From 792638241bd785d5a0bf66b253decc7c8d4f8a35 Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 3 Nov 2026 23:55:51 +0000 Subject: [PATCH 001/113] fix(tui): status row, meters and settings screens at 80 columns The status row wrapped to a second row at 80x24, the meters vanished below 120 columns, and F2/F4 drew their editors off the right-hand edge at 80. The status row now drops its encoding and palette hints before wrapping, meters fall back to a compact percentage form, two-column screens too narrow for both columns show the one the keyboard is in, and header/footer bars elide text rather than clipping their keys. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- src/SharpMUTerm.Tui/AliasesScreenRenderer.cs | 2 +- src/SharpMUTerm.Tui/KeypadScreenRenderer.cs | 2 +- src/SharpMUTerm.Tui/KeypadScreenView.cs | 19 ++++- src/SharpMUTerm.Tui/MarkupText.cs | 79 +++++++++++++++++++ src/SharpMUTerm.Tui/MsspScreenRenderer.cs | 2 +- src/SharpMUTerm.Tui/OptionsScreenRenderer.cs | 2 +- src/SharpMUTerm.Tui/ScreenChrome.cs | 41 ++++++++++ src/SharpMUTerm.Tui/SharpMUTermApp.cs | 45 ++++++++++- src/SharpMUTerm.Tui/StatusMeterRenderer.cs | 28 ++++++- src/SharpMUTerm.Tui/TimersScreenRenderer.cs | 2 +- src/SharpMUTerm.Tui/TriggersScreenRenderer.cs | 2 +- src/SharpMUTerm.Tui/TriggersScreenView.cs | 15 +++- src/SharpMUTerm.Tui/WorldsScreenRenderer.cs | 2 +- 13 files changed, 223 insertions(+), 18 deletions(-) diff --git a/src/SharpMUTerm.Tui/AliasesScreenRenderer.cs b/src/SharpMUTerm.Tui/AliasesScreenRenderer.cs index acfe3682..298d4dd9 100644 --- a/src/SharpMUTerm.Tui/AliasesScreenRenderer.cs +++ b/src/SharpMUTerm.Tui/AliasesScreenRenderer.cs @@ -114,7 +114,7 @@ internal static string HeaderLine(int width, ScreenModel? model = null, ScreenFo var title = $"[bold {Value}] Aliases[/]"; var hints = ScreenChrome.Hints( ScreenChrome.ListHints, "F3", model?.HasEditableRow ?? false, focus, model?.HasRemovableRow ?? false); - return SpreadLR(" " + title, hints, width); + return SpreadTitle(" " + title, hints, width); } /// diff --git a/src/SharpMUTerm.Tui/KeypadScreenRenderer.cs b/src/SharpMUTerm.Tui/KeypadScreenRenderer.cs index 6b413d6d..4af1b236 100644 --- a/src/SharpMUTerm.Tui/KeypadScreenRenderer.cs +++ b/src/SharpMUTerm.Tui/KeypadScreenRenderer.cs @@ -203,7 +203,7 @@ internal static string HeaderLine(int width, ScreenModel? model = null, ScreenFo var title = $"[bold {Value}] Keypad & hotkeys[/]"; var hints = ScreenChrome.Hints( ScreenChrome.SingleListHints, "F4", model?.HasEditableRow ?? false, focus, model?.HasRemovableRow ?? false); - return SpreadLR(" " + title, hints, width); + return SpreadTitle(" " + title, hints, width); } /// diff --git a/src/SharpMUTerm.Tui/KeypadScreenView.cs b/src/SharpMUTerm.Tui/KeypadScreenView.cs index 10ec3420..82204dd4 100644 --- a/src/SharpMUTerm.Tui/KeypadScreenView.cs +++ b/src/SharpMUTerm.Tui/KeypadScreenView.cs @@ -38,14 +38,25 @@ public static IWindowControl Build( // While a key capture is armed the binding row swaps its key well for a prompt twice the width, // so the list asks for more and the diagram gives it up for as long as the prompt is up. The // numpad is the one thing on this screen with nothing to do with the keystroke being waited for. + var rows = ScreenChrome.Rows(height); + var hotkeysMinimum = focus?.Edit is { Capture: true } + ? KeypadScreenRenderer.CaptureWidth + : KeypadScreenRenderer.MinHotkeysWidth; + if (ScreenChrome.TooNarrowForTwo(width, KeypadScreenRenderer.MinNumpadWidth, hotkeysMinimum)) + { + // The diagram is a picture of the bindings the list already holds, so a narrow screen drops it + // and keeps the list, which is where every key on this screen acts. + var only = KeypadScreenRenderer.HotkeysColumn(macros, focus, sets, selected, width); + return ScreenChrome.Single( + header, footer, ScreenChrome.Stretch(new MarkupControl(ScreenChrome.Window(only, rows))), + only.Count, rows); + } + var numpad = ScreenChrome.SplitWidth( width, KeypadScreenRenderer.NumpadWidth(macros), KeypadScreenRenderer.MinNumpadWidth, - focus?.Edit is { Capture: true } - ? KeypadScreenRenderer.CaptureWidth - : KeypadScreenRenderer.MinHotkeysWidth); - var rows = ScreenChrome.Rows(height); + hotkeysMinimum); var left = KeypadScreenRenderer.NumpadColumn(macros, numpad); var right = KeypadScreenRenderer.HotkeysColumn( macros, focus, sets, selected, width <= 0 ? numpad : width - numpad - ScreenChrome.ColumnDivider); diff --git a/src/SharpMUTerm.Tui/MarkupText.cs b/src/SharpMUTerm.Tui/MarkupText.cs index 892b185f..62115705 100644 --- a/src/SharpMUTerm.Tui/MarkupText.cs +++ b/src/SharpMUTerm.Tui/MarkupText.cs @@ -68,7 +68,86 @@ internal static string SpreadLR(string left, string right, int width) return $"{left} {right}"; } + // When both do not fit, the left gives way: on every bar that calls this the right is the keys + // (Esc, ⏎), and a bar that clipped them off the edge named an action without its key. + var room = width - VisibleLength(right) - 1; + if (VisibleLength(left) > room) + { + left = ElideVisible(left, room); + } + var gap = Math.Max(1, width - VisibleLength(left) - VisibleLength(right)); return left + new string(' ', gap) + right; } + + /// + /// for a screen's header, where the left is the screen's title and the right + /// its key hints. Here the right gives way: the title says where the reader is, and the hints that + /// fall off the end (the close key last of all) are repeated in the action bar. + /// + internal static string SpreadTitle(string title, string hints, int width) + { + if (width > 0 && VisibleLength(title) + 1 + VisibleLength(hints) > width) + { + hints = ElideVisible(hints, Math.Max(0, width - VisibleLength(title) - 1)); + } + + return SpreadLR(title, hints, width); + } + + /// + /// Cuts a markup string to visible cells, ending in … when anything + /// was cut. Tags are kept, including those after the cut, so every span that opened still closes. + /// + internal static string ElideVisible(string markup, int width) + { + if (VisibleLength(markup) <= width) + { + return markup; + } + + var budget = Math.Max(0, width - 1); + var result = new System.Text.StringBuilder(markup.Length); + var shown = 0; + var cut = false; + + void Visible(string text) + { + if (shown < budget) + { + result.Append(text); + shown++; + } + else if (!cut) + { + cut = true; + if (width > 0) + { + result.Append('…'); + } + } + } + + for (var i = 0; i < markup.Length; i++) + { + var c = markup[i]; + if ((c == '[' || c == ']') && i + 1 < markup.Length && markup[i + 1] == c) + { + Visible(new string(c, 2)); + i++; + continue; + } + + if (c == '[' && markup.IndexOf(']', i) is var close and > 0) + { + result.Append(markup, i, close - i + 1); + i = close; + continue; + } + + Visible(c.ToString()); + } + + return result.ToString(); + } } diff --git a/src/SharpMUTerm.Tui/MsspScreenRenderer.cs b/src/SharpMUTerm.Tui/MsspScreenRenderer.cs index 21be61b3..7424a72f 100644 --- a/src/SharpMUTerm.Tui/MsspScreenRenderer.cs +++ b/src/SharpMUTerm.Tui/MsspScreenRenderer.cs @@ -168,7 +168,7 @@ internal static ScreenModel Model( internal static string HeaderLine(int width) { var hints = $"[{Label}]↑↓ scroll · [/][{Accent}]Esc[/][{Label}] back [/]"; - return SpreadLR($" [bold {Value}] {Escape(Title)}[/]", hints, width); + return SpreadTitle($" [bold {Value}] {Escape(Title)}[/]", hints, width); } /// The screen's action bar: where the cursor is in the report, and the key that leaves. diff --git a/src/SharpMUTerm.Tui/OptionsScreenRenderer.cs b/src/SharpMUTerm.Tui/OptionsScreenRenderer.cs index 0e304809..58757a33 100644 --- a/src/SharpMUTerm.Tui/OptionsScreenRenderer.cs +++ b/src/SharpMUTerm.Tui/OptionsScreenRenderer.cs @@ -95,7 +95,7 @@ internal static string HeaderLine( Escape(fkey), model?.HasEditableRow ?? false, focus); - return SpreadLR(" " + heading, hints, width); + return SpreadTitle(" " + heading, hints, width); } /// diff --git a/src/SharpMUTerm.Tui/ScreenChrome.cs b/src/SharpMUTerm.Tui/ScreenChrome.cs index aa4af073..ab484d64 100644 --- a/src/SharpMUTerm.Tui/ScreenChrome.cs +++ b/src/SharpMUTerm.Tui/ScreenChrome.cs @@ -773,6 +773,47 @@ internal static IWindowControl Split( return root.Build(); } + /// + /// Whether a two-column screen has too few cells for both columns at their minimums. Below that + /// still hands the list its minimum, and the column beside it runs off the + /// right-hand edge: F2 and F4 lost their editors that way at 80 columns. Such a screen shows one + /// column at a time instead (), the one the keyboard is in. + /// + internal static bool TooNarrowForTwo(int width, int minimum, int companion) => + width > 0 && width < minimum + ColumnDivider + companion; + + /// + /// 's frame with one column in the body, for a screen too narrow for two + /// (). Same header, same action bar, same content-sized body. + /// + internal static IWindowControl Single( + MarkupControl header, MarkupControl footer, MarkupControl column, int content, int rows) + { + var root = Controls.Grid() + .WithAlignment(HorizontalAlignment.Stretch) + .WithVerticalAlignment(VerticalAlignment.Fill); + + if (rows <= 0) + { + root.Rows(GridLength.Cells(1), GridLength.Star(1), GridLength.Cells(1)).Columns(GridLength.Star(1)); + root.Place(header, 0, 0, 1, 1); + root.Place(column, 1, 0, 1, 1); + root.Place(footer, 2, 0, 1, 1); + return root.Build(); + } + + root.Rows( + GridLength.Cells(1), + GridLength.Cells(Math.Clamp(content, 1, rows)), + GridLength.Star(1), + GridLength.Cells(1)) + .Columns(GridLength.Star(1)); + root.Place(header, 0, 0, 1, 1); + root.Place(column, 1, 0, 1, 1); + root.Place(footer, 3, 0, 1, 1); + return root.Build(); + } + /// Widens a column panel to its arranged width so its content isn't hugged. internal static MarkupControl Stretch(MarkupControl control) { diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 8c187c52..65d95165 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -13084,9 +13084,11 @@ private string StatusBarMarkup(string character, string state) // "utf-8" means the server agreed, "utf-8 assumed" means nobody said, "iso-8859-1 forced" means // you did. With nothing connected there is no fact to report, and the cell is not drawn — the // same rule that took the address and the invented latency meter off this row. + string? encodingCell = null; if (EffectiveEncoding() is { } encoding) { - right.Add($"[dim]{Escape(encoding.Label)}[/]"); + encodingCell = $"[dim]{Escape(encoding.Label)}[/]"; + right.Add(encodingCell); } // The character count lives at the bottom now (the input gutter is gone); while recalling @@ -13096,7 +13098,39 @@ private string StatusBarMarkup(string character, string state) ? $"[{AccentHex(AccentPalette[0])}]history[/] [dim]· ↓ back to draft[/]" : $"[dim]{ActiveBar().Text.Length} chars[/]"); - right.Add("[dim]⌃P palette[/]"); + const string paletteCell = "[dim]⌃P palette[/]"; + right.Add(paletteCell); + + // The cluster above is built unconditionally, and at 80 columns a scrolled-back pane's segment + // made it one cell too wide: the row wrapped, a pane lost a row and every server was told a new + // size. Give cells back until it fits, least useful first — the encoding (a fact that rarely + // changes), then the palette hint (⌃P is also on the header's menu button), and only then the + // character count. The scrollback segment and the identity are never dropped: they are the + // only places those facts are said. + // + // The meters count here too: on a narrow terminal they are worth more to someone in a fight than + // either of those two cells, and they used to be the thing that lost — at 80 columns a world + // publishing HP showed none of it. + var compactMeters = meters.Length > 0 + ? StatusMeterRenderer.Render(StatusMeters(), StatusData(), $"{_ink.Notice}", compact: true) + : string.Empty; + var meterCost = compactMeters.Length > 0 ? 3 + MarkupWidth(compactMeters) + MeterSlack : 0; + foreach (var droppable in new[] { encodingCell, paletteCell }) + { + if (droppable is null + || MarkupWidth(left) + MinStatusGap + MarkupWidth(string.Join(" ", right)) + meterCost <= HeaderWidth()) + { + continue; + } + + right.Remove(droppable); + } + + if (right.Count > 1 + && MarkupWidth(left) + MinStatusGap + MarkupWidth(string.Join(" ", right)) > HeaderWidth()) + { + right.RemoveAt(right.Count - 1); + } // The focus hint goes in last and only if it fits. This row is a *sticky* band whose length // changes at runtime, and a cluster that overflows the width wraps it onto a second row — which @@ -13109,6 +13143,13 @@ private string StatusBarMarkup(string character, string state) // The meters sit beside the identity they describe, and only when the row has room for them with a // few cells to spare: the character count on the right grows as a line is typed, and a cluster that // came and went with it would be worse than one that is absent on a narrow terminal. + if (meters.Length > 0 + && MarkupWidth(left) + 3 + MarkupWidth(meters) + MarkupWidth(rightBar) + MinStatusGap + MeterSlack > HeaderWidth()) + { + // Too narrow for value/max: the share alone, in a field just as fixed. + meters = StatusMeterRenderer.Render(StatusMeters(), StatusData(), $"{_ink.Notice}", compact: true); + } + if (meters.Length > 0 && MarkupWidth(left) + 3 + MarkupWidth(meters) + MarkupWidth(rightBar) + MinStatusGap + MeterSlack <= HeaderWidth()) { diff --git a/src/SharpMUTerm.Tui/StatusMeterRenderer.cs b/src/SharpMUTerm.Tui/StatusMeterRenderer.cs index e17a767c..1c5566a2 100644 --- a/src/SharpMUTerm.Tui/StatusMeterRenderer.cs +++ b/src/SharpMUTerm.Tui/StatusMeterRenderer.cs @@ -26,8 +26,16 @@ internal static class StatusMeterRenderer /// Below this share of its maximum a value is drawn in the warning ink. internal const double LowShare = 0.25; - /// The meters that have a value, as one markup run, or empty when none does. - internal static string Render(IReadOnlyList meters, GameDataStore data, string lowInk) + /// The cells a compact meter's share takes: 100%. + internal const int ShareWidth = 4; + + /// + /// The meters that have a value, as one markup run, or empty when none does. + /// draws a meter that has a numeric maximum as its share (hp 82%) in a reserved + /// -cell field, for a status row too narrow for value/max; a meter with no + /// usable maximum is drawn as its value either way. + /// + internal static string Render(IReadOnlyList meters, GameDataStore data, string lowInk, bool compact = false) { var cells = new List(); foreach (var meter in meters) @@ -40,6 +48,15 @@ internal static string Render(IReadOnlyList meters, GameDataStore d var max = string.IsNullOrWhiteSpace(meter.Max) ? null : StatusMeter.Read(data, meter.Max); var low = IsLow(value, max); var label = MarkupText.Escape(meter.Label); + if (compact && Share(value, max) is { } share) + { + var percent = $"{Math.Clamp((int)Math.Round(share * 100), 0, 999)}%".PadLeft(ShareWidth); + cells.Add(low + ? $"[dim]{label}[/] [bold {lowInk}]{percent}[/]" + : $"[dim]{label}[/] [bold]{percent}[/]"); + continue; + } + var shown = MarkupText.Escape(StatusMeter.Fit(value, ValueWidth).PadLeft(ValueWidth)); var cell = low ? $"[dim]{label}[/] [bold {lowInk}]{shown}[/]" @@ -55,10 +72,13 @@ internal static string Render(IReadOnlyList meters, GameDataStore d return string.Join(" ", cells); } - private static bool IsLow(string value, string? max) => + private static bool IsLow(string value, string? max) => Share(value, max) < LowShare; + + private static double? Share(string value, string? max) => max is not null && double.TryParse(value, NumberStyles.Float, CultureInfo.InvariantCulture, out var v) && double.TryParse(max, NumberStyles.Float, CultureInfo.InvariantCulture, out var m) && m > 0 - && v / m < LowShare; + ? v / m + : null; } diff --git a/src/SharpMUTerm.Tui/TimersScreenRenderer.cs b/src/SharpMUTerm.Tui/TimersScreenRenderer.cs index f405171a..a5a84937 100644 --- a/src/SharpMUTerm.Tui/TimersScreenRenderer.cs +++ b/src/SharpMUTerm.Tui/TimersScreenRenderer.cs @@ -114,7 +114,7 @@ internal static string HeaderLine(int width, ScreenModel? model = null, ScreenFo var title = $"[bold {Value}] Timers[/]"; var hints = ScreenChrome.Hints( ScreenChrome.ListHints, "F6", model?.HasEditableRow ?? false, focus, model?.HasRemovableRow ?? false); - return SpreadLR(" " + title, hints, width); + return SpreadTitle(" " + title, hints, width); } /// diff --git a/src/SharpMUTerm.Tui/TriggersScreenRenderer.cs b/src/SharpMUTerm.Tui/TriggersScreenRenderer.cs index 0919e78e..5d71b3ea 100644 --- a/src/SharpMUTerm.Tui/TriggersScreenRenderer.cs +++ b/src/SharpMUTerm.Tui/TriggersScreenRenderer.cs @@ -264,7 +264,7 @@ internal static string HeaderLine(int width, ScreenModel? model = null, ScreenFo var title = $"[bold {Value}] Triggers & spawn routing[/]"; var hints = ScreenChrome.Hints( ScreenChrome.ListHints, "F2", model?.HasEditableRow ?? false, focus, model?.HasRemovableRow ?? false); - return SpreadLR(" " + title, hints, width); + return SpreadTitle(" " + title, hints, width); } /// diff --git a/src/SharpMUTerm.Tui/TriggersScreenView.cs b/src/SharpMUTerm.Tui/TriggersScreenView.cs index 14e3871c..9df2af08 100644 --- a/src/SharpMUTerm.Tui/TriggersScreenView.cs +++ b/src/SharpMUTerm.Tui/TriggersScreenView.cs @@ -35,12 +35,25 @@ public static IWindowControl Build( // Body: rule list │ editor, as two real columns. The split is a function of the screen's width: // at 120 the rule list keeps the share it was designed with, and at 100 it gives cells back to // the editor rather than letting the attribute legend run off the right-hand edge. + var body = ScreenChrome.Rows(height); + if (ScreenChrome.TooNarrowForTwo( + width, TriggersScreenRenderer.MinColumnWidth, TriggersScreenRenderer.MinEditorWidth)) + { + // One column at a time: the rule list, or the editor once the keyboard has moved into it or + // ⏎ has opened one of the rule's fields, which are drawn in the editor and nowhere else. + var only = focus is { } f && (f.InPane(1) || f.IsEditing) + ? TriggersScreenRenderer.EditorColumn(sets, selectedTrigger, routeTargets, focus, width, body, theme) + : TriggersScreenRenderer.RulesColumn(sets, selectedTrigger, focus, width); + return ScreenChrome.Single( + header, footer, ScreenChrome.Stretch(new MarkupControl(ScreenChrome.Window(only, body))), + only.Count, body); + } + var rules = ScreenChrome.SplitWidth( width, TriggersScreenRenderer.ColumnWidth, TriggersScreenRenderer.MinColumnWidth, TriggersScreenRenderer.MinEditorWidth); - var body = ScreenChrome.Rows(height); var left = TriggersScreenRenderer.RulesColumn(sets, selectedTrigger, focus, rules); var right = TriggersScreenRenderer.EditorColumn( sets, selectedTrigger, routeTargets, focus, diff --git a/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs b/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs index 1e6e93c7..79f7fb6a 100644 --- a/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs +++ b/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs @@ -299,7 +299,7 @@ internal static string HeaderLine( focus, model?.HasRemovableRow ?? false, model?.HasDetailRow ?? false); - return SpreadLR(" " + title, hints, width); + return SpreadTitle(" " + title, hints, width); } /// From ba27130742f8e87afba6a517fed2c77e89607bcd Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 3 Nov 2026 23:59:47 +0000 Subject: [PATCH 002/113] feat(tui): /connect opens a world by name or adds one from a host --plain had no way to add a world on a first run: the settings screens are not usable there. /connect [port] [tls] saves a new world and dials it; /connect opens a configured one. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- src/SharpMUTerm.Tui/SharpMUTermApp.Connect.cs | 147 ++++++++++++++++++ src/SharpMUTerm.Tui/SharpMUTermApp.cs | 10 +- .../ConnectCommandTests.cs | 125 +++++++++++++++ 3 files changed, 281 insertions(+), 1 deletion(-) create mode 100644 src/SharpMUTerm.Tui/SharpMUTermApp.Connect.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/ConnectCommandTests.cs diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Connect.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Connect.cs new file mode 100644 index 00000000..cefe5bd8 --- /dev/null +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Connect.cs @@ -0,0 +1,147 @@ +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Diagnostics; +using SharpMUTerm.Core.Session; +using static SharpMUTerm.Tui.MarkupText; + +namespace SharpMUTerm.Tui; + +/// +/// /connect: open a world from the command line. A configured world is reached by name; anything else +/// is read as a host (and port), saved as a new world and dialled. It exists because --plain has no +/// settings screens a screen reader can use, so a first run there had no way to add a world at all, and it is +/// the quickest way in everywhere else too. +/// +internal sealed partial class SharpMUTermApp +{ + /// The port a host given without one is dialled on, the same default as the command line's. + internal const int DefaultConnectPort = 4000; + + /// What /connect with nothing after it says. + internal const string ConnectUsage = "/connect , or /connect [port] [tls] to add one"; + + private void ConnectCommand(string windowId, string arguments) + { + var words = arguments.Split(' ', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries); + var tls = words.Any(IsTlsWord); + words = words.Where(word => !IsTlsWord(word)).ToArray(); + + if (words.Length == 0) + { + AppendWindowLine(windowId, $"[dim]*** {Escape(ConnectUsage)}[/]"); + if (_config.Worlds.Count > 0) + { + var names = string.Join(", ", _config.Worlds.Select(world => world.Name)); + AppendWindowLine(windowId, $"[dim]*** worlds: {Escape(names)}[/]"); + } + + return; + } + + var world = _config.Worlds.FirstOrDefault( + known => string.Equals(known.Name, string.Join(' ', words), StringComparison.OrdinalIgnoreCase)); + if (world is null) + { + if (ParseEndpoint(words) is not { } endpoint) + { + RefuseCommand($"no world called {Snippet(string.Join(' ', words))}, and that is not a host — {ConnectUsage}"); + return; + } + + world = new WorldDefinition + { + Name = UniqueWorldName(endpoint.Host), + Host = endpoint.Host, + Port = endpoint.Port, + UseTls = tls, + }; + _config.Worlds.Add(world); + SaveConfiguration(); + Notice($"added {world.Name} ({world.Host}:{world.Port}) — F5 edits it", MessageSeverity.Info, "F5"); + } + + var character = world.Characters.FirstOrDefault(); + var key = character is null ? world.Name : $"{world.Name}.{character.Name}"; + var session = _sessions.Find(key); + if (session is null) + { + session = OpenSession(world, character); + BindSession(session, OpenSessionWindow(session)); + } + + Activate(OpenSessionWindow(session)); + UpdateStatus(); + UpdateInputChrome(); + + if (session.State is not (ConnectionState.Connected or ConnectionState.Connecting)) + { + LastCommand = DialAtStartupAsync(session); + } + } + + private static bool IsTlsWord(string word) => + word.Equals("tls", StringComparison.OrdinalIgnoreCase) + || word.Equals("--tls", StringComparison.OrdinalIgnoreCase); + + /// + /// Reads host port, host:port or a bare host. A bracketed IPv6 address keeps its colons. Null + /// when the words are not one host with at most one port, so a mistyped world name is refused rather than + /// saved as a world that dials a host called "my world". + /// + internal static (string Host, int Port)? ParseEndpoint(IReadOnlyList words) + { + if (words.Count is 0 or > 2) + { + return null; + } + + var host = words[0]; + var port = DefaultConnectPort; + if (words.Count == 2) + { + if (!TryPort(words[1], out port)) + { + return null; + } + } + else if (host.StartsWith('[') && host.IndexOf("]:", StringComparison.Ordinal) is var close and > 0) + { + if (!TryPort(host[(close + 2)..], out port)) + { + return null; + } + + host = host[..(close + 1)]; + } + else if (host.Count(c => c == ':') == 1) + { + var colon = host.IndexOf(':'); + if (!TryPort(host[(colon + 1)..], out port)) + { + return null; + } + + host = host[..colon]; + } + + host = host.Trim('[', ']'); + return Uri.CheckHostName(host) == UriHostNameType.Unknown ? null : (host, port); + } + + private static bool TryPort(string text, out int port) => + int.TryParse(text, out port) && port is > 0 and <= 65535; + + /// A world name not already taken: the host, then the host with a number after it. + private string UniqueWorldName(string host) + { + bool Taken(string name) => _config.Worlds.Any( + world => string.Equals(world.Name, name, StringComparison.OrdinalIgnoreCase)); + + var name = host; + for (var n = 2; Taken(name); n++) + { + name = $"{host} {n}"; + } + + return name; + } +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 65d95165..bfe1d20d 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -2472,7 +2472,7 @@ internal async Task StartAsync(IReadOnlyList startup) /// The empty-workspace message when there is nothing to connect because there is nothing at all. internal const string NoWorldsNotice = - "No world configured. Pass a host/port on the command line, or add one on F5."; + "No world configured. Type /connect , pass one on the command line, or add one on F5."; /// /// And when there are worlds but none of their characters is marked. It is the ordinary state of a @@ -4616,6 +4616,14 @@ private void OnCommandEntered(InputBar bar, string command) return; } + // `/connect` opens a world by name, or adds one from a host and dials it. + if (command.StartsWith("/connect", StringComparison.OrdinalIgnoreCase) + && (command.Length == 8 || command[8] == ' ')) + { + ConnectCommand(windowId, command[8..].Trim()); + return; + } + // `/package` opens the Packages screen; `/package install …` reads one for review. if (command.StartsWith("/package", StringComparison.OrdinalIgnoreCase) && (command.Length == 8 || command[8] == ' ')) diff --git a/tests/SharpMUTerm.Tui.Tests/ConnectCommandTests.cs b/tests/SharpMUTerm.Tui.Tests/ConnectCommandTests.cs new file mode 100644 index 00000000..4a9c574b --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/ConnectCommandTests.cs @@ -0,0 +1,125 @@ +using SharpConsoleUI.Drivers; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Session; +using SharpMUTerm.Graphics; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// /connect: the way into a world from the command line alone, which is the only way --plain has. +/// +[NotInParallel] +public class ConnectCommandTests +{ + private static readonly TerminalCapabilities Headless = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private static (SharpMUTermApp App, RecordingTelnetSession Wire, AppConfiguration Config) Open( + Action? configure = null) + { + Console.SetIn(TextReader.Null); + var config = new AppConfiguration(); + configure?.Invoke(config); + var wire = new RecordingTelnetSession(); + var app = new SharpMUTermApp(config, Headless, new HeadlessConsoleDriver(120, 32)); + app.TelnetFactory = _ => wire; + return (app, wire, config); + } + + private static void Type(SharpMUTermApp app, string text) + { + foreach (var c in text) + { + app.SimulateKey(new ConsoleKeyInfo(c, ConsoleKey.NoName, false, false, false)); + } + + app.SimulateKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false)); + } + + [Test] + public async Task AHostAndPortAddAWorldAndDialIt() + { + var (app, _, config) = Open(); + await using var _app = app; + + Type(app, "/connect mud.example.org 4201 tls"); + await app.LastCommand; + + await Assert.That(config.Worlds.Count).IsEqualTo(1); + var world = config.Worlds[0]; + await Assert.That(world.Name).IsEqualTo("mud.example.org"); + await Assert.That(world.Host).IsEqualTo("mud.example.org"); + await Assert.That(world.Port).IsEqualTo(4201); + await Assert.That(world.UseTls).IsTrue(); + await Assert.That(app.FindSession("mud.example.org")!.State) + .IsEqualTo(ConnectionState.Connected); + } + + [Test] + public async Task AConfiguredWorldIsReachedByNameAndNotAddedAgain() + { + var (app, _, config) = Open(c => c.Worlds.Add(new WorldDefinition + { + Name = "Convergence", + Host = "convergence.example", + Port = 4201, + Characters = { new CharacterDefinition { Name = "Ann", Logging = new LoggingSettings() } }, + })); + await using var _app = app; + + Type(app, "/connect convergence"); + await app.LastCommand; + + await Assert.That(config.Worlds.Count).IsEqualTo(1); + await Assert.That(app.FindSession("Convergence.Ann")!.State).IsEqualTo(ConnectionState.Connected); + } + + [Test] + public async Task ConnectingTwiceReusesTheSession() + { + var (app, _, config) = Open(); + await using var _app = app; + + Type(app, "/connect mud.example.org 4201"); + await app.LastCommand; + var first = app.FindSession("mud.example.org"); + Type(app, "/connect mud.example.org"); + await app.LastCommand; + + await Assert.That(config.Worlds.Count).IsEqualTo(1); + await Assert.That(app.FindSession("mud.example.org")).IsSameReferenceAs(first); + } + + [Test] + public async Task AMistypedNameIsRefusedRatherThanSavedAsAHost() + { + var (app, wire, config) = Open(); + await using var _app = app; + + Type(app, "/connect my favourite world"); + + await Assert.That(config.Worlds).IsEmpty(); + await Assert.That(wire.Lines).IsEmpty(); + } + + [Test] + [Arguments("host.example", "host.example", 4000)] + [Arguments("host.example:23", "host.example", 23)] + [Arguments("[::1]:4201", "::1", 4201)] + [Arguments("10.0.0.5", "10.0.0.5", 4000)] + public async Task EndpointsAreReadInEveryUsualShape(string text, string host, int port) + { + var endpoint = SharpMUTermApp.ParseEndpoint(new[] { text }); + + await Assert.That(endpoint).IsEqualTo((host, port)); + } + + [Test] + [Arguments("host.example", "0")] + [Arguments("host.example", "70000")] + [Arguments("host.example", "telnet")] + public async Task ABadPortIsNoEndpoint(string host, string port) + { + await Assert.That(SharpMUTermApp.ParseEndpoint(new[] { host, port })).IsNull(); + } +} From e330da2ae41a9cc4afccaea03a587a5134778e19 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 00:02:37 +0000 Subject: [PATCH 003/113] feat(window): bundle JetBrains Mono and Nerd Font symbols A machine with no Nerd Font installed drew every chrome icon in the window as a box, and text fell back to whatever monospace face the system had. The window now carries JetBrains Mono (OFL 1.1) and Symbols Nerd Font Mono (MIT) as embedded resources, used after any preferred installed face, and ships their licences beside the executable. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- src/SharpMUTerm.Avalonia/CellFonts.cs | 61 +++++++++++- .../Fonts/JetBrainsMono-Bold.ttf | Bin 0 -> 277828 bytes .../Fonts/JetBrainsMono-BoldItalic.ttf | Bin 0 -> 279832 bytes .../Fonts/JetBrainsMono-Italic.ttf | Bin 0 -> 276840 bytes .../Fonts/JetBrainsMono-OFL.txt | 93 ++++++++++++++++++ .../Fonts/JetBrainsMono-Regular.ttf | Bin 0 -> 273900 bytes src/SharpMUTerm.Avalonia/Fonts/README.md | 14 +++ .../Fonts/SymbolsNerdFont-LICENSE.txt | 21 ++++ .../Fonts/SymbolsNerdFontMono-Regular.ttf | Bin 0 -> 2507556 bytes .../SharpMUTerm.Avalonia.csproj | 10 ++ .../BundledFontTests.cs | 35 +++++++ 11 files changed, 233 insertions(+), 1 deletion(-) create mode 100644 src/SharpMUTerm.Avalonia/Fonts/JetBrainsMono-Bold.ttf create mode 100644 src/SharpMUTerm.Avalonia/Fonts/JetBrainsMono-BoldItalic.ttf create mode 100644 src/SharpMUTerm.Avalonia/Fonts/JetBrainsMono-Italic.ttf create mode 100644 src/SharpMUTerm.Avalonia/Fonts/JetBrainsMono-OFL.txt create mode 100644 src/SharpMUTerm.Avalonia/Fonts/JetBrainsMono-Regular.ttf create mode 100644 src/SharpMUTerm.Avalonia/Fonts/README.md create mode 100644 src/SharpMUTerm.Avalonia/Fonts/SymbolsNerdFont-LICENSE.txt create mode 100644 src/SharpMUTerm.Avalonia/Fonts/SymbolsNerdFontMono-Regular.ttf create mode 100644 tests/SharpMUTerm.Avalonia.Tests/BundledFontTests.cs diff --git a/src/SharpMUTerm.Avalonia/CellFonts.cs b/src/SharpMUTerm.Avalonia/CellFonts.cs index 65959ba3..0c086d93 100644 --- a/src/SharpMUTerm.Avalonia/CellFonts.cs +++ b/src/SharpMUTerm.Avalonia/CellFonts.cs @@ -24,9 +24,27 @@ internal sealed class CellFonts : IDisposable "CaskaydiaMono Nerd Font", "CaskaydiaCove Nerd Font Mono", "CaskaydiaCove Nerd Font", "JetBrainsMono Nerd Font Mono", "JetBrainsMono Nerd Font", "FiraCode Nerd Font Mono", "Cascadia Mono", "Cascadia Code", "JetBrains Mono", "Consolas", "SF Mono", "Menlo", + ]; + + /// + /// Installed faces tried after the bundled JetBrains Mono: they are on most machines, so they used to be + /// what a window without a preferred face drew in, and none of them is a face anybody picked. + /// + private static readonly string[] LastResortFamilies = + [ "DejaVu Sans Mono", "Liberation Mono", "Noto Sans Mono", "Courier New", ]; + /// The bundled faces (Fonts/), loaded once and never disposed: every grid shares them. + private static readonly Lazy BundledRegular = new(() => Bundled("JetBrainsMono-Regular.ttf")); + private static readonly Lazy BundledBold = new(() => Bundled("JetBrainsMono-Bold.ttf")); + private static readonly Lazy BundledItalic = new(() => Bundled("JetBrainsMono-Italic.ttf")); + private static readonly Lazy BundledBoldItalic = new(() => Bundled("JetBrainsMono-BoldItalic.ttf")); + private static readonly Lazy BundledSymbols = new(() => Bundled("SymbolsNerdFontMono-Regular.ttf")); + + /// The family name the bundled text face reports. + internal const string BundledFamily = "JetBrains Mono"; + private readonly ConcurrentDictionary<(int CodePoint, bool Bold, bool Italic), SKFont> _fonts = new(); private readonly SKTypeface _regular; private readonly SKTypeface _bold; @@ -141,9 +159,32 @@ private SKFont Create(int codePoint, bool bold, bool italic) } } - return null; + return BundledSymbols.Value is { } bundled && bundled.ContainsGlyph(codePoint) ? bundled : null; + } + + /// Whether the bundled faces are in this build, for a test to hold the packaging to. + internal static bool HasBundledFaces => BundledRegular.Value is not null && BundledSymbols.Value is not null; + + private static SKTypeface? Bundled(string file) + { + using var stream = typeof(CellFonts).Assembly.GetManifestResourceStream($"Fonts.{file}"); + if (stream is null) + { + return null; + } + + using var data = SKData.Create(stream); + return data is null ? null : SKTypeface.FromData(data); } + private static SKTypeface? BundledText(SKFontStyle style) => (style.Weight >= (int)SKFontStyleWeight.SemiBold, style.Slant != SKFontStyleSlant.Upright) switch + { + (true, true) => BundledBoldItalic.Value, + (true, false) => BundledBold.Value, + (false, true) => BundledItalic.Value, + _ => BundledRegular.Value, + }; + private static readonly string[] SymbolFamilies = [ "Symbols Nerd Font Mono", "Symbols Nerd Font", .. PreferredFamilies.Where(f => f.Contains("Nerd Font", StringComparison.Ordinal)), @@ -162,6 +203,24 @@ private SKFont Create(int codePoint, bool bold, bool italic) face?.Dispose(); } + // The bundled face is asked for by its own name, so a family that resolves to it (the regular face's, + // when bold is matched after it) gets the bundled weights rather than a system fallback. + if (BundledText(style) is { } bundled) + { + return bundled; + } + + foreach (var name in LastResortFamilies) + { + var face = SKFontManager.Default.MatchFamily(name, style); + if (face is not null && string.Equals(face.FamilyName, name, StringComparison.OrdinalIgnoreCase)) + { + return face; + } + + face?.Dispose(); + } + return SKFontManager.Default.MatchFamily("monospace", style); } } diff --git a/src/SharpMUTerm.Avalonia/Fonts/JetBrainsMono-Bold.ttf b/src/SharpMUTerm.Avalonia/Fonts/JetBrainsMono-Bold.ttf new file mode 100644 index 0000000000000000000000000000000000000000..8c93043de6454ad2d5575f0751150c6551d9c588 GIT binary patch literal 277828 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

^Q2@p_nJptvCyhdNtfUDv9XvP^J$Tq^Yf}I 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 s3n!(`lCJDArN|NmBd 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

Zh7cd=34FaGWy`SDvi)66*nbC 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 RXt+-ctVzYaTEQjd{{RH8A$|Y= literal 0 HcmV?d00001 diff --git a/src/SharpMUTerm.Avalonia/Fonts/JetBrainsMono-BoldItalic.ttf b/src/SharpMUTerm.Avalonia/Fonts/JetBrainsMono-BoldItalic.ttf new file mode 100644 index 0000000000000000000000000000000000000000..1ddf216d1884ab44789c0c86dc06f6556c4c4e22 GIT binary patch literal 279832 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

r*`bq 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 literal 0 HcmV?d00001 diff --git a/src/SharpMUTerm.Avalonia/Fonts/JetBrainsMono-Italic.ttf b/src/SharpMUTerm.Avalonia/Fonts/JetBrainsMono-Italic.ttf new file mode 100644 index 0000000000000000000000000000000000000000..ccc9d6a5bc15ffbcce66f923bf3d7999c73ede84 GIT binary patch literal 276840 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 &?JvTsIyg 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 z

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%0AZ2!I>(X$feQ`u_ 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

XjjY`n>jrC$aj{_8JaEU>x;^hZByMwz0J;8 zhndwK9y`!?dXcwR*3^w(wtE&*NQDb-qhM}so!eGphdO1@v2MSI+vuz^GcLcMlMzU6(cu_>#OG8Khc^*{ zuX!1J{o-}uhE%lD&ZaASWlyTDCTB)&8~M~nKH!NUGX|`w;jW>&xW-$RS39N;E@kGA z%>b3idjb5jS#1^@47~t%>^!)p*ETicXq`5rvTjaW+U}e_I1;LyJyhViU{^;qSDDXg zZB8y4%Wk`1RgWuG<+D_`wD&|R2I^`8Chz=NE93QJQwWJoo?KnsH90XX^cKyjs&t(- z7G<=0DH(5xPLiHwgVEv9&c;-fH5ys2&@s)Lu5XVj<5Qb7MBt^|f`|8@sc|$U-vpPhUuZq?Xv#lal@WeVY8K;TK7N?lQh3@*v z-kIxsZN=tpugGcaCWjzd{O(9NX|3qW1?!o{;Z^DSXl+wyT6a@O`PG_2ExrYT3Yl8n zq#m(eXGe<6R6S}tVqn`tUPP${H7htUG99K!s8NHtG_-SvgRrp zZGImkg;}CC%MAe_s*SFo&!aLEy|P>w2cK9E@5=+gtNuv!j_Pla^$o;L3Z$3JA`8gb zaD*|-fI7vIE(F~~9rsbcVj*wvKcP%AejQH40%#TYGoarK4rC+Qm; zPWUk)T~oa*p1|no7XhD(+omvS`ss4F)VhYdwqv|;M_Kto2Ai-zc`Haq7E~-xRj&jh zQXr~Bp#w#u3L4y?ewI!S<+Go*z@63?0DKZ?i?X7I?DzW3)iZ*gW%ks985Vz2(QcqX zJVp|1qE9qdo1ifG2*h)ZCOluTS?o|wOz~7CBVYghqi-A2kwglSF8Z+3yv~kICwu&U zjZ3U;cC!|VVOaw)OEJBjXVkGDXSeQOyR4-+>6~*`29jx3FEaqUvW&*-Ff`Urvc5y+ z#=AyLnYM_92egy$#$+hC_WX-h4xPt})7m@t2W+ATBw?x3tSnqeLW8KOV znc4L&lVND_@?cb*npyf)^?X;Qt2wb@=_E~lvGVuEApn7*P9y@;61T_YVxuJ9?5?Pn zLb3SR$Rt+YL{jmfBasS_Dve_I)G|ya8VI{}G&-w=v-0t<-OHuYP|&;;Hb&ILP$g)*3<>(iyRDgoq}O}3#A=8nn$>)j z$C1!L_~tl+PG|t?r6S$9%Q|$I^7n|&W;AFdfTKBII;7S{yys0>v#9c(RifSOb_8Uf z$>vLIx^>1rA>g$MR%6r`vFI1>T0u5d*m#qLv3RQ^HYRasbFQgwi^rsmTH?NhWoIf< zT++)YnD_mESb_R`-ld3kPc4DaZWDLa13ATe0=5_9f)(k*cE`F5cVF zIeNQr1IxH9IHPF?pl}@Tspa`vkrzWg8FCrC1mnsQ;qUP6=Twtab5vtM^&eJU zk1X-`t6o?AR`nOvDM%s#cq0a=EJP_**2v0-U$|RB!QQ9Z6w4TwNAlR);;b7Up zA^jdoJ0Q=;Wa62MC!MP{x-m@m^Nji-hWQasq z9$9C|ho?#}D?h$`OI3eb0#FK(gupFWnyM44R_tH#m&{C8fYi*(4W3Ih{?=KvN;Z`GK$z*OcVspS`25+2X6IYiLE)60^mNw4Y44Ip!6u zZYN=`bU9)GqG?PPDWTW-tU5Pyim|eegvF^h=!h-q_Eea-4J|=duXQ4{isAeom*2$u zZHDCdm^GC#vAo7R({57xCCRL1t=dQyRK^&el8;SW*t@x9pJU!LpEM~au60&As)QLn z?OD>`yxja}iN3);kQs2yzxLjnJ1W{ER&g3r8&9v9*TM*k1~S9V5tc+^fsVXv$jDy1 zPZq)fo6*Xcog24@yjpK(Womk3kmnY6wQmD+jZLX+SlccU*jeq2!5%W%;ugKz*Vmdf zF}!BQIVlud?at;`Hm(wyeL1%!Ua98{Vnrszu<5wpeJ{g_>0m{Lg%z##h~zgR!pB6M z(UghRXk?SisH=>)`_%EIS<9f(C}T|oS*?1+Mq=qIKvUf{L5|eNvMzf~K-nn>7M;-| z5}r4j3<77+^s!Pp6=WHM&CF>ye^Ael-yqD3@@!Ct=q_za;GKGtCK|%l4@LA4rz}k( zpNulB3s}R7q#q=p?1Ow8`Op6Za8x&TIrXt3=-39B2}OE>Yg14Y&8=aJ;1ukv6l;o2 zL-zpny}_c7b)TcBsG`BXq1>SSQ@M_PnJpk~p~-29*s64I9@u(#-)k>lxbGu>aPo@L zhJ4XKfBq{QR(G`Rd+is8Zk5OTf@Aet(`hbw>P4>bH5xxm=`7yO^?pl0h;SEB0M z3#gv?ahZBic_t1A1xxj-vhYP!ItX1%eXamejFJpc3tWZR#_&1VaA2JQE)CcvKxFA3 zQ-m)#Al#Jw8lY1!@j%-vOHgnmPV@|AkrnL;ObU8}oJKE$ibPDXanrZ;K<-RXG>nBL zOob@E3VCjDT&AHET3#$ipFn<^pn~Ijvwqff1Zf-Vsd+& zM!&_@RF~H1-P3y(_>;vT{6lrU^F}gVJNmfwHopat(cWoY35~tCbDn45EP>6>UOk?F z*E(b~v>1tS6RTzbX1>EZXgR_>HhnQ)?9ePe7BRY5678#Om8*i+y~LzP+IJi!#}O51 zk9!geXLo7@kE~@4Y45Pew>GJL{@oXkFF0p`VZG_S+k3Nf+&-6}?loUwvRfnxK}vJqiRDe| zOq5ZVrs`@DQ`D1O|Hf)fwJYKgR&tG-dSR63MXf*J=XIPZRPFbK^;TJG=$VzQ?5_@R z0zYY6m!R_nJe+|zo8tbM-lDZ{?Qd9G44bDa&rh978mEr`aDZfCU3+z43W-ip`f53s zp{+kCZCcRuOM7Nk1GAe%&KtXR7DADq-pRVsnGi8>_LfR>UuCDSo2lWM$c2}+O`0D? z-0i+}X@ikb=d068uXoJ6G&udq$43r6Br?22IFO+?ZcuK#1z9tkienH6X7xy`;%vI5HK&PQrl54Rc|ngkqOZ_axswUHcPX}V!Y0ST zG9%LrmJ~4&BA(rmy2YkP=2Mc-m0`BDj&Y){9xX^D!NR=~sU~$n<}X$8q7FU{)alW}jlm3X z@CGo(Y&g!m6a9GO;{}8u>06RQSk7OV7PQ*Za~x3gh*}bvc7~%djSN?Hu%M3K^zrN_ zp-C+OZ%qxZ;%E2E05PEj&eMo{2EHD#!t@8x4KWe|?z8+G;#A6HcI(N#?2F{_@dhqV z-ch`YpM7C`GkfW&7seZe8RWik75lmZFtZ>@GIv@!L*O~CPN-Tmr(IcyDd#1COjTA#5yJ+}5$au8=%S(z{eepj z$|L0ji9A3O2%D85aZ-9DgIJ6XSU`XPrWho0G4E@oWkx`}+SEKOU zz?b{4k)SZ*r=to3vJAD74gjV!JEfWe9XnG16P&@HGry(Jt#vR)b3kv}G2NW%Skh{c zs2D-Q-vhf~q63dWaPg?b8E$pFO4c zekAw;VTY_fa>giyk$6TQDnxu*sew5))qvUsAx|{v=zF#UX$lb7DOq$TgP6T?q_}I@ zpr1p^T?j$5>N}2ZRZ7a=m6I3pbCwY!xs4p1b?}}+>x~VQ#SWeGdvZAVSxXR9Q7v#=8cWa$s9oC4k+WzIE z`H@R40tzkb`Ghq5%ceCKT{q;7n@swE-P=|hM-)Lv{}glEx!ac4Jx{DkjI<9sD>C7_ z7PD{@_ou6ZwP`DBbi)K^jFU;ZM0ecPBU#?MPvdraq4p{doiV(I9+ST!lF2e#dATp# zk<2DdZKfU;SsqY*(kUX6V*dFiDLQRwgRu>mWZ)$MU!~z48p51FNV~D*Jatm} zu)w@Q%m7;cc3eU*x&f+CDa8I3ShG()`Q$^j$h{3)bP(8u0o7vcn)(T8-T-iM8~*bk z%5Ys!5LgIKMwmDX$dhe=8U#@XE11d$HHb=yWrMjah3=-x?rACru++g*-dDA#EkGrJ zxKLI1!gFd_uYLA~y1L`XjvXK0;U^2z-S>C#+#Z{9oAPycO08F#USjfjdO2UianI|W z=c7(;9rGB&+#!qlB_6wSM7h;!$V*-`%Lwc~KO!_2Io-V5S*IMyPX9T_)I_|tCFRloru`p3mdi0O=p6?NHsWk~KsVyDnGL}A7?IAM zRW^8SZq{wj5}wI~D1Z4^Y@V;2lST#U(9d9AOrda@I)oj-?T2WZ7lbxh;84I6UhqRDix_+6mg$6)ZX~bIyeoBATFJcn;)^fh;bfvSN4=zU6Cl#JOnd)*X2q<# zNPGIOG`aSrmrkyD=_PzW^T}V7nFxGcje6)8;qh@XYQ+}Iid@2J6{>{Bs;qT#mgS7s{dnL9d*TA9=)iQDwl1Xeqo@hXbL23*-UeCQfM+# za%XBKgL83fzgwv8>K=3i&KVd>dqsa^qyOM{7k={_Uuy|_XBRFZjW{i zr%bb3Idkpe&iZw;t-TEvlrqq0d=bB)iuvBIzrOLrr3>|*vx)YRZ(%O3yLRohecEiB zGOm2>X(X0pRMX*C0-PCg_95(|DuGI?RS=VlJRS;|0A{?tZ1SUVa>$uaCmO4!ENR0m zfL}jQ2M8FWTMBiNCqgFVa!3G2sALT`z}M3!hPoqbnPkn(`FqYkI=gAz?5WN9nBSsf zq~y%C+g8mqq#TZ*BkY#fYEmA95D8Yb*JNWlkrN~oBIdpAUUS~#S9fgb+ms7bGK@~6 zA?)nL(C(0ba{WLgIMm%@GO-S;Mqj9zb^YkH*vW^MuG2|FE7zs%^WvR}8XNT>m}alu zv1UdHv8AzeeRaa9cba9<5{SkkUSs2?l`Ge+KRCJb!1jSjerKztxyq;Eq}JN*CFjqb znKpW(nRJ!8|K&DOul71)z?W+6X82PiyURA%Jed(C%zRA^K@JJ2wSKUp+g*FbC5IQ1 z3-Uz!@Z>Ak_Nh6&XtV_FHB)BR6!)IBdgY3ZnDo!+AS6Kz6EXoRiah22R3Uc;dkRrE zbPuTxD9go#uzj0ptx%XuC@-duiiJ@ax&(9|c%vBlJSbnE&@4n5un+LwIA!s$(=Z7< z4#F?ty}Uf_w&nH^1Rta;;gToVS|w=VkHE@4jY z#k!n{bxE=G5C%gg-sGq^#rQYLuJQZE?<2cN@rE1VxeSeWvyXAz&!6(%eGm8R=kZz0 zqUz_sB7X=;Q>$vA`fwe|L9`8tmK;m!CUBTE+7Y2WpDD(+PjzB&3=sd*I&sXD^N<{Z zn%D?yBDzb7?&@CUz24C`R*{RZpWjnyw>m=|#TAolrq4Kd_RdSEwnd_De`j$|uBIw8 z^G?WzkKca$jtg(!ddFXw_e##^pC?h0DLuS5?*?=)Wr?`lxnizsMRkj3dlHqKA{J-F z(_F~+C!brz-z7H>sRRO4WfFP1B^&JB>3*YG%!MOum7}Y0U9(VDkk?{Ll0D zCF-ax9;$KY;_l$y1=DsoW0ufm9_#R^+BG;L)zyU4A%-j*N=!HToNVaUv~{6rSe>s5 zg^j(gyvZ(x`2!?qz4g>Bw>oQl);8klp=lO~h$1kb2ysi;YS+{1F;#aMY&{JH68MU8 z$K#rq%_Au%eq`uPw8fJ;(lXV3H@S~IaKEFaJ$uBurgXtA$|IN5OWHs*&p;{6lHvhd zRa15BmyGXP<=UGHCWG6ZTSxRe98Jwo6j;@_u^tDp9=8E0`6}Iklouf&lA$I`q)(#^ ziWTE!KdlT*9DN590A%Vog}Eg>1WyApb{)MEr`KWCgwYc-94|QHZFqWRh#Wk_cwlAw z1U9%GCJrh}Q@%(aO%C*ULiQINc*^(&G@_wx7Hn~tH;N){NS}KZwmn}vIPd)0YlBiW zeV?9-Sg_4BX_pUpq}O7Nw5U6R=O6D@S0rS!=LYwQ?bgZ$17FP$ zt5q=g*IOO)>U$dbbw#3at-}nQyBR?Itz`GC7jJoS7IN>n^wAE^X*aP3Bb>$-k=N>t zykJ&q6HPk1$PhVPA$SNE7_qN>u5#7xh+&GykWW@>_-0-cbVRHDmVC~~Wo#h8kjy3C zCkI)Z*T(WJc9xYP&QcSJS4ByKvV61JWrI**Y8Kq>>-Ac13I*dLUNa|5=)vbhKc9l= z2^}AyB^4)3VXXH^O z(Wm^hkNgCY2k+sdGnB`^PEL_0l(^D0leDDKL6`Eqo7o@G4ipC>1>RMhfBoy37$P4q zM3vYJS(=Rtc{8Gwa5Yk#E=55(LLz=ctO~I9cv!GamM1dh9~7f9etmn}0Xzw}-@vi-K(wv*qGC&w3A*FS&7thv{` z%6;|J5$1hjU(~zz?xnLvZ#!{B`90z0fAyseo4$Vyf=kPD^2rG3@@8b2o1|KTIWa*A zr>X-OZyin9iJxdL2+znw^+GDNA`T*&h_iU1OsB&aBff_{)x ziUO5zcw&#i4g$Xn749*Yh<~9mFPKtljwthKN)8b!8Lvyk%ft~A2h`0&%z(0FS4n+f z{8D~JSA5I4ZF@#~P%UwpHX(_K!qW3{DbDNo(lWAs6LXRF#*1V_y*W|m=~hP@MeU~j zNX(>{4-a_Nexv|UYkan@ux#vFrRBI0qvZI;oS`09#K1CaPicLg{Agtfy?m4T@aX>V zwB+VBi+#Qs(E|}dHcJkTNBNF6DGd?tz9&MZ#}toeu-@d71vL>{YnsUiOpKFdW>;qC znhFiiFjm{Vkin4d=Jo8ujzsv%T}Nv3hA@^B=I(qoBlOa^s#uZDQLsK35H&$FDprQZ zOOW`1GKs7Mc0D`uCjpU=NHam6&dlzNZSeaA=fkD!!_60W`b))6dMQn4dviUrlqfa#)RkYm8$xp5Zd&H^oR$ zYs*9@yj(qwTEW4gLUtC4B$DO8)`*px3l)j@cWv-ZL(y>ZmfuYkv_kcdY(4z4_pUK) z96WWnt7_D^Wth8lU^c(nT0D8vyMt&EeA8Go^2>fUUmN`RLtLBdZ$9_blEFDfXYoPk4?#yiOy*IU0S!vaKwJb}rY|BM*w`I9o?zjPNVAE`49AgYNozMfO1k++j z$W0*$A)#JE3n7<;z$GEZmd5Y2WcJ?plKjk~$S$%dG`G&`=1LhA; z-@d)J9T}i7?$TRU{q)hFn5)vGZ~X9%)4dIM{OIEaCXcpK zYaC5a3-DUeoNqB`ET%q_bzOhd-e-4b3S?mzVE^>iij|Eot7CH7eAG4*-*U(H+BS`X z)Wgd4qvuvVH_V%Zx~qM|zE{70eA_Cc_5rqW-Rb8)+PdNGAKtRM7AVb^KH0kN&8Kf! zRsDqDI(`G_Dq|ax))QL4oFS1n4^#pzlP$nmHTH zNRaZJAINOV#XzZT>LKXqWP}QW`H0s{G)oExo(9x&t*|2t9BCdE0(cCfDTcB>Aj*MO zrQL)^O%Y=Tb38z3;EBFTD%cCx5b+OZ_jR*c|H#JI=FDEY_<_&&Ua?zn@CDaQIkD?% z^0@lv$+1Nnmpt(KzMJ->_8UzB;3A7@u?vYR4Kxb#%~W(BY_Okf%qzrW2{P7*JG*CGevGdZ)2#U;z;<$^p0t zDm*@bH#0eWkMBqVndurHC`SMM-H4~N)X4LN;IXVK67En(Wh+1f_l z1@yT~eY4BHJP^M*k%UXp=es5j8Zn+or2d-*)-HILyHgK%^!n(*Amf(Eb!W9iJNWbS zEu4`ZZc)p3tY6hZydBnIZw!o-;9$%C9_k}_G&>f+(@$(!uQRQIMgM5rFhLSxq9XB~ zH3jXJrt#5Sby{WvLV+4vP)C)!jvQLJD^|93({1w?HPx-0JHBWNJ4gzdQ%k&>n!fw* z{^i{J8}>&t8%D36dvD|ZDUDuGj~Dkpk}3J# zl~1i({Xu8r)z1$O?3ps9qw(q&uG_dF6Q%b}zzGF8!4Ffu15%nvAg+nz67>W~`)Msf2!gC~BW5``&~5aWAqEt}%8ifmRG5_7nO5)z zcygz>i7(-PqNJm%se$DDY29>d+!wL{Rl?V7nbPr_gHA8tNg7d;-=P1&OhvLg^7S?O zill&lO|cnt&YmWJS(Ukb$;;}?>I3Qi|J1tYB0!P>-J4~EV{ff&&+1wnaXpyS{+%^J0 zK6z!QwyPJly03Ph-{i^jTJ$39Iu7%m;(T9$eCL6|ZiHtQ?S@XI0f_8er@tNgJDLP- zSz*CWw)?62LgUNyk03JxIT;a}n-Tk$ZFb&+*IqquOv$%LOiE*Aps%$LIk(}BwTGU? z*4T<8*FJdSv0JyqTVsJf)R$lR{k`ljUVi)Sm*0JNeBJ41o;m&W(*ob#I#>Nb6GFjO z)~bY)4K4GBH>zK6Xm7!``oXqI?KNdvV(Vv2zWq;cKlIRsRg-JRU-;yuFTZ^0hcDm$ zt6$wt#{`>m5My~W#siIJLeeI!nvpUhX%WpjR;Hig>Z;Q3W{eA7N>(||J1-t+1g7vAZ3ywZ*Kl)_q zpiggDpE{Vj`a%2A`-ko8o&2SPgX)J;(2SP0D4}FS{o>{8)bs1xTcgQ(^~0@QZB?b) zV(X?)KKze2AG&|T+DTQQ7xW#?kfTWI$L+C6|a zpyMV;Xqj<3x@i5!NKh0g1v{<$TOr1;y!q%!HKzVm{R@*MZ{Kp$Etl`PX3t^uo12au zJ4S>Xue|Ci^_zD1^v%S|KE@>D$u@P_yrRN~9|jleuO4~0AccqkMY;d~aN#02nvJc3 zmpzRKXlwq@S6beXbTRF}XId|u{y$!XIp>{1>rwnuAHFA=pYQWJ9C`VxiKx^1eI=<$&4ndy zpH5FssAomQUBZF#8n4f0)NsBZg6r=ajHOH9j<#Sl6`)14oe2O)#zHen(W+U3;ZP|y zvCI+}&Iyy91}JkJ;wAOu*q!60`BfJ8s&_9VzxTJ?S96Ssj!ha;4-b;Zo4@?YtUnap zz|_7r_QTf*XK?nDbd>dsJ))juUX2f}Nq<6q*6^7jUn#$7{9WeJ)Kj=V`-jT#`5w~x z8r%8W*izGmNxtdoFQbq(QME{X7e3o0a*7tKr@1KTsk5ix4F}h(7J3Jz9Qn=Hy!#t5zn)eeF?FWH)P0l7B@g57KL^CwM?%mX~?J> z?2!}*H0(U@RhOBPT-?fcLynoeR&Aj%mt3D)j&i}7@z>S$#yrV|rLc^j0PNQCU6 z?`a$;qeJ!09`xyBkPrXD!$PA{|NH0>mz+Pzg)aVqzVf>+>?Ti-vD3%c{)^vyo#kI) zFa7;e2D0`Tm^`PTax*lQ>^e_15o~Zg5}K&iMNR678idq}%=*hnMH>A;^D+DcO#8qU zQe+ODoLN>bcH)DGoWp?NVm5}yloK$u0R!tZwFo*+J+7YGvhl|~4WHM8eVFYvwVLvS zEv9FRY7g91)N#e6(8j|n2V7ek7tc-=l#V%u2NmN0Z#5cwt7e#3P2Rvv?}&HL>x)L3 z6*iB}dq91A&z%kzyD22t1;-pmOB-U3NAIj1+fS}n{OMJr<2;qj>W_7Tg_mV&l~Cpv5=j4kAJ!oNaCCdRfM zEZlT_!}7w@zkc|;i{xY-F_cFE{!Sq-BAAx~zc)Md_~Yu}nKN%Z{`jkpKhE-@NQGOU z7fLs0f1kSH-X8~T>I=(WAFay``e7QF1^vEL@%7gXTQ6` z@6Vi3w^kMuAg%SkLh;Duc}q#&jY`@TwQKUY^N)GY(0?aMBDW>%7L5A#u-oiHS=^HA zF2CtsLHoijc{dkDGc@dm#Cu*>P_uTXFZ^8gL-a}gb+QT6pTVoO5&|HLETYHgavP@8 z@yz5jVm!Zy@vP)n(S}BnL%mKxFm>=ox|t5f`I<~3eHUINJ&& zetn{@M$4}yHqKOW-7q|F{PPcH_s{5M2k<+Zlhxay7r|sO6j9tO}Slu_? ztKLE8F+Vswrlvmql)Og!`F>!i1~9hWV1R@V2=|LrSUy6RCQ7C9txWwk0SAK+M=~)g zC~`zFo=_P~M=B@Kx+}}teyA>2)E(y8RhEit+*>@(iaGGhjDKG=Xk@nJTyg$G`ASCl zgye><2sNpHZvq8I{?qx34;nMV@D{ar^NC%`qJMs*Ez5Pv{eLQXskmhRVW$$f*vSgO zSa`O&-HSYYh(B~|{*(EG>b^nXo14xz?fi*-a<-j_2iymL1Qtt^^}y#43%yyp1G$kf z_9UeBfeIWi@TztHjIrwt9^q~Fw(+4rXJC90_pH_J;nmy5RxtPLD)gj)x9IIGqtmG) z7i-o1W;5Bwy=;?Y&+)NE+$%2Egb#Elun>Ltw!h^39ehM!QY7HaqoW={BpMTnX5A!M z{2@IdWRZr5Y5c!53AiEbVG=?7qD}P_7y*4cjx|f5O2dR+3009cGp>qr5!K7SVgkb3 zknyu#>Xg7nS#$!7Z21Iin-5FAb(air3hP$^Rts0Xfu2Z?v4HCTB02d-!z(eLEUzX z*5~jz+}f+icBbn1z_zuic{Ya~1P;ccux4N>$HIldgR@w#p^-i-=b+p@L=(7tnyUyL z8coL*83yWz$yHhtZPx)O0py`u%S(%%UVH1${frR-aTgMfIH*t#qg!A3#&#XJhk0Dq zn`!IIvs-zCzPy3W3)sy5;dQySk#u!&p-Cw3oE~R94#r&8D!Z*wQ=ztuZJsR2oww?1 zfDPm{MsUGOl0ni+?82C!*J~(Q0ur4#g)tP+^u&>2$J&swu&Hq1;%dHLZkc3~n0eNw z>VPMq*BE_QSPT6%iQL&sax0JJ=^!SPQqw*C?VUmonL0&EfyQO}CeGn;8#%+_lQ-ly zF1mhb0iT~FV5JG@CjD|$>IoC#VwlpP#;Ox~mhE0^EicU22aaTv!h&LLC}t3ePJ`&E zPGiG#03wJrF_tAgYsrk4D^rqV@e>ZPAb42&jPefO=9?4%Jhd9L7Ug&1H8oL=VGSm2 z^^v<<60?g63-ytbTaTAi?{7{{f+i=Y%58HVtM~oClX@&m=e^GgDV%47gX&< z1i>di9i;RyEF)M&k#c&N&K2sI`u2DQVM7Spg_xhVl9ME(C2LA@Q$bZ*V2kOEPMy-D z9+5N7(n8))TR5ItlnR?UyS7pVC9V)`bq=V_Q>xN2vg4=ZvDeu!F2E0u)iO_yo!O8J zxP&A~c5ToZ+-BWTyKI^qa8*{?O=(@ZHZQt2wZSw!UTV}jEr zQ7D#`S-Fi|?+FwvJQSdtC+ttvF!^*W#W~qe$DA}S*RGxxD#6kl#>2tB#=bIE1px4$ z>EF)rE;56*83F$43do#x@NwkCFw^1qg69e%n6AzU8dJUvM49X0i>1>Us0dI`QkeiJ zIpjH&)mdSZ0s8^<)MoLWh(uG1lhV}!PYg~NH1~vD;$A9nAs9Sz_U7$Vb49Oz`85x` z`1*ftctHK#J9{<8PycJ}RsP(v!QSQm;8d%`8Pc;V!i&JqV$Jg|-*g;KLf(|$461)) z0yHM}BwAXre({AxDJ}Q<%A5#}1ZA(o!xznJf7RB1bN=#{f20D&$mora{N&f~ty=rj zdk)O45&rM6ZHdki|gR$99gDJ#J$-_IXCUdB@>O3qy9b$0^G=D-f{g)e%8w8QV3s%c2uTUPX?bQ9mv-Ut9Eg%ebsw z=`J&leTg`9nVVeBe4WkZAURs#B9p=i8XvPzdI>1o5QkY*5240lmK!PSSfzaf_W=6J z=E$Z@VP6cR2f-^ZhQT~WRYAyZkUP?nWDzV7SZQ#daCa9-Ow^(L(uCZST%+hH$TgX! zrc3(F0C5^c3?!4#zpgw4*zGpw(n@m(*#OEn^ogTQ>G0?>Bn=MknVp zIyAPyF8}zod==9lamPxvOeA~h@_8=Q6;l<5!@Zz1-B44IUKqgvhCInD9NX49#ki%l zrc0xoQykqpOv-^Ov&mM{q{GE;#p4A&V07rPplS>n+ssK(W`iE9Hh)RYc~`@;e+I`) z7kp|~1>Lso+53 zS_mFuAsP|rC&dsJFpyVe_evdU`c^z5#M#$2&D!R+?vEr7l~q(aGpVIR&PV%}@l5!y zVUt5bwS?boo^i_pp>o-^lLsE!XRrM8<Rlue>|L~daFo|uoV zP8|}#A;h>NNom0dLuTAG&~wxJ9<8Zp+w@Hbbo|h<=`&7m>Ufb@P5tv02g91&zLNCv zCXI+FFe4d}zcq*DOeRJ$8MT8v%?{B7sl0&GUp);ORFKmI5AaOHem3P?nR74N7)w7~ zQds|?YJ6v0&`pyqpQiNLL>|Krkw4%8V^m_qBJl0ev$IMeHrf9%`#>)OIc%qxfCzew zmio#T&xnHoie3weR1QZt?t=#*LAj5GK_i#IV0+Oz*XqfJM_pwSKpI~MXR3SihDXn z=gsmrn!7YQcKyiojT`%?Z{Ez#nYLlmy&E@9&ns%^S>4-P!D^(j&8Y^`vw8}dlF^XI z%44ze_}KF#57*I?MU39cSV_=MtU87)(p!j33Wo0dQ2oa-=6mWtKD={KD3~{*(aal( zRV=)cPZ`p#nxZY2t!Y>F1wqE5J7V1rR$bkG>k%EU!uYGVZQfQ?<1IE63d7r~$K{Rp zZrU_$8Xma6dpGrKCY5j%xGOxN#EYi0nC@h{!x7ihj!4Auv`cOC9@SagCf&hHkIg)wc{mm%sGaOB=wUF&lGeD|*<^VunCPv%6Rxbxo5 zkAW%=*&iK@ABonTH|-GdgV7{Dbde*r#2Q20SqsD5vnJeNV~}#Vi>zK z{-@m8*21*K;;4y4g1!jj4pdE^vL=Re@?^JWHp7zfb1@ewHC5zh^_3hyVu26mO9zge0F`$6L(rozM9_ zk{j5SZ*gX>G%wGn5n1i}jUczP+szywO5HRG^kIGtXW~3aO&vHe`I?e~mbuSu*|YeE z3!4x2-8MhrwNU15iPJNGmW!D0#k9?7*=}@dJz{{3B!Ys@Cb%tSgXK-7f=lXrQGt4? z(fnWmK4EUFX`UIDbhdQbVM&!vji!^j)FTYcDL!W**635PPdgB~UWDi$Py-Xz5*mZ2 z(9SIHW;xhWD5?Y_IBlBn4WdD*9uuRqoKS1vRH3X7*=`XcCbTmjq9DDp3L3VKN2uOO z(DP{;!a$BQOf4|;#E^H%BiB+aZ7c}q-PjP5)Vb2?<7@Dub#)w$CUcuCUX9MqH30u} zxPvw7IdZ48=J;xf+&OVVa^i#w4|0>>P4tYvE5+HcJpPVVGINvEWfJ3+TJt00BkBx8 zB(F_k^T-_+pCWhU&gmix^A9yP#3E+Pf16`d)~uPL2^#*}rA;QAIu1oGLkLz>5?*0k%8fff5olD?{> z>jer;!5?rt+FJ_@TL8Ea@B>i{6R}1n3LRlbh=8jIu0i-W2z|{KPYU5QY=`s=zH9t3 zi4m8Q>(~x}UB92*KHNM07$aVW{j;#se+Espt@*Q8gyHeCmh9<0A~Q^G8n=x6UH)!jsNEQ7FNRMP(%<~T4Pv}b~3z9B(nFSJs@VLO!0U$&e{UMsNRotgJC$r=d=0tFXYT7d%6O;=AD3&}get=#wyF_vPU9y))!61S3G6J%m zy|W$6Fsrd!z^ni>bpxkM#!C`Wb*>E8#pJSFMP}q!VNc;jP7b*u;HI?tYV(V<)}$=6 zqEQ0Nga?3BMs#`d>6oOkx4WRjBw)`kf-K`tk7FWA~3InH^&fzWF9Q9hE!xvID1-@z<1(KUSEO zLS7-S;FW#~$JDA6JLApqJX{Em$teWsj zO&B0ptguCwFLR8R+@td#gDGJp6^umyfSP2oiXSvW=ynvOg#to$F$Wa@BUBYnbJP}v zC0c>WM*UvOh27!GIew@-rRo`V(i`d*+BR3dHbf4S;c%;BAHD5r$2y011NS%W zg*{&tQwv-)D7SKw4OM_`tN9Pr$27vwEr8Rt`W5<+KKo5R658 z_Or%s&!Qo1{;p(cMI^tZa_l@yJ!>3sE_FD29gL#vkPJ$J!YYdLxyhtdX*H5*y-Sd; zMlBPKMsvTkOjBl*dDCrLQ7h>L9cv`8ni~ZT!eDuN85bDlgu?Udg-As#Tv(JJF0wLk z!piIn_0#|bCLv~Q&?Fy7Vh-sgyqW~TM4lZW3kER1+1E8EA4Y*QW5QcvtI@Tx2!3e{ z2JN`lBd>1DQcN(_#F~8ue8SzVSQtZy|ka`E$F@5$|2qBc%7QPmR{E zJ^lRqe|`V?(`y?V=;r3l?>~Fny2k$=X>T7MY3*317L1RuCRy(9uP3jE68)S^=P>mf zO~@BNxD$KOBEXqI2cZxFJQ$cqK?=h&n(JZoqcH%}<0$eGjxj0#(MoX&)QML`zRjynflKUp4->ewePtPh;(qnAD+c6)~&hix%W430jhCL zZND?R{)F{a_58+jYq$;PHf?;7z6is!XXM_tdbI9WUtL2lu(zvgFTDV<6N&EKRln}k zbMI~3_}+7;*45*3&%VFq`Nx%8S0hVL?cDg2jhkLv%WpVGU+C`y>%BT80)PWu`dUa( z>I=yVmN2#Kvn5!d`=aBay4k@F4@DU+a0nEpf+8xQF;f>fz=?1RAifJZLkVW^2UQs} ziMCkQk(GT)!~Ue#D*NA~6uLt5Eh2HeQjb?fsrZ)cI6O-+JIr1QrO;WX+u_$$e)dn- z9H(SS{@}8E>byfERu0JzR!MP(JT0@gbT(gmd8eV(uwd%+5e+8>oV>N&TXVmNr z+qBW#Kt+!()u|7F8WQy6h^_NA;keNeg>Tj(v6wVd{jz-7PJNRYwd;rOQa+lQoZaU~ z_5sg1tZt4OomZ345AjwWT*h(|eA6|A9gpXgXi(|TVwG(3hr70|neIY@Bq!;cr@O!x z;fnd^rg}+hug)Kpjn0y`@~tlfmJge~F+oa%uZ$EtQ&j+UA;IM{(?_2#UYd z>p?e`v~b1XEXW~bI`qH?(KjCKQ1OL7JuFDHuLWj1b;FuM!h=ZO5p+^&)yf-Mb}W7U z$UPfBY5&Ex+h@-rN69i_D2{SoH;t~Sbs1}?Tt{NFhlkhvhWi8Udp+5JSj`Q>>YU}s z!8x1r^PIPGzCj|8jP%L^QiUoC3&=`*GxYTd{vn#A2x(xi&w6;MmWNC@gc?Cy3IBqg z3rE6{Jd%Rbf)i6Ll5vprLre|TMHM_;ej@3Pnq&~fnKV8? z#{w2AnkPkhgD`AF+y_3JbtTb=4hAD?lw)ZFgX4F*b{aqlFf?CYkMT>*LR^r3oP{?* zq*fwADGa_Dw5K$M5+6i6QUZ}|9xN_OcUiC~arj*hu*2yQpuy$R843=<_@qW6WmbZZ zw*sRac|ibYVhP1NkdA*@{7h4-448Pv6_+%{g$be`;PkPw;u3ubDD~WmTDQNcMqwmD z@i`5ah^G*Ah%6~p3QSR(8`NbwTW-)ky{=kjYB;A^LS(MQm0n*bDPbgRJ z`Sn$nSiZenXznygB9<4o+Z(f_qV^z*N_|#E)@eb16<*_O8`0}ZBVd5YE4Q`1&@_LV zh4^cuR%^c9QuM$*dN(H~lQCMYBlYZsR`RkVnCCEainUF)1=u`}i@TJt6d!+U z&DKEmwfD+8MzW_Wf9W>j#}yj17ExF#PUZT?0lD@L8(nch_6 zPwJ6S%H{cWC82z;ld}bF29f?WL8EBQ_2s25PVw4O!S_y?DhrC^Izuv0>Weibs=d*H zj#)8JCZ4u+4g?wAA_v*vrq=S(fk;RW#F4SpJI4bKH-b`D;5ygqW*@R>w8r9anU~2l zDpf-52(jG|=_=M4EJ(`g?s=K$u)xbcI|CX6<5jv?IOt+IM1=Hum&L`p3sW9D${@<3 zJA$MP))WZakxwvSR17eQBak=NAO5j7M?UwT_@qbZ)%^)u(K}TqhDYY50m4QCMEG56)<3 z9G7ywU!3eDR$Dkv%Y70mDmCPm6jmcw3Txph)SWIwPJan$11sb#vXD^Zon6c#f+*=D z{ZHi+bOJibutsJNAV(6C3bO}OI+GP1kR^~Dbn4L$(U1}i(qdI8kKiC+u674j%!&-O zFk0#r8U=k9Psk!D!&Tt*q}Q=wp#c~k{sFwwQ)!qKawSW` z&?s{6QEVN|_jniS4kUu_1Y#cwIxst#^3phqmo(nY{#rZIm`qsnCccM2!qIoY6?qAK zjw!7%6HNs?8sgOlZqGMaM6=*Gcx`?|W|{0m`pFA7@L@0viq`oc0rUBUqo?>zD+0I* zgQ}hy-e^Qf7R2}%;W%i}hTLAxzzwq|?vLv@(`lmPL0D*JLtu1d5JTj!X9v+5lC0g) z2Tqw=&1*RWJ6~<6lf!8<#?Sw6MT#1C4=TpM0|etsod=yDQHtXc^wA zVckkDXG38?-Y5_!?z>EH)CScHZ2}5o2V6#{zP6gLH(P@;>XxUXQ;S=Cf@t8B-n7$a zk4Q#H5ODdEGu9jOUMPBmL*c-1U-4o?DwumG>j1}C*dNqrTqe-Ff~Se~Ct4@#%XE{f z|K7yAMDS_@jPudjkul05059y4Pt$|GjjmgG81AY71&c)Yc7^m0nm8#-q zPH#8*cuibhajL_a>lKVPG0r8GdP5wiR((_>hdo+9Vn7_Y%#=dA*8}m2@f0YuODIXh zU`^oUqIK@DfuUu*MWgSy0jY12_>Bs@gvh9WM*V2cJ=7Ic4DekrM&n1!3Z8ciSm3X; z1;UQ8O(dzlN#Y2Mp9K>LVXx7IYII3dyVqz;#sCn=@DIe`BcyudrdA25OCAt|Ntr+8tRmZnjWa)~ui+238wV z*XU|3z>|ygTqSy@>^FNJt4E)&6-w2&(58%;>Huz)*;E>Z!lo)!r%hecgY>{c5@1ifAQf5L{O z0wgQ)xZg-NS^b4;$UW?DR{zmbxJ5F9n3bX~cxzHg{!pWJt!|xR?X*o#$jXeOaNH^f zWE7&N6?7C{8dnnGO1&l+EA8&ZJzDJg@HMBVZw&;>Bz83BA;5_`1%*Uf3T?8CbG$RG7ao2?E8#Aa3dc)r;Z9=f7;X!9 z43T9+!(Dd_GaQ!-Bn5g(C))b0(S6bM8|j(qoinX8?Fg~y@9g3yumj;W~YEDtNADAdK7UUq1#pW~kXDi~fx<#j9nyX-w} zzcZ^=y;M9z{X2xh%E_)FD$>bb{j9M$K2UaXhdlU{!%xEAmXlTu53PCJD zm{6&JD3M8A^9?A78Ns;o%%3)2`{5Pp+wi?Op4hhXM&|s*HQW)`qq8%iEkD~=ZL#0| z&GqWLoJ^iwU=D8DtyS(HRo|N!KM%k!6{4tMiQ(~mpkt%YtC*wAQL+jslVSA>Ji@fc+WGZUbQH6!GP-i)mCXxF4s4eKQA@mG1brI+j z(pi!+jeN1c*1|& zv7lngY6OhmSA&Bm2M15`xuw(B)s6kvz>ygoS@iHDOkn&MdiCpFy9QcVTf^Wl$A`(G z6YH*DUtYWV_$uY*p_6A$B2){%;UZPcGQkr0dJ2OWewJydk^V@_t3RU*)tY`4+nfd+uFlEF1pN1x~v zE-(9U_P9*mm(9sav%0^&9aWe$cDXw$k9Rf}=O?so_9WT%>Y88Qu|hU{bYFjP*xF&c z_amdywD;WlcyRFEt(~1)?;V_T@777%es#DgrrqYxON6$Gc@AfMuQMKZ?iGeH@m0TU zRevEFt>Voc^2jW5L=X)r}P{ec@CzJz06JeAnzz`V-2bPvWsEGLuol))`j z>PH$?R-MjNV4MnK3LXVibAoTcf%Vt!s7GcP3-bk8^a&P=Ce2)pp#~}VRW#k5;JnUv zmYOq44RfR>5t?mJ4Y8cj6n5w4X8aXjs&50<{mvJe2qG5VBK_{VrAs>d>VDS3P5x{TCl?se=!Z5m|&zmM`eEwmM8fUdb=)D*{2k zv1elym)<(ysH>b_wZsD*;_k{ahlf$EYRT&FweXXVEhjI}-B+gfisH|I&By`c9=b;G zIXl#a;$C4D@JmT}PrFg22_6&p15EHhBtimA8P=GtXB^ORurA<-LT`Z*V@k87bPRpF zk7y`8@GoZ+Q<{ZPobr`W;3(YtA&e^MI8age6OC)@M5c7wNZFXCYF?EWOFfyip`KqZ z=X$_vtAT#XhjXWOcmLbIr}F=GU|RS1E#o8Zs9pdWIs|6%R4r5Qj-bW>_KY@RDbumJ z@tcn;=U01prgZv98H5d~Ur{YyconQQMq6pUDIer9rQ~L4oMxjf-C)XZhl!siH~-uF zCx|OnXmuBq+gt{YxDqL=ue1v3xo9e^u_qxTi)s9Z)=)v(LRim=4ibYYCX@o#E*v3i zK$x-l7rKI`&e<~tyW3LwN7c=$lN@|r@sw5dO<%QkMgNrY61T!tUpRk^yVzR1{)%O- zEhCq2EULK3-^7hoggZAZT{We&Wb(?z8@s?`ft;sH$b4k^FX8*T0leOr_vkcQQY%}^ z1U@A!140DOD%gG0msysf{-}Bu9BFWS!4AY*5WrMl%Cy z362hhO;hUY{esdr-#!)GAfn(4B>(}HF#v*@szytyPzfyGYRD9oX!U|87PhgRCulGl z5r`+Y_Ls0N)i1l3t54fBl6m9&1ZgRiij7 zG zrKxU4MLzu21Ti)E8wk)-h!>Fv<$nI(C%X4958xH_l_ujjen5G}>o_g@s z15>9SV07B?V&>iNp7=jv@7MqP5Ek6Ke|qaZ=f9YCb#L#1zPEp>K$DV!pWn%qy-+b;IehcEUmt@G?bC@?BK*9{??4*2iG)j~GgI+@ostodj zvbNF$NS7K=4mc1d4n?vySJuZe@u5U{Hfswf#lru?<3*P)_TP3zAr>l+Aj*MrjIoNc zphz#24x0G#Z?V8|0gj{1Rqu=ygPSiW$zUJvk3EcfZW zXo2&)(uqw-lvPC2j4g)V$9B*(^?RX7xNb_{jdQE|U4X`r?tA#jARN zM!Im<{$Q}Wr?mL%sY~ZCU$kr271v(2a^=W^Ra0EmvpO~}y>iEq6PvGCx~_X_6WelN z)2>B}hL=utHBDVOxb%v3r;qHodfw)aS=FvN^M_WgTsdkhDVj8?sHiwKY4W^rS4mN4 z7v1UVEGcpwdt}DIAySlzKd|+9(lqjBlukY{C(E9-#rJD&3x z@=&m@Ay7tD2bjB_3sM~nsTGO#dCWTe7w0QLcT5j8B&*-j%jpHH06iREE=2qR zW2ns9&Cflo(Oz9?sxr1HezU$?TQHO`83KA_rUF!KG(Zr~ydCk&>g%UW+dkNAcZT7P zw%K(`rLz0Oji9_hBHZPZQ)dc*H<-G1_Ohy`A-_AnR?@QXo2D9xKCqJfddUv0&7tVb zh=*t!3`;LwHna#l$DrO&I4!EaN^*rRknSd*hh-r9m;t* z)g`G*6T!1@-5vnB&~+W_1s0up2_D36{RRL$MQA1pLX4DH9rnV zJ&xF<=!vMDXYDrB{l{#O>~OZ4pqE7vHTe21~~+E+9~y?Utj$@`LI zxM>B*bq_oL_XN7`%6)rpc~hwQAjSyNsq01pLBer(UnocO?8JSCv@ zo9s&Gnf1#Xt~^Wz50LN*^=~UCV%-yQT@hTGH&J(NYjQ5_eKs7PFs_U?}sKE~3ymkNogDtTi-~6*zi~QAenr1-=zj-w8+_m`U^xSTD97ur3Ew zqwEeP1p{&djYP4@9NoeO!MWI`{*o+AnGCObILN$c?p?Nh>-rgCUB%38Z9_d{+uT~_ zN#?%sS>s**_SU=}cCSk}-e~DvvU$U*{*t<-m-9DtEM3}x$A!DETe|eRCF~d(xX_&4 z1RehFZ7nMr+~(%hS8N@fmM$LKmRmq_#s^4F^NL2-#Np|sq?p~CTiCv`#;Gr#w!O1| z|BQnBmt?OXExm4d__~WW^+7V7Thc+=mo9B59gz1FCxBX)LLIh5AfvLl6CUl5eLQ$! zIy1oEe_?=~N2>-3b>n}0Wc-sy$3MZjM@zpO64*L$(6TK^cu|!k~bfN#z06CwUA~7G5ZN1b-NhY!(JXTc09W zvdtd{2s{heD2rw{%5f=1x2)6euI)aZn`^4RZ%VB<*tv94V{v`=?mdImq<-YUP2am} zRlvV;|M!kwwY;9Gp1XHXcYSGRX3|c3!R~oiUD0Y*kc3{?e{hzSGrG024o<~Vp4hZw z-4TV;Id(prYHgn1)HJrKu%&5!b2HoI07O_Zjcst6%y<=s+e-o&)7w_ms3KO&Zw(c} z()RY!qGtXLXXCQV&#ajHqxXjcG%fWgFsKiZKD8ymnfgM{t|Sy;l5sP{tBQRXNysz2g=Zl=*24fwd< zIsGbO?BBd)^9f+~b{ZrJ&M@4UCT9}v>j~Uf0jiT$=FG}jfc%3sIoHq`j97OTI*E0N z=R_nGWB6drLL@9x5eJwT+|WGC97N}7&LmF8+=e8CVMGTFhD>(w;FSfXaRQvt4$yvN zpWsPP+vxZcxP+KMBA%Vp^45;t%lAJ%ckbf{whh#SfY?%AR2jGPf~R)Q;pf%!cc`oX zFtEK1`1pd(E_Y*NWZvOc?(5FhBXc7cUz>8>NT<^~uzlaPTNk;KKi$!N^`ZuIWY&(o z2RAQp#-4ir^yvEAM%m6&qocQts{Q>1@wn=&n0(dH@cuP3_TRX$BtESE<-qH|J)r(& zxE&;5_QtA?(nz?xxvAV_(gYSSJAUMmzB#9#`Tp}icwzA4iwpnbCyy^#{f`$<7d)_c z*OroKCKD~)ysKF#nze1;jaN+fnd?UZkj|m-qOhdS5fmvG!{r%dU zTTqz=*sBaY$SD6#*B+XmK^Gs`PgJGP=5u3#$!dWVIYIS8q@6;&OjJ-k0Ouj^A03G< z%fzzkWY*Gz#t$8zvPPkXCCx5?nVXdue!mR-Yl}&$r5~v8T^{rLSUdLG!#wY24__@6&S0B&e(ta;PlYzMM$0 zc#+W;H#iOEfYplnTvAbCQgHVal&|OR?JA$LyG@S8qE^zQxs$s`GjaJyGM#c`)bgzBk^fpCKEHxEpf?L1B`m zEhb-QW8<#Yg8@-yYhLtbNAK2XG@JX8)eJpKp}Gc*wdm21ISL{W&$t4HfwTN+TkcC$J_Hme88 z>G8a~S|&Yki+bCu$JYzP=X2Q5myI=5b$5<^apzHT$BlR;IngU-?>RK~#anMt`S%@1 zosm{J$;K=uJhOB>Qp`D3f3iMIIxqlhGr?<1H6O?|@k0C7`{wR?b@S#|cg?LvhJG$i{>VAj!_hi zrk(;vYjr>O(O~Ozd!!M^a9`&k!?ao13Vn@)f)*R#2(JD3mC37GB@ArKi2B zFEw+6YkAYHHAb!@Z=k*h)Ph322^nB5BSsFnvZCU%X-uvQZ}A?JLu2oA7+Xu+_fDI+ z**ofU;0!VBl>tNNttNxHuCBuv=`$8317Q098&IJOObkm?wg5Nr!u2t0aJ$Dmpo z2MYtL103Fd=+b(?@`0M5iY!H5u)gdPKv@d&32US1VfgUbIb;f{y7=74T}MAxH(q<$ zcJ;2u)K@;(J@VWbv-6bt{%>~t{in?Hf}^>%t1M=Vq|&9Sh%7S=5v{!Sib;FUez5*^ zRv&U(Ek2(ty}76_AnMI}en;Eo-~Y|J8^#x?YZ1fLz4f+j`wu?Zx$ZaLzxEOi2z@o(wa2yVy ziIIjuX0vB)w``=CwjKWHs0^cWBZA0uCro$Y{YP*vYjR_J!f;2$K)ONA^awy_HY*^< z37F>S82pEvrrT7xL$CnpVE?n5HTdzKf$A0IW#x%7X!ERyqT|poa4z1W_b4FDkbotL z4LYjJ@%b!hvpfT+ZZMMS${ZPLRT+B9hz zB!lLXJx~K?RD3V6GDzpF$VAE!9L1`IDo7wHgxZS#Xb^}m8f43g3EFPhrxOrI0@RA2 zZ&L?Ssl$dS3zD!Xc*t%OkTOlPrLl(q5^Yxsz(ae`#z(-4dM_vj5|bKVgJ??jSI{4V z%cbBbPtdSGQg`VKkN_dLs{l;Q-a0}th{?eCfM~$|Wsr(WZ_GxK%k<;8xeRUvU}o6I zz}wJv6vH^5jtCRdC9|T0&I5aNLZ1$!FxAJ!M6Zpm&Ta!fKk8_(g5p? z;chH7fGh#gc|jv>g$sq(xE;6*%HzlZOFSQ*3prx&<;ieoSa~E+^CW4tVaLyF!Wua! z13o9#$pP5TKGBQ>G10Fz!W)Cz0z;-;DjVFmtr`QUjd5*xNr2uck>ON8O*GtVz{-lC zB`B3~ujVprrRD6s%C#DeJjijd$Td0x&Q-EEiS4zrO>`InH8M{2TlM|`z72OJM-Bd@ zjGK}1Td)9t&sLN<1tADOulI@gHL@S4B@~TYv>?EriWnja!o?b`y~f}Ik@R?NV16p? z50=>I72tq2vH`0u8bGXDmRLs9ft$d!97au^&*QK3-t>E^q}-4;%vPdJx9+rZ8`R(U zlrjqg{eiIusrSh5T)X)50)J1;KuBg@W8dI}`J z{5q-pG-*Y}Mi7g7bB*K5_?@v-Jf7m-iKk*Qhbua^gzm=3vq7IL67<>w%rOT&5ahSk z$pBtx>=W%I15@ckt0=S+A_jd*v2r|kwyeCyV@z5DG82U4(4avigGQ533?7Y1FLSb% zv!q22vULcBk6@jZ&@B?e16GV3gNt^bGU(HKk@j6;1gnP6rfBev4eqsMKೡYqP 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

  • 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ȱhG*M1YZawCXl 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

    OI4UspGlT`!HM`DynNuYOccjItN8K7 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%0DYGyyLDBYrlD)+lJnAc~r^Fy(i8uI7C8A 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

    VfO$nqU4!!FTk$dEW_FNDe(t8|UM?)*ksU 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

    GcvbsWmz>ZW@ga6d*)mb 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�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

    (e+lw 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

    !HP0N%%ET8XP-BMb%N=h1>W-?!$RG&83Bm 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

    {HyL4{(^wGxH5z4Tf3d^GV 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�TH(s!c?arq93~mhue>KilAQZpMX#J`vEXiSd~VI zxIHpHlQ~)JAgv}heR{#n%_~rQU7DVlkv{J6$2aAt78cCh@;KBJWyeVW0MucBJZ4dI z`uNU&xfd2K#rF0-C!HHKqj<^UqN1-BPe@NsU&4!}=_3RD)5g`-ZpuqLF=JEh3M4t~ z7%`Y$TCq7lZF<41%`0lhrO8h#!`xe!EiWt#T|9omg!DykFTw>TNYmYMy(LA3-YT!q zU~aU8-8BF!E=JhUMF^V!n}H_Gkl6tRjFJ-_1){ak$1s5+5ke>O+wr!@1Ept{&ss&2 z!4#2eZ8aU$vE&VlWzFuMgM-OG7(Ce1oi)Khh9A7XO?_WmtQH)ShfS(ccu;I?P`mgC z9~D&EcJm#1Xq#ky;qk(X*1(3g^s>p%!J8ha~<3I@QC35UPY(}0BiU)wK( zeU!gFzAfX(L~M8vV(!A605~rq5lJ4Yt!1v+4X@R*nMxWutox?6?H2#}4m-50Xl!gd zymjk2sP<=KgKaOc*D`B5FEzBkwsmV|121i`eNA6n%fDKGB@cxs#fa3V)UqY_9}joe zqtY8!uCU>GSFRvadjt4kgndx#*&1oG`r^y$*yaZNJdz(;AU`DGtdvD00!1(q0*Hza zL0&u97~$YGyKCU_HTs9cgG1?)G7TK=?crk$k{rXedF0K5fM3Bk5I7R6kaq&crgQ@S z9R-~G(W7rqD23tcC~<&W)jE5;)$!egQk_A()A>S+6oQIO*N=9D;X8DWZvbr-LI?1| z)`T?zq>wWM0xdWptZ{URV?)tNMiza2-rHmlgZ%}D^CXwbwcA$Ij!m66?^_^Z&3S@< z$Ls-&28cBMb-q?PU$bO*+V~ZsC zPCS9Pk!o7R-P7ah0i~i#+o+y-WA0U z6h!_VWR1T<=XFE0>O@grq({^Nz}sliI9mA&7Xw&_cuMOQqPbb<0`3ES#>on`p(6o8 zPEW*<62#OaQMKX&l1H2@>M;W`%sm@PZI5Kd#8yhf#va-A{FJG>n(=9?R&Db)K36_( zY2So|?2dYE;Mn&nX6KI{<~u&l!>AjrTlm9M{$6fRXH2YFbmr{8-T056UMxzH-FDWm zn~<@yzJAy4`ud$2>Fev+-pYNkF)^|GDz!0Fr#!#wXtrPI_Ejs#kAGQPS-Hb+QbIys z(}gK>4j-5`K7NpcR%h@`%6WXLbKjz|3&zfvS+TKZQPP;~Neu;aS#?wtN-fMj9EG35 zvrF^yqL7-Skr0PatfQKV*05zk%7OEO@^P4zr_stg3Q^sp7&{`YFrv_O&Q*2*R(?C6 z%cQWRz+mmnqFEg+ zn70E04Nz#PYV?x^hEupemF;bvofJBTWGr&%L6Av7%H(#YrNIu(R~F;tbmw zcnZp|qi`Gd)$+nS zE-7gE8tdySN%S_7uMW|P$is>tU_2#4ch%I_bo)k!3{us;TRuw`7~l)(&^rCsYL+lp zKK?-Znw_`~xUEJ=&5$^IXMAF~RxJl>#qlix3vS3aCKu;VC|DaKb~{ zI`k5K1R0A_k@rPK{4o?1_J2-gu@pHol z(k-2MaFTsc-v=IWcIpQ-I_Ckdu|Y;1zp-dn`Exd-A|pHoK^^k#r$e1^Yb&pqnrUCO z*Y@@Cup4CU48N}TfXAXDVv8dp{XLUnjb0D@&d$Rf1>K$d1_VX~=f*wsP*OmqUtdrA zV82(ZR%5-$w?F2eSohccN63A?m}&E%TcJj`o$QNX7s=jAqGC-9Sg!WozXKR35EC-z z3?A(EAOKaGJDnrm>Dc`&-M#den7$dAa@uvq_{vLH>;H3G!|Ff1s{8SS>(~GFzyJLD zOd)V7UuUndrG@+S(}UiQs@zWPQv#!|SJ+p=taQ0l`j6K$H6IRBP_H}r!~ z0IotN@}h;a))NtDAx!5%>w_d~EH6h9wMUd0SFj9(U?va+W1gDQUGM(N90rKXzMA1-3Q`+m+V50`fEQSr;-QYd%P zsQL&jIF5nHJrsQ)Vnx<42sPjlIJ!u=CnE(0-+-;8-t7InEcOe5x+@r<(T~q`6q&5?4%M%d+6!|6S!rJjvX9xw^X(`>~ zg*aq))6Lr-&O;m~OnytRb@GT9F-?xtTiba=Bo>(3#48EY*$%z6^T4PPQ&2Nc>*N`p zFuh)D?LsenZfb^e(Our4oRbs!xeOZ`?-3Fb78vgn$agq7MA8H7S@o%NSYU!rKtM>u z@IfILFUp#W3h2jaa9gcwMmn1tJa`oU2u`hXRIGYGD@Y;2Xn?Me{lhFn&=E`XB$8z) zlTKA?bp`KZc?-yQx*#t#H0X6NuVJBs3JV8?4)cOM zFK92tnN|Rq37O;qSpar%Lswpx8kprlzIYXuLZDK>_KPi|iU^n)vR;|PZmBzUXHM6h z#_yTBc5QU?mtXSJUw+w~Rav>OvNCJa3&*NAbl7gFdUtQ*s;5?F=4e;uOkA}=Zm2tR z#_~O>`OBR&M)7p%*w2+%*?7(rUr+mO+f{4=Du)BT4?ZFK7Jv?1{D_%8W!T` zgMLV?89wDg@F-hU&LR#)#L*1{jHEq;az?%UJ$r^VvS(@*98dw}^u^!5eCruG%G9ba zI#9EK7x6+|3b-AXYuRB;TyQmU5nMwAvf_H(@RRyNT+Q^cJmjStdAUoMyoGC+vFhaQ zEDRU@Nps@>3tO6(`soeA1f;UQly@HNJF1y{e#` zXzq-9c|pyM1Ffyv*49?E(X0Pz|9a3w(u#TL@Xh|L zS$mrLM}PWaq=_}FymFkQ)L0r5;l6>TLLIhelx7fO zCQsU@LlJ>+1q%E4pIW9Nx`*aTQJfTqw`Ge*6MHGh9l zUkpNTJ)pHr->7QNDz_$IL4ij`kkg%sezb z)?3#!_FQz`d-efvf3?S!9Y*A+#N4rN<)|CGsFUX1D!~I*tcTJdEGK4~oM>{zmCRc| zr{VPJ29`np`Kv60zp5`j-C)u*oTg`|8?^LjpNYn$o2Gtdodr=xo^WYV2)nt9MAxnx z?3r5?Nuzu8k=8oaTGr6w!X-T@M91#E-)Z73-KD|rTKy_J5m#2X059CVpa!d^5Uk{x z-8Bn{09p%O*M&~R=yJGOW{}o1O?R(-D%Nt>l&K%@!D47Fn^*F!X0hCQw4sO2!*I<0 zuE!#2ZKb7YSs>jynpm5#1*s&_f6_ZJC^tZ!d1(R?jThfIpf9}DtZVEjqkFX7du?K` z!Y4aW>>;&Xjt;eg4bVL=qV@^7T+%6>Vkem-ZO?Im1rin-+Jtvf-APjwrER7C*t<=2 zKhU=j14)b%d`ED=J2(W%#TK2EV%B}&PZsG?bS_eNDQr?m0pK%q!|t>~Jbqn)KB5~v zR&FR5H44y~bp@9%U)DX|yBNjjQPWK2ga(aI)m{6F=tTF-dT@VXBLtGBz0l0NngkJK z79~7nb0LhdNSTtd@pr9f({ivBtq?rP{7hVL3Xc~>Ld z<4JhLXanp^v~sT&u0k=}f6vRa5AJ>W9`ofu@pkH(G|vtYtc6MU?xw`bv`o%D8tk4K zc9O?Q`|s{qcfZVIr|tu4@b2cM0|Ej49`i#RKwC}arSCg-Y8wQI3(Q|2{=#a0=lp1| z@rdebcBZ=8q`6~uF#XrAN&BUj?wFnKKGtLmWLwE#@z<>g`} z%MEvTq`RFy0xuJ5z#bJ|y%8F4S2x5^VG(3syL_+VTFh5bAP8T@7T>QOov`x>YyQ2O zpp|@&t6#eZ@!hod7uhbtrz2RNneE-{`q*)p@T+xG?;5AN0#mu%V7ex|(0xJOU7hG| zuWP^9lPD+OtDT=)RTL=$)P$2#++El2<}W1Y_}{f-1S2OTkUQ5`k1ca=X4AcAevajI zw@tMMJXLN0vjiM^>hW=RtF#<`p1YaL8D0BIZn$G<_u!+HYX}cR7iS=DeP53H3q95K zxAgS#|a00jZ z%fRTUWE66`SI>L$b@H-`p1VED)V=~z z?%m9>*V$qPy8+@N1b@6oi(D324)d^+-FGnY(b3Z9%*xan+B5&T>;%oxhV ze^eh0MQ@X2&-F9X%bGfHH-Qbv!~+4NRsLc*e~GQ>?>2##m5lI{5m zrgZtW3(|p15-`p9ykL}yb>sHOLG9uBsavrU5 zOYFLyD1e5A)lH$7LWpssTo;j}3CAgJ#F;3S8g4km5w-DlZDDb{>D;+OLNKH>017W+ z0AH)&sNqDR{<>#TpS!JQQpaP6gwU3BZUu&e?pc5sioJVR+mJkexot{lZevKF?a?*@ znb7u3whe7d#T+e5Gqh*#*S1BE5fR%owi+v8A=OxbX363XFBbxhfu>}wNgv0*P*F*H z1W1{Kr*4U=RSi6l2S~;D1RYhQq^t-bqJjIc&#C|2=Z_2W@d)4M=c%y5>P1zso+w8) z(l650M!-gVbZ@Yuj_Fil>z9c=4a}qNvR?xC=%rrtck_^68pB^fsxp;^rGZiu?mL9a zH1=oq=LTgvinjdU#}Lu2|J@++fL}-M-GkWKi~ip-hE~6{3_HUp!=jPE$nQIbrjMi< z(u@W^m_z9LKd(cKVbm{CcF%>_SwfUH63zD|_y5Z={6$JT0@y|NDb^vD`u(=D@);4| zAk9>^{r@?J9XEd+xp$A@6TRrS(pYNhsX4+fuxp6;FC9!qzUDvVEUR`Eauyf`kedy8 zI?RqsQO;aK0Xs|OyQ7`E)60;UtaC)nSI0lK@Y*X?Rl9aoRqxuR$lvtZLO`oWvyS=tyY*h$KU%oX9h9-?(X;h`ZLV!%sHR)xjvug z@_wG@%g-ygrj)s&b;x-(Vaoh#ii6PT9lg?7P^<& z?tgx5W7`u8GPPBU-W(C`z^4QAkx(F3x1oNWHoc6#{vQ|qXm@Gfyi zIPL&{AQ&72{AHfd#o58?i78pxAs)U*+dbVvTXiEmr0@Rw&+Q%~bQu}Im7Y!U^l%uK zFn->g`ua7J>C->u;qQ;1Fq`^{B{kA%>F?4VIg*GSeCG0gy7JNLr{2lec^9x&sWihg zTIZR;y(wN}hbMVOM|-A735L~AtzKQbczRxFsQQH$`uk0$=MShoZn*vSw`_v^Na+4; z!-}g{ev*DqbKQb@SNIN$DJTAc+roua zPcx|z27vv6keE_f4L8-)a^V631k_C7-hvyT*dkst>6PS@NEPb>#3Y|KrRIWh3PlYN z&gRr$-dXD5AWP?3W%+|wR_+fbRjCnqW6Jy?ct@ok7ev=7HMo(lwpwAfxWc58D?~YU*)@vwGNlINPkcUbb;4huaSjKL7kC3W z0AU`;D;=(%VBCpu_KUJi1aQyJvQtsCpEqgCkZxET31yZK?`LIj5UO{s?WkP%PV2nc z(_-Uy&zx0Mw6~y8@RF+16O+B_rCYj4V>WBQR&MBdQXT4i zea0N!k(j|!xu9Fd7z#Gpd+Cx=e}B}!eW1@Dt-q!E|3R<2LUj25)bqANgK=|rxUPEJ z@-1@r2L(l?tfB7TAa{SgudlAXHQC>vWpNRAj2_HRx_hmcu-|v3xf+wE!tC)fOSM|H zQ*})BHdd2D_dpwnSQ7a}a2SG-S>YoQ5WsKDv{9iTGCe`kXgh|CR5%5rsAM(}0w}>j ztW0I-_yA@~LllS#iwv|-A)>z+XV5A-Lcb=Fx{C-D@CzD0`Ob2np+ru>vw@ro0rb0k zX-sScU8w#je#}$Tp7iv1GDIzSd5lYO^VQiU+1N~)W~xh!8V)R&vy+>r$CQvV4*)Tf zvLjz}j2Z9f;o-Ay+*s>jU+g%tH8%F@$04IRH8)oJQTi^(Ul2yDv3G#Aud^eVMOdk= zhCDI8{_dSG?#&r9E<7T@FL325t)F42!w*L*Ds)cj8lWlCKX3li8v9cc~=)%KoY;@xqqzEYxmCUO8;L3kDzapsJ+~V_u zZU@J(*u0X4O=IHyNBf41iOHGlG&3YQy?`qz&YBV*9q8*;S(G&;B-~k0kq3lE5atvq8q7G| z!6D^9d(4p}F#6;}rFQw?)#GIbL)r0HrNtc`hVpVlM~A7py!@q~_8mB|@28i_%hkCC z9P8=9ulVaYap}?td=gzw?R;iJ*Q84yh~fvACUs4CW+$pK$X@*ak4^jmP5~5*k<34g z115n1xj^<@7&LKs!0t;{cshsJLONAZ50IG}c1x+|_-(RW5`YBLiwckow~v}WAQQ3K zh(4$+;9LS^&5W#KKpAp@mSQyq8Qy|&$U03J7sX1=DcF`ZGS-D|K+p&nsvoYW8DpT7 zNOdFQEnzgs3~NSc3~m?Mk1cmr?Cx}_VvHR?vXE^Yh>b_g;)BLS&Vo%GGO2SErkRZR za$$HGu(+Es24w4{M3aMHCj<6&y3<2_uQA(}fjW!j!;EosF`x*tUAm9V^Mi0i#M6_0 zoo*~YEPZTwS9W&P(Og$T%~*g$W@M3!2RMGac=npLr&lzv=cO{>Pz=Uc3%p1fg4@TX z-nGTEPp_4FWo!BaJcH5~kKB-|L-i6qFn59(bYvN3veC<+4U}wwApjwB0PW+LN-DKd zX%<3vZ`PiGo?BKTr#4erb5zQxSVwrix=?rs+0ju>RU@cuC)*2#-czT_D_cI3nw@Q| z?c&`8{gv0{1FZfD8yj_F5&jzGSIsOt`gMYCuufK4#x@dl<~7sTK{Zmw^; zCIYc1!^4x4L-A)UP6-PR4x5- z>VA0G+At(OUPsxF@q%PZ)E}J689Y7ZVu+Hx8m*j(ML_y$IVwJ4O%t202xbTjON_n+ z=M8Wg#Jpj#KF(@caT|fQXzFg?X0xUI{Yc0l^;-LK5$qFWU$|FRm&H9T#jabp&^st^ z`tvU|Z}Vdj%kuU6*@?be)0Zuq4s@e>;@_OU>)vl%mj91vok<-(E?=+DtK-M#PhWSS zd0Wuv{OSAePG5FkwZAI@z()MjSgJlkZt457wLIF-$_M?76@=UDg%uAyG4;y6*VJPG37yyb{A?aCTcz7TTO=%tS8zpP$(lEoCw>M1PR zxM^k~ruCKHo-2cJBsQ>d%5i{^Hzt5Y)L0urJ40;6><+-prHM;Q2B2XAteQ-Blf`eW z!<$9_)mBa7GD**=;`67)ZjXtPj(P+ICwO`1#u*#A7|Bg4=WUX|P7U9}{b}{Rr}!=G z0H+#1e#`j0+}Jelg#3{naY3U^VPY>czAx**%yDOi!4?S=gq%ri5ZMm&gQpQ53Le*Qe^dd=mN zZ3i3#i*Z*h6k! zjopH(n(mE|h;;9mnDdCBf0!*(+NQ*VbjF=&A5dr{*{lco*FH=cL6hNg!(Eo+MI(Ph z)Pum$?Z~Uz&@R71z(Z2&%jz~nl>YT^5#+K`KkvvQO zUZpu{i*^4q*1e)KmtgQ%_T%OWBrouU9r7bDdP?I9PFgNAH} zBbSp?otmDST3#_FBXv>-j-F>5g<$a=ZlcLoI-s5;{!dEkoO#I;Q&Z>ZlM?w4O)Y#K z?uXslO#cPQCa%D8jFG(nu)F~kiS`Rnh6IBygUu07)j@+qeR4v(LC9uauAK{ZQ7j6p z7_x5|O?%JvtZVCQ+x_&1XLfhoxg#CBbLZHOwvDBF;Y)q##@#!M5);>+T$`K-%{nLU zlNR(|(M1**8p%?#zN{cp$M2V~VTE^$hXMm*qI{Pu@r{ZJ4CMDGCe12Zi`1h@a6DJ~ zOo@v^Eue9Wit(1~3GaEil8WjLX}=Ir6sGIFcTgsk&Dw5C+m_Y{HMY7j)BnhgmMDHz zn_xJu)K;2UgV4oS(*0M~*38P5Dtj@|mq8@(2QJhcGlgPHQWir(=u?_qZ;gYCl4cI+ z0vV+OB+!?SMg0e&2}(Ag3e-S?Canb@Vd)_liZF%Q;d9cpGao*^Tc{BM9}5HasNnBmO72Lm*+gkogjRJ^IyGQc+Y?adG9v38QPPs|qqD59Z%}u}khZ<(@9G z1RpPF=#=mEi%x>;;Gk~eX=*{RC#CM-puRMo7*XD~`P8L`?LwSJuyxGv8Rav&r2bT( zm|imbS9_as>N8iNMpW-Z*jN$CbeZ5ym1QtTghyuUS4p1+JA?*>uU{PQji}aM;gVgI zS5$<*zhe_S_0>^o@6oTg%w@UcbdbBO@7u16-O^`rTa&jj zOHVXX2YQ2qXned$uBV9+NUI9wGjL1}bRjKpxT(-0;uS5D%uJDAP1oS~2M@(Y5R-jg zJi-Ew9`^o|^jGPx{HunqPD_7!^NX_fnp*fXz0FoGsWtWNt*oqE$igbCsw(y*mV}3` z2@fy%*S=qUt5cCxD?a5Eo4g`5Iy$A{b2iLudizYe&97WowQE;pMMdSV=c*TqQi;Nc zB`252d+7JpL)Blvf*%Af3Y;OeUC|yW`dvR?f32LEHz0zN3nOS7q*GcHlyFk+fN*63 zQjdT+j&ydl3gAo9H*b9T=-z$$dBYqg`n440(qhO#mP zKd+&pf`YSOzFS_AkdQFGvchBIA5)~SxY_&Z+VshrP|p7L`K4V)-q>w0sQEQQnPKm~ zONO$&d&i9Fq+G>6sk2e6;3>|zDikZFM(c;=axkL}p;QtA8`*pQ_&)5C*ZHfLptJLb%=_VyVQ?x7zoyj{8Qx#t#Qa?$It zYV1SwBpOLVxg+$W=T$>Mmq#PwWfn3z&Xv87<;iZ@FJxC_^h{I?SZ8I#Nic||>{C9z zl$Hu}KoJ(GPZ1QwOq*nGHc+h)Dx{26ICDyHiSvEXyMpSeSw$!BAxZ30QCWe3m4Sg- zl6BE)FVD!avC(67-g>Q|9jn#5I5<1&Vq(WedU~xESJ!OZHLqG|ub#JSqv*SHSqt?1 zwL6%qWtmBuTRuNU)TPWX7tR;XShM=%$<=FS6t-to`{S=Vt7vsmf^Li_fEK#dhuj<- z+zzdFcW@r+=HWR;mr%4?QhEC)XOyg4SCWzJ?;YwiA;YllXoFtgaCDs^W5PlYH-CRO z5A+%7l`Vc#BVq5Fg!zTZBkPqxprJMfuQ#Amc0oMzXaJcpr|37DJ+QD)Ttpm!CB~wK z7D}pX_LAq+-kNGw-yi{EQF7FQeJyKrGa$JmI7v4u1K+S0;$bqM&Go3}hAA<=i(1cRever9H- znT$`f_?^+3ApY(q=*JJxd^i&_EZT`?whyn4($cQr2Tl+3)`mMVVr=AiVbu@(5N}cM zrHhP}4hW8iMp{{$vXH4vw??`i?Kz4)FC>i>_UJrE-TRS^3L4?Urt$u!&y@Sz$KHha zLQjAS6BZm+dWhe!Gea_`5WEUo56{g=HAPa>6f{Uz!5R}<1}{v9ubeK!V8}443ZkSa zb~&m*tum^lTDC(CPG{i6s0L!#@WQKbZc&B-apk$wSsfxCG?%-Ex%p=nPv2UASTLQ)iY> zW`%XP=q$&MYPw+B8wG#0>uy> z3cnu6(d2_c$RRG+}Zq0xUn10es)D1C$wfW1#f$EHH@4To)YrPxj{`1mvsg zll@&X$n8Top+>VA0K3ijTGjzT|10FF(x8t)2N6w>O|1xBXQrV^%o)oCqyf4NxzCkt zD^T9NpbMe zdFgI;A1*KOb+oqgjhs<+P_TC$J$c4ccFx)eAmcX#`dE(ePz z>5G@S1yyC07v@A21^EXihwH}##7ziGcK7lMA0Lu5I=HYr3xVX+sshX*C~9G0SF(T5 zd{$J07VRaNMaaN|FacJoeihALjr`gVf@Cb{=wLbagikv#Fms-^1F+Z%l*UZAgqSjVcw(Gf>MMZ_JdpO$*h=wg*tI63KSAbByE!j0S*)4IwqYL7;=G3VF z(7g4#+tLrx_qV^>x@F7O?|y($)8&Wnwl??G7tL(lb?Wt9y9;N|EZn{8^;5fAXBNrr zzyGcDuAKA33H%#Hnwkn7I8i6e5DIWW1dI4_HL-R0s@SDq1SXz^S_&#H3la!ZM@iGk z$=4j23WtYlta`<{Y1^BBl^-h3o$ME|CToE@wY8^@aR*$(b-^AE+yM`}p`otc{hc8h z!+2p%TI%Nc`pv0n((2OY=HE0ovu{h9(^B>GnwxusXVz%7*&)-7OV@4Mk}#4zDn7`2)ilt`HL|aq z5|2M%V1}6+OC|s;*I}daGFTI3mD<-JM_eZ@2nE3BZt(}90r?hz@{tH*ZO?ip} zB{>WGcmFowtZ|BPRyyA@8xQCmALNQ5&)NqRS`OArL|V>Bi)0BEw6jsXEvnhN>V4M2rAz|Po0}D?SU42C26#1Ek6S5l-2R_nkM;9gS;^oG^d)7l!g63 zRnk*^-~p6U0dOLZ4Mj!~esK@dZ2gL#6n?-A{}XCCnpByLh=>exMzM zp$FA4LlS5#p(K`LLc^B;;knQ{npHpv`Kj?_h@q`MK<%Se8m{uX-txkRzBZ+`{gueP z-7A&%^l;@@_!z>jDvg#qLHbi~{{lg6G;$SJkY!>p9ka!L;{tgFov#EylY^mAs4;K_ zv96SCg|hWR)2T)1QttBHxpz7{@64Sm9XN+SX)m|)9H^Ak%Izj<#j3<=yq#k;T=~j5 zb35;J&Yi=)Idk^x83eRlNM}fUxaa6QV%_ec?`)xkt}1#OEA)>aD+m7Z>MygI*8I8 z(b`~#JK4!jcG%QYUNS#z%IKh=(NiYRE3Ry*Ye-E`Pg%KqYh!Uy(JZDub&8Lc%hBt( z-(R_cL?aQjY*28=*&PtQVaPmPyT6d{R7lvC3$>CmVvZ8lNfO z`T3)~!fM5p+$I`JODr^sgdPVS-6ZrKNHVA{x`ro>FuV$BPl89b@-ccC(PEhtLnt7P zs^v36r9giO%)7JZX-B_+Fq04#;OF>`ho`UJ7a62x$II{izex<#=8TUo2p-M$VK!4$|K_DlCD=Dzd!V<-Wr=3=|Ibl!YRn@Jn)dk5(o}KL-;vLVV+Zm6Vkan(vHvA|!4LQt5_AC4C)f89E1U3+dsr1@fVX^|0t z3lgt!33Eii9HA^>2^0m8hDX-_$lMz>N8VbMJyrA2s6Xfj#j6x!u1tyty%aqRM~J8+ zeyX374|ifGU$b*(a(-S?0$I*XMe@g@BEEB|RvTv88R-}3cqt~>5FEqzdUyrvgJZ-T zyP&{uQ|p*)yWWH#9Efpub9C}UXQh7DDp+&7**Pgg^2kq2C<+ZuOd1_TpNbNa^7!7c z5y+PoDxNXj#Z|%O<-zVAF~PhYUxOba!g2gZI?i^&m=rf=q|- zfm-}CKdoFNtNP|IjYD$k>`GhMMs;ZJGVjC2-O?l>RQmMX)pHlsrQz@0kuooGt1mtC zWnI4Tyq~t@nI+2#j0+}=eMu-YE@0ZXuDo^8)c3o0e@FEFfi1yeL!tW6z6oW)Ky+GUFM^%4$3{LbA57Q^; zi8x@xA>P8g2dklXK)V^x(2%F8#H-2m$`yVLA;OJO z2rzQl#PNvqCjWuS5iZkyZG?vjcLm3|a=ajZ<-_%{%t{5nJg7$hNe>OwO8RJ^t9VRT zk-DmPP(}MDYbwnZ<32<+dhj&v8(c+on=wkbJeV(}nmw}8Xj~pzZ8QiEtvGYnW1o9y z-91_o^i`y@dbqR>!C*X~-uqCAwBNFQ;9f`vrUOrYU_j=3v{d4ou%puB;gV6${!%$B z7Fg1U%2#SEeS~==(;2f3hj>s~DwFfqVgbwS29yyXn}NvRry@-vbGtCOIzl%A2|DA@_Ea~i&CUu^#tI~tFUq0BV& zR1?%6BIyJsaGR?t19OUx-YUr7sCL+rmw)SMVSZrM!m|kJcHLm$ib_jOYvY22tl&6J zdG54d1>AaNb9I%k7{^`mS+r=&E4KpH=H{AKi)rldl07}e(qPEurJye~&(C8{I)c&# z$mkH+G1Z22RkTTi>mb@c$kHe8-%c`8U<^n5G8$yhAv+_g%XQqicSGvn>Rx_wS$ury z{N=`umiiSbsR`p3mN(|K?Ro3F*Is|3x-~V`(Bw91Lu31frAsD+7BzKTYT+D_X;LM% za|J_It!iIBzcfA`L8n)2YO1ZtNFQ=gKeu(aX>IG(%uK<0-OG!rQd5=}SP$uLY5{z9 zP#e4uaUJGUnO&fMmLF#2yCMY2W+)<-Q87szx?WZ#acJytjg0?@WE$iec#x5;Q_kMsk6*JGxHcyPh4MpZ}&RpbYe>8=1phc?1H}rys!OPKIb9*iBr8YWvX=d z>>KY&z5nDeCbS+c_3#4bBbBmJu5UOaeGtrCNyl3*Ce~xwJ8lRFTDfE7h#7 zTKMMak8gBKRqW<1$s|~6y1k*Q^33ULUtDPU>2X!Q#qP2_7eD^w^qUJ8KEc3l|%r)Xm(8~Su3ZZOIlRDdg=U_j(*wd>Z)Y?RaL21>n3^ojMe%2 z`ua)V>C*ju7T}}5QQz5lrn6IsOH4NBv5Ocpd-j+JWV5U8Tf8VK@zx~WSU;So8{^~q zZ8~0I0oFzM`Z70Ucs+lv6YTPpO&ppL8;V0c><)$D&T$%!n&Lsu{SVVEB0mqavzuz2t5f1#Q`#QCn2)!WviHy zMCkxZMmfxo6c*n1&G+n+?@xXI_rHrP=o9nM%@kJ@>ZG^a+}LDYA-83wj!kv~YoyQ$ zW$zvbD@Gy4KazC5=9x;%&rJ5gV$!^@q~A5GER^&BV1aNNtqCtgSeCa8q!NVJJ_+v7 zXM`|fgiDIot}QOfPdWR1T77z!!ElI09V|8Um=7m*?n_ylm}6M*yma}6G6OQu8S2W* zUknK@n)NJe{8HN4)x!+CVdk&g-NqvFl8^^6FE2DOG-%|Q%#saFix+9X{8GE9dXxOi zkr4Vpmr)|!tFERWsu!yZLP8Fem)E|sWpgU>rXY+jzrU)QX)7y4481IGv_js9Lp;Gz zuN6N2bg z>HMO(a}y`nvjkiF@#FRL|1>_{uwc1#e)$4J{CIY_M3@kd19#{f{X!q&P0tKp^ruD6 zq0Ubae@|R;lY3Ta=RdI5{}I|#C7X1p?1fHyy}VV*o)%cLw0~;BhZ1XogzWU2+!wMX z2N3S`U!|paI!#P2YFWE=lwoN%2*TTM*&YC<5>Qf%p2$9gGEZ{ z9bsUC(Zsm&e+?^nOzsUhO^>0Z0o?D|-m>1_GR!kU^)>jxk=Wy@_mvE}R$AyQU1MD# zSq~#+AxRYq-xoa$T0&s8@7%d_^v64g?$Cd|c)4Dx*F^OvAizcQ+>QMm-|)?*dfw%y zpAP+`obwaEuD15;ulr`q+qiL_y6_w04$?iCX&ZKB8-WN61yBROQBLdwu@R(CA2`Q` z_BaAe!;lBqeS~uQy?$oL-(hy9e#>RRr7tjElx1Y|wLIEI`3xeU_fnCp1-X;}`2!X$ z27MPLtH6%%_@7CiM>~eb%DwNh=GeWPy5wY?l{a4dHR*+AF};taZwdv#2@xYe)|zwC&N(5U1elXc>ZG3n`JxL0+_;tt)IorZ|W9eOhz zP-w(Gc429(*%1ZU5QQ zDBFp^XyK!uylV+9aC`_1h(rWZKSdis6zspTTEHzU=e9TFnl19gdhFuU)$< zhMUgu8OHbj@lfBYvGNJ?>`ip{fpx-SuOQn6tYpf}L7w*9yIoy(#gpvV?audZvy)Qc z?ar>-{rT+V-S^(R%jM?Q)*eQrymBe;_PcN2=4MEFci(;YZr^L{wST<(?mxIZ_S)@t zJ8yG~=&ZxFgJlCAt-~rOM^ZEj{}h@Zwl1C3A(M`sG#y$+fR6qQ{t>sgjaR5Xb=tD z0Rd1k>5wU?p^*124`dsqRiS5)B)yzWaeP~TgVfwX5pVE9bCg3ak#fy<^4Q2dNPHR8 zZEJ{BNj99yQjI z9wtWKR2h3@53=e-7%Kp`&>91H)d%nG@%FQh$QeU#_eC-l$@59#*rX>m;oh-)? zK${0PZIZen=qWTq3r1096(7W0ak4A|A})mIP!bYQp8-9n^t?<<9}N#<-r+y{&2MUI zACAcK=U}-fLwnlWvr@J_^ZFY{R?aJq$$rJsKN4IjnD5(NY)9AI%r`6h;cn=WgR-0( z9HxceZ|=dUU-n6x(j}Nf&>x%UkUe0*V8XK z9doA#aYhit!uudfkTkr5Xp{x|&;8dw1sTd;WJdOWuBmy+z&3QD$JQ z!5BY(f4|B8elY`I-Tp;<9!`I@y4ns;2siaBp2=RmTv}AS!mZ43;^NNMEW6L%`Ay9d z>T{w$794>+WN>(-GqMkomEX))fG!WynxherI*K0h%A$_KkFxYh2G!xh6;n@P!h{J4 zg=AytUw}lw+y(tGhsJdMobs|c`t))i{FP_S)tBzuz`Tuf_@t71C9`2c6_6JyVM1PC zYu>~`H6p) zdAqCN`%R$v$Po$~Ei5vFN?Gb}uTy6D>ryA)9Ju0>yLT6KDaEpPrMLe}dYh&Em)cIW zpH=*K+t2Pho^ju?4FA1Yh8edya;hi>0KbnDwgx1}hq{8Zb%S>55{-p~1)H|Y3x z-^s7)eI{{s@$Sz}eO5p>ksM*xx7*5|!;p4}o0C1=(9wg?_k*Dfkzl(cT&&PZ>ZtW= z+DyG|Yc`M}1bY(iui#N&RjcgfVPxy+YlRJGk1lEU!iBSwbXAt*+DtO3EatT<4TUCo z4>i|?e3E=n6X<{}I+MrW9%3^z&ONT!1kS^}1%9W8=tm*#?O814gdJ;AOHC5jX&@BGyWfKpghkl{Y`P`$o>#8lBunn0@O~A zZz12v;^7t&_d^EU+CrFm1X^MCh=1(%(3(0bbc-rtzv0!G92J{I=Z#?3>*zgdC?^S(f47ha4ZYSbF5{eCZKU&dL!R*CPkMOpC;grn(!UHbb~f{?C2O`!yvPo9O4~P{se#W( zH`1~-3{~fH`NDRwoXgKu!|ODYJLEdd(b3UG+{mq>Ps3bIE?Pf-H!ISh}FJ6^S^6R(*Vz*RiXV))k*jJJV*WYhP+?(0nVUIS)fG25D9a5cE zT~_@C7F&e_dccuAOfI3RKy+$(C19HY*pG6&gY?LokOI1hCV@ph2uuPPe|gd%A{`V0 zvfuas0S55rky9b=fJn%2C)|k?B^Fw3x%^+=JrcCVa(DSNU5}93u=SHR91r9*Bvw+k zrE<5R$#ZuPVhKS|>uIGfTWeeVciGaP*c#-4zo5?#*;#8e)^?qCwzk9Vq?g#i0J)4iMNb$#(qoN{Emg?I{IJ{lnW9JOOQ-Wp) zscgtAr^J12ZBj*Bn@N?@m{I5EW6Y-g5_DTqc$&fmxGwP-f*5UWA7UWGcpiR)P+%Lc$+yL4SR|2LR zuy4rR3aue}DBO!D6TF$=;~jvukXljj4!~K&*J(b5raWy*c(Qkv-;_k1E>V{})h{k4 zH9c)~5Ub_>Z1h8Fr*1r6N*Ns-teq$on`)&ZpjU!MbH$0T9{+XS5;uGQVLondj^2So z-KrNKJAN`TU;JqOdbjxajT6QX-?VA?xVX%WSlDYGvL!{zwf2Ql8|Zcya8;-nLn1ur zd@(8H2lT_#`EsBvRGOAOq6ERs3AWzcWK&OkJRcL^K`-&9o{7^ozM>YgMnsPr<|1g? zG=kfR?BK*9LxHnN4h?TRsjDk<8y)KE5j-+%T0mStfX*i_ zWui`J6BeG*c*eA2pFDpQT?YAS#L_-MQPrIOgUbH0fmSvg-`3Vv{;w;$_A$-lV@!an ziu(kce^X=D_h>V5rKyJ}8I)7if_K~j-qG5^yHP?+A2q#F1YA}i7K(+eQ0(S+AZ+i? z;tT;7NdO6at)9WXD$eMC6~zGaZIMHUffpJHTXce==YBxmF$HBYdYH2h!jA!=YK8lN z-NUpaE3_=K$Ra+0@vsvBl?O*p^Ql(u$aBzC+ILw$DRrZs{kSARxGo(ESi*knyUazU zr=Mx&-6y5$@%u*Jz2$UzI`4k(8}?&OAe|P7C>$x1^ro-pH%&^>^CRbNG=2T`yp3Of zy>T9UpJL$G7N@5*&#pCk>nEk)*u~o7mh`mQwcp&FxBlkM^{`x_$ve?cCd&z(D^DPjQkC*`?w=b&{l0-8?Q zM|O}nOG|k`&}A`>P^!xyb9s%7;;82k-)IytqGQ; zNGjuA{YL!o=1uYaZ@$4eSn#3waxQo$pIGexaGq=<@;5W-=E+Y;wiSZcfFgY0TXZaR z;jUyvlw~3WDgbQ+`HukeuI33z$S!wsnX5F#>8W~u|Cp+sdfSrJNfA1Kzu1GF38BGs zeDlt#7=M3#YI?C|l~lUcmOkNJM2VOX5~^>~v-i%QXZ`2T^GPiAdfX(venMhsxa}G7 zaAZ2nYstyMA@L+<^ zkUB~JVX1@G8_mZ=pn?lkb5skV98p*s>|kgM*slQE2rTXvm>YBqBD~DI!Bvo&4P}&~ zC4kB#fc66om^4hHSgcHM0*_!{X2WRj7zS4(2d#Op;3L94JjR8EOz`kv*StK661_Zh zVI#e`%e6}`Kqk3b)BseEIr+F*?C+C;wNu(`R}~fY78OI}Jtdini@3}5Cv@AkWd;Qm z&MJ2wsVfUfj2l~~8|hwFhOo={80bC9eI&Q%{Z~6y93j^1$cm0vKDanok7AWKB|WHH z`dgZ}P(16)4Mnp~HLgE3tH?N;3pO8eoYMLOI)i|NU}62$@?rC?!~*55iF0*PJE1G-YWOAN z82O`F;uostIk~C7uyM4nLmb7BKh`eQjR^~D7;a^y{$3dFI9$4a{FTrUgW>uguw?C+ z(Am0Y+H^rZW$OO@A4#qKpZszCdbO}`AG3bHd8{rgyRD5m>vY-U%HBWnt6!y*1o-XU z^UbfNO=>4@`f#lfy0~`9()pnwOBUBX87d4P<}4m}w6?O*e@ulB1q6b7_0^Ej`B^R7 z-g@WarS~rH-=AeQ%VtHx?|H;ItM@Oa`uU~3FB%(=eyXEE*7w~X1>WX3b{0!M zYjBOE*YJ^}6AU&0fw>RBlOE(KV3pC|l2gN$u?A_gw7n)rU6)x?BOR2QSv_+TmvP(a z*>_d?mbs}rYI4MDozk~}s)^TfYH;%KoSOb`Iy=vGc8XWekqyJ_A4m}sD64ibW{zAB zs4ejD8(a~&4vavY19d6rhpS(Qy1l=s15Q-!aHZ-$Cw6cJtcX{M?OYK(38ch|)bO<; z|21O~E0AQLD*>mQR2}U=^c1us%vgJeTpy)hEWLvIK)FCtkR_}nSiS*SiqtW(dIj%l zJkP1?a^hm77P&L(V&Zc8TQcKfV&XDcz0|Dq48lF?n49$N&6t>6cuX-jKs>nc+!*}j z_Wyu)9OQK8I2}6a@%^L7iWHj0jB*&z;#0p2^be`k(KG0t{vvfdx`(>Tpw8e5#14dT zP$``wqHCn~|EP1YXJfp~x={|F$?h~lwnwXNIE0@eqzUQoWDt!Fay>}}e32;*K^MLf z;@DRv6+sG$2`D4>vknILH)-S&sX&^}&oaHtj^99JthGtW#j}!=#36JM@d%dtk*}hx z3xWok_G`#AHcYLF>e`6EuHVpW|8=!(KMLLWw6yN&jT@h4cm*@{6WlxgO*u}iXHYrp zpxQR;;bQJ(s-GaPjAIF~XLMt|4guGqV$@=Dtb{;n@b0S+A%d$aubN)sx;dP8b@#5y zg$pZp?Y?UCHr?dC(TBi$sosKbq!VhTCd8`^vdBE#cce3Tq|XFLbQN`IJL^DK6|YT9 zMrS5c+wLF6S`Nl1)X9b)Tq$0@E5B->V(MTqK}-;Wufk4&zumhLbw=)=!DTS8s)I`r zzU007%27rY3$CoZst)dN;JO(a_lq*jbK@~%#WVh)vGVQzIg^*lm>ZSH^OaKo~zAs^N zd<^1bG_oV5pAT)fvDl#LK~X>Dy<0;fFAmTb##t#I5%_|m7B#-cG`D0wxY4;bHrB)Y zFWK1D?OXZQ&WZIUPHw}kbL@Tn1a)-G{8x%0{m z$&+)k8w&WYw_ZFr)5%SoYHw$!7T)bY#q76FsL1xv#s_Wp%q|%--Nq&{c}Cf(k?y`e z+55zG(%y?2C|?R^?#d4d@${KHw`b>|xnxf}3x#Nq!Lbm8&;X$lzywv5%=IGZ zHSu?v0-tG9%S@_`MTNqb9*70kV?40Auuw2~cnRr){j^ax!jP=%xlIPSr3gvOq9Hj2z01nh(k zk>*rtWuuepVRm+rBRG&cR#7O*@#iSD3&Gu$hdL?*nyjm#i9M$p1w-Shp2Q*#uT$$x zs>V}-p+UT3iGN1#S4Vk=Xt=~s<9?y6@zkltva--b9O|!>zszh9?(dOpP4QA z6CF{0k~(A%u*_})kWDi&8ib16@?--VV7G+POk^~Ef=U||l@k@kFIo(%*AG9u^Y)U( zd@7%6>a5Sri;A8OG-iHPUM_zlN=ueDZ4~m;-@1L|Xky~gBe!o!TsT`HZ7D%yi8+%q z+{Je0^P9QH%%V2SpOX zpnSbnslTk`tGjj=&k|RND`pk%-t{V~T$K+5>GbHRyxe-FVcffq*0(=Gw{`2gzv*Eg zFl4upVtan`?$)j9Nod9Fog+Rvdx1-G&zL+1t+-%mHRi#Cm}5^s#{ee-^4T8>wvoV* zvFZRrgVpnzsSEA zC9SH__f+*%_LRoNAu;+6Huc%Iunxu2C-`Y0044NI!O3V; z<3Z!z2aO|p*l5i46v6|bg#iOC9H=o(9hoR#;4GXBueBN!QU^>I4K4|FfldUUH9x~K z?P%B^=sDG^xeR|(m8mk6%Mee5^Sk+-5yk?zq{U(BhKI8gafAtqk0bZD%X+=O^FUik zNkmjJe{EKDL`g~8fhxVBt6V>O;iO5mwHupiYbQ;Lipto3_U_%Y`wv{Wd-sAcx+s2p zQE2G+c$5$_emuPpGIfD&G`c01dS^(BDG# zl_e;5j_l(6i^=k!TdcU%h;V{fkwrm`w`+SAN_S#I94WqG;Fx|zT9SvP$f7oR&VejI!H z;_Gj0Zr(jLbL-|ePXG4(vnRHYrhL=Mv*Ju@ICHFPd;ay0-*~-h;lird-}w0T!!K0H zy0(EhF%)Zoe4`ZoDWRjuBN~zj9?+~P*{z7wkU7u?PkID6M@Gx%fhdw+9~XY+41e_8 zIWY6*&zVXo2#Jqq^cODBD;Iv@EMbstbj2z3XC(rQyLj3)gUNa|qjD=l2$ki|C-tE6F zo;$bVe}1?Z?&lhDrnopl91=SrD}z}tJ9hlH=QFZ$COtj6lUYwqn-s%szHt22<^G#D z?Gh6uQ>cf#|wkV&DI%ATw*CxcztUUp$zU zv;X<^((aV8p(|I0Mob#@Pl}*_%&v5X-N=rPuS3=9pl^@A>g_nA)bZESE$REa{9@*u z8X7&4oB7JBH8F{Ti>q!yv*bI&OBbG+6tm{3_V=G#P--K+Ib-7Vyj*r_|3{ZUcyY^- z7xE?XPcAOfn<**BX2D^Y{Bov(4_}W@Ry0zwV2ByRKr#rer99Q^Z%WZ$e{EV$nqJz6 zNd_K#o$Lii7XQKeJce=vBzZGIk0<9z!zblky}qwU6Jsv(=1o8;zgBo?1t(6JIJ0gQ zG8&1Dl-`K)w;=ZYUUDSlqovCtGInth+%+yj`Aqd1ocqd*L69T!QXxXGd|ofExoW>mjMMCWX zfVMWUC%++{Z=0A`5YJtMHNudb%O3z@ubc^~g~6edl0i_z*p|ZN#6)IbmC0*6k`v<- zDH?@1CNIfU79Y?3KE5D7833RjQ<*r1-_QNNs&HaTC;*5PlS4zq-lW76iPH0IK~l$B zLaPtvk9=T{NCS=x2mpi;<^(H{d|DXrwup|T#R3*SQeICk@T%~`LUF}+r~vUZ6w5dp z3k#|f><`2VfR~Z=q){r3*K^{&M7qU}L(sbHzXFcS=M@^YP>^c6}(l_Oa`pJ+6zY+uJ`xX|Gf- zlD{rGhSF{xIYQU7v@g2;!qU9AZSy{SRGgrnF(EQCp^$sU9JiOo3V9^df05^}BSs7J z#%~0N%y(dKAaav37aWbuLWA=H{F(3wXc4nLaiSzDsx>C6a(AVsEhZ|{cs;%H^y$iU zAv6=w)IJw)aV~uhoQrsiZ@__=D9DYh$9O$6DylM*m7YG$O0z1XU_8NE_(dH;{^MGx zF){y5O^n_`=zm-rG(rIWM8<Oi)U=tq1cyb8Dpzh9RX+5= zSgW@`QsYc1zp_%w=Y3C~q|g+DWDrO2WZ;N**{;DJinqZI;2(*`0n9%#voTatX)va2$~XHA2Y@xc_# z-K;X@Bq|tNen^OqmzU3s_;~e!*(GaCJ?l@ERsBKWIPP-q!ZjtcjYc!x^Bs?%;ln+o zSz<4O|BUciv&PTW&25ASBB5_YSmw*hS)Lw69-jCp@1OUvXR9w@27o3ZG%nT#d0@cN z>6R({wx+$Wh_9jf>kFRwbMVZbK+G;w{R(|XkPEO;^eXejEAb zCN%xB&_H-u%jRd1Eo8o$;Ikw>x?15{h0}HgL#Id@vK^QtPx)S?IFOgcd(y2RUVCb? zd%mZ~aJO~qK7&IU8~Wv!O-(QC=)ZMeb*JZYUHy{E3vb;xD1AG7k9 z?V7aovhtVPd!E~~cAj0;>!&ANJo=K(tz`Yyw)eJgNSa4aE`D(9Z{24W zSMT1?^upGv`Qw~iiwyJMUA-nhuVwp-7hXK9*T?HJ?2eVpmG&&JKV`czBX8mS1JCcX zNzBf8dE3^40%=xa((G|DUPGfjy@z{dXVopsf|Bon?<{dmup&Dl20W=RWd9We=>z_V zIZ7aDg6H~Wu~V~e^l zJe}gurwbu)|7rdvS!Zmf<7|gCUbrcZXFGJsGCfpc^^BC`(aZdjyad4+$)4qy5Fm+Q zJxF0hCI?Gv<(NLC;v~@@Z|MDx%Ni9$b8d*5T6eeDY#A-AGPdwy& zV=^WhI!2X6mXu4-fRT#9)OV3XsNxN%HzX8FG%F&lKuqNPLh?CC9U~VmpYIauA{UNd zD5*>crF^qmSmooBJaKD9ldr#jzJE|*LV{ZA7AB{)*Vr1L_pm}BS>GrR*I`<Nq+aKQsPfM!gc>S68X?BwY&zh=Gd z>WT_s`<~Y>o_lM3Y4Y@G(|qg_5(uZk9yO|$w@8PIXD(ZMA{%yccCLdbPnE&)3Vf);V@0IOdaT7k<1I)VO+7l z(bF7%TfM4(qvZ*&m;AmHntY+@dcViVoCiz&^!lgR&$#+GJR&e~1-~@e&d$>_ZE}7=p>&gNW8O9!rp}*lC@U~MhbG9p-*b?+ z$HCq+93I9&hzy0P&)_B-iTrJrMhr3QpE5(~Lw9`3;g$uugmIWH_+I2xFkSk?UW)U2FS>olKA>C#<< zQsU~CvGiq|r!T6htE;XoU_JtRoc}D#6vaXEP z-9ZUnqqJQ?-d?Pd2~)zF^Q)@s#yY*Us`iCvwk^a(r@JqmIkmdazl+(mCj=Ayy3b?Y ze1Kik4wRAb+YsVnUBNIY5&H+6K@elwiV$aV#A&!qqHB<2th!Y!kXm(RN zd!5n*1&oXKTh_x8o~|f}f!ds;-|7B z6Iz2;_!jyRem_)a*vVxoJP<_Rn<$SnYlsit9iF?YATli2d&C@FVSQ%wbD?~7TQ&aL zDC{vJY{tbEkl?oc=!K;%>T4}aFC1a77+VWxt=z(Fnj4CW*fgECC84}v#;V~?{(eFA zC(0&l)$&&#MD`Uw7#DXqZXDz`>Fz-M-xaeF|5pkyjM9xo!~x&2I_!orU#G+hafAok zXvhQ;WjPj1o3c@$)1khCDvLla7y{}Bn!3J7AK;BN0t3!cR*!Es@g`{Y9glSdmY`P(*PF!8lVqw>cPVvTn$W6+;W9yce(`3emy%%c=-8UtYO>zLr>j z_6#aMqDu52#I;$$i;Y)S0igAG5M>k!7Ej4+ty-9!wYSnEbodZ|_mQq6hT7>^Q&yIL zP<3nOl*K{P>K&CO31d7*SP5Vzt(-l_Oq^LQd4RK>xvi@t+KMZoG76J_6l~vcJ8_=;HPkRN)~jz zYT>R{Ky}5Ubx`UM4?T@vj7$;Yd-K@!YuC<(5h6KB?YF@+ zN(|q|Qdr9NnpsiOif?%G{$Jw1O!QV}2_ zie@H54+Z&SAPzgp$gx<%W_y^0=Xb?W$htG|eH6PNOOogl%~twJCb7!!1z0(0;k5%7 z549VSBZV+MAWGYgfG8n4`O*tVw-1U*Zv5F?VTCbBK!fpfB@S4gh|a@=>ltZJt$3!qD|1Rn@H2nkzWwjdK%s8iD{Vg@ zG#0E{RaCfY)p_YtuCP^VVZU(;I#9DHJB$DOwv{W=({eI1O7-R2?{43I*Hj`Ir5$?_ zSZ5|KD4e;f|D@R7$_{~aW`#^$~x*A8L-ywT5GMl4|O|k+wpWd zdlKgJ_WOLjKQqjr!_D*i^T)u)IvczjKduZ2JyiVE@DlbRz+JEu}Bf@y|yiFQqT!`&Dm{j02}$*aDieP zofnj63+t|5s+0EC)zlUgqPbX2R7~OQRjckt>_i@NNr`CN+QyEdbS<1eji>6}2ydw2 zb@};q`eQLMvuCed`JnZGW%so!R#0Qz6Lk+9P>)G>zjg`ok$inx?3Zc=2BHfV5;7`V2@pZH;D4NZZc!CE)zj-p9q1mt z7`!Zu7if9Tm9M>#E;qFn*8_vBzNod#Rds70)$>YaPwId+cxyGQo29P-Vwp*H*w&el z-u*=m0(i|3DpFaI3xS@Lz9VD=F^%}4#yi1Sh?}-R5g>ai8cKOOJ4x$&@uIc%mOUVQ zO|7VydZ@HPS<_Ie7G1u~PF=n%9lmulIPblY_MC{`S06!Dq}x&FOhP#iO|YQF1O@pM z``iS~T3<{kj>YvQ85t!V0+z1N&0uY6Dyr|Y))zGapn%s3T)vylpTQ-7C7+k#4P&rxfxc`_I@~lX!d*S6 ztzeT8LS&(4wPld|faFAZxw@N(tS^#)*Uk7~Hvz`xI1i}aSi?&t$smddjc{+f77b_- z0g*tW;nKyf##{D+@(RfUl#eu$b;?e=k_OK6I#NeCkbSJYY-^!Q=K$eR_Ay!2#Qg(0 z28iux;@Z^RH_d}dREqSN2hy$v%;wTrjR>@CYc1=8R#yy83rl-Ywuq?e*}*TWj{D24Rg_Y}j)!HcBHIOA^FVT`Y_NhDgpJJAdvEIgN;o2bJ zc9x1Sy`80UqTk0}zaS!l1VHFGD8pSY8_NH{Y>vay+Tn`jP%L7hP~)&-0V~ zZoST(mVx0*(Dg||weM#^p;Ft9&i)rw6I%5}Y!62g$W8p{4SygET3TOG6fWlHc8*Mv z3AcY@LeLX=|Ca;Pv1jeFRkKh;a#(L1dg&-@)S@eBk9CEea<+R>3QMLh&Dns@Meqekfa?Gn zZJ%q$cJVSK(Cn?M>hD;@RtHRbrIU=ZpNURm9+bYSv{hBn)!POyVKrLXZbw0N@S6ub zd0~(t-O_aulClzeS+-i66>{mK6%dRLr-in1R?YmVt<}$SwRFzw)~8kquMdo8%^*nv zbZQ?n!(xOtpt!!jg|njXISD9Klsm?LC$wWEC)mf13S10*P#URHMy?TZkqllR1q>4i zDlgZY|1bK?P=TyYV=w}xFBC~huGda#hPWgoIfzW2cI)C%Qm=YSJw+fGhKc>HAMKc4 zrIU=q$VN<`i&qVaMd>;N5}Rm^hb$C{A7+%~=~%;|*uCWM?7rk}h)s=%+Y+51M@8Rn z>fCob!qYJhJ)(P~#W--9_qv2+Mz~r%YwZ=+i`GM4>M5gxiPWmzWfbthU?ueBKT#@S z9mtlx<&N_j(RC3q#2V4qdfhiJ96LxmVo0sMjYG}a+IAZY;#dzao9!&DRV_!I?%{iO zd7_cMu(;t8nCnUdZ@QJe$YqQC;w$nfdMs_|<#cn%NH5{VrDPOMBcOZuWO|=H3B5{y zmDK_7C_meW$kaTcFoP4N&k13pKM#i!uMth;#l3Y-2DhfdJ3zf8>e;qFDDBORC#nZZ zy(=eO5BXuY2NR8$;C{qsFQQXDB~9$wCQVdN4S)y9CIb(WxWaal`{F~P(DlcNR0XCe zDwm{z^P}A^bc}g$>v!9lCXv}?C6aH0Hyu7T@~w&}2l6>xXqQ@y#o1W&!+ayK(ojY7we+IEU+Ips*!0bdn#0ZRRE2IT9m4i;;t9%=LzXR-!XimdvjM@U)vFu=2g9T$+h0vPq>k*&X%*@2VYZ#ASLID0P27_`_!VWDGdt^6N$4Ss1b4_SNg?^ zeem{3oOg)f^nT{rJU<;xFYfsq188&RVfqT*I z!az);tsWq;Z!^o)Nz7ZcZ7n2O-ve=R2%{UhaK}514QBOCvWs#VbT%GG)`c-th6>gn zpGSn>wc|>|!rpm(T5`&09)*;*jr}9PBYix557*LFpSh>I-jI2Bas&k3`RHkpXa9lE7Kc+If$B*EqdM z%7;>jgHm(^DyM5%Z*u@^K{R$!3z@1%Z$A6sX1d(4@G`>hm#1Vcx{P?KYlYmQk5i12 zPI(Z5Q=Y;;n)DZ$T)j&O+exnl&#@WcY3)xrhb(P}5-%PGuG86LsJG4+O_wNo7;v0T zZW0b*I<<&!@>2{xj@pI}yJ99al3Y6PzA0C%eeL+I{SXfcLy!Zu5#1H=t~E)1zh@8 zwKb0%!B+O~-Edwzhaa(f4kG&4Kd${8w)o3!xjKksI*0o<4qS4X^EeF1XbQlrCXQx_ za<6Q5skZjYm5XZ8tuj?JgnKiB9kSE_pEJ54CmKWVus6JOk*FrvtfQ=7SJc3)-=5

    Sx#7b%sR?Ry(`uY=cYKB;i3;uJzk+~Z*Ejoom*f#WVUEbeN& zd9|X^K8b4HN5Lm0xURQlbCQq3Cl!u^PYZJjVGIuJOHvNd)l){Ed6bEMu0qA4z1;Ua zImu0%Ps+ud3{HX$%z5TY5gsJ%F1gUL#`YMR;6Y-LP_%S+<>i1wpBVAVmD<`%mt1ip z>TiOCM<38N(nLk)%CdFvB*n47lXCZUduIzUW*cEaO6{SE46*E;}C&YZiHm`|3bQ|dnh<8p|F}I4t(v122`kN=SZIibMFgx8xod?)Clgo zfsacLbl!V*pD>_CpiaZ9)Z2n-*aV@d4L*@m*_ zYdJLmd3jaeeRuF$*6J~Nxm8!XHWDNOZ_^a8T}AaXXTH1V`Fj>tRuTqzE64dsKhoz- z*M9X#`6~0|tvdZ=j zeSfoJ2H9mSfzhMR+99+{F*tK)m7Fzl5^v)=TT(w5D z;=E*D#$>-_Kckmh_VxPwniNZZi{ATqLA51?XC4QLF2H1^*nEq{T2lJn@s^{d220J| zqU{->MODvIN^&j9)>7)1#{AGaE!mQ3%=3l@`oReF!k(oB?fDk z7Mc=B!yW=*sP)p|ACQs)Xb@1_O&QB;AR4x?T%s?ZUoElVa_0bjTf(mzwsgHN#ded& zV+950Y$SI6^BDU=qmPe2rj%G0u`f6R5}Gef!^JefwiLcJJ#BW;yI1r8vL__lcM6s5 zB?XTl;1|G2aAs!ctE<3<^?lx4L5qCoJm{O6RQP5Fe)U}tK z21;2`eFr?k6&)RIU3-->jh1Jyh7*C~G+e_*WC>%@B-jU7L?~1BLoz&sEZjU|?c4zV z0m*B3@}dO_Qsap)p}^*%nOtrZ^4XVpVz`PXbm{%W=@KP~N(>ldUWYCfK&rRB37 zDQWC$zFI2w*y!mu!n5>rna814^{rOJx2y9`r==Bs@<~@KJt~&Mw6xRtDQSG&>C>7l z)aFc+B3M(1K%$C-f{7*%gwaKHd)LAPYeDMiO*(a{V2nbb3d z(d_-M7gv?m&sUHsLk|6A?d@GJ5QkD{WwY4t4`U5y3kf?=x`+p`Np2saoAi()NZO*N%Jn5lr44#Fzi+N?wEt(q?EL~*>sCrYT-iMmWN zYyB-8l`a}YC7dX;9O0vfECHWVA*PS7WM!N3YUyXnL!FXTJARhxlV4k#&omtYG;02JDUgHU%?%K&4x!F+3=eUwL6w9oi=sqw53aS^uo7<)`Oe#Mi52tHVNN@ zZ;>N&mZL8=ac}Q@D_5#k^6e=deKM}27Y=2oj1@KlC1*jPp5vQui=wM1 z8W|YQRUYzRb)U4Ph7UVmrQb_+MCcE+l=wvd(){}CI~6@5P+c9; zk}AAoIjyU`7ms#*s%-1$`V1Qmo#n9M-28f{qU$%6ot?GfyRx%aN~{?*ot^luqHkIo z{Y~^}^%eb51iqwOAJil$=&>wysByiL0&Z+=1Cpd2-+ef043mV0lMl4QYF(}F5zGxr z4Wa3XR+0ix0X zDFxEOf|RnD^z1Ec_ZG=a|G`V0KEwJp8_usuK}4#05%1Zew%9)bYfqR?kjwfCNJ2MM z|Jigd!mxwv4K;=+(r|AjD9n4f6h;6CV#;i&u5fPwQN^|}gl9o7(EMXo0a~HWvfO+S zUvoS7{*De-%J#F;4toCb_H70D+P0l#*q=#B&Xe?T*Ko(AW9nE%vs}z|GJO&+b^5f< z=AIwJKcNrYhbg0M$|NoU3x z?Q*}NcQ71QTEv7Z4uk1{M>L0SJ@$~%J~@8cWQE%&$G!zm+Si}|MEikR`88UvE!rl+ z6Br@iZ^4eiw%K8YBxHMO`|Col+U|{}d`TNpOd@SBn$`)o>@y)pbT^*FUYZVUxo~KYiK4Cs=MK2dhUbHG2$~~) zNcTy`meDqi0sM&$FeW4Q!*bIzUq8J`sd{E!Uf#TC&Y%7EiN?l;3uikb2)`j>@BTN- z*Q{Co<|}IXQ1xuwQ0b?z;Vf8vR?6`VSJ%bqr(gNK+Wh+~i%MQO{Ovb~e+e+#VWy3H zJKFbdicltJuiVH#*|;)$vUJe6+B>81q%`y+^Ax#uk9tpK@v9$cx{`*8Nq)&}>;z}} z3Aja&PdnU+dK4FeU9eq9mWUK_@D3iKz2MX}xG80gMR|EejbFF@dGoW+ZvJyyhbb^B zD$w-OD{qz6*O$HZiuI|Ej(?2_LRAVKAFY(}t{7s5=yR`}QxBfIvS`tPx7d4c9l&4= zk&nH^_P_L4q>`Ckvx%SFRFj=49~Np)MI{}O_*dvbxaVg*yoOaw(s+Cm)+HAe%c00b zFvG6O9N@@6zqsL;rp{3YboL2OqDCJWeZQmX{2y88ZPFVQc(V%#?NeHZ=h^;Q=qpi+ zc8Qhv!vKefFJFwD!xoiA;lV98SNUvY11TYF>{CC@wjj3mP_V7v6fJ`zYBLMVwH zhs=2lg1{?~Ercr7?w@YB=A=-h1>sAod}_|zH4lDl{r;2HYYJyQ*ZTadf`VDkQ!YtI zTkB2|UOQVQ)()FukMwBuq2>=Re)3^;^@pEaJpT5fY8LQ*<3}HS`G?~zjeHG#Tx%=a z*4XmFx!<4os1XpoLbt1g-dTpz&xkV*xh~WjSYY5$+hAKWWDNr;5$7z_b2IuS0bCfJ zM#QiPiXxOyBMELvHm9c_tgki zTXKdhXmo^-Zu}Sj?T`@$BkFYuNoL~s#f-}m6i~8q%z$oa0t2pQ0ms_L?DlHLm#=dJ`{1H(`OKxG1ueV24402xz%4m$0HDmKlI9;qQ_ zb}m!eukUPy0-Vx$Mrnm+{M9P{Te`l3S1B)wa>E^02k;I#6x?7H01XNd9&V$kubgwS zn`Gwc`&pQD4Tvob_g-%mHEsqAa3n+}P3Ix@*?#_K>FR#Emeh@36HR#zdVDq|HfW=S z+rp;lyTqsgOot!SClVM9EDjnpN9Uy3>?IdqG*8t3l2zC9fMo>(vqMl>1Ex+=Bx~jRH`&%l)XqLBl$gw|68rP|X0~;Y z3d=yRTLui4J-}e`gMJhPN-0nJX8#IQ8e)6l1rq%OQDx8I8p2sPLQhy&B-4P`?Hm*&h_l4(1nQ0s>Oz2L`06U!KwLgnJQxMiVOj;kAPYujzN!7j;(A zKadM?Q7T*^3yCq&6Cx@)jaRmIR_S-4Vnzrq>)GYBTClQculJ;%qN9VM-e#Zt862yT|pK<*0AqImtU~cGLYrg=B*sqfiD_1Ai^Jt zs#?er$XBQNU` z;Q>j~?|sOe6dk=IeNs_pWf5A#i(bEJIBCWP6{U3|EtD@K8pxJ+&=9S8a{H$O+7xs{ zz>W@p8Xl=At(}!n>iQ##FT?xvySoxJ>I^n)t4EM$Wbai#m0`4qWY=h#kn<+%=3`RW z1*RQ*9}t=1$6Ye4E38|z{Kd^%XBC85&&{o?o6B}3KDKIQO(g#T=z;;G$3H^#bt}@=IH0mscVRgN=&R99WX9(?3i@?SLf?! zy0Gozk68oIiRSS?^FL#5?buuz{dTPC?lrcFZx~&o!vYQ~a|8j@k)lVb;XY`dhXkj_pJy+rqE>yNSr2v1CmifpKx z(|LGK-6{RN6DO?C$gA*l%-G0r0i!KZU7X)$1L<6lXlLrR{h@2G90Id4P8U>tE%#qpK;&X$e-m;HXf65CTX zv&)cIRh6f7&aCRX=Na|@f9e^$1;@*C;*R#Eoeu4sk0kD}pLmXQ9$s;cJa>r>T=)+0 zeam5geWymB?9U?j*Uz#r7Su?Ac--*|x1Rj%ol6Cs>J%VVI^Ox`XXw8%Nj=ZMiGw_u z!8WqZ6Xxazkg|cD(KrQnesjL@{GS^CgzxhMIS9k({rLXo7Z)yIKJ8d|#7U`SWeiH6 z0M+hNu)q(*oBJpX}t4}g3*gFlCVi}jB%1+Xafo1>%; z*?Y@-k=_?hel;92WTnzsLedD1Fa&f+BNeLr5MB0^wQIInD_W(F^(7^(>h9L})~j)? za?|#;YqGLG-?sL_Y15Q;t8PK@CcPP{1t`CI?8x;!ZkB1&9$ZWO;J^&GW1)>i+(t*; zPiX7WjbU!!N)cepmLy{^TEya2y;($sMaL=?!5Fnkj%|{1I+vjbH z4$Yw0K1y$EwdzDy_Czobu1(|BVh)5Eqa#aRC!7(;86|&&PPi1&)0ZS18Bs}0ly>rO zX5{zmpPD~|f75b;rFB`!!d4V!?mIWU^DIa*1G62-?an$c<+c-cMX!`}yV!snW^;`g z2S(hPZ_vD|rlyuX#6DmTt*Wi9`S8OQt0+a4X_f)IdFWWzS>dnaf5*6nZq`Xk+qKW*G6 ze&zo>a^%Asy7L>PqK@C7_j-0#yo4rAQU0;$`j6eeb&Xhbi_F0q43>Mt5v>4Q44iMZSn;R) z^8qkxIbxEUGN^}7@=f?^#v(g743Z{M_%pzgU{e9!hzG_#pdS;!HG&DWMOuCM{XI@8y#>jfdiJII()?V3tIF9K_!kv_N74id+cCh!Gk+ z6#DQ!WsC|W)!0~cIFrW&&&vCF=FH&6th!ZOx2~$qE<&rbh5d1|^+r=uYJ6O&8k`ay z78aKJe1SP3A#t|!L>jR3n@Fc}$ix`zt!X;KHy(^Uq7n>&Ol=>Wtc`aP(+^~TuH@7O z8eXH*c&CafP?Uj;*rn`RhA}_ym;u&CbCTB7WSa$NnLHG}fxC1%BbF(cT>fssda(mZ zkYV@Xcz{Cb*Ufy6C(MK`P5YC)`v?_ncTZ}ix!XPSTASTP&e zlq*&Mp>lSGdalt-%bV0V56g=Tdndn&hc1u0a)jF)?8HnUl7eX3h%`wob|i%#Unsc zyjj7G*|n>-W~Stn#wA2XmZVRNkMpSiNA!lC%*&;?gtYY7*oA1~7nT2ub_PQr_I^jFRWV2fc$yhX+8{6I=G2G9REJTjusEDo6~0z2Uxlyb)_?6=y5!``(ktS(RpKwS2k0!) za$kaR7EKg&h3Eo7+gWi7Gx_?7Ly5*?JC!gV3nUr2;*-SblWhB2vLDzTaViqwLv$PY z)kk06_tsnd)T8{njruQM&z-S(>$^uj`Q*qk=9!!O`WKzESXfLHoLomAUb$-Wma#K( z7cR`5F?LI4bqz}^!s}s%s7L24Pfe?_vl^>2((rLYAT&$5uSh1g| zXv2x6>2+PyH!jp*_N7tXhiE63zyQ@t3rOxYEAWcCsZ+7r`vF4s@=*hIoz% zvCmZ9blp7Ny?Bw?2p-F{rfxn6foR7HF%1O~al@el5er!)TG&wn3KBH6)~GfhdVBj+ zZId#jfl&65U$WsizXXcRNukx%VU-b)VZ89smtT3~-`{?F>*g5{q?@Q=f9<}!-z-c?jgBcoOVL=qsVF_IC?+};{Xp5e%8n)CtHZ(q$Hm8+A|hAb z9~NOsG>7s1E7Kxuvk)97RyOVN!y!}mSVQP)%xihhsw&z%HMe7cc))J zP+8$oRO-9wiPqMu?;n1HU#A&(^2uKvexG^$UCy^ep{r`LB`UHo1y74DNzsvoJm6$m zDQ;zFO3$WDoSC1(kF#kh`>3@;N{V_OpM3c6r=K2vv%GBaJ+Hj{QOx%(AFZmHmd&pp ze)HI|H{W>j$tlxzI>}%S1G{hCvnT(M>kE_Q;2F36m?n1oU74ExEH_y@SAJ*0bI_a)YzmJ5MFESb0$Z8q#H=mt(9 zt{0Dp+J@SnV@b6e7FIA2jvuHg^gjAu^!`a?+MBUO&^*i5008}2Jbl@1Y1qvD;J8HBnr$n-M^`7R6;~!jJTg#u^5jEa# zxTj~JhrhqkKd5MKsei*fbURx+i zbALl{U2#T;hkwY>5F`2&b^fP*bU>6lwItV%4vZWh6uQDY#<-PvZ#71Hj`a;T`lRe= zZQY(`G=})I*NaR+!`H7c2YSvgy3ZWpqXgzeKV)(@h6Lp=oU{HxcmI(YMdcIo0*Ct! z88!Nj)Oic$FUnayxqNa=uyH~0{-wo>m*lbN;LymZfIw<@G%hMd{YS>+4S6$-sXHdj znXoP+I>f`%{f;4vGbg*RT=C=+C5!ZWqtVkn@Z~9m$ukmy9x?g&c?O3Bm-x>vtlIXq zai)2W-hZgOX;k8LwlpR<#C=pi_wb*Qm(tjnmYX}${U&}I z+c0~?PgJ)RZt;U*kG>UpgDISHjP<_I#t>sgZ(*dTP)`FR z(hnG=so-tMLBXq14SV8FPxgejH(&30CtvTa-xUzR;{sBwWhwL+z&e5x<-Li)1>Wjg z9^UE^Z*Qs4!&}PtmKR)fcfaWF!6zHt|LTr!Bm3Cn#Dodf3sF&W*n|mknAzMlM>^~~ zl+E_=;BOE0Rp%Mq`P=U9Y__{|J&Zdv%4l@o$%9V0m@HUkOAZ24cBcu2xKWp);eKP# z_bv!0AbGZ9Nlgj~lafTwJ6cC9zc{^M$52fWCDz*zDB$~tFr!ESH6EsJ7QsofE+#Xx zI5TK0`$9a)4gmkyPoc+42_kS=SV%$psbY`aRQ?md?N zURcM>SUX?z-b( zkZ7g|Z&D%@KQFx(GiG4Q=th%Cr#_lbC)31`a;gdWu_~KgTRU6Yo0_m;!i1dK%3nOg zq8?QjOWubwhFUC3%kF=mZJnZ6l9!hMyn;n;R;!UeKlSufEq}gKmscB_aR1BuS=NTS zgv5wNZ0us`PW8X7c}uP=t4yDy=&L_j{b2dB$#+embo#M9bLi#nv5Y`Z48n)(9tqZ( zT*SfXFYPs`QIv-AAZaiA>&m&K2TFfwszHY;0KZg}0sJr!x`&`(tisKLHK16emh(60d<7b$J?(T0N}G4>z8vpD@$B_)drkn1~V zBXD1+w0FJOy1ccj)!Hr|+NA_lU`{*JHA0|qXca|-d=?C`=|mUR0Z^$zQm`IBH$V0y zt-UJ&aFdetGor~x*;3cfZz40^P>mkz%aAO{CAyPwC-$&C_UMDSU4d>c=p*t(4^LZX zHj0XqK)2~5kmL4_T=sM)Q}0fAXEW5)@UVMAr|h#H9njg4S?O&L-v zk-988gOavxr6wa9`JI9otO4@YY`u>uZ*3&)5C;+36w|Jt%vd+n`lITT^bbQd?$u^% znY@=JP}-dGd3*i*t^|rwDoAp&QtXoS5Zhf;LVFIV?|6@)PXRCCL9 zWL-7*a3}aM7J2UQPYC-9`F5dR5oGgdGEdVINGNLNj^lT|M9w490Yi1NI8+i*?v`kO zBNZ zh&fuiGQ`BYmhvA%#w>aG;iY3j_&*nq4~>~MvvhI(J?)G07vDQ`R!pe%o5KzF-;-;J z8tpkIA$msseU)qF!iVm@ThULIJk%ev73J=`AFBQO!%OF%-DSKp$kSu!P!G?s9>!hI z|KZYyU;W4*^AqAt;n z3jM2?D_Q4`x`?ruE$k~q$WeuE#4}uLv!Ims(7qtO1;Ww+6_aiJkrT^!Ezcr>LBjjQcyWVO;%zFox14-N4%42OiKOe(P< zpaY@(Di#x3ktxC*dXeUqN*=*X5|%n#@he}nE<9qI^ybvfn;&^3BxI^uJbv1A^(}6k zaHjE|nX{r<7|{Fc%WL%qt9|F#mUGSa48i#MT?`D`TGtD?K!1f`n~oBnl^sx_mmb{fy9Y z@ORJ$oC%r!%ah5Wa_5T|YF0JvSygkPCO9zDTd&tEUdGXZ?uueqn&fHp@iS(hKR?qr z(qp8uQ!mNxQ~W&@{U+n75dF|QhUxXDQ}QDhm}NzE^$Om4fj^Nq=g`=pL(v`A)7{g< zn{7H3jjp|VzLl-jyBh=J)RO^*p^A^YQ5nkawN^>^1ifDUNv!dIBfk3;W?YX7lshoj z=zY$pcRjup-PgSEOZAeHqF%D%&sLrEVP}Js!k?BdSxfb8*8}u*T{&W}*v|yYN13IY zLo#v@`K`2<=?s}@vum)6={6z}`Jj%$9A4Isjvuab z_uirXfEl!EX=E=Uhl#SPFsZ1$5Jl28`GzehI<}-(eRlB0?A0CoJ89t#=F6|{V6Ps( zUT@f9Fx2F9#^%;oEP48KxfV<3k{#>-z40n9*}?poFaA$@kNMkpRHH+WwbSU((xz-z z?ar~X(L|bqJPOxjNWot$*E(G|zowhCd?G_`-p0QZRPn`l8}r|Wf3Wr>?Rvf57i18> z-U!A%It=T;4|_;E+=UutyRbVmB9{v@Fl`OW#0^`frKhE(U;lw+eGfP1tNKH0vOB*= zrFdG}G`-KXw6xBv>{X5*^_lCA^a9sG_(vI6|!J@wr2v^0ay@%N5PF~>0o{xm)5{QkIM z%bM)t_)^cQqcBK$zdDLVwX#@Vhq?1~IX==zwJb^U1Z0ZZA6v;FGMQq=w6=;3bEe(*lnQ5dawf?vY%Gel<}qv~%PBL;arLAq*PNcHh#YaGb?cC3g);!v+`?`cgW6CX&8|IDj8fG| zPtwCQL*-#m#BlU6wKukBob)e*CUD`WY}0^cKvl#tk~8i$PqYHvwz`cgX~+nSL(u09MWZ z#>dpt9jlU0@Ll|m{7X4xzZ9o#*e{1vNgY%WtH#k|XDR!HXRrf5{>UnR{1Jmg4Cw^o zBh+md8P|T{P|WnOK;`gcra>4nKfUaBQaxG0>ptPDE7X%q_OY^3RH@agp-#*BtyXx;#lRf_3yp6o*s9sd5|hoAAC@GX2U?I_OKnHE^+?;)scY9T-!*He;%n{NZI2f(XyZ#;%TWbK z=8~|{r0zZ7gP0L=mys4X!bdhh2_O6D+T^^w{>cd+({)xbB6;tMGe> zw7*fk_GP1?;>7E}`sf;et&9J(p={I3Z(eEbWb0YpiLQ9*^+xp{=Nq*-(UlF+DV30@ zBn!YbPF;{Dfy==YI20*GQrm|;kg>5hUE*lA(gtfoQ^B@2^wp417vez4CVcz)q7HKY z(YrcWlf9)IHPO)83c}nHwdOXoT-joS(X>4X+oYRrs_!GJT~b0&lUlAc62su^(a_p8 z`lxQ6N_^VbJ{WbPdy7=jMvV}OB4_wc8=_5{hIy_5)e(=_XmArYOenfULJs1VB<4yy zC5|OrX(+AsYqxc<1mGVCoIupbaoZI&q{*J$O{t%c0~j9HgP;3G6ZUX|kPp=H1(u>6 zz1UvnLlS~qT2OE_M~)sBCy^muFk8gvg`EabptN-*7^IktAmsRu2~baVu-#EX_$o?E z(NV1C7K3)1qO{VoIdS_CP97ODjqPX*cCKgS!T+oykc19Jst~Q=0}L zVj24UfHtg^EiZO7{0Z@d&gdmR;dbTCX!iJt)|MNxVkCrI3fo|!t_$4Mzl+Wd*rG;3L_m#wP>UpM zjox4oXhJNon_@Q;1eeU70MT2^k@K(4m)=0h0^16rJwWsY_9^As%Xbp#cS@x-o$np- zE=!ls%}h-T4M{%sfHfB6KdiRhOum|qM14Oogqj-t-N%x%#SqfWiN42VOt^C$n($=| zPEQ~BE*QWT(DtT%{mCCk-Yyr?%!q|X#J~lF<^PZKKX^EJVP9*p8LeN9kd3{gS<4A< zob}8J>yhmuuy~P&-VgGiI2&xdZtqt^CwCvn{w~1l2;!!1a$Lg=c3EZ1?ckm{^7eh; zsnRhN2?$sgc*N}5XlU-F3Eit>u{)IRq_<5bK&)kk7O0A_&# z1~#-89Q3_Y>0T58rff^lq-quTp^fM|A z?_Cbl-suOl7XZD$y3{%|_OrQr%&{FaQPbKG3>?&?Y8c12wUzB%8*dBi(lLixpDC@t zXh4Ye8V04U8+5;L_AnH&)`P^d@9r}NW^%^ExjU{l>B?RVpI1Zf=@J941or&%N;Fp#G+aGpU zKOogTJG8qGNg;jK4i&6jTGs8X68^G&Mnyg(8!y@EFCbo`Hd3TnCTi(Wc3o3jw8TJ` zm^7%>vJFa&qxGT@X=Cfl!gI+*pJ9Yl?fjDF6YM_7Z%ggRIg*8ZfDhqcA5NY#Kmb_a zXokbbPi9Dl4hJ{+!RKRpNKEh(4p)%_YH+i-ZL)5(t{;j(_wjR?%!3WhJ|`VjV!f~b zt+HfMVnWHnZ{{zw#4KJ|d!QzA$JWn2{m1vM9b2}JtCQ5O<;n~0V@6o(q^Ikw@5@u` z)H?a;(Z(aGsf!k;BqygVz9%(#_9hNN(J;B!*i@(Hr&FZU6SlzS`#=-hKS|-Zi^x_P_G3jqKN5kE++vNG}%TZ}*;G zQ@6-_+pK~U+DL94p*A-A9#r7T^uhiU$iWC(Ba?zM65SazaOG-s*S{+C`{RN-*rAS~ zApWl)Ztn7B&B|5z{i?3c3d6fW9eiF#P-zgmBZxoW<;&+O|Ij|)IUbZScwc0=*Fd3= z0JEUROKbp+sB+m%=r@obH|pTSU5FKSLqv5nMo+pLZlqH%0xF@j1El&VAtgrd(fOnO zM_yvxr~fX+^2CV~Y*@)+maSj-)gQh>_*}lvy4~ma=7tlc_dPCu_LcAx_q@h9;&DVX z@Z&{_3$BL5P=t^~%CjFT14Q+RhJoU^p41@u^OnUW{HGHqp0K3U#EuCH8iPuQEL<5E z{^~3Bp)bEwlD@JgJ$_&5iH6O`eNF_2#Eb{TN$mKnn|;FYV-DIU><~+d1NREHwSC&& z{%P9))`X5YIC^N$IOIBI5iin}>U1NC#mJ8y>ec-u*p_cL!tulliib#xcRWGzxIs%4 zw?CoiJb4{O3LE?lgs&TnY(1c|72&#P(z{U6zI`V61JKmV_1e)AVK?{q+G@MivW!0E>A{>=OgoaGnT>rl=N6|DhJ zKKbcq7x;ht?$hA5;8*r{{me#wf9mx5NBjd$H$4^5#-IKt|MaiFR$s+OH6Hy|{nPf- z!L0$(yV5dp4q&+rItk+$A;uGkXy7=U1~V|4K&|w}HXPJ?I*&$w%V1EQrG?}O85;#O zxB=WRf$DB7$`acEe|H8+2EMGN_WnTQ#*Lr0@@f3je?If>w`$(0Krz6;Q;q@3aeP6D z(I@k+())^9cYGQXG9|0HsF1zt5$UnqLzWE{dNKCaZ!q>V!R-Mo`(OXdjQ{!B*$s~x z15Q8xRKNjOBWGW*U(K4oFf(hom#KAo>-?4}Sw6;KzQDty%EOnED`4a5q7estMMQhU zZ84>u5iF7r6y37jC^~utjfq4ju!|SvZ40xr(4*+$m8|Si5i-t@ET$jvoM$!>+lUYPK zuxWr*WAdR2f9Sv&qz*^OU7Gl>f8^?C%5bj;&tU5*0@U_TJ0I;or6O;Ag@4RflYG87 z&;MkKUY1)Go#ZLKvP8;wfWJ^aSsMN_AKLb!(s`M$Tx1v;75G5CCvr~a&a1DVH@Cj? zqW>2M4^1}(t0^&mP&4=zojmOvhf!*aVf2rs_Ba#+X^Yc=A#OBTXZ17}jrzIe( zHXw$bbOw+-7U_`3K*m1KU=!VoAHf}%3c@!ariMJ$?uox`3NrCJ z&UVObkrqg<56Y^8ToVEazr%tyM-VBIOp!f zd*+3Vn^;&95f}W(0cqJU9}SL+STs95D#UWP++Nib7e75CE-qtwd|Xr2qDIf4kr^c( z=Af}gOHfEiaFTIskl6#k5&?mpIXOHXx$ea)Ue?M|z)gsT< zR?kJNF1+=Rz_9SFk_k!a0?EVRB1K_R=Gr-E48oUb*UnkG}sN5Kk-RY&qN7 za`^dO3m2$s)wK&2?t1=ksG0qdN3Hq%^EG@N`;%Gvm|y+jmj^O34*c?mt6Yj@Yx&mB zgt+b7KmM>4L2k58_vy*?gsCd$(;zcZL=NjOW*@QF9F_*9t>{CYjIoUFjLB3Ggl8`Qn z&f2oFrse$~e|*2CW+jj1|8bOB-W+9q&aSkU$awu%SO2cNfqc3I)ld45 zW7HStrZo$MT7VUWyr}Y^N6oe`LQU_RAQBxa8wt%AwNXs>YX+c7%pZ&z%DJVQ$ zSYVnK6dWT-6Q%_Rzs9eQi>i$pH{d}aDfhnYY16Xr+cC|=e;XebJ}rh#iw_Ciks1^n z9F!{TM>A~H-8ea^`lZ3r(+^wjsKxNVD1&7ZH&c zS5#cHazSxJl&Je>?@cg8{;YGN&WG=g3qx6b5?dCZ$E$K@%$TvC^j3^_MhrVB)?LQ@Ud_(Dd4H1!9eiI8D zKCa7(K@ZXU8lq#SOu@7JO7WLTfm6!)#o!oZwTDKH@C^wW;VYh^j5FAGM3i{Zo=FPJ z)ldyPwyUCkX1)KU^qB--otrYzZ`$~@BDUKk9IYBneY^wah}W-=gBl!=Eb`EbX7fORIIwwe7c%W+iSMjq?28n zOxcdtjAKXxZtg~KmNlHvL@%jX(PfvFWm{2vStf1SJ$Is4dPGF+{@S1*v)6>|+Wn=; z;bHhSEIe6z5)zi+pFZb5{UamIVPOHG3T4PG5lp7Nh zG7D;J3xFNvpBfsM!wT%LWF{mU)$j3JI{iI0KGB#GX1<}L4>w238?{H6OQG{C)B;1`F%p9rCDsE#>7O zbpCp%GBP41zwGh7|33TJldsL1RQm9;U)=M6KmVd*S6+;ek++eH2?yN3axpu9rtZ~t z4Y2QI%=UIiDkl8bR)Fx~QnR)<`LK z6Q6r>lYSQ8%Ae-ro#7M}U4D(q|NeLNoGGHda9q@yeEZ{eDRwiTcj9sEA&2d*N419z z3I_};6l1|_No_1p3pPZj?pB+Ww$6+7u&MT@m9!m1qdKKrS_WfnZvDabl2o+}p%LNR zu*EwlpE`(kqmY%!Cg;y%qT!;9rmjiBN@FVAUm1-~pX@DFNR_P}fMm7E?iuy-i&GjM z*O33o&#HU6UZfrc@{iIoBVoYu&B$w?ipr8ecpu{7zn_UK!zD)c2u>zK-Gd?%E+>Nt zX^Z>a$&$ha4}dBCWIc>WqdweCk9KvM6ACW0aBz)Q&W>boFKKs9A$kAiO+CQZ$j^Fk zYyGR)aZfCnm6+_#&vqir?4D%KzyJQ^Ntha|hvdtuYxo8Jbrs8+H)s9q)Fe;;lxZJ6{Pi!ttox4tq=fKGLAg^Gtge~0G(UgotlGNy({qDZfJqOAhhFXMkG~Bp zQj{H#wmEPYFmT?Nv&2tX;sBh$@*ZAEnDAs@>-ZJ$&K2}1@eq~U5vbXwj69R(EAT>D zHnNn+i|H4PC#W|v(Xky&2^Q4Bf!GWuM$3+|@v_dG*WB6M-0Y@nuI$WiZr1BqY4uOT z!a~QZ_!BR!R?v7zIwnJ5k(KeFYBbyJVAVio z-LSrfU90ZOmUMGV#5JY$G(MUH8lyuNXg!g=2(jD5(CAe_Rib1Awh5`8-MPDR6W`q^ zEtVEP%Xd@QzBhDZ<#TH*Ti&R?BrR>^FUXebdwN0!_RMJ`THq(O$&&8g$X--`hvK_l zsWAyf54D^Cn-Qoa=of>^kjiJ(SJhV=StW(Bd!z8og%3XjEZ{1>nNQ)HYinv?&h(_( z+TIt@mk*IB0h@rwA&7$4!jj&wC-u z4eGFCe~P(fJxGuf`XaZr=N8pwS7L&@wAH3L?TvoSsS|W3&27&)6?_k{5)1;3kICTa zW_8<^(56@^>&aCtlu*qH$K1YIwMk}}+ZP(8rRqzKY&p`umi1)xo>P1)&+DNifG;3I zd!@u>`U-ZKvsCJhI#+2BJt&sr`=Zxn){3O7g$;$8FcesW=UD=L;z9Tkt`s>L#-^Je z9S2EdY?ABR6am);8_NI1xAA|mq0+{f%x$Gr_b*?5e^u$W%&4}F8{C4{Jp#|tzxWgM z22_>}?J9Vz>96fl#2wpnYMh{V|*ez_1LoI&VJjQFdu|B0i`(PeWfdF zRkU8A)CU$Ai?;0$Zd$vOAJbXo2qs|k4f9T|f1f1QPcRFSn{##|`-^{%88 zE)}VVq#}7PJ*vZ`ov>Wu)M_3l9ik~RRH%ooht$K;Jh@1kcNu@G;&H4)+NG9iGv$0O zd#`m}l6{7>IlF@yWxX*R-!i`S;mDEEuKmtC>`*g1B<|jMhZi;TBHZoXxRF^lur!vo zfmt?ghHv6AOQizP-PRb-JO4PWn6Or2dGzXA%FROo_^WlTrU`a}R-e0AP?{O9&DZ z0b2>IOy?v+Hd-j$Ph|3G&M|q(I~z7w`EKimjYmr|GB*|hmTE&$$CZ1g{9<#{{$DJu zkgJAgb*+B&$*)ext*?Ih<*VQ37Zl{zOia@M?$HhSH!G{$@aWf*GmGbM%$!`jV1w$J zH?cZ2a$Iss=<3>1mc6yAC^?Z$`AU6f)vL1$YgWz5N0yJUi!|SWH{w^LkV_Ck*c)CW zFd(?cNC=P&uppudQ;%-6jLG;RH+N}vR>MMN^+Gt9uAe5{E62|j^|X{mKZc6SQ?eFy z9=f-o;a+{w!iLN0yxIqA`NZ1V2c@Jnbgn4qidW&rAPcF!U+eg8#HUj!FwroPQHYFE z_=p;$EMhMK0Hr%fX+(D&L*@xG8Mvry{aaSC8ATN`Qr!{~yAm5Rq#-eBD2hz`gh%d> zeqdqBH|6E^^Lgd`dcI&<)v^bw$iAw2uzb1n0VM=mb@b+B?xTelQz zjWsigN?hTxiU^`j4mx3UP>H^fne;#!Fts>G79V;r>acH~Ge_m=mgC$D&l*F1H9YTT%p`!_C}0c^@K(@I}?_1&$G3=R?oA*MjbkQlzRBV*|T%U7v<*8nUGsBTS@Wt8a1lq*rNOHU7KB8 zJatWJY1iH9F>~I(%d&9xT;*8E`23`)cg4f_Uv#Ww)F?0CIG=#7*G7j0MvfdkdSql^ z*l1YZg8}=YiRP{J?~C>)=c9i-|(vbn_G#JTw!@NhT#I z+)c|&@dKQx@FQX1CO7ZlvL6ys#BDMV&uq65eqllSWSSegO%U@UW-c*V8a_l9XV^Wr zzGl&)F)arx@o}PLoVxwizqPlhQ@5i;Y#3|1$czET4 zdn_9x5Y_aYkWfAKxj3e**PnS|0UwJT5J9HSX!$<(3Jy|5&`B z;xYOUTpRzfVfmsG+kZ?*s>*$uu5G2cbLgqWe>xTnBrE zjPn*IEgr4Lap{|{CvUhfIi(g_I=}lwOKnX`%3=lHf418-30+Ukyr-mk&!)#oIevW8 zo~p(7&QK?{6U{;&(6G=+)O@eB9*RbSw*-q=Abh|l7|IAY z3tvK6SZGW}ymAi8Dem^5`msH(l-L;3kwtKhI)KQQDAhwSBqOQG^ z)T^L_I=Vo&?V`*s%H-N*)vec_V){fbfkvk$5hn<&J54AG?*ceh!(S5O8^MG?hDKIi z6m02sTobj>;X&(sbPPfH=LD$~dcV%Quo}-i%W@L0gBCRg!XzSXmlp#5px6wa*xW!twn%w(hUNt%H ziH@2SA3_X<(0nLFXnO?pT38-aNFqlB;zipQ6JnBoX5e{7+>DaXSx*baHG=?}WzH3KyHgd3=;wG!2zcZ&0W2+sdLPIX$l zp^!)RJP^m3MqZ-?vS{h(qAOyxu)Pv|{eXRh8PUTJjH)O~g-O!i^vLix_!4#O9TvdP z!dN*g9nWd-iMwt#XHStmC8;Z+qYUYO_B&oCp*7Sp{Y&MPs8YT$pPEw5yeqSe@_01faFi$oDu;|I5 zrcnCJh_P%kOQN@i0;IYqYR&4``PtVVSR4Jfzs0P1;5BA`ef5LU-&()y+!Qz|y>O>N z+4XAnCa#EI3w9}nopUBm3f$CbkZ-(F|6t6UZ^k@W{|Z05@1eCOG);cTwDzHW%-qy8 zGksFttIjSz?j8aOXdBrFA>-!e(c#tlMsNQb=gCBT9`2y zQ$dHWmM%h&vCzP}`+!14M?pYnFU>0LEh@F{pX%N-_;S^*k`gg)>iWqO_t^4Pd(udF zCWE1nI2E@65!l5g$X||5iv#IYsWzb#R3aKJgCsf|>~tDnm7!aMc46e!YLZsyBI9Tq zLSu2eNhAYzQ%7YVQE35z^HTx>q<`_E;MoNq%$^m@De<*PzZ3T;_Oe}2Vgj8);8ZL` z+tk!W&IChl*=f=GyAF2FsxU7Ib5w z+mV6_iHodaPv%FP4`A|cD2ifoiU$s>g$p;8zZM{^~ycz8VFeMxQnQmRey@GqRR;?YGVkKQM(JI9*R(~CP77p*hYLBnnFsOqQy;JU{a zk0a{Sc(XXGH2O$~2!{R+-mv$4gk%FzBiw|k3Q$UFT_9*P5n(1u{}zfVsoCr-QB=4t zBfU`hBirA>zwKJD46`maq1+H|8K}V%3s#b*KX;|ga&|AugQ$E zw?yWyNhSpmQjtaIAs88&xd@*>9%cNHtsq|vi1abW`yALYJjV0R@BN3k-Ld1WpVx3j zZ&ZDZYz}KyuU)IZ#xt9nRV$v<!%21IVdZMcgtTtq|!#1Rn@5ed;IL_{P+R3t?tQ^IR# z<|3MznUR_6TB)nlQfqFphGuMAZrjiAuDNQh>$ZMfWo91#@6S1dU}?MmeSHUJ=FGW1 z*U$60zCVEe`|m2H^cMV^!ZdDfn;Kf&Lc@J4QvS|Y$CiWkaUf?OY}o8@sxq?dQH6K58)x1GUDPrr05v(g|Jim6IV}+ z6BrRmcMOj`$O|M`!KcGLuzznNjB@f$b?l*=#%k}JoXV?LJ8q^g_07qyykg1yf2ZCB znBse(`_0!@&0Ay` z2QQcQzgkxBy!qx+71hb3E2re_ykh5-m^i1TcF73@0wvC#UAuVpoWw+H`y%@CdG@pl zM`tf$aXlvfq_j`9cY~v}594|uX5nX$q{k?-5t*9kfk6s?bR@g!Zvz?~KWYR?$s6yY z2QBGu3;3B(x(MXM3eZQhc;&73>)-9Zabx#)*W0gJ+islgsl%)1BkuF@C(G*Vmwoby z^(lOwWna;en%<5#ChoX#7Ki@+yN~}-o!|A3kAL^~FZSNJw(Ht8=~KNtC8ccMQ!D0` zrHmPatrbsUE5%y5oWAJLa{h+Hik0uGrR}emcc+Xw_;ZIbDc#Fy4yzU4V;ne2d>qBi z1fstApp95$31*MpgX>G0;UD!nMnF7?&dR_5^5>EBrI6dFZNHt4t`R&>pJpvxU2N@{ zGyJRGqi+-M^!Cx-`&-sCgML@=7e4)zzfdvg9OHyl<~yq<7=QmEy@n_ZhT@{Cs>g~A zcojcZRaJy7>+uEsI~MS-78Vs%Ru&a4{BZEjX;Y^pB~6(+4fN~Y_k8*gNA)6b+u_iD zWdad-uA&^ZM|oi%Mg;)&4pA2_9a=kC5e7j&SX4{+=v2Q%8U)lNdg%1D9wFnf;?nLo zO#(?~;A12QBszo4&~%;c0*!}Ws6F`93VnwrI&!-B?Tm>Nob>Fy{HSP6hyLlNW5?dR zp$xRRclbm^e%!o%^_p2F-Zx_&d(1RvLZ*EWk9*TI)oFOd!~j)bP`qcpN;vEpGcqAQ zC|GIx=Jp=Z(ed#{`w=6f5)47XN4uR~7`I`=3DKu;Vy0WKCORtrO_SS%iFuZ<;lG(O zR&P*^{lfBP%c`d1-gso`+>P=1p<(WB*+!F6Gtcs;g^xYe&|{w*qlb=ugRgabgqvpQ z(4gRvks7yQLxY0a!`oJH1&sq{=!UzPG!R&jBbd1zK-babRvI4B&n7OKl1)K>GF;w+0Pt2iop zg1C1=bkrM{cmnIb#K%xM?qx&Qw+5@MBgue>`GdKr-!(}Cy5+;{{DXr;*I=kDl+aYs zdTNuaiGNZ{1a63er|_n%6H#mBiYFJ@Zz5q z=1tM3WUi>J#5Ji4DsNR*q^AC${4qZ&zpco6;%9WE$-=194X)Ee3XVlyE@(kf(xNZF z;COxU@p`oa^pn;e4T3Z^52%@#Omp+Rc=A@+~@lbB>@A)qa6!%`;cSgRjG23Xa zx3&~CG!zK+bhWibkba-eA;g8EKC&`U4!nSt z7;(ND$q^E)WV{MuX@5u{JKS5GmUglCVq-~f??v9u%B}UR0%qN_N`v|Sn_0%C&9XlA z<(I;$T))*X=u6qq3%X9Q8`XTy?c8_MR8I4?jt)ubQiqv%U$h9&%N-% zxufm7e)+%-@@%jcC|nD*!+qYUZ|M= zSP}0&@bVOXzRp3gC(Ft_Ip%&4p86=# zb3GhS9Z~m>EEY-|XP59}ob}FjLs>#kLb;)RO~O%W+fYW^?LCGb_Cwrt>&|%(lnr3- zwy|&q<5CTse>n2AK*1=HQ%M*g0|ta>EWDD6>)$bUqQhy?F}HTvsyDZ`78S-?OhDR8 zPR>!C*nc^*(mOl5^sBG-T~4d^HfEJyRI5+dPUnZCXB0fY_24s0M^VW14X}oCo(BPUjr8xK=xqimZ^-K z%oBH36`Rw&GN&h|q$Ezyq(|LRs6Mk7=Q7)~y%nzch%9q)PH86CUH;}Q5 zeWKz{GZS?iEMqA%Ae!>6T`h{bpx8oP=FpCp1gwK3@j6Q`vmOXrm@ej}OX_uD zxd)y>zG)<*+7os?S*l123})0`sX8p=AGCIu1rccRYR`b!*zAB2e*WH;TT0FjTRSWq zhV0i53PpFgILzD6&nFtTxpDdD+x9lDo}686I{yM2 z+lpYlHom=7OxXEp=d=990Cw}c5##2R&7Hy=d2D$ro3OdZRFgA#^(vLofzRQg9ZT1* zZ13*L&R+BMu6KXcaegPiwuX|V2o>Hv-R&nYAL1W;C-}3oZaqOksn%Ouu*NjAu+5*n z(s^v}+O^r)q-VL8f_0`9l7GLoRN*cu*g=FC-g<UC-3#^BV zI(UZ&??ZZ>77wuwUSuf{a6nyf_mEPV(v^3)%c3CfL;Rz^Fn(>%vj_J;W4NDtaQDFI zrEx21?nHMFo7$SnK!3r|UyJlEI0Vb&hj6i^*OAl4*v6q+6XWM!ImIET#@{b~ z>k{kZn&{}lnZ`-sQIQ4nQibg$^UeVr!5D{};#m_a?Yo}Zyk*UrnT0OS21CuF&z4Th z-@jz(o~gOwncJQbk@5CZDl4bh$45qZ-gbLj7&ap}*V!d3Z2#1$o|+J=b<-=aw48H@ zkDD-IWK3m-kLUYE&bZC;x-GcnV?~zlrsZGVv*&95H1v2sEg6Ej)6d6AwrUOR_)z@8 zr|So*QUdppXgaWkCFOTNKh4^~V5DN9969+M`S3!XElyOTAG3(1)3sxQmm*ctEG&BKh7D z=QvPRn>YrJmKaH}hKUK}+klBoa~w)V&{3+rjn@RFmkr~f`uKxK(I9cnqOB`4)nsL7 zXVsX>>gpzsE;fzHsAFe9C6noAi76$sZs3$3igA5o!edN}nPIUhCj3%x^7?1T__G;U zLwVwCJ3$hE&epvmWs+8RC$05IqAAV4` zNs3n@zmjzmYqYytq8;h8Wuh!4H=*;S$R;`qdRl)X;}7f0fDsPVIyj8wtJ~#kP#z$N+Rt{p?x)dH7psfQV&Y!eO>07OM70d*_AeHvU5!Q z5d-d1x5e*cx z3kQC(c^+sR6(rOs(qTizuCj|_ZUT)Da>7uNE|x@sU{x?!26q>baPkUHbU~;v#jD6; zXRx#guf^}TG0$wiS9CnNd(X)~{NhMDA?*m7U@r&7RZPcslN5m9vYB>O+6WV;_I) zrLo%2et!GG%kR8Bo+W-_UhdB(a&7`>5J7G(~@nP30zj(MR~lPuII@;hVhSq1EoY%0g^a7l(~t zUA6pUrFG^{Hp0iR?w`q)tT%6F|9n^*2>#}k)k;ZsOE&Vg;L(imIrW2oND6YgJ+4@+ zSfOZCtU=$$5?3yfbPza@blIy-O2bKHK?Kdi7y2AT03r*eL$D+IPxOME5-}E}>4VV$ zi@GmU;Z!0RHd;xJy2SL^xd)Py57vn4tur6eVV-GuDa+slTY-F7=iA#Wv_KgnDvpDX%7RSh0Im5Xsm0MAk_RD^!;56|D=m^x8bgyDZwQ8#F0tQ> z%0rF3Tpno8#Drj)m$Ekp2(nVK<|x!CeMgEO6HlDe`NWuNii-a6Siuq#_^NZ7))^mY zn0-XN=TSHB(USs4)O&vVt9kQ2`QTXP4jzPn)57r?kx|9!@}s!MyjPZpL zk!k70n0A2jX#0E=mcMl*Qx#K4B1Hq^?N@a!D0Kvi-hK-aI zMsR8u_71Ukck|VSMfiBTx!XH9*t@&?_=h9z&)IFr5S0md{eAC+B=dp*G>B(_5N!xi z=7f5ARXRApn*lGTv?7f=e~;chORY^uhbno>)X`(ZLbZ5>geE8F=A?`Z3wP6MH4&ky zqd!slTTO-l{<%uvLxd;vI-QR%2%NL8Pf%z;U}%7^pOcG=i(jyBP=Mu6l(P-4v|b~0 zVv%ly7lbN<*N6~n(r5=aSothW$yakL6M551FNtjM@54`Ld?&K^l^>d~dX0#RO3$1y zVO(ltv=`DUMvY8Mn>;yXbac447cXG@rUV#n3s3S-(Ra%GwmuOfmG~scjXEZh-~o=; zCWL_XRdq6DUlUVD^A)U_weWiJ0N)n}Bc386z)re(gT?kh;oyJr7-b!%^&J=Yd_TDKm-RVr}l|!ZIQ&mKtN{6PK zd)+QycH4WCH{IW41Dlo@WswmfOn`Kva8nXg7zr>;m}X18*ZU)D>CQiVfC80nUd5>*EieD<;A@Uj;-)Y6Izc5NK@ARVx0Ra+cq&sNlChN@3i3 zL5S|VDnuVcPN`y~%{qBfIdUUY9oF8xt3AxkeIF=KS!=DI2~m8@DIuCXeSmrahYG5* z2kQLJ!|IG@BR=QH&sOigNOd-q!H++ceMgnPQzU4Q96icPrOJytnk@&Y)(0$>Az}k> zr&IXuw?%*R3S~2@4`q}BUF5;%*?ps43N+qlAQnhV7SUapVez4tP0%BWPnKv00-mtU zxq|Knk$@|$WAdr!91v=4Z~`1Z^px|DJV0bScRwZbh|{`j6D8BPOo;|)kp~%HB#}AJ z&OgAuU1c}K!+wk*YfjXN$oPo#gsjPwB(pCi$>^HVc$tjg@LCyB~`ZY z(0CCQA7JfH#oA4NZlhu0Cu@nU*FdoLz&3`7+{YuyYNDr*R4G3LI3xPT3=+I5w`{2> z-?BxlDBH573>)98hxr*c%{f$G@}1aQB_jK zZ2TK5L{ZC8Waal|*?4`lWlQu=6kJRx+p_uNY@>1V{VGh%DleOqO_h0cB}`P$>`7(i zStzo@8_M%q6B=_+7@c8Z#+b8Z_d*s>XC6NguGYy%#hzK3NB1cCq+4S_0 zwJ#Y3DSVRD!Qa0I%=ck z9~+ewjFTFS3wQYss`G=&iocV<%7I)H5fN!E%!r7LM2h&5=qTY=&suJRr$iqp6tEE} zDero$#9@=WKm?)>h%}RULJXt?4u=Jl9N=Pz*CTPoguMZe0$HCc!B<0#D}g4PQMOk{$gJCs97azz4y1Qw*7pKs)ynk#CSC?i zk*Wd&uQO+6$;+!c;_STE`Od*Bs)8zRs5H0I*>#t$sLR!UzER6yx1d+evZe?hA3lc6 z9z6cir5fiW3-j{0ir-}Byu6wt&N0sGocS9thw%6s)v}-AWL$;57|@|o-cmV-s*Lmr ze@b|Ig^+`bK0*ErmiG+$RKYvO17-s0^JvqC{k}b7$%?nW^nQh1yP#ivV9uQz7kp+P zSgqcCV72~&x3$%~=Yz(LmcKQ9(Br$GYw48Pw+_tmyMVY`I>S#`;B&5X_4*c{y<1j) zC>E`L|D4Z$cKuWR>Q`sYdUdt_Q$OogpWl7BdJBpUn&0o+?1Zs|FnBP)5NGix5gR}a zP;NJ#3sa2WKwUDgz?J!jnep zPetmz+_gG??ew?mTvUD$`jC_{`crznHqzHmJ9B1de*IJXWqh#*@z*TJPZb^fZsuY` zdeX2!{pjQnJ+7+NdnLPTwbSdC9bIO~OrQfv;b9TSBa)N!TJ*g(|EcBEJM#}NlXM0M zKm|?f$C1lWRNR-_B;o-yvL7PJG1Le3d_=<#V-y$rpcYMPmmeq=(JcQCfU9Zx^dGfT zq&u|}tImI9JN@VATvyOUc)~*((9_SyU8`T7KdAlCuyqeKAI1;a_vD=AJtSPaG|SmB*vYZPE7Xf= z`(jU?Si9~+e*L60#=FtK30SkpUhRn96?K|mNIfL%!PumZ{fygvDg4VakAEVz_kG0n zh@&j$gx?V~=DEJJ>iK}gJloAbk>|@i+-uh(@1-<+!H0Yy+_98#tYcz3g6_JJsq3Nl zQZdj?I|c4F3>Gk2z0y%Oc>$7@?~?sUYCIT9ePw0BeHgk%K#JNu_1H9CxvNCqlB4I*_z=SF@J7aDFaq5uhngc{< za3%{Y+pGo2$)!(Re_}2Iq)uNgePT?qs(`NCR0i0m0YIrchwu|Z&OqEZp}5&w%qP4Wt*D*TV;b-$!@bji-JAb&h@e2*}e&&!J?dWeZ zS-Mofpc_O7gD9oqEw*`mm{1H zDc>yRYmPz{g;xVYG;pbezXSvLplyU9(C$=up4~f!dTHSYWE&+i3#cN1E43Xe;>2`` zVAc~obdp;+8W}rfqa^4UDJqFC_G19ghD&CU`oKI84UYr-bi7>`Vi=*sqVB0lMDuaPuhVM@?=2nw8tN(u$2>I<4X$TGn8(+sd*-h z(4%Xfn40Hr{;s63GAT1NapBBa%&416C+7yRta0%rMTSiCjey+#lV1!_x|S5q8<&|m zZeGEV{>-g?+cC(~!YNKh_}y&8{f#d1iC;DEDTA&ADHuxl(Zr-#5s`(DZ=JWftRPBX zf(XH+**=CwI%9T{bVhYaM8wQ_8|Q7BH!~tc_!P4Psa^g3?r!&^Y_QlOzW#I2#&C=a zJMfb_*lzToDtgReJ3S~jFokrYN21OnQ4A!63?xJcw3{A*AJ}gvw47KYmNp$T0!8Z! z9-GI%&*z4gPNOp4c}zCk_ftQISy?4WlZIQ>1Wz2AY5f>8+$O}y8`c6M9vMF9{h=RO494&&ydIffd;A8mHeI+w&@ZVM5uN6bF*V` zPzvfD>UzuuS@Y*JA3w+8by84WmO+F?{Ep}G*Hs#~A$w)?m7a5_eznz`eaZgz+~)L{ zQ7Sh}iIE*(CgrcipYglA(*_MQtK=2W7=4WYn9-9wHA;<>y*X2bV0{*DgX5Vxb?Z2v zc<-@eb9^+G)G7A%G#(ZApkGzFN<0L$9R?|Rjv<{*9CEWk@|9xxrOp=Z1#)2-0(>fX zm^`pv9D9F2ob^L&?JfnCW1(DSGG;}~j zB-Vh;0P;47fV62dnvm&4CquwVLyweqGUbuYSo(O08WB~2_yvtL+Fg{E3CUpLE*+Hu zm59%W{tt@@QD<-^M7SPylHA3z&P9Dz&gz`sKuFWRkxPrGuf*2qsM?b0E2BmyMK3Lu z6Fzqp`X+~jgocb7TU=U{7dyvcVMay$_+YP`8Pikq7mu%6K?$KvsR3Q})u~I1lBUnd z@(&(gUol~ULvccW;rtonM&ja-WZ%$&=Rc)W9v_uonC0(ltglF~axleAeQaA*iWX;J zIo8kE8u%s+S=OMFQc7z+^uc$k=Z8M25m8B+Khv>4>1O&ACi`eS?cF?GW0N&H)yGO7 z4}G#GRW9 zOU2E~OPB8!G6!X+DO*3;7@2LFlM~q*K4rEkJKUHPYWtZpM;XCyzxVFCW;V3*-R5-w zz35z>|DcCJJQ5*b?zxy(+|2M(f#ALVNZ$h+- z+(RV#WAhz$1wBt7>!3;^f}~59hAQbXhyi{86C;q>T(B^hWv8qk?ZL3NOX&LuA@i3# zM@Om8qZiH2ZjO%LZc3$_x1*EBY{8c!ez`hhr|p*@xH;qHcD{b5xR=fF*6V?{XpWs( zuS#-ua-TQc+k5ytcPD2)*W0a9+y(2pk z*)(M93t<_ZrPy(bqlYIS;(TAx-?3$!NqcMq{a1R2} z#E@hf4`4_T^nmny227_7(Z&${DC^DWpde%PzKZgW#=O+AGy2>%wX(hZYu1E5diYgsG(Cue3RxAyH9obTKczGsbmjn$Di+_Bzj zwXn4}xRe)%%KIG3I~ILMek>?2*@p)en27lO5)++Ak;xU75Deq&TB7mH5QFtfRB%X0 zQ1t$)%7be{BgT$>%-Srrm0HTI<>kWOGs+_X`sE$bAwh`2XT{+`LEFo>Z7biteXK4h zD`mT7ul4#t7@8Umu{FvNsb9{ZOlnA43U}%Y>PUFGZr>uT=@NIBTPm%MZ3hLnJFG?- zWd2INxK*kU)#nvl8;14|0v-H!?Jsl6QWr?0<>8H=oD`xTrj*j_?W};<2^wRl)hz-<7WB8`l4QP59a0`90fw;hiX-Gv;$7 zG-HV zuUB=ZrBzlnEt)&`87&I}qS=PE)zwM+bQ99^3yl-~s?%fYpE7@3q81PDumsp4Uvfu_ zml$}PrOux7(kopH;u-t=%ZA1$O8LQFzRv2lcHJLK-dt4mY;*6DbpH24Z?J$4r4X>g zdRnDRExmzuJ8dpc;RgRdHQ<9UC z780s_FDKxxVa=9O9SUP$t_v7b}E)trC?f zw$_#j+doh`M}`FD#!8eaC?qmJ?|eZ)W4M0Y*cq&que@vh=T;8dwC*+5pmh5nIA|1q zlPFm%n;sez+&XuX(KvA)$WmZH=9pGlZji^22D8DJutqS3LJ+tsO$U!u8bTQCi3~#s zZqatcoH2$~M|HTLrF=JT6r@uIOS{^|BgWD{~nw`V4Sa;ve z1I%&RH0zD7E*6tlX&XRYl?KkG0VJ=1Kc3TS%xU6j`^!l3xoaZLX^0m*s#h}$_jhgO5ty7*L@|=>CbA@ znG58HKfR{1e!W9T>HAy9nI@XkG}gK>7lsnumDVGf%F{{+{6A?8wa{|PFRF*~dJDH+ zdqeP$K7hwA>naA;5@{~|M{5ZdKHGzSVma|=oA||nC52!7H){$D<@Hv@z`BBkfo$b6 zKc$5?<49Va?F9)aMixKx?n)s3AP*cVRf6LsVn&)Gl@#p>p)AoQUhg79?ELlAsfCr5 z3s0T;D|0+_`0yeAz1ec;P3Cm9^JHaZXD16aHh%L0)H*QD3FUk~1m>}xM&pxD-gxp! zqtWx6XF)-4L4hX=uf*p$I#N}?f9*Ph@hM$ip7L??u5Rh6H# zr81I@F<3&hksK^ki4+?RmsGtAGSY~#3@}ep*(xhfc3$QGc=HgIR;i?tOLggdm;b@o zaC!T7OW6;~Ty?YR5oLaId4HLwDoumS90R&@-lh-ml{73afk=;r_;%tR(6H_<5W&%y zB=!;J3~E3VB;M})>C>kz+wyBaTip!dI*OQX-^OKX5YplnGNtW+VtB%#? z`lr18&QG^n@HwF62buzSX(}WEa{$+t z-7kk^rM+K1l@6ssp`^@YkHR_?x-0Xhz5r+!Z{O{Cxs}3hel|K1K9K72pMp5;n?G+J zbL?2PN;fLp-_OrKe3Wig!|VL}dGi*GgP|AxJp=vjfz@@iA_u+*2yr9F4RWR-jih9= zge#v4LzZ|;%_D305HMHD4py0)w_Q>szc4kglDENaGcvmUC(`vk4A=D&s>tgNgDbMC z0~P6!>M`!W%n{v>aU)6@02Ji2h0#M?vrWlPjI?B~)wy6Csk;%jUfKhMGGOIY(PvqY z7-KnqRyo)FqFrpyU<4g#$YVeLSZZHc&!)jMV&GE>K1{EJQguMx0_lW2*`N*7$y#n{ zv5`gp(4OSRfz~Rkp#s0nG_z|H&;o(R}-@8>iLcOx~vHkCN8UE+PY;ECs?{4 zD`M)R$BuH#QAu|MdZsFe$EXgYe7uAw8lV)MU6uYpuFgUbmCzPr0t`55^n<*CFi`o) zdy0Zeu;NN#D73Cp4T;^RKe!A5*zP>vefBIXV|!WI*|U82`B&DrDiGLsH8@f%kvjB4wGl^&vTL$_A|C>9Bi17b2PWSR!~1c!{IiX*GizIk8g`6GAE? z$;<)5j7kzyLJB>iGBz#+YFp?`buL2`1=D}d@3htzx}7(r8|0kg zJlnmcZdL25LZ=Tu)MfIs4k=>`XN*m$FZ3G03@g`nZ&|jgmH%tu!8cBS_3QT*0X+V_ zUyDOnUMv4aGkZ~*!|$Phr;NKuIwv*MmmC%|DTrbSNFcnxNu#fp%&_ z3z4v=ps)mmomFnu?>lHQJH#HN|0tDVj( z#Mj>xH%{pl&b!9Pn`(#pI=VXA0|rE`)@p+wUI(Pt4t4i%O&vAT*K>Ga9Dh@3NH3`l zanufRa2*n8Z|^ZoAL1V#lv?ZPuhym{MS2U&Jv1nU9sJEN_;>q1Pmhc5NnTUG>fI07 zt}~qt^=p#OCd8(H{tEy0FhA|>9US5tFnLybpniCKWY)+@6I&ina&xn{_tymndJc2( z)5qw-+($=_8IzN-qBS>l$S~iuoYuxw?e2yVVY&pJpUW_hAiXY74J3r5$D7x_0N?H~ zUDm9LA;ZH$e0+ulCKPU6wYtsVJ93o4&({?vhXi=p+dFzf2ldPjZK`vGU)HQiLEa%@ zo_f1XEr4Bj{G9LNfBMTQVR3I{MAUFEui;SwRUG?=nPWDcYAw%puJ;OpG!t@gxoC1fsWyB@I^*tm>KP7%agOjhTMl{@Qn^s>x zt+G;Gv0wqVc!Z~ueSp2ayEYlZIUj+7xv_llgg$9#5fu~U)i?3BFzKdu0HzEFi%G}o!*dO2#xDt6{Gb58b{AC zeJF~hbstx;ecLOZ8JbbLDP@zR0DR-?@1&nH<)saqUh^~rj8x_TYV^gz`W{-ev1BXf z7S@|TnG)}5KRh%nC>SNg9ezG}dR%VI81HcXq_S!HfY2~MKSzg2c`r3jo}QE)lj4Px zt&-mK-VOM%eGT8};XuQQLnPl=&_W~DM~cD4e5URXaVC2MRy_0$Mdw5Vd&t=i^PYMs z0KMUcC<)?9u~@>N8%p;?teFhQEkf#erQEYRmuFm`6X4IbNE+teOzYJBu`XSp)II>W8vXJ-h4DjMF`)dq_qx{U@-!d=@c4Y%KP}EDtOos0=FU2U6!CRyJBbEv?HhWdQVxq=y+TltCB&H4H8CA!HEO6SUD zD}?NYC|Gbs0ibsz`B0LdKo?-N!lEPDjpNBWGLA`xf2eVF$o)d5A=wNE+C_2?iNxaW z6Kn}va@?G8isdzGt0yVvn7bW@DyIv_43QBYY~IU=5LnEYShEunt8*q-!_j=^)T)HU zHf+ITU^8D2hx;X`PFTlY4H=bN-8s}@*iMjWVMB>^u{g0Wn$E0lOH8P0$MyJ@+V)4~ zml9#R#34ri|8Mz~Gx_EdZ29rNP5*uQPyFYlCz)*#_>tMryg9>HmD(P}fxrxH?j`Wa zmwwQC0I7Fy7wBx&137~2JRn4M%kp_eUVZ(6l;q?Taeo2C3bHDENK~Q{}oF1+kS37~=<^qF3`4dqOS5Y9L31`w7_(ezcIEss9uFrNUE~iCY zJ}8~9m%I~gS4!-qUez^rm|E%cxxM`-Ax`#@-ob%>VV*nVeYKI><2`)5cvOgohrOTn zps&Y@NVT1hPgGRc+~irq9G8uW8kNLL48!yb7DO>Yr;CX4^$S@ku*QH9BLV_E`0|mi zh_v&~vLBW`%*)k+V**>vPC+$ZpA((zJ4_H<6BGDF{=q%u z4miR8FjuGlWLQvOgpe7DT)kCHd8NqLFCa*%^n30I|6l$szjjaYY*dW)W9{gO$)~>j zvhy)NT|l5x95;Ds^O zuWR#wm17EWh$@&JDRw1h3C?8HSt|PRDviQeLr6bgS7#lY5{J}tVeZ!;JwaCSOgJZ^n0PS)#lWgVMr>x88NbOXqp%noj(vd@7mOxZIk z4f!=AVMPD{X${KnTiM&&mD_tN=08vHXBB-~<_~|w0C7%00ROXZp|@qXuV*XIYqhiV zZ2$R!ii*k|+bSxoP|17aP(Wxno#iW*c^6`ylmARNbRYs&Vjt*nCMinMPQ>29Us#03 z2>Ch(>5R~FS`u#QF9M1Va6j}X8ys+roNoeryFNaVph$uZfyC&Dh6teR62XwK(6|cO z$cx}1stdfu*wo+mK6DJpC`;gi$x|FAUJvqLQ|aye7<98z1f8Tu2gjp< z#Dr{B7)?n36iu6?QVwaB{W4G3Pv?d!7u8O7m^76jR%iq`f(VCAep=-L=vS=ix zdjB}P{Lz|^1+(>na?MB296Wx!bKkPMX?c0m>Xz-Znm&5wBm6&ORSOvBTAWPKmX9!-`7g~Q; z`K{nJfxq#M^q4W1%p>~xloZxO<-7L@t`zEr|`5zS-(YFx}zfd3icgr17p*UHqPa zXm^Yo*k@IQ#gZU#>49L{^CI`gJ2TRtsMh|WW9)4aUSv~de7%^^woq2VyTvG z_Dy4!Y|Xy`eYaOM;D_wE4(~jfz@xa5o005zM9VJzq@`N+cc+0%ivaCLeIx@TUzO~5O6TX}g;YYZ||AE@cXYxROBpPDnLIVRm?N^iS(v2Fac zF*EWFlgFkMjh$T?I|K8IE#c+r&6rn_(#SybkaE+;E=vm{Oga*Vn6#hLq(I|C4G=H6 zBw#^x_0SF&x70qxt?rvTgT<2eG+WWI(#qBc| zS}$!`y)xU_x@t8GXm~1T^5iM?4T8(o88b|CUVWLhy!`4M)AZ@jvG~4LezCnN#=mLB z@7iaX+=I)T`&5d&+|3(a*~f28MQXMUEi7xp=G;8;-n;M1Ivlz3MnQWw3HT>-F;c+w z%Mt|o5o4MpYgw3r$nRjsxkyapQ; zIED3}BArWntZnzN7s@ARS1!n&yrW{l4rbl407tQ9QSYdt8DF(S?4wWmHL!2syn!u2 zoSgk+74CzxC7zeT79*aLWCK6MMUmeg+9Ob+P9AY2-Ri-;0&EQ{v24r>gGZxHYQVlB zin1(TbFiuWV0pN&@4+iq`jRgnI)s1W5&?x|m6c^(x+J_@lT~Id{N|gRBf`UCYsP$I zEo5H&3IT$bWwFAnGQ`0W4^FaPCFXJ|)-pHnljQXnA14S7s_OL|toZ8~H;!sbo;#9u7HU!qjq_*hD)c4x>8EaCt5E*i|tquRI zP!wueRZq|7&Y@u=OH+%vV>SDzv^2c!gVgBAwlY}ct-WW@TK6Ku->o*j-@>a=Mv+a% z{P-p2hcDtP5>P@iaAJPwMGtJ~#XyRJr+FfohM>(00fCW$glN#wFoTjfL>;_wV@+w< zgt4D?o<00A3(~~I8RABc^f5(dOenN;EyztzbIet`dxU%e0FNz9eZSX@y6$f7nq{I8ylIuRj zbyKLMY)6NOPyem@fD%et$!?^iX{#^nM#`M~x2@0bDXQ=8p%Z%0ri1VAfB*i$(m=$$ zX*t9bZ1z*Mo)RNPPV25hwn0iQgSd5k7S)%eA~wDMIfi!NIQE?Hh7F)SwIni9;^+F? zzzu$S_iG|K1kj2bh-!FXoDWpP+}>SOFWsZN|GumZnp1?2Q9>#_0dS}Yu%fZse{UJ5 z^8Vc+D$3zfa(e~pG;psL@g8`J+*r|3<5EkgLOt-D8T_>N^vKAP)b_%9F`=i2mv(nQ z*k;2AYC=6h6LkQhec&PHcFGUaeI9)RA#mXS-PSfbK<*Ag1;ybE?vFuZ1+M+>4|Fi% zZmews_p$V#GpQX;V-6E4W*k#5a4L#hJ zQ;>gb_mRWL3{T8xDEiIp;=nPOj>RBv{&P-vRDW2%ipcLN1(|NOS_z*G-t~tyUbHkjAg7&qfxw`mu-i(dSqT6KQ zex+sE@*RmbfUjDGIW`s4%Ma^~!nPp7a3_;YT1NwAhe=ErR1DKEUMFm6tXw!QtRMk{*!fKp6j#w+pDRIKGX?Z*vkUrGz zwr8v0M;k23d(z#R4pfH}5`znY2jlTXrAQPv=rKgym7UVVSgpnMV0kQkRF)1o|Ds(m(gIz6qFpjs-N~PB73*>#`V`+R zwaaSs$rNaK`rAdiyXHS{7gpQZ`JXh(5b2Tko8@@bWLs}Nq*+McBxC2hLOKtY{0J5I z`)XjgQ1_st?)MXV3<>kF)P+HIBd<{hL4+OT|CR#x9!ao5vFk3LO-S5R!#o$k!^y5$>{$_;hPGcwJw zN1GZ?2o>;R1bq|R&z&QUl(KST9SVYiE#DxQM7hAalkJrBasOrekdO{J7_#tx)IR4y zQIW!y5|sV>2I7dd@8NULVN4HTt5bxf0&I~B5h{c{h*FS-NK&1xmE6&ZbONXtnPdtr zHOkAQ#wkm@^30}U=VEnw#w@Y*v5A>!<{ahHtY}MJOqMvAbPKF7C!C-0bK%Lw#q5mx z2%)t&YXYKb_`&d;zIZl+zX9pgHploz(B1LSQ@9bj&+OTIUh3S*Et4m&Oi3;; zuUq@}%Ic|o%RN20s^bjb*1?8;_1d+G^H?{3^F5D%0CjnsVM12vsFB8rv2l~%eQD3^ z*-bmvJhO9o`P{K7O>eKutA3CF&ybh62P;YKGXeAFOCBv0B7^48*Ir|z1GQReQ%6NV zmVz_rDdn(CM!aacgyEBmxVSUthe{=bW_YI z^GISwgtNqn@Us}n_(X7gCA07zENjv)`4~7nq%l>+`uUHv*vI&It5lgI#ea?T_hW|W zC}ZD>NyX=4MgW*F=3Mb4RkJZF+Pbs5vYY;i>tF^jJKfz@j=UBu4tp!Rdx%&F_x^e> z0yOp{C~P1irUZ>^7?aqwk!T9?g$WJ{4k8!;6&y3@eEw3o?&;HM zWo*{D@4OX|7W(l~hCynLxAl?{zOMO-nTlD^e&xR<2 z2@0}?F-u;J_>(mCf$)XaU^R*(BZ)N0p%icl)X=Y356rPZU3@~EhGswVr{QuWG{B|w z;ejqyLxNGOXFt)Lky-jgOJ;_(f!}L=EX-k*~kHrssU1Q6id|u11oA|ZG2TVBTk?&wF#~jn0v!*#62YMXqm4$bpE3qiPefQKvRe`ayQx#jEuh&Jc zSozDN=guAd<;s;2eqjK?ujm$8)9Q2QRySeJqaEQZi$2dH8VJp}Ya+$jKtYV)2byDc z(o_P$(`(%&eG#dVB-$@)i*O{+ZXD(i3MGfF*&#e9K8W(|QQ2u?68Xemys(9zKkt~9 z{>idUwTnhG*L?>zv|ROnW-1n{!$VWS9N$~8aBNpdQvBHL^zp$Vj%!*D`?fA$95{CD zq={q4BLCTWfb;Zn^Jl$%8`l5TcWquysp-(c3v4?wCJ#B++jrm<{`cgX+6|2hD^q_R zl9Z5|J$7v1;yQly+pC+_uiyBM@4Bfuix+pjd!_X$M^&eC*x>~gxWVfecq~8nspI(c zvn!ses!T-z64KLBQ$qFjpVC+p@7?4JhB&L|BBs@a(CC6e8<|2C#2{9qhKgWiu;dv4 z!l=}dSsIiRW+$D$>I}=)9O0e3i`NUT)-HZrGx6u^H?uU>V*Q(P=uC}U>D;U5_#g52 z4L`Wh_FKqiUTo$|EE^$^tN1DY>$jYgf8@ul*LMEt!_92`TTYF$t;m>ukRQ0(J9qBF z*?_BMg{=5$?-}aPei}Md;$~zzDQQFz;-(5x3}?Vxa2CmY7R>@2rIk(63@a7O_DzGO zW!gUBg}?CMfLsTNnPTQq{(Wxa=a$bKAtY3-+OS+)HDG74jOVv=X9@^E6{6X4zTSF) zzs>)LIW61N_<1A#NyJH;N<5%#jEw+Y36yl{6s=5578ofKMdSst2Q!? z?{3+F9x`66m1Esv1}i7Odf~h^hTcd59u2GIAGL9sv7YhWb%D~b{@8MJ~lvmm(Idi(`XrJ^Ohfr>k z#(rEe**MV2K>OJR=6Q^1r~8B{wOdD$m+WryS#v z*mof}A*mXfo{7E>yrcQG;}7h(#(D-03tJKsrkW>Bt>V{CQ99^Tsiz>Y+WvO3TM98e;SGD#dJ{ttRQRU0x>m!%QR zcxsBt#F0O^J(b|VQ}9a|!k&BQX65{!x0_?zpPyfO^O&lY0*%@TxX9WbGippqbYwBk z6eK94!F$v~rs=jNW=mB?dqP5c#lq*r^S4cz=60b%$^}oVD3VoeV~+Y3YZ1d~ z);+NHQ^9q>LO{JpuqK{H;_XHPl*IqeB|9W$Do)RAF22&T{w-_aF@9Z0IqT)`#m;#7 zYtO&)jp{?iZwXJV&D=_Er|NWiAO|#4H=g%-RXU^^UJsD1QMgI|zda+#dPppf|++dHo z6PG{uHUg8`azItAy!l(|&m{*R~G2kM6;f3LvWUNC&006ai?i1OPB z=q+>=-dXZh_9q5!sw!rweR|>MJ!yfY!3N((CghB`XiA^A@K0X;m%p&1c>ngp57|-S zp98cE^g+^WQnqF2^zcBO@Sp(dg;-lzH&2GbSfWqvj-+03g~O=UNIYH;an>^7M+^n? zUoAEVIEaD^#FJLu%D>q>jW140&O{17vE%d1240?)n))Hr^Qa1@7aap*ijJ1%Tirf? zUSQ7_FEjFg8K;k%6oV8}Dq&IjI!oEiq)A=EA1!4KnX28Blc!71N|I!XnKW*?k%`6? zkP?JH!mjl+p35>|O^<^W2>c4xv2lW8#M1^+J;*)JnzF`DLgg^9$qI_lLgG%GRA5MG z{A1)}bg4BgB*|CbrVk97xFt6=%HWb$G<})}j|*HeG5kWzBc|j)lTdEs7-%ZyauA;! z5hpb9KTVnmH=pO?QfH^62C`E+UytbV{C{ncprEDR!OnhqU6^FFb3lE|%3>xV`|e+v zK?#2&)Yb^hM}zsFqu`023_Sli$Q`j5PlNa+ISxxUXVS=_aTQCyh74Ok(;=e-3=;GL zhtA9a7+#c2#9d`gELac}P4K>?;7(Gn2HRgyov%lU=I2<))?xWjJ@QTJPUf$0hV$D@0A02L5*qCNYOOH#N zyJRVQzxhaptU=nyk1&_Ya)L8OHhxFHOHc^TCuXOTQtRJ!5f`@-y6o>CXAn z7OGx)!`=N219$fi89P3(F~4yN^K3ND3O1UiG+vMop>u1%f0S!BW4yY;q7w}HF_N;l z(`pT_VsLh+NtQ%+n7!e$N(foRqEe5L`?OIJ+tn8!sczw4&Zvau?*M$6W6jc)`ztH= z0bAf*N&m#dHy(b1e+eHIcS$c?;my36)u<2C@>_X-Ulch!XQ_L#;9nV0*;a{vX-siW zd}L&N4i@%Ry|u;s%VO~9gM1pH*am`E8`MnPO*4`Fa}=||6&D-<==l=F-mlt^PwB7t z01=?uee23=E1%%k5sVC}6L5H2_>*k8D)r4b-yBJN<^Ad&FbY3Ty6_}<>hR4S9Wo^2lynspt>4t|AD#;jX+s=A9@CKDxL^J3^4hOs1b9wln^sBqE={K z%<}ZXItOYtT&I$b4&jPitvCCk)IHF)(^DC!7+9gK`{|M1pJk4f+>2(@lbOw%i}>~V zYAsvU4_*C0^@jVD2YS??-soQS8tPZSpk~y&P@`h1(H%WZuG5}@Iw`$uxPKM3x2q42 ztj)hUg>GRa;dDAtAl<(dG%^|5EJGHWSe{p4MHajwRVp9FF`lN|$wwwhI=^0qA zx*S*Z4_qnY%D&%-hb&f=$#G$n3?wWrxl&b-JUO4F@chZi1qDZPbMbEl|B!#ef7?M* zL9;%SIV3p<1+zNE0mDeE@Z1Uy3iA_uHWgD7RJV{kqZQ;T9B{LCaM8L_j+f-p4rE0R~F3GPTtPLd?$oQhKVpsl5DMD*4oHfJB>l) z(-lh|U63K%X(j^yIXE_`4++;*%~#j4Q#^6qRZERn*juM*>M+M;_0|!Nwk!<@<=58n z1Rl5UDu4ewwcEEH!r}}tPw9OT8C7O;COiCta-ks}C|53w1R0XIWOjF;ek2I;-Vd_fG47Q9;{DcK` zYR3FHIiP16&wm!yRt_BwT&N<;BiF5CaqPQ2dvf}Bo+|GzKl1&W)vvy~dd-@8@$BWM zk|1r2n-5>;JLwaP$-GDN4 zB9p&t{sbwqIR!stF?`q;Pllq^_=z{UzP9arYE+D$f2ygrxhpNLZoHpwMif5Ix4tJG zU`x(F%a%l^`uaxmXQEQY-;^~Y6NV+x-!JCtsEh#Ln6ICeePD-mPImBMFn||Sq*rJ# zp`dd#GXkLmITWV|8&wRHQOH*SWshRolgS0rgA>97Aeze!iSuMT!+opWlsaiRbd_fd7Itr&H3F zuiEm&sujRiNLyLArF7oB^l8C?X!a3$HaGN)FytW2#>1fLJ{DY+_3%=Il_n@!t~dZ4 zsTtJKko;UxS4B@tQ}Ug4CQK1Ix0=C?@LJjP9m424;4PY(pNbqXGPgT3S-=qJZafOk3V&0Q=ODDP{q3{ zUO$jt?YJys+d#%X1&=7o5T1fsE8U&Kg{(Cc)=Lk~N0z4Gjzpnd&}li!^;D76>qPn& z*+mx3K`jR5#Fn_s;E)n{Wd?_s_W*!0wWhqJCbi@<>2r_#!m6f@j;63Ae}Ad2AulgE zNlZvi&P~rwxm6)n+4-~h%ouY(U~tI%;IV?Zta{Iy_J-CKD_R>~U%U6S%%y45I{3F8 zE|>Z9c@6Bh$&>Q(CMDZB1haqi-3+dT?uu=~_*sqdqvUx2Dv>(`a9aX;Q$7VKme`e@ z(k5xsj(cpe6&xqvu&`QXPn$cWjlvq$eaa^GDmI6&F^BwhxD2e#Y8l8+`NWl;43J`U z(!ID!c>j@ZQHzJ&-?8(Yv?q*;YZelwNJ1$p_JQGJH)ohB8{IKU4{+sn@HY_!0d&?GO>8*eq@>?_2L~zt`exJ z#h-#EYT@cfNiiqv^U zTVC!nqvJ(#GhMcF0?V7QGBVlVGoG8r`xu7zU~VA&qk?ZkQ6%A{`w0Ne80E0_K)@Vk zL}kOa!uJmk8BCEhqA+XIfD+q~a?Llpy1KFRz~D3|CQY`eG?l$O)E5w=RXAm7N#W8d z#T84QHm7G51_#;(1(phn=Euct5_~9tiQrGm)v?ILQ?Yc%iX&^9mn~~v^UCt=l@;7A zJt{gqD6j~@dvYJ*J7J#+gH1XNni7iIi~tFWJEp8pbR*0SQZUNaN_@v^Q7xL*tg#nP zYUbEzCoGPn3X)$+TJ7jSYcVQ2XZDgsp&6MODRz#YNy$~!3m1Ai3L&9Wr%3PG`WS;? z=(5WZfoBom?y8o~$K01@t91!>3rnl^A3HNIG9z_rs1V|;D=n$APf=LKq%HYZU(@Uz8CVE1BLG>T>U9f}3j_U6sFJOq_Am{;Dur<~qx%$g?C(JoY%o9|D zFw4>$POv``{W4wI% zE3{K>-*=OJrws|kU$6_yuUqhF!*41oiW*81Cw4H$c@O*r$$lcdeSEwl5TmQU)=(^6 zD{6ql;Szt(oH;&D&J9I^uDC(67j)9KU>}1h8obBSvnIYy@s&dALn|wol3=RSboZK= zNz+X!#x<3F532WqzbeQ2(1tdOz@m@mOCJ2PtrZM91m#BLp>_|m_x!6{b zmlyWLxyaPK(9qOKjNWTrNy)N&tJpN;=o2;R)CS2wQFqco6AjVv1B$>aqp!NTLJ?gqy@+LS!DCod%>EMkDd{x)7ZKQ=Bd*1Tlbt|bG6hUOP6 zRw&I61*MdTH8qk54x2Jauo(Qr6LeZdUOvXvpgqPLzD^WRILsc=)Zva;*@2SDs^6Qaj3&2qp#R$jE-Ku>X}YvuVHoh zT$Nwv1YU-wc?zXveqfK)I6XGAqPj}G< zxs4i^F+Dqf+m@|GdCdMD^%C^2!CW;0Vs*WtyOZOI;arBwDZ&JJVCecO%*u-DW3sYF zA41r!8CrBo?hPM=G9gy_Kr$im%p#i7^AaacOceay;WtqTDCRdi*BuY#^QL?n%ATK+ zzYYm?+k~h#=~?3S5+}~mRL+{1h-^4FJBKc5JH9S&3VS}3cjr&x^FoV?F)oH_b%1u) z2o4WY28PB+I^}$tWU;gYhflOQT48#SRSJV>f=nZx8$oBD*aJhONr(cWn>N1Nxp5PS zmdl=7z%z=9>tzBo<#$qht4pj9gx(#nAm8MTn>OOAMrPj@${(1L|44BW??xr5vNWDW zt8JLesxVGnARqcchX}rOK;08VEV=xSp@3S3bXJ(JWz;Ea0A@2*kXuue%Qo~#M^$c} zmJqS6LuxM-^wJff!_B3ntJL1U(cu&6aFh44B^pUM~uWh`O=-H?C^+0nEx zC@{f8Wo!9YC$AS?Vqcz;-mv`d?3$X{Y(pn&&gWyq16t=sd;5}}5_f0m=vg60c=ojP z21)k(zfXZIg-Z5#UKI;)uh)jzm*Gs_D814n(;gZ>BzeDLzZ>?SLK zw7w!a#85mE2BM-Al8**}I600N)8!!Xfe39-7X%}%O-`b>A@~e`FD-4~^K8>|yJuwV z*?YQt8zo#!PqXaN>r2l6(dzd0r=@nwcXETbXR;(}w+$Gk9vW7KNBk%F+)pq&T0`SQ*+#%%zyZ}yiJ+%(6-0Ul zMLfo;tSl3Y>%myew#X_hfE3^3Jf)%USjKrjh#avoc znUqXE_P8!7k!UA*f0%ZPdrcpv9yWg{WQ@w<1eg+{_CKgg;jVRkQ9`T;>k<;&I{HF{8st;agSriwiU3;@^U+6Y(hXLBm5BrFu}Ha*~b4=oQ044!VGrVNzjRx;2$G z*;4U)Qb%S&TwFq?`f!TbWd9jo-0#^YUR8~?^r}wJs`*`fTuy&oPF(!h;AB<2rB_IW zJrB=Qk-0|t=2+1@rKle7`aZ)Ggd^(QTUP7`Tk7w549mNGS?c0uHV5B-z;ApLs_}sD z3uTT}ynr8+eN3x?4+9|?QKN|KfTmLpUZThgM5vL|KKc(73X~XKwk6AbDG)n}Z;(R{ zF#uvP5b#Al?8=o;1;zk;*VS5ux9h+g#*};QwQegf=iU8Lyr;apoN>6oLWF?sLilgxQ4jqmrba1c4#x&rlc} z@r-N_YdeoPw!u&*-VF{wW$vQ+gZM$k4~l$Uj97cfxr<(Ywt^B;hEKxHA`Q4-kdvSK z#2J2x*Yitfgu}d^Z74a_d8S08W7kTd)IQi)`Z-kXSGlKQVotX5gISRFz;(M%PIVdU>F0*?qCOGa1of$S#(5h1f0dDhbb zdLgB!@`Jo?FgZiwm04I<#Vv>S%GWDG0-Y*Lz{IoCd2|iEV$H;d(~I^G?8#S zgT2}|WXt-pyh&Q)INg1&;SnhXrOSeBZG!^}8o<1fmuXWUPhaL0=o?zM;=haDJ^x3h-#0T} zv<))m8*E2QQzEDM8b^;xnOqt?YP7YD`0~6Wt!}w zrztorjGqmS7;AEH0ZBHaeC;EBbyFe(ll9s@C&xe!e^(b5F*FpF5X0ivp?WsmWs#vO zwWPMu*p>|x2^b* zL(Ix@z%jC_s%a&qW0cc4HdR$cI(@}w@VDR1#-&Uc1qQ9b;}c9 zeZ{|G`OJqIST;9(mX)<`{qBqH?G+XBG3E*vxK4gd)xz>x7MAkF%bCgvuYCltx|dHq z&2QZJYReN}9DZ3yV0mrp*JWj0URu%q`mIlx+jTm?kKyu{*_?$Bw(NOKIm&mSUc

    zf z_Hj}sih>O@X{6F|!KhvYRWivI1GnMD=PDkJ}#0 zkBkmvC4#+4s^BNH*FCm#($tDLQzpxb%gBhs^8pVt(C>oa)nNq%1Vs2CYpm6NSlNMB z10mlPMpbL~STN+#aCrkn4LnV-T#*+Q2B3`*61JT^Up)}z~)2h=CQXZgybg0v?zqDNY&F~;N(h_^KD>C7U*xv?PF(<6W%p_5sz zzbTl!G5r1Gf`jAIRRtELlRI<>3FkzdUYaV^hoM>JHB|9;P{9rZ{*-Kg!!!>CvJJ=& z%xDd8AZ-v*EyCqs(ABxFUDBVBYGqM@9HBoixOO$~bEYf&j#7uKfwqy+e;~W^uafGJ(&g}BW`7V1>aY$?1PxX)w?Vw93Xwj_dr(M(PYY{QxA*PhVDOj?Q>d_49 zYrKP{e#laJM}POC<;Qqq!)wPI8rc!mVcv0(zs06pWU0cY{^p6Cw>{d>@aS*E1ctag zWS@twPk>x3Via02r%?2dQ0iJ;zBo!N`Y%7lSmxHxsw;wDUvVIO+twswu550Ym$EBat-IU)riUnry zm<)X*AEOIL-UMyiD0Nr4AUSHJOGSHQBSJ}6K3V_la~CeMQD;pP{mf>+iM?Hs2?-Hl z3GvT`Q6}4n2>RSNjsn=mjT@s+cs?>NPT9#W$a!lcA`%jq7>0|mAuQ?4XN6{0S0o7M zzw_F@y>sizl?a=%)p;jnEby+TppOseXq{v`ied>O#WH;1u`0uof_VbIH2_Qvgo;Ww z`k(`#%_%ShX)J~6;3}|w)ei*;H3UFFye!`Rhm|fTH3vQPF#o!`DpaT}F}@-F#fj-G~oB0pmv0eqXxBfp^>l|sTRjCZ4VtLtK*p5Wd`)Ux@es? zafzIQJ!1cQAdhl_LntjKVL(LYt}D~at{u-_Xr&Yv}|8j6VKhwPFC*VHS9(2u_3`y*#$pguG_V5;(=2?WMWJsU=*y7XE%F!j40#@dphHe9zr6j} zuh;~Bx`&@;6U1akw{h<7u>;K*?umBaC^zG_yPMJaeSYRVKf@BvGpL&sde?*A>A##_ zt^1H0P>}VD_O8L<4jz6ko+_1};{-nA8Fs4b8NP%a^9~L3{oec5DpA9pw1|93$>*Q% z`TO7Z$e-du7uPUPk62Haz%hPCLxd|X+{8{Vc?Ke5tGD;Re8-RLKOk!OlKwvHGlLi5 zQiVr)A3PFanK(jn94BkdfOv<1XxV*RR_Q8T0wYddtMM^p558l_VRcs*7h9SN#g77f zj$^NSJT6OcGtRhVbllBe#}ALq>- zV_@gItmj?*-Mm>$WS64Kw*uuN3Rm$p@b5N9u#G^*k4gx`UxM6!l{L&xwr&Gg(FDgz zKM=1F9YCW9_?oxi&0sjiT6LN-SX|>cTMGyZHmJQ2SrLoyAu$VL z)(={joftR;7>v1V80j37W|rH0PFAG`_aBS{;m z7%+x9k1%p%UV^8jUwDY&eYU^Xmpw0bKnu9%+BN0B?b^EJzzUMmrui;Y@?$gDKKlBNU@Z&!Gx&9rN(=hpKPi3M|CZk-VGO_)ofw>L6I-Fos#Vf5ctuTG3$Ya$XSYQw*t_mp^U zR$>JID?mg4as8Rui@y#}dA$o(Yk3?i{VouG5|C<;`F)f5whomtLE;-5G6&ymy8>Khw@Tky@ z85;lYD_dV*_R&;B-(&A~e$(gTYw*1AK}cF!i1aN_=4t#k@AvZ!Wi6oqihjB7=$60r zJ>!(|I2ugF(!kT6M86?V6bu?hc$6SgQ7}OeLxKTtQ*N}SW#Fs^@PZBSA&!AHT;W2Y zr^0b!R_KNNH5x@nf_BEWa_BPlv4@%e{^uNw%QCBC$J#co`7iI<@)DfeOvq!K3k&(GIovXbFVAC#r=)L5T%T{8Y+gQVmc6yX%T_B+n)S%|XkB`iTWWmv z>?QU#-eVlKn)3b6@hiV8&vdX=zrK8#ZSvakc_q5W*}s~t+i}S98{9gNFVB6fv5?ml z6|tt`hDW9MsxnIwkT*ju&dhuyBHT4C$u}{!aC)BB#@ndTi4$gRObj2B6dxhmG^oG# zf|vhqpqAbzM`v2y$5i2L6vLMiUEvB*z}2WRu)u6)$Dd!fkw4FDa{C=sXDkWo1AWEx zp8Xoj`CQLZ_}lu=Ijo6ai@&+~_5Y$DtA}I@6-F@Sy~4u@a2>@MSrHV!Rj8+BKUVs- zWs&eU(YUIO0q9kMek6miXUlkZ8RH{Ar6pc^7cXXFds(#FR;!CFmBF>t?$gWo+4M5# zVm?YgcdjeF0;-xnVXKGssps3ec!i!j=Y@ROpiLa2O_VWFF}tYYPm6h-2#O)EX9!t{ z@1h?{M!UV|dPqtu6Bd<8nHY&ygnXk4cW1IW{IHI4d@( zZ>3DyJ^B&J{y)`^M$q?Toyc-q6m`DirsOZ*%Gc3BPWcT5)|2%b;lg-0ZtNe zt1>P;bc$BWGyzu%tw_|EDnJyDq)+4o`pQ?W$$Vs@{Hw zop|S+OEm7R-sLl`Cuvq=&LJEi=*yTaLSjx90$?Lh!h@(^Va_HoQ!x}EdV}T!c}zgt zY^_FKg@#~9UD+E;;$76C?4+%&U07s#@%$H4O*Xc>#p^a6LFq-CN?o*p!fSRhQw}^> zFf%gL*1?XwZugw9zG7yvF?CsdzWVgCDVxdy=U3OK=IDYBHEgNif3)Nv(X25tGN@?g z62WHcszYJAnbYg57Qh)jWto8nX@>N{bO-3i8Kl zHY)x-zN#EL%-XiX}#J?(A4Dbit z(dAgK16`aW6VfhS%9`=}1I6?BXLx;oDJsgeYwt@(d36_aqYDTAcNJD|&C9D`&ab@| z7(5Rgf!=%Z;&n48PkJCdclOG&t7><}KxZE%`xIhbA*g9}x7|o4F6KT=T8lawdX6&EbEtOb z)b;OXvpxsnRifOcgV+NO(31a<3MBVMr;?%h73&5h2HC?PHU>cj)Y+_qw1X`6>@(io(}t&bjvqT^W<@=3?P9tSG-?E%=pEb~9Bd=@cSpPW z+Uv^8$-rYw7fqs#XY{My7})qD-SHP_yRSgK$AE@YMO+pULp+PjjbM2usx%)J^xqVV zi`T5lnWYwsiyoO89~Ugz7qD+V06Mu_h~`(A>5*AEI99x7ZSHJQ?PG`s^3!E@-(XpP zLs?&VI|Io$qiurId{(MznQtFwsc|8^tAf5^Aij{YSBJNXs|#r zD4u5bVc|JD-$k3A{$1$;7wxp*35ipHDRqU`+F)L&IjdQOa;(uC$P;WJ{F0GEi#jox zys3Hv6_f|NqS^)4W~^Bwe(=EuQrnToAJ3n=%w%?O$jf`=(G5+@YD^|ar&(eAsquQR zb6$ExdY4OW{J|cq)T+o$NAmJFTF&P`x^DfZs;U^es$gyXrpK!%sZQy=BKcVs4Qwln zz1!dMLK&k*4V`WHpo_g4-XqpB^8BFq=(l;bUEJNb;Cq-zcTuNL-aKDMRj7m}p{ zj@w-8v*4`$8^gs>uF5?T_^>;SU1l0!v%@dML^W`8Nqo5a)dlb1&$QUXyK${=# zRX;+Hrmc&bx{F2s98Cm_rkwkWsZ-{2MP9lO8Vcg`G%(MRLmqNn_>lyONDJWjyTkp- z9r6S%9YppF0xpFeS;wTSX2ap#- za_!qEE7q`Mwc`0@Yt|fjgB+ry$2PU{SNMmj)hfH%@{=d8y~9J+vp@3xd0`bt=i%9_ z&~|S?uAYu(sFC@8dE^^yRk9lb@%;cvxxhZNoUoiwr8B!7H@1n{z15l)l{Z1)sM0Mb z*!TQjwB4UYd_K)tOE7*O#F`EqSS=h5VM9QSb$}B)WL8DI%i*j;`_)E?O0r)|a$pEMEBFD~B0Srq3*%xpToI3+HK^=NB!X zo!8vVAK-s0$gM7#uPI-$W@qykJ3oK@_b(q_RNl?AT@&+N*(Q#h|`SDj=o)sEq(KDN4&dlnj?ijzdVPwAufVci^;8;9lwT9|~ z=#4=ZJDN-*0|L41^yA{@iWdcDArq<`kDxeB#Xy=z>>~P(@@SasaIB&5K|B=sm-1sM z@0ffDN9gth>4EEIR-S)4BP(kL^Xuq*pSj)mdeas}r#zz+^db^|@l}C=OsjFW0*4vhw2_=zH35mrKVXP*h1mO#Xg+k&Gf)T3%d{J?2R3v;n zXJ#_rw>nu%=UdD-bLQIm3m@`dwLCc|*V|e26lW}i6TP*0h{M)f$)gp#0ldgS!>~>9o?;8W6Dz_B zgBY(nIW@G>-Pjhy01v(he8xIgLZ)P?fB=s*hw$0&2rKT^QaDISxs6LdTG}Wa;g~fB z-_oH&ht$rup*AW_@6RQJuLxT)&!tPYmP)w=Gh%{+V`ji4O#e*wCAA*1U)#XH+zs9X z-U{l`J?Nu}V(_J>a%U4#lSU4u~Z z$dUeBe2lD=OugoIuNAWq#XrCUXR1}L)jL*yvib-5w2R^mjV?$ED*0<5nnA{~r>W0@ z`2yh{6NrML=c)vcV(9t}$O3L^TpXkdGNGGeRE%L5%y(|Ol6@A#Brs+a%~yW%1sM9c z?*y6aqq&vF2h`{T>aQf|6J=W;@X3idWfC5Mt{+r{Y3XM0rXfc!M0|=yLjb;G1CjQY zcG1oOVIX>Rm;_OwhmM54_Vt;YZL5s z6?6zmXyc>DduY{a2Yan|c$nW5qp#K}s%!=_1UngxSs{^OfnIi_Y)0F;#Z8}J@YTA+ zmt+`>TCJBpB7E9`FFyX5f6DuL|NG9PMmbzzjM?DT${yA`I85>SA3J-M${}`c`jphs zqiw8>J`mYeT~l z0t4af>1fYit4mKREpNBCx3^h8HEq9*i(8)2T|MeP+Ym<^8#uR3NlnR!8l@8KH6JN! z%3w?fjW%DItD%lUv3;=f5*H6CYA~XOU<9;?p2z4z;)NKa`q_zzv-pEKb+6Q|o|uT} zi2S;5EjLJ`hVa}TctVtyofCW1Q5A^UsLQFSTm54HE_qX|IP`5r1z&s)z7s-EPuU1P zy*)<0Y^_y;=b+-L^jP;;K&(=c?!+(*=%u}2Z^Edzj_S>*XQf#+x#G526Sma%Ta}y= z+DnAwD+g<`cwJVFxJ_#3b*yQY=8by3r}VM@o~)YW&1(hsQ>Oqb_tLMf;M$t3nf(um z^`&T(VP7o5Pte1|407h()WGcuz%z2ZCb$?{OrTjDNt!#cFn5#Id&y1MFJ*|^`m0Wr zu$!#@Oin_=sX;nFa$`-r?k+0D&WN#63DAl+pE|`K7r%^8$dNwi6#g|x^`DtPh#ro2 z8GMcq+htsqpL>!@6`;HwaQykXXWAcit_&gAQ9u$OpI7(O&lY0jUOZijWry>v#_AF9 zsO!O7*#Vit8QRih88I4-r-W>n$=Mh5__3f-Os#NUegp^&WN0_p<(GOUWNbpWhsH@}Hha1f_yG|BslYzgZn=J;p? z)lpYL{yY3qy92*RS}v^uFb}Iy?Z>Y-`(H4}ivNf;XY@r7+7IER#IjX@9s(Yb`ca?| zksLC7edQ@J<2c~wEu7(@&u z`iM)WE_E-m5MC(j*+yq4r~eK=TzoCOow$j>b?1OL|PsHq^IveQQhA!ECO`)xh|r*mk8 z-*}Sa;D`F+qQ@GyY%VJc4bufSH>;xno{&S~)W`>o2+qE8}qdOwgehK9#PTqkAK|$fbh+xM$**;6x ze^80VB0TZ>pZV#k(A@qpWT@{@BSNTA@*Zi8V~8=rREbH2vX;|iGZC}PU`lg%B2XqI z1*JW&T3k_G=@J$?q2G`Y60W_G99bKgtj?9cde2#-<&wlc(S(6gUi=#XJifY>qsfT%v ziI0zsb9UBwhA>^1v%kN|qT5!lE@m6*_)(r_`96q3n}bStRJ~9;H-5t0u&_kR6s2>hBcy8~8i@TZK&u69)iKm%ke$Usx(I3P_)bwX2iW#z3(rpwN$eUxIs zI-(-y6@I(n%6q?isQP46(>GrVPa-jK8b1k0SuP0b!^nxouQ6TUjgysGYL~3azGi+M z$>~^4yPSLFvDLNn3QJgBM@`M!ou4z;ufKd^OGW$fasisaLNKj59^YM7T|UC=d+>`_nyg6w}NV00k3szgv90!}`M#$m3JW z=0{pi35J%Rwn+6p+tUTl_S1q-i_#|tX(4Pxnx}r08WqVXWFPZ400dli#HZDnkqcqa zPZIe4r|-PAtg5P-t!8hr)yt}@tKNQF@)gB?3(Gy#!g7UUKST7bt|4pGkn}7FJwop3 z7GUijLrvtm4D?4kjII#m2awn0LB0b+h#XV#!puLQk-`e#42_A#I@%0}V;sXEj5WFj zlEmg}Eq@uI(?&uKe2S%^MsIK9oP-4KUE1{c?qhq}O3QU0O0CBmA9U3V1X&+w1wNISRdz;P!A%(R?@8}#%KNul9#Udu^C~|g9KLF))tE|BQ&Lh(db<@&l2G;s;bmzKkI_t+l2X#!RgyAg<9v;I z{>CqQyEN!Lq*EO1PlliBOInp2Ui_22rt&-%XJo!u{L>w}e>eGH3ybcorw9C9h;u>x ztmMv$5k^ArkoxH!=2duv)2t;E#r#NB#6N|q=+6A!LrNm{UvIx%Rb9P|Z{oQu>O8{H zOg~NNJxr^8?-S+HvkL7o;J^NW=SlN|KWHD~7BK7-VH`ae8N8hcR|YFFxyz}0`pv{P z3GEXd>f&O9e6zAkQj%X~?;e!eETYQN1Ftp<7kMc#&}9y5;o8uLtLqlV#T%b++%7x^ z_6*)n(L5S!Sv1zDK^ioe)hW9v;lWTjT5u?ejuZn)MuY@z1p3^dnhE$YXgMU9Q%b9t zySDy#LPD{aGwV4CS!kI7*anLSNsX8Ou4=U`?j9^x_&n$MW2IR$jlbT!8988g!Ri_v zI!kyCx!7cyOGIndN^K-q>Ci^k&_-(FiU~6a8hDh97Y%PBXh@(9w7$j#-rCl~N-fn= z2oQyZG=py%+NCQmF)1lAPvsk5N?7D=UF<;~4Y+vDAAk^VBP;?6LGKQTu?tY9Y6ug7 za0c*P&>Z)|7yz^nb`LnfJKYmhpu4Lsk2tb~&>sg7I46VHAF9&}a8MW?Pfld()Ba$% z;>l1~xO&Gx70)9DWA0U!rzyX4l=inMqxY^lAtK`5bqWX~wVP|ey(%MG-IjWUD688) zR+V$Fydnt4reo=k=Rd`AYzCSQ3=CFv=a;~Lm{C z_p{Y$Z8f&GI*$MyP=#RHR_}vRth_%;6{YvmdV51rhE=P_aw8=>J11_u6EtAKV<-5A zq-Lg13y+;Nd7Pb{y}e^abxrzMhotmrb)83J9_luwrXmW#D*f;!p^7QBX}P|FAc)YNK=Zlv%Tg%*Do|` zJGU9*eL_4nPL?870M(DiA=&r;4ojIEVet4N2*y@`Z2{44QE)_b0S|=nW-S)3<@k}(Ed8KrdUuC)YDP&0B;;1QG(~Xce%Y^NTyi%~I`{!X^JB)cvfab)? zR>bNEwqH2T=CKm)X!(ex9#C!B$5Jh~(1-V1O4PxKX@7%HNAM5H70Q}B3bYwzt14MY zXfA>x8uB_=HAI;>ngNZ9-7-wStUZvuQRH*#fVkfVoP1Sa>&41S-cwn1v6Vph&tsSG zo~p{qsdtIL%1zPwO{|}xy8*CHW80hE2`v$B2(?j%!yfvgR9L__n z@XKo4zj3fH43Fo*4nO>$e}2LmdZKstc$)ud?N{b95wbqn4BXMni801v4+c~TB*D5* zx& z|It~s==YduM(Bk+p!*|~jUU&S z7~q-1fH6aAT@qB7S@vm`(>y8&(Lf-vxQgJW-tcvkAY6$tq)YCwX0Ht<0`ZH$HBpY#Sbi4m}WBN zv;=#43T%vbV4&X9B;*BojA4RaABert{SQ}Vs4t{fSvuM^b|zC^UO6BP+M&@$dbjIw z!R^_V4;2-Sk95&KkeXV1(%Z`~P_Os&3=WtuVpDRHbQx7u8NxM5CtSn&aU1dkgFG<` zD~BIY&gY``kUyd6lyynbKe8=9NF^?rWGd2$4%(*xf1!nf)ZI*|7v>l+Zi@T>E2j{v zubb&r=HlRxldfy?s+*}V#rCXp-E&@bnZ^ob8+p%{zsnapggOUL(v=F$#+g~A4ejj> zOLiHh-Y%ydPGw2u2}jqg=?YEo(uaj6`4}|i#~+!wZg%pd2lDHFTR(GM!NjCu+R9v? zl{~qGLf`-L>d^vehc;-E&OY=&aeP91!z1lA#Vk&(-Zv+>Xy$wGzHPBe$TRpP73iVl zKoeM9N4p?@FhwwEhrs8fWy38kJ=ii2e3QPI_Gn44M9ax;H?j)+tK_gyAMXNh@364s z+~k7fT!T+|SYmRW&&*Vlzn}KDRrZl1=R5Z7Eh=Wts>NZ+21A&1L*)`?FeHarZm4#I zCF8qNxDn>9EgB^MX%-NVak zSG^-NnSv3Uq059D>Wwf28-__PgT#V*AV`N>ZU_U_Xnk|KZ#wQoRt%KnSZl{8wn41&^}K17o#BcLW5;Q0VtEXkEL-w z(yN6GW`O^m%HLA`>((1mxY}M?`yJQurLd8kW3tuu_gBZoXYsF*Bxy5i;hAjOMgFnc zz3)rSd*6|n{L75^xat{d_q4cpN@z*?jv73lW;`DkD>*;78o|Zn%rfW>A8i0;4}vXa z?GM}(k()*ig@G@x^+Pu;UfcQCjZD|*@1GFgylThx=a}zbn6}YUv!?2yg8cCCwd`-g zXNyBZUYCByw={qEwdzVU&gR$lo_g=}@0wRlnD82|KNucfkYDxC+CT2$UaIpvQVO`- z-*-}&h%4y1KrzFW7y{j%@?TMy3eJvijcS1LcS650&s+tf$0sw6jy()=7Wdv$H0v zv?i-lRpsj!+g{V((Ww@pZfo!CR5vxprC1`e65{y9dQE5FVO4v{;WdX#J4=OhT*>^= zLprlQ%Bm^1L?lKk|%h-kfX2uppy&y2=MDgtL#0So=oFaedH9%C6`##KG|WGy*bX zlPftmcB%Ew`?6>FS^2;{ZvVskkIYOme1ElD>!r_HKmWY-vrDa?OD8PZs$;67mK-8H z`_PGJKmYvMPd}x@pMEHOB3zREEpE9U%S$SSOB>|27{md;PlSy{_JzQ_ z)UwW^E!)2R(5VA2%rEI$$KM|ler(^~lCMG&_@Z^`Wnlz|QU+SYA^!|d^s`7A-3rvW zD?X28&Q_e1?@bzpZ%hQ!-c4Xj`e*e|tg1^*tt)By5mNgu3vv8P*-qs78KStQq%LjR zid9=4`7FKVM`;&z(%J7LpSSEDS%<;gOq6560lI1{SQnznGXM}u@Ov0?L8W%2UF5JP z8@Yo5h3mYzy+gJC#7S0jlAwzyV^W+sOW1NkxYACxY;&Br1Lw4NbhL}b?N#ah2aw2> zFpDa)#bU~qq_XnIymATi%4m3i`_im7@Cc)AMKX2Z(E@duxDh#)%-Z_Wt#?+jiU)G% zJj_03Rziy9ZT_iqFe{dRKc%kzsXwq_=LgfK=FX{!=bu`qtm3V6uouip87Imnq?ah7u8hl^BrZNZ0S`6d0tge67AAg#|b9kINfgvotikR+^f& z_0-n1w1`;`!|UL9VY)f2I#ViT4MWL}Y}uDpU7e-onbqklgqI#^c&%X( z|9BG%o?`j!YYmUQJ2maWg*KJwuTPj8n>*&?S=IgP#D;ezb!DD< zQlC{_YIUZ@YG!ryOv}ENnImEu>>%HJ;MtQ!oZ=z?V+y{{DJVcD9FARDyn_(#jOyV@ zARii4mdvkOzo6(^>y0%XeFrn*%pGi@`f5hiiN24VJH&k_EFX!*$mI*H4t}jNlU=aP zBln6E&L_Jy3vR7h`DUznhPtSuwko5~qeC6awQuwW?(l>_-wdE*mcr2}tQ%=vVZ zpYTn4d%MX5Al}b!6lPY(C1ms;&Zxvb$+=_1pSruxlwH}OYD9|JV!*>nwOh9eTdFhr zzDbKqs7Wh<bSEj7v5sFu`r?!LFYc(!CT0Qs>UI?L=xxxUxXWu&5U7V_VXg5% zA5lC(h}kxxqr=K*LRvI*9l86sidOvkjT=o{Y^=6y`uc1B)jKc#dS$;*d*I;5d|?tp zMqtA7goRuVxFS-ea|u*%;d9IE-x#Ms){`b>Thf!U^&?fd@+8 zjV!2_v(!40L5A*aEw94z-Gg8?Vt3pffG;von^M9FIrUi0$U>+{rIe17s{JDhAt#q8 z6h-UJP+3Fu(Edazn4^X(q1<1LlP=uj?k;$A|KICEWu52{!hTQ}lqOiUVIC~UJV^2j zwHelC1YS``M%&Q>7LD~pXcfgSU{tntAyA?$RCnAL^Xre@8GtbG#lygXdhJIF;hAl0FqoQ3Mf%_L+IrL<*7~Q_#*b~ zIm%p3Wz(Fh@GXRE>7iKHnJe`+nQ?^j%gN}DP(gHiFs$SqHE6^^lnc!+*C9?c_KA(G zswOj&Z4_%y)dP2`lEvlat_g-Lfs90+WBMhyxnGy;HRc-r4coAmZ?nbpFTDYHnnrc3 zWxFta?VQ|BFW_96%^_pGz4$7wmwlds$yted5sgIJ?%klN2i?%k+#Wmz`vx5)ngMpm z`$V-xIj^r#Y@l<6wY*&YIG!6J{8%x00LiPQTql*2d#sb{JlxYdRW_Y)Guu|WP*WZf zGKn7po^kf1kPs=q-)_MI@q4A*0UhBqIo}872y3t}SW9TSz{G2$PzRI%uAlg9fKWI= zQX^24AZA3U1?;Luh)mILFuej40y8z7E1d$!_eX(Zvo?hZk1 zN9XS4XAIQwE23KK5@yQja&c0rjAQ2_h$=+yHx_PSt>Q|R1`K3)hY3{a~BLu0e)6yLxi z0MUL#r>GT1 zll7;Q#&2xni}*V{`7;0K{rxMEu-BWZPaj*mG{NlZsIj*1{RCOpoyMgs-hB2tOP*1< zbkpYjEeADe8av0vV}NuTW$ALAbN@3NPrh*e$f>=DHWc?IyUlTYdc*IwzqVklAt<$= zuI2TQFtw1>te0hC6$J6j9ZRz^Po$%xGX_au6p5U7&pe^R_S4^&1ovng&&=;ROh zLCf`>0j%sDHu?Wp$WK;cRQ1MJdFS=Bn-`~ya~k#N!Iu4-H!UqxKQ;=fZ+X)N@VT|sIP&3RnGtg^>y+D1+ z;^0h#9C2`l!%$UH#*yL(F#*OHTNY!iWb@fr7JT&BM>&8r`Tgm?9AOhzuSrR{m^WwV zj^nR2Ht?)U4IrI(M{lY+|Kh7h`JecQ{DnWC?qXp%vv|&*HmqK~ckhuSJ9o}4_zSYh zAcuGdf9u0L#)cEtEO3b$L?Hp*N(h4E0TO2l)=Z5YbO{L?dG!tHd10PVaE)!-kgzX~ zjh0H-j*Yw$bJqVQ>`8c>FZ;XnqV#Lwfg9}Ujq&kpG~3CSZe%-U9z&5IM_EmS#2ABz z<8M&Ig~65jAmJHN#py+eJ3+K;;~-}0fv2bpQ{~4bCXZBf$XzGiV~*?{=5VHcSO1By z`m&u%A1Sr7@%EWGV^RG9T|v0t{OJh>ouf^c#@5}Cm|kH@2sEE*Tbn;6Nbe|?ls7)V zW>;wyf4|F|7;H9=onY=#hcsnR@^Jot#Jvk#lx5lnJoocFGk__|8Iki@P9h8k5fKrQ zlYk=vA}T895D^s-kr0j4JdmL&TDfILimpqhE>c-*W@zY^TW024t(uwZ`c~U2GxPZU zujiQ&Fl~GH_kF)_aK?G&bYJ)By07E^5(a7J&92K^JUY^~Yspv(bzn+lT%_pB4#iHL zICpZkTUPn()ibQK61P?FUAUr5HOM+RqS)vc05+y77!u!ntXdQW_n;LCAM;R7?%!Ax z+`%i5_Nm`K7T9!FRPS86^7fEFWG9&iDU^d`bi8KiMTSEf1^V-s62S1p2F&$DLWcPH z=U+T^M*K8R9du-n5EZ}X)$c8@{kvLY(ww`o^zd%x@Xn5D3EEHcO^4dJjET>+wRiTi za~t9tw_{;eh~HpyzkukspFR=g$~?Q6b@o`5siSjra`{tl#ODW&ek;jSS<-GVXfn6g zqm0m=j`q(QTE%0o$=>cKPI!(Q5opK4g_AF`psCrs#m>hf|_Y?<8zVqi!H82H{E+55{7U zWhcr@Bm3HT=H(_Y23Z4?cD6{w!N{`B0ZyU>GZ5v-}>>x?KRU>MO(N1ZGK7o+&SeJ z#0#$C2yVJV{-LXNE2@@c=j1M_k`Xh8HLh)cBh5f9Z@rC~6q)oU`<3 z&pO03{SD*uGJ10F;KLu_9O)Hykl)7+>eTEoOli_x`ndcOUN-!){J#)RUy#<+z&CH_Q8#w&O{fI||h*SSb&K}r*Nlu|SN$LxPM{K&gmsAqTm-udF zPOqc#>IE@XUrYU>JNR7#)p6KYz%;;!T5q5ND!t06!EkEOzPD=b4&s)fM$HU^cB=`wwV`r%${s zUP+xYFligq==JO+KnHMS^Ml-Of^~5Z>w@-HkRn#%7_cllnx9Ej+LAx(h{IJRn*f`+Tnh21$%o%?hv7O@C zyxiQGJ6k)ydF$}_)4ug}hdcOr;#WzD1@k9Q-ZXz|EPF=#s#u@I5K^#3T)P!$Vb4Ct zmW-`l_Th)O{?UDA@nYdGW}Q2?cXsXAnK!fP=`T<1YR%5l{!Ranf~3U6q=NaILO6T& zjmZDKnptp@F#d$+un1>i5_+vh=3XM=STZmN7O0eiic}H^5c(@0c!vH`|H#6vv;&O2 z{2qFbY);~sa`%zRX9w>^7_$CM?7T2^s-}6&{%%dpp}gv{ zx3;$AJUus=Zq7Lo_lF9e;!BIG7iqM$)< zIX6gGd0p9}|3xg~oAv)vZo8(dZ+v&~_bL8B*F&)g_+Fpg(*?4A3S!yj;rm#~2%(hVCcHfeoWceP z(%9nQM4_&B5=(~>6zm)zLu4V9*c7B5p9nkbdN5Lw7hp0)>I_*-WgHag!>E}cWz?uP z)nTj8(s!62?35A=gl@sW$Q1X#Ny|s(NetzS^maDVM=n$5fvQ_&NKm-{P3pY*BYAms zRJUF#OV7>Q`y;A&*5Ib{&6{~&ku#&C(Jw%Q>MUESt;OR`da4jEmJr7{1y~pP*0jZ{tS|^*o7J80<|>$P*X?uaXq|N1`76N$4Ip z|HyBIKlD>#gw%hTkK@=Q<5b@j0j{{>t6rq#Bfb{jQsP5C@H6B0(xxmdJ@XO!sk^&m zX-aZ(%F+@fmJj*pOzFZYX~KIQxn@_(t&)w4#54g>D^AzK1 z({QWpiVO;{pZaEoU0@JU=mYIC-kfS55Jc<8FeZeCIdDwJQ~gv6NvMo2XR)l!PVL zuwWE|qN5oP;(1)QrgDe5!>K^*0C;lKhubR=HCukIFGl*?@F4 zvbJLdDsi&#C{ZoN$6$?x@h@qrK3%u=lP1x(;_~%Jxg;IF zsXwY26BRW^1A4g!`s4`8>rq<6R|KhoD1z?og-9>SWd!ES0i8-vWb3|?s)}Y6GF|}| zo?VmR`KoxejSRj;Z5xb5MD=Qv!#ImX|Cxi@pg7_{Rrhbp3BG%UlKfJJwhW#rh$|Qk z9}_z7(AprYC}VR3f05wsmY@fW@j0QCiRVk_8XJ?E8N|P)>;CRLJ{+0OFUsxlicOe{ zD$E7>(nvqRfIsX=vGvcSk%iq-1 zuRJ`zIWY-tvq?Jhsg;#eXa9Jc8$Y!&tFmg@{>{zPrlqB=mE2@2OZvOX))&m5lpwju z^h((crk}rgGxuWU6uqS;Xw>wqjhkM3ed7j9&OrJRH}jw9mq+f`{yvMxQ!eiN$L;sn z%8Y9L+tdYN<p8% z08CE>1m&@2LZQH&5n8SA@m#a)tPQ$C1TP^AKZ^TnP3H6(@rAtD2?7580TW{L!U!Ee zDh~lYB3~>t`J-wnxDjR9$tVWM2q$)KLO}Zxp)#GYM_ItM%OnL7WRhC|#aB^%NWNQ1 zt~>xZtsOlzBVPN>IA>Iw9Tm=xLZKAFBz1Iel4KOA&&_3PerWpPn>)|^@c9qV{IHo| z3Y7XZ8=GML9;>XJr**~QqY4Xy9Y*kTxU^BP>FNn=3cynUn__;YnzEIJQw!<}HHE!L zdjwA3O5<$WuODvEjY1Gb7=<++_uD;jBl8M!6(z;tQ5^ygg17Rq9r{-MI4&nUZpVMs zuX|5%&v|=SJf?Hnr@106vb%{_bC@GhRc-Lq&>WFf+c-nCk{&E1@;f}3AllvoW(aw< zU?^@T-u_dkPSM^D4sPfOh~k5z{Di@iZESnffFBkVv@$RV6LhQT*5#WGx4ymAc=Ht? z+Npt96rvOp?d=2fd(1ml>536-fz`$5bJ_lyOkGW2(1e&kWc!bg%Vi@ArxdO%ol@3_ z|L^^XthVi93FRlK(T}rIKU^Qo5n_NO1Yc(Hp#HWTSVpmKFn2;^wXl*I60Jo@9t=3J zUWPlO(CCyj$?>+enXLWUFG_bl3h)xa!Gh(KsZ+IM5;dB{*4W&jz?IZ9j%&Kr#HBUf zYT(iuZZ_uk;8-q!vlbmo$kh1j-_Y$g^lHbd4s$LKwI=W0ws@+CJkjL(JtUg+Nl9v8E_xwKbY|^WVt^b#u zuieHy9}rOS>+S#l|GGkoZVx8l?0>Va^v{Ys`Pu(JT36DtviL986%s8_n1%ZF-!H3s zm#}Zvi`Dx3#NT+uT%6s9aCQ$v{9G*dj0{=?*G1`TRN0ZLTX#%gj=%w|uEPxCPhExSpOFrrvT{mHz>5W1^<^ z9@IpQNnI`kYAr*#LJH;)9_mB<{|mj~VGZ~%d!p$*sMP#lyTgCHQ|^vfcY@|cQ2c;- zvBA6yfu-Ax5P%|#a3Unudh-JjN2I_KCdWb`Z5^`#)07mp<$bHZ?8$L4omts0v>al# znrVx^J#nJ4>d0Dzj|lm?JcRMgpN@dktI6gk6DulyIzArtrJw3(X~~@-t{1;wI&~`d zeb>T;@1Oh{VJ1Km5nvQZ*Js*!b3xjqH@Yj5Re@<0Wcv{h!mj2_mSr3Up#VCuqg>c- zE}YxWj&z6zO~QNc@)yJv+)uFEkl#_ZgDN34I#C=Nz60$*GBA)W0j6X;m()tKEA)T8 z+a&z1f;&t2K)7=bge$SC{z&dDZY90e(1G{}K%xrgj@9EiFoF2d9b(>0N!8aWIvQ7X zbgV+S1ZY-7!uHid*l1REa?-MF)&>?hl3s}hf|bNkAywia3rU2J3NAY|Y9qNBe5LmLgGf-e!%LVc95Dx^&RU`)A88Sr73NYk-(R%2!+ZgpKD`}kJKY-Z^ zcRGOSE+9fg2g5XtJ(U5b912uUQ6UnMg=byf0ikh)1-CiDty3{o^Hk3y;A z1U>G((xYCds%^iq`1;}-`}V=TF_vXt$E|%IBGAW)AFb&)eE4uvQ&2!a5PRY+#q0P+^uGPyUH|U7NWT=lf8TeDuP?cwo4h^{w`ZCTAAa*KHkh6_ zJ#+ZY!*9}VRG@DH#j99B7I#M9)W{8p#)^Mn6(IMew+H!>tgrz?k!=q378rnV8YEP!1BAORbWHYuwC@M&l;Ym4s zryYo;nGIqCYoMFhz$s9lvrQ_wnd2GUa9`2T0J4d8gH1#B_Bo+014Vbkjt@=;>9h|f zmGC-DaOX{Y!pJZW!x4qRSUmuRm3XGKR-qYrVeZH#V3K*S4-8i7N2b1=%gnrZ;lf2- zCMy44Y-uS6S%6mHJo8i6RCQIYNzKQux)7O>wJR$lQi*Pn2?PZ}(XHNgp)C_oDT1L2w=1wz3;4bt|1JxTW!M76825Bi+{YNoWn!p+^2+t$AJ zEcNO28Gu-^v|FW?nA$U_t(W@5-0gp&=` zB;jI&r%@&-g5vf}goV8~E7;^M?3}N5Jml{0 zG1%B_?Ywvj3h`p#p?EKX2|;N)TwFapHJa2kM<)+2@yi#J5~IevxbtQDKk}uW>|=fY zdTuukXh%B>D-(9JMYlWngUwvg-6|H%D*S=~p)v1-Q({K?lvF1tPp`C$)G3_jn4Q~S zd1VqxYV6#x8$ZPF`Ip%6Fa0+iexoA;JGc+UzdSQ^^EZN9w{EzDB?@jWpfg^v8E3#a zoB&iE7rfshR7zUF@R24@aUMP%UN%(a$`JStmp-h9P>W&5APZ9e=RL!p%gIgVD$4ZR zOn2AJoSZbg$5e6FAu%zpdUr-f^~~oSdSCKZtG#{IYC(+$Bz~zmPE!`n4sRDzodc?O zBVF*=F^yWiySh3KwVL7y_*K`&%8!`h@MOIO-H5@33tkO6o2ci#iye0|gHAGp9< zx0}`@X!@pdSH;42sJ>5E<-&!PT~y!a?aB&;WRDMqy=<4lnq*DlsSk-Vn6XDUbNQXF zO5D2Mfsk^1QANd~xV|jEVLe-L z5Y_ZLJx7luNzf-rnqyD(u2McF$tyCBWuGi4#}MQ2mg5Eb|F1+=kDQk;B9fQF$9sBA z!sXXc`}vGX_`MytkJ~73ZFH6m%dLw z2Lv$V0WH|!lD=TL(@IsDAO`_KoiLKaZeo`a|60nPl-J@j>;eL~MxXL@2M-U2^m3m! zZrKF{)dmIF-FgFs0FzzZ-Cck}>oYQOi_E8G=bc`i5#cm4y?m0t z|D^JCSGRYWy?Lm5gF4ilS)Fw9O_AS78R-_0vHEmg_B8V%Pj|NnOJ}ym!$Yidwv2Fd zuNo7bT%}xcXJL7Iocc&un7fCEdsx_!un9=ND__21v2sk*rr@9;_DU{6K5Vba6=!>k zX}OaveJ-)EvEzr7r)Q6Odeg>LV`iq8TYNEQGKF|e9`iT6o~M3#KT_A|n`BjfS)Wf(g?p*me>-$-E}%2;d*8aX2w#yis`C39}JxKIB)R{1|fh*;q@u z94?f-;wKFUSyO{9NOv$V7Pma*FL@1H-z?X5@(E9;XXvkR?wqH#Q%DduvqXIK=~lfK z8L`S=W{r<+$kQFn9#sAL%;z>AJji-43yGJp46%2N^f)S9Ar&HO^)VD7g9WNEY4cvV z+o-5;$74t;UfMf|7lsZef|#cc1Z~*x8)U@{<(0jIma^2#UwvL}!-_9U<0Qw@(!P{p zdnj{{P=zUyM;aC|)rW`70`DWIZ_h>jw?dTm6d$uDEiFrTESJVASNUyTeaoRT?Wv@{ z{q2h{xMwcR+_bTMe+vpHDE~e)c6@!F?$23+SlSm~V4i4PjP1*kzOS4+$P7*vX)O9E zAfoW6GLil#5_I9zUh(2yXHI7xW1xWr5m`diGfQ>vbI$s2L5cDPH9T%8r|osBDmD@$ zYQDI%#A?bVqNPv2r&v9*St>|)pm-)|t0UR(7!&0UscgJd6IOrqHwTBkC%*kRDklHC z#z@xnp1=uDHA9gB)sHgh(2^rgUN?^$tNx_*{`fn_tdGF|Jams5y8)S%zhmr#+q-Yv z+gwsr+RW;i&Cl(7d$%aCz({-EQfI+kS+n}> zr=Ju*+Q=d%BXOmMnVv~Z?nzGCay}_>-kBS1)tSl_^kvy9a|yA1BsOEI7G)yOiSu(B^70yTC>=^WT7t(>l>-*%ZnsdzaratK5@`nj*16Ca z#12Wx{PMU`+`v4=a>XXa9~65PCtwRfU3ytr3-ghDK_nj1p9#3O6oNvcJ|vXBcOf^E zq$9r!$wFrD(iaB2=s{Pc4$%J|u1X55@^q8rPwD3kjnKRF2gAEkki}Dypgcx#SfQgB zf?^o(Bc)sjZ3`ztlSR&p)W#cjScf?9q`ElqROuHda16h>ea9IOpWkLFtKD_%^J zHQ+rYk;CvGvq#yq&$#o-;NJ6M;-jCR7R{?J@zLV2s*8LKJx3e7;u?6_2&`8gZJ1-F z(r+5j69I~P?<_Zn4P(Q^2K@%6XyCdVm_ol^x$0W)SSlSRDDHiLnv?rguq#P=gUq{! z!s1RS36m5_Bsnq)LjmWbAQ|{|p+!@|EHr(*Le^janj3-#u-wd%IfzU8BWngl(kPKf zI2?zl%3fO`)&i|vc?{q#k?e$6qy5A;TA7uPlGduUlkXppLPN_?f`||pqq4l8tnSyS@4xmk{^S3@%XOCG4J0=++b+!IE8~5<)2jV^H7qL1*DtdY&x96)mgyal?_Qq4 zUCk)hSJQ`&5yXwS$=9zk)6cgGg+2V}nO_yf1VLVVKqpmo55!r8*`NXMU$929p1~dq zL6UOxL%j@M5uzDh5n>V&{SVPArPKCq>N<9;tFx20jZX9S8H)tUOm;951Vlx9`=&ii zvM!&ys;}uh*41?^kNQMZGkZM4tuj-h7xlP=PFTnZhcjA{2YO*A231toMxug=F9cv3#Uz6SYH3Kc#~dXwl6Q8J3k^aGGhMRrKK}+quZi$XO#B6 z#23j0yHZP1y}e7kz3(fG&$!IpYuAaL>(=fL8Z~X&s32Ui1YEU6jh#F1#=N;>qk@7m zGJ=90T+&*bj{UhG`!hhQv4iL*MBK@VHd0@(p(M!yfsABimn@@_4GrLs5ICd*k32X~ zh-GJ!Nv@b%dnY|qovEpg3Xjc?ZOX4~nyt^A-6Sm8xA*2=U9>)vYo|N64<#7#V`GIT z_S(`ru8D~=mrm2z=+01K22L@ji61eiscFvLYy5Qmsik}OE)}Ad>Yvp&^CPZt;red+ zW_~P|poF7h3cD5GuN%@QPD_ODj(2 z>l4d-y}fY(*NYNV`}Ag0$4=7 z*zK^YzJxHQ9$k^Ho0rTs`t5wUu3N?n2d^{O$&49M#6br5M#w`*f5?Y&gRQ59umx4+ zcob`?ssi1~MTj^ zB**n5=@ao4ZCs6Ti1rX>6nx+p@BzYYrzo*#lGl|sKClJzSm5v)n}m@YkxJx+QAiRA zeiEA_9w^(CiT5!(9#Bg>(43fwRfI`+muOow)vBY>-b(+cE-o`>=ujV@mOTF`fPtN} z80O^c;%sXt2u}7CfUQ0d9vqZ$#w?gQUPqP#s|&Dz4|eh}uKe0l+ z)MsczQtK&Vk4g@8cPn@4cXW4i#rIlN<;degU}DVpDfe1Z>+4g?y4j2Lue-aqg#I5$ zm%kLDm#6@CxfhAY$W|u9q<5HyL28lMl_7jz^25;agAY+r=7a)yPdJ((p(49Lhqo#&R zEA{jQMLIeMjC6Az#});|xFXxY+41Am%c^Hh%+8)Tt9se$S<|v2XRK;!DP3Q)WYWZm z35%;Yl(sajnh}{beP-M8nmgjYJ2lJs@pkj>MP1awRgX6xVvQwyAh&dC#(aQ%@5+qDvk9; z?u7m_+mot0v}o>ZHRoFO%g-YAEAb8aTp13(gMuVU#Upd>AT0d8cmYIrh`QXIoZR0| zx6`XBGjK)@Q{~LS;^?!rQ;Y*5X&z6>BO)BEKsHz$ZEm2rG57%_{$XVm!XinMxz&y=t*nE84QU^wkk?$qY2i!#Fj}fw8Dukxrp%! zU1I^*STG*h%ZDpfzLjE!y@R*@rl*5Fn|J!~pPs2-^xSi=Zf{y!Ubl8{`{7lK7G>AR zXr|3*t*y%_dXg>o4iUo>2TdI-Y*}>g^CfJ`kKPU=MmTu$UHtbc$l>x_=Kh;{J z!hS~Sk~erJ2`H32l-$SUC*+E$I0$Mm8tam=?dQ&kC3JG0gK3*8av2Xiq|+4l(C1L* zth*c49nbaWXM-h5NQ#rj)yJF>`wByW2JkKNLP*?AlEDcL$qJkddXJ9>)S)n+q6XDr zBra8@>05JZ&i8cpWYvfTU}g2<*EKmrOOIm*h;mjsG~P>X>_`P&{0%;h$~J3PvmGk| zWz1YxQX%Ja=Q^Bl=y%u?ZSee<=rB%06vc`aif0sC@gk`p zOBOAoW+uIZIq!chEesqs4^%kWy&@ez7;xFDAV>G&S0S|EX z3KHx>IckP$K>mb%gY~A(-+aqVBgHOXOM6@Mp(du~mKH9KzTOamphF5~*$b4bT4l+f&8wz5BnS?&8I|I)TNrE;Kj< zwg|Pmo1M*&!S)Wry*vUP9PF%ySq>dyYH1A{gOyF7N024TADW|vD=<#2tSp8MR;kp% z=Jxo8sc8=Aw6L%mp^jvC{q1b^IkvU|0a4M(t_d+?|0g;l(v#h)T*BWG#I7aOHsine zd}SThxS*IX&N6usbH`!!yeVeI3Zog$b8^*f81^{ZcjMVSrBd_R(F0FDIV3VYJ0Y&Dth97eTuEtJSzKmfW@MzLNt9iD z%j)`VFErv_|Lk`QrxvFy-_=@MzjNpEl#+~v>`TF4`!^j+Wns)b;oXjZ{qnu|R_;Wf z^lUfWvgOB2_ldbPip%w@C($jE+QMZ2s=yVadZ)UburfGM)Xm}U{w%zk!5*F zGkx^)^DW)o&o!Sv&&}U>{(SRu-QB#C@s$(O8+eW1+xar3Mi_FEwNm-`5Nu z&&TV!_HW&mJ43%rzidYCwyhb|F!$cTMhSnkHzfGkXWx6Ln|;Jw0bLZ){my&OJ}Z1D zlY@1jxW5wPla3w}4w#JmNp+l1xluYqzy~Sug%ZGIzdHPoB%YE*e|_(5r6nPQ5pp4+ zn}tXA?&5;0S@$4P;@k2{oa>9Qu>> zYJ~Af7A2Y*BSR0f0Gg2E9#833`wy-$%60fng*0pXfdNOX3tGA0wLVQKV^PFe)2fFXft$;B_V@bNKyzZZX zTrgVl+sF|{vLzCJ0d!kBl#PxW!n(qw8viiobWV9-v}xdl>(&-_m6diD*1Urll@QcR z29scAR#1Yjy(nI+L~i5PSYY@+zKGiwqK+5$v8;G?2%jQ`+gJ?a!iQO~YOO2#K$J>e z3f1&=v9dBbf8QzmcJlAhIRq)~b4_{b+TzmJIdo$Kn?0$Li z+J#%UwLH%zuxUUzb8_+3g}`ze?#HslWkLwIZr$^02M6`@>yAu_jh!GyudAq7SLp%s z8OGR1Badj%kresNurs`VO{BDWeuGj^omvPONGhTsoO`c6o?O(3_>nh1`7pWS3aJ-d z_G77*Z6_a?x~NQ$b?gRzGO|4-=@ur)3(zWwgAFQye1YS^d8ez+wDy}7l8 z6|sU1w5G+Ep_c_BXDkT_?fKA3)jknEV4V*=z_<%v4uPS9b=ukiYyy(IU4-=DV+-)& zFv6Vh3CG!mqf4^;TJ=4Z?bbNzXyaE6Zp~VgSQUFDasTv#dD~2*x4pD>%G~$!<9pXK z2ip@TO&!I%(ahA_`$omj(-!0%oNeB+@5BpBTh`V`X%nKe`~sJ2d`G_J7v=1%33qg0 z>tlWWG%-{)^=iz7q(8+k@O*dt70Uw6pVG>6t}Hm~X?FUw?O1WG_-#VWyYm)ib!O#^ z+4<_L(_)U~{>3cB>@Oc$Mr>QVM#H6L)uAYLZGgXcB`VWlM7Rdfd|&wo)N1H8+CLP( zU>vJiiW0?Q1*(#<-#ILpc|Dxdat23xZ%Dj=9o78YP{_9i{g0CFJL zZ6Qtxf#AmP8n;J|IF}%1Txtz*F!cAZbUG?TQxIPrt1lWG=$Ex(q_5@( zoFfdmMiMoqsW+0!|a^E-_ zYk5PSg9HL)l2pmQb4)HT4%GnfS$L?|NW zQGT6NS2nnV4Hkdy5P#-u*&wds73P>)q6U6_RkB*m*K8?YFgnEAp`dVGZGBxrTGW{0 z;#c8CS(25>vGk0Z<kazi~Q|=Y*miC9xhMQ3#9*HAxk(z5=RFwX=D>RUK+|vT{>$xVl6e zl9q69#k2DZKvZy9<(8U~qNpg=S=riprL|SxW*8BSjgW@y5$$KZtL|&LM}l8!i9UQ& zWyyS-;qwdD*VQhYk`WVKRQOzL1-@Nb(aPRAY#0!%9sYq0`w7Tiu$&Enmap^)M4+`7 zlA+|ufdL!SV}fFi)++fGx|aDWO_|(R0xsq8IzA!w9oIO?q(6KS`7xWhVsBlPZhROP z&E{bK6n`pM-#)_G!EdbXv|$!uGxM5*gX4u@dtNo(%*=0QaIl&6Fwdy`IZrOHs-Ifu z;-Vg8?fs2=a9GqBpJ*T7p-QVkL!IocErUi6a~6~q7U6qNDDK}svFFtfMDYWDrayyUV@9Wj&7BZCbm(xmDS1uLG+G7wi$U&Y z_KbcdvH)7?K84%$}zZ3$fr?Igt9_fvvmGamjPW$Lm}to zK~$H8b%WWN^i))@pa|w4#D65GHUv-Eao~^b%^iT0zDY67Yj2@e_g4sFmcoruh?hc; z7ryy*9wuKd?gYL<{5?z#EFzu-j!N&r zmqY>83?(pE)eOdU64ekz(&DzJJ@F>fLvWT!c7_sid95#SlDlMtR1soUyB?g7zy-DMLkIVX;s2pW z`?92t#0E2T=h`*YvvqLDl6lMf;GKiO$=&2UEpTQ#lR(-vq|ad`^=Uv5V^E}6iqSB# zOoX(7^FRs0Mg^l)T5q_TAb!T(0_51XLnmJP!xVjUYI%98@{eDu6iQ+%^K#8*%=^Jj|B#=F#D^@tA{!>?aufzHb z)WmR8Zqt9!sm687mgVXHI)bx)MCaI&v%DisU?*lp8>&%19i_YeoYpeCC zL`foX9h`wifgFi$uixY;9(hfk0(}L=pJT{TDG_qo5B{oOWNv zp=5oNByuV75G0v#kjxIJmXxIOmrWBUt*qTLYGg@j?-K4bcTyj%j}#iYZsn+w6zzqS zl93^sYipB}Ou6cmk~hT(?A^m+0_)VRee+G(b|$yUqfOu-Q3N(tmxM$IrTak)2IUTV zn{mo;u3NX(ROd+z1!o3Rn+7V_F={yD%{Oy=gZUb2LX0t$8kNZi7XC<$%WWbqM%jtg zZv*eIf+pL>O!Bq#u@tFRgtT={GW9u9{Dzc1*(;?|itQ>Oy#U;)s2v%E?RWsZQoN1; zp%Mi}e1X`m&1@@(7uw}{zAv|D3SZv{X=F))Aa8|a5a}n7^JW}%-SF$CfNYZ6Q)WtO znEFhzBO;WfO(-%n&>mmV*D%qdQ}C44*e;zTjo?kmcxFpuYbNwbmDs;#q-8_Ol_}vA z^t1XLK2vVfez*q@OmA;{+q(v8_|L=~*2d6Roiqk~X0SIP$G;X`?R>mOYjfHutnOmUskHq2F(m!S$bgM z%L~Py7rwNRr4C9{$AtNL`xFG%%+$=u*Ua=D9Xv3DgDY;;_t@vBsV|tnJT>o?)#7I> zW0)mETW-g!RBy>Mg4*e5&-pM&IFjk!TWpeVDi0+51mJh$dZuku- z%1*%^oS)1B<;+PNL5c`Cqd^Qu4!x^hm04Al$q(j|$E8GzaQko_mi!U%@=5U$^FGNu z#WPiDsu3vlbW}u`E!)Vxzjv(&Fv_0ddy{gbPy6HS`|@2D_6K3{8uo zfy1#>NFFvp1P~z6dITuqBR=pnQ|iyzD+L!9XJwX)i<45Y)x$B!57GU^73mcr&d!b} zy#l#tuE*8a&(_}F)^DVXK18%V0c?6>dpzvn9^iZUSrash38GdXYLv6E1Mb&P^ur&R zAt!m{2(ivfDFzK}TO6s=v4)eZq3%T1XcuQkw$?3>-Q_g>8b8Pdh}QZWC%LZ~tkf85 z&>>^0J5UV5Z}z)SC;SinXPze+vL{c9m$_|^7zG=Dc@&tpcnM{-82E!U9!6|;FW3vo zJMcgS{g30)*Wm9No%RO}KVp<5;s%ZqV+HVk@4|WDFu zCL^I*P&C?ih$-iw{GaPCE$y~%9G|N@lPi>Ti>-?Ltfa6oOgtOhojbnw1!d`YLtdCs zFR=l48c)9u(J7R8B!U=}ZdBfqydsoGr}B^kT0Cea8k}J;N7Isl4ujf=c-dQZ>BQZ$ zCpM&}z4Qmh_0~?G~EgpC2?O*r! zk=^UfG|<1r&>z89ck6@2ORPVB`^3eIC*J5z(j9+n)6=mO{>pr3nyj*Ykj^+Qn-c%uj5g{az$NQqJOVG0Bk z&ywHm0X>8z;fC01%IkWFBC@;{OjlIcKgF(S{5BjN@Sh3E{V8wPcQ3Z_O*I4ax} z$@S)lKq7GHOG;LG%Em zJO|iMvL76SEM<*R zgq$v^Jy^N2eMmNbL9tNCM=2?DXc_;MXB+C^I<2W~+|{ruCAnhmxn*qnwicFE)01DB zn%wx5{sk#wPpz^Z6H!tUF(x^san;MmI$!&Ixp=y%iA65|{I%mpUtHaol6+5OJ7^Rz zUJvGVj^cI2VJtjS!pu2o(@3TZx<&}2yH5~Dv`CkD!3IVy`jbvFsh)ekE2E>4{FC$- zD&t7OD?jjCkNn&y##5mny9g`8ko0TK_=C(!qD>k!UbS!XSYJPL`zOqty?ve8n81-^ zH%EB|j$zKzTuh&^9~$6^>yab9t)2anBc0X0mU!J_q}nlZYlKsn;VRT6A}J-pC3K|C zh>?EI!~Afa;^$!N=`$)^dpJGRHN@A_HO<{(WUzb0l$219Fn3E=UtiZ@ez;EYbhYwv z?EWN8J5TrROU?N<9_gWe0q*urKFN{pYIl1=*tHlr+9i@((j4Gz5$NX|nH(IPS7dEv zZ!%aVn43G)>5e>8NEl{v4eKRu^A zyP8*}s&A{QNo4A*npUx-6>e{RD@vMy9rgd;_#FGbtzK1iutwx+vh*M8?(>Wb&8jKw zF6$Nw@t_~o4MxC3Y`(nE0~AGTjj|K$ zPW%|W5ka(IFFNoBx<8I4_M$jnu7IxG0h>7SAdWo?{;^cGPRD zYKiWcm|qebE$|VM`J<;Fc=N5Pj;}DwSD26ZG~enoD|g|7oEgD^K~pBg9_(ExzF5Ob zXs_N!eF)_{u&v8A&@l86Y>2PPSgNFPg4AFfSMzfRGw>@d zi`XpQ8^`WbDFNH!ml;W5u>>M*XX;D{_kG921S6KqBtPqIb;nj)E88a zrT8i-q}5xBF_rj@#AZ-*iVGJcDZuS_QLl=cSGZ&6Yx_iyH$f8KxUAE$T$ z>$w!`d8uLp`h`9b%sM4nNc>i^Da$7XS^rS32=9UyhQWVgLLY{5Nn90GZ7Fk)N15SspzuZ6as5%Z!MM2vxVf2` zxw!>Yq-WsduMe2B{tJRP2lnrS=^`d$D=6OG{z7)P*rm@9yRvh(?s)f~AJJ4Hzoi4EC@n0M z;{yF%Tm<2{l0g-isZs|A%#^E(zdxqWY;xj4vxQrgWkOO)#h|jpL`+s_D1D+dC8cyw z>2u1^kkF73xb6t^^b)WVPTyJFHPOn+Y4BjH)XGI`5MC(^RqmRRv-{|cq_~)n3l$cGnI?POt-ZKc7oDjgx%tdsjkYw zgRT8YJ_L4nsDvFpQZY;MB<9Z*f$*|V#ssEwOrdN*#~wqrBb7~p&_f{vo>rJ?`k)8) zk2KZT7*w%dqLM~*xMl)VC8$9Gq+nLX$A*FSaaeQ9?|+2JFf zd~)RQg~JK1t0pBju3_&E-%v0wf9|@FWS^8#OILZ7>q#rj9UVRYgZ$e6e%ay7l?_BS&OT9kr@)@0vx6;&A)>>H|&b zS+iwChc zq&|tI$nPYd^gy|vG9X+Z>`QB21z#j>4Wkpz3LKD!V+TjotFO$>Kf3PxoLLoXs<+Qt zn4iCA&m2j3&!6+!o|Cu4y`uPIeL>@%_P_V^9zD5d4=hfSt6PT;VJ-FP33dkLVIwyf z*s3LteRr%8S+uvprE!rFq8_PkMp~Zj0WA%+FU($eV$YtF>u<*=Sh z;hbLVKG#n-BB?G4V+6!`nJ5>7pE^tpAsZ~@BfOxg`t*QfyaAj+23yP!BB9zL;f z_6xNQ6$^>tiW7TZFF;6Vm{aOlOLw5Qs>6afJE#l^)XEvd1dF=Mc0ZzF)of1M!b1Pqmy*OnPc1^RHi-l=#`R;y+(`C8IHa_A9d+W;+iJ zi+2cm#ocO!z4z=ns-k&w_w9fGTk+(#+NWnHCgwb=xPOI3T|LP(C+}I@(X!0Xw$?wD zh}%;Q&wnlM`i{+iiT`Wf%%@{#&yEf9u?`6JnJ{-;(1=Qxh)GY+%#(C78RLd>XJExN z_Llg1-%Qbxrt$`Iu5GxXfDv%heN4DRoiF`iW?ot5_QGe&%GMXXFs&>v_oZF$6eT1! zcPA!n;xpFYy0!k+o%MI{PZgav`=yuPeCwwpH=7UE)g5fUdE|EI(U*75$`cb36T6!e z6VGna4_ki+Uy#3pDS?b@)RAqW9XxI&L5V{gn~9GJhYZ|lE$(HP|5@sNWzO4_prSTdNhqz{Hsas)uzCI0i51fO0NX)G z&%GADwLqh*(bTjZY-?{jh<|PE`#Ns?d8fEm9}IH{SBxP(+kIeX=j$75vQ@CyU2QkVnWlwJi zYC4<5BX%13_PsZOmm40Q%mv~9^5ib5IyH)U3;*m5IUXL7rtD$M09V}mJ+Qxk0;aT+ zqPX!)|4Djzc{+V90#WY$Z6HJ+?B}wF>9N$2EjjeD)NDE;Zu(6cdcWs)8{@|fHZ?O? zg23tewd;noBSYqm6y!`IKMcc<8Z9Fw%1^}gU8rh_2=Y94eGw`Cw0W`wT<1vs(oMog6BGn9{(nFKlN2Vq+(ht>5 zWh%Rf*0l29qI1I-jgNQC28q(HqsPmI{l6x(Kb@q#_8-ef5W`4iraw0$S-)CUH#aja_$6rG(9^kp8oND`Jf9f;rw@YFtjg-hV1MhXqPQON7+(&ayP6B_m(s}|SO ze&pUe%3XW>M(q8*JYA;Lupu8>Ys0YG`i&t~kF1A=J7C11h#@7eZ|x(+LPB-54K@7#C^BjE`i&nh)5?t- zfwpQ|^f({yaz11r=`@N#$61weAa(iW>3!P)L$_gE+DO014e8~N=+eNsmv%2DWP3fB zdpF`LQW`XZz@&{Uaob0cue9&#((W-#J}y8pSg&F8hKI8&1L@{h9zSZN8B`v}n#6jP zdG4?G5$3+n-@!x5BRrIe7<;%39z{&Q)eDXT#{ygp9yWxr@n9+p9Re81-dz5n0|Ts1 zK1r1JoyR&mkBK+SGjcP4y`Gj!IY8(MzjEeG?)!(=2<0Zp2Maj-(W70*kBi^4s&s@# zrOiyMnArssa6>-`tCq)UOx1b7Gs!s0C{)^wuxBJ_T^e>o&>?I?PSe4uXGcH~kWfR( zltXW*0Qw{pXm@eNWm9XIzJ~4Rifg8pz5e5!wz9T6=cd*~kIO(Js}iQsLLoPAm8Pal zdGvg@3N@iLHR8vbnjhN>+wR z>H=Jyqpbq@>I)YxaEGrSIkxn6pmns1bCCFSQ1r7KIF4m94OQUV4fI5!em#N@fM8f_(8f~#IIF}LZ)abS}6ZXn5gvG`*+2&rlv3p zlHR9K5|9^cpgwN!?L+6{$s9(uNivF>h^U_yGEvv}ta9l&;q65Ik+i;;$&rQ#8 zJHQIc#4W6%P<)|B+*Qa*#VvSv!~fj{3tEy>%FFZf{ol~kU>Rl~@F^}`xMX62#jxqq zv`+p}vB>g;jc+^v2@ubp<>ct-#4BLiX4fwq`0C1m3*UZw;lP!z4qOl&YKp9_cRf{~ zmSJTT8oEsX5v^7(VsS*|2*z<8VG)AVb6xvfSI7S@7wbzqEC+0)lmClh~<0B%b}ZI7d{_wb;(5 zrCJ9Zi?2M)Wm5GzmUrQ6R(^}wM+3uMdO^W5rM0NIKMcA?7uqC0AX-#;-?8FWwQ4=r8cQioBzK$=lY;JL<0LuCw!- zHi#G4Rp2~VXP}KfKK+ED8k3CQ;DOvFZ;vo5(pn`2hcsJWQf#FHAXw>4P*`m;sapHW zMQiQeiiX>>*FG~RKQSR8aTD|T>8Iy5i9JPyf9&Yt{8%C9QLp@J-QA5F|In~Nm}&im zcK6!+Ih!UYej#buT`qQzeCjU|V>D4Z$ ze|@0;(?s*IgDsl3^@E-{ax1J;zb?N^Q^*zfpavd;g_ih-(MMno8x>(PS@@u?sfnc` z0>u}33lkI6uHBU<9{uN!?Y?Z(_j;khq(Q7>4*HxeViD7AVS)K}%WMA^pnDg0bH6m) zUCgavj@%pKiV@h0#@{CUmy`7CWG?4na`3XVfZr0CT3$X8ScTAef$e&?p@Gx=-28OJ zt3Un75(;*)UTyU3$}Hx%XA7J%*Vk|PO#H%RV}pKBOYi66*LPMdH_sP8-Kp2|h117P z`RI)i>}h?rcy-FTwOj1xt^ zkt+4-bZfwDt(mp9Qgv6iMz=e_)vN`<$QWK3w;8gZ%;6JZ!`2eSM{@R8Vk*x{#IfeY{GAB_KA!5!9h>yfswk zAl^Ir9=?TDZ7a~ng;MoCdCDp|VRneDO9*Ai!>A1lCF39tIQ2(-_mPfA+O{0wVt4v!!z&42 zpFR6^!YhXE^lpA+OWPwIN3gLZDQ+Xu;I{HzoWjb63x9vPqqVi;<-c!V{9VGUhSO<_ z`GA8y}npokehk1|@qp20uDxc*B*R3svt#1(`=AdSS# zWuAEGiu@Ly_zO~cvP8TD?jsh4hf2getInSgn#=jt%VoUnWC&aS4nN3`^stq|$N0Lk z%Y1XW&~p5w*j~;WE|;<8CxiLAcX0L=p5bjF$Jz3-%dDwf+#pnyon+z1xKsHV_JfXt zJt3HD&Xlu%p5PZxmX)30A0A^j%g=B-9XrXhf?400a&CWuMH1?Da6SAiP6dZAdRgmA zOhH;OM@zZ=z#D`WayKhge-^K4-P5thVNWaD*|tadC9i42(^h(|jqSV}57LYDarCaT zir!oMO#cSyV*-8UnYEY;gT6vqtN$LeB3BJHlTu@P0zOZ5^Q4OZ6tvRcx^n~TY~8~u zqH6{JCfFxwU8)o}t!zP){55p=`f#gJcl}iIFmC z6iT?KAlWjaO9)Z|T}c?zF-Xf!$2O2+(itvAgpw6d(&unO47`5lGfG-NfI^eQmVUKH zJ~uVh%qt)z&V{X=2*G-HMkOhg>5+Pn6S0QqHxwOde3{!DnV468FFaW8Q0|_h+fm=J`*>PL-Ta3Rty$|G z8;=YK=4RD#N-Qj{BYK0774z$R7a+vqg`QmCbDnCb-`QE;AjFhCG`}t*tzqE-m%U4y z&1NI=2A9E#;CD=(3$k5N1)ex3XhMYKD^Scu|F{Bt19CN-WK80#Rifswnn@&zQk7)@ z_`q``lO_zcMEaEa?x&KfA+;UxOOkm!5un3=E(JluN_Mb3EzL_~I_5nleGU%@in0jE z5(*Y8B}cMu$`;CNkjNu2Fp}-moBCtZB9*(NC_T5O0z6k@e3G8UC&w19#A+j{%lm#Gr>i5HS5@VzG6*%!z9Z-iQ394^if7`KYtT{0xE)( zpIblhKzZRv>!VATOc*~tduhwYhr#kBpUDo`^NosGiUsH?t2r29Flajo%lL&S526a5 zSVx#>Ch=Zkd>C+%aLYoN!rZW8_9;WH>_@S?1xu5RE*YWDuJQU8!@}k)DJU9|wYO>U;-Ojxn%Nr&;{le*tUhHv37 z>cpg)rO$LeADZEy3;XpKe>)pLmt!H>KK{TNIxQQ%f+g;;yh!&6!$Sdi3fcy|;@d$hh%h$b=+T@-{4BR@+NoYK-{ z9Kpz#iO({qWVjT4Q(A^P^d?|l=*C2~2J$3w(yBc?!xG`NQN}UXk(#agsMyg{{0a)5 zTE4oqrq*b3cQ5wd($ll0#M{f++uO<8yCgS0E-pUzNKG{h?qRkvE7c+CEoU$9LklSj zk{Gf4Tz)VU{9{`lTviZkP)|4HPrOnvPV~-*w`b}p%5(PK9~^V;J7?#4_Q-Ih!$(`T z@P8POv9-?5i|cChp54A}LZYK%e*S}NHg2lwd14!oe9qnl?oPI<__(cc@f|hQJzI`= zdxwVjc&luk+zY&&RjNt(SCFv9d2VUSgo&BW(b1!IIoZ?wg*bnw=G%%mAAQCxlfU@m zw5)Z1oMtE-zy1&9+?ikITEKj89t@1fWJS56N>Q(9QnV;qi2+J-H)8|ym%@wa0Em)c z8Z=j7EtfhOk$UkutZ4-LNxh%KsIT!+M~oE3ou;6tr7^%LNW+TvrIavu`DX`28d3T> z$cykREh3aB%@0-mQw0TnQ%1)|>81W&c!)+P#?#}FJRJPT9)7vH=7>C0B?E&~LIdet z?Cx$d*4DJHj$ig*ORT@Zg7eQUFP*M7#HRhbK^jr)<((T_;vG{Im7PDS5#?q_6{$x~ z*tY%IyxO|O&d$;R&_IPIyASvF$?@?%vZbfGrb8OCJHyno?TMbMO&ixdn4j{ikQ=u-cy;EX!+;#Ob`eV?#%?10#~Er>vaZm=C~7sXVyzFwDbYKtgc zZx467pc-dCe`hDBn#X*G*#}DFxxKpP+_po;Y@;;bCU^VElNT)L96o$mO?BQ&+qY*L z9UXJ?maW;iaehrTtzWFturMrB<KL$$N3 zv%jxXwa(TJCIec}1M@-FqdlQTmn&XYAbgB;==<(}g9?8lt=>?q*K`aIt#g1*1~yO{ zJ9?YeHto5Zk%%*)!a+r|OL| zA{8nK)kQ@6L|CTT4j&emwCHE%n7_Z#$cA`pSK~v9{g~gUVa;Os^P)>}@1&G<;&S+St02{`RUF4& za%V>TvI&79w$2EQG5yBTO%iP=->I~{TMu%Y612m>KSig%v?pk-JA?c|$#BR5q&Y_O zk0vK=D>#3!t>D7+wYxVKI*YKaI56e~gmT2WodHQxeRd|<1qX$Ny1Lnz&g()#z}xQ{ zcD~ccqzm)indCrPgPW^u(z&ppApWT?bnLh(CDX@0xf2rj#-ckCcsL-0KH;+8b5I&j z7~O0xG=tr?z$Y_Ar#fjf+IySM&cQyw*V|LAYjF1Wb8~TO=om44xK`uk<+Cl^#>v6Q z+uO@7xWOX{=(UDzKECI4!GR9RJAJ~#l6-c)ALiy_H!L_rcRtz1)qSKcc%&`fiVQc6 z*!h0AtLrekprEk#lWg5wg_fDqre$UZkNkCY^`wH8tM;fC)bHL^zre>gZ-if>F@KUV zapr2s|LF@CzT`5++}vzNnmAt{pUkOKE!%y3)%tBCJlt(V7fMnrI6n?VQvs6HUtAT4QconBfx zop?=K|Fz5_DGPI;EF3ukU7?)4_pfEQR$_CV3Xg;*_DXm(L ztR;i})cRaj=OoTsNejB8-@$_?d5f$kuTk51>r6Dv)&Y8LyxwH$NYnS#P)K5=dMD*9 zG)4AXWF1JQiZqGb&rdJzgmUBOA0^a4_u*%fqk81;_e7f1u|QHnpD{&6X7Kl-pu*$P9spFhB|u$uG7A~UR?r}IK}TjZ5k>$Q^oN@9B@yQ&T_Hmo0_-_T&B z=2OjjVu;=dUkh6E&fuQ-GdTXDO8()$$e*C1Hj<*(MU$@~?5vX13a zy9Vts26$HU6qDi0D8Wct+a~E1ceO2UuyIn`2xvWD~H4Is|U;wKwej>g+yqF$M_qkch- z?ZTzYD$plshAmN1VPZIv#%3B;8-x#ZQJG_-witLobduT8%h$)x!`((}YvW}0x7C}( zs}GCw#n*(3!UV-_%M;s`wU#UVcpaO>f6L#fV>#$EB@$#-X{xcd?GcL+g5DYclcKxa zLTPq8lgI|QA|AocLjr!B+9u<<^t80}B6EwSJ3Y;8PD@9mQuXR0k+Z{ICtLVlQ)ZkEh;S9_{XZq&Fk6wx6MNpWrryN4Lz7irvB6kECg~R!Ti2}?;C6A;V%$-p!9li0&s?|k&vamv(%B%Z-L}@CoI*Yl;ZDy;%Y}j6u zZfI@k(46U{!o{^JWF3%fiUZgxVxkJfjwbt1?=&|w2(84aMZ8LIlOW+Q9K|@bC>mj; zOp|%5JB=EiraZ^bm~(P;da**K>M1MhJErV3r)6ZMnX8cUun6_3MeBQV%uz{+{ZFcD zk$Cjj>i#FGN8ZD`s1H-j0Jq;kO$%l$bmF0NPd@zU6~af-GaQC#5Y)gsj;9hlSUwF& zQMOK6`j8ez3P*Aru%xnNoug}lYeH;xY+~@Z{D4ejf}`Kb+Lv3(H$M81V^D5HdZ1r9 zZ)zyp_RyLjy;tbSOk1@fJY<|XICS`M@0LBUuiEGD)c~r@c^7Z1mL$#RRjm&!+PpDM zAK_%{p!N&Yy2eE3H0Zrr4PlOsQEG^rs;cLHZNXK9+ zvc{QGS_@fX2qM*SfVvLT6!S@oT|3J9SxLyiG7f@wOF49*JS$g^jw<&`{xv#DcK!#(Z5UI3ZMe!M(%?RQQ4Q-?m-sdNA{i4mbd3be>b) zHch=?d8DOqPq5J#Jagtq@XiJADQr!jVTL@{^ zph|lEqwAf#bS2_SM-uF~}osZS$S-DInDrW+&@*g+o$ig|${o?R8fj zj)Qj9g{j2mrO(N=+zk#3FxP6nq`FBgt%G#|9L9}v-tt`YQgdM;sK%ZXV)$nMrL~6g zJ|@TT+QR!ll1nUQ-yMM8{G_j}b)|z{7N)J0J*oESyN;gHYyw5Bgu77_NadupvMo!B z&{xfiraj3t|7m_2m zjGbai=FRz3Gz*Rg;6zN@+STh)w1mk;mQUQ*m9{QeKmJX>Aq z+12He`>3I$c*pivRAfZTgG!^MaX;CSR4JoKC;@mG}VwSAdfQnKdZVm|;;OYMIub_CDoD0KKH3IY(>nt}2Wq|0km6q?@#7 zST_j9ht$M8Py>0XOFP6ouB6@Jr*#6V2Vvc3xsr*v?WF3_P1+mo_?2Wl8(3SIyf+0w z_=Pl#8U`Ugn^Ke}dIkYvmtdoiw;X;(L!pd>lzp#;sQsr_|@PJXxtmfXc|Y_K1Cp7e3nY;-)#-g+BUK$Q);Z9UpTY<+ku|mb}Zt_RIWW;=09+GfGm;<*U`F)yQi zB*)6~3FUnwj}_s(WX=>&H|Q|RzuQ0ln63Zn04yw#CAB^9l#3x1*50Yl;2MzT-~fxuPv;;pBhmaD zdXHKSluwxxH1)`#Si^SrTYmb8YSwqB9%`x~LS`!~Ic7#T?yB*uwwCHPh;4C$^cpMe zE|S0Lo{ZkELrf4PC`d{j%?3$qAasRftAG@H{l?cDH*MPZ^$j8Fn;RR5F7KNu=}4L! zlaYZiD81N}S*njt&wv%DGHvtbBS$v3XK1Q6ZusVgc;Uu38#Zp-c;kkkzj0&ZM)4^< zM1Oo!4-s8onvoF`gB-UaHb~E{Rum5@%037y;QkHbU;hQ{>_PShdk}$+4R5~LE^%y+wYG9> zG^&i+m$8?QY~Bo^I-`B_{o8q~dtt+ylnni?OPAiF^yqIkEL84_i5`nqqX#neQs0&8 z^+?Zrd+xmFUziJLBh9ISv&$8})KH*d6T#>v$>EZuEn$1GePLy*v7gdrLZE8Qc07}I zzc{=g(T!;(#4(-#rx}!>^%)5NwT1)t)>{LF2ZC#h5iEQePc9=PZTz*XSJ~9x$??DH zX#)|#APGc-uvjd`)2fTx$}NrTU7n!qz*oOu@AhwE?}APcG?qVU2dxassY><{YZgRW zlmEF*L?J=BN9abV;QKxPk8Qhh?HcR8a)rHp^{S=u{*V8CTa}Mqp&#J@ku6>mi>15! zjhEccUpQVv+xFkI;TP4F_JNU3BF?Rt}wr4ulNxFrTVv zfDG*f2|5B^?~4i?kyhgGZ&F4r z&dalNe6pIKd-25t&!BNi<(Q~ZS@jE=N;AhHuGwbvD3!`DT~ietn36nZ%nW;bFR$8k zb4w+qyiF8qjzLxDv(i7PlB|bHE%95%z53Mtydf=HtDfGserqGd^MRk2y6pxf5$@_(#UV z@bCpt_>|t+)isM3%&&c*wC2H%#g@bpcCPeVsnX}Ev)w1k3Jy&z$<7|dX4g#2mA=Vp z3X`DC>2yg+1g(^?0W!A68M_!xX@WgC!}3W2D-Ie!n~Ay1AKW?E$Z%*|Ips9&o|-eo zEmcR>tS&37YccBr1J4Bp_NDPN2;x1J8Lq3cQ^mHJ#q62<$0IXJ*R7u^oG`ak1qSHq z>U05t{X3LK6B)LXEt&33WGIMp^1^&io-|~O(@BWsmR2CI&*znwv%KE7n_%(j; z)tC0nF7MkgckZ5-zUqCvo0Y4zP@<%>SDIy+(D#*|7^9^W^3xK z2a1Xe24DZ!Pfl2N%`ASjeFI<5R&3hzXz|SFR<62HSNGJ6!)Vx0nS+><2-$wWQ(H|- zJP5US4Gux_9fX;JD-v4l&z;Fvj~#F9Te%Wu7P8F`Q|&MUuMPHPHhtCoB@N}wAh3@0d@zy>G(2Nn`8A@e%tSU z1YV(oA|Q~wi+iyz>m?}j;6rNroof@~aya2%LnXkVtu4U@RSKcGT|@!xLbF_osGuvc zFS*yiJD;-~^;AX;zbTXwI-0HI>p*R^reAL@5`jfS`#1nSjL?Vs_AzY@kc$!pr-4V< zBOoAox;RlXBs{u*Z;OBHL%zGtzPDM=s&QFa<5sQA!cY6DQ@y)7cRqFh?!NV}k`F%= zoId=pgm1CD!>e9>|15j+?EA02`u=&IbN>BywosYG7UDDF&5u8(zJg8THn3vvL53d* zTRVkske%vIxC2G7NsKa!B6ZRia)6&IT{mrW#t-ulwb z&(BSB+0DVp$-%An_^G!~y^TMW1OE_rtk|SHWC9O=vc;UNk5V=GxmnC^eh!YV%0sS> z4wfUr=9@RgCbsP6O=M0R!;1KC(7AWy7~tNKWg2~lE!IhrC$*BYfqeo3y#QtvR;MeT z+PL-9sjZDui*6sp)derc-7 zXiT2QLM*pf$h2gm(KMA`QV=%#P8qs?TS_R2{*d~~xg(W$W<+i6`t`N7BY2NgV(h?k zkO&oMu_yZ- zeiP^T26iHmmgnf?ic+ISmNB z;u}~?{|n;zH)d9D0?8_F_n=%sJ48IoaSfg8oa8_izH4GZ%Idp|p5q$U5|(9gid)N!<%1 z(T;+b5o!(z!F@nA75_}?YC#?wd9n+;7L-q@p-?_aA!Q!#biDz%(yp?g zX~;pEAsR397`pM%TC(bBZp02qxzGeUjAciJ%ygg}yp-esrg2k{+S%9h{%Z!qp;x~9 z?yGCvO>$m4%G*>&#GcGmO#KYnxAV3_s5*>k;@NPpBC@7Ab?Hbuc$4bRi; z)U1^vW+4A5;1mf#7@3o+OQ=pFX<{`E3t0QN-(BZ#o;rQ{6wAE+-M74XL4#2B&rd$# zpGAb{R4`<=hYPZR?kjS_Blu^Ze1fh~yoa+h4&#MT59Xv4LI)cd6yoZljoZGDe<-yC zo%}WWm__c}j%}eHo%qk>DFm@?S12UP=G*AzHqET&ml3%Pp+Od;=BDDM<*fZ4+<;{I<`GrL( zc_V|<8ib0x$>vmgxKQO^F8o@YH68!43TCrRaW;4mhw%@OEa|Y!V5g_V#d~>`8)xq6 z8uEC^8u3K^Xd|J+ghcDX$4qmAWs5L>@d|M_%O>*|KOt1G-E24b=T9IeM8N&)ypru= zj09fmyJ2Db~^+dK-#m-~f>}Ve&5xX+N`2D{qxA{Tz+H$igR0 zlH1paXdg6(DK4NrXk(uc`D@_(o`cYHS%srH?=dvQ>`2S zAAX8=2+pQe#6F;qnlKv?1=bnIsYI0mD2xtOf2OEf=f9|oy}5t zML9l4<+q{yN8z(nQZ6+q%ge|x;*c6}M^dPu%2s-l-)`ECZ=G28@Wbm)yvA%uXB(K~ z6c0x{wwT9s=#us=8w&B5)Hfu=qMedLm;)H083zU(d$QUygehpd3)5*V1xffZ7uMHL z#iK?uf_>{P9)~-gm}1VJ*u8t$rizGpb6Y;zzU|_tJfTXkV;ZKasyh6#`ftXB=aQ0} z_STCkV?vR+F)6vIuwMC4ap{&VhgR25$kA*%w_DRRA!o;vXZedFf9rogM>WQ-l1U=QLMgrnx{{G>in2Yz0+|+`y9REQ6+zkAj#V@K1ta#W1DhOD2pT zrB%^-I-^OXjHNSIXA+MfL$7?#WH&54xGpusJ6|8oFD(rU%1o$V(C*~m(%xP^Zrt3` z5>s+~!jambKo^8jIp!W48)tBRb=sJ*{(2A3NzWadvOIf?@Ow7lJ=3Iu?D$Mu&$RT( z`~oiY{PTMrE-v;=c6S*5`uME5`lQ5~s)uT4memNa0k0K2+|j|YKzuA}!njGJ_*IuA z)1<1}1(Wt$zGfe`PFXa0EcJoFCh!8ye(bTXiU4ZA3}c}tOKrroQ(`zJU$Gn1uywni zy5!K@i=EmJdhe=Daj_L(Yc=P(xLoRds%?ErN_fQbl~1V_v(vX0$HsM( z8%AxdAl+&j`uhOZ9pwpygo$~rBh)`m)3{hg0v(dFA6i2XWuG(_fa=<{+EpjkwY9B# z^G$?u#?Q#a&xy7+p)H$u>NZtXq3}YJW_=rPYg^CkUcWLf^JM0@wi9hj;$m|qjxv-P4$Nwq4QwQiki8~cOUcXhUM`ZE@rz|nSgfhoJ5-nVbg zY=6J?4Fb0mWxj+~iIsl;Hl|*`L!&QnQ-F{6_WK~sdq7G+2WDMzSO-k=+>R`F6 z?{1HsA{erdl>`YJg*Q%_pEfQiL9@T2U7kl`$-Og-r>@GbkSCGqJUji9Stk6NO#rbK!dGfS3=g?&{siX+2Z-SP|OR?V7g zOnPSn|MDID2ua99*{Dpao|M1y+|K-bB{G1{on2d#GZ7IX5mTmBcf13t&OeH8|M4Bx zK_3C(r^Ss;1&woO0LD55A z-u`|W8KvQDB6AeaArNyPHtC$g{7F%Im3meY9*i;^@6EwJO!^?&t8yXPSUMfZuT@G> zn~(6BhPaE#w>=ca`KR(8{d?D=DRJ~}3j~_k4U#Uz> zOo$sD6u6x0b{X(!L;#wUkPsI?B5+0jdUPJu3%5J{hgpf=1YjumzCLiSLeH)f3x&hz z!9iOJ<+SycyvMLF3@Dm|N+~clFgM%*E|PX8Q6#CZUAdz4$;>M6J##1DLO;AL*DfnN z+Gbsm)XefLv)Yuei^ZzO-fl3ew$0WUDZ2vix@Ku4ugSQ~Ib!h~yiq>H?=?^#fK17A zEqi%}8be_IK%GKq`$9SpSiP|bNDK0W<45b$dqxvKq)M4teSf%&TERX)t8K7ezmw=* zhbDXIJ*`@bOj6|{96_j;upjk;rC!)i`|AJ(hy1Q2^^p=vKqM(R5`{}B7wT(Gb${$& zUX7L#q8g;z(2N-r`gjYDb!9AjdI*+4#`nlP59G}X4FbUeQm#vs3b-~&na*((shb$2 zjwdEAVroDRvWzql5+PlYQWEiSRc|v@G&HItw0r@X=E3al>PJj(L+n z0x`WtiMHrDMJx{eDjt*B4Ov94A*Y!1mzi}7PvAqt-?dwcYnu3Ly>ClTd*7xfw-jyV z*3V+zQyLMb1%fMs?mUuKEOt3;KeP^D(8axkI@T&>Ix`aN27q#CnCkNm(XTZuEIvLg zJU(8~;9oeN2%4d(vxVq)971$ROBbmNaX4uTE)T}6iShH79;j^iYY?wynQ}~b{)CP9 zCi4c|OTo@Zc=`BvMerE@m<}l9u(Gl+BG?GS{<9If!ZPgNv5F*Qsx3ha2~=q%dml{l zNv(=cgf}cs+IdJmMS>fgGn85hx&(FsW)z0(y*L4+Ex~HX(`qznN7K^kYJaS&9g}u6 zAGyecR#4eDKl<$Pg2HB1$(-Wjk*jL!v+6A&d%oPmHWkG!U%q?KUu^B>&ffLZBP?Kz zxM}8utW9O*>oT)cyC1BtO~X%Z-HQ7B{#SGAi`K92?AjIoP5Yw4q9pgC=8Ea=6Lag> z+5GzEJ$st_tJ+v>#XMWv%TMoK@u0t7G5=yMa~YR8YxcTzvu9|1(JZ)TY@wmLA zB4zu{Iq$yruYEh7Toe$g_X`Nv_{JL_Tsw1S>*mztEt}8%>8n4#{`#W+1WZ4_yMq2!Q5&7?$4kWxG$>D^(z9c+)Bvk=2Ov?XCM(zhOo44Y{2 z6OzJnCQakt-@N$PQqo z=}^W<0BB@&oe(aH3^S6)#2HM5u!^(u!c}%2mht++UL*zRZ4qKl9+QEVz&bXZfH0h^ zDl4cz(f@)ni@=|Bqj^EH_|P&Hu9CS~GR;$wkh*0#M8e_*oz!eV3d5uV9wYkkn1Tj? zPBk0)fqw+xb$@*U;VP3(oM@o3j7AiuD&t=gH6&s&dim=%V3CFHIs(>mZ~{p-2OSm= zEfU%ou-s++mF#V98a1pCo*Fr4BfW>s1OH`mXlVVQWxy*yQF?engAc()NaxaY=ZsB@ z>DcD5xKjPV1O27bmCDlTYvl+M-~jr&TVDHf{O?p*sj20&=FCY>QmHeyz41o3r`~nu z%*Bg;WutwxDXU_8YD7+yQ)m#=eDmGmK<~9jG>V|WRDX4k+I2-~vF*&Vm8(jp^IAXu zVv0gZD%-aq=}%GpYb%S)BSr)T7Z+Dn=XH!9Z)?{)VS?7?+2*E`u8%Z4Iw31+62ixA zXP3XOJ|fwiUxI$Cvr1pXfdC-#cuD#~`cUVQ2A1F~O-z5u^)s3_o2nZxSlVS(#CgcS;C$NZB zkXvCu>LB^`3M;+}7x(_FluVRfpf^;F^r$Zd>ga)M`~ZV|B3*wQ>Ys#b69UB~T^|?3 zWwA$4SwRDkX&lwEJZl7`34158COVVTm<|C_>x{&L!@N#15Aen{ainc+C{Vj$Hd{_e zQ(BpgDJL#fJ|~__57X(wmYL0(B>vS&(8hV5WS;yh{w4p)GOM5gINh1J34fnlUq&pY z(W1BT_b($NlanGN%*iGgjYvlrs5ePn6Yi-uK%7GaVX1?pF(HA2&S}XICN}~tWRic1 zL@P9FXd`;yuR5Pg^s1m$?YnW(+MXzHu&nE;G3SNNa7}t7na#_nMRzynITC;jYTJNJ?*Pqu1nk-hS4p5J zsSpHfa3+yDgok)x5X;*=Cbjr1n1`x#Ey<8*oa^;QioCfPyJeIzYjb?HM>^Ws?=u4?shRRs;JW28hxMOY0DTPs)optrY=h>J_9%5PR}O){CwHU7~} z1r<#Ne3>8e?--4d5x#z>`cALVu3z~>_?VQ2;E|Rmnv1%+uo&3))MxOLS#=W)9y?(- zB82^D@Z(L!9!>bIAYEdR#!U$!L8I1%d3a(O1bKkG0I~s6n_<_I&I;+A!1_kph)#vf z6Z8w8l`Qpzx@m(T(FJ(`f;v*eG$3}yQ{g3kQ>SB2c3oE^vp-Y*dFhq$q5SQ6iTsSQ zq5`poiQwLwBK=M z>5Wi6+QES}+uO6Z_wLQ#$F^;LZ1R~ilh-|I8UN_vL#o=x4js0fJ2UyQ&8nGq>G78J z-*vw`V@7oJfdk)sbLBJs&-r!7j(sv|O5xtZDPrm5GfxW3=was+^qmHM_YKbL&v1%r zvEst4v(9;>w-D#-N}HQxjrADPM_@FA5KrBt#sVPzd}ep(P+5HZHY6$EQKRWJ#^?55 z$gVkhv?g1n&y6=)E+Zeg`m%Uk@aT0CJjCnD7QAYV-%(S;y8AC6XM0U9n|t&qn@d^T zk@_5;NjiFz#+Epx?yg@P#`Ble4!Z=726;dK4>jbw2eQF4yI)*U@fPJwKTJvFf6|Wu z5=QnuH3iCAmO9aOKhvi;dWQC=+Bi@*q2b=1?GIGx?_Xbgsa}VvhV0Fs^fAUq1p}EZ zQ{Uac159bZtdAu(78X2N9qy|2PiFzuRosf1@XM!yRLxTH`Vna^+;6Vt|MJ;@Iw~a; z2_4!}yq$#fOP9_>tasY8{zDVQing|+5~$GVlNF+CEA&h9^UI&~mp%6%gZoTwOHG@Q z6$3OwSmL-)7enUw$xcpl5}d*kO_}qH3ii~KKuda#JSKMVT+o`NXd$dtk|V9lQ7I44 zeP@t12&q{K&p$E&=^O5Z-J!|I^-dlJG+8?SakQ|ifn{5E=#b`zd*|2D{tGoVDn0jV zi&?klFO%~9(BQ&0T}YOXQG!(pRRarIsUKY4>dil$aNG|q**8X`fxycB3M#}ZNW|8iep?3c>%uo z_@R)<2<8yt>zgW;r26`XFqc#P!yjuowQpzA3OwCd(E8MxvY9H|IPUS{)vM1xC-F;7 zX-YN~PBtYsEj<+C;u_6fVg<4B@kyp|e&lVYTQ$4Tpm$Lf)VM^Bh>IIhmnw8zW!YDo zn)yk9rE;3~CYel0dz%!}82k;k{;wc?k!*=GkX)=%ypB}&0oSS&(kh*eL?>vB7q*S+}k{6%RsN9IM(Dr;_?Yu?km?u9)YSLH2i9(bi= zX)C>gZ&k$4d!V_se5&%D#$0oRTY7}v#WyW^;-$seGyL2QdC|^(~(h@;W5&Mp6|^yCeUX?hxr)7;woG z{=@mwE!@0PyKar;AE!?J=>wOMS()ZdUq+UcY|f8b85TB{MH>;cqEAUi+|GMZ`V?E} z=|8}R`2%d2k&ptDAO|X#E))@rBN0J{HbJVFTw;P`&a;~IBoZW}60!`Gbfj2fnlPO& z^KcDI2pbuOm5W0IUmI@bKRiC>t5=Ngl_qv9s5XX&XH75t_Q02`!aB}WMmEeW8=hDC zn)~tIZLQJKYuP#eityIjw5i^Z}{}R17q@hOS9MP=y*Pn zzw+fP!;d?RT=h_WW6YPv*O>Fu{FSt|t%m&vMVE-yzp#8h=5gVZFC8ML=S?rIPQ#+q z-2M?`=885B!wKOH#CC~dIofHhEvcnwh%20J46Q+1C_U`m&4*x%wR>0d!w{7Naafk= zsma)pq$3AokA5T4Fru8G-UA(j^nLQ_$!3oa{B57l$}DOz@au+_mY^AB;*P)vSoV#l zW-2FC=$~I1_ITjHAuqpAuNnk>g*Gkzt#jzSgzl`LtJs0N9}QQU3n^ z4vu!2c8;uYvAfT>rqfGYvBc2&b3pqCqQq5gPMk$48Zg&556{3S}yX2C{d15xTuhj>^426 zC_a3QuXiQz&HipK!M0veUgL^_OoqtxsC0HN?O1VsSXfYGN@1B$QPk2>#1)$TiOdez zrK7Lb6!wTgF6N=LFN0qP5SzcRTTbeg2A#GLG7_VeQTzFJVQEgERYyvS@ z&*xF^1R!)P6)Vy6+OUK~aP=mJVMPy6`f3L#eciS9Qu-!>Ckw#~iJo{1(4af*PG`ur zcb}F^9ia^+br-rdnSRKOFNunALE57oD_3>|H25{>S9aDBzPPG$wO?~^Q(#9+OGjW+ zaI(M9KzSrTOO@`}tD zm7+XHn!332;du$(E-vPZf|?l2O8>B&mnZ6*{TKUpOq{b;DzI+toQWO&i`^P@IWOl# zwFOuDcVv~d)>2(+Tg$TWmOmR)R`&ADnU>#IuVBu9XBkH~&&rGSb5v8e`%t&XO-;{_ zowY7|`FvwtLdhf$thAWx%q=tZ23Idn$E^I(I0c5B4H1eA_`3=frFilGwFieWS7n&1 z(p9az`yPi*)Xe1nzKb?=baWr?=;#q(#YL`t~e$-@;}9 z?s&c9-#o*FymN*^y7VLq9P~RF)m#-p?tu&#(r&HsmZJN{C!g$P?;zBEB46( ziB{t*!D*REN!=95cI7&kj> z1J|+Kj*~2xAA9e`ZXuOB9k0*yD2`{UPcE%lz51cQe9A>Ge){P{Yh2bza??P447B%I zYXsRS1bc`}hy-QDmf`VpHFHH$0#toS1rLX0y~m${2YL?Mb@)hCmCf|&_p4~cXZ({6 zmLE7+-!hx`*c|%adsQ`u51q>nbkN_w-kCz@VRlPA)g4NGIw<=&0kabX%ObWBSbD?c z6`tT6rj~#Uum&-B5Rg?Nu2s9bwd&TFn%o;XIb!FbmKKZ_NR1u(x2p4DG&^?=c$wDL z%ClbwwLExG>D_&VQf=@vaVe?>ir1F)16j5rk2z&dR)9E1MkpkDVwzBTYcf1R2_c4Q zC=OP;o)X1(x3nA*s&aB}^d8fCRkhw~W!Fkuls>|`zN0#j^Tpx8?5#A8ZNw z`fMd?+;^s>M98yTQ^AKH)Rh8|NQ;>w$3gf50%lQs!CF z6Aboy&86O}`AC0Z%2&476&9`Ez*5#X74%-!_#v+1dv&wPRM_8u{21}Eof|e36q*H# zxk)tRz4*7^wwCua${U3d&{8~!6lo4eon*$9-7{oQq7VTag=l1Uea-6jzGmeGi$1@m zCSTnSyno?ue+w1wDBmMq|7}g4N}pF#lP7MK#`GPm6P1+n11rTU&qFpL`XgEELR;XL zfx*^wAORiD4y~%UtFYOWTA*yVGn+SUeD>LmsiuP7E=`8z;>Grh=iATY@1jQ4T--l( zD#Z5qXCK*QHcwUBPfaz6nM`lNyX^y?lZi_oEsh#!OTDVF;2E?*>IQ$uQ@ zYPPdvs=uwA*;v@;QrOs7sC?7TlCS=@&qbSY=1kj}ciP^;-OYJR5Af5 zCC>#RcHD@rW$uxDU@|1W!7)Fp_Atod> zAYct;rBXcsUqSzi1&PMjg_xJjE0&kM_+rWOrq;BqtTcztPN{Dd70`)m(91H<1Mo)Ji$NL=>^4fq-i8G$@rq#F z`A#f)OOI%%Vx6G!i3Od=d3Xc_RZYJ|IsYk3Wo@l;7q~iP>I_jFa?U!#vp5b_V=Si1@C-d&EJmM^Ru&Vp z60{1m{|xwe9HF`RN$tD~w}r8FhrK5#0YE3FI&0}3glaN9wn;1T(W4(hpyL`xNhx3lhRCDb&wWl+2_Y44bD!cK zK1*eH3kRlpcmHUn;uh7}uf_8>cnwH)?zxr=jmgk!k%|01SL@w&pUbg0tgLGE`M;|l zTn2FJ-djI$&%M_J-#spO7T0ov&T#`e2W1^`rV%6nQzF80k#ED5sl%9h9k<)pfBBHg zXWuDiVm8;s8wcxn8Sgu!hQ6{-6|}GavwbQL{zoCZqVN167*KxQ_*=n2swZEGeXj7% zwVkElc{TFHFl{Jv)iN6euKW_N+<%jq#1j>2{Xu?JGgMvbm->4?`iQM(UvW=yBMVV=^=F7*u+Xm4r{%upKVWD- zw3efAc8Bf3IWd7nqZA3&p}J+u!psT8pL~CzUt+P-7tlctXjCQlF>`4MCXvmNwwl2K1WQlZvl z<0J`677s4%`ptFx?0@DX{#Wc7AM;NZKC|id6PuoCd*!zW53(#nP4)V=ht^J?>E}Oc zGF$Q1!otZqwgl;AruM1F$023>c)#KmTh2V6gEd==*RKQX`UF~4b5jzSa-ER_T{ zByc^Vr=X97q2?0ed%%!^!;^l=kI_0K#Sb3K5+aGalF383bm+z*{IL+W?&!I5 zN7=eX3l~01hRMRIb@g8_sGU+or(jXhf`!5^b=>HgU<5s09vhpQR=42s%`D}yj)vOw zROO6i`}RG!eBVCNse(l}H1H2JUV8m=3+tCGtF14Z0+ylZDMj`5%}omz78QY|==h_L ztY08HojN7ltZUoQ{`8|y%wL$Al9IY`{u7U3IB}LJd7f5845fzR(kXxrd#wyAl7kJx ztcF;$(nZn=ts^>8YPj4s6}%Xh^U4@icVpwJ|LOe!WBKx=%Q>4jA3yfy>rd@GSX}bt zlW%k#J-&H!&gDrjAN=zA5550$s<9FAhd3SH!6e+-|M4dso5OX5h5KLr?&#`Oaq%G` zAOoJp9y)MfNpnbOT->VFM{gc{d2*pHd~?SqA4~O)L%p9uy|EIk_4b4^JP-g%bCDv; zK}F!Apt+|Nd9CFPQsBMAPxC*Do8Ic`>cS?M!jf6aJN%2?ADrd&{Cr&7puy?reyDNfOeEtL zTrs#G5Cg2D7BODa_cLPk{?&$UZVmVkbfb3C(f2Y|L-W;a^;9I!Xb)kgB3A`;XP;ul6^v3j=jgZT%&6 zw`{e>wS!BM-KxF#6RHs zLf{X6&5K_SuF=O2i!)W2Ol}KbnK&WH*3khZHOJJ8eqB)%r1o~{P=gyjCc0T#69ePu z4Bx22s=N%5lxbfZDV2jt5EVYS^HB?%(XK#rcYrNO(!pCcEord}P6!!nCBO}V!cdwJvFn7Cbl}B?`hP%ec9WkRR zh=nXMxu^xmsM`?@eSh}!$4;48^)I5-Y}5H^WRrQ3B8 z0rvlGJ9zu+WhcvC$NW^o2h|1{FIyV>VUR-t&>A(O{IrCWq8sMr2+A~P#pWeAYai!J znDc2-IL+LDFA8rn4?LbXdDJL}ND{)9PS#8)OfhM)^LS?ztbEVtm@DlCI8U9<$F>@*8OTg5=v;$oof8sTBt|%zNWRmHR?asgQigO} zYeZ+5;&vWnytT0ZP*2>kibxYJ&Qp?5!K4zei$Hy}K5aAl+h??uXJ+jvY|K@4K zd>XiEjV+}VAe3ruY0Ik1RJ-8ch8D{u0`Q6P^k2P)R3~Kui!&qDZV`X4r9=e29(uh{ z(jwDr5-lS^32Dt)>p>j6uro3$``+?L4#=QVC3Y6BzN>8WYV%MOp*psyl)p!u-Ex^l ztEnP5_^4$ZsV#jf_2)Y(_?jK{;u;Hngf&&W*_z6{+&&@$g3X2VR%x#pS_c|s6ecOY z_qLu!nHsL)x%u@LoBAE~JESV)&!8$;ym%{HEi9-1${Mz&DmVA;((89nscg-V^IS{p zNl>Ar7PS&1&gfl@0Zy_(7;8)(} z{}5^ETCX_*`?iO~WrX~HIJ-y^kU89No&<)vxN4O6bz~lDiO-QfLeiz=UB+(h%1*O$ z~mc3g_-SmUGJ zr~ka7@ry=Pw#8JxWpb8}sl95(%;eO_$S&atP+A!v&HBf<*|3GIbkZrVrMTv0IKe!BW>$Q6gj335!DwJ+dgaUC7PP&%LlM zH~;*O{M--na?cUPD65^19K*=BmAg%tTbG-+qjr9Nem+cMYIYhv%vg+#8Ts8B6{{2v zqv7ax>#yXglRf){(8V;u-hMc;fK1Z4xd*3=He~pFx<%xNh5I<#+K)(a za`JR=7_PQ;NeLWg>qsAqa&ite#m1%wx;g9f!bANWJOY#9$QeG|K_$Nb^yiBj_dL_M z=<|@^U}KUoxzOG|X4L59qU59zDLJ=zS8MTX)5NH_686_yvHDO4)yFY=FKI zwb~~l!rMk05HKNZxRY=6sF?AQuCC!am!N>yXivxC`s@(_APJ0)M%oCKpU=d|08hOk zCO6Cjaf2QK;y0hOj75!&i+I=PY)#52gNNrZdmK9rBLb6?EEoBUeDVLb3+E%EU54}T zW-!0ueh60_%B`u9Fl!VYNV`xZuxm2EW(KrSfCPa@BjhL{(bNd(1D;E|kv0Q~J8tM} z@C*>#SxEtn_@b@Qxb#}KHa9XP_!>{WDi&V>VWWC#a7g4*1cX|ji>D&9DR$3Bajoy5 z0He94>Wd|j*&~CamRKYCzOZ}|6+BXAg}iblJF?NrpJ`Eur-c-13+>;7XBC~AKYvY5c`=3~SxvJ*=cJ)*We*M{Vi|-fTmf{fvMJ{yPW0>2N`%|ID{322gDgCH(A`pGZ z`-*K-axKE7;H><@)+LcgG))mhzyDtNw7i^s_5JtU6SBgmEc6r$;g^=w6&Exq9lrmO ztt&6*D}Vf+f66bNrngVC5bSe#DDQVD&z(*wxjanzy9?AxzVt+Lwks_*E+!rTyT9o1 z!wkU=O+J#eqHu3I_5ZK4P5U-Aa4CV&Fi>%KLvSYgDC zr_cWI!`ZXI_V(}t4?K`p9}pO0`PE9{0b$k(@%c5?Yg?z;27CMP5y$AqvINa(du5Dl`-H8n_$3`=ee-wBQz z+In{~DVsdBXO98?sX;si4hxAR~Hq)L&& zNMiUK!h9@=;S9%e0xAga%zYS}?@Mr8N>ybw;PkRqb|~A`AaC>i_>9%4^KDj}z@Ow# z!;*WyKD=M;Z3O~m+XD3-=Y0Q)T3%xntmd|&M_Gj~+R5Sk9psQ2tdq5?tJzc5u0|;M z|4SeK=Zf982QAf=5Q=%uJf4woU*-3TlNYudzUWV zd$RX@VpMo|WFtuMR3S;kUx$ZLPkebo%$Ym4RXo2A^xSjS8_L0bKs-lgmV@i~3u|Hs<9z(rN({p0gJb7o+Oiwt)dkn0RL5xFxWq96it*N}vCR6s;T zMMF|#mB_qhWQK}nX4aaSxz?(y;L^ZXFx34 zXP?*e49v`#GiT2C{`r2c?@vlnMC7c*B&hN39SU>*`q#fcX2F9wSmsq)ES2*tm@8O2DYBIKDHrpAASU>KkleAXHm_mD>v!tp;wd z`A7!rmm^E*LcZvVl*&I-|79R_@)hB?%wYA`e1!6c^!JMF5C;E6&>F80g&x9SMRYKp zIvootd1(6~Q~-?(wTrJ6zJ#K^gpYX3?b|U)F;hch*iC!q(1bGaHnQ8d4<5LU)b_Wy zr*MpY#tl+wO%1!Xy()LoWWP;gC#B_7<>i4@`(v+0=M|VdeSsCD8y3$(h1~PKe6@5+ z$dyj@^jhMpwwuB;Gs8{Ov#a4*02$BLcU}~^G=w-WD-p<^Lm^wxyUWrLsX|~hwFL{x z`gp_$HI|BTg^fLf{bF1X0)V_r8+*mL!Tw(5d}E=urg7$AKLJazF#bm|uD5q)qjaiq zCjW?q4)&ivPv3}fq(GxR+!?aqIrOLv8-hyw;YgCbPdF?g2R$psqCeho@nQ!nrdNKP z6>H7`pX0Fh_{9#Ziq4669XJe8Yvep3WYr+h#ZxMz7)PZCHcVykBfwu+=hl+vWwWpM-8ipQfG<= zN5?R%JE<$jTpf&>}G zgIxcWe;5C#mk@Tf+EjB1IeDeVlap6b@l4stYbFboW{(gl5WlK{d_HL7fdlW=VOTXU zJ7TG+WG_2xYDG+}ypDA)xFLL$oRTkTikGJ( zmk5Ie4bpiQpf2a(Ebog2>}l3n1J5B@e|%SuaXkZxLdj7PBWt@ynI{NLmCwq93}z3$ z7`9Xu5n!Nc{)T8_jLoU4$`R#PE2z!@Op*L(PSsKEVX{gdt-3SjXjKlKQ%>L;v8F0V zDyN?bhjXep)G_Sn;i@ctSWq42hgo@6)nGY4oK?C0?4q;s@#o zMY=CI9IQ27nLx{cDiq~U?J zjkx!HZ1>d>jFG$~*)CZDw4X4N)Dwn~Hi#ek9zaD3eLsmgOo*mQhpXc!LY+CBsf9rer;Bym$$c9RaI7OM1_$&ZHaWAm|8kMCoUdfcH>KvC;i#)fd^cxq?<->Ps|aPTg6LR(w@sK@g>)wkm?Ta zgy3NBrww?eebC0=P>j6n&o9RU%G@^KL}kh%>#wL|l&}L}i#jpaFk55~dJ}&`-`XKE z?~Bj*S2vFHx{IyrcmDo2tKa_R!}|`DmzpE*G_oDML1Um-_GYj#Z&v$;%}Xn$>!v~r+s`{cg=@5>$CzyDdMI_1ck=G(0N_L?S zYj<|GdJ4<0OP&AG!TT;O4^E1YFdDlG#n_bM8nI_h^U-|D;?PELJg>z1rcgMpVvBLfLRknBhH+jKciuGw5hiEzuzSCI9D z-pztfVpsZ-4Q=aM%O5g0WKLVvyyetZbACbM@|`=L-BDW`s)txEhWSA6S zsSRAFP$DJ035y?2wfl^ca<>dvA0zl-J@jpa{XSb|LC@F}P1G$~JLr~yx~jCDRKI9+ z80>enZtm+VPq3Y^>d}Qmc`m(dq{#L&rRRY5qB&6D4zV`NP*3>fC8=jU{;s-eOy1v+Jo zc7?VH^Qc%gPqhr%_s!@pG?V^_?^b+lko8otHqb(#o*L>awY+F-^URhbhB|KOcd`Y= zq$ZIGB8H9TyOFdpME~)X`rcPGVTZx?-91GiYx3SlADu8EIOGvOzqwwX35nl4vt#R4 z%cGBaFu}Lp7#0(~c4pn;m2K72LP83sYs7;5*r4E&ne`2IOL7~L?M<9EU$0-2Sv=F= z9~wrPcfvyb4QBzeHuO2wgyVqF;ITOKY-oydK?<*N4QN=_x#!@aR=?mt@0GiDZhi8! zmses!)9&62d%aB|-p%{>?C)wQii)z!oSB$kP|~)zsCIE-!5^2@7ZiGX2L+X`K6Gep z-jceRYj^Fjr0DsV;Xb~;KE?Dh80_m4A%6^y@bP6{blT64zB`+eN2qOiP!VWVv3#c8 zRT=w}@-{9|HK>{~Hg>cDia!`2%+sV~6Lvs(tE4OBVG6*g(Fn=ipJZfS7#KM`N*+GN z$RdY8DWj|q4LjOSXiui7XNdgD&>8KnHt`RmW;F0GI`^-p5eaVc^Q-XW$&ZMyr}*CR z4G#-21oJ@*09ua`_>U#^<5Inmt|&DH9#L^m1!q>bm6l|#(d*}@X;@vz3Ih{715BPF zlk!$9Ag1lGk zWPMF{o|u&Pm$806kx@QOv$U{a+0weD1%()YHYvsnf0dQu2OYVIGxaH!J-gQCEa06l zuJZ{tdB>(_JX~76?#Z&n;Q^`P;|J9#0KoB1N%8XZ^c0^(ZaKJ1Lq72aFZac;?iV57 zite6(&PjJq?6&qZIHB{}<}xcMwn8mbA)BHA10^!?RNu9#N}JV5s=EvrFqAiMa2J%9 zv==E@kpD^_g~DVm$;J)cCkfp-$~YI`Dp{-94O{jlddfNbWS|($?%B{pkymy9mA)(e zGEMv*d*5~V*AeC=VNOQhr`ZU?46!N0WGw)te7nE+9?j{2oJZol?aBtOPXiiqmL?i} zQ(XMO>!fQEZx1?)x22Op9z8`wj$E)LP7rsn_UNd|gCC^Li5@pejLe9P?v+mRmfoJ; z3q7FK#3KyV%W1e?z`Vbwb0IxO*pF+csK|&xP@coJOB;07INo2wK^GFFNaZBP{kVob z);M*4?+250{84y_LL#)&Jn(+OsU&Y$0;7*m=RPtiqN3hp?GJHV3_$Q z1W{^5(f}ZJ3N=!f^3=r9P{L1pV0Z)vC-fu2VGrBWkIca|hBg^j!2GcXN2Pcn*uhI1 z{wH1<01w#u39EI4#4f7NuqM`cbKu;~o5C%=<%~KD!5?y3UcyXMaM{G(uTSz#lmqwV z*P4Sv8F}jo>Ca zroFp!^tdVO7T4uSysK?}eqL*7jF8YT#2sb9(r#mVKwxoTV7e&WoSNh}HZv+ZC1p-w ze%pq<=OinC_XS{{rdfo3-kDw+h({^u4oD7Ha06*RLo@l`)=0)v{kLmnt>PlH0`2wR zt6Nt;Uoc#|k@_r!_f-+L+0bexDGPd(BLhb@vxc68qmP)u2bVW3XAcUmDl}q9CpN@C ztCSfxa$%B@^3EkYU-~sSlPk^8Q?ubtA3Tczsp4ij;a6ZZBfLczIwU+*^dAyp#zBZ*Ri{b4~%fxp6-IVE#sRA+DMr3%Nk98dxL} zodkqhjrL2>-v9o78NldV=l1w-dylW>-)vbaG5y-(d)q3-Zoj3!?zyq&g?(=-YSK6Ny|Cv-&##yI zNsUjRd}He_^Ll2#WKHW5fTgGJTU)iZlReV>{N!y58rH5^!oOc{-nI3OlTTmiTsuPk za+WQZL9%TJzJfZqse^-n<%9YLHaxE|QvgH2HEFG3v5EJP0RbrG0_cdWu1rLF-gxK} z4)=r(o^DZF8cTa)!-XvCfd=MzY+5xt@IhlKe0uNPx}f;YvMr6J7cK}n$Bywo3$xD$ zin%S;ef(N!qo>p@+-_+2!!faj2Yv7ctODnIgfo-Z+{vdzdDvGzRMbpp$q=$+~r z#Ac<+o(IZ~m4lsuCZYl`N!%kP9u1>uiU~Tv`{5&$_6Dih-=%Ke^ldlI1~$mqoM zOQ_pH?2u^*G*7H-D5My-!iHHXuts%L0(Bt<{*OS(BcQ+TGiSP?2^Uiu@+D8!#J32@ z)}3^wJ9b-sgB8Esk^(~(?>uw5o0NpoHAQVWXN~~&0~gBct`qu?Bt&n7$ezEDkeLa3 zL-aC&-Zex><&2VW&m<;!sH(`=M6qG6CJOMt9}N*pcEcbs6JA99X(kjlgzi=!LiNs| z!Yn*bsjqZh=xmaXB$V>)z}rOVUN7I?^j&wi@Yyl@lj>*AHWX|dAHI7A)eq){LY~Pf zEqp}A(@4=Gnx|9;dd>IUc^#*dB~f^@PRBB(D$aqBuG+piA_47^(_Yh z&{{?Cr7WS+!UvN}_7+*)qnsU<=I{fo=zDZtv$QV%2^WWT`Ja@Ql$72mEfF_lRh88h z7p+{iKQ7_H75Ot}B+ZSE1BwacGEt70oY1$tY7Q~LS#K@&9h}okrjTp-E+F3UX4BYfvo%A z1D-S%FEj= z#YI7%1O!G>X3wk9h+0(z1Qlgu6a~TEPIK34vrk08ADyxZ&qUvmMa>SC!-7R^W=CDGm=hH7I4(Dpds3WXtyb?HxL8o|{)}8PHKn|+JjE>5TC3Bd z#vAtg$Hw}%wHbW8WBvF0#m1zn_dcDI;_l+&o|0otjiURQqlQ!`>iK+OS3^#&Hh)Ha zMb=bzl3LuS=VIy%iDYkk~T~~EwI!j28 z8OJXp)-+~ZE5+AnSv6eSqOR~4q#$58{7!p`@2k$qahQ^^aKRz(!M$QNs(zivfoFzr zBrIb62u~fy&Qa7V33SM;9VP2n6YcFayMQT4+GxZYDV3H3jkp5i-OxgfJwnMF+F^=ydV&Vv9Ldr_0TSDml+yhnDTH?yB2EEsIY_PS^2; zV_bE*kf4~Ds3>pmm~oTeBL`OXgvgAHNPY?V18T*p!F^(tdr8UsxzmsUaPIt)l3bpG z=1E+Q=3P#&#J%n$MUIOe7ZPZ1?+#sb)YRx`xs8fXM=(~`G*D@ZTt^6)TaZ_r*L|4v zHVz5%*oY*6xCre<*f_MJ%05I?8{_~mLl{L@+Cgb!g$g%b*q)uyC?#zZRe29iuW}DI zg;`axp~23*fdRplA^rx|;mgmMOX1oP8D6Ts&2L#0`!^8_Iuz%0pE-T{O!wbkcy{wL zcJM1-HX#Q1^*-aIYm#5^*nj~4(8^iADQ%31jErb36)Hs0uwYRbqZb21^<#ukQco)RSrzNKY*E*M z;*f6_!5YztAloG-%xCick~;?4Ujl)`3icpuDBK7A6gCVtg+2wg3^b;4Zz0y}D&KeM z5}cC`u&PT~mselhya@?4cuJ!c#?sg+)(QuAQEpJ$>!q80EcEIjjCU8k*05 z;y_E4zw~!_n^jgBis_6{X~}4A&alj$kqu%?@ z=NI%Bvp2w1#m<)+Rd^|0-LoH^I${?U73dlBA$j)z^SLPCh2{`fELE_Eo$Tg zrDN9Ub?o0h zZ>bYoTCV^84zewOmpvyf?}X7i$W`y?XpYX-#v0S3&5^N54q|BdV;XIB#q`W*qqn!a zy*ey-+C%AimT05i-8)e4s`EJ|YM!2+8=I)pghsT9V$Gb~%*b$WZ#O$JOkh`@dEwVT zf7xQWvToh`*9UxONPAG5mwR4%>PlL~!28$Nt-B)pD#=9`ty%VB*<@2xX-RHklx9_a zy2;x`6g95)-p+~dCz`yYf@7mx?e)I$rKzQpisIsz;zrXI5Q&8X} zc2T{NT}%rM{+oJ#sJol!q;tZ*=;j`3T`(~zQJ0maON6K>j3_7kUzZdnhPh#wFf_?- z;(uH0;Qs>>!=el8j$atKaD3ebzUW`o!$}jT4s@~C>FiyspT@~+1si3J_7c{h9D}D* z!%G&!3>~O&X>b9%#;)-gpv1%8j~LW_Qk7Jt=p%LC@s!$A80moFQhN{?j=lAcgYw7FU z&G}s|8?=@-Z+Lq8S6enUt)7;hJ#BT<7I$|+kij8HQ$o6rM7NwB!NtXv^(V?78kn)I zscC9fzr}Ls#q%uTgz#S9x|ZwL2UsG5*YfUN>b*!$Up1w@aZ`5oBh6bjH$Re{?cD^( z3NpM)dz#A>XmG1a_t9IGspb=HZF3)H@%>p@k2G!Ved$H`j@R-_Z6s`~hiMx5&v=6) zBCLAVTs;gDf?yD(0k^-=5`th;;_JZ(%k)VZTW{!zjG#}$`YM~6LkW7s@WDqX zUXAkPw;`1}+n*4d5FX6d2#pvGtDaYF?CHwHO$^ucJ zManzzAhvcYb%3Rt<_daIaZ^y7gdp00h`T`*NLz*)U4V=S%A0U0Hi0i7Wtr@8S}JYl z8-v5+SekJ0&Q9^$jt@~AUW2zPB>qg80Q{#i5t=eZYsTCCg+-KAl;BF>pf_AErG7NV zc%qNQ8X!v=RmhY8_a8fX7aw9??@x0>R5lR=WylbS$v}T3fB$x zOY7HXmp}A+dy~07-ZXw;jM2Pg^2&Apc&HrsqDF1~oWKBo508KVmoY};*f6a&%rDHS zcO4tx;o%<;I431VN(%GK$nc1Y@=8xMhMjnWWo+3oHZag7+S_T&7)PIIm%zfpU-O@=tXhs5UaVbIAo3z_qno?0 zkGq@EddgguseAo6e8s+T3ebo;`!Tov#s^<{d2)C}nb`|h_!`Ez25Vk*a&pu)qa8V4 zx$7LfUD~S`L}!+6wg2q7x6ZwJ`&FHzlZ%`Ep_@$okAV*7vQ=ee=IEd$PkQ?L;K%-k zU}w#pJ9?K)N5|O7oqMji=p58)WF$S+-X0sI)0uVlP7kP^O#y*Aod@8ez!uqgdhnVL z&$}BO?Ce~Q&9lTM%yUNNbgp9@n#^hJq)XWE0VfdgpWn=eXUm%Kh=_3WY;HxQ;~V_j zFAW;Wm_#`TlZ8U%EiVb8vpGZCCWToUy*V%5@|%VUan-9?5nqXH z*@>Cuaf_o0)|%7f0t~ZLQ)e3jcIV~2|IE&7d3gfz(!ps=%LbT$j2ZUZt=B<+at;`#LrB(K#zHv*_>cnJ!!*8D4(%x2BXkS@%cw4w{ zD=xdmkFGjcT>N!$se0zj7lki0fj#84`rEgAVx!CQJqwE-du;2r-}oDnlA4;fMH@{T z&HSt!mijhOT@N-jLA)vXs&tn1W_S0tlT6(9Wg z)8)(l{E49Z)2GYB7Zm@u6_1^esCi=3tuLS4w(ZF;r|MIFqQdubvbe}Tvk~ZZ+l~+7 zM-s0qS$QyVlnke!JJi3JUueSp@Le_pEr}~xMgZ;AwVny?ge4EcFG@OE zU0pFbA%TS1dwE)@E<^Fvqt^zE10|>++=WqVVXe8MPU@HTz(xAUAYNn?7Zw592jQxF ztjO#_<2HmNMrD(3bkuUyHbp7gPk#z~_!Avb-BKz2Vabew%*^=_dHI!(%znrX$(cv1 zkM;f8EqOEg@@D8}MUTsyu~?TO%l7w=jUVLupQsf)ZQ+KdVSvm{9=$i7zuv}QW^>wv zaQ^a!4?o;6S}mjp-){rr%bd0k`KxX3f2hQKEBqA2yrJ}aQ6FFmQDfj&vGs$G7s@0H?L|(UIc#y z8&2LhHaj6CY)4gI?rJcIJ9bPA2^J3ldGvFb1GRqKt2d103Z#ODPQ-%x9zcD)DEb{M zQ>iHtC~S*FoshH074U6zD8^a8o7HHvcTOo4J}HQhc2n^S7WA?&xHn(JHX_alg_si@ zU6M;1s387PAUiaW%TBRVaQHwEsZ~c&-Yk^oB>S5Wm3Tirlp|=s)N5ubj^UyT?%!6G zFpC`>IIJljfH$}nUgHCBEGK7kt4cGAmowFX3clrJ)%+p73x>W2VWFeb9gWS}B{P1C z$?G0Z=n81LQKyCVz38YZfZVTKUoI?C4r9hmnGzLk{YM8V*(gilu8i(DC8M%Zs;~h) zlFD32w*J>fHDJ<5$Tvh2j1=EHI#rPMQv{Su_?93S39$#zi z`L<+Dn^?oYO|$T?nYd(9`X~fL{5HwkdvFWe>*0}9_WE&tVItd`G3CKoRKJmQgZPM_ z>QV4KFsZ_ZY^xtIQNbW1rxg)(5BE_!lz)n3E)VmyFWz_m<$`bB+sr6kcb zT5p~*d3ai@S+T3DG3(js6UOt;;RVO0Cz__ig#E+1PWb7%V!$cWw?~L=+kvGUOMpHF zda9v{AHA-ZP2P>}!Cg^?j0t*w;B@XOe~5`E{`wR9ab{vrjsJucOS*AFxMy%I*%a1Q zRGyYj5ke}h!39_o`{gwlBKIlgANk#bsU)?Xya3KpU{t!b7zKq#LU zG;rnbzw#gDfwUpg&wv=Qb-o0hN0m{L;OHZ|PX%K{cw!rN56~y1$P`$6YnqxtYTJmPBtw;DkkdasK=a3+nNA3;HDG8)Hn8*@qRT@?v@|mXQU2c+b2+w zZI?RWdK=Yjv3`s|P@lTy0=A#sl2V1=!jW^q+eF9MQ_vZ&z`ZHYH%0BiB^Sa3!ICn@ znG8PMz<<}rfA_JV{#X#SHKb7fUZptKN(rP{ljp!8)DeKmz%rW-k9idfAt9R7EO4X7 zk^EK=KsyTwsDa6diZ`0{q$8(PJ9LhM>%nLdcNGG9Dx2d~DBPx75ub@JjO z^8=!T%eds~1HV{Z>L6-&?OU||#bqnjwK5AVQ*q1Qs_~zaQB*xSeO>DtC#~5#fV_VK#(jnT6l8PLKG#*-a z4a8zsbd8l5qJ@TYFi0Vj?Uw?kSpg-exH*3A&8X{gV@L&dtr7 ze(CqUM~>7l(TvT{Z)@B6OxuP6JT|O1K1#`-|V7zU}?@ zakxI{tFMCo;4(3-Iy5wGqB+%c>x1h{>k|`y5gImeQc9|+WnIg|55Mp{w|1^q?$^e` zac9^BH>~Hs+q0)=r)$T9CgHp;FfgIR0f*AD4le2Z{h42W!Ja+&m}Ijt=U$QLGsV8e zfajiyK2su6AW;q(6T&bD$Wa9QJMp-~Kua_??mthL;4GcAC8nnX%Em0iG?2c>MDr^? zQ7Ojy8rV_@Fk*OrkZybZb}Q= z5g{btLY%FPc(%4u6P)ysq^)}sf=%2TkQ|UO>tQA*hyxY1!WEm=l zVVgq=dSyC%J1vNASfhGe^|Wd~Rux)8&SW%kk}y3mFK|ff28ZrgL$reE)#fTDbDE@J zd4MU16g0`eG>=SndEXa9py~?efRHD}rh_4Y+8zuR<}MO=A~hvyab9g|l(Tu_ikCerQ&Jl%JSV2j@jQ5|q{MSh+C>Eo8)ZKO);scSaulkEZ=!f_ij3-C$S0OI8%-u7(oL)$g8FBT z^wWr_hNwt+UmPCGR74Oh#OPrl#*!dl2lXAWD~xtfGs;AOD1w&}qbcjDX{ORRf<7t( zNUS*RBPRR+3?=S>H#h}iQ}IfM=8RtOX2QStNzo(4CD|)>HndGBm^gXTv7T`;#>9dL zmsd~9o|GTg*06I$c1iIgMLXxtEy!f!E;@q5dx}70DQTps)U)`R?k4(>KPpA}~eWIpE`GoA$ z>73o-W}p7mr@uXRvrF~bu8k`!Mts1ER15Kf(WI4ZE5)xPmICj&k1odi(gqk|zY{^c*9 zeYPRi;BTITz`bZ3`1=F)+24XNeM!1b!n0e@y}nq`Ipab92yLMZDLwlnz+p1A2Uw*DX+5K z>|uj%g2mS_X|A6yU+j+p5dKu*@82)iq|)I3;?0tXh?1KfJx^q1{rVhJA?1nc+@8+? zMDQN|-W|!8g{v}DHJE=&_aqXD1sT96BDJ=YZZy|q*R-(=X{ce6BNH9AW7(pDsfa_Q z3MTgp%uniN^dqI3GAb^*n6R=}c{0-8sTHb%g#WkrbDWxvIFu}QeOvP#~5E3daZDLDl zsJo~7$`ZoTUQ*YEm--n6U3K(%M!gX3AMEDu?-uNDt+akj)<5JZtCSzyHQdjoImR_H zIc0xctaF)538jOdZ7GeM08{>mIPuw-Tfuf}TO^)ZW0iEBoFX{Rzc97bQ%d5)nspa2#gcJ-+1EIjNGAotNV9J+dWxE?O- zyw=%SOIPO~b})?i6`ilru;PO2c{4PuB&WW9Mqb{G`uZIHx~6k+T>(F?nSmS6=v=Zi z2VgE5e!QS=aVLI--{gEUbc%jF{LKho_;S^JRh?=jJeIer;LY=Y)(=F*Ms@`4A+n_| zO!hFtp$uqFA4VJ~qNzMPi4U~>ugC*Ii^Df@b=<<~N^bdo$j;hVVL z_TFYNM8n}#d1ap|SN~+!qq~3H^*KwI*t$OdgM4K)a+cQ1eQ)~;8A;?)s};vn;REGe z9j&}ekqGUTqj&uc)(gs|-ewOE~&G3nCmp?)lf_4x~ z)eE~ua#E;b2vz)za7NAzJQh|`&{I3vya7f^jra%K&uw>u%|n6Dfc{F{f$&{qwlR&D>)x)d+fF(=r%hV3 zZr5{Lo|^Y1ZtoR`g2Mg~w*8e?w*f)Pudwk>p|Ch!`ls;5h#OgV*iZq1BcdJFDl@f7qmd+@-Q@D`_vgOMg&Yk;cR7kzYktU{J z0(#L^BrYCC_!-9hu}c~axNdL)zfAF{lq!k%4MF7q`ITa-^s)>e;)>BEvoNXmx}i7a1*^3KFGQ}73dab}9!8cjo2&LzSGilvDVC#KrY5C#96T8{IX(aI`pNO`M>n=#+q!Y%){DgRU0l2}DypF& zDr)6()jORX_P)+U=9GV8GeUw>7ta(UA52Md@$~6<g#fK4@Q}vsazbCIWESasfwOn11%H7{}_9fx*Ks%l#7Zq)wDwplX6p=Foc1j?&fB8 zftvxQz0pGB`T%rOLoupD@q$BHQcM)F>856GVOWMR7T$Y~b`E$V7K`?_WuUk>wwKKr zezEi=To~A`d~+eTkIlIdhp*)qTr;qp-4fp9o?6CN@G0!6*x0^U{=3BUvHXMBzC?P7 z<#s>$l@Ry#Yj4XwutWH6I`o6ATP9a2O);?C$`yycA^bM0ib4BAu~m2HLoc-ia&-l~ zd3LA{(!MT}d#py9Gag`M5uaFq>=6VBkc2^S z*6_F)P;n2FJj=t{tOg9f7 z$DG1|`hV6t8uV^KL2i13K|RTy=qqUEdGUb-3x&L$I3zzd=ZX+B-Gd2+b3++k?fkdxE!@OF2dx) z%x{iGNv?Kwk_NcnX~isZuy3bNP-v`sr+090!s$jwUq=TACm+Xr?;b;a{TKte0vpCu zI*P-`_4S4x?|ereCkF>y+}P;o_ke@FeYn^tv}wW|ro|V=WyAh8?a?$=dXS%kg6vpA zmMI_I5#ILxQ*;6Izd5?{JTWYfPtiLTC`?!;n5uNA@Pf z|A0{s0?Q8N9a*7eO|MK5Wcv-d6e?Sn!dQ8@Y7&r4QK)UUuF~w2y28iLT=>*>OIdWJ zr>D89zrSklgIR{ewJiw-UejDkBoeXu6WCd{wqkajIWse*zN`{)IPesxW(kYS8#59r z$`Z5qI@7+x<5d6>a-R-@Iw%y?2)hGH zN;;{CLpn8<8BW`zBk^$U?!Z8PYym6F&zHWbF$V;gYm)Nw)khc3l)k7H^ubl3<^@T! z1{UyexN{m7&fHzIJ2WOXbl-yAv$QF-yF(_#1@OZ)tbEqH4~Ew!1l9*6)tGU-AYb}o zf#8lP+8T2{zd6v){zFL0ryqyzUa&7;k^g>xqs+&poW;4?5IL?wcEG-eRA?s)OPCo%NbXHlg@Gl~0BS^kG-cImiVJ4sL)L zm!_G=6z1m_cHq=Rp<*;>!@iCS)fF-2RY}S7%3~@P@5q|&Z>U}LqSpOAf}ZK?0Vx(7Jckk z=k610YN{#WRCUci7B8ZMMT-Roe)ve!6GC%hVg*}&>MWpN`IBc)Su2s0WZp3r%@(le z+2w=3m^5i|?V6VAnn{x;r7fy%SyNk=hH9&a$J_uc0pL%-m=Tf)Fmn^M(RO%297ZAr zHVjeHNH{G3!-~Q55p3r~$-ij|*sEHO)Jr{eS;w}wZ)$(stDCQR^8{cgBHt`)v8xZ| zWU_F$V-=F3Bl#xQ93E5Jm}2ICUi(UeFtH&kw4r^=<41mX-olc(w3z*2T0>dOoy`Dr zxtMmICHD^Gxt%zsC;h41=V_olZ-e$|G1svJh9RLM3?yNQ$$+hdfd)a=F`A&kfSH^6 zom6TxUnwqNEW=(!eeFerYBH2dw3*Rll;>g)9f_y;YPK2b!q0dM$q%gRyvEhl{dQhO zsI#LxU+wPb6!u`zH}0-_@jSU>zAK8Coz!aGdC_f*&+VuHHhcTS^Bf(QEZwvim_=+y zKfWyP<*)Ep&a<%FZ1#EnQIGmdR_bhL=U_<-Wh%Yn0}nXr@2Wy3S>Uzl%#XRdjBz?J zVeW(jIyb$ZzvgO>3j^I)m~QcsZBJFs)#;{YRvpmkvCv`2QH|^mU(CZs)z2W^?^Yc` z-vA#3y@N?esV8Y(%IZdHvzm5ukS_Ac{ck%BvtVSOCBwL5f{QOWDL~T2qbniXcp}{i zdJigv(F^&>(ly@b<96O+0ggL5zV|@m%Gt9wvum1V%MaL;?&^yF*$^C9Ui`PbzO=Od z+%KDtM(zkbw))H5cbzonFC*;4nm0-TrK6mKYwvlC+OZx~>^z&zX7{QuH?Dksb3=n4 zdvbsMQo`tka0@N7p!sh{(_*=QFgHifwXEO!+Ob{hEn7kd@2WyKTUvI7MjUW()zAKk zLUKnxk2!#dC#;DqtO*x*b`u8fIAB|(!a@fV42A#U4?{x&s?9n80z}3EFT~|)k}SVfz*iBw#&NLTy>T@%i8_wvz>Dul2%KrADYwo z?5qE?4iMhHzws~>01!BK>(;l=^|5zZAUx%g`_8?+b*q^0KkgM8_g`Y%XJFhZ4oI;X zlgtx>UI8$KEI9xOLPIEnu!te!8;rg5#8O3goqEgHUrW*KQywU$fBiM9`x+mQC9dxzJf@pJd5Wz*#p6!#FS{#GF|ShqkVf3BsN*ep{00S^Op#VE_n1+8{vQzO$| z5RPT-K$oJ9uK{X64HqUQCwTifJurUU#7U_WgMyp&gK^%+kA3^ivE#yf6g<@@jThh$ zuqZgloSKm~E*e@QpSZ-d+0DY`UoJ$KR3>kwG&79a$Hq5 zZ=-ej=b!Ue3B{8ip^PomZ^QGB)-L>PfkPA@gr`nUBuLvWBn?j)bYPuaEok z1!b0b)3e98M)BGXwtLP3%U0JhkpP~Bzw-Ag?W=rIwCkAZ)8|<#_#%8C{5Nwt>EY8&o3$tlx`su%`>pLX#V`?f(7J` zLkss-HYBH1STW|->WY-)hDrpW{j2sca%zy-4itlV2*s+&)z+TDF2paTq(0PF36SJU zr44pT(ygGPV#~bZ5|l4^1{D`s=I;*@Jms}|_bkTE72c^n)C$|wAI@Sx8M2_=@zR>J zV+M{yW@krg%3`wFg@Kp(@hunF@eVAv4mv%!gG(31H5A)%j;MTg^O&eBQ918UvpYR&=u17!T*uQPFZKkZZ!Tt z8}1ui;O^|AF*-YYvz=~Ejz*2k7(G^iy=d@{I^4$>^zo{`4qs11KDm936r)gBvUtY_ zJlG^R7iU*jZ+_X`(NUAY$2zzHyi|%8F8B4(tFt@MU)VL$Hx19DvEVeKV6R0EB$`4X z;iRooR1hY_G=kwqU{;V<5Y(OuZGw)KI1srpK|~Emruo;b068LHVRQ6zt zb;r6R>&hQ;dfT$gqVC7b+eeXtc89t_y`7zUr0l^XO+0r_#Y!od|A__BQ~0FiC_6P` zy;E7VL)%Kj;!x7)jVO&ll%c2glUZdg){d64SxrZK7Ia$FS1p|jdX5f!r(SOD5IYC5 zG~Mba+3BVS%gP>X;yFjxO5iA%{1iT2dlV44IZ_Zit*p->|6osGnUtb@z$yXNgV=Rq z5pCY@a6piif3i$uO29Fxr;VhxqwU0n2~g{$BdZbo8!#7TDZ-|0a@T4RUUHX9)%P;n zH#a+_Su)}yg6t5yr^zhPsYQE)*sXgaE?y_<5)16@Vp+0>v&KQAD^+l95sF2gXI)*w zrF#Jj6cKu7sWvh_S|=o%AHBTEh@d>3vx9@^P*EvrVht0|^H2SJy;-o6gT}!@r_lTfc+Xlb+nV>zPM@)B$%cl$zJ?7;cFmw*m3#LliUj-!?6(RW4%~2ElicLH>%BAy zH8t|RYihcpEo`49x{JMD$-k{UMK?ZG$;MQ&uWm7K(D*NI(Rc|X>P&kRcGB@+qOizF z6q5&y%>=BV-%Snow%6A2s#;O!W6DfNs)X|9t9=d$;ih;8wPj@8(`OI0 zsm$u4-s>>6uyCpa${o2c`D1a+xz*|HQ_PPxQ2};2)r0z|7hBt}$4@#M!FC;*#N*W3$BqIz;6r zS3~A}NV&s)P+ii)srw#ZG0-uPvvK1)JsUSN=W|O6@@@VT>gyvaEaS>w&c&rG+Iy%T zNJn{FxIAOVVz@-isISZWVVxI>{UgSX&_pS|Mb_LYf7DrlJ<>%WmVlvy>*9w#k@YE6dl2<8u?Wo5EM0KN=e0p zRDmICx-cOzCp2WdqE|zz56__tBi6^Rkm2s5<*U74EUPYPip%nM$v{O%>K$FM^CqdX zQG43_l#!MD6xxiDRR__!=Qu^Rm#t$6Mjp0kD}0A|!f1r!1|A7XMx(m$`w`9fzVBYH z5o*ZYKYqGp#*o9BIm6es1D+OV=r$+Xg$%uZ_057dZ zdla2Y5f zL-@8oC__PnaQlg3q*(%@pRB4`qZD+Mms^ohLwV3VUkG{dMYP8qJZ6!qlBk@mHCU)5 zwPDV?0{9RLRu{oUmON-J!9Y`HW#GV&1rLOuHe@e)1xgVh2k~YMu_JpOKtVA@$Zt!g zL1POW8VZHwQ_E-X>U=#hO8T8eP$Q-9`yLv7VWWqxQs-2y(NsI>Dn;MM$WXoL*{v5{ zP2ns2#EPM>Dn!2(v146Dy#=nAP2@nSt!c;`h{|hd>wInZuGzEgS&J}!8)tl+eob_= z?ghP5k&nBFPo9(hpi`{B^Uqvef97I{bvmeb%8S+e6glZ%&_xG0uhH|j;L89%&`IzE z#ZZHO4fTy4*39w|Jp;y){^G&kqeEit{*SsPM!F_!VefZKzhf)^PdenZ=J$LY|AMU& z#t$C+Uv-8!oJWOXEhr{-o6ZitQh#jeis z@~P}}aYMItmcAuA+Ww&4xzH!dJKxFmkYlW$>-sTc){im7Iv&zH=Er(@6guk<+GEDI z==mAU_;5VZ%!t_|UQ6i{cU8V>&WJvd=R3(AG|2bO`2Ssx{HNrq`Q%ssr`>T*eVA`y zP5i*4J1f#L60I@Y?$Pl75%_!7LyVV0h;6|UV_}X%VJGTg)!k8AWXJHe1 zr7m@UT^^ike>Ve7X;@6JbxURxc4>0@`pc^pmOu8?l|H`Wd3KnWKhK_G&foU;RU?pI z@t#GdX(<5?w0Ot4Iys(E%gpHK3vxeuA&w;;(qI|3SrUSR5e$vsXJZIuK#?~QqnFG` z&@t&5!W5Tk(m}u%ff;4S#RHgmL2zJq9W$i#qm4&l+yqf{xLVrU*IIg2ac=Aj3=EG< zPmc_TrMxCRGBO}AFd#BAT^)NxdgW?WN(!<*MY72LetxX$YW4j2nfvy=_SPrcx~kuM zueG$gy0leehT~)u5Kj*wk4k!E1Ry(%gxe7jj*slE_ugCF*1CgVzuez{8CK6MsiZ3+ zBIosP+@kCCvwy<4F;zUDYj+trB~tLgNF1++D_ITz1MZ^89W=eOQ^Bsq|O zqkq5=CpF9$pn|0gB0DLRtAJrtEBmg=ISg#PgCYqM>L@fU%2Qz~Y$76fgLq^Bt09an zxP%xN~a(tLOAW~6OqP2+D&H|^1BMP{e#wib<)r|N}ks*?UsEe?sj4B z$H6i~ds7^^Srzm;azqcnk%9?EQ85h5p>bHOGU5|eX(+2IDevI&n;4I|q`ef4DS>Gb z-g>gKvUUB5Ipu?&ak$b8SAlnxfULC8Zyx@(?=-$*mso%E;F0k3tAT+mF1<7z|5r}l zRh2(%}um-<@a`_uJy8__E142| zJj8!t1zdX?4o^|7j}S2c;vv-zU3=04~o`kSX4hO8*`Pe z9$7YPX7zH(C$*dYb;;P%?|zOo`d7IfKyAR?+z^jC@@^xK;dvtr479fbtg(fQt*v5f zd%I+9Zx{bMz%_#OGhqYg67Yi<3{8Y1bnjT92f(=%i)>|qi3YBlT$+sZ4h0QmX8nod z-U~fFH5PRPTt!+ec(1A9O;uGxpT#0;jQScSUOz9L>IF*u`5(TI?6)7!J#@JrBSXpq zO!!9WG8#Y{qSGg-E0uxNI*c4R1a(xh4|t^d5C$}ok>2IrIAT2@YxK}fX)Jj)+lv%| z^1Cvo)FDC?9wFqcok$`Xh*k9)Yn|1&7eL*C&+WLPpR5%Ob_RXNZw zjzx-qWEQ}0u#9a&(l-8ux;3x9KJU<~rp~hRZOF|mwc@*PbFN*>zLu>y3G)38zkw^a zuj#BWEUe$zyyj&-hrN8HePi~5En5~KZ6dIioN?{7>v{6rgw3oLbG?duhT?q zp!|^%fas7Nfq~{&*U~| z`X$FtEbw;j*Zi_A)7v3x!qQ(pw?Dcbin!4=Ay5`l#!zZ}0#N90|ZPtTxcrDc*D~ex6pWcN`Zh($3 z8xdP@r32#)>O;PoT7B5??|#sN=}R?o`H4+5;^eH zoJRgHgWpWTz>VzPzb`Lu-}C&@gZs0y_rGu+xt#OzE^gm04jfi;E(m%rS646T8zB!q z8OQoMw>Mf3P_`SjGrgYlGem@s_4f}bgg;|g{gPwHmNqohzkX~<{f_C`SF@*Y@82$- zl#_uLm{X$?6QkH>{>QbIg_bno^U_A^-|-QyDb)6R_F|2KTLB6c1n!A=9?JSnI|$~I z?CA}qB%C!Br|+ahv|hdd11iQ?cl3x@U(#v7X!L#`8J83{Vf^jhC_mq%$llvAap=F{>j^*}uYiD_vA0l>=zOJK*RD zseKxxteJ?kg^im$dkH;PHn@PE(mb2U!0X918llp_mJN7$lSoi$gzZl07O*swKSc7# z7$E@u1_HLm_Ov_Tzijq~dCSVIDsxtdm&M{65;DOQ5CGWw%I?ZDmECiS>+Mp5qRr>~SlHhkFby^(_AodXT!u|{WmFddw%bqiJ)g{J$iqVwJ2YTL@g9* z?2m9RnqvYiGJqyU{5A$??&v7s0ru^?v#(ubCTl|FPD__JzVKL6Mkc7UiZB+;U3v1c zZNl8!-4;VTvo-s=fZ&r>EP~L~;%xeEQ*qA_?Fk<;F{5zbKGgg3^viBTTri!j7GGgM zX#EjZ$)Jt)hm)16`&hw!gx)F{oIohGvS=TQ*__TUgF`edt;8OC3|ivGwuVO5x3#sg zk^kIkYDh_GX-r9x&xzhG%=U6)zWHK)qjd4|%^YT{?LV~7xWM>^)|AxBBq`+4M!;QP zZ+!IacbKi5gI7m2wv0-VuJE7VtE?pWuFhAl@ZnnHdw6?beBXl6C8G-)QbtWL+6h(t z4%@mDVg=wAQLVOw7w)2D?<%%iBuO*T7XiXh7D!7XTwc}k+G9E=WBTLH2Km~7t*lL7 z;KVjdE>1jy+46GLkSd?)HkYHUHH@h@p{MTSBPEnAFbBA3ec(UcBrjsa$QNrBf<6BN z_^<;kLj!7>xn#`5#V{Q~Tni{$B%2mJ*ecYITMfpe0p^sj@s-Cl_&=<2} z)hfyYe?gI-WhLOPDslt5A>T~&3T z7?`qs^|2xj3+w@Hc5<4TpFca{)Mh6)KaV{gPWbVNZp(D5S@PWCnX}^YGi&DJ=a$sC zo&P>{%8>B5*x56`>wdlSueJO4*Up)ep}Y;5{+OjeWne znMbo?YwrjkipL=yGkN=*xpY@V4;2Svf@Km>*2U#EvcRW#Ia(7W03B|BU4h!Fj@-JqF7Bxrp|OsVwgOU znBh!Y1hJgh^?IC{!ZR<Az%K6GEToCv7oRMF{X@kl8yXbo?-$N;qx}2{n=Ca!I%@vc;K2#QONt+H z4O=~y|3|yb-^;Vhu8sK%`wPh0la=guOdW9}B@+ODX(~sM2ZNrdGYRZZJh_qO8h%5ZgMU{yNksnthEGW7L41C%(0|E#8`RS~k0!7I`C@FDdVqn1h zxM6yysW}T5PR#`^!GRRx{RAMGlMd1};RQ*scaL>KQc+eOa1^ZAq?O{pzp3 zmj8a?VtqryY9t2QPAW*Zjfq~Fz$$WIvgYY4M)0)>@&*qNmX4aj%sX~+LuJ`#{Nng| zl?|Cf1dp?`W5?}m8!G3G=NF@eOXi=1(%c2}3WmnoMdoL)K3{*mx*kpZMgGUdOWbU? zVvASw{IPF;_}s)iF{9#@pfb&h_nzLvF;8zQ zJ6!!w`A6VeFJEQ}7cO{Zl&7VYX9#>(1%7t!xO~|w4H6b=Yo&Ec-Or?#E^p(jUbt}K z1-4?_Wtq|YY(-33S`1sc=%MX=)vk(#_r52uq)!;rAa@WQw_b+q6rf-+492V{gATAA zNU`2Z4=qM}wd0m|$S{cBL*iE{CKIh<+|fEKp)=_9g$w-X<;z>q67(Z+!nVtockCoe zcBwR^-Ry|TXsAom1l&mhQlw(|s%|QnpuV@TVi#Mn{h>v@-<4OS8Tm@K(nw?|HlF^V zqZO;z9^QJKih2iM5u=ZABqd$Icsr-XGVH#@e3c2K?q990Og8!XNR@mq%MtdPt!B-B zV$jlZOc{j&L`n|J5e zX==JAoMqk>f?Fl)YxdSW{Me13)^3lgE0A1;gmdT0%6O~UAbyQ;>bbTZe8V2SudatF z1!eHy4FWOL&Yf+X6;sUbNHOQ+Gv|aeth&3wJKO5|Rvg7nm1LmMeyzkuc3IA?h*kiCjZT5ZMkOKov|{&Njvf1U#IICsjT;PIw^kTSNcO5Td)4e z`yOy1&_;H+2<*3Q-~nzlni>Quflm>1vbyLLj%$ciO1^1JJBwi!*Tqn&&hE0E?G$jx zP?MHGOi{D8U5NpUp~z@+JB=T3)VM0g-I-}ju|ctjdrv}!0_7)Q1>&fK+zlHC9&tCI z#0G%Zl;`xna=+()ygJkw54d9$!-TFH_r(r#q?F}nYH$uYdi1DhH+wqjPFj9g1Ikb; zKSG-F(orh?dz1t{=>TiE>2E4&OHNMxpzSDs*fCDn)>YAV6#snC*7=&{iTOXu*ZDGj z{sRkmf=VZB=2|24X*GJ0;y(X>pc8qQx7rXaRUniFL17~(L4nI(e?HPKbU z7P9+o5l%S;ks5jM*fCx!?9Ezax=}3JF3J-2c6sxIrZK6ejI=SurDM_pyuqS_*wx^8 zuR+2yZDPlwtj^bt9n)lGEjrrynkFj}C4N#PBa73| z$L@pvlBF9VwmM+?0onr#4}l~N{HHFh6wl9=$$1^}!CJh~!IuJ^xB)eoZ9ZUwON8GE z<7#g#liGxF{71RA*EK2q2G{e2K@@9{ARE-{x+31VwpK{*5cZU@psr(5C$lprw=pZ0 zP8UDQ|Dt=eRz4)>mhjI%fXdLu!*5x!iPSuI-Fvsm8UD3RixAoBR0eB|_Gxiv`MC;9|eugnkwe*9+JH~9T=E3$Fo&zWW2 z)C=Z++1d(2F34pUvepj!=9}lf{qeaU@%t@}We?wUAWp|Hj22nO;<$o%px!W*G3ItS z@racvJe@B^k(mww&Nk==w>i62P7O?0vniuIXMmeg-cD)Q+WJ6l|Yb@lARf}uPZHXi1&tbZ`Wr_5) zGGwimCnOfK(}k@xACRMYcfSWK=fK!s={ZKunHDHiU}q-=!R}r<$Z~^8yqk_4Q#L*E z644PE*)>-_tm#<%;{QDRbZ(BY_O}rQP&gv0u6nWjmAG>U;>4bM`i)ZFd_MwFzZCU< zPh0iWOA3eYH-*-M(slUHNl(X&I74Hl*?~?A)j!Ip*mRO0!GJK*0I}<^|I`~Wi-3+T z9pUS?Jd_vZqn9MTPgLGRTTBTVO>7b05FKjj^+p|4lk2{l3o|}q)gNVOO9#0I5AYk* z_0k}}0l}_=4$YV|q4-Fg-;6`*>r#RGy4i|K{2nPN6sASomdjto8Z#g&(+{Yg$%u!T z42ocl0ZqLadM|5?BAXL^>YOQ5E9629cf}z=K~s8ANS2Ej*QfwL-R`Eg)YQNM08oG=K|!7C$Qf2!4$SYw#ImwF`mcI#PR<$OD*vvvg?wfO6ElDvQSZrR zb}rP^G-m7!6m<>Yj|UEPcOMwY9uDyG2u&nx#1X>WHQ!D8^ZNBVq*(xXt1aiV_=$Gj!6MtKMAVIThMHSclBsjfa?J!3s3PCJk{3tq^~kqA*vo_is+x8w zt3Xk7NGkL8_e10bbYF;Nw17}jPqhld!b&?F_F@zxwB`|xRe)^&4A5UUMONYICgiR~Nk!{t&}j~=!VDJKYo0}hQ~i{e|&@a^R|Y9F+447 z7dsp_y=ZN|qGw_ZHI#Sj1?zn{WOf7KQXF8YGK8~0heSpMsCIdDp9oNJN(o9rG3@Wt z?ip94(G-olnWy{}#?4&VkXa~MnKD;CG^4z^xojTctqNOMwx$#x>ry{9PQusBGd=v` zMo!Ak&P$6s}E! z8%PVD`l=4P3Vx^bQkQM%-ngFbYWK)_nW^Q4I}6KGGub}!6zqpfguQZ~o_4-2p+G=+ za$G2|6x>4NlFP+B#f75yL~dDi_m_0V4=pThI{EG1LtP_oMBkSk`q~ ze~UF(T?vT$#;zkBm_+(iDcU%(^T!Op3TxMPnX0Qtj~F@t#Z`xnV7E-Esi~u8no?1M zPWZzOD;x&ewVCCb%<;yU7~}ZPZ(7Bjd7~GXXJwUFr)OPFO*PF#@!2t^8KYC>G^L(- zIgM>kUuo_M+19Fiv3AF-Dg7k_raHPRlO&k~caQ~1&C*?G=^HBUnTj^Xj7gOX@93`h zf=WfJ#<2x7vB9@HEbdDk4JuMoN6&yT`Hk6>m0nGqUOYOFEm8>4xOIM`aRXU5+NcbB zIb5_>R@z&a`3Y+exSj?AD_{uplriuUDt!k+f)eKhz72j&flq;irr@j71JXrFGZPI_ zqVg;j=exyJF@g~SfcgQW275VHxx;e^IwRSz)VN{xWq~E0BS%iuJd>M{;87Y_rjLzH zl`8B92f>}?DSn)2Ylm}@5bk+%w^uw7q;?b=VKg?bVPn=b8jTSVd<S6v# z)x&!J-M+o+*0RrqutcO!J{YGk4{}wxpr-3RmvEwC;Hh$$;iB0+_rY&?8u=LCk~CAJ+b-p>1Ny)0!%l75OouVW9@~G zowiW^&$1HXKVG5Xs4DCc9_l53>F7PkbGW}DdYEalKl$tYhmM?3AlNLNHa0XwSXMSJ z-3SDT^l@eKx2Kz*K5^pdW)fI*R>ekt_i&NCPm6@SZJvf6X)+MZXgU3&%LdixNuxAkDh@+~(vZ(ZK;*4B+%9-D5G zF3c!gza<1=M%y|%5Ln-#ExpF~UAxAzuXU*PzGP#BadL4zG^MCjC6kR2M+1Z4%UQV4 zCpvO)pd6w^z|$J4ME_B20DTWpJU(=gfk#po73U|)fd_TbTQj=+ESt+}ile@&7=a3tl?k)UhW{Yq+TmG}) zFmh^X6~PNsl};UbEI1;07*k|9ppS zm1=Acfy_1y<4t}ztSLv5-1ImolHir=UTQ|#?c}moKSQI>BCXUD5GAcueqg1iDsWhK zqM(Eai30HifIwwUw6STuK6%oB!Wqk!bWI-_HPF$~b7*RQe(F$9C#Qi?BZXHB`t{As zyxwYUJ7MCorQC5fThp|&av@&>ezB&qV#nibO#^bXer#O#@}8?*e7gC{D=)8G^TXeT zKi4*{t}-nLZNuUtBFrD?`@1+9dHZjt_-S3tvgMzCe)AN+&VM@i!3PJCB4~U1=I3W>mtlR1R?lL7 z=V5*=HfY%Ml#ptRN6%so0zwoy-lL?8ugP2Y#AgK!9xk@VWgy2alNO3*TYG!fu$$+H z1qNme)A|h?JQxPnIf%lAywQDq5fQguWMiP5q}T_xG5|&0qoi%-b}=UPzHOb-Y)1{* z-mUQy@)pMBs17B@OVtmIuwza}98ob)gUR=2iIcM=K9Xz(Cax(w6>hQOy13Im>RZ7aN;KbzOprWEi zdC}U!qJY^+$)U4HrG$o#Ni3TFnAC#T5=MuFcD4u`;!lf7lp+(+B(U34_Lt`+ZuP7oR|%kJl`sZ?hHivU5ErX3o#a@k*c4 zIMZaB**GQLD<@}u=0wljoH;q;(n52}8fVU!F|)BOCp2xWv|0g=2R1wp@5YMnIun=8 zza1Prg}G(}&z_ym9vT@rG#f7Q;aOS3M+6|0q(>LChV_V~5VCKOAzqO?0OO||s(R+& zPg;^sfEcM-aM%u!@2OeJODihgdHbslp_BpOBfAFbSoYK!sAEg^$XiZcc>A4&6>JOi zv+eEj7HDsZ>^jAI0M@D>aufo2qeL^Q7o?12iJt|B?2&WYtvp$$vt z42rcv7IfA5>qf=KWbh5;llX>=m{{eZVxsWkTsGy5^xkUb-wSESEd4zciYk6YJZUgEM<*_ zLX|10G*Ym_{mGnUjJ+?J@~4^;tDbp{pLxw)e00fk+m`1>M2tu%pSNPilH5rA@YvfV zkBg6!EHq1T@#F3xx@)}1%_HejMbldg3P#SJxoAb%yu=X&qh`)tuyEEaVZ3DwNGCx& znKl9Xs1qXJNFUXqNJI~M1&p|4oKrj?&`(LCAPWVABQkCW8f$7w9V^m>C(|p0i`88} z$rWWnkTfeRo*(4btbtg}KEw9t%I1yiXnMtAZ9?_Dz_8A%lPW4EvE{N~HG4taE1wk| z_}}8Q_%$10pHgIjUto(XCh?JPQ}AogTDONJ1rrQemx*sE@dMueNbsY@j=^VI78qkt zjtbNmR@n`SmWmL^yk|zmG$@e)EDfJ@H19n9=3Dd1nx(`K<;OStoefZZ{7-H$mCZf) z=IP^#)Wt6@e|pO<{-29~;pUI{kIZJ?ytm%`^!ll;wkI`5HauBhfAMP^ec%4L;kA!G zee;d7dFZd!Y7Y4N7VH&51PQfxcCbTlv#2}97s0D!qf>xmz?o_7I3ufsAkWp31*G(W z%NY&YcAjIHocZ?TNd}%nsREj2Ja%5_C@!Ny-yI!SeOz3e_Oal&Tq-h<8;7(2$hUOY zY|clV(Xaxf7nCXAd)daiAo0pl=+o?SnZ&Kjmrac+B&DP@nl6j$5I|RS^=e9r$&`|E^=c8q>FzFY zC4X=cKI|D3bysOh8Fg_~3jQ{luQblUpQ{(~5?)c>ozZwVT?W;LbKAa8iaODy!+Ips zH=V@TN*X$L6}v+$STq^Jdw0ES=bJ0j@U!yGGAyQe;XC|INQf^}U%k7-H($zJ`Njd( zbl{DZnWa0Q=grUWJec{=)@^UTv1?~3y~V2zyrI}cEIwB?Z-fvW$Q_`>K-&mvh=n53 zQVH8A!X!k{g^i$wHyI6p)jri;lXZ%0iX5p(w7PSUxzpaE?1`)z;L@DHLQ%nL#jONc zn_B}^aB>^qV57RaddeG8Uh1fkUsb-BTXRyuMqrbGE4>`Co3W5+6irpJxYOEKoZ0A#$LHpbOY@TVdyX5In}fnL9UTM4 zr{(3Pjq?;Tz0%V1rj1K?KXLQ4yPHejJ{l=-nEOD_XepYK=W!R_%Q6~`(NpNrm~|+N z6rU{h@z5cAJA|cq2H5uL6X8yu4~&iu3__@wy3SR5JIRS+Obl$c9k7#pqKQ*|L38JP zw0n0#!kE#&6PF-QX*P{+2VLgwez>D2B$4*+2bdjRphQ+2G57Z1lpH~=w%3?z%)t1$ zr}dMFo<)Oll=xh34Zz6ID(&%Jw8LLWZT4*S`_L{G!?25JH{`pWelYPI%P5LRvS@Aj zuM>Y~KNQ;U=|?Zx@6&_3h`*=xZsIqK2su!Qr}JHv$z5=|4^`y0?$|qvsfu`k71^u6 zmQ|&U1T{sP!x2iyy$GJB@HVh+QrzwhP|g_7ziMrhPo?CAh9xD34-v(XP$c=zS~%Sl zw?D6G!!EXCD-*l-@jba(Yoj#Qy*J*H1jMX}y95g1B!4Z&OVIgmM3{ z_OXc*_=UII{)BS07`E`xWL$e|Vt9BVUA|C$0)sPeLl%XaBj;%W>_1OI<{+yw3h#hH zkx`P&JL-Utv_yuxK>Ak+1OwG@)^y8GifFER_@%_O;+0MOV#}-bBa$LwBT{`MK0F|J zU#cA5F(PY9)y%g1(Nk(!%J`Y%D-*^q&aZm5B2hZ^T|~HF@Jlb9|NRr=eLV(7BuuTS z=Rdr(apRa#e~n1=iJddPV$=8vrg!#;8DIVE=!nFDkSn^^We=8sKjm8WY|7i`FJzzY z8_7c5x4Vz0NQ%7czO$p<&*<+xhtt%nl~*dSm@Ab(G=A2%`(p#HWWZjzo$IM5za#Ac zq~)m^4whDrba1;r2%@;-d8?+QGZGj^y423^(qr(Gu5p1wI3~{Q1h5CU?mN_*JN}dY z(HTj=Mw$-xNNmic&Tm!JBaQ2%nApz851DWS6eazkKHEI7&sYP$+-t>y1G0b|r^HO$ z`S*c6&*=P4<6@pg9kz6P!~LKCA{k*CSF_cjLx)&L_e1aT@4X%b)x9Fr-Wv@X zjJH4TcmBO=RhX!-de@V*2rNq?;r`F>ULrTHXk$9#5#I+KMl6*p6en`4i~kFD>n~tU zLCl1WTDwwFeqs3sXd!{EppSui8z$}++*~x0hsU7KAN&TmYqbLeH_7*qd*EQtL7GGC zG&?Oc3;R6-{asvKT>S#PGpJ=RId5tNV)lwg9nAnM~?6f>L(_Z zANl%-_`;Dxoj>5IMt`Kd94haPR%@%yFgVDDQI5BNqR}>8YgwLU($5@}Y;};#2c%pk+zzV?ur<5W9 zx2NO&uE?IB`7XXQzGhEyd}17oLU+a6m~ZjTY;N+@oVujM#H6|$oVX-g-9Z}+QxBkx zj8nkefPMkN*`6WW<341X&u7)dGZQO{ugT7dON>vxm)N;zHu=tOpbwC7?&w1Zoq!MM zg(9{qhoT~~EAUT>w601w7!g2c-8=l|cF#$ZXV)Ldo3?uP4Dm zzo(D#mcn822O1i3p}pp}x1T)e=`kc6MFPXZ0eR4SydJz35JT~RwZQwMh&2k&ZpP!? zYoY5|OXwB+cN<}YsDwP=4Gv0-vp?d1S)iaQE)Iw+#S+lF=*fKLB3`IXOA8kE^Gd$f zWnRg%f8H?n$%cNuu`_G*_N{_&I%CjR3~ypi{R zwJIN0e#m6w(B>|*X@fjUPuTw9K4x0XwGn(O%1F=s7W7M5qC*7`!8JRidGbc{Von%@tZK7#GUdGJwX%lCbcfAM}AGi1TuJ5bg z-L%o&eL=;M43p&Nlbq!5uPKO#m|}ExFZ^c4+O;!GYuAcjYKDbMCS%AE&CqD6P!ka? z@ozMt!=%Cx;|rhQRLfaH`6Q*N#?#KkvM9JAJ>UI@0H zZkqkT4TnKXoTzv_ehXc&@kB`)2MKj2H8dg*93_|+V0chVs-(qWdP2Hjls*+I7&4VU|rzYp8YZ9wXGgi%BzcIgj z&*8%Sjq7JWT2P=dH+P-ETGd+lW37IPwW?99bVCq1LRKxk&LHajA?JxY)O#Q?Pmk&x z0SuW)_kUe9h_Uy6UO2FEBfrwr1oVO^gZ(8Nn@jcv_KBzcUum`p7nB`o<)5W3zx?!5<`Tql->=Wi;HZQLSbB&K;s)+Xij6MN@wOgF)Zlm>ECl+Z z&!4$vXMcLTcmG6A+c;PLK6L)grp!$5nzZPKM_;VDO^x`hxwu^dmNm-Bm5N4YNBy+) zuxx${dOl0u^3>Cpm#6WwZ@1p2MSKojR{E^QC^e9l<)iqRAvI@ksb zy40IB8NlMxu2nRLt~U=K=1l;K`-X2gc#th(E;nnmYqi>nw9fGKikO%Qn$yrU%&l^D z3#A{lAodc8^1a)424B8!`y^9qAeNvTDC0ss0c>pV_A{tC6fLVdd{_uY`{>2pjo+-% zxU`y0s6TTMfwSVygV<`l=#Nwo2JTD0Vr8W$gnP}b1U|qpvAqqg7CS3_g+dhI1HXI3 z%ucQ4nHam)*35EfV5En|WwZ*H)8i1@)Y?kvnjnC;a*KGx(;9ty2a-W3;<9s%jD3ICL*H?>+`7m6_8w6D77+Zm_AxckkwGT!jkYaxlcI4Lj> zBpczRrr=j{Y9b_--d7FFx9!UJo0G1WGl4Y%yb;KyD!pt`MtS*!3FSm3^50X!tBGXL=@BY8{-1%DKsqfLp6iYIRP-;{HCZo44S#gEkJ3C!(HqReM7UbsK zp%D>7g_+Gc5%|ezo<~{HY~B4PRo$T@*gnzokwYy(fz#0$cUi@EHAyj z>9eIv@z}BSo929)iTvidWZ`EK_nnEF;s%H!><#$$M7Sy)#1-V@G@4m1G5)7e?gzs-)j{ zj^-*9%x%t#h@71(CpPC5M-H8)EU@8%Cy@$*n?d${r>o!*nv`V)@uL=0{%~=0boA(p zKU6Ll6<@H7UVjATK>*V89au4l#(EQP*WeusE;j=LF)HdBqjBE2P~@XMGm>2nM<+IV zV64B!5&=PwH?GcjCjbSre6jFIBG<&aYFwd38#S^1v3gpYL@(B9yXWyi{9FF*pvSYP=H+a3@7MZ$OW}goq(dde%}=mC1#j@T zMljcd%yk5R>x~yiB$T-a&Kfq{ym9!jQeStJ_FBEE<=w9jvI%Pt&US3~n)S`ab%6si zN7U9n{mk`I8(Uj9j#^sV{8U}-i243?#m(#2>^_EspfxY=KK%8&Et}Rqbb1D?I)`SQ zen=c$F)h!yyJ7R+VsZ=S&o9U`{$pdqZet!41>0L@{;0L2odT;{f1F1YQyPz`weeO9 z7_1zO#$XVV|NRk1>f#EQ1V{z6kv)Ow#p?0Q34pdS{^S)(!bSj2JjPTBDbnK!fu3tI zcu6eKSEoTVDiHhNEv7(K;66s8vL((62rfWC#+PESoV3m^gHWl0fC7dH;n0w90mVvc zFW5m-MLiN@j1iv)W-eL_pzi5>we&h&fHX;TBQ_9>V~BuPW4bG5x}rDuD!zx4ilz+98ue%O#kZcZ)bhNi|9O0<9 zarBWiI-TCp9@TJdZS;mJI~&hI0XF?K8V^U8J_bKG+kX0r-NF87S7U>!W%hO&$?nu9 zJ3CZy@UZFUgc4_Vl1+b?KxZ4fDudp})-PnRtwX=Q8cmMYjj-D&oDbU~V zboP2%kAQWVpJ+zdXy`{e8tftV5!P(f*myfh30uqbj+**8j$Np})~Bz{*BZ}U{+VRo zuWvu=t&cvbF&IWhMg39uIoXpgj{SBR4hKCE?juUN06%+;O-+EUq}SL5V`bau``L+NzrK!+D1H-cr_noZ z#bwtmZN-Y|nVHccnrDks49MMNQvK@LZ@6YpVP`%4gWLvc zB)7Eu!jB3H#<97@-VP3i_Zmj7N?BF%%#uf<^Xux0GBbH|e%*5U%M&Nqn>DpH`K}tt zeW1U;XHIQhK7TSZvuI^qUTAII=3;KHUpZ^mNP}Van`^78m2oP;IL(14Db}jwm&Qr3 zhtc=$QM#S*q8fyMd9)PW3T)$-#>X4@x%k;7H5j$!GcamTHV;nV!`0)rpV zMe$FFv~tzVDN~H0n&(P=d`EvsUo8ED+teIk*}2c2{0zV6o;-I>aPov9 z-2;O+c4pBhGiIc*he}6}o;?e76&g#n)h&%FT(xRuRu+E@SF2jNw6@Sq(on%rubkCr zc3oE1td%Q@LhDvPSF)y&|NFzyqf7s=p}J<-pZ~n+voANDJGbde02K6U6wzy{%_ zMDRhuQLJ%ve$Z*5t}}RMAv(ioB3U7HSPcoT{9Em*tMVl}{A}HzpZ89C_vv09a z9^9lHEz5$)KDk2%7ZuHutUw?KNpKVcMJF+;kU{IT;H83Cdo~EQVgfamza-UZ*ODF# z6-!umSh##pK<*7xu*UfM`uMo|dLB@E=~8L&rAybP!h;oQUAv+1wH!X&Ql2RlLgVA_ zD4&XpkH0Xt_`-$axk{YsH}Dr+hWz0GZ-y^ow2(JsgEHR+{375DDF8ZO5jF&prxB^| z5A=jUAWj+dWC+5q&W4fH8K@5wgLvPnMt&U%OD&3Xh?lDPjr#bigMga*jQ71%-&hsj zwvoSScB*35_3?||XD%Dr^+ot(d^~SxH1A{AFV!z<#An1q<}JtmUQ+VCJf`jMWo)XD zAkP2$-^+N*_iOM!f6KgFEdAj7l9Io(5#|@a|GtEcy@dIcZvAwt)Y=~TWG=|g@uJ8M zlw4J8>=1oaR!*ZF8RM@rFg*fi0+E)j`$0Zn6B=y{nb=|N>=Te=kiC4|2j=MdPcU}Q zvF9Gb7k}s5*~{$JReC;To-oc%^0tjmtYwuB&R(gV*HR;6DiWhL0?#+^7B0v>(PGg4 zuItKNtFZZWZ*~X10=`?Hr+($ikJ|Yd{?QMc-nt-9_`tK>u!e8&{9xmHHx|9=Cl+}g z_yafijg8D&d0^I?_n{uTfB!{dgN9xV0e|1kYOK0Z;mLho_x>Bl{G z|G+=`%Nz18{>eW#9=srbzW$h@-9vhVzPpL8w~5*C|7>E`3;||XXE(r)&M0ykIFXW+ zqpbeeKtzubb?SLQbi-jE#SBUU=%E_Gc{EzHmHd3o;*UT4=RZGeuc{Vp3Clt#{r<$qi>s4IE_?ELb!F?p_dngT z)z2>@W9Qy;yp}cm@JV}hRaJHS3HisPfF3;veshIaB)b5`0?Tzex9vE9pdx(1>3i^9C?06e&M0*+uvSSTbH+X z@$)+l{M3HDs=B)B_;J3E##(a*Bl*b>G_I}NwgP-~`j&0{G5%3uesr{{p>E8W>MDq? z=P(~tT@~tZV-Fa4iSDF!K749UI6()i))FAADh{DY7s_B#7)^A5rkl-B^#Ib2iFw+H zkRzZ$Vx15rNernsknR7PP?&()-JARio@l9H2>!dwP>8&ZNpQVibWRCymt zynml2X~zC_|edY!~DkZN5>CZ9hO2LN(oBIF?f3$a#FsaFXyDpr|0yV_Dk7` zHwc-d3a5{~JW|qhZNA{=H-@d6Fer?|x8SEI?4py{+ae;*DX%mJs0ZV*nt-&7IZ=x8 zqT5PumAHx|2KtcU0B1RosxnwQA(Sk^`;o4-`$pbZ#y%@aK~(2T;fJx3X3XUg<{1+P z4N@o>E5{mx+TXs5GTapE2gIBh0l#i$BO3 zyI2_ue6-Bq6FiteuLcME815btIv;PxDUcrk(M}dw2*fCdBqSkAV9|r+pqRLd3`CDy zW~U+Nl*BkFGz_L{VAJ281)Jflj)}8y&hxlv=E2iF)?et{ACZ5X>jUXsM*bEOg8l zOzrY5M81;^{}!(GiRD_bC-=G*((vFTLBs|kUhZ>E3P)BVkR?u+Eyrcy?&`3-jJ_h7 z+TtUin)FWa5lmDtB=m@rj}i^N{t$~IX##1fMm1E#*MON(eC8x6se&}*btRC*GA(Lv z;ZLf8D2jlT)38+@KFm7s2O%!0a0$4(h4XJHN|^5)UQkq8T9_ZtcLW1u!aW#WT8b+G7$07^C<3wVR7ghppaz@VJ%?h$Nm zfpRZbGna~V$=wy{)R4w+es-AQdP@ACYUjR_engb8UZh(F;{S34$eTtX&R7HgkE3ui zSUQLiC?xQI_}7GW{~rtm-ym1ZRqQlxI;@^csto3dD1s3f2TUw7A}OVd7MVKl@CAXT zhk%>YDP=%y+sjL^jx~4XhYYofqn(1~N&V`v=_?UV)L}>ny>dg4`T||b zUj+dAt;rxP8u9&zy6!*?SnMnQ+wwrRGnu0P=OOb2iMMykz4i+3cXt+DkG`Vh-cW=g z){)|$)s~tC!g>=q9(jL)17MrYg2+)E1=5KwM!Z#%rItex=4REHI}rZEHs1tSf*+Xl ziDQtRw7_$81OE?Ja(ZbJk(BN0pg1)AUG$d3C4WfTz`5!VlQUxU$5bxv0x1nfcR%M*ROZIkC$ssNkhh^RqReP*Nb&& zyDQShU3!;a;NNsCU-$LLTRQ(OhyQyy8-WrR+t>*HM+A~h;is4XTR8pi<;&N9adPYO zlMH4+Of&MQyLBOZ#7hiRu-pi-ZWN*>2sOR{{*F0T^Q|7XdclbZ9*dFX}K{Xf~v^iF*G!B4;$0e#A}mTV^in*jlAeuTSP=# zGjC~ZlMk?L2zrTp>AH0+jfeBg*My*m2>C2B1PPNAVm5fMqs<9ar>@jW4v@5T3%*rQE6 zjD6a~Ub!ZJj(!h@Vl)<=T$Y4R4r}CpC{Ql)H2*{6d-8sk)5IE+__8MUDGzJn)2<1F z(aF!z$v+?z<8?zTl8Fn6q>BUv+hkAyD`1`N&$d4$iS##uyFxj!Z?6rSg`S`K5 z{a>HiboFaCp5r1jR**gU&FuD$D0wz_(; ztLfrZm{rzMmF=Fp=4Wo~d{r}*?i3YHLE*GlZ|5cb;`O@`LUl2xI#4;f9SSajD(S9? z14lr_&g`zCzy`&=1UD|Cw9jU$r>M+>rKUX5a8K`h_qca2Ddv@5#T;G*?hT>zjKnUS zWmRdl)ap?>I~4I>F`htDR!Tuq`cz=7D|neQ(WF&E--$9{I+deFad*2!0(hPD91(9T z@n*!FxmzSJ01i2i1Q_^65G&GHQ zZ*Du@%!>K7-A+Ef|C0Cl5xS3`m}<~faw`>lefZ2--yE$Z(DlX3rseIg1-$w`DRlA7 z*|BkzN5APtOkZ5PFK6oV+WmRcI{(c#dPhflvqA|qGyS672lzAdPHWBSyp?&OA@w1l z*F({CLT2bbo-Kqn9Y3>~xf%3Mh3@XD?(UJ{lKHTT%-(Z-In;9LWwrZ+Gx0qgQeoOd z_tkcHObm)njSfv>t`TW&ZacAN6#eoA@c0m{AVQb5Liq?%ka2n__lrWIyjzL~NZ-}# z*Ts`^xV&4pPTnnt3#Yp#X*XeS?t)%aq{O8GUsVqg2H%E*$<;>M#a zV|L2}{n@YRfg$LR1ETGetc!cQLCz|~4^#B2NN0vFbARX2mxb@|-;r(Aj*f+GroK*2 z)=Gyp`+42}u(YoBx9{zY`Npz-q5TS5XZGXUl^$cLXg)1`zzr6UAoLBx;oE&zjM$2G z70DreSQs0~H2%6FuwSG8YAGs_b)2FHROmj@Ue=AD*mYoK9ly*x>Q*uj7Hl$|IfFa+ z1eGnb+`B;)HQT%D_!TyAc|G&sm+Q|cA3bC0)i0`11Y>2l-TZ<5LpX)rpc>VOFoPI5 z>-6barqic|GY{w{QvMD~Zi!7ziK*+>rLrBu$LQy$pQ7y3OB8P2eedZi@OXFd%^Q;v zH*HEx+NkzX$vvA3>z%ifgBk;=)eC1jLMtI1D!xQSq>EH6Pwzk$Iz^PFb&?nS;y>bt-bjBLy{6hxnDqZMTnvQT)FM6Fh;y&>^EshVtV?S^a;t~8QOF& zQS|i4^5lOs$+CY~urL2(NC^8pI9YhgQ_r_`ek+VTD<9E@B|FTTS~IbXN*$I>teHB? zGOoLF$N+rLNH1e;2+}}3*0vFOav*Q`=C&{X(^0A zc~yBm(Aiaa%ksT|K*R;mXjpDaIC_i-0~0Rci?5N5Tr+u~m%W{yKC-XY?WB*=79(Am;b=2l*QwljL8 z_}y7{Audincv@Qe>6~&lV9uORZ!|TD{}{u*j?11JCm(^iPqGTaHP0&7bWt*kFyHEh zqli)1h_G1V;u;$SWXEa~xZT;gbD4Wt`3CvmnXd1j6e5AXh|+0x)Yi>Tp2M!OmxW!Q zHQ|!n$iS2M5X+~sSJ_K?wS9YD!0p+~<|jUV{8KBEiLFq(LW)+-ZP?{-2r_>d zceG&1R3eT67)|E<#Ab1uxmak-Z&m%NqTq+xi|5gQ(u;gBDh`T8M!{nO7+XMhOs$@D zUoA;pG2+#_oIKGdKX+NR{2ep3w;vlhI5@j5G&E0J+U1dxyMp&;*H+}_NbcFy(ejvQ z*oJ3r{yQ|RE<1Se$~^QFxs#S!nzo214u|b79e8|mU`<3D1SAU9604X6sJN3N&-vf} z7cUSGa*c@vB#feZDu!<5RmGI7INj82VCt^=hAQ*lwzi%?#X%=?hf_mC?VJ_s3reNZ z(t`CX%+IdfvA?Pw>AL>EbY&f8K}i&Z-S9!Jv=`S=HD5?&y zcdi+#Nl^6>Cs#P6l|(T7RrFb=XfVolb&Yk6?fFl8;_ihZZzFG*g7 zpYG=%%}RHhHg&BL2In|L+bFB~f%C3tVzkTs|2sC+m!^SvJ;jvgn6f{CmAgbd;HIFJ0!!XMOZbsW)++jY|QG6RGC#SPq z(=5kOok~7evzd_7?nJ}6xlNi4Q{pEbjBv|)FmHafJ%){iG|~sP2aKJ~KtR54d*(T) zJlw%I)BKXZLAC$-V%;Vx)$XxVh?B>l&ZX+|c7^v5@*!^6M~ZBzs_v?thLZc01x#*A zqc1J)C@cUAlc%pK|Er%0XlrY8Et&Je&i4<#_x!HXQkS+im(r3KUwHRm+pb-uCF0-% z&CPi^Ik`_i!)89)oRdcw-@NPPm$Mq%UJeg^9Ii5_$TYWzmwh~qiS9vdg6*OApMPOa ziK}|m=ikS_JLk-CdG}qHIdgVCFTRqS^UTw)A9%Vs7guV2`oQZ?Ka-Q&^~4L}khV3W zhYlGsbo5Z4fdMfAqfH4z1BS$S#gAUohLgA*vO$a@8&FLi@_kyNUM4XR2mD2*N|aF~ zX*m#UfrdrNTY(`0J3i8d(08yd6bKm>T~^jEK@lrE`IXzG$qU*SOrGTSmDJG{S(7Uc z&8abeT$4jZI&x}QB+N8?4vWS^$w^^O*`&!H4?pZNc~V(N=bWq>sjTan8gU#xOUN5yl&VL$)1}L(>VwJbzbFHR zR68K0b-6B@63&2?I3Xs+Wx;}h6DAaYz|WgLFg=3Q_+|LZmwnC_DVPnn-iF=49(EQL zHGq&nsD=tzT~JrmVm&Y-rO2qmd{Au^MkXr-UWkMnf-|Fo5eEPsK?v?-DKmgL>B*z0 z3!8Pct?lU1wyra6^iNwBK_5w%+loy`i;IhIu4}`mj%w^t3guTG>5atN)RvL_W^4tL0x2F+)>*1!tLC8dy-8MNkNW27gri<_)M6; zMjz-8tAY+0U9AfizWwg^-@p6z!Ugh|{4e}Uy3EF}Ud_hKkaZuEPxJ47d~tVT;_erJ z{EiFZW@+zUHtL)g8_G|5oujtIJKCb%WJR&)xG9{(=%BdVsnPCE^fazZ?P*#}6;sWv zuRi@u{xta!`H^Y)&pgeJS$Z>RMLo-uh4*^*ggwF^>x_(8zy7^<+Sy0Un_uLy?eDy| zem&dOtBbIoS=M8BTpnye3bZ?Tx-TWcDpCy2XR65qCQma-q77_TG>68TEJ`PAx3;Ru zLPp|__8Ta_)6RBC9r%L;z37hiQ<`n`941+MXS=)wUx6t@{R*ras5610Jz@+zz$#DP zV(p@hf`6mPYOYlkMhs)6gKx{8p3v!Y8^%%r&%K)wL-2r63VLbdH_x80fYs~f-Wy>}0oJaas4ZQ|pm0Mlxyhi7Q$p~{D{CU1Cx zr9H7BJNw~>4~2yE^U|b+ga&v=)&Oeu+Upw4(uXSxt3vS8)h{$IWLSx(M@>?R_n@pq zLAdtn-fP$PzIshMuzrwtmdVS@c4AayO^%b~6+YBBYM4(%Q_}XGM_+m3@yS_PlOKQl zcON{zJ*jD^AuiR;+ADBuT8^#T*r7Go_U^srKhkeZc-Zu+ZO=cygEc3H4>4o~dwXA^ z2mE6;0{9l6x`y!-*k2Lv>Ir@xs91xXT#(J93>h&>>`fBJW0blaN^pTM#sW3uC=Lzr z1yqff{k5v3q-x31wsYsseDTG**W-uHnKLZ@-1H)T4b{U?drW!Osx4h{Y2w674evES z?f2JnXU?4as~-z)Yj~(KBct-66^~6XYF#V;wP-rOj+$l6ww30(r*A%rHO<#qjW#Aw zZ*;GDx7+7slQF6*g9RdX{1$Y`2voyEe(CxsIz zQ-y<0Ew{kubk4>G0Np)u2c2K8u+yon;6OrF^8;EcrGSZ3RO;$MtqJ7sKV31wvyq|S+DohR_A zPhTuKQ(|XV?-cxqIsA}q)(JKHIChVkoTiU@>BTW-Ls|4(RrM$*RTr7S50052)fh*a`X`A1^?6GB_~%! zY(ec4fN!!u9n)OzS}WCbt>q0b1AVXNsiG-VCD?*un&DIUfznh>DCSWO)OLD&n*%C`3U`?S`V(|FN5d} zHGp=7=8h_0(sx}hx}qDqglc)6wbi9d&6mzMU%1eG{*v%RhhTT+Oqa`jkTYS<$4HU4HM&_HLgJXXpt z^9CkNh>sBt3qIUQjF-O`yreuT$ zs4w2=OEgyYFZ4#CUmc2H?U?!Yn8+3C4?(J-keBM27(Mn{{FZ8x|7sZ}o zyiLJx8qd`3f$eHl>G+KUEZrVzvxOd7=df4a){)ftkA{?<_RHh`E0pw}mj8|@Ss{v+ zPWLqZ*W_^`Pgz#VGj(nCV952%7tu+zq5f~??0(Y+FNm5V@!yer&xDToujW;_J+D2_ zx(V<83wh<%KX2I~7v&xBQMIaEEUJ$~&4POXVbzp<2x-L^WrRr96N|QpFW)#8=jq`k zZuW{FhQ~o3p0ZWOMt)vm-WxMm#El#Bg~-Sl&DDsAPWRZMk%A99%)|3G!(!6I!yJ(F zG8Q8YVUc1~MkuLM1TqX&3NKk)**LQB3Rz*XC+schRggDH|Iz9cohwRl?Mc<%Fp&ob z_16#d_KETF6W67r0z~dMgs<$KGjdXN%%FiTfLHU1Nhwax$|#NhKeW9ITvX+{KhC?> z%phngcSOM9He5x7;UXd;A|b+rh-gYSA|N6nk|`>h_t21t%#_?_-gcRpnJL?-$bIjQE>iZ1bgq}ah|G$2Tbd^#og%PKl_M%i9Z=_iU0 z6%D3YL_)U3qpGsXNHCjXW5uZ0J@gc7HjQ{9FC_)>nvnyvX@DE4^VI5%DWmgs?rv`G zW2jh|-yknfPwmqKv|6pE0ACogcS!e3NXtefOpFc=>+cmdC?O|d#PZ1rgTlOqm!M$N za*zI#`g_Pv{9|wJpfIhMmv`tuZ#YW2%brxJ!e6#M+}}=en~=J$DD!~ngobWs4a_by zO3ojnX3=i-uy(B~Ni)=yl-3#2_|4vR2ZfIZdU<<$hXmot>!A%;t zc6yqF`G16r*yVjthMoTt`ixc^#JqyEh!d3OpHk~w1!*LRBHrLKBGUYjok7{+iYbn! zo0AV-DX`a=YXHoFH)*x%7F*d-viUGevKK0(TN4Wta@_5;u3^638&nyF(z-b9<|oE5 zgGMhocNkRrQI{t>ZYl7PigRX+n-dZ4?xNQDM9dgHT5XI-FW&nk;S|1-KFo{K3oO+Ypgco@o||fLny90XGlvk zoU5xt(P)&B27+mV>P6P%;K1YDhnw>g+7 zy=`!4;1G|Hsrn4V-0@lI%V*T3rxh{#(zNut*=l|XV}dba?t>B%&<}U{uq`4jz0emU zfbBm4@ljR;3Pd(hxZ*4G~Q)Mk(0r2#b;rDWtXA z2UM*XLvPxmBEN4j&pAkP#;~M+b(41PQI?FdVdsZYTx5ZwTJuYr`-fz47@V z93~4b2D$j1^Bu1_z1# zal|uNw)rx>C7vFdAsy}d%G)?f^7f%G({u79A8)?9^IdeAyhp!=xTV36tVsi=%pS5s zqsL?piSB?kwQE}I2(<=^FVu6rTr9`JZsY`+Xc*5rA427OFI7)^QZ1frxUp};E90}X z$G@^+-$ApPZ#0|tr^Up?4A~SLGpBufNy)jQBGk5SDJ|6u&dz#u!@laJ}o;taun^rOgio%9F50xMeqA4R*`3(Ny12Q&&> z02CV1XCBrV>{AbKfYh7y-Bna1{Q&Jx-0?tjIxat|5g**<4MkG9P+7#1-ZMYENi-g` zzukaNavrnUfogEUA1zNw=5lYa7DHj%5ah}Hz^Vl2&91!)Oh!k?ieBfX-6w?%^?7rZ z`I?YcB-q#V%EdbY_Dg#0miC&2%zN%((R!GyWmkpp4=Jls9}*fmVaTC1bP%cq9qh5 zV&*CzbN+ie~=mDdrA0~j@(Ozuhb(VeoI^TU=DD>9G_I~|u z7x}t5B`Vy>pqGvh^7GXN1ie2C<>SIr?pVpg&h)BH@5o=dZhqzQ#Du}F!y|PiQ*ugA z?dPu!G6V)jvceFZ|E3~r6f-v&{vA(KAbyjq|8>%C2g_3;b_PU1NA=ZdHGNT=iefat z-!Zt@CMd`dG57K`RT`sATAH(WCkM$N-6pLV4vQz6a(y?fZEu#BGp*Tb!>SVpH|%K+ z+q0#nZgs9vOb}O3d~)`z_k#j-zJ7y*7);fA%;(T0A)%sGS6@t5d^_#an0{G)Rzz6r zWMi047p3=}J$utk?0iL={B?=s zs11oSHs$HfeS7ritD0Cc{M8Lxuk6^NX-jfsee=e!bn>$DLVTPT!lTu;ev?=*BR{_= zUmX{hnV-2#Ee%qsRKYJzpT2#^PadvMoD?pbf6|E)^Yh7HS5$N=KfnF+Qxu!S6q57$2!Pn9hvvY8*F+5K=_%5Be)^1a*TsoXEAz<#y^Tl+g*tRD?Ut}* z3t(tYU>S;RrRXSF4D#%9u~SF;+leLSTH#pS!9(94-m>}d;mw;HR+pA0CMJ%YJ!jR5 zIVFh+2_t5g`Z8V01x=JRq3NhJfrb8KZPk>gSj^uJv)G);P4t0PD@)5pBqok1D_yy& zv@{{%WnOW#qLvK>k0YB$CylO{5mE4xJ(Nz0zw{$>`=g0fYn;@P4^rGwBIXS6GykBf zeH86dj6HXLL<5+Xzuc$)`**BiYH+M04%tCZn{Ho6f2(NZCzIQnpxP>5uhTA2BlagAO(z@O?j8+EmJ=+sd|xgfiPF zu5Z)rUe-I3Q$DVw+RXj@S&O&3r>FaJ{zGQDE}(6$a9B#FN4!F)EGs$i|Gv3!?1R~*#%L$+ zlGnEXU6g)jKSW6}_jkm~%& z2ZeWd(MI1UW$~R&EkfSb~MEF~gnT0d3 zSLM4v}x1ws@CP_<>gBy_M?GcSTn;o zH6^LcpiMY%;Iee6F+aaiI;dbHcbmsl_Z*%F=0zeavm|ATRQKFQ^^j`kZ5$xX0v@OU z`arewjt)i$xXlu*S>4x)8)iTZ?s1=dj18qz8&w2kSq|+dd&QYjl?|eLG_sL*BqinM zCM9{tdb)edoGBKJDI_E+Dk!KVwfzTP1+Y_<(7{X9dFm&^j7cL$CKon`eL`Bzk44%U%%&r@6qPPo4Pl|;G&LIeQ4C7)QB^P|p zML{NbmRKJs#BEweKs}rCJ46 z4;e3LHxX*f;~^u5q>W}o5|~gg>|tXk4LU_X=nJ*g6wF`3Jns!Xjk3_NQgA<-qW4S? z3dy2c3G~ohX%7JeEt{)$O)bHgY%W!|n6YNCRvLt>hYxECqNB#NJ;Rn$&!5N7(Nh}V39f9o+BFks6ytT<&hd*>k;2}DJN*8CO zF9C4Maj3kQAoRLWjsq~sX$8`*r(oh|mLrU9i#)DTLYKuJmOA_tq*j-hV&Ku?pc zriZLYE8C1G>#!Udc%W@@j0^mp7W3uA=yJH>|_6q zgN=V5Pu1$4kPTHmSNE~))oZZrJ2s9J^2gdb?02y7cEFpCJ*?HM`{*KV-*H#v42>iF z*tnrNN?yIvHxy0og&cx-l6)~WA);GG<*sl>r~qV2M7>8lFFcbOr&Bni_0=f{i6~ZS z7h%1*%+PiTo=LWvC5(9ggYQ2C>POpZRV}2SldBglH1ghT>xcooQ9SwF%vr+|5{A#3 z`P}m2k_1R_vx+mWrSRjmLa7*KKu}P6n;%(t;&vX>SubArj^QLS@; z1NFCBsGqBGfB!2>0}GRcHy_fvq>d6*?fTznVndl)C2d}WRyMBN$o(GHM%Bur<{e5i zyS1|)>`_!}gmU5$%!ko>P)6%izeq7Bg9S!asaJU~W2|aSO6n%D5nl`nnrCPa6O+w{ z>7hP-4~HyP7lK1hT}=$q1H#)HZxY@V4v8|ASuy6zhlD|ZyY0>;BWDqpB%MW>hqjo7 zvUdUjEENCKH45^QrPvJ$Ue)xlDk|b<&lDB0fEK=S^U~+Wq&b?ikn7HMc|>hfiEkB{q&UlsQ_pualp7?jZ$j5$v}5oN|>e^hS5lq6n)^gwPOqGx3{ z0idS^$#bv9SCzPA>XXIoT#E%@AkT?FR88eb1 z$7V+kpTRasn*^b#Xk=vOgvj`!qNm2^ju<&|cwY7~AzD)qH*9R%dW0aBXHqI`a7gyk z%rh@DOn1sde@l<>yk-=LJLMI*XknPgDczuPdHlPlCj?IEgxedXKcs+?bSbmFtuc-l}O@7ST^%{%6?EO)Keo$pBw*Nai( zhsJvQ4CQIBeRe{9YxUD~iKkb$zkM;|i47lQWPHF+Tzu-OgLkaFP$|=q=bBTVg%GW#6^P zGRCL4&v4vFC1dHhp$`%GW~YWtScX$W)ETBB%#8j}1H|y=Q|7Dfs%Mxz59I7jM|F9& z2{klL2uyvoxtYx{ajByUsqqWA?;Und>MvE0B;j%DD*K?j%%;>qS1Kf^Nv*N-!fM4) zq_4jY>)Q{Jo{`pQpaV1y2biRKSSc}1s^&er`8D%ter?Zg6k|Nuwvj@oVR+K8njQJb z+q(Ae*4g{_&%X3Mb4Bq;{>|LQ-%&|Q%VYX0HdWo_D)QeCrrE935$ZBfgFniVFNOk>&y9XA71T`M4a(KcFTvBXAuSF?AjTCGflre{>DYcwMhDC$eovl2H7kL^zc`;Aa#cHnDhlj_j4i6g~ zVRu#K?rDx?8tImp+mUS2WSGwyP@-WoAg#mz3DD^RVnm}GOe|F9 z#XLo5tuNjZg`X|O-RF)D`eQhxJ=k;oy#1-j6qy!it0RdH5&~%M%dD{CX+g`wh_GC1 z9X=NA9Kj;c0*k3m9U)`Afiuu{VO?|aur5ezzICK=UVA^_AI2pI@zS7V2Ky>I%sv(R z1d+e5Eo67k;MJ)b-;h1EqYrk)Q)h=~akdVK5*>Z!SHFsJK zbN>0t3ze5=799i*ANboX@VB$F#^HlKAMtQVOQ#2B0C8dY*bA|QUJii_FJRM_e_3W2 zgR@i{&U9h7d8<2%;`_q+`7nMifS(Jy%^cnM86n%91-Pr0qYk$>Jyf2Eyhx!3KZo$` zbILKRX8{c1+)OK6>?ox3psRBq>jnNah`bhlFjs-|Du#chjyM>w;ts%!L9dfe;z=1bo)(WXY^ARN>blo{H0k1ONfz|`)C@=vO8^Npsw zye4CQqtV!yFN|h~_-NuY>aKhDwDN^rN~zTlY3=WXng!7=kjK#)@nTB7u3*-gH zx_yWdncYvQnk>{bDrCZ;FdF$0`P~VX4jpac^Vu59Cxsz0X_R--WK`8E4LGXK=JU-F zN988KY(vB=pD@>=X;;{f-A++^D5g&Fji`VRM_8xiAwk8|`v|-nW*yntDA~`$NRGsV zbS72aX&4FEmgdtY)9GeYk)=#9c@K(<2=2jbPXJNyfS{N<9q|+S`4BC|<{2}Z^NV0z zH5DN)dxF_2yS$m0H8RpvRw&#{<&sZH64@85@BG52!&aRS>_;WHmN#H>}=o`s*0rB(Jp(3`~O$a+V=UX)fw#$;@?BmmJgM<_YIPwt6G zFK-y*;2$D*1G*rInd(h-X))2!(djRc@$7}V?BT;yb?O;2UNks4=>o=2m_hFj8MAl( zd{y0q3F{}+<=2^6D5_GshYCV_cD$p5ua6;ZDwDz}uqcd+%f)oNzOe(e!PeHj9_#1k z9fC#dfi#D)8Tv@|EBSdZR_Eobh7O&$`puV~dg^~t3ua8oMaV!*bh;rXwr=5~H(Oh` zSG|y8ejnP$bb2iBA0Ac`HrQpkFn#jKoJkY2^byNl!$QkK2g5%9xtF_}tF?8oc7Vr# zK7HLiXg+iRU$ZCH7Da-_Ay%)zY7u%joc4`Spif$RIXFkVL`BOP31n(?L3IiA6M^27 z4-GCu@BukVl);1m+qKRCiKG_v2h{VhRD*DlPx{lS-G5TXiMV@G-Tch{UcE++Y%R$1 zm)cB|C+81+cVJHZWjn9l9pf!&b_a-b^%0GYZ zxtjdmHVy`rpLO59`HuZuhpWA99Ioc!T)Nt)N1r}8*Ke5G$Hw8OqCS24jKw)yoO8wJ z-0U29LEXIhPd^}=h`{q>yaXtpUfI3zwE ziLPSQx^Y2Fj|2~C)y4s#959GjUHqxN=>&BUq1obdj^6UJtak5>D-;fygPF-INh z7V$*pSbS)}fFY;{f;Fk=%1Ugvg11B!$rNq_DU0?l2QU{nwY!c{vzF4GWhoK=A$`HR z28X3=q*m}_XpUq30{!nGuM~HgC!sJE)z0dA0kiZx021=G^x)MnUJE}Qu0PDm>IopY zo;mX?s{cNOWU9%+kJ1;y!1f>MMGjt^5kkox*C2gC|M0`g8el06;y)hZKQfm?%;h)R zg=TkeOZVg7ZWpBd$Uo5@9xhz^LoHD|96AL4^Z(1(0ME#R$n4MlOk1`r2LMt#o|tAi zZIRlj1r54OtQuMN}3S0P7}6ig1V! zgS9rE-Rm3RdF{u)9W1?y;uU?P5(D_kfW+H3*bep<`vstkZI#<>1D2$yTRy(9a&IBf zeOeBV@VvI*Z-*{ka~$B|_Fw-+z>T~opTM8`<#u8KTNIe6DqgsG#fA3seI9=X|M-VIB{`>Z%9KAevYJKJ>r5xsRadV&VOm#h{;F~1 z2AibG{nm;t6!a9Kg)%|mx2l7dOwfYgz z=igb@8uT(hoz_}~C}&F*ZBo)mXCK{~N6Z>Xz82T4lZ%{Of7c*y zF*8HN{KG86m2V4=csy0F&#WsdOiK;+aE}cVgrHb=k3TfY)Hz|P5qf=ON>~^|gvZPb zqtNZb;Mmw;wowk;w&{{Jl<`!eToZw&k@{PG@yL;-jT;-bm-@c{e`=u3C^yfth20WN zJr5rJ;o;ZhqilVtrG!1k|E^EMhjK14@^B79sDqK@ktPy2F)?Ys`XnjLe6#W6iuN$) zgyDl_^G7e#o%x{4{9#Te!p|l+g|#nj{P;$DSn?-lyNnxYFmC*hY}^<;K&!6lsA1#9 z{@raiesb&-jfG6rUE|Fo>AJh&lD6w*M+!U9>D)U=_uG`hP-E{)hMIq!s;XIUmOH#v zIw|PSCiK+(Z^WzK-o9e(7wvx~%Zx@dQ)!8Glx3rPyYb}Cx%C^X>(Mg`0^XmRJ&10q z`NMNW-M6*%VYL4_J_q3x7HATF{+!W_)ktf>?EW~X)8xM`)jTUa%S(l~!RI>liOz9Q z=GEP4^&1oZ?!+PuIaq+(_s_JYwe{kqOMiGY#8k1r`SQcY1CjWT=G2d#OLF|Sq6Gb^ zX7D{^biPEk=Re#SO+J6SmA}o#x3ckA8y=9^zK3kBto67@wg<+HzK_~^u!DNZ$^)~W z_ss#{paD05hEetlYMk{Mk`%}nq4olAWACs70t-w^YI|yD&%kA))oqQJo`1LGpSz@5 z_Sk$fe$VH>9345}=AutNx^&aoQ`_%EQ(%&}R}gT))A-oiJSmW^3QSV1S+L{zOYMjH zj9wn3x+;CiR`FlT**SJ@KEI*ZkrbWv?i~AbV+2sF2tPc$puYa8F~UUSQ5P=?*fRd` z7>S3mMbLy3t-LWl-(q|yLle70r*I4i9RwB0zt}3ot^jFK?IQZAQTtr5YksMw=B4JH zwYH`2kPtw-MApK1zTs%bt|^U}dr_y+)jPJLza zBz}-Sw>sBc%`f?$;wN_QWRa)by6Iw$$PJ4{{NO~Q$qLnn$h>$jNie`zTzeGDp#&Jh zI|T$7+CRwGO+jkpB!#gn7(OJrf|8%5^C5*=a5wQw)m10Al`n`uPInSZG`of`T(~vC zXiP{n8ku40jZBQcGG&6ZFRH=*LS-jgw{$OG_IzbCOZ|PN;;- z>k==nUN>>#dJa$uHuB|(Px1z1;s~R0M559BdO$>WQSHk`*%1LP1EQBLi}7h`@r+rv zG{(1u-g&u}-r*m8`6Z3XJdDXEj7bk5+`y^HI^h6hGyvHXXGd$rdf}84PxlV%y<~tn zUKnkX4w;Uqyv5kOw)SfJ*iPhH%SMXtI7jsSMbGBBbN7<{Oo#p{L68# zHMke$f>6YQjB*0^GK%avK^bJeqR@{)W3cYThq10e%7^{aA5F6pnR%>982zdFD*x*6 zhoVt59+7gTsn4%I&E8&OZ$Is$ryp~4lJ@>TA=PC5d_BO}gISi4KqT<5K4QfT5wJYq z*Pnl?q&B|~I>v$y7wF(vQ3ywdB7pnKMtB(FECI} zbc*&@UsIA~Yi(80+56#5yX zRO-+{nd7G&KQ7b`O-mM>*>t{1y7Hgz{;_S#&|Y@iPj6XWIVSxdtBxOE<>6tB9i}&q z%gxKmE|ePjyXVHmg&Cj7%^&|{SorGW$Gf+sKcW^AA@Go}1}+9{Fl*vCn{Ew@VYhxqt6m(ma^>IZ8v(B5z<-wR^z~0pyT6S|!iL}1JXzjR z{DXe*^CX~xi4_xJl9N-bFb0V0z@W+A05Y7)2eJX0LSW?RGBTaQ&Ok7tfc9sRUj6TR zOLJjka(j3~!-T>5hK$U)^D;Ap(2R_E^D;8jb;+7gfZCvV{@- z-4h4=T((GMTCo7uu7pzoz0`OEBxu=BnXR;0I8!3UHe+e#2cZ*@27M^4Sv`uQ>|QRqZw z!CJFcpjcSdd^Y>q^+CfvIu+`P9~i&+n|v2H^Y*Ih_)xYyG(OHbRK2`TYB1Na4Z_uH z{H6KV2RX$dN0%=_mM)B0Dlq-=fH^4(1&phyVdNmTTmCpN!Vt(jK%q^M>l8cG!}Lm2 zezT%^g^l+<=Q|bWL)j1O6jMWD*!3R|9V`b4iSa~1e03G9yef)I00Gp5w!$}i`YcUR zUuikHy0R7mTTz`^NUCd%a}K*c|IoqfXzVAS6RC1j-{!w^b9FVEgSL8VRTZ_BD?e}l z+BRjSPfwwiZK%7A?^@b%ClPaLEwU2>5$S*kEI*yUua?|mWRX%N2D>P2mpzK2Wc4Dk zt|-_^Bh;v>84jb=G0tyG$5G+$7)(+yC*>^-YhW82dOzm0q(C-1p-ju^@{O-ZW8QpI zI!(voE4x0)FD}miM6pWcB*<1NEMXTH=N==TmMZIn&6+h=uL>boudZ3s4xC5C^Tjv+4{!k` zjy}EbzIONBQYJ&q?7-_Cti0^*y`S_Y(ZKYKvx4&<4CnuneuB^U%DuNFGTsve{<;2E zGwL?{g`bqykfKXa{F6K8pB0Smkh)yF2-{2caz#XjV~t>*QIw5;6e83h&DweSNA|D+ z1P5L=JRA(O8NC9?PdGsjWx};DzEHN`;W)S~>=g z9~MWjZ>LTHUG7xeu<@!>2*crjR}xvxVRiYPop?9@!%>bZ!3={uVVTx+NTJ>unQU+5 zH2aW>M`V+phe{Dx9{!R3UQVKs*Sd!ej23$Um{V#p==Eh=XR&`W9Y3F021rf<+%#sE zao-AHlk!kg7te%;hPt}hzS(9rv5Q;F=7tU&C%EdfvW!i~ zLStN4`qmv|_U`=y*;*9q6H?5(gbhGPMLYS|*6Wsj*mf~A92W@h=QePsI=Z>p98vbn z>(jEcBBUS34IHStVKl}BxcIHLH#QA)>({SeXnT%0nXNJcw)Chxw>xcTTDheZA2SU8 zHJJm*U?!INB!_=SV@7!?u_pjOiHz`%^l}mL-vxgTPVz9yi5JX|=9nA=CbyHVEkXE3 zY>XiyGDQfhd3nE|$CUv`GzSMiV=$tw`> zBOMwWJH&{F_6s!{(H6czxMn=s)Wp9b-o}1Rm$uqOqh>fzS#hdtYZ?B??_`NJ=#5CK z5Na3nl}G|gMjSjUkkBktECrC{B7G=u5P|^YU~E9ldL_Tzo?tY_#$-a1UTVEmDsm1B z3rAau7>Fp#l!}C?0XuhnTaY^?jiE9CQww_=L8dTz>Fo-!dZ4E#=3T`=eujMoJXzz; zva_KgE$$TMMkZFhG7Xk0mlQr5|j^; z%ZEeMvMglv#*T1eAF5`oS@S|2kXJIap7H#)F5VM3<62Ku4TaG1-RiL!momp%_lVVJ zCb7Q4O#&b$rl>?UX^OF;37DMFL*p|C&{YPstyi6r>`TXv9h*6O*3^p9BL2)g%L2da zpX>>49RP2%JcDGcO4`Y=d(hILm?PO5L&M-=Nz$PvcA9jeqm=!`xhzXnJ3e|XztU0C zgYDJYNA<8y2Uw8-2^ABiLSbW5S!PFx*8tWOc{vAyQSv6*)Y5|bm|;yf>DWY}A*M{e>c z{a?8`FKI;hTgM(U#(|iv3O|IU20ILmv7!mMX`rqb2hGEU~uPr*4 zX)wP&X!!7{zi!1|_DsTrQJF?nwJP1fZ)^?rJo><#uQ+(eQ-=|n6nm{gMWG;fx~j8j3tz*s{h3JaU=h+tW34$x5w?SA4r6KAQ(Id zejwVW9ANSVZ-=EyB-TzDEY>2Ls3bIW)d7#B84Ro^3Xv2YP{h*h;>CG9YVKT?rE&@m z9@?Re4GM9*nh-WGEJ27Zn)$(@uRnOBt!B)iFk?-DKK%M_)y3Ux*<~|A_Aj^cNX^@N zFVxD`OXJPY4oXfQRQk;aAIzLNW(*%19zj5r5#d5CY&>K)?A)VV<%-|k_5g)QRKrv@ z12hKuCs~E5gceB{Q3|_eTVjLs0p4t(PzL7TVK^r&Y$1T!-mb3p%N@J&aZjQ^1*=dn zf!j}hEi62@J^xe@@M-(F^i$@7f^pWV!OpA2m~S^C<`bJ2eH3^TD6H(6KaDM{}OhRUlEIL zMc+|=5kPGDMU#7==xQN9EnOG-vM`jt2xGSe6Eky_7-DWYZf+4nxQgLo5A-F(eL&18 zeMxkny-+%Y)AXzpFCysbe#8k2n`pg&k%t z&|ol*tLoJo@%_#`1sO}2CXRxrKwqbe(65i3P-sGJnN!FZFg25s!%+f;`b51EGzoN7 z##JiD@24jkSE29Is1Q8}nKGG3(WEcr(Ko1dGEKOm+@8+3bfrD`4mtx`ES_)ykhgNk_GMP(DBehzsC+w)*`p^bA3vTjG4D%!ILNPDaBEx@wSt#|l z!*W@^yr4W=eX*$RplDln4%UH7&E}G3)ptlP;6GR|Szgqxg#`gKz{PyM5s}TaOzMrN zkXz$Ms(O@WsFq}w@+E9}=fk{Z+1QM%?CPpL^?Xky3rIBYKd=Np2bL6E%1cg4O3urz zs#5w(X@e(X$K!sZ4aniJ^K$l+MRPPqPN9s3RY7TvqJBKG2`O{i_w5z3{KPjBmsIeL zOO}`qJpU96sFaFxtCEwBB_}_$3EQ51JeL_d_CFsnw^Sj1zd4bgt7M*4xt(pmn3GL+ zG5G5f$n>EI_y|Z~iJ03Fuy!bEh(j4oG@563ooaTVoXiTcsDgT53OAR}Dbfq{am|&3 z2iwk&%9N9tId^VGCOc#CrL~8~WCjGq#u);1ODL`#If4j&XJxUOL4k9!f`VWE;jnn_ z!-f)rxxr8}XIv)K@Mowh#53#*X&Vra{0;Mh0);8eg}!WlK{?|eAWZuAzp+j`@m)M+ zOCo8sKA0#LjT+dfG-b%9(5c|U9OXnJn7k1{0E_g&n-(oG3NJL8-Hl0!rKKxZ5=xd* zkR?-1rU6M+@upM{f1s{?uR2r8uE@%2O6>e((y=#Hiu6GL#?L zI3ZWX`{D2*9@%%sHDwv#F=L67>{s=0iR`J$-R6m-GCt4cd+ zfcs_QQJ1BoU9o0L4i;7IA+!Q3iSbT`I3F${mrFf4YGWXq5tpdnB8gck*k8scci=Bb7$I!AzMH^i0HasYu6Fc zBj34{Vz(~IQCz%0zOVR#{7-nh^Y$Iut}rcG_TGTG9tDazE33n+D&Gp?wU=EWo={y0 z8!G}sliJD~AOx(H&PeV;C@uekLg+Znnzs3r1EW48l?l~SnYlq&Cp|+CC2s2e>&t%I z&O4w<5DfZ3aH2cVbJtz!J9ZsBcn~Q(hwC445A~V$P~|=(TPiqlLCBW_>Knx~Sv*J) z+Gu}lU9>u7C=9aqVFx2fPnk0jG>&sbG(d5n5jtb;V+|8b4ve=^P_>Y*g|JyX%K!q1 zNXJWjgVwdGOJNjCt{pecD=(jC`s`;GbhWbn?1!&y&Y3i6G9Y6PZ~hAkR-R{T*-Cx^ zpExd+^tR1byOj9)+N&M*_UNIp5A-T_u$kDSw^6M&_U~c7P9?_>t$65FsI#R~hK=)cZlQa|^B_~rm_|s$_5rr`8|{0fhK45fw#WHU54$p3m0E3I=HL?AdxO1mSC3*^ zcIo=w#04!YTAq+JDZvm4t)lbS#|v_v3Dv4@n~rW@yJS*z?UcH0CtLsPjn$ReRqJ!! zc;ml*wvJMVGyQEVld5QV>%gobI_T&X8%rWIDcid0F!E1>>Guv!lgi+OfQ(V8pX8rmx+4pINP!w5Dd361LX#!eEws+SHu8tD*drSIQgS6z1T0 zSMHSE^tz&cd%k=moLr!f3=XbpCRE<%!@m12?0GsOHH73fi$B2;J6R}v@NuvXT0PWX ztr$eXa(uP$AIr-G3JPo&V5-2DbOLMjAq@FIhN62&FMg;~oB#9=6o4x!DP;@TM{L3D z($bQTKQ4!&4#+YI&@wEX16B_Gjzj%v0op3*tH8u~r~~}AX?DrSpRoE*KDlt=lTUcc zCm)y07XFU!pd2h!P{J4K35AsS$y0PG%1I_ZP}@V$#A1i&OUMIqT%v4&0unj}3p!x< zWWWVQu#1fLvOz?R^|gXiMUD;*t}ARs(QNy*F!w}#+^`Al#_WZ|;wA_)XG=N;j|t1) z$vW7cf|Es#j+IV!PSU$)g?T1%V|HBp!tC}b+3|75O4(^{VyDjuvMqpg!MpT0%bwUS zo0x?nHO#b#i2)_pRib6Try|~v$ng-u%*RgfAB4A8ws2dF!Ci`O!% zAIw*CRO)R~`7w6nF16^d(THh01o=@7pA)1VHG|X$HzDW%gH*r-JQ!xb2lFS`Wb7n} zWz-QyuSR`^-zeM6CY9Y@-&DE!Y*|(&;TamY@*9RUtrlKSX73pl^F8w`+02Y<_}2VJ zVf5t#2NJZD{jVMI{(;LgY&Ji?>Wyi+{2SmIhR02~ho0W#nX%AAx1(**@1cZQ%c?idA!Fk4$7&v|U6dfQr~5`yWQC&5XM;x-?;0 zF0C<@)hp<~ndrY>G8Uy4GfvTk;K^o@P(%UT)`uYwCsL1XnIb0`n>4PhY#duDo{U)tL& zjFabj4enivd)vbn3m#1pAWb0{syb=t2Al3c7FpqI*bLudKQ>8+%)eO3xa45Jw0Cb1 z;9@V|{aH?_%3`>FRq!WNW8YJWMgJs$*56z8DqWXx`u^mCWQ`MG7zP}@znMnRZs;40Du6> zv&NT0Fc-rA%`bU~2&T($A4oU=qC5Xpc-s?a_>ZyKvB8J_^MyyGw5d9OY9HWc&i9Uq znS_tY``H%s6V)%Z@{4Bp^9LIdtsShfXV4zv@8B;oKTH%CHP&4;!>$pH*;J*iK zl683{_~ylWR#VDr?x3#=k7O45rljs1^SED8R%0OxzhlK~N?G**q@cE}X114j)sgl6 z7cAVodEtWo>yPlYt#zwec!n!NGx@bp7S0ZY^224Bp@enh&(4lLP{S5T0*WeHCcY*{?qEsAYxGujh|-6alrX%jK_GLD}e>&>hQhSgsl zag4DwUicyC*+=c~havRGKNpN7hC5nq?FTh9LTx>e5jRFRkdhr9MX>AgE4le9A>c$JNM55HN&Vt=r;-@tc;vOV7#D;6%SFrH`oLiw%@ z_O?H;*dl&Ya`to&3heLh?j8^j$5tXTfn2Zw0q*XaFz#q;%dU1f_IB@mkS8<4!gK(O z2B$CN``O`xIJtkz*wN02?ExhHpAU5Dj-1X?(Ufx znS<{@e+Gd6+F&ioUVoVbqxT#L z;v5Dn7iT+bWhoH*?Sw3o^#cuJ@k%$ciN$7T00c~7s`D3?F6lAhsk+rG($iw+t>pZ| z`K3#jF8lf$zJqzvCs(swLY&mZmozr2H!gkdn{T+ZM4OSmYQ?6?dD^8*0ab>G-U}C& zEPa4B*-uWibq3Y(^Y?S`mjya6S)j43INC=T>KIw89jqBxw#6jEt|e?Mo12-ntIW4A zbKk}m7Ht#1d+PDg{iGxO2j(io_Zyu$iL6gq=3TzMn06bhDBQ-sOWt;6TSjJ0`t-T@ zS2lN-ie1ks+9Cfi|^6K#AsQTS3kFWowP1!dg3wF8wzXlMGZc8J|X2Q;NGL@u=M zA&sGBs5JPY%>v*^@vP^zRxA#Vt2%zX3PndA(zuY$w*O`;twNrgRU990G_F6+FC7mE zd7zyaJG(&{H`EVMU55=`_J~8O^+X+Mi~vL?nTQ4rza_d}~JLyt$bfTiNc4;+c!W!?H1_!^5*0%xw3P3bQeI(BfG|2?;sOIW=Wv zL&dqR_%MFv&fALNl6^z1puZKlJ$*4+lz*aCS=&e3`_Um2_Xt_i9{wSZeIw=Mui_i@ zie-tl4F7SI({hm&UuCW}%u0T3#j=z>QLbqNdm(%i025YOBZkT;+D5QkeV}|Nrpl_} zr;lH`^=1R#-2F!E4Z+HCD?^%NNPSZ20eac(j&WJtZz;C}3b6WZtR8HXgcOcGy?+|X zyqqQygO6OV^Y1qIXelX=Mqrp zfC(%o&jHDkx|#?1?X1%xNvBN*U?C=zkN0F)b(;!|! zT(_2a7vIi0|26-SpS;SPK~LZHAJ?PwE1%LlDLyVPeiEO;w(%(%L(7-^Jxr$^+m7+8 z!bN_4@tBl*si1Yz8Drd2#stGn!TZr%ME4^#Mh*ca;Q(_>sRr#I;UdpLc^4)}Sag(z zBFayiNPjkAQy8qTdUk$Na&prAXPN7>^F}7Ao7Kjr|GJA;{B@^s>eQ(_{;CdFKFstc zo0i_j+#PRy()iYnT%&R7&Nu%nKfmp(FBdIZwD9cLzurFk<)X#1efDRpfq!BqS!2xn zWo;J*QvsluAO;+Uwh-dTV5Q0m!MQ;|*Ryg^N296>v)#KlN3UNWr7zr2D4uTGwgb_U zPw(8;^xuE`+vBHCKhB=nz}Bbm-K*8#N>>Euw!VV1bVV#rMaeDwhQdN&2`Jn7N#l;~ zQ;k*C-=04GEps=2+ddCS_B6lA9&#^zak9VU_fbe8bq@*ikFZl)|LP>JSrt+)Z#_Vr=lV`8EL~vA=^<3S?wxx zK}64>-znZ3)n1f-?kmW+UxF-$DQ)OJO(5?OI;IP1*0>;5p{4%NjKb6P2YJ@P`qPCo z4%N53`TPsyPkZ5cmeF~{tyoAtKQ%$yL}jBBKipZGI`D`S|?7^IZQkJQe&fCR3URV z)s>V`(p|B;tFvuSYmL35o4c!P-`=inY<)(CE~vC_(;R<3W7Eu>M7>)-8SskUQji6Mg(^tE$w z@^Eu>P+Rx3adGMA-`|bzdiI6t(q46?#as9JYGcA-cR zCE2TD%#}#CK>ccsyP<3qKU%qJYzCr;&NE#T;(;$X!SAT5ML;k@g;nD+o~W#>3uN!` z3rG1k%Qm`LY;Mq zLr2-fJd+7P~Qif7C`derQE;smQXae|kgI5Dm8M7-c} z;)JyGM4?~&i4#FHSAB%b-KGmZ&Ockn298c`PEAP}eY#fs>BP|!13Yz7{ILbXUr)&2 zH#?ccpN`=j`O9sGP4Ry0_6dxaO;?}vm2+8%GgIwKIYyUy!oucAQdjyy)=%Z_kpYkq zwTQ9F(~?F6U1XpjF9T#0`9wO?nvmO$g%P3IHM0GK1B;iK-(NVB1+JEgr;bhm!0*~o z$--lU!=FSQfPb+8X{8O)rxdtiPGAH0zdkAz(>{G%!j{DUm0tSMM;|#&U-Ciw;w1;( zH;?4!o@WD+M@`FHyEbpysAP6w-jnYO!#^rbr|W$55k04u-hRGe?%ambG>AF_*mBIx z&Uzz#VUP5I$Dwnqi51<`LKxzR1C@?+ouf!t?|`K24_`pea~C(;Oy#xu#g1I;O}R#y=g0~1eFHtH7&y%gdMI`ec;)0Qp z18K=JYgx2fU*rVJ(h6bT%96b4dXd4;BWGk#(zFvfW=LN;?|I}dVwznI8e3j>#lfvPX9U=dxJ`k<@ zyCu8zm!G8Mg3+T3ws-FpS%m*7}=0)^}Op~`&SLmXZc$YpG_2DVn19=7e-ue5fclM!*K*7Fu|IVDxX@%r{?dA*o zWL+Jr--sfzQ9E{J@7|rgYe(je9W2M|EOY&0@4E&0`33Lp<9YkuEhsqXHAOnSPe^9^ zZ!Xkr+EjPp8^}wpJ9lR8+&OXg?uk2hD!j5&4x@M*s##>e%Mn}=cMdX z=8Zy!lcGKO!CObSBtxc)Qfmsg#J-CxUWGoHr4fP19HIy)O?gc3Jux{6iIZ{+hQEzS z$c%nf3g02s?~d@%>3qY*>ac(Sm9KBP`G(lrr0?<8sInVd(6wDs!@(k;?rwo*I`#oVgvZR0Y3Pbfl>11Bc}(;orjO`_W@JrWr2f}C z(x!JJGXn#n#7`pw0yDW^Z2YG~jOvj|##y6Bmpommo;vhnR8ur%4r#kE#2-IHG`>SJ zJH|!EzLP$8#?*unnVHLth0kW}?#}nUA;pZeGJqC}P=(16+q)$}MMq%NvL_pK$YW<= zue2MXH~pydz-N@wkR%C;#A%~kJOz#T8lQ9UKSi;@`9TT7^r<$g#1SRt;i~3HL)!I& z=Isd~ihC|JMD^B&88ap)&NNP*nV3^FZqoy5$Tybi6KTy(B)$wrs1ev4*ahxkjz)tNzQi-d_LJt1$QJ z|2xkeVDKyJegD7=ckayGd(L^D=RD{8RACi)!kRS%IcZ}+zh1@&A1&PKvgBk8^FqZ8 zjZcKp$x+5sgEgOm+A-Rq06Hb7p_e<+3YJW4{E!BmQ85aywGrCUaQ&fN(ifLU#w?s$ z%65##_LqM7A0tQNmHDrA+h7PobDuEj&&v)R*d<+!_Z-mXHL0|8QgiWC?S48qTPp8j zJ4*8xj*Pi{8A|$R{CXVEes1oSAP1*>`&)& zO>~|{A&B*jvb*}jPwWm|MA^~t{R&);*FNCNZEGn+3~+CkAQSnos?3=9$IJPrOF?kX3hrPXZt-GX(>5%Uje z#l>mT*0iADM#){d#y0N0mXPOOnSJTfzH9M?o|X9*SMA?YJ!MKTOKlG<$XHOUZANrM z%a&`qD<;n!GBUfe`g8N!Tduvac2eP>*tvLxjY#f**BM#`$-zQ`q)G#62=4DuI5>LlU@uRlSIo#MpJ$GY(OhFQ zy}kJ@eB#H?hxGSAv7%U<26fYa^avj8!N0}#PkVX|o*O;5(4&8Fetu@m$dNIb3}J2{ zX@|`P76#Eg-cFQ!Kw49-S!7qyXX1e8hrkm7mrlLN`UV9gkP-O>6`w@FJ2o=Rd+Z#YjL(#k`U`OgfM-G)kXvawBW zHDgi7(G0hx15j*`G0$k3w0k9KXrmMt__x9jZG%-+6TNGATxS{ zH`_S5lKD)H5OYQ5J>s({3mml)V1|I1ON+cZE%=G*7BLtz-wSkgF&GlG0}mD5_1F2E z-KG6;=8Mc--gNlAM(JW+t6w~u#WUHHMRnsRJPWhqYudPXdj|v#ZToDjA^hD1x)%N; z>-Rc82>!F{-FFo~P4xJ@_xP^&>RM7JPE2X31OE1~zfFYwZ5d1_Y8*V(K^OvS0+dB` zTP1-6V}UIdjwhWfj)^3+JSgQ05qw@U$Yx2QhkK;|k-FN11W2AWwcEyw*;aeRM42xp)B5-^ znm@OVONN(ZH#?eyXwA)HQV=^xHo6m<50S`)O<6%*pP1d~wy( z4g%aZ>od{|`8Qf=My>bU|BTN7=F$d^R>VZD27VK$3%`mgi#R}sjmAzo5i7vj0Y^%N zkg8OF99i_+EwO|v3gDm|jt&jF$;yNQzURx7G{KtV(*uIyVuK-LjqE(seqhdyO;JKp zOQV9a3k#)l@(v}q&>_li)TFd1>3q~(tFJL%Gi;sO(DYHGgDf(Z)uA#|-X4WIHbW+j z)DP={NKSK(GUVC$$aIL3{vMTxHus!XopOU$u zeDTiv8`wwu?-3FBWXi-5e4X6DhD0oypiG=NTpk`2Fmfc?p~sBKu!^be4wxtlDpttB z?c^7$r(-b0tNWmqQOgQz6Sd-Lof4OE5{h^GciFMH)PR7P=!~F%=#C>z;{7O@Pw|UV zJqu}FzLsB>4zYlZ9SDABxj;;8sx~%t}G*XuraP=Ht}=?fKYl>j#;vCfIMDm+k%lBpCkh%ueB5pwQz7uh0KwdN}Dj zOcbvF3-p+M=~7KgOUgbfWPTiqe}-of7*@SK5H*KAbXmr?)T% zVRwBbQ93+~ZH12@1_bU7SK|pHgMjB1_yNPAMRrzIgT2m@&Wyc_&4ZG+V^tRU1mp8FECXZ}BYA{oIpz^uqN;I72i8sw zSqK>z8Z92^v(eiZ4@M6d6Xfu)-nO9`(byB)I3k$SF{hCqK@Y05K@V*mV)L{=H%AYj z+-9KaJDM}8r93Yur#UBw%V^OycdnE>cP^KuT&0d9gI`^H?XVF<(3Tzm69(@7Uz+|8 zhKpdahK-Ij5*o+d4_(vToE-I!f1=%LKGzAE@b~k#F`ff3vYj*ogldgVOeaA*JPA!n z)hQlAL7fBts%#%CDZ681I}0H_Z@yTao}Q){Q2?qegY99_`~*Fuo>b`pT`Ui>sFHnb zX^po0d`wK5ayu=pYRg-1zlca6&8@UD6zI)8pO>fngvP7|1yV^t0nIKQ(9VzlJwvSnFIG}9Zg5&=hT!JH}Bv7!o%id zJN??>yAP^IQBQ@`3aY$WZTvx#P%3f?Q(?7&Y@qb5^(-u!p~9%rs}A!o6#S%}R$*lQ zfX<4MRAr7|LpLp!D`E|rY1Ot$k3m1y#GBP{10rKIiaMsIR95c)T?ZL4|8h}OB{#PT zWs!69^Tix&hxwt9{xU5e0O>E&^nPduO5Zi*XXobSX5*PRFL=70w4|T?3|U><8K6PJ3EmfU=Fzu z^r+`)^w3@^4=PU@cX?bA3R$>~FZb~s>1IH{u{O6JU!t!jYHZ@Od3{ngqpmBrhLVEAS z>jCTl(+X_$*W*SwS>uOeIYTOcEDZMpHT4e_CHI?u5j*%2`8KSJFsuu;qEUN)Iq1;X zYq8^^JU}~lR&&5CERK}u2kdX!zBMgZYp&w2rRJ+vJKGuH(EIq8Q^27k)1oQ<5-d83 zpQ4B4pxma%t=g+!)qK@L&n-G1!KHuLPfU6%`_T$*@v zJM6>2`5pwZ?W5KQS=`71@F0-Eu5S=%)}RWImxEnf5P1;T10{a0AU99_yYB4-7;RuVO>{KUP*GB@$No8?zi0h{oUMnM%kf5W!cFS`twb!yw~I@nqi^F zy^D6FrB7Lgci3%qt)aY}Us&X+UYBk#{FzycW~EIXzDc?CGTo8xhkr#2US$`2B7N|8 z;n1B!(b1;z`QwtDd3_{{Pb+(VS_V#H&C$G6_5XG$ORq{<$Vc@K*Mncfuz?41Az-3| zVZgf=$`GT)Fjkx^&foW-~{{o_|rI zsctKG)Kn+8HE61>Z5C7~b1=r&OGI9Z@BxulOANuQ7Y&t~eJ&#PoCpz8ED$EvwQw^U z$suU#cQ07GoNc7JZzYDX0t;N*IY-( zp3UxVxz0U%YHd6{Cwh6b)uH@UZd;uucf{lv9%?Z3?t#znG^5ek-Ju6yp*5Zd{*(=< z^cLwx*m)utC7_R>coX=F$=FN)_I6U`N0J}Rd8;xrj8X`Cwnay!vK?tr(eC{N`Cryl z>_W{hE@ft{%1oAtZja6HrJXg!H{%s=4-o;AE%rn@!3=XMofc;OSYM@ldebqS$5jA&+ZoMZ#GpU7jGR zuZtA(81%803EGSg1dQl}8D)`K9)nz6U;;n3hUwSQ%^JGabB{;APEdah83D5k?Eg2h zE}jtal-7Gl2OVjeb<8p`$!y@w(K=UM`l{+H{2>ssZ3c*FkWl#r6{&ZnM8`x0@ss@S zuFqfolENhE`5%1Fw2akR_X2^XnBubzWzne zZfD1oe0LAAo-}9ZE2&7#fgINX^H9kC@xNtFvj_x7u?UNxDqQlvW|_+&F)_*w=6K1m zr-MV!01uB}weFd7)Y3|JvC6^0#l^wF!`T_3*y_Hc^2jF;;|7)^pNO)l`zi`n>i+y}|lUDuHauq8dI%i4bsOWJlTkSAEy6SxAcCpZgYtU18LxRm}s zYO$*Fu!Rzb(42)wAtnZn5n5N)d@CC9&0R3Lf6N}ryV?hggbh(8t_wns#mwYT%L0P{ zf%VnX!5X*6iNy=^D6fshaMgQJsi|EW~pN-BN7W6Fy-C)>Qx^O_?cSw)*A*s zN?oLyG`a#5XH;sbJ^>XeM+R;-tHaF6L#jDE8-p-agR7e?iO z0%xdC1Qm3AM1g5+-d?kMKx%p6{E@NoqZUNP#TL$6J!fWC{FtX_L=F9M=njsQ7qn=Cm)18VToj}dDggpQZM?#SQs)Sdt)I6(Ob^u# zBg7zkBJEITi?KkUm={Ju)YI@Hea{x#Dn^M|e#cmKj;l^{oB1WSNN%fE|MQ>9zrVV& zs-j{wYV~yU*>~*Nt{unt35}+kLo&Z&NUJECtNd=o2);f#n>jRQXu73D@+(ixMcS{s zJ4i=D6voBIj(WDJVl9(#|B!m-piKM z=HBRS=fZl?`k|-}6sPD#aS$RTg66gEjOm#@ub(=x7kP&ZijKzU4LOYGg!>Kfe7|Uc z`Ru!kO1hndHA!qT=4YCq6xNFoP`#ifKYWfN|&| z(|m@0bJZWFHzC_|Am(J3MRJLbHkG=9wDg@1T7Ozi~PP`Y?i!q`P6FT7v5S>1#07G{lDWf;U5wMTt|p;0RBQ>o~dquoUt zRBO*N+O(Km{4IV4Ioi!Pi{e`-3&pQEq4XAw6>w7P zw&}p@P&JXlrSMCRxCkiCU`7!!s7rwLhvK6MC{wFFo00WqL-sv9e{xvkaJVb461Gke8~**VWVLu-X-*M1+$4)g5<;ubMP2!9UBz1M$4y{hVXxsGWm)q|~cr6ryrw0v0v#Mg>6ZlY;jm zz84XG*c`E4B2ty&pNBI)*)IZ|h}w)Gewxk@m2d^HDhdyj)evsvmg5C@JTY{w0Xk)N zP}G{CA%^gE>-X$gzt#{wWaz(nc1+Oepco~j30hLAbCV`#fdgqQ^ySXMC)hvRtvje?6 z!sNg2uIZVcv8tl%xzW3!OnqfqwMxm%jtKMc3e48z*X*uZwaWBWY{2f(&y`iI%0Paf zjV)+18?;%Ch&3m~mxe;Z$g(NI9_;K&k^~m8wj*BLw*zy;uD6o|Y)Peox9C%8O;kt3 zs?j7u^#s3m;!(9dBf_JJ8+0KT;{xj@W)S2-E>UeeJvs=ajZ{Aq88K6(?Ms7$w!OCJ z;5!Q!HP@Atm`r{94Ua53{q(RXmUa*ILLPj-u$tkdTc;b(ZP3E;-pl)e)Hyc7ao4{$h zfLG(6d%j||ASdSRZJuN6peq)6U?J4q!xohF(}7Fu1_lZ~2FiHSuELM51G zzR?7X5Tcweoc1cjVJ!?d^z4+LW?o8(x?{j2i{B zl=46(hg3~b`J{D_H6R^x8vCjvnC1|1~agt#QYGc zV^-~JNZV0^Xe|o^X#}td14VEdF+V^C?IV#_O3OifIo8kAv3 zzC(0<1X|uw0ZkOB=*3ztUX*S4)pN;bx|O$W-NhoaX2iy{Tx=<5kt26?>sC;}lk=tX zEiEmnpAQUd$tq_pHT-Do$fwOU>;pblYAI4`*c$VzFSD^NQdLWf@-O1YI-4ng>n*@# z5E&s;;nToMrvO7(qAc01bfnf_w>t7g%wi9QXrRt4AJuf!?f`VcOH5F5aQKp?nGV!k z5h2Q90jRGi=v!wSU`$LOj~d)Q>2aQ;ykb-R{PO+$d5!A;KlehZF1Jc5+LWE`=Vwj^ z5A*a)M@2CAU0{eF?r=@9i$PJ41){0~M~r|_hLf!UQNvJQMcXqmoDY&dGmiJuhbw_{ zP@<2cqfeswf|Le?{PYI1_N;?jzA`;$_UsommyF&%=7AV#Z~{?%u0Q|8y+35cn2bo0 zHSotji5wh+Vn~5O{oPq@R3Nd0K&UHLdp5}g&^BrFB(DJNYKY#XoT?&QBvf$&uSYMI zD1=Q9zk5=9vURxJk4@okDNPdTb+kXKd%s#E*#%=Ef^^hQAklgrf>Ts<7cfcy6d>NYqA6(y^6n{uo9Ajznr~2< zXDLcKrJX_!hW{^cw&E6WS{wNR=(paOmtSID+LI1VO<1r9C}JJ!M2+hfn=GsiW7MU7@Z6xp$}N-n!lzRiypf z;?^kbsk=?ruZuZH!AzPnz{Z*4Yw6pxQCQ+vT|ptLZ-Z6biv$<&+}_9#!7%%2(EY`H z%6@7_N%`T7j8#!luKJKNrLHtJwNxXOram+OPP4|tlZBzI+qC>isfSmtoSLq6n;DQICSi)y28Y zZ)s4edChbb++GtE<>o(hg|Z38X&9(Aeeu5_@6H}g6Z1!GksiPgi%>Ps88Si z?%v)W1N!w@%+Ibq$ZoCHM7Dl|Q2*n)4XOG0sm6%pw!PyD3&&})aMHd1K<@z_9s|6+ zJls*0W9aI4*te@O_F5~Ld%(MA6xFlHVNdWts3&MhN4E+fA#Yy{9N&nu5`kjWv4DJ# z$dv=Ny?djQCIC+|M#wh>WG}7SgcpV5+TKV8=o6Vg;p4$u_3r)qyC=~TpYy(EdIQ0K z9AKjf$sIuWE_-Q}l;0H%Ld?Ct5A0O#{e6A##me{F_G+@;2kqPI3iN}II!bg$ByI!i zAQ{Fw5|*%_NF%rha@y)F)my-v;A6$OdFg_Zu_wpY6%;7vQwj=FScOMo;@jgA3GzOD z`}Ubgxz*pN81a+BidjiP3O75VKl*`!iM(w7{DN)f;{_A7P7@1K!|~Gv>^luWOCE!9 z;Tx1C6APqPrsLmWIIQsK0iHm6I`;Cez!78f0{MX)oWWojfK{zTK@PG9Bd9rM4X1Je zE#J-j5-SFV$w$pusLcNe9C>b6Xpc)Hk;V}(&_pK1`>o$T6j7|-u502qtO(rV@z=uR zt^t+S*06=Z9!R|0GV{qI`&;I`Zo{vf>#X=Or}%yR1>8`zs$%Yj`E~|)b*@j~K>8i& zagGk$l{~Xk(U%x(S1_Pf(OhoyV zo$q8M4$=dJ<}ua#`85>3hkv)D($2>p zMED2rZ+?@bKM*SIxk+FD!Vo-wg)6Sd-*2G(o~!*|+$@z%T)l|ZiMdO=4f?(it2Ty- z1?mj@J1N$rOgdqf;}DvUvx^+sOa)eVoUU87`l;l)HpFe0rfSc>G&le7(^E|IMrY>D zeFZ|My`O((a-xo%Ekz@gO(~OBt*JW2@4_S0JQW_H{DLie`41arAV0l+QO!K$r~B!r z`{^mw-3rd0keR|jZQ>UX1BZlk+H_RN5p5<=((86S7@%`^Yvgl-hO1CZc>)zvzVx?8 z03@$A+nAnJAs5)Bd179)_kC-ZRYmS5NkoVyL=7*r7J$Hs(WYMsoe8zIN}ZJ3nn%Yn zI{&tXQv5jmXRj#RG-sQnIcLw_tvTC_>@ZsAP%TKhMV^EUY>xgS3Z~N?hgn5>C!<>R zgJ40!O~{f&MiT--2n)=%@7*&U&4S|M?-npqK)xoHKbarEOv;(HCevEw3@TXEU*U$Y z80vm>G!N1lO>v{|T)(n5Gjr{YBDzMArbua`o;I9RvHvN2kbt4IJtll@1HWQtu5hS@ zzW^UpIW~n+X)5sZcKWsFSJ0ZJ>iOW<#&F9Hq}rLply?FFLCxL-6FW6)R#nw0b^<+? z;^Ivz5wB<#QJ*E&iyAAvG;8*$D(#ffai+UXpw!x#I^)c>ZBK0<>v$`)NXuX#<93C$L9~n!r)mCW}cwO25V>=c1rR5X0}@Tdi7e{|#el`8~iC!N~o8Mv|t{k1k; zJb0Ep=J5T}u-Tw1qoo#9FIayPP)h-F8A7DhCe?_LCi^hzAhw@DnkSu+=?ucCEgCNt z1R|;hFQdvW^cgZZlZHSRHhFtrm*x;V+X0>-Jv~1jYHJH4MV_0RvW?CS80yqtniF7W z*WZ0;?|w>sVm{1<^3cGTxl!cE;k60x8MsS+yI3tSxF)mYew(<4(8BoUP_qCGlw1hhdcrf7|=$|PV8 zIyl6dvSM0m`Hq<2U>J(gxhOj(3qks5pn0Y#I5rjQ^iseQ6s;6-P-1- zk}gndGdy8#wbyl}da1FZo<4z1N&?xnRL{F_PbU{A#9?E5QTH0MloMtu&$nzsmbV0k zs$zuVnU18xlkkPf(3Ctrf6|yZH;0=1^tf2}o=QG{;jBYm(ejdAS%pjHDz&SpyWQkli_o=6b4oM#5 zKd&ZuFly(+Zj=W9ZjaJcJKy={uXjHD{=+}UuQ~V!2}Nb!*n8r8{>Fdtn-w$g=KuNl z?niD9zN{C!I{PL5mghZg=3i@Nguvbf1Flq{x%?@rz>gS%6mL$Fj-?nD(23thyX zOKONvUe#BSFDVS#NL*hWgH0IxY#qP5^WArB?<**6y7iUM@(Z-d)t3qiwr)L_m)CYB z*vBs^Bm~ugH0upGH2L`?>Ti(P_7olY`pilcJi-h+!8!PY{Gt7!Y!CC)Vth~qf(qY?ffG`M-iZ2zsMX$! zMvr1vsV9UjDp_LKBlH;8fv7x0$IKGZP3PLRbMXQ6@N{Q({FIy91-C@EXBYSG?$B`h zuYat#^JM-0`jouH!nhQ(jgnTR%PS~vZLG=OoxNllK6t^+ZNxfu?)0XV#BoEiJcEZs zOdAo?*DW|}r1wDWxq_TOsh^oW!p_CjmDxo{R+xBwef`fiiKdj2-13ZUjm@2cyR`-7 zEbX~JmDlEto}>aWVy1a_)oCA}*sP&_`o@l$8ZjiuBWuXmF(SsKoxdXn;sHDp#<;HA zZ`*Du`d(fL3+F}=lT7;s42r0EO1%z4L|6ATTo-#4@idaVoM=9PT9^(-2t7nbT1yC( zAl<{3D!cb!sCbS!BVvo3(9#BjK(1|CAmW^OSMIj=+O<7}J~_Bt-K=k;qSdy+D#xOh@ZaqFARcj+_Z4Z+cdDfT`-VPOOEyN@$PrVQ|iPVMK; zd@de5R8Ux0aOmK?dCHnD1pI(3H*KSmKY}?eu#bBBIUM6V0E5D zY7W?6yWUN^JZUJ_uTj*lLEhbfViROvx?7rTj70H^h9E=VzCo-wps$--pFk-%$c_Hv zwR>MfkWv!Z$IY#8KtNv?mp*}XOwTx$MSE7|ye6|Cx%F0Z0V-i=os*45UWqTc2a&BR zNV+zd3|E6YUk4fZMriqi`nbEh1q8YE<&}N=3<|`D+=2q!V7C`}Wh!kbUz@tEkAzKX zvZxZRn$|4R3j|a|Hi)Wp*dQ$8qac@&Tw%UmVwDJ?(n3T!t-XgL_fm-ZJE~OCtygKJ zTiEeqEA6Rq4RHQIb zfR`%k(!&?tRl!^-F;8q}V6dSgCP8=|on5l?n`3m9{xL}SK(n_d1-Z-gq;S6&lYI2?}sh7c`j8Qo!kD|yXcSJ+)O9XFHXuue?EGx z)Lp77tzTHRaN)-1>PxFGamVDKA-?*7o`#{xz_}fNT1P#g6Sij=4@H#YFm#R{4?Y59 zC|lhZ><^9^QCJw8g%`vMYjRL_ws5a^l7UFz1tF6*7>g=x+xG?B5zjC7}aG>`M?Ud_9 zLlV3Ph7?^FKdlFD+(-y0xgouET{>_DKdo;S;R_+!DIu|l2yM4dbdE7q0iu-=1x`to zCxD&6=y4Hh&sRnag%GYDV$)ze|6Gjbr=XZ~JWmWS#@0XPocPi1I@fBGt%<2=Z9=bG zcMsjH2U`|k>QJL4(6}ByZK0MSo^zJE**7({4Q+z|R724Oe9j}x4OVrP?L~}}N`olG zQzm1ElLU>e5S){g0ji(O$e|=GW27|FAu(28fp6!O?l9u0a~d2othb*&6eZJ{AHUpa zyQ7hE#gdEfWH-_Y?2mFcww{;LgHp$IN$az7GsetJ&zd>;u<37toZIL%$I-BI4sK6zwz$%Mol$ek~1f7eeoO5mlYP4J^x1W`n)-O zkdJS=udkJp@rm6Kqn2?1?#GJqu`^Lw8r#by#n) zsemAlIr88UD4XBg&)YVf@#bvHEI=>~t1~xY3PA5UcMfm-^7t!;rk;M%j?_dW%>=|Z z!~`|vs52o(-<;Eo3XpRcf81HHta@Rn#Er(a`dY7Y>v#Y= z5n*QIB&IJ6c&d)u$%D|$z*ldJK)#43?T%KPP=l1GK^aC=l?cr!EtL-ho#MAk%lMr} zW2@$q*4a&lq0o7^;q9TKq69+v+MZ($je$S@82CQ_zsoSUI_({#Z&PgxtGnwFj;^&u zMVfozAWx?S0!_C@2v4QV;Z)GAR$gNTPKKtr0|-9oeYz=B>UGOB%d7zc8_=8uBg2@g zz4P4g0y4fxG9)go25ggE191#}*JfVBKwMcn;|2_I@Mr&{Xy#f$3E`+wD`^7!wFC3BmM_oBSD#zm z{>f}#+pr;dq9%d;prBpqj-^MI*DhLAyZp$~onI;D@%iIrd7w{3q@S-9{8U?g1mJ%p zbiF!p>O2x=G)yCElCbe%Fm}Z%Cdizpy}D$!wEa=gX_2UU4)`-< z+fRUjH=qVH)*2jrppywp6h>6d@~5#ChAJ;VN~MwwZG1oLySHFgb7^XGdTCQ>I_7k< z#;)7XHqE(vS>OGB((P=Tz}f0^Yi@$oy=XVUy%71NrbweIVdoLFaI$jhoT-4m#;)y7 zms`v#Xw8?Sx@jZ=;%Ag#vA&Dq;K#UG8arxzGuDY@H9slJR;4s4nO$cniKX|=QuL+Q z86GfITMuXuKV_vmdxG)Mv`?$ z!;vm@5Oo>5tXfOfv0wvMlt4W|D7*%myudH7;ZK|uQQI^{_eR*}uRs4Nf^W~QS zNzg>COXLZu>z;A921=z0{GANL`5}elFa4Wq9%Uo(s`6A z+I0TXri&M~_OsGThDS}AHET)~Y|&F@wQl@azQ%h=N6jgyP;~zDO`qfMJi$VIO@+k= zGVbUOXgUW-%tu=KsHIE4U|_vu2<|>)4@4n>;Pb2K%$9L+>mUgp8)2=BmF=M4NKCe1y+?+Y%lB%_KfW0Jb z7M>CCHmkLK*_*$6WAD7#>Oy0DK1y`f>3##Ym zu+X<7 zl5|$1Rkn%!`)A}AXhT6wTWHOF01p->`RcV@prNzK`WKEia)+j!f<7?1O4Ma0_-&PXlJ97S#b#ha~ZBZ5g85+xOzBZmEec)6-H)k$1p!4 z9EOZ8s8&NS5$oU$aZ(uMyxI@omVk273$<&>GKp9k5pSgnjtmG$TQDdf_0-pFSL>`O z|A4fj0RL2N3Ug^lNhv8wNkN3nq$P_dr8E>KldC=3DGt#mNURq~Z|^)n|=Oav|Sv+}tpIx*X4EY}&-eZsNfY!*9(07(Xrb zi-+&-w;~9iegZ#6*)G2c!|D73{=u#H+woh2@f$1F1=SP@Aj=}DLG;^hEwcz#?PFa%Xu}JQ#a5iuwEdFVqJF_#J23a?I0S+sCs%F&|3&v|wG@6YYH!5%X4;mh&N3e0!@In6a z@N4&+ILWJd=(Ce2O`7~{Q7S#N_>GyFa`c1(z8OfvkMi@qbM}8aV}J8d{-y!6_7khT z(HrY74txijm1R*u-^be4Yw=L!Vls1+SHQ`Y(a@k6H~MRnZ`6CB4+f9?0>1W=R5_50 z6+Q^ZarcnkTf4S`Rjyi9VZMcSrlSAuzK{fF>g(^iA}VG5h9jQ{&3am)vMR7Ud=a5p1g43o=I4C`((c{ENj33rLcEOAO3oR z^3wFs(1TlRf4`!vbZVodL-T-EnxC)(TXYnvEo(%^8(F?56Q*S02J8azt`5vcU}z6R zj?iFKZ)ZD&w1jx^zO>Xu#b`^s$gh(G<&VNvc4prxh1_|xmrv}-dHKsT)6>|-c9O9& zl@wC9ePA<__AFdDdGc{9s{HHW1Tg=b-IA)gb6ncg%oX|bMvjCx>US0*YC4ExXM;pc z+n;swkWu6gYZrCV8VhS?KKK)C9Ru~q3>5Y}^q%&NKz?sTZ=}L_8$klUa8+sZ!}$A! zyC9QMi;~w!q}AE_`pGDM?E;a=+18I4q3R)d7E+O)9uo=~GWTBC*7)(q&F4PiX&;?y z{`lhyO-I;?BTZa>Zi?Qia$jn3pR~ODFwM8A)BA_Kx1z`R zwlN0{_G5EukG5L@&L3TWeYxGRF+F_`p6HSO%Eq5|v%b@p zWc;JPVfy^_LDJvc?F0Q1_N6}gWR8Arx0=?Lbxq`eXj-=l^G)vPDL#6dPeYM^Dd?GZPP_B$eJwHzD@YwbN_)@FTVrS?FVKUaq2YKuh#m_n5b!c+*Z~;m1l{T9wU7rA;45%KjDZbI z5SFo_$T9fO0D`@Q%KvJ4F*dNIzP^O{mDSgmkq*l*>w5C@ys4QP#S;r|=I2?kHle=E zTty#}i^}TxB{YG#)cy%$GjC$_#1X+px|?c~>VsH)XaN>JZyRpx>1VM(!~6`UFPfl` z`wy*hhf_|88X9D%FO5zkhL-DQsC5 zdlI?N>()(Q7G}y?y#M>V%?NJ^Wc8^756jzOu!rHEM>t${^7RSP^`d6;Q%ldvMijQt zYNJP_Q#hnba|_Nr5MN39Y6t9aLjz!RRiM2NG{E+)CZe>{09jsEBv4z-3H;R*W=o9? zv*Q6^JTw33^5uuKO_9d$<6=sF02|1W}m7 z+UF2?VPQ~4R26VS;4{tlj@c#N5W{16M~ko)7*ySo3L}k4{A*1XzbPE3V66o(*jkDiO@z&`>au6^q6JmCAX<$8VlkaGc_F*+RT~ zoNs=CHNU_=e1DUwCplp5e+bKY4>jA27M)mfc-GjUK?&G5kPGqdLUqd)sq4J8?LMrx>iQXH#FI z9F~%4)zbfx`j`>VpekeMU73Fw?u1`Ydaf^P$%w;`=s|Ab5tPepecz6ocHTx)g)bxW zh=0`;A?1*i(i$tJ+=B-kIh}wLuR+HY5z3(=WPM#6A7y?-Gy=ct)rnB`i})oK0o
    #cs=iOBPCb*k_m$}f>>W+gXftdC6 zF|5EqF6z9hrk45hOSErx(3&LuP^;@uyI+wDDSTMO|Hy?yGs|kkG4wib>st|zrbk&l z#xipi;nF_z^(CG6mr}r?{iQ^DZp*{qXU4{@%4{LzE%N}!kD@E}Bks)cQ3nwQSu3*Y zFePaIsRUJLeNhOH$}tW)YvgVF3QeyJlY>@D8DBCU}E zfYkA%xCSW??S;u$B8M_K(q+Rr;_K(g=6g<)*L=2#&(>(#%(Ah$G+n8s(^4L~cqz3K ziqT;H*aYI9uZes1e!v~YeWiNjgd*7ahFrx?-GC3Ao;9x_YLFefR>)r>$T$` zq#Oet@Hq8QhR;Sbgem+a7BcwX;C{2eG>ufXINza6ox&~~v z0Ec0S74xx)?ZkoZLv}ADgNlNY;2tnfh@fyp0jMX@<_E5WFxrPeRBXVs;i@ffs1FQS z@;++tas-hf#Cciqk>tWcIrLa^q_N@Hu?Ayg^0A~yqcKtwd92~+u?BfBol81~Mmom| zlN!bsA_OEWOF5sJsU}59!3YOYVYbwla>F>oB!g5L%zIJVwKIU1%H8W$V zl&9=yOafa}(x9kSB35*Cx~4g!6o+Os0K*SUzJ1%DTD8$b4o81fOb`A^>A_N-mp&r8 zbSkUGu~Pe7DN8AR?lwPsn{7jJs)MDan1kiWD=bHxy+8K25mbpqOE;waM~hNw<12J) z(oacpp)xzPi6eiHlynM!gbZT=Q)F=qfN>OPN(u~-Q$}UF^bJVp%`ftK-Qq`2omSCv zca^`x%u%TJGgCsq`gFvP9~&K4!SxggF(fv2h~_`zcBr%5p`cG%I|o~ z_7S7>20tGMLwCm=`O_;Vc#P5Ky&UM~7LxGV{Df>bx1d+%=*M^@ubw`4n@jh*M|wHv z17k*{cDL{2;M#w1#8gLnDPn}aw}V#O!&$#n@7zP9ap6Iy`u2|DC=2eKI*DGBRZHC;fWw^au$aezEGJzHjnEHthM?dwO=;=NC0>*yT;9 zO)s#~!-hrr@9Wlc&+O;h-RH-t*VQ&(C@yV^;nQ@8JG{j*e0N{N^r6Uw~!`Kk^#8Cv=g}m%!b$sa9z;HiMx~mM*uD=v>s#wZ0wtx}Gc$O#V{mhL@!+`TB)K!+}ZN)s3X z)Vg)DbuvaEy`r~PMANA~X;GwxG!v;OX1OQ`H3D7Om>h;)9AUi<@4c0k&8|prZLD42 z@FD+h{f0jp48PxAcldDKc9yfFE+Z4~9r}UqGB0Y@eo)Fk40k(xwtp4>=W*07cKq;< z>(-r}mI39cjyGjYn>MX(`=PxjnL!%B-}wguWh6#zF>Lr=!~pw?_%0h&YNE|o{iR+@ z2&LA#NH@_$JDsO0F6;n1$POrGyW(&PHW>N z>TnZ*Y<&vbV)%uWX#AwCJ%D0D0kE*%V9qIk(<3fDC@3ZtDHGD4rO;za^M^{aCa5hY zI;uW8`T#rP7lQ`i71E8;1Enl9Jr-SmvSMR`g4+5@27LIK1p5K@r1rcCih~nUu4vGw z*0z9`OHi@h?FPYu!c!P$J9sl9m9#rZJVL>M)@+T2NZDqlXN?9`HRe#gZCH@Re`Qa;_i52u&tekhnzH_danJz zfmyqoU4{ht`PhGZ_dIJh1~8wKqXu-BZOZOEFMYn-b%QcBz-SCGY2UZcaS0ymJ<#6N zFDTF#x*f^9798C~=0^zdBSZu?s>n|P@7`WW>2V^%8AevcANyx-XPScE(wTrLK8prU zExf5z^0fo~Ls_(R`fiP;G5=?2kb$ai)eM@d~6n@xQPU znzL;~WsjV*`3?@NdbsxC#jO4Uhu_EwPDkkf)Jck}q+2vN3-QIoqnUXhgm7#UczhPm z!><69ea8}60{fn)-3K2TD=1tLTw9V(w&m5D`H#@GNa0hRSzFd3moGCuOul90ba@#&YT)gzv%`Z$! z>B+7_7H^>ZVc}}zm59ZNkDoDYX!i7lwFQOyX3pPrdE>eBo6waqlw@^lJo^<6_}&XEqV=Ar?f?9@kyE_6ta4ndIG~9N^a-cw{~X{A&DYf8>!+ z#o#s&f9ody`pZ8x6crXOIQ}R0!G{e+MMcm4@k9P0MKI`C z;j?`GzuwrgH9Ow4d8d6`?4ppuqGJv0!-j@u3tMNWO@6WRjW=FYn;BH@d!zEj$!Ul} zINQW_Vi<%Ct}7m~zZDbe?P_`a25gvL^SP$x=HG%20yo5uicfofPfu`m@&UrqMzQK5 zh=9}tp-6;Bh$1uy#Sd3Y(e$<*f(FR8t`V-J;6kItfiQ%ri^TG^d#@vvMGc!Yd015L zpoq|Dw5T_pxDk3VxG}o%_JNJ%%jMx~}k zMP>&XLPvOqK0S2=db^~j?~IR)O&dLfwQepPemwYK==J%VTlQ{v{`n1iTQ<+XjyoJ5 zUbxw0+FV(=Svf)988Nl}JG^cxE)g?z%Fe_QbPb{j$s=md6j#JtAehq^J3&uKA()$_ zu#+qT^%vTtpA8A8>aUo|FvCJQgRK?nnOaLmm)2Il>GbJM(Sgg#cCVaQ7#&kyP*XEL zi0}UTy}IoaSLe(f9vwe=Ny#QnnrMbnywE(1Un)Js)|cjs8-Wb-C}Os<_H^k>Rq90Q*&#uVL3 zkZ}wBnItQV+MvR#rT>Eb}~G zzY>%-dFD$ci#^$9?CaX=rYt3EZu!bZi_P)w174ZDeaHILeEUt?{`~=u7!(~n$YdH6 z9R{;ryRTcN33aI(W0Qtze-N(hDN|R~v#qLPLI8$l4V7EX_QB*vg-C4leh9U6g%4Mq z1~{qqDIX~6JA0rKAm#$jBJ{~(A477xu=OB*=}uW0tK2eeT6g=f@QEHC0gcncLW6g^ zhlCV+xcfo4@oaG}V-9WAyNg+DW8-)0%XjTuk!3JuRr>5N8!J6s6FcLzu+*Ty4Q}QH zwq7M!i(_$sv627Fc1;;y=()J$rJ0k{f?gTq(f@qrvgayRuG;a!sx?y^@!IDL`yodD z-qq8m-6j+q2%2|U5Gq48n{5%&f$n32VZ{2jbF-FZ$Mp*}%&OSEePy~a z;6#9tmvOhg{f3yvM`F%Y`{3NvH5F@iuUc-(i5}EAZpllv%m>p%H)dJV`0fs2j-LF@ zHRf@1&5IUKFv;@MZCW7_vTsbFQ1`J#K-DTHVt|N5ABu>pWSeQ0c_L;604KpgRq-(~ z#F}rP8}_tXh();SWUE=C+7oQy?zgNqm;}WP!4{{^44(lb4cXB?o}Qs~c82ijkY6i; z-C4CcWA{Qf^277en%><2yea$LB z1s@L&bxwS~?S+LC8V5zsn!W0|?a@99^5%>I**tl%{3a&ColhF&|I4O(I!5&Dm6Wus zJO8h&a6{ILUAxLF2Q8fctpA``<%^ja-LdRU+|?9d?AJF?=&S1fH$YTyQ}=L3#5U+` ziSgmrdKY&h)2Ar8(Z0pKyiyaAR2!9&T%22;SKrXNXS?(F*m$IPjOXu3d6sQ$H~*?= z?9)m09#hOAQs0EnMq ze70??yxp9m$!E2S;VjQPD@o15U!ul)(lxtYuj_U0`99#Gn64YJZQnqUsS1zVJy#$Z z00D-g$EdEpzO}wyPLnd)(lqt-VEd8QEmxbXwM%83(29r#nP?|H^Fabo3*{69B- z7oU(X51l(EzI2J)DitU-?%A`q)g2Z^=0$0Q!*$zcXSbzpT3ou}cbhlu-?(JaSTJ-N z=MdQ4&jFTR(3O0U-$iRl4|oE>&%=|B9Pmo?-7$TVl3_})XkbF9h zg&1#}+29f!9C@PqxYOo?X|wp&659aobF?tYoE3&NT=X<+WNvAx#Vh9J$3!R`cJFYfxB^y#L>|R`PEaPnyI^ zj*mo$*ot>q&_TAa;n`EC+_gwQFi{^`Z4_m z|MwQY;)gxV;q|ws@?7|CzVN&fJDf#sXVP0!Z}Gg)*fH6u<*&S3!Wv0%@ifeU?ia$| z`h0ulDDOz`{`~fESLBolco#yCo(4Y>{I#ef+K+|FCCMhJFReZ=?*jGzgwtSQv#5{~rHy^_r-qd`5r^ zKfRA%`6!XfyBoRRQei7p<7T>H4f_=8M{RMDnqS5}^` ztTg|SmtHe#Q(pcHv$ssi&zin{2j8%L`}C|62qL;E)mCQbR#qZG@pkyLq z%~y~9@ZNhn@R6*{9Xp@kE*wln$ljLto$jzT!NQ@!LGl(Df=(9eT3sA!o>V(P2r@hX zP|$QUAt5pQ`1T!HS^4QT`K$8tHqEL@&&$l(v0ZwXea+oeU=kB@vl9~K9e{M_yN7=| zdbM`13e>kB93h}uldzZGRQ2vox(pX9LJ&oe$4Q;`D1&uRNffFg-L)8s%8`6KDVE(p z_c>VJl$WG}2vD~3PaVBxF1q?3i%p)6adAZp)~sHzU{oCB98giSoG3_?WJid=4cGY5 zuX*dnWI@dDj{afij?642Ju!ay{!jU*Z1AUVJs&%M%>qk@j8Q6u$&R4n(;cH6gA7hY z0jacw{D#P%hoVGbpsN3=D`JB1g6ISs5kB+aijU`x1LL^+3 z<#yOFy)bjAM%h4JPZv)FH?e^*G}u5B2shYhQGx^6Dk7H&(LVxrW`q);YP@pjf$zU( z>EC}Zr6E(0IW#sh2Y%ZedxdXaP$)NrnC3~Zugb^_;xk77p6wYuwJa-32Me0|C36nH z{U`Nne_{^#g)_2>&X%n|@~T6~^sKU}quHLoIzA&1ozBu}u9Iz5m8B@Bc94kghp)2( zYFpAV$%$zxL@x5_Xv-67C@P3}S)pb7a7^mqgoRHwb?cG8t=TF!`E^tLOtaS3RZVy* zD85drwnDSPt#Ph<0HQSKR37Y#T`m;X zAK0!il~fcGjuD_@p zF-b1UO?IuL84MOpVI1{sDe_?^#5d`3Q5xj#b)-V8yOXI4QZ%*JtmgX*< z4PPMae!Aohw%f|y>WbYknqt5o1~T?1-KInp zWH=JYyPrqT_aAF_Sa+T}t8iGKC*gXU$?ANM|(;6z6wuP8ZRU{Z5*8jUg zrqt>RP*~8&4B5<}7_9%@0}-EXwvo4!O^lyWpQ-kPu%q0BTzVB+#aP6}XV?_d>I56a zHZ+8+1_S8HmSO@Ue9>Ld#TbEt9wa%CFCQWQ!Pv3=^iF>2j1XHUggCK)8O5Mr>btl` z_-S2i!@@gG&`II;q+kb~-ROu2r_?CJvGp+;?XZR(wssmG;505Vg+1ASXjST#KIu^g z7B@nchaGv+&Q8P5JHIf6-x(NG<<47ry2QA9I6DoCibfYwr=9^p!AkC5{?XL*>BsZe z#lEh|=@xUowcy01rl#{vjh8MpHl06x`qGI%e({C&s-J!|SKOLv3{$6!Y;x`A-Y-9O z@L;E5Lk99lxACb=cH?^@(^F$Vb{;@)WjaL-^4*)`Xk7+;I{TmwwL9P6uwHTfG)z> zO8DO-^D<>6Lv|NiiO-1gwNYSUZjfFh%P}1rTA|N6vA|fE5P6`O9h=_=$q)3SP2+ha{jm(VH$jsE#iduDDGAy@k z%WeC)t+{1x>-yU*g_-03^Szf*%t!rp{|w9wckbMK&i9=2J>Tc&JHO=cTVMW-g_M*W zc#SXQdy5LUZU5%$tdz;qrlzIWBCxp-8u#z~mnBsic|%Qc3MnpNh7!uYYur@-jOhgNv^n8j`I#=PU;Y^u&_~m`n-gMHF?VR=6Ptl z&BqUDwP918(XW2jfTkxY|IJdoi>6&fdKUmp%e5q`We-&r7w37r#1Mm#NA>A(^}~D|_iW6a!$o z&JZBfU=5f#$s4Z|gE=8kav%m`D!@E>M2GL^b>6zEY&EoSA?u;y5A|K8!kVfood3wpkN4UBQ+9S8+$gMx!ZAfncH3PI_IA1&=&3Ogohmwf|SHK*mKVaYR z*l!equpgx%X7sNO1)*dVJtzcy+I=Y&ntnq3J__#YBR4WS_-o00sYh^`w$50YL;61mHOJ%`* zd*?>?-bN~vWgKz-$ZB%$u0{sp-8uB2egqOeEyn7en;2?pPx26U?sx;+aqs2(My@_8 zUHez|!NJ?iiN^Gv%gcQLx~_BsUQ&DL-kZpM;OFlWOr?khKkmkuS;Hm~3A`Q5YTAQI z2ONl$L2|JqcLAu9<~Q8V5h$B$?}WunT0X_Q+~Y~4Fgv7Z$)85u`HG`Dt8H6wRj7MIk_p6YgjdH< z*aG$~MEI~Con9XoPa!-E(4$;1YUC_&o$zt!ym=!SM`=^-2)3wDIIFWB>T0}DD5Qx| zd1K=Anvt<_;ls(uh}`INa4I5nh3hrO$oP0cjL&>*gz!=Pp)%u`gpAPOU_0X#_0dWj$Vp5KDHy|?vG@Bd@}iGiBw%Dw-?zhGe(_pa<$xrvY5 z?JMQ2hmih2a`b=QN72e~<3H+M*MHwD>eFV}r^Z6Ia74^742QJHonqu7B~ow}bXLib zprp<8KGVp<>^2PPlJ7$$r z8AuoyZf)f|UTRjgNzkd_(>MR24_1qW$v91uyI_UR7DyzPs+psTs_#skLCitTkx`8B^ES?Iv^; z{0S$^N{+ns$tQ0eDJjcHZ;soOKK02BJ9lnq$Vl&ues+4MYVYNjpZfNL-~Rr@)y6$b zE4!wouWx*T|DET4^m1w4#*^*cTVH5wm^y{8G69(OS(WAIQ(ck#{IdLv^fB3)k0p!- ze6yFQZghfvdUo8@si1=?M$a1Zp5zHqk#~21xe(GTC_unZ9+M{7;zL7UYgt&9%Su9>0VyHvx3}fosiBBZ^X=dNWFbzL#{kpp(>*qEX z;-{Iissucm&z=P$G(Gc!EQ9i^3g>M#D7MZkWVwJE%RSp{kj_!!nRgiE`>HUn`Y^A& z5JT`7?n{BWX3`V1*XS6U8c{Y><5+?{Lclpi$w}L7lnqTiQ;;dN0_lt7^p%ei=^X;e zyF+`q)EBy#S#MB~&THiK1ut}Dd1;>?>!nL8Oes%^h%hD}ujlc*7G`O@0BH~rfrEv9 z0Xnbvw!;Cl3mO};vkv2%_$VYKS{oLkddHZni-@!|cI4(%j>*W%u1H7|<_^kD5jw^f zMnvA~tUsO+za%GDm|__jp%XfiBO?mOo4ztFzAQOKS@wi}PTtIomZNaVpizA-ql1G& zL!yW-0u!K9a?r&U5f%z&7afIgac^JP#GUN0h@|=EO*Soo0b5y$vvqPDDg=0`T~nRa zi8cIaA3s{7k4|3{8#im#i(<-4$Epnz64h$wkgmQr6P?xS#18(kID|zcrmrqOe7O0~ z{OqEQn_oQB@yfzQZ1UNcVA>bIii`C~PxOe@{0No>?N*7gGN4T)>v=+VjYEtBcr&AA z>l7(S(hlj^q+;K(EHYc-Y~GLpF`n+FfjMM@?c4{!q=hCn2p6cjvu!qhcurcM|i9CX0V z&fnh-8VBt^GCtH$$b$i}nL@jj3l7p`g5WP1;%Eq9OrUKA zGn_P5vlN8vr6lX;HY6wWJauDs;hm$KW+QqpIawWjQ-9)w>cVpi7x8c*JUMxeJ~^r3 zF?~|9;l%e^)1gf%$#ZcCU_2&1RD=-#Md=}lq?q$k(MTE$I%widvg`_^KnTs$LZ=u! zkA*T7<=g+!K(;Mk(1AWO@p7fY)nUx=gb$ALaEAPm{)9C*`k>DsZQ>2&O{ zwXKO~T|*!0TLD6Xiy6$3H3?bJ)T1vdZKvP6%pa^6-n?TXm;-0>oYi{nn z+1&k%&r$YeeCotdeX72s@r8zp<)eSsb^6fnm@SfQ;>aW)H-&JwiOX-CPA$~0Tt8~6kw<97z5IR`Kyr~oW2C*xxmnv1~#)c0M4I7sj9GqvD!>jW9 zan%FjMT%g{)N*+$$ukLa$x&K9+Tl!8*AlQmU3*vRgsNpu zfquMxJ`3daW3%}2OBO>ygX8?vY8%^O&Q3WA@lM>}=<1p@#4)(7i^adsQ`99H6{BKy z$Bd#tCE|n6n0u;YVBT;5zsIzbl)6CFB7l_VC?I%33Oa%?V~wSP_(e&=6Qz7PCo+Ih zt{GDK$(E^l`>CgPjv2!)yg7Dk?VCGlVSyX5+OU1c#fv+hyLeF;OMv`hS)oJEbVS0^%fx^*6IiLiwC#NDD4d|$$EC`+*E|pP0uOFnK3J8I%`Zxo$JW= zAfG)Zde_2*Q_=P3K!S(%v+u^pn@lSjVj9vtM(FR?#%4jIzPgPE6mP_Vm3 z93LICBPM!bD~jq7Nr*HUK56_aF@AaA5QMM^KP*DW&}avHNlP~)1fghK^o;5SfaA-8 zEb%^RM|r?FvKVC|cS}y)agoh34QK7xv2X5JJp$ud+dF(2tF*ZITu>yU2?C=R{Cq%J zQMH)BE_+;T8_)mU)b+uRUDJM>$wLmY3)jAXr?u(O!6S#8mAY!aB`UP_q80zPqWZOG z*$17LmYqEQm7`BA(q>IBMQ*AWZ>_$ke}kdt`v6%8wn4dnX0#CR>6;YiBlTF4)}>CG zL9Md!Hgyw&jFAuQpRp`Pxcwq^)MclIW`y|0n*+MJQ|fx({AH|qh}2n2&v_YRc+K>j zSu-%u(|HX>dFr!SC8`VPv9e(ob$CL1V)$^w>3jOR+e8DwP|X`7f~eCsQar*EF~*;F z4j$aek-YB_6y(vaNzN=rIK0$zQE?l*m4Ua4uxfgv*LL1^;FU^=A7LDwuu~E2k7JDJ zEn~kbZl70{cK2RV#=G;K9nPaiRy`M`x$ZL5)=iVW{`eQ=MvKK}!DF4HWSe|9KfJNd zPCG10Gt_%MQf2}Z?cL-1K2R2!xdvKTVNbn#fB5?P@9ur~9xoX!`Y&{AyEINIXzy{f zmk>#O2`k0U1Q!ELc1gg8!5RKd?6i_>k5pb8UtnIsl40h=QhE=v&V#FJKhKI!sLkr- zBFc&)*)1y}UK#TF=Z9O4_Xemg9&cgqs*4RB2YXl7zFr4V&R z^Ux%1WTbYISvrE^a18-6nCf}-%Nv@YLK6OLB=Oc^mE+D0VS0eDvQP$Xd&4-=OG z_Y}|CT3OpGS7lDtg$N}fI;Ao-bCtQHo4q#H$=ur2LCXuZ_HNeZj_P8op>{k%>D|8d zfbltgE>x!rJ;q*V+JoC(a96S(dpBdEmD1YHXJNIWTZ~>&>f>guv>IRwRs+d{EGbdg zZV@d>bDi1+?YQ1skNAMn_43RZ;*B6@qodZj6&<4-^7x9V6A`iG@ejpvaoO z+0w<`AMp4ZH@EKW__)7r-I7yki4=*y8~DogXIAa zx4*pc#z$joxB~!Q2lR`uvq)d1&Y&0)A~4W1Nk#|SF#;Q;d_K9;;-%>NhW5|+XDsBi z{ZFikX4NcT0oUl}%g0EM#qG@y}+>dR{6m21Eclqp7%e|2LOV z^;z0iZfC(RS_9lfvaturI4P)`3q=;h!~OuH2vfrzDygCNu-M=oB|``JdLd03HeoYw zDvARc2=PxY-CH&>7uLdDwruHcJRZi5&G;Qp9bMW~Fx&9;ZdN=zDQWn%F+=q$c`vWt z9W`c5)MOsdU{YoLz)I0`%Vu7NO4qo+<}HRl9^Wu!22UOSB6}w|zhLtuA!|3A8xe7N zRECFP?6cwFli3LEDlNOU|G>vmJhG@bj`cYn^VkycP~?vU&ERmPbbQH;MH5(>*WfJ> zbTA(zB1a?AhzLx!De9!XQc(vq9o~B|ccyskytg|7S@H`0nLDGhK;s&8e(3WhCysvn z(FboWXyGpWMgHRGnvQs#ZtV1|xH0PDL%bmW2vg+Fy!D(gTt6}?Dhfp>oT4?U!Sjqg zQ;JeEre;o_SiF`$%Sy){sEOB&9UV93puE4!z9&2E0p74pL0hAEdpJ)3hwOxBTLoq> z^7^$gkxq=HVdU5`Z!_P!<{1nLx+i&q1TS0Op=V7>CI3v%j^(q{%w^x6ANn%Q%_GjR zm9Ibd>~yw@C1>(OtWuxOcXU4f!p>LsKlAMJ&O=vMR#Zr?EaRo%Q*MoJr+FVgIsOOn zXk=bwm+|uKf}Q-No!EYgm3CGpCdS5d>GSJ=5J#chpdDF3_Izxw;TV(iJ^f)4V7`|53rz^vPQZzbE z(dwmpAK#Uub7n8GdCHq7*c)OkpKmCWUvY1e@%|U{_zP(BvCxo`aCd2_p*E7uL}rQv z_(S?Tk;zQ9_R)wFPXJF-DB=KWNh>(UzkT=pFIKOp zDHxS9e%Z3kpKdx?-#2iPxo18J`pwlyx#KB*^G&>BHap>(#3-ZP+|5;}~HI@urg}C3#QoPY70I zvLaQI_a5FO>JPC(X#%4|aumfK22F-!31}PG2aoF7xvPKs?WmOG>gr8%@(a?AeZ|kT zH8*5s_N8TKH#DF9!|GK>{KhHYcw`UD)#^36wv^GL}(!nG`*m%?%1Z1 z6xi;X5(@!#W|H@bCSjP*Dafioh{oL+O;Y{O=JcP>PEaSO22HEWnYxv{Y_Q+dNHF1t?~7gu;{?%ciU zOUEUMh26}rOK;fgb=i2c=WlG#i%++dbZxuz7XQL*^BUe>y|iP;vA^ z-@n8WR3LW)sc49<@<&g+&<`w#2lqr@Qqo$zVPaaBy=RWFrAq2ekL!2s-+s&OsXr|3 z+pdh+bBYc>v_pNTSBnFPZ;>Uaz0He4?>Z{9S*~dY-%%`JGi?clDmr;lqY0 z)NCzm!cSnI2u4HQv?EK7p-SE3&%P+`yDI%89A-OHxxsaYAZIam(uT5}-Jj1q2p0 z)YfchTD~$lg%SgrYO2O3C8aE_-t@xPbithLXP)L$Y8y7ytX{oZ5bEk=JZ#mf!ilL< zrpzx%nHal5I60P};lXIAggc67&km?|D~^paG7ArJ0@yhC&5Xgg-iNC;89J zqH{*;bfa@_ZO?^mZd5MYHA1$IK_I&(tUy0D(Y`p&IHneFz_VVX2Mow5gA((#(=G`wo{Ve8; zR*7UB5)4D<5v@CZk6 zRh(*fMO$0N?%j!ced2EH-=;Q^Mjwp)5NKA2d;F!QFq=p-gD3LwBsl3%SxZgOXJttn0?s7Ql!{C{XfDY z7H8L2c2T%}EOjgYd?H&iaT}}1&HbOP6W{(|WOB=b1z~i)Lt1`IDG=FY*;C$Ytf0er zLia%6yv)CdTR|&gn2D(KOF}4|fCx3g+5q=bY3mNPrei)Iy76>iI0dq}nO)^>{2mBWf}ab^@mAS(fpq(27N)DCxO5HXaG z{qUBMKT_4-5=3bdx1?nPt(craBCPPjIka!$w9Nb{v~P{6eQ|NnkPB#z39U*eb24J@s` zo~0RtxLcRmmmSqr;b9XNFM8=EwqVch^70A8!>X%0*q5i$(*DgqYG};Ox3PoCxN>`C zWe>A7-l*X<;+CXWUuEO}iqVL+Yi+hPs?=ctXQHOyKvE}({-sutt;|Vf_!wNiVK(V zHT3;#GO)A9u*biE@eIO0lzSnWqUB&SFaJQbw~SeZ`dBJB#fc%KW8&Ax`OW%ga0n}xJUWTBS&kCpKm*QWcQ1D{cB$}G4r=u zYHC8>{IPBD!bxeB&R@mR+GOA#OTa(!DSpsKHV1p##j{uj#)GZE&YOVPLm3kq8cRz2 zI8**$J8#@xF%S8*E1N#@=iKmvZA3)EUc+8>o>4hy=FIhmT(LNDvSF}b82tJMvBS`s z7!V--i|)l{pwIi!XWGFXFoI>m#_Qp+=bx2Z&npvsc2nS_k3I3y4H*?cDiET z+^x-X=dl@Ay6V-|JIdPDj~5%*aTpf9o)Qu= zDQ#h|s51VMh3&58k-St)sK?3cj;nhgS98B;TN@kOXzVN0wtoC7ssc&T*7QJyBncLZ zDc=Pb;uax`B^%yV{nlt9{AB#A;BJV*J9oVMiDahR^P%q-K|TouzkpAG z5d)Lc=Aq|f4M}iB(NSQ&*zCQb0n;FW==cl~suC8Egv&{RW|Cu6WoW&8xwXFS^5r(p zQ=^$s+;+2`t(r%ezpw~8y75S^MDT_2rl5SZe&0{^HAFSi;6`W~xoyBwX` zR>xk(bsIJs&(dVuyJPq!aARmyvS zz(@J-z^s9NQyUN%&*;Thw$q|ZI6DR*f#kavNv@F!4x>Z35cP;Dq{jOBMc1Rvc#jUI z#>J&xZtLssR^IGX3^Y%joma0-P1Vv_YQM|R(}2H{~9p4SmP&j7_gHFHatsJofp+2Zq(6gKPRn zhbc0!A0f6MEr--0@d&JF>_3sTVCBG_z<{xkcx7v?ca(CaQSCcgmzb-nUodla!pfPi z?mf%9bh;Q{Kc(mtCw_VG1AdL!f51Z2#kY3F`}(a24xM~t;Q~(&tu|p?^vV^?p4Bn? zl>^rAAjlI$Gm@lfgo#=v*_w`F;no>ynV>Q-!BA^#5YB>MMT>Qqv|^pn&P9WP z8JS>Y{5FRvkMrAt*mso;lX&AY%)cDSEb?8@O;QsBC7GEaCYcg+Y$Yo+-AL7`*^;@d zEh{UUf1B8XP69meu)bAKPqG7Poq9J>CVLnTi?Ra#nk{Jq*H<2R>;(Z=7N z7F^e_W#<22;IuUNF*o{olmjeFdBq44Eh^iV^E-k{KB%9mKK%5fD8|6RqB}~7h0ZqrscwtGpW>! zUQu`)FKdlYpon~PGYZNZ>W#+!28s$b#=jTiPpCG@{jG!bNZy07@q(EH!~~{8K#oeg zxf$)!QZ!Hugj0-;jW^hvFq8#|)^^l#>u8~#*Rk4z&0BM_vvap^+xPN@VI!Om4If_r z_J(dvME0STDM+>59r7=Y2Olid7#rE~RE3-zW1dgZ|&HT-k$iPx|d;q4QhU&DeDpogIWDT+?Ooz zYta7g{$NJ9*=VE#L}tt_YxIsfF^s7>4>}|S_0^@Pc6D4RM(uFU2lK!;g#cD%e1ePo zc1!*4({G;niiI*Gji(@p@F5vNFE#OX%u_@P&?SKphC2vKf!8xdtx>40InLtga>i#z z2%DG{uC^AzjLEfcLLqpaJt18y7S}qBYl-9)gdW6Tzr+fN#4aJJZZbneN*FOj*lt~z z7jxyY`wG(e{)%t(sS}Ee$Ln-2Us+nIe36~zu~+>4zv*ihPfyb8CtXU@U%9sD(#zG$ zsNJHX6yy99?&S_WEdVW-hFEeB#3F_d%nFmuG_V1pFOujWGe;^Hf8Kd;(V{^YZES2j z_n~^I=+g7V>aw!8-!7y=!Rq3o`3E}xz^}M^dGY=F2EJc#nDhR-H~#e2TMHJz`Lc}7 z5cbpkm5O}a|3&Hkaf$?KrV*EsXB2Kt77di{@&T(sEAWuo*AELQVeSxm;yn!{gk)v@ zn=L!CbLJQAH!jbImwuzWtIZ*cnfY6`zV^xCBTJXMY!6f^J;neBVTE}64gK83<1^-Xv-|THE-`)I49i zx(wkD{2H%*;d}OncA28*`6V~cyA(b3{v8X|F5)bYnW`E-f4!1m;lU-cA&sa^U(3{*{Z9&SsZQD9NK78~$$L+x?wMXQl z%#3Q0zwy}IibcQqfd9Zx)_1YmI-=$?Ew8`(;tS~msCn(c#?8~GpPW07AL=<3F*b2b ziKBj9VW9{AasV~^_OPV7_t-k*|J|YIAV|~mK+yrb&@Ms>9mmR*CW|yzU;_g-10Gl$ z^dkAw!H4jQJ=X!}1_q$hKsg3-GF*9)F>tfnV_T*<=0wjUm~zQ@y*?>XpO^9lTUuJS zy7s)`N`<~*pTCW@PexRG_^zfAdQpV;|>n^)eLI4 z9)tu5#DFSr-l&QfO-v zXi;aY^vxI*6X5S35HmUu>Ynn>e075@B*Ih?7t@ZMuJ>_OKXPWm{YqfuBv;-4_TlWo z_(_PbPjZ2eFS0U2?|b(so?)o)^(jd9@y$#5`711719|dfWKk{rHM59Hl|O`$P!A>R zEjmeIgOR`R|9`^0xftYvpOBDYuCBwb2KK*qaT#{ihb*mr{`CA`aCgHA`11g5?mR3c zbQoTw_s*eV&dx5wf`f+PMnS>DTxd@d2JESRkLLe@0SJ-wg%Yk@eBq5lAxI1ks25&{wG5c$}f#Rb?R@M{tK!b zos1V)CA+|{-n*|7^7A7k6+b)7G9XZbZ$Vy0@_`f7f5(Tfqkk?)`s4V7i{r|+%vY_N zn!U2Hc$w?C6)9Ai*nY0?W(Q7KYewi19POSSkc=U9;Xe~Px5tI?@AMuXqjVKZ_4C|4{)^?(m#k+= z=}vWZqnA|a=Sr8XyoVn_pLo=|0Y8G`_Hg0;pN1tOl!ZqK_l9pS$@3u_a;RxNB>b1u zmKrtt=MudeiJ=1}dJ7BB(F>=huM}?|d`yz)n~hGwcfW$1nsEtZONSMhB>Kfi-@Yi# zcEbszM&Cm}pr8B_{m7+2jz1t#JXA^gC*S`KMWlVhkYfHwYSLMksFV$@v4J#&f$5id z%p+znf}!s=^gp33|Lz3;jyat`i107#Ob@3pUE?To;@|y@htQmP6o>C$f#9G6vRmK? zFq7h8WWn>1Jms_|BXr1+Z+!f+Mmjks=ymFgc?Hkz$jg5;bNPlX7#9LbBDNqbT<01T ztc^;5nXw@;DSc{fhDrXG=RH+|ee9P;NsOcjA6ea{zC=n$+Q%oQ?L2WJ|Dl`4qc#XWKQs(kb3R^9 zBmMl-MhtUw_8t{8u5|3!nCL~uXHF^=vRe1B4dnm4o&tfu7Z~G2W$GWko*e)2ef#(L z{YU#h{_)5K)pz>(^>))Q+VcN-O+leFwO9EctSSAeQ|nH>x2~&e-Fv70i$!Jp)2Y*S zr%u(KK80uEUw8Lrgw{NARUuegnv0Y$1%*XT5)_3m(klfrn&fynkC`^Tp@4l6zpJcsk;>H=QGIC-XY-9%dYO8!J)1%Cz$yK1O_=c4vM`L z5)fcHDD+Va(deMt>k$^}?%~ybG1S4qauBqyOR<&?4naZw{)1v)_6!d3@bY^35`AVF z5D;=H0iT72AaI(-oNOefy=mz$tx&Q!J!0|66oY-UpJ3t4M6Y|v70(cqV^E|4tu(k8_jNc#sUCi=PbEbFyzJ@1HY+SrDcKouv`)@0jJ)Ri9Y)1BeG8FIUKXyHdxgpz6Omky0 z#bW;QF8hetfgY0PD<{YUi}p?r17l?1+W%x8)VEz6SLl*5UjIp9iAz$l{*zChTeR@M z80p^cHeP(LGOuuC3{q7$exfgoj(iNET^Bytv}obZatV7-_NS^4Uo=#TZYF;P925XF z^T9KMhrOfC;5G4%CUY^V`%)1&+3D)!NQQN_uxjKWagEssUcI+o$g1DFx88W5{wvXP z#2~|(LB_Yt;ix#)zB4~BFMntIu{-bB+MMZ`xtA&`#HNahOEYFn7b_*WsTuisyIx?G zFYL<8r+0h{y`%9n`BjuaIG|c}iWr0vDdi0$#zK(rC(NAu;i-T*&}S%Pt*lHL&RfJ$ zz{0USF#CGrrov6V?cAL0IB>n>+NMo~%6K=ouiY|T4zjW`-l81N7W5S(YvQL4{XZKw z&uJ8fv!B?Gj_W1Y8yn}9xCR7ye&y==25-Sy_zn0BV&WxqEeBA{3{X9ktOfWefBFYu zimGkh7g!t1%FgaByudQMQK~SjF&U-uZio@Q>>O)TA})>X;0Lm=XY&K+Sk}2lexNbg zpkUUbmbIPZg}Az@&oYjey@X)pMNv%tG#dD`qcSgeNH63*q5vz^0TzP%h>OM_d7kPl z&pT|~E9CKNF_VuHvidR&onq!^JWp6fZ&Y#o4+QM>FP_Kt_WhZjRrSXG##iV=VJ7P~ zbn=;W^fN;z@z}xePus#jeH>JfvBm7*sdj~@EmDfhL2VVd4$%k)Bm%$Gs)=rQ^Vr?hxA#*Bpa)=C*<#I3P&ZtUp$B*l6A%0Dd~P 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

    B9I>^t8~Cv>w9f@#}?JgdspNvKhbn}p*NEgvf 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

    •  public PaneTint Tint { get; set; } + /// + /// The id of the layout this character's windows use (), or null to + /// follow the world's. An id that names no layout any more falls through to the next step of + /// rather than failing; no migration marks anybody. + /// + public string? Layout { get; set; } + /// Logging is configured per character. public LoggingSettings Logging { get; set; } = new(); @@ -179,6 +186,7 @@ public sealed class CharacterDefinition OnDisconnect = OnDisconnect, TriggerSets = new List(TriggerSets), Tint = Tint, + Layout = Layout, Logging = new LoggingSettings { Format = Logging.Format, diff --git a/src/SharpMUTerm.Core/Configuration/WorldDefinition.cs b/src/SharpMUTerm.Core/Configuration/WorldDefinition.cs index b7787f89..c234a6ce 100644 --- a/src/SharpMUTerm.Core/Configuration/WorldDefinition.cs +++ b/src/SharpMUTerm.Core/Configuration/WorldDefinition.cs @@ -187,6 +187,20 @@ public sealed class WorldDefinition ///     public TerminalColor Accent { get; set; } = TerminalColor.Default; + /// + /// The id of the layout this world's characters use when they name none of their own, or null for none. + /// See . + /// + public string? Layout { get; set; } + + /// + /// The layout the player accepted when the client suggested one for this world + /// (), or null when no suggestion was accepted. Below + /// in : a choice the player made outright wins + /// over one they only agreed to. + /// + public string? AcceptedLayoutSuggestion { get; set; } + /// The characters that can connect to this world. public List Characters { get; set; } = new(); @@ -219,6 +233,8 @@ public sealed class WorldDefinition GrabPrefix = GrabPrefix, GmcpLogin = GmcpLogin, DiscordPresence = DiscordPresence, + Layout = Layout, + AcceptedLayoutSuggestion = AcceptedLayoutSuggestion, Characters = Characters.Select(c => c.Clone()).ToList(), }; diff --git a/src/SharpMUTerm.Core/Layouts/BuiltInLayouts.cs b/src/SharpMUTerm.Core/Layouts/BuiltInLayouts.cs new file mode 100644 index 00000000..e2e988d5 --- /dev/null +++ b/src/SharpMUTerm.Core/Layouts/BuiltInLayouts.cs @@ -0,0 +1,58 @@ +namespace SharpMUTerm.Core.Layouts; + +/// +/// The layouts every client has. Read-only: they are not in config.json, +/// refuses to change them, and changing one is saving a copy. +/// +public static class BuiltInLayouts +{ + /// The id of . + public const string RoleplayId = "roleplay"; + + /// The id of . + public const string CombatId = "combat"; + + /// + /// For posing: the output with a composer docked under it, who is in the room beside it, and the capture + /// windows as a tab behind who-here. What every world gets when nothing else applies. + /// + public static LayoutDefinition Roleplay { get; } = new() + { + Id = RoleplayId, + Name = "Roleplay", + IsBuiltIn = true, + Placements = + [ + new PanelPlacement { PanelId = PanelIds.Output, Region = LayoutRegion.Main, Order = 0 }, + new PanelPlacement { PanelId = PanelIds.Composer, Region = LayoutRegion.Bottom, Order = 0 }, + new PanelPlacement { PanelId = PanelIds.WhoHere, Region = LayoutRegion.Side, Order = 0 }, + new PanelPlacement { PanelId = PanelIds.Chat, Region = LayoutRegion.Side, Order = 1, TabOf = PanelIds.WhoHere }, + ], + }; + + /// + /// For fighting: a meter strip across the top, the output, the map beside it, the capture windows collapsed + /// under the map, and a quick bar under the output. + /// + public static LayoutDefinition Combat { get; } = new() + { + Id = CombatId, + Name = "Combat", + IsBuiltIn = true, + Placements = + [ + new PanelPlacement { PanelId = PanelIds.Vitals, Region = LayoutRegion.TopStrip, Order = 0 }, + new PanelPlacement { PanelId = PanelIds.Output, Region = LayoutRegion.Main, Order = 0 }, + new PanelPlacement { PanelId = PanelIds.Map, Region = LayoutRegion.Side, Order = 0, Size = 2 }, + new PanelPlacement { PanelId = PanelIds.Chat, Region = LayoutRegion.Side, Order = 1, Collapsed = true }, + new PanelPlacement { PanelId = PanelIds.QuickBar, Region = LayoutRegion.Bottom, Order = 0 }, + ], + }; + + /// Both, in the order a picker lists them. + public static IReadOnlyList All { get; } = [Roleplay, Combat]; + + /// The built-in with , or null. + public static LayoutDefinition? Find(string? id) => + All.FirstOrDefault(l => string.Equals(l.Id, id, StringComparison.Ordinal)); +} diff --git a/src/SharpMUTerm.Core/Layouts/LayoutDefinition.cs b/src/SharpMUTerm.Core/Layouts/LayoutDefinition.cs new file mode 100644 index 00000000..70043ac3 --- /dev/null +++ b/src/SharpMUTerm.Core/Layouts/LayoutDefinition.cs @@ -0,0 +1,93 @@ +using System.Text.Json.Serialization; + +namespace SharpMUTerm.Core.Layouts; + +/// +/// The area of the window a panel is placed in. Host-neutral: the terminal folds these into its pane split tree +/// (), the desktop window into dock panes. +/// +public enum LayoutRegion +{ + /// The centre, where the output sits. Several main panels share it side by side. + Main, + + /// A column on the right of the main area. Several side panels stack top to bottom. + Side, + + /// A band under the main area (not under the side column). Several sit side by side. + Bottom, + + /// A thin band across the top of the whole window, for a meter strip. Several sit side by side. + TopStrip, +} + +/// One panel's place in a . +public sealed record PanelPlacement +{ + /// The panel, one of (an unknown id is kept and skipped). + public string PanelId { get; init; } = string.Empty; + + /// Which area it sits in. + public LayoutRegion Region { get; init; } = LayoutRegion.Main; + + /// Its position among the panels of its region, lowest first. Ties keep list order. + public int Order { get; init; } + + /// + /// Its share of its region against the other panes there, as a weight: two panes of 1 and 3 take a quarter + /// and three quarters. Zero or less is read as 1. A tab's size is not read (its pane's is). + /// + public double Size { get; init; } = 1; + + /// Whether it starts collapsed: placed, but shown as a title the player can open. + public bool Collapsed { get; init; } + + /// + /// The panel whose pane this one joins as a tab, or null for a pane of its own. When that panel is not drawn + /// (unknown, collapsed, or without data yet), this one takes a pane of its own in its own region. + /// + public string? TabOf { get; init; } +} + +/// +/// A saved arrangement of panels: which exist and where they sit. Whether a placed panel is actually drawn is a +/// separate question, answered per session by . +/// +/// Immutable: changes a layout by replacing it, so a built-in handed out by +/// cannot be edited in place. +/// +/// +public sealed record LayoutDefinition +{ + /// The stable id characters and worlds refer to. Never shown; survives a rename. + public string Id { get; init; } = string.Empty; + + /// The name the player sees and picks by. + public string Name { get; init; } = string.Empty; + + /// + /// Whether this is one of . Never read from or written to a file, so a + /// hand-edited configuration cannot make a layout of its own read-only. + /// + [JsonIgnore] + public bool IsBuiltIn { get; init; } + + /// The panels, in no particular order (each carries its ). + public IReadOnlyList Placements { get; init; } = []; + + /// + /// How much of the window each region takes, as a fraction of the axis it divides: + /// of the width, and of the height. A + /// region left out takes 's value. takes + /// what is left and is not read from here. Null (the default) is "all defaults". + /// + public IReadOnlyDictionary? RegionShares { get; init; } + + /// The placements naming a panel this client can draw (). + [JsonIgnore] + public IEnumerable KnownPlacements => Placements.Where(p => PanelIds.IsKnown(p.PanelId)); + + /// The known placement for , or null when the layout does not place it. + public PanelPlacement? PlacementOf(string panelId) => + KnownPlacements.FirstOrDefault(p => string.Equals(p.PanelId, panelId, StringComparison.Ordinal)); +} diff --git a/src/SharpMUTerm.Core/Layouts/LayoutFold.cs b/src/SharpMUTerm.Core/Layouts/LayoutFold.cs new file mode 100644 index 00000000..b6c8df6b --- /dev/null +++ b/src/SharpMUTerm.Core/Layouts/LayoutFold.cs @@ -0,0 +1,127 @@ +using SharpMUTerm.Core.Workspaces; + +namespace SharpMUTerm.Core.Layouts; + +/// +/// A layout folded into the workspace's own split tree, for one session. +/// +/// +/// The tree, built from and exactly as a workspace's is, except that a +/// pane's are panel ids rather than window ids — the host maps each to whatever +/// draws it. Pane ids are panel:<id of the pane's first panel>. Null only when nothing is drawn. +/// +/// Placed collapsed and with data: the host shows each as a title the player can open. +/// Placed, known, and without data yet: drawn once says so. +public sealed record LayoutFoldResult( + LayoutNode? Root, + IReadOnlyList Collapsed, + IReadOnlyList Waiting); + +/// +/// Folds a into a split tree, the shape the terminal's workspace already draws: +/// +/// Column[ TopStrip, Row[ Column[ Main, Bottom ], Side ] ] +/// +/// with any empty region left out. Panels in one region share it side by side (main, bottom, top strip) or stacked +/// (side), weighted by . Unknown panel ids are skipped, a collapsed panel is listed +/// rather than given a pane, and a panel without data is left out until it has some. +/// +/// A tab joins its host's pane only when the host has a pane of its own (is drawn and is not itself a tab); +/// otherwise it takes a pane in its own region. One level, so there are no chains or cycles to resolve. +/// +/// +public static class LayoutFold +{ + /// The share of the window a region takes when the layout does not say. + public static double DefaultShare(LayoutRegion region) => region switch + { + LayoutRegion.Side => 0.3, + LayoutRegion.Bottom => 0.2, + LayoutRegion.TopStrip => 0.1, + _ => 1.0, + }; + + /// The prefix of every pane id the fold makes. + public const string PanePrefix = "panel:"; + + /// Folds ; with no , every known panel has data. + public static LayoutFoldResult Fold(LayoutDefinition layout, IPanelAvailability? availability = null) + { + ArgumentNullException.ThrowIfNull(layout); + + var known = layout.KnownPlacements + .Select((p, index) => (Placement: p, Index: index)) + .OrderBy(x => x.Placement.Order) + .ThenBy(x => x.Index) + .Select(x => x.Placement) + .ToList(); + + bool HasData(PanelPlacement p) => availability?.HasData(p.PanelId) ?? true; + + var collapsed = known.Where(p => p.Collapsed && HasData(p)).ToList(); + var waiting = known.Where(p => !HasData(p)).ToList(); + var drawn = known.Where(p => !p.Collapsed && HasData(p)).ToList(); + + // A panel drawn twice would be two panes holding one thing; the first placement wins. + drawn = drawn.DistinctBy(p => p.PanelId, StringComparer.Ordinal).ToList(); + + var hosts = drawn.Where(p => p.TabOf is null).Select(p => p.PanelId).ToHashSet(StringComparer.Ordinal); + bool IsTab(PanelPlacement p) => p.TabOf is not null && hosts.Contains(p.TabOf) + && !string.Equals(p.TabOf, p.PanelId, StringComparison.Ordinal); + + var sequence = 0; + LayoutNode? Region(LayoutRegion region, SplitDirection direction) + { + var panes = new List<(PaneNode Pane, double Size)>(); + foreach (var slot in drawn.Where(p => p.Region == region && !IsTab(p))) + { + var tabs = new List { slot.PanelId }; + tabs.AddRange(drawn.Where(p => IsTab(p) && string.Equals(p.TabOf, slot.PanelId, StringComparison.Ordinal)) + .Select(p => p.PanelId)); + panes.Add((new PaneNode(PanePrefix + slot.PanelId, tabs, sequence: ++sequence), slot.Size > 0 ? slot.Size : 1)); + } + + return panes.Count switch + { + 0 => null, + 1 => panes[0].Pane, + _ => new SplitNode(direction, panes.Select(p => (LayoutNode)p.Pane).ToList(), panes.Select(p => p.Size).ToList()), + }; + } + + double Share(LayoutRegion region) => + Math.Clamp(layout.RegionShares?.GetValueOrDefault(region, DefaultShare(region)) ?? DefaultShare(region), 0.05, 0.9); + + // Numbered in the order a reader meets them: main first, then what is around it. + var main = Region(LayoutRegion.Main, SplitDirection.Row); + var bottom = Region(LayoutRegion.Bottom, SplitDirection.Row); + var side = Region(LayoutRegion.Side, SplitDirection.Column); + var top = Region(LayoutRegion.TopStrip, SplitDirection.Row); + + var centre = Join(main, bottom, SplitDirection.Column, Share(LayoutRegion.Bottom), secondIsShare: true); + var body = Join(centre, side, SplitDirection.Row, Share(LayoutRegion.Side), secondIsShare: true); + var root = Join(top, body, SplitDirection.Column, Share(LayoutRegion.TopStrip), secondIsShare: false); + + return new LayoutFoldResult(root, collapsed, waiting); + } + + /// + /// Two nodes along one axis, either of which may be missing. is the fraction the + /// region-shaped one takes: the second when , else the first. + /// + private static LayoutNode? Join(LayoutNode? first, LayoutNode? second, SplitDirection direction, double share, bool secondIsShare) + { + if (first is null) + { + return second; + } + + if (second is null) + { + return first; + } + + var sizes = secondIsShare ? new[] { 1 - share, share } : new[] { share, 1 - share }; + return new SplitNode(direction, [first, second], sizes); + } +} diff --git a/src/SharpMUTerm.Core/Layouts/LayoutLibrary.cs b/src/SharpMUTerm.Core/Layouts/LayoutLibrary.cs new file mode 100644 index 00000000..3a2c0423 --- /dev/null +++ b/src/SharpMUTerm.Core/Layouts/LayoutLibrary.cs @@ -0,0 +1,156 @@ +namespace SharpMUTerm.Core.Layouts; + +/// What did: changed the layout in place, or saved a copy. +/// The layout that now holds the placements. +/// True when the named layout was a built-in and a new one was saved instead. +public sealed record LayoutSaveResult(LayoutDefinition Layout, bool CreatedNew); + +/// +/// The layouts a player can pick from: first, then their own, which live in the list +/// handed in (AppConfiguration.Layouts). Every change is made to that list, so saving the configuration +/// is what persists it; this type writes no file. +/// +/// A built-in is never changed. on one saves a copy under a fresh name, and +/// and refuse. Names are unique across the whole library, ignoring case, +/// so a picker never shows two rows that read the same. +/// +/// +public sealed class LayoutLibrary +{ + private readonly List _user; + private readonly Func _newId; + + /// The player's layouts, changed in place. + /// Makes the id of a new layout; a GUID by default. A test passes its own. + public LayoutLibrary(List userLayouts, Func? newId = null) + { + _user = userLayouts ?? throw new ArgumentNullException(nameof(userLayouts)); + _newId = newId ?? (() => Guid.NewGuid().ToString("N")); + } + + /// The built-ins, then the player's layouts in the order they were saved. + public IReadOnlyList All => [.. BuiltInLayouts.All, .. _user]; + + /// + /// The layout with , or null. A built-in wins over a saved layout that happens to carry + /// the same id, so a hand-edited file cannot shadow one. + /// + public LayoutDefinition? Find(string? id) + { + if (string.IsNullOrEmpty(id)) + { + return null; + } + + return BuiltInLayouts.Find(id) + ?? _user.FirstOrDefault(l => string.Equals(l.Id, id, StringComparison.Ordinal)); + } + + /// Whether some layout other than is already called . + public bool IsNameTaken(string name, string? exceptId = null) => + All.Any(l => !string.Equals(l.Id, exceptId, StringComparison.Ordinal) + && string.Equals(l.Name.Trim(), name.Trim(), StringComparison.OrdinalIgnoreCase)); + + /// + /// if no layout has it, otherwise the first of name 2, name 3… that is + /// free. A blank name becomes Layout. + /// + public string UniqueName(string? name) + { + var stem = string.IsNullOrWhiteSpace(name) ? "Layout" : name.Trim(); + if (!IsNameTaken(stem)) + { + return stem; + } + + for (var n = 2; ; n++) + { + var candidate = $"{stem} {n}"; + if (!IsNameTaken(candidate)) + { + return candidate; + } + } + } + + /// + /// Saves as a new layout. The name is made unique () + /// rather than refused, so "save current" always succeeds. + /// + public LayoutDefinition SaveAsNew( + string? name, + IEnumerable placements, + IReadOnlyDictionary? regionShares = null) + { + ArgumentNullException.ThrowIfNull(placements); + var layout = new LayoutDefinition + { + Id = _newId(), + Name = UniqueName(name), + Placements = placements.ToArray(), + RegionShares = regionShares is null ? null : new Dictionary(regionShares), + }; + _user.Add(layout); + return layout; + } + + /// + /// Replaces the placements of the layout with . A built-in is not changed: a copy named + /// after it (Roleplay 2) is saved instead, and the result says so, so the caller can re-point whoever + /// was using the built-in at the copy. + /// + /// No layout has . + public LayoutSaveResult Update( + string id, + IEnumerable placements, + IReadOnlyDictionary? regionShares = null) + { + ArgumentNullException.ThrowIfNull(placements); + var existing = Find(id) ?? throw new KeyNotFoundException($"No layout has the id '{id}'."); + if (existing.IsBuiltIn) + { + return new LayoutSaveResult(SaveAsNew(existing.Name, placements, regionShares ?? existing.RegionShares), true); + } + + var updated = existing with + { + Placements = placements.ToArray(), + RegionShares = regionShares is null ? existing.RegionShares : new Dictionary(regionShares), + }; + _user[IndexOf(id)] = updated; + return new LayoutSaveResult(updated, false); + } + + /// + /// Renames a saved layout. Refused (false) for a built-in, an unknown id, a blank name or a name another + /// layout already has; renaming to its own name in a different case is allowed. + /// + public bool Rename(string id, string newName) + { + if (string.IsNullOrWhiteSpace(newName) || Find(id) is not { IsBuiltIn: false } existing + || IsNameTaken(newName, exceptId: id)) + { + return false; + } + + _user[IndexOf(id)] = existing with { Name = newName.Trim() }; + return true; + } + + /// + /// Deletes a saved layout. Refused (false) for a built-in or an unknown id. Characters and worlds still naming + /// it are left alone: falls through past an id that names nothing. + /// + public bool Delete(string id) + { + if (Find(id) is not { IsBuiltIn: false }) + { + return false; + } + + _user.RemoveAt(IndexOf(id)); + return true; + } + + private int IndexOf(string id) => _user.FindIndex(l => string.Equals(l.Id, id, StringComparison.Ordinal)); +} diff --git a/src/SharpMUTerm.Core/Layouts/LayoutResolver.cs b/src/SharpMUTerm.Core/Layouts/LayoutResolver.cs new file mode 100644 index 00000000..328b281d --- /dev/null +++ b/src/SharpMUTerm.Core/Layouts/LayoutResolver.cs @@ -0,0 +1,53 @@ +using SharpMUTerm.Core.Configuration; + +namespace SharpMUTerm.Core.Layouts; + +/// Which step of chose a layout. +public enum LayoutSource +{ + /// The character names it (). + Character, + + /// The world names it (). + World, + + /// The player accepted it when the client suggested it (). + AcceptedSuggestion, + + /// Nothing named one that exists, so it is . + Default, +} + +/// A resolved layout and the step that chose it. +public sealed record ResolvedLayout(LayoutDefinition Layout, LayoutSource Source); + +/// +/// Which layout a character's windows use: the character's own, else the world's, else the suggestion the player +/// accepted for the world, else . An id that names no layout (deleted, or +/// from another machine's file) is passed over as though it were not set. +/// +public static class LayoutResolver +{ + /// Resolves the layout for on ; either may be null. + public static ResolvedLayout Resolve(LayoutLibrary library, WorldDefinition? world, CharacterDefinition? character) + { + ArgumentNullException.ThrowIfNull(library); + + if (library.Find(character?.Layout) is { } own) + { + return new ResolvedLayout(own, LayoutSource.Character); + } + + if (library.Find(world?.Layout) is { } worlds) + { + return new ResolvedLayout(worlds, LayoutSource.World); + } + + if (library.Find(world?.AcceptedLayoutSuggestion) is { } accepted) + { + return new ResolvedLayout(accepted, LayoutSource.AcceptedSuggestion); + } + + return new ResolvedLayout(BuiltInLayouts.Roleplay, LayoutSource.Default); + } +} diff --git a/src/SharpMUTerm.Core/Layouts/LayoutSuggester.cs b/src/SharpMUTerm.Core/Layouts/LayoutSuggester.cs new file mode 100644 index 00000000..054c9572 --- /dev/null +++ b/src/SharpMUTerm.Core/Layouts/LayoutSuggester.cs @@ -0,0 +1,134 @@ +using SharpMUTerm.Core.Protocols; +using SharpMUTerm.Core.Telnet.Mssp; + +namespace SharpMUTerm.Core.Layouts; + +/// +/// What a connection has shown the client, as plain values, so can be tested +/// without a session. reads it off the live stores. +/// +/// +/// The package names holds: GMCP packages by name (Char.Vitals), MSDP variables +/// as MSDP.NAME. +/// +/// MSSP CODEBASE, or null when the server sent none. +/// MSSP FAMILY, or null when the server sent none. +public sealed record LayoutSignals( + IReadOnlyCollection GameDataPackages, + string? MsspCodebase = null, + string? MsspFamily = null) +{ + /// Nothing seen yet. + public static LayoutSignals None { get; } = new([]); + + /// Reads the signals off a session's game data and its server's MSSP report; either may be null. + public static LayoutSignals From(GameDataStore? gameData, MsspData? mssp) => new( + gameData?.Entries.Select(e => e.Package).ToArray() ?? [], + mssp?.Codebase, + mssp?.Family); +} + +/// Why suggested what it did — what the offer can say to the player. +public enum LayoutSuggestionReason +{ + /// The game sends vitals (GMCP Char.Vitals, MSDP HEALTH…): a game with fighting in it. + Vitals, + + /// The server's MSSP names a MUSH-family codebase (PennMUSH, TinyMUX, a MUCK, a MOO…). + RoleplayServer, + + /// Nothing pointed either way. + Default, +} + +/// A suggested layout and the reason for it. +public sealed record LayoutSuggestion(string LayoutId, LayoutSuggestionReason Reason); + +/// +/// Suggests a built-in layout for a world from what its connection has shown: +/// once the game sends vitals, otherwise — with a reason that says whether +/// the server's MSSP named a roleplay-leaning codebase or nothing pointed either way. Vitals win over the codebase: +/// a MUSH that sends Char.Vitals has a combat system someone wanted shown. +/// +public static class LayoutSuggester +{ + /// The game-data packages that mean the game sends vitals (compared ignoring case). + public static IReadOnlySet VitalsPackages { get; } = new HashSet(StringComparer.OrdinalIgnoreCase) + { + "Char.Vitals", + $"{GameDataStore.MsdpPrefix}.HEALTH", + $"{GameDataStore.MsdpPrefix}.HEALTH_MAX", + $"{GameDataStore.MsdpPrefix}.MANA", + $"{GameDataStore.MsdpPrefix}.MOVEMENT", + }; + + /// + /// Codebase name endings that lean towards roleplay. A word of the codebase ending in one counts, so + /// PennMUSH 1.8.8, TinyMUX 2.13, RhostMUSH, ProtoMUCK and LambdaMOO all do. + /// + private static readonly string[] RoleplayEndings = ["MUSH", "MUX", "MUCK", "MOO"]; + + /// The MSSP FAMILY values that lean towards roleplay. + private static readonly string[] RoleplayFamilies = ["TinyMUD"]; + + /// Suggests a layout for what says the connection has seen. + public static LayoutSuggestion Suggest(LayoutSignals signals) + { + ArgumentNullException.ThrowIfNull(signals); + + if (signals.GameDataPackages.Any(VitalsPackages.Contains)) + { + return new LayoutSuggestion(BuiltInLayouts.CombatId, LayoutSuggestionReason.Vitals); + } + + if (IsRoleplayCodebase(signals.MsspCodebase) || IsRoleplayFamily(signals.MsspFamily)) + { + return new LayoutSuggestion(BuiltInLayouts.RoleplayId, LayoutSuggestionReason.RoleplayServer); + } + + return new LayoutSuggestion(BuiltInLayouts.RoleplayId, LayoutSuggestionReason.Default); + } + + /// + /// Whether an MSSP CODEBASE names a MUSH-family server. Read word by word (runs of letters), so a version + /// number or punctuation does not matter and a word that merely contains MOO mid-way does not count. + /// + public static bool IsRoleplayCodebase(string? codebase) + { + if (string.IsNullOrWhiteSpace(codebase)) + { + return false; + } + + foreach (var word in Words(codebase)) + { + if (RoleplayEndings.Any(e => word.EndsWith(e, StringComparison.OrdinalIgnoreCase))) + { + return true; + } + } + + return false; + } + + private static bool IsRoleplayFamily(string? family) => + family is not null && RoleplayFamilies.Any(f => string.Equals(f, family.Trim(), StringComparison.OrdinalIgnoreCase)); + + private static IEnumerable Words(string text) + { + var start = -1; + for (var i = 0; i <= text.Length; i++) + { + var letter = i < text.Length && char.IsAsciiLetter(text[i]); + if (letter && start < 0) + { + start = i; + } + else if (!letter && start >= 0) + { + yield return text[start..i]; + start = -1; + } + } + } +} diff --git a/src/SharpMUTerm.Core/Layouts/PanelAvailability.cs b/src/SharpMUTerm.Core/Layouts/PanelAvailability.cs new file mode 100644 index 00000000..d3b85774 --- /dev/null +++ b/src/SharpMUTerm.Core/Layouts/PanelAvailability.cs @@ -0,0 +1,68 @@ +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Protocols; + +namespace SharpMUTerm.Core.Layouts; + +/// +/// Whether a panel has anything to show for one session yet. A layout says where a panel goes; this says whether +/// it is drawn, so a world that never sends a map never gets an empty map pane. +/// +public interface IPanelAvailability +{ + /// Whether has data. False for an id outside . + bool HasData(string panelId); +} + +/// +/// The facts about one session that decide which panels have data, as plain values, and the rule that reads them. +/// A host builds one per session () whenever one of the inputs changes; the rule is pure. +/// +/// Rooms in the session's map (WorldMap.Rooms.Count). +/// Whether any status meter has read a value (). +/// Whether the game has said who is in the room (GMCP Room.Players). +/// Capture windows the session's trigger rules have opened. +/// Values the session's holds. +public sealed record PanelAvailability( + int RoomsRecorded = 0, + bool MeterValueArrived = false, + bool WhoHereKnown = false, + int SpawnWindows = 0, + int GameDataEntries = 0) : IPanelAvailability +{ + /// A session that has shown nothing yet: only the panels that need no data. + public static PanelAvailability Nothing { get; } = new(); + + /// The GMCP packages that say who is in the room. + public static IReadOnlyList WhoHerePackages { get; } = ["Room.Players", "Room.AddPlayer"]; + + /// + public bool HasData(string panelId) => panelId switch + { + PanelIds.Output or PanelIds.Composer or PanelIds.QuickBar => true, + PanelIds.Map => RoomsRecorded > 0, + PanelIds.Vitals => MeterValueArrived, + PanelIds.WhoHere => WhoHereKnown, + PanelIds.Chat => SpawnWindows > 0, + PanelIds.GameData => GameDataEntries > 0, + _ => false, + }; + + /// + /// Reads the facts off a session's stores. defaults to + /// ; the map and the capture windows are counted by the caller, because they + /// live in the host. + /// + public static PanelAvailability From( + GameDataStore? gameData, + int roomsRecorded, + int spawnWindows, + IEnumerable? meters = null) + { + var meterArrived = gameData is not null + && (meters ?? StatusMeter.Defaults()).Any(m => StatusMeter.Read(gameData, m.Value) is not null); + // By package name, not value: an empty Room.Players (nobody else here) is still knowing who is here. + var whoHere = gameData is not null + && gameData.Entries.Any(e => WhoHerePackages.Contains(e.Package, StringComparer.OrdinalIgnoreCase)); + return new PanelAvailability(roomsRecorded, meterArrived, whoHere, spawnWindows, gameData?.Count ?? 0); + } +} diff --git a/src/SharpMUTerm.Core/Layouts/PanelIds.cs b/src/SharpMUTerm.Core/Layouts/PanelIds.cs new file mode 100644 index 00000000..9114bea1 --- /dev/null +++ b/src/SharpMUTerm.Core/Layouts/PanelIds.cs @@ -0,0 +1,42 @@ +namespace SharpMUTerm.Core.Layouts; + +/// +/// The panels a layout can place, by id. An id is a plain string so a layout written by a newer client (or by +/// hand) still loads: a placement naming an id outside is kept in the layout and skipped by +/// everything that reads it (). +/// +public static class PanelIds +{ + /// The output pane: the game's text. + public const string Output = "output"; + + /// The docked composer, a multi-row editor for posts. + public const string Composer = "composer"; + + /// Who is in the room with the character (GMCP Room.Players). + public const string WhoHere = "who-here"; + + /// Health, mana and the other meters a game sends. + public const string Vitals = "vitals"; + + /// The map drawn from the rooms the mapper recorded. + public const string Map = "map"; + + /// The capture windows trigger rules send lines to (channels, pages, tells). + public const string Chat = "chat"; + + /// A row of buttons for the commands a player uses most. + public const string QuickBar = "quick-bar"; + + /// Every GMCP, MSDP and MXP value the session holds. + public const string GameData = "game-data"; + + /// Every id this client knows how to draw. + public static IReadOnlySet Known { get; } = new HashSet(StringComparer.Ordinal) + { + Output, Composer, WhoHere, Vitals, Map, Chat, QuickBar, GameData, + }; + + /// Whether names a panel this client can draw. + public static bool IsKnown(string? panelId) => panelId is not null && Known.Contains(panelId); +} diff --git a/tests/SharpMUTerm.Core.Tests/Layouts/LayoutConfigurationTests.cs b/tests/SharpMUTerm.Core.Tests/Layouts/LayoutConfigurationTests.cs new file mode 100644 index 00000000..6aa0f3b9 --- /dev/null +++ b/tests/SharpMUTerm.Core.Tests/Layouts/LayoutConfigurationTests.cs @@ -0,0 +1,108 @@ +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Layouts; + +namespace SharpMUTerm.Core.Tests.Layouts; + +/// +/// Layouts in config.json: the player's layouts and the world/character references round-trip, the built-ins +/// are never written, and a document from before layouts loads with none — new optional fields whose defaults are +/// the old behaviour, so no migration step and no schema version change ('s +/// reasoning). +/// +public class LayoutConfigurationTests +{ + private const string DocumentWithoutLayouts = """ + { + "version": 5, + "worlds": [ { "name": "Aetherfall", "host": "aetherfall.mux", "port": 4201, "characters": [ { "name": "Corvid" } ] } ] + } + """; + + [Test] + public async Task ADocumentFromBeforeLayoutsLoadsWithNone() + { + var config = ConfigurationStore.Deserialize(DocumentWithoutLayouts); + + await Assert.That(config.Layouts).IsEmpty(); + await Assert.That(config.Worlds[0].Layout).IsNull(); + await Assert.That(config.Worlds[0].AcceptedLayoutSuggestion).IsNull(); + await Assert.That(config.Worlds[0].Characters[0].Layout).IsNull(); + } + + [Test] + public async Task LayoutsAndReferencesRoundTrip() + { + var config = new AppConfiguration(); + var library = new LayoutLibrary(config.Layouts, () => "my-layout"); + library.SaveAsNew( + "Scene", + [ + new PanelPlacement { PanelId = PanelIds.Output, Order = 0 }, + new PanelPlacement { PanelId = PanelIds.Chat, Region = LayoutRegion.Side, Order = 1, Size = 2.5, Collapsed = true, TabOf = PanelIds.WhoHere }, + new PanelPlacement { PanelId = "hologram", Region = LayoutRegion.TopStrip }, + ], + new Dictionary { [LayoutRegion.Side] = 0.35 }); + config.Worlds.Add(new WorldDefinition + { + Name = "W", + Layout = BuiltInLayouts.CombatId, + AcceptedLayoutSuggestion = BuiltInLayouts.RoleplayId, + Characters = [new CharacterDefinition { Name = "C", Layout = "my-layout" }], + }); + + var json = ConfigurationStore.Serialize(config); + var back = ConfigurationStore.Deserialize(json); + + // Region names, not numbers, so a hand-edited file reads. + await Assert.That(json).Contains("\"region\": \"Side\""); + await Assert.That(json).DoesNotContain("isBuiltIn"); + await Assert.That(json).DoesNotContain("knownPlacements"); + + var layout = back.Layouts.Single(); + await Assert.That(layout.Id).IsEqualTo("my-layout"); + await Assert.That(layout.Name).IsEqualTo("Scene"); + await Assert.That(layout.IsBuiltIn).IsFalse(); + await Assert.That(layout.Placements.Count).IsEqualTo(3); + await Assert.That(layout.Placements[1]).IsEqualTo(new PanelPlacement + { + PanelId = PanelIds.Chat, Region = LayoutRegion.Side, Order = 1, Size = 2.5, Collapsed = true, TabOf = PanelIds.WhoHere, + }); + await Assert.That(layout.Placements[2].PanelId).IsEqualTo("hologram"); + await Assert.That(layout.RegionShares![LayoutRegion.Side]).IsEqualTo(0.35); + + await Assert.That(back.Worlds[0].Layout).IsEqualTo(BuiltInLayouts.CombatId); + await Assert.That(back.Worlds[0].AcceptedLayoutSuggestion).IsEqualTo(BuiltInLayouts.RoleplayId); + await Assert.That(back.Worlds[0].Characters[0].Layout).IsEqualTo("my-layout"); + + // Resolution after the load agrees with before it. + var resolved = LayoutResolver.Resolve(new LayoutLibrary(back.Layouts), back.Worlds[0], back.Worlds[0].Characters[0]); + await Assert.That(resolved.Layout.Name).IsEqualTo("Scene"); + } + + [Test] + public async Task AFileCannotMakeItsOwnLayoutBuiltIn() + { + var config = ConfigurationStore.Deserialize(""" + { "version": 5, "layouts": [ { "id": "x", "name": "X", "isBuiltIn": true, "placements": [] } ] } + """); + + await Assert.That(config.Layouts.Single().IsBuiltIn).IsFalse(); + } + + [Test] + public async Task CloningAWorldOrCharacterCarriesItsLayout() + { + var world = new WorldDefinition + { + Layout = "a", + AcceptedLayoutSuggestion = "b", + Characters = [new CharacterDefinition { Layout = "c" }], + }; + + var copy = world.Clone(); + + await Assert.That(copy.Layout).IsEqualTo("a"); + await Assert.That(copy.AcceptedLayoutSuggestion).IsEqualTo("b"); + await Assert.That(copy.Characters[0].Layout).IsEqualTo("c"); + } +} diff --git a/tests/SharpMUTerm.Core.Tests/Layouts/LayoutFoldAndAvailabilityTests.cs b/tests/SharpMUTerm.Core.Tests/Layouts/LayoutFoldAndAvailabilityTests.cs new file mode 100644 index 00000000..f1013ea4 --- /dev/null +++ b/tests/SharpMUTerm.Core.Tests/Layouts/LayoutFoldAndAvailabilityTests.cs @@ -0,0 +1,161 @@ +using SharpMUTerm.Core.Layouts; +using SharpMUTerm.Core.Protocols; +using SharpMUTerm.Core.Workspaces; + +namespace SharpMUTerm.Core.Tests.Layouts; + +/// +/// decides which placed panels are drawn, and folds what is +/// drawn into the workspace's own split tree. +/// +public class LayoutFoldAndAvailabilityTests +{ + [Test] + public async Task OnlyTheDatalessPanelsAreAvailableBeforeAnythingArrives() + { + var nothing = PanelAvailability.Nothing; + + foreach (var always in new[] { PanelIds.Output, PanelIds.Composer, PanelIds.QuickBar }) + { + await Assert.That(nothing.HasData(always)).IsTrue(); + } + + foreach (var needsData in new[] { PanelIds.Map, PanelIds.Vitals, PanelIds.WhoHere, PanelIds.Chat, PanelIds.GameData, "hologram" }) + { + await Assert.That(nothing.HasData(needsData)).IsFalse(); + } + } + + [Test] + public async Task EachPanelLightsUpWithItsOwnData() + { + await Assert.That(new PanelAvailability(RoomsRecorded: 1).HasData(PanelIds.Map)).IsTrue(); + await Assert.That(new PanelAvailability(MeterValueArrived: true).HasData(PanelIds.Vitals)).IsTrue(); + await Assert.That(new PanelAvailability(WhoHereKnown: true).HasData(PanelIds.WhoHere)).IsTrue(); + await Assert.That(new PanelAvailability(SpawnWindows: 2).HasData(PanelIds.Chat)).IsTrue(); + await Assert.That(new PanelAvailability(GameDataEntries: 3).HasData(PanelIds.GameData)).IsTrue(); + await Assert.That(new PanelAvailability(RoomsRecorded: 1).HasData(PanelIds.Vitals)).IsFalse(); + } + + [Test] + public async Task AvailabilityIsReadOffTheGameDataStore() + { + var data = new GameDataStore(); + await Assert.That(PanelAvailability.From(data, 0, 0)).IsEqualTo(PanelAvailability.Nothing); + + data.SetGmcp("Room.Players", "[]"); + data.SetGmcp("Char.Vitals", """{"hp":"450","maxhp":"500"}"""); + var seen = PanelAvailability.From(data, roomsRecorded: 4, spawnWindows: 1); + + await Assert.That(seen.WhoHereKnown).IsTrue(); + await Assert.That(seen.MeterValueArrived).IsTrue(); + await Assert.That(seen.RoomsRecorded).IsEqualTo(4); + await Assert.That(seen.SpawnWindows).IsEqualTo(1); + await Assert.That(seen.GameDataEntries).IsEqualTo(2); + await Assert.That(PanelAvailability.From(null, 0, 0)).IsEqualTo(PanelAvailability.Nothing); + } + + [Test] + public async Task RoleplayWithEverythingFoldsIntoOutputComposerAndASideColumnWithChatAsATab() + { + var fold = LayoutFold.Fold(BuiltInLayouts.Roleplay); + + // Row[ Column[ output, composer ], side ] + var root = (SplitNode)fold.Root!; + await Assert.That(root.Direction).IsEqualTo(SplitDirection.Row); + await Assert.That(root.Sizes[1]).IsEqualTo(LayoutFold.DefaultShare(LayoutRegion.Side)).Within(1e-9); + + var centre = (SplitNode)root.Children[0]; + await Assert.That(centre.Direction).IsEqualTo(SplitDirection.Column); + await Assert.That(centre.Panes().Select(p => p.Id)).IsEquivalentTo(new[] { "panel:output", "panel:composer" }); + + var side = (PaneNode)root.Children[1]; + await Assert.That(side.Tabs).IsEquivalentTo(new[] { PanelIds.WhoHere, PanelIds.Chat }); + await Assert.That(fold.Collapsed).IsEmpty(); + await Assert.That(fold.Waiting).IsEmpty(); + } + + [Test] + public async Task ATabWhoseHostHasNoDataTakesAPaneOfItsOwn() + { + // A MUSH sends no Room.Players, but trigger rules have opened a channel window. + var fold = LayoutFold.Fold(BuiltInLayouts.Roleplay, new PanelAvailability(SpawnWindows: 1)); + + var panes = fold.Root!.Panes().ToList(); + await Assert.That(panes.Select(p => p.Id)).IsEquivalentTo(new[] { "panel:output", "panel:composer", "panel:chat" }); + await Assert.That(panes[2].Tabs).IsEquivalentTo(new[] { PanelIds.Chat }); + await Assert.That(fold.Waiting.Select(p => p.PanelId)).IsEquivalentTo(new[] { PanelIds.WhoHere }); + } + + [Test] + public async Task CombatWithNoDataYetIsOutputAndTheQuickBar() + { + var fold = LayoutFold.Fold(BuiltInLayouts.Combat, PanelAvailability.Nothing); + + await Assert.That(fold.Root!.Panes().Select(p => p.Id)).IsEquivalentTo(new[] { "panel:output", "panel:quick-bar" }); + await Assert.That(fold.Waiting.Select(p => p.PanelId)).IsEquivalentTo(new[] { PanelIds.Vitals, PanelIds.Map, PanelIds.Chat }); + } + + [Test] + public async Task CombatWithEverythingHasAStripOnTopAndListsChatAsCollapsed() + { + var fold = LayoutFold.Fold(BuiltInLayouts.Combat); + + // Column[ vitals, Row[ Column[ output, quick-bar ], map ] ] + var root = (SplitNode)fold.Root!; + await Assert.That(root.Direction).IsEqualTo(SplitDirection.Column); + await Assert.That(((PaneNode)root.Children[0]).Id).IsEqualTo("panel:vitals"); + await Assert.That(root.Sizes[0]).IsEqualTo(LayoutFold.DefaultShare(LayoutRegion.TopStrip)).Within(1e-9); + await Assert.That(root.Panes().Select(p => p.Id)) + .IsEquivalentTo(new[] { "panel:vitals", "panel:output", "panel:quick-bar", "panel:map" }); + await Assert.That(fold.Collapsed.Select(p => p.PanelId)).IsEquivalentTo(new[] { PanelIds.Chat }); + } + + [Test] + public async Task PanelsInOneRegionShareItBySize() + { + var layout = new LayoutDefinition + { + Id = "x", + Name = "X", + Placements = + [ + new() { PanelId = PanelIds.Output }, + new() { PanelId = PanelIds.GameData, Region = LayoutRegion.Side, Order = 2, Size = 3 }, + new() { PanelId = PanelIds.Map, Region = LayoutRegion.Side, Order = 1, Size = 1 }, + ], + RegionShares = new Dictionary { [LayoutRegion.Side] = 0.4 }, + }; + + var root = (SplitNode)LayoutFold.Fold(layout).Root!; + await Assert.That(root.Sizes[1]).IsEqualTo(0.4).Within(1e-9); + + var side = (SplitNode)root.Children[1]; + await Assert.That(side.Direction).IsEqualTo(SplitDirection.Column); + await Assert.That(side.Panes().Select(p => p.Id)).IsEquivalentTo(new[] { "panel:map", "panel:game-data" }); + await Assert.That(side.Sizes[0]).IsEqualTo(0.25).Within(1e-9); + } + + [Test] + public async Task TabsDoNotChainAndAPanelPlacedTwiceGetsOnePane() + { + var layout = new LayoutDefinition + { + Id = "x", + Name = "X", + Placements = + [ + new() { PanelId = PanelIds.Output }, + new() { PanelId = PanelIds.Map, Region = LayoutRegion.Side, TabOf = PanelIds.Chat }, + new() { PanelId = PanelIds.Chat, Region = LayoutRegion.Side, TabOf = PanelIds.Map }, + new() { PanelId = PanelIds.Output, Region = LayoutRegion.Bottom }, + ], + }; + + var panes = LayoutFold.Fold(layout).Root!.Panes().ToList(); + + // The cycle breaks into two panes rather than losing both, and output is drawn once. + await Assert.That(panes.Select(p => p.Id)).IsEquivalentTo(new[] { "panel:output", "panel:map", "panel:chat" }); + await Assert.That(panes.All(p => p.Tabs.Count == 1)).IsTrue(); + } +} diff --git a/tests/SharpMUTerm.Core.Tests/Layouts/LayoutLibraryTests.cs b/tests/SharpMUTerm.Core.Tests/Layouts/LayoutLibraryTests.cs new file mode 100644 index 00000000..e2cc5b16 --- /dev/null +++ b/tests/SharpMUTerm.Core.Tests/Layouts/LayoutLibraryTests.cs @@ -0,0 +1,157 @@ +using SharpMUTerm.Core.Layouts; + +namespace SharpMUTerm.Core.Tests.Layouts; + +/// +/// : the built-ins are listed and never changed, the player's layouts are saved, updated, +/// renamed and deleted in the list handed in, and no two layouts share a name. +/// +public class LayoutLibraryTests +{ + private static readonly PanelPlacement[] OutputOnly = [new() { PanelId = PanelIds.Output }]; + + private static LayoutLibrary Library(List? user = null) + { + var n = 0; + return new LayoutLibrary(user ?? [], () => $"id{++n}"); + } + + [Test] + public async Task TheBuiltInsAreListedFirstAndAreReadOnly() + { + var user = new List(); + var library = Library(user); + library.SaveAsNew("Mine", OutputOnly); + + await Assert.That(library.All.Select(l => l.Id)).IsEquivalentTo(new[] { "roleplay", "combat", "id1" }); + await Assert.That(library.All[0].IsBuiltIn).IsTrue(); + await Assert.That(library.All[2].IsBuiltIn).IsFalse(); + + // Never in the player's list, so never in config.json. + await Assert.That(user.Count).IsEqualTo(1); + } + + [Test] + public async Task SavingUnderATakenNameNumbersIt() + { + var library = Library(); + + var first = library.SaveAsNew("Scene", OutputOnly); + var second = library.SaveAsNew("scene", OutputOnly); + var builtInName = library.SaveAsNew("Roleplay", OutputOnly); + var blank = library.SaveAsNew(" ", OutputOnly); + + await Assert.That(first.Name).IsEqualTo("Scene"); + await Assert.That(second.Name).IsEqualTo("scene 2"); + await Assert.That(builtInName.Name).IsEqualTo("Roleplay 2"); + await Assert.That(blank.Name).IsEqualTo("Layout"); + } + + [Test] + public async Task UpdatingASavedLayoutReplacesItInPlaceAndKeepsItsId() + { + var user = new List(); + var library = Library(user); + var saved = library.SaveAsNew("Scene", OutputOnly); + PanelPlacement[] changed = [new() { PanelId = PanelIds.Output }, new() { PanelId = PanelIds.Map, Region = LayoutRegion.Side }]; + + var result = library.Update(saved.Id, changed); + + await Assert.That(result.CreatedNew).IsFalse(); + await Assert.That(result.Layout.Id).IsEqualTo(saved.Id); + await Assert.That(user.Single().Placements.Count).IsEqualTo(2); + await Assert.That(user.Single().Name).IsEqualTo("Scene"); + } + + [Test] + public async Task UpdatingABuiltInSavesACopyAndLeavesTheBuiltInAlone() + { + var user = new List(); + var library = Library(user); + var before = BuiltInLayouts.Roleplay.Placements.Count; + + var result = library.Update(BuiltInLayouts.RoleplayId, OutputOnly); + + await Assert.That(result.CreatedNew).IsTrue(); + await Assert.That(result.Layout.Name).IsEqualTo("Roleplay 2"); + await Assert.That(result.Layout.IsBuiltIn).IsFalse(); + await Assert.That(user.Count).IsEqualTo(1); + await Assert.That(BuiltInLayouts.Roleplay.Placements.Count).IsEqualTo(before); + await Assert.That(library.Find(BuiltInLayouts.RoleplayId)).IsSameReferenceAs(BuiltInLayouts.Roleplay); + } + + [Test] + public async Task UpdatingAnUnknownIdThrows() + { + await Assert.That(() => Library().Update("nope", OutputOnly)).Throws(); + } + + [Test] + public async Task RenameRefusesBuiltInsBlanksAndTakenNames() + { + var library = Library(); + var a = library.SaveAsNew("A", OutputOnly); + library.SaveAsNew("B", OutputOnly); + + await Assert.That(library.Rename(BuiltInLayouts.CombatId, "Fight")).IsFalse(); + await Assert.That(library.Rename(a.Id, " ")).IsFalse(); + await Assert.That(library.Rename(a.Id, "b")).IsFalse(); + await Assert.That(library.Rename(a.Id, "combat")).IsFalse(); + await Assert.That(library.Rename("missing", "C")).IsFalse(); + + await Assert.That(library.Rename(a.Id, "a")).IsTrue(); + await Assert.That(library.Find(a.Id)!.Name).IsEqualTo("a"); + await Assert.That(library.Rename(a.Id, " Duel ")).IsTrue(); + await Assert.That(library.Find(a.Id)!.Name).IsEqualTo("Duel"); + } + + [Test] + public async Task DeleteRemovesASavedLayoutAndRefusesABuiltIn() + { + var user = new List(); + var library = Library(user); + var saved = library.SaveAsNew("Scene", OutputOnly); + + await Assert.That(library.Delete(BuiltInLayouts.RoleplayId)).IsFalse(); + await Assert.That(library.Delete("missing")).IsFalse(); + await Assert.That(library.Delete(saved.Id)).IsTrue(); + await Assert.That(user).IsEmpty(); + await Assert.That(library.Find(saved.Id)).IsNull(); + } + + [Test] + public async Task ASavedLayoutCannotShadowABuiltInById() + { + var user = new List { new() { Id = BuiltInLayouts.RoleplayId, Name = "Impostor" } }; + var library = Library(user); + + await Assert.That(library.Find(BuiltInLayouts.RoleplayId)!.Name).IsEqualTo("Roleplay"); + await Assert.That(library.Delete(BuiltInLayouts.RoleplayId)).IsFalse(); + } + + [Test] + public async Task AnUnknownPanelIsKeptInTheLayoutAndSkippedByReaders() + { + var layout = new LayoutDefinition + { + Id = "x", + Name = "X", + Placements = [new() { PanelId = PanelIds.Output }, new() { PanelId = "hologram", Region = LayoutRegion.Side }], + }; + + await Assert.That(layout.Placements.Count).IsEqualTo(2); + await Assert.That(layout.KnownPlacements.Select(p => p.PanelId)).IsEquivalentTo(new[] { PanelIds.Output }); + await Assert.That(layout.PlacementOf("hologram")).IsNull(); + await Assert.That(LayoutFold.Fold(layout).Root!.Panes().Select(p => p.Id)).IsEquivalentTo(new[] { "panel:output" }); + } + + [Test] + public async Task EveryPanelTheBuiltInsPlaceIsKnown() + { + foreach (var layout in BuiltInLayouts.All) + { + await Assert.That(layout.Placements.All(p => PanelIds.IsKnown(p.PanelId))).IsTrue(); + await Assert.That(layout.IsBuiltIn).IsTrue(); + } + } +} diff --git a/tests/SharpMUTerm.Core.Tests/Layouts/LayoutResolverTests.cs b/tests/SharpMUTerm.Core.Tests/Layouts/LayoutResolverTests.cs new file mode 100644 index 00000000..bd0cf489 --- /dev/null +++ b/tests/SharpMUTerm.Core.Tests/Layouts/LayoutResolverTests.cs @@ -0,0 +1,71 @@ +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Layouts; + +namespace SharpMUTerm.Core.Tests.Layouts; + +/// +/// : character, then world, then the accepted suggestion, then Roleplay — and an id that +/// names nothing is passed over rather than failing. +/// +public class LayoutResolverTests +{ + private static (LayoutLibrary Library, LayoutDefinition Saved) WithOneSaved() + { + var library = new LayoutLibrary([], () => "saved"); + return (library, library.SaveAsNew("Scene", [new PanelPlacement { PanelId = PanelIds.Output }])); + } + + [Test] + public async Task NothingSetIsRoleplay() + { + var (library, _) = WithOneSaved(); + + var resolved = LayoutResolver.Resolve(library, new WorldDefinition(), new CharacterDefinition()); + + await Assert.That(resolved.Layout).IsSameReferenceAs(BuiltInLayouts.Roleplay); + await Assert.That(resolved.Source).IsEqualTo(LayoutSource.Default); + await Assert.That(LayoutResolver.Resolve(library, null, null).Source).IsEqualTo(LayoutSource.Default); + } + + [Test] + public async Task TheCharacterWinsOverTheWorldWhichWinsOverTheSuggestion() + { + var (library, saved) = WithOneSaved(); + var world = new WorldDefinition { Layout = BuiltInLayouts.CombatId, AcceptedLayoutSuggestion = BuiltInLayouts.RoleplayId }; + var character = new CharacterDefinition { Layout = saved.Id }; + + var both = LayoutResolver.Resolve(library, world, character); + await Assert.That(both.Layout.Id).IsEqualTo(saved.Id); + await Assert.That(both.Source).IsEqualTo(LayoutSource.Character); + + character.Layout = null; + var worldOnly = LayoutResolver.Resolve(library, world, character); + await Assert.That(worldOnly.Layout.Id).IsEqualTo(BuiltInLayouts.CombatId); + await Assert.That(worldOnly.Source).IsEqualTo(LayoutSource.World); + + world.Layout = null; + world.AcceptedLayoutSuggestion = BuiltInLayouts.CombatId; + var suggestion = LayoutResolver.Resolve(library, world, character); + await Assert.That(suggestion.Layout.Id).IsEqualTo(BuiltInLayouts.CombatId); + await Assert.That(suggestion.Source).IsEqualTo(LayoutSource.AcceptedSuggestion); + } + + [Test] + public async Task ADeletedLayoutFallsThroughToTheNextStep() + { + var (library, saved) = WithOneSaved(); + var world = new WorldDefinition { Layout = BuiltInLayouts.CombatId }; + var character = new CharacterDefinition { Layout = saved.Id }; + + library.Delete(saved.Id); + var resolved = LayoutResolver.Resolve(library, world, character); + + await Assert.That(resolved.Layout.Id).IsEqualTo(BuiltInLayouts.CombatId); + await Assert.That(resolved.Source).IsEqualTo(LayoutSource.World); + + // Every step dangling, all the way down. + world.Layout = "gone"; + world.AcceptedLayoutSuggestion = "also-gone"; + await Assert.That(LayoutResolver.Resolve(library, world, character).Source).IsEqualTo(LayoutSource.Default); + } +} diff --git a/tests/SharpMUTerm.Core.Tests/Layouts/LayoutSuggesterTests.cs b/tests/SharpMUTerm.Core.Tests/Layouts/LayoutSuggesterTests.cs new file mode 100644 index 00000000..5960ec17 --- /dev/null +++ b/tests/SharpMUTerm.Core.Tests/Layouts/LayoutSuggesterTests.cs @@ -0,0 +1,90 @@ +using SharpMUTerm.Core.Layouts; +using SharpMUTerm.Core.Protocols; +using SharpMUTerm.Core.Telnet.Mssp; + +namespace SharpMUTerm.Core.Tests.Layouts; + +/// : vitals suggest Combat; a MUSH-family codebase, or nothing, suggests Roleplay. +public class LayoutSuggesterTests +{ + [Test] + public async Task NothingSeenSuggestsRoleplayByDefault() + { + var suggestion = LayoutSuggester.Suggest(LayoutSignals.None); + + await Assert.That(suggestion).IsEqualTo(new LayoutSuggestion(BuiltInLayouts.RoleplayId, LayoutSuggestionReason.Default)); + } + + [Test] + [Arguments("Char.Vitals")] + [Arguments("char.vitals")] + [Arguments("MSDP.HEALTH")] + public async Task VitalsSuggestCombat(string package) + { + var suggestion = LayoutSuggester.Suggest(new LayoutSignals(["Room.Info", package])); + + await Assert.That(suggestion).IsEqualTo(new LayoutSuggestion(BuiltInLayouts.CombatId, LayoutSuggestionReason.Vitals)); + } + + [Test] + public async Task VitalsWinOverAMushCodebase() + { + var suggestion = LayoutSuggester.Suggest(new LayoutSignals(["Char.Vitals"], "PennMUSH 1.8.8p0")); + + await Assert.That(suggestion.LayoutId).IsEqualTo(BuiltInLayouts.CombatId); + } + + [Test] + [Arguments("PennMUSH 1.8.8p0")] + [Arguments("TinyMUSH 3.3")] + [Arguments("TinyMUX 2.13.0.4")] + [Arguments("RhostMUSH")] + [Arguments("MUSH")] + [Arguments("mux2")] + [Arguments("FuzzBall MUCK 7.0")] + [Arguments("LambdaMOO 1.8.1")] + [Arguments("SharpMUSH")] + public async Task AMushFamilyCodebaseSuggestsRoleplayAndSaysWhy(string codebase) + { + var suggestion = LayoutSuggester.Suggest(new LayoutSignals([], codebase)); + + await Assert.That(suggestion).IsEqualTo(new LayoutSuggestion(BuiltInLayouts.RoleplayId, LayoutSuggestionReason.RoleplayServer)); + } + + [Test] + [Arguments("tbaMUD 2023")] + [Arguments("Evennia 4.0")] + [Arguments("Smooth Engine")] + [Arguments("")] + public async Task AnyOtherCodebaseIsTheDefault(string codebase) + { + await Assert.That(LayoutSuggester.Suggest(new LayoutSignals([], codebase)).Reason).IsEqualTo(LayoutSuggestionReason.Default); + } + + [Test] + public async Task TheTinyMudFamilyCountsWhenTheCodebaseSaysNothing() + { + var suggestion = LayoutSuggester.Suggest(new LayoutSignals([], "Custom", "TinyMUD")); + + await Assert.That(suggestion.Reason).IsEqualTo(LayoutSuggestionReason.RoleplayServer); + } + + [Test] + public async Task TheSignalsAreReadOffTheLiveStores() + { + var data = new GameDataStore(); + data.SetMsdp("""{"HEALTH":"100"}"""); + var mssp = MsspData.From([ + new KeyValuePair>("CODEBASE", ["TinyMUX 2.13"]), + new KeyValuePair>("FAMILY", ["TinyMUD"]), + ]); + + var signals = LayoutSignals.From(data, mssp); + + await Assert.That(signals.GameDataPackages).Contains("MSDP.HEALTH"); + await Assert.That(signals.MsspCodebase).IsEqualTo("TinyMUX 2.13"); + await Assert.That(signals.MsspFamily).IsEqualTo("TinyMUD"); + await Assert.That(LayoutSuggester.Suggest(signals).LayoutId).IsEqualTo(BuiltInLayouts.CombatId); + await Assert.That(LayoutSignals.From(null, null).GameDataPackages).IsEmpty(); + } +} From dc332af2d0231e23688a504e6548f2a7b14f47e0 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 02:13:11 +0000 Subject: [PATCH 006/113] =?UTF-8?q?Add=20SharpMUTerm.Client=20with=20a=20c?= =?UTF-8?q?ontribution=20registry;=20=E2=8C=83P=20reads=20its=20commands?= =?UTF-8?q?=20from=20it?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A new UI-agnostic project, SharpMUTerm.Client (Core only), holds the shared client shell's first piece: ContributionRegistry, with six kinds of contribution (commands, panels, settings sections, status cells, overlays, output decorators), each with a stable id unique within its kind and an owner. The built-in ⌃P catalog moves out of Core's CommandCatalog.Build into BuiltInCommands, registered as contributions; the Tui supplies the work (RunBuiltInCommand). The command surface, the pointer menu and DispatchCommand all read the registry, so a package or host can add commands. The catalog is unchanged entry for entry. New suite: SharpMUTerm.Client.Tests (in CI). Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- .github/workflows/ci.yml | 5 + CLAUDE.md | 26 +- SharpMUTerm.slnx | 2 + .../Commands/BuiltInCommands.cs | 371 ++++++++++++++++++ .../Contributions/Commands.cs | 300 ++++++++++++++ .../Contributions/ContributionList.cs | 91 +++++ .../Contributions/ContributionOwner.cs | 61 +++ .../Contributions/ContributionRegistry.cs | 49 +++ .../Contributions/Descriptors.cs | 193 +++++++++ .../SharpMUTerm.Client.csproj | 17 + .../Commands/CommandCatalog.cs | 322 +-------------- src/SharpMUTerm.Core/Commands/CommandIds.cs | 6 + .../Pointer/SharpMUTermApp.Pointer.cs | 2 +- src/SharpMUTerm.Tui/SharpMUTerm.Tui.csproj | 1 + .../SharpMUTermApp.Contributions.cs | 94 +++++ src/SharpMUTerm.Tui/SharpMUTermApp.cs | 20 +- .../BuiltInCatalogTests.cs} | 27 +- .../ClientAssemblyTests.cs | 52 +++ .../ContributionRegistryTests.cs | 215 ++++++++++ .../SharpMUTerm.Client.Tests.csproj | 19 + 20 files changed, 1527 insertions(+), 346 deletions(-) create mode 100644 src/SharpMUTerm.Client/Commands/BuiltInCommands.cs create mode 100644 src/SharpMUTerm.Client/Contributions/Commands.cs create mode 100644 src/SharpMUTerm.Client/Contributions/ContributionList.cs create mode 100644 src/SharpMUTerm.Client/Contributions/ContributionOwner.cs create mode 100644 src/SharpMUTerm.Client/Contributions/ContributionRegistry.cs create mode 100644 src/SharpMUTerm.Client/Contributions/Descriptors.cs create mode 100644 src/SharpMUTerm.Client/SharpMUTerm.Client.csproj create mode 100644 src/SharpMUTerm.Tui/SharpMUTermApp.Contributions.cs rename tests/{SharpMUTerm.Core.Tests/Commands/CommandCatalogTests.cs => SharpMUTerm.Client.Tests/BuiltInCatalogTests.cs} (85%) create mode 100644 tests/SharpMUTerm.Client.Tests/ClientAssemblyTests.cs create mode 100644 tests/SharpMUTerm.Client.Tests/ContributionRegistryTests.cs create mode 100644 tests/SharpMUTerm.Client.Tests/SharpMUTerm.Client.Tests.csproj diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c4b4668a..04c89bb4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,6 +44,11 @@ jobs: shell: bash run: dotnet run -c Release --no-build --project tests/SharpMUTerm.Core.Tests/SharpMUTerm.Core.Tests.csproj + - name: Test — Client + if: ${{ !cancelled() }} + shell: bash + run: dotnet run -c Release --no-build --project tests/SharpMUTerm.Client.Tests/SharpMUTerm.Client.Tests.csproj + - name: Test — Graphics if: ${{ !cancelled() }} shell: bash diff --git a/CLAUDE.md b/CLAUDE.md index a6b36fb5..1e4f778f 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -58,7 +58,7 @@ fallbacks) for inline images/maps. ## Repository state -**M1 delivered, plus substantial M2–M4 work.** `SharpMUTerm.slnx` builds all twelve projects on +**M1 delivered, plus substantial M2–M4 work.** `SharpMUTerm.slnx` builds all fifteen projects on `net10.0`, with the full test suite passing. In place: - **Core** — `AnsiParser` (SGR 16/256/truecolor), styled-line + `ScrollbackBuffer` model (a capped @@ -194,6 +194,21 @@ fallbacks) for inline images/maps. the review opens, so the review is never shown for bytes the index did not name. The focused window's world (its session's, else its owner's, never `_active`) sorts its own packages first; a `*` package does not count as the world's own. The default index repository does not exist yet. +- **The shared client shell** (`SharpMUTerm.Client`; `ContributionRegistry`). UI-agnostic, references Core only + (`ClientAssemblyTests` fails on a SharpConsoleUI or Avalonia reference). The registry holds six kinds — + commands, panels, settings sections (field descriptors only), status cells (reserved width, drop order), + overlays, output decorators — each with a stable id unique within its kind and an owner (built-in or a + package id, so `RemoveOwnedBy` takes a package's contributions with it). Order is registration order unless + the kind defines one, ties by registration. Only **commands** are live so far: + - **⌃P's catalog is the registry's.** `BuiltInCommands.Register` (Client) says what each entry is called, + its group, its key per host (`KeyHint`, `HostKey.Newline` resolved from `HostKeyGlyphs`) and when it is + offered; the work is the Tui's `RunBuiltInCommand`, handed in as `run`. `CommandPalette`, the pointer menu + (`AddCommands`, key from the contribution) and `DispatchCommand` all read `SharpMUTermApp.Contributions`. + Entries generated from live state (characters, windows, panes, settings screens, the send group) are a + `CommandFamily` owning an id prefix; a single command's id may not fall under one. Dispatch ignores + availability (a rail row or the other half of a stateful pair still runs). A new ⌃P command is a + contribution in `BuiltInCommands` plus a case in `RunBuiltInCommand`; Core's `CommandCatalog` keeps only + `CharacterCycle`. - **Tui** — **SharpConsoleUI** app: a `TabControl` of output windows (main + trigger-routed **spawn windows** + web view, with unread badges), each a `MarkupControl` in a `ScrollablePanelControl` viewport (PgUp/PgDn, Shift+↑/↓, ⌃Home/⌃End, wheel; unread badges count output arriving below a @@ -915,8 +930,8 @@ through `MacroKeys`, `ScreenField` and the keypad renderer. ```bash dotnet run -c Release --project tests/SharpMUTerm.Core.Tests + @@ -10,6 +11,7 @@ + diff --git a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs new file mode 100644 index 00000000..d6b39ca3 --- /dev/null +++ b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs @@ -0,0 +1,371 @@ +using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Core.Workspaces; + +namespace SharpMUTerm.Client.Commands; + +/// +/// The client's own commands, registered into a : every Switch to… +/// and Go to… entry, the stateful commands that read their current value (Pause logging vs +/// Start logging, Unzoom pane, Resume scrollback), and one Open … entry per settings +/// screen the host offers. What each entry is called, where it is listed, which key it names and when it is +/// offered lives here; what it does is the host's, handed in as run, because that work reaches +/// into the shell (panes, sessions, overlays) and this assembly draws nothing. +/// +/// Registration order is the catalog's order, and it is the order the surface lists entries in within a group. +/// +/// +public static class BuiltInCommands +{ + /// + /// Registers every built-in command. does the work for an id and returns false when + /// it did not do what the label promised; it is called for every id these contributions handle, offered or not. + /// + public static void Register(ContributionRegistry registry, Func run) + { + ArgumentNullException.ThrowIfNull(registry); + ArgumentNullException.ThrowIfNull(run); + var commands = registry.Commands; + + void Add( + string id, + CommandGroup group, + string title, + KeyHint? key = null, + string? detail = null, + Func? when = null, + Func? titleFor = null, + bool detailFirst = false) => + commands.Add(new SingleCommand + { + Id = id, + Category = group, + Title = title, + TitleFor = titleFor, + Key = key, + Detail = detail, + DetailFirst = detailFirst, + IsAvailable = when, + Run = _ => run(id), + }); + + void Family(string id, string prefix, Func> generate) => + commands.Add(new CommandFamily + { + Id = id, + IdPrefix = prefix, + Generate = generate, + Run = (commandId, _) => run(commandId), + }); + + // GO TO — switch character, then jump to windows. + Family("goto:characters", CommandIds.CharacterPrefix, Characters); + Family("goto:windows", CommandIds.WindowPrefix, Windows); + + // WORLD + // Both carry their chord. The surface is where this client is discovered from, and a key nobody + // can find is the same as no feature — ⌃L's newline sat unused until it was reported missing. + Add("world:reconnect", CommandGroup.World, "Reconnect", "⌥R"); + Add("world:disconnect", CommandGroup.World, "Disconnect", "⌥D"); + Family("world:send-group", CommandIds.GroupPrefix, SendGroup); + Add("world:reload-scripts", CommandGroup.World, "Reload scripts", + detail: "re-reads this character's Lua files", when: c => c.State.ScriptsOn); + + // Only where the host has a screen reader to tell: the window's live region, or --plain. + Add("a11y:toggle-window", CommandGroup.Terminal, "Read this window aloud", + when: c => c.State.Announced is not null, + titleFor: c => c.State.Announced == true ? "Stop reading this window aloud" : "Read this window aloud"); + + // TERMINAL — stateful labels. + Add("term:log-off", CommandGroup.Terminal, "Pause logging", when: c => c.State.LoggingOn); + Add("term:log-on", CommandGroup.Terminal, "Start logging", when: c => !c.State.LoggingOn); + Add("term:unfreeze", CommandGroup.Terminal, "Resume scrollback", when: c => c.State.Frozen); + Add("term:freeze", CommandGroup.Terminal, "Freeze pane", when: c => !c.State.Frozen); + Add("term:clear", CommandGroup.Terminal, "Clear window"); + + // Scrollback position. Here as well as on the keyboard because this surface is where the client + // is discovered from — every other thing you can do to an output window is listed here — and the + // subtitles are how the keys get taught: a pane that scrolls and says so nowhere is a pane + // nobody scrolls. The "back" entry appears only when there is somewhere to come back from. + Add("term:scroll-oldest", CommandGroup.Terminal, "Scroll to oldest", "⌃Home", "PgUp pages back"); + Add("term:scroll-live", CommandGroup.Terminal, "Back to live output", "⌃End", when: c => c.State.ScrolledBack); + + // The restore log's one control that is not a settings field. It is listed unconditionally, and + // it is listed *here* rather than only on F9, because "delete what this client has written down + // about my session" is a thing a person wants to do now — after saying something they would + // rather was not on disk — and a purge you have to find in a settings screen is a purge that + // happens tomorrow. The per-character switch on F9 is the other half: this one is immediate and + // total, that one is a standing preference. + Add("term:restore-purge", CommandGroup.Terminal, "Purge the restore log", + detail: "deletes every pane's saved content"); + + // Copying output. Listed unconditionally and subtitled with the *gesture* as well as the chord, + // because the gesture is the part nobody can guess: under mouse reporting a plain drag belongs to + // the application, so a user who has learnt that their terminal needs ⇧-drag has no reason to try + // dragging here. It refuses out loud with nothing selected, which is what earns it a row at all. + Add("term:copy", CommandGroup.Terminal, "Copy the selection", "⌃C", + "drag across a pane or the command line, or ⇧← ⇧→ there"); + + // The client's own messages — the status-line notices that dismiss themselves — kept out of the + // output window (and so out of the session log) and readable here instead. + Add("term:messages", CommandGroup.Terminal, "Show client messages", detail: "status-line notices"); + + // What the server is sending out of band. Listed unconditionally: a meter or a script is written + // against a GMCP path, and this is where a player finds out which paths their game has. + Add("term:gamedata", CommandGroup.Terminal, "Show game data", detail: "GMCP and MSDP this connection holds"); + + // The map. Listed unconditionally, like the game data above: a map is recorded from the first room a + // game reports, and nothing else on screen says the client keeps one. + Add("term:map", CommandGroup.Terminal, "Show map", detail: "this connection's map · click a room, or /walk "); + Add("term:walk-stop", CommandGroup.Terminal, "Stop walking", detail: "ends the speedwalk", when: c => c.State.Walking); + + // Game sound, for this run. The levels and the off switch are F7's; this is the quick one. + Add("term:mute", CommandGroup.Terminal, "Mute sound", detail: "until unmuted or restarted", + when: c => c.State.Sound == true); + Add("term:unmute", CommandGroup.Terminal, "Unmute sound", detail: "game sound is muted", + when: c => c.State.Sound == false); + + // The command line's own history, browsable and searchable. Named here as well as bound to ⌃R + // because a chord nothing mentions is a chord nobody finds — the same reason every settings screen + // has a row even though each has an F-key. + Add("term:history", CommandGroup.Terminal, "Search command history", "⌃R"); + + // The composer. Named here as well as bound to F1 for the reason the row above it is: a surface + // nobody can find is a surface nobody uses, and this one is not something a reader would guess + // at from the command line in front of them. + Add("term:compose", CommandGroup.Terminal, "Compose a post", "F1", "a full editor, sent as one line"); + + // Packages: the list, and the install that starts at the review. F10 can be taken by a terminal's + // own menu key (GNOME Terminal), so this surface is the way in that always works. + Add("term:packages", CommandGroup.Terminal, "Packages", "F10", "installed packages, on/off, remove"); + Add("term:package-install", CommandGroup.Terminal, "Install package…", detail: "from a file or an https link"); + Add("term:package-browse", CommandGroup.Terminal, "Browse packages", detail: "the package index, this game's first"); + Add("term:timestamps-off", CommandGroup.Terminal, "Hide timestamps", when: c => c.State.TimestampsOn); + Add("term:timestamps-on", CommandGroup.Terminal, "Show timestamps", when: c => !c.State.TimestampsOn); + Add("term:input2-off", CommandGroup.Terminal, "Hide second input", "⌃B i", "this window", + when: c => c.State.SecondInputOn, detailFirst: true); + Add("term:input2-on", CommandGroup.Terminal, "Show second input", "⌃B i", "this window", + when: c => !c.State.SecondInputOn, detailFirst: true); + + // The newline chord. Here for the same reason the scrollback keys are: a chord that works and is + // named nowhere is a chord nobody finds, which is precisely how this one was reported as missing. + // The host says which chord it is: a terminal reports Shift+⏎ and Ctrl+⏎ as a bare ⏎, so there it is + // Alt+⏎, and a window keeps Alt+⏎ for itself, so there it is Ctrl+⏎. + Add("term:newline", CommandGroup.Terminal, "Insert a newline in the command line", KeyHint.ForHost(HostKey.Newline)); + + // LAYOUT — every entry carries the chord that runs it, because this surface is where the client + // is discovered from and the ⌃B keymap is otherwise visible only while the prefix is armed. + Add("layout:split-right", CommandGroup.Layout, "Split right", "⌃B |"); + Add("layout:split-down", CommandGroup.Layout, "Split down", "⌃B -"); + Add("layout:unzoom", CommandGroup.Layout, "Unzoom pane", "⌃B z", when: c => c.State.Zoomed); + Add("layout:zoom", CommandGroup.Layout, "Zoom pane", "⌃B z", when: c => !c.State.Zoomed); + Add("layout:close", CommandGroup.Layout, "Close pane", "⌃B x"); + + // Directional pane focus. Listed whether or not the workspace has a second pane, deliberately: + // this is the surface that teaches the keyboard, and the entries are how a reader learns the + // workspace splits at all. Each refuses out loud when there is nothing that way. + Add("layout:focus-left", CommandGroup.Layout, "Focus pane left", "⌃←"); + Add("layout:focus-right", CommandGroup.Layout, "Focus pane right", "⌃→"); + Add("layout:focus-up", CommandGroup.Layout, "Focus pane up", "⌃↑"); + Add("layout:focus-down", CommandGroup.Layout, "Focus pane down", "⌃↓"); + Add("layout:cycle", CommandGroup.Layout, "Focus the next pane", "⌃O", "⌃B o"); + + // The tab cycle, beside the pane cycle it rhymes with. Listed unconditionally for the same reason + // the four directional entries above are: this surface is where the keyboard is learnt, and a + // reader whose panes each hold one window has no other way to find out that a pane holds tabs at + // all. ⌃N has always done this and was named on F4 and nowhere else. + // + // Listing it obliges it to answer, which the directional entries pay for by refusing out loud and + // this one did not — it returned in silence on a pane with one tab, which is what a dead key looks + // like. The refusal is the host's (SharpMUTermApp.NextWindow); the entry is only allowed to exist + // because it is there. + Add("layout:next-tab", CommandGroup.Layout, "Focus the next tab", "⌃N"); + + Family("layout:panes", CommandIds.PanePrefix, Panes); + + // Pane size, in the plain words the request used ("increase/decrease a pane's horizontal or + // vertical character size") rather than in the chord's terms. Listed for the same reason the + // directional entries and the newline chord are: ⌥⇧+arrow is not a chord anybody guesses, and a + // feature reachable only by a chord nobody knows is the state ⌃L's newline sat in until it was + // reported as missing. Listed unconditionally too — each refuses out loud when the focused pane + // has no border to move that way, which is how a reader learns the workspace resizes at all. + // The arrow names what happens to *this* pane — ↑ taller, ↓ shorter — from either side of the + // split; it named the direction the divider travelled until that was reported as inverted. + Add("layout:wider", CommandGroup.Layout, "Make this pane wider", "⌥⇧→"); + Add("layout:narrower", CommandGroup.Layout, "Make this pane narrower", "⌥⇧←"); + Add("layout:taller", CommandGroup.Layout, "Make this pane taller", "⌥⇧↑"); + Add("layout:shorter", CommandGroup.Layout, "Make this pane shorter", "⌥⇧↓"); + + // SETTINGS — one entry per configuration screen, in the order the host lists them (its F-key + // order). Every screen or none: a surface offering one of them and hiding the rest would read + // as "this is the only thing you can configure", which is the state the surface was in before. + Family("settings:screens", CommandIds.ScreenPrefix, Screens); + } + + /// + /// The built-in catalog for this state, with no host behind it: what the surface would list. For a test of + /// the catalog alone, and for any reader that wants the entries without running them. + /// + public static IReadOnlyList Catalog( + Workspace workspace, + IReadOnlyList characters, + string? focusedSessionKey, + CommandContext context, + IReadOnlyList? settings = null) + { + ArgumentNullException.ThrowIfNull(workspace); + ArgumentNullException.ThrowIfNull(characters); + ArgumentNullException.ThrowIfNull(context); + var registry = new ContributionRegistry(); + Register(registry, _ => false); + return registry.Commands.Catalog(new CommandEnvironment( + context, + workspace, + characters, + focusedSessionKey, + settings ?? Array.Empty(), + new HostKeyGlyphs(context.NewlineChord))); + } + + // The two neighbours in the character cycle carry its chords. Only those two: ⌥J and ⌥K move one + // step, so they are the honest answer for the rows either side of you and a lie for anybody + // further away. There is deliberately no direct-selection chord to put on the rest — the digit + // row is spent on windows and panes, and every remaining digit-bearing modifier (⌥⇧, ⌃⇧) has no + // legacy encoding at all on this terminal, which was measured rather than assumed. + private static IEnumerable Characters(ICommandContext context) + { + var characters = context.Characters; + var focusedSessionKey = context.FocusedSessionKey; + var cycle = CommandCatalog.CharacterCycle(characters); + var here = cycle.FindIndex(c => c.SessionKey == focusedSessionKey); + var next = here >= 0 && cycle.Count > 1 ? cycle[(here + 1) % cycle.Count].SessionKey : null; + var previous = here >= 0 && cycle.Count > 1 + ? cycle[(here - 1 + cycle.Count) % cycle.Count].SessionKey + : null; + + foreach (var character in characters) + { + if (character.SessionKey == focusedSessionKey) + { + continue; + } + + var state = character.Connected ? "connected" : "offline"; + var chord = character.SessionKey == next ? "⌥J · " + : character.SessionKey == previous ? "⌥K · " + : string.Empty; + yield return new CommandItem( + CommandGroup.GoTo, + $"Switch to {character.CharacterName}", + CommandIds.Character(character.SessionKey), + $"{chord}{character.WorldName} · {state}"); + } + } + + private static IEnumerable Windows(ICommandContext context) + { + var workspace = context.Workspace; + var activeWindow = workspace.Layout.FocusedPane.ActiveTab; + + // The chord each window's entry names, from the one place windows are numbered — the *focused* + // character's list, because that is what ⌥N indexes. A window belonging to somebody else has no + // chord from here and correctly gets none: pressing ⌥2 would reach the focused character's second + // window, not this entry, and an entry naming a key that goes elsewhere is the defect the + // numbering exists to prevent. Built as a lookup rather than read per entry because the entries + // walk the whole registry, including windows no pane holds. + var windowOrdinals = new Dictionary(StringComparer.Ordinal); + var reachable = workspace.WindowsFor(context.FocusedSessionKey); + for (var i = 0; i < reachable.Count && i < CommandIds.WindowJumpDigits; i++) + { + windowOrdinals[reachable[i].Id] = i + 1; + } + + foreach (var window in workspace.Windows) + { + if (window.Id == activeWindow) + { + continue; + } + + var owner = window.SessionKey ?? "unowned"; + var unread = window.Unread > 0 ? $" · {window.Unread} unread" : string.Empty; + + // The chord leads, because it is the part a reader is here to learn — the owner and the count + // describe the window and this says how to reach it without the surface at all. Windows past + // the ninth get the same subtitle minus the chord, rather than one naming a key that would do + // something else. + var chord = windowOrdinals.TryGetValue(window.Id, out var ordinal) ? $"⌥{ordinal} · " : string.Empty; + yield return new CommandItem( + CommandGroup.GoTo, + $"Go to {window.Title}", + CommandIds.Window(window.Id), + $"{chord}{owner}{unread}"); + } + } + + // The send group: one line to several characters. Offered once two characters are open, since a + // group of one is the command line. + private static IEnumerable SendGroup(ICommandContext context) + { + var characters = context.Characters; + var open = characters.Where(c => c.Open).ToList(); + if (open.Count <= 1 && !characters.Any(c => c.InGroup)) + { + yield break; + } + + foreach (var character in open) + { + yield return new CommandItem( + CommandGroup.World, + character.InGroup + ? $"Remove {character.CharacterName} from the send group" + : $"Add {character.CharacterName} to the send group", + CommandIds.GroupToggle(character.SessionKey), + character.WorldName); + } + + var members = characters.Count(c => c.InGroup); + if (members > 0) + { + yield return new CommandItem( + CommandGroup.World, + "Send the command line to the group", + CommandIds.GroupSend, + members == 1 ? "1 character" : $"{members} characters"); + yield return new CommandItem(CommandGroup.World, "Clear the send group", CommandIds.GroupClear); + } + } + + // Numbered pane jumps, one entry per pane that exists — the one group here that is *not* listed + // unconditionally, because "Go to pane 4" on a workspace with two panes names a place there is no + // way to make. The number is the one the move and drag overlays badge each pane with, so the entry + // and the digit a user is about to press in move mode are the same number. + // + // The chord is ⌃B N and no longer ⌥N: ⌥N names a *window* now, and a pane and a window are + // different destinations that cannot share one key. ⌃B is where the rest of the pane keymap lives. + // Only the first nine carry it, so a tenth pane gets an entry with no subtitle rather than one + // naming a key that does something else — the honest shape for a place only the mouse, ⌃O, the + // arrows and this entry can reach. + private static IEnumerable Panes(ICommandContext context) + { + var paneCount = context.Workspace.Layout.Panes.Count; + if (paneCount <= 1) + { + yield break; + } + + for (var n = 1; n <= paneCount; n++) + { + yield return new CommandItem( + CommandGroup.Layout, + $"Go to pane {n}", + CommandIds.Pane(n), + n <= CommandIds.PaneJumpDigits ? $"⌃B {n}" : null); + } + } + + private static IEnumerable Screens(ICommandContext context) => + context.Settings.Select(screen => + new CommandItem(CommandGroup.Settings, $"Open {screen.Title}", screen.Id, screen.Shortcut)); +} diff --git a/src/SharpMUTerm.Client/Contributions/Commands.cs b/src/SharpMUTerm.Client/Contributions/Commands.cs new file mode 100644 index 00000000..eab4b5e8 --- /dev/null +++ b/src/SharpMUTerm.Client/Contributions/Commands.cs @@ -0,0 +1,300 @@ +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Core.Workspaces; + +namespace SharpMUTerm.Client.Contributions; + +/// A key whose chord differs between hosts. Each host says how it spells each one (). +public enum HostKey +{ + /// The chord that inserts a newline in the command line: ⌥⏎ in a terminal, ⌃⏎ in the desktop window. + Newline, +} + +/// +/// How the running host names its s on an in-app surface. Supplied by the host (the Tui +/// reads it off ClientHost.Keys), never guessed here, so a surface cannot name another host's chord. +/// +/// The newline chord as a surface writes it (Alt+⏎). +public sealed record HostKeyGlyphs(string Newline) +{ + /// A terminal's spelling, for a caller that has no host to ask (a test of the catalog alone). + public static HostKeyGlyphs Terminal { get; } = new("Alt+⏎"); + + /// The glyph for . + public string Glyph(HostKey key) => key switch + { + HostKey.Newline => Newline, + _ => throw new ArgumentOutOfRangeException(nameof(key), key, null), + }; +} + +/// +/// The key that runs a command, as a surface names it: either the same on every host (⌥R, ⌃B |, +/// F1) or a each host spells its own way. +/// +public sealed record KeyHint +{ + private KeyHint(string? glyph, HostKey? hostKey) + { + Fixed = glyph; + Host = hostKey; + } + + /// The glyph, when it is the same on every host. + public string? Fixed { get; } + + /// The host key, when each host spells it differently. + public HostKey? Host { get; } + + /// A chord spelt the same on every host. + public static KeyHint Of(string glyph) + { + ArgumentException.ThrowIfNullOrWhiteSpace(glyph); + return new KeyHint(glyph, null); + } + + /// A chord each host spells its own way. + public static KeyHint ForHost(HostKey key) => new(null, key); + + /// The glyph on the host whose spellings are . + public string Resolve(HostKeyGlyphs keys) + { + ArgumentNullException.ThrowIfNull(keys); + return Fixed ?? keys.Glyph(Host!.Value); + } + + /// Lets a literal stand for a fixed hint: Key = "⌥R". + public static implicit operator KeyHint(string glyph) => Of(glyph); +} + +/// +/// What a command reads to decide whether it is offered and what it is called right now. A host supplies one +/// each time the catalog is built or a command is run. Kept small on purpose: a command's work is +/// done by its own delegate, which closes over whatever it needs; this is only the state every surface shares. +/// +public interface ICommandContext +{ + /// The stateful flags (logging, zoom, freeze, …) the catalog's labels read. + CommandContext State { get; } + + /// The workspace: windows, panes, focus. + Workspace Workspace { get; } + + /// Every configured character, in the order the connection rail draws them. + IReadOnlyList Characters { get; } + + /// The session key of the character the surface is acting on, or null. + string? FocusedSessionKey { get; } + + /// The settings screens the host offers, in its F-key order. + IReadOnlyList Settings { get; } + + /// How this host spells the keys that differ between hosts. + HostKeyGlyphs Keys { get; } +} + +/// A plain : every value given up front. +public sealed record CommandEnvironment( + CommandContext State, + Workspace Workspace, + IReadOnlyList Characters, + string? FocusedSessionKey, + IReadOnlyList Settings, + HostKeyGlyphs Keys) : ICommandContext; + +/// +/// Commands are the actions the command surface (⌃P) lists, searches and runs, and that a pointer menu +/// offers by id. A contribution is one of two shapes: a , one entry with a fixed id, +/// or a , a set of entries generated from live state (one per character, window or +/// pane) whose ids share a prefix. Either way the surface sees s, in registration order. +/// +public abstract class CommandContribution : IContribution +{ + /// + public required string Id { get; init; } + + /// + public ContributionOwner Owner { get; init; } = ContributionOwner.BuiltIn; + + /// The entries this contribution offers right now. + public abstract IEnumerable Entries(ICommandContext context); + + /// Whether a command id is one this contribution runs. Asked without a context: an id is the whole address. + public abstract bool Handles(string commandId); + + /// + /// Runs the command with this id. Availability is not checked: a surface offers what is available, + /// but an id that arrives another way (a rail row, a key, the opposite half of a stateful pair) still runs. + /// Returns false when it did not do what its label promised. + /// + public abstract bool Execute(string commandId, ICommandContext context); +} + +/// One command with a fixed id: a title, the group it is listed under, the key that runs it and when it is offered. +public sealed class SingleCommand : CommandContribution +{ + /// What the surface calls it. + public required string Title { get; init; } + + /// A title that depends on state, used instead of when set (a toggle that names its next state). + public Func? TitleFor { get; init; } + + /// The group it is listed under. + public required CommandGroup Category { get; init; } + + /// The key that runs it, on each host; null when nothing but the surface does. + public KeyHint? Key { get; init; } + + /// A few words on what it does, shown beside the key. + public string? Detail { get; init; } + + /// Whether the subtitle reads detail · key rather than the usual key · detail. + public bool DetailFirst { get; init; } + + /// Whether it is offered right now; null means always. + public Func? IsAvailable { get; init; } + + /// Does the work. Returns false when it did not do what its label promised. + public required Func Run { get; init; } + + /// The subtitle the surface shows: the key and the detail, joined. + public string? SubtitleFor(ICommandContext context) + { + var key = Key?.Resolve(context.Keys); + return (key, Detail) switch + { + (null, null) => null, + (null, { } detail) => detail, + ({ } k, null) => k, + ({ } k, { } detail) => DetailFirst ? $"{detail} · {k}" : $"{k} · {detail}", + }; + } + + /// + public override IEnumerable Entries(ICommandContext context) + { + if (IsAvailable is null || IsAvailable(context)) + { + yield return new CommandItem(Category, TitleFor?.Invoke(context) ?? Title, Id, SubtitleFor(context)); + } + } + + /// + public override bool Handles(string commandId) => string.Equals(commandId, Id, StringComparison.Ordinal); + + /// + public override bool Execute(string commandId, ICommandContext context) => Run(context); +} + +/// +/// A set of commands generated from live state — one per character, window, pane or settings screen — whose +/// ids all start with . names the family itself and is +/// never a command id. +/// +public sealed class CommandFamily : CommandContribution +{ + /// The prefix every id this family emits starts with, and so every id it runs. + public required string IdPrefix { get; init; } + + /// Generates the entries from the current state. + public required Func> Generate { get; init; } + + /// Runs one of the family's ids. + public required Func Run { get; init; } + + /// + public override IEnumerable Entries(ICommandContext context) => Generate(context); + + /// + public override bool Handles(string commandId) => commandId.StartsWith(IdPrefix, StringComparison.Ordinal); + + /// + public override bool Execute(string commandId, ICommandContext context) => Run(commandId, context); +} + +/// +/// The registry's commands: builds the catalog the surface lists, and finds the contribution that runs an id. +/// A single command's id may not fall under a family's prefix, and one family's prefix may not contain +/// another's, so every id has exactly one contribution that runs it. +/// +public sealed class CommandList : ContributionList +{ + internal CommandList() + : base(ContributionKind.Command) + { + } + + /// Every entry every contribution offers right now, in registration order. + public IReadOnlyList Catalog(ICommandContext context) + { + ArgumentNullException.ThrowIfNull(context); + var items = new List(); + foreach (var contribution in this) + { + items.AddRange(contribution.Entries(context)); + } + + return items; + } + + /// The contribution that runs : an exact single command first, else the family whose prefix it has. + public CommandContribution? Resolve(string commandId) + { + ArgumentNullException.ThrowIfNull(commandId); + if (Find(commandId) is SingleCommand single) + { + return single; + } + + return this.OfType().FirstOrDefault(f => f.Handles(commandId)); + } + + /// + /// Runs through the contribution that handles it. Returns false, and sets + /// false, when nothing does. + /// + public bool TryExecute(string commandId, ICommandContext context, out bool handled) + { + var contribution = Resolve(commandId); + handled = contribution is not null; + return contribution is not null && contribution.Execute(commandId, context); + } + + /// + protected override void Validate(CommandContribution contribution) + { + switch (contribution) + { + case SingleCommand single: + ArgumentException.ThrowIfNullOrWhiteSpace(single.Title); + if (this.OfType().FirstOrDefault(f => f.Handles(single.Id)) is { } owning) + { + throw new ArgumentException( + $"the command id '{single.Id}' falls under the family '{owning.Id}' ({owning.IdPrefix})", + nameof(contribution)); + } + + break; + case CommandFamily family: + ArgumentException.ThrowIfNullOrWhiteSpace(family.IdPrefix); + foreach (var other in this) + { + var clash = other switch + { + SingleCommand s => family.Handles(s.Id), + CommandFamily f => f.IdPrefix.StartsWith(family.IdPrefix, StringComparison.Ordinal) + || family.IdPrefix.StartsWith(f.IdPrefix, StringComparison.Ordinal), + _ => false, + }; + if (clash) + { + throw new ArgumentException( + $"the family '{family.Id}' ({family.IdPrefix}) overlaps '{other.Id}'", + nameof(contribution)); + } + } + + break; + } + } +} diff --git a/src/SharpMUTerm.Client/Contributions/ContributionList.cs b/src/SharpMUTerm.Client/Contributions/ContributionList.cs new file mode 100644 index 00000000..b9c30cce --- /dev/null +++ b/src/SharpMUTerm.Client/Contributions/ContributionList.cs @@ -0,0 +1,91 @@ +using System.Collections; + +namespace SharpMUTerm.Client.Contributions; + +/// +/// One kind's contributions, in registration order. Registration order is the order every reader sees unless +/// the kind defines its own (a settings section's Order, a status cell's DropOrder), and ties +/// there are broken by registration order too, so the same registrations always read back the same way. +/// +/// Registered and read on the client's UI thread. It is not a concurrent collection. +/// +/// +/// The contribution type. +public class ContributionList : IReadOnlyList + where T : class, IContribution +{ + private readonly List _items = new(); + private readonly Dictionary _byId = new(StringComparer.Ordinal); + + internal ContributionList(ContributionKind kind) => Kind = kind; + + /// The kind this list holds. + public ContributionKind Kind { get; } + + /// + public int Count => _items.Count; + + /// + public T this[int index] => _items[index]; + + /// + /// Adds a contribution after every one already registered. + /// + /// The id is empty, or another contribution of this kind already has it. + public void Add(T contribution) + { + ArgumentNullException.ThrowIfNull(contribution); + ArgumentException.ThrowIfNullOrWhiteSpace(contribution.Id); + ArgumentNullException.ThrowIfNull(contribution.Owner); + if (_byId.TryGetValue(contribution.Id, out var existing)) + { + throw new ArgumentException( + $"a {Kind} with the id '{contribution.Id}' is already registered by {existing.Owner}", + nameof(contribution)); + } + + Validate(contribution); + _items.Add(contribution); + _byId.Add(contribution.Id, contribution); + } + + /// The contribution with this id, or null. + public T? Find(string id) => _byId.GetValueOrDefault(id); + + /// Whether a contribution has this id. + public bool Contains(string id) => _byId.ContainsKey(id); + + /// Removes every contribution this owner registered, keeping the order of the rest. Returns how many went. + public int RemoveOwnedBy(ContributionOwner owner) + { + ArgumentNullException.ThrowIfNull(owner); + var removed = _items.RemoveAll(c => c.Owner == owner); + if (removed > 0) + { + foreach (var id in _byId.Where(p => p.Value.Owner == owner).Select(p => p.Key).ToList()) + { + _byId.Remove(id); + } + } + + return removed; + } + + /// A further check a kind makes before accepting a contribution; throw to refuse it. + protected virtual void Validate(T contribution) + { + } + + /// The contributions sorted by , ties left in registration order. + protected IReadOnlyList SortedBy(Func key) => + _items.Select((item, index) => (item, index)) + .OrderBy(p => key(p.item)) + .ThenBy(p => p.index) + .Select(p => p.item) + .ToList(); + + /// + public IEnumerator GetEnumerator() => _items.GetEnumerator(); + + IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); +} diff --git a/src/SharpMUTerm.Client/Contributions/ContributionOwner.cs b/src/SharpMUTerm.Client/Contributions/ContributionOwner.cs new file mode 100644 index 00000000..93546311 --- /dev/null +++ b/src/SharpMUTerm.Client/Contributions/ContributionOwner.cs @@ -0,0 +1,61 @@ +namespace SharpMUTerm.Client.Contributions; + +/// +/// Who put a contribution into the registry: the client itself (), or a package, named by +/// its id. The owner is what lets a disabled or removed package take every one of its contributions with it +/// () without touching anything the client registered. +/// +/// The package's id, or null for the client's own contributions. +public sealed record ContributionOwner(string? PackageId) +{ + /// The client's own contributions. + public static ContributionOwner BuiltIn { get; } = new((string?)null); + + /// A contribution from the package with this id. + public static ContributionOwner Package(string packageId) + { + ArgumentException.ThrowIfNullOrWhiteSpace(packageId); + return new ContributionOwner(packageId); + } + + /// Whether this is the client's own. + public bool IsBuiltIn => PackageId is null; + + /// + public override string ToString() => PackageId is null ? "built-in" : $"package:{PackageId}"; +} + +/// +/// The six kinds of thing a host's views read from the registry. Each kind has its own list in +/// , and ids are unique within a kind. +/// +public enum ContributionKind +{ + /// An action the command surface (⌃P) lists and a pointer menu can offer. See . + Command, + + /// A view of data the client holds (game data, the map). See . + Panel, + + /// A group of fields on a settings screen. See . + SettingsSection, + + /// A cell of the status row. See . + StatusCell, + + /// A modal surface drawn over the workspace. See . + Overlay, + + /// A step that changes a line of output on its way to a pane. See . + OutputDecorator, +} + +/// What every contribution has: an id unique within its kind, and an owner. +public interface IContribution +{ + /// The stable id. Unique within the contribution's kind; a second registration under it is refused. + string Id { get; } + + /// Who registered it. + ContributionOwner Owner { get; } +} diff --git a/src/SharpMUTerm.Client/Contributions/ContributionRegistry.cs b/src/SharpMUTerm.Client/Contributions/ContributionRegistry.cs new file mode 100644 index 00000000..f6579d07 --- /dev/null +++ b/src/SharpMUTerm.Client/Contributions/ContributionRegistry.cs @@ -0,0 +1,49 @@ +namespace SharpMUTerm.Client.Contributions; + +/// +/// Everything the client's surfaces list, held in one place so that a host's views read it rather than each +/// keeping its own copy, and so that a package (or a host) can add to it. Six kinds, one list each: +/// +/// : actions the command surface (⌃P) lists and runs, and a pointer menu offers by id. +/// : views of data the client holds for a connection (game data, the map). +/// : groups of field descriptors on a settings screen. +/// : segments of the status row, each with a reserved width and a drop order. +/// : modal surfaces over the workspace. +/// : steps that change a line of output on its way to a pane. +/// +/// Every contribution has a stable id, unique within its kind (a duplicate is refused), and an owner, the +/// client or a package. Order is registration order unless a kind says otherwise, and always deterministic. +/// +/// UI-agnostic: nothing here draws. The terminal reads it through SharpConsoleUI views, and the desktop +/// window will read the same registry through its own. +/// +/// +public sealed class ContributionRegistry +{ + /// Actions the command surface lists and a pointer menu offers. + public CommandList Commands { get; } = new(); + + /// Views of data the client holds. + public ContributionList Panels { get; } = new(ContributionKind.Panel); + + /// Groups of settings fields. + public SettingsSectionList SettingsSections { get; } = new(); + + /// Segments of the status row. + public StatusCellList StatusCells { get; } = new(); + + /// Modal surfaces over the workspace. + public ContributionList Overlays { get; } = new(ContributionKind.Overlay); + + /// Steps that change a line of output on its way to a pane. + public OutputDecoratorList OutputDecorators { get; } = new(); + + /// Removes every contribution of every kind this owner registered. Returns how many went. + public int RemoveOwnedBy(ContributionOwner owner) => + Commands.RemoveOwnedBy(owner) + + Panels.RemoveOwnedBy(owner) + + SettingsSections.RemoveOwnedBy(owner) + + StatusCells.RemoveOwnedBy(owner) + + Overlays.RemoveOwnedBy(owner) + + OutputDecorators.RemoveOwnedBy(owner); +} diff --git a/src/SharpMUTerm.Client/Contributions/Descriptors.cs b/src/SharpMUTerm.Client/Contributions/Descriptors.cs new file mode 100644 index 00000000..9590c05f --- /dev/null +++ b/src/SharpMUTerm.Client/Contributions/Descriptors.cs @@ -0,0 +1,193 @@ +using SharpMUTerm.Core.Text; + +namespace SharpMUTerm.Client.Contributions; + +/// +/// Panels are views of data the client holds for a connection — the game data, the map, a package's own +/// readout. A host decides how to draw one (an overlay in the terminal, a docked pane in the window); the +/// contribution says what it is called and whether there is anything to show yet. +/// +public sealed class PanelContribution : IContribution +{ + /// + public required string Id { get; init; } + + /// + public ContributionOwner Owner { get; init; } = ContributionOwner.BuiltIn; + + /// What the panel is called. + public required string Title { get; init; } + + /// + /// Whether there is data to show for the connection with this session key (null: none is focused). A host + /// can offer an empty panel all the same; this lets it say so rather than draw a blank. + /// + public Func HasData { get; init; } = _ => true; +} + +/// +/// Settings sections are groups of fields on a settings screen. This slice carries the descriptors only; +/// nothing renders them yet. Sections are read in , ties in registration order. +/// +public sealed class SettingsSectionContribution : IContribution +{ + /// + public required string Id { get; init; } + + /// + public ContributionOwner Owner { get; init; } = ContributionOwner.BuiltIn; + + /// The section's heading. + public required string Title { get; init; } + + /// Where it sits among the sections; lower first. + public int Order { get; init; } + + /// Its fields, in the order they are shown. + public IReadOnlyList Fields { get; init; } = Array.Empty(); +} + +/// One field of a settings section: its id within the section, its label and an optional line of help. +public abstract record SettingsField(string Id, string Label, string? Help = null); + +/// A tick box. +public sealed record BoolField(string Id, string Label, string? Help = null) : SettingsField(Id, Label, Help); + +/// One of a closed set of values. +public sealed record ChoiceField(string Id, string Label, IReadOnlyList Choices, string? Help = null) + : SettingsField(Id, Label, Help); + +/// A whole number within bounds. +public sealed record NumberField(string Id, string Label, int Minimum, int Maximum, string? Help = null) + : SettingsField(Id, Label, Help); + +/// Free text; for a password. +public sealed record TextField(string Id, string Label, int? MaxLength = null, bool Masked = false, string? Help = null) + : SettingsField(Id, Label, Help); + +/// A colour from a named palette (never a free hex: a name survives a theme change, a hex does not). +public sealed record ColourField(string Id, string Label, IReadOnlyList Names, string? Help = null) + : SettingsField(Id, Label, Help); + +/// A list of items, each described by 's fields. +public sealed record ListField(string Id, string Label, IReadOnlyList Item, string? Help = null) + : SettingsField(Id, Label, Help); + +/// +/// Status cells are the segments of the status row. Every cell reserves its width whether or not it has +/// anything to say, because a cell that costs a column only when it speaks reflows the row (and, through the +/// panes, the size every server is told). When the row is too narrow, cells go in : +/// the highest first, ties the most recently registered first. +/// +public sealed class StatusCellContribution : IContribution +{ + /// + public required string Id { get; init; } + + /// + public ContributionOwner Owner { get; init; } = ContributionOwner.BuiltIn; + + /// Which goes first when the row runs out of room; higher goes sooner. + public int DropOrder { get; init; } + + /// The cells it holds whether or not it has text. + public required int ReservedWidth { get; init; } + + /// Its text now, or null for blank. Never wider than once drawn. + public Func? Text { get; init; } +} + +/// +/// Overlays are modal surfaces drawn over the workspace (⌃P, ⌃R, ⌃F, the composer). Minimal for now: an +/// id, a title, and the command that opens it, so a surface can list it. +/// +public sealed class OverlayContribution : IContribution +{ + /// + public required string Id { get; init; } + + /// + public ContributionOwner Owner { get; init; } = ContributionOwner.BuiltIn; + + /// What it is called. + public required string Title { get; init; } + + /// The command id that opens it, if one does. + public string? OpenedBy { get; init; } +} + +/// +/// Output decorators change a line of output on its way to a pane — link detection and emoji +/// substitution are the client's own. Run in , lowest first, ties in registration order. +/// Minimal for now; nothing runs them yet. +/// +public sealed class OutputDecoratorContribution : IContribution +{ + /// + public required string Id { get; init; } + + /// + public ContributionOwner Owner { get; init; } = ContributionOwner.BuiltIn; + + /// Where it runs among the decorators; lower first. + public int Order { get; init; } + + /// The change, or null for a descriptor that only names one. + public Func? Apply { get; init; } +} + +/// Settings sections, readable in their declared order. +public sealed class SettingsSectionList : ContributionList +{ + internal SettingsSectionList() + : base(ContributionKind.SettingsSection) + { + } + + /// The sections by , ties in registration order. + public IReadOnlyList Ordered => SortedBy(s => s.Order); + + /// + protected override void Validate(SettingsSectionContribution contribution) + { + var duplicate = contribution.Fields.GroupBy(f => f.Id, StringComparer.Ordinal).FirstOrDefault(g => g.Count() > 1); + if (duplicate is not null) + { + throw new ArgumentException( + $"the section '{contribution.Id}' has two fields with the id '{duplicate.Key}'", nameof(contribution)); + } + } +} + +/// Status cells, readable in the order they are given up. +public sealed class StatusCellList : ContributionList +{ + internal StatusCellList() + : base(ContributionKind.StatusCell) + { + } + + /// The cells in the order they go when the row is too narrow: highest drop order first, then the newest. + public IReadOnlyList InDropOrder => + this.Select((cell, index) => (cell, index)) + .OrderByDescending(p => p.cell.DropOrder) + .ThenByDescending(p => p.index) + .Select(p => p.cell) + .ToList(); + + /// + protected override void Validate(StatusCellContribution contribution) => + ArgumentOutOfRangeException.ThrowIfNegative(contribution.ReservedWidth); +} + +/// Output decorators, readable in the order they run. +public sealed class OutputDecoratorList : ContributionList +{ + internal OutputDecoratorList() + : base(ContributionKind.OutputDecorator) + { + } + + /// The decorators by , ties in registration order. + public IReadOnlyList Ordered => SortedBy(d => d.Order); +} diff --git a/src/SharpMUTerm.Client/SharpMUTerm.Client.csproj b/src/SharpMUTerm.Client/SharpMUTerm.Client.csproj new file mode 100644 index 00000000..62aa7329 --- /dev/null +++ b/src/SharpMUTerm.Client/SharpMUTerm.Client.csproj @@ -0,0 +1,17 @@ + + + + + SharpMUTerm.Client + SharpMUTerm.Client + + + + + + + diff --git a/src/SharpMUTerm.Core/Commands/CommandCatalog.cs b/src/SharpMUTerm.Core/Commands/CommandCatalog.cs index 4ce9af1b..69dd79ae 100644 --- a/src/SharpMUTerm.Core/Commands/CommandCatalog.cs +++ b/src/SharpMUTerm.Core/Commands/CommandCatalog.cs @@ -1,5 +1,3 @@ -using SharpMUTerm.Core.Workspaces; - namespace SharpMUTerm.Core.Commands; /// A character the command surface can switch to, with enough detail to label the entry. @@ -68,12 +66,10 @@ public sealed record CommandContext( public sealed record SettingsEntry(string Title, string Id, string Shortcut); /// -/// Generates the command-surface catalog from live state, per the design: every non-focused -/// character becomes a Switch to… entry, every non-active window a Go to… entry -/// subtitled with its owner and unread count, stateful commands read their current value -/// (Pause logging vs Start logging, Unzoom pane, Resume scrollback), and -/// every configuration screen the host offers becomes an Open … entry subtitled with its key. -/// Pure so the exact catalog is unit-testable; ranks it against a query. +/// What the command surface's catalog shares with the shell outside it. The catalog itself is no longer +/// built here: its entries are contributions in SharpMUTerm.Client's registry +/// (BuiltInCommands), so a package or a host can add to it. The character cycle stays here because the +/// shell's ⌥J/⌥K and the rail read it too. /// public static class CommandCatalog { @@ -100,314 +96,4 @@ public static List CharacterCycle(IReadOnlyList char ArgumentNullException.ThrowIfNull(characters); return characters.Where(c => c.Open).ToList(); } - - public static IReadOnlyList Build( - Workspace workspace, - IReadOnlyList characters, - string? focusedSessionKey, - CommandContext context, - IReadOnlyList? settings = null) - { - ArgumentNullException.ThrowIfNull(workspace); - ArgumentNullException.ThrowIfNull(characters); - ArgumentNullException.ThrowIfNull(context); - - var items = new List(); - var activeWindow = workspace.Layout.FocusedPane.ActiveTab; - - // GO TO — switch character, then jump to windows. - // - // The two neighbours in the character cycle carry its chords. Only those two: ⌥J and ⌥K move one - // step, so they are the honest answer for the rows either side of you and a lie for anybody - // further away. There is deliberately no direct-selection chord to put on the rest — the digit - // row is spent on windows and panes, and every remaining digit-bearing modifier (⌥⇧, ⌃⇧) has no - // legacy encoding at all on this terminal, which was measured rather than assumed. - var cycle = CharacterCycle(characters); - var here = cycle.FindIndex(c => c.SessionKey == focusedSessionKey); - var next = here >= 0 && cycle.Count > 1 ? cycle[(here + 1) % cycle.Count].SessionKey : null; - var previous = here >= 0 && cycle.Count > 1 - ? cycle[(here - 1 + cycle.Count) % cycle.Count].SessionKey - : null; - - foreach (var character in characters) - { - if (character.SessionKey == focusedSessionKey) - { - continue; - } - - var state = character.Connected ? "connected" : "offline"; - var chord = character.SessionKey == next ? "⌥J · " - : character.SessionKey == previous ? "⌥K · " - : string.Empty; - items.Add(new CommandItem( - CommandGroup.GoTo, - $"Switch to {character.CharacterName}", - CommandIds.Character(character.SessionKey), - $"{chord}{character.WorldName} · {state}")); - } - - // The chord each window's entry names, from the one place windows are numbered — the *focused* - // character's list, because that is what ⌥N indexes. A window belonging to somebody else has no - // chord from here and correctly gets none: pressing ⌥2 would reach the focused character's second - // window, not this entry, and an entry naming a key that goes elsewhere is the defect the - // numbering exists to prevent. Built as a lookup rather than read per entry because the entries - // walk the whole registry, including windows no pane holds. - var windowOrdinals = new Dictionary(StringComparer.Ordinal); - var reachable = workspace.WindowsFor(focusedSessionKey); - for (var i = 0; i < reachable.Count && i < CommandIds.WindowJumpDigits; i++) - { - windowOrdinals[reachable[i].Id] = i + 1; - } - - foreach (var window in workspace.Windows) - { - if (window.Id == activeWindow) - { - continue; - } - - var owner = window.SessionKey ?? "unowned"; - var unread = window.Unread > 0 ? $" · {window.Unread} unread" : string.Empty; - - // The chord leads, because it is the part a reader is here to learn — the owner and the count - // describe the window and this says how to reach it without the surface at all. Windows past - // the ninth get the same subtitle minus the chord, rather than one naming a key that would do - // something else. - var chord = windowOrdinals.TryGetValue(window.Id, out var ordinal) ? $"⌥{ordinal} · " : string.Empty; - items.Add(new CommandItem( - CommandGroup.GoTo, - $"Go to {window.Title}", - CommandIds.Window(window.Id), - $"{chord}{owner}{unread}")); - } - - // WORLD - // Both carry their chord. The surface is where this client is discovered from, and a key nobody - // can find is the same as no feature — ⌃L's newline sat unused until it was reported missing. - items.Add(new CommandItem(CommandGroup.World, "Reconnect", "world:reconnect", "⌥R")); - items.Add(new CommandItem(CommandGroup.World, "Disconnect", "world:disconnect", "⌥D")); - // The send group: one line to several characters. Offered once two characters are open, since a - // group of one is the command line. - var open = characters.Where(c => c.Open).ToList(); - if (open.Count > 1 || characters.Any(c => c.InGroup)) - { - foreach (var character in open) - { - items.Add(new CommandItem( - CommandGroup.World, - character.InGroup - ? $"Remove {character.CharacterName} from the send group" - : $"Add {character.CharacterName} to the send group", - CommandIds.GroupToggle(character.SessionKey), - character.WorldName)); - } - - var members = characters.Count(c => c.InGroup); - if (members > 0) - { - items.Add(new CommandItem( - CommandGroup.World, - "Send the command line to the group", - CommandIds.GroupSend, - members == 1 ? "1 character" : $"{members} characters")); - items.Add(new CommandItem(CommandGroup.World, "Clear the send group", CommandIds.GroupClear)); - } - } - - if (context.ScriptsOn) - { - items.Add(new CommandItem( - CommandGroup.World, "Reload scripts", "world:reload-scripts", "re-reads this character's Lua files")); - } - - // Only where the host has a screen reader to tell: the window's live region, or --plain. - if (context.Announced is { } announced) - { - items.Add(announced - ? new CommandItem(CommandGroup.Terminal, "Stop reading this window aloud", "a11y:toggle-window") - : new CommandItem(CommandGroup.Terminal, "Read this window aloud", "a11y:toggle-window")); - } - - // TERMINAL — stateful labels. - items.Add(context.LoggingOn - ? new CommandItem(CommandGroup.Terminal, "Pause logging", "term:log-off") - : new CommandItem(CommandGroup.Terminal, "Start logging", "term:log-on")); - items.Add(context.Frozen - ? new CommandItem(CommandGroup.Terminal, "Resume scrollback", "term:unfreeze") - : new CommandItem(CommandGroup.Terminal, "Freeze pane", "term:freeze")); - items.Add(new CommandItem(CommandGroup.Terminal, "Clear window", "term:clear")); - - // Scrollback position. Here as well as on the keyboard because this surface is where the client - // is discovered from — every other thing you can do to an output window is listed here — and the - // subtitles are how the keys get taught: a pane that scrolls and says so nowhere is a pane - // nobody scrolls. The "back" entry appears only when there is somewhere to come back from. - items.Add(new CommandItem( - CommandGroup.Terminal, "Scroll to oldest", "term:scroll-oldest", "⌃Home · PgUp pages back")); - if (context.ScrolledBack) - { - items.Add(new CommandItem( - CommandGroup.Terminal, "Back to live output", "term:scroll-live", "⌃End")); - } - - // The restore log's one control that is not a settings field. It is listed unconditionally, and - // it is listed *here* rather than only on F9, because "delete what this client has written down - // about my session" is a thing a person wants to do now — after saying something they would - // rather was not on disk — and a purge you have to find in a settings screen is a purge that - // happens tomorrow. The per-character switch on F9 is the other half: this one is immediate and - // total, that one is a standing preference. - items.Add(new CommandItem( - CommandGroup.Terminal, - "Purge the restore log", - "term:restore-purge", - "deletes every pane's saved content")); - - // Copying output. Listed unconditionally and subtitled with the *gesture* as well as the chord, - // because the gesture is the part nobody can guess: under mouse reporting a plain drag belongs to - // the application, so a user who has learnt that their terminal needs ⇧-drag has no reason to try - // dragging here. It refuses out loud with nothing selected, which is what earns it a row at all. - items.Add(new CommandItem( - CommandGroup.Terminal, "Copy the selection", "term:copy", "⌃C · drag across a pane or the command line, or ⇧← ⇧→ there")); - - // The client's own messages — the status-line notices that dismiss themselves — kept out of the - // output window (and so out of the session log) and readable here instead. - items.Add(new CommandItem( - CommandGroup.Terminal, "Show client messages", "term:messages", "status-line notices")); - - // What the server is sending out of band. Listed unconditionally: a meter or a script is written - // against a GMCP path, and this is where a player finds out which paths their game has. - items.Add(new CommandItem( - CommandGroup.Terminal, "Show game data", "term:gamedata", "GMCP and MSDP this connection holds")); - - // The map. Listed unconditionally, like the game data above: a map is recorded from the first room a - // game reports, and nothing else on screen says the client keeps one. - items.Add(new CommandItem( - CommandGroup.Terminal, "Show map", "term:map", "this connection's map · click a room, or /walk ")); - if (context.Walking) - { - items.Add(new CommandItem(CommandGroup.Terminal, "Stop walking", "term:walk-stop", "ends the speedwalk")); - } - - // Game sound, for this run. The levels and the off switch are F7's; this is the quick one. - if (context.Sound is { } playing) - { - items.Add(playing - ? new CommandItem(CommandGroup.Terminal, "Mute sound", "term:mute", "until unmuted or restarted") - : new CommandItem(CommandGroup.Terminal, "Unmute sound", "term:unmute", "game sound is muted")); - } - - // The command line's own history, browsable and searchable. Named here as well as bound to ⌃R - // because a chord nothing mentions is a chord nobody finds — the same reason every settings screen - // has a row even though each has an F-key. - items.Add(new CommandItem( - CommandGroup.Terminal, "Search command history", "term:history", "⌃R")); - - // The composer. Named here as well as bound to F1 for the reason the row above it is: a surface - // nobody can find is a surface nobody uses, and this one is not something a reader would guess - // at from the command line in front of them. - items.Add(new CommandItem( - CommandGroup.Terminal, "Compose a post", "term:compose", "F1 · a full editor, sent as one line")); - - // Packages: the list, and the install that starts at the review. F10 can be taken by a terminal's - // own menu key (GNOME Terminal), so this surface is the way in that always works. - items.Add(new CommandItem( - CommandGroup.Terminal, "Packages", "term:packages", "F10 · installed packages, on/off, remove")); - items.Add(new CommandItem( - CommandGroup.Terminal, "Install package…", "term:package-install", "from a file or an https link")); - items.Add(new CommandItem( - CommandGroup.Terminal, "Browse packages", "term:package-browse", "the package index, this game's first")); - items.Add(context.TimestampsOn - ? new CommandItem(CommandGroup.Terminal, "Hide timestamps", "term:timestamps-off") - : new CommandItem(CommandGroup.Terminal, "Show timestamps", "term:timestamps-on")); - items.Add(context.SecondInputOn - ? new CommandItem( - CommandGroup.Terminal, "Hide second input", "term:input2-off", "this window · ⌃B i") - : new CommandItem( - CommandGroup.Terminal, "Show second input", "term:input2-on", "this window · ⌃B i")); - - // The newline chord. Here for the same reason the scrollback keys are: a chord that works and is - // named nowhere is a chord nobody finds, which is precisely how this one was reported as missing. - // The host says which chord it is: a terminal reports Shift+⏎ and Ctrl+⏎ as a bare ⏎, so there it is - // Alt+⏎, and a window keeps Alt+⏎ for itself, so there it is Ctrl+⏎. - items.Add(new CommandItem( - CommandGroup.Terminal, "Insert a newline in the command line", "term:newline", context.NewlineChord)); - - // LAYOUT — every entry carries the chord that runs it, because this surface is where the client - // is discovered from and the ⌃B keymap is otherwise visible only while the prefix is armed. - items.Add(new CommandItem(CommandGroup.Layout, "Split right", "layout:split-right", "⌃B |")); - items.Add(new CommandItem(CommandGroup.Layout, "Split down", "layout:split-down", "⌃B -")); - items.Add(context.Zoomed - ? new CommandItem(CommandGroup.Layout, "Unzoom pane", "layout:unzoom", "⌃B z") - : new CommandItem(CommandGroup.Layout, "Zoom pane", "layout:zoom", "⌃B z")); - items.Add(new CommandItem(CommandGroup.Layout, "Close pane", "layout:close", "⌃B x")); - - // Directional pane focus. Listed whether or not the workspace has a second pane, deliberately: - // this is the surface that teaches the keyboard, and the entries are how a reader learns the - // workspace splits at all. Each refuses out loud when there is nothing that way. - items.Add(new CommandItem(CommandGroup.Layout, "Focus pane left", "layout:focus-left", "⌃←")); - items.Add(new CommandItem(CommandGroup.Layout, "Focus pane right", "layout:focus-right", "⌃→")); - items.Add(new CommandItem(CommandGroup.Layout, "Focus pane up", "layout:focus-up", "⌃↑")); - items.Add(new CommandItem(CommandGroup.Layout, "Focus pane down", "layout:focus-down", "⌃↓")); - items.Add(new CommandItem(CommandGroup.Layout, "Focus the next pane", "layout:cycle", "⌃O · ⌃B o")); - - // The tab cycle, beside the pane cycle it rhymes with. Listed unconditionally for the same reason - // the four directional entries above are: this surface is where the keyboard is learnt, and a - // reader whose panes each hold one window has no other way to find out that a pane holds tabs at - // all. ⌃N has always done this and was named on F4 and nowhere else. - // - // Listing it obliges it to answer, which the directional entries pay for by refusing out loud and - // this one did not — it returned in silence on a pane with one tab, which is what a dead key looks - // like. The refusal is the host's (SharpMUTermApp.NextWindow); the entry is only allowed to exist - // because it is there. - items.Add(new CommandItem(CommandGroup.Layout, "Focus the next tab", "layout:next-tab", "⌃N")); - - // Numbered pane jumps, one entry per pane that exists — the one group here that is *not* listed - // unconditionally, because "Go to pane 4" on a workspace with two panes names a place there is no - // way to make. The number is the one the move and drag overlays badge each pane with, so the entry - // and the digit a user is about to press in move mode are the same number. - // - // The chord is ⌃B N and no longer ⌥N: ⌥N names a *window* now, and a pane and a window are - // different destinations that cannot share one key. ⌃B is where the rest of the pane keymap lives. - // Only the first nine carry it, so a tenth pane gets an entry with no subtitle rather than one - // naming a key that does something else — the honest shape for a place only the mouse, ⌃O, the - // arrows and this entry can reach. - var paneCount = workspace.Layout.Panes.Count; - if (paneCount > 1) - { - for (var n = 1; n <= paneCount; n++) - { - items.Add(new CommandItem( - CommandGroup.Layout, - $"Go to pane {n}", - CommandIds.Pane(n), - n <= CommandIds.PaneJumpDigits ? $"⌃B {n}" : null)); - } - } - - // Pane size, in the plain words the request used ("increase/decrease a pane's horizontal or - // vertical character size") rather than in the chord's terms. Listed for the same reason the - // directional entries and the newline chord are: ⌥⇧+arrow is not a chord anybody guesses, and a - // feature reachable only by a chord nobody knows is the state ⌃L's newline sat in until it was - // reported as missing. Listed unconditionally too — each refuses out loud when the focused pane - // has no border to move that way, which is how a reader learns the workspace resizes at all. - // The arrow names what happens to *this* pane — ↑ taller, ↓ shorter — from either side of the - // split; it named the direction the divider travelled until that was reported as inverted. - items.Add(new CommandItem(CommandGroup.Layout, "Make this pane wider", "layout:wider", "⌥⇧→")); - items.Add(new CommandItem(CommandGroup.Layout, "Make this pane narrower", "layout:narrower", "⌥⇧←")); - items.Add(new CommandItem(CommandGroup.Layout, "Make this pane taller", "layout:taller", "⌥⇧↑")); - items.Add(new CommandItem(CommandGroup.Layout, "Make this pane shorter", "layout:shorter", "⌥⇧↓")); - - // SETTINGS — one entry per configuration screen, in the order the host lists them (its F-key - // order). Every screen or none: a surface offering one of them and hiding the rest would read - // as "this is the only thing you can configure", which is the state the surface was in before. - if (settings is not null) - { - foreach (var screen in settings) - { - items.Add(new CommandItem(CommandGroup.Settings, $"Open {screen.Title}", screen.Id, screen.Shortcut)); - } - } - - return items; - } } diff --git a/src/SharpMUTerm.Core/Commands/CommandIds.cs b/src/SharpMUTerm.Core/Commands/CommandIds.cs index e842ef53..c4378852 100644 --- a/src/SharpMUTerm.Core/Commands/CommandIds.cs +++ b/src/SharpMUTerm.Core/Commands/CommandIds.cs @@ -16,6 +16,12 @@ public static class CommandIds /// Prefix of a "go to this window" id; the remainder is a workspace window id. public const string WindowPrefix = "win:"; + /// Prefix of an "open this settings screen" id; the remainder is the screen's first view name. + public const string ScreenPrefix = "screen:"; + + /// Prefix every send-group id shares: the toggles, and . + public const string GroupPrefix = "group:"; + /// Prefix of an "add to / remove from the send group" id; the remainder is a session key. public const string GroupTogglePrefix = "group:toggle:"; diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs index 83641060..e30c0c38 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs @@ -535,7 +535,7 @@ private void AddCommands(List items, params string?[] ids) if (catalog.FirstOrDefault(c => c.Id == id) is { } command) { - items.Add(new PointerMenuItem(command.Title, ShortHint(command.Subtitle), () => OnUiThread(() => DispatchCommand(id)))); + items.Add(new PointerMenuItem(command.Title, MenuKeyHint(command), () => OnUiThread(() => DispatchCommand(id)))); } } } diff --git a/src/SharpMUTerm.Tui/SharpMUTerm.Tui.csproj b/src/SharpMUTerm.Tui/SharpMUTerm.Tui.csproj index 2926bfa8..4b4945b3 100644 --- a/src/SharpMUTerm.Tui/SharpMUTerm.Tui.csproj +++ b/src/SharpMUTerm.Tui/SharpMUTerm.Tui.csproj @@ -69,6 +69,7 @@ + diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Contributions.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Contributions.cs new file mode 100644 index 00000000..877d8b84 --- /dev/null +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Contributions.cs @@ -0,0 +1,94 @@ +using SharpMUTerm.Client.Commands; +using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Core.Workspaces; + +namespace SharpMUTerm.Tui; + +/// +/// The contribution registry this app reads its command surface from. The built-in commands are registered +/// at construction ( says what each is called and when it is offered; +/// does the work), and ⌃P, the pointer menu and every +/// read the registry rather than a list of their own — so a command a package or +/// a host adds is listed, searched, offered and run exactly as a built-in one is. +/// +internal sealed partial class SharpMUTermApp +{ + private readonly ContributionRegistry _contributions = new(); + + /// The registry the surfaces read. A host or a package adds to it; the views pick it up on their next read. + internal ContributionRegistry Contributions => _contributions; + + private void RegisterBuiltInContributions() => BuiltInCommands.Register(_contributions, RunBuiltInCommand); + + /// What a command reads right now. Each value is worked out only if something asks for it. + private ICommandContext CommandEnvironment() => new AppCommandContext(this); + + /// + /// Runs a command-surface entry by its id, through the contribution that handles it. Internal so a + /// headless test can dispatch an id the way the palette does, without opening the surface and typing at it. + /// + /// Returns for an id nothing implements, and says so on the status line — never + /// through _active: an unwired command is exactly what you hit while nothing is connected, and a + /// message that needs a session to be seen cannot report in the state it is being read in. + /// CommandDispatchTests dispatches every id the catalog can emit and fails on a false. + /// + /// + internal bool DispatchCommand(string id) + { + if (_contributions.Commands.Resolve(id) is not { } contribution) + { + RefuseCommand($"{id} isn't wired in this build yet"); + RefreshTabTitles(); + return false; + } + + if (contribution.Owner.IsBuiltIn) + { + return contribution.Execute(id, CommandEnvironment()); + } + + // A package's command is somebody else's code: a throw from it is reported, not allowed to take the + // UI thread down with it. + try + { + return contribution.Execute(id, CommandEnvironment()); + } + catch (Exception ex) + { + RefuseCommand($"{id} failed: {ex.Message}"); + return false; + } + } + + /// + /// The key a pointer menu shows for a command: the one the contribution names on this host, else the key + /// its catalog subtitle leads with (), for an entry a family generated. + /// + private string? MenuKeyHint(CommandItem command) => + _contributions.Commands.Resolve(command.Id) is SingleCommand { Key: { } key } + ? key.Resolve(HostKeyGlyphs()) + : ShortHint(command.Subtitle); + + private HostKeyGlyphs HostKeyGlyphs() => new(Host.Keys.Newline.Glyph); + + private sealed class AppCommandContext(SharpMUTermApp app) : ICommandContext + { + private CommandContext? _state; + private IReadOnlyList? _characters; + private IReadOnlyList? _settings; + private HostKeyGlyphs? _keys; + + public CommandContext State => _state ??= app.CommandState(); + + public Workspace Workspace => app._workspace; + + public IReadOnlyList Characters => _characters ??= app.BuildCharacterRefs(); + + public string? FocusedSessionKey => app._active?.SessionKey; + + public IReadOnlyList Settings => _settings ??= app.SettingsCommands(); + + public HostKeyGlyphs Keys => _keys ??= app.HostKeyGlyphs(); + } +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 8c187c52..f0a2be57 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -892,6 +892,7 @@ public SharpMUTermApp( // short with the input bar a row up, for good. _window.IsScrollable = false; + RegisterBuiltInContributions(); _palette = new CommandPalette(_system, BuildCatalog, () => _active?.SessionKey, id => DispatchCommand(id)); _messageLog = new MessageLogOverlay(_system, _diagnostics); _gameData = new GameDataOverlay(_system, _time); @@ -6462,7 +6463,7 @@ private IReadOnlyList SettingsCommands() => SettingsScreens() .ToList(); /// The command-surface id prefix for "open this settings screen". - private const string ScreenCommandPrefix = "screen:"; + private const string ScreenCommandPrefix = CommandIds.ScreenPrefix; /// /// Binds every chord the app claims globally: the window/pane commands, and each settings screen's @@ -7684,9 +7685,12 @@ private void RefreshRail() /// the SETTINGS group from that table is that the two cannot disagree, and only a test that reads /// both can say so. /// - internal IReadOnlyList BuildCatalog() + internal IReadOnlyList BuildCatalog() => _contributions.Commands.Catalog(CommandEnvironment()); + + /// The stateful flags the catalog's labels read, as they stand now. + private CommandContext CommandState() { - var context = new CommandContext( + return new CommandContext( LoggingOn: _active?.IsLogging == true, Zoomed: _workspace.Layout.ZoomedPaneId is not null, Frozen: _workspace.Layout.FocusedPane.Frozen, @@ -7698,8 +7702,6 @@ internal IReadOnlyList BuildCatalog() Walking: SendTarget() is { } walker && _recorders.TryGetValue(walker, out var map) && map.Walk.IsWalking, Sound: CanPlaySound ? !_muted : null, Announced: Host.Announcer is null ? null : IsAnnounced(ActiveWindowId())); - return CommandCatalog.Build( - _workspace, BuildCharacterRefs(), _active?.SessionKey, context, SettingsCommands()); } /// @@ -7947,9 +7949,9 @@ internal IReadOnlyList PaneLines(string windowId) => internal bool MessageLogIsOpen => _messageLog.IsOpen; /// - /// Runs a command-surface entry by its id, doing what the current shell supports. Internal so a - /// headless test can dispatch an id the way the palette does, without opening the surface and - /// typing at it. + /// Does the work for a built-in command id: the run every contribution + /// BuiltInCommands.Register makes is handed. reaches it through the + /// registry, which is what lets a package's or a host's command sit beside these. /// /// Returns for an id nothing here implements. That is not a nicety: the /// catalog is generated from live state and this is a hand-written switch, so the two drift in @@ -7958,7 +7960,7 @@ internal IReadOnlyList PaneLines(string windowId) => /// fails on a false, which is the only thing that makes them stay in step. /// /// - internal bool DispatchCommand(string id) + private bool RunBuiltInCommand(string id) { if (DispatchGroupCommand(id)) { diff --git a/tests/SharpMUTerm.Core.Tests/Commands/CommandCatalogTests.cs b/tests/SharpMUTerm.Client.Tests/BuiltInCatalogTests.cs similarity index 85% rename from tests/SharpMUTerm.Core.Tests/Commands/CommandCatalogTests.cs rename to tests/SharpMUTerm.Client.Tests/BuiltInCatalogTests.cs index d77b69dd..c0517de8 100644 --- a/tests/SharpMUTerm.Core.Tests/Commands/CommandCatalogTests.cs +++ b/tests/SharpMUTerm.Client.Tests/BuiltInCatalogTests.cs @@ -1,9 +1,10 @@ +using SharpMUTerm.Client.Commands; using SharpMUTerm.Core.Commands; using SharpMUTerm.Core.Workspaces; -namespace SharpMUTerm.Core.Tests.Commands; +namespace SharpMUTerm.Client.Tests; -public class CommandCatalogTests +public class BuiltInCatalogTests { private static readonly CharacterRef[] Characters = { @@ -15,7 +16,7 @@ public class CommandCatalogTests public async Task NonFocusedCharacters_BecomeSwitchEntries() { var ws = new Workspace(); - var catalog = CommandCatalog.Build(ws, Characters, "Aetherfall.Corvid", new CommandContext()); + var catalog = BuiltInCommands.Catalog(ws, Characters, "Aetherfall.Corvid", new CommandContext()); var switches = catalog.Where(c => c.Id.StartsWith("char:")).ToArray(); await Assert.That(switches).HasSingleItem(); // Corvid is focused, only Rookery remains @@ -29,7 +30,7 @@ public async Task NonActiveWindows_BecomeGoToEntries_WithOwnerAndUnread() var ws = new Workspace(); ws.RouteSpawn("Chat"); // background window, 1 unread, owner unset here - var catalog = CommandCatalog.Build(ws, Characters, "Aetherfall.Corvid", new CommandContext()); + var catalog = BuiltInCommands.Catalog(ws, Characters, "Aetherfall.Corvid", new CommandContext()); var goTo = catalog.Single(c => c.Id.StartsWith("win:")); await Assert.That(goTo.Title).IsEqualTo("Go to Chat"); await Assert.That(goTo.Subtitle).Contains("1 unread"); @@ -39,10 +40,10 @@ public async Task NonActiveWindows_BecomeGoToEntries_WithOwnerAndUnread() public async Task StatefulCommands_ReadCurrentValue() { var ws = new Workspace(); - var loggingOff = CommandCatalog.Build(ws, Characters, null, new CommandContext(LoggingOn: false)); + var loggingOff = BuiltInCommands.Catalog(ws, Characters, null, new CommandContext(LoggingOn: false)); await Assert.That(loggingOff.Any(c => c.Title == "Start logging")).IsTrue(); - var loggingOn = CommandCatalog.Build(ws, Characters, null, new CommandContext(LoggingOn: true, Zoomed: true, Frozen: true)); + var loggingOn = BuiltInCommands.Catalog(ws, Characters, null, new CommandContext(LoggingOn: true, Zoomed: true, Frozen: true)); await Assert.That(loggingOn.Any(c => c.Title == "Pause logging")).IsTrue(); await Assert.That(loggingOn.Any(c => c.Title == "Unzoom pane")).IsTrue(); await Assert.That(loggingOn.Any(c => c.Title == "Resume scrollback")).IsTrue(); @@ -56,7 +57,7 @@ public async Task StatefulCommands_ReadCurrentValue() [Test] public async Task TheTabCycleIsListedWithItsChord() { - var catalog = CommandCatalog.Build(new Workspace(), Characters, null, new CommandContext()); + var catalog = BuiltInCommands.Catalog(new Workspace(), Characters, null, new CommandContext()); var entry = catalog.Single(c => c.Id == "layout:next-tab"); await Assert.That(entry.Title).IsEqualTo("Focus the next tab"); @@ -72,7 +73,7 @@ public async Task TheTabCycleIsListedWithItsChord() [Test] public async Task NumberedPaneEntries_AppearOnlyOnASplit_AndOnlyTheFirstNineCarryAChord() { - var one = CommandCatalog.Build(new Workspace(), Characters, null, new CommandContext()); + var one = BuiltInCommands.Catalog(new Workspace(), Characters, null, new CommandContext()); await Assert.That(one.Any(c => c.Id.StartsWith(CommandIds.PanePrefix, StringComparison.Ordinal))) .IsFalse(); @@ -97,7 +98,7 @@ await Assert.That(one.Any(c => c.Id.StartsWith(CommandIds.PanePrefix, StringComp var panes = ws.Layout.Panes.Count; await Assert.That(panes).IsGreaterThan(CommandIds.PaneJumpDigits); - var entries = CommandCatalog.Build(ws, Characters, null, new CommandContext()) + var entries = BuiltInCommands.Catalog(ws, Characters, null, new CommandContext()) .Where(c => c.Id.StartsWith(CommandIds.PanePrefix, StringComparison.Ordinal)) .ToList(); @@ -137,7 +138,7 @@ public async Task WindowEntries_LeadWithTheirChord_AndOnlyTheFirstNineHaveOne() // focused *character* is Corvid, because the numbering is scoped to whoever is active and a // catalog built for nobody would correctly hand out no chords at all. ws.Layout.FocusedPane.ActiveIndex = -1; - var entries = CommandCatalog.Build(ws, Characters, "Aetherfall.Corvid", new CommandContext()) + var entries = BuiltInCommands.Catalog(ws, Characters, "Aetherfall.Corvid", new CommandContext()) .Where(c => c.Id.StartsWith(CommandIds.WindowPrefix, StringComparison.Ordinal)) .ToDictionary(c => c.Id, c => c.Subtitle, StringComparer.Ordinal); @@ -162,7 +163,7 @@ await Assert.That(subtitle!.Contains('⌥')) public async Task Catalog_CoversEveryGroup() { var ws = new Workspace(); - var catalog = CommandCatalog.Build(ws, Characters, "Aetherfall.Corvid", new CommandContext(), Screens); + var catalog = BuiltInCommands.Catalog(ws, Characters, "Aetherfall.Corvid", new CommandContext(), Screens); foreach (var group in Enum.GetValues()) { await Assert.That(catalog.Any(c => c.Group == group)).IsTrue(); @@ -179,7 +180,7 @@ public async Task Catalog_CoversEveryGroup() public async Task EverySettingsScreenTheHostOffers_BecomesAnEntry_SubtitledWithItsKey() { var ws = new Workspace(); - var catalog = CommandCatalog.Build(ws, Characters, null, new CommandContext(), Screens); + var catalog = BuiltInCommands.Catalog(ws, Characters, null, new CommandContext(), Screens); var settings = catalog.Where(c => c.Group == CommandGroup.Settings).ToArray(); await Assert.That(settings.Length).IsEqualTo(2); @@ -194,7 +195,7 @@ public async Task EverySettingsScreenTheHostOffers_BecomesAnEntry_SubtitledWithI public async Task AHostThatOffersNoScreens_GetsNoSettingsGroup() { var ws = new Workspace(); - var catalog = CommandCatalog.Build(ws, Characters, null, new CommandContext()); + var catalog = BuiltInCommands.Catalog(ws, Characters, null, new CommandContext()); await Assert.That(catalog.Any(c => c.Group == CommandGroup.Settings)).IsFalse(); } diff --git a/tests/SharpMUTerm.Client.Tests/ClientAssemblyTests.cs b/tests/SharpMUTerm.Client.Tests/ClientAssemblyTests.cs new file mode 100644 index 00000000..71d4a8d9 --- /dev/null +++ b/tests/SharpMUTerm.Client.Tests/ClientAssemblyTests.cs @@ -0,0 +1,52 @@ +using System.Reflection; +using SharpMUTerm.Client.Contributions; + +namespace SharpMUTerm.Client.Tests; + +/// +/// The shared shell draws nothing. Both hosts' views read SharpMUTerm.Client, so the day it names +/// SharpConsoleUI the desktop window inherits the terminal's framework, and the day it names Avalonia the +/// terminal loads a windowing toolkit. Checked over every assembly it pulls in from this repository, so a +/// reference that arrives through Core counts too. +/// +public class ClientAssemblyTests +{ + // Ordinal: the terminal host's assembly is "sharpmuterm", which a case-blind prefix match finds in every SharpMUTerm.* name. + private static readonly string[] Forbidden = { "SharpConsoleUI", "Avalonia", "sharpmuterm", "sharpmuterm-window", "SharpMUTerm.Tui" }; + + [Test] + public async Task TheClientAssemblyReferencesNeitherUiFramework() + { + var seen = new HashSet(StringComparer.Ordinal); + var pending = new Queue(); + pending.Enqueue(typeof(ContributionRegistry).Assembly); + var offenders = new List(); + while (pending.Count > 0) + { + var assembly = pending.Dequeue(); + if (!seen.Add(assembly.GetName().Name!)) + { + continue; + } + + foreach (var reference in assembly.GetReferencedAssemblies()) + { + var name = reference.Name!; + if (Forbidden.Any(f => name.Equals(f, StringComparison.Ordinal) + || name.StartsWith(f + ".", StringComparison.Ordinal))) + { + offenders.Add($"{assembly.GetName().Name} → {name}"); + } + + // Follow this repository's own assemblies; a package's references are its own business. + if (name.StartsWith("SharpMUTerm.", StringComparison.Ordinal) && !seen.Contains(name)) + { + pending.Enqueue(System.Reflection.Assembly.Load(reference)); + } + } + } + + await Assert.That(offenders).IsEmpty(); + await Assert.That(seen).Contains("SharpMUTerm.Core"); + } +} diff --git a/tests/SharpMUTerm.Client.Tests/ContributionRegistryTests.cs b/tests/SharpMUTerm.Client.Tests/ContributionRegistryTests.cs new file mode 100644 index 00000000..f81b6ff2 --- /dev/null +++ b/tests/SharpMUTerm.Client.Tests/ContributionRegistryTests.cs @@ -0,0 +1,215 @@ +using SharpMUTerm.Client.Commands; +using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Core.Workspaces; + +namespace SharpMUTerm.Client.Tests; + +public class ContributionRegistryTests +{ + private static ICommandContext Context(CommandContext? state = null, HostKeyGlyphs? keys = null) => + new CommandEnvironment( + state ?? new CommandContext(), + new Workspace(), + Array.Empty(), + null, + Array.Empty(), + keys ?? HostKeyGlyphs.Terminal); + + private static SingleCommand Command(string id, string title = "T", ContributionOwner? owner = null) => new() + { + Id = id, + Title = title, + Category = CommandGroup.Terminal, + Owner = owner ?? ContributionOwner.BuiltIn, + Run = _ => true, + }; + + [Test] + public async Task ADuplicateIdIsRefusedWithinAKind() + { + var registry = new ContributionRegistry(); + registry.Commands.Add(Command("x:one")); + + await Assert.That(() => registry.Commands.Add(Command("x:one", owner: ContributionOwner.Package("p")))) + .Throws(); + await Assert.That(registry.Commands.Count).IsEqualTo(1); + + // Ids are per kind: a panel may share a command's id. + registry.Panels.Add(new PanelContribution { Id = "x:one", Title = "One" }); + await Assert.That(registry.Panels.Count).IsEqualTo(1); + } + + [Test] + public async Task ACommandUnderAFamilysPrefixIsRefused_AndOverlappingFamiliesToo() + { + var registry = new ContributionRegistry(); + registry.Commands.Add(new CommandFamily + { + Id = "fam", IdPrefix = "win:", Generate = _ => Array.Empty(), Run = (_, _) => true, + }); + + await Assert.That(() => registry.Commands.Add(Command("win:chat"))).Throws(); + await Assert.That(() => registry.Commands.Add(new CommandFamily + { + Id = "fam2", IdPrefix = "win:x", Generate = _ => Array.Empty(), Run = (_, _) => true, + })).Throws(); + } + + [Test] + public async Task TheCatalogIsInRegistrationOrder_AndHonoursAvailability() + { + var registry = new ContributionRegistry(); + registry.Commands.Add(Command("b:second", "Second")); + registry.Commands.Add(new SingleCommand + { + Id = "a:hidden", Title = "Hidden", Category = CommandGroup.Terminal, + IsAvailable = c => c.State.LoggingOn, Run = _ => true, + }); + registry.Commands.Add(Command("a:first", "First")); + + var quiet = registry.Commands.Catalog(Context()).Select(c => c.Id).ToList(); + await Assert.That(quiet).IsEquivalentTo(new[] { "b:second", "a:first" }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + + var logging = registry.Commands.Catalog(Context(new CommandContext(LoggingOn: true))).Select(c => c.Id).ToList(); + await Assert.That(logging).IsEquivalentTo(new[] { "b:second", "a:hidden", "a:first" }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + } + + [Test] + public async Task AHostKeyHintIsSpeltTheWayTheHostSpellsIt() + { + var registry = new ContributionRegistry(); + registry.Commands.Add(new SingleCommand + { + Id = "term:nl", Title = "Newline", Category = CommandGroup.Terminal, + Key = KeyHint.ForHost(HostKey.Newline), Detail = "in the command line", Run = _ => true, + }); + + var terminal = registry.Commands.Catalog(Context()).Single(); + var window = registry.Commands.Catalog(Context(keys: new HostKeyGlyphs("Ctrl+⏎"))).Single(); + await Assert.That(terminal.Subtitle).IsEqualTo("Alt+⏎ · in the command line"); + await Assert.That(window.Subtitle).IsEqualTo("Ctrl+⏎ · in the command line"); + } + + [Test] + public async Task DispatchFindsTheExactCommandFirst_ThenTheFamily_AndIgnoresAvailability() + { + var ran = new List(); + var registry = new ContributionRegistry(); + registry.Commands.Add(new SingleCommand + { + Id = "term:log-on", Title = "Start logging", Category = CommandGroup.Terminal, + IsAvailable = _ => false, Run = _ => { ran.Add("log"); return true; }, + }); + registry.Commands.Add(new CommandFamily + { + Id = "goto:windows", IdPrefix = "win:", + Generate = _ => Array.Empty(), + Run = (id, _) => { ran.Add(id); return true; }, + }); + + await Assert.That(registry.Commands.TryExecute("term:log-on", Context(), out var logHandled)).IsTrue(); + await Assert.That(registry.Commands.TryExecute("win:chat", Context(), out var winHandled)).IsTrue(); + await Assert.That(registry.Commands.TryExecute("nope", Context(), out var nopeHandled)).IsFalse(); + await Assert.That(logHandled && winHandled && !nopeHandled).IsTrue(); + await Assert.That(ran).IsEquivalentTo(new[] { "log", "win:chat" }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + + // A family's own id names the family, not a command. + await Assert.That(registry.Commands.Resolve("goto:windows")).IsNull(); + } + + [Test] + public async Task RemovingAPackageTakesEveryKindItRegistered_AndLeavesTheRestInOrder() + { + var package = ContributionOwner.Package("bells"); + var registry = new ContributionRegistry(); + registry.Commands.Add(Command("a:one")); + registry.Commands.Add(Command("bells:ring", owner: package)); + registry.Commands.Add(Command("a:two")); + registry.StatusCells.Add(new StatusCellContribution { Id = "bells", Owner = package, ReservedWidth = 3 }); + registry.Panels.Add(new PanelContribution { Id = "bells", Owner = package, Title = "Bells" }); + + await Assert.That(registry.RemoveOwnedBy(package)).IsEqualTo(3); + await Assert.That(registry.Commands.Select(c => c.Id).ToList()) + .IsEquivalentTo(new[] { "a:one", "a:two" }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(registry.StatusCells.Count).IsEqualTo(0); + + // Its ids are free again. + registry.Commands.Add(Command("bells:ring", owner: package)); + await Assert.That(registry.Commands.Contains("bells:ring")).IsTrue(); + } + + [Test] + public async Task SectionsReadInOrder_CellsDropHighestFirst_TiesByRegistration() + { + var registry = new ContributionRegistry(); + registry.SettingsSections.Add(new SettingsSectionContribution { Id = "late", Title = "Late", Order = 20 }); + registry.SettingsSections.Add(new SettingsSectionContribution + { + Id = "early", Title = "Early", Order = 10, + Fields = new SettingsField[] + { + new BoolField("on", "enabled"), + new ChoiceField("mode", "mode", new[] { "a", "b" }), + new NumberField("n", "count", 0, 10), + new TextField("name", "name", MaxLength: 20), + new ColourField("tint", "tint", new[] { "teal" }), + new ListField("rules", "rules", new SettingsField[] { new TextField("pattern", "pattern") }), + }, + }); + registry.SettingsSections.Add(new SettingsSectionContribution { Id = "tie", Title = "Tie", Order = 10 }); + + await Assert.That(registry.SettingsSections.Ordered.Select(s => s.Id).ToList()) + .IsEquivalentTo(new[] { "early", "tie", "late" }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + + registry.StatusCells.Add(new StatusCellContribution { Id = "room", DropOrder = 1, ReservedWidth = 12 }); + registry.StatusCells.Add(new StatusCellContribution { Id = "meters", DropOrder = 5, ReservedWidth = 10 }); + registry.StatusCells.Add(new StatusCellContribution { Id = "mute", DropOrder = 1, ReservedWidth = 7 }); + await Assert.That(registry.StatusCells.InDropOrder.Select(s => s.Id).ToList()) + .IsEquivalentTo(new[] { "meters", "mute", "room" }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + + await Assert.That(() => registry.SettingsSections.Add(new SettingsSectionContribution + { + Id = "dupe", Title = "Dupe", + Fields = new SettingsField[] { new BoolField("x", "x"), new BoolField("x", "y") }, + })).Throws(); + } + + /// + /// The built-in catalog is registered as contributions, so its ids are all addressable through the + /// registry and none is refused for clashing with another. + /// + [Test] + public async Task EveryBuiltInEntryResolvesToTheContributionThatListedIt() + { + var ran = new List(); + var registry = new ContributionRegistry(); + BuiltInCommands.Register(registry, id => { ran.Add(id); return true; }); + + var ws = new Workspace(mainWindowId: "main", mainTitle: "Main", sessionKey: "A.One"); + ws.RouteSpawn("Chat", "A.One"); + ws.Layout.SplitFocused(SplitDirection.Row); + var characters = new CharacterRef[] + { + new("A", "One", "A.One", true, true, true), + new("A", "Two", "A.Two", true, true), + }; + var context = new CommandEnvironment( + new CommandContext(ScriptsOn: true, Walking: true, Sound: true, Announced: false), + ws, + characters, + "A.One", + new SettingsEntry[] { new("Aliases", "screen:aliases", "F3") }, + HostKeyGlyphs.Terminal); + + var catalog = registry.Commands.Catalog(context); + foreach (var item in catalog) + { + await Assert.That(registry.Commands.TryExecute(item.Id, context, out var handled)).IsTrue(); + await Assert.That(handled).IsTrue(); + } + + await Assert.That(ran).IsEquivalentTo(catalog.Select(c => c.Id).ToList(), TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(catalog.Select(c => c.Group).Distinct().Count()).IsEqualTo(Enum.GetValues().Length); + } +} diff --git a/tests/SharpMUTerm.Client.Tests/SharpMUTerm.Client.Tests.csproj b/tests/SharpMUTerm.Client.Tests/SharpMUTerm.Client.Tests.csproj new file mode 100644 index 00000000..67d03687 --- /dev/null +++ b/tests/SharpMUTerm.Client.Tests/SharpMUTerm.Client.Tests.csproj @@ -0,0 +1,19 @@ + + + + Exe + SharpMUTerm.Client.Tests + SharpMUTerm.Client.Tests + false + true + + + + + + + + + + + From 266eb2eb7529fc2eb0cffba068b9b4306ca4c8a3 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 02:13:56 +0000 Subject: [PATCH 007/113] Add the trigger builder: a rule from selected output, plain-language match kinds, and a live test on F2 Ctrl+P > "Make a trigger from the selection" (and the output right-click menu) makes a rule from the selected line, with numbers, quoted speech and known GMCP player names turned into * wildcards, and opens F2 on it with the pattern being typed and the regex shown behind it. Triggers gain a match type (contains the text, starts with, * wildcards, regular expression; regex stays the default), and F2's pattern editor shows how many of the last 2,000 held lines match, with the newest three highlighted. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 5 + CLAUDE.md | 23 ++ .../Commands/BuiltInCommands.cs | 4 + src/SharpMUTerm.Core/Automation/Trigger.cs | 24 +- .../Automation/TriggerMatchType.cs | 180 +++++++++++++++ .../Automation/TriggerPreview.cs | 96 ++++++++ .../Automation/TriggerSuggestion.cs | 206 ++++++++++++++++++ .../Commands/CommandCatalog.cs | 4 +- .../Commands/CompletionIndex.cs | 12 + src/SharpMUTerm.Core/Text/OutputSearch.cs | 2 +- .../Pointer/SharpMUTermApp.Pointer.cs | 2 +- src/SharpMUTerm.Tui/ScreenField.cs | 21 ++ src/SharpMUTerm.Tui/SettingsSession.cs | 11 + .../SharpMUTermApp.TriggerBuilder.cs | 172 +++++++++++++++ src/SharpMUTerm.Tui/SharpMUTermApp.cs | 29 ++- src/SharpMUTerm.Tui/SnapshotViews.cs | 2 +- src/SharpMUTerm.Tui/TriggerReport.cs | 5 +- src/SharpMUTerm.Tui/TriggersScreenRenderer.cs | 197 ++++++++++++++++- src/SharpMUTerm.Tui/TriggersScreenView.cs | 7 +- .../Automation/TriggerBuilderTests.cs | 200 +++++++++++++++++ .../TriggerBuilderTests.cs | 132 +++++++++++ .../TriggerSetManagementTests.cs | 9 +- .../TriggersScreenEditingTests.cs | 4 +- .../TriggersScreenRendererTests.cs | 2 +- 24 files changed, 1323 insertions(+), 26 deletions(-) create mode 100644 src/SharpMUTerm.Core/Automation/TriggerMatchType.cs create mode 100644 src/SharpMUTerm.Core/Automation/TriggerPreview.cs create mode 100644 src/SharpMUTerm.Core/Automation/TriggerSuggestion.cs create mode 100644 src/SharpMUTerm.Tui/SharpMUTermApp.TriggerBuilder.cs create mode 100644 tests/SharpMUTerm.Core.Tests/Automation/TriggerBuilderTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/TriggerBuilderTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 1fc6e440..4a634a31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,11 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- Make a trigger without writing a regex: select a line of output and choose Ctrl+P ▸ *Make a trigger from + the selection* (also on the right-click menu). Triggers (F2) opens on a new rule whose pattern is the line + with its numbers, quoted speech and known player names turned into `*`, and shows the regex behind it. + While you edit a pattern, F2 shows how many recent lines it matches and the newest few, and a rule can now + match "contains the text", "starts with" or "matches with * wildcards" as well as a regular expression. - `/connect [port] [tls]` adds a world and connects to it, and `/connect ` opens a configured one. It is the way to add a world in `--plain`, where the settings screens cannot be used. - The desktop window bundles JetBrains Mono and the Nerd Font symbols, so its icons draw on a machine with no diff --git a/CLAUDE.md b/CLAUDE.md index 1e4f778f..03e383cd 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -1035,6 +1035,8 @@ python3 tools/ansi_frame_to_image.py frame.ansi frame.html # or .svg own hit test rather than a highlight posed by hand — the only frame carrying `WorkspacePalette.SelectionBand`, which is why it is in `FrameContrastTests`' list: the band is the one plane this client invents rather than derives from a pane, and its ink replaces the world's own on every selected cell), + `trigger-builder` (a real drag across a line of output and the real ⌃P *Make a trigger from the + selection*, so F2 opens on the suggested wildcard rule with its regex and the live test counting), `prefix-panel` (the ⌃B which-key panel — the state `prefix` becomes a few hundred milliseconds later, if no key has arrived), `focus`/`focus-moved` (a split *and* a second command line — the one geometry showing a focused pane @@ -1958,6 +1960,27 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] `DiscordIpc.Show` never blocks: a worker sends only the newest value, reads and discards each reply (bounded in size and time), and on a failed connect does not retry until the next update. The application id is the game's; this client registers none. The snapshot and every test host have `Presence = null`. +- **The trigger builder makes a plain-language rule from selected output** (`TriggerMatchType`, + `TriggerPatterns`, `TriggerSuggestion`, `TriggerPreview`, Core; `SharpMUTermApp.TriggerBuilder.cs`; ⌃P + `term:trigger-from-selection`; the `trigger-builder` view). Decisions not to relitigate: + - **Every match kind compiles to one regex** (`TriggerPatterns.ToRegex`), so the engine, captures and the + timeout are unchanged. `Regex` is the enum's first member and so the default: a rule with no `matchType` + means what it always meant, and the schema version did not move. A `*` wildcard is a capture (lazy, the + last one greedy) and matches anywhere in the line, like *contains*; `\*` is a literal asterisk. + - **The suggestion guesses three things and nothing else**: numbers, the inside of double quotes, and the + GMCP player names `CompletionIndex.Names()` holds, as whole words. A line with nothing variable, or only + variable, becomes *contains the text*, never a pattern of bare `*`. + - **The rule is made at once, then F2 opens on it with the pattern field open** (`SettingsSession.OpenField`). + It has no actions, so it changes nothing until given one. It goes in the selection window's character's + first listed set, else the first set, else a new `My triggers` set listed on that character. Package + sets are never written to. + - **The live test is `OutputSearch`'s corpus and safeguards**: every window a pane holds (focused window + last, so its lines count as newest), the newest 2,000, a 100 ms match timeout, and an invalid pattern as a + muted state. Unlike ⌃F a zero-width match counts, because the engine fires on one. It always draws four + rows so typing never moves the rows below. + - **The match kind is field 10, appended**, though it is drawn on the `match pattern` heading row: that + keeps every ordinal and costs no row in a pane that already fills a 24-row screen. Switching *to* a + regex rewrites the pattern as the regex it meant, so the rule keeps matching what it matched. - **The send group is session keys in memory** (`SendGroup`, Core; `SharpMUTermApp.SendGroup.cs`; ⌃P `group:` ids). It is never saved, because a saved group would be a standing order to send one line to several worlds. It is offered once two characters are open. Members are marked on the rail by swapping the dot for ◆/◇ in diff --git a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs index d6b39ca3..88595d61 100644 --- a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs +++ b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs @@ -106,6 +106,10 @@ void Family(string id, string prefix, Func c.State.OutputSelected); + // The client's own messages — the status-line notices that dismiss themselves — kept out of the // output window (and so out of the session log) and readable here instead. Add("term:messages", CommandGroup.Terminal, "Show client messages", detail: "status-line notices"); diff --git a/src/SharpMUTerm.Core/Automation/Trigger.cs b/src/SharpMUTerm.Core/Automation/Trigger.cs index ce69e22d..1042c826 100644 --- a/src/SharpMUTerm.Core/Automation/Trigger.cs +++ b/src/SharpMUTerm.Core/Automation/Trigger.cs @@ -112,6 +112,7 @@ public sealed class Trigger private Regex? _compiled; private bool _caseSensitive; private string _pattern = string.Empty; + private TriggerMatchType _matchType; /// /// What the rule is called, for the lists that show it. Settable so the F2 screen can rename a rule @@ -140,6 +141,26 @@ public required string Pattern } } + /// + /// How is read — a regex (the default, and what every rule written before this + /// existed means), or one of the plain-language kinds F2 offers first. Settable so the editor can change + /// it live; writing it drops the cached for the reason does. + /// + public TriggerMatchType MatchType + { + get => _matchType; + set + { + if (_matchType == value) + { + return; + } + + _matchType = value; + _compiled = null; + } + } + public bool Enabled { get; set; } = true; /// @@ -174,7 +195,7 @@ public bool CaseSensitive /// The compiled regex (built once, lazily), with a match timeout guarding against ReDoS. [JsonIgnore] public Regex Regex => _compiled ??= new Regex( - Pattern, + TriggerPatterns.ToRegex(MatchType, Pattern), RegexOptions.Compiled | (CaseSensitive ? RegexOptions.None : RegexOptions.IgnoreCase), AutomationDefaults.RegexMatchTimeout); @@ -189,6 +210,7 @@ public bool CaseSensitive { Name = Name, Pattern = Pattern, + MatchType = MatchType, Enabled = Enabled, CaseSensitive = CaseSensitive, StopProcessing = StopProcessing, diff --git a/src/SharpMUTerm.Core/Automation/TriggerMatchType.cs b/src/SharpMUTerm.Core/Automation/TriggerMatchType.cs new file mode 100644 index 00000000..3360a883 --- /dev/null +++ b/src/SharpMUTerm.Core/Automation/TriggerMatchType.cs @@ -0,0 +1,180 @@ +using System.Text; +using System.Text.RegularExpressions; + +namespace SharpMUTerm.Core.Automation; + +/// +/// How a is read. Every kind compiles to one .NET regex +/// (), so the engine, captures and the match timeout are the same +/// for all of them; what differs is only what the player has to type. +/// +/// is first, and so the default, because it is what every rule written before this +/// existed means: a configuration with no matchType reads exactly as it always did, which is why +/// the schema version did not move for it. +/// +/// +public enum TriggerMatchType +{ + /// The pattern is a .NET regular expression, as it always was. + Regex, + + /// The line contains the pattern as literal text, anywhere. + Contains, + + /// The line starts with the pattern as literal text. + StartsWith, + + /// + /// Literal text in which each * stands for any run of characters (and is a capture, so + /// $1 names the first). It matches anywhere in the line, like ; \* + /// is a literal asterisk. + /// + Wildcard, +} + +/// +/// The one place a becomes a regex, and the plain words each is offered +/// under. Pure, so the engine, the F2 editor's live test and the suggestion from a selection all read +/// a pattern the same way. +/// +public static class TriggerPatterns +{ + /// + /// The match kinds in the order the F2 editor offers them: the plain-language ones first, the raw + /// regex last, because a player who has never written one should meet the three they can use before + /// the one they cannot. + /// + public static IReadOnlyList Offered { get; } = + [ + TriggerMatchType.Contains, + TriggerMatchType.StartsWith, + TriggerMatchType.Wildcard, + TriggerMatchType.Regex, + ]; + + /// What a match kind is called on screen. + public static string Describe(TriggerMatchType type) => type switch + { + TriggerMatchType.Contains => "contains the text", + TriggerMatchType.StartsWith => "starts with", + TriggerMatchType.Wildcard => "matches with * wildcards", + _ => "regular expression", + }; + + /// The match kind a description names, case-insensitively, or null when it names none. + public static TriggerMatchType? Parse(string description) + { + ArgumentNullException.ThrowIfNull(description); + foreach (var type in Offered) + { + if (string.Equals(Describe(type), description.Trim(), StringComparison.OrdinalIgnoreCase)) + { + return type; + } + } + + return null; + } + + /// The regex means when read as . + public static string ToRegex(TriggerMatchType type, string pattern) + { + ArgumentNullException.ThrowIfNull(pattern); + return type switch + { + TriggerMatchType.Contains => Literal(pattern), + TriggerMatchType.StartsWith => "^" + Literal(pattern), + TriggerMatchType.Wildcard => WildcardToRegex(pattern), + _ => pattern, + }; + } + + /// + /// Why cannot be used as , or null when it can. Only a + /// regex can fail to parse; the literal kinds refuse only the empty pattern, which would match every + /// line. + /// + public static string? Validate(TriggerMatchType type, string pattern) + { + ArgumentNullException.ThrowIfNull(pattern); + if (pattern.Length == 0) + { + return "pattern cannot be empty"; + } + + if (type == TriggerMatchType.Wildcard && pattern.All(c => c == '*' || char.IsWhiteSpace(c))) + { + return "a pattern of only * matches every line"; + } + + if (type != TriggerMatchType.Regex) + { + return null; + } + + try + { + _ = new Regex(pattern, RegexOptions.None, AutomationDefaults.RegexMatchTimeout); + return null; + } + catch (ArgumentException error) + { + return "not a valid regex: " + error.Message.Split('\n')[0].Trim(); + } + } + + /// + /// escaped to match itself. A space is left a space: Regex.Escape writes + /// it as a backslash and a space, which is legal and is also the first thing a reader of the regex shown + /// behind a plain pattern would stumble on — and without IgnorePatternWhitespace a bare space is + /// literal anyway. + /// + public static string Literal(string text) + { + ArgumentNullException.ThrowIfNull(text); + return System.Text.RegularExpressions.Regex.Escape(text).Replace("\\ ", " ", StringComparison.Ordinal); + } + + /// + /// Literal text with each unescaped * turned into a capture. Every wildcard is lazy except a + /// trailing one, which is greedy: a lazy capture at the very end of a pattern would match nothing at + /// all, and $1 of * says * would always be empty. + /// + internal static string WildcardToRegex(string pattern) + { + var parts = new List(); + var literal = new StringBuilder(); + for (var i = 0; i < pattern.Length; i++) + { + var c = pattern[i]; + if (c == '\\' && i + 1 < pattern.Length && pattern[i + 1] == '*') + { + literal.Append('*'); + i++; + } + else if (c == '*') + { + parts.Add(literal.ToString()); + literal.Clear(); + } + else + { + literal.Append(c); + } + } + + parts.Add(literal.ToString()); + + var regex = new StringBuilder(); + for (var i = 0; i < parts.Count; i++) + { + regex.Append(Literal(parts[i])); + if (i < parts.Count - 1) + { + regex.Append(i == parts.Count - 2 && parts[^1].Length == 0 ? "(.*)" : "(.*?)"); + } + } + + return regex.ToString(); + } +} diff --git a/src/SharpMUTerm.Core/Automation/TriggerPreview.cs b/src/SharpMUTerm.Core/Automation/TriggerPreview.cs new file mode 100644 index 00000000..88ff4871 --- /dev/null +++ b/src/SharpMUTerm.Core/Automation/TriggerPreview.cs @@ -0,0 +1,96 @@ +using System.Text.RegularExpressions; +using SharpMUTerm.Core.Text; + +namespace SharpMUTerm.Core.Automation; + +/// +/// What one trigger pattern comes to against the output the client is holding: how many lines it +/// matched, the newest few of them, and — when the pattern cannot be used yet — why. +/// +/// How many lines were tried. +/// How many of them matched. +/// The newest matches, newest first, at most the number asked for. +/// Why nothing could be tried, or null when the pattern was usable. +public readonly record struct TriggerPreviewResult( + int Tested, int Matched, IReadOnlyList Samples, string? Problem); + +/// +/// The F2 editor's live test: a pattern run over recent output on every keystroke. The trigger engine's +/// rules, so a count here is what the rule would have done — the same regex +/// (), the same case rule, and a zero-width match counting, because +/// the engine fires on one. 's safeguards, because this too runs on the UI +/// thread per keystroke: a bounded number of lines, a match timeout, and an unparseable pattern returned as +/// a state — a regex is unparseable most of the time it is being typed. +/// +public static class TriggerPreview +{ + /// How many of the newest lines are tried. + public const int MaxLines = 2000; + + /// How many matching lines are kept to show. + public const int DefaultSamples = 3; + + /// Runs , read as , over the newest of . + /// Plain text, oldest first. + public static TriggerPreviewResult Run( + IReadOnlyList lines, + TriggerMatchType type, + string pattern, + bool caseSensitive, + int samples = DefaultSamples) + { + ArgumentNullException.ThrowIfNull(lines); + ArgumentNullException.ThrowIfNull(pattern); + + var first = Math.Max(0, lines.Count - MaxLines); + var tested = lines.Count - first; + + if (TriggerPatterns.Validate(type, pattern) is { } problem) + { + return new TriggerPreviewResult(tested, 0, Array.Empty(), problem); + } + + Regex regex; + try + { + regex = new Regex( + TriggerPatterns.ToRegex(type, pattern), + RegexOptions.CultureInvariant | (caseSensitive ? RegexOptions.None : RegexOptions.IgnoreCase), + OutputSearch.MatchTimeout); + } + catch (ArgumentException error) + { + return new TriggerPreviewResult(tested, 0, Array.Empty(), error.Message.Split('\n')[0].Trim()); + } + + var matched = 0; + var kept = new List(); + for (var index = lines.Count - 1; index >= first; index--) + { + var text = lines[index] ?? string.Empty; + try + { + var found = regex.Match(text); + if (!found.Success) + { + continue; + } + + matched++; + if (kept.Count < samples) + { + kept.Add(new OutputMatch(index, text, found.Index, found.Length)); + } + } + catch (RegexMatchTimeoutException) + { + // OutputSearch's reasoning: a count that silently skipped the expensive lines would be a + // test lying about what the rule would do. + return new TriggerPreviewResult( + tested, 0, Array.Empty(), "pattern took too long — try a simpler one"); + } + } + + return new TriggerPreviewResult(tested, matched, kept, null); + } +} diff --git a/src/SharpMUTerm.Core/Automation/TriggerSuggestion.cs b/src/SharpMUTerm.Core/Automation/TriggerSuggestion.cs new file mode 100644 index 00000000..41820f84 --- /dev/null +++ b/src/SharpMUTerm.Core/Automation/TriggerSuggestion.cs @@ -0,0 +1,206 @@ +using System.Text; + +namespace SharpMUTerm.Core.Automation; + +/// +/// A trigger pattern proposed from a line of output somebody selected: the text, in +/// form, with its obviously variable parts turned into *. +/// +/// A short name for the rule, from the first literal words of the pattern. +/// The pattern, read as . +/// How is read. +public readonly record struct TriggerSuggestion(string Name, string Pattern, TriggerMatchType MatchType) +{ + /// The regex the pattern compiles to — what F2 shows behind the plain-language form. + public string Regex => TriggerPatterns.ToRegex(MatchType, Pattern); + + /// The longest selection read; past it the rest is ignored rather than becoming a pattern. + public const int MaxLength = 200; + + /// The longest name proposed. + public const int MaxNameLength = 24; + + /// + /// Proposes a pattern for . Three kinds of run become a wildcard, because + /// they are the parts of a line that are different next time: + /// + /// numbers (125, 1,024, 3.5) — damage, gold, experience, counts; + /// the inside of quoted speech — what was said, while the quotes and the verb stay; + /// any of as a whole word — the players the game has told the client + /// about (GMCP), so Rivane tells you becomes * tells you. + /// + /// Nothing else is guessed at. A pattern that would be nothing but wildcards is no pattern at all, so + /// that selection is matched as literal text instead (). + /// + /// The selected text. Only its first non-blank line is used. + /// Names to read as variable, or null for none. + public static TriggerSuggestion Suggest(string selected, IEnumerable? names = null) + { + ArgumentNullException.ThrowIfNull(selected); + + var line = selected.Replace("\r", string.Empty, StringComparison.Ordinal) + .Split('\n') + .Select(l => l.Trim()) + .FirstOrDefault(l => l.Length > 0) ?? string.Empty; + if (line.Length > MaxLength) + { + line = line[..MaxLength]; + } + + var variable = new bool[line.Length]; + MarkQuoted(line, variable); + MarkNumbers(line, variable); + MarkNames(line, variable, names); + + var pattern = new StringBuilder(); + var literal = new StringBuilder(); + var wild = false; + for (var i = 0; i < line.Length; i++) + { + if (variable[i]) + { + if (!wild) + { + pattern.Append('*'); + wild = true; + } + + continue; + } + + wild = false; + + if (line[i] == '*') + { + pattern.Append("\\*"); + } + else + { + pattern.Append(line[i]); + } + + literal.Append(line[i]); + } + + if (literal.ToString().Trim().Length == 0) + { + return new TriggerSuggestion(NameFrom(line), line, TriggerMatchType.Contains); + } + + return variable.Any(v => v) + ? new TriggerSuggestion(NameFrom(literal.ToString()), pattern.ToString(), TriggerMatchType.Wildcard) + : new TriggerSuggestion(NameFrom(line), line, TriggerMatchType.Contains); + } + + /// The text between each pair of double quotes (straight or curly), not the quotes themselves. + private static void MarkQuoted(string line, bool[] variable) + { + for (var i = 0; i < line.Length; i++) + { + var close = line[i] switch + { + '"' => '"', + '“' => '”', + _ => '\0', + }; + if (close == '\0') + { + continue; + } + + var end = line.IndexOf(close, i + 1); + if (end < 0) + { + return; + } + + for (var j = i + 1; j < end; j++) + { + variable[j] = true; + } + + i = end; + } + } + + /// Runs of digits, with the separators inside a number (1,024, 3.5) taken with them. + private static void MarkNumbers(string line, bool[] variable) + { + for (var i = 0; i < line.Length; i++) + { + if (!char.IsAsciiDigit(line[i])) + { + continue; + } + + var end = i; + while (end + 1 < line.Length + && (char.IsAsciiDigit(line[end + 1]) + || (line[end + 1] is ',' or '.' && end + 2 < line.Length && char.IsAsciiDigit(line[end + 2])))) + { + end++; + } + + for (var j = i; j <= end; j++) + { + variable[j] = true; + } + + i = end; + } + } + + /// Each name as a whole word, case-insensitively. Names shorter than two letters are ignored. + private static void MarkNames(string line, bool[] variable, IEnumerable? names) + { + if (names is null) + { + return; + } + + foreach (var name in names.Where(n => n is { Length: >= 2 }).Distinct(StringComparer.OrdinalIgnoreCase)) + { + var at = 0; + while ((at = line.IndexOf(name, at, StringComparison.OrdinalIgnoreCase)) >= 0) + { + var end = at + name.Length; + var whole = (at == 0 || !char.IsLetterOrDigit(line[at - 1])) + && (end == line.Length || !char.IsLetterOrDigit(line[end])); + if (whole) + { + for (var j = at; j < end; j++) + { + variable[j] = true; + } + } + + at = end; + } + } + } + + /// The first few words of , as a rule name. + private static string NameFrom(string text) + { + var words = text.Split(' ', StringSplitOptions.RemoveEmptyEntries) + .Select(w => w.Trim(',', '.', ':', ';', '!', '?', '"', '\'', '“', '”', '(', ')', '[', ']')) + .Where(w => w.Length > 0); + var name = new StringBuilder(); + foreach (var word in words) + { + if (name.Length > 0 && name.Length + 1 + word.Length > MaxNameLength) + { + break; + } + + if (name.Length > 0) + { + name.Append(' '); + } + + name.Append(word.Length > MaxNameLength ? word[..MaxNameLength] : word); + } + + return name.Length == 0 ? "New Trigger" : name.ToString(); + } +} diff --git a/src/SharpMUTerm.Core/Commands/CommandCatalog.cs b/src/SharpMUTerm.Core/Commands/CommandCatalog.cs index 69dd79ae..5becd011 100644 --- a/src/SharpMUTerm.Core/Commands/CommandCatalog.cs +++ b/src/SharpMUTerm.Core/Commands/CommandCatalog.cs @@ -44,6 +44,7 @@ public sealed record CharacterRef( /// /// Null where the host has no screen reader to tell; otherwise whether the active window's output is read aloud. /// +/// Whether some pane's output is selected, so a trigger can be made from it. public sealed record CommandContext( bool LoggingOn = false, bool Zoomed = false, @@ -55,7 +56,8 @@ public sealed record CommandContext( bool ScriptsOn = false, bool Walking = false, bool? Sound = null, - bool? Announced = null); + bool? Announced = null, + bool OutputSelected = false); /// /// A configuration screen the command surface can open: what it calls itself, the id the host diff --git a/src/SharpMUTerm.Core/Commands/CompletionIndex.cs b/src/SharpMUTerm.Core/Commands/CompletionIndex.cs index 6f64e08b..2edb7db5 100644 --- a/src/SharpMUTerm.Core/Commands/CompletionIndex.cs +++ b/src/SharpMUTerm.Core/Commands/CompletionIndex.cs @@ -114,6 +114,18 @@ public IReadOnlyList Candidates(string prefix) } } + /// + /// The player names the game has reported (GMCP), newest first — what a trigger made from a selection + /// reads as variable, since a rule about one player's line is nearly always wanted for every player's. + /// + public IReadOnlyList Names() + { + lock (_gate) + { + return _names.Newest().ToList(); + } + } + /// Forgets everything, as a new connection does. public void Clear() { diff --git a/src/SharpMUTerm.Core/Text/OutputSearch.cs b/src/SharpMUTerm.Core/Text/OutputSearch.cs index f72ec689..170bee29 100644 --- a/src/SharpMUTerm.Core/Text/OutputSearch.cs +++ b/src/SharpMUTerm.Core/Text/OutputSearch.cs @@ -58,7 +58,7 @@ public static class OutputSearch /// over every line of every window — so a pattern that backtracks catastrophically has to come back /// as an error rather than wedge the client. /// - private static readonly TimeSpan MatchTimeout = TimeSpan.FromMilliseconds(100); + internal static readonly TimeSpan MatchTimeout = TimeSpan.FromMilliseconds(100); /// /// The lines of matching , in the order they were diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs index e30c0c38..c16aeeed 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs @@ -450,7 +450,7 @@ internal IReadOnlyList PointerMenu(System.Drawing.Point point) AddCommands( items, - "term:copy", null, + "term:copy", "term:trigger-from-selection", null, "layout:split-right", "layout:split-down", "layout:zoom", "layout:unzoom", "layout:close", null, "term:freeze", "term:unfreeze", "term:scroll-live", "term:clear", "term:timestamps-on", "term:timestamps-off"); break; diff --git a/src/SharpMUTerm.Tui/ScreenField.cs b/src/SharpMUTerm.Tui/ScreenField.cs index 609ff6ee..d2560a27 100644 --- a/src/SharpMUTerm.Tui/ScreenField.cs +++ b/src/SharpMUTerm.Tui/ScreenField.cs @@ -572,6 +572,27 @@ internal static ScreenField Pattern(string label, Func get, Action + /// A trigger's pattern, refused unless it can be used as the kind the rule reads it as — only a regex + /// can fail to parse, and the plain kinds refuse only the patterns that would match every line + /// (). + /// + internal static ScreenField TriggerPattern( + string label, Func get, Action set, Func type) + { + ArgumentNullException.ThrowIfNull(get); + ArgumentNullException.ThrowIfNull(set); + ArgumentNullException.ThrowIfNull(type); + + return new ScreenField( + label, + get, + value => TriggerPatterns.Validate(type(), value) is { } reason + ? (reason.Length > MaxErrorLength ? string.Concat(reason.AsSpan(0, MaxErrorLength - 1), "…") : reason) + : null, + set); + } + /// A that may be blank, held as null when it is: a pattern a world need not have. internal static ScreenField OptionalPattern(string label, Func get, Action set) { diff --git a/src/SharpMUTerm.Tui/SettingsSession.cs b/src/SharpMUTerm.Tui/SettingsSession.cs index fdd4e8e1..4c72a8e2 100644 --- a/src/SharpMUTerm.Tui/SettingsSession.cs +++ b/src/SharpMUTerm.Tui/SettingsSession.cs @@ -371,6 +371,17 @@ private ScreenAction Activate(ScreenModel model) return ScreenAction.Redraw; } + /// + /// Opens a field of the focused row as though ⏎ and ⇥ had reached it — how a screen opened for + /// something (F2 from a selection) lands in the field that something is about. + /// + internal void OpenField(int field) + { + var model = _model(Selection); + Selection.Clamp(model.Sizes); + Open(model, field); + } + /// Opens a field of the focused row, seeding the buffer with its current value. private void Open(ScreenModel model, int field) { diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.TriggerBuilder.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.TriggerBuilder.cs new file mode 100644 index 00000000..bae7a12b --- /dev/null +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.TriggerBuilder.cs @@ -0,0 +1,172 @@ +using SharpConsoleUI.Controls; +using SharpMUTerm.Core.Automation; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Diagnostics; + +namespace SharpMUTerm.Tui; + +/// +/// The trigger builder: ⌃P ▸ Make a trigger from the selection turns selected output into a new rule +/// and opens F2 on it with the pattern being typed, and F2's live test runs the pattern over what the panes +/// hold on every keystroke. +/// +internal sealed partial class SharpMUTermApp +{ + /// What the set a rule is made in is called when the configuration has none to put it in. + internal const string BuilderSetName = "My triggers"; + + /// + /// The output a pane has selected, and which window it is in — or null when what is selected is not a + /// pane's (the command line) or nothing is. Asked of the window's SelectionManager, for + /// 's reason: it owns the one selection, wherever the focus is. + /// + private (string Text, string? WindowId)? SelectedOutput() + { + if (_window.SelectionManager.ActiveSelection is not MarkupControl { HasSelection: true } pane) + { + return null; + } + + var text = SelectedText.Of(pane); + if (text.Trim().Length == 0) + { + return null; + } + + var windowId = _panes.Concat(_frozenPanes) + .FirstOrDefault(entry => ReferenceEquals(entry.Value, pane)).Key; + return (text, windowId); + } + + /// Whether some pane's output is selected — what the ⌃P entry is offered on. + private bool HasOutputSelection => + _window.SelectionManager.ActiveSelection is MarkupControl { HasSelection: true }; + + /// + /// ⌃P ▸ Make a trigger from the selection. The rule is made at once — enabled, with no actions, + /// so it does nothing to the stream until it is given something to do — and F2 opens on it with the + /// pattern field open, so the next keystroke edits the suggestion and the live test answers it. + /// + /// It goes in the first editable set of the character whose window the selection is in: the + /// character's own first listed set, else the first set F2 lists, else a new one. A package's sets are + /// never written to (they are replaced wholesale by an update), and they are not on F2 anyway. + /// + /// + private bool MakeTriggerFromSelection() + { + if (SelectedOutput() is not { } selected) + { + RefuseCommand("nothing selected — drag across a pane's output to select the line the trigger is for"); + return false; + } + + if (_settings.IsOpen) + { + RefuseCommand("close the settings screen first — the trigger opens on F2"); + return false; + } + + if (ComposerIsInTheWay("the trigger editor")) + { + return false; + } + + var windowId = selected.WindowId ?? ActiveWindowId(); + var session = WindowSession(windowId); + var suggestion = TriggerSuggestion.Suggest(selected.Text, session?.Completions.Names()); + var set = BuilderSet(session?.SessionKey ?? _workspace.FindWindow(windowId)?.SessionKey); + + var trigger = new Trigger + { + Name = ScreenLists.Available(_config.TriggerSets.SelectMany(s => s.Triggers).Select(t => t.Name), suggestion.Name), + Pattern = suggestion.Pattern, + MatchType = suggestion.MatchType, + }; + set.Triggers.Add(trigger); + SaveConfiguration(); + + var index = _config.TriggerSets.SelectMany(s => s.Triggers).ToList().IndexOf(trigger); + _settings.Toggle(ConsoleKey.F2, () => TriggersScreen(editPattern: index)); + return true; + } + + /// + /// The set a rule made from a selection goes in, for the character names + /// (world.character), creating one when the configuration has no sets at all — and listing a + /// created set on that character, or the rule would sit in a set nobody runs. + /// + private TriggerSet BuilderSet(string? owner) + { + var character = owner is null ? null : CharacterFor(owner); + if (character is not null) + { + foreach (var name in character.TriggerSets) + { + if (_config.TriggerSets.FirstOrDefault(s => string.Equals(s.Name, name, StringComparison.Ordinal)) is { } own) + { + return own; + } + } + } + + if (_config.TriggerSets.FirstOrDefault() is { } first) + { + return first; + } + + var created = new TriggerSet { Name = BuilderSetName }; + _config.TriggerSets.Add(created); + character?.TriggerSets.Add(created.Name); + Notice($"made a trigger set called {BuilderSetName} for it", MessageSeverity.Info); + return created; + } + + /// The lines the trigger-builder view lands in the main window before selecting one. + internal static IReadOnlyList TriggerBuilderScene { get; } = + [ + "You gain 125 experience points.", + "Rivane says, \"to the crypt, then!\"", + "A town guard nods to you.", + "You gain 40 experience points.", + ]; + + /// + /// The trigger-builder view: lands in the main window, the last + /// line is selected by a real drag (), and the real ⌃P entry is dispatched. + /// The row is measured, not counted, because the demo's room description wraps in a narrow pane. + /// + private void StageTriggerBuilder() + { + foreach (var line in TriggerBuilderScene) + { + AppendWindowLine(MainWindowId, MarkupText.Escape(line)); + } + + RenderWholeFrame(); + var buffer = _lines[MainWindowId]; + var target = buffer.Count - 1; + var width = _paneScrolls.GetValueOrDefault(MainWindowId)?.ViewportWidth ?? 0; + var row = MeasureRows(buffer, 0, width, _panes.GetValueOrDefault(MainWindowId), target); + SimulatePaneDrag(MainWindowId, 0, row, buffer[target].Plain.Length, row); + ReArmWholeFrame(); + DispatchCommand("term:trigger-from-selection"); + } + + /// + /// What F2's live test runs over: the plain text of every window a pane holds, ⌃F's corpus + /// (), with the focused window's lines last so they count as the newest — + /// they are the ones the rule is most likely being written about. Chrome rows carry no plain text and + /// are left out, so a test cannot match the client's own bars. takes the + /// newest of it. + /// + private IReadOnlyList TriggerTestLines() + { + var focused = ActiveWindowId(); + var windows = SearchableWindows(all: true); + return windows.Where(w => !string.Equals(w.WindowId, focused, StringComparison.Ordinal)) + .Concat(windows.Where(w => string.Equals(w.WindowId, focused, StringComparison.Ordinal))) + .SelectMany(w => w.Lines) + .Where(line => line.Length > 0) + .ToList(); + } +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 55826312..4f6a9a2e 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -1401,6 +1401,14 @@ public string RenderSnapshot(string? view = null) ReArmWholeFrame(); } + // The trigger builder: a real drag across a line of output, then the real ⌃P entry, so the frame is + // F2 opened on the rule it made — the suggested pattern being typed, the regex behind it, and the + // live test counting the lines it already matches. + if (string.Equals(view, "trigger-builder", StringComparison.OrdinalIgnoreCase)) + { + StageTriggerBuilder(); + } + // A selection in the command line: the same band on the bar the panes use, made by a real drag // through the bar's own mouse handler across part of the demo's draft. In FrameContrastTests' // list for "selection"'s reason, and because here the band sits on a tinted input row instead. @@ -7117,11 +7125,22 @@ private ScreenBinding WorldsScreen(string fkey, bool onCharacters) /// buttons, and the cursor has to leave the list to press one. The selection is what the editor /// pane and the [[- del]] row are about, and it stays on the rule the user was looking at. /// - private ScreenBinding TriggersScreen() + private ScreenBinding TriggersScreen() => TriggersScreen(editPattern: null); + + /// + /// A rule to open with its pattern field already being typed into — the trigger builder's landing — + /// as its index in the flattened list, or null to open the screen as F2 does. + /// + private ScreenBinding TriggersScreen(int? editPattern) { var session = new SettingsSession(selection => TriggersScreenRenderer.Model(_config.TriggerSets, selection.SelectionIn(0), RouteTargets()), SaveConfiguration); + if (editPattern is { } rule) + { + session.Selection.Seed(0, rule); + session.OpenField(TriggersScreenRenderer.PatternField); + } return new ScreenBinding(session, () => TriggersScreenView.Build( _config.TriggerSets, @@ -7130,7 +7149,8 @@ private ScreenBinding TriggersScreen() _system.DesktopDimensions.Width, session.Focus(), _system.DesktopDimensions.Height, - _theme)); + _theme, + TriggerTestLines())); } /// Opens the F3 Aliases screen: the alias list, then the alias's toggles. @@ -7709,7 +7729,8 @@ private CommandContext CommandState() ScriptsOn: _scriptsRoot is not null, Walking: SendTarget() is { } walker && _recorders.TryGetValue(walker, out var map) && map.Walk.IsWalking, Sound: CanPlaySound ? !_muted : null, - Announced: Host.Announcer is null ? null : IsAnnounced(ActiveWindowId())); + Announced: Host.Announcer is null ? null : IsAnnounced(ActiveWindowId()), + OutputSelected: HasOutputSelection); } /// @@ -8100,6 +8121,8 @@ private bool RunBuiltInCommand(string id) return true; case "term:copy": return CopySelection(); + case "term:trigger-from-selection": + return MakeTriggerFromSelection(); case "term:messages": if (!ComposerIsInTheWay("the client messages")) { diff --git a/src/SharpMUTerm.Tui/SnapshotViews.cs b/src/SharpMUTerm.Tui/SnapshotViews.cs index f8d76322..e89b91ab 100644 --- a/src/SharpMUTerm.Tui/SnapshotViews.cs +++ b/src/SharpMUTerm.Tui/SnapshotViews.cs @@ -21,7 +21,7 @@ internal static class SnapshotViews "compose", "compose-literal", "moo-edit", "mssp", "mssp-none", "mssp-never", "web", "rail-long", "scrollback", "scrollback-up", "links", "away", "away-scrollback", "search", "search-regex", "search-all", "search-landed", "activity-bar", - "mxp-image", "mxp-figure", "input-selection", "selection", + "mxp-image", "mxp-figure", "input-selection", "selection", "trigger-builder", "prefix", "prefix-panel", "focus", "focus-moved", "tabs", "tabs-many", "collapsed", "timestamps", "timestamps-toggled", "prompt", "meters", "gamedata", "map", "map-walking", "map-split", "packages", "package-review", "package-browse", "send-menu", diff --git a/src/SharpMUTerm.Tui/TriggerReport.cs b/src/SharpMUTerm.Tui/TriggerReport.cs index 5788da8a..e30baa58 100644 --- a/src/SharpMUTerm.Tui/TriggerReport.cs +++ b/src/SharpMUTerm.Tui/TriggerReport.cs @@ -135,7 +135,10 @@ private static string Rule(Trigger trigger, TriggerEngine engine) : $"window '{trigger.Actions.SpawnTarget}'"; var matches = engine.MatchesFor(trigger); var state = trigger.Enabled ? string.Empty : " (disabled)"; - return $" {mark} {name}{state} /{trigger.Pattern}/ → {route} · " + var pattern = trigger.MatchType == TriggerMatchType.Regex + ? $"/{trigger.Pattern}/" + : $"{TriggerPatterns.Describe(trigger.MatchType)} \"{trigger.Pattern}\""; + return $" {mark} {name}{state} {pattern} → {route} · " + $"{Count(matches, "match", "matches")}"; } diff --git a/src/SharpMUTerm.Tui/TriggersScreenRenderer.cs b/src/SharpMUTerm.Tui/TriggersScreenRenderer.cs index 5d71b3ea..8ef9fcac 100644 --- a/src/SharpMUTerm.Tui/TriggersScreenRenderer.cs +++ b/src/SharpMUTerm.Tui/TriggersScreenRenderer.cs @@ -94,6 +94,23 @@ internal static class TriggersScreenRenderer /// internal const int SetField = 9; + /// + /// How the pattern is read — , offered in plain words. Appended for the + /// reason was, though the editor draws it above the pattern: a player + /// should meet "contains the text" before they meet a regex. + /// + internal const int MatchTypeField = 10; + + /// The words the match field offers, in the order gives. + internal static IReadOnlyList MatchTypeNames { get; } = + TriggerPatterns.Offered.Select(TriggerPatterns.Describe).ToArray(); + + /// + /// How many sample rows the live test always draws, matching or not, so the rows under it do not jump + /// as a pattern being typed gains and loses matches. + /// + internal const int TestSampleRows = TriggerPreview.DefaultSamples; + /// /// How wide the fg / bg / attrs and rewrite / respond / /// script labels are padded, so the field wells in each section start in the same column. @@ -298,8 +315,11 @@ internal static ScreenModel Model( var rules = ScreenModel.Rows(flattened, entry => ScreenRow.Of( ScreenToggle.Bind(() => entry.Trigger.Enabled, v => entry.Trigger.Enabled = v), ScreenField.Name("name", () => entry.Trigger.Name, v => entry.Trigger.Name = v), - ScreenField.Pattern( - "match pattern", () => entry.Trigger.Pattern, v => entry.Trigger.Pattern = v), + ScreenField.TriggerPattern( + "match pattern", + () => entry.Trigger.Pattern, + v => entry.Trigger.Pattern = v, + () => entry.Trigger.MatchType), ScreenField.WindowName( "route", () => Route(entry.Trigger), @@ -328,7 +348,12 @@ internal static ScreenModel Model( () => entry.Trigger.Actions.ScriptCallback, v => entry.Trigger.Actions.ScriptCallback = v, Callbacks(entry.Trigger, callbacks)), - ScreenLists.Owner(sets, s => s.Triggers, entry.Trigger))) + ScreenLists.Owner(sets, s => s.Triggers, entry.Trigger), + ScreenField.Choice( + "match", + () => TriggerPatterns.Describe(entry.Trigger.MatchType), + v => SetMatchType(entry.Trigger, TriggerPatterns.Parse(v) ?? entry.Trigger.MatchType), + MatchTypeNames))) .Concat(Buttons(sets, selectedTrigger)) .ToArray(); @@ -350,6 +375,23 @@ internal static ScreenModel Model( return new ScreenModel(rules, editor); } + /// + /// Changes how a rule's pattern is read. Moving to a regex rewrites the pattern as the regex + /// it already meant, so the rule goes on matching exactly what it matched and the player sees the raw + /// form of what they built; moving away leaves the text as typed, because there is no plain-language + /// reading of an arbitrary regex to convert it to. + /// + internal static void SetMatchType(Trigger trigger, TriggerMatchType type) + { + ArgumentNullException.ThrowIfNull(trigger); + if (type == TriggerMatchType.Regex && trigger.MatchType != TriggerMatchType.Regex) + { + trigger.Pattern = TriggerPatterns.ToRegex(trigger.MatchType, trigger.Pattern); + } + + trigger.MatchType = type; + } + /// /// The rule list's buttons. A rule is added to the set that owns the selection rather than to some /// fixed one, because the list is flattened across every set and a rule appearing in a set the user @@ -454,7 +496,7 @@ internal static List RulesColumn( foreach (var trigger in set.Triggers) { left.Add(ScreenChrome.Cursor( - RuleRow(row, selectedTrigger, trigger), cursor.IsOn(0, row), width)); + RuleRow(row, selectedTrigger, trigger, width), cursor.IsOn(0, row), width)); left.Add(RuleSub(set.Name, trigger.Actions)); row++; } @@ -541,7 +583,8 @@ internal static List EditorColumn( ScreenFocus? focus = null, int width = ColumnWidth, int height = 0, - Theme? theme = null) + Theme? theme = null, + IReadOnlyList? recent = null) { ArgumentNullException.ThrowIfNull(sets); ArgumentNullException.ThrowIfNull(routeTargets); @@ -557,7 +600,8 @@ internal static List EditorColumn( selectedTrigger, width, height, - theme is null ? null : WorkspacePalette.ReadingPlane(theme)) + theme is null ? null : WorkspacePalette.ReadingPlane(theme), + recent) : new List(); } @@ -576,7 +620,7 @@ internal static List EditorColumn( return flattened; } - private static string RuleRow(int index, int selectedTrigger, Trigger trigger) + private static string RuleRow(int index, int selectedTrigger, Trigger trigger, int width = 0) { var marker = index == selectedTrigger ? "[bold]▸[/]" : " "; var box = trigger.Enabled ? $"[{Accent}]✓[/]" : "[dim]·[/]"; @@ -585,7 +629,18 @@ private static string RuleRow(int index, int selectedTrigger, Trigger trigger) // window, the list would have gone on calling it `main` — the two surfaces disagreeing about one // rule, which is the shape of the confusion the rename exists to remove. var target = Route(trigger); - return $"{marker} {box} [bold]{Escape(trigger.Name)}[/] [dim]{Escape(trigger.Pattern)}[/] [dim]→ {Escape(target)}[/]"; + + // The pattern gives way first when the row is wider than its column: a row that wrapped put its + // route at the start of the next row, where it read as part of the rule under it. A rule made from + // a selection is the usual cause — its name and pattern are both a line of output long. + var pattern = trigger.Pattern; + if (width > 0) + { + var room = width - 1 - (4 + trigger.Name.Length + 1 + 3 + target.Length); + pattern = Fit(pattern, Math.Max(1, room)); + } + + return $"{marker} {box} [bold]{Escape(trigger.Name)}[/] [dim]{Escape(pattern)}[/] [dim]→ {Escape(target)}[/]"; } private static string RuleSub(string owningSet, TriggerActions actions) => @@ -640,7 +695,8 @@ private static List BuildEditor( int index, int width = ColumnWidth, int height = 0, - Rgb? plane = null) + Rgb? plane = null, + IReadOnlyList? recent = null) { var name = cursor.EditOn(0, index, NameField); var set = cursor.EditOn(0, index, SetField); @@ -652,6 +708,14 @@ private static List BuildEditor( var rewrite = cursor.EditOn(0, index, RewriteField); var response = cursor.EditOn(0, index, ResponseField); var script = cursor.EditOn(0, index, ScriptField); + var match = cursor.EditOn(0, index, MatchTypeField); + + // What the live test and the regex line read: the buffers while they are open, so both follow the + // keystroke rather than the last commit. + var matchType = match is { } typing && TriggerPatterns.Parse(typing.Text) is { } typed + ? typed + : trigger.MatchType; + var patternText = pattern?.Text ?? trigger.Pattern; // While the route field is open the radios follow the *buffer*, not config, so ↑↓ visibly move // the dot before anything is committed — the buffer is what ⏎ would write. @@ -672,8 +736,27 @@ private static List BuildEditor( "[dim]set[/]", $" {ScreenChrome.Field($"[{Value}]{Escape(setName)}[/]", set)}", string.Empty, - "[dim]match pattern (regex)[/]", + + // How the pattern is read, in plain words, on the heading row itself and so before the pattern + // — a player who has never written a regex meets the three kinds they can use first. It costs + // no row: this pane already runs to the height of a 24-row terminal. The raw regex is still + // drawn, under a plain pattern, so nothing that was visible before is hidden now. + $"[dim]match pattern[/] {ScreenChrome.Field($"[{Value}]{Escape(TriggerPatterns.Describe(trigger.MatchType))}[/]", match)}", $" {ScreenChrome.Field(Escape(trigger.Pattern), pattern)}", + }; + + if (matchType != TriggerMatchType.Regex) + { + lines.Add(RegexRow(matchType, patternText, width)); + } + + if (recent is not null) + { + lines.AddRange(TestRows(recent, matchType, patternText, trigger.CaseSensitive, width)); + } + + lines.AddRange(new[] + { string.Empty, // The caption is here as well as over the actions section because the route expands captures // too: "Channel $1" against ^<(.+?)> is one rule feeding a pane per channel, and a reader who @@ -689,7 +772,7 @@ private static List BuildEditor( // field is open (ScreenChrome.Choices, applied to this whole column at the end) — which is // what a radio group was really offering, without pretending the set is closed. $" {ScreenChrome.Field(Escape(currentRoute), route)}", - }; + }); var fg = trigger.Actions.HighlightForeground; var bg = trigger.Actions.HighlightBackground; @@ -738,6 +821,98 @@ private static List BuildEditor( return ScreenChrome.Choices(lines, cursor.Edit, width); } + /// + /// The regex a plain-language pattern compiles to, drawn under it: it is what the engine will run, and + /// a player outgrowing the plain kinds learns the syntax from the rules they already wrote. + /// + private static string RegexRow(TriggerMatchType type, string pattern, int width) + { + const string Label = " regex "; + var regex = TriggerPatterns.ToRegex(type, pattern); + return $"[dim]{Label}[/]{ScreenChrome.ReadOnly(Fit(regex, width - Label.Length - 2))}"; + } + + /// + /// The live test: how many of the recent lines the pattern matches, and the newest few of them with the + /// match marked. It is always + 1 rows, whatever the pattern does, so typing + /// never moves the rows below it — and a pattern that does not parse yet is a state written in the + /// muted ink, not a warning: a regex is unparseable most of the time it is being typed. + /// + internal static List TestRows( + IReadOnlyList recent, TriggerMatchType type, string pattern, bool caseSensitive, int width) + { + ArgumentNullException.ThrowIfNull(recent); + + var result = TriggerPreview.Run(recent, type, pattern, caseSensitive); + var room = Math.Max(8, width - 8); + string caption; + if (result.Problem is { } problem) + { + caption = "· not a pattern yet: " + problem; + } + else if (result.Tested == 0) + { + caption = "· no output held yet to try it on"; + } + else + { + var held = result.Tested.ToString("N0", System.Globalization.CultureInfo.InvariantCulture); + var count = result.Matched.ToString("N0", System.Globalization.CultureInfo.InvariantCulture); + caption = result.Matched == 0 + ? $"· none of the last {held} lines match" + : $"· {count} of the last {held} lines match"; + } + + var rows = new List { $"[dim]test[/] {ScreenChrome.ReadOnly(Fit(caption, room))}" }; + foreach (var sample in result.Samples) + { + rows.Add(" " + Sample(sample.Text, sample.MatchStart, sample.MatchLength, Math.Max(8, width - 4))); + } + + while (rows.Count < TestSampleRows + 1) + { + // A space, not empty: ScreenChrome.Compact drops empty rows, and these are reserved. + rows.Add(" "); + } + + return rows; + } + + /// + /// One matching line, cut to around its match so the match is always on + /// screen, with the matched run in the accent — the search surface's way of saying why a row is listed. + /// + internal static string Sample(string text, int start, int length, int width) + { + const string Ellipsis = "…"; + var from = 0; + if (text.Length > width) + { + // Lead in with a few cells of context before the match, and never leave slack at the end. + from = Math.Clamp(start - 6, 0, Math.Max(0, text.Length - width + Ellipsis.Length)); + } + + var head = from > 0 ? Ellipsis : string.Empty; + var room = width - head.Length; + var take = Math.Min(text.Length - from, room); + var tail = string.Empty; + if (from + take < text.Length) + { + take = Math.Max(0, room - Ellipsis.Length); + tail = Ellipsis; + } + + var shown = text.Substring(from, take); + var hitStart = Math.Clamp(start - from, 0, shown.Length); + var hitEnd = Math.Clamp(start + length - from, hitStart, shown.Length); + return $"[dim]{head}[/]{Escape(shown[..hitStart])}[bold {Accent}]{Escape(shown[hitStart..hitEnd])}[/]" + + $"{Escape(shown[hitEnd..])}[dim]{tail}[/]"; + } + + /// Text cut to cells with an ellipsis. + private static string Fit(string text, int width) => + width <= 1 || text.Length <= width ? text : string.Concat(text.AsSpan(0, width - 1), "…"); + /// A checkbox row in the editor pane, checked in the accent and unchecked dim. private static string Checkbox(string label, bool value) => value ? $"[{Accent}][[x]][/] {Escape(label)}" : $"[dim][[ ]] {Escape(label)}[/]"; diff --git a/src/SharpMUTerm.Tui/TriggersScreenView.cs b/src/SharpMUTerm.Tui/TriggersScreenView.cs index 9df2af08..2d42d9a7 100644 --- a/src/SharpMUTerm.Tui/TriggersScreenView.cs +++ b/src/SharpMUTerm.Tui/TriggersScreenView.cs @@ -23,7 +23,8 @@ public static IWindowControl Build( int width, ScreenFocus? focus = null, int height = 0, - Theme? theme = null) + Theme? theme = null, + IReadOnlyList? recent = null) { var header = ScreenChrome.Band( TriggersScreenRenderer.HeaderLine( @@ -42,7 +43,7 @@ public static IWindowControl Build( // One column at a time: the rule list, or the editor once the keyboard has moved into it or // ⏎ has opened one of the rule's fields, which are drawn in the editor and nowhere else. var only = focus is { } f && (f.InPane(1) || f.IsEditing) - ? TriggersScreenRenderer.EditorColumn(sets, selectedTrigger, routeTargets, focus, width, body, theme) + ? TriggersScreenRenderer.EditorColumn(sets, selectedTrigger, routeTargets, focus, width, body, theme, recent) : TriggersScreenRenderer.RulesColumn(sets, selectedTrigger, focus, width); return ScreenChrome.Single( header, footer, ScreenChrome.Stretch(new MarkupControl(ScreenChrome.Window(only, body))), @@ -57,7 +58,7 @@ public static IWindowControl Build( var left = TriggersScreenRenderer.RulesColumn(sets, selectedTrigger, focus, rules); var right = TriggersScreenRenderer.EditorColumn( sets, selectedTrigger, routeTargets, focus, - width <= 0 ? rules : width - rules - ScreenChrome.ColumnDivider, body, theme); + width <= 0 ? rules : width - rules - ScreenChrome.ColumnDivider, body, theme, recent); var rulesCol = ScreenChrome.Stretch(new MarkupControl(ScreenChrome.Window(left, body))); var editorCol = ScreenChrome.Stretch(new MarkupControl( diff --git a/tests/SharpMUTerm.Core.Tests/Automation/TriggerBuilderTests.cs b/tests/SharpMUTerm.Core.Tests/Automation/TriggerBuilderTests.cs new file mode 100644 index 00000000..329f3c3b --- /dev/null +++ b/tests/SharpMUTerm.Core.Tests/Automation/TriggerBuilderTests.cs @@ -0,0 +1,200 @@ +using SharpMUTerm.Core.Automation; +using SharpMUTerm.Core.Configuration; + +namespace SharpMUTerm.Core.Tests.Automation; + +/// +/// The trigger builder's Core half: the plain-language match kinds, the pattern proposed from a selection, +/// and the live test F2 runs over held output. +/// +public class TriggerBuilderTests +{ + [Test] + public async Task NumbersBecomeWildcards() + { + var suggestion = TriggerSuggestion.Suggest("You gain 125 experience points."); + + await Assert.That(suggestion.MatchType).IsEqualTo(TriggerMatchType.Wildcard); + await Assert.That(suggestion.Pattern).IsEqualTo("You gain * experience points."); + await Assert.That(suggestion.Regex).IsEqualTo("You gain (.*?) experience points\\."); + } + + [Test] + public async Task NumbersWithSeparatorsAreOneWildcard() + { + var suggestion = TriggerSuggestion.Suggest("HP: 1,024/2,048 (3.5%)"); + + await Assert.That(suggestion.Pattern).IsEqualTo("HP: */* (*%)"); + } + + [Test] + public async Task QuotedSpeechKeepsItsQuotesAndLosesItsWords() + { + var suggestion = TriggerSuggestion.Suggest("Rivane says, \"to the crypt, then!\""); + + await Assert.That(suggestion.Pattern).IsEqualTo("Rivane says, \"*\""); + } + + [Test] + public async Task KnownPlayerNamesBecomeWildcardsOnlyAsWholeWords() + { + var suggestion = TriggerSuggestion.Suggest( + "Rivane tells you: meet Rivanes at dawn", new[] { "Rivane" }); + + await Assert.That(suggestion.Pattern).IsEqualTo("* tells you: meet Rivanes at dawn"); + } + + [Test] + public async Task ALineWithNothingVariableIsMatchedAsText() + { + var suggestion = TriggerSuggestion.Suggest(" A town guard nods to you. \nsecond line"); + + await Assert.That(suggestion.MatchType).IsEqualTo(TriggerMatchType.Contains); + await Assert.That(suggestion.Pattern).IsEqualTo("A town guard nods to you."); + await Assert.That(suggestion.Name).IsEqualTo("A town guard nods to you"); + } + + [Test] + public async Task ALineThatIsAllVariableIsMatchedAsTextRatherThanAsEverything() + { + var suggestion = TriggerSuggestion.Suggest("12345"); + + await Assert.That(suggestion.MatchType).IsEqualTo(TriggerMatchType.Contains); + await Assert.That(suggestion.Pattern).IsEqualTo("12345"); + } + + [Test] + public async Task ALiteralAsteriskIsEscapedSoItStillMatchesItself() + { + var suggestion = TriggerSuggestion.Suggest("*** You have 3 new mail ***"); + var trigger = new Trigger { Pattern = suggestion.Pattern, MatchType = suggestion.MatchType }; + + await Assert.That(suggestion.Pattern).IsEqualTo("\\*\\*\\* You have * new mail \\*\\*\\*"); + await Assert.That(trigger.Regex.IsMatch("*** You have 12 new mail ***")).IsTrue(); + await Assert.That(trigger.Regex.IsMatch("You have 12 new mail")).IsFalse(); + } + + [Test] + public async Task AWildcardIsACaptureAndATrailingOneIsGreedy() + { + var trigger = new Trigger { Pattern = "* says *", MatchType = TriggerMatchType.Wildcard }; + + var match = trigger.Regex.Match("Rivane says hello there"); + + await Assert.That(match.Groups[1].Value).IsEqualTo("Rivane"); + await Assert.That(match.Groups[2].Value).IsEqualTo("hello there"); + } + + [Test] + public async Task ContainsReadsRegexCharactersLiterally() + { + var trigger = new Trigger { Pattern = "[public] (", MatchType = TriggerMatchType.Contains }; + + await Assert.That(trigger.Regex.IsMatch("x [public] (hi)")).IsTrue(); + await Assert.That(trigger.Regex.IsMatch("p")).IsFalse(); + } + + [Test] + public async Task StartsWithIsAnchoredAndCaseFollowsTheRule() + { + var trigger = new Trigger { Pattern = "You gain", MatchType = TriggerMatchType.StartsWith }; + + await Assert.That(trigger.Regex.IsMatch("you gain 5")).IsTrue(); + await Assert.That(trigger.Regex.IsMatch("Then you gain 5")).IsFalse(); + + trigger.CaseSensitive = true; + await Assert.That(trigger.Regex.IsMatch("you gain 5")).IsFalse(); + } + + [Test] + public async Task ChangingTheMatchTypeRecompiles() + { + var trigger = new Trigger { Pattern = "a.c" }; + await Assert.That(trigger.Regex.IsMatch("abc")).IsTrue(); + + trigger.MatchType = TriggerMatchType.Contains; + + await Assert.That(trigger.Regex.IsMatch("abc")).IsFalse(); + await Assert.That(trigger.Regex.IsMatch("xa.cx")).IsTrue(); + } + + [Test] + public async Task OnlyARegexCanFailToParse() + { + await Assert.That(TriggerPatterns.Validate(TriggerMatchType.Regex, "(")).IsNotNull(); + await Assert.That(TriggerPatterns.Validate(TriggerMatchType.Contains, "(")).IsNull(); + await Assert.That(TriggerPatterns.Validate(TriggerMatchType.Wildcard, "* *")).IsNotNull(); + await Assert.That(TriggerPatterns.Validate(TriggerMatchType.StartsWith, string.Empty)).IsNotNull(); + } + + [Test] + public async Task ThePlainWordsRoundTripAndComeBeforeTheRegex() + { + foreach (var type in Enum.GetValues()) + { + await Assert.That(TriggerPatterns.Parse(TriggerPatterns.Describe(type))).IsEqualTo(type); + } + + await Assert.That(TriggerPatterns.Offered[^1]).IsEqualTo(TriggerMatchType.Regex); + } + + [Test] + public async Task TheMatchTypeRoundTripsThroughTheConfigurationAndDefaultsToRegex() + { + var config = new AppConfiguration(); + config.TriggerSets.Add(new TriggerSet + { + Name = "Mine", + Triggers = + { + new Trigger { Name = "xp", Pattern = "You gain * xp", MatchType = TriggerMatchType.Wildcard }, + new Trigger { Name = "old", Pattern = "^old$" }, + }, + }); + + var loaded = ConfigurationStore.Deserialize(ConfigurationStore.Serialize(config)); + var legacy = ConfigurationStore.Deserialize(""" + { "version": 5, "triggerSets": [ { "name": "S", "triggers": [ { "name": "t", "pattern": "^a" } ] } ] } + """); + + await Assert.That(loaded.TriggerSets[0].Triggers[0].MatchType).IsEqualTo(TriggerMatchType.Wildcard); + await Assert.That(loaded.TriggerSets[0].Triggers[1].MatchType).IsEqualTo(TriggerMatchType.Regex); + await Assert.That(legacy.TriggerSets[0].Triggers[0].MatchType).IsEqualTo(TriggerMatchType.Regex); + await Assert.That(new Trigger { Pattern = "x", MatchType = TriggerMatchType.StartsWith }.Clone().MatchType) + .IsEqualTo(TriggerMatchType.StartsWith); + } + + [Test] + public async Task ThePreviewCountsEveryMatchAndKeepsTheNewestFew() + { + var lines = new[] { "You gain 1 xp", "noise", "You gain 2 xp", "You gain 3 xp", "You gain 4 xp" }; + + var result = TriggerPreview.Run(lines, TriggerMatchType.Wildcard, "You gain * xp", caseSensitive: false); + + await Assert.That(result.Problem).IsNull(); + await Assert.That(result.Tested).IsEqualTo(5); + await Assert.That(result.Matched).IsEqualTo(4); + await Assert.That(result.Samples.Select(s => s.Text)) + .IsEquivalentTo(new[] { "You gain 4 xp", "You gain 3 xp", "You gain 2 xp" }); + } + + [Test] + public async Task ThePreviewTriesOnlyTheNewestLines() + { + var lines = Enumerable.Range(0, TriggerPreview.MaxLines + 500).Select(i => i < 500 ? "old" : "new").ToArray(); + + var result = TriggerPreview.Run(lines, TriggerMatchType.Contains, "old", caseSensitive: false); + + await Assert.That(result.Tested).IsEqualTo(TriggerPreview.MaxLines); + await Assert.That(result.Matched).IsEqualTo(0); + } + + [Test] + public async Task AnUnparseablePatternIsAStateNotAThrow() + { + var result = TriggerPreview.Run(new[] { "a" }, TriggerMatchType.Regex, "(unclosed", caseSensitive: false); + + await Assert.That(result.Problem).IsNotNull(); + await Assert.That(result.Matched).IsEqualTo(0); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/TriggerBuilderTests.cs b/tests/SharpMUTerm.Tui.Tests/TriggerBuilderTests.cs new file mode 100644 index 00000000..6cc5385b --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/TriggerBuilderTests.cs @@ -0,0 +1,132 @@ +using SharpConsoleUI.Drivers; +using SharpMUTerm.Core.Automation; +using SharpMUTerm.Graphics; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// The trigger builder: ⌃P ▸ Make a trigger from the selection and F2's live test. Every frame here +/// is the real one — a real drag through the pane's own mouse handler, the real ⌃P entry, and the real +/// settings session typing into the pattern field. +/// +/// Serialised: rendering redirects the process-global Console.Out. +[NotInParallel] +public class TriggerBuilderTests +{ + private static readonly TerminalCapabilities Headless = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private static SharpMUTermApp Demo(int width = 120, int height = 32) + { + Console.SetIn(TextReader.Null); + return new SharpMUTermApp(DemoScene.Build(), Headless, new HeadlessConsoleDriver(width, height)); + } + + private static string Text(string frame) => string.Join("\n", FrameGrid.Decode(frame, 120, 32)); + + [Test] + public async Task TheEntryIsOfferedOnlyWhileOutputIsSelected() + { + var app = Demo(); + app.RenderSnapshot(); + await Assert.That(app.BuildCatalog().Any(c => c.Id == "term:trigger-from-selection")).IsFalse(); + + app.SimulatePaneDrag(SharpMUTermApp.MainWindowId, 0, 0, 10, 0); + + await Assert.That(app.BuildCatalog().Any(c => c.Id == "term:trigger-from-selection")).IsTrue(); + } + + [Test] + public async Task WithNothingSelectedItRefusesAndMakesNothing() + { + var app = Demo(); + app.RenderSnapshot(); + var before = app.Configuration.TriggerSets.Sum(s => s.Triggers.Count); + + await Assert.That(app.DispatchCommand("term:trigger-from-selection")).IsFalse(); + await Assert.That(app.Configuration.TriggerSets.Sum(s => s.Triggers.Count)).IsEqualTo(before); + await Assert.That(app.Settings.IsOpen).IsFalse(); + } + + [Test] + public async Task TheViewOpensF2OnAWildcardRuleWithTheLiveTestCounting() + { + var app = Demo(); + var frame = Text(app.RenderSnapshot("trigger-builder")); + + var made = app.Configuration.TriggerSets.SelectMany(s => s.Triggers).Last(t => t.Name.StartsWith("You gain", StringComparison.Ordinal)); + await Assert.That(made.MatchType).IsEqualTo(TriggerMatchType.Wildcard); + await Assert.That(made.Pattern).IsEqualTo("You gain * experience points."); + await Assert.That(app.Settings.IsOpen).IsTrue(); + await Assert.That(frame).Contains("matches with * wildcards"); + await Assert.That(frame).Contains("regex You gain (.*?) experience points\\."); + await Assert.That(frame).Contains("2 of the last"); + await Assert.That(frame).Contains("You gain 125 experience points."); + } + + [Test] + public async Task TheLiveTestFollowsTheBufferKeystrokeByKeystroke() + { + var app = Demo(); + app.RenderSnapshot("trigger-builder"); + + // The pattern field is open on the suggestion: Home, then type a word that matches nothing. + app.Settings.SimulateKey(new ConsoleKeyInfo('\0', ConsoleKey.Home, false, false, false)); + foreach (var c in "Never ") + { + app.Settings.SimulateKey(new ConsoleKeyInfo(c, ConsoleKey.NoName, false, false, false)); + } + + var frame = Text(app.RenderWholeFrame()); + + await Assert.That(frame).Contains("none of the last"); + await Assert.That(frame).Contains("Never You gain * experience points."); + } + + [Test] + public async Task TheViewFitsAt80Columns() + { + var app = Demo(80, 24); + var rows = FrameGrid.Decode(app.RenderSnapshot("trigger-builder"), 80, 24); + + await Assert.That(string.Join("\n", rows)).Contains("2 of the last"); + await Assert.That(rows.All(r => r.TrimEnd().Length <= 80)).IsTrue(); + } + + [Test] + public async Task AnUnparseablePatternIsDrawnAsAStateAndTheRowsBelowDoNotMove() + { + var good = TriggersScreenRenderer.TestRows(new[] { "abc" }, TriggerMatchType.Regex, "b", false, 60); + var bad = TriggersScreenRenderer.TestRows(new[] { "abc" }, TriggerMatchType.Regex, "(b", false, 60); + var empty = TriggersScreenRenderer.TestRows(Array.Empty(), TriggerMatchType.Contains, "b", false, 60); + + await Assert.That(bad[0]).Contains("not a pattern yet"); + await Assert.That(bad[0]).DoesNotContain(ScreenPalette.Warn); + await Assert.That(empty[0]).Contains("no output held yet"); + await Assert.That(good.Count).IsEqualTo(TriggersScreenRenderer.TestSampleRows + 1); + await Assert.That(bad.Count).IsEqualTo(good.Count); + await Assert.That(empty.Count).IsEqualTo(good.Count); + } + + [Test] + public async Task ASampleKeepsItsMatchOnScreenWhenTheLineIsLong() + { + var line = new string('x', 100) + "HIT" + new string('y', 100); + + var sample = TriggersScreenRenderer.Sample(line, 100, 3, 30); + + await Assert.That(sample).Contains("HIT"); + await Assert.That(MarkupText.VisibleLength(sample)).IsLessThanOrEqualTo(30); + } + + [Test] + public async Task SwitchingToRegexKeepsWhatTheRuleMatched() + { + var trigger = new Trigger { Pattern = "You gain * xp.", MatchType = TriggerMatchType.Wildcard }; + + TriggersScreenRenderer.SetMatchType(trigger, TriggerMatchType.Regex); + + await Assert.That(trigger.Pattern).IsEqualTo("You gain (.*?) xp\\."); + await Assert.That(trigger.Regex.IsMatch("You gain 5 xp.")).IsTrue(); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/TriggerSetManagementTests.cs b/tests/SharpMUTerm.Tui.Tests/TriggerSetManagementTests.cs index 38019b66..013feec0 100644 --- a/tests/SharpMUTerm.Tui.Tests/TriggerSetManagementTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/TriggerSetManagementTests.cs @@ -547,9 +547,16 @@ public async Task Tab_AfterAMoveOpensTheMovedRulesOwnNextField() } session.Handle(Key(ConsoleKey.DownArrow)); - session.Handle(Key(ConsoleKey.Tab)); // commits the move and wraps to field 0 + session.Handle(Key(ConsoleKey.Tab)); // commits the move and steps to the field after the set + // The match kind follows the set now (it was appended after it), and it belongs to the moved + // rule: a regex rule reads "regular expression". var edit = session.Focus().Edit!.Value; + await Assert.That(edit.Field).IsEqualTo(TriggersScreenRenderer.MatchTypeField); + await Assert.That(edit.Text).IsEqualTo("regular expression"); + + session.Handle(Key(ConsoleKey.Tab)); // and wraps to field 0 of the same rule + edit = session.Focus().Edit!.Value; await Assert.That(edit.Field).IsEqualTo(TriggersScreenRenderer.NameField); await Assert.That(edit.Text).IsEqualTo("Spam"); } diff --git a/tests/SharpMUTerm.Tui.Tests/TriggersScreenEditingTests.cs b/tests/SharpMUTerm.Tui.Tests/TriggersScreenEditingTests.cs index 2de9c5f5..72e81c29 100644 --- a/tests/SharpMUTerm.Tui.Tests/TriggersScreenEditingTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/TriggersScreenEditingTests.cs @@ -61,7 +61,9 @@ public async Task ARuleRowCarriesItsPatternRouteAndBothHighlightColours() // The name leads, then everything the editor pane draws, then the set that owns the rule. Every // ordinal below is unchanged — each new field is appended, so nothing the screen, the snapshot // keys or these tests already address is renumbered. - await Assert.That(model.RowAt(0, 0).FieldCount).IsEqualTo(10); + await Assert.That(model.RowAt(0, 0).FieldCount).IsEqualTo(11); + await Assert.That(model.FieldAt(0, 0, TriggersScreenRenderer.MatchTypeField)!.Value.Get()) + .IsEqualTo("regular expression"); await Assert.That(model.FieldAt(0, 0, TriggersScreenRenderer.SetField)!.Value.Get()).IsEqualTo("Comms"); await Assert.That(model.FieldAt(0, 0, TriggersScreenRenderer.NameField)!.Value.Get()).IsEqualTo("Tell"); await Assert.That(model.FieldAt(0, 0, TriggersScreenRenderer.PatternField)!.Value.Get()).IsEqualTo("tells you"); diff --git a/tests/SharpMUTerm.Tui.Tests/TriggersScreenRendererTests.cs b/tests/SharpMUTerm.Tui.Tests/TriggersScreenRendererTests.cs index 9b42091f..efb2134d 100644 --- a/tests/SharpMUTerm.Tui.Tests/TriggersScreenRendererTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/TriggersScreenRendererTests.cs @@ -117,7 +117,7 @@ public async Task Render_HighlightCaptionAndSwatchAppearWhenColourSet() { var lines = TriggersScreenRenderer.Render(Scene(), selectedTrigger: 0, routeTargets: Array.Empty()); - var heading = lines.Single(l => l.Contains("highlight") && !l.Contains("fg") && !l.Contains("bg")); + var heading = lines.Single(l => l.Contains("[dim]highlight[/]")); await Assert.That(heading).Contains("recoloured"); await Assert.That(heading).DoesNotContain("[[x]]"); await Assert.That(heading).DoesNotContain("[[ ]]"); From ab388bde4c3315d04bfa49bf057672b143ad3efe Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 03:11:53 +0000 Subject: [PATCH 008/113] Settings screens follow the theme; pane tints re-picked for colour-blind readers Settings screens (D6): ScreenPalette's constants become roles spelt as the Dark theme's values. A new immutable ScreenTheme, built once from the app's theme, resolves renderer markup and control colours at the view boundary (ScreenChrome.Panel/Band/VerticalRule, ScreenTheme.Colour), so renderers and their tests are untouched and there is no mutable global. Dark resolves to the constants byte for byte; Light mirrors L*, Solarized takes its background's hue, and every ink is held to Contrast.Floor on its planes. Threaded through every *ScreenView.Build (required), SettingsOverlay, ComposeOverlay, ListOverlay and EditReviewOverlay. FrameContrastTests gains 13 settings views on all three themes; ScreenThemeTests checks that no Light settings frame paints a dark-palette plane. Tints: ColourVision (Core) simulates protanopia/deuteranopia/tritanopia (Machado 2009) and measures CIEDE2000. The ten anchors were re-picked within 40 degrees of each name: the worst dichromat pair goes from 0.28 to 1.99, and the worst pair for typical vision from 3.71 to 3.96. TintColourVisionTests holds 1.9 / 3.5 on all themes. Names kept. A tinted character's rail and tab tooltips name the colour, at no cell cost. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 6 + CLAUDE.md | 44 +- .../Configuration/PaneTint.cs | 7 +- src/SharpMUTerm.Core/Text/ColourVision.cs | 201 +++++++++ src/SharpMUTerm.Tui/AliasesScreenView.cs | 12 +- src/SharpMUTerm.Tui/ChromeInk.cs | 6 +- src/SharpMUTerm.Tui/ComposeOverlay.cs | 26 +- src/SharpMUTerm.Tui/EditReviewOverlay.cs | 15 +- src/SharpMUTerm.Tui/KeypadScreenView.cs | 11 +- src/SharpMUTerm.Tui/ListOverlay.cs | 12 +- src/SharpMUTerm.Tui/MsspScreenView.cs | 7 +- src/SharpMUTerm.Tui/OptionsScreenView.cs | 15 +- .../Pointer/SharpMUTermApp.Pointer.cs | 22 +- src/SharpMUTerm.Tui/ScreenChrome.cs | 35 +- src/SharpMUTerm.Tui/ScreenPalette.cs | 16 +- src/SharpMUTerm.Tui/ScreenTheme.cs | 404 ++++++++++++++++++ src/SharpMUTerm.Tui/SettingsOverlay.cs | 13 +- src/SharpMUTerm.Tui/SharpMUTermApp.cs | 24 +- src/SharpMUTerm.Tui/SpellingHighlighter.cs | 9 +- src/SharpMUTerm.Tui/TimersScreenView.cs | 12 +- src/SharpMUTerm.Tui/TriggersScreenView.cs | 13 +- src/SharpMUTerm.Tui/WorkspacePalette.cs | 31 +- src/SharpMUTerm.Tui/WorldsScreenView.cs | 28 +- .../Text/ColourVisionTests.cs | 70 +++ .../FrameContrastTests.cs | 10 +- tests/SharpMUTerm.Tui.Tests/PointerTests.cs | 15 + .../SharpMUTerm.Tui.Tests/ScreenThemeTests.cs | 172 ++++++++ .../TintColourVisionTests.cs | 65 +++ 28 files changed, 1186 insertions(+), 115 deletions(-) create mode 100644 src/SharpMUTerm.Core/Text/ColourVision.cs create mode 100644 src/SharpMUTerm.Tui/ScreenTheme.cs create mode 100644 tests/SharpMUTerm.Core.Tests/Text/ColourVisionTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/ScreenThemeTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/TintColourVisionTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c939f10..e77c14f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -106,12 +106,18 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Changed +- The ten pane colours a character can be given (F5 ▸ `tint`) have been re-chosen so they stay apart for + players with red-green or blue-yellow colour blindness, and a little further apart for everyone else. + The names are unchanged, so nothing needs setting again; Ochre is now a red ochre and Ember a red. In the + window, pointing at a tinted character in the sidebar or at its tab names the colour. - An MXP picture is downloaded and decoded once per session. A room picture shown on every look used to be fetched again whenever the pane's width had changed, and once per look that arrived while it was still loading. ### Fixed +- The settings screens (F1–F10), the deletion review and the package and send lists follow the Light and + Solarized Dark themes instead of staying dark on every theme. - MXP pictures draw again. Since the TelnetNegotiationCore update the client stopped answering a server's MXP `` and `` questions, so a game such as SharpMUSH decided it could not show `` and sent the picture's address as text instead. diff --git a/CLAUDE.md b/CLAUDE.md index a6b36fb5..f4889daf 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -711,9 +711,10 @@ fallbacks) for inline images/maps. - **A span carrying a background is measured against *it*.** That plane is known exactly and a highlight's pair must be judged as a pair; a span with the default background emits none and takes the pane, so it is measured against the reading plane. `reverse` swaps first. - - **`ScreenPalette` is deliberately not built this way.** Those constants sit on the settings screens' - own fixed backdrop, which no theme moves; measuring them against a theme plane would be measuring - them against a plane they are never painted on. `ChromeInk` is the other four — `Accent`, `Notice`, + - **`ScreenPalette` is not built this way either, but it does follow the theme** (`ScreenTheme`, Tui; + defect D6). The settings screens are their own backdrop, so their inks are measured against their own + planes rather than a pane's; but the planes themselves move with the theme. See the *settings screens + follow the theme* entry below. `ChromeInk` is the other four — `Accent`, `Notice`, `Draft`, `Marker` — and it carries **the plane it was resolved against**, so a renderer can hold a colour it was *handed* (a world's accent) to the same floor. - **A fill is not text.** A ribbon segment's accent, a pane tint and F2's swatch are identity or @@ -731,6 +732,31 @@ fallbacks) for inline images/maps. focused pane. Reaching it means giving up `[dim]` across every renderer for an explicit floor-checked grey — a sweep, for a near miss on one theme. The exemption is a named predicate with the number in it, so whoever does that sweep can delete it and watch the test pass. +- **The settings screens follow the theme, and the renderers do not know it** (`ScreenTheme`, Tui; defect + D6). `ScreenPalette`'s constants are *roles* spelt as the Dark theme's values; renderers keep writing + `[{Label}]…` in them, and the views resolve the markup and every control colour through one immutable + `ScreenTheme` the app builds from its theme (`ScreenTheme.For`, held in `_screens`, handed to + `SettingsOverlay`, `ComposeOverlay`, `ListOverlay` and `EditReviewOverlay`, and to every `*ScreenView.Build` + as a **required** parameter). Decisions not to relitigate: + - **Resolve at the view, not in the renderers.** A palette parameter on every renderer function is every + screen and every renderer test rewritten for a value only the last step needs; a mutable `ScreenPalette` + is global state the parallel suites race on. `ScreenChrome.Panel`/`Band`/`VerticalRule(scheme)` and + `ScreenTheme.Colour` are the only ways a role reaches a control. A view that hands a renderer's lines + straight to a `MarkupControl` is a dark island on Light — legible, so `FrameContrastTests` cannot see it; + `ScreenThemeTests.NoLightSettingsFramePaintsADarkPlane` can. + - **Dark resolves to the constants byte for byte** (`IsIdentity`), so no Dark frame moved. A dark theme + keeps each role's lightness and takes its background's hue shift; a light one mirrors L* (100 − L*) and + keeps the tint, the menu shadow is placed below the darkest plane, and every ink is then held to + `Contrast.Floor` on the planes it is drawn on (`PlanesUnder`: a label never sits on the menu's selected + row). The wells are the *lightest* thing on a light screen — the input-field convention there. + - **`Paint` rewrites colours and nothing else**: escaped `[[`/`]]` and `link=` targets are text; a run of + `█░▒▓` is a colour *sample* and keeps its hex even when it equals a role's (F2's swatch of a highlight + that happens to be `#00f5b7`); a foreground that is no role (a world's accent) is held to the floor on + the plane it lands on, except on Dark, which stays as it was. + - A bordered modal's title, border and unstyled text are the framework's cyan and `#eeeeee`, 1.4:1 on a + light backdrop; `ScreenTheme.Frame` recolours them off Dark. **Not themed**: the workspace popups that do + not sit on a settings screen (⌃P, quit, ⌃B panel, search, game data, message log, history) still paint + `ScreenPalette.MenuBg` raw. They pass the floor on Light and look dark; same recipe when someone wants it. - **A trigger's `route` says three things, and the third is "nothing"** (`TriggerActions.MainWindow`, Core; F2's `route` list). `SpawnTarget = null` has always meant *this rule adds no destination — the line follows whatever the other matched rules decided*, which is exactly what a highlight rule wants. @@ -1531,6 +1557,18 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] chroma distance on the darkened surface: nearest pair Teal/Jade at 7.8, against that test's floor of 6. The yellow-greens were tried and rejected — an olive measured 5.9 from `Ochre`, a lime 6.5 from `Moss` — and `TintStrength` went from 0.75 to 0.85 with the darkening, for the same chroma-is-bounded reason. + **The ten anchors were then re-picked for colour-blind readers** (`ColourVision`, Core: Machado 2009 + dichromat matrices on linear sRGB, CIEDE2000; `TintColourVisionTests`). Searched within 40° of each + name's hue for the set whose closest pair — the ten *and* the untinted plane, all three themes — is + furthest apart under protanopia, deuteranopia and tritanopia, on condition that typical vision's closest + pair got no closer and the Light planes stayed pastel. Worst pair went from 0.28 (deutan, Moss/Ember on + Dark) to 1.99 (deutan, Moss/Ochre on Solarized Dark); typical vision 3.71 → 3.96. The floors are 1.9 + (dichromat) and 3.5 (typical). **That is "side by side they differ", not "alone it is recognised"**, + and it cannot be more: ten planes at one luminance near L* 7, seen on one hue axis, top out around 2.2 + even with the names ignored. So the name is the second cue, where it costs no cell: a tinted character's + rail row and tab tooltips say `pane colour: moss` (`TintLine`), and F5's `tint` row already names it. + **Names are stored, so they were kept**; `Ochre` is now a red ochre (hue 18°) and `Ember` a red, and the + enum's doc says so. Do not add a migration for a hue change — the name is the setting. **It says nothing on a monochrome terminal, deliberately** — the cue that must survive a lost hue is focus, and the rail and the tab title still name the character in words — and it is a **truecolor** cue, which is unacceptable for focus and is why diff --git a/src/SharpMUTerm.Core/Configuration/PaneTint.cs b/src/SharpMUTerm.Core/Configuration/PaneTint.cs index 6869251a..d34ceb6e 100644 --- a/src/SharpMUTerm.Core/Configuration/PaneTint.cs +++ b/src/SharpMUTerm.Core/Configuration/PaneTint.cs @@ -52,10 +52,13 @@ public enum PaneTint /// Green. Moss, - /// Amber. + /// + /// Red ochre — a burnt orange-brown. It was amber until the set was re-picked for colour-blind readers; + /// the stored name is kept, since a name is what the configuration holds. + /// Ochre, - /// Red-orange. + /// Red. Ember, /// Violet. diff --git a/src/SharpMUTerm.Core/Text/ColourVision.cs b/src/SharpMUTerm.Core/Text/ColourVision.cs new file mode 100644 index 00000000..b3348209 --- /dev/null +++ b/src/SharpMUTerm.Core/Text/ColourVision.cs @@ -0,0 +1,201 @@ +namespace SharpMUTerm.Core.Text; + +/// A colour-vision deficiency can simulate. +public enum ColourDeficiency +{ + /// Typical trichromatic vision: no simulation. + None = 0, + + /// No working long-wavelength (red) cones. + Protanopia, + + /// No working medium-wavelength (green) cones — the commonest of the three. + Deuteranopia, + + /// No working short-wavelength (blue) cones. + Tritanopia, +} + +/// +/// How far apart two colours look, to typical vision and under a simulated colour-vision deficiency. +/// +/// Simulation: Machado, Oliveira & Fernandes, "A Physiologically-based Model for Simulation of +/// Color Vision Deficiency", IEEE TVCG 15(6), 2009 — the severity-1.0 (dichromat) matrices from the +/// paper's supplementary table, applied to linear sRGB and clipped to the unit cube. Chosen over +/// Brettel/Viénot because it is one 3×3 matrix per deficiency, covers tritanopia with the same model as +/// the other two, and is what browser devtools and most accessibility checkers ship. +/// +/// +/// Distance: CIEDE2000 (Sharma, Wu & Dalal 2005's formulation) over CIELAB with a D65 white. +/// It is computed from the simulated colour before rounding to bytes: the pane planes this is used +/// for sit near L* 7, where one byte is a visible fraction of the whole distance being measured. +/// +/// +public static class ColourVision +{ + private static readonly double[,] Protan = + { + { 0.152286, 1.052583, -0.204868 }, + { 0.114503, 0.786281, 0.099216 }, + { -0.003882, -0.048116, 1.051998 }, + }; + + private static readonly double[,] Deutan = + { + { 0.367322, 0.860646, -0.227968 }, + { 0.280085, 0.672501, 0.047413 }, + { -0.011820, 0.042940, 0.968881 }, + }; + + private static readonly double[,] Tritan = + { + { 1.255528, -0.076749, -0.178779 }, + { -0.078411, 0.930809, 0.147602 }, + { 0.004733, 0.691367, 0.303900 }, + }; + + /// The CIEDE2000 distance between two colours as seen with . + public static double Distance(Rgb a, Rgb b, ColourDeficiency deficiency = ColourDeficiency.None) => + DeltaE2000(Lab(Linear(a, deficiency)), Lab(Linear(b, deficiency))); + + /// A colour as it appears with , rounded to bytes for display. + public static Rgb Simulate(Rgb rgb, ColourDeficiency deficiency) + { + var (r, g, b) = Linear(rgb, deficiency); + return new Rgb(Encode(r), Encode(g), Encode(b)); + } + + /// Linear sRGB, put through the deficiency's matrix. + private static (double R, double G, double B) Linear(Rgb rgb, ColourDeficiency deficiency) + { + var r = Decode(rgb.R); + var g = Decode(rgb.G); + var b = Decode(rgb.B); + var m = deficiency switch + { + ColourDeficiency.Protanopia => Protan, + ColourDeficiency.Deuteranopia => Deutan, + ColourDeficiency.Tritanopia => Tritan, + _ => null, + }; + + if (m is null) + { + return (r, g, b); + } + + return ( + Math.Clamp((m[0, 0] * r) + (m[0, 1] * g) + (m[0, 2] * b), 0, 1), + Math.Clamp((m[1, 0] * r) + (m[1, 1] * g) + (m[1, 2] * b), 0, 1), + Math.Clamp((m[2, 0] * r) + (m[2, 1] * g) + (m[2, 2] * b), 0, 1)); + } + + private static double Decode(byte channel) + { + var c = channel / 255.0; + return c <= 0.04045 ? c / 12.92 : Math.Pow((c + 0.055) / 1.055, 2.4); + } + + private static byte Encode(double linear) + { + var c = linear <= 0.0031308 ? 12.92 * linear : (1.055 * Math.Pow(linear, 1 / 2.4)) - 0.055; + return (byte)Math.Clamp(Math.Round(c * 255), 0, 255); + } + + /// CIELAB (D65) of a linear sRGB triple. + private static (double L, double A, double B) Lab((double R, double G, double B) rgb) + { + var x = (0.4124564 * rgb.R) + (0.3575761 * rgb.G) + (0.1804375 * rgb.B); + var y = (0.2126729 * rgb.R) + (0.7151522 * rgb.G) + (0.0721750 * rgb.B); + var z = (0.0193339 * rgb.R) + (0.1191920 * rgb.G) + (0.9503041 * rgb.B); + + var fx = F(x / 0.95047); + var fy = F(y); + var fz = F(z / 1.08883); + return ((116 * fy) - 16, 500 * (fx - fy), 200 * (fy - fz)); + + static double F(double t) => + t > 216.0 / 24389 ? Math.Cbrt(t) : (t * 24389 / 27 + 16) / 116; + } + + private static double DeltaE2000((double L, double A, double B) p, (double L, double A, double B) q) + { + const double Pow25To7 = 6103515625.0; // 25^7 + + var c1 = Math.Sqrt((p.A * p.A) + (p.B * p.B)); + var c2 = Math.Sqrt((q.A * q.A) + (q.B * q.B)); + var cBar7 = Math.Pow((c1 + c2) / 2, 7); + var g = 0.5 * (1 - Math.Sqrt(cBar7 / (cBar7 + Pow25To7))); + + var a1 = (1 + g) * p.A; + var a2 = (1 + g) * q.A; + var c1p = Math.Sqrt((a1 * a1) + (p.B * p.B)); + var c2p = Math.Sqrt((a2 * a2) + (q.B * q.B)); + var h1p = Hue(p.B, a1); + var h2p = Hue(q.B, a2); + + var dL = q.L - p.L; + var dC = c2p - c1p; + double dh; + if (c1p * c2p == 0) + { + dh = 0; + } + else + { + dh = h2p - h1p; + if (dh > 180) + { + dh -= 360; + } + else if (dh < -180) + { + dh += 360; + } + } + + var dH = 2 * Math.Sqrt(c1p * c2p) * Math.Sin(Radians(dh / 2)); + + var lBar = (p.L + q.L) / 2; + var cBarP = (c1p + c2p) / 2; + double hBar; + if (c1p * c2p == 0) + { + hBar = h1p + h2p; + } + else if (Math.Abs(h1p - h2p) <= 180) + { + hBar = (h1p + h2p) / 2; + } + else + { + hBar = h1p + h2p < 360 ? (h1p + h2p + 360) / 2 : (h1p + h2p - 360) / 2; + } + + var t = 1 + - (0.17 * Math.Cos(Radians(hBar - 30))) + + (0.24 * Math.Cos(Radians(2 * hBar))) + + (0.32 * Math.Cos(Radians((3 * hBar) + 6))) + - (0.20 * Math.Cos(Radians((4 * hBar) - 63))); + var dTheta = 30 * Math.Exp(-Math.Pow((hBar - 275) / 25, 2)); + var cBarP7 = Math.Pow(cBarP, 7); + var rC = 2 * Math.Sqrt(cBarP7 / (cBarP7 + Pow25To7)); + var sL = 1 + (0.015 * Math.Pow(lBar - 50, 2) / Math.Sqrt(20 + Math.Pow(lBar - 50, 2))); + var sC = 1 + (0.045 * cBarP); + var sH = 1 + (0.015 * cBarP * t); + var rT = -Math.Sin(Radians(2 * dTheta)) * rC; + + var l = dL / sL; + var c = dC / sC; + var h = dH / sH; + return Math.Sqrt((l * l) + (c * c) + (h * h) + (rT * c * h)); + + static double Hue(double b, double a) + { + var degrees = Math.Atan2(b, a) * 180 / Math.PI; + return degrees < 0 ? degrees + 360 : degrees; + } + + static double Radians(double degrees) => degrees * Math.PI / 180; + } +} diff --git a/src/SharpMUTerm.Tui/AliasesScreenView.cs b/src/SharpMUTerm.Tui/AliasesScreenView.cs index e4dfd743..6a80eaa7 100644 --- a/src/SharpMUTerm.Tui/AliasesScreenView.cs +++ b/src/SharpMUTerm.Tui/AliasesScreenView.cs @@ -15,13 +15,13 @@ namespace SharpMUTerm.Tui; internal static class AliasesScreenView { public static IWindowControl Build( - IReadOnlyList sets, int selected, int width, ScreenFocus? focus = null, int height = 0) + IReadOnlyList sets, int selected, int width, ScreenTheme scheme, ScreenFocus? focus = null, int height = 0) { var header = ScreenChrome.Band( AliasesScreenRenderer.HeaderLine(width, AliasesScreenRenderer.Model(sets, selected), focus), - ScreenPalette.HeaderBg); + ScreenPalette.HeaderBg, scheme); var footer = ScreenChrome.Band( - AliasesScreenRenderer.FooterLine(sets, selected, width, focus), ScreenPalette.FooterBg); + AliasesScreenRenderer.FooterLine(sets, selected, width, focus), ScreenPalette.FooterBg, scheme); var list = ScreenChrome.SplitWidth( width, @@ -33,10 +33,10 @@ public static IWindowControl Build( var right = AliasesScreenRenderer.EditorColumn( sets, selected, focus, width <= 0 ? list : width - list - ScreenChrome.ColumnDivider, rows); - var listCol = ScreenChrome.Stretch(new MarkupControl(ScreenChrome.Window(left, rows))); + var listCol = ScreenChrome.Stretch(ScreenChrome.Panel(ScreenChrome.Window(left, rows), scheme)); var editorCol = ScreenChrome.Stretch( - new MarkupControl(ScreenChrome.Indent(ScreenChrome.Window(right, rows)))); + ScreenChrome.Panel(ScreenChrome.Indent(ScreenChrome.Window(right, rows)), scheme)); return ScreenChrome.Split( - header, footer, listCol, editorCol, list, Math.Max(left.Count, right.Count), rows); + header, footer, listCol, editorCol, list, Math.Max(left.Count, right.Count), rows, scheme); } } diff --git a/src/SharpMUTerm.Tui/ChromeInk.cs b/src/SharpMUTerm.Tui/ChromeInk.cs index 12896dfb..d805efed 100644 --- a/src/SharpMUTerm.Tui/ChromeInk.cs +++ b/src/SharpMUTerm.Tui/ChromeInk.cs @@ -23,9 +23,9 @@ namespace SharpMUTerm.Tui; /// the theme's answer, because a hex picked against one theme becomes a hole in the next. /// /// -/// is deliberately not built this way. Those colours sit on the -/// settings screens' own fixed backdrop, which no theme moves, so measuring them against a theme plane -/// would be measuring them against a plane they are never painted on. +/// is not built this way. Those colours sit on the settings screens' +/// own backdrop, not on a pane, so they are measured against that backdrop's planes — which +/// works out per theme — rather than against a pane's. /// /// /// diff --git a/src/SharpMUTerm.Tui/ComposeOverlay.cs b/src/SharpMUTerm.Tui/ComposeOverlay.cs index 2739eb7d..ffd51d19 100644 --- a/src/SharpMUTerm.Tui/ComposeOverlay.cs +++ b/src/SharpMUTerm.Tui/ComposeOverlay.cs @@ -59,12 +59,16 @@ internal sealed class ComposeOverlay /// Opens the dictionary, the first time the composer is opened and never again, so a client nobody writes a /// post in reads no dictionary. Null, or a null answer, is a composer with no spelling, which says so. /// - internal ComposeOverlay(ConsoleWindowSystem system, Func? spelling = null) + /// The settings screens' palette for the app's theme; the composer is one of them. + internal ComposeOverlay(ConsoleWindowSystem system, Func? spelling = null, ScreenTheme? scheme = null) { _system = system; _openSpelling = spelling; + _scheme = scheme ?? ScreenTheme.Dark; } + private readonly ScreenTheme _scheme; + /// /// The dictionary marking this post, or null: none was found, or this is a MOO edit, whose buffer is as often /// code as prose. @@ -155,12 +159,12 @@ internal void Toggle(string target, string draft, ComposeEscaping escaping, bool // paints from the *focused* pair whenever it has focus, and it always has focus here, so // setting only the unfocused one leaves the default grey on screen for the whole session — // which is exactly what the first frame of this window showed. - BackgroundColor = new Color(ScreenPalette.EditBg), - FocusedBackgroundColor = new Color(ScreenPalette.EditBg), - ForegroundColor = new Color(ScreenPalette.Value), - FocusedForegroundColor = new Color(ScreenPalette.Value), - SelectionBackgroundColor = new Color(ScreenPalette.CursorBg), - SelectionForegroundColor = new Color(ScreenPalette.Value), + BackgroundColor = _scheme.Colour(ScreenPalette.EditBg), + FocusedBackgroundColor = _scheme.Colour(ScreenPalette.EditBg), + ForegroundColor = _scheme.Colour(ScreenPalette.Value), + FocusedForegroundColor = _scheme.Colour(ScreenPalette.Value), + SelectionBackgroundColor = _scheme.Colour(ScreenPalette.CursorBg), + SelectionForegroundColor = _scheme.Colour(ScreenPalette.Value), }; if (!_spellingOpened) @@ -171,7 +175,7 @@ internal void Toggle(string target, string draft, ComposeEscaping escaping, bool if (Spelling is { } checker) { - _editor.SyntaxHighlighter = new SpellingHighlighter(checker); + _editor.SyntaxHighlighter = new SpellingHighlighter(checker, _scheme.Colour(ScreenPalette.Warn)); } _editor.SetContent(draft); @@ -181,7 +185,7 @@ internal void Toggle(string target, string draft, ComposeEscaping escaping, bool .AsModal() .Maximized() .Frameless() - .WithColors(new Color(ScreenPalette.PanelFg), new Color(ScreenPalette.PanelBg)) + .WithColors(_scheme.Colour(ScreenPalette.PanelFg), _scheme.Colour(ScreenPalette.PanelBg)) .AddControl(HeaderBand()) .AddControl(_editor) .AddControl(FooterBand()) @@ -349,14 +353,14 @@ private void Redraw() /// private MarkupControl HeaderBand() { - var band = ScreenChrome.Band(Header(), ScreenPalette.HeaderBg); + var band = ScreenChrome.Band(Header(), ScreenPalette.HeaderBg, _scheme); band.StickyPosition = StickyPosition.Top; return band; } private MarkupControl FooterBand() { - var band = ScreenChrome.Band(Footer(), ScreenPalette.FooterBg); + var band = ScreenChrome.Band(Footer(), ScreenPalette.FooterBg, _scheme); band.StickyPosition = StickyPosition.Bottom; return band; } diff --git a/src/SharpMUTerm.Tui/EditReviewOverlay.cs b/src/SharpMUTerm.Tui/EditReviewOverlay.cs index 9d9f1453..8701eaee 100644 --- a/src/SharpMUTerm.Tui/EditReviewOverlay.cs +++ b/src/SharpMUTerm.Tui/EditReviewOverlay.cs @@ -35,7 +35,13 @@ internal sealed class EditReviewOverlay private Action? _keep; private Action? _undo; - public EditReviewOverlay(ConsoleWindowSystem system) => _system = system; + private readonly ScreenTheme _scheme; + + public EditReviewOverlay(ConsoleWindowSystem system, ScreenTheme? scheme = null) + { + _system = system; + _scheme = scheme ?? ScreenTheme.Dark; + } public bool IsOpen => _window is not null; @@ -62,7 +68,7 @@ public void Open(IReadOnlyList deletions, Action keep, Action undo) _selected = ReviewChoice.Keep; var lines = Lines; - _body = new MarkupControl(new List(lines)); + _body = new MarkupControl(_scheme.Lines(lines, ScreenPalette.MenuBg)); // Hug the content: the question is as tall as it has things to name. Centred *after* WithSize, // because the builder reads the bounds set so far and falls back to 80x25 otherwise. @@ -75,7 +81,7 @@ public void Open(IReadOnlyList deletions, Action keep, Action undo) .WithTitle("Deletions") .AsModal() .WithBorderStyle(BorderStyle.Single) - .WithBackgroundColor(new Color(ScreenPalette.MenuBg)) + .WithBackgroundColor(_scheme.Colour(ScreenPalette.MenuBg)) .HideTitleButtons() .Resizable(false) .WithSize(width, height) @@ -84,6 +90,7 @@ public void Open(IReadOnlyList deletions, Action keep, Action undo) .OnClosed((_, _) => Reset()) .Build(); + _scheme.Frame(_window); _window.PreviewKeyPressed += OnKey; _system.AddWindow(_window); } @@ -117,7 +124,7 @@ private void OnKey(object? sender, KeyPressedEventArgs e) break; case ReviewAction.Redraw: - _body?.SetContent(new List(Lines)); + _body?.SetContent(_scheme.Lines(Lines, ScreenPalette.MenuBg)); _window.Invalidate(redrawAll: true); break; diff --git a/src/SharpMUTerm.Tui/KeypadScreenView.cs b/src/SharpMUTerm.Tui/KeypadScreenView.cs index 10ec3420..efa9267d 100644 --- a/src/SharpMUTerm.Tui/KeypadScreenView.cs +++ b/src/SharpMUTerm.Tui/KeypadScreenView.cs @@ -26,14 +26,15 @@ public static IWindowControl Build( IReadOnlyList sets, int selected, int width, + ScreenTheme scheme, ScreenFocus? focus = null, int height = 0) { var header = ScreenChrome.Band( KeypadScreenRenderer.HeaderLine(width, KeypadScreenRenderer.Model(macros, sets, selected), focus), - ScreenPalette.HeaderBg); + ScreenPalette.HeaderBg, scheme); var footer = ScreenChrome.Band( - KeypadScreenRenderer.FooterLine(macros, width, focus, selected), ScreenPalette.FooterBg); + KeypadScreenRenderer.FooterLine(macros, width, focus, selected), ScreenPalette.FooterBg, scheme); // While a key capture is armed the binding row swaps its key well for a prompt twice the width, // so the list asks for more and the diagram gives it up for as long as the prompt is up. The @@ -50,10 +51,10 @@ public static IWindowControl Build( var right = KeypadScreenRenderer.HotkeysColumn( macros, focus, sets, selected, width <= 0 ? numpad : width - numpad - ScreenChrome.ColumnDivider); - var numpadCol = ScreenChrome.Stretch(new MarkupControl(ScreenChrome.Window(left, rows))); + var numpadCol = ScreenChrome.Stretch(ScreenChrome.Panel(ScreenChrome.Window(left, rows), scheme)); var hotkeysCol = ScreenChrome.Stretch( - new MarkupControl(ScreenChrome.Indent(ScreenChrome.Window(right, rows)))); + ScreenChrome.Panel(ScreenChrome.Indent(ScreenChrome.Window(right, rows)), scheme)); return ScreenChrome.Split( - header, footer, numpadCol, hotkeysCol, numpad, Math.Max(left.Count, right.Count), rows); + header, footer, numpadCol, hotkeysCol, numpad, Math.Max(left.Count, right.Count), rows, scheme); } } diff --git a/src/SharpMUTerm.Tui/ListOverlay.cs b/src/SharpMUTerm.Tui/ListOverlay.cs index 04deb107..a8a70f3f 100644 --- a/src/SharpMUTerm.Tui/ListOverlay.cs +++ b/src/SharpMUTerm.Tui/ListOverlay.cs @@ -19,9 +19,12 @@ internal sealed class ListOverlay private Func>? _render; private Func? _key; - public ListOverlay(ConsoleWindowSystem system) + private readonly ScreenTheme _scheme; + + public ListOverlay(ConsoleWindowSystem system, ScreenTheme? scheme = null) { _system = system; + _scheme = scheme ?? ScreenTheme.Dark; } public bool IsOpen => _window is not null; @@ -50,7 +53,7 @@ public void Open(string mode, string title, Func> render, Func var outer = width is { } asked ? Math.Clamp(asked + 4, 24, widest) : widest; var lines = render(outer - 4); var height = Math.Clamp(lines.Count + 2, 8, Math.Max(8, desktop.Height - 2)); - _content = new MarkupControl(lines); + _content = new MarkupControl(_scheme.Lines(lines, ScreenPalette.MenuBg)); // Centered() after WithSize(), for CommandPalette's reason. Window? built = null; @@ -58,7 +61,7 @@ public void Open(string mode, string title, Func> render, Func .WithTitle(title) .AsModal() .WithBorderStyle(BorderStyle.Single) - .WithBackgroundColor(new Color(ScreenPalette.MenuBg)) + .WithBackgroundColor(_scheme.Colour(ScreenPalette.MenuBg)) .HideTitleButtons() .Resizable(false) .WithSize(outer, height) @@ -74,6 +77,7 @@ public void Open(string mode, string title, Func> render, Func }) .Build(); _window = built; + _scheme.Frame(_window); _window.PreviewKeyPressed += OnKey; _system.AddWindow(_window); @@ -86,7 +90,7 @@ public void Repaint() { if (_render is not null && _content is not null) { - _content.SetContent(_render(Width())); + _content.SetContent(_scheme.Lines(_render(Width()), ScreenPalette.MenuBg)); _window?.Invalidate(redrawAll: true); } } diff --git a/src/SharpMUTerm.Tui/MsspScreenView.cs b/src/SharpMUTerm.Tui/MsspScreenView.cs index 5249b93b..e498ff92 100644 --- a/src/SharpMUTerm.Tui/MsspScreenView.cs +++ b/src/SharpMUTerm.Tui/MsspScreenView.cs @@ -18,12 +18,13 @@ internal static IWindowControl Build( MsspObservation? observation, DateTimeOffset now, int width, + ScreenTheme scheme, ScreenFocus? focus = null, int height = 0) { - var header = ScreenChrome.Band(MsspScreenRenderer.HeaderLine(width), ScreenPalette.HeaderBg); + var header = ScreenChrome.Band(MsspScreenRenderer.HeaderLine(width), ScreenPalette.HeaderBg, scheme); var footer = ScreenChrome.Band( - MsspScreenRenderer.FooterLine(world, observation, focus, width, now), ScreenPalette.FooterBg); + MsspScreenRenderer.FooterLine(world, observation, focus, width, now), ScreenPalette.FooterBg, scheme); var rows = ScreenChrome.Rows(height); @@ -32,7 +33,7 @@ internal static IWindowControl Build( // way for the control's content and the height it was sized for to disagree the moment the // renderer stopped being a pure function of its arguments. var lines = MsspScreenRenderer.Render(world, observation, now, focus, rows, width); - var body = ScreenChrome.Stretch(new MarkupControl(lines)); + var body = ScreenChrome.Stretch(ScreenChrome.Panel(lines, scheme)); var root = Controls.Grid() .WithAlignment(HorizontalAlignment.Stretch) diff --git a/src/SharpMUTerm.Tui/OptionsScreenView.cs b/src/SharpMUTerm.Tui/OptionsScreenView.cs index fa419d70..70bf2380 100644 --- a/src/SharpMUTerm.Tui/OptionsScreenView.cs +++ b/src/SharpMUTerm.Tui/OptionsScreenView.cs @@ -23,17 +23,17 @@ internal static class OptionsScreenView private const int CardInset = 4; public static IWindowControl Build( - OptionsScreenRenderer.OptionsScreen screen, int width, ScreenFocus? focus = null) + OptionsScreenRenderer.OptionsScreen screen, int width, ScreenTheme scheme, ScreenFocus? focus = null) { var header = ScreenChrome.Band( OptionsScreenRenderer.HeaderLine( screen.Title, screen.FKey, width, OptionsScreenRenderer.Model(screen), focus), - ScreenPalette.HeaderBg); + ScreenPalette.HeaderBg, scheme); var footer = ScreenChrome.Band( - OptionsScreenRenderer.FooterLine(screen.Rows, width, focus), ScreenPalette.FooterBg); + OptionsScreenRenderer.FooterLine(screen.Rows, width, focus), ScreenPalette.FooterBg, scheme); var rows = OptionsScreenRenderer.BodyColumn(screen.Rows, focus, Math.Max(0, width - CardInset)); - var card = Card(rows); + var card = Card(rows, scheme); // Header on the first row, footer on the last, the card hugging its content directly beneath the // header and the remaining space left as backdrop — so the action bar sits at the bottom of the @@ -57,15 +57,16 @@ public static IWindowControl Build( /// cells its lines cover, so the card is a grid — a grid's background covers its whole arranged /// area, giving the band its full width and the padding rows their colour. /// - private static IWindowControl Card(IReadOnlyList rows) + private static IWindowControl Card(IReadOnlyList rows, ScreenTheme scheme) { - var list = new MarkupControl(Pad(rows)) { HorizontalAlignment = HorizontalAlignment.Stretch }; + var list = ScreenChrome.Panel(Pad(rows), scheme, ScreenPalette.EditBg); + list.HorizontalAlignment = HorizontalAlignment.Stretch; var card = Controls.HorizontalGrid() .WithAlignment(HorizontalAlignment.Stretch) .WithVerticalAlignment(VerticalAlignment.Fill) .Column(c => c.Flex(1).Add(list)) .Build(); - card.BackgroundColor = new Color(ScreenPalette.EditBg); + card.BackgroundColor = scheme.Colour(ScreenPalette.EditBg); return card; } diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs index 83641060..01a23684 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs @@ -2,6 +2,7 @@ using SharpConsoleUI.Controls; using SharpConsoleUI.Drivers; using SharpMUTerm.Core.Commands; +using SharpMUTerm.Core.Configuration; using SharpMUTerm.Core.Diagnostics; using SharpMUTerm.Core.Workspaces; @@ -266,6 +267,13 @@ private PointerTarget RailTargetAt(PaneRect rail, System.Drawing.Point point) tooltip = hit.Span.Text.Trim(); } + var owner = target.StartsWith(CommandIds.CharacterPrefix, StringComparison.Ordinal) + ? target[CommandIds.CharacterPrefix.Length..] + : target.StartsWith(CommandIds.WindowPrefix, StringComparison.Ordinal) + ? _workspace.FindWindow(target[CommandIds.WindowPrefix.Length..])?.SessionKey + : null; + tooltip += TintLine(owner); + return new PointerTarget(PointerKind.RailRow, row, PointerShape.Hand, tooltip, "rail:" + target); } @@ -332,9 +340,21 @@ private string TabTooltip(string windowId, bool closable) var title = Snippet(WindowTitle(windowId)); var unread = window is { Unread: > 0 } ? $" · {window.Unread} unread" : string.Empty; var actions = closable ? "click to show it · drag it onto another pane · × closes it" : "click to show it · drag it onto another pane"; - return $"{title}{unread}\n{actions}"; + return $"{title}{unread}\n{actions}{TintLine(window?.SessionKey)}"; } + /// + /// The pane colour a character chose, by name, as a line for a tooltip — the cue that does not + /// depend on telling hues apart. Ten tints at one luminance cannot all be told apart by a reader with a + /// colour-vision deficiency (see ), and the rail and the tab strip may + /// not spend a cell on saying it (the NAWS rule), so the name goes where it costs none. Empty for a + /// window nobody owns and for a character with no tint. + /// + private string TintLine(string? sessionKey) => + TintOf(sessionKey) is var tint && tint != PaneTint.None + ? $"\npane colour: {tint.ToString().ToLowerInvariant()}" + : string.Empty; + /// /// What clicking a pane's link does, said before it is done. For a link a server wrote, that is the /// whole point: a URL is shown in full before anything opens it, and a <SEND> says what it diff --git a/src/SharpMUTerm.Tui/ScreenChrome.cs b/src/SharpMUTerm.Tui/ScreenChrome.cs index aa4af073..28d8964f 100644 --- a/src/SharpMUTerm.Tui/ScreenChrome.cs +++ b/src/SharpMUTerm.Tui/ScreenChrome.cs @@ -701,12 +701,25 @@ internal static string Context(params string?[] parts) return joined.Length == 0 ? string.Empty : $"[{ScreenPalette.Label}]{joined}[/]"; } - /// A full-width one-row band — the header or the footer. - internal static MarkupControl Band(string line, string bg) => new(new List { line }) - { - BackgroundColor = new Color(bg), - HorizontalAlignment = HorizontalAlignment.Stretch, - }; + /// + /// A full-width one-row band — the header or the footer — in 's colours. + /// is a role, resolved with the line. + /// + internal static MarkupControl Band(string line, string bg, ScreenTheme scheme) => + new(new List { scheme.Paint(line, bg) }) + { + BackgroundColor = scheme.Colour(bg), + HorizontalAlignment = HorizontalAlignment.Stretch, + }; + + /// + /// A column of a renderer's lines, resolved for and drawn on + /// (a role: the backdrop unless the column sits on + /// a card). The one place a screen's markup becomes a control, so it is the one place it is themed. + /// + internal static MarkupControl Panel( + IEnumerable lines, ScreenTheme scheme, string plane = ScreenPalette.PanelBg) => + new(scheme.Lines(lines, plane)); /// /// How many rows a two-column screen's body has: everything but the header band and the action bar. @@ -730,6 +743,7 @@ internal static string Context(params string?[] parts) /// How wide the list column runs (see ). /// How many rows the taller of the two columns holds. /// How many rows the body has to spend, or 0 when the caller has no height. + /// The theme's palette, for the hairline. internal static IWindowControl Split( MarkupControl header, MarkupControl footer, @@ -737,13 +751,14 @@ internal static IWindowControl Split( MarkupControl right, int leftWidth, int content, - int rows) + int rows, + ScreenTheme scheme) { var body = Controls.HorizontalGrid() .WithAlignment(HorizontalAlignment.Stretch) .WithVerticalAlignment(VerticalAlignment.Fill) .Column(c => c.Width(leftWidth).Add(left)) - .Column(c => c.Width(1).Add(VerticalRule())) + .Column(c => c.Width(1).Add(VerticalRule(scheme))) .Column(c => c.Width(1).Add(Filler())) .Column(c => c.Flex(1).Add(right)) .Build(); @@ -785,14 +800,14 @@ internal static MarkupControl Stretch(MarkupControl control) /// to nothing and never paints its background, so the rule is an empty grid instead — a grid's /// background covers its whole arranged area, giving a full-height hairline. /// - internal static IWindowControl VerticalRule() + internal static IWindowControl VerticalRule(ScreenTheme scheme) { var rule = Controls.HorizontalGrid() .WithAlignment(HorizontalAlignment.Stretch) .WithVerticalAlignment(VerticalAlignment.Fill) .Column(c => c.Flex(1).Add(Filler())) .Build(); - rule.BackgroundColor = new Color(ScreenPalette.Rule); + rule.BackgroundColor = scheme.Colour(ScreenPalette.Rule); return rule; } diff --git a/src/SharpMUTerm.Tui/ScreenPalette.cs b/src/SharpMUTerm.Tui/ScreenPalette.cs index a9048656..6552b7cd 100644 --- a/src/SharpMUTerm.Tui/ScreenPalette.cs +++ b/src/SharpMUTerm.Tui/ScreenPalette.cs @@ -1,11 +1,17 @@ namespace SharpMUTerm.Tui; /// -/// The colours the full-screen settings screens (F2–F9) are built from. Renderers interpolate them -/// into markup tags; the views hand the same hexes to as control -/// backgrounds, so the bands a renderer writes text for and the panel a view paints agree by -/// construction. Screen files pull these in with -/// using static SharpMUTerm.Tui.ScreenPalette;. +/// The colour roles the full-screen settings screens (F1–F10) are built from, spelt as the Dark +/// theme's values. Renderers interpolate them into markup tags; the views resolve that markup, and the +/// control backgrounds, through a for the active theme — so the bands a renderer +/// writes text for and the panel a view paints agree by construction, on every theme. On Dark the two are +/// the same bytes. Screen files pull these in with using static SharpMUTerm.Tui.ScreenPalette;. +/// +/// A view must never hand one of these to a control directly (new Color(ScreenPalette.EditBg), or a +/// renderer's lines straight into a MarkupControl): that is a dark island on a light theme, defect +/// D6. , and +/// are the ways in. +/// /// internal static class ScreenPalette { diff --git a/src/SharpMUTerm.Tui/ScreenTheme.cs b/src/SharpMUTerm.Tui/ScreenTheme.cs new file mode 100644 index 00000000..f59b3200 --- /dev/null +++ b/src/SharpMUTerm.Tui/ScreenTheme.cs @@ -0,0 +1,404 @@ +using System.Globalization; +using System.Text; +using SharpConsoleUI; +using SharpMUTerm.Core.Text; +using SharpMUTerm.Core.Theming; + +namespace SharpMUTerm.Tui; + +/// +/// The settings screens' palette resolved for one theme. names the roles — +/// panel, header, label, value, well, accent — and its constants are the Dark theme's values for them; +/// this is the same set of roles worked out for whatever theme is active, so a Light client gets light +/// screens rather than a dark island in the middle of a light workspace (defect D6). +/// +/// The renderers do not know about it, deliberately. They write markup in the role colours +/// ([{Label}]…, the constants), and the view resolves that markup +/// through an instance of this class at the one place it becomes a control (, , ). Threading a palette parameter through every +/// renderer would have touched every function on every screen and every test that calls one, for a +/// value only the last step needs; and a mutable would be global state the +/// parallel test suites race on. An instance is immutable, made once per app from the app's theme, and +/// handed to the views. +/// +/// +/// The Dark theme resolves to the constants byte for byte, so every Dark frame is exactly what +/// it was. Other themes keep the same relationships: a dark theme takes its background's hue +/// on the planes; a light one mirrors each role's lightness (CIE L*, so a step that read as one step +/// still does) and keeps its hue. Then every ink is held to on each plane +/// it is drawn on, the floor the workspace's chrome is held to. +/// +/// +internal sealed class ScreenTheme +{ + /// The palette the constants describe: the Dark theme's. + internal static readonly ScreenTheme Dark = new(Canonical()); + + private readonly IReadOnlyDictionary _roles; + + private ScreenTheme(IReadOnlyDictionary roles) + { + _roles = roles; + IsIdentity = roles.All(r => string.Equals(r.Key, r.Value, StringComparison.OrdinalIgnoreCase)); + } + + /// Whether every role resolves to its own constant (the Dark theme). + internal bool IsIdentity { get; } + + internal string Accent => Role(ScreenPalette.Accent); + + internal string PanelBg => Role(ScreenPalette.PanelBg); + + internal string PanelFg => Role(ScreenPalette.PanelFg); + + internal string HeaderBg => Role(ScreenPalette.HeaderBg); + + internal string FooterBg => Role(ScreenPalette.FooterBg); + + internal string EditBg => Role(ScreenPalette.EditBg); + + internal string Label => Role(ScreenPalette.Label); + + internal string Value => Role(ScreenPalette.Value); + + internal string Muted => Role(ScreenPalette.Muted); + + internal string Rule => Role(ScreenPalette.Rule); + + internal string CursorBg => Role(ScreenPalette.CursorBg); + + internal string Ink => Role(ScreenPalette.Ink); + + internal string MenuBg => Role(ScreenPalette.MenuBg); + + internal string MenuSelectedBg => Role(ScreenPalette.MenuSelectedBg); + + internal string MenuShadow => Role(ScreenPalette.MenuShadow); + + internal string FieldBg => Role(ScreenPalette.FieldBg); + + internal string Warn => Role(ScreenPalette.Warn); + + /// The planes text is drawn on — what an ink is measured against. + private static readonly string[] TextPlanes = + [ + ScreenPalette.PanelBg, ScreenPalette.HeaderBg, ScreenPalette.FooterBg, ScreenPalette.EditBg, + ScreenPalette.CursorBg, ScreenPalette.MenuBg, ScreenPalette.MenuSelectedBg, ScreenPalette.FieldBg, + ]; + + /// + /// Every plane role. is not among them: it is placed relative + /// to the others rather than mirrored, because a shadow is darker than what casts it on any theme. + /// + private static readonly string[] Planes = [.. TextPlanes, ScreenPalette.Rule]; + + /// The text roles, mirrored with the planes on a light theme and then held to the floor. + private static readonly string[] Inks = + [ScreenPalette.Label, ScreenPalette.Muted, ScreenPalette.PanelFg, ScreenPalette.Value]; + + /// The reference backgrounds the hue shift is measured from, one per side of mid-grey. + private static readonly Rgb DarkReference = new(0x1e, 0x1e, 0x1e); + + private static readonly Rgb LightReference = new(0xfa, 0xfa, 0xfa); + + /// The palette for . + internal static ScreenTheme For(Theme theme) + { + ArgumentNullException.ThrowIfNull(theme); + + var light = Contrast.RelativeLuminance(theme.Background) >= LightPlaneLuminance; + var shift = Delta(theme.Background, light ? LightReference : DarkReference); + var roles = new Dictionary(StringComparer.OrdinalIgnoreCase); + + foreach (var plane in Planes) + { + var rgb = Parse(plane); + roles[plane] = Add(light ? Mirror(rgb) : rgb, shift); + } + + // Darker than every plane on either kind of theme: the list's far edge reads as "under". + var lowest = Planes.Select(p => Lightness(roles[p])).Min(); + roles[ScreenPalette.MenuShadow] = light + ? Add(AtLightness(Parse(ScreenPalette.MenuShadow), lowest - ShadowStep), shift) + : Add(Parse(ScreenPalette.MenuShadow), shift); + + foreach (var ink in Inks) + { + var rgb = Parse(ink); + roles[ink] = Legible(light ? Mirror(rgb) : rgb, roles, PlanesUnder(ink)); + } + + // The accent and the warning keep their hue and are moved only as far as the floor asks; on a + // light theme that is a long way, which is the point. + roles[ScreenPalette.Accent] = Legible(Parse(ScreenPalette.Accent), roles); + roles[ScreenPalette.Warn] = Legible(Parse(ScreenPalette.Warn), roles); + + // Text printed on the accent: near-black on a bright accent, the panel's own tone on a dark one. + var accent = roles[ScreenPalette.Accent]; + var ink0 = Contrast.RelativeLuminance(accent) < LightPlaneLuminance ? roles[ScreenPalette.PanelBg] : Parse(ScreenPalette.Ink); + roles[ScreenPalette.Ink] = Contrast.Legible(ink0, accent); + + return new ScreenTheme(roles.ToDictionary(r => r.Key, r => r.Value.ToHex(), StringComparer.OrdinalIgnoreCase)); + } + + /// What a role constant resolves to here. A colour that is not a role is returned as given. + internal string Role(string constant) => _roles.TryGetValue(constant, out var hex) ? hex : constant; + + /// A role constant as a control colour. + internal Color Colour(string constant) => new(Role(constant)); + + /// + /// Colours a bordered modal's frame, title and unstyled text. The framework's defaults (a cyan title + /// and border, #eeeeee text) were chosen for a dark backdrop and fall to 1.4:1 on a light one, + /// so a theme that is not the constants' own draws them in its label and value inks; the Dark theme + /// keeps the framework's, unchanged. + /// + internal void Frame(Window window) + { + ArgumentNullException.ThrowIfNull(window); + if (IsIdentity) + { + return; + } + + window.ForegroundColor = Colour(ScreenPalette.Value); + window.ActiveTitleForegroundColor = Colour(ScreenPalette.Value); + window.InactiveTitleForegroundColor = Colour(ScreenPalette.Label); + window.ActiveBorderForegroundColor = Colour(ScreenPalette.Label); + window.InactiveBorderForegroundColor = Colour(ScreenPalette.Label); + } + + /// Every line of a renderer's markup resolved for this theme, on . + internal List Lines(IEnumerable lines, string plane = ScreenPalette.PanelBg) + { + ArgumentNullException.ThrowIfNull(lines); + return lines.Select(line => Paint(line, plane)).ToList(); + } + + /// + /// One line of a renderer's markup resolved for this theme. Role colours are swapped for this + /// theme's; any other foreground — a world's own accent, a highlight a rule names — is held to the + /// floor against the plane it lands on, which is the tag's own background, else the one it is nested + /// in, else (the control's). Escaped brackets and link targets are text and + /// are never read as colours. A run of blocks (█░▒▓) is a colour sample and keeps its colour, + /// even one that shares a role's hex, because what it shows is that colour. + /// + internal string Paint(string markup, string plane = ScreenPalette.PanelBg) + { + ArgumentNullException.ThrowIfNull(markup); + if (markup.IndexOf('[') < 0) + { + return markup; + } + + var output = new StringBuilder(markup.Length + 16); + var planes = new Stack(); + planes.Push(Role(plane)); + + var i = 0; + while (i < markup.Length) + { + var ch = markup[i]; + if ((ch == '[' || ch == ']') && i + 1 < markup.Length && markup[i + 1] == ch) + { + output.Append(ch).Append(ch); + i += 2; + continue; + } + + if (ch != '[') + { + output.Append(ch); + i++; + continue; + } + + var close = markup.IndexOf(']', i + 1); + if (close < 0) + { + output.Append(markup, i, markup.Length - i); + break; + } + + var tag = markup.Substring(i + 1, close - i - 1); + if (tag == "/") + { + if (planes.Count > 1) + { + planes.Pop(); + } + + output.Append("[/]"); + } + else + { + output.Append('[').Append(Tag(tag, planes, Sample(markup, close + 1))).Append(']'); + } + + i = close + 1; + } + + return output.ToString(); + } + + /// One opening tag, resolved; pushes the plane its content is drawn on. + private string Tag(string tag, Stack planes, bool sample) + { + if (tag.StartsWith("link=", StringComparison.OrdinalIgnoreCase)) + { + planes.Push(planes.Peek()); + return tag; + } + + var words = tag.Split(' '); + string? background = null; + var foreground = -1; + for (var w = 0; w < words.Length; w++) + { + if (words[w] == "on" && w + 1 < words.Length && IsHex(words[w + 1])) + { + words[w + 1] = Role(words[w + 1]); + background = words[w + 1]; + w++; + } + else if (IsHex(words[w]) && foreground < 0) + { + foreground = w; + } + } + + var plane = background ?? planes.Peek(); + if (foreground >= 0) + { + var given = words[foreground]; + if (sample) + { + // A colour sample is the colour it samples — F2's swatch of a highlight that happens to be + // the accent's hex must not turn into this theme's accent. The one role a sample is drawn + // in is the hairline (an unset swatch's hatching), and that follows the theme. + words[foreground] = string.Equals(given, ScreenPalette.Rule, StringComparison.OrdinalIgnoreCase) + ? Role(given) + : given; + } + else if (_roles.ContainsKey(given)) + { + words[foreground] = Role(given); + } + else if (!IsIdentity) + { + // Not a role: a colour the screen was handed. Hold it to the floor where it lands. + words[foreground] = Contrast.Legible(Parse(given), Parse(plane)).ToHex(); + } + } + + planes.Push(plane); + return string.Join(' ', words); + } + + /// Whether the text a tag opens on is a colour sample — blocks only, up to the next tag. + private static bool Sample(string markup, int start) + { + var any = false; + for (var i = start; i < markup.Length && markup[i] != '['; i++) + { + if (markup[i] is not ('█' or '░' or '▒' or '▓')) + { + return false; + } + + any = true; + } + + return any; + } + + private static bool IsHex(string word) => + word.Length == 7 && word[0] == '#' && word.Skip(1).All(Uri.IsHexDigit); + + private static Rgb Parse(string hex) => new( + byte.Parse(hex.AsSpan(1, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture), + byte.Parse(hex.AsSpan(3, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture), + byte.Parse(hex.AsSpan(5, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture)); + + private static IReadOnlyDictionary Canonical() => + new[] + { + ScreenPalette.Accent, ScreenPalette.PanelBg, ScreenPalette.PanelFg, ScreenPalette.HeaderBg, + ScreenPalette.FooterBg, ScreenPalette.EditBg, ScreenPalette.Label, ScreenPalette.Value, + ScreenPalette.Muted, ScreenPalette.Rule, ScreenPalette.CursorBg, ScreenPalette.Ink, + ScreenPalette.MenuBg, ScreenPalette.MenuSelectedBg, ScreenPalette.MenuShadow, ScreenPalette.FieldBg, + ScreenPalette.Warn, + }.Distinct(StringComparer.OrdinalIgnoreCase).ToDictionary(h => h, h => h, StringComparer.OrdinalIgnoreCase); + + /// + /// The planes an ink is drawn on. Every plane text is drawn on, except that a label never sits on the + /// menu's selected candidate — the candidate the buffer names is drawn in the value ink, and the rest of + /// the list in labels on the menu's own plane — so a label is not dragged toward a plane it never meets. + /// + internal static IReadOnlyList PlanesUnder(string ink) => + string.Equals(ink, ScreenPalette.Label, StringComparison.OrdinalIgnoreCase) + ? TextPlanes.Where(p => p != ScreenPalette.MenuSelectedBg).ToArray() + : TextPlanes; + + /// An ink moved, if it must be, until it clears the floor on every plane it is drawn on. + private static Rgb Legible(Rgb ink, IReadOnlyDictionary roles, IReadOnlyList? planes = null) + { + // Every plane is on one side of mid-grey, so the plane nearest the ink is the hardest and clearing + // it clears the rest; two passes absorb the rounding of the first. + for (var pass = 0; pass < 2; pass++) + { + foreach (var plane in planes ?? TextPlanes) + { + ink = Contrast.Legible(ink, roles[plane]); + } + } + + return ink; + } + + /// How far below the darkest plane a light theme's menu shadow sits, in L*. + private const double ShadowStep = 16; + + private const double LightPlaneLuminance = 0.18; + + /// + /// A dark role on a light theme: the same colour at the mirrored lightness (100 − L*), keeping the + /// tint it carried (its distance from the grey of its own luminance). + /// + private static Rgb Mirror(Rgb rgb) => AtLightness(rgb, 100 - Lightness(rgb)); + + /// The colour's tint laid over the grey at (L*). + private static Rgb AtLightness(Rgb rgb, double lightness) + { + var own = Grey(Contrast.RelativeLuminance(rgb)); + var grey = Grey(FromLightness(Math.Clamp(lightness, 0, 100))); + return new Rgb( + Channel(grey + (rgb.R - own)), + Channel(grey + (rgb.G - own)), + Channel(grey + (rgb.B - own))); + } + + /// CIE L* of a colour's relative luminance. + private static double Lightness(Rgb rgb) + { + var y = Contrast.RelativeLuminance(rgb); + return y > 216.0 / 24389 ? (116 * Math.Cbrt(y)) - 16 : y * 24389 / 27; + } + + private static double FromLightness(double lightness) => + lightness > 8 ? Math.Pow((lightness + 16) / 116, 3) : lightness * 27 / 24389; + + /// The sRGB byte of the neutral grey with relative luminance . + private static double Grey(double y) + { + var v = y <= 0.0031308 ? 12.92 * y : (1.055 * Math.Pow(y, 1 / 2.4)) - 0.055; + return v * 255; + } + + private static (int R, int G, int B) Delta(Rgb a, Rgb b) => (a.R - b.R, a.G - b.G, a.B - b.B); + + private static Rgb Add(Rgb rgb, (int R, int G, int B) d) => + new(Channel(rgb.R + d.R), Channel(rgb.G + d.G), Channel(rgb.B + d.B)); + + private static byte Channel(double value) => (byte)Math.Clamp(Math.Round(value), 0, 255); +} diff --git a/src/SharpMUTerm.Tui/SettingsOverlay.cs b/src/SharpMUTerm.Tui/SettingsOverlay.cs index 7139d948..e83004f5 100644 --- a/src/SharpMUTerm.Tui/SettingsOverlay.cs +++ b/src/SharpMUTerm.Tui/SettingsOverlay.cs @@ -54,12 +54,19 @@ internal sealed class SettingsOverlay /// writes the configuration out as it accepts one, so there is no moment on /// the way out at which the host would have anything left to save. See . /// - public SettingsOverlay(ConsoleWindowSystem system) + public SettingsOverlay(ConsoleWindowSystem system, ScreenTheme? scheme = null) { _system = system; - _review = new EditReviewOverlay(system); + Scheme = scheme ?? ScreenTheme.Dark; + _review = new EditReviewOverlay(system, Scheme); } + /// + /// The palette the screens are painted in — the app's theme, resolved once. The window's own + /// backdrop is painted from it here; each screen's view paints its panels from the same instance. + /// + internal ScreenTheme Scheme { get; } + /// The F-key of the currently open screen, or null when closed. public ConsoleKey? OpenKey => _window is null ? null : _openKey; @@ -149,7 +156,7 @@ private void Open(ConsoleKey key, ScreenBinding binding) .AsModal() .Maximized() .Frameless() - .WithColors(new Color(PanelFg), new Color(PanelBg)) + .WithColors(Scheme.Colour(PanelFg), Scheme.Colour(PanelBg)) .AddControl(binding.Control()) .OnClosed((_, _) => Reset()) .Build(); diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 8c187c52..e6ee1695 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -52,6 +52,13 @@ internal sealed partial class SharpMUTermApp : IAsyncDisposable private readonly TerminalCapabilities _capabilities; private readonly Theme _theme; + /// + /// The settings screens' palette, resolved from once (). + /// Handed to every surface built from 's roles — F1–F10, the deletion review + /// and the package and send lists — so they follow a Light theme instead of staying dark. + /// + private readonly ScreenTheme _screens; + /// /// The colours this client paints in its own voice, resolved from and held to /// the legibility floor against the plane they land on — see . They were @@ -895,10 +902,11 @@ public SharpMUTermApp( _palette = new CommandPalette(_system, BuildCatalog, () => _active?.SessionKey, id => DispatchCommand(id)); _messageLog = new MessageLogOverlay(_system, _diagnostics); _gameData = new GameDataOverlay(_system, _time); - _settings = new SettingsOverlay(_system); - _composer = new ComposeOverlay(_system, _spelling); - _packageView = new ListOverlay(_system); - _sendMenu = new ListOverlay(_system); + _screens = ScreenTheme.For(_theme); + _settings = new SettingsOverlay(_system, _screens); + _composer = new ComposeOverlay(_system, _spelling, _screens); + _packageView = new ListOverlay(_system, _screens); + _sendMenu = new ListOverlay(_system, _screens); _composer.Send += (_, result) => SendComposed(result); _composer.Closed += (_, result) => KeepComposeDraft(result); _quit = new QuitOverlay(_system, QuitFactsNow, Quit); @@ -7049,6 +7057,7 @@ private ScreenBinding MsspScreen(WorldDefinition world) observation, _time.GetUtcNow(), _system.DesktopDimensions.Width, + _screens, session.Focus(), _system.DesktopDimensions.Height)); } @@ -7095,6 +7104,7 @@ private ScreenBinding WorldsScreen(string fkey, bool onCharacters) session.Selection.SelectionIn(WorldsScreenRenderer.WorldsPane), session.Selection.SelectionIn(WorldsScreenRenderer.CharactersPane), _system.DesktopDimensions.Width, + _screens, session.Focus(), fkey, session.Selection.SelectionIn(WorldsScreenRenderer.TriggerSetsPane), @@ -7119,6 +7129,7 @@ private ScreenBinding TriggersScreen() session.Selection.SelectionIn(0), RouteTargets(), _system.DesktopDimensions.Width, + _screens, session.Focus(), _system.DesktopDimensions.Height, _theme)); @@ -7135,6 +7146,7 @@ private ScreenBinding AliasesScreen() _config.TriggerSets, session.Selection.SelectionIn(0), _system.DesktopDimensions.Width, + _screens, session.Focus(), _system.DesktopDimensions.Height)); } @@ -7155,6 +7167,7 @@ private ScreenBinding KeypadScreen() _config.TriggerSets, session.Selection.SelectionIn(0), _system.DesktopDimensions.Width, + _screens, session.Focus(), _system.DesktopDimensions.Height)); } @@ -7170,6 +7183,7 @@ private ScreenBinding TimersScreen() _config.TriggerSets, session.Selection.SelectionIn(0), _system.DesktopDimensions.Width, + _screens, session.Focus(), _system.DesktopDimensions.Height)); } @@ -7191,7 +7205,7 @@ private ScreenBinding OptionsScreen(Func sc { var session = new SettingsSession(_ => OptionsScreenRenderer.Model(screen()), SaveConfiguration); return new ScreenBinding(session, () => OptionsScreenView.Build( - screen(), _system.DesktopDimensions.Width, session.Focus())); + screen(), _system.DesktopDimensions.Width, _screens, session.Focus())); } /// The --view suffix that opens a settings screen with a field being typed into. diff --git a/src/SharpMUTerm.Tui/SpellingHighlighter.cs b/src/SharpMUTerm.Tui/SpellingHighlighter.cs index ed160a96..17781781 100644 --- a/src/SharpMUTerm.Tui/SpellingHighlighter.cs +++ b/src/SharpMUTerm.Tui/SpellingHighlighter.cs @@ -10,12 +10,11 @@ namespace SharpMUTerm.Tui; /// /// A colour and not an underline: the hook carries a foreground and nothing else, and an underline needs a /// styling hook in upstream. on -/// is the pair the settings screens already use for a refused value. +/// is the pair the settings screens already use for a refused value; +/// is that warning resolved for the app's theme (). /// -internal sealed class SpellingHighlighter(SpellChecker checker) : ISyntaxHighlighter +internal sealed class SpellingHighlighter(SpellChecker checker, Color marked) : ISyntaxHighlighter { - private static readonly Color Marked = new(ScreenPalette.Warn); - public (IReadOnlyList Tokens, SyntaxLineState EndState) Tokenize(string line, int lineIndex, SyntaxLineState startState) => - (checker.Misspellings(line).Select(m => new SyntaxToken(m.Start, m.Length, Marked)).ToArray(), startState); + (checker.Misspellings(line).Select(m => new SyntaxToken(m.Start, m.Length, marked)).ToArray(), startState); } diff --git a/src/SharpMUTerm.Tui/TimersScreenView.cs b/src/SharpMUTerm.Tui/TimersScreenView.cs index d6f1cbe8..8d682c80 100644 --- a/src/SharpMUTerm.Tui/TimersScreenView.cs +++ b/src/SharpMUTerm.Tui/TimersScreenView.cs @@ -15,13 +15,13 @@ namespace SharpMUTerm.Tui; internal static class TimersScreenView { public static IWindowControl Build( - IReadOnlyList sets, int selected, int width, ScreenFocus? focus = null, int height = 0) + IReadOnlyList sets, int selected, int width, ScreenTheme scheme, ScreenFocus? focus = null, int height = 0) { var header = ScreenChrome.Band( TimersScreenRenderer.HeaderLine(width, TimersScreenRenderer.Model(sets, selected), focus), - ScreenPalette.HeaderBg); + ScreenPalette.HeaderBg, scheme); var footer = ScreenChrome.Band( - TimersScreenRenderer.FooterLine(sets, selected, width, focus), ScreenPalette.FooterBg); + TimersScreenRenderer.FooterLine(sets, selected, width, focus), ScreenPalette.FooterBg, scheme); var list = ScreenChrome.SplitWidth( width, @@ -33,10 +33,10 @@ public static IWindowControl Build( var right = TimersScreenRenderer.EditorColumn( sets, selected, focus, width <= 0 ? list : width - list - ScreenChrome.ColumnDivider, rows); - var listCol = ScreenChrome.Stretch(new MarkupControl(ScreenChrome.Window(left, rows))); + var listCol = ScreenChrome.Stretch(ScreenChrome.Panel(ScreenChrome.Window(left, rows), scheme)); var editorCol = ScreenChrome.Stretch( - new MarkupControl(ScreenChrome.Indent(ScreenChrome.Window(right, rows)))); + ScreenChrome.Panel(ScreenChrome.Indent(ScreenChrome.Window(right, rows)), scheme)); return ScreenChrome.Split( - header, footer, listCol, editorCol, list, Math.Max(left.Count, right.Count), rows); + header, footer, listCol, editorCol, list, Math.Max(left.Count, right.Count), rows, scheme); } } diff --git a/src/SharpMUTerm.Tui/TriggersScreenView.cs b/src/SharpMUTerm.Tui/TriggersScreenView.cs index 14e3871c..666dbe91 100644 --- a/src/SharpMUTerm.Tui/TriggersScreenView.cs +++ b/src/SharpMUTerm.Tui/TriggersScreenView.cs @@ -21,6 +21,7 @@ public static IWindowControl Build( int selectedTrigger, IReadOnlyList routeTargets, int width, + ScreenTheme scheme, ScreenFocus? focus = null, int height = 0, Theme? theme = null) @@ -28,9 +29,9 @@ public static IWindowControl Build( var header = ScreenChrome.Band( TriggersScreenRenderer.HeaderLine( width, TriggersScreenRenderer.Model(sets, selectedTrigger, routeTargets), focus), - ScreenPalette.HeaderBg); + ScreenPalette.HeaderBg, scheme); var footer = ScreenChrome.Band( - TriggersScreenRenderer.FooterLine(sets, selectedTrigger, width, focus), ScreenPalette.FooterBg); + TriggersScreenRenderer.FooterLine(sets, selectedTrigger, width, focus), ScreenPalette.FooterBg, scheme); // Body: rule list │ editor, as two real columns. The split is a function of the screen's width: // at 120 the rule list keeps the share it was designed with, and at 100 it gives cells back to @@ -46,9 +47,9 @@ public static IWindowControl Build( sets, selectedTrigger, routeTargets, focus, width <= 0 ? rules : width - rules - ScreenChrome.ColumnDivider, body, theme); - var rulesCol = ScreenChrome.Stretch(new MarkupControl(ScreenChrome.Window(left, body))); - var editorCol = ScreenChrome.Stretch(new MarkupControl( - ScreenChrome.Indent(ScreenChrome.Window(right, body)))); - return ScreenChrome.Split(header, footer, rulesCol, editorCol, rules, Math.Max(left.Count, right.Count), body); + var rulesCol = ScreenChrome.Stretch(ScreenChrome.Panel(ScreenChrome.Window(left, body), scheme)); + var editorCol = ScreenChrome.Stretch(ScreenChrome.Panel( + ScreenChrome.Indent(ScreenChrome.Window(right, body)), scheme)); + return ScreenChrome.Split(header, footer, rulesCol, editorCol, rules, Math.Max(left.Count, right.Count), body, scheme); } } diff --git a/src/SharpMUTerm.Tui/WorkspacePalette.cs b/src/SharpMUTerm.Tui/WorkspacePalette.cs index de6c0404..de1ec5fb 100644 --- a/src/SharpMUTerm.Tui/WorkspacePalette.cs +++ b/src/SharpMUTerm.Tui/WorkspacePalette.cs @@ -156,19 +156,30 @@ private static Rgb Tinted(Rgb plane, PaneTint tint, double depth) /// plane it is going onto, so what is fixed here is hue and saturation. Ten, spread around the wheel, /// so two characters' colours are recognised rather than compared; saturated, because chroma is /// bounded by luminance and these are re-lit onto a dark plane. + /// + /// Picked for colour-blind readers as well (TintColourVisionTests): searched, within + /// 40° of each name's hue, for the set whose closest pair — among the ten and the untinted plane, on + /// all three themes — is furthest apart under simulated protanopia, deuteranopia and tritanopia, + /// without the closest pair for typical vision getting any closer and without the light theme's planes + /// leaving pastel. Worst pair, CIEDE2000: 2.05 protan, 2.22 deutan, 2.00 tritan on Dark (were 1.74, + /// 0.28, 0.83), 1.99 deutan on Solarized Dark; typical vision 3.96 (was 3.71). That is "two panes side + /// by side differ", not "a pane is recognised alone": ten planes at one luminance near L* 7 cannot be, + /// for a dichromat — the best found with the names ignored was about 2.2 — which is why a tinted + /// character's rail row and tab say the colour by name. + /// /// private static Rgb? Anchor(PaneTint tint) => tint switch { - PaneTint.Slate => new Rgb(0x1e, 0x5c, 0xe0), - PaneTint.Teal => new Rgb(0x00, 0xa0, 0x94), - PaneTint.Moss => new Rgb(0x3f, 0xa8, 0x18), - PaneTint.Ochre => new Rgb(0xd4, 0x96, 0x00), - PaneTint.Ember => new Rgb(0xd8, 0x33, 0x1c), - PaneTint.Plum => new Rgb(0xb0, 0x2c, 0xd4), - PaneTint.Indigo => new Rgb(0x5a, 0x3c, 0xf0), - PaneTint.Azure => new Rgb(0x00, 0x90, 0xd8), - PaneTint.Jade => new Rgb(0x00, 0xb0, 0x60), - PaneTint.Rose => new Rgb(0xe0, 0x30, 0x7a), + PaneTint.Slate => new Rgb(0x17, 0x57, 0xe0), + PaneTint.Teal => new Rgb(0x2e, 0xa0, 0x7f), + PaneTint.Moss => new Rgb(0x48, 0xa8, 0x30), + PaneTint.Ochre => new Rgb(0xa1, 0x32, 0x00), + PaneTint.Ember => new Rgb(0xd8, 0x00, 0x18), + PaneTint.Plum => new Rgb(0x60, 0x2f, 0xa1), + PaneTint.Indigo => new Rgb(0x40, 0x40, 0xff), + PaneTint.Azure => new Rgb(0x00, 0x89, 0xce), + PaneTint.Jade => new Rgb(0x07, 0xb0, 0x6e), + PaneTint.Rose => new Rgb(0xc6, 0x17, 0x84), _ => null, }; diff --git a/src/SharpMUTerm.Tui/WorldsScreenView.cs b/src/SharpMUTerm.Tui/WorldsScreenView.cs index 508c3823..10221711 100644 --- a/src/SharpMUTerm.Tui/WorldsScreenView.cs +++ b/src/SharpMUTerm.Tui/WorldsScreenView.cs @@ -22,6 +22,7 @@ public static IWindowControl Build( int selectedWorld, int selectedCharacter, int width, + ScreenTheme scheme, ScreenFocus? focus = null, string fkey = WorldsScreenRenderer.FKey, int selectedSet = 0, @@ -39,10 +40,10 @@ public static IWindowControl Build( var model = WorldsScreenRenderer.Model( worlds, triggerSets, selectedWorld, selectedCharacter, selectedSet, info ? _ => { } : null); var header = ScreenChrome.Band( - WorldsScreenRenderer.HeaderLine(width, model, focus, fkey), ScreenPalette.HeaderBg); + WorldsScreenRenderer.HeaderLine(width, model, focus, fkey), ScreenPalette.HeaderBg, scheme); var footer = ScreenChrome.Band( WorldsScreenRenderer.FooterLine(worlds, selectedWorld, selectedCharacter, accent, width, focus), - ScreenPalette.FooterBg); + ScreenPalette.FooterBg, scheme); // How many rows the WORLDS/detail body has once the header, the character band, the gap under // it and the action bar have taken theirs. The detail column is built against that number, so a @@ -62,17 +63,17 @@ public static IWindowControl Build( var rows = height <= 0 ? 0 : Math.Max(1, height - 1 - band); // Body: WORLDS list │ detail, as two real columns. - var worldsCol = ScreenChrome.Stretch(new MarkupControl( - WorldsScreenRenderer.WorldsColumn(worlds, selectedWorld, focus, rows, info).ToList())); - var detailCol = ScreenChrome.Stretch(new MarkupControl( + var worldsCol = ScreenChrome.Stretch(ScreenChrome.Panel( + WorldsScreenRenderer.WorldsColumn(worlds, selectedWorld, focus, rows, info), scheme)); + var detailCol = ScreenChrome.Stretch(ScreenChrome.Panel( WorldsScreenRenderer - .DetailColumn(worlds, triggerSets, selectedWorld, selectedCharacter, accent, focus, rows) - .ToList())); + .DetailColumn(worlds, triggerSets, selectedWorld, selectedCharacter, accent, focus, rows), + scheme)); var body = Controls.HorizontalGrid() .WithAlignment(HorizontalAlignment.Stretch) .WithVerticalAlignment(VerticalAlignment.Fill) .Column(c => c.Width(30).Add(worldsCol)) - .Column(c => c.Width(1).Add(ScreenChrome.VerticalRule())) + .Column(c => c.Width(1).Add(ScreenChrome.VerticalRule(scheme))) .Column(c => c.Width(1).Add(ScreenChrome.Filler())) .Column(c => c.Flex(1).Add(detailCol)) .Build(); @@ -94,11 +95,10 @@ public static IWindowControl Build( // block sits on the right while its checkboxes stay left-aligned (an Auto column hugs it, not // per-row right-justify, which would ragged the left edge). The edit grid's own background // gives the full-width elevated band behind both. - var formPanel = new MarkupControl(ScreenChrome.Indent(form)) - { - HorizontalAlignment = HorizontalAlignment.Left, - }; - var trigPanel = new MarkupControl(triggers) { HorizontalAlignment = HorizontalAlignment.Left }; + var formPanel = ScreenChrome.Panel(ScreenChrome.Indent(form), scheme, ScreenPalette.EditBg); + formPanel.HorizontalAlignment = HorizontalAlignment.Left; + var trigPanel = ScreenChrome.Panel(triggers, scheme, ScreenPalette.EditBg); + trigPanel.HorizontalAlignment = HorizontalAlignment.Left; var edit = Controls.HorizontalGrid() .WithAlignment(HorizontalAlignment.Stretch) .WithVerticalAlignment(VerticalAlignment.Fill) @@ -107,7 +107,7 @@ public static IWindowControl Build( .Column(c => c.Add(trigPanel)) .Column(c => c.Width(2).Add(ScreenChrome.Filler())) .Build(); - edit.BackgroundColor = new Color(ScreenPalette.EditBg); + edit.BackgroundColor = scheme.Colour(ScreenPalette.EditBg); // A one-row panel-background gap sits between the editing pane and the footer so the footer // reads as a separate bar, not the last row of the character setup section. diff --git a/tests/SharpMUTerm.Core.Tests/Text/ColourVisionTests.cs b/tests/SharpMUTerm.Core.Tests/Text/ColourVisionTests.cs new file mode 100644 index 00000000..be3a6ad7 --- /dev/null +++ b/tests/SharpMUTerm.Core.Tests/Text/ColourVisionTests.cs @@ -0,0 +1,70 @@ +using SharpMUTerm.Core.Text; + +namespace SharpMUTerm.Core.Tests.Text; + +/// +/// The colour-vision simulation the pane tints are measured with. What is pinned is that it is the model it +/// says it is: the confusions each deficiency is known for collapse, the ones it is not known for do not, +/// and the distance is a distance. +/// +public class ColourVisionTests +{ + private static readonly Rgb Red = new(0xd0, 0x30, 0x30); + private static readonly Rgb Green = new(0x50, 0x90, 0x20); + private static readonly Rgb Blue = new(0x20, 0x40, 0xd0); + + [Test] + public async Task BlackAndWhiteAreAHundredApart() + { + await Assert.That(ColourVision.Distance(new Rgb(0, 0, 0), new Rgb(0xff, 0xff, 0xff))).IsEqualTo(100.0).Within(0.01); + } + + [Test] + [Arguments(ColourDeficiency.None)] + [Arguments(ColourDeficiency.Protanopia)] + [Arguments(ColourDeficiency.Deuteranopia)] + [Arguments(ColourDeficiency.Tritanopia)] + public async Task ADistanceIsZeroToItselfAndTheSameBothWays(ColourDeficiency deficiency) + { + await Assert.That(ColourVision.Distance(Red, Red, deficiency)).IsEqualTo(0.0); + await Assert.That(ColourVision.Distance(Red, Blue, deficiency)) + .IsEqualTo(ColourVision.Distance(Blue, Red, deficiency)).Within(1e-9); + } + + /// + /// Greys are untouched by every matrix — each row of Machado's matrices sums to one — so the simulation + /// moves hue and never lightness of a neutral. + /// + [Test] + [Arguments(ColourDeficiency.Protanopia)] + [Arguments(ColourDeficiency.Deuteranopia)] + [Arguments(ColourDeficiency.Tritanopia)] + public async Task AGreyLooksTheSameToEveryone(ColourDeficiency deficiency) + { + var grey = new Rgb(0x77, 0x77, 0x77); + await Assert.That(ColourVision.Distance(grey, ColourVision.Simulate(grey, deficiency))).IsLessThan(0.5); + } + + /// Red against green is the confusion protanopia and deuteranopia are named for. + [Test] + [Arguments(ColourDeficiency.Protanopia)] + [Arguments(ColourDeficiency.Deuteranopia)] + public async Task RedAndGreenCloseUpForTheRedGreenDeficiencies(ColourDeficiency deficiency) + { + var typical = ColourVision.Distance(Red, Green); + await Assert.That(ColourVision.Distance(Red, Green, deficiency)).IsLessThan(typical / 2); + } + + /// And tritanopia keeps it — its confusion is blue against green, not red against green. + [Test] + public async Task TritanopiaKeepsRedAndGreenApartAndClosesBlueOnGreen() + { + await Assert.That(ColourVision.Distance(Red, Green, ColourDeficiency.Tritanopia)) + .IsGreaterThan(ColourVision.Distance(Red, Green) / 2); + + var cyan = new Rgb(0x20, 0x90, 0xa0); + var green = new Rgb(0x30, 0xa0, 0x40); + await Assert.That(ColourVision.Distance(cyan, green, ColourDeficiency.Tritanopia)) + .IsLessThan(ColourVision.Distance(cyan, green) / 2); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs b/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs index bd4847c3..44ac8df5 100644 --- a/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs @@ -55,6 +55,12 @@ public class FrameContrastTests // The package surfaces are a modal of their own, with a warning ink on the review. "packages", "package-review", "package-browse", "send-menu", + // The settings screens follow the theme (ScreenTheme), so each kind of screen is walked on all + // three: a list-and-editor screen, an options card, a field mid-edit with its caret and its + // candidate list, a password, and the deletion review that follows a screen out. + "aliases", "timers", "textansi", "input", "set", "password", "deletions", "route", "triggers-edit", + "keypad-edit", "worlds-edit", "mssp-none", "compose-literal", + // The prompt row is the only thing this client paints outside a pane that carries the // *game's* colours rather than its own, so the floor is applied against the idle input band // instead of the reading plane. A band nothing renders in a test is a band nobody checks. @@ -78,8 +84,8 @@ public async Task NoPaintedTextIsBelowTheLegibilityFloor((string Theme, string V // FrameGrid's own remarks warn about ("quietly green on a frame it has misread"), and it is // precisely what a floor assertion cannot notice, so it is asserted separately. // - // Counted in *cells* rather than in distinct pairs: a settings screen is painted from the fixed - // ScreenPalette and is legitimately down to four colour pairs (F1's composer), while the + // Counted in *cells* rather than in distinct pairs: a settings screen is painted from the theme's + // ScreenTheme and is legitimately down to four colour pairs (F1's composer), while the // thinnest real frame here still paints 201 glyphs. A pair-count floor would be policing how // colourful a view is, which is not what this is for. var painted = pairs.Values.Sum(); diff --git a/tests/SharpMUTerm.Tui.Tests/PointerTests.cs b/tests/SharpMUTerm.Tui.Tests/PointerTests.cs index 7ba12e8b..7e2dac9a 100644 --- a/tests/SharpMUTerm.Tui.Tests/PointerTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/PointerTests.cs @@ -182,6 +182,21 @@ public async Task TabsRailRowsAndTheCommandLineAreFound() await Assert.That(kinds.Any(t => t.Kind == PointerKind.Output && t.Shape == PointerShape.Text)).IsTrue(); } + /// + /// A tinted character's rail row and tab say the pane colour by name — the cue that survives a + /// reader who cannot tell the ten hues apart, in the one place it costs no cell. An untinted character's + /// rows say nothing about colour. + /// + [Test] + public async Task ATintedCharactersRowsNameThePaneColour() + { + var (app, _) = App("tint-tabs"); + var targets = Scan(app).Select(hit => hit.Target).Where(t => t.Tooltip is not null).ToArray(); + + await Assert.That(targets.Any(t => t.Kind == PointerKind.RailRow && t.Tooltip!.Contains("pane colour: "))).IsTrue(); + await Assert.That(targets.Any(t => t.Kind == PointerKind.Tab && t.Tooltip!.Contains("pane colour: "))).IsTrue(); + } + [Test] public async Task ARightClickOnADividerOrAPaneAsksTheHostForAMenu() { diff --git a/tests/SharpMUTerm.Tui.Tests/ScreenThemeTests.cs b/tests/SharpMUTerm.Tui.Tests/ScreenThemeTests.cs new file mode 100644 index 00000000..d7747a68 --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/ScreenThemeTests.cs @@ -0,0 +1,172 @@ +using SharpConsoleUI.Drivers; +using SharpMUTerm.Core.Text; +using SharpMUTerm.Core.Theming; +using SharpMUTerm.Graphics; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// The settings screens follow the theme (defect D6). 's constants are the Dark +/// theme's; works the same roles out for the active theme, and the views resolve +/// their renderers' markup through it. Pinned here: Dark is untouched, every theme's inks clear the floor +/// on every plane they are drawn on, the resolver rewrites only colours, and a Light frame is light. +/// holds the painted pairs of every settings view to the floor on all three. +/// +[NotInParallel] +public class ScreenThemeTests +{ + private static readonly string[] Roles = + [ + ScreenPalette.Accent, ScreenPalette.PanelBg, ScreenPalette.PanelFg, ScreenPalette.HeaderBg, + ScreenPalette.FooterBg, ScreenPalette.EditBg, ScreenPalette.Label, ScreenPalette.Value, ScreenPalette.Muted, + ScreenPalette.Rule, ScreenPalette.CursorBg, ScreenPalette.Ink, ScreenPalette.MenuBg, + ScreenPalette.MenuSelectedBg, ScreenPalette.MenuShadow, ScreenPalette.FieldBg, ScreenPalette.Warn, + ]; + + private static readonly string[] TextPlanes = + [ + ScreenPalette.PanelBg, ScreenPalette.HeaderBg, ScreenPalette.FooterBg, ScreenPalette.EditBg, + ScreenPalette.CursorBg, ScreenPalette.MenuBg, ScreenPalette.MenuSelectedBg, ScreenPalette.FieldBg, + ]; + + private static readonly string[] Planes = [.. TextPlanes, ScreenPalette.Rule, ScreenPalette.MenuShadow]; + + private static Rgb Rgb(string hex) => new( + Convert.ToByte(hex.Substring(1, 2), 16), Convert.ToByte(hex.Substring(3, 2), 16), Convert.ToByte(hex.Substring(5, 2), 16)); + + /// Every Dark frame is what it was: the Dark theme resolves each role to its own constant. + [Test] + public async Task TheDarkThemeIsTheConstantsByteForByte() + { + var scheme = ScreenTheme.For(ThemeLibrary.Get("Dark")); + + foreach (var role in Roles) + { + await Assert.That(scheme.Role(role)).IsEqualTo(role); + } + + await Assert.That(scheme.IsIdentity).IsTrue(); + } + + /// + /// The text inks — label, muted readout, value, the panel's own text, the accent and the warning — clear + /// on every plane text is drawn on, on every theme; and the ink printed on the + /// accent clears it on the accent. + /// + [Test] + [Arguments("Dark")] + [Arguments("Light")] + [Arguments("Solarized Dark")] + public async Task EveryInkClearsTheFloorOnEveryPlane(string themeName) + { + var scheme = ScreenTheme.For(ThemeLibrary.Get(themeName)); + string[] inks = [ScreenPalette.Label, ScreenPalette.Muted, ScreenPalette.Value, ScreenPalette.PanelFg, ScreenPalette.Warn]; + + foreach (var ink in inks) + { + foreach (var plane in ScreenTheme.PlanesUnder(ink)) + { + await Assert.That(Contrast.Ratio(Rgb(scheme.Role(ink)), Rgb(scheme.Role(plane)))) + .IsGreaterThanOrEqualTo(Contrast.Floor) + .Because($"{ink} on {plane} on {themeName}"); + } + } + + // The accent is text too — hints, checkmarks, the selected candidate's marker — on any of them. + foreach (var plane in TextPlanes) + { + await Assert.That(Contrast.Ratio(Rgb(scheme.Accent), Rgb(scheme.Role(plane)))) + .IsGreaterThanOrEqualTo(Contrast.Floor).Because($"accent on {plane} on {themeName}"); + } + + await Assert.That(Contrast.Ratio(Rgb(scheme.Ink), Rgb(scheme.Accent))) + .IsGreaterThanOrEqualTo(Contrast.Floor).Because($"ink on the accent on {themeName}"); + } + + /// + /// A light theme's screens are light: every plane is on the light side of mid-grey, and the text that + /// was light on the dark screens is dark. And the relationships survive — the label is quieter than the + /// value, and the menu's shadow is darker than every plane it falls on. + /// + [Test] + public async Task ALightThemeGetsLightScreensWithTheSameRelationships() + { + var scheme = ScreenTheme.For(ThemeLibrary.Get("Light")); + + foreach (var plane in TextPlanes) + { + await Assert.That(Contrast.RelativeLuminance(Rgb(scheme.Role(plane)))).IsGreaterThan(0.18).Because(plane); + } + + await Assert.That(Contrast.RelativeLuminance(Rgb(scheme.Value))).IsLessThan(0.05); + await Assert.That(Contrast.Ratio(Rgb(scheme.Value), Rgb(scheme.PanelBg))) + .IsGreaterThan(Contrast.Ratio(Rgb(scheme.Label), Rgb(scheme.PanelBg))); + + var shadow = Contrast.RelativeLuminance(Rgb(scheme.MenuShadow)); + foreach (var plane in Planes.Where(p => p != ScreenPalette.MenuShadow)) + { + await Assert.That(shadow).IsLessThan(Contrast.RelativeLuminance(Rgb(scheme.Role(plane)))).Because(plane); + } + } + + /// + /// The resolver swaps colours and nothing else: escaped brackets stay text, a link's target is never read + /// as a colour, a colour sample keeps the colour it samples even when it shares a role's hex, and a colour + /// that is not a role is held to the floor against the plane it lands on. + /// + [Test] + public async Task PaintingRewritesColoursAndLeavesTextAlone() + { + var scheme = ScreenTheme.For(ThemeLibrary.Get("Light")); + + await Assert.That(scheme.Paint($"[[{ScreenPalette.Label}]] [{ScreenPalette.Label}]x[/]")) + .IsEqualTo($"[[{ScreenPalette.Label}]] [{scheme.Label}]x[/]"); + await Assert.That(scheme.Paint($"[link=mux:send:{ScreenPalette.Value}]go[/]")) + .IsEqualTo($"[link=mux:send:{ScreenPalette.Value}]go[/]"); + await Assert.That(scheme.Paint($"[{ScreenPalette.Accent}]████[/]")) + .IsEqualTo($"[{ScreenPalette.Accent}]████[/]"); + await Assert.That(scheme.Paint($"[{ScreenPalette.Ink} on {ScreenPalette.Accent}] ⏎ [/]")) + .IsEqualTo($"[{scheme.Ink} on {scheme.Accent}] ⏎ [/]"); + + // A world's own bright accent, which was legible on the dark backdrop, is darkened onto the light one. + var painted = scheme.Paint("[bold #66ffcc]Aetherfall[/]"); + var hex = painted.Substring("[bold ".Length, 7); + await Assert.That(Contrast.Ratio(Rgb(hex), Rgb(scheme.PanelBg))).IsGreaterThanOrEqualTo(Contrast.Floor); + } + + /// + /// The frames say so too: on Light, no settings screen paints a single cell on a plane of the dark + /// palette. This is what catches a view that builds a control from a renderer's markup without resolving + /// it — the dark island D6 was — which a contrast audit cannot, because a dark band with its own light + /// text on it is perfectly legible. + /// + [Test] + [Arguments("triggers")] + [Arguments("worlds")] + [Arguments("textansi")] + [Arguments("aliases")] + [Arguments("timers")] + [Arguments("keypad-edit")] + [Arguments("mssp")] + [Arguments("compose")] + [Arguments("deletions")] + [Arguments("packages")] + public async Task NoLightSettingsFramePaintsADarkPlane(string view) + { + Console.SetIn(TextReader.Null); + var config = DemoScene.Build(); + config.ThemeName = "Light"; + config.Theme = ThemeLibrary.Get("Light"); + var caps = new TerminalCapabilities(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + var app = new SharpMUTermApp(config, caps, new HeadlessConsoleDriver(120, 32)); + var frame = app.RenderSnapshot(view); + + var dark = Planes.Select(Rgb).ToHashSet(); + var cells = FrameGrid.Cells(frame, 120, 32).Values.ToList(); + var offending = cells.Count(c => c.Background is { } bg && dark.Contains(bg)); + + await Assert.That(cells.Count).IsGreaterThan(1000); + await Assert.That(offending).IsEqualTo(0).Because($"--theme Light --view {view}"); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/TintColourVisionTests.cs b/tests/SharpMUTerm.Tui.Tests/TintColourVisionTests.cs new file mode 100644 index 00000000..9e8c652d --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/TintColourVisionTests.cs @@ -0,0 +1,65 @@ +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Text; +using SharpMUTerm.Core.Theming; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// The ten pane tints stay apart for colour-blind readers. Every pair of tinted planes — and every +/// tinted plane against the untinted one, since "no colour" is a choice a neighbour can make — is held to a +/// CIEDE2000 floor under simulated protanopia, deuteranopia and tritanopia (Machado 2009, through +/// ), on all three themes. +/// +/// The floor is 1.9, and what it buys is stated rather than flattered. A ΔE00 of about 1 is a +/// just-noticeable difference for two flat patches side by side; about 2 is where it is seen at a glance. +/// Panes are exactly that — flat planes side by side — so 1.9 says two characters' panes visibly differ +/// to a dichromat. It does not say a lone pane is recognised by its colour: the planes sit at one +/// luminance (an invariant: no character's pane is brighter than another's) near L* 7 on the dark themes, +/// where the whole gamut is a few units wide, and a dichromat sees hue on one axis only. The best set found +/// with the names ignored reached about 2.2. So the floor is close to the ceiling, and the name is said +/// where it costs no cell (the rail and tab tooltips). +/// +/// +/// Typical vision is held to 3.5 — the anchors were re-picked for colour-blind readers on condition that +/// nobody else's closest pair got closer (it was 3.71 on Dark, and is now 3.96). +/// +/// +public class TintColourVisionTests +{ + private const double DichromatFloor = 1.9; + + private const double TypicalFloor = 3.5; + + public static IEnumerable<(string Theme, ColourDeficiency Deficiency)> Cases() => + from theme in ThemeLibrary.Names + from deficiency in Enum.GetValues() + select (theme, deficiency); + + [Test] + [MethodDataSource(nameof(Cases))] + public async Task EveryPairOfPanePlanesStaysApart((string Theme, ColourDeficiency Deficiency) test) + { + var theme = ThemeLibrary.Get(test.Theme); + var floor = test.Deficiency == ColourDeficiency.None ? TypicalFloor : DichromatFloor; + + // PaneTint.None is in the enumeration, so the untinted surface is one of the planes compared. + var planes = Enum.GetValues().Select(t => (Tint: t, Plane: WorkspacePalette.Tint(theme, t))).ToList(); + + var worst = (Distance: double.MaxValue, A: PaneTint.None, B: PaneTint.None); + for (var i = 0; i < planes.Count; i++) + { + for (var j = i + 1; j < planes.Count; j++) + { + var d = ColourVision.Distance(planes[i].Plane, planes[j].Plane, test.Deficiency); + if (d < worst.Distance) + { + worst = (d, planes[i].Tint, planes[j].Tint); + } + } + } + + await Assert.That(worst.Distance).IsGreaterThanOrEqualTo(floor) + .Because($"{worst.A} vs {worst.B} on {test.Theme} under {test.Deficiency}: {worst.Distance:0.00}"); + } +} From a59445a5153c7fc11201ea08ef745a0a7d32cfc1 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 03:38:03 +0000 Subject: [PATCH 009/113] =?UTF-8?q?Discoverability:=20fuzzy=20=E2=8C=83P?= =?UTF-8?q?=20with=20recents,=20a=20key=20column,=20and=20F4=20clash=20war?= =?UTF-8?q?nings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The palette's ranking and grouping move into SharpMUTerm.Client (CommandPaletteModel, FuzzyMatch, RecentCommands, KeyGlyphs) so the window's palette can list the same rows; Core's CommandMatcher is removed. Matching is word-by-word subsequence with word-start/consecutive/prefix scoring and highlighted matches. An empty query lists RECENT (in memory, eight) and SUGGESTED (from CommandContext) before the groups. Keys sit in a right-aligned column in one glyph vocabulary and are never elided. F4 marks a binding that wins over a client key (MacroKeys.YieldedBy) with an amber triangle and a shadowed duplicate as dead; ⌃P lists "Key clashes (N)" while N > 0. New snapshot views menu-fuzzy and menu-recent. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 8 + CLAUDE.md | 31 ++ .../Commands/BuiltInCommands.cs | 26 +- .../Contributions/Commands.cs | 6 +- .../Palette/CommandPaletteModel.cs | 296 ++++++++++++++++++ src/SharpMUTerm.Client/Palette/FuzzyMatch.cs | 246 +++++++++++++++ src/SharpMUTerm.Client/Palette/KeyGlyphs.cs | 53 ++++ .../Palette/RecentCommands.cs | 48 +++ .../Commands/CommandCatalog.cs | 7 +- src/SharpMUTerm.Core/Commands/CommandItem.cs | 16 +- .../Commands/CommandMatcher.cs | 113 ------- src/SharpMUTerm.Tui/CommandPalette.cs | 86 +++-- src/SharpMUTerm.Tui/CommandSurfaceRenderer.cs | 182 +++++++---- src/SharpMUTerm.Tui/KeyClashes.cs | 116 +++++++ src/SharpMUTerm.Tui/KeypadScreenRenderer.cs | 29 +- src/SharpMUTerm.Tui/MacroKeys.cs | 61 ++++ src/SharpMUTerm.Tui/ScreenPalette.cs | 7 + .../SharpMUTermApp.Contributions.cs | 23 ++ src/SharpMUTerm.Tui/SharpMUTermApp.cs | 36 ++- src/SharpMUTerm.Tui/SnapshotViews.cs | 2 +- .../CommandPaletteModelTests.cs | 226 +++++++++++++ .../Commands/CommandMatcherTests.cs | 64 ---- .../CommandSurfaceRendererTests.cs | 89 ++++-- .../FrameContrastTests.cs | 2 +- .../PaletteDiscoverabilityTests.cs | 153 +++++++++ .../SnapshotViewEmptyConfigTests.cs | 2 +- 26 files changed, 1617 insertions(+), 311 deletions(-) create mode 100644 src/SharpMUTerm.Client/Palette/CommandPaletteModel.cs create mode 100644 src/SharpMUTerm.Client/Palette/FuzzyMatch.cs create mode 100644 src/SharpMUTerm.Client/Palette/KeyGlyphs.cs create mode 100644 src/SharpMUTerm.Client/Palette/RecentCommands.cs delete mode 100644 src/SharpMUTerm.Core/Commands/CommandMatcher.cs create mode 100644 src/SharpMUTerm.Tui/KeyClashes.cs create mode 100644 tests/SharpMUTerm.Client.Tests/CommandPaletteModelTests.cs delete mode 100644 tests/SharpMUTerm.Core.Tests/Commands/CommandMatcherTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/PaletteDiscoverabilityTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 911140d8..1b645dc9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,14 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- Ctrl+P matches as you type by initials and fragments, not only by prefix: `trig sel` finds *Make a trigger + from the selection*, and the letters it matched are highlighted. The commands you last ran from it are + listed first under RECENT, followed by what the moment suggests (copy while something is selected, back to + live output while scrolled back). Every entry's key sits in one right-aligned column, spelt one way (⌥⏎, + not Alt+⏎), and a narrow window shortens titles but never keys. +- Keypad & hotkeys (F4) marks a binding that hides one of the client's own keys (such as Ctrl+C copy) with an + amber △ and says the binding wins, and marks a second binding on the same key as one that never runs. + Ctrl+P lists *Key clashes (N)* while there are any. - Make a trigger without writing a regex: select a line of output and choose Ctrl+P ▸ *Make a trigger from the selection* (also on the right-click menu). Triggers (F2) opens on a new rule whose pattern is the line with its numbers, quoted speech and known player names turned into `*`, and shows the regex behind it. diff --git a/CLAUDE.md b/CLAUDE.md index d964b7d1..b4090398 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -209,6 +209,34 @@ fallbacks) for inline images/maps. availability (a rail row or the other half of a stateful pair still runs). A new ⌃P command is a contribution in `BuiltInCommands` plus a case in `RunBuiltInCommand`; Core's `CommandCatalog` keeps only `CharacterCycle`. +- **⌃P's ranking and grouping are the Client's, so both hosts list the same rows** (`CommandPaletteModel`, + `FuzzyMatch`, `RecentCommands`, `KeyGlyphs` in `Client/Palette`; the Tui only draws, `CommandSurfaceRenderer`). + Core's `CommandMatcher` is gone. Decisions not to relitigate: + - **Matching is subsequence, word by word, in order**, scored per character: +1 matched, +8 at a word start, + +6 straight after the previous match, +4 on the first character, −1 per skipped character (−4 at most + per gap), +20 when the title starts with the whole query. Each word is aligned by dynamic programming, + falling back to the leftmost alignment so anything that is a subsequence matches. A title match always + lists above a match on the detail, the key or the group's name; ties keep catalog order. Groups keep + their headers but are ordered by their best entry, so the best match is the first row. + - **An empty query lists RECENT, then SUGGESTED, then the groups**, each entry once. SUGGESTED is read off + `CommandContext` flags alone (selection → copy and make-a-trigger, frozen, scrolled back, walking, + zoomed, clashes) — not a guess at habit, which is RECENT's job. ⌃P refuses over the composer and the + settings screens are modal, so there is no "screen open" mode for it to adapt to. + - **Recents are in memory for the run** (eight, newest first, `SharpMUTermApp._recentCommands`). The only + view state that outlives a run goes into `config.json`, and which menu entries were clicked is not + configuration; command-line history, the nearest relative, is in memory too. Recorded when chosen on ⌃P + (`CommandPalette.Commit`, `RunFromPalette`), never on a key or a rail click. + - **A `CommandItem` carries `Key` and `Detail` apart from `Subtitle`**; `Subtitle` stays the joined line + for the pointer menu and the tests that read it. Keys are shown through `KeyGlyphs.Normalize`, so the + host's `Alt+⏎`/`Ctrl+⏎` read `⌥⏎`/`⌃⏎` in the column while `--help` keeps the words. The key column is + right-aligned at the widest key; a narrow surface drops the detail, then elides the title, never the key. + - **Clashes come from `MacroKeys`, never a second table** (`KeyClashes`, Tui). `ClaimedBy` (a global + shortcut: the client wins, `Verdict` already says Taken) and `YieldedBy` (what the main window does with a + chord only after `DispatchMacro` declined it: the binding wins, a warning). `YieldedBy`'s list mirrors the + window chain below `DispatchMacro` and the bar's key table, and must move with them. Two bindings on one + chord resolve as `MacroEngine.Resolve` does — the first answers even disabled. F4 marks a binding that wins + with an amber `△` (`ScreenPalette.Caution`) in the key's own well, a loser with `▲`, and says which side + wins in the footer; ⌃P lists `Key clashes (N)` only while N > 0, and it opens F4. - **Tui** — **SharpConsoleUI** app: a `TabControl` of output windows (main + trigger-routed **spawn windows** + web view, with unread badges), each a `MarkupControl` in a `ScrollablePanelControl` viewport (PgUp/PgDn, Shift+↑/↓, ⌃Home/⌃End, wheel; unread badges count output arriving below a @@ -1001,6 +1029,9 @@ python3 tools/ansi_frame_to_image.py frame.ansi frame.html # or .svg - **Views:** `worlds`/`settings`, `triggers`, `route`, `highlight`, `aliases`, `timers`, `keypad`, `set`, `textansi`, `input`, `logging`, `password`, `startup`, `freeze`, `spawn`, `split`, `move`, `drag`, `history`, `history-search`, `history-search-filter`, `draft`, `draft2`, `menu`, `menu-split`, + `menu-fuzzy` (`trig sel` typed into ⌃P after a real drag, so the trigger builder's entry is offered — the + frame showing a two-word fuzzy match highlighted), `menu-recent` (⌃P opened empty after two commands ran + through the palette's own path, `RunFromPalette` — RECENT at the top, newest first, listed once), `messages`, `quit`, `connections` (**two connections on one world** — the one view where the header's fraction, the rail's dots and the quit prompt's count are all visible together and all have to agree; every other view has at most one character connected per world, which is what hid a header dividing diff --git a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs index 88595d61..68391a42 100644 --- a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs +++ b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs @@ -134,6 +134,10 @@ void Family(string id, string prefix, Func c.State.KeyClashes > 0, titleFor: c => $"Key clashes ({c.State.KeyClashes})"); + // The composer. Named here as well as bound to F1 for the reason the row above it is: a surface // nobody can find is a surface nobody uses, and this one is not something a reader would guess // at from the command line in front of them. @@ -262,7 +266,11 @@ private static IEnumerable Characters(ICommandContext context) CommandGroup.GoTo, $"Switch to {character.CharacterName}", CommandIds.Character(character.SessionKey), - $"{chord}{character.WorldName} · {state}"); + $"{chord}{character.WorldName} · {state}") + { + Key = chord.Length == 0 ? null : chord[..^3], + Detail = $"{character.WorldName} · {state}", + }; } } @@ -303,7 +311,11 @@ private static IEnumerable Windows(ICommandContext context) CommandGroup.GoTo, $"Go to {window.Title}", CommandIds.Window(window.Id), - $"{chord}{owner}{unread}"); + $"{chord}{owner}{unread}") + { + Key = chord.Length == 0 ? null : chord[..^3], + Detail = $"{owner}{unread}", + }; } } @@ -365,11 +377,17 @@ private static IEnumerable Panes(ICommandContext context) CommandGroup.Layout, $"Go to pane {n}", CommandIds.Pane(n), - n <= CommandIds.PaneJumpDigits ? $"⌃B {n}" : null); + n <= CommandIds.PaneJumpDigits ? $"⌃B {n}" : null) + { + Key = n <= CommandIds.PaneJumpDigits ? $"⌃B {n}" : null, + }; } } private static IEnumerable Screens(ICommandContext context) => context.Settings.Select(screen => - new CommandItem(CommandGroup.Settings, $"Open {screen.Title}", screen.Id, screen.Shortcut)); + new CommandItem(CommandGroup.Settings, $"Open {screen.Title}", screen.Id, screen.Shortcut) + { + Key = string.IsNullOrEmpty(screen.Shortcut) ? null : screen.Shortcut, + }); } diff --git a/src/SharpMUTerm.Client/Contributions/Commands.cs b/src/SharpMUTerm.Client/Contributions/Commands.cs index eab4b5e8..9fadcbea 100644 --- a/src/SharpMUTerm.Client/Contributions/Commands.cs +++ b/src/SharpMUTerm.Client/Contributions/Commands.cs @@ -175,7 +175,11 @@ public override IEnumerable Entries(ICommandContext context) { if (IsAvailable is null || IsAvailable(context)) { - yield return new CommandItem(Category, TitleFor?.Invoke(context) ?? Title, Id, SubtitleFor(context)); + yield return new CommandItem(Category, TitleFor?.Invoke(context) ?? Title, Id, SubtitleFor(context)) + { + Key = Key?.Resolve(context.Keys), + Detail = Detail, + }; } } diff --git a/src/SharpMUTerm.Client/Palette/CommandPaletteModel.cs b/src/SharpMUTerm.Client/Palette/CommandPaletteModel.cs new file mode 100644 index 00000000..385b209e --- /dev/null +++ b/src/SharpMUTerm.Client/Palette/CommandPaletteModel.cs @@ -0,0 +1,296 @@ +using SharpMUTerm.Core.Commands; + +namespace SharpMUTerm.Client.Palette; + +/// A run of characters in a string: where it starts and how long it is. +public readonly record struct TextRange(int Start, int Length); + +/// Which field of an entry a query matched, best first. +public enum PaletteMatchField +{ + /// The query is empty; nothing was matched. + None, + + /// The title. + Title, + + /// The detail, the key or the group's name — listed below every title match. + Other, +} + +/// One line of the palette: a group header or an entry. +public abstract record PaletteRow; + +/// A group's header. +/// The header as drawn, in capitals (RECENT, LAYOUT). +public sealed record PaletteHeader(string Label) : PaletteRow; + +/// +/// An entry the palette lists: the command, its key as this host spells it (in the one glyph vocabulary, +/// ), the words beside it, and where the query matched its title. +/// +/// The catalog entry; is what a surface dispatches. +/// The chord, or null. A surface draws it in a column of its own and never elides it. +/// The words beside the title, or null. +/// The runs of the title the query matched, ascending, for highlighting. +/// Which field the query matched. +/// The match's score within its field; zero for an empty query. +public sealed record PaletteEntry( + CommandItem Item, + string? Key, + string? Detail, + IReadOnlyList TitleMatches, + PaletteMatchField Field, + int Score) : PaletteRow; + +/// +/// What the palette shows for one query: the rows in display order (headers and entries interleaved), the +/// entries alone in the same order (what ↑↓ walk and ⏎ dispatches), and how many entries the catalog held. +/// +public sealed record PaletteView(IReadOnlyList Rows, IReadOnlyList Entries, int Total) +{ + /// The widest key any entry carries, in characters; the width a surface reserves for the key column. + public int KeyWidth => Entries.Count == 0 ? 0 : Entries.Max(e => e.Key?.Length ?? 0); +} + +/// +/// The command surface's view-model, shared by every host's palette: a query and a catalog in, ordered rows +/// with group headers out. UI-agnostic — the terminal draws it as markup and the window will draw it with +/// its own controls, and both list the same rows in the same order. +/// +/// An empty query lists RECENT first (what was last run from the surface, newest first), then +/// SUGGESTED (what the state the client is in makes likely: copy and make-a-trigger while output is +/// selected, Back to live output while scrolled back, and so on — ), then every +/// group in its fixed order. An entry is listed once, in the first of those it belongs to. +/// +/// +/// A query is matched by against the title; an entry whose title does not match +/// is tried against its detail, its key and its group's name, and listed below every title match. Groups keep +/// their headers but are ordered by their best entry, so the best match is always the first row; within a group +/// entries are ordered by score, and ties keep catalog order. +/// +/// +public static class CommandPaletteModel +{ + /// The header over recently run commands. + public const string RecentLabel = "RECENT"; + + /// The header over the entries the current state suggests. + public const string SuggestedLabel = "SUGGESTED"; + + private static readonly CommandGroup[] GroupOrder = + { + CommandGroup.GoTo, + CommandGroup.World, + CommandGroup.Terminal, + CommandGroup.Layout, + CommandGroup.Settings, + }; + + /// The header a group is listed under. + public static string GroupLabel(CommandGroup group) => group switch + { + CommandGroup.GoTo => "GO TO", + CommandGroup.World => "WORLD", + CommandGroup.Terminal => "TERMINAL", + CommandGroup.Layout => "LAYOUT", + CommandGroup.Settings => "SETTINGS", + _ => group.ToString().ToUpperInvariant(), + }; + + /// + /// The ids the client's state makes likely, most specific first. Kept to what the state says outright — + /// a selection, a scrolled or frozen pane, a walk, a clash — rather than guessed from habit, which is what + /// RECENT is for. + /// + public static IReadOnlyList Suggested(CommandContext state) + { + ArgumentNullException.ThrowIfNull(state); + var ids = new List(); + if (state.OutputSelected) + { + ids.Add("term:copy"); + ids.Add("term:trigger-from-selection"); + } + + if (state.Frozen) + { + ids.Add("term:unfreeze"); + } + + if (state.ScrolledBack) + { + ids.Add("term:scroll-live"); + } + + if (state.Walking) + { + ids.Add("term:walk-stop"); + } + + if (state.Zoomed) + { + ids.Add("layout:unzoom"); + } + + if (state.KeyClashes > 0) + { + ids.Add("settings:key-clashes"); + } + + return ids; + } + + /// Builds the view for over . + /// What has been typed; blank lists everything. + /// Every entry offered right now, in registration order. + /// Ids run from the surface, newest first; ids no longer offered are skipped. + /// Ids the current state makes likely (). + public static PaletteView Build( + string query, + IReadOnlyList catalog, + IReadOnlyList? recent = null, + IReadOnlyList? suggested = null) + { + ArgumentNullException.ThrowIfNull(query); + ArgumentNullException.ThrowIfNull(catalog); + + return string.IsNullOrWhiteSpace(query) + ? BuildEmpty(catalog, recent ?? Array.Empty(), suggested ?? Array.Empty()) + : BuildMatched(query, catalog); + } + + private static PaletteView BuildEmpty( + IReadOnlyList catalog, IReadOnlyList recent, IReadOnlyList suggested) + { + var rows = new List(); + var entries = new List(); + var shown = new HashSet(StringComparer.Ordinal); + var byId = new Dictionary(StringComparer.Ordinal); + foreach (var item in catalog) + { + byId.TryAdd(item.Id, item); + } + + void Section(string label, IEnumerable items) + { + var list = items.Where(i => !shown.Contains(i.Id)).ToList(); + if (list.Count == 0) + { + return; + } + + rows.Add(new PaletteHeader(label)); + foreach (var item in list) + { + shown.Add(item.Id); + var entry = Entry(item, Array.Empty(), PaletteMatchField.None, 0); + rows.Add(entry); + entries.Add(entry); + } + } + + Section(RecentLabel, recent.Where(byId.ContainsKey).Select(id => byId[id])); + Section(SuggestedLabel, suggested.Where(byId.ContainsKey).Select(id => byId[id])); + foreach (var group in GroupOrder) + { + Section(GroupLabel(group), catalog.Where(i => i.Group == group)); + } + + // A group a package or a later build adds is listed after the known ones rather than dropped. + foreach (var group in catalog.Select(i => i.Group).Distinct().Where(g => Array.IndexOf(GroupOrder, g) < 0)) + { + Section(GroupLabel(group), catalog.Where(i => i.Group == group)); + } + + return new PaletteView(rows, entries, catalog.Count); + } + + private static PaletteView BuildMatched(string query, IReadOnlyList catalog) + { + var matched = new List<(PaletteEntry Entry, int Index)>(); + for (var index = 0; index < catalog.Count; index++) + { + var item = catalog[index]; + if (FuzzyMatch.Match(query, item.Title) is { } title) + { + matched.Add((Entry(item, Ranges(title.Positions), PaletteMatchField.Title, title.Score), index)); + continue; + } + + var other = new[] { DetailOf(item), KeyOf(item), GroupLabel(item.Group) } + .Where(t => !string.IsNullOrEmpty(t)) + .Select(t => FuzzyMatch.Match(query, t!)) + .Where(r => r is not null) + .Select(r => r!.Score) + .DefaultIfEmpty(int.MinValue) + .Max(); + if (other != int.MinValue) + { + matched.Add((Entry(item, Array.Empty(), PaletteMatchField.Other, other), index)); + } + } + + // Best first: a title match above any other, then by score, then catalog order. + static int Compare((PaletteEntry Entry, int Index) a, (PaletteEntry Entry, int Index) b) + { + var byField = a.Entry.Field.CompareTo(b.Entry.Field); + if (byField != 0) + { + return byField; + } + + var byScore = b.Entry.Score.CompareTo(a.Entry.Score); + return byScore != 0 ? byScore : a.Index.CompareTo(b.Index); + } + + matched.Sort(Compare); + + // Groups in the order of their best entry; the sort above already put each group's best first. + var rows = new List(); + var entries = new List(); + foreach (var group in matched.Select(m => m.Entry.Item.Group).Distinct()) + { + rows.Add(new PaletteHeader(GroupLabel(group))); + foreach (var (entry, _) in matched.Where(m => m.Entry.Item.Group == group)) + { + rows.Add(entry); + entries.Add(entry); + } + } + + return new PaletteView(rows, entries, catalog.Count); + } + + private static PaletteEntry Entry(CommandItem item, IReadOnlyList matches, PaletteMatchField field, int score) => + new(item, KeyOf(item), DetailOf(item), matches, field, score); + + private static string? KeyOf(CommandItem item) => + string.IsNullOrWhiteSpace(item.Key) ? null : KeyGlyphs.Normalize(item.Key); + + // An entry that set only a subtitle (a package's, or a family that has no key) shows it as its detail. + private static string? DetailOf(CommandItem item) => + item.Detail ?? (item.Key is null ? item.Subtitle : null); + + /// Collapses ascending positions into runs. + public static IReadOnlyList Ranges(IReadOnlyList positions) + { + ArgumentNullException.ThrowIfNull(positions); + var ranges = new List(); + var i = 0; + while (i < positions.Count) + { + var start = positions[i]; + var length = 1; + while (i + length < positions.Count && positions[i + length] == start + length) + { + length++; + } + + ranges.Add(new TextRange(start, length)); + i += length; + } + + return ranges; + } +} diff --git a/src/SharpMUTerm.Client/Palette/FuzzyMatch.cs b/src/SharpMUTerm.Client/Palette/FuzzyMatch.cs new file mode 100644 index 00000000..a8e898a0 --- /dev/null +++ b/src/SharpMUTerm.Client/Palette/FuzzyMatch.cs @@ -0,0 +1,246 @@ +namespace SharpMUTerm.Client.Palette; + +/// A match of a query against one piece of text: how good it is, and which characters it used. +/// Higher is better. Only comparable between matches against texts of the same kind. +/// The indices in the text of every matched character, ascending. +public sealed record FuzzyResult(int Score, IReadOnlyList Positions); + +/// +/// Subsequence matching for the command surface. Every character of the query must appear in the text, in +/// order, ignoring case; a query with spaces is several words, each matched in order after the one before it, +/// so trig sel finds Make a trigger from the selection. +/// +/// The score rewards what a reader means when they type a few letters: a character at the start of a word +/// (), one straight after the previous match (), and the very +/// first character of the text (); it charges for each character skipped between two +/// matches (, capped per gap so one long skip is not worse than several short ones), +/// and adds when the text simply starts with the query. So lay scores +/// Layouts (a whole prefix) above Clear window's scattered l-a-y, and fp prefers +/// Freeze pane (two word starts) to anything that merely contains an f and a p. +/// +/// +/// Each word is aligned by dynamic programming over every place its characters could land, so the best +/// alignment is found rather than the leftmost; if aligning the words one by one leaves a later word nowhere +/// to go, the leftmost alignment of all of them is scored instead, so anything that is a subsequence matches. +/// +/// +public static class FuzzyMatch +{ + /// Every matched character. + public const int Matched = 1; + + /// A matched character that begins a word. + public const int WordStart = 8; + + /// A matched character immediately after the previous one. + public const int Consecutive = 6; + + /// A match on the text's first character. + public const int TextStart = 4; + + /// Charged per character skipped between two matched characters of one word. + public const int GapPenalty = 1; + + /// The most one gap is charged. + public const int MaxGapPenalty = 4; + + /// Added when the text starts with the whole query, spaces and all. + public const int WholePrefix = 20; + + /// + /// Matches against , or returns null when it is not a + /// subsequence of it. An empty or blank query matches everything with a score of zero. + /// + public static FuzzyResult? Match(string query, string text) + { + ArgumentNullException.ThrowIfNull(query); + ArgumentNullException.ThrowIfNull(text); + + var words = query.Split(' ', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries); + if (words.Length == 0) + { + return new FuzzyResult(0, Array.Empty()); + } + + var lower = text.ToLowerInvariant(); + var positions = new List(); + var score = 0; + var from = 0; + var aligned = true; + foreach (var word in words) + { + var best = AlignWord(word.ToLowerInvariant(), lower, text, from); + if (best is null) + { + aligned = false; + break; + } + + score += best.Value.Score; + positions.AddRange(best.Value.Positions); + from = best.Value.Positions[^1] + 1; + } + + if (!aligned) + { + // A word aligned for its own best score can leave the next one nowhere to go; the leftmost + // alignment of every word in turn finds a match whenever there is one. + positions.Clear(); + score = 0; + from = 0; + foreach (var word in words) + { + var start = positions.Count; + foreach (var c in word.ToLowerInvariant()) + { + var at = lower.IndexOf(c, from); + if (at < 0) + { + return null; + } + + positions.Add(at); + from = at + 1; + } + + score += ScoreRun(text, positions, start); + } + } + + var normalised = string.Join(' ', words).ToLowerInvariant(); + if (lower.StartsWith(normalised, StringComparison.Ordinal)) + { + score += WholePrefix; + } + + return new FuzzyResult(score, positions); + } + + /// Whether index of begins a word. + public static bool IsWordStart(string text, int i) + { + if (i == 0) + { + return true; + } + + var previous = text[i - 1]; + var current = text[i]; + return (!char.IsLetterOrDigit(previous) && char.IsLetterOrDigit(current)) + || (char.IsLower(previous) && char.IsUpper(current)); + } + + private static int CharScore(string text, int i) => + Matched + (IsWordStart(text, i) ? WordStart : 0) + (i == 0 ? TextStart : 0); + + private static int Link(int previous, int next) => + next == previous + 1 ? Consecutive : -Math.Min(MaxGapPenalty, (next - previous - 1) * GapPenalty); + + // Scored against the original text, so a capital inside a word (camelCase) counts as a word start. + // ToLowerInvariant maps char for char, so an index in the lowered text is the same index here. + private static int ScoreRun(string text, List positions, int start) + { + var score = 0; + for (var i = start; i < positions.Count; i++) + { + score += CharScore(text, positions[i]); + if (i > start) + { + score += Link(positions[i - 1], positions[i]); + } + } + + return score; + } + + private static (int Score, int[] Positions)? AlignWord(string word, string text, string original, int from) + { + var m = word.Length; + var n = text.Length; + if (m == 0 || n - from < m) + { + return null; + } + + // best[i, j]: the best score for word[0..i] with word[i] matched at text[j]; back[i, j] the j of word[i-1]. + var best = new int[m, n]; + var back = new int[m, n]; + const int none = int.MinValue; + for (var i = 0; i < m; i++) + { + for (var j = 0; j < n; j++) + { + best[i, j] = none; + } + } + + for (var j = from; j < n; j++) + { + if (text[j] == word[0]) + { + best[0, j] = CharScore(original, j); + back[0, j] = -1; + } + } + + for (var i = 1; i < m; i++) + { + for (var j = from + i; j < n; j++) + { + if (text[j] != word[i]) + { + continue; + } + + var top = none; + var arg = -1; + for (var k = from + i - 1; k < j; k++) + { + if (best[i - 1, k] == none) + { + continue; + } + + var candidate = best[i - 1, k] + Link(k, j); + if (candidate > top) + { + top = candidate; + arg = k; + } + } + + if (arg >= 0) + { + best[i, j] = top + CharScore(original, j); + back[i, j] = arg; + } + } + } + + var end = -1; + var score = none; + for (var j = from; j < n; j++) + { + // Strictly greater, so the earliest of equal endings wins and later words keep the most room. + if (best[m - 1, j] != none && best[m - 1, j] > score) + { + score = best[m - 1, j]; + end = j; + } + } + + if (end < 0) + { + return null; + } + + var positions = new int[m]; + for (int i = m - 1, j = end; i >= 0; i--) + { + positions[i] = j; + j = back[i, j]; + } + + return (score, positions); + } +} diff --git a/src/SharpMUTerm.Client/Palette/KeyGlyphs.cs b/src/SharpMUTerm.Client/Palette/KeyGlyphs.cs new file mode 100644 index 00000000..ddb7f53d --- /dev/null +++ b/src/SharpMUTerm.Client/Palette/KeyGlyphs.cs @@ -0,0 +1,53 @@ +namespace SharpMUTerm.Client.Palette; + +/// +/// One spelling for every chord a list of keys shows. The catalog's keys are written in the symbol vocabulary +/// (⌃R, ⌥⇧→, ⌃B |) except where a host names a chord in words — the newline is Alt+⏎ +/// in a terminal and Ctrl+⏎ in the window, because --help and the composer's footer read those +/// strings too. A column of keys mixing ⌥R with Alt+⏎ reads as two different modifiers, so the +/// palette spells them all the one way: Ctrl ⌃, Alt ⌥, Shift ⇧, Enter ⏎, +/// Tab ⇥, Esc stays a word. +/// +public static class KeyGlyphs +{ + private static readonly (string Word, string Glyph)[] Modifiers = + { + ("Ctrl+", "⌃"), + ("Control+", "⌃"), + ("Alt+", "⌥"), + ("Option+", "⌥"), + ("Shift+", "⇧"), + }; + + private static readonly (string Word, string Glyph)[] Keys = + { + ("Enter", "⏎"), + ("Return", "⏎"), + ("Tab", "⇥"), + }; + + /// + /// in the symbol vocabulary: Alt+⏎ → ⌥⏎, Ctrl+Enter → ⌃⏎. + /// A chord already in symbols, or a plain key name (F4, PgUp), is returned unchanged. + /// + public static string Normalize(string chord) + { + ArgumentNullException.ThrowIfNull(chord); + var result = chord; + foreach (var (word, glyph) in Modifiers) + { + result = result.Replace(word, glyph, StringComparison.OrdinalIgnoreCase); + } + + // A bare key name only after a modifier glyph, so "Tab" in prose (or F-keys) is left alone. + foreach (var (word, glyph) in Keys) + { + foreach (var modifier in new[] { "⌃", "⌥", "⇧" }) + { + result = result.Replace(modifier + word, modifier + glyph, StringComparison.OrdinalIgnoreCase); + } + } + + return result; + } +} diff --git a/src/SharpMUTerm.Client/Palette/RecentCommands.cs b/src/SharpMUTerm.Client/Palette/RecentCommands.cs new file mode 100644 index 00000000..29a484bd --- /dev/null +++ b/src/SharpMUTerm.Client/Palette/RecentCommands.cs @@ -0,0 +1,48 @@ +namespace SharpMUTerm.Client.Palette; + +/// +/// The commands most recently run from the command surface, newest first, at most . +/// Running one again moves it to the front rather than listing it twice. +/// +/// Held in memory for the life of the run and never written down. The nearest thing this client keeps is the +/// command line's history, which is in memory too (SharpMUTermApp._histories); the only view state that +/// outlives a run goes into config.json through PersistConfiguration, and "which menu entries I +/// clicked" is not configuration. A file of its own would be one more thing this client writes, purges and +/// documents, for a list a person rebuilds in eight clicks. +/// +/// +public sealed class RecentCommands +{ + /// How many the surface shows by default. + public const int DefaultCapacity = 8; + + private readonly List _ids = new(); + + /// Creates an empty list holding at most ids. + public RecentCommands(int capacity = DefaultCapacity) + { + ArgumentOutOfRangeException.ThrowIfLessThan(capacity, 1); + Capacity = capacity; + } + + /// The most ids held. + public int Capacity { get; } + + /// The ids, newest first. + public IReadOnlyList Ids => _ids; + + /// Puts at the front, dropping the oldest past . + public void Record(string commandId) + { + ArgumentException.ThrowIfNullOrWhiteSpace(commandId); + _ids.Remove(commandId); + _ids.Insert(0, commandId); + if (_ids.Count > Capacity) + { + _ids.RemoveRange(Capacity, _ids.Count - Capacity); + } + } + + /// Forgets every id. + public void Clear() => _ids.Clear(); +} diff --git a/src/SharpMUTerm.Core/Commands/CommandCatalog.cs b/src/SharpMUTerm.Core/Commands/CommandCatalog.cs index 5becd011..768d1fa8 100644 --- a/src/SharpMUTerm.Core/Commands/CommandCatalog.cs +++ b/src/SharpMUTerm.Core/Commands/CommandCatalog.cs @@ -45,6 +45,10 @@ public sealed record CharacterRef( /// Null where the host has no screen reader to tell; otherwise whether the active window's output is read aloud. /// /// Whether some pane's output is selected, so a trigger can be made from it. +/// +/// How many F4 bindings share a chord with the client or with each other, so Key clashes (N) is offered +/// only when there is one to show. +/// public sealed record CommandContext( bool LoggingOn = false, bool Zoomed = false, @@ -57,7 +61,8 @@ public sealed record CommandContext( bool Walking = false, bool? Sound = null, bool? Announced = null, - bool OutputSelected = false); + bool OutputSelected = false, + int KeyClashes = 0); /// /// A configuration screen the command surface can open: what it calls itself, the id the host diff --git a/src/SharpMUTerm.Core/Commands/CommandItem.cs b/src/SharpMUTerm.Core/Commands/CommandItem.cs index 4497a58e..3dac440c 100644 --- a/src/SharpMUTerm.Core/Commands/CommandItem.cs +++ b/src/SharpMUTerm.Core/Commands/CommandItem.cs @@ -24,4 +24,18 @@ public enum CommandGroup /// value), the group it renders under, and a stable the UI dispatches on. The /// catalog is generated from live state, so often carries dynamic detail. /// -public sealed record CommandItem(CommandGroup Group, string Title, string Id, string? Subtitle = null); +public sealed record CommandItem(CommandGroup Group, string Title, string Id, string? Subtitle = null) +{ + /// + /// The chord that runs this entry on the running host, held apart from so a surface + /// can draw keys in a column of their own. Null when nothing but the surface runs it. + /// still carries it too, joined with the detail, for the readers that show one line. + /// + public string? Key { get; init; } + + /// + /// The few words describing the entry, without the key. Null when there are none, and also null on an entry + /// that set only ; a surface then treats the whole subtitle as the detail. + /// + public string? Detail { get; init; } +} diff --git a/src/SharpMUTerm.Core/Commands/CommandMatcher.cs b/src/SharpMUTerm.Core/Commands/CommandMatcher.cs deleted file mode 100644 index 99ced66b..00000000 --- a/src/SharpMUTerm.Core/Commands/CommandMatcher.cs +++ /dev/null @@ -1,113 +0,0 @@ -namespace SharpMUTerm.Core.Commands; - -/// A paired with its match score for the current query. -public readonly record struct RankedCommand(CommandItem Item, int Score); - -/// -/// Ranks command-surface entries against a query, per the design's rule: a prefix match on the -/// title ranks highest, a substring match beats a fuzzy subsequence, and subtitle matches rank -/// below title matches. Case-insensitive. An empty query returns every item in catalog order. -/// Pure and deterministic. -/// -public static class CommandMatcher -{ - // Tier bases keep the classes well separated; the per-tier bonus breaks ties within a class. - private const int PrefixTier = 4000; - private const int SubstringTier = 3000; - private const int SubtitleTier = 2000; - private const int FuzzyTier = 1000; - - /// Returns the matching items, best first (stable within equal scores). - public static IReadOnlyList Rank(string query, IEnumerable items) - { - ArgumentNullException.ThrowIfNull(query); - ArgumentNullException.ThrowIfNull(items); - - var q = query.Trim().ToLowerInvariant(); - var results = new List<(RankedCommand Ranked, int Index)>(); - var index = 0; - foreach (var item in items) - { - var score = q.Length == 0 ? 0 : Score(q, item); - if (score is not null) - { - results.Add((new RankedCommand(item, score.Value), index)); - } - - index++; - } - - // Highest score first; ties keep catalog order (stable). - results.Sort((a, b) => - { - var byScore = b.Ranked.Score.CompareTo(a.Ranked.Score); - return byScore != 0 ? byScore : a.Index.CompareTo(b.Index); - }); - - return results.Select(r => r.Ranked).ToArray(); - } - - private static int? Score(string q, CommandItem item) - { - var title = item.Title.ToLowerInvariant(); - if (title.StartsWith(q, StringComparison.Ordinal)) - { - // Shorter titles are tighter prefix matches. - return PrefixTier + Math.Max(0, 100 - title.Length); - } - - var titleIndex = title.IndexOf(q, StringComparison.Ordinal); - if (titleIndex >= 0) - { - return SubstringTier + Math.Max(0, 100 - titleIndex); - } - - var subtitle = item.Subtitle?.ToLowerInvariant(); - if (subtitle is not null && subtitle.Contains(q, StringComparison.Ordinal)) - { - return SubtitleTier; - } - - var spread = FuzzySpread(q, title); - return spread is null ? null : FuzzyTier + Math.Max(0, 200 - spread.Value); - } - - /// - /// If every char of appears in in order, returns - /// the span from the first to the last matched character (a tighter run scores higher); else null. - /// - private static int? FuzzySpread(string q, string title) - { - if (q.Length == 0) - { - return 0; - } - - int? best = null; - for (var start = 0; start < title.Length; start++) - { - if (title[start] != q[0]) - { - continue; - } - - var titleIndex = start + 1; - var queryIndex = 1; - while (queryIndex < q.Length && titleIndex < title.Length) - { - if (title[titleIndex++] == q[queryIndex]) - { - queryIndex++; - } - } - - if (queryIndex == q.Length) - { - var spread = titleIndex - start - 1; - best = best is null ? spread : Math.Min(best.Value, spread); - } - } - - return best; - } -} diff --git a/src/SharpMUTerm.Tui/CommandPalette.cs b/src/SharpMUTerm.Tui/CommandPalette.cs index 46bc5deb..b88d2333 100644 --- a/src/SharpMUTerm.Tui/CommandPalette.cs +++ b/src/SharpMUTerm.Tui/CommandPalette.cs @@ -1,3 +1,4 @@ +using SharpMUTerm.Client.Palette; using SharpMUTerm.Core.Commands; using SharpConsoleUI; using SharpConsoleUI.Builders; @@ -6,10 +7,11 @@ namespace SharpMUTerm.Tui; /// -/// The command surface (⌃P): a modal search box over a live-generated catalog, ranked with -/// and rendered grouped by . ↑↓ -/// walk the flattened results, ⏎ dispatches the selected id, Esc closes. The catalog and dispatch -/// are supplied by the app so this stays a thin view over tested logic. +/// The command surface (⌃P): a modal search box over a live-generated catalog, ordered and grouped by the +/// shared view-model (, in Client, so the window's palette can list the same +/// rows) and drawn by . ↑↓ walk the entries, ⏎ dispatches the selected id +/// and records it among the recent ones, Esc closes. The catalog, the suggestions and dispatch are supplied by +/// the app so this stays a thin view over tested logic. /// internal sealed class CommandPalette { @@ -17,13 +19,13 @@ internal sealed class CommandPalette private readonly Func> _catalog; private readonly Func _context; private readonly Action _dispatch; + private readonly RecentCommands _recent; + private readonly Func> _suggested; private Window? _window; private PromptControl? _search; private MarkupControl? _results; - private IReadOnlyList _ranked = Array.Empty(); - private IReadOnlyList _ordered = Array.Empty(); - private int _total; + private PaletteView _view = Empty; private int _selected; private int _contentWidth; @@ -31,16 +33,41 @@ public CommandPalette( ConsoleWindowSystem system, Func> catalog, Func context, - Action dispatch) + Action dispatch, + RecentCommands recent, + Func> suggested) { _system = system; _catalog = catalog; _context = context; _dispatch = dispatch; + _recent = recent; + _suggested = suggested; } + private static PaletteView Empty { get; } = new([], [], 0); + public bool IsOpen => _window is not null; + /// What the surface is listing right now, for a test. + internal PaletteView View => _view; + + /// The selected entry's index in , for a test. + internal int Selected => _selected; + + /// Types into the open surface, as if it had been keyed in. + internal void SetQuery(string query) + { + if (_search is null) + { + return; + } + + _search.SetInput(query); + _selected = 0; + Refresh(query); + } + /// Opens the surface if closed, closes it if open (bound to ⌃P). public void Toggle() { @@ -64,13 +91,15 @@ private void Open() _results = new MarkupControl(new List()); // Size the surface to hug the full (unfiltered) catalog so nothing scrolls and there's no empty - // gutter: fit height to the row count and width to the widest row, both capped to the desktop. - var catalog = _catalog(); - var initial = CommandSurfaceRenderer.Render( - CommandMatcher.Rank(string.Empty, catalog), 0, catalog.Count, _context()); + // gutter: fit height to the row count and width to the widest row, both capped to the desktop. A + // narrower desktop elides titles and details, never keys (CommandSurfaceRenderer). + var initial = Build(string.Empty); var desktop = _system.DesktopDimensions; - var height = Math.Clamp(initial.Count + 3, 6, Math.Max(6, desktop.Height - 2)); - _contentWidth = Math.Clamp(CommandSurfaceRenderer.MaxWidth(initial) + 1, 32, Math.Max(32, desktop.Width - 6)); + var height = Math.Clamp(initial.Rows.Count + 1 + 3, 6, Math.Max(6, desktop.Height - 2)); + _contentWidth = Math.Clamp( + Math.Max(CommandSurfaceRenderer.NaturalWidth(initial), HeaderWidth(initial)) + 1, + 32, + Math.Max(32, desktop.Width - 6)); var width = _contentWidth + 2; // + the 1-cell left/right border // A clean overlay: single border, but no window chrome — no minimize/maximize/close buttons @@ -99,36 +128,42 @@ private void Open() Refresh(string.Empty); } + private PaletteView Build(string query) => + CommandPaletteModel.Build(query, _catalog(), _recent.Ids, _suggested()); + + // The context line ("N of M acting on X") is measured too, so a long character name is not cut off. + private int HeaderWidth(PaletteView view) => + CommandSurfaceRenderer.MaxWidth(CommandSurfaceRenderer.Render(view, -1, _context()).Take(1).ToList()); + private void Refresh(string query) { - var catalog = _catalog(); - _total = catalog.Count; - _ranked = CommandMatcher.Rank(query, catalog); - _ordered = CommandSurfaceRenderer.Order(_ranked); - _selected = _ordered.Count == 0 ? -1 : Math.Clamp(_selected, 0, _ordered.Count - 1); + _view = Build(query); + _selected = _view.Entries.Count == 0 ? -1 : Math.Clamp(_selected, 0, _view.Entries.Count - 1); Paint(); } private void Paint() => - _results?.SetContent(CommandSurfaceRenderer.Render(_ranked, _selected, _total, _context(), _contentWidth)); + _results?.SetContent(CommandSurfaceRenderer.Render(_view, _selected, _context(), _contentWidth)); private void Move(int delta) { - if (_ordered.Count == 0) + var count = _view.Entries.Count; + if (count == 0) { return; } - _selected = ((_selected + delta) % _ordered.Count + _ordered.Count) % _ordered.Count; + _selected = ((_selected + delta) % count + count) % count; Paint(); } private void Commit() { - if (_selected >= 0 && _selected < _ordered.Count) + if (_selected >= 0 && _selected < _view.Entries.Count) { - var id = _ordered[_selected].Id; + var id = _view.Entries[_selected].Item.Id; Close(); + _recent.Record(id); _dispatch(id); } } @@ -169,7 +204,6 @@ private void Reset() _window = null; _search = null; _results = null; - _ranked = Array.Empty(); - _ordered = Array.Empty(); + _view = Empty; } } diff --git a/src/SharpMUTerm.Tui/CommandSurfaceRenderer.cs b/src/SharpMUTerm.Tui/CommandSurfaceRenderer.cs index 8fd65eaf..b40da605 100644 --- a/src/SharpMUTerm.Tui/CommandSurfaceRenderer.cs +++ b/src/SharpMUTerm.Tui/CommandSurfaceRenderer.cs @@ -1,75 +1,73 @@ using System.Text; -using SharpMUTerm.Core.Commands; +using SharpMUTerm.Client.Palette; using static SharpMUTerm.Tui.MarkupText; namespace SharpMUTerm.Tui; /// -/// Renders the command surface (⌃P) results to markup lines, grouped GO TO / WORLD / TERMINAL / -/// LAYOUT / SETTINGS with the selected row highlighted, per the design. The flattened row order matches -/// so ↑↓ navigation and dispatch stay in sync. Pure so it's unit-testable. +/// Draws the command surface (⌃P) from the shared view-model (): a context +/// line, then each group's header and its rows, the selected row highlighted. Every row has three parts — the +/// title, with the characters the query matched in bold accent; the detail, dimmed; and the key, right-aligned +/// in a column of its own so every chord on the surface starts and ends in the same place. When the surface is +/// narrower than a row, the detail goes first and then the title is elided; the key never is, because the key +/// is the part a reader came to learn. Pure so it is unit-testable. /// internal static class CommandSurfaceRenderer { - private static readonly (CommandGroup Group, string Label)[] Groups = - { - (CommandGroup.GoTo, "GO TO"), - (CommandGroup.World, "WORLD"), - (CommandGroup.Terminal, "TERMINAL"), - (CommandGroup.Layout, "LAYOUT"), - (CommandGroup.Settings, "SETTINGS"), - }; - - /// Flattens ranked results into display order: groups in fixed order, ranked within each. - public static IReadOnlyList Order(IReadOnlyList ranked) - { - var ordered = new List(ranked.Count); - foreach (var (group, _) in Groups) - { - foreach (var r in ranked) - { - if (r.Item.Group == group) - { - ordered.Add(r.Item); - } - } - } + /// Cells before the title: ▸ on the selected row, blanks elsewhere. + private const int Lead = 3; - return ordered; - } + /// Cells between the title and its detail. + private const int DetailGap = 3; + + /// The fewest cells between the text and the key column. + private const int KeyGap = 2; + + /// The fewest characters of a detail worth showing; below this it is left out rather than cut to a stub. + private const int MinDetail = 4; + + /// The selected row's band: dark ink on the accent. + private const string SelectedBand = "#18181c on #00f5b7"; + + /// A matched character on an unselected row. + private static readonly string MatchInk = $"bold {ScreenPalette.Accent}"; /// - /// Builds the markup lines: a context header, then each group's header and its rows. The row at - /// flattened index is highlighted. When > 0 - /// the selected row's highlight bar is padded to that visible width so it spans the full surface. + /// Builds the markup lines. The entry at index of + /// is highlighted. is the surface's content width; 0 sizes every row to its own + /// natural width (), which is what a test reads. /// - public static List Render( - IReadOnlyList ranked, int selected, int total, string? context, int width = 0) + public static List Render(PaletteView view, int selected, string? context, int width = 0) { + ArgumentNullException.ThrowIfNull(view); + if (width <= 0) + { + width = NaturalWidth(view); + } + var lines = new List { - $"[dim]{Escape(ranked.Count.ToString())} of {Escape(total.ToString())}" + $"[dim]{Escape(view.Entries.Count.ToString())} of {Escape(view.Total.ToString())}" + (string.IsNullOrEmpty(context) ? string.Empty : $" acting on {Escape(context)}") + "[/]", }; - var flatIndex = 0; - foreach (var (group, label) in Groups) + var keyWidth = view.KeyWidth; + var index = 0; + foreach (var row in view.Rows) { - var inGroup = ranked.Where(r => r.Item.Group == group).ToList(); - if (inGroup.Count == 0) + switch (row) { - continue; - } - - lines.Add($"[dim]├ {label}[/]"); - foreach (var r in inGroup) - { - lines.Add(Row(r.Item, flatIndex == selected, width)); - flatIndex++; + case PaletteHeader header: + lines.Add($"[dim]├ {Escape(header.Label)}[/]"); + break; + case PaletteEntry entry: + lines.Add(Row(entry, index == selected, width, keyWidth)); + index++; + break; } } - if (ranked.Count == 0) + if (view.Entries.Count == 0) { lines.Add("[dim] no matches[/]"); } @@ -77,7 +75,25 @@ public static List Render( return lines; } - /// The visible width of the widest rendered line — used to size the surface to its content. + /// + /// The width every row fits in without eliding anything: lead, title, detail, and the key column at the + /// widest key. The surface sizes itself to this, capped to the desktop. + /// + public static int NaturalWidth(PaletteView view) + { + ArgumentNullException.ThrowIfNull(view); + var keyColumn = KeyColumn(view.KeyWidth); + var widest = 0; + foreach (var entry in view.Entries) + { + var text = entry.Item.Title.Length + (entry.Detail is null ? 0 : DetailGap + entry.Detail.Length); + widest = Math.Max(widest, Lead + text + keyColumn); + } + + return widest; + } + + /// The visible width of the widest rendered line. public static int MaxWidth(IReadOnlyList lines) { var max = 0; @@ -89,20 +105,66 @@ public static int MaxWidth(IReadOnlyList lines) return max; } - private static string Row(CommandItem item, bool selected, int width) + // The key column: the gap, the widest key, and one cell before the edge. With no keys at all, one cell. + private static int KeyColumn(int keyWidth) => keyWidth == 0 ? 1 : KeyGap + keyWidth + 1; + + private static string Row(PaletteEntry entry, bool selected, int width, int keyWidth) + { + var room = Math.Max(1, width - Lead - KeyColumn(keyWidth)); + + // The title keeps every cell it needs before the detail gets any; past that it is elided. + var title = entry.Item.Title; + var titleShown = title.Length <= room ? title.Length : Math.Max(1, room - 1); + var titleElided = titleShown < title.Length; + var used = titleShown + (titleElided ? 1 : 0); + + string? detail = null; + if (entry.Detail is { } d && room - used - DetailGap >= Math.Min(MinDetail, d.Length)) + { + var detailRoom = room - used - DetailGap; + detail = d.Length <= detailRoom ? d : string.Concat(d.AsSpan(0, detailRoom - 1), "…"); + used += DetailGap + detail.Length; + } + + var pad = new string(' ', Math.Max(0, room - used)); + var key = entry.Key is null + ? new string(' ', KeyColumn(keyWidth)) + : new string(' ', KeyGap + keyWidth - entry.Key.Length) + entry.Key + " "; + + var titleMarkup = Highlight(title, titleShown, entry.TitleMatches, selected ? "bold underline" : MatchInk) + + (titleElided ? "…" : string.Empty); + + if (selected) + { + var detailPart = detail is null ? string.Empty : new string(' ', DetailGap) + Escape(detail); + return $"[{SelectedBand}] ▸ {titleMarkup}{detailPart}{pad}{Escape(key)}[/]"; + } + + var detailMarkup = detail is null ? string.Empty : $"{new string(' ', DetailGap)}[dim]{Escape(detail)}[/]"; + var keyMarkup = entry.Key is null ? key : $"[{ScreenPalette.Muted}]{Escape(key)}[/]"; + return $" {titleMarkup}{detailMarkup}{pad}{keyMarkup}"; + } + + /// The first characters of , matched runs wrapped in . + private static string Highlight(string text, int shown, IReadOnlyList matches, string style) { - var title = Escape(item.Title); - if (!selected) + var sb = new StringBuilder(); + var at = 0; + foreach (var range in matches) { - var sub = item.Subtitle is null ? string.Empty : $" [dim]{Escape(item.Subtitle)}[/]"; - return " " + title + sub; + var start = Math.Min(range.Start, shown); + var end = Math.Min(range.Start + range.Length, shown); + if (start < at || end <= start) + { + continue; + } + + sb.Append(Escape(text[at..start])); + sb.Append('[').Append(style).Append(']').Append(Escape(text[start..end])).Append("[/]"); + at = end; } - // Selected: one continuous accent bar across the whole row (title + subtitle), padded to the - // surface width so the highlight reads as a full-width band rather than hugging the title. - var subtitle = item.Subtitle is null ? string.Empty : $" {Escape(item.Subtitle)}"; - var text = $" ▸ {title}{subtitle} "; - var pad = width > VisibleLength(text) ? new string(' ', width - VisibleLength(text)) : string.Empty; - return $"[#18181c on #00f5b7]{text}{pad}[/]"; + sb.Append(Escape(text[at..shown])); + return sb.ToString(); } } diff --git a/src/SharpMUTerm.Tui/KeyClashes.cs b/src/SharpMUTerm.Tui/KeyClashes.cs new file mode 100644 index 00000000..db76170c --- /dev/null +++ b/src/SharpMUTerm.Tui/KeyClashes.cs @@ -0,0 +1,116 @@ +using SharpMUTerm.Core.Automation; + +namespace SharpMUTerm.Tui; + +/// How a binding collides with something else that wants its chord. +internal enum KeyClashKind +{ + /// A global shortcut of the client's holds the chord, and runs first: the binding never fires. + ClientWins, + + /// Another binding earlier in the list holds the chord: this one never fires. + Shadowed, + + /// The binding runs, and the client's own action on that chord does not (a warning, not a fault). + BindingWins, + + /// The binding runs, and a later binding on the same chord never does. + Shadows, +} + +/// One clash: the binding, what kind, and the sentence F4 prints for it. +/// The binding. +/// Which of the four collisions it is. +/// What happens, naming which side wins. +internal readonly record struct KeyClash(Macro Macro, KeyClashKind Kind, string Reason) +{ + /// Whether the binding still runs: a warning rather than a fault. + internal bool BindingRuns => Kind is KeyClashKind.BindingWins or KeyClashKind.Shadows; +} + +/// +/// Which F4 bindings share a chord with the client or with one another, and which side wins. The client's +/// side is read from and nowhere else, so this cannot disagree with the dispatcher: +/// is a global shortcut (tried before any window, so the client wins and +/// already reports the binding as taken), and +/// is an action the main window takes only after DispatchMacro has declined the key (so the binding +/// wins). Two bindings on one chord resolve as does: the first in the list +/// answers, even when it is disabled, and the second never runs. +/// +/// The bindings are compared across every set, which is F4's own stricter reading (AlreadyBound): a +/// session flattens its character's sets into one engine, so two sets ever enabled together collide. +/// +/// +internal static class KeyClashes +{ + /// Every clash among , in list order. + internal static IReadOnlyList Find(IReadOnlyList macros) + { + ArgumentNullException.ThrowIfNull(macros); + var clashes = new List(); + foreach (var macro in macros) + { + if (For(macro, macros) is { } clash) + { + clashes.Add(clash); + } + } + + return clashes; + } + + /// + /// How many clashes a reader needs to look at: every binding that never fires because of another claim + /// on its chord, and every binding that hides one of the client's own keys. A binding that shadows a later + /// one is not counted again — the later one already is. + /// + internal static int Count(IReadOnlyList macros) => + Find(macros).Count(c => c.Kind != KeyClashKind.Shadows); + + /// The clash is part of, or null. + internal static KeyClash? For(Macro macro, IReadOnlyList macros) + { + ArgumentNullException.ThrowIfNull(macro); + ArgumentNullException.ThrowIfNull(macros); + if (MacroKey.Canonicalise(macro.Key) is not { } chord || !Live(macro)) + { + return null; + } + + if (MacroKeys.ClaimedBy(chord) is { } claimed) + { + return new KeyClash(macro, KeyClashKind.ClientWins, $"the client wins: {chord} {claimed}"); + } + + var holders = macros + .Where(m => string.Equals(MacroKey.Canonicalise(m.Key), chord, StringComparison.OrdinalIgnoreCase)) + .ToList(); + var at = holders.FindIndex(m => ReferenceEquals(m, macro)); + if (at > 0) + { + return new KeyClash(macro, KeyClashKind.Shadowed, $"{Name(holders[0])} holds {chord} first; this never runs"); + } + + if (!MacroKeys.Verdict(chord).Fires) + { + return null; + } + + if (MacroKeys.YieldedBy(chord) is { } yielded) + { + return new KeyClash(macro, KeyClashKind.BindingWins, $"this wins: {chord} no longer {yielded}"); + } + + return holders.Count > 1 + ? new KeyClash(macro, KeyClashKind.Shadows, $"this wins: {Name(holders[1])} on {chord} never runs") + : null; + } + + // A disabled binding, or one with nothing to send or call, leaves its key alone (DispatchMacro), so it + // clashes with nothing itself — though as the first holder of a chord it still blocks a later one. + private static bool Live(Macro macro) => + macro.Enabled && (macro.Command.Length > 0 || !string.IsNullOrEmpty(macro.ScriptCallback)); + + private static string Name(Macro macro) => + string.IsNullOrWhiteSpace(macro.Name) ? $"→ {macro.Command}" : macro.Name; +} diff --git a/src/SharpMUTerm.Tui/KeypadScreenRenderer.cs b/src/SharpMUTerm.Tui/KeypadScreenRenderer.cs index 4af1b236..530a5aea 100644 --- a/src/SharpMUTerm.Tui/KeypadScreenRenderer.cs +++ b/src/SharpMUTerm.Tui/KeypadScreenRenderer.cs @@ -393,10 +393,13 @@ internal static string FooterLine( // The row can only spare a handful of cells for a reason; the footer has the width to give // the whole one, for the binding the cursor is actually on. var verdict = MacroKeys.Verdict(macros[at].Key); + var clash = KeyClashes.For(macros[at], macros); context = ScreenChrome.Context( ScreenChrome.Position("binding", at, macros.Count), Escape(Identify(macros[at])), - verdict.Fires ? null : "▲ " + Escape(verdict.Reason)); + clash is { } c + ? (c.BindingRuns ? "△ " : "▲ ") + Escape(c.Reason) + : verdict.Fires ? null : "▲ " + Escape(verdict.Reason)); } var actions = ScreenChrome.Actions(focus: focus); @@ -458,6 +461,7 @@ internal static List HotkeysColumn( lines.Add(ScreenChrome.Cursor( Hotkey( macros[i], + macros, sets is null ? null : ScreenLists.OwnerOf(sets, s => s.Macros, macros[i])?.Name, cursor.EditOn(0, i, NameField), cursor.EditOn(0, i, CommandField), @@ -530,6 +534,7 @@ private static string NumpadCell(int digit, IReadOnlyList macros, int wid /// private static string Hotkey( Macro macro, + IReadOnlyList macros, string? setName, ScreenFieldEdit? name, ScreenFieldEdit? command, @@ -537,10 +542,17 @@ private static string Hotkey( ScreenFieldEdit? set) { var verdict = MacroKeys.Verdict(macro.Key); + var clash = KeyClashes.For(macro, macros); var tick = macro.Enabled ? $"[{Accent}]✓[/]" : "[dim]·[/]"; - var chord = verdict.Fires - ? $"[bold]{Escape(macro.Key)}[/]" - : $"[{Muted}]▲ {Escape(macro.Key)}[/]"; + + // A clash is marked inside the key's own well, where the ▲ already goes, so it costs the row no + // cell: △ in amber for a binding that runs and hides something (a client key, or a later binding), + // ▲ for one that never runs. The footer says which side wins for the row the cursor is on. + var chord = clash is { BindingRuns: true } + ? $"[{Caution}]△ {Escape(macro.Key)}[/]" + : verdict.Fires && clash is null + ? $"[bold]{Escape(macro.Key)}[/]" + : $"[{Muted}]▲ {Escape(macro.Key)}[/]"; var bound = ScreenChrome.Field(PadVisible(chord, KeyColumnWidth), key); // A binding that has never been named still gets its well — the name is editable whether or not @@ -578,10 +590,11 @@ private static string Caveat(MacroKeyVerdict verdict) => /// private static string DeadCount(IReadOnlyList macros) { - var dead = macros.Count(m => !MacroKeys.Verdict(m.Key).Fires); - return dead == 0 - ? string.Empty - : $" [{Muted}]▲ {dead} of {macros.Count} cannot fire[/]"; + var dead = macros.Count(m => + !MacroKeys.Verdict(m.Key).Fires || KeyClashes.For(m, macros) is { Kind: KeyClashKind.Shadowed }); + var hiding = macros.Count(m => KeyClashes.For(m, macros) is { Kind: KeyClashKind.BindingWins }); + var caption = dead == 0 ? string.Empty : $" [{Muted}]▲ {dead} of {macros.Count} cannot fire[/]"; + return hiding == 0 ? caption : caption + $" [{Caution}]△ {hiding} hide a client key[/]"; } private static Macro? FindByKey(IReadOnlyList macros, string key) diff --git a/src/SharpMUTerm.Tui/MacroKeys.cs b/src/SharpMUTerm.Tui/MacroKeys.cs index e6584d76..59d0056c 100644 --- a/src/SharpMUTerm.Tui/MacroKeys.cs +++ b/src/SharpMUTerm.Tui/MacroKeys.cs @@ -195,6 +195,67 @@ private static AppShortcut[] BuildAppShortcuts() /// The claimed chords by canonical descriptor, built once from . private static readonly Dictionary Claimed = BuildClaims(); + /// + /// What the app's own global shortcut on this descriptor does, or null when no shortcut holds it. A macro + /// on such a chord never runs: a global shortcut is tried before any window sees the key, which is why + /// reports it . + /// + internal static string? ClaimedBy(string? descriptor) => + MacroKey.Canonicalise(descriptor) is { } canonical && Claimed.TryGetValue(canonical, out var does) ? does : null; + + /// + /// What the client does with this chord after DispatchMacro has had it, or null when + /// nothing does. A macro bound here runs and the client's own action does not — the chord is the user's + /// once they bind it, which is why reports these as firing. F4 marks such a binding + /// as a warning rather than a fault (). + /// + /// The list is the main window's key chain below DispatchMacro, in its order: the pane resize + /// (TryResizeKey), copy, pane selection (TryFocusKey), scrollback (TryScrollKey), + /// recall (TryRecallKey), then the command line's own table (InputBarControl.ProcessKey). + /// Unmodified keys are not here: a macro cannot be bound to one (the prompt has them). + /// + /// + internal static string? YieldedBy(string? descriptor) => + MacroKey.Canonicalise(descriptor) is { } canonical && Yielded.TryGetValue(canonical, out var does) ? does : null; + + private static readonly Dictionary Yielded = BuildYielded(); + + private static Dictionary BuildYielded() + { + var yielded = new Dictionary(StringComparer.OrdinalIgnoreCase); + void Add(string key, bool ctrl, bool alt, bool shift, string does) => + yielded[MacroKey.Describe(key, ctrl, alt, shift)] = does; + + foreach (var arrow in new[] { "Left", "Right", "Up", "Down" }) + { + Add(arrow, ctrl: false, alt: true, shift: true, "resizes the pane"); + Add(arrow, ctrl: true, alt: false, shift: false, "moves between panes"); + } + + Add("C", ctrl: true, alt: false, shift: false, "copies the selection"); + Add("Home", ctrl: true, alt: false, shift: false, "scrolls to the oldest output"); + Add("End", ctrl: true, alt: false, shift: false, "goes back to live output"); + Add("Up", ctrl: false, alt: false, shift: true, "scrolls the pane"); + Add("Down", ctrl: false, alt: false, shift: true, "scrolls the pane"); + Add("Up", ctrl: false, alt: true, shift: false, "recalls history"); + Add("Down", ctrl: false, alt: true, shift: false, "recalls history"); + Add("Left", ctrl: false, alt: true, shift: false, "moves a word"); + Add("Right", ctrl: false, alt: true, shift: false, "moves a word"); + foreach (var key in new[] { "Left", "Right", "Home", "End" }) + { + Add(key, ctrl: false, alt: false, shift: true, "selects in the command line"); + } + + Add("A", ctrl: true, alt: false, shift: false, "selects the command line"); + Add("X", ctrl: true, alt: false, shift: false, "cuts the selection"); + Add("E", ctrl: true, alt: false, shift: false, "goes to the end of the line"); + Add("K", ctrl: true, alt: false, shift: false, "deletes to the end of the line"); + Add("U", ctrl: true, alt: false, shift: false, "deletes to the start of the line"); + Add("Z", ctrl: true, alt: false, shift: false, "undoes"); + Add("Y", ctrl: true, alt: false, shift: false, "redoes"); + return yielded; + } + /// /// The canonical descriptor for a keystroke, whatever it is worth — what the capture mode writes /// into a binding, before the field's validator has a word to say about it. Null when the key has no diff --git a/src/SharpMUTerm.Tui/ScreenPalette.cs b/src/SharpMUTerm.Tui/ScreenPalette.cs index 6552b7cd..359af913 100644 --- a/src/SharpMUTerm.Tui/ScreenPalette.cs +++ b/src/SharpMUTerm.Tui/ScreenPalette.cs @@ -99,4 +99,11 @@ internal static class ScreenPalette /// palette that shouts at every risky-looking row teaches the eye to skip the colour. /// internal const string Warn = "#ff6b6b"; + + /// + /// A binding that works and costs something: F4's △ on a macro that hides one of the client's own + /// keys or another binding on its chord. Amber rather than , because nothing here is + /// refused — the binding runs, and the colour only says what it is standing in front of. + /// + internal const string Caution = "#e8b04a"; } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Contributions.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Contributions.cs index 877d8b84..bd8753c7 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Contributions.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Contributions.cs @@ -1,5 +1,6 @@ using SharpMUTerm.Client.Commands; using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Client.Palette; using SharpMUTerm.Core.Commands; using SharpMUTerm.Core.Workspaces; @@ -16,6 +17,28 @@ internal sealed partial class SharpMUTermApp { private readonly ContributionRegistry _contributions = new(); + /// + /// What was last run from ⌃P, newest first, listed under RECENT when the surface opens with nothing typed. + /// In memory for the run and never saved: see for why. + /// + private readonly RecentCommands _recentCommands = new(); + + /// The ⌃P surface itself, for a test that reads what it is listing. + internal CommandPalette Palette => _palette; + + /// The ids the RECENT group lists, newest first, for a test. + internal IReadOnlyList RecentCommandIds => _recentCommands.Ids; + + /// + /// Runs an entry the way choosing it on ⌃P does: recorded among the recent ones, then dispatched. Internal + /// so a test and the menu-recent snapshot run commands through the palette's own path. + /// + internal bool RunFromPalette(string id) + { + _recentCommands.Record(id); + return DispatchCommand(id); + } + /// The registry the surfaces read. A host or a package adds to it; the views pick it up on their next read. internal ContributionRegistry Contributions => _contributions; diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 0ad7eb92..783d2b5f 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -1,5 +1,6 @@ using System.Text; using Microsoft.Extensions.Logging; +using SharpMUTerm.Client.Palette; using SharpMUTerm.Core.Commands; using SharpMUTerm.Core.Automation; using SharpMUTerm.Core.Configuration; @@ -900,7 +901,13 @@ public SharpMUTermApp( _window.IsScrollable = false; RegisterBuiltInContributions(); - _palette = new CommandPalette(_system, BuildCatalog, () => _active?.SessionKey, id => DispatchCommand(id)); + _palette = new CommandPalette( + _system, + BuildCatalog, + () => _active?.SessionKey, + id => DispatchCommand(id), + _recentCommands, + () => CommandPaletteModel.Suggested(CommandState())); _messageLog = new MessageLogOverlay(_system, _diagnostics); _gameData = new GameDataOverlay(_system, _time); _screens = ScreenTheme.For(_theme); @@ -1689,6 +1696,27 @@ public string RenderSnapshot(string? view = null) _palette.Toggle(); } + // The command surface searched: a real drag across the output first, because "Make a trigger from + // the selection" is offered only while something is selected, then `trig sel` typed into it — the + // frame that shows a fuzzy match across two words, its characters highlighted, at the top. + if (string.Equals(view, "menu-fuzzy", StringComparison.OrdinalIgnoreCase)) + { + RenderWholeFrame(); + SimulatePaneDrag(MainWindowId, 0, 1, 46, 3); + ReArmWholeFrame(); + _palette.Toggle(); + _palette.SetQuery("trig sel"); + } + + // The command surface opened with nothing typed after two commands were run through the palette's + // own path: RECENT at the top, newest first, and neither entry listed a second time in its group. + if (string.Equals(view, "menu-recent", StringComparison.OrdinalIgnoreCase)) + { + RunFromPalette("layout:split-right"); + RunFromPalette("layout:cycle"); + _palette.Toggle(); + } + // The ⌃B which-key panel over the demo workspace: what the arming timer opens when no key has // arrived by the time it fires. `prefix` is the terse strip on its own — the first thing an armed // prefix shows — and this is what follows it, so the two views are the whole of the display. The @@ -7744,7 +7772,8 @@ private CommandContext CommandState() Walking: SendTarget() is { } walker && _recorders.TryGetValue(walker, out var map) && map.Walk.IsWalking, Sound: CanPlaySound ? !_muted : null, Announced: Host.Announcer is null ? null : IsAnnounced(ActiveWindowId()), - OutputSelected: HasOutputSelection); + OutputSelected: HasOutputSelection, + KeyClashes: KeyClashes.Count(Macros())); } /// @@ -8069,6 +8098,9 @@ private bool RunBuiltInCommand(string id) switch (id) { + case "settings:key-clashes": + // The keypad screen is where each clash is marked and explained; this entry is its way in. + return RunBuiltInCommand(ScreenCommandPrefix + "keypad"); case "layout:zoom": case "layout:unzoom": _workspace.Layout.ToggleZoom(); diff --git a/src/SharpMUTerm.Tui/SnapshotViews.cs b/src/SharpMUTerm.Tui/SnapshotViews.cs index e89b91ab..17cd7ea4 100644 --- a/src/SharpMUTerm.Tui/SnapshotViews.cs +++ b/src/SharpMUTerm.Tui/SnapshotViews.cs @@ -16,7 +16,7 @@ internal static class SnapshotViews "triggers-edit", "logging-edit", "keypad-edit", "password-edit", "startup-edit", "freeze", "freeze-scrollback", "spawn", "split", "move", "drag", "history", "history-search", "history-search-filter", "draft", "draft2", - "menu", "menu-split", "messages", "quit", "connections", "characters", + "menu", "menu-split", "menu-fuzzy", "menu-recent", "messages", "quit", "connections", "characters", "tint", "tint-input", "tint-input-moved", "tint-tabs", "compose", "compose-literal", "moo-edit", "mssp", "mssp-none", "mssp-never", "web", "rail-long", "scrollback", "scrollback-up", "links", "away", "away-scrollback", diff --git a/tests/SharpMUTerm.Client.Tests/CommandPaletteModelTests.cs b/tests/SharpMUTerm.Client.Tests/CommandPaletteModelTests.cs new file mode 100644 index 00000000..474add0f --- /dev/null +++ b/tests/SharpMUTerm.Client.Tests/CommandPaletteModelTests.cs @@ -0,0 +1,226 @@ +using SharpMUTerm.Client.Commands; +using SharpMUTerm.Client.Palette; +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Core.Workspaces; +using TUnit.Assertions.Enums; + +namespace SharpMUTerm.Client.Tests; + +public class FuzzyMatchTests +{ + [Test] + public async Task AQueryMatchesWhenItIsASubsequence_IgnoringCase() + { + await Assert.That(FuzzyMatch.Match("SPLIT", "Split right")).IsNotNull(); + await Assert.That(FuzzyMatch.Match("lgg", "Start logging")).IsNotNull(); + await Assert.That(FuzzyMatch.Match("zzz", "Start logging")).IsNull(); + } + + [Test] + public async Task WordsAreMatchedInOrder_EachAfterTheLast() + { + var match = FuzzyMatch.Match("trig sel", "Make a trigger from the selection"); + await Assert.That(match).IsNotNull(); + await Assert.That(match!.Positions).IsEquivalentTo(new[] { 7, 8, 9, 10, 24, 25, 26 }, CollectionOrdering.Matching); + await Assert.That(FuzzyMatch.Match("sel trig", "Make a trigger from the selection")).IsNull(); + } + + [Test] + public async Task AWholePrefixBeatsAScatteredMatch() + { + var prefix = FuzzyMatch.Match("lay", "Layouts")!; + var scattered = FuzzyMatch.Match("lay", "Clear window, say")!; + await Assert.That(prefix.Score).IsGreaterThan(scattered.Score); + } + + [Test] + public async Task WordStartsBeatTheMiddleOfAWord() + { + // f…p at two word starts, against an f and a p buried in words. + var starts = FuzzyMatch.Match("fp", "Freeze pane")!; + var buried = FuzzyMatch.Match("fp", "Self-help")!; + await Assert.That(starts.Score).IsGreaterThan(buried.Score); + } + + [Test] + public async Task TheBestAlignmentIsFound_NotTheLeftmost() + { + // The leftmost s is in "Show"; the best is the word start of "scrollback". + var match = FuzzyMatch.Match("sc", "Show scrollback")!; + await Assert.That(match.Positions).IsEquivalentTo(new[] { 5, 6 }, CollectionOrdering.Matching); + } +} + +public class CommandPaletteModelTests +{ + private static readonly CommandItem[] Items = + { + new(CommandGroup.Layout, "Split right", "layout:split-right", "⌃B |") { Key = "⌃B |" }, + new(CommandGroup.Layout, "Split down", "layout:split-down", "⌃B -") { Key = "⌃B -" }, + new(CommandGroup.Layout, "Layouts", "layout:layouts", "⌥M") { Key = "⌥M" }, + new(CommandGroup.Terminal, "Start logging", "term:log-on"), + new(CommandGroup.Terminal, "Clear window", "term:clear"), + new(CommandGroup.Terminal, "Make a trigger from the selection", "term:trigger-from-selection", "opens F2") + { Detail = "opens F2" }, + new(CommandGroup.Terminal, "Copy the selection", "term:copy", "⌃C · drag") { Key = "⌃C", Detail = "drag" }, + new(CommandGroup.GoTo, "Go to #public", "win:2", "⌥2 · Corvid · 3 unread") { Key = "⌥2", Detail = "Corvid · 3 unread" }, + }; + + private static IEnumerable Ids(PaletteView view) => view.Entries.Select(e => e.Item.Id); + + private static IEnumerable Headers(PaletteView view) => view.Rows.OfType().Select(h => h.Label); + + [Test] + public async Task AnEmptyQueryListsEveryGroupInItsFixedOrder() + { + var view = CommandPaletteModel.Build("", Items); + await Assert.That(Headers(view)).IsEquivalentTo(new[] { "GO TO", "TERMINAL", "LAYOUT" }, CollectionOrdering.Matching); + await Assert.That(view.Entries.Count).IsEqualTo(Items.Length); + await Assert.That(view.Total).IsEqualTo(Items.Length); + } + + [Test] + public async Task LayFindsLayoutsFirst() + { + var view = CommandPaletteModel.Build("lay", Items); + await Assert.That(view.Entries[0].Item.Id).IsEqualTo("layout:layouts"); + await Assert.That(view.Rows[0]).IsEqualTo(new PaletteHeader("LAYOUT")); + } + + [Test] + public async Task TrigSelFindsTheTriggerBuilder_WithItsCharactersMarked() + { + var view = CommandPaletteModel.Build("trig sel", Items); + var first = view.Entries[0]; + await Assert.That(first.Item.Id).IsEqualTo("term:trigger-from-selection"); + await Assert.That(first.TitleMatches) + .IsEquivalentTo(new[] { new TextRange(7, 4), new TextRange(24, 3) }, CollectionOrdering.Matching); + } + + [Test] + public async Task TheBestGroupComesFirst_EvenWhenItIsNotTheFirstGroup() + { + // "log" is a title prefix only in TERMINAL; GO TO's entry does not match at all. + var view = CommandPaletteModel.Build("log", Items); + await Assert.That(view.Entries[0].Item.Id).IsEqualTo("term:log-on"); + await Assert.That(Headers(view).First()).IsEqualTo("TERMINAL"); + } + + [Test] + public async Task ATitleMatchListsAboveADetailMatch() + { + // "corvid" is only in a detail; "c" … also matches titles, which must come first. + var detailOnly = CommandPaletteModel.Build("corvid", Items); + await Assert.That(Ids(detailOnly)).IsEquivalentTo(new[] { "win:2" }); + await Assert.That(detailOnly.Entries[0].Field).IsEqualTo(PaletteMatchField.Other); + await Assert.That(detailOnly.Entries[0].TitleMatches).IsEmpty(); + } + + [Test] + public async Task EqualScoresKeepCatalogOrder() + { + var view = CommandPaletteModel.Build("split", Items); + await Assert.That(Ids(view).Take(2)) + .IsEquivalentTo(new[] { "layout:split-right", "layout:split-down" }, CollectionOrdering.Matching); + } + + [Test] + public async Task RecentComesFirst_NewestFirst_AndIsNotListedTwice() + { + var recent = new RecentCommands(); + recent.Record("term:clear"); + recent.Record("layout:split-down"); + recent.Record("gone:away"); // no longer offered: skipped + + var view = CommandPaletteModel.Build("", Items, recent.Ids); + await Assert.That(view.Rows[0]).IsEqualTo(new PaletteHeader("RECENT")); + await Assert.That(Ids(view).Take(2)) + .IsEquivalentTo(new[] { "layout:split-down", "term:clear" }, CollectionOrdering.Matching); + await Assert.That(Ids(view).Count(id => id == "term:clear")).IsEqualTo(1); + await Assert.That(view.Entries.Count).IsEqualTo(Items.Length); + } + + [Test] + public async Task RecentIsNotAGroupOnceSomethingIsTyped() + { + var view = CommandPaletteModel.Build("clear", Items, new[] { "term:clear" }); + await Assert.That(Headers(view)).DoesNotContain("RECENT"); + } + + [Test] + public async Task TheStateSuggestsWhatItMakesLikely_AfterRecent() + { + var suggested = CommandPaletteModel.Suggested(new CommandContext(OutputSelected: true)); + await Assert.That(suggested).Contains("term:copy"); + await Assert.That(suggested).Contains("term:trigger-from-selection"); + + var view = CommandPaletteModel.Build("", Items, new[] { "term:clear" }, suggested); + await Assert.That(Headers(view).Take(2)).IsEquivalentTo(new[] { "RECENT", "SUGGESTED" }, CollectionOrdering.Matching); + await Assert.That(Ids(view).Skip(1).Take(2)) + .IsEquivalentTo(new[] { "term:copy", "term:trigger-from-selection" }, CollectionOrdering.Matching); + } + + [Test] + public async Task AnIdleClientSuggestsNothing() + { + await Assert.That(CommandPaletteModel.Suggested(new CommandContext())).IsEmpty(); + } + + [Test] + public async Task KeysAreSpeltInOneVocabulary_AndTheKeyWidthIsTheWidest() + { + var items = new[] + { + new CommandItem(CommandGroup.Terminal, "Newline", "term:newline", "Alt+⏎") { Key = "Alt+⏎" }, + new CommandItem(CommandGroup.Layout, "Split right", "layout:split-right", "⌃B |") { Key = "⌃B |" }, + }; + var view = CommandPaletteModel.Build("", items); + await Assert.That(view.Entries.Single(e => e.Item.Id == "term:newline").Key).IsEqualTo("⌥⏎"); + await Assert.That(view.KeyWidth).IsEqualTo(4); + } + + [Test] + public async Task TheRealCatalogCarriesKeysApartFromDetails() + { + var catalog = BuiltInCommands.Catalog(new Workspace(), Array.Empty(), null, new CommandContext()); + var view = CommandPaletteModel.Build("", catalog); + + var copy = view.Entries.Single(e => e.Item.Id == "term:copy"); + await Assert.That(copy.Key).IsEqualTo("⌃C"); + await Assert.That(copy.Detail).DoesNotContain("⌃C"); + var input = view.Entries.Single(e => e.Item.Id == "term:input2-on"); + await Assert.That(input.Key).IsEqualTo("⌃B i"); + await Assert.That(input.Detail).IsEqualTo("this window"); + } +} + +public class KeyGlyphsTests +{ + [Test] + [Arguments("Alt+⏎", "⌥⏎")] + [Arguments("Ctrl+⏎", "⌃⏎")] + [Arguments("Ctrl+Enter", "⌃⏎")] + [Arguments("Shift+Tab", "⇧⇥")] + [Arguments("⌃B |", "⌃B |")] + [Arguments("F4", "F4")] + [Arguments("PgUp", "PgUp")] + public async Task ChordsAreSpeltInSymbols(string chord, string expected) + { + await Assert.That(KeyGlyphs.Normalize(chord)).IsEqualTo(expected); + } +} + +public class RecentCommandsTests +{ + [Test] + public async Task RunningAgainMovesToTheFront_AndTheOldestFallsOff() + { + var recent = new RecentCommands(capacity: 3); + foreach (var id in new[] { "a", "b", "c", "a", "d" }) + { + recent.Record(id); + } + + await Assert.That(recent.Ids).IsEquivalentTo(new[] { "d", "a", "c" }, CollectionOrdering.Matching); + } +} diff --git a/tests/SharpMUTerm.Core.Tests/Commands/CommandMatcherTests.cs b/tests/SharpMUTerm.Core.Tests/Commands/CommandMatcherTests.cs deleted file mode 100644 index 39d67f4a..00000000 --- a/tests/SharpMUTerm.Core.Tests/Commands/CommandMatcherTests.cs +++ /dev/null @@ -1,64 +0,0 @@ -using SharpMUTerm.Core.Commands; - -namespace SharpMUTerm.Core.Tests.Commands; - -public class CommandMatcherTests -{ - private static readonly CommandItem[] Items = - { - new(CommandGroup.Layout, "Split right", "layout:split-right"), - new(CommandGroup.Layout, "Split down", "layout:split-down"), - new(CommandGroup.Terminal, "Start logging", "term:log-on"), - new(CommandGroup.GoTo, "Go to #public", "win:2", "Corvid · 3 unread"), - }; - - [Test] - public async Task EmptyQuery_ReturnsAllInCatalogOrder() - { - var ranked = CommandMatcher.Rank("", Items); - await Assert.That(ranked.Select(r => r.Item.Id)) - .IsEquivalentTo(new[] { "layout:split-right", "layout:split-down", "term:log-on", "win:2" }); - } - - [Test] - public async Task PrefixMatch_RanksAboveSubstring() - { - // "sp" prefixes "Split …" but is only a substring of nothing else here. - var ranked = CommandMatcher.Rank("sp", Items); - await Assert.That(ranked).Count().IsEqualTo(2); - await Assert.That(ranked[0].Item.Title).StartsWith("Split"); - } - - [Test] - public async Task Substring_BeatsFuzzySubsequence() - { - // "log" is a substring of "Start logging"; "lgg" is only a fuzzy subsequence of it. - var sub = CommandMatcher.Rank("log", Items); - await Assert.That(sub[0].Item.Id).IsEqualTo("term:log-on"); - - var fuzzy = CommandMatcher.Rank("lgg", Items); - await Assert.That(fuzzy.Any(r => r.Item.Id == "term:log-on")).IsTrue(); - await Assert.That(sub[0].Score).IsGreaterThan(fuzzy.First(r => r.Item.Id == "term:log-on").Score); - } - - [Test] - public async Task Matches_SubtitleWhenTitleDoesNot() - { - var ranked = CommandMatcher.Rank("corvid", Items); - await Assert.That(ranked).HasSingleItem(); - await Assert.That(ranked[0].Item.Id).IsEqualTo("win:2"); - } - - [Test] - public async Task NonMatching_QueryIsExcluded() - { - await Assert.That(CommandMatcher.Rank("zzzzz", Items)).IsEmpty(); - } - - [Test] - public async Task Ranking_IsCaseInsensitive() - { - var ranked = CommandMatcher.Rank("SPLIT", Items); - await Assert.That(ranked).Count().IsEqualTo(2); - } -} diff --git a/tests/SharpMUTerm.Tui.Tests/CommandSurfaceRendererTests.cs b/tests/SharpMUTerm.Tui.Tests/CommandSurfaceRendererTests.cs index bcf69154..54d5f375 100644 --- a/tests/SharpMUTerm.Tui.Tests/CommandSurfaceRendererTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/CommandSurfaceRendererTests.cs @@ -1,6 +1,6 @@ +using SharpMUTerm.Client.Palette; using SharpMUTerm.Core.Commands; using SharpMUTerm.Tui; -using TUnit.Assertions.Enums; namespace SharpMUTerm.Tui.Tests; @@ -8,33 +8,18 @@ public class CommandSurfaceRendererTests { private static readonly CommandItem[] Items = { - new(CommandGroup.Layout, "Zoom pane", "layout:zoom"), - new(CommandGroup.GoTo, "Switch to Rookery", "char:k2", "Aetherfall · offline"), - new(CommandGroup.GoTo, "Go to #public", "win:2", "Corvid · 3 unread"), + new(CommandGroup.Layout, "Zoom pane", "layout:zoom", "⌃B z") { Key = "⌃B z" }, + new(CommandGroup.GoTo, "Switch to Rookery", "char:k2", "Aetherfall · offline") { Detail = "Aetherfall · offline" }, + new(CommandGroup.GoTo, "Go to #public", "win:2", "⌥2 · Corvid · 3 unread") { Key = "⌥2", Detail = "Corvid · 3 unread" }, new(CommandGroup.Terminal, "Start logging", "term:log-on"), - new(CommandGroup.Settings, "Open Worlds & Characters", "screen:worlds", "F5"), + new(CommandGroup.Terminal, "Insert a newline in the command line", "term:newline", "Alt+⏎") { Key = "Alt+⏎" }, + new(CommandGroup.Settings, "Open Worlds & Characters", "screen:worlds", "F5") { Key = "F5" }, }; [Test] - public async Task Order_GroupsInFixedOrder_RankedWithin() + public async Task Render_DrawsTheSettingsGroup_WithEachScreensKey() { - var ranked = CommandMatcher.Rank("", Items); - var ordered = CommandSurfaceRenderer.Order(ranked); - - // GoTo entries come first (both), then Terminal, then Layout, then Settings last — the screens - // are where you go least often, and they are the only group whose rows all do the same kind of - // thing, so they read as a block at the foot rather than as noise in the middle. - await Assert.That(ordered.Select(i => i.Id)) - .IsEquivalentTo( - new[] { "char:k2", "win:2", "term:log-on", "layout:zoom", "screen:worlds" }, - CollectionOrdering.Matching); - } - - [Test] - public async Task Render_DrawsTheSettingsGroup_WithEachScreensKeyAsItsSubtitle() - { - var ranked = CommandMatcher.Rank("", Items); - var lines = CommandSurfaceRenderer.Render(ranked, selected: -1, total: Items.Length, context: null); + var lines = CommandSurfaceRenderer.Render(CommandPaletteModel.Build("", Items), selected: -1, context: null); await Assert.That(lines.Any(l => l.Contains("├ SETTINGS"))).IsTrue(); await Assert.That(lines.Any(l => l.Contains("Open Worlds & Characters") && l.Contains("F5"))).IsTrue(); @@ -43,21 +28,69 @@ public async Task Render_DrawsTheSettingsGroup_WithEachScreensKeyAsItsSubtitle() [Test] public async Task Render_EmitsGroupHeadersAndHighlightsSelected() { - var ranked = CommandMatcher.Rank("", Items); - var lines = CommandSurfaceRenderer.Render(ranked, selected: 0, total: Items.Length, context: "Corvid"); + var lines = CommandSurfaceRenderer.Render(CommandPaletteModel.Build("", Items), selected: 0, context: "Corvid"); await Assert.That(lines[0]).Contains("acting on Corvid"); await Assert.That(lines.Any(l => l.Contains("├ GO TO"))).IsTrue(); await Assert.That(lines.Any(l => l.Contains("├ LAYOUT"))).IsTrue(); - // The selected (first flattened) row is highlighted with the accent background. await Assert.That(lines.Any(l => l.Contains("on #00f5b7") && l.Contains("Switch to Rookery"))).IsTrue(); } [Test] public async Task Render_NoMatches_SaysSo() { - var ranked = CommandMatcher.Rank("zzzz", Items); - var lines = CommandSurfaceRenderer.Render(ranked, -1, Items.Length, null); + var lines = CommandSurfaceRenderer.Render(CommandPaletteModel.Build("zzzz", Items), -1, null); await Assert.That(lines.Any(l => l.Contains("no matches"))).IsTrue(); } + + /// + /// The key column: every key ends on the same column, which is one cell short of the row's edge, and the + /// host's spelt-out newline chord is drawn in the same glyphs as the rest. + /// + [Test] + public async Task EveryKeyEndsOnTheSameColumn_InOneGlyphVocabulary() + { + var view = CommandPaletteModel.Build("", Items); + var lines = CommandSurfaceRenderer.Render(view, selected: -1, context: null, width: 70); + var rows = lines.Where(l => !l.StartsWith("[dim]", StringComparison.Ordinal)).ToList(); + + foreach (var row in rows) + { + await Assert.That(MarkupText.VisibleLength(row)).IsEqualTo(70); + } + + var plain = rows.Select(Strip).ToList(); + await Assert.That(plain.Single(p => p.Contains("Zoom pane"))).EndsWith("⌃B z "); + await Assert.That(plain.Single(p => p.Contains("newline"))).EndsWith("⌥⏎ "); + await Assert.That(string.Join("\n", plain)).DoesNotContain("Alt+"); + } + + /// A surface narrower than its rows elides the title and the detail, never the key. + [Test] + public async Task ANarrowSurfaceElidesTitlesButNeverKeys() + { + var view = CommandPaletteModel.Build("", Items); + var lines = CommandSurfaceRenderer.Render(view, selected: -1, context: null, width: 24); + var newline = Strip(lines.Single(l => l.Contains("Insert"))); + + await Assert.That(newline.Length).IsEqualTo(24); + await Assert.That(newline).Contains("…"); + await Assert.That(newline).EndsWith("⌥⏎ "); + } + + [Test] + public async Task MatchedCharactersAreHighlighted() + { + var view = CommandPaletteModel.Build("zp", Items); + var lines = CommandSurfaceRenderer.Render(view, selected: -1, context: null); + var zoom = lines.Single(l => l.Contains("oom")); + + await Assert.That(zoom).Contains("[bold #00f5b7]Z[/]"); + await Assert.That(zoom).Contains("[bold #00f5b7]p[/]"); + } + + private static string Strip(string markup) => + System.Text.RegularExpressions.Regex.Replace( + markup.Replace("[[", "\u0001").Replace("]]", "\u0002"), @"\[[^\]]*\]", string.Empty) + .Replace("\u0001", "[").Replace("\u0002", "]"); } diff --git a/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs b/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs index 44ac8df5..3f263820 100644 --- a/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs @@ -46,7 +46,7 @@ public class FrameContrastTests // The selection band is the one plane this client invents rather than derives from a pane, and // its ink replaces the world's own colour on every selected cell — so it is the pair with the // most to lose from a theme it was not measured against. - "selection", "input-selection", + "selection", "input-selection", "menu-fuzzy", "menu-recent", // The meters are the status row's only cells whose colour depends on what a server sent (a low // value wears the notice ink), and the inspector is a modal of its own. diff --git a/tests/SharpMUTerm.Tui.Tests/PaletteDiscoverabilityTests.cs b/tests/SharpMUTerm.Tui.Tests/PaletteDiscoverabilityTests.cs new file mode 100644 index 00000000..23398365 --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/PaletteDiscoverabilityTests.cs @@ -0,0 +1,153 @@ +using SharpConsoleUI.Drivers; +using SharpMUTerm.Core.Automation; +using SharpMUTerm.Graphics; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// ⌃P as the place keys are learnt: fuzzy matching over the real catalog, the RECENT group filled by the +/// palette's own dispatch path, and the key clashes F4 marks — every one read off the real app, and the +/// frames off the real paint. +/// +/// Serialised: rendering redirects the process-global Console.Out. +[NotInParallel] +public class PaletteDiscoverabilityTests +{ + private static readonly TerminalCapabilities Headless = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private static SharpMUTermApp Demo(int width = 120, int height = 32) + { + Console.SetIn(TextReader.Null); + return new SharpMUTermApp(DemoScene.Build(), Headless, new HeadlessConsoleDriver(width, height)); + } + + private static string Text(string frame, int width = 120, int height = 32) => + string.Join("\n", FrameGrid.Decode(frame, width, height)); + + [Test] + public async Task TrigSelPutsTheTriggerBuilderFirst_InTheRealSurface() + { + var app = Demo(); + var frame = Text(app.RenderSnapshot("menu-fuzzy")); + + await Assert.That(app.Palette.IsOpen).IsTrue(); + await Assert.That(app.Palette.View.Entries[0].Item.Id).IsEqualTo("term:trigger-from-selection"); + await Assert.That(frame).Contains("Make a trigger from the selection"); + } + + [Test] + public async Task CommandsRunFromThePaletteAreListedUnderRecent_NewestFirst() + { + var app = Demo(); + var frame = Text(app.RenderSnapshot("menu-recent")); + + await Assert.That(app.RecentCommandIds).IsEquivalentTo(new[] { "layout:cycle", "layout:split-right" }); + var entries = app.Palette.View.Entries.Select(e => e.Item.Id).ToList(); + await Assert.That(entries[0]).IsEqualTo("layout:cycle"); + await Assert.That(entries[1]).IsEqualTo("layout:split-right"); + await Assert.That(entries.Count(id => id == "layout:cycle")).IsEqualTo(1); + await Assert.That(frame.IndexOf("RECENT", StringComparison.Ordinal)) + .IsLessThan(frame.IndexOf("GO TO", StringComparison.Ordinal)); + } + + [Test] + public async Task AKeyIsNeverElidedOnANarrowTerminal() + { + var app = Demo(80, 24); + var frame = Text(app.RenderSnapshot("menu"), 80, 24); + + // The copy entry's detail is longer than the surface: it is elided, and its key is still drawn whole. + var copy = frame.Split('\n').Single(l => l.Contains("Copy the selection", StringComparison.Ordinal)); + await Assert.That(copy).Contains("…"); + await Assert.That(copy.TrimEnd(' ', '░', '│')).EndsWith("⌃C"); + } + + [Test] + public async Task KeyClashesAreCountedOnThePalette_AndOpenTheKeypadScreen() + { + var app = Demo(); + app.RenderSnapshot(); + await Assert.That(app.BuildCatalog().Any(c => c.Id == "settings:key-clashes")).IsFalse(); + + var macros = app.Configuration.TriggerSets[0].Macros; + macros.Add(new Macro { Key = "Ctrl+C", Command = "kill", Name = "kill" }); // wins over copy + macros.Add(new Macro { Key = "F2", Command = "score", Name = "score" }); // F2 opens Triggers first + macros.Add(new Macro { Key = "F11", Command = "north", Name = "north" }); + macros.Add(new Macro { Key = "F11", Command = "south", Name = "south" }); // never runs + + var entry = app.BuildCatalog().Single(c => c.Id == "settings:key-clashes"); + await Assert.That(entry.Title).IsEqualTo("Key clashes (3)"); + + await Assert.That(app.DispatchCommand("settings:key-clashes")).IsTrue(); + await Assert.That(app.Settings.IsOpen).IsTrue(); + var frame = Text(app.RenderWholeFrame()); + await Assert.That(frame).Contains("△ Ctrl+C"); + await Assert.That(frame).Contains("hide a client key"); + } +} + +public class KeyClashesTests +{ + private static Macro M(string key, string command = "x", string name = "") => + new() { Key = key, Command = command, Name = name }; + + [Test] + public async Task AGlobalShortcutWins_AndSaysSo() + { + var f2 = M("F2"); + var clash = KeyClashes.For(f2, [f2]); + await Assert.That(clash?.Kind).IsEqualTo(KeyClashKind.ClientWins); + await Assert.That(clash!.Value.Reason).Contains("the client wins"); + await Assert.That(clash.Value.BindingRuns).IsFalse(); + } + + [Test] + public async Task AChordTheWindowTakesAfterTheMacrosIsTheBindingsAndAWarning() + { + var copy = M("Ctrl+C"); + var clash = KeyClashes.For(copy, [copy]); + await Assert.That(clash?.Kind).IsEqualTo(KeyClashKind.BindingWins); + await Assert.That(clash!.Value.BindingRuns).IsTrue(); + await Assert.That(clash.Value.Reason).Contains("no longer copies the selection"); + + // Verdict agrees that the binding fires: the warning is not a second opinion on deliverability. + await Assert.That(MacroKeys.Verdict("Ctrl+C").Fires).IsTrue(); + } + + [Test] + public async Task TwoBindingsOnOneChord_TheFirstAnswers_EvenDisabled() + { + var first = M("F11", name: "north"); + first.Enabled = false; + var second = M("F11", name: "south"); + await Assert.That(KeyClashes.For(second, [first, second])?.Kind).IsEqualTo(KeyClashKind.Shadowed); + await Assert.That(KeyClashes.For(second, [first, second])!.Value.Reason).Contains("north holds F11 first"); + + // A disabled binding clashes with nothing itself. + await Assert.That(KeyClashes.For(first, [first, second])).IsNull(); + + first.Enabled = true; + await Assert.That(KeyClashes.For(first, [first, second])?.Kind).IsEqualTo(KeyClashKind.Shadows); + await Assert.That(KeyClashes.Count([first, second])).IsEqualTo(1); + } + + [Test] + public async Task AFreeChordClashesWithNothing() + { + var free = M("F11"); + await Assert.That(KeyClashes.For(free, [free])).IsNull(); + await Assert.That(KeyClashes.For(M("Num5"), [M("Num5")])).IsNull(); // never arrives: not a clash + } + + [Test] + public async Task EveryYieldedChordIsOneTheVerdictSaysFires() + { + // The warning list may only name chords a binding can actually be written on and fire on. + foreach (var chord in new[] { "Ctrl+C", "Ctrl+Left", "Alt+Shift+Up", "Shift+Up", "Alt+Up", "Ctrl+A", "Ctrl+X" }) + { + await Assert.That(MacroKeys.YieldedBy(chord)).IsNotNull(); + await Assert.That(MacroKeys.Verdict(chord).Fires).IsTrue(); + } + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/SnapshotViewEmptyConfigTests.cs b/tests/SharpMUTerm.Tui.Tests/SnapshotViewEmptyConfigTests.cs index fddf38ad..44b8800e 100644 --- a/tests/SharpMUTerm.Tui.Tests/SnapshotViewEmptyConfigTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/SnapshotViewEmptyConfigTests.cs @@ -40,7 +40,7 @@ public class SnapshotViewEmptyConfigTests "collapsed", "prefix", "prefix-panel", "timestamps", "timestamps-toggled", "spawn", "split", "focus", "focus-moved", "freeze", "freeze-scrollback", "move", "drag", "scrollback", "scrollback-up", "away", "away-scrollback", "links", "web", "rail-long", "history", "history-search", - "history-search-filter", "draft", "draft2", "menu", "menu-split", "messages", "quit", + "history-search-filter", "draft", "draft2", "menu", "menu-split", "menu-fuzzy", "menu-recent", "messages", "quit", "connections", "characters", "tint", "tint-input", "tint-input-moved", "compose", "compose-literal", "deletions", "textansi", "input", "keypad", "password", "startup", "logging", "set", "triggers", "route", "highlight", "worlds", "settings", "mssp", From a5e329c8ac6bfb57fa183e63ffb1dc1b67acebae Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 03:50:27 +0000 Subject: [PATCH 010/113] Wire layouts into the client: panes per panel, Alt+M list, F5 rows, suggestion A character's resolved layout is realised as one pane per panel that has data (LayoutFold -> LayoutRealiser -> WorkspaceLayout.ReplaceTree); output, chat and map are the existing windows, every other panel a panel:: window whose control comes from a factory registered in TerminalPanels. Re-folds are rate limited and rebuild only when the drawn panels change, and stop once the player rearranges the panes. A restored workspace wins at startup; only the live entry point applies layouts on its own. Alt+M and Ctrl+P > Layouts open the list (apply, save changes, save as new, use for world/character); F5 gains a layout row on worlds and characters; a world's first connect accepts a suggestion and says so once. LayoutCapture reads an arrangement back into placements. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 7 + CLAUDE.md | 34 + .../Commands/BuiltInCommands.cs | 4 + src/SharpMUTerm.Core/Layouts/LayoutCapture.cs | 128 ++++ .../Layouts/LayoutRealiser.cs | 198 +++++ .../Workspace/WorkspaceLayout.cs | 26 + src/SharpMUTerm.Tui/MacroKeys.cs | 4 + src/SharpMUTerm.Tui/Program.cs | 3 +- src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs | 715 ++++++++++++++++++ src/SharpMUTerm.Tui/SharpMUTermApp.cs | 67 +- src/SharpMUTerm.Tui/SnapshotViews.cs | 2 +- src/SharpMUTerm.Tui/TerminalPanels.cs | 101 +++ src/SharpMUTerm.Tui/WorldsScreenRenderer.cs | 69 +- src/SharpMUTerm.Tui/WorldsScreenView.cs | 12 +- .../Layouts/LayoutRealiserTests.cs | 116 +++ .../LayoutWiringTests.cs | 249 ++++++ .../SharpMUTerm.Tui.Tests/ScreenModelTests.cs | 2 +- 17 files changed, 1719 insertions(+), 18 deletions(-) create mode 100644 src/SharpMUTerm.Core/Layouts/LayoutCapture.cs create mode 100644 src/SharpMUTerm.Core/Layouts/LayoutRealiser.cs create mode 100644 src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs create mode 100644 src/SharpMUTerm.Tui/TerminalPanels.cs create mode 100644 tests/SharpMUTerm.Core.Tests/Layouts/LayoutRealiserTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/LayoutWiringTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 911140d8..ff2b0a21 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,13 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- Layouts. Alt+M (or Ctrl+P ▸ *Layouts*) lists the built-in Roleplay and Combat layouts and the ones you save: + ⏎ applies one to the panes, `s` saves the panes as they are into the selected layout, `n` saves them as a + new one, `w` makes it the world's default and `c` this character's. Worlds & Characters (F5) has a `layout` + row on each world and each character. A panel appears only once the game sends what it shows, so a MUSH + never gets an empty map pane, and the first time you connect to a world the client picks Combat or Roleplay + from what the game sends and says which in a notice. A workspace you arranged yourself is still what comes + back after a restart. - Make a trigger without writing a regex: select a line of output and choose Ctrl+P ▸ *Make a trigger from the selection* (also on the right-click menu). Triggers (F2) opens on a new rule whose pattern is the line with its numbers, quoted speech and known player names turned into `*`, and shows the regex behind it. diff --git a/CLAUDE.md b/CLAUDE.md index d964b7d1..7c050bb8 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -896,6 +896,37 @@ fallbacks) for inline images/maps. - Screenshots of the window's cues come from a real window under Xvfb, driven with XTest; `--render-png` has no pointer and cannot show them. +- **Layouts are realised as panes, one per panel that has data** (`Core/Layouts`: `LayoutFold` → + `LayoutRealiser` → `WorkspaceLayout.ReplaceTree`, `LayoutCapture` for the way back; Tui `SharpMUTermApp.Layouts.cs`, + `TerminalPanels.cs`; ⌥M / ⌃P ▸ *Layouts*; F5 `layout` rows; the `layouts` and `layout-combat` views). The layout's + name is shown nowhere on the main screen. Decisions not to relitigate: + - **A panel is a window.** `output` is the session's window, `chat` its spawn windows, `map` `map:`, and + every other panel a window `panel::` (`TerminalPanels.WindowId`) whose control comes from the + factory registered for that id (`Panels.Register(id, ctx => control)`, from `partial void + RegisterTerminalPanels()`), built once and re-parented like the map's. So panels get tabs, the rail, focus, + `Activate`/`SendTarget` (a panel window is owned by its session) and persistence for nothing. An id with no + factory counts as having no data (`DrawableAvailability`), so an unbuilt panel is *Waiting* and costs no cell. + - **Applying never closes a window.** Windows no panel places stay in the pane they were in if its id survives, + else in the output pane; a collapsed panel's windows are background tabs of the first pane in its region. + - **A restored workspace wins at startup.** The first bind of a character whose windows the resumed workspace + holds keeps that arrangement; any other bind applies the resolved layout; ⌥M ⏎ always applies. Only the live + entry point applies on its own (`autoLayout:`, the `save:`/`logRoot:` family), so no test or snapshot that + binds a session has its panes rearranged. + - **Re-folding is gated twice.** Inputs (game data, the map recorder, a new spawn window) arm one 500 ms timer + (`LayoutRefoldDelay`), and the re-fold rebuilds only if `LayoutRealiser.FoldShape` changed — a burst of GMCP + that draws the same panels reflows nothing (`PaneAreaRebuilds` is the pin). It stands down for good once the + tree's shape (`TreeShape`: pane ids and nesting) is not the one it applied: the player split, closed or + moved a pane and the arrangement is theirs. A divider dragged is not a shape change and is reset by the next + re-fold. A new spawn window goes into the live layout's chat pane, not the focused one. + - **Saving captures geometry, not intent.** `LayoutCapture` reads regions off the solved rectangles (above the + output = top strip, right of it = side, below = bottom); panels not on screen keep their old placement. + Saving changes to a built-in saves a copy and points the character (or the world using it) at the copy. + - **Layout saves go through `PersistConfiguration`**, never `SaveConfiguration`, which re-periodises timers. + F5's rows commit through `SaveConfiguration` like every screen and it re-applies a live layout whose owner + now resolves differently. + - **The suggestion is taken once per world** (`AcceptedLayoutSuggestion`), 5 s after a connect or at once when + vitals arrive, said in one notice, and only by the live entry point. + ## One client, several hosts — and how they are kept the same The terminal (`sharpmuterm`), the desktop window (`sharpmuterm-window`) and the headless snapshot all run the @@ -1074,6 +1105,9 @@ python3 tools/ansi_frame_to_image.py frame.ansi frame.html # or .svg `tabs-many` (**more tabs than the strip can hold** — five of one character's captures in a split pane, which is the state every other tab view is too small to reach. Without eliding, that pane draws two tabs and half of a third and says nothing about the rest), plus the + `layouts` (the ⌥M list over the demo, through the registered shortcut) and `layout-combat` (the Combat layout + applied over the demo's game data and recorded streets: the map beside the output with Chat as a tab under it, + and no pane for the panels nothing draws yet), plus the default workspace (no `--view`). Any settings screen also takes a `-edit` suffix, which opens it and drives real keys in so the frame shows a field mid-edit. State toggles: `collapsed`, `prefix`, `timestamps`, diff --git a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs index 88595d61..b40093bd 100644 --- a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs +++ b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs @@ -187,6 +187,10 @@ void Family(string id, string prefix, FuncAn arrangement read back into placements, for or . +public sealed record CapturedLayout( + IReadOnlyList Placements, + IReadOnlyDictionary RegionShares); + +/// +/// Reads the workspace the player has arranged back into a layout: "save changes" and "save as new". The pane +/// holding the output is ; a pane entirely above it is the top strip, one entirely +/// to its right is the side column, one entirely below it is the bottom band, and anything else shares the main +/// area. A pane's first panel is its host and the rest are tabs of it (). +/// +/// Geometry is read off on a nominal 1000×1000 area, so it is the tree's own proportions +/// and not a terminal's size. Panels the previous layout placed that are not on screen now (a map on a session +/// that has recorded no room yet) keep their old placement, so saving from a quiet session does not lose them. +/// +/// +public static class LayoutCapture +{ + private const int Extent = 1000; + + /// + /// Captures . names the panel a window draws, or null for a + /// window that belongs to no panel of this session (another character's, the web view). Null when no pane holds + /// the output, since a layout is arranged around it. + /// + public static CapturedLayout? Capture(LayoutNode root, Func panelOf, LayoutDefinition? previous = null) + { + ArgumentNullException.ThrowIfNull(root); + ArgumentNullException.ThrowIfNull(panelOf); + + var rects = LayoutSolver.Solve(root, new PaneRect(0, 0, Extent, Extent)); + var seen = new HashSet(StringComparer.Ordinal); + var panes = new List<(PaneRect Rect, List Panels)>(); + foreach (var pane in root.Panes()) + { + var panels = pane.Tabs.Select(panelOf).OfType().Where(PanelIds.IsKnown).Where(seen.Add).ToList(); + if (panels.Count > 0 && rects.TryGetValue(pane.Id, out var rect)) + { + panes.Add((rect, panels)); + } + } + + var main = panes.FirstOrDefault(p => p.Panels.Contains(PanelIds.Output)); + if (main.Panels is null) + { + return null; + } + + var m = main.Rect; + LayoutRegion RegionOf(PaneRect r) => + r.Y + r.Height <= m.Y ? LayoutRegion.TopStrip + : r.X >= m.X + m.Width ? LayoutRegion.Side + : r.Y >= m.Y + m.Height ? LayoutRegion.Bottom + : LayoutRegion.Main; + + var placements = new List(); + foreach (var group in panes.GroupBy(p => RegionOf(p.Rect))) + { + var ordered = group.Key == LayoutRegion.Side + ? group.OrderBy(p => p.Rect.Y).ThenBy(p => p.Rect.X) + : group.OrderBy(p => p.Rect.X).ThenBy(p => p.Rect.Y); + var order = 0; + foreach (var (rect, panels) in ordered) + { + var size = group.Key == LayoutRegion.Side ? rect.Height : rect.Width; + var host = panels[0]; + placements.Add(new PanelPlacement + { + PanelId = host, + Region = group.Key, + Order = order, + Size = Math.Round(Math.Max(1, size) / 100.0, 2), + }); + placements.AddRange(panels.Skip(1).Select(tab => new PanelPlacement + { + PanelId = tab, + Region = group.Key, + Order = order, + TabOf = host, + })); + order++; + } + } + + if (previous is not null) + { + placements.AddRange(previous.KnownPlacements.Where(p => !seen.Contains(p.PanelId))); + } + + return new CapturedLayout(placements, Shares(panes.Select(p => (p.Rect, RegionOf(p.Rect))).ToList(), m)); + } + + private static Dictionary Shares(List<(PaneRect Rect, LayoutRegion Region)> panes, PaneRect main) + { + static double Clamp(double share) => Math.Round(Math.Clamp(share, 0.05, 0.9), 2); + var shares = new Dictionary(); + + var side = panes.Where(p => p.Region == LayoutRegion.Side).ToList(); + if (side.Count > 0) + { + var left = side.Min(p => p.Rect.X); + var right = side.Max(p => p.Rect.X + p.Rect.Width); + shares[LayoutRegion.Side] = Clamp((right - left) / (double)Extent); + } + + var bottom = panes.Where(p => p.Region == LayoutRegion.Bottom).ToList(); + if (bottom.Count > 0) + { + var top = bottom.Min(p => p.Rect.Y); + var foot = bottom.Max(p => p.Rect.Y + p.Rect.Height); + var whole = foot - main.Y; + shares[LayoutRegion.Bottom] = Clamp(whole <= 0 ? LayoutFold.DefaultShare(LayoutRegion.Bottom) : (foot - top) / (double)whole); + } + + var strip = panes.Where(p => p.Region == LayoutRegion.TopStrip).ToList(); + if (strip.Count > 0) + { + var foot = strip.Max(p => p.Rect.Y + p.Rect.Height); + shares[LayoutRegion.TopStrip] = Clamp(foot / (double)Extent); + } + + return shares; + } +} diff --git a/src/SharpMUTerm.Core/Layouts/LayoutRealiser.cs b/src/SharpMUTerm.Core/Layouts/LayoutRealiser.cs new file mode 100644 index 00000000..d9eae7ac --- /dev/null +++ b/src/SharpMUTerm.Core/Layouts/LayoutRealiser.cs @@ -0,0 +1,198 @@ +using System.Text; +using SharpMUTerm.Core.Workspaces; + +namespace SharpMUTerm.Core.Layouts; + +/// +/// A layout made into a workspace tree: the panes hold window ids, ready for +/// . +/// +/// The tree. Every pane has at least one tab. +/// The pane holding the output window, which is where the keyboard goes. +/// Which pane each drawn or collapsed panel ended up in, by panel id. +/// +/// of the fold this was made from: what is drawn and where, with no window +/// ids in it. Two folds with one shape realise to the same panes, so a host re-folds without rebuilding anything +/// while the shape holds. +/// +public sealed record RealisedLayout( + LayoutNode Root, + string FocusedPaneId, + IReadOnlyDictionary PanelPanes, + string Shape); + +/// +/// Turns a (panes of panel ids) into a workspace tree (panes of +/// window ids), given what each panel is drawn by. Pure: the host says which windows a panel stands for +/// and which other windows must survive; this decides where everything goes. +/// +/// A pane takes every window of every panel folded into it, in that order; a pane left with none is dropped +/// and its split collapsed. +/// A collapsed panel's windows are background tabs of the first pane in its region, else of the output pane: +/// a title the player can open, which is what collapsed means in a pane tree. +/// Every window in keep that no panel placed survives — in the pane it asks for when that pane still +/// exists, else in the output pane. Applying a layout never closes a window. +/// +/// +public static class LayoutRealiser +{ + /// Realises , or returns null when it draws nothing. + /// The layout folded, for the regions of collapsed panels. + /// The fold. + /// The windows that draw a panel, in tab order; empty when nothing does yet. + /// The session's own window: focused, and where strays go. + /// Windows to keep, each with the pane id it would like to stay in (or null). + public static RealisedLayout? Realise( + LayoutDefinition layout, + LayoutFoldResult fold, + Func> windowsOf, + string outputWindowId, + IEnumerable<(string WindowId, string? PaneId)>? keep = null) + { + ArgumentNullException.ThrowIfNull(layout); + ArgumentNullException.ThrowIfNull(fold); + ArgumentNullException.ThrowIfNull(windowsOf); + if (fold.Root is null) + { + return null; + } + + var placed = new HashSet(StringComparer.Ordinal); + var panelPanes = new Dictionary(StringComparer.Ordinal); + var paneFirstPanel = new Dictionary(StringComparer.Ordinal); + + LayoutNode? Build(LayoutNode node) + { + if (node is PaneNode pane) + { + var tabs = new List(); + foreach (var panel in pane.Tabs) + { + var windows = windowsOf(panel).Where(placed.Add).ToList(); + if (windows.Count == 0) + { + continue; + } + + tabs.AddRange(windows); + panelPanes[panel] = pane.Id; + paneFirstPanel.TryAdd(pane.Id, panel); + } + + return tabs.Count == 0 ? null : new PaneNode(pane.Id, tabs, 0, false, pane.Sequence); + } + + var split = (SplitNode)node; + var children = new List(); + var sizes = new List(); + for (var i = 0; i < split.Children.Count; i++) + { + if (Build(split.Children[i]) is { } child) + { + children.Add(child); + sizes.Add(split.Sizes[i]); + } + } + + return children.Count switch + { + 0 => null, + 1 => children[0], + _ => new SplitNode(split.Direction, children, sizes), + }; + } + + var root = Build(fold.Root); + if (root is null) + { + return null; + } + + var panes = root.Panes().ToList(); + var output = panes.FirstOrDefault(p => p.Tabs.Contains(outputWindowId)) ?? panes[0]; + + foreach (var collapsed in fold.Collapsed) + { + var windows = windowsOf(collapsed.PanelId).Where(placed.Add).ToList(); + if (windows.Count == 0) + { + continue; + } + + var target = panes.FirstOrDefault(p => + paneFirstPanel.TryGetValue(p.Id, out var first) + && layout.PlacementOf(first)?.Region == collapsed.Region) + ?? output; + target.Tabs.AddRange(windows); + panelPanes[collapsed.PanelId] = target.Id; + } + + foreach (var (windowId, paneId) in keep ?? []) + { + if (!placed.Add(windowId)) + { + continue; + } + + var target = paneId is null ? null : panes.FirstOrDefault(p => p.Id == paneId); + (target ?? output).Tabs.Add(windowId); + } + + var at = output.Tabs.IndexOf(outputWindowId); + output.ActiveIndex = at >= 0 ? at : 0; + return new RealisedLayout(root, output.Id, panelPanes, FoldShape(fold)); + } + + /// + /// What a fold draws and where, as a string: the tree of panes with their panel ids, then the collapsed panels. + /// No sizes and no window ids, so it changes only when a panel appears, goes, or moves. + /// + public static string FoldShape(LayoutFoldResult fold) + { + ArgumentNullException.ThrowIfNull(fold); + var text = new StringBuilder(); + if (fold.Root is { } root) + { + Describe(root, text, n => string.Join(",", n.Tabs)); + } + + text.Append("|c:").Append(string.Join(",", fold.Collapsed.Select(c => c.PanelId))); + return text.ToString(); + } + + /// + /// The structure of a workspace tree — pane ids and how they nest, without tabs or sizes. A host compares it + /// with the one it applied to tell whether the player has since split, closed or moved panes, in which case + /// the arrangement is theirs and a re-fold must leave it alone. + /// + public static string TreeShape(LayoutNode root) + { + ArgumentNullException.ThrowIfNull(root); + var text = new StringBuilder(); + Describe(root, text, p => p.Id); + return text.ToString(); + } + + private static void Describe(LayoutNode node, StringBuilder text, Func pane) + { + if (node is PaneNode leaf) + { + text.Append('[').Append(pane(leaf)).Append(']'); + return; + } + + var split = (SplitNode)node; + text.Append(split.Direction == SplitDirection.Row ? "row(" : "col("); + for (var i = 0; i < split.Children.Count; i++) + { + if (i > 0) + { + text.Append(' '); + } + + Describe(split.Children[i], text, pane); + } + + text.Append(')'); + } +} diff --git a/src/SharpMUTerm.Core/Workspace/WorkspaceLayout.cs b/src/SharpMUTerm.Core/Workspace/WorkspaceLayout.cs index 52f40b20..bb889890 100644 --- a/src/SharpMUTerm.Core/Workspace/WorkspaceLayout.cs +++ b/src/SharpMUTerm.Core/Workspace/WorkspaceLayout.cs @@ -388,6 +388,32 @@ private bool DetachWindow(string windowId) return false; } + /// + /// Replaces the whole tree, as applying a layout does (Layouts.LayoutRealiser). Empty panes are + /// pruned and single-child splits collapsed, exactly as after any other change; the zoom is cleared, because + /// the pane it named may be gone and a layout is asked for in order to be seen whole; focus goes to + /// when it survives, else to pane 1. A pane carrying no creation sequence is + /// given one after the highest taken, and the pN counter moves past any pN id in the new tree, + /// so a later split cannot collide with it. + /// + public void ReplaceTree(LayoutNode root, string? focusedPaneId = null) + { + ArgumentNullException.ThrowIfNull(root); + Root = root; + ZoomedPaneId = null; + var panes = Root.Panes().ToList(); + _paneCounter = Math.Max(_paneCounter, panes.Select(p => ParsePaneCounter(p.Id)).DefaultIfEmpty(0).Max()); + _sequenceCounter = Math.Max(_sequenceCounter, panes.Select(p => p.Sequence).DefaultIfEmpty(PaneNode.Unsequenced).Max()); + foreach (var pane in panes.Where(p => p.Sequence <= PaneNode.Unsequenced)) + { + pane.Sequence = ++_sequenceCounter; + } + + FocusedPaneId = focusedPaneId ?? string.Empty; + _removed.Clear(); + PruneAndFix(); + } + /// Swaps for in the tree. private void ReplaceNode(LayoutNode target, LayoutNode replacement) { diff --git a/src/SharpMUTerm.Tui/MacroKeys.cs b/src/SharpMUTerm.Tui/MacroKeys.cs index e6584d76..98a46329 100644 --- a/src/SharpMUTerm.Tui/MacroKeys.cs +++ b/src/SharpMUTerm.Tui/MacroKeys.cs @@ -167,6 +167,10 @@ private static AppShortcut[] BuildAppShortcuts() // So ⌥G is the whole repeat, and no surface advertises a chord that goes back — going back is // ⌃F again, which is one keystroke more and is a key that exists. new(ConsoleModifiers.Alt, ConsoleKey.G, "goes to the next search hit"), + // The layouts list (⌃P ▸ Layouts). ⌥M is `ESC m`, a printable byte after ESC, so it arrives as one Alt + // chord like ⌥D/⌥R/⌥F; nothing in the framework or the command line's key table takes it, and the + // window host does not keep it for itself (HostKeys.Reserved holds ⌥⏎ and the paste chords). + new(ConsoleModifiers.Alt, ConsoleKey.M, "opens Layouts"), // The character cycle. Letters and not digits because the digit row is spent (⌥N windows, ⌃B N // panes) and there is no third digit-bearing modifier this terminal delivers: read off a pty, // kitty writes ⌥⇧1 as `CSI 49;4u` and ⌃⇧N as `CSI 110;6u` — kitty-keyboard-protocol sequences diff --git a/src/SharpMUTerm.Tui/Program.cs b/src/SharpMUTerm.Tui/Program.cs index fc4d74be..655baf21 100644 --- a/src/SharpMUTerm.Tui/Program.cs +++ b/src/SharpMUTerm.Tui/Program.cs @@ -210,7 +210,8 @@ internal static int RunLive( media: new MediaCache(MediaCache.DefaultRoot), packages: new PackageStore(PackageStore.PathFor(ConfigurationStore.DefaultPath)) { Logger = diagnostics.For("SharpMUTerm.Packages") }, scriptStoreRoot: Path.Combine(Path.GetDirectoryName(ConfigurationStore.DefaultPath)!, "script-data"), - spelling: () => OpenDictionary(loadLogger)); + spelling: () => OpenDictionary(loadLogger), + autoLayout: true); ready?.Invoke(liveApp); int exitCode; try diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs new file mode 100644 index 00000000..38b9929b --- /dev/null +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs @@ -0,0 +1,715 @@ +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Diagnostics; +using SharpMUTerm.Core.Layouts; +using SharpMUTerm.Core.Session; +using SharpMUTerm.Core.Workspaces; +using static SharpMUTerm.Tui.MarkupText; + +namespace SharpMUTerm.Tui; + +/// +/// Layouts in the workspace: resolving a character's layout, realising it as panes, re-folding it as panels get +/// data, the ⌥M list, and the first-connect suggestion. +/// +/// A restored workspace wins at startup. A character whose windows came back from the last run keeps the +/// arrangement it was left in; a character with none gets its resolved layout when its session is bound. ⌥M ⏎ +/// always applies. Only the live entry point applies a layout on its own (autoLayout, the +/// save:/logRoot: family): a test or a snapshot binding a session keeps the workspace it built. +/// +/// +/// A live layout is re-folded only while the panes are still its own. The tree shape is recorded when a +/// layout is applied; once the player splits, closes or moves a pane it no longer matches, and from then on the +/// arrangement is theirs and nothing rebuilds it until ⌥M. A re-fold that would draw the same panels is a no-op, +/// so a burst of GMCP rebuilds nothing. +/// +/// +internal sealed partial class SharpMUTermApp +{ + /// How long a change in what a session has shown is gathered before the layout is re-folded. + internal static readonly TimeSpan LayoutRefoldDelay = TimeSpan.FromMilliseconds(500); + + /// How long after a world's first connect the client waits for MSSP and GMCP before suggesting a layout. + internal static readonly TimeSpan LayoutSuggestionDelay = TimeSpan.FromSeconds(5); + + /// The layout applied last and still owning the panes, or null. + private sealed record LiveLayout( + string SessionKey, + string LayoutId, + string FoldShape, + string TreeShape, + IReadOnlyDictionary PanelPanes); + + /// + /// Panels drawn by pane controls of their own, by panel id. See ; the panels plug in + /// from . + /// + internal TerminalPanels Panels { get; } = new(); + + /// Registers the terminal panels' factories into . Called once, at the end of construction. + partial void RegisterTerminalPanels(); + + private LayoutLibrary? _layoutLibrary; + + /// Whether a bound session gets its layout without being asked: the live entry point only. + private readonly bool _autoLayout; + + /// The ⌥M list. + private readonly ListOverlay _layoutsView; + + /// Every layout: the built-ins, then the player's (). + internal LayoutLibrary Layouts => _layoutLibrary ??= new LayoutLibrary(_config.Layouts); + + private LiveLayout? _liveLayout; + + /// Session keys whose windows the restored workspace holds; the first bind of each keeps the restore. + private HashSet _restoredOwners = new(StringComparer.Ordinal); + + private ITimer? _layoutTimer; + private bool _layoutTimerArmed; + private readonly Dictionary _suggestionTimers = new(StringComparer.Ordinal); + + private int _layoutsSelected; + private string? _layoutsStatus; + + /// The id of the layout realised in the panes, while it still owns them; for tests. + internal string? LiveLayoutId => _liveLayout?.LayoutId; + + /// Whose layout owns the panes, or null. + internal string? LiveLayoutOwner => _liveLayout?.SessionKey; + + /// Read once the workspace exists: whose windows a resumed workspace brought back. + private void NoteRestoredOwners() => + _restoredOwners = _workspace.Windows.Select(w => w.SessionKey).OfType().ToHashSet(StringComparer.Ordinal); + + // ── what a panel is drawn by ──────────────────────────────────────────────────────────────────── + + private bool IsDemoKey(string key) => + _sessions.Sessions.Count == 0 && string.Equals(key, DemoScene.ActiveSessionKey, StringComparison.Ordinal); + + /// A session's own window: the one it prints into, else the main window recorded as its. + private string? OutputWindowOf(string key) + { + if (FindSession(key) is { } session && _sessionWindows.TryGetValue(session, out var bound)) + { + return bound; + } + + return _workspace.Windows + .Where(w => w.Kind == WindowKind.Main && string.Equals(w.SessionKey, key, StringComparison.Ordinal)) + .OrderBy(w => w.Sequence) + .FirstOrDefault()?.Id; + } + + private IEnumerable SpawnWindowsOf(string key) => + _workspace.Windows + .Where(w => w.Kind == WindowKind.Spawn && string.Equals(w.SessionKey, key, StringComparison.Ordinal)) + .OrderBy(w => w.Sequence); + + /// The name a panel window's tab carries. + internal static string PanelTitle(string panelId) => panelId switch + { + PanelIds.WhoHere => "Here", + PanelIds.Vitals => "Vitals", + PanelIds.QuickBar => "Quick bar", + PanelIds.Composer => "Composer", + PanelIds.GameData => "Game data", + PanelIds.Map => "Map", + _ => panelId, + }; + + /// Registers (and places, if it is not) the window a terminal panel is shown in, and returns its id. + private string EnsurePanelWindow(string panelId, string key) + { + var id = TerminalPanels.WindowId(panelId, key); + if (_workspace.FindWindow(id) is null) + { + _workspace.OpenWindow(id, PanelTitle(panelId), WindowKind.Auxiliary, key); + } + else if (_workspace.Layout.FindWindow(id) is null) + { + _workspace.Layout.AddWindow(id); + } + + return id; + } + + /// + /// Opens a registered terminal panel for as a tab of the focused pane (or goes on + /// showing it where it is) and returns its window id; null when no factory is registered for the id. + /// + internal string? OpenPanel(string panelId, string sessionKey) + { + if (!Panels.IsRegistered(panelId)) + { + return null; + } + + var id = EnsurePanelWindow(panelId, sessionKey); + RebuildPaneArea(); + return id; + } + + /// The windows that draw for , creating a panel or map window on the way. + private IReadOnlyList PanelWindows(string key, string panelId) + { + switch (panelId) + { + case PanelIds.Output: + return OutputWindowOf(key) is { } output ? [output] : []; + case PanelIds.Chat: + return SpawnWindowsOf(key).Select(w => w.Id).ToList(); + case PanelIds.Map: + if (MapOf(key) is not { Map.Rooms.Count: > 0 }) + { + return []; + } + + var map = MapWindowId(key); + if (_workspace.FindWindow(map) is null) + { + _workspace.OpenWindow(map, PanelTitle(PanelIds.Map), WindowKind.Auxiliary, key); + } + + return [map]; + default: + return Panels.IsRegistered(panelId) ? [EnsurePanelWindow(panelId, key)] : []; + } + } + + /// The panel a window draws for , or null when it is not one of that session's. + private string? PanelOf(string key, string windowId) + { + if (string.Equals(windowId, OutputWindowOf(key), StringComparison.Ordinal)) + { + return PanelIds.Output; + } + + if (string.Equals(windowId, MapWindowId(key), StringComparison.Ordinal)) + { + return PanelIds.Map; + } + + if (TerminalPanels.TryParseWindowId(windowId, out var panel, out var owner)) + { + return string.Equals(owner, key, StringComparison.Ordinal) ? panel : null; + } + + return _workspace.FindWindow(windowId) is { Kind: WindowKind.Spawn } spawn + && string.Equals(spawn.SessionKey, key, StringComparison.Ordinal) + ? PanelIds.Chat + : null; + } + + /// What 's session has shown, as the fold reads it — with every panel nothing draws counted as having no data. + internal IPanelAvailability LayoutAvailability(string key) + { + var data = FindSession(key)?.GameData ?? (IsDemoKey(key) ? _demoGameData : null); + var rooms = MapOf(key)?.Map.Rooms.Count ?? 0; + var facts = PanelAvailability.From(data, rooms, SpawnWindowsOf(key).Count(), _config.Text.StatusMeters); + return new DrawableAvailability(facts, Panels); + } + + /// , less the panels this client has nothing to draw with. + private sealed class DrawableAvailability(IPanelAvailability facts, TerminalPanels panels) : IPanelAvailability + { + public bool HasData(string panelId) => + facts.HasData(panelId) + && (panelId is PanelIds.Output or PanelIds.Chat or PanelIds.Map || panels.IsRegistered(panelId)); + } + + // ── applying ──────────────────────────────────────────────────────────────────────────────────── + + /// The world and character a session key names, live or configured. + private (WorldDefinition? World, CharacterDefinition? Character) LayoutOwner(string key) => + FindSession(key) is { } session + ? (session.World, session.Character) + : FindCharacter(key) is { } found ? (found.World, found.Character) : (null, null); + + /// The layout uses, by . + internal ResolvedLayout ResolveLayout(string key) + { + var (world, character) = LayoutOwner(key); + return LayoutResolver.Resolve(Layouts, world, character); + } + + /// + /// Realises for in the workspace: one pane per drawn panel, every + /// other window kept, the session's own window focused — or , when a re-fold must + /// not move the reader. False when the session has no window to arrange around. + /// + internal bool ApplyLayout(string key, LayoutDefinition layout, string? focusWindow = null) + { + if (OutputWindowOf(key) is not { } output) + { + return false; + } + + var fold = LayoutFold.Fold(layout, LayoutAvailability(key)); + var keep = _workspace.Layout.Root.Panes() + .SelectMany(p => p.Tabs.Select(t => (t, (string?)p.Id))) + .ToList(); + if (LayoutRealiser.Realise(layout, fold, panel => PanelWindows(key, panel), output, keep) is not { } realised) + { + return false; + } + + _workspace.Layout.ReplaceTree(realised.Root, realised.FocusedPaneId); + _liveLayout = new LiveLayout( + key, layout.Id, realised.Shape, LayoutRealiser.TreeShape(_workspace.Layout.Root), realised.PanelPanes); + RebuildPaneArea(); + var focus = focusWindow is not null && _workspace.Layout.FindWindow(focusWindow) is not null ? focusWindow : output; + Activate(focus); + RefreshRail(); + return true; + } + + /// A session has been bound to its window: apply its layout, unless the restored workspace already arranged it. + private void ApplyLayoutOnBind(WorldSession session) + { + if (!_autoLayout) + { + return; + } + + if (_restoredOwners.Remove(session.SessionKey)) + { + return; // the player's last arrangement wins over the layout at startup + } + + ApplyLayout(session.SessionKey, ResolveLayout(session.SessionKey).Layout); + } + + /// Something a panel's availability reads has changed for : re-fold, once the burst settles. + private void NoteLayoutInput(string key) + { + if (_liveLayout is not { } live || !string.Equals(live.SessionKey, key, StringComparison.Ordinal) || _layoutTimerArmed) + { + return; + } + + _layoutTimerArmed = true; + _layoutTimer ??= _time.CreateTimer( + _ => OnUiThread(() => + { + _layoutTimerArmed = false; + RefoldLayout(); + }), + null, + Timeout.InfiniteTimeSpan, + Timeout.InfiniteTimeSpan); + _layoutTimer.Change(LayoutRefoldDelay, Timeout.InfiniteTimeSpan); + } + + /// + /// Re-folds the live layout against what its session has shown now, and rebuilds the panes only if that draws + /// different panels. Stands down for good once the player has rearranged the panes, and for now while a pane is + /// zoomed. + /// + internal void RefoldLayout() + { + if (_liveLayout is not { } live || _workspace.Layout.ZoomedPaneId is not null) + { + return; + } + + if (!string.Equals(LayoutRealiser.TreeShape(_workspace.Layout.Root), live.TreeShape, StringComparison.Ordinal)) + { + _liveLayout = null; // the arrangement is the player's now + return; + } + + var layout = Layouts.Find(live.LayoutId) ?? ResolveLayout(live.SessionKey).Layout; + var fold = LayoutFold.Fold(layout, LayoutAvailability(live.SessionKey)); + if (string.Equals(LayoutRealiser.FoldShape(fold), live.FoldShape, StringComparison.Ordinal)) + { + return; + } + + ApplyLayout(live.SessionKey, layout, ActiveWindowId()); + } + + /// + /// A capture window has just opened for : put it in the live layout's chat pane when + /// there is one, rather than the focused pane, and re-fold in case chat had no pane yet. + /// + private void PlaceNewSpawnWindow(WorldSession session, string windowId) + { + if (_liveLayout is { } live + && string.Equals(live.SessionKey, session.SessionKey, StringComparison.Ordinal) + && live.PanelPanes.TryGetValue(PanelIds.Chat, out var pane) + && _workspace.Layout.FindPane(pane) is not null) + { + _workspace.Layout.AddWindow(windowId, pane, activate: false); + } + + NoteLayoutInput(session.SessionKey); + } + + /// After a settings commit: a live layout whose owner now resolves to another layout is re-applied. + private void ReapplyLayoutAfterSettings() + { + if (_liveLayout is not { } live) + { + return; + } + + var resolved = ResolveLayout(live.SessionKey).Layout; + if (!string.Equals(resolved.Id, live.LayoutId, StringComparison.Ordinal)) + { + ApplyLayout(live.SessionKey, resolved, ActiveWindowId()); + } + } + + // ── the first-connect suggestion ──────────────────────────────────────────────────────────────── + + private static bool NeedsSuggestion(WorldSession session) => + session.World.Layout is null && session.World.AcceptedLayoutSuggestion is null && session.Character?.Layout is null; + + /// A session connected: on a world nobody has picked a layout for, suggest one once MSSP and GMCP have had a moment. + private void ScheduleLayoutSuggestion(WorldSession session) + { + if (!_autoLayout || !NeedsSuggestion(session) || _suggestionTimers.ContainsKey(session.SessionKey)) + { + return; + } + + _suggestionTimers[session.SessionKey] = _time.CreateTimer( + _ => OnUiThread(() => AcceptLayoutSuggestion(session)), + null, + LayoutSuggestionDelay, + Timeout.InfiniteTimeSpan); + } + + /// Vitals decide the suggestion outright, so their arrival need not wait for the timer. + private void NoteSuggestionSignal(WorldSession session, string package) + { + if (_suggestionTimers.ContainsKey(session.SessionKey) && LayoutSuggester.VitalsPackages.Contains(package)) + { + AcceptLayoutSuggestion(session); + } + } + + /// + /// Takes the suggestion for 's world into , + /// says so once, and applies it when it changes what the live layout is. + /// + internal void AcceptLayoutSuggestion(WorldSession session) + { + if (_suggestionTimers.Remove(session.SessionKey, out var timer)) + { + timer.Dispose(); + } + + if (!NeedsSuggestion(session)) + { + return; + } + + var report = _mssp.Find(session.World.Host, session.World.Port)?.Report; + var suggestion = LayoutSuggester.Suggest(LayoutSignals.From(session.GameData, report)); + session.World.AcceptedLayoutSuggestion = suggestion.LayoutId; + PersistConfiguration(); + + var name = Layouts.Find(suggestion.LayoutId)?.Name ?? suggestion.LayoutId; + var why = suggestion.Reason switch + { + LayoutSuggestionReason.Vitals => "the game sends vitals", + LayoutSuggestionReason.RoleplayServer => report?.Codebase is { } codebase + ? $"it runs {Snippet(codebase)}" + : "it is a roleplay server", + _ => "nothing it sends points elsewhere", + }; + Notice($"Using the {name} layout for {Snippet(session.World.Name)}: {why}. ⌥M changes it.", MessageSeverity.Info, "⌥M"); + + if (_liveLayout is { } live + && string.Equals(live.SessionKey, session.SessionKey, StringComparison.Ordinal) + && !string.Equals(live.LayoutId, suggestion.LayoutId, StringComparison.Ordinal)) + { + ApplyLayout(session.SessionKey, ResolveLayout(session.SessionKey).Layout, ActiveWindowId()); + } + } + + // ── ⌥M ────────────────────────────────────────────────────────────────────────────────────────── + + /// The character the layouts list is about: the focused window's, else the demo's. + private string? LayoutsKey() => + SendTarget()?.SessionKey + ?? _workspace.FindWindow(ActiveWindowId())?.SessionKey + ?? (_sessions.Sessions.Count == 0 ? _demoActiveKey ?? DemoScene.ActiveSessionKey : null); + + /// Whether the ⌥M list is up. + internal bool LayoutsOpen => _layoutsView.IsOpen && _layoutsView.Mode == "layouts"; + + /// What the ⌥M list shows, for a test. + internal IReadOnlyList LayoutsLines => _layoutsView.Lines; + + /// Feeds a key to the ⌥M list. + internal void SimulateLayoutsKey(ConsoleKeyInfo key) => _layoutsView.SimulateKey(key); + + /// ⌥M and ⌃P ▸ Layouts: the list of layouts for the focused character, or closes it. + private void ShowLayouts() + { + if (LayoutsOpen) + { + _layoutsView.Close(); + return; + } + + if (AnyOverlayOpen) + { + return; + } + + if (LayoutsKey() is not { } key) + { + RefuseCommand("no character here — a layout belongs to a character (⌃P ▸ Switch to …)"); + return; + } + + var all = Layouts.All; + var inUse = _liveLayout is { } live && string.Equals(live.SessionKey, key, StringComparison.Ordinal) + ? live.LayoutId + : ResolveLayout(key).Layout.Id; + _layoutsSelected = Math.Max(0, all.ToList().FindIndex(l => l.Id == inUse)); + _layoutsStatus = null; + _layoutsView.Open( + "layouts", + $"Layouts · {Snippet(key)}", + width => LayoutsListLines(key, width), + k => LayoutsKeyPressed(key, k), + width: 64); + } + + private bool LayoutsKeyPressed(string key, ConsoleKeyInfo k) + { + var all = Layouts.All; + _layoutsSelected = Math.Clamp(_layoutsSelected, 0, all.Count - 1); + var selected = all[_layoutsSelected]; + var (world, character) = LayoutOwner(key); + switch (k.Key) + { + case ConsoleKey.UpArrow: + _layoutsSelected = Math.Max(0, _layoutsSelected - 1); + return true; + case ConsoleKey.DownArrow: + _layoutsSelected = Math.Min(all.Count - 1, _layoutsSelected + 1); + return true; + case ConsoleKey.Enter: + if (!ApplyLayout(key, selected)) + { + RefuseCommand($"no window to arrange for {Snippet(key)} — switch to the character first"); + return false; + } + + Notice($"{selected.Name} layout applied — c keeps it for this character, w for the world", MessageSeverity.Info, "⌥M"); + return false; + case ConsoleKey.S when k.Modifiers == 0: + SaveLayoutChanges(key, selected, world, character); + return true; + case ConsoleKey.N when k.Modifiers == 0: + SaveLayoutAsNew(key, selected); + return true; + case ConsoleKey.W when k.Modifiers == 0: + if (world is null) + { + _layoutsStatus = "this character's world is not configured"; + return true; + } + + world.Layout = selected.Id; + PersistConfiguration(); + _layoutsStatus = $"{selected.Name} is now {world.Name}'s layout"; + ReapplyIfResolvedChanged(key); + return true; + case ConsoleKey.C when k.Modifiers == 0: + if (character is null) + { + _layoutsStatus = "no configured character to keep it for"; + return true; + } + + character.Layout = selected.Id; + PersistConfiguration(); + _layoutsStatus = $"{character.Name} uses {selected.Name}"; + ReapplyIfResolvedChanged(key); + return true; + default: + return true; + } + } + + /// After w or c: applies the layout now resolves to, if the panes show another. + private void ReapplyIfResolvedChanged(string key) + { + var resolved = ResolveLayout(key).Layout; + if (_liveLayout is { } live + && string.Equals(live.SessionKey, key, StringComparison.Ordinal) + && string.Equals(live.LayoutId, resolved.Id, StringComparison.Ordinal)) + { + return; + } + + ApplyLayout(key, resolved, ActiveWindowId()); + } + + /// The current arrangement, read back as 's placements. + private CapturedLayout? CaptureArrangement(string key, LayoutDefinition? previous) => + LayoutCapture.Capture(_workspace.Layout.Root, window => PanelOf(key, window), previous); + + private void SaveLayoutChanges(string key, LayoutDefinition target, WorldDefinition? world, CharacterDefinition? character) + { + if (CaptureArrangement(key, target) is not { } captured) + { + _layoutsStatus = "nothing to save — no pane holds this character's output"; + return; + } + + var result = Layouts.Update(target.Id, captured.Placements, captured.RegionShares); + if (result.CreatedNew) + { + // A built-in is never changed; whoever was using it is pointed at the copy, and failing that this character. + if (character?.Layout == target.Id || character is not null && world?.Layout != target.Id) + { + character!.Layout = result.Layout.Id; + } + else if (world is not null) + { + world.Layout = result.Layout.Id; + } + + _layoutsStatus = $"{target.Name} is built in — saved as {result.Layout.Name}"; + } + else + { + _layoutsStatus = $"saved {result.Layout.Name}"; + } + + PersistConfiguration(); + _layoutsSelected = Layouts.All.ToList().FindIndex(l => l.Id == result.Layout.Id); + AdoptArrangementAs(key, result.Layout); + } + + private void SaveLayoutAsNew(string key, LayoutDefinition from) + { + if (CaptureArrangement(key, from) is not { } captured) + { + _layoutsStatus = "nothing to save — no pane holds this character's output"; + return; + } + + var saved = Layouts.SaveAsNew(from.Name, captured.Placements, captured.RegionShares); + PersistConfiguration(); + _layoutsSelected = Layouts.All.ToList().FindIndex(l => l.Id == saved.Id); + _layoutsStatus = $"saved as {saved.Name} — c or w puts it to use"; + } + + /// + /// The panes now are , as just saved from them: it becomes the live layout without a + /// rebuild, so re-folding follows it. + /// + private void AdoptArrangementAs(string key, LayoutDefinition layout) + { + var fold = LayoutFold.Fold(layout, LayoutAvailability(key)); + var panels = new Dictionary(StringComparer.Ordinal); + foreach (var pane in _workspace.Layout.Root.Panes()) + { + foreach (var window in pane.Tabs) + { + if (PanelOf(key, window) is { } panel) + { + panels.TryAdd(panel, pane.Id); + } + } + } + + _liveLayout = new LiveLayout( + key, layout.Id, LayoutRealiser.FoldShape(fold), LayoutRealiser.TreeShape(_workspace.Layout.Root), panels); + } + + /// One line describing a layout: its own words for a built-in, its panels for a saved one. + private static string LayoutDescription(LayoutDefinition layout) => layout.Id switch + { + BuiltInLayouts.RoleplayId => "output, composer, who is here", + BuiltInLayouts.CombatId => "vitals, map, quick bar", + _ => string.Join(", ", layout.KnownPlacements.Where(p => p.TabOf is null).Select(p => PanelTitle(p.PanelId).ToLowerInvariant())), + }; + + /// The ⌥M list for at a width. + internal List LayoutsListLines(string key, int width) + { + var (world, _) = LayoutOwner(key); + var inUse = _liveLayout is { } live && string.Equals(live.SessionKey, key, StringComparison.Ordinal) + ? live.LayoutId + : ResolveLayout(key).Layout.Id; + var worldDefault = world?.Layout ?? world?.AcceptedLayoutSuggestion; + var all = Layouts.All; + var nameColumn = Math.Clamp(all.Max(l => Snippet(l.Name).Length) + 2, 12, 24); + var lines = new List(); + + void Row(int index, LayoutDefinition layout) + { + var selected = index == _layoutsSelected; + var mark = selected ? $"[bold {ScreenPalette.Accent}]▸[/]" : " "; + var name = Snippet(layout.Name); + name = name.Length > nameColumn - 1 ? name[..(nameColumn - 2)] + "…" : name; + var tags = new List(); + if (layout.Id == inUse) + { + tags.Add("● in use"); + } + + if (layout.Id == worldDefault) + { + tags.Add("● world default"); + } + + var tag = tags.Count == 0 ? string.Empty : string.Join(" ", tags); + var room = Math.Max(0, width - 2 - nameColumn - tag.Length - 1); + var description = LayoutDescription(layout); + description = description.Length > room ? (room > 1 ? description[..(room - 1)] + "…" : string.Empty) : description; + lines.Add( + $"{mark} [{(selected ? "bold " : string.Empty)}{ScreenPalette.Value}]{Escape(name.PadRight(nameColumn))}[/]" + + $"[{ScreenPalette.Label}]{Escape(description.PadRight(room))}[/]" + + (tag.Length == 0 ? string.Empty : $" [{ScreenPalette.Accent}]{tag}[/]")); + } + + lines.Add($"[{ScreenPalette.Label}]built in[/]"); + for (var i = 0; i < all.Count && all[i].IsBuiltIn; i++) + { + Row(i, all[i]); + } + + lines.Add(string.Empty); + lines.Add($"[{ScreenPalette.Label}]yours[/]"); + var own = 0; + for (var i = 0; i < all.Count; i++) + { + if (!all[i].IsBuiltIn) + { + Row(i, all[i]); + own++; + } + } + + if (own == 0) + { + lines.Add($" [{ScreenPalette.Label}]none yet — n saves the panes as they are now[/]"); + } + + lines.Add(string.Empty); + lines.Add( + $"[{ScreenPalette.Accent}]s[/] [{ScreenPalette.Label}]save changes[/] " + + $"[{ScreenPalette.Accent}]n[/] [{ScreenPalette.Label}]save as new[/]"); + lines.Add( + $"[{ScreenPalette.Accent}]w[/] [{ScreenPalette.Label}]use for world[/] " + + $"[{ScreenPalette.Accent}]c[/] [{ScreenPalette.Label}]use for this character[/]"); + if (_layoutsStatus is { } status) + { + lines.Add($"[{ScreenPalette.Value}]{Escape(status)}[/]"); + } + + lines.Add(string.Empty); + lines.Add($"[{ScreenPalette.Label}]↑↓ pick [[Esc]] Close [[⏎]] Apply[/]"); + return lines; + } +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 0ad7eb92..4cc7ad1d 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -722,9 +722,11 @@ public SharpMUTermApp( MediaCache? media = null, PackageStore? packages = null, string? scriptStoreRoot = null, - Func? spelling = null) + Func? spelling = null, + bool autoLayout = false) { _spelling = spelling; + _autoLayout = autoLayout; var capabilities = host.Capabilities; Host = host; _config = config; @@ -780,6 +782,8 @@ public SharpMUTermApp( // Resume the last session's workspace (panes/windows/focus) when the config carries one; // otherwise start with a single main window. Real startup and the demo share this path. _workspace = ResumeOrNew(config); + NoteRestoredOwners(); + RegisterTerminalPanels(); var headless = host.RunsInline; _headless = headless; @@ -908,6 +912,7 @@ public SharpMUTermApp( _composer = new ComposeOverlay(_system, _spelling, _screens); _packageView = new ListOverlay(_system, _screens); _sendMenu = new ListOverlay(_system, _screens); + _layoutsView = new ListOverlay(_system, _screens); _composer.Send += (_, result) => SendComposed(result); _composer.Closed += (_, result) => KeepComposeDraft(result); _quit = new QuitOverlay(_system, QuitFactsNow, Quit); @@ -1765,6 +1770,22 @@ public string RenderSnapshot(string? view = null) } } + // Layouts. `layouts` is the ⌥M list over the demo, opened through the registered shortcut itself; + // `layout-combat` is the demo with the Combat layout realised through the same ApplyLayout ⌥M ⏎ runs, over + // the demo's game data (vitals, so the meters have values) and its recorded streets (so the map has rooms). + // Panels nothing draws yet stay out, which is the data gating the frame is there to show. + if (string.Equals(view, "layouts", StringComparison.OrdinalIgnoreCase)) + { + _shortcuts[(ConsoleModifiers.Alt, ConsoleKey.M)](); + } + + if (string.Equals(view, "layout-combat", StringComparison.OrdinalIgnoreCase)) + { + LoadDemoGameData(); + LoadDemoMap(); + ApplyLayout(DemoScene.ActiveSessionKey, Core.Layouts.BuiltInLayouts.Combat); + } + // The ⌃Q confirmation, over a workspace that has something to lose: a second world marked // connected (the demo scene's own way of saying so, and what the header's "n/m characters" reads), // a line typed into the command line through the bar's real change notification, and then the @@ -2745,6 +2766,7 @@ private void BindSession(WorldSession session, string? windowId = null) // after this transition, so a server that does publish overwrites nothing: it adds a // report beside a connection time that is already here. _mssp.RecordConnection(session.World.Host, session.World.Port, _time.GetUtcNow()); + ScheduleLayoutSuggestion(session); } UpdateStatus(); @@ -2758,12 +2780,17 @@ private void BindSession(WorldSession session, string? windowId = null) session.MsspReceived += (_, e) => OnUi(() => CaptureMssp(session.World, e.Data)); // The meters read the session's game data, which the session has already stored by the time this is // raised. Only the session the status row describes repaints it. - session.GameData.Changed += (_, _) => OnUi(() => + session.GameData.Changed += (_, package) => OnUi(() => { if (ReferenceEquals(session, _active)) { RefreshStatusBar(); } + + // A panel can have just got its data (vitals, who is here); re-folding is rate-limited and a no-op + // when nothing drawn changes, so this costs a dictionary lookup per message. + NoteLayoutInput(session.SessionKey); + NoteSuggestionSignal(session, package); }); session.SpawnLine += (_, e) => OnUi(() => OnSpawnLine(session, e.Target, e.Line)); session.MooEditReceived += (_, edit) => OnUi(() => ReceiveMooEdit(session, edit)); @@ -2789,6 +2816,7 @@ private void BindSession(WorldSession session, string? windowId = null) session.EncodingChanged += (_, _) => OnUi(UpdateStatus); RefreshTabTitles(); UpdateStatus(); + ApplyLayoutOnBind(session); } /// @@ -4611,6 +4639,7 @@ private void OnSpawnLine(WorldSession session, string target, StyledLine line) } else { + PlaceNewSpawnWindow(session, window.Id); RebuildPaneArea(); } } @@ -5067,7 +5096,8 @@ private void ToggleHistorySearch() /// private bool AnyOverlayOpen => _palette.IsOpen || _settings.IsOpen || _quit.IsOpen || _messageLog.IsOpen || _historySearch.IsOpen - || _prefixPanel.IsOpen || _composer.IsOpen || _search.IsOpen || _gameData.IsOpen || _packageView.IsOpen || _sendMenu.IsOpen; + || _prefixPanel.IsOpen || _composer.IsOpen || _search.IsOpen || _gameData.IsOpen || _packageView.IsOpen || _sendMenu.IsOpen + || _layoutsView.IsOpen; /// /// Opens the ⌃F search surface, or closes it when the chord arrives again. @@ -6646,6 +6676,12 @@ private void RegisterFocusReportTab() return () => { NextSearchHit(); return true; }; } + // ⌥M opens the layouts list. ESC m, like the rest of the Alt letters. + if (claim.Key == ConsoleKey.M) + { + return () => { ShowLayouts(); return true; }; + } + // ⌥F freezes and resumes the focused pane. It was ⌃F, and moved so that search could have the // chord every reader on every platform reaches for. Same delivery story as ⌥D and ⌥R: ESC + a // printable byte, decoded as that letter with Alt set. @@ -6882,6 +6918,9 @@ internal void SaveConfiguration() // And F7's sound levels, and F5's per-world download switch, which a playing queue holds a copy of. ApplySoundMix(); + // And F5's layout rows: a live layout whose owner now resolves to another one is re-applied. No timers. + ReapplyLayoutAfterSettings(); + PersistConfiguration(); } @@ -7106,7 +7145,8 @@ private ScreenBinding WorldsScreen(string fkey, bool onCharacters) selection.SelectionIn(WorldsScreenRenderer.WorldsPane), selection.SelectionIn(WorldsScreenRenderer.CharactersPane), selection.SelectionIn(WorldsScreenRenderer.TriggerSetsPane), - OpenMsspScreen), + OpenMsspScreen, + Layouts.All), SaveConfiguration); session.Selection.Seed(WorldsScreenRenderer.WorldsPane, ActiveWorldIndex()); session.Selection.Seed(WorldsScreenRenderer.CharactersPane, ActiveCharacterIndex()); @@ -7126,7 +7166,8 @@ private ScreenBinding WorldsScreen(string fkey, bool onCharacters) fkey, session.Selection.SelectionIn(WorldsScreenRenderer.TriggerSetsPane), _system.DesktopDimensions.Height, - info: true)); + info: true, + layouts: Layouts.All)); } /// @@ -8147,6 +8188,9 @@ private bool RunBuiltInCommand(string id) case "term:map": ShowMap(); return true; + case "layout:layouts": + ShowLayouts(); + return true; case "term:mute": case "term:unmute": SetMuted(id == "term:mute"); @@ -8355,6 +8399,7 @@ private void StartMapping(WorldSession session) { RenderMap(MapWindowId(session.SessionKey)); RefreshStatusBar(); + NoteLayoutInput(session.SessionKey); // the first room recorded is the map panel's data }; walk.Changed += (_, reason) => OnWalkChanged(session, reason); session.StateChanged += (_, e) => @@ -10452,6 +10497,14 @@ private IWindowControl BuildTabContent(PaneNode pane, string windowId, Workspace return map; } + // A layout panel drawn by a control of its own (TerminalPanels). An unregistered one falls through to an + // empty output view rather than vanishing, so a window restored from a build that had the panel still shows. + if (TerminalPanels.TryParseWindowId(windowId, out var panelId, out var panelOwner) + && Panels.GetOrCreate(new TerminalPanelContext(panelId, panelOwner, FindSession(panelOwner), windowId)) is { } panel) + { + return panel; + } + return OutputViewFor(windowId, window.Title); } @@ -10535,6 +10588,7 @@ private MarkupControl FrozenContentFor(string windowId) /// Rebuilds the pane area from the model and swaps it into the live window. private void RebuildPaneArea() { + PaneAreaRebuilds++; var row = BuildWorkspaceRow(); _window.RemoveContent(_workspaceRow); _window.InsertControl(WorkspaceRowIndex, row); @@ -10542,6 +10596,9 @@ private void RebuildPaneArea() RefreshTabTitles(); } + /// How many times the pane area has been torn down and rebuilt; a test counts the reflows a change cost. + internal int PaneAreaRebuilds { get; private set; } + /// The TabControl of the focused pane, or null if none is realised. private TabControl? FocusedTabs() => _paneTabs.GetValueOrDefault(_workspace.Layout.FocusedPaneId); diff --git a/src/SharpMUTerm.Tui/SnapshotViews.cs b/src/SharpMUTerm.Tui/SnapshotViews.cs index e89b91ab..d5af7fb9 100644 --- a/src/SharpMUTerm.Tui/SnapshotViews.cs +++ b/src/SharpMUTerm.Tui/SnapshotViews.cs @@ -24,6 +24,6 @@ internal static class SnapshotViews "mxp-image", "mxp-figure", "input-selection", "selection", "trigger-builder", "prefix", "prefix-panel", "focus", "focus-moved", "tabs", "tabs-many", "collapsed", "timestamps", "timestamps-toggled", "prompt", "meters", "gamedata", "map", "map-walking", "map-split", - "packages", "package-review", "package-browse", "send-menu", + "packages", "package-review", "package-browse", "send-menu", "layouts", "layout-combat", ]; } diff --git a/src/SharpMUTerm.Tui/TerminalPanels.cs b/src/SharpMUTerm.Tui/TerminalPanels.cs new file mode 100644 index 00000000..bf46ad70 --- /dev/null +++ b/src/SharpMUTerm.Tui/TerminalPanels.cs @@ -0,0 +1,101 @@ +using SharpConsoleUI.Controls; +using SharpMUTerm.Core.Session; + +namespace SharpMUTerm.Tui; + +/// What a terminal panel is being built for: which panel, whose, and the window that will hold it. +/// One of PanelIds. +/// The world.character the panel belongs to. +/// That character's live session, or null (the snapshot demo has none). +/// The workspace window the control is shown in (). +internal sealed record TerminalPanelContext(string PanelId, string SessionKey, WorldSession? Session, string WindowId); + +/// +/// The seam layout panels plug into, keyed by panel id. A panel that is drawn by a pane control of its own — who is +/// here, the vitals strip, the quick bar, the docked composer — registers a factory here at startup +/// (SharpMUTermApp.RegisterTerminalPanels), and the layout code realises it as a workspace window +/// owned by the session, shown as a tab of the pane the layout puts it in. +/// +/// Three panels are not registered here because they are windows already: output (the session's window), +/// chat (its capture windows) and map (map:<key>). An id that is neither those nor +/// registered counts as having no data, so a layout naming it folds it into its Waiting list and draws +/// nothing — an unbuilt panel costs no cells. +/// +/// +/// The factory is called once per window; the control is cached here and re-parented on every pane rebuild, the way +/// the map's control is, so it must survive being moved between containers. +/// +/// +internal sealed class TerminalPanels +{ + /// The prefix of every panel window id. + public const string WindowPrefix = "panel:"; + + private readonly Dictionary> _factories = new(StringComparer.Ordinal); + private readonly Dictionary _controls = new(StringComparer.Ordinal); + + /// Registers the factory for , replacing any earlier one. + public void Register(string panelId, Func factory) + { + ArgumentException.ThrowIfNullOrEmpty(panelId); + _factories[panelId] = factory ?? throw new ArgumentNullException(nameof(factory)); + } + + /// Whether a factory is registered for . + public bool IsRegistered(string panelId) => _factories.ContainsKey(panelId); + + /// The ids with a factory. + public IReadOnlyCollection Registered => _factories.Keys; + + /// The window id that shows for . + public static string WindowId(string panelId, string sessionKey) => $"{WindowPrefix}{panelId}:{sessionKey}"; + + /// + /// Reads a panel window id back. The panel id runs to the first colon after the prefix (no panel id has one); + /// the session key is the rest, colons and all. + /// + public static bool TryParseWindowId(string windowId, out string panelId, out string sessionKey) + { + panelId = string.Empty; + sessionKey = string.Empty; + if (windowId is null || !windowId.StartsWith(WindowPrefix, StringComparison.Ordinal)) + { + return false; + } + + var rest = windowId.AsSpan(WindowPrefix.Length); + var colon = rest.IndexOf(':'); + if (colon <= 0 || colon == rest.Length - 1) + { + return false; + } + + panelId = rest[..colon].ToString(); + sessionKey = rest[(colon + 1)..].ToString(); + return true; + } + + /// The control already built for , or null. + public IWindowControl? ControlFor(string windowId) => _controls.GetValueOrDefault(windowId); + + /// The control for 's window, built on first use; null when the id is unregistered. + internal IWindowControl? GetOrCreate(TerminalPanelContext context) + { + if (_controls.TryGetValue(context.WindowId, out var existing)) + { + return existing; + } + + if (!_factories.TryGetValue(context.PanelId, out var factory)) + { + return null; + } + + var control = factory(context); + _controls[context.WindowId] = control; + return control; + } + + /// Forgets a window's control, when the window is closed. + internal void Forget(string windowId) => _controls.Remove(windowId); +} diff --git a/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs b/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs index 79f7fb6a..3a951dcb 100644 --- a/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs +++ b/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs @@ -1,3 +1,4 @@ +using SharpMUTerm.Core.Layouts; using System.Globalization; using SharpMUTerm.Core.Configuration; using SharpMUTerm.Core.Telnet; @@ -95,6 +96,27 @@ internal static class WorldsScreenRenderer /// , as one of . internal const int DiscordField = 14; + /// : the layout this world's characters use, or the suggestion. + internal const int WorldLayoutField = 15; + + /// What a world with no layout of its own reads as: the suggestion it accepted, else Roleplay. + internal const string WorldLayoutDefault = "(suggested)"; + + /// What a character with no layout of its own reads as. + internal const string CharacterLayoutDefault = "(world default)"; + + /// The layout row's choices: the default word, then every layout by name. + internal static IReadOnlyList LayoutChoices(IReadOnlyList layouts, string unset) => + [unset, .. layouts.Select(l => l.Name)]; + + /// The name of the layout names, or null for none (or one that is gone). + internal static string? LayoutName(IReadOnlyList layouts, string? id) => + id is null ? null : layouts.FirstOrDefault(l => string.Equals(l.Id, id, StringComparison.Ordinal))?.Name; + + /// The id of the layout called , or null for the default word. + internal static string? LayoutId(IReadOnlyList layouts, string name) => + layouts.FirstOrDefault(l => string.Equals(l.Name, name, StringComparison.OrdinalIgnoreCase))?.Id; + /// F5's words for . internal static readonly string[] DiscordChoices = ["off", "show status"]; @@ -161,6 +183,9 @@ internal static class WorldsScreenRenderer /// internal const int PaneTintField = 9; + /// , appended after the tint: also about how the panes look. + internal const int CharacterLayoutField = 10; + /// /// The trigger-set row's field ordinals. A set's name leads, as every list row's does — and here it /// is more than a label: a character opts into automation by name, so renaming a set is a @@ -446,10 +471,12 @@ internal static ScreenModel Model( int selectedWorld, int selectedCharacter, int selectedSet = 0, - Action? info = null) + Action? info = null, + IReadOnlyList? layouts = null) { ArgumentNullException.ThrowIfNull(worlds); ArgumentNullException.ThrowIfNull(triggerSets); + var all = layouts ?? BuiltInLayouts.All; (selectedWorld, selectedCharacter) = Resolve(worlds, selectedWorld, selectedCharacter); @@ -480,7 +507,12 @@ internal static ScreenModel Model( "discord", () => w.DiscordPresence ? DiscordChoices[1] : DiscordChoices[0], v => w.DiscordPresence = v == DiscordChoices[1], - DiscordChoices))) + DiscordChoices), + ScreenField.Choice( + "layout", + () => LayoutName(all, w.Layout) ?? WorldLayoutDefault, + v => w.Layout = LayoutId(all, v), + LayoutChoices(all, WorldLayoutDefault)))) .Concat(WorldButtons(worlds, selectedWorld, info)) .ToArray(); @@ -511,7 +543,12 @@ internal static ScreenModel Model( () => c.Logging.RestoreLog ? RestoreOn : RestoreOff, v => c.Logging.RestoreLog = string.Equals(v, RestoreOn, StringComparison.OrdinalIgnoreCase), RestoreChoices), - ScreenField.Enumeration(TintLabel, () => c.Tint, v => c.Tint = v))) + ScreenField.Enumeration(TintLabel, () => c.Tint, v => c.Tint = v), + ScreenField.Choice( + "layout", + () => LayoutName(all, c.Layout) ?? CharacterLayoutDefault, + v => c.Layout = LayoutId(all, v), + LayoutChoices(all, CharacterLayoutDefault)))) .Concat(CharacterButtons(world, selectedCharacter)) .ToArray(); @@ -938,8 +975,10 @@ internal static List DetailColumn( int selectedCharacter, string accent, ScreenFocus? focus = null, - int height = 0) + int height = 0, + IReadOnlyList? layouts = null) { + var all = layouts ?? BuiltInLayouts.All; var cursor = focus ?? ScreenFocus.None; (selectedWorld, selectedCharacter) = Resolve(worlds, selectedWorld, selectedCharacter); if (selectedWorld < 0) @@ -1028,6 +1067,13 @@ world.GrabPrefix is { } grab cursor, selectedWorld, DiscordField)), + WorldField("layout", Field( + LayoutName(all, world.Layout) is { } worldLayout + ? $"[{Value}]{Escape(worldLayout)}[/]" + : $"[{Label}]{WorldLayoutDefault} · {Escape(LayoutName(all, world.AcceptedLayoutSuggestion) ?? BuiltInLayouts.Roleplay.Name)}[/]", + cursor, + selectedWorld, + WorldLayoutField)), string.Empty, $"[{accent}]├ CHARACTERS[/] [{Label}]a character is a connection[/]", }); @@ -1144,8 +1190,13 @@ private static string Checkbox(string label, bool value, string hint) /// /// internal static List FormColumn( - CharacterDefinition character, string accent, ScreenFocus? focus = null, int selectedCharacter = -1) + CharacterDefinition character, + string accent, + ScreenFocus? focus = null, + int selectedCharacter = -1, + IReadOnlyList? layouts = null) { + var all = layouts ?? BuiltInLayouts.All; var cursor = focus ?? ScreenFocus.None; var form = new List { @@ -1219,6 +1270,14 @@ internal static List FormColumn( selectedCharacter, PaneTintField, pane: CharactersPane) + $" [{Label}]{TintNote}[/]"), + CharField("layout", Field( + LayoutName(all, character.Layout) is { } own + ? $"[{Value}]{Escape(own)}[/]" + : $"[{Label}]{CharacterLayoutDefault}[/]", + cursor, + selectedCharacter, + CharacterLayoutField, + pane: CharactersPane)), }; // The log format and `restore` both sit near the foot of this block, so their lists are drawn diff --git a/src/SharpMUTerm.Tui/WorldsScreenView.cs b/src/SharpMUTerm.Tui/WorldsScreenView.cs index 10221711..7c6c4b3a 100644 --- a/src/SharpMUTerm.Tui/WorldsScreenView.cs +++ b/src/SharpMUTerm.Tui/WorldsScreenView.cs @@ -1,3 +1,4 @@ +using SharpMUTerm.Core.Layouts; using SharpMUTerm.Core.Configuration; using SharpConsoleUI; using SharpConsoleUI.Builders; @@ -27,7 +28,8 @@ public static IWindowControl Build( string fkey = WorldsScreenRenderer.FKey, int selectedSet = 0, int height = 0, - bool info = false) + bool info = false, + IReadOnlyList? layouts = null) { // Both panes end in button rows, so a raw cursor can point past its list; resolving once here // keeps every block of the screen agreeing on which world and character are selected. @@ -38,7 +40,7 @@ public static IWindowControl Build( // The model is rebuilt here only to derive the header's hints, so the INFO row's presence is all // it needs of the action — a no-op stands in for it, and the delegate stays with the session. var model = WorldsScreenRenderer.Model( - worlds, triggerSets, selectedWorld, selectedCharacter, selectedSet, info ? _ => { } : null); + worlds, triggerSets, selectedWorld, selectedCharacter, selectedSet, info ? _ => { } : null, layouts); var header = ScreenChrome.Band( WorldsScreenRenderer.HeaderLine(width, model, focus, fkey), ScreenPalette.HeaderBg, scheme); var footer = ScreenChrome.Band( @@ -51,7 +53,7 @@ public static IWindowControl Build( var band = WorldsScreenRenderer.HasCharacter(worlds, selectedWorld, selectedCharacter) ? Math.Max( WorldsScreenRenderer.FormColumn( - worlds[selectedWorld].Characters[selectedCharacter], accent, focus, selectedCharacter).Count, + worlds[selectedWorld].Characters[selectedCharacter], accent, focus, selectedCharacter, layouts).Count, WorldsScreenRenderer.TriggersColumn( worlds[selectedWorld].Characters[selectedCharacter], triggerSets, @@ -67,7 +69,7 @@ public static IWindowControl Build( WorldsScreenRenderer.WorldsColumn(worlds, selectedWorld, focus, rows, info), scheme)); var detailCol = ScreenChrome.Stretch(ScreenChrome.Panel( WorldsScreenRenderer - .DetailColumn(worlds, triggerSets, selectedWorld, selectedCharacter, accent, focus, rows), + .DetailColumn(worlds, triggerSets, selectedWorld, selectedCharacter, accent, focus, rows, layouts), scheme)); var body = Controls.HorizontalGrid() .WithAlignment(HorizontalAlignment.Stretch) @@ -85,7 +87,7 @@ public static IWindowControl Build( if (WorldsScreenRenderer.HasCharacter(worlds, selectedWorld, selectedCharacter)) { var character = worlds[selectedWorld].Characters[selectedCharacter]; - var form = WorldsScreenRenderer.FormColumn(character, accent, focus, selectedCharacter).ToList(); + var form = WorldsScreenRenderer.FormColumn(character, accent, focus, selectedCharacter, layouts).ToList(); var triggers = WorldsScreenRenderer .TriggersColumn(character, triggerSets, accent, focus, selectedSet, worlds) .ToList(); diff --git a/tests/SharpMUTerm.Core.Tests/Layouts/LayoutRealiserTests.cs b/tests/SharpMUTerm.Core.Tests/Layouts/LayoutRealiserTests.cs new file mode 100644 index 00000000..a0a44db7 --- /dev/null +++ b/tests/SharpMUTerm.Core.Tests/Layouts/LayoutRealiserTests.cs @@ -0,0 +1,116 @@ +using SharpMUTerm.Core.Layouts; +using SharpMUTerm.Core.Workspaces; + +namespace SharpMUTerm.Core.Tests.Layouts; + +/// +/// turns a fold into a workspace tree of windows, reads an +/// arrangement back into placements, and swaps the result in. +/// +public class LayoutRealiserTests +{ + private static readonly IReadOnlyDictionary Windows = new Dictionary + { + [PanelIds.Output] = ["main"], + [PanelIds.Map] = ["map:W.C"], + [PanelIds.Chat] = ["spawn:chat", "spawn:ooc"], + [PanelIds.Vitals] = ["panel:vitals:W.C"], + }; + + private static IReadOnlyList WindowsOf(string panel) => Windows.GetValueOrDefault(panel) ?? []; + + [Test] + public async Task CombatPutsTheMapBesideTheOutputAndTheCollapsedChatUnderTheMapAsTabs() + { + var fold = LayoutFold.Fold(BuiltInLayouts.Combat, new PanelAvailability(RoomsRecorded: 3, MeterValueArrived: true, SpawnWindows: 2)); + var realised = LayoutRealiser.Realise(BuiltInLayouts.Combat, fold, WindowsOf, "main")!; + + var panes = realised.Root.Panes().ToDictionary(p => p.Id); + await Assert.That(panes["panel:map"].Tabs).IsEquivalentTo(new[] { "map:W.C", "spawn:chat", "spawn:ooc" }); + await Assert.That(panes["panel:map"].ActiveTab).IsEqualTo("map:W.C"); + await Assert.That(panes["panel:vitals"].Tabs).IsEquivalentTo(new[] { "panel:vitals:W.C" }); + // The quick bar has no window, so its pane is dropped rather than drawn empty. + await Assert.That(panes.ContainsKey("panel:quick-bar")).IsFalse(); + await Assert.That(realised.FocusedPaneId).IsEqualTo("panel:output"); + await Assert.That(realised.PanelPanes[PanelIds.Chat]).IsEqualTo("panel:map"); + } + + [Test] + public async Task WindowsNoPanelPlacesAreKeptInThePaneTheyAskForOrTheOutputPane() + { + var fold = LayoutFold.Fold(BuiltInLayouts.Combat, new PanelAvailability(RoomsRecorded: 3)); + var realised = LayoutRealiser.Realise( + BuiltInLayouts.Combat, fold, WindowsOf, "main", + [("web", "panel:map"), ("char:Other.Ann", "p7"), ("main", null)])!; + + var panes = realised.Root.Panes().ToDictionary(p => p.Id); + await Assert.That(panes["panel:map"].Tabs).Contains("web"); + await Assert.That(panes["panel:output"].Tabs).IsEquivalentTo(new[] { "main", "char:Other.Ann" }); + await Assert.That(panes["panel:output"].ActiveTab).IsEqualTo("main"); + } + + [Test] + public async Task TheShapeChangesOnlyWhenWhatIsDrawnChanges() + { + var quiet = LayoutFold.Fold(BuiltInLayouts.Combat, new PanelAvailability()); + var stillQuiet = LayoutFold.Fold(BuiltInLayouts.Combat, new PanelAvailability(GameDataEntries: 40)); + var mapped = LayoutFold.Fold(BuiltInLayouts.Combat, new PanelAvailability(RoomsRecorded: 1)); + + await Assert.That(LayoutRealiser.FoldShape(stillQuiet)).IsEqualTo(LayoutRealiser.FoldShape(quiet)); + await Assert.That(LayoutRealiser.FoldShape(mapped)).IsNotEqualTo(LayoutRealiser.FoldShape(quiet)); + } + + [Test] + public async Task ReplacingTheTreeClearsTheZoomAndFocusesTheNamedPane() + { + var layout = new WorkspaceLayout(["main", "web"]); + layout.SplitFocused(SplitDirection.Row); + layout.ToggleZoom(); + var fold = LayoutFold.Fold(BuiltInLayouts.Combat, new PanelAvailability(RoomsRecorded: 1)); + var realised = LayoutRealiser.Realise(BuiltInLayouts.Combat, fold, WindowsOf, "main", [("web", null)])!; + + layout.ReplaceTree(realised.Root, realised.FocusedPaneId); + + await Assert.That(layout.ZoomedPaneId).IsNull(); + await Assert.That(layout.FocusedPaneId).IsEqualTo("panel:output"); + await Assert.That(layout.FindWindow("map:W.C")!.Id).IsEqualTo("panel:map"); + // A split after the swap gets a fresh pN id, and the panes keep the fold's numbering: main first. + layout.SplitFocused(SplitDirection.Column); + await Assert.That(layout.Panes.Select(p => p.Id).Distinct().Count()).IsEqualTo(layout.Panes.Count); + await Assert.That(layout.Panes[0].Id).IsEqualTo("panel:output"); + } + + [Test] + public async Task CapturingTheCombatArrangementGivesBackItsRegions() + { + var fold = LayoutFold.Fold(BuiltInLayouts.Combat, new PanelAvailability(RoomsRecorded: 3, MeterValueArrived: true, SpawnWindows: 2)); + var realised = LayoutRealiser.Realise(BuiltInLayouts.Combat, fold, WindowsOf, "main")!; + string? PanelOf(string window) => Windows.FirstOrDefault(kv => kv.Value.Contains(window)).Key; + + var captured = LayoutCapture.Capture(realised.Root, PanelOf, BuiltInLayouts.Combat)!; + + var byId = captured.Placements.ToDictionary(p => p.PanelId); + await Assert.That(byId[PanelIds.Output].Region).IsEqualTo(LayoutRegion.Main); + await Assert.That(byId[PanelIds.Map].Region).IsEqualTo(LayoutRegion.Side); + await Assert.That(byId[PanelIds.Vitals].Region).IsEqualTo(LayoutRegion.TopStrip); + await Assert.That(byId[PanelIds.Chat].TabOf).IsEqualTo(PanelIds.Map); + // Not on screen (no window draws it), so it keeps the placement the layout gave it. + await Assert.That(byId[PanelIds.QuickBar].Region).IsEqualTo(LayoutRegion.Bottom); + await Assert.That(captured.RegionShares[LayoutRegion.Side]).IsBetween(0.25, 0.35); + + // And folding the capture again draws the same panes. + var again = LayoutFold.Fold( + new LayoutDefinition { Id = "x", Name = "x", Placements = captured.Placements, RegionShares = captured.RegionShares }, + new PanelAvailability(RoomsRecorded: 3, MeterValueArrived: true, SpawnWindows: 2)); + var panesAgain = again.Root!.Panes().Select(p => p.Id).OrderBy(id => id, StringComparer.Ordinal); + var panesBefore = realised.Root.Panes().Select(p => p.Id).Append("panel:quick-bar").OrderBy(id => id, StringComparer.Ordinal); + await Assert.That(panesAgain).IsEquivalentTo(panesBefore); + } + + [Test] + public async Task NothingIsCapturedWithoutTheOutput() + { + var tree = new PaneNode("p1", ["web"]); + await Assert.That(LayoutCapture.Capture(tree, _ => null)).IsNull(); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/LayoutWiringTests.cs b/tests/SharpMUTerm.Tui.Tests/LayoutWiringTests.cs new file mode 100644 index 00000000..f1a77b98 --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/LayoutWiringTests.cs @@ -0,0 +1,249 @@ +using SharpConsoleUI.Controls; +using SharpConsoleUI.Drivers; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Layouts; +using SharpMUTerm.Core.Session; +using SharpMUTerm.Graphics; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// Layouts in the client: ⌥M and ⌃P open the list, applying realises panes for the panels that have data, a bound +/// session gets its layout unless the restored workspace arranged it, a re-fold waits out a burst and rebuilds only +/// when a panel appears, and the player rearranging the panes ends the re-folding. +/// +/// Serialised: rendering redirects the process-global Console.Out. +[NotInParallel] +public class LayoutWiringTests +{ + private static readonly TerminalCapabilities Headless = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private static readonly ConsoleKeyInfo AltM = new('m', ConsoleKey.M, shift: false, alt: true, control: false); + + private static SharpMUTermApp Demo(AppConfiguration? config = null) + { + Console.SetIn(TextReader.Null); + config ??= DemoScene.Build(); + config.ScrollbackSpill.Enabled = false; + return new SharpMUTermApp(config, Headless, new HeadlessConsoleDriver(120, 32)); + } + + private static (SharpMUTermApp App, AppConfiguration Config, ManualTimeProvider Time) Live(bool restored = false) + { + Console.SetIn(TextReader.Null); + var config = DemoScene.Build(); + config.ScrollbackSpill.Enabled = false; + if (!restored) + { + config.LastSession = null; + } + + var time = new ManualTimeProvider(); + var app = new SharpMUTermApp( + config, ClientHost.Headless(new HeadlessConsoleDriver(120, 32), Headless), time, autoLayout: true); + return (app, config, time); + } + + private static ConsoleKeyInfo Letter(char c) => new(c, ConsoleKey.A + (char.ToUpperInvariant(c) - 'A'), false, false, false); + + [Test] + public async Task AltMIsAClaimedChordThatOpensTheLayoutsList() + { + await Assert.That(MacroKeys.AppShortcuts.Any(s => s.Modifiers == ConsoleModifiers.Alt && s.Key == ConsoleKey.M)).IsTrue(); + + await using var app = Demo(); + app.RenderSnapshot(); + app.SimulateKey(AltM); + + await Assert.That(app.LayoutsOpen).IsTrue(); + var text = string.Join("\n", app.LayoutsLines); + await Assert.That(text).Contains("Roleplay"); + await Assert.That(text).Contains("Combat"); + await Assert.That(text).Contains("in use"); + await Assert.That(text).Contains("[Esc]] Close"); + + app.SimulateLayoutsKey(new ConsoleKeyInfo('\u001b', ConsoleKey.Escape, false, false, false)); + await Assert.That(app.LayoutsOpen).IsFalse(); + } + + [Test] + public async Task TheCommandSurfaceOpensTheSameList() + { + await using var app = Demo(); + app.RenderSnapshot(); + + await Assert.That(app.DispatchCommand("layout:layouts")).IsTrue(); + await Assert.That(app.LayoutsOpen).IsTrue(); + } + + [Test] + public async Task CombatOverTheDemoPutsTheMapBesideTheOutputWithChatTabbedUnderIt() + { + await using var app = Demo(); + app.RenderSnapshot("layout-combat"); + + await Assert.That(app.LiveLayoutId).IsEqualTo(BuiltInLayouts.CombatId); + await Assert.That(app.PaneIdOf("main")).IsEqualTo("panel:output"); + await Assert.That(app.PaneIdOf(SharpMUTermApp.MapWindowId(DemoScene.ActiveSessionKey))).IsEqualTo("panel:map"); + await Assert.That(app.PaneIdOf(DemoScene.ChatWindowId)).IsEqualTo("panel:map"); + await Assert.That(app.FocusedPaneId).IsEqualTo("panel:output"); + // Vitals and the quick bar have nothing to draw them in this build, so they take no pane. + await Assert.That(app.PaneIds).IsEquivalentTo(new[] { "panel:output", "panel:map" }); + } + + [Test] + public async Task ARegisteredPanelIsDrawnInItsOwnPaneOnceItHasData() + { + await using var app = Demo(); + app.Panels.Register(PanelIds.Vitals, _ => new MarkupControl(["vitals"])); + app.RenderSnapshot("layout-combat"); + + var window = TerminalPanels.WindowId(PanelIds.Vitals, DemoScene.ActiveSessionKey); + await Assert.That(app.PaneIdOf(window)).IsEqualTo("panel:vitals"); + await Assert.That(app.Panels.ControlFor(window)).IsNotNull(); + await Assert.That(TerminalPanels.TryParseWindowId(window, out var panel, out var key)).IsTrue(); + await Assert.That(panel).IsEqualTo(PanelIds.Vitals); + await Assert.That(key).IsEqualTo(DemoScene.ActiveSessionKey); + } + + [Test] + public async Task ABoundSessionGetsItsLayoutWhenNothingWasRestored() + { + var (app, config, _) = Live(); + await using var _app = app; + var session = app.BindWorldWithoutConnecting(config.Worlds[0]); + + await Assert.That(app.LiveLayoutId).IsEqualTo(BuiltInLayouts.RoleplayId); + await Assert.That(app.LiveLayoutOwner).IsEqualTo(session.SessionKey); + await Assert.That(app.PaneIdOf("main")).IsEqualTo("panel:output"); + } + + [Test] + public async Task ARestoredWorkspaceWinsOverTheLayoutAtStartup() + { + var (app, config, _) = Live(restored: true); + await using var _app = app; + var before = app.PaneIds.ToArray(); + app.BindWorldWithoutConnecting(config.Worlds[0]); + + await Assert.That(app.LiveLayoutId).IsNull(); + await Assert.That(app.PaneIds).IsEquivalentTo(before); + } + + [Test] + public async Task ARefoldWaitsForTheBurstAndRebuildsOnlyWhenAPanelAppears() + { + var (app, config, time) = Live(); + await using var _app = app; + config.Worlds[0].Layout = BuiltInLayouts.CombatId; + app.Panels.Register(PanelIds.Vitals, _ => new MarkupControl(["vitals"])); + var session = app.BindWorldWithoutConnecting(config.Worlds[0]); + await Assert.That(app.PaneIds).IsEquivalentTo(new[] { "panel:output" }); + + var rebuilds = app.PaneAreaRebuilds; + for (var hp = 400; hp < 410; hp++) + { + session.GameData.SetGmcp("Char.Vitals", $$"""{"hp":"{{hp}}","maxhp":"500"}"""); + } + + await Assert.That(app.PaneAreaRebuilds).IsEqualTo(rebuilds); // nothing until the burst settles + time.Advance(SharpMUTermApp.LayoutRefoldDelay); + await Assert.That(app.PaneIds).Contains("panel:vitals"); + await Assert.That(app.PaneAreaRebuilds).IsEqualTo(rebuilds + 1); + + rebuilds = app.PaneAreaRebuilds; + session.GameData.SetGmcp("Char.Vitals", """{"hp":"12","maxhp":"500"}"""); + time.Advance(SharpMUTermApp.LayoutRefoldDelay); + await Assert.That(app.PaneAreaRebuilds).IsEqualTo(rebuilds); // the same panels: no reflow + } + + [Test] + public async Task RearrangingThePanesHandsThemToThePlayer() + { + var (app, config, time) = Live(); + await using var _app = app; + config.Worlds[0].Layout = BuiltInLayouts.CombatId; + app.Panels.Register(PanelIds.Vitals, _ => new MarkupControl(["vitals"])); + var session = app.BindWorldWithoutConnecting(config.Worlds[0]); + + app.OpenUnownedWindowForTest("aside", "Aside"); // a second tab, so the split has something to move + var shape = app.PaneIds.Count; + app.DispatchCommand("layout:split-right"); + await Assert.That(app.PaneIds.Count).IsEqualTo(shape + 1); + session.GameData.SetGmcp("Char.Vitals", """{"hp":"400","maxhp":"500"}"""); + time.Advance(SharpMUTermApp.LayoutRefoldDelay); + + await Assert.That(app.PaneIds).DoesNotContain("panel:vitals"); + await Assert.That(app.LiveLayoutId).IsNull(); + } + + [Test] + public async Task SaveAsNewCapturesTheArrangementAndCPutsItToUse() + { + var config = DemoScene.Build(); + await using var app = Demo(config); + app.RenderSnapshot("layout-combat"); + app.SimulateKey(AltM); + + app.SimulateLayoutsKey(Letter('n')); + await Assert.That(config.Layouts.Count).IsEqualTo(1); + var saved = config.Layouts[0]; + await Assert.That(saved.Name).IsEqualTo("Combat 2"); + await Assert.That(saved.PlacementOf(PanelIds.Map)!.Region).IsEqualTo(LayoutRegion.Side); + await Assert.That(saved.PlacementOf(PanelIds.Chat)!.TabOf).IsEqualTo(PanelIds.Map); + + app.SimulateLayoutsKey(Letter('c')); + var corvid = config.Worlds[0].Characters.First(c => c.Name == DemoScene.MainCharacterName); + await Assert.That(corvid.Layout).IsEqualTo(saved.Id); + await Assert.That(string.Join("\n", app.LayoutsLines)).Contains("Corvid uses Combat 2"); + } + + [Test] + public async Task SavingChangesToABuiltInSavesACopyAndPointsTheCharacterAtIt() + { + var config = DemoScene.Build(); + await using var app = Demo(config); + app.RenderSnapshot("layout-combat"); + app.SimulateKey(AltM); + app.SimulateLayoutsKey(new ConsoleKeyInfo('\0', ConsoleKey.DownArrow, false, false, false)); // Combat + + app.SimulateLayoutsKey(Letter('s')); + + await Assert.That(BuiltInLayouts.Combat.Placements.Count).IsEqualTo(5); // untouched + var copy = config.Layouts.Single(); + var corvid = config.Worlds[0].Characters.First(c => c.Name == DemoScene.MainCharacterName); + await Assert.That(corvid.Layout).IsEqualTo(copy.Id); + await Assert.That(app.LiveLayoutId).IsEqualTo(copy.Id); + } + + [Test] + public async Task TheSuggestionIsTakenOnceAndSaidOnce() + { + var (app, config, _) = Live(); + await using var _app = app; + var session = app.BindWorldWithoutConnecting(config.Worlds[0]); + session.GameData.SetGmcp("Char.Vitals", """{"hp":"400","maxhp":"500"}"""); + + app.AcceptLayoutSuggestion(session); + app.AcceptLayoutSuggestion(session); + + await Assert.That(config.Worlds[0].AcceptedLayoutSuggestion).IsEqualTo(BuiltInLayouts.CombatId); + var said = app.Messages.Entries.Count(m => m.Text.Contains("Using the Combat layout", StringComparison.Ordinal)); + await Assert.That(said).IsEqualTo(1); + await Assert.That(app.LiveLayoutId).IsEqualTo(BuiltInLayouts.CombatId); + } + + [Test] + public async Task TheWorldsScreenOffersEveryLayoutAndAWordForNone() + { + IReadOnlyList all = [.. BuiltInLayouts.All, new LayoutDefinition { Id = "x1", Name = "Mine" }]; + + await Assert.That(WorldsScreenRenderer.LayoutChoices(all, WorldsScreenRenderer.WorldLayoutDefault)) + .IsEquivalentTo(new[] { "(suggested)", "Roleplay", "Combat", "Mine" }); + await Assert.That(WorldsScreenRenderer.LayoutId(all, "mine")).IsEqualTo("x1"); + await Assert.That(WorldsScreenRenderer.LayoutId(all, WorldsScreenRenderer.CharacterLayoutDefault)).IsNull(); + await Assert.That(WorldsScreenRenderer.LayoutName(all, "gone")).IsNull(); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/ScreenModelTests.cs b/tests/SharpMUTerm.Tui.Tests/ScreenModelTests.cs index 4cc3c22e..81ec108d 100644 --- a/tests/SharpMUTerm.Tui.Tests/ScreenModelTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/ScreenModelTests.cs @@ -512,7 +512,7 @@ public async Task Worlds_TheCharacterRowCarriesItsLogFormatFolderAndRestoreSwitc var model = WorldsScreenRenderer.Model(worlds, Sets(), 0, 0); var row = model.RowAt(WorldsScreenRenderer.CharactersPane, 0); - await Assert.That(row.FieldCount).IsEqualTo(10); + await Assert.That(row.FieldCount).IsEqualTo(11); await Assert.That(row.FieldAt(WorldsScreenRenderer.CharacterNameField)!.Value.Get()).IsEqualTo("Kaz"); await Assert.That(row.FieldAt(WorldsScreenRenderer.LogFormatField)!.Value.Get()).IsEqualTo("Html"); await Assert.That(row.FieldAt(WorldsScreenRenderer.LogDirectoryField)!.Value.Get()).IsEqualTo("/logs/kaz"); From 01377316a7c7ebd4341808681982bce4c4dc6c80 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 03:53:14 +0000 Subject: [PATCH 011/113] Settings, rebuilt (first pass): declared F7/F8, search, changed marks, meter table MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit F7 and F8 are drawn from settings sections declared in SharpMUTerm.Client (BuiltInSettings): each field has a group heading and a SettingBinding over the configuration, whose default is read off a fresh AppConfiguration. F7 is now "Text & display", grouped under Colour & legibility, Text, Links & pictures, Status row & meters, Activity and Sound, and windowed to the screen height so nothing runs off a 24-row terminal. - `/` on any settings screen opens a search over every declared field and every screen title, with a per-section match count; Enter goes to the field on its own screen, Esc puts the screen back. - A field away from its default is marked "● changed"; `r` resets it through the same save funnel. The header names `r reset` only there. - F7's meters are a table: label, value path, maximum path and a live `now` column from the focused session's game data, [+ meter], Delete to remove, a box of received paths while the cursor is in the table, and the path fields offer those paths with their values. Snapshot views settings-search, settings-meters, settings-meters-pick and settings-changed, in the parity list and FrameContrastTests. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 11 + CLAUDE.md | 31 +- .../Contributions/Descriptors.cs | 32 +- .../Settings/BuiltInSettings.cs | 213 +++++ .../Settings/SettingBinding.cs | 99 +++ .../Settings/SettingsSearch.cs | 75 ++ .../Configuration/AppConfiguration.cs | 2 +- .../Configuration/PreferenceSettings.cs | 2 +- src/SharpMUTerm.Tui/MacroKeys.cs | 2 +- src/SharpMUTerm.Tui/OptionsScreenRenderer.cs | 740 +++++++++++++----- src/SharpMUTerm.Tui/OptionsScreenView.cs | 19 +- src/SharpMUTerm.Tui/ScreenChrome.cs | 30 +- src/SharpMUTerm.Tui/ScreenEdits.cs | 11 + src/SharpMUTerm.Tui/ScreenField.cs | 13 +- src/SharpMUTerm.Tui/ScreenModel.cs | 10 +- src/SharpMUTerm.Tui/SettingsOverlay.cs | 126 ++- src/SharpMUTerm.Tui/SettingsSearchSurface.cs | 342 ++++++++ src/SharpMUTerm.Tui/SettingsSession.cs | 24 +- .../SharpMUTermApp.Settings.cs | 93 +++ src/SharpMUTerm.Tui/SharpMUTermApp.cs | 105 ++- src/SharpMUTerm.Tui/SnapshotViews.cs | 1 + .../SettingsDeclarationTests.cs | 108 +++ .../ClientHostContractTests.cs | 3 +- .../FrameContrastTests.cs | 4 + tests/SharpMUTerm.Tui.Tests/GameDataTests.cs | 80 +- .../OptionsScreenRendererTests.cs | 3 +- .../ScreenCursorTests.cs | 7 +- .../SharpMUTerm.Tui.Tests/ScreenModelTests.cs | 33 +- .../SettingsSearchTests.cs | 148 ++++ 29 files changed, 2085 insertions(+), 282 deletions(-) create mode 100644 src/SharpMUTerm.Client/Settings/BuiltInSettings.cs create mode 100644 src/SharpMUTerm.Client/Settings/SettingBinding.cs create mode 100644 src/SharpMUTerm.Client/Settings/SettingsSearch.cs create mode 100644 src/SharpMUTerm.Tui/SettingsSearchSurface.cs create mode 100644 src/SharpMUTerm.Tui/SharpMUTermApp.Settings.cs create mode 100644 tests/SharpMUTerm.Client.Tests/SettingsDeclarationTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/SettingsSearchTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 911140d8..195d1164 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- Search the settings: press `/` on any settings screen and type. Every option, and every settings screen by + name, is listed with how many matches each screen holds; ⏎ goes straight to the option on its own screen. +- A setting you have changed from its default is marked `● changed` on Text & display (F7) and Input (F8), + and `r` on it puts the default back. - Make a trigger without writing a regex: select a line of output and choose Ctrl+P ▸ *Make a trigger from the selection* (also on the right-click menu). Triggers (F2) opens on a new rule whose pattern is the line with its numbers, quoted speech and known player names turned into `*`, and shows the regex behind it. @@ -115,6 +119,13 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Changed +- The status row's meters are edited in a table on Text & display (F7): one row per meter with its label, + value path and maximum path, what it reads now, `[+ meter]`, and Delete to remove one. While you are in + the table it lists the game data this connection has received, and a path field offers those paths, with + their values, to pick from. +- F7 is now called Text & display and its options are grouped under Colour & legibility, Text, Links & + pictures, Status row & meters, Activity and Sound. A list taller than the terminal scrolls with the cursor + instead of running off the bottom. - The ten pane colours a character can be given (F5 ▸ `tint`) have been re-chosen so they stay apart for players with red-green or blue-yellow colour blindness, and a little further apart for everyone else. The names are unchanged, so nothing needs setting again; Ochre is now a red ochre and Ember a red. In the diff --git a/CLAUDE.md b/CLAUDE.md index d964b7d1..787eff08 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -999,7 +999,11 @@ python3 tools/ansi_frame_to_image.py frame.ansi frame.html # or .svg holds the two sides together; when you add state the demo fakes, pin it against the live writer the same way. - **Views:** `worlds`/`settings`, `triggers`, `route`, `highlight`, `aliases`, `timers`, `keypad`, - `set`, `textansi`, `input`, `logging`, `password`, `startup`, `freeze`, `spawn`, `split`, `move`, `drag`, + `set`, `textansi`, `input`, `settings-search` (F7, `/`, `meter` typed: the search with its section + list and match counts), `settings-meters`/`settings-meters-pick` (the meter table over the demo's game + data, the cursor on a meter with the received-data box under it, and the same meter's value path open with + its dropdown of received paths), `settings-changed` (F7 after two real edits: the `● changed` marks and + `r reset`), `logging`, `password`, `startup`, `freeze`, `spawn`, `split`, `move`, `drag`, `history`, `history-search`, `history-search-filter`, `draft`, `draft2`, `menu`, `menu-split`, `messages`, `quit`, `connections` (**two connections on one world** — the one view where the header's fraction, the rail's dots and the quit prompt's count are all visible together and all have to agree; @@ -1202,6 +1206,31 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] - **`PromptControl` is not the command line** — `InputBarControl` is, built on `MultilineEditControl`. 2.7 gave `PromptControl` an opt-in multiline mode (`Multiline`, `MinRows`/`MaxRows`, `EnterBehavior`), but it has no undo and no gutter for the prompt. +- **Settings are declared in Client, and F7 and F8 are drawn from the declarations** + (`SharpMUTerm.Client/Settings/BuiltInSettings.cs`; `SettingBinding`, `SettingsSearch`; Tui + `OptionsScreenRenderer.FromSection`, `SettingsSearchSurface`, `SharpMUTermApp.Settings.cs`). A section is a + settings screen (id, title, key, order) registered in `ContributionRegistry.SettingsSections`; every screen + F2–F10 is one, and the screen table (`SettingsScreens`) reads its titles from them, so ⌃P, the header and the + search say one name. **To add a field**: add a descriptor to its section with a `Group` (a heading, never a + screen) and a `SettingBinding` over the configuration property. The screen draws it, `/` finds it, and + `● changed` and `r reset` work on it with nothing else written. Things not to relitigate: + - **A default is never written in a declaration.** It is what the binding reads off a fresh + `AppConfiguration`, so the configuration types stay the one place a default is decided; a list default is + re-read per reset, so two configurations never share one. + - **`r` resets, and only where it would do something.** A row carries a reset only while it differs from + its default (`ScreenRow.Reset`), so the header names `r reset` exactly there. It goes through + `ScreenEdits.Apply`, the save funnel. On the meter table `r` resets the whole list (the field is the list). + - **`/` is the overlay's, not a screen's**, and only while the screen is navigating — inside a field it is a + character. The search is drawn in the same window in place of the screen (content-swapping, the + `_behind` reason); Esc puts the screen back untouched, ⏎ goes through `SettingsOverlay.Show`, which swaps + the screen in place. It matches label, group, help and keywords, and a section's title only when none of + its fields matched, so an undeclared screen is still found by name. + - **The meter table is F7's one non-row field.** A meter is a row of three fields (label, value path, + maximum path); `now` reads `SendTarget()`'s game data (never `_active`'s); Delete on a meter row is a hidden + trailing Remove button added only while the cursor is on one; the received-data box shows only while the + cursor is in the table; path fields offer the received paths with their values as `ChoiceNotes`. + - F7 and F8 are windowed to the screen height (`ScreenChrome.Window`), because F7 is taller than 24 rows. + - Not declared yet: F2–F6, F9 (F5's character form) and F10 are listed by title only. - **Settings screens have no `IPasteTarget` and cannot easily have one.** They are markup rebuilt wholesale every key, with the edited field a buffer in `SettingsSession`. `SettingsOverlay` listens at `IConsoleDriver.Paste` instead. That can't double-fire *only* because no control on diff --git a/src/SharpMUTerm.Client/Contributions/Descriptors.cs b/src/SharpMUTerm.Client/Contributions/Descriptors.cs index 9590c05f..e5a5295b 100644 --- a/src/SharpMUTerm.Client/Contributions/Descriptors.cs +++ b/src/SharpMUTerm.Client/Contributions/Descriptors.cs @@ -1,3 +1,4 @@ +using SharpMUTerm.Client.Settings; using SharpMUTerm.Core.Text; namespace SharpMUTerm.Client.Contributions; @@ -26,8 +27,10 @@ public sealed class PanelContribution : IContribution } /// -/// Settings sections are groups of fields on a settings screen. This slice carries the descriptors only; -/// nothing renders them yet. Sections are read in , ties in registration order. +/// Settings sections are the settings screens, each with the fields it declares. A section with fields +/// is drawn from them (F7 and F8 are; see ); a section with none is still listed, +/// by its title, wherever the screens are listed — the settings search names it and opens it. Sections are read +/// in , ties in registration order. /// public sealed class SettingsSectionContribution : IContribution { @@ -45,10 +48,31 @@ public sealed class SettingsSectionContribution : IContribution /// Its fields, in the order they are shown. public IReadOnlyList Fields { get; init; } = Array.Empty(); + + /// The key that opens its screen (F7), or null for a section no key opens. + public string? Key { get; init; } } -/// One field of a settings section: its id within the section, its label and an optional line of help. -public abstract record SettingsField(string Id, string Label, string? Help = null); +/// +/// One field of a settings section: its id within the section, its label and an optional line of help. +/// +/// is the heading it is drawn under — consecutive fields with the same group share one +/// heading, so a group is a heading and never a screen of its own. is where the value +/// lives in the configuration; a field with one can say whether it differs from its default and be reset. +/// are further words the settings search finds the field by. +/// +/// +public abstract record SettingsField(string Id, string Label, string? Help = null) +{ + /// The heading the field is drawn under, or null for none. + public string? Group { get; init; } + + /// Where its value lives, or null for a field that only describes. + public SettingBinding? Binding { get; init; } + + /// Further words the search finds it by, space-separated. + public string? Keywords { get; init; } +} /// A tick box. public sealed record BoolField(string Id, string Label, string? Help = null) : SettingsField(Id, Label, Help); diff --git a/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs b/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs new file mode 100644 index 00000000..c700a2b9 --- /dev/null +++ b/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs @@ -0,0 +1,213 @@ +using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Core.Configuration; + +namespace SharpMUTerm.Client.Settings; + +/// +/// The client's own settings screens, declared: one section per screen, in F-key order of the screens' place +/// in the list, each carrying the key that opens it. F7 () and F8 () +/// declare their fields and are drawn from them; the rest are listed by title so the settings search can name +/// them and take a reader there, and declare fields as they are moved over. +/// +/// To add a field: add a descriptor to its section's list with a (the +/// heading it sits under) and a over the configuration property that holds it. +/// The screen draws it, the search finds it, and ● changed and the reset key work on it with nothing +/// else written — the default is read off a fresh , never restated here. +/// +/// +public static class BuiltInSettings +{ + /// F7's groups, in the order they are drawn. Colour and legibility: what the client does with the colours a world sends. + public const string ColourGroup = "Colour & legibility"; + + /// Text: how a line's characters are laid out. + public const string TextGroup = "Text"; + + /// Links and pictures: what counts as a link and how one is drawn. + public const string LinksGroup = "Links & pictures"; + + /// The status row's meters. + public const string MetersGroup = "Status row & meters"; + + /// The bar marking where a reader left a window. + public const string ActivityGroup = "Activity"; + + /// Game sound; drawn only where a host passes the sound settings. + public const string SoundGroup = "Sound"; + + /// The id of the meters field, which a host draws as a table rather than one value. + public const string MetersField = "meters"; + + /// F7: how a world's text is drawn. + public static SettingsSectionContribution Text { get; } = new() + { + Id = "text", + Title = "Text & display", + Key = "F7", + Order = 60, + Fields = + [ + Flag("strip-colour", "strip incoming ANSI colour", ColourGroup, + c => c.Text.StripIncomingColour, (c, v) => c.Text.StripIncomingColour = v, + "draw every line in the theme's own colours", "sgr monochrome color"), + Flag("legible", "keep text legible", ColourGroup, + c => c.Text.KeepTextLegible, (c, v) => c.Text.KeepTextLegible = v, + "lift a colour that would be unreadable on the pane", "contrast color"), + Flag("blink", "allow blink", ColourGroup, + c => c.Text.AllowBlink, (c, v) => c.Text.AllowBlink = v, + "let a world's blinking text blink", "flash"), + Number("transparency", "background transparency (%)", 0, TextSettings.MaxBackgroundTransparency, + ColourGroup, + c => c.Text.BackgroundTransparency, (c, v) => c.Text.BackgroundTransparency = v, + "how see-through the panes are on a terminal that can do it; 0 is off", + "opacity translucent kitty background"), + + Number("tab-width", "tab width (spaces)", 0, TextSettings.MaxTabWidth, TextGroup, + c => c.Text.TabWidth, (c, v) => c.Text.TabWidth = v, + "how many spaces a tab expands to; 0 deletes tabs", "whitespace tabs"), + Flag("emoji", "emoji substitution", TextGroup, + c => c.Text.EmojiSubstitution, (c, v) => c.Text.EmojiSubstitution = v, + "draw :smile: style codes as the emoji they name", "unicode"), + + Flag("underline-links", "underline hyperlinks", LinksGroup, + c => c.Text.UnderlineHyperlinks, (c, v) => c.Text.UnderlineHyperlinks = v, + "underline every clickable link", "url"), + Flag("detect-links", "detect links in output", LinksGroup, + c => c.Text.DetectLinks, (c, v) => c.Text.DetectLinks = v, + "make an http(s) address a world prints clickable", "url browser"), + + new ListField( + MetersField, + "meters", + [ + new TextField("label", "label", StatusMeter.MaxLabelLength), + new TextField("value", "value path"), + new TextField("max", "maximum path"), + ], + "game data the status row shows, such as hp 412/500") + { + Group = MetersGroup, + Keywords = "gauge gmcp msdp vitals hp mana status", + Binding = new SettingBinding>( + c => c.Text.StatusMeters, + (c, v) => c.Text.StatusMeters = v, + StatusMeter.Format, + v => v.Count == 0 ? "none" : string.Join(" · ", v.Select(m => m.Label))), + }, + + Number("activity-seconds", "activity bar holds for (seconds)", 0, TextSettings.MaxActivityBarSeconds, + ActivityGroup, + c => c.Text.ActivityBarSeconds, (c, v) => c.Text.ActivityBarSeconds = v, + "how long the NEW bar stays once you are back; 0 retires it at once", "unread new away"), + + Flag("sound", "game sound", SoundGroup, + c => c.Sound.Enabled, (c, v) => c.Sound.Enabled = v, + "play the sounds and music a world sends", "audio mcmp msp"), + Number("master-volume", "master volume (%)", 0, SoundSettings.MaxVolume, SoundGroup, + c => c.Sound.MasterVolume, (c, v) => c.Sound.MasterVolume = v, null, "audio loudness"), + Number("sound-volume", "sound volume (%)", 0, SoundSettings.MaxVolume, SoundGroup, + c => c.Sound.SoundVolume, (c, v) => c.Sound.SoundVolume = v, null, "audio loudness effects"), + Number("music-volume", "music volume (%)", 0, SoundSettings.MaxVolume, SoundGroup, + c => c.Sound.MusicVolume, (c, v) => c.Sound.MusicVolume = v, null, "audio loudness"), + Flag("captions", "sound captions", SoundGroup, + c => c.Sound.Captions, (c, v) => c.Sound.Captions = v, + "print a line of text for each sound", "audio subtitles accessibility"), + ], + }; + + /// F8's groups. + public const string InputGroup = "Input"; + + /// The command line's own size. + public const string CommandLineGroup = "Command line"; + + /// F8: the command line. + public static SettingsSectionContribution Input { get; } = new() + { + Id = "input", + Title = "Input", + Key = "F8", + Order = 70, + Fields = + [ + Flag("echo", "local echo", InputGroup, + c => c.Input.LocalEcho, (c, v) => c.Input.LocalEcho = v, + "show what you send in the output", "typed commands"), + Flag("drafts", "keep per-tab drafts", InputGroup, + c => c.Input.KeepDrafts, (c, v) => c.Input.KeepDrafts = v, + "each window keeps the line you were typing", "unsent"), + Flag("no-logins", "keep logins out of history", InputGroup, + c => c.Input.ExcludeCredentials, (c, v) => c.Input.ExcludeCredentials = v, + "a typed connect line and its password are not recorded", "password secret credentials"), + Number("rows", "height (lines)", InputSettings.MinRows, InputSettings.MaxRowCeiling, CommandLineGroup, + c => c.Input.Rows, (c, v) => c.Input.Rows = v, + "how many rows the command line starts at", "size"), + Number("max-rows", "grows to (lines)", InputSettings.MinRows, InputSettings.MaxRowCeiling, + CommandLineGroup, + c => c.Input.MaxRows, (c, v) => c.Input.MaxRows = v, + "how tall a long line may make it", "size wrap"), + Flag("second-bar", "second bar on new windows", CommandLineGroup, + c => c.Input.SecondBar, (c, v) => c.Input.SecondBar = v, + "open new windows with a second command line", "split input"), + ], + }; + + /// Every section the client declares, in their order: the screens F2 to F10. + public static IReadOnlyList All { get; } = + [ + Listed("worlds", "Worlds & Characters", "F5", 10), + Listed("triggers", "Triggers & spawn routing", "F2", 20), + Listed("aliases", "Aliases", "F3", 30), + Listed("keypad", "Keypad & hotkeys", "F4", 40), + Listed("timers", "Timers", "F6", 50), + Text, + Input, + Listed("logging", "Character logging", "F9", 80), + Listed("packages", "Packages", "F10", 90), + ]; + + /// Registers every built-in section. + public static void Register(SettingsSectionList sections) + { + ArgumentNullException.ThrowIfNull(sections); + foreach (var section in All) + { + sections.Add(section); + } + } + + private static SettingsSectionContribution Listed(string id, string title, string key, int order) => + new() { Id = id, Title = title, Key = key, Order = order }; + + private static BoolField Flag( + string id, + string label, + string group, + Func get, + Action set, + string? help = null, + string? keywords = null) => + new(id, label, help) + { + Group = group, + Keywords = keywords, + Binding = new SettingBinding(get, set, v => v ? "on" : "off"), + }; + + private static NumberField Number( + string id, + string label, + int minimum, + int maximum, + string group, + Func get, + Action set, + string? help = null, + string? keywords = null) => + new(id, label, minimum, maximum, help) + { + Group = group, + Keywords = keywords, + Binding = new SettingBinding(get, set), + }; +} diff --git a/src/SharpMUTerm.Client/Settings/SettingBinding.cs b/src/SharpMUTerm.Client/Settings/SettingBinding.cs new file mode 100644 index 00000000..6a3c4ca7 --- /dev/null +++ b/src/SharpMUTerm.Client/Settings/SettingBinding.cs @@ -0,0 +1,99 @@ +using System.Globalization; +using SharpMUTerm.Core.Configuration; + +namespace SharpMUTerm.Client.Settings; + +/// +/// Where a declared setting lives in the : how to read it, how to write it, and +/// what it is when nobody has touched it. The untyped half is what every surface needs to say +/// ● changed and to reset a value; is what a renderer reads the value +/// through. +/// +/// The default is never written down. It is whatever the binding reads off a freshly constructed +/// , so the configuration types stay the one place a default is decided and a +/// declaration cannot disagree with them. +/// +/// +public abstract class SettingBinding +{ + /// Whether the value in is its default. + public abstract bool IsDefault(AppConfiguration config); + + /// Puts the default back into . + public abstract void Reset(AppConfiguration config); + + /// The value as text, the way a search result or a summary shows it. + public abstract string Text(AppConfiguration config); + + /// The default as text. + public abstract string DefaultText { get; } +} + +/// A setting of type . +/// What the configuration holds. +public sealed class SettingBinding : SettingBinding +{ + private readonly Func _get; + private readonly Action _set; + private readonly Func? _format; + private readonly Func? _describe; + private readonly Lazy _defaultText; + + /// Reads the value. It must not change the configuration. + /// Writes the value. + /// + /// The value as text, which is also what two values are compared by. Needed for a value with no useful + /// ToString — a list compares by what it lists, not by reference. + /// + /// + /// The value as a reader is shown it in a summary, when that is shorter than — + /// a list of meters reads as their labels. + /// + public SettingBinding( + Func get, + Action set, + Func? format = null, + Func? describe = null) + { + ArgumentNullException.ThrowIfNull(get); + ArgumentNullException.ThrowIfNull(set); + _get = get; + _set = set; + _format = format; + _describe = describe; + _defaultText = new Lazy(() => Format(Default)); + } + + /// The value in . + public T Get(AppConfiguration config) => _get(config); + + /// Writes into . + public void Set(AppConfiguration config, T value) => _set(config, value); + + /// + /// The default, read off a fresh configuration each time — so a default that is a list is never one + /// instance shared between every configuration that is reset to it. + /// + public T Default => _get(new AppConfiguration()); + + /// A value as text. + public string Format(T value) => + _format?.Invoke(value) ?? Convert.ToString(value, CultureInfo.InvariantCulture) ?? string.Empty; + + /// + public override string DefaultText => _defaultText.Value; + + /// + public override bool IsDefault(AppConfiguration config) => + string.Equals(Format(Get(config)), DefaultText, StringComparison.Ordinal); + + /// + public override void Reset(AppConfiguration config) => Set(config, Default); + + /// + public override string Text(AppConfiguration config) + { + var value = Get(config); + return value is bool flag ? (flag ? "on" : "off") : _describe?.Invoke(value) ?? Format(value); + } +} diff --git a/src/SharpMUTerm.Client/Settings/SettingsSearch.cs b/src/SharpMUTerm.Client/Settings/SettingsSearch.cs new file mode 100644 index 00000000..9f1eef47 --- /dev/null +++ b/src/SharpMUTerm.Client/Settings/SettingsSearch.cs @@ -0,0 +1,75 @@ +using SharpMUTerm.Client.Contributions; + +namespace SharpMUTerm.Client.Settings; + +/// +/// One thing the settings search found: a field of a section, or — for a section that declares no fields, or +/// whose title matched where none of its fields did — the section itself. and +/// say where in the query was found, so a host can mark it; both are +/// -1/0 when the match was in text the host does not draw (the help line or the keywords). +/// +/// The section it is in. +/// The field, or null for the section itself. +/// What a result row reads: the field's label, or the section's title. +/// Where the query starts in , or -1. +/// How long the matched run is. +public sealed record SettingsMatch( + SettingsSectionContribution Section, SettingsField? Field, string Text, int Start, int Length); + +/// +/// The settings search: a query matched against every declared field's label, group, help line and keywords, +/// and against every section's title — so a screen whose fields are not declared yet is still found by name. +/// Case is ignored and the match is a plain substring, the rule ⌃R and ⌃F already follow. Pure, so the whole +/// contract is testable without a screen. +/// +public static class SettingsSearch +{ + /// + /// Every match for , in section order and then field order. An empty query matches + /// nothing: there is no list to narrow, and every field at once is what the screens already are. + /// + public static IReadOnlyList Find(IEnumerable sections, string? query) + { + ArgumentNullException.ThrowIfNull(sections); + + var q = (query ?? string.Empty).Trim(); + var matches = new List(); + if (q.Length == 0) + { + return matches; + } + + foreach (var section in sections) + { + var found = 0; + foreach (var field in section.Fields) + { + var at = field.Label.IndexOf(q, StringComparison.OrdinalIgnoreCase); + if (at >= 0 || Contains(field.Group, q) || Contains(field.Help, q) || Contains(field.Keywords, q)) + { + matches.Add(new SettingsMatch(section, field, field.Label, at, at >= 0 ? q.Length : 0)); + found++; + } + } + + var title = section.Title.IndexOf(q, StringComparison.OrdinalIgnoreCase); + if (found == 0 && title >= 0) + { + matches.Add(new SettingsMatch(section, null, section.Title, title, q.Length)); + } + } + + return matches; + } + + /// How many of are in each section, by section id. + public static IReadOnlyDictionary CountBySection(IEnumerable matches) + { + ArgumentNullException.ThrowIfNull(matches); + return matches.GroupBy(m => m.Section.Id, StringComparer.Ordinal) + .ToDictionary(g => g.Key, g => g.Count(), StringComparer.Ordinal); + } + + private static bool Contains(string? text, string query) => + text is not null && text.Contains(query, StringComparison.OrdinalIgnoreCase); +} diff --git a/src/SharpMUTerm.Core/Configuration/AppConfiguration.cs b/src/SharpMUTerm.Core/Configuration/AppConfiguration.cs index fda2a605..d1e05953 100644 --- a/src/SharpMUTerm.Core/Configuration/AppConfiguration.cs +++ b/src/SharpMUTerm.Core/Configuration/AppConfiguration.cs @@ -75,7 +75,7 @@ public sealed class AppConfiguration /// public List CharsetOrder { get; set; } = new() { "utf-8", "iso-8859-1" }; - /// How inbound text is drawn — the F7 "Text & ANSI" screen's settings. + /// How inbound text is drawn — the F7 "Text & display" screen's settings. public TextSettings Text { get; set; } = new(); /// Game sound: on or off, the player's levels, captions (F7 ▸ SOUND). diff --git a/src/SharpMUTerm.Core/Configuration/PreferenceSettings.cs b/src/SharpMUTerm.Core/Configuration/PreferenceSettings.cs index 81ff7239..4a643d5a 100644 --- a/src/SharpMUTerm.Core/Configuration/PreferenceSettings.cs +++ b/src/SharpMUTerm.Core/Configuration/PreferenceSettings.cs @@ -1,7 +1,7 @@ namespace SharpMUTerm.Core.Configuration; /// -/// Application-wide text rendering preferences — the settings the F7 "Text & ANSI" screen edits. +/// Application-wide text rendering preferences — the settings the F7 "Text & display" screen edits. /// These are global rather than per world: they describe how *this terminal* draws what any world /// sends, so a world's own and /// stay where they are. diff --git a/src/SharpMUTerm.Tui/MacroKeys.cs b/src/SharpMUTerm.Tui/MacroKeys.cs index e6584d76..8c8a8492 100644 --- a/src/SharpMUTerm.Tui/MacroKeys.cs +++ b/src/SharpMUTerm.Tui/MacroKeys.cs @@ -185,7 +185,7 @@ private static AppShortcut[] BuildAppShortcuts() new((ConsoleModifiers)0, ConsoleKey.F4, "opens this screen"), new((ConsoleModifiers)0, ConsoleKey.F5, "opens Worlds"), new((ConsoleModifiers)0, ConsoleKey.F6, "opens Timers"), - new((ConsoleModifiers)0, ConsoleKey.F7, "opens Text & ANSI"), + new((ConsoleModifiers)0, ConsoleKey.F7, "opens Text & display"), new((ConsoleModifiers)0, ConsoleKey.F8, "opens Input"), new((ConsoleModifiers)0, ConsoleKey.F9, "opens the character's log"), // F10 is Packages, the composer's case: a different surface, claimed so F4 says so. diff --git a/src/SharpMUTerm.Tui/OptionsScreenRenderer.cs b/src/SharpMUTerm.Tui/OptionsScreenRenderer.cs index 58757a33..38a21cae 100644 --- a/src/SharpMUTerm.Tui/OptionsScreenRenderer.cs +++ b/src/SharpMUTerm.Tui/OptionsScreenRenderer.cs @@ -1,30 +1,44 @@ using System.Globalization; +using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Client.Settings; using SharpMUTerm.Core.Configuration; using SharpMUTerm.Core.Input; +using SharpMUTerm.Core.Protocols; using static SharpMUTerm.Tui.MarkupText; using static SharpMUTerm.Tui.ScreenPalette; namespace SharpMUTerm.Tui; /// -/// Produces the markup sub-blocks shared by the F7 (Text & ANSI) and F8 (Input & spellcheck) -/// screens — the header band, the options list (toggle/value rows grouped under dim section headers), -/// and the footer action bar. The two screens differ only in their title, F-key, and rows, so the -/// blocks take an rather than being written per screen. -/// composes them into a real panel for the live/snapshot view; -/// merges the same blocks into a single -/// line list for the unit tests. Pure so every block is testable. +/// Produces the markup sub-blocks of the single-list option screens — F7 (Text & display) and F8 +/// (Input) — the header band, the options list (rows grouped under dim headings), and the footer action +/// bar. composes them into real panels; merges the same blocks into one line list for the unit tests. /// -/// F9 was a third one, "Logging", and is gone: its rows edited one character's -/// — whichever was connected, or else the first configured — while -/// presenting as a global preference. Logging now sits in the character's own form on F5, and F9 opens +/// Both screens are drawn from their declared settings sections (, in +/// the Client): one row per field, a heading wherever the field's group changes, and the value read and +/// written through the field's . A field that differs from its default says +/// ● changed and carries the reset r runs. Nothing about a row is written here any more except +/// how a kind of field is drawn, so a field added to a section appears on its screen, in the search and +/// under the reset key at once. +/// +/// +/// F7's meters field is the one drawn as more than a row: a table, one row per meter with its label, +/// value path and maximum path as three fields (⏎ opens the label, ⇥ steps on), the value now in a fourth +/// column read from the focused session's game data, [[+ meter]] under it, and — while the cursor is +/// in the table — the paths this connection has received, with their values, which a path field also offers +/// as its dropdown. +/// +/// +/// F9 was a third one, "Logging", and is gone: its rows edited one character's +/// while presenting as a global preference. Logging sits in the character's own form on F5, and F9 opens /// that screen there. See . /// /// internal static class OptionsScreenRenderer { /// Where a row's value starts, measured from the left edge of the list. - private const int LabelWidth = 28; + private const int LabelWidth = 38; /// /// The checkbox column every row reserves, whether or not it has one: "[[x]] ". A value row @@ -33,28 +47,56 @@ internal static class OptionsScreenRenderer /// private const int AffordanceWidth = 4; + /// What a field that differs from its default says, after its value. + internal const string ChangedMark = "● changed"; + /// - /// A single options-list row: a toggle, a value row, both at once, a section header, or a spacer. - /// is the config the checkbox writes to; is the - /// config the value writes to, which is what makes a value row activatable with ⏎. A row with - /// neither still takes the cursor but nothing happens there. - /// - /// Carrying both is supported and currently unused: F9's log format was the case that needed it - /// (Space started and stopped logging, ⏎ picked the format), and that row now lives on F5 where its - /// character is. F4's bindings are the same shape one layer down — Space enables the macro, ⏎ edits - /// its command — so keeps the capability whether or not this screen uses it. - /// + /// A single options-list row: a toggle, a value row, both at once, a section header, a spacer, or a + /// row drawn by its own . is the config the checkbox + /// writes to; (or , for a row of several) is what ⏎ + /// opens. A row with neither still takes the cursor but nothing happens there. /// + /// What the row is called; ├ marks a heading, empty a spacer. + /// The value it shows, or null for a checkbox row. + /// The checkbox's state, or null for none. + /// A dim note after the value. + /// What Space flips. + /// The one field ⏎ opens. + /// Several fields, ⏎ opening the first and ⇥ stepping on; wins over . + /// What ⏎ runs on a button row. + /// + /// Puts the row's setting back to its default; non-null exactly when it differs, which is also what + /// draws . + /// + /// + /// Draws the row itself, given the open edit on it (null while navigating) and the width — the meter + /// table's rows. Null for the ordinary checkbox and label/value shapes. + /// + /// Drawn but never a cursor stop: a table's column headings, the received-data box. + /// The declared field the row draws, so the search can land on it. + /// What the footer says while the cursor is on it, in place of option n/m. public readonly record struct OptionRow( string Label, string? Value, bool? Toggle, string? Hint = null, ScreenToggle? Bind = null, - ScreenField? Edit = null); + ScreenField? Edit = null, + IReadOnlyList? Fields = null, + ScreenButton? Button = null, + Action? Reset = null, + Func? Draw = null, + bool Static = false, + string? FieldId = null, + string? Where = null); - /// One options screen: the title and F-key its chrome shows, plus the rows it lists. - internal readonly record struct OptionsScreen(string Title, string FKey, IReadOnlyList Rows); + /// + /// One options screen: the title and F-key its chrome shows, the rows it lists, and — while the cursor is + /// on a row Delete can take out (a meter) — that removal, which the model carries as its pane's hidden + /// trailing button. + /// + internal readonly record struct OptionsScreen( + string Title, string FKey, IReadOnlyList Rows, ScreenButton? Remove = null); /// /// Merges every sub-block into one line list (header, options, footer). Used by the unit tests and @@ -78,45 +120,45 @@ public static List Render(string title, string fkey, IReadOnlyList /// The screen title on the left, the keyboard hints right-aligned to . The /// hints are derived from and rather than written - /// here, so the header cannot advertise an edit the screen doesn't offer; called without them it - /// describes a screen that only navigates. + /// here, so the header cannot advertise an edit the screen doesn't offer — r reset appears only + /// on a row that differs from its default, and Del remove only on a meter. /// - /// There is deliberately no ‹ back affordance. These screens were the only ones that drew - /// one, and it pointed nowhere: there is no navigation stack behind a settings screen, Esc closes - /// it, and the header already says so two columns to the right. + /// There is deliberately no ‹ back affordance: there is no navigation stack behind a settings + /// screen, Esc closes it, and the header already says so. /// /// internal static string HeaderLine( string title, string fkey, int width, ScreenModel? model = null, ScreenFocus? focus = null) { var heading = $"[bold {Value}]{Escape(title)}[/]"; + var resettable = model is not null && focus is { Edit: null } at && model.ResetAt(at.Pane, at.Index) is not null; var hints = ScreenChrome.Hints( ScreenChrome.SingleListHints, Escape(fkey), model?.HasEditableRow ?? false, - focus); + focus, + removable: model?.HasRemovableRow ?? false, + resettable: resettable); return SpreadTitle(" " + heading, hints, width); } /// - /// The action bar: where the cursor is in the options list on the left, cancel/save on the right. - /// It used to be an inventory (5 options · 2 sections); the section count was noise — the - /// headings are on screen and counting them tells nobody anything — and the option count answered a - /// different question from every other screen's footer. It now names the cursor's position and the - /// section it is standing in, which is F2's trigger 1/4 · set Comms in this screen's nouns. - /// The selected row comes from , the only thing that knows it. + /// The action bar: where the cursor is in the options list on the left — option 4/15 · COLOUR & + /// LEGIBILITY, or a row's own words (meter 2/3) — and the actions on the right. /// internal static string FooterLine(IReadOnlyList rows, int width, ScreenFocus? focus = null) { ArgumentNullException.ThrowIfNull(rows); - var options = rows.Count(r => !IsSpacer(r) && !IsSection(r)); + var options = rows.Count(IsNavigable); var context = string.Empty; if (options > 0) { var selected = Math.Clamp(focus?.Pane == 0 ? focus.Value.Index : 0, 0, options - 1); + var row = rows.Where(IsNavigable).ElementAt(selected); context = ScreenChrome.Context( - ScreenChrome.Position("option", selected, options), SectionOf(rows, selected)); + row.Where is { } where ? Escape(where) : ScreenChrome.Position("option", selected, options), + SectionOf(rows, selected)); } return SpreadLR(" " + context, ScreenChrome.Actions(focus: focus), width); @@ -138,7 +180,7 @@ internal static string FooterLine(IReadOnlyList rows, int width, Scre continue; } - if (IsSpacer(row)) + if (!IsNavigable(row)) { continue; } @@ -154,7 +196,7 @@ internal static string FooterLine(IReadOnlyList rows, int width, Scre /// /// The options list itself — one line per row, in order. The row under the keyboard cursor is - /// drawn on a cursor bar padded to ; spacers and section headers are + /// drawn on a cursor bar padded to ; spacers, headings and static rows are /// skipped when counting, so the cursor index matches 's row order. /// internal static List BodyColumn( @@ -167,14 +209,17 @@ internal static List BodyColumn( var navigable = 0; foreach (var row in rows) { - if (IsSpacer(row) || IsSection(row)) + if (!IsNavigable(row)) { - lines.Add(RenderRow(row, null)); + lines.Add(row.Draw is { } draw ? draw(null, width) : RenderRow(row, null)); continue; } - var line = RenderRow(row, cursor.EditOn(0, navigable, 0)); - lines.Add(ScreenChrome.Cursor(line, cursor.IsOn(0, navigable), width)); + var on = cursor.IsOn(0, navigable); + var line = row.Draw is { } drawn + ? drawn(on ? cursor.Edit : null, width) + : RenderRow(row, cursor.EditOn(0, navigable, 0)); + lines.Add(ScreenChrome.Cursor(line, on, width)); navigable++; } @@ -183,29 +228,59 @@ internal static List BodyColumn( /// /// How wide a dropdown may run on a screen rendered without a width — the merged - /// path the unit tests use. The live view always passes a real - /// width, so this only keeps the width-agnostic fallback from letting a list run unbounded. + /// path the unit tests use. /// private const int ChoiceListWidth = 60; /// - /// The screen's one navigable pane: every row that isn't a spacer or a section header, in display - /// order, each carrying whatever config bindings it was built with — the checkbox Space flips and - /// the value ⏎ opens. + /// The screen's one navigable pane: every row that is a cursor stop, in display order, each carrying + /// whatever it was built with — the checkbox Space flips, the values ⏎ opens, the button ⏎ runs, the + /// reset r runs — and, when there is one, the removal Delete runs as a hidden trailing button. /// internal static ScreenModel Model(OptionsScreen screen) { var rows = screen.Rows - .Where(r => !IsSpacer(r) && !IsSection(r)) - .Select(r => r.Edit is { } field ? new ScreenRow(r.Bind, new[] { field }) : new ScreenRow(r.Bind)) - .ToArray(); + .Where(IsNavigable) + .Select(r => new ScreenRow( + r.Bind, + r.Fields ?? (r.Edit is { } field ? new[] { field } : null), + r.Button, + r.Reset)) + .ToList(); + if (screen.Remove is { } remove) + { + rows.Add(ScreenRow.Of(remove)); + } + return new ScreenModel(rows); } + /// Where the row drawing a declared field sits among the cursor stops, or -1. + internal static int IndexOf(OptionsScreen screen, string fieldId) + { + var navigable = 0; + foreach (var row in screen.Rows) + { + if (!IsNavigable(row)) + { + continue; + } + + if (string.Equals(row.FieldId, fieldId, StringComparison.Ordinal)) + { + return navigable; + } + + navigable++; + } + + return -1; + } + /// /// One row: its checkbox column (a box, or the blank that keeps the labels in one column), its - /// label, the value it holds if it holds one, and its hint. A row can carry both a checkbox and a - /// value, which is the shape F4's bindings use one layer down. + /// label, the value it holds if it holds one, its hint, and when it differs + /// from its default. /// private static string RenderRow(OptionRow row, ScreenFieldEdit? edit) { @@ -227,202 +302,451 @@ private static string RenderRow(OptionRow row, ScreenFieldEdit? edit) }; var hint = row.Hint is null ? string.Empty : $"[dim] — {Escape(row.Hint)}[/]"; + var changed = row.Reset is null ? string.Empty : Changed(); var hasValue = row.Value is not null || edit is not null; var label = Escape(row.Label); + // A checkbox row's label *is* its content, so it keeps the primary ink; a label/value row's // label is the secondary half of a pair, so it dims and lets the value carry the weight. if (!hasValue) { - return $"{box}{label}{hint}"; + return $"{box}{label}{hint}{changed}"; } var value = ScreenChrome.Field(Escape(row.Value ?? string.Empty), edit); - return $"{box}[dim]{label.PadRight(LabelWidth - AffordanceWidth)}[/] {value}{hint}"; + return $"{box}[dim]{label.PadRight(LabelWidth - AffordanceWidth)}[/] {value}{hint}{changed}"; } - /// A blank separator carrying no label, value, or toggle. + private static string Changed() => $" [{Accent}]{ChangedMark}[/]"; + + /// A blank separator carrying nothing at all. private static bool IsSpacer(OptionRow row) => - row.Label.Length == 0 && row.Value is null && row.Toggle is null; + row.Label.Length == 0 && row.Value is null && row.Toggle is null && row.Draw is null + && row.Button is null && row.Fields is null; /// A dim group heading, marked by the branch glyph the screens prefix them with. private static bool IsSection(OptionRow row) => row.Label.StartsWith("├ ", StringComparison.Ordinal); + /// Whether a row is a cursor stop. + private static bool IsNavigable(OptionRow row) => !row.Static && !IsSpacer(row) && !IsSection(row); + /// - /// The F7 "Text & ANSI" screen, reflecting — and writing back to — the app's - /// . Called without arguments it projects the defaults, which is what - /// the unit tests and the width-agnostic fallback want. + /// The F7 screen over the defaults — or over the given settings, written back to as the rows are used. + /// null leaves the SOUND group out, which is how a caller that has no sound + /// settings to hand gets the rest of the screen. /// - internal static OptionsScreen TextAnsiScreen(TextSettings? text = null, SoundSettings? sound = null) + internal static OptionsScreen TextAnsiScreen(TextSettings? text = null, SoundSettings? sound = null) => + TextAnsiScreen( + new AppConfiguration { Text = text ?? new TextSettings(), Sound = sound ?? new SoundSettings() }, + includeSound: sound is not null); + + /// + /// The F7 screen, drawn from (the declared + /// unless a host passes the registry's) over . + /// + /// Where the values are read from and written to. + /// Whether the SOUND group is drawn. + /// The focused session's game data, which the meter table reads its now column from. + /// Which cursor stop the keyboard is on, which decides whether the received-data box shows. + /// The declared section. + internal static OptionsScreen TextAnsiScreen( + AppConfiguration config, + bool includeSound = true, + GameDataStore? data = null, + int cursor = -1, + SettingsSectionContribution? section = null) { - var settings = text ?? new TextSettings(); + ArgumentNullException.ThrowIfNull(config); + return FromSection( + section ?? BuiltInSettings.Text, + config, + data, + cursor, + includeSound ? null : BuiltInSettings.SoundGroup); + } + + /// The F8 screen over the defaults, or over the given settings. + internal static OptionsScreen InputScreen(InputSettings? input = null) => + InputScreen(new AppConfiguration { Input = input ?? new InputSettings() }); - var rows = new List + /// + /// The F8 "Input" screen, drawn from its declared section. + /// + /// keep logins out of history is the one row here that is about a secret rather than a + /// convenience: with history browsable and searchable (⌃R), a hand-typed + /// connect <name> <password> recorded in it is a password on display. It is bash's + /// HISTIGNORE, on by default, and the verbs it recognises are . + /// + /// + /// There is no spellcheck section and no newline key row: a setting with nothing behind it is the + /// empty promise these screens are held against, and the newline chord is fixed per host and named where + /// the keys are named. + /// + /// + internal static OptionsScreen InputScreen(AppConfiguration config, SettingsSectionContribution? section = null) + { + ArgumentNullException.ThrowIfNull(config); + return FromSection(section ?? BuiltInSettings.Input, config, null, -1, null); + } + + /// + /// A declared section as an options screen: a heading wherever the group changes, then one row per + /// field, drawn by kind. leaves one group out. + /// + internal static OptionsScreen FromSection( + SettingsSectionContribution section, + AppConfiguration config, + GameDataStore? data, + int cursor, + string? skipGroup) + { + ArgumentNullException.ThrowIfNull(section); + ArgumentNullException.ThrowIfNull(config); + + var rows = new List(); + ScreenButton? remove = null; + string? group = null; + var navigable = 0; + foreach (var field in section.Fields) { - new("├ COLOUR", null, null), - new("strip incoming ANSI colour", null, settings.StripIncomingColour, null, - ScreenToggle.Bind(() => settings.StripIncomingColour, v => settings.StripIncomingColour = v)), - - // Directly under the row above, because the two are answers to one question — what to do - // about a colour this terminal cannot show well — and they are the ends of its range: that - // one discards every colour the server sent, this one keeps them all and moves only the few - // that cannot be read. Unticking it is not "no policy"; it is the policy this client had - // before anything was measured. - new("keep text legible", null, settings.KeepTextLegible, null, - ScreenToggle.Bind(() => settings.KeepTextLegible, v => settings.KeepTextLegible = v)), - new("allow blink", null, settings.AllowBlink, null, - ScreenToggle.Bind(() => settings.AllowBlink, v => settings.AllowBlink = v)), - new("underline hyperlinks", null, settings.UnderlineHyperlinks, null, - ScreenToggle.Bind(() => settings.UnderlineHyperlinks, v => settings.UnderlineHyperlinks = v)), - - // Under COLOUR because it sits with the row above it — that one says how a link looks, this - // one says what counts as a link — even though neither is strictly about colour. The pair - // reads as one idea, which a LINKS section of two rows would not improve. - new("detect links in output", null, settings.DetectLinks, null, - ScreenToggle.Bind(() => settings.DetectLinks, v => settings.DetectLinks = v)), - new(string.Empty, null, null), - new("├ WHITESPACE", null, null), - - // A count, not a checkbox, and its own section rather than an extra row under COLOUR: it is - // the only thing on this screen that changes how wide a line *is* rather than how it looks. - // Zero is a real answer — it deletes tabs — so the field's floor is 0, not 1. - new("tab width (spaces)", settings.TabWidth.ToString(CultureInfo.InvariantCulture), null, null, null, - ScreenField.Integer( - "tab width (spaces)", () => settings.TabWidth, v => settings.TabWidth = v, - 0, TextSettings.MaxTabWidth)), - new(string.Empty, null, null), - new("├ UNICODE", null, null), - new("emoji substitution", null, settings.EmojiSubstitution, null, - ScreenToggle.Bind(() => settings.EmojiSubstitution, v => settings.EmojiSubstitution = v)), - new(string.Empty, null, null), - new("├ BACKGROUND", null, null), - - // Its own section, beside ACTIVITY's reasoning: it describes the client's chrome rather than - // how a world's text is drawn. A percentage and not a checkbox, and zero is off — it only looks - // right on a terminal set to draw its background translucent, which this client cannot see. - new("background transparency (%)", - settings.BackgroundTransparency.ToString(CultureInfo.InvariantCulture), null, null, null, - ScreenField.Integer( - "background transparency (%)", - () => settings.BackgroundTransparency, v => settings.BackgroundTransparency = v, - 0, TextSettings.MaxBackgroundTransparency)), - new(string.Empty, null, null), - new("├ ACTIVITY", null, null), - - // Seconds, and its own section: it is the only row on this screen describing the client's own - // chrome rather than how a world's text is drawn. Zero is a real answer — it retires the bar - // as soon as it has been read past, which is what this client did before the floor existed — - // so the field's floor is 0, as the tab width's is. - new("activity bar holds for (seconds)", - settings.ActivityBarSeconds.ToString(CultureInfo.InvariantCulture), null, null, null, - ScreenField.Integer( - "activity bar holds for (seconds)", - () => settings.ActivityBarSeconds, v => settings.ActivityBarSeconds = v, - 0, TextSettings.MaxActivityBarSeconds)), - new(string.Empty, null, null), - new("├ STATUS ROW", null, null), - - // One line, `label=value/max; …`, each path allowed `|` alternatives. A list editor would be - // friendlier and is a screen of its own; this is the whole of the setting, typed where it is read, - // and a part that does not parse is dropped rather than refused so a half-typed meter costs nothing. - new("meters", MeterSummary(settings.StatusMeters), null, null, null, - ScreenField.Optional( - "meters", - () => settings.StatusMeters.Count == 0 ? null : StatusMeter.Format(settings.StatusMeters), - v => settings.StatusMeters = StatusMeter.Parse(v))), - }; + if (skipGroup is not null && string.Equals(field.Group, skipGroup, StringComparison.Ordinal)) + { + continue; + } + + if (!string.Equals(field.Group, group, StringComparison.Ordinal)) + { + if (rows.Count > 0) + { + rows.Add(new OptionRow(string.Empty, null, null)); + } + + group = field.Group; + if (group is not null) + { + rows.Add(new OptionRow("├ " + group.ToUpperInvariant(), null, null)); + } + } - if (sound is not null) + if (field is ListField { Id: BuiltInSettings.MetersField, Binding: SettingBinding> meters }) + { + remove = MeterRows(rows, config, meters, data, cursor, ref navigable) ?? remove; + continue; + } + + rows.Add(Row(field, config)); + navigable++; + } + + return new OptionsScreen(section.Title, section.Key ?? string.Empty, rows, remove); + } + + /// One declared field as a row, by kind. A field with no binding the row understands is shown read-only. + private static OptionRow Row(SettingsField field, AppConfiguration config) + { + var reset = field.Binding is { } binding && !binding.IsDefault(config) + ? () => binding.Reset(config) + : (Action?)null; + + switch (field) { - rows.AddRange(SoundRows(sound)); + case BoolField when field.Binding is SettingBinding flag: + return new OptionRow( + field.Label, null, flag.Get(config), null, + ScreenToggle.Bind(() => flag.Get(config), v => flag.Set(config, v)), + Reset: reset, FieldId: field.Id); + + case NumberField number when field.Binding is SettingBinding count: + return new OptionRow( + field.Label, count.Get(config).ToString(CultureInfo.InvariantCulture), null, null, null, + ScreenField.Integer( + field.Label, () => count.Get(config), v => count.Set(config, v), number.Minimum, number.Maximum), + Reset: reset, FieldId: field.Id); + + case ChoiceField choice when field.Binding is SettingBinding named: + return new OptionRow( + field.Label, named.Get(config), null, null, null, + ScreenField.Choice(field.Label, () => named.Get(config), v => named.Set(config, v), choice.Choices), + Reset: reset, FieldId: field.Id); + + case TextField when field.Binding is SettingBinding text: + return new OptionRow( + field.Label, text.Get(config) ?? string.Empty, null, null, null, + ScreenField.Optional(field.Label, () => text.Get(config), v => text.Set(config, v)), + Reset: reset, FieldId: field.Id); + + default: + return new OptionRow( + field.Label, field.Binding?.Text(config) ?? string.Empty, null, Reset: reset, FieldId: field.Id); } + } + + /// The cells the meter table's label column takes (a label is at most eight). + private const int MeterLabelWidth = StatusMeter.MaxLabelLength + 1; + + /// The cells its now column takes: 1000/1000 and a cell. + private const int MeterNowWidth = 11; + + /// The gap between two of its columns. + private const int MeterGap = 2; - return new OptionsScreen("Text & ANSI", "F7", rows); + /// How many received paths the box under the table lists before it says how many more there are. + internal const int ReceivedRows = 6; + + /// What the received-data box is called, and the path fields' dropdown with it. + internal const string ReceivedCaption = "received on this connection"; + + /// What the now column says of a meter whose value has not arrived. + internal const string Waiting = "waiting"; + + /// + /// F7's meter table, appended to : the column headings, one row per meter, the + /// add button, and — while the cursor is on one of those — the box of paths this connection has + /// received. Returns the removal Delete runs, when the cursor is on a meter. + /// + private static ScreenButton? MeterRows( + List rows, + AppConfiguration config, + SettingBinding> binding, + GameDataStore? data, + int cursor, + ref int navigable) + { + var meters = binding.Get(config); + var reset = binding.IsDefault(config) ? null : (Action)(() => binding.Reset(config)); + var received = data is null ? Array.Empty<(string Path, string Value)>() : ReceivedPaths(data); + var first = navigable; + + rows.Add(new OptionRow(string.Empty, null, null, Static: true, FieldId: BuiltInSettings.MetersField, + Draw: (_, width) => MeterHeading(width, reset is not null))); + + ScreenButton? remove = null; + for (var i = 0; i < meters.Count; i++) + { + var meter = meters[i]; + var index = i; + var fields = new[] + { + ScreenField.Text("label", () => meter.Label, v => meter.Label = StatusMeter.Clip(v)), + PathField("value path", () => meter.Value, v => meter.Value = v ?? string.Empty, received, required: true), + PathField("maximum path", () => meter.Max, v => meter.Max = v, received, required: false), + }; + rows.Add(new OptionRow( + meter.Label, null, null, + Fields: fields, + Reset: reset, + FieldId: i == 0 ? BuiltInSettings.MetersField : null, + Where: ScreenChrome.Position("meter", index, meters.Count), + Draw: (edit, width) => MeterRow(meter, data, edit, width))); + if (navigable == cursor) + { + remove = ScreenButton.Remove(meters, index, first, $"meter {meter.Label}"); + } + + navigable++; + } + + var addAt = navigable; + rows.Add(new OptionRow( + "[+ meter]", null, null, + Button: ScreenButton.Add("+ meter", meters, () => new StatusMeter { Label = "new" }, first), + Reset: reset, + FieldId: meters.Count == 0 ? BuiltInSettings.MetersField : null, + Draw: (_, _) => new string(' ', AffordanceWidth) + $"[{Accent}][[+ meter]][/]")); + navigable++; + + if (cursor >= first && cursor <= addAt) + { + rows.AddRange(ReceivedBox(received)); + } + + return remove; + } + + /// + /// A meter's value or maximum path: free text, with every path this connection has received offered + /// in the dropdown beside what it holds now. The current value heads the list, so opening the field + /// shows the whole list with it marked rather than narrowing to nothing. + /// + private static ScreenField PathField( + string label, + Func get, + Action set, + IReadOnlyList<(string Path, string Value)> received, + bool required) + { + var current = get(); + var choices = new List(); + if (!string.IsNullOrWhiteSpace(current)) + { + choices.Add(current); + } + + choices.AddRange(received.Select(r => r.Path).Where(p => !string.Equals(p, current, StringComparison.Ordinal))); + var notes = received.ToDictionary(r => r.Path, r => r.Value, StringComparer.Ordinal); + + return new ScreenField( + label, + () => get() ?? string.Empty, + value => required && string.IsNullOrWhiteSpace(value) ? $"{label} cannot be empty" : null, + value => set(string.IsNullOrWhiteSpace(value) ? null : value.Trim()), + choices.Count > 0 ? choices : null, + ChoiceNotes: notes, + ChoiceCaption: ReceivedCaption); + } + + /// How wide the table's two path columns are at . + private static (int Value, int Max) PathWidths(int width) + { + var room = (width > 0 ? width : 100) - AffordanceWidth - MeterLabelWidth - MeterNowWidth - (3 * MeterGap); + room = Math.Max(16, room); + return (room / 2, room - (room / 2)); + } + + private static string MeterHeading(int width, bool changed) + { + var (value, max) = PathWidths(width); + var gap = new string(' ', MeterGap); + var line = new string(' ', AffordanceWidth) + + "label".PadRight(MeterLabelWidth) + gap + + "value path".PadRight(value) + gap + + "maximum path".PadRight(max) + gap + + "now"; + return $"[dim]{line}[/]" + (changed ? Changed() : string.Empty); } /// - /// F7's SOUND rows: game sound on or off, the three levels, and captions. Drawn on every host, because - /// captions are text and are the one thing a host with no audio device can still do with a sound. + /// One meter: its three fields in their columns and what it reads now. While one of its fields is open + /// that field takes the rest of the row, so a long path is typed where it can be seen. /// - private static IEnumerable SoundRows(SoundSettings sound) + private static string MeterRow(StatusMeter meter, GameDataStore? data, ScreenFieldEdit? edit, int width) + { + var (valueWidth, maxWidth) = PathWidths(width); + var gap = new string(' ', MeterGap); + var line = new System.Text.StringBuilder(new string(' ', AffordanceWidth)); + var cells = new[] { (meter.Label, MeterLabelWidth), (meter.Value, valueWidth), (meter.Max ?? string.Empty, maxWidth) }; + for (var i = 0; i < cells.Length; i++) + { + var (text, cell) = cells[i]; + if (edit is { } open && open.Field == i) + { + var room = Math.Max(8, (width > 0 ? width : 100) - VisibleLength(line.ToString()) - 2); + line.Append(ScreenChrome.Field(string.Empty, Scrolled(open, room))); + return line.ToString(); + } + + var shown = string.IsNullOrEmpty(text) ? "—" : text; + var display = Escape(ElidePlain(shown, cell - 1).PadRight(cell - 1)); + line.Append(PadVisible(ScreenChrome.Field($"[{ScreenPalette.Value}]{display}[/]", null), cell)).Append(gap); + } + + line.Append(Now(meter, data)); + return line.ToString(); + } + + /// The now column: 412/500, 412 with no maximum, or . + internal static string Now(StatusMeter meter, GameDataStore? data) { - yield return new(string.Empty, null, null); - yield return new("├ SOUND", null, null); - yield return new("game sound", null, sound.Enabled, null, - ScreenToggle.Bind(() => sound.Enabled, v => sound.Enabled = v)); - yield return Level("master volume (%)", () => sound.MasterVolume, v => sound.MasterVolume = v); - yield return Level("sound volume (%)", () => sound.SoundVolume, v => sound.SoundVolume = v); - yield return Level("music volume (%)", () => sound.MusicVolume, v => sound.MusicVolume = v); - - // A caption is a line of text for a sound, so it is the one SOUND row that matters with sound off. - yield return new("sound captions", null, sound.Captions, null, - ScreenToggle.Bind(() => sound.Captions, v => sound.Captions = v)); - - static OptionRow Level(string label, Func get, Action set) => - new(label, get().ToString(CultureInfo.InvariantCulture), null, null, null, - ScreenField.Integer(label, get, set, 0, SoundSettings.MaxVolume)); + if (data is null || StatusMeter.Read(data, meter.Value) is not { } value) + { + return $"[{Muted}]{Waiting}[/]"; + } + + var max = string.IsNullOrWhiteSpace(meter.Max) ? null : StatusMeter.Read(data, meter.Max); + var text = StatusMeter.Fit(value, 5) + (max is null ? string.Empty : "/" + StatusMeter.Fit(max, 5)); + return $"[bold {ScreenPalette.Value}]{Escape(text)}[/]"; } /// - /// What the meters row shows when it is not being edited: the labels, in order. The full line is long — - /// every alternative path of every meter — and a row clipped at the screen's edge says less than this. + /// An open edit whose buffer is longer than , cut to the stretch around the caret + /// so the caret is always drawn — the buffer itself is untouched. /// - private static string MeterSummary(IReadOnlyList meters) => - meters.Count == 0 ? "none" : string.Join(" · ", meters.Select(m => m.Label)) + " (⏎ edits the paths)"; + private static ScreenFieldEdit Scrolled(ScreenFieldEdit edit, int room) + { + if (edit.Text.Length < room) + { + return edit; + } + + var start = Math.Clamp(edit.Caret - room + 2, 0, edit.Text.Length); + var length = Math.Min(room - 1, edit.Text.Length - start); + return edit with { Text = edit.Text.Substring(start, length), Caret = edit.Caret - start }; + } + + private static string ElidePlain(string text, int width) => + text.Length <= width ? text : width <= 1 ? "…" : text[..(width - 1)] + "…"; + + /// The box of received paths under the table, drawn while the cursor is in it. + private static IEnumerable ReceivedBox(IReadOnlyList<(string Path, string Value)> received) + { + var indent = new string(' ', AffordanceWidth); + var widest = received.Count == 0 ? 0 : Math.Min(40, received.Max(r => r.Path.Length)); + yield return Line($"{indent}[{Label}]┌ {ReceivedCaption}[/]"); + if (received.Count == 0) + { + yield return Line($"{indent}[{Label}]│[/] [{Muted}]nothing yet — a meter shows once its value arrives[/]"); + } + + foreach (var (path, value) in received.Take(ReceivedRows)) + { + yield return Line( + $"{indent}[{Label}]│[/] [{ScreenPalette.Value}]{Escape(ElidePlain(path, widest).PadRight(widest))}[/]" + + $" [{Muted}]{Escape(ElidePlain(value, 20))}[/]"); + } + + var more = received.Count - ReceivedRows; + yield return Line(more > 0 + ? $"{indent}[{Label}]└ {more.ToString(CultureInfo.InvariantCulture)} more · open a path and ↑↓ to pick one[/]" + : $"{indent}[{Label}]└ open a path and ↑↓ to pick one[/]"); + + static OptionRow Line(string markup) => new(string.Empty, null, null, Static: true, Draw: (_, _) => markup); + } /// - /// The F8 "Input" screen, reflecting — and writing back to — the app's - /// . - /// - /// It was "Input & spellcheck" and had a SPELLCHECK section holding check spelling and - /// dictionary. Both are gone: this client has no speller, so the checkbox promised a check - /// that never ran and the dictionary named a file nothing opened. The rule they broke is the one - /// the header hints already follow: a screen may not advertise a key, or a setting, that does - /// nothing. - /// - /// - /// keep logins out of history is the one row here that is about a secret rather than a - /// convenience: with history browsable and searchable (⌃R), a hand-typed - /// connect <name> <password> recorded in it is a password on display. It is - /// bash's HISTIGNORE, on by default, and the verbs it recognises are - /// . Nothing writes history to disk either way. - /// - /// - /// There is still no newline key row, and now for the opposite reason to the one that took - /// it away. The command line wraps and grows, so a newline can be typed — but only on chords this - /// host delivers, and the interesting answers (Shift+⏎, Ctrl+⏎) are ones no Unix terminal reports - /// distinctly through SharpConsoleUI's parser. A field offering them would be the same empty - /// promise as the speller. The chord is fixed and named where the keys are named. - /// + /// Every value this connection's game data holds, as a path a meter can name and its text now: the + /// scalar fields of each GMCP package (and MSDP and MXP variables), objects walked a few levels deep and + /// arrays left out — a list of channels is not something a meter shows. Sorted by path. /// - internal static OptionsScreen InputScreen(InputSettings? input = null) + internal static IReadOnlyList<(string Path, string Value)> ReceivedPaths(GameDataStore data) { - var settings = input ?? new InputSettings(); + ArgumentNullException.ThrowIfNull(data); - return new OptionsScreen("Input", "F8", new List + var found = new List<(string, string)>(); + foreach (var entry in data.Entries) { - new("├ INPUT", null, null), - new("local echo", null, settings.LocalEcho, null, - ScreenToggle.Bind(() => settings.LocalEcho, v => settings.LocalEcho = v)), - new("keep per-tab drafts", null, settings.KeepDrafts, null, - ScreenToggle.Bind(() => settings.KeepDrafts, v => settings.KeepDrafts = v)), - new("keep logins out of history", null, settings.ExcludeCredentials, null, - ScreenToggle.Bind(() => settings.ExcludeCredentials, v => settings.ExcludeCredentials = v)), - new(string.Empty, null, null), - new("├ COMMAND LINE", null, null), - new("height (lines)", settings.Rows.ToString(CultureInfo.InvariantCulture), null, null, null, - ScreenField.Integer( - "height (lines)", () => settings.Rows, v => settings.Rows = v, - InputSettings.MinRows, InputSettings.MaxRowCeiling)), - new("grows to (lines)", settings.MaxRows.ToString(CultureInfo.InvariantCulture), null, null, null, - ScreenField.Integer( - "grows to (lines)", () => settings.MaxRows, v => settings.MaxRows = v, - InputSettings.MinRows, InputSettings.MaxRowCeiling)), - new("second bar on new windows", null, settings.SecondBar, null, - ScreenToggle.Bind(() => settings.SecondBar, v => settings.SecondBar = v)), - }); + Walk(entry.Package, entry.Data, 0); + } + + return found.OrderBy(f => f.Item1, StringComparer.OrdinalIgnoreCase).ToList(); + + void Walk(string path, System.Text.Json.Nodes.JsonNode? node, int depth) + { + if (found.Count >= 512) + { + return; + } + + switch (node) + { + case System.Text.Json.Nodes.JsonObject obj when depth < 4: + foreach (var (key, child) in obj) + { + Walk(path + "." + key, child, depth + 1); + } + + break; + case System.Text.Json.Nodes.JsonValue: + if (data.GetText(path) is { } text) + { + found.Add((path, text)); + } + + break; + } + } } - /// The F7 "Text & ANSI" screen body. + /// The F7 screen body. public static List TextAnsi() => Render(TextAnsiScreen()); /// The F8 "Input" screen body. diff --git a/src/SharpMUTerm.Tui/OptionsScreenView.cs b/src/SharpMUTerm.Tui/OptionsScreenView.cs index 70bf2380..1724d95f 100644 --- a/src/SharpMUTerm.Tui/OptionsScreenView.cs +++ b/src/SharpMUTerm.Tui/OptionsScreenView.cs @@ -6,7 +6,7 @@ namespace SharpMUTerm.Tui; /// -/// Composes an options screen (F7 Text & ANSI, F8 Input & spellcheck) from real +/// Composes an options screen (F7 Text & display, F8 Input) from real /// panels rather than one merged markup blob: a header band carrying the keyboard hints, the options /// list on a single full-width elevated card, and a Cancel/Save action bar pinned to the last row. /// These screens are one list, not two panes, so there is no column split and no vertical rule — the @@ -22,8 +22,17 @@ internal static class OptionsScreenView /// Columns the list is inset by: two of padding on each side of the card. private const int CardInset = 4; + /// + /// The screen's height, or 0 for none. With one, a list taller than the body is windowed around the + /// cursor () rather than run off the bottom — F7 with its meter table and + /// SOUND group is taller than a 24-row terminal. + /// public static IWindowControl Build( - OptionsScreenRenderer.OptionsScreen screen, int width, ScreenTheme scheme, ScreenFocus? focus = null) + OptionsScreenRenderer.OptionsScreen screen, + int width, + ScreenTheme scheme, + ScreenFocus? focus = null, + int height = 0) { var header = ScreenChrome.Band( OptionsScreenRenderer.HeaderLine( @@ -33,6 +42,12 @@ public static IWindowControl Build( OptionsScreenRenderer.FooterLine(screen.Rows, width, focus), ScreenPalette.FooterBg, scheme); var rows = OptionsScreenRenderer.BodyColumn(screen.Rows, focus, Math.Max(0, width - CardInset)); + if (height > 0) + { + // The header, the footer, the card's pad row above the list and one row of backdrop below it. + rows = ScreenChrome.Window(rows, Math.Max(1, height - 2 - CardPadding)); + } + var card = Card(rows, scheme); // Header on the first row, footer on the last, the card hugging its content directly beneath the diff --git a/src/SharpMUTerm.Tui/ScreenChrome.cs b/src/SharpMUTerm.Tui/ScreenChrome.cs index 56b0e164..0be6c83f 100644 --- a/src/SharpMUTerm.Tui/ScreenChrome.cs +++ b/src/SharpMUTerm.Tui/ScreenChrome.cs @@ -30,7 +30,8 @@ internal static string Hints( bool editable = false, ScreenFocus? focus = null, bool removable = false, - bool detailed = false) + bool detailed = false, + bool resettable = false) { if (focus?.Edit is { } edit) { @@ -56,8 +57,10 @@ internal static string Hints( // one that survives — and because the INFO key's drawn row (`i info on Aetherfall`) is on the // screen either way, while a key that removes a world has only this line and its own row. var all = (editable ? verbs + EditHint : verbs) + + (resettable ? ResetHint : string.Empty) + (removable ? DeleteHint : string.Empty) - + (detailed ? DetailHint : string.Empty); + + (detailed ? DetailHint : string.Empty) + + SearchHint; return $"[{ScreenPalette.Label}]{all} · [/][{ScreenPalette.Accent}]{fkey}[/][{ScreenPalette.Label}]/[/]" + $"[{ScreenPalette.Accent}]Esc[/][{ScreenPalette.Label}] close [/]"; } @@ -93,6 +96,18 @@ internal static string Hints( /// internal const string DetailHint = " · i info"; + /// + /// What a screen adds while the focused row is a declared setting that differs from its default — and + /// only then, since r does nothing on a row at its default. + /// + internal const string ResetHint = " · r reset"; + + /// + /// The settings search, which / opens on every settings screen (). + /// Last of the verbs, so a narrow header gives it up before anything the screen itself does. + /// + internal const string SearchHint = " · / search"; + /// The hints that replace a screen's own while a field edit is open. internal const string EditingHints = "⏎ commit · Esc revert"; @@ -365,6 +380,9 @@ private static string Capture(ScreenFieldEdit open) /// internal const int MaxChoiceRows = 6; + /// The longest note drawn beside a choice (). + internal const int MaxNoteLength = 16; + /// What the dropdown calls itself when the field will take values outside the list. internal const string OpenChoicesCaption = "suggestions"; @@ -474,7 +492,7 @@ private static (string Caption, List<(string Content, string Background)> Entrie { var all = open.Choices!; var visible = open.VisibleChoices; - var caption = open.ClosedChoices ? ClosedChoicesCaption : OpenChoicesCaption; + var caption = open.ChoiceCaption ?? (open.ClosedChoices ? ClosedChoicesCaption : OpenChoicesCaption); var entries = new List<(string, string)>(); if (visible.Count == 0) @@ -491,6 +509,12 @@ private static (string Caption, List<(string Content, string Background)> Entrie for (var i = first; i < first + take; i++) { var name = MarkupText.Escape(visible[i]); + if (open.ChoiceNotes is { } notes && notes.TryGetValue(visible[i], out var note)) + { + var shortNote = note.Length > MaxNoteLength ? note[..(MaxNoteLength - 1)] + "…" : note; + name += $" [{ScreenPalette.Muted}]{MarkupText.Escape(shortNote)}[/]"; + } + entries.Add(i == marked ? ($"[{ScreenPalette.Accent}]▸[/] [{ScreenPalette.Value}]{name}[/]", ScreenPalette.MenuSelectedBg) : ($" [{ScreenPalette.Label}]{name}[/]", ScreenPalette.MenuBg)); diff --git a/src/SharpMUTerm.Tui/ScreenEdits.cs b/src/SharpMUTerm.Tui/ScreenEdits.cs index e25d1956..5aa54b55 100644 --- a/src/SharpMUTerm.Tui/ScreenEdits.cs +++ b/src/SharpMUTerm.Tui/ScreenEdits.cs @@ -78,6 +78,17 @@ internal sealed class ScreenEdits internal IReadOnlyList Deletions => _deletions.ConvertAll(d => d.What); /// Flips a checkbox and writes it out. Committed on the spot; nothing to review. + /// + /// Puts a declared setting back to its default — the same funnel as every other change, so a reset is + /// saved, and reaches a connected session, exactly as typing the default in would. + /// + internal void Apply(Action reset) + { + ArgumentNullException.ThrowIfNull(reset); + reset(); + _persist?.Invoke(); + } + internal void Apply(ScreenToggle toggle) { toggle.Flip(); diff --git a/src/SharpMUTerm.Tui/ScreenField.cs b/src/SharpMUTerm.Tui/ScreenField.cs index d2560a27..7df78259 100644 --- a/src/SharpMUTerm.Tui/ScreenField.cs +++ b/src/SharpMUTerm.Tui/ScreenField.cs @@ -44,6 +44,11 @@ namespace SharpMUTerm.Tui; /// chrome's, applied at the last moment before markup (see ScreenChrome.Field), so the plaintext /// never exists in a rendered frame that a snapshot, a screenshot or a shoulder could read. /// +/// +/// A dim note drawn beside a choice in the dropdown, by choice — what a game-data path holds right now, on +/// F7's meter editor. The note is never part of the value: ↑↓ still put only the choice in the buffer. +/// +/// What the dropdown is called in place of suggestions, or null. internal readonly record struct ScreenFieldEdit( int Field, string Text, @@ -53,7 +58,9 @@ internal readonly record struct ScreenFieldEdit( IReadOnlyList? Choices = null, bool ClosedChoices = false, bool Capture = false, - bool Masked = false) + bool Masked = false, + IReadOnlyDictionary? ChoiceNotes = null, + string? ChoiceCaption = null) { /// Whether the open field knows any values at all, whatever the buffer currently is. internal bool HasChoices => Choices is { Count: > 0 }; @@ -129,7 +136,9 @@ internal readonly record struct ScreenField( bool ClosedChoices = false, bool Capture = false, bool Masked = false, - Func? Follow = null) + Func? Follow = null, + IReadOnlyDictionary? ChoiceNotes = null, + string? ChoiceCaption = null) { /// Longest rejection message kept; regex parser errors run to several lines otherwise. private const int MaxErrorLength = 44; diff --git a/src/SharpMUTerm.Tui/ScreenModel.cs b/src/SharpMUTerm.Tui/ScreenModel.cs index e7c34514..31a22b84 100644 --- a/src/SharpMUTerm.Tui/ScreenModel.cs +++ b/src/SharpMUTerm.Tui/ScreenModel.cs @@ -211,10 +211,15 @@ internal enum ScreenButtonKind /// The checkbox Space flips, or null when the row has none. /// The values ⏎ opens for editing, in the order the screen draws them. /// The command ⏎ runs, or null when the row is not a button. +/// +/// Puts the row's value back to its default, or null when the row is at its default or has none to go back +/// to — so r reset is offered exactly where it would do something. Only declared settings carry one. +/// internal readonly record struct ScreenRow( ScreenToggle? Toggle = null, IReadOnlyList? Fields = null, - ScreenButton? Button = null) + ScreenButton? Button = null, + Action? Reset = null) { /// A selectable row with nothing to press and nothing to type into. internal static ScreenRow Stop => default; @@ -523,6 +528,9 @@ internal ScreenRow RowAt(int pane, int index) => /// The checkbox at a cursor position, or null when that row isn't pressable. internal ScreenToggle? ToggleAt(int pane, int index) => RowAt(pane, index).Toggle; + /// What r runs on a row: its reset, or null where the row is at its default. + internal Action? ResetAt(int pane, int index) => RowAt(pane, index).Reset; + /// The button at a cursor position, or null when that row isn't one. internal ScreenButton? ButtonAt(int pane, int index) => RowAt(pane, index).Button; diff --git a/src/SharpMUTerm.Tui/SettingsOverlay.cs b/src/SharpMUTerm.Tui/SettingsOverlay.cs index e83004f5..33d4b046 100644 --- a/src/SharpMUTerm.Tui/SettingsOverlay.cs +++ b/src/SharpMUTerm.Tui/SettingsOverlay.cs @@ -49,6 +49,28 @@ internal sealed class SettingsOverlay ///     private readonly Stack _behind = new(); + /// + /// The settings search, while it is up over a screen (/), or null. It is drawn in the screen's own + /// window in place of the screen — content-swapping, for 's reason — and Esc puts the + /// screen back exactly as it was, because the screen's session is never touched while it is up. + /// + private SettingsSearchState? _search; + + /// + /// What the search reads and how it takes a reader to a match. Set by the app; with none, / is not + /// ours and the header would be wrong to name it, which is why every screen is opened by an app that sets it. + /// + internal SettingsSearchHost? SearchHost { get; set; } + + /// Whether the settings search is up. + internal bool IsSearching => _search is not null; + + /// The search's query, for a test. + internal string? SearchQuery => _search?.Query; + + /// Where the open screen's cursor is, for a test. + internal ScreenFocus? Focus => _binding?.Session.Focus(); + /// /// The overlay no longer takes a save action. Persistence moved to the point of change: each screen's /// writes the configuration out as it accepts one, so there is no moment on @@ -103,6 +125,45 @@ public void Toggle(ConsoleKey key, Func binding) Open(key, binding()); } + /// + /// Puts a screen up in place of whatever is showing — the settings search's ⏎. Over an open screen it + /// swaps the content of the same window, so going to a field on the screen the search was opened from does + /// not close and reopen it; a screen holding deletions is closed through its review first, as a change of + /// F-key would. + /// + public void Show(ConsoleKey key, ScreenBinding binding) + { + _search = null; + if (_window is null) + { + Open(key, binding); + return; + } + + var edits = (_behind.Count > 0 ? _behind.Last() : _binding)?.Session.Edits; + if (edits is { HasDeletions: true }) + { + CloseAndReview(); + Open(key, binding); + return; + } + + _behind.Clear(); + _openKey = key; + _binding = binding; + Refresh(); + } + + /// Closes the overlay altogether, keeping everything, as Esc on a screen does. + public void CloseAll() + { + _search = null; + if (_window is not null) + { + CloseAndReview(); + } + } + /// Renders a screen into a headless frame (used by snapshots). public void OpenForSnapshot(ConsoleKey key, ScreenBinding binding) => Open(key, binding); @@ -193,6 +254,13 @@ private void Paste(string text) return; } + if (_search is { } search) + { + search.Type(text); + Refresh(); + return; + } + Apply(binding, binding.Session.Paste(text)); } @@ -203,6 +271,25 @@ private void OnKey(object? sender, KeyPressedEventArgs e) return; } + if (_search is { } search) + { + e.Handled = ApplySearch(search, search.Handle(e.KeyInfo)); + return; + } + + // `/` opens the search over any screen — but only while the screen is navigating: inside an open + // field it is a character being typed, and the field has the whole keyboard (SettingsSession's rule). + if (e.KeyInfo.KeyChar == '/' + && (e.KeyInfo.Modifiers & (ConsoleModifiers.Control | ConsoleModifiers.Alt)) == 0 + && !binding.Session.IsEditing + && SearchHost is { } host) + { + _search = new SettingsSearchState(host, TitleOf(_openKey, host)); + Refresh(); + e.Handled = true; + return; + } + // ⌃V is the app-level paste, and it was as dead on these screens as the terminal's own. The // framework reads the clipboard for the focused control when that control accepts paste, and a // settings screen has none to offer, so the read is done here instead. ⌃⇧V is not this chord: @@ -222,6 +309,39 @@ private void OnKey(object? sender, KeyPressedEventArgs e) e.Handled = Apply(binding, binding.Session.Handle(e.KeyInfo)); } + /// What the search answered a key with, acted on. + private bool ApplySearch(SettingsSearchState search, SettingsSearchAction action) + { + switch (action) + { + case SettingsSearchAction.Close: + _search = null; + Refresh(); + return true; + + case SettingsSearchAction.Go when search.Current is { } match && SearchHost is { } host: + // The host puts the screen up (Show), which takes the search down with it. A host that + // could not leaves the search where it is. + if (!host.Go(match)) + { + Refresh(); + } + + return true; + + case SettingsSearchAction.None: + return false; + + default: + Refresh(); + return true; + } + } + + /// The title of the section a key opens, for the search's "Esc goes back to …" line. + private static string? TitleOf(ConsoleKey key, SettingsSearchHost host) => + host.Sections().FirstOrDefault(s => string.Equals(s.Key, key.ToString(), StringComparison.Ordinal))?.Title; + /// /// Acts on what a screen said an input meant, and reports whether the input was consumed. Shared by /// the key and the paste paths so a screen cannot answer the two differently. @@ -268,7 +388,10 @@ private void Refresh() } window.ClearControls(); - window.AddControl(binding.Control()); + window.AddControl(_search is { } search + ? SettingsSearchView.Build( + search, _system.DesktopDimensions.Width, _system.DesktopDimensions.Height, Scheme) + : binding.Control()); window.Invalidate(redrawAll: true); } @@ -329,6 +452,7 @@ private void Reset() _system.ConsoleDriver.Paste -= OnPaste; _window = null; _binding = null; + _search = null; _behind.Clear(); } } diff --git a/src/SharpMUTerm.Tui/SettingsSearchSurface.cs b/src/SharpMUTerm.Tui/SettingsSearchSurface.cs new file mode 100644 index 00000000..3b4675c1 --- /dev/null +++ b/src/SharpMUTerm.Tui/SettingsSearchSurface.cs @@ -0,0 +1,342 @@ +using System.Globalization; +using SharpConsoleUI.Controls; +using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Client.Settings; +using SharpMUTerm.Core.Configuration; +using static SharpMUTerm.Tui.MarkupText; +using static SharpMUTerm.Tui.ScreenPalette; + +namespace SharpMUTerm.Tui; + +/// +/// What the settings search needs from the app: the declared sections it searches, the configuration their +/// values are read from, and a way to take the reader to a match. returns false when it could +/// not, and the search stays up. +/// +internal sealed record SettingsSearchHost( + Func> Sections, + Func Config, + Func Go); + +/// What a key did to the settings search. +internal enum SettingsSearchAction +{ + /// Not a key the search uses. + None, + + /// The query or the selection moved. + Redraw, + + /// Back to the screen the search was opened over. + Close, + + /// Go to the selected match. + Go, +} + +/// +/// The settings search's keyboard state: the query being typed and which match is selected. It owns no +/// controls — hands it keys and draws from it — +/// so the whole contract is testable without a terminal. Typing narrows, Backspace widens, ↑↓ walk the matches, +/// ⏎ goes to the selected one, Esc goes back to the screen it was opened over. +/// +internal sealed class SettingsSearchState +{ + private readonly SettingsSearchHost _host; + + internal SettingsSearchState(SettingsSearchHost host, string? origin = null) + { + ArgumentNullException.ThrowIfNull(host); + _host = host; + Origin = origin; + } + + /// The title of the screen the search was opened over, which Esc goes back to. + internal string? Origin { get; } + + /// What has been typed. + internal string Query { get; private set; } = string.Empty; + + /// Which match is selected, clamped to the matches there are. + internal int Selected { get; private set; } + + /// The sections searched, in their order. + internal IReadOnlyList Sections => _host.Sections(); + + /// The configuration a match's value is read from. + internal AppConfiguration Config => _host.Config(); + + /// Every match for the query, in section order. + internal IReadOnlyList Matches => SettingsSearch.Find(Sections, Query); + + /// The selected match, or null when nothing matches. + internal SettingsMatch? Current + { + get + { + var matches = Matches; + return matches.Count == 0 ? null : matches[Math.Clamp(Selected, 0, matches.Count - 1)]; + } + } + + /// Interprets one key. + internal SettingsSearchAction Handle(ConsoleKeyInfo key) + { + switch (key.Key) + { + case ConsoleKey.Escape: + return SettingsSearchAction.Close; + + case ConsoleKey.Enter: + return Current is null ? SettingsSearchAction.Redraw : SettingsSearchAction.Go; + + case ConsoleKey.UpArrow: + return Move(-1); + + case ConsoleKey.DownArrow: + return Move(1); + + case ConsoleKey.Backspace: + if (Query.Length == 0) + { + return SettingsSearchAction.Redraw; + } + + Query = Query[..^1]; + Selected = 0; + return SettingsSearchAction.Redraw; + + default: + if (key.KeyChar != '\0' && !char.IsControl(key.KeyChar) + && (key.Modifiers & (ConsoleModifiers.Control | ConsoleModifiers.Alt)) == 0) + { + Type(key.KeyChar.ToString()); + return SettingsSearchAction.Redraw; + } + + // Every other key is swallowed rather than passed on: the screen under the search is not + // the one the reader is looking at, and a key reaching it would change something unseen. + return SettingsSearchAction.Redraw; + } + } + + /// Appends text to the query — a key, or a paste flattened to one line. + internal void Type(string text) + { + var line = new string((text ?? string.Empty).Where(c => !char.IsControl(c)).ToArray()); + Query = (Query + line).Length > MaxQuery ? (Query + line)[..MaxQuery] : Query + line; + Selected = 0; + } + + /// The longest query kept; a field label is never near it. + internal const int MaxQuery = 64; + + private SettingsSearchAction Move(int delta) + { + var count = Matches.Count; + if (count == 0) + { + return SettingsSearchAction.Redraw; + } + + Selected = ((Math.Clamp(Selected, 0, count - 1) + delta) % count + count) % count; + return SettingsSearchAction.Redraw; + } +} + +/// +/// Draws the settings search: a header carrying the query, a list of every settings section with how many +/// matches each holds, and beside it the matches grouped by section, the matched text marked, each field's +/// value now and ● changed where it differs from its default. Below +/// the section list is left out and the matches take the width. +/// Pure markup apart from . +/// +internal static class SettingsSearchView +{ + /// The section list's width when the screen can afford it. + internal const int SectionsWidth = 35; + + /// The fewest cells the section list is drawn in. + internal const int SectionsMinimum = 24; + + /// The fewest cells the matches are readable in. + internal const int MatchesMinimum = 44; + + /// The header's hints. Every key named here is one answers. + internal const string Hints = "type to filter · ↑↓ select · ⏎ go · Esc back"; + + /// The composed screen. + internal static IWindowControl Build(SettingsSearchState state, int width, int height, ScreenTheme scheme) + { + ArgumentNullException.ThrowIfNull(state); + + var matches = state.Matches; + var rows = ScreenChrome.Rows(height); + var header = ScreenChrome.Band(HeaderLine(state, matches, width), HeaderBg, scheme); + var footer = ScreenChrome.Band(FooterLine(state, matches, width), FooterBg, scheme); + + if (ScreenChrome.TooNarrowForTwo(width, SectionsMinimum, MatchesMinimum)) + { + var only = ScreenChrome.Window(MatchColumn(state, matches, width), rows); + return ScreenChrome.Single( + header, footer, ScreenChrome.Stretch(ScreenChrome.Panel(only, scheme)), only.Count, rows); + } + + var left = ScreenChrome.SplitWidth(width, SectionsWidth, SectionsMinimum, MatchesMinimum); + var sections = SectionColumn(state, matches, left); + var right = ScreenChrome.Window(MatchColumn(state, matches, width - left - ScreenChrome.ColumnDivider), rows); + return ScreenChrome.Split( + header, + footer, + ScreenChrome.Stretch(ScreenChrome.Panel(sections, scheme)), + ScreenChrome.Stretch(ScreenChrome.Panel(right, scheme)), + left, + Math.Max(sections.Count, right.Count), + rows, + scheme); + } + + /// + /// Settings / meter▌ 3 matches on the left, the keys on the right. The block after the query is + /// where the next character lands; it is drawn rather than placed with the terminal's caret because the + /// screens draw every caret they have. + /// + internal static string HeaderLine(SettingsSearchState state, IReadOnlyList matches, int width) + { + var count = state.Query.Trim().Length == 0 + ? string.Empty + : matches.Count == 1 ? " 1 match" : $" {matches.Count.ToString(CultureInfo.InvariantCulture)} matches"; + var left = $" [bold {Value}]Settings[/] [{Accent}]/[/] [{Value} on {FieldBg}]{Escape(state.Query)}[/]" + + $"[{Ink} on {Accent}] [/][{Label}]{count}[/]"; + return SpreadTitle(left, $"[{Label}]{Hints} [/]", width); + } + + /// Where the selection is, and the actions: meter 1/3 · Text & display [Esc] Back [⏎] Go. + internal static string FooterLine(SettingsSearchState state, IReadOnlyList matches, int width) + { + var context = state.Current is { } current + ? ScreenChrome.Context( + Escape(ScreenChrome.Position(state.Query.Trim(), Math.Clamp(state.Selected, 0, matches.Count - 1), matches.Count)), + Escape(current.Section.Title)) + : string.Empty; + var actions = $"[{Label}] [[Esc]] Back [/] " + + (state.Current is null ? string.Empty : $"[{Ink} on {Accent}] [[⏎]] Go [/] "); + return SpreadLR(" " + context, actions, width); + } + + /// + /// Every section, with its key and how many matches it holds. The section the selected match is in wears + /// the cursor band; a section with none is dimmed while a query is typed, so the list reads as where the + /// query was found. + /// + internal static List SectionColumn(SettingsSearchState state, IReadOnlyList matches, int width) + { + var counts = SettingsSearch.CountBySection(matches); + var selected = state.Current?.Section.Id; + var typed = state.Query.Trim().Length > 0; + var lines = new List { string.Empty }; + foreach (var section in state.Sections) + { + var count = counts.GetValueOrDefault(section.Id); + var key = section.Key ?? string.Empty; + var tally = count > 0 ? count.ToString(CultureInfo.InvariantCulture) : string.Empty; + var title = ElideVisible(Escape(section.Title), Math.Max(4, width - 11)); + var ink = typed && count == 0 ? Muted : Value; + var row = $" [{ink}]{PadVisible(title, Math.Max(4, width - 11))}[/] [{Label}]{key,-4}[/][{Accent}]{tally,3}[/]"; + lines.Add(ScreenChrome.Cursor(row, section.Id == selected, width)); + } + + return lines; + } + + /// + /// The matches, grouped under their section's title and key. A field match reads its label with the + /// matched run marked, its value now, and ● changed when it differs from its default; a section + /// match reads open …. The selected one wears the cursor band and has its help line under it. + /// + internal static List MatchColumn(SettingsSearchState state, IReadOnlyList matches, int width) + { + var lines = new List { string.Empty }; + if (state.Query.Trim().Length == 0) + { + lines.Add($" [{Label}]Type to search every setting by name, by what it does, or by screen.[/]"); + if (state.Origin is { } origin) + { + lines.Add($" [{Label}]Esc goes back to {Escape(origin)}.[/]"); + } + + return lines; + } + + if (matches.Count == 0) + { + lines.Add($" [{Label}]Nothing matches “{Escape(state.Query.Trim())}”.[/]"); + return lines; + } + + var config = state.Config; + var selected = Math.Clamp(state.Selected, 0, matches.Count - 1); + string? section = null; + string? group = null; + for (var i = 0; i < matches.Count; i++) + { + var match = matches[i]; + if (!string.Equals(match.Section.Id, section, StringComparison.Ordinal)) + { + if (section is not null) + { + lines.Add(string.Empty); + } + + section = match.Section.Id; + group = null; + lines.Add($" [bold {Value}]{Escape(match.Section.Title)}[/] [{Label}]{Escape(match.Section.Key ?? string.Empty)}[/]"); + } + + if (match.Field is { Group: { } fieldGroup } && !string.Equals(fieldGroup, group, StringComparison.Ordinal)) + { + group = fieldGroup; + lines.Add($" [dim]├ {Escape(fieldGroup.ToUpperInvariant())}[/]"); + } + + lines.Add(ScreenChrome.Cursor(Row(match, config, width), i == selected, width)); + if (i == selected && match.Field?.Help is { } help) + { + lines.Add($" [{Label}]{ElideVisible(Escape(help), Math.Max(8, width - 6))}[/]"); + } + } + + return lines; + } + + /// One match: its marked text, then (for a field) its value and whether it has changed. + private static string Row(SettingsMatch match, AppConfiguration config, int width) + { + var text = Marked(match); + if (match.Field is not { } field) + { + return $" [{Label}]open[/] {text}"; + } + + var changed = field.Binding is { } binding && !binding.IsDefault(config); + var mark = changed ? $" [{Accent}]{OptionsScreenRenderer.ChangedMark}[/]" : string.Empty; + var value = field.Binding?.Text(config) ?? string.Empty; + var room = Math.Max(0, width - 3 - 30 - VisibleLength(mark) - 2); + var shown = room > 3 && value.Length > 0 ? $"[{Muted}]{ElideVisible(Escape(value), room)}[/]" : string.Empty; + return $" {PadVisible(text, 30)} {shown}{mark}"; + } + + /// The match's text with the matched run in the accent, bold. + private static string Marked(SettingsMatch match) + { + if (match.Start < 0 || match.Length == 0 || match.Start + match.Length > match.Text.Length) + { + return $"[{Value}]{Escape(match.Text)}[/]"; + } + + var before = match.Text[..match.Start]; + var run = match.Text.Substring(match.Start, match.Length); + var after = match.Text[(match.Start + match.Length)..]; + return $"[{Value}]{Escape(before)}[/][bold {Accent}]{Escape(run)}[/][{Value}]{Escape(after)}[/]"; + } +} diff --git a/src/SharpMUTerm.Tui/SettingsSession.cs b/src/SharpMUTerm.Tui/SettingsSession.cs index 4c72a8e2..e106878d 100644 --- a/src/SharpMUTerm.Tui/SettingsSession.cs +++ b/src/SharpMUTerm.Tui/SettingsSession.cs @@ -149,7 +149,9 @@ internal ScreenFocus Focus() field?.Choices, field?.ClosedChoices ?? false, field?.Capture ?? false, - field?.Masked ?? false) + field?.Masked ?? false, + field?.ChoiceNotes, + field?.ChoiceCaption) : (ScreenFieldEdit?)null; return new ScreenFocus(Selection.Pane, Selection.Index, edit, Enter(model)); @@ -235,6 +237,9 @@ private ScreenAction Interpret(ConsoleKeyInfo key) case ConsoleKey.I when key.Modifiers == 0: return Detail(model); + case ConsoleKey.R when key.Modifiers == 0: + return Reset(model); + case ConsoleKey.Spacebar: return Toggle(model); @@ -310,6 +315,23 @@ private ScreenAction Detail(ScreenModel model) return ScreenAction.Consumed; } + /// + /// r on a declared setting that differs from its default puts the default back, through + /// like any other change. A row at its default has no reset and the key is not ours + /// there, which is also why the header names r reset only on such a row. A plain letter is safe + /// for 's reason: an open field edit has taken the whole keyboard long before this. + /// + private ScreenAction Reset(ScreenModel model) + { + if (model.ResetAt(Selection.Pane, Selection.Index) is not { } reset) + { + return ScreenAction.None; + } + + Edits.Apply(reset); + return ScreenAction.Redraw; + } + private ScreenAction Toggle(ScreenModel model) { if (model.ToggleAt(Selection.Pane, Selection.Index) is not { } toggle) diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Settings.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Settings.cs new file mode 100644 index 00000000..945d294f --- /dev/null +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Settings.cs @@ -0,0 +1,93 @@ +using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Client.Settings; +using SharpMUTerm.Core.Protocols; + +namespace SharpMUTerm.Tui; + +/// +/// The settings screens' declared half: the sections the client registers (), the +/// projections F7 and F8 are drawn from, and the settings search's way back into the screens. The screens' +/// keyboard and chrome are 's and 's as before. +/// +internal sealed partial class SharpMUTermApp +{ + private void RegisterBuiltInSettings() => BuiltInSettings.Register(_contributions.SettingsSections); + + /// A declared section's title — what its screen's header, its ⌃P entry and the search all call it. + private string SectionTitle(string id) => + Section(id).Title; + + /// A declared section, from the registry; the built-in declaration if something removed it. + private SettingsSectionContribution Section(string id) => + _contributions.SettingsSections.Find(id) ?? BuiltInSettings.All.First(s => s.Id == id); + + /// + /// F7 as it stands: the declared section over the live configuration, the meter table reading the focused + /// window's game data, and deciding whether the received-data box is shown. + /// + private OptionsScreenRenderer.OptionsScreen TextProjection(int cursor) => + OptionsScreenRenderer.TextAnsiScreen(_config, includeSound: true, SettingsGameData(), cursor, Section("text")); + + /// F8 as it stands. + private OptionsScreenRenderer.OptionsScreen InputProjection() => + OptionsScreenRenderer.InputScreen(_config, Section("input")); + + /// + /// The game data the meter editor reads: the focused window's session's — never _active's, for the + /// misdelivery reason everything else here resolves through the focused window — or the demo scene's. + /// + private GameDataStore SettingsGameData() => SendTarget()?.GameData ?? StatusData(); + + /// What the settings search reads, and how its ⏎ lands. + private SettingsSearchHost SettingsSearchHost() => + new(() => _contributions.SettingsSections.Ordered, () => _config, GoToSetting); + + /// + /// The search's ⏎: opens the match's screen in the same window and, for a declared field, puts the cursor + /// on the row drawing it. Packages (F10) is not a settings screen and is opened its own way. + /// + private bool GoToSetting(SettingsMatch match) + { + if (string.Equals(match.Section.Id, "packages", StringComparison.Ordinal)) + { + _settings.CloseAll(); + ShowPackages(); + return true; + } + + if (!Enum.TryParse(match.Section.Key, out var key) + || SettingsScreens().FirstOrDefault(s => s.Key == key) is not { Open: not null } screen) + { + return false; + } + + var binding = screen.Open(); + if (match.Field is { } field && FieldRow(match.Section.Id, field.Id) is { } row and >= 0) + { + binding.Session.Selection.Seed(0, row); + } + + _settings.Show(key, binding); + return true; + } + + /// Where a declared field's row is on its screen, or null for a section not drawn from declarations. + private int? FieldRow(string section, string field) => section switch + { + "text" => OptionsScreenRenderer.IndexOf(TextProjection(-1), field), + "input" => OptionsScreenRenderer.IndexOf(InputProjection(), field), + _ => null, + }; + + /// Whether the settings search is up, for a test. + internal bool SettingsSearchIsOpen => _settings.IsSearching; + + /// The F-key of the open settings screen, for a test. + internal ConsoleKey? SettingsOpenKey => _settings.OpenKey; + + /// Where the open settings screen's cursor is, for a test. + internal ScreenFocus? SettingsFocus => _settings.Focus; + + /// Where a declared field's row is on F7 or F8, for a test. + internal int? SettingsFieldRow(string section, string field) => FieldRow(section, field); +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 0ad7eb92..3c95556b 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -900,11 +900,12 @@ public SharpMUTermApp( _window.IsScrollable = false; RegisterBuiltInContributions(); + RegisterBuiltInSettings(); _palette = new CommandPalette(_system, BuildCatalog, () => _active?.SessionKey, id => DispatchCommand(id)); _messageLog = new MessageLogOverlay(_system, _diagnostics); _gameData = new GameDataOverlay(_system, _time); _screens = ScreenTheme.For(_theme); - _settings = new SettingsOverlay(_system, _screens); + _settings = new SettingsOverlay(_system, _screens) { SearchHost = SettingsSearchHost() }; _composer = new ComposeOverlay(_system, _spelling, _screens); _packageView = new ListOverlay(_system, _screens); _sendMenu = new ListOverlay(_system, _screens); @@ -1949,6 +1950,56 @@ public string RenderSnapshot(string? view = null) return RenderFrame(); } + // The settings search and F7's meter editor, reached by the keys a reader would press: F7, `/`, + // `meter`. `settings-meters` then takes ⏎ to the field and ↓ onto the second meter, where the + // received-data box is drawn; `-pick` opens that meter's value path, so its dropdown lists what the + // demo's game data holds. The game data is written through SetGmcp, the call the wire makes. + // `settings-changed` is F7 after two real edits — Space on `emoji substitution`, and `8` typed into + // the tab width — so the frame carries the `● changed` marks and the header's `r reset`. + if (string.Equals(view, "settings-changed", StringComparison.OrdinalIgnoreCase)) + { + _settings.OpenForSnapshot(ConsoleKey.F7, TextAnsiScreen()); + for (var down = 0; down < 5; down++) + { + _settings.SimulateKey(Stroke('\0', ConsoleKey.DownArrow)); + } + + _settings.SimulateKey(Stroke(' ', ConsoleKey.Spacebar)); + _settings.SimulateKey(Stroke('\0', ConsoleKey.UpArrow)); + _settings.SimulateKey(Stroke('\r', ConsoleKey.Enter)); + _settings.SimulateKey(Stroke('\b', ConsoleKey.Backspace)); + _settings.SimulateKey(Stroke('8', ConsoleKey.D8)); + _settings.SimulateKey(Stroke('\r', ConsoleKey.Enter)); + SyncInputWidth(); + return RenderFrame(); + } + + if (string.Equals(view, "settings-search", StringComparison.OrdinalIgnoreCase) + || string.Equals(view, "settings-meters", StringComparison.OrdinalIgnoreCase) + || string.Equals(view, "settings-meters-pick", StringComparison.OrdinalIgnoreCase)) + { + LoadDemoGameData(); + _settings.OpenForSnapshot(ConsoleKey.F7, TextAnsiScreen()); + foreach (var c in "/meter") + { + _settings.SimulateKey(Stroke(c, c == '/' ? ConsoleKey.Oem2 : ConsoleKey.NoName)); + } + + if (!string.Equals(view, "settings-search", StringComparison.OrdinalIgnoreCase)) + { + _settings.SimulateKey(Stroke('\r', ConsoleKey.Enter)); + _settings.SimulateKey(Stroke('\0', ConsoleKey.DownArrow)); + if (view!.EndsWith("-pick", StringComparison.OrdinalIgnoreCase)) + { + _settings.SimulateKey(Stroke('\r', ConsoleKey.Enter)); + _settings.SimulateKey(Stroke('\t', ConsoleKey.Tab)); + } + } + + SyncInputWidth(); + return RenderFrame(); + } + // Settings screens (composed-control or markup — SettingsView hands back a control factory // either way) open over the workspace for their --view name. A "-edit" view opens the // same screen and then drives real keys into it, so the frame shows a field genuinely mid-edit @@ -6462,18 +6513,18 @@ private void RefreshStatusBar() /// private IReadOnlyList SettingsScreens() => new SettingsScreen[] { - new(ConsoleKey.F2, "Triggers & spawn routing", new[] { "triggers", "route", "highlight", "set" }, TriggersScreen), - new(ConsoleKey.F3, "Aliases", new[] { "aliases" }, AliasesScreen), - new(ConsoleKey.F4, "Keypad & hotkeys", new[] { "keypad" }, KeypadScreen), - new(ConsoleKey.F5, "Worlds & Characters", new[] { "worlds", "settings" }, WorldsScreen), - new(ConsoleKey.F6, "Timers", new[] { "timers" }, TimersScreen), - new(ConsoleKey.F7, "Text & ANSI", new[] { "textansi" }, TextAnsiScreen), - new(ConsoleKey.F8, "Input", new[] { "input" }, InputScreen), + new(ConsoleKey.F2, SectionTitle("triggers"), new[] { "triggers", "route", "highlight", "set" }, TriggersScreen), + new(ConsoleKey.F3, SectionTitle("aliases"), new[] { "aliases" }, AliasesScreen), + new(ConsoleKey.F4, SectionTitle("keypad"), new[] { "keypad" }, KeypadScreen), + new(ConsoleKey.F5, SectionTitle("worlds"), new[] { "worlds", "settings" }, WorldsScreen), + new(ConsoleKey.F6, SectionTitle("timers"), new[] { "timers" }, TimersScreen), + new(ConsoleKey.F7, SectionTitle("text"), new[] { "textansi" }, TextAnsiScreen), + new(ConsoleKey.F8, SectionTitle("input"), new[] { "input" }, InputScreen), // "password" and "startup" are further --view names for the same character-pane screen, the way // F2 carries four: the screen is identical, only the -edit script differs, and each names a // state a still frame is the only way to look at — a masked buffer mid-edit, and the two-entry // dropdown over `at start`, which is drawn *downward* over the rows beneath it. - new(ConsoleKey.F9, "Character logging", new[] { "logging", "password", "startup" }, CharacterLoggingScreen), + new(ConsoleKey.F9, SectionTitle("logging"), new[] { "logging", "password", "startup" }, CharacterLoggingScreen), }; /// @@ -7217,24 +7268,32 @@ private ScreenBinding TimersScreen() _system.DesktopDimensions.Height)); } - /// Opens the F7 Text & ANSI screen, bound to the app's text preferences. - private ScreenBinding TextAnsiScreen() => - OptionsScreen(() => OptionsScreenRenderer.TextAnsiScreen(_config.Text, _config.Sound)); + /// Opens the F7 Text & display screen, drawn from its declared section. + private ScreenBinding TextAnsiScreen() => OptionsScreen(TextProjection); - /// Opens the F8 Input screen, bound to the app's input preferences. - private ScreenBinding InputScreen() => - OptionsScreen(() => OptionsScreenRenderer.InputScreen(_config.Input)); + /// Opens the F8 Input screen, drawn from its declared section. + private ScreenBinding InputScreen() => OptionsScreen(_ => InputProjection()); /// /// The shared open path for the single-list option screens (F7/F8). is - /// re-projected from config on every key, so a flipped checkbox shows up in both the row it lives - /// on and the model the next keystroke navigates. - /// - private ScreenBinding OptionsScreen(Func screen) - { - var session = new SettingsSession(_ => OptionsScreenRenderer.Model(screen()), SaveConfiguration); - return new ScreenBinding(session, () => OptionsScreenView.Build( - screen(), _system.DesktopDimensions.Width, _screens, session.Focus())); + /// re-projected from config on every key, and handed the cursor, so a flipped checkbox shows up in both + /// the row it lives on and the model the next keystroke navigates — and F7's received-data box follows the + /// cursor into and out of the meter table. + /// + private ScreenBinding OptionsScreen(Func screen) + { + var session = new SettingsSession( + selection => OptionsScreenRenderer.Model(screen(selection.CursorIn(0))), SaveConfiguration); + return new ScreenBinding(session, () => + { + var focus = session.Focus(); + return OptionsScreenView.Build( + screen(session.Selection.CursorIn(0)), + _system.DesktopDimensions.Width, + _screens, + focus, + _system.DesktopDimensions.Height); + }); } /// The --view suffix that opens a settings screen with a field being typed into. diff --git a/src/SharpMUTerm.Tui/SnapshotViews.cs b/src/SharpMUTerm.Tui/SnapshotViews.cs index e89b91ab..991faf21 100644 --- a/src/SharpMUTerm.Tui/SnapshotViews.cs +++ b/src/SharpMUTerm.Tui/SnapshotViews.cs @@ -13,6 +13,7 @@ internal static class SnapshotViews null, "worlds", "settings", "triggers", "route", "highlight", "set", "aliases", "timers", "keypad", "textansi", "input", "logging", "password", "startup", "deletions", + "settings-search", "settings-meters", "settings-meters-pick", "settings-changed", "triggers-edit", "logging-edit", "keypad-edit", "password-edit", "startup-edit", "freeze", "freeze-scrollback", "spawn", "split", "move", "drag", "history", "history-search", "history-search-filter", "draft", "draft2", diff --git a/tests/SharpMUTerm.Client.Tests/SettingsDeclarationTests.cs b/tests/SharpMUTerm.Client.Tests/SettingsDeclarationTests.cs new file mode 100644 index 00000000..68680102 --- /dev/null +++ b/tests/SharpMUTerm.Client.Tests/SettingsDeclarationTests.cs @@ -0,0 +1,108 @@ +using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Client.Settings; +using SharpMUTerm.Core.Configuration; + +namespace SharpMUTerm.Client.Tests; + +/// +/// The declared settings: every built-in field is bound to the configuration, a fresh configuration is at every +/// default, a change is seen and a reset undoes it, and the search finds a field by label, group, help or +/// keyword and a screen by its title. +/// +public class SettingsDeclarationTests +{ + private static IEnumerable Fields => BuiltInSettings.All.SelectMany(s => s.Fields); + + [Test] + public async Task EveryDeclaredFieldIsBoundAndGrouped() + { + foreach (var field in Fields) + { + await Assert.That(field.Binding).IsNotNull(); + await Assert.That(field.Group).IsNotNull(); + } + } + + [Test] + public async Task AFreshConfigurationIsAtEveryDefault() + { + var config = new AppConfiguration(); + foreach (var field in Fields) + { + await Assert.That(field.Binding!.IsDefault(config)).IsTrue(); + } + } + + [Test] + public async Task AChangeIsSeenAndAResetUndoesIt() + { + var config = new AppConfiguration(); + config.Text.TabWidth = 8; + config.Text.StatusMeters.RemoveAt(0); + var tab = BuiltInSettings.Text.Fields.Single(f => f.Id == "tab-width").Binding!; + var meters = BuiltInSettings.Text.Fields.Single(f => f.Id == BuiltInSettings.MetersField).Binding!; + + await Assert.That(tab.IsDefault(config)).IsFalse(); + await Assert.That(meters.IsDefault(config)).IsFalse(); + + tab.Reset(config); + meters.Reset(config); + + await Assert.That(config.Text.TabWidth).IsEqualTo(TextSettings.DefaultTabWidth); + await Assert.That(config.Text.StatusMeters.Count).IsEqualTo(3); + } + + /// A reset list is a fresh one, never a default instance two configurations would share. + [Test] + public async Task ResetListsAreNotShared() + { + var binding = (SettingBinding>)BuiltInSettings.Text.Fields + .Single(f => f.Id == BuiltInSettings.MetersField).Binding!; + var a = new AppConfiguration(); + var b = new AppConfiguration(); + binding.Reset(a); + binding.Reset(b); + + await Assert.That(ReferenceEquals(a.Text.StatusMeters, b.Text.StatusMeters)).IsFalse(); + } + + [Test] + public async Task TheSearchFindsLabelsKeywordsAndTitles() + { + var byLabel = SettingsSearch.Find(BuiltInSettings.All, "METER"); + await Assert.That(byLabel.Select(m => m.Field?.Id)).Contains(BuiltInSettings.MetersField); + var meters = byLabel.First(m => m.Field?.Id == BuiltInSettings.MetersField); + await Assert.That(meters.Start).IsEqualTo(0); + await Assert.That(meters.Length).IsEqualTo(5); + + var byKeyword = SettingsSearch.Find(BuiltInSettings.All, "opacity"); + await Assert.That(byKeyword.Single().Field!.Id).IsEqualTo("transparency"); + await Assert.That(byKeyword.Single().Start).IsEqualTo(-1); + + var byTitle = SettingsSearch.Find(BuiltInSettings.All, "alias"); + await Assert.That(byTitle.Single().Field).IsNull(); + await Assert.That(byTitle.Single().Section.Id).IsEqualTo("aliases"); + + await Assert.That(SettingsSearch.Find(BuiltInSettings.All, " ")).IsEmpty(); + } + + [Test] + public async Task MatchesAreCountedBySection() + { + var counts = SettingsSearch.CountBySection(SettingsSearch.Find(BuiltInSettings.All, "volume")); + + await Assert.That(counts["text"]).IsEqualTo(3); + await Assert.That(counts.ContainsKey("input")).IsFalse(); + } + + /// Every settings screen F2–F10 is a section with its key, so the search can list and open all of them. + [Test] + public async Task EveryScreenIsASectionWithItsKey() + { + var registry = new ContributionRegistry(); + BuiltInSettings.Register(registry.SettingsSections); + + await Assert.That(registry.SettingsSections.Ordered.Select(s => s.Key!)) + .IsEquivalentTo(new[] { "F5", "F2", "F3", "F4", "F6", "F7", "F8", "F9", "F10" }); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/ClientHostContractTests.cs b/tests/SharpMUTerm.Tui.Tests/ClientHostContractTests.cs index 444f0203..f405c5c8 100644 --- a/tests/SharpMUTerm.Tui.Tests/ClientHostContractTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/ClientHostContractTests.cs @@ -106,7 +106,7 @@ public async Task EveryViewTheSnapshotKnowsIsInTheParityList() var source = File.ReadAllText(Path.Combine(RepositoryRoot(), "src", "SharpMUTerm.Tui", "SharpMUTermApp.cs")); var exact = Regex.Matches(source, @"string\.Equals\(view, ""([a-z0-9-]+)""").Select(m => m.Groups[1].Value); var prefixes = Regex.Matches(source, @"view\.StartsWith\(""([a-z0-9-]+)""").Select(m => m.Groups[1].Value); - var screens = Regex.Matches(source, @"new\(ConsoleKey\.F\d+, ""[^""]+"", new\[\] \{ ([^}]+) \}") + var screens = Regex.Matches(source, @"new\(ConsoleKey\.F\d+, [^,]+, new\[\] \{ ([^}]+) \}") .SelectMany(m => Regex.Matches(m.Groups[1].Value, @"""([a-z0-9-]+)""").Select(v => v.Groups[1].Value)); var listed = SnapshotViews.All.OfType().ToHashSet(StringComparer.Ordinal); @@ -116,6 +116,7 @@ public async Task EveryViewTheSnapshotKnowsIsInTheParityList() .ToList(); await Assert.That(exact.Count()).IsGreaterThan(20).Because("the pattern still finds the view comparisons"); + await Assert.That(screens).Contains("textansi").Because("the pattern still finds the settings screen table"); await Assert.That(missing).IsEmpty().Because("each view has to be rendered in the window too"); } diff --git a/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs b/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs index 44ac8df5..59090649 100644 --- a/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs @@ -61,6 +61,10 @@ public class FrameContrastTests "aliases", "timers", "textansi", "input", "set", "password", "deletions", "route", "triggers-edit", "keypad-edit", "worlds-edit", "mssp-none", "compose-literal", + // The settings search marks its matches in the accent and the changed marks wear it too; the meter + // editor's dropdown carries the received values as muted notes beside each path. + "settings-search", "settings-meters", "settings-meters-pick", "settings-changed", + // The prompt row is the only thing this client paints outside a pane that carries the // *game's* colours rather than its own, so the floor is applied against the idle input band // instead of the reading plane. A band nothing renders in a test is a band nobody checks. diff --git a/tests/SharpMUTerm.Tui.Tests/GameDataTests.cs b/tests/SharpMUTerm.Tui.Tests/GameDataTests.cs index ae89ddf7..9e4ceeb6 100644 --- a/tests/SharpMUTerm.Tui.Tests/GameDataTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/GameDataTests.cs @@ -137,23 +137,83 @@ public async Task TheInspectorOpensOnTheFocusedConnection() await Assert.That(app.GameDataIsOpen).IsFalse(); } + /// + /// F7's meters are a table: one row per meter with its label, value path and maximum path as three fields + /// of that row, written straight into . It replaced a single + /// label=value/max; … line, which was the maintainer's complaint about it: too small to edit. + /// [Test] - public async Task F7EditsTheMetersAsOneLine() + public async Task F7EditsEachMeterInItsOwnRow() { var text = new TextSettings(); var screen = OptionsScreenRenderer.TextAnsiScreen(text); var model = OptionsScreenRenderer.Model(screen); - var field = Enumerable.Range(0, model.PaneCount) - .SelectMany(p => Enumerable.Range(0, model.RowCount(p)).Select(r => model.RowAt(p, r))) - .SelectMany(r => Enumerable.Range(0, r.FieldCount).Select(i => r.FieldAt(i))) - .Where(f => f is not null) - .Select(f => f!.Value) - .Single(f => f.Label == "meters"); + var first = OptionsScreenRenderer.IndexOf(screen, "meters"); + var row = model.RowAt(0, first); + var edits = new ScreenEdits(); + + await Assert.That(row.FieldCount).IsEqualTo(3); + await Assert.That(edits.Apply(row.FieldAt(0)!.Value, "life")).IsNull(); + await Assert.That(edits.Apply(row.FieldAt(1)!.Value, "Char.Vitals.hp")).IsNull(); + await Assert.That(edits.Apply(row.FieldAt(2)!.Value, " ")).IsNull(); + await Assert.That(edits.Apply(row.FieldAt(1)!.Value, " ")).IsNotNull(); + + await Assert.That(text.StatusMeters[0].Label).IsEqualTo("life"); + await Assert.That(text.StatusMeters[0].Value).IsEqualTo("Char.Vitals.hp"); + await Assert.That(text.StatusMeters[0].Max).IsNull(); + } + + /// + /// [+ meter] adds a row and lands on it; Delete on a meter row takes that meter out, and is offered only + /// there — the header names Del remove on a meter and nowhere else on the screen. + /// + [Test] + public async Task F7AddsAndRemovesMetersFromTheTable() + { + var config = new AppConfiguration(); + var screen = () => OptionsScreenRenderer.TextAnsiScreen(config); + var session = new SettingsSession(s => OptionsScreenRenderer.Model( + OptionsScreenRenderer.TextAnsiScreen(config, cursor: s.CursorIn(0)))); + var first = OptionsScreenRenderer.IndexOf(screen(), "meters"); + + session.Selection.Seed(0, first + 3); + session.Handle(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false)); + await Assert.That(config.Text.StatusMeters.Count).IsEqualTo(4); + await Assert.That(session.IsEditing).IsTrue(); + session.Handle(new ConsoleKeyInfo('\0', ConsoleKey.Escape, false, false, false)); + + session.Selection.Seed(0, first + 1); + session.Handle(new ConsoleKeyInfo('\0', ConsoleKey.Delete, false, false, false)); + await Assert.That(config.Text.StatusMeters.Select(m => m.Label)).IsEquivalentTo(new[] { "hp", "mv", "new" }); + await Assert.That(session.Edits.HasDeletions).IsTrue(); + + session.Selection.Seed(0, 0); + await Assert.That(session.Handle(new ConsoleKeyInfo('\0', ConsoleKey.Delete, false, false, false))) + .IsEqualTo(ScreenAction.None); + } - await Assert.That(new ScreenEdits().Apply(field, "hp=Char.Vitals.hp/Char.Vitals.maxhp; gold=Char.Status.gold; broken")).IsNull(); + /// + /// The table's now column reads the focused session's game data — 412/500 once both have + /// arrived, waiting before — and a path field offers every received path with its value. + /// + [Test] + public async Task F7MetersShowWhatTheyReadNowAndOfferWhatHasArrived() + { + var data = new GameDataStore(); + data.SetGmcp("Char.Vitals", """{"hp":"412","maxhp":"500"}"""); + var meters = StatusMeter.Defaults(); - await Assert.That(text.StatusMeters.Select(m => m.Label)).IsEquivalentTo(new[] { "hp", "gold" }); - await Assert.That(text.StatusMeters[1].Max).IsNull(); + await Assert.That(MarkupText.Plain(OptionsScreenRenderer.Now(meters[0], data))).IsEqualTo("412/500"); + await Assert.That(MarkupText.Plain(OptionsScreenRenderer.Now(meters[1], data))) + .IsEqualTo(OptionsScreenRenderer.Waiting); + await Assert.That(OptionsScreenRenderer.ReceivedPaths(data).Select(p => p.Path)) + .IsEquivalentTo(new[] { "Char.Vitals.hp", "Char.Vitals.maxhp" }); + + var config = new AppConfiguration(); + var screen = OptionsScreenRenderer.TextAnsiScreen(config, data: data); + var value = OptionsScreenRenderer.Model(screen).RowAt(0, OptionsScreenRenderer.IndexOf(screen, "meters")).FieldAt(1)!.Value; + await Assert.That(value.Choices!).Contains("Char.Vitals.maxhp"); + await Assert.That(value.ChoiceNotes!["Char.Vitals.maxhp"]).IsEqualTo("500"); } [Test] diff --git a/tests/SharpMUTerm.Tui.Tests/OptionsScreenRendererTests.cs b/tests/SharpMUTerm.Tui.Tests/OptionsScreenRendererTests.cs index 7a85056a..1cdab9f5 100644 --- a/tests/SharpMUTerm.Tui.Tests/OptionsScreenRendererTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/OptionsScreenRendererTests.cs @@ -86,7 +86,8 @@ public async Task TextAnsi_ContainsExpectedLabelsAndSections() { var lines = OptionsScreenRenderer.TextAnsi(); await Assert.That(lines.Any(l => l.Contains("COLOUR"))).IsTrue(); - await Assert.That(lines.Any(l => l.Contains("UNICODE"))).IsTrue(); + await Assert.That(lines.Any(l => l.Contains("LINKS & PICTURES"))).IsTrue(); + await Assert.That(lines.Any(l => l.Contains("STATUS ROW & METERS"))).IsTrue(); await Assert.That(lines.Any(l => l.Contains("strip incoming ANSI colour"))).IsTrue(); await Assert.That(lines.Any(l => l.Contains("allow blink"))).IsTrue(); await Assert.That(lines.Any(l => l.Contains("underline hyperlinks"))).IsTrue(); diff --git a/tests/SharpMUTerm.Tui.Tests/ScreenCursorTests.cs b/tests/SharpMUTerm.Tui.Tests/ScreenCursorTests.cs index b0cb1f4d..8d75617f 100644 --- a/tests/SharpMUTerm.Tui.Tests/ScreenCursorTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/ScreenCursorTests.cs @@ -112,11 +112,10 @@ public async Task Keypad_BarsTheFocusedBinding() [Test] public async Task Options_BarsTheFocusedOptionAndNeverASectionHeader() { - // Navigable row 6 is "emoji substitution" — the three section headers and the two spacers are - // skipped, five colour rows come first, and "tab width (spaces)" sits at 5 between them and this - // one. + // Navigable row 5 is "emoji substitution" — the headings and spacers are skipped, the four + // COLOUR & LEGIBILITY rows come first, and "tab width (spaces)" sits at 4 above it in TEXT. var screen = OptionsScreenRenderer.TextAnsiScreen(); - var lines = OptionsScreenRenderer.BodyColumn(screen.Rows, new ScreenFocus(0, 6)); + var lines = OptionsScreenRenderer.BodyColumn(screen.Rows, new ScreenFocus(0, 5)); await Assert.That(Barred(lines)).IsEqualTo(1); await Assert.That(lines.Single(l => l.Contains(Bar, StringComparison.Ordinal))).Contains("emoji substitution"); diff --git a/tests/SharpMUTerm.Tui.Tests/ScreenModelTests.cs b/tests/SharpMUTerm.Tui.Tests/ScreenModelTests.cs index 4cc3c22e..f9632f4e 100644 --- a/tests/SharpMUTerm.Tui.Tests/ScreenModelTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/ScreenModelTests.cs @@ -364,16 +364,14 @@ public async Task Options_NavigableRowsSkipSectionHeadersAndSpacers() var screen = OptionsScreenRenderer.TextAnsiScreen(); var model = OptionsScreenRenderer.Model(screen); - // 21 display rows: 6 section headers + 5 spacers + 10 options. It was 7/4 before WHITESPACE and - // its "tab width (spaces)" row, which brought a header and a spacer with it, 10/5 before - // "detect links in output" joined the COLOUR section, 11/6 before ACTIVITY and its - // "activity bar holds for (seconds)" row brought a header and a spacer of their own, and 14/7 - // before "keep text legible" joined COLOUR beneath the row it is the other half of, and 15/8 - // before BACKGROUND and its "background transparency (%)" row, and 18/9 before STATUS ROW and its - // "meters" row. - await Assert.That(screen.Rows.Count).IsEqualTo(21); + // 23 display rows: 5 group headings + 4 spacers + the meter table's column headings (drawn, never a + // stop) + 13 stops — eight settings in four groups, the three default meters, [+ meter], and the + // activity bar's hold. SOUND is left out because this caller passes no sound settings. Since F7 was + // drawn from its declared section the groups are COLOUR & LEGIBILITY, TEXT, LINKS & PICTURES, + // STATUS ROW & METERS and ACTIVITY; it was 21/10 with one row for the meters as a typed line. + await Assert.That(screen.Rows.Count).IsEqualTo(23); await Assert.That(model.PaneCount).IsEqualTo(1); - await Assert.That(model.Sizes[0]).IsEqualTo(10); + await Assert.That(model.Sizes[0]).IsEqualTo(13); } /// @@ -397,23 +395,24 @@ public async Task Options_TextAnsiRowsWriteBackToTheTextSettings() model.ToggleAt(0, 1)!.Value.Flip(); await Assert.That(text.KeepTextLegible).IsFalse(); - model.ToggleAt(0, 3)!.Value.Flip(); + model.ToggleAt(0, 6)!.Value.Flip(); await Assert.That(text.UnderlineHyperlinks).IsFalse(); - model.ToggleAt(0, 4)!.Value.Flip(); + model.ToggleAt(0, 7)!.Value.Flip(); await Assert.That(text.DetectLinks).IsFalse(); - model.ToggleAt(0, 6)!.Value.Flip(); + model.ToggleAt(0, 5)!.Value.Flip(); await Assert.That(text.EmojiSubstitution).IsFalse(); - // Row 5 is the tab width — a count, so it is a field rather than a toggle, and it is what makes + // Row 4 is the tab width — a count, so it is a field rather than a toggle, and it is what makes // this screen carry an editable row at all. - await Assert.That(model.ToggleAt(0, 5)).IsNull(); + await Assert.That(model.ToggleAt(0, 4)).IsNull(); await Assert.That(model.HasEditableRow).IsTrue(); - // Row 7 is the background transparency, a percentage rather than the checkbox it started as. - await Assert.That(model.ToggleAt(0, 7)).IsNull(); - var transparency = model.FieldAt(0, 7, 0)!.Value; + // Row 3 is the background transparency, a percentage rather than the checkbox it started as, at the + // foot of COLOUR & LEGIBILITY. + await Assert.That(model.ToggleAt(0, 3)).IsNull(); + var transparency = model.FieldAt(0, 3, 0)!.Value; await Assert.That(transparency.Validate("101")).IsNotNull(); transparency.Set("60"); await Assert.That(text.BackgroundTransparency).IsEqualTo(60); diff --git a/tests/SharpMUTerm.Tui.Tests/SettingsSearchTests.cs b/tests/SharpMUTerm.Tui.Tests/SettingsSearchTests.cs new file mode 100644 index 00000000..ab1f085c --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/SettingsSearchTests.cs @@ -0,0 +1,148 @@ +using SharpConsoleUI.Drivers; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Graphics; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// The settings rebuilt from declarations, end to end through the overlay: / opens the search over any +/// screen, typing narrows it, ⏎ lands on the field's own row — on another screen too — and Esc puts the screen +/// back. And the changed marks: a field away from its default says so, and r puts the default back +/// through the same save as every other edit. +/// +[NotInParallel] +public class SettingsSearchTests +{ + private static readonly TerminalCapabilities Headless = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private static SharpMUTermApp App(AppConfiguration? config = null, Action? save = null) + { + Console.SetIn(TextReader.Null); + return new SharpMUTermApp( + config ?? DemoScene.Build(), Headless, new HeadlessConsoleDriver(120, 34), save: save); + } + + private static ConsoleKeyInfo Key(char c, ConsoleKey key = ConsoleKey.NoName) => new(c, key, false, false, false); + + private static void Type(SharpMUTermApp app, string text) + { + foreach (var c in text) + { + app.SimulateSettingsKey(Key(c)); + } + } + + [Test] + public async Task SlashOpensTheSearchAndEscPutsTheScreenBack() + { + var app = App(); + app.DispatchCommand("screen:input"); + + app.SimulateSettingsKey(Key('/', ConsoleKey.Oem2)); + await Assert.That(app.SettingsSearchIsOpen).IsTrue(); + + app.SimulateSettingsKey(Key('\0', ConsoleKey.Escape)); + await Assert.That(app.SettingsSearchIsOpen).IsFalse(); + await Assert.That(app.SettingsOpenKey).IsEqualTo(ConsoleKey.F8); + } + + /// The search is opened over F8 and goes to a field of F7: the screen changes, and the cursor is on that field's row. + [Test] + public async Task EnterGoesToTheFieldOnItsOwnScreen() + { + var app = App(); + app.DispatchCommand("screen:input"); + app.SimulateSettingsKey(Key('/', ConsoleKey.Oem2)); + Type(app, "meter"); + + app.SimulateSettingsKey(Key('\r', ConsoleKey.Enter)); + + await Assert.That(app.SettingsSearchIsOpen).IsFalse(); + await Assert.That(app.SettingsOpenKey).IsEqualTo(ConsoleKey.F7); + await Assert.That(app.SettingsFocus!.Value.Index).IsEqualTo(app.SettingsFieldRow("text", "meters")!.Value); + } + + /// A section with no declared fields is found by its title and opened by ⏎. + [Test] + public async Task ASectionIsFoundByItsTitle() + { + var app = App(); + app.DispatchCommand("screen:textansi"); + app.SimulateSettingsKey(Key('/', ConsoleKey.Oem2)); + Type(app, "timers"); + + app.SimulateSettingsKey(Key('\r', ConsoleKey.Enter)); + + await Assert.That(app.SettingsOpenKey).IsEqualTo(ConsoleKey.F6); + } + + /// Inside an open field `/` is a character, not the search: the field has the whole keyboard. + [Test] + public async Task SlashInsideAFieldIsTyped() + { + var app = App(); + app.DispatchCommand("screen:input"); + app.SimulateSettingsKey(Key('\0', ConsoleKey.DownArrow)); + app.SimulateSettingsKey(Key('\0', ConsoleKey.DownArrow)); + app.SimulateSettingsKey(Key('\0', ConsoleKey.DownArrow)); + app.SimulateSettingsKey(Key('\r', ConsoleKey.Enter)); + + app.SimulateSettingsKey(Key('/', ConsoleKey.Oem2)); + + await Assert.That(app.SettingsSearchIsOpen).IsFalse(); + await Assert.That(app.SettingsFocus!.Value.Edit!.Value.Text).EndsWith("/"); + } + + /// + /// r on a changed field puts its default back and saves, the way every other committed change on + /// these screens does; on a field at its default it is not taken. + /// + [Test] + public async Task RResetsAChangedFieldThroughTheSave() + { + var config = DemoScene.Build(); + config.Input.LocalEcho = false; + var saves = 0; + var app = App(config, _ => saves++); + app.DispatchCommand("screen:input"); + + app.SimulateSettingsKey(Key('r', ConsoleKey.R)); + + await Assert.That(config.Input.LocalEcho).IsTrue(); + await Assert.That(saves).IsEqualTo(1); + + app.SimulateSettingsKey(Key('r', ConsoleKey.R)); + await Assert.That(saves).IsEqualTo(1); + } + + [Test] + public async Task AChangedFieldIsMarkedAndTheHeaderOffersTheReset() + { + var input = new InputSettings { Rows = 5 }; + var screen = OptionsScreenRenderer.InputScreen(input); + var model = OptionsScreenRenderer.Model(screen); + var lines = OptionsScreenRenderer.BodyColumn(screen.Rows); + var row = OptionsScreenRenderer.IndexOf(screen, "rows"); + + await Assert.That(lines.Single(l => l.Contains("height (lines)"))) + .Contains(OptionsScreenRenderer.ChangedMark); + await Assert.That(lines.Single(l => l.Contains("local echo"))) + .DoesNotContain(OptionsScreenRenderer.ChangedMark); + await Assert.That(OptionsScreenRenderer.HeaderLine("Input", "F8", 0, model, new ScreenFocus(0, row))) + .Contains("r reset"); + await Assert.That(OptionsScreenRenderer.HeaderLine("Input", "F8", 0, model, new ScreenFocus(0, 0))) + .DoesNotContain("r reset"); + + model.ResetAt(0, row)!(); + await Assert.That(input.Rows).IsEqualTo(new InputSettings().Rows); + } + + /// Every settings screen names the search in its header, because every one of them answers `/`. + [Test] + public async Task EveryScreenNamesTheSearch() + { + var header = OptionsScreenRenderer.HeaderLine("Input", "F8", 0, OptionsScreenRenderer.Model(OptionsScreenRenderer.InputScreen())); + await Assert.That(header).Contains("/ search"); + } +} From 2fc7f4e9657d288c72a1cea6ba56153b74bfc285 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 04:07:32 +0000 Subject: [PATCH 012/113] Add the who-here, vitals, quick bar and docked composer panels Four panels plug into the layouts seam (TerminalPanels.Register from RegisterTerminalPanels): who is here from GMCP Room.Players and the room's item list (a click puts look on the command line), a one-row vitals strip of reserved fields with bars, values, a low mark and the combat target, a quick bar of function-key macros run through the key's own path, and the F1 editor docked as a pane sharing F1's draft. While the composer's pane is in front it is armed: the focus pin targets its editor, Esc hands the keyboard back to the command line, and arriving at the pane arms it again. Each is on Ctrl+P and has a snapshot view. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 5 + CLAUDE.md | 37 +- .../Commands/BuiltInCommands.cs | 6 + .../Protocols/CombatTarget.cs | 77 ++ .../Protocols/RoomOccupants.cs | 317 +++++++ src/SharpMUTerm.Core/Session/WorldSession.cs | 8 + src/SharpMUTerm.Tui/Panels/DockedComposer.cs | 215 +++++ .../Panels/QuickBarRenderer.cs | 131 +++ .../Panels/VitalsStripRenderer.cs | 159 ++++ src/SharpMUTerm.Tui/Panels/WhoHereRenderer.cs | 106 +++ src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs | 791 ++++++++++++++++++ src/SharpMUTerm.Tui/SharpMUTermApp.cs | 57 +- src/SharpMUTerm.Tui/SnapshotViews.cs | 1 + src/SharpMUTerm.Tui/StatusMeterRenderer.cs | 60 +- .../Protocols/RoomOccupantsTests.cs | 165 ++++ .../DockedComposerTests.cs | 252 ++++++ .../FrameContrastTests.cs | 4 + .../LayoutWiringTests.cs | 6 +- .../TerminalPanelTests.cs | 246 ++++++ 19 files changed, 2617 insertions(+), 26 deletions(-) create mode 100644 src/SharpMUTerm.Core/Protocols/CombatTarget.cs create mode 100644 src/SharpMUTerm.Core/Protocols/RoomOccupants.cs create mode 100644 src/SharpMUTerm.Tui/Panels/DockedComposer.cs create mode 100644 src/SharpMUTerm.Tui/Panels/QuickBarRenderer.cs create mode 100644 src/SharpMUTerm.Tui/Panels/VitalsStripRenderer.cs create mode 100644 src/SharpMUTerm.Tui/Panels/WhoHereRenderer.cs create mode 100644 src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs create mode 100644 tests/SharpMUTerm.Core.Tests/Protocols/RoomOccupantsTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/DockedComposerTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/TerminalPanelTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 542caadf..6a20af0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,11 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] never gets an empty map pane, and the first time you connect to a world the client picks Combat or Roleplay from what the game sends and says which in a notice. A workspace you arranged yourself is still what comes back after a restart. +- Four panels a layout can place, each also on Ctrl+P: *Show who is here* (the players and creatures in your + room, from GMCP; click a name to put `look ` on the command line), *Show vitals* (your meters as bars + with values, a warning colour when low, and what you are fighting), *Show quick bar* (your function-key + macros as `F11 kick`; click one to run it) and *Dock the composer* (the F1 editor as a pane that shares F1's + draft: ⌃S sends, ⌥L switches escaping, F1 opens it full screen, Esc goes back to the command line). - Make a trigger without writing a regex: select a line of output and choose Ctrl+P ▸ *Make a trigger from the selection* (also on the right-click menu). Triggers (F2) opens on a new rule whose pattern is the line with its numbers, quoted speech and known player names turned into `*`, and shows the regex behind it. diff --git a/CLAUDE.md b/CLAUDE.md index 97aa5c77..b978f177 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -954,6 +954,39 @@ fallbacks) for inline images/maps. now resolves differently. - **The suggestion is taken once per world** (`AcceptedLayoutSuggestion`), 5 s after a connect or at once when vitals arrive, said in one notice, and only by the live entry point. +- **Four panels plug into that seam** (`SharpMUTermApp.Panels.cs`, `Tui/Panels/`: `WhoHereRenderer`, + `VitalsStripRenderer`, `QuickBarRenderer`, `DockedComposer`; Core `RoomOccupants`, `CombatTarget`; ⌃P `panel:*`; + the `panel-who`/`panel-vitals`/`panel-quickbar`/`panel-composer` views). The first three are one `MarkupControl` + each, drawn from the session's stores on change and sized from `PaneOutputRects` on `PostBufferPaint` + (`SyncPanelSizes`), so a panel's content is a function of its own pane and moves no other cell. Decisions: + - **A panel's links are its own.** Each panel control has its own `LinkClicked`, the payload is an *index* into + what that panel last drew (`mux:who:N`, `mux:quick:N`), and the action runs on the panel's own session + (`context.SessionKey`), never `_active` — the map window's rule. A who-here click puts `look ` on the + command line through `PlaceGrab` and sends nothing (the name is the game's text); a quick-bar click runs + `WorldSession.HandleKeyAsync(descriptor)`, the path the key itself takes. + - **The roster is server text, bounded** (`RoomOccupants`: 200 rows, 64-character names, no whitespace or + control characters in a player name, so a click cannot become a second command). `Room.Players` replaces, + `AddPlayer`/`RemovePlayer` edit, and creatures come from `Char.Items.*` with `location: room` and an `m` + attribute. Cleared on connect with the game data. + - **The vitals strip reserves every field**, the status row's rule: value and max `StatusMeterRenderer.ValueWidth` + each, the low mark's cells whether shown or not, the target name padded. The level of detail (bar length, + word or `!` low mark, gap, target bar, then percentages) is chosen from the width alone, so it changes only + when the pane does. It reads F7's meters through `StatusMeterRenderer.Read`; the meter model is unchanged. + - **The quick bar elides, never wraps**: `+N` counts what did not fit and `F4 edits keys` goes first. + - **The docked composer shares F1's draft** (`_composeDrafts`, per character, in memory) and sends through + `ComposeMessage.Build`, so ⌃S, ⌥L and the `%r` join are F1's exactly. F1 from it opens the same buffer full + screen; F1's close writes the draft back into the docked copy (`SyncDockedComposers`). + - **Composer focus is one fact: *armed*.** Armed means the focused pane's front window is a composer and it has + not been released (`_composerReleased`). While armed, `PinFocusToArmedBar` pins the framework's focus to the + *editor* instead of the bar — so typing, paste and the caret all land there by the pin's existing rule — and + both command lines wear the idle band. `HandleWindowKey` hands an armed composer's keys to + `HandleComposerKey` (macros, resize, ⌃C/⌃X, ⌃S, ⌥L, Esc, the ⌃arrows, else the editor). **Esc releases** (the + bar arms and ⏎ sends from it, to the same character); the ⌃↑/⌃↓ ladder releases too; **arriving** at the + composer's pane (⌃O, ⌃arrows, a tab, a click in the editor — `ArmClickedComposer` on `FocusChanged`, guarded by + `_pinningFocus` so the pin's own focus moves never count) arms it again. `ArmBar` does **not** release: it is + re-asserted on every layout change, and releasing there disarmed the composer the moment its pane was built. + ⌥⏎ arrives as Esc then Enter, so an Enter within 50 ms of the releasing Esc re-arms and inserts a newline + (`TryComposerAltEnter`). `DockedComposerTests` covers each of these. ## One client, several hosts — and how they are kept the same @@ -1138,7 +1171,9 @@ python3 tools/ansi_frame_to_image.py frame.ansi frame.html # or .svg tabs and half of a third and says nothing about the rest), plus the `layouts` (the ⌥M list over the demo, through the registered shortcut) and `layout-combat` (the Combat layout applied over the demo's game data and recorded streets: the map beside the output with Chat as a tab under it, - and no pane for the panels nothing draws yet), plus the + and no pane for the panels nothing draws yet), `panel-who`/`panel-vitals`/`panel-quickbar`/`panel-composer` + (each panel in a pane of its own over the demo's game data; the composer over who-here, armed, with a draft + typed through its real key path), plus the default workspace (no `--view`). Any settings screen also takes a `-edit` suffix, which opens it and drives real keys in so the frame shows a field mid-edit. State toggles: `collapsed`, `prefix`, `timestamps`, diff --git a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs index 63c50b62..ea1aede6 100644 --- a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs +++ b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs @@ -121,6 +121,12 @@ void Family(string id, string prefix, Func"); + // The panels a layout places, openable one at a time as tabs: each draws the focused character's own data + // and says so when there is none yet, so they are listed unconditionally, like the map. + Add("panel:who-here", CommandGroup.Terminal, "Show who is here", detail: "players and creatures in the room · click a name to look"); + Add("panel:vitals", CommandGroup.Terminal, "Show vitals", detail: "the F7 meters as bars, and your target"); + Add("panel:quick-bar", CommandGroup.Terminal, "Show quick bar", detail: "this character's function-key macros · click one to run it"); + Add("panel:composer", CommandGroup.Terminal, "Dock the composer", detail: "a pane to write posts in · ⌃S sends"); Add("term:walk-stop", CommandGroup.Terminal, "Stop walking", detail: "ends the speedwalk", when: c => c.State.Walking); // Game sound, for this run. The levels and the off switch are F7's; this is the quick one. diff --git a/src/SharpMUTerm.Core/Protocols/CombatTarget.cs b/src/SharpMUTerm.Core/Protocols/CombatTarget.cs new file mode 100644 index 00000000..c72a732c --- /dev/null +++ b/src/SharpMUTerm.Core/Protocols/CombatTarget.cs @@ -0,0 +1,77 @@ +using System.Globalization; +using SharpMUTerm.Core.Configuration; + +namespace SharpMUTerm.Core.Protocols; + +/// +/// What the character is fighting, as the game reports it: a name and, when the game says, how much of its health +/// is left (0–1). Read from by the vitals strip. +/// +/// The target's name as the game spells it. +/// Its health left, 0–1, or null when the game names a target and not its health. +public sealed record CombatTarget(string Name, double? Share) +{ + /// + /// Where a target's name is, in the order tried: Aardwolf's char.status enemy, IRE's + /// IRE.Target.Info short_desc, and the MSDP convention's OPPONENT_NAME. + /// + public const string NamePaths = "Char.Status.enemy|IRE.Target.Info.short_desc|MSDP.OPPONENT_NAME"; + + /// + /// Where its health is: Aardwolf's enemypct (0–100), IRE's hpperc ("40%"), and MSDP's + /// OPPONENT_HEALTH — out of OPPONENT_HEALTH_MAX when the game sends one, else a percentage. + /// + public const string SharePaths = "Char.Status.enemypct|IRE.Target.Info.hpperc|MSDP.OPPONENT_HEALTH"; + + /// The longest name kept; a longer one is cut, because the name arrives from the wire. + public const int MaxNameLength = 64; + + /// + /// The target the store describes, or null when it names none. An empty name is no target: Aardwolf sends + /// "enemy": "" once a fight is over. + /// + public static CombatTarget? Read(GameDataStore data) + { + ArgumentNullException.ThrowIfNull(data); + var name = StatusMeter.Read(data, NamePaths)?.Trim(); + if (string.IsNullOrEmpty(name) || name.All(char.IsControl)) + { + return null; + } + + name = new string(name.Where(c => !char.IsControl(c)).ToArray()); + if (name.Length > MaxNameLength) + { + name = name[..MaxNameLength]; + } + + return new CombatTarget(name, ShareOf(data)); + } + + private static double? ShareOf(GameDataStore data) + { + foreach (var path in StatusMeter.Alternatives(SharePaths)) + { + if (data.GetText(path) is not { } text) + { + continue; + } + + if (!double.TryParse(text.Trim().TrimEnd('%'), NumberStyles.Float, CultureInfo.InvariantCulture, out var value) + || !double.IsFinite(value)) + { + return null; + } + + if (path.StartsWith(GameDataStore.MsdpPrefix + ".", StringComparison.OrdinalIgnoreCase) + && data.GetNumber("MSDP.OPPONENT_HEALTH_MAX") is { } max and > 0) + { + return Math.Clamp(value / max, 0, 1); + } + + return Math.Clamp(value / 100, 0, 1); + } + + return null; + } +} diff --git a/src/SharpMUTerm.Core/Protocols/RoomOccupants.cs b/src/SharpMUTerm.Core/Protocols/RoomOccupants.cs new file mode 100644 index 00000000..04296315 --- /dev/null +++ b/src/SharpMUTerm.Core/Protocols/RoomOccupants.cs @@ -0,0 +1,317 @@ +using System.Globalization; +using System.Text.Json; + +namespace SharpMUTerm.Core.Protocols; + +/// One person or creature in the room with the character. +/// What a command names them by (look Name): a player's name, a creature's own. +/// What the panel shows: a player's fullname when the game sends one, else the name. +/// A player, from Room.Players; false for a creature from Char.Items. +/// How long the player has been idle, when the game says (no standard field does). +/// A creature's item id, which is how Char.Items.Remove names it; null for a player. +public sealed record RoomOccupant(string Name, string Display, bool IsPlayer, int? IdleSeconds = null, string? Id = null); + +/// +/// Who is in the room with one character, kept from the GMCP messages that say so: Room.Players (the whole +/// list), Room.AddPlayer and Room.RemovePlayer (one each), and the room's creatures from +/// Char.Items.List/Add/Remove with location: "room" and an m attribute — the +/// IRE and Aardwolf conventions. Read by the who-here panel. +/// +/// +/// +/// It is a roster rather than a read of , because the store keeps the +/// latest message per package: Room.AddPlayer there is whoever arrived last, and a +/// Room.RemovePlayer is a name with nothing to subtract it from. +/// +/// +/// It is bounded at the door — people, names of — and a +/// name with a control character or (for a player, whose name is a command argument) any white space is refused. +/// Writes come from the telnet read loop and reads from the UI thread; one lock covers both. +/// +/// +public sealed class RoomOccupants +{ + /// The most people held; more are dropped. + public const int MaxOccupants = 200; + + /// The longest name or display name kept. + public const int MaxNameLength = 64; + + private readonly Lock _gate = new(); + private readonly List _players = []; + private readonly List _creatures = []; + private bool _known; + + /// Raised after the roster changed. On the writer's thread. + public event EventHandler? Changed; + + /// + /// Whether the game has said who is here at all — a Room.Players or Room.AddPlayer arrived. An + /// empty room the game reported is known; a game that never reports is not. + /// + public bool Known + { + get + { + lock (_gate) + { + return _known; + } + } + } + + /// Players in the order the game listed them, then creatures. + public IReadOnlyList Snapshot + { + get + { + lock (_gate) + { + return [.. _players, .. _creatures]; + } + } + } + + /// + /// Takes one GMCP message. Packages this roster does not read, and malformed bodies, are ignored. Returns + /// whether the roster changed. + /// + public bool Apply(string package, string? json) + { + if (string.IsNullOrWhiteSpace(package) || string.IsNullOrWhiteSpace(json) || json.Length > GameDataStore.MaxPayloadBytes) + { + return false; + } + + var name = package.Trim().ToLowerInvariant(); + if (name is not ("room.players" or "room.addplayer" or "room.removeplayer" + or "char.items.list" or "char.items.add" or "char.items.remove")) + { + return false; + } + + bool changed; + try + { + using var document = JsonDocument.Parse(json, new JsonDocumentOptions { MaxDepth = 16 }); + var root = document.RootElement; + lock (_gate) + { + changed = name switch + { + "room.players" => ReplacePlayers(root), + "room.addplayer" => AddPlayer(root), + "room.removeplayer" => RemovePlayer(root), + "char.items.list" => ReplaceCreatures(root), + "char.items.add" => AddCreature(root), + _ => RemoveCreature(root), + }; + } + } + catch (JsonException) + { + return false; + } + + if (changed) + { + Changed?.Invoke(this, EventArgs.Empty); + } + + return changed; + } + + /// Forgets everyone, as a new connection does. + public void Clear() + { + lock (_gate) + { + _players.Clear(); + _creatures.Clear(); + _known = false; + } + + Changed?.Invoke(this, EventArgs.Empty); + } + + private bool ReplacePlayers(JsonElement root) + { + if (root.ValueKind != JsonValueKind.Array) + { + return false; + } + + _known = true; + _players.Clear(); + foreach (var item in root.EnumerateArray()) + { + if (Player(item) is { } player && Room() && !_players.Exists(p => SameName(p, player.Name))) + { + _players.Add(player); + } + } + + return true; + } + + private bool AddPlayer(JsonElement root) + { + if (Player(root) is not { } player) + { + return false; + } + + _known = true; + var at = _players.FindIndex(p => SameName(p, player.Name)); + if (at >= 0) + { + _players[at] = player; + } + else if (Room()) + { + _players.Add(player); + } + + return true; + } + + private bool RemovePlayer(JsonElement root) + { + var name = root.ValueKind == JsonValueKind.String ? root.GetString() : Text(root, "name"); + return name is not null && _players.RemoveAll(p => SameName(p, name.Trim())) > 0; + } + + private bool ReplaceCreatures(JsonElement root) + { + if (!InRoom(root) || !TryProperty(root, "items", out var items) || items.ValueKind != JsonValueKind.Array) + { + return false; + } + + _creatures.Clear(); + foreach (var item in items.EnumerateArray()) + { + if (Creature(item) is { } creature && Room()) + { + _creatures.Add(creature); + } + } + + return true; + } + + private bool AddCreature(JsonElement root) + { + if (!InRoom(root) || !TryProperty(root, "item", out var item) || Creature(item) is not { } creature) + { + return false; + } + + _creatures.RemoveAll(c => c.Id == creature.Id); + if (!Room()) + { + return false; + } + + _creatures.Add(creature); + return true; + } + + private bool RemoveCreature(JsonElement root) + { + if (!InRoom(root) || !TryProperty(root, "item", out var item)) + { + return false; + } + + var id = item.ValueKind == JsonValueKind.Object ? Id(item) : Scalar(item); + return id is not null && _creatures.RemoveAll(c => c.Id == id) > 0; + } + + /// Whether one more fits under . + private bool Room() => _players.Count + _creatures.Count < MaxOccupants; + + private static RoomOccupant? Player(JsonElement item) + { + var name = item.ValueKind == JsonValueKind.String ? item.GetString() : Text(item, "name"); + name = name?.Trim(); + if (!Acceptable(name) || name!.Any(char.IsWhiteSpace)) + { + return null; + } + + var full = Text(item, "fullname")?.Trim(); + return new RoomOccupant(name!, Acceptable(full) ? full! : name!, true, Idle(item)); + } + + private static RoomOccupant? Creature(JsonElement item) + { + if (item.ValueKind != JsonValueKind.Object + || Text(item, "attrib") is not { } attrib + || !attrib.Contains('m', StringComparison.Ordinal) + || Id(item) is not { } id) + { + return null; + } + + var name = Text(item, "name")?.Trim(); + return Acceptable(name) ? new RoomOccupant(name!, name!, false, Id: id) : null; + } + + private static bool InRoom(JsonElement root) => + root.ValueKind == JsonValueKind.Object + && string.Equals(Text(root, "location"), "room", StringComparison.OrdinalIgnoreCase); + + private static bool Acceptable(string? name) => + name is { Length: > 0 and <= MaxNameLength } && !name.Any(char.IsControl); + + private static bool SameName(RoomOccupant player, string name) => + string.Equals(player.Name, name, StringComparison.OrdinalIgnoreCase); + + private static string? Id(JsonElement item) => + TryProperty(item, "id", out var id) ? Scalar(id) : null; + + private static string? Scalar(JsonElement value) => value.ValueKind switch + { + JsonValueKind.String => value.GetString() is { Length: > 0 and <= MaxNameLength } s ? s : null, + JsonValueKind.Number => value.GetRawText(), + _ => null, + }; + + private static bool TryProperty(JsonElement item, string property, out JsonElement value) + { + if (item.ValueKind == JsonValueKind.Object) + { + foreach (var p in item.EnumerateObject()) + { + if (string.Equals(p.Name, property, StringComparison.OrdinalIgnoreCase)) + { + value = p.Value; + return true; + } + } + } + + value = default; + return false; + } + + private static string? Text(JsonElement item, string property) => + TryProperty(item, property, out var value) && value.ValueKind == JsonValueKind.String ? value.GetString() : null; + + private static int? Idle(JsonElement item) + { + if (!TryProperty(item, "idle", out var value)) + { + return null; + } + + var seconds = value.ValueKind switch + { + JsonValueKind.Number when value.TryGetInt32(out var n) => n, + JsonValueKind.String when int.TryParse(value.GetString(), NumberStyles.None, CultureInfo.InvariantCulture, out var n) => n, + _ => (int?)null, + }; + return seconds is >= 0 ? seconds : null; + } +} diff --git a/src/SharpMUTerm.Core/Session/WorldSession.cs b/src/SharpMUTerm.Core/Session/WorldSession.cs index e4b18442..4c7a4530 100644 --- a/src/SharpMUTerm.Core/Session/WorldSession.cs +++ b/src/SharpMUTerm.Core/Session/WorldSession.cs @@ -410,6 +410,12 @@ public ILogger Logger /// public GameDataStore GameData { get; } = new(); + /// + /// Who is in the room with this character, from GMCP Room.Players and its relatives (the who-here + /// panel). Emptied on connect, with . + /// + public RoomOccupants Occupants { get; } = new(); + /// /// This connection's map, when the client keeps one: set by the client as the session opens, read by the /// scripting bridge's map.*. Null in a session nothing maps. @@ -599,6 +605,7 @@ public async Task ConnectAsync(CancellationToken cancellationToken = default) _telnet = telnet; telnet.OutputReceived += OnOutputReceived; GameData.Clear(); + Occupants.Clear(); lock (_metersGate) { _mxpMeters = []; @@ -609,6 +616,7 @@ public async Task ConnectAsync(CancellationToken cancellationToken = default) // Stored before the event, so a handler reading GameData sees the message that raised it. GameData.SetGmcp(e.Package, e.Json); Completions.ObserveGmcp(e.Package, e.Json); + Occupants.Apply(e.Package, e.Json); OnGmcpLogin(e.Package, e.Json); if (World.DiscordPresence && e.Package.StartsWith("External.Discord.", StringComparison.OrdinalIgnoreCase) diff --git a/src/SharpMUTerm.Tui/Panels/DockedComposer.cs b/src/SharpMUTerm.Tui/Panels/DockedComposer.cs new file mode 100644 index 00000000..13c5192e --- /dev/null +++ b/src/SharpMUTerm.Tui/Panels/DockedComposer.cs @@ -0,0 +1,215 @@ +using SharpConsoleUI; +using SharpConsoleUI.Builders; +using SharpConsoleUI.Controls; +using SharpConsoleUI.Layout; +using SharpMUTerm.Core.Commands; +using static SharpMUTerm.Tui.MarkupText; + +namespace SharpMUTerm.Tui.Panels; + +/// +/// The composer as a pane: a header naming what is being written and how it will be escaped +/// (COMPOSE +pose literal), the F1 composer's editor, and a key row +/// (⌃S send · ⌥L literal · F1 full screen · Esc command line). +/// +/// The editor is the F1 composer's — a that inserts on ⏎, wraps words +/// and keeps undo — and the post it builds is 's, so a docked post and a +/// full-screen one are the same command. Its buffer is the character's draft: the host writes every +/// change into the store F1 opens from, so F1 here carries on the same text. +/// +/// +/// It does not route its own keys. The host decides, from its pane, whether it is armed — the place typing, +/// paste and the caret go — and hands each key to itself. That is the rule the command +/// line follows, and it is what keeps one fact behind "which control gets a keystroke". +/// +/// +/// The grid is kept and re-parented across pane rebuilds. A disposed GridControl disposes its children and +/// nothing else, and none of these three keeps state that a dispose clears, so the same instance serves for the +/// life of the panel (pinned by DockedComposerTests). +/// +/// +internal sealed class DockedComposer +{ + private readonly MarkupControl _header; + private readonly MarkupControl _footer; + private readonly string _accent; + private bool _armed; + private bool _quiet; + + internal DockedComposer(string windowId, string sessionKey, ScreenTheme scheme, string accent) + { + WindowId = windowId; + SessionKey = sessionKey; + _accent = accent; + Editor = new MultilineEditControl + { + WrapMode = WrapMode.WrapWords, + ShowLineNumbers = false, + IsEditing = true, + VerticalAlignment = VerticalAlignment.Fill, + HorizontalAlignment = HorizontalAlignment.Stretch, + + // Esc is the host's — it hands the keyboard back to the command line — so the editor must not + // spend it dropping out of edit mode first. + EscapeExitsEditMode = false, + PlaceholderText = "Write a post. ⏎ starts a new line; ⌃S sends it as one command.", + + // Both pairs, as the F1 composer sets them: the control paints from the focused pair whenever it has + // focus, and from the other while the command line has it. + BackgroundColor = scheme.Colour(ScreenPalette.EditBg), + FocusedBackgroundColor = scheme.Colour(ScreenPalette.EditBg), + ForegroundColor = scheme.Colour(ScreenPalette.Value), + FocusedForegroundColor = scheme.Colour(ScreenPalette.Value), + SelectionBackgroundColor = scheme.Colour(ScreenPalette.CursorBg), + SelectionForegroundColor = scheme.Colour(ScreenPalette.Value), + }; + Editor.ContentChanged += (_, _) => + { + if (!_quiet) + { + Redraw(); + Changed?.Invoke(this, EventArgs.Empty); + } + }; + + _header = new MarkupControl(new List()) { HorizontalAlignment = HorizontalAlignment.Stretch }; + _footer = new MarkupControl(new List()) { HorizontalAlignment = HorizontalAlignment.Stretch }; + + var grid = Controls.Grid() + .WithAlignment(HorizontalAlignment.Stretch) + .WithVerticalAlignment(VerticalAlignment.Fill); + grid.Rows(GridLength.Cells(1), GridLength.Star(1), GridLength.Cells(1)).Columns(GridLength.Star(1)); + grid.Place(_header, 0, 0, 1, 1); + grid.Place(Editor, 1, 0, 1, 1); + grid.Place(_footer, 2, 0, 1, 1); + Control = grid.Build(); + Redraw(); + } + + /// The panel window this is drawn in. + internal string WindowId { get; } + + /// Whose draft this is: the World.Character key the panel belongs to. + internal string SessionKey { get; } + + /// What the pane hosts. + internal IWindowControl Control { get; } + + /// The editor, which the host focuses and hands keys to while this is armed. + internal MultilineEditControl Editor { get; } + + /// The escaping mode, toggled by ⌥L, as F1's is. + internal ComposeEscaping Escaping { get; private set; } = ComposeEscaping.AsTyped; + + /// The buffer, with its lines broken by \n whatever the platform's newline. + internal string Body => Editor.GetContent().Replace("\r\n", "\n", StringComparison.Ordinal); + + /// Whether typing goes here. Only the host sets it. + internal bool Armed + { + get => _armed; + set + { + if (_armed != value) + { + _armed = value; + Redraw(); + } + } + } + + /// Raised after the buffer or the mode changed by the writer's hand (never by ). + internal event EventHandler? Changed; + + /// The header row's markup, for the tests. + internal string HeaderMarkup => _header.Text; + + /// The key row's markup, for the tests. + internal string FooterMarkup => _footer.Text; + + /// Replaces the buffer and mode with a draft kept elsewhere (F1 closing), raising nothing. + internal void Load(string body, ComposeEscaping escaping) + { + Escaping = escaping; + if (!string.Equals(Body, body, StringComparison.Ordinal)) + { + _quiet = true; + try + { + Editor.SetContent(body); + } + finally + { + _quiet = false; + } + } + + Redraw(); + } + + /// ⌥L: flips the escaping and says so in the header. + internal void ToggleEscaping() + { + Escaping = Escaping == ComposeEscaping.Literal ? ComposeEscaping.AsTyped : ComposeEscaping.Literal; + Redraw(); + Changed?.Invoke(this, EventArgs.Empty); + } + + /// Sizes the editor to the pane's box, less the header and key rows. + internal void Fit(int width, int height) + { + var rows = Math.Max(1, height - 2); + if (Editor.ViewportHeight != rows) + { + Editor.ViewportHeight = rows; + } + + if (_width != width) + { + _width = width; + Redraw(); + } + } + + /// The pane's width, which picks the key row's long or short form. + private int _width; + + /// + /// The verb the post starts with — +pose, say — for the header, so a reader can see what the + /// buffer will be sent as without reading it. Empty for an empty buffer. + /// + internal static string Verb(string body) + { + var first = body.Split('\n').Select(l => l.Trim()).FirstOrDefault(l => l.Length > 0) ?? string.Empty; + var space = first.IndexOfAny([' ', '\t']); + var verb = space < 0 ? first : first[..space]; + return verb.Length <= 16 ? verb : verb[..15] + "…"; + } + + private void Redraw() + { + var verb = Verb(Body); + var mode = Escaping == ComposeEscaping.Literal ? $"[{_accent}]literal[/]" : "[dim]as typed[/]"; + var marker = _armed ? $"[{_accent}]▌[/]" : " "; + _header.SetContent(new List + { + $"{marker}[bold {_accent}]COMPOSE[/]" + (verb.Length > 0 ? $" {Escape(verb)}" : string.Empty) + $" {mode}", + }); + + // The long form names what each key does; the short one, for a narrow column, keeps every key and the + // two words that matter. Both list the same keys, so a narrow pane hides no gesture. + var footer = _armed + ? $" {Key("⌃S")}[dim] send · [/]{Key("⌥L")}[dim] literal · [/]{Key("F1")}[dim] full screen · [/]{Key("Esc")}[dim] command line[/]" + : $" [dim]click here to write · [/]{Key("F1")}[dim] full screen[/]"; + if (_width > 0 && VisibleLength(footer) > _width) + { + footer = _armed + ? $" {Key("⌃S")}[dim] send · [/]{Key("⌥L")}[dim] literal · [/]{Key("F1")}[dim] full · [/]{Key("Esc")}[dim] back[/]" + : $" [dim]click to write · [/]{Key("F1")}[dim] full[/]"; + } + + _footer.SetContent(new List { _width > 0 ? ElideVisible(footer, _width) : footer }); + } + + private string Key(string key) => $"[{_accent}]{key}[/]"; +} diff --git a/src/SharpMUTerm.Tui/Panels/QuickBarRenderer.cs b/src/SharpMUTerm.Tui/Panels/QuickBarRenderer.cs new file mode 100644 index 00000000..566ac149 --- /dev/null +++ b/src/SharpMUTerm.Tui/Panels/QuickBarRenderer.cs @@ -0,0 +1,131 @@ +using System.Globalization; +using SharpMUTerm.Core.Automation; +using static SharpMUTerm.Tui.MarkupText; + +namespace SharpMUTerm.Tui.Panels; + +/// +/// The quick bar: one row of the character's function-key macros — F1 kick F2 bash F3 cure light — with +/// F4 edits keys at the right. Each entry is a link ( and its index) that the +/// panel's own handler runs through the macro path the key itself takes. Elided to the width, never wrapped. +/// +internal static class QuickBarRenderer +{ + /// The scheme an entry's link carries, followed by its index in the list drawn. + internal const string LinkPrefix = "mux:quick:"; + + /// The longest a macro's name is drawn before it is cut. + internal const int MaxNameWidth = 16; + + /// The right-hand hint naming where the keys are edited. + internal const string Hint = "F4 edits keys"; + + /// One entry: the key as printed (F1, ⌃F2), the descriptor it fires, its name. + /// Whether pressing the key reaches the macro on this host (); + /// one that does not is still clickable and drawn dim. + internal readonly record struct Entry(string Key, string Descriptor, string Name, bool Fires); + + /// + /// The function-key bindings to show, from the bindings that resolve: one per key, plain keys before modified + /// ones, then by number. A binding with neither a command nor a script is left out, as the key path leaves it. + /// + internal static IReadOnlyList Entries(IEnumerable macros, Func resolve) + { + var seen = new HashSet(StringComparer.OrdinalIgnoreCase); + var entries = new List<(Entry Entry, int Modifiers, int Number)>(); + foreach (var candidate in macros) + { + if (!MacroKey.TryParse(candidate.Key, out var parts) + || parts.Key.Length < 2 || parts.Key[0] != 'F' + || !int.TryParse(parts.Key.AsSpan(1), NumberStyles.None, CultureInfo.InvariantCulture, out var number)) + { + continue; + } + + var descriptor = MacroKey.Describe(parts.Key, parts.Ctrl, parts.Alt, parts.Shift); + if (!seen.Add(descriptor) + || resolve(descriptor) is not { } macro + || (macro.Command.Length == 0 && string.IsNullOrEmpty(macro.ScriptCallback))) + { + continue; + } + + var name = macro.Name.Trim().Length > 0 ? macro.Name.Trim() : macro.Command.Trim(); + if (name.Length == 0) + { + name = macro.ScriptCallback ?? descriptor; + } + + var key = (parts.Ctrl ? "⌃" : string.Empty) + (parts.Alt ? "⌥" : string.Empty) + (parts.Shift ? "⇧" : string.Empty) + parts.Key; + var modifiers = (parts.Ctrl ? 1 : 0) + (parts.Alt ? 2 : 0) + (parts.Shift ? 4 : 0); + entries.Add((new Entry(key, descriptor, Single(name), MacroKeys.Verdict(descriptor).Fires), modifiers, number)); + } + + return entries.OrderBy(e => e.Modifiers).ThenBy(e => e.Number).Select(e => e.Entry).ToList(); + } + + /// The row for cells. Entries that do not fit are counted, never wrapped. + internal static string Render(IReadOnlyList entries, int width, string accent) + { + width = Math.Max(1, width); + var hint = $"[bold {accent}]F4[/][dim] edits keys[/]"; + if (entries.Count == 0) + { + return ElideVisible($"[dim]No function keys bound · [/]{hint}", width); + } + + var cells = entries.Select((e, i) => Cell(e, i, accent)).ToList(); + var hintWidth = VisibleLength(hint); + foreach (var withHint in new[] { true, false }) + { + var room = withHint ? width - hintWidth - 2 : width; + var row = Fit(cells, room); + if (row is not null) + { + return withHint ? SpreadLR(row, hint, width) : row; + } + } + + return ElideVisible(cells[0], width); + } + + /// The entry index a link names, or null for any other link. + internal static int? ParseLink(string url) => + url.StartsWith(LinkPrefix, StringComparison.Ordinal) + && int.TryParse(url.AsSpan(LinkPrefix.Length), NumberStyles.None, CultureInfo.InvariantCulture, out var index) + ? index + : null; + + /// The most entries that fit with a +N for the rest, or null for none. + private static string? Fit(List cells, int room) + { + for (var take = cells.Count; take > 0; take--) + { + var row = string.Join(" ", cells.Take(take)); + if (take < cells.Count) + { + row += $" [dim]+{(cells.Count - take).ToString(CultureInfo.InvariantCulture)}[/]"; + } + + if (VisibleLength(row) <= room) + { + return row; + } + } + + return null; + } + + private static string Cell(Entry entry, int index, string accent) + { + var name = entry.Name.Length <= MaxNameWidth ? entry.Name : entry.Name[..(MaxNameWidth - 1)] + "…"; + var link = $"[link={LinkPrefix}{index.ToString(CultureInfo.InvariantCulture)}]"; + return entry.Fires + ? $"{link}[bold {accent}]{Escape(entry.Key)}[/] {Escape(name)}[/]" + : $"{link}[dim]{Escape(entry.Key)} {Escape(name)}[/][/]"; + } + + /// A name on one line: a multi-command macro's line breaks become ; . + private static string Single(string name) => + string.Join("; ", name.Split('\n', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries)); +} diff --git a/src/SharpMUTerm.Tui/Panels/VitalsStripRenderer.cs b/src/SharpMUTerm.Tui/Panels/VitalsStripRenderer.cs new file mode 100644 index 00000000..105a1da9 --- /dev/null +++ b/src/SharpMUTerm.Tui/Panels/VitalsStripRenderer.cs @@ -0,0 +1,159 @@ +using System.Text; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Protocols; +using static SharpMUTerm.Tui.MarkupText; + +namespace SharpMUTerm.Tui.Panels; + +/// +/// The vitals panel: one row of the configured meters as bars — +/// hp ████████░░ 820/1000 mp ██░░░░░░░░ 190/1000 low — and, right-aligned, what the character is +/// fighting when the game says: target a rotting ghoul ████░░░░░░ 40%. +/// +/// Every field is reserved, the status row's rule (): the value and the +/// maximum take cells each, the low mark takes its three +/// whether it is showing or not, and the target's name is padded to its field. A number changing never moves a +/// cell. The level of detail is chosen from the box's width alone — full bars, short bars, no bars, +/// percentages — so it changes only when the pane does. +/// +/// +internal static class VitalsStripRenderer +{ + /// The meter's mark when it is below . + internal const string LowMark = "low"; + + /// The panel's colours: the bars, the warning, and the empty part of a bar. + internal readonly record struct Ink(string Bar, string Low, string Empty); + + /// The one-cell low mark the tighter levels use in place of . + internal const string ShortLowMark = "!"; + + /// + /// How much a level draws: the bar's cells, whether values are shown (else percentages), whether the low mark is + /// the word or one cell, the target's name field and bar, and the gap between meters. + /// + private readonly record struct Level(int Bar, bool Values, bool LongLow, int TargetName, int TargetBar, int Gap); + + /// From the most to the least; the first that fits the width is drawn. The target gives way first. + private static readonly Level[] Levels = + [ + new(10, true, true, 20, 10, 3), + new(10, true, true, 14, 0, 3), + new(8, true, false, 12, 0, 2), + new(5, true, false, 12, 0, 2), + new(0, true, false, 12, 0, 2), + new(0, false, false, 10, 0, 2), + ]; + + /// + /// The strip for a box cells wide, or empty when no meter has a value and the game + /// names no target. + /// + internal static string Render(IReadOnlyList meters, CombatTarget? target, int width, Ink ink) + { + if (meters.Count == 0 && target is null) + { + return string.Empty; + } + + width = Math.Max(1, width); + string? last = null; + foreach (var level in Levels) + { + last = Compose(meters, target, level, width, ink); + if (VisibleLength(last) <= width) + { + return last; + } + } + + return ElideVisible(last!, width); + } + + private static string Compose( + IReadOnlyList meters, CombatTarget? target, Level level, int width, Ink ink) + { + var left = string.Join(new string(' ', level.Gap), meters.Select(m => Meter(m, level, ink))); + if (target is null) + { + return left; + } + + var right = Target(target, level, ink); + var gap = width - VisibleLength(left) - VisibleLength(right); + return left.Length == 0 + ? new string(' ', Math.Max(0, gap)) + right + : left + new string(' ', Math.Max(level.Gap, gap)) + right; + } + + private static string Meter(StatusMeterRenderer.MeterReading meter, Level level, Ink ink) + { + var sb = new StringBuilder(); + sb.Append($"[dim]{Escape(meter.Label)}[/]"); + var colour = meter.Low ? ink.Low : ink.Bar; + if (!level.Values) + { + var text = meter.Share is { } share + ? StatusMeterRenderer.Percent(share) + : StatusMeter.Fit(meter.Value, StatusMeterRenderer.ValueWidth); + var width = meter.Share is null ? StatusMeterRenderer.ValueWidth : StatusMeterRenderer.ShareWidth; + sb.Append(' ').Append(meter.Low + ? $"[bold {colour}]{Escape(text.PadLeft(width))}[/]" + : $"[bold]{Escape(text.PadLeft(width))}[/]"); + return sb.ToString(); + } + + if (level.Bar > 0 && meter.HasMax) + { + sb.Append(' ').Append(Bar(meter.Share, level.Bar, colour, ink)); + } + + var value = Escape(StatusMeter.Fit(meter.Value, StatusMeterRenderer.ValueWidth).PadLeft(StatusMeterRenderer.ValueWidth)); + sb.Append(' ').Append(meter.Low ? $"[bold {colour}]{value}[/]" : $"[bold]{value}[/]"); + if (meter.HasMax) + { + var max = StatusMeter.Fit(meter.Max ?? string.Empty, StatusMeterRenderer.ValueWidth).PadRight(StatusMeterRenderer.ValueWidth); + sb.Append($"[dim]/{Escape(max)}[/]"); + var mark = level.LongLow ? LowMark : ShortLowMark; + sb.Append(' ').Append(meter.Low ? $"[{colour}]{mark}[/]" : new string(' ', mark.Length)); + } + + return sb.ToString(); + } + + private static string Target(CombatTarget target, Level level, Ink ink) + { + var name = target.Name.Length <= level.TargetName + ? target.Name.PadRight(level.TargetName) + : target.Name[..(level.TargetName - 1)] + "…"; + var sb = new StringBuilder($"[dim]target[/] {Escape(name)}"); + if (target.Share is { } share) + { + var low = share < StatusMeterRenderer.LowShare; + if (level.TargetBar > 0) + { + sb.Append(' ').Append(Bar(share, level.TargetBar, low ? ink.Low : ink.Bar, ink)); + } + + sb.Append($" [bold]{StatusMeterRenderer.Percent(share).PadLeft(StatusMeterRenderer.ShareWidth)}[/]"); + } + else + { + sb.Append(new string(' ', (level.TargetBar > 0 ? level.TargetBar + 1 : 0) + 1 + StatusMeterRenderer.ShareWidth)); + } + + return sb.ToString(); + } + + /// + /// A bar of : the filled part in solid blocks, the rest in light shade. A meter whose + /// maximum has not arrived draws all empty, so the bar's cells are held from the first value. + /// + internal static string Bar(double? share, int cells, string colour, Ink ink) + { + var filled = share is { } s ? (int)Math.Round(Math.Clamp(s, 0, 1) * cells) : 0; + var full = filled > 0 ? $"[{colour}]{new string('█', filled)}[/]" : string.Empty; + var empty = filled < cells ? $"[{ink.Empty}]{new string('░', cells - filled)}[/]" : string.Empty; + return full + empty; + } +} diff --git a/src/SharpMUTerm.Tui/Panels/WhoHereRenderer.cs b/src/SharpMUTerm.Tui/Panels/WhoHereRenderer.cs new file mode 100644 index 00000000..ff2766b5 --- /dev/null +++ b/src/SharpMUTerm.Tui/Panels/WhoHereRenderer.cs @@ -0,0 +1,106 @@ +using System.Globalization; +using SharpMUTerm.Core.Protocols; +using static SharpMUTerm.Tui.MarkupText; + +namespace SharpMUTerm.Tui.Panels; + +/// +/// The who-here panel: HERE The Grand Plaza · 4, then one row per person — players with a dot and how +/// long they have been idle when the game says, creatures dimmed under them. Every name is a link +/// ( and its row), answered by the panel's own handler and by nothing else. +/// +internal static class WhoHereRenderer +{ + /// The scheme a row's link carries, followed by its index in the roster drawn. + internal const string LinkPrefix = "mux:who:"; + + /// The cells the idle column takes when any row has one: idle 59m. + internal const int IdleWidth = 8; + + /// Under this many seconds idle a player reads active. + internal const int ActiveSeconds = 60; + + /// The panel's colours: the dot of an active player, and the plane they are measured on. + internal readonly record struct Ink(string Accent); + + /// + /// The panel's rows for a box by cells. Never wider than the + /// box and never taller: a room fuller than the box ends in … and N more. + /// + internal static List Render(string? room, IReadOnlyList occupants, int width, int height, Ink ink) + { + width = Math.Max(8, width); + height = Math.Max(1, height); + var lines = new List(); + + var count = $" · {occupants.Count.ToString(CultureInfo.InvariantCulture)}"; + var title = string.IsNullOrWhiteSpace(room) ? string.Empty : " " + Escape(room.Trim()); + lines.Add(ElideVisible($"[bold {ink.Accent}]HERE[/]{title}[dim]{count}[/]", width)); + if (height == 1) + { + return lines; + } + + if (occupants.Count == 0) + { + lines.Add("[dim]Nobody else is here.[/]"); + return lines; + } + + var showIdle = occupants.Any(o => o.IdleSeconds is not null) && width >= IdleWidth + 8; + var nameWidth = width - 2 - (showIdle ? IdleWidth + 1 : 0); + var rows = height - 1; + var fits = occupants.Count <= rows ? occupants.Count : Math.Max(0, rows - 1); + for (var i = 0; i < fits; i++) + { + lines.Add(Row(occupants[i], i, nameWidth, showIdle, ink)); + } + + if (fits < occupants.Count) + { + lines.Add($"[dim]… and {(occupants.Count - fits).ToString(CultureInfo.InvariantCulture)} more[/]"); + } + + return lines; + } + + /// The roster index a row's link names, or null for any other link. + internal static int? ParseLink(string url) => + url.StartsWith(LinkPrefix, StringComparison.Ordinal) + && int.TryParse(url.AsSpan(LinkPrefix.Length), NumberStyles.None, CultureInfo.InvariantCulture, out var index) + ? index + : null; + + /// How an idle time reads: active, idle 4m, idle 2h, idle 3d. + internal static string Idle(int seconds) => seconds switch + { + < ActiveSeconds => "active", + < 3600 => $"idle {(seconds / 60).ToString(CultureInfo.InvariantCulture)}m", + < 86400 => $"idle {(seconds / 3600).ToString(CultureInfo.InvariantCulture)}h", + _ => $"idle {Math.Min(99, seconds / 86400).ToString(CultureInfo.InvariantCulture)}d", + }; + + private static string Row(RoomOccupant who, int index, int nameWidth, bool showIdle, Ink ink) + { + var name = Escape(Fit(who.Display, nameWidth)); + var link = $"[link={LinkPrefix}{index.ToString(CultureInfo.InvariantCulture)}]"; + if (!who.IsPlayer) + { + return $"[dim]·[/] {link}[dim]{name}[/][/]"; + } + + var idle = who.IdleSeconds is { } seconds && seconds >= ActiveSeconds; + var dot = idle ? "[dim]●[/]" : $"[{ink.Accent}]●[/]"; + var row = $"{dot} {link}{name}[/]"; + if (!showIdle) + { + return row; + } + + var status = who.IdleSeconds is { } s ? Idle(s) : string.Empty; + return PadVisible(row, nameWidth + 2) + " " + $"[dim]{status.PadLeft(IdleWidth)}[/]"; + } + + private static string Fit(string text, int width) => + text.Length <= width ? text : width <= 1 ? "…" : text[..(width - 1)] + "…"; +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs new file mode 100644 index 00000000..eea3d7b6 --- /dev/null +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs @@ -0,0 +1,791 @@ +using SharpConsoleUI.Controls; +using SharpConsoleUI; +using SharpConsoleUI.Events; +using SharpConsoleUI.Layout; +using SharpMUTerm.Core.Automation; +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Diagnostics; +using SharpMUTerm.Core.Layouts; +using SharpMUTerm.Core.Protocols; +using SharpMUTerm.Core.Session; +using SharpMUTerm.Core.Text; +using SharpMUTerm.Core.Workspaces; +using SharpMUTerm.Tui.Panels; + +namespace SharpMUTerm.Tui; + +/// +/// The four panels a layout can place that the workspace did not already have: who is here, the vitals strip, +/// the quick bar, and the docked composer. Each is a control made once per (panel, character) by the factory +/// registered here, drawn from that character's own data — never _active's — and sized to its pane on the +/// frame, the way a map window is. +/// +/// +/// +/// Links are per surface. A who-here row and a quick-bar entry are links, answered by that panel's own +/// LinkClicked and nothing else; the payload is an index into what the panel last drew +/// (mux:who:3, mux:quick:1), so no text from the game is ever read back as a command, and the output +/// panes' handler never sees either scheme. +/// +/// +/// The docked composer can hold the keyboard, and that is decided in one place (): +/// it is armed while its window is the focused pane's tab and the writer has not handed the keyboard back with Esc. +/// While it is armed the focus pin () holds the editor, so typing, paste +/// and the caret go there together, and both command lines wear the idle band. Moving to its pane (⌃arrows, ⌃O, a +/// tab click) or clicking in it arms it; Esc, ⌃↓ onto a command line, or moving to another pane disarms it. +/// +/// +internal sealed partial class SharpMUTermApp +{ + /// The markup panels, by window id. + private readonly Dictionary _panelViews = new(StringComparer.Ordinal); + + /// The docked composers, by window id. + private readonly Dictionary _dockedComposers = new(StringComparer.Ordinal); + + /// Who is in the demo's room: written by , as the wire writes a session's. + private readonly RoomOccupants _demoOccupants = new(); + + /// The window last saw in front, so arriving at a composer re-arms it. + private string? _composerArmWindow; + + /// Whether Esc (or ⌃↓ onto a bar) handed the keyboard back from the composer in front. + private bool _composerReleased; + + /// When an Esc released a composer, so the Enter of a ⌥⏎ that follows it is not sent from the bar. + private DateTimeOffset? _composerEscapeAt; + + partial void RegisterTerminalPanels() + { + Panels.Register(PanelIds.WhoHere, NewWhoHerePanel); + Panels.Register(PanelIds.Vitals, NewVitalsPanel); + Panels.Register(PanelIds.QuickBar, NewQuickBarPanel); + Panels.Register(PanelIds.Composer, NewDockedComposer); + } + + /// The ⌃P ids that open a panel: panel: and the panel's id. + private const string PanelCommandPrefix = "panel:"; + + /// + /// ⌃P ▸ Show who is here and its siblings: opens the focused character's panel as a tab of the focused + /// pane, or goes to it. A window that belongs to no character refuses, for 's reason. + /// + private void ShowPanel(string panelId) + { + var key = SendTarget()?.SessionKey ?? _workspace.FindWindow(ActiveWindowId())?.SessionKey; + if (key is not { Length: > 0 }) + { + RefuseCommand("no character here — pick one first (⌃P ▸ Switch to …)"); + return; + } + + if (OpenPanel(panelId, key) is not { } windowId) + { + RefuseCommand($"this client cannot draw a {Snippet(panelId)} panel"); + return; + } + + Activate(windowId); + } + + // --- Who is here ------------------------------------------------------------------------------------------ + + private IWindowControl NewWhoHerePanel(TerminalPanelContext context) + { + IReadOnlyList drawn = []; + var view = NewPanelView(context, (width, height) => + { + var roster = PanelOccupants(context.SessionKey); + if (roster is not { Known: true }) + { + drawn = []; + return ["[dim]The game has not said who is here.[/]"]; + } + + drawn = roster.Snapshot; + var data = PanelGameData(context.SessionKey); + var room = data is null ? null : StatusMeter.Read(data, "Room.Info.name|MSDP.ROOM_NAME"); + return WhoHereRenderer.Render(room, drawn, width, height, new WhoHereRenderer.Ink(_ink.Accent)); + }); + view.Click = url => + { + if (WhoHereRenderer.ParseLink(url) is { } index && index < drawn.Count) + { + OfferLook(context, drawn[index]); + } + }; + + if (context.Session is { } session) + { + session.Occupants.Changed += (_, _) => OnUiThread(view.Refresh); + session.GameData.Changed += (_, package) => + { + if (package.StartsWith("Room.", StringComparison.OrdinalIgnoreCase) + || package.StartsWith("MSDP.ROOM", StringComparison.OrdinalIgnoreCase)) + { + OnUiThread(view.Refresh); + } + }; + } + else if (IsDemoKey(context.SessionKey)) + { + _demoOccupants.Changed += (_, _) => OnUiThread(view.Refresh); + } + + return view.Control; + } + + /// + /// A click on a name puts look Name on the character's command line and sends nothing: the name is the + /// game's text, and the player sees the line before ⏎. It lands on the bar of the panel's own character — the + /// panel's window is brought forward when the one in front belongs to someone else. + /// + private void OfferLook(TerminalPanelContext context, RoomOccupant who) + { + var owner = WindowSession(ActiveWindowId())?.SessionKey ?? _workspace.FindWindow(ActiveWindowId())?.SessionKey; + if (!string.Equals(owner, context.SessionKey, StringComparison.Ordinal)) + { + Activate(context.WindowId); + } + + if (ArmedComposer() is not null) + { + ReleaseComposer(); + } + + PlaceGrab(ActiveBar(), $"look {who.Name}", context.SessionKey); + Notice($"look {Snippet(who.Name)} is on the command line — ⏎ sends it", MessageSeverity.Info); + } + + // --- Vitals ----------------------------------------------------------------------------------------------- + + private IWindowControl NewVitalsPanel(TerminalPanelContext context) + { + var view = NewPanelView(context, (width, _) => + { + if (PanelGameData(context.SessionKey) is not { } data) + { + return ["[dim]No vitals: this character is not connected.[/]"]; + } + + var strip = VitalsStripRenderer.Render( + StatusMeterRenderer.Read(PanelMeters(context.SessionKey), data), + CombatTarget.Read(data), + width, + VitalsInk()); + return [strip.Length > 0 ? strip : "[dim]No vitals yet — the game has sent none of the meters F7 names.[/]"]; + }); + + if (context.Session is { } session) + { + session.GameData.Changed += (_, _) => OnUiThread(view.Refresh); + session.MxpMetersChanged += (_, _) => OnUiThread(view.Refresh); + } + + return view.Control; + } + + /// + /// The strip's colours, each held to the floor against the plane it lands on: the bars are fills but carry + /// meaning, so they are lifted like text; the empty part of a bar is a grey that still reads as a track. + /// + private VitalsStripRenderer.Ink VitalsInk() => + new(_ink.Accent, _ink.Notice, _ink.Lift(new Rgb(0x6a, 0x6a, 0x72))); + + // --- Quick bar -------------------------------------------------------------------------------------------- + + private IWindowControl NewQuickBarPanel(TerminalPanelContext context) + { + IReadOnlyList drawn = []; + var view = NewPanelView(context, (width, _) => + { + drawn = QuickBarEntries(context.SessionKey); + return [QuickBarRenderer.Render(drawn, width, _ink.Accent)]; + }); + view.Click = url => + { + if (QuickBarRenderer.ParseLink(url) is { } index && index < drawn.Count) + { + RunQuickMacro(context, drawn[index]); + } + }; + return view.Control; + } + + /// + /// The function-key bindings a character's quick bar lists: its session's engine when it has one (so a script's + /// runtime binding shows), else the bindings its trigger sets configure. + /// + private IReadOnlyList QuickBarEntries(string sessionKey) + { + if (FindSession(sessionKey) is { } session) + { + return QuickBarRenderer.Entries(session.Macros.Macros, session.Macros.Resolve); + } + + if (FindCharacter(sessionKey) is not { } found) + { + return []; + } + + var macros = _config.ResolveTriggerSets(found.Character, found.World).SelectMany(s => s.Macros).ToList(); + return QuickBarRenderer.Entries(macros, key => macros.FirstOrDefault( + m => string.Equals(MacroKey.Canonicalise(m.Key), key, StringComparison.OrdinalIgnoreCase)) is { Enabled: true } m ? m : null); + } + + /// + /// A click on an entry runs that binding through — the path the key + /// itself takes — on the panel's own character, never the one in front. + /// + private void RunQuickMacro(TerminalPanelContext context, QuickBarRenderer.Entry entry) + { + if (FindSession(context.SessionKey) is not { } session) + { + RefuseCommand($"{Snippet(context.SessionKey)} has no open session — ⌃P ▸ Switch to it opens one"); + return; + } + + _ = session.HandleKeyAsync(entry.Descriptor); + LastQuickMacro = entry.Descriptor; + } + + /// The descriptor the quick bar last ran, for the tests. + internal string? LastQuickMacro { get; private set; } + + // --- The docked composer ---------------------------------------------------------------------------------- + + private IWindowControl NewDockedComposer(TerminalPanelContext context) + { + var composer = new DockedComposer(context.WindowId, context.SessionKey, _screens, _ink.Accent); + if (_composeDrafts.TryGetValue(context.SessionKey, out var draft)) + { + composer.Load(draft.Body, draft.Escaping); + } + + composer.Changed += (_, _) => KeepDockedDraft(composer); + _dockedComposers[context.WindowId] = composer; + var box = PanelBox(context.WindowId); + composer.Fit(box.Width, box.Height); + return composer.Control; + } + + /// + /// Writes the docked buffer into the draft store F1 opens from, so the two are one draft. An empty buffer + /// forgets the draft, as an F1 window closed empty does. + /// + private void KeepDockedDraft(DockedComposer composer) + { + if (composer.Body.Trim().Length == 0) + { + _composeDrafts.Remove(composer.SessionKey); + return; + } + + _composeDrafts[composer.SessionKey] = new ComposeResult(composer.Body, composer.Escaping); + } + + /// Puts a character's kept draft back into its docked composers, after F1 changed it. + private void SyncDockedComposers(string? sessionKey) + { + foreach (var composer in _dockedComposers.Values) + { + if (sessionKey is null || string.Equals(composer.SessionKey, sessionKey, StringComparison.Ordinal)) + { + var draft = _composeDrafts.GetValueOrDefault(composer.SessionKey); + composer.Load(draft.Body ?? string.Empty, draft.Body is null ? composer.Escaping : draft.Escaping); + } + } + } + + /// + /// The composer that holds the keyboard, or null: the docked composer whose window is the focused pane's tab, + /// unless the writer handed the keyboard back. Arriving at a composer's window clears the hand-back, so moving + /// to its pane is moving into it. + /// + private DockedComposer? ArmedComposer() + { + var windowId = ActiveWindowId(); + if (!string.Equals(windowId, _composerArmWindow, StringComparison.Ordinal)) + { + _composerArmWindow = windowId; + _composerReleased = false; + } + + return !_composerReleased && _dockedComposers.TryGetValue(windowId, out var composer) ? composer : null; + } + + /// The band the primary command line is painting itself in now. + internal SharpConsoleUI.Color? PrimaryBandColor => _input.BackgroundColor; + + /// Whether a docked composer holds the keyboard. + internal bool ComposerArmed => ArmedComposer() is not null; + + /// The docked composer drawn in a panel window, for the tests and the snapshot views. + internal DockedComposer? DockedComposerIn(string windowId) => _dockedComposers.GetValueOrDefault(windowId); + + /// Whether the framework's focus is on a docked composer's editor. + internal bool ComposerHasFocus => + _window.FocusManager.FocusedControl is { } focused && _dockedComposers.Values.Any(c => ReferenceEquals(c.Editor, focused)); + + /// + /// Paints who holds the keyboard: the armed composer's header marker, and both command lines idle while a + /// composer has it — ⏎ there inserts a line, it does not send. + /// + private void SyncComposerBands() + { + var armed = ArmedComposer(); + foreach (var composer in _dockedComposers.Values) + { + composer.Armed = ReferenceEquals(composer, armed); + } + + _input.Armed = armed is null && ReferenceEquals(_armed, _input); + _second.Armed = armed is null && ReferenceEquals(_armed, _second); + } + + /// Re-derives who holds the keyboard after the focused pane or window changed. + private void SyncComposerArm() + { + SyncComposerBands(); + PinFocusToArmedBar(); + } + + /// Esc in the composer: the keyboard goes back to the command line; the pane stays where it is. + private void ReleaseComposer() + { + _composerReleased = true; + SyncComposerBands(); + PinFocusToArmedBar(); + } + + /// + /// A click put the framework's focus on a docked composer's editor: arm that composer, bringing its window to + /// the front when it is not. Called on the framework's FocusChanged, ahead of the focus pin, which would + /// otherwise take the focus straight back; never from the pin itself, which runs while the editor still has the + /// focus it is about to lose. + /// + private void ArmClickedComposer() + { + if (_pinningFocus || !_window.GetIsActive() || _window.FocusManager.FocusedControl is not { } focused + || _dockedComposers.Values.FirstOrDefault(c => ReferenceEquals(c.Editor, focused)) is not { } clicked + || ReferenceEquals(clicked, ArmedComposer())) + { + return; + } + + if (!string.Equals(ActiveWindowId(), clicked.WindowId, StringComparison.Ordinal)) + { + _pinningFocus = true; + try + { + Activate(clicked.WindowId); + } + finally + { + _pinningFocus = false; + } + } + + _composerArmWindow = clicked.WindowId; + _composerReleased = false; + SyncComposerBands(); + } + + /// + /// A key while a docked composer holds the keyboard. The workspace gestures keep their meaning — a bound macro, + /// ⌃arrows, ⌥⇧arrows, ⌃C — and the composer's own three (⌃S, ⌥L, Esc) are answered here; everything else is the + /// editor's, handed to it explicitly as the command line's keys are, ⏎ included. + /// + private string? HandleComposerKey(DockedComposer composer, KeyPressedEventArgs e) + { + var key = e.KeyInfo; + _composerEscapeAt = null; + if (DispatchMacro(key) is { } sent) + { + e.Handled = true; + return sent; + } + + if (TryResizeKey(e)) + { + return null; + } + + var ctrl = key.Modifiers == ConsoleModifiers.Control; + var alt = key.Modifiers == ConsoleModifiers.Alt; + if (ctrl && key.Key is ConsoleKey.C or ConsoleKey.X) + { + // Never the editor's own: its ⌃C/⌃X write to the system clipboard through a helper nothing can + // substitute. Through the app's clipboard, as the command line's are. + e.Handled = true; + if (!composer.Editor.HasSelection) + { + CopySelection(); + } + else if (ToClipboard(composer.Editor.GetSelectedText(), key.Key == ConsoleKey.X ? "cut" : "copied") + && key.Key == ConsoleKey.X) + { + composer.Editor.ProcessKey(new ConsoleKeyInfo('\b', ConsoleKey.Backspace, false, false, false)); + } + + return null; + } + + if (ctrl && key.Key == ConsoleKey.S) + { + e.Handled = true; + SendDocked(composer); + return null; + } + + if (alt && key.Key == ConsoleKey.L) + { + e.Handled = true; + composer.ToggleEscaping(); + return null; + } + + if (key.Key == ConsoleKey.Escape && key.Modifiers == 0) + { + e.Handled = true; + _composerEscapeAt = _time.GetUtcNow(); + ReleaseComposer(); + return null; + } + + if (TryFocusKey(e)) + { + return null; + } + + e.Handled = true; + if (!composer.Editor.HasFocus) + { + _window.FocusControl(composer.Editor); + } + + composer.Editor.ProcessKey(key.Key == ConsoleKey.Enter ? new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false) : key); + return null; + } + + /// + /// The Enter of a ⌥⏎ typed in the composer: the terminal splits it into an Esc — which released the composer — + /// and an Enter. Within the same window pairs them in, the composer takes the keyboard + /// back and the Enter is a new line there, rather than a ⏎ sending whatever the command line holds. + /// + private bool TryComposerAltEnter(KeyPressedEventArgs e) + { + var at = _composerEscapeAt; + _composerEscapeAt = null; + if (e.KeyInfo.Key != ConsoleKey.Enter || e.KeyInfo.Modifiers != 0 + || at is not { } released || _time.GetUtcNow() - released > AltEnterWindow + || !_dockedComposers.TryGetValue(ActiveWindowId(), out var composer)) + { + return false; + } + + e.Handled = true; + _composerReleased = false; + SyncComposerArm(); + composer.Editor.ProcessKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false)); + return true; + } + + /// + /// ⌃S in the docked composer: the buffer as one command, built exactly as F1 builds it, to the composer's own + /// character — echoed, alias-expanded and recorded in that character's history like any line typed. + /// + private void SendDocked(DockedComposer composer) + { + if (FindSession(composer.SessionKey) is not { } session) + { + RefuseCommand(NothingToSendTo(composer.WindowId)); + return; + } + + if (ComposeMessage.Build(composer.Body, composer.Escaping) is not { } line) + { + RefuseCommand("nothing to send — the composer is empty"); + return; + } + + composer.Load(string.Empty, composer.Escaping); + _composeDrafts.Remove(composer.SessionKey); + HistoryFor(composer.SessionKey, BarKind(_input)).Add(line); + _ = session.SendUserInputAsync(line); + } + + /// Types into the armed composer through the window's key handler, one key per character. + internal void SimulateComposerTyping(string text) + { + foreach (var c in text) + { + SimulateKey(c == '\n' + ? new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false) + : new ConsoleKeyInfo(c, char.IsAsciiLetter(c) ? (ConsoleKey)char.ToUpperInvariant(c) : ConsoleKey.NoName, char.IsUpper(c), false, false)); + } + } + + /// + /// What a click in a docked composer's editor does to focus: the framework focuses the control the pointer hit + /// (FocusReason.Mouse) and raises FocusChanged. The framework's own mouse path runs only inside + /// Run(), which no test enters. + /// + internal void SimulateComposerClick(string windowId) + { + if (_dockedComposers.TryGetValue(windowId, out var composer)) + { + _window.FocusManager.SetFocus(composer.Editor, FocusReason.Mouse); + } + } + + // --- Shared ----------------------------------------------------------------------------------------------- + + /// A markup panel: one control, redrawn from its render function at its pane's size. + private sealed class PanelView(string windowId, MarkupControl control, Func> render, Func box) + { + internal string WindowId { get; } = windowId; + + internal MarkupControl Control { get; } = control; + + internal (int Width, int Height) Size { get; private set; } + + internal Action? Click { get; set; } + + internal List Markup { get; private set; } = []; + + internal void Refresh() + { + Size = box(WindowId); + Markup = render(Size.Width, Size.Height); + Control.SetContent(Markup.ToList()); + } + } + + private PanelView NewPanelView(TerminalPanelContext context, Func> render) + { + var control = new MarkupControl(new List()) + { + HorizontalAlignment = HorizontalAlignment.Stretch, + VerticalAlignment = VerticalAlignment.Fill, + }; + var view = new PanelView(context.WindowId, control, render, PanelBox); + control.LinkClicked += (_, e) => view.Click?.Invoke(e.Url); + _panelViews[context.WindowId] = view; + view.Refresh(); + return view; + } + + /// What a markup panel last drew, for the tests. + internal IReadOnlyList PanelMarkup(string windowId) => + _panelViews.TryGetValue(windowId, out var view) ? view.Markup : []; + + /// A click on a panel's link, as its own handler receives it. + internal void SimulatePanelClick(string windowId, string url) + { + if (_panelViews.TryGetValue(windowId, out var view)) + { + view.Click?.Invoke(url); + } + } + + /// Redraws every panel: after a configuration commit, which can change meters and macros. + private void RefreshPanels() + { + foreach (var view in _panelViews.Values) + { + view.Refresh(); + } + } + + /// Redraws a panel whose box changed, and fits each composer. Rides PostBufferPaint. + private void SyncPanelSizes() + { + foreach (var view in _panelViews.Values) + { + if (view.Size != PanelBox(view.WindowId)) + { + view.Refresh(); + } + } + + foreach (var composer in _dockedComposers.Values) + { + var box = PanelBox(composer.WindowId); + composer.Fit(box.Width, box.Height); + } + } + + /// The cells a panel has: its pane's output rectangle, or a fallback before one is arranged. + private (int Width, int Height) PanelBox(string windowId) + { + if (_workspace.Layout.FindWindow(windowId) is { } pane + && PaneOutputRects().TryGetValue(pane.Id, out var rect) + && !rect.IsEmpty) + { + return (rect.Width, rect.Height); + } + + return (Math.Max(20, _system.ConsoleDriver.ScreenSize.Width - 24), Math.Max(3, _system.ConsoleDriver.ScreenSize.Height - 6)); + } + + /// A character's game data: its session's, or the demo's for the demo character with nothing open. + private GameDataStore? PanelGameData(string sessionKey) => + FindSession(sessionKey)?.GameData + ?? (IsDemoKey(sessionKey) ? _demoGameData : null); + + /// A character's room roster: its session's, or the demo's. + private RoomOccupants? PanelOccupants(string sessionKey) => + FindSession(sessionKey)?.Occupants + ?? (IsDemoKey(sessionKey) ? _demoOccupants : null); + + /// The meters a character's vitals show: the player's own, then any its server asked for. + private IReadOnlyList PanelMeters(string sessionKey) + { + var own = _config.Text.StatusMeters; + var served = FindSession(sessionKey)?.MxpMeters ?? (IsDemoKey(sessionKey) ? _demoMeters : []); + return served.Count == 0 + ? own + : [.. own, .. served.Where(m => !own.Any(o => string.Equals(o.Value, m.Value, StringComparison.OrdinalIgnoreCase)))]; + } + + // --- The snapshot views ----------------------------------------------------------------------------------- + + /// + /// The four panel views, each opened through its real ⌃P entry and placed the way its layout places it: + /// panel-who a narrow column beside the output; panel-vitals a strip over it, with a target; + /// panel-quickbar a strip under it, with function-key bindings the demo does not otherwise carry; + /// panel-composer the Roleplay column — the composer armed and holding a post typed through the real key + /// path, over who is here. The data is written through and + /// , the calls the wire makes. + /// + private void LoadDemoPanels(string view) + { + LoadDemoGameData(); + _demoOccupants.Apply( + "Room.Players", + """[{"name":"Ashlyn","fullname":"Ashlyn the Wanderer","idle":12},{"name":"Brannoc","idle":260},{"name":"Merrow","fullname":"Merrow of the Tide","idle":5},{"name":"Corvid","idle":0}]"""); + _demoOccupants.Apply( + "Char.Items.List", + """{"location":"room","items":[{"id":"9101","name":"a town crier","attrib":"m"},{"id":"9102","name":"a stray cat","attrib":"m"},{"id":"9103","name":"a lantern","attrib":"t"}]}"""); + + switch (view) + { + case "panel-who": + OpenDemoPanelBeside(PanelIds.WhoHere, columns: 34); + Activate(MainWindowId); + break; + + case "panel-vitals": + _demoGameData.SetGmcp("Char.Status", """{"enemy":"a rotting ghoul","enemypct":"40"}"""); + OpenDemoPanelStrip(PanelIds.Vitals, Edge.Top); + Activate(MainWindowId); + break; + + case "panel-quickbar": + _config.TriggerSets.Add(new TriggerSet + { + Name = "Quick", + Macros = + { + new Macro { Name = "kick", Key = "F11", Command = "kick" }, + new Macro { Name = "bash", Key = "F12", Command = "bash" }, + new Macro { Name = "cure light", Key = "Ctrl+F3", Command = "cast 'cure light'" }, + new Macro { Name = "quaff mana", Key = "Ctrl+F4", Command = "quaff mana" }, + }, + }); + FindCharacter(DemoScene.ActiveSessionKey)?.Character.TriggerSets.Add("Quick"); + OpenDemoPanelStrip(PanelIds.QuickBar, Edge.Bottom); + Activate(MainWindowId); + break; + + case "panel-composer": + if (OpenDemoPanelBeside(PanelIds.Composer, columns: 46) is { } composer + && _workspace.Layout.FindWindow(composer) is { } column) + { + var who = TerminalPanels.WindowId(PanelIds.WhoHere, DemoScene.ActiveSessionKey); + _workspace.OpenWindow(who, PanelTitle(PanelIds.WhoHere), WindowKind.Auxiliary, DemoScene.ActiveSessionKey, column.Id); + _workspace.Layout.SplitWithWindow(who, column.Id, Edge.Bottom); + RebuildPaneArea(); + Activate(MainWindowId); + Activate(composer); + SimulateComposerTyping("+pose Corvid sets the lantern down by the fountain\nand waits, 100% certain [someone] saw."); + } + + break; + } + + RefreshRail(); + } + + /// Opens a demo panel in a new pane to the right of the main window's, wide. + private string? OpenDemoPanelBeside(string panelId, int columns) + { + var mainPane = _workspace.Layout.FindWindow(MainWindowId)?.Id; + if (mainPane is null || OpenPanel(panelId, DemoScene.ActiveSessionKey) is not { } windowId) + { + return null; + } + + _workspace.Layout.SplitWithWindow(windowId, mainPane, Edge.Right); + RebuildPaneArea(); + Activate(windowId); + SizeDemoPane(windowId, columns); + return windowId; + } + + /// Opens a demo panel in a pane along one edge of the main window's, as short as a pane may be. + private void OpenDemoPanelStrip(string panelId, Edge edge) + { + var mainPane = _workspace.Layout.FindWindow(MainWindowId)?.Id; + if (mainPane is null || OpenPanel(panelId, DemoScene.ActiveSessionKey) is not { } windowId) + { + return; + } + + _workspace.Layout.SplitWithWindow(windowId, mainPane, edge); + RebuildPaneArea(); + Activate(windowId); + SizeDemoPane(windowId, PaneResize.MinimumPaneRows); + } + + /// + /// Moves the border of the split holding a window's pane so that pane is along the + /// split's axis, through — the arithmetic a drag on the divider uses. Needs + /// a rendered frame, so the panes have rectangles. + /// + private void SizeDemoPane(string windowId, int cells) + { + RenderFrame(); + if (_workspace.Layout.FindWindow(windowId) is not { } pane + || ParentOf(_workspace.Layout.Root, pane) is not { Children.Count: 2 } parent) + { + return; + } + + var rects = PaneRectsForResize(); + if (!rects.TryGetValue(pane.Id, out var rect)) + { + return; + } + + var horizontal = parent.Direction == SplitDirection.Row; + var start = horizontal ? rect.X : rect.Y; + var length = horizontal ? rect.Width : rect.Height; + var boundary = parent.Children.IndexOf(pane) == 0 ? start + cells : start + length - cells; + PaneResize.DragBorder(parent, 0, boundary, rects); + RebuildPaneArea(); + ReArmWholeFrame(); + } + + private static SplitNode? ParentOf(Core.Workspaces.LayoutNode node, PaneNode pane) => + node is not SplitNode split + ? null + : split.Children.Contains(pane) + ? split + : split.Children.Select(child => ParentOf(child, pane)).FirstOrDefault(found => found is not null); + + /// The demo's room roster, for the tests that drive it the way the wire would. + internal RoomOccupants DemoOccupants => _demoOccupants; +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 57572b8a..de401928 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -974,7 +974,12 @@ public SharpMUTermApp( // line, and this puts it back the instant anything takes it, which is what makes "which bar ⏎ // sends from", "which control the framework will paste into" and "where the caret is drawn" one // fact rather than three that agree until they don't. - _window.FocusManager.FocusChanged += (_, _) => PinFocusToArmedBar(); + _window.FocusManager.FocusChanged += (_, _) => + { + // A click in a docked composer's editor is a request to write there, not focus drifting: arm it. + ArmClickedComposer(); + PinFocusToArmedBar(); + }; _window.PreviewKeyPressed += OnWindowKey; // NAWS rides the frame. Pane rectangles exist only while an arranged layout does, and every @@ -993,6 +998,7 @@ public SharpMUTermApp( DrawSixelOverlay(buffer); PublishScrollbars(); SyncMapSizes(); + SyncPanelSizes(); }; if (_sixel is not null) { @@ -1785,6 +1791,16 @@ public string RenderSnapshot(string? view = null) LoadDemoPackages(view.ToLowerInvariant()); } + // The panels a layout places, each opened through its real ⌃P entry over the demo's game data, which is + // written through the calls the wire makes. See LoadDemoPanels for what each frame is for. + if (string.Equals(view, "panel-who", StringComparison.OrdinalIgnoreCase) + || string.Equals(view, "panel-vitals", StringComparison.OrdinalIgnoreCase) + || string.Equals(view, "panel-quickbar", StringComparison.OrdinalIgnoreCase) + || string.Equals(view, "panel-composer", StringComparison.OrdinalIgnoreCase)) + { + LoadDemoPanels(view!.ToLowerInvariant()); + } + // The status row's meters and the game data inspector, over the demo's game data — written through // GameDataStore.SetGmcp, the call the wire makes, so the frame shows what a server's messages produce. // `meters` is the row alone; `gamedata` opens the inspector through the real ⌃P entry. @@ -4893,6 +4909,7 @@ private void SendComposed(ComposeResult result) // was opened, already sent. _composer.Close(); _composeDrafts.Remove(session.SessionKey); + SyncDockedComposers(session.SessionKey); HistoryFor(BarKind(ActiveBar())).Add(line); _ = session.SendUserInputAsync(line); } @@ -4918,10 +4935,13 @@ private void KeepComposeDraft(ComposeResult result) if (result.Body.Trim().Length == 0) { _composeDrafts.Remove(key); - return; + } + else + { + _composeDrafts[key] = result; } - _composeDrafts[key] = result; + SyncDockedComposers(key); } /// The composer, for the tests and the snapshot views. @@ -5291,8 +5311,9 @@ private void SetUpBar(InputBarControl bar, InputBar kind) private void ArmBar(InputBarControl bar) { _armed = bar.Visible ? bar : _input; - _input.Armed = ReferenceEquals(_armed, _input); - _second.Armed = ReferenceEquals(_armed, _second); + // A docked composer holding the keyboard keeps it: this is re-asserted on every layout change, and only + // the explicit gestures (the ⌃↑/⌃↓ ladder, ⇥ between bars, Esc) hand it back — see ReleaseComposer. + SyncComposerBands(); _window.FocusControl(_armed); UpdateInputChrome(); } @@ -5314,7 +5335,8 @@ private void PinFocusToArmedBar() return; } - var bar = ActiveBar(); + // The armed composer, when one holds the keyboard, is what typing, paste and the caret follow instead. + IInteractiveControl bar = ArmedComposer()?.Editor ?? (IInteractiveControl)ActiveBar(); if (ReferenceEquals(_window.FocusManager.FocusedControl, bar)) { return; @@ -5707,6 +5729,7 @@ private bool TryFocusKey(KeyPressedEventArgs e) // Up out of the second command line before anything else — it is the station above it. if (move == PaneDirection.Up && ReferenceEquals(_armed, _second) && _second.Visible) { + _composerReleased = true; ArmBar(_input); return true; } @@ -5720,6 +5743,7 @@ private bool TryFocusKey(KeyPressedEventArgs e) // Down off the last pane lands on the command lines, which are drawn below them. if (move == PaneDirection.Down && _second.Visible && ReferenceEquals(_armed, _input)) { + _composerReleased = true; ArmBar(_second); return true; } @@ -6926,6 +6950,9 @@ internal void SaveConfiguration() // line rather than the next reconnect. See ReloadAutomation. ReloadAutomation(); + // The quick bar lists the macros just committed, and the vitals the meters. + RefreshPanels(); + // F5 also adds and removes worlds and characters, which are what the header's fraction and the // rail are drawn from. Neither is repainted by anything else here, so a world added on F5 used to // leave both reading the configuration as it was before. @@ -8080,6 +8107,12 @@ private bool RunBuiltInCommand(string id) return true; } + if (id.StartsWith(PanelCommandPrefix, StringComparison.Ordinal)) + { + ShowPanel(id[PanelCommandPrefix.Length..]); + return true; + } + if (id == "a11y:toggle-window") { ToggleAnnounced(); @@ -11280,6 +11313,17 @@ private bool RouteToInput(ConsoleKeyInfo key) return null; } + // A docked composer holding the keyboard takes the keys an editor takes; see HandleComposerKey. + if (ArmedComposer() is { } composer) + { + return HandleComposerKey(composer, e); + } + + if (TryComposerAltEnter(e)) + { + return null; + } + // Alt+⏎ → newline, reassembled from the Escape and Enter the parser splits it into. First in // the chain because it is the only entry that has to see *every* key: it remembers a lone // Escape and must forget it again the moment anything else arrives, whoever ends up claiming @@ -12362,6 +12406,7 @@ private void SyncToFocusedPane() SyncScrollbackState(); RefreshPromptRow(); ReportPaneSizes(); + SyncComposerArm(); } /// diff --git a/src/SharpMUTerm.Tui/SnapshotViews.cs b/src/SharpMUTerm.Tui/SnapshotViews.cs index 8c046f45..b4b8f269 100644 --- a/src/SharpMUTerm.Tui/SnapshotViews.cs +++ b/src/SharpMUTerm.Tui/SnapshotViews.cs @@ -25,5 +25,6 @@ internal static class SnapshotViews "prefix", "prefix-panel", "focus", "focus-moved", "tabs", "tabs-many", "collapsed", "timestamps", "timestamps-toggled", "prompt", "meters", "gamedata", "map", "map-walking", "map-split", "packages", "package-review", "package-browse", "send-menu", "layouts", "layout-combat", + "panel-who", "panel-vitals", "panel-quickbar", "panel-composer", ]; } diff --git a/src/SharpMUTerm.Tui/StatusMeterRenderer.cs b/src/SharpMUTerm.Tui/StatusMeterRenderer.cs index 1c5566a2..d56277cd 100644 --- a/src/SharpMUTerm.Tui/StatusMeterRenderer.cs +++ b/src/SharpMUTerm.Tui/StatusMeterRenderer.cs @@ -38,32 +38,25 @@ internal static class StatusMeterRenderer internal static string Render(IReadOnlyList meters, GameDataStore data, string lowInk, bool compact = false) { var cells = new List(); - foreach (var meter in meters) + foreach (var reading in Read(meters, data)) { - if (StatusMeter.Read(data, meter.Value) is not { } value) - { - continue; - } - - var max = string.IsNullOrWhiteSpace(meter.Max) ? null : StatusMeter.Read(data, meter.Max); - var low = IsLow(value, max); - var label = MarkupText.Escape(meter.Label); - if (compact && Share(value, max) is { } share) + var label = MarkupText.Escape(reading.Label); + if (compact && reading.Share is { } share) { - var percent = $"{Math.Clamp((int)Math.Round(share * 100), 0, 999)}%".PadLeft(ShareWidth); - cells.Add(low + var percent = Percent(share).PadLeft(ShareWidth); + cells.Add(reading.Low ? $"[dim]{label}[/] [bold {lowInk}]{percent}[/]" : $"[dim]{label}[/] [bold]{percent}[/]"); continue; } - var shown = MarkupText.Escape(StatusMeter.Fit(value, ValueWidth).PadLeft(ValueWidth)); - var cell = low + var shown = MarkupText.Escape(StatusMeter.Fit(reading.Value, ValueWidth).PadLeft(ValueWidth)); + var cell = reading.Low ? $"[dim]{label}[/] [bold {lowInk}]{shown}[/]" : $"[dim]{label}[/] [bold]{shown}[/]"; - if (!string.IsNullOrWhiteSpace(meter.Max)) + if (reading.HasMax) { - cell += $"[dim]/{MarkupText.Escape(StatusMeter.Fit(max ?? string.Empty, ValueWidth).PadRight(ValueWidth))}[/]"; + cell += $"[dim]/{MarkupText.Escape(StatusMeter.Fit(reading.Max ?? string.Empty, ValueWidth).PadRight(ValueWidth))}[/]"; } cells.Add(cell); @@ -72,6 +65,41 @@ internal static string Render(IReadOnlyList meters, GameDataStore d return string.Join(" ", cells); } + /// + /// One meter's reading, as every renderer of meters draws it: the status row and the vitals panel read the + /// same values through this, so the two cannot disagree about what "low" is. + /// + /// The meter's label. + /// The value as the game sent it. + /// The maximum as the game sent it, or null when the game has not sent one. + /// Whether the meter is configured with a maximum at all, sent yet or not. + /// Value over maximum, when both are numbers and the maximum is positive. + /// Whether is under . + internal readonly record struct MeterReading(string Label, string Value, string? Max, bool HasMax, double? Share, bool Low); + + /// The meters that have a value, in their configured order. A meter with nothing to read is left out. + internal static IReadOnlyList Read(IReadOnlyList meters, GameDataStore data) + { + var readings = new List(); + foreach (var meter in meters) + { + if (StatusMeter.Read(data, meter.Value) is not { } value) + { + continue; + } + + var hasMax = !string.IsNullOrWhiteSpace(meter.Max); + var max = hasMax ? StatusMeter.Read(data, meter.Max) : null; + readings.Add(new MeterReading(meter.Label, value, max, hasMax, Share(value, max), IsLow(value, max))); + } + + return readings; + } + + /// A share as a whole percentage, at most four cells: 82%, 100%. + internal static string Percent(double share) => + $"{Math.Clamp((int)Math.Round(share * 100), 0, 999).ToString(CultureInfo.InvariantCulture)}%"; + private static bool IsLow(string value, string? max) => Share(value, max) < LowShare; private static double? Share(string value, string? max) => diff --git a/tests/SharpMUTerm.Core.Tests/Protocols/RoomOccupantsTests.cs b/tests/SharpMUTerm.Core.Tests/Protocols/RoomOccupantsTests.cs new file mode 100644 index 00000000..c27766b2 --- /dev/null +++ b/tests/SharpMUTerm.Core.Tests/Protocols/RoomOccupantsTests.cs @@ -0,0 +1,165 @@ +using SharpMUTerm.Core.Protocols; + +namespace SharpMUTerm.Core.Tests.Protocols; + +/// +/// Who is in the room, from GMCP: the whole list, a player arriving and leaving, and creatures from the room's item +/// list. The roster is server text, so it is bounded in count and name length and refuses names a click would turn +/// into a different command. +/// +public class RoomOccupantsTests +{ + [Test] + public async Task RoomPlayersReplacesTheListInTheGamesOrder() + { + var roster = new RoomOccupants(); + roster.Apply("Room.Players", """[{"name":"Ann","fullname":"Ann the Bold"},{"name":"Bo"}]"""); + roster.Apply("Room.Players", """[{"name":"Cy"},{"name":"Ann"}]"""); + + await Assert.That(roster.Known).IsTrue(); + await Assert.That(roster.Snapshot.Select(o => o.Name)).IsEquivalentTo(new[] { "Cy", "Ann" }); + } + + [Test] + public async Task AFullNameIsShownAndTheShortNameIsKept() + { + var roster = new RoomOccupants(); + roster.Apply("Room.Players", """[{"name":"Ann","fullname":"Ann the Bold"}]"""); + + var ann = roster.Snapshot.Single(); + await Assert.That(ann.Name).IsEqualTo("Ann"); + await Assert.That(ann.Display).IsEqualTo("Ann the Bold"); + await Assert.That(ann.IsPlayer).IsTrue(); + } + + [Test] + public async Task AddAndRemoveChangeOneRowWhateverTheCase() + { + var roster = new RoomOccupants(); + roster.Apply("Room.Players", """[{"name":"Ann"}]"""); + roster.Apply("Room.AddPlayer", """{"name":"Bo","idle":"240"}"""); + roster.Apply("Room.AddPlayer", """{"name":"bo","idle":5}"""); + + await Assert.That(roster.Snapshot.Count).IsEqualTo(2); + await Assert.That(roster.Snapshot[1].IdleSeconds).IsEqualTo(5); + + await Assert.That(roster.Apply("Room.RemovePlayer", "\"BO\"")).IsTrue(); + await Assert.That(roster.Snapshot.Select(o => o.Name)).IsEquivalentTo(new[] { "Ann" }); + } + + [Test] + public async Task CreaturesComeFromTheRoomsItemListAndOnlyMonsters() + { + var roster = new RoomOccupants(); + roster.Apply("Room.Players", """[{"name":"Ann"}]"""); + roster.Apply("Char.Items.List", """{"location":"room","items":[{"id":"1","name":"a rat","attrib":"m"},{"id":"2","name":"a chest","attrib":"c"}]}"""); + roster.Apply("Char.Items.List", """{"location":"inv","items":[{"id":"3","name":"a sword","attrib":"m"}]}"""); + + await Assert.That(roster.Snapshot.Select(o => o.Display)).IsEquivalentTo(new[] { "Ann", "a rat" }); + await Assert.That(roster.Snapshot[1].IsPlayer).IsFalse(); + + roster.Apply("Char.Items.Remove", """{"location":"room","item":{"id":"1"}}"""); + await Assert.That(roster.Snapshot.Count).IsEqualTo(1); + } + + [Test] + public async Task ANameWithASpaceOrAControlCharacterIsRefused() + { + var roster = new RoomOccupants(); + roster.Apply("Room.Players", """[{"name":"Ann; quit"},{"name":"Bo\u001b[2J"},{"name":"Cy"}]"""); + + await Assert.That(roster.Snapshot.Select(o => o.Name)).IsEquivalentTo(new[] { "Cy" }); + } + + [Test] + public async Task TheRosterIsCapped() + { + var roster = new RoomOccupants(); + var many = string.Join(",", Enumerable.Range(0, RoomOccupants.MaxOccupants + 50).Select(i => $"{{\"name\":\"P{i}\"}}")); + roster.Apply("Room.Players", $"[{many}]"); + + await Assert.That(roster.Snapshot.Count).IsEqualTo(RoomOccupants.MaxOccupants); + } + + [Test] + public async Task OtherPackagesAndMalformedBodiesChangeNothing() + { + var roster = new RoomOccupants(); + var raised = 0; + roster.Changed += (_, _) => raised++; + + await Assert.That(roster.Apply("Char.Vitals", """{"hp":"1"}""")).IsFalse(); + await Assert.That(roster.Apply("Room.Players", "[{")).IsFalse(); + await Assert.That(roster.Known).IsFalse(); + await Assert.That(raised).IsEqualTo(0); + } + + [Test] + public async Task AnEmptyRoomTheGameReportedIsKnown() + { + var roster = new RoomOccupants(); + roster.Apply("Room.Players", "[]"); + + await Assert.That(roster.Known).IsTrue(); + await Assert.That(roster.Snapshot).IsEmpty(); + + roster.Clear(); + await Assert.That(roster.Known).IsFalse(); + } +} + +/// What the character is fighting, read from the three shapes games send it in. +public class CombatTargetTests +{ + [Test] + public async Task AardwolfsEnemyAndPercentage() + { + var data = new GameDataStore(); + data.SetGmcp("Char.Status", """{"enemy":"a rotting ghoul","enemypct":"40"}"""); + + var target = CombatTarget.Read(data); + await Assert.That(target).IsNotNull(); + await Assert.That(target!.Name).IsEqualTo("a rotting ghoul"); + await Assert.That(target.Share).IsEqualTo(0.4); + } + + [Test] + public async Task AnEmptyEnemyIsNoTarget() + { + var data = new GameDataStore(); + data.SetGmcp("Char.Status", """{"enemy":"","enemypct":"0"}"""); + + await Assert.That(CombatTarget.Read(data)).IsNull(); + } + + [Test] + public async Task IresTargetInfo() + { + var data = new GameDataStore(); + data.SetGmcp("IRE.Target.Info", """{"id":"1","short_desc":"a goblin","hpperc":"75%"}"""); + + var target = CombatTarget.Read(data)!; + await Assert.That(target.Name).IsEqualTo("a goblin"); + await Assert.That(target.Share).IsEqualTo(0.75); + } + + [Test] + public async Task MsdpHealthIsAShareOfItsMaximumWhenOneIsSent() + { + var data = new GameDataStore(); + data.SetMsdp("""{"OPPONENT_NAME":"a troll","OPPONENT_HEALTH":"30","OPPONENT_HEALTH_MAX":"120"}"""); + + var target = CombatTarget.Read(data)!; + await Assert.That(target.Name).IsEqualTo("a troll"); + await Assert.That(target.Share).IsEqualTo(0.25); + } + + [Test] + public async Task ATargetWithNoHealthHasNoShare() + { + var data = new GameDataStore(); + data.SetGmcp("Char.Status", """{"enemy":"a shade"}"""); + + await Assert.That(CombatTarget.Read(data)!.Share).IsNull(); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/DockedComposerTests.cs b/tests/SharpMUTerm.Tui.Tests/DockedComposerTests.cs new file mode 100644 index 00000000..15274901 --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/DockedComposerTests.cs @@ -0,0 +1,252 @@ +using SharpConsoleUI.Drivers; +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Layouts; +using SharpMUTerm.Graphics; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// The docked composer, driven through the window's own key handler: arriving at its pane arms it, typing and paste +/// go to it and not the command line, ⌃S sends one command to its character, Esc hands the keyboard back, +/// and its buffer is the same draft F1 opens. +/// +/// Sessions are connected, as ' are: SendUserInputAsync writes nothing without +/// a transport, so "it was sent" against an unconnected session would hold whatever the code did. +/// +/// +[NotInParallel] +public class DockedComposerTests +{ + private const int Width = 120; + private const int Height = 32; + + private static readonly TerminalCapabilities Headless = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private static ConsoleKeyInfo Key(ConsoleKey key, ConsoleModifiers modifiers = 0, char ch = '\0') => + new(ch, key, modifiers.HasFlag(ConsoleModifiers.Shift), + modifiers.HasFlag(ConsoleModifiers.Alt), modifiers.HasFlag(ConsoleModifiers.Control)); + + private static ConsoleKeyInfo Enter => Key(ConsoleKey.Enter, ch: '\r'); + + [Test] + public async Task OpeningTheComposerArmsItAndTypingLandsThere() + { + var world = await Connected(); + var windowId = world.OpenComposer(); + + await Assert.That(world.App.ComposerArmed).IsTrue(); + await Assert.That(world.App.ComposerHasFocus).IsTrue().Because("paste follows the framework's focus"); + + world.App.SimulateComposerTyping("say hi"); + await Assert.That(world.App.DockedComposerIn(windowId)!.Body).IsEqualTo("say hi"); + await Assert.That(world.App.PrimaryInputText).IsEqualTo(string.Empty); + } + + [Test] + public async Task EnterInsertsALineAndCtrlSSendsOneCommandToTheComposersCharacter() + { + var world = await Connected(); + var windowId = world.OpenComposer(); + + world.App.SimulateComposerTyping("+pose waves\nand sits"); + await Assert.That(world.Telnet.Lines).IsEmpty().Because("⏎ in the composer is a new line, not a send"); + + world.App.SimulateKey(Key(ConsoleKey.S, ConsoleModifiers.Control)); + + await Assert.That(world.Telnet.Lines).IsEquivalentTo(new[] { "+pose waves%rand sits" }); + await Assert.That(world.App.DockedComposerIn(windowId)!.Body).IsEqualTo(string.Empty); + await Assert.That(world.App.HistoryEntries(InputBar.Primary)).Contains("+pose waves%rand sits"); + } + + [Test] + public async Task AltLEscapesTheWayF1Does() + { + var world = await Connected(); + var windowId = world.OpenComposer(); + world.App.SimulateComposerTyping("100% [sure]"); + + world.App.SimulateKey(Key(ConsoleKey.L, ConsoleModifiers.Alt)); + await Assert.That(world.App.DockedComposerIn(windowId)!.HeaderMarkup).Contains("literal"); + world.App.SimulateKey(Key(ConsoleKey.S, ConsoleModifiers.Control)); + + await Assert.That(world.Telnet.Lines).IsEquivalentTo(new[] { "100%% \\[sure\\]" }); + } + + [Test] + public async Task PasteGoesToTheComposerWhileItIsArmedAndToTheCommandLineAfterEsc() + { + var world = await Connected(); + var windowId = world.OpenComposer(); + + world.App.SimulatePaste("pasted"); + await Assert.That(world.App.DockedComposerIn(windowId)!.Body).IsEqualTo("pasted"); + + world.App.SimulateKey(Key(ConsoleKey.Escape)); + await Assert.That(world.App.ComposerArmed).IsFalse(); + await Assert.That(world.App.ArmedBarHasFocus).IsTrue(); + + world.App.SimulatePaste("look"); + await Assert.That(world.App.PrimaryInputText).IsEqualTo("look"); + await Assert.That(world.App.DockedComposerIn(windowId)!.Body).IsEqualTo("pasted"); + } + + [Test] + public async Task AfterEscEnterSendsFromTheCommandLineToTheSameCharacter() + { + var world = await Connected(); + world.OpenComposer(); + world.App.SimulateComposerTyping("draft"); + world.App.SimulateKey(Key(ConsoleKey.Escape)); + + foreach (var c in "look") + { + world.App.SimulateKey(Key((ConsoleKey)char.ToUpperInvariant(c), ch: c)); + } + + world.App.SimulateKey(Enter); + await Assert.That(world.Telnet.Lines).IsEquivalentTo(new[] { "look" }); + } + + /// + /// ⌥⏎ is the newline chord, and a terminal writes it as Esc then Enter. In the composer the Esc alone would hand + /// the keyboard back and the Enter would send whatever the command line held — so the pair is put back together. + /// + [Test] + public async Task AltEnterInTheComposerIsANewLineAndSendsNothing() + { + var world = await Connected(); + var windowId = world.OpenComposer(); + world.App.SimulateComposerTyping("one"); + + world.App.SimulateKey(Key(ConsoleKey.Escape)); + world.App.SimulateKey(Enter); + world.App.SimulateComposerTyping("two"); + + await Assert.That(world.Telnet.Lines).IsEmpty(); + await Assert.That(world.App.ComposerArmed).IsTrue(); + await Assert.That(world.App.DockedComposerIn(windowId)!.Body).IsEqualTo("one\ntwo"); + } + + [Test] + public async Task MovingToAnotherPaneDisarmsItAndComingBackArmsIt() + { + var world = await Connected(); + var windowId = world.OpenComposer(); + world.App.DispatchCommand("layout:split-right"); + world.App.RenderNextFrame(); + var composerPane = world.App.PaneIdOf(windowId); + await Assert.That(world.App.PaneIds.Count).IsEqualTo(2); + + while (world.App.FocusedPaneId == composerPane) + { + world.App.SimulateKey(Key(ConsoleKey.O, ConsoleModifiers.Control)); + } + + await Assert.That(world.App.ComposerArmed).IsFalse(); + await Assert.That(world.App.ArmedBarHasFocus).IsTrue(); + + world.App.SimulateKey(Key(ConsoleKey.O, ConsoleModifiers.Control)); + await Assert.That(world.App.FocusedPaneId).IsEqualTo(composerPane); + await Assert.That(world.App.ComposerArmed).IsTrue().Because("arriving at its pane is moving into it"); + await Assert.That(world.App.ComposerHasFocus).IsTrue(); + } + + /// A click in the editor arms it — the focus pin must not take the focus straight back to the bar. + [Test] + public async Task AClickInTheEditorArmsItFromAnotherPane() + { + var world = await Connected(); + var windowId = world.OpenComposer(); + world.App.DispatchCommand("layout:split-right"); + world.App.RenderNextFrame(); + var composerPane = world.App.PaneIdOf(windowId); + while (world.App.FocusedPaneId == composerPane) + { + world.App.SimulateKey(Key(ConsoleKey.O, ConsoleModifiers.Control)); + } + + await Assert.That(world.App.ComposerArmed).IsFalse(); + + world.App.SimulateComposerClick(windowId); + + await Assert.That(world.App.ComposerArmed).IsTrue(); + await Assert.That(world.App.ComposerHasFocus).IsTrue(); + await Assert.That(world.App.FocusedPaneId).IsEqualTo(composerPane); + world.App.SimulateComposerTyping("x"); + await Assert.That(world.App.DockedComposerIn(windowId)!.Body).IsEqualTo("x"); + } + + /// While the composer holds the keyboard both command lines are drawn idle: ⏎ is not theirs. + [Test] + public async Task BothCommandLinesAreIdleWhileTheComposerIsArmed() + { + var world = await Connected(); + world.OpenComposer(); + var (armed, idle) = world.App.InputBandColors; + await Assert.That(world.App.PrimaryBandColor).IsEqualTo(idle); + + world.App.SimulateKey(Key(ConsoleKey.Escape)); + await Assert.That(world.App.PrimaryBandColor).IsEqualTo(armed); + } + + [Test] + public async Task TheDockedBufferIsTheDraftF1Opens() + { + var world = await Connected(); + var windowId = world.OpenComposer(); + world.App.SimulateComposerTyping("half a post"); + + world.App.SimulateKey(Key(ConsoleKey.F1)); + await Assert.That(world.App.Composer.IsOpen).IsTrue(); + await Assert.That(world.App.Composer.Body).IsEqualTo("half a post"); + + world.App.Composer.SimulateTyping(" and the rest"); + world.App.Composer.SimulateKey(Key(ConsoleKey.Escape)); + + await Assert.That(world.App.DockedComposerIn(windowId)!.Body).IsEqualTo("half a post and the rest"); + } + + [Test] + public async Task ItSurvivesThePaneAreaBeingRebuilt() + { + var world = await Connected(); + var windowId = world.OpenComposer(); + world.App.SimulateComposerTyping("kept"); + + world.App.DispatchCommand("layout:split-right"); + world.App.RenderNextFrame(); + + await Assert.That(world.App.DockedComposerIn(windowId)!.Body).IsEqualTo("kept"); + await Assert.That(world.App.RenderWholeFrame()).Contains("kept"); + } + + private sealed record Wired(SharpMUTermApp App, RecordingTelnetSession Telnet) + { + /// Opens the composer through its ⌃P entry, in a pane of its own beside the output. + internal string OpenComposer() + { + App.DispatchCommand("panel:composer"); + var windowId = TerminalPanels.WindowId(PanelIds.Composer, "Quiet.Ann"); + App.RenderNextFrame(); + return windowId; + } + } + + private static async Task Connected() + { + Console.SetIn(TextReader.Null); + var config = new AppConfiguration(); + var world = new WorldDefinition { Name = "Quiet", Host = "quiet.example.org", Port = 4000 }; + world.Characters.Add(new CharacterDefinition { Name = "Ann", Logging = new LoggingSettings() }); + config.Worlds.Add(world); + + var app = new SharpMUTermApp(config, Headless, new HeadlessConsoleDriver(Width, Height)); + var telnet = new RecordingTelnetSession(); + app.TelnetFactory = _ => telnet; + await app.BindWorldWithoutConnecting(world).ConnectAsync(); + app.RenderNextFrame(); + return new Wired(app, telnet); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs b/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs index 3f263820..2019f55e 100644 --- a/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs @@ -48,6 +48,10 @@ public class FrameContrastTests // most to lose from a theme it was not measured against. "selection", "input-selection", "menu-fuzzy", "menu-recent", + // The four panels: who is here and the quick bar carry the accent on links, the vitals strip paints bars + // and the warning in a server-driven colour, and the docked composer is an editor on its own plane. + "panel-who", "panel-vitals", "panel-quickbar", "panel-composer", + // The meters are the status row's only cells whose colour depends on what a server sent (a low // value wears the notice ink), and the inspector is a modal of its own. "meters", "gamedata", "map", "map-walking", "map-split", diff --git a/tests/SharpMUTerm.Tui.Tests/LayoutWiringTests.cs b/tests/SharpMUTerm.Tui.Tests/LayoutWiringTests.cs index f1a77b98..921afbf1 100644 --- a/tests/SharpMUTerm.Tui.Tests/LayoutWiringTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/LayoutWiringTests.cs @@ -89,8 +89,8 @@ public async Task CombatOverTheDemoPutsTheMapBesideTheOutputWithChatTabbedUnderI await Assert.That(app.PaneIdOf(SharpMUTermApp.MapWindowId(DemoScene.ActiveSessionKey))).IsEqualTo("panel:map"); await Assert.That(app.PaneIdOf(DemoScene.ChatWindowId)).IsEqualTo("panel:map"); await Assert.That(app.FocusedPaneId).IsEqualTo("panel:output"); - // Vitals and the quick bar have nothing to draw them in this build, so they take no pane. - await Assert.That(app.PaneIds).IsEquivalentTo(new[] { "panel:output", "panel:map" }); + // The demo sends vitals, and the quick bar always has something to say, so both take their strips. + await Assert.That(app.PaneIds).IsEquivalentTo(new[] { "panel:vitals", "panel:output", "panel:map", "panel:quick-bar" }); } [Test] @@ -140,7 +140,7 @@ public async Task ARefoldWaitsForTheBurstAndRebuildsOnlyWhenAPanelAppears() config.Worlds[0].Layout = BuiltInLayouts.CombatId; app.Panels.Register(PanelIds.Vitals, _ => new MarkupControl(["vitals"])); var session = app.BindWorldWithoutConnecting(config.Worlds[0]); - await Assert.That(app.PaneIds).IsEquivalentTo(new[] { "panel:output" }); + await Assert.That(app.PaneIds).IsEquivalentTo(new[] { "panel:output", "panel:quick-bar" }); var rebuilds = app.PaneAreaRebuilds; for (var hp = 400; hp < 410; hp++) diff --git a/tests/SharpMUTerm.Tui.Tests/TerminalPanelTests.cs b/tests/SharpMUTerm.Tui.Tests/TerminalPanelTests.cs new file mode 100644 index 00000000..039a496a --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/TerminalPanelTests.cs @@ -0,0 +1,246 @@ +using SharpConsoleUI.Drivers; +using SharpMUTerm.Core.Automation; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Layouts; +using SharpMUTerm.Core.Protocols; +using SharpMUTerm.Graphics; +using SharpMUTerm.Tui.Panels; +using static SharpMUTerm.Tui.MarkupText; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// The three markup panels — who is here, the vitals strip, the quick bar — as pure renderers, and as panes of a +/// connected client: what a click does, whose session it does it on, and that a panel costs no cell outside its pane. +/// +[NotInParallel] +public class TerminalPanelTests +{ + private const int Width = 120; + private const int Height = 32; + + private static readonly TerminalCapabilities Headless = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private static readonly VitalsStripRenderer.Ink VitalsInk = new("#00f5b7", "#f5c542", "#6a6a72"); + + // --- who is here ------------------------------------------------------------------------------------------ + + [Test] + public async Task WhoHereListsPlayersThenCreaturesUnderTheRoomName() + { + var rows = WhoHereRenderer.Render( + "The Grand Plaza", + [new("Ann", "Ann the Bold", true, 30), new("Bo", "Bo", true, 600), new("rat", "a rat", false, Id: "1")], + 40, 10, new WhoHereRenderer.Ink("#00f5b7")); + + var plain = rows.Select(StripMarkup).ToList(); + await Assert.That(plain[0]).Contains("The Grand Plaza").And.Contains("3"); + await Assert.That(plain[1]).Contains("Ann the Bold").And.Contains("active"); + await Assert.That(plain[2]).Contains("idle 10m"); + await Assert.That(plain[3]).Contains("a rat"); + await Assert.That(rows[1]).Contains($"[link={WhoHereRenderer.LinkPrefix}0]"); + await Assert.That(plain.All(r => r.Length <= 40)).IsTrue(); + } + + [Test] + public async Task WhoHereSaysHowManyItCouldNotShow() + { + var many = Enumerable.Range(0, 30).Select(i => new RoomOccupant($"P{i}", $"P{i}", true)).ToList(); + var rows = WhoHereRenderer.Render("Hall", many, 30, 6, new WhoHereRenderer.Ink("#00f5b7")); + + await Assert.That(rows.Count).IsLessThanOrEqualTo(6); + await Assert.That(StripMarkup(rows[^1])).Contains("and 26 more"); + } + + [Test] + public async Task ANameIsTheGamesTextAndIsEscaped() + { + var rows = WhoHereRenderer.Render(null, [new("Ann", "[bold]Ann[/]", true)], 40, 4, new WhoHereRenderer.Ink("#00f5b7")); + + await Assert.That(rows[1]).Contains("[[bold]]Ann[[/]]"); + } + + // --- vitals ----------------------------------------------------------------------------------------------- + + private static StatusMeterRenderer.MeterReading Meter(string label, string value, string max) => + new(label, value, max, true, double.Parse(value) / double.Parse(max), double.Parse(value) / double.Parse(max) < StatusMeterRenderer.LowShare); + + [Test] + public async Task AChangingValueMovesNoCell() + { + var before = VitalsStripRenderer.Render([Meter("hp", "1000", "1000"), Meter("mp", "900", "1000")], new CombatTarget("a ghoul", 0.9), 100, VitalsInk); + var after = VitalsStripRenderer.Render([Meter("hp", "7", "1000"), Meter("mp", "90", "1000")], new CombatTarget("a ghoul", 0.05), 100, VitalsInk); + + await Assert.That(VisibleLength(after)).IsEqualTo(VisibleLength(before)); + var mp = StripMarkup(before).IndexOf("mp", StringComparison.Ordinal); + await Assert.That(StripMarkup(after).IndexOf("mp", StringComparison.Ordinal)).IsEqualTo(mp); + await Assert.That(StripMarkup(after)).Contains(VitalsStripRenderer.LowMark); + } + + [Test] + public async Task TheStripGivesUpDetailToFitAndNeverOverflows() + { + StatusMeterRenderer.MeterReading[] meters = [Meter("hp", "412", "500"), Meter("mp", "23", "120"), Meter("mv", "88", "100")]; + var target = new CombatTarget("a rotting ghoul", 0.4); + + var wide = StripMarkup(VitalsStripRenderer.Render(meters, target, 140, VitalsInk)); + var narrow = StripMarkup(VitalsStripRenderer.Render(meters, target, 50, VitalsInk)); + + await Assert.That(wide).Contains("█").And.Contains("412/500").And.Contains("40%"); + await Assert.That(narrow.Length).IsLessThanOrEqualTo(50); + await Assert.That(narrow).DoesNotContain("█"); + foreach (var width in new[] { 8, 20, 40, 60, 80, 100, 120 }) + { + await Assert.That(VisibleLength(VitalsStripRenderer.Render(meters, target, width, VitalsInk))).IsLessThanOrEqualTo(width); + } + } + + [Test] + public async Task NothingToShowIsNoStrip() + { + await Assert.That(VitalsStripRenderer.Render([], null, 80, VitalsInk)).IsEqualTo(string.Empty); + } + + // --- quick bar -------------------------------------------------------------------------------------------- + + private static readonly Macro[] Bindings = + [ + new() { Name = "kick", Key = "F11", Enabled = true, Command = "kick" }, + new() { Name = "", Key = "Ctrl+F3", Enabled = true, Command = "cast 'cure light'" }, + new() { Name = "bash", Key = "F12", Enabled = true, Command = "bash" }, + new() { Name = "look", Key = "Num5", Enabled = true, Command = "look" }, + new() { Name = "off", Key = "F10", Enabled = false, Command = "nothing" }, + ]; + + private static Macro? Resolve(string descriptor) => + Bindings.FirstOrDefault(m => m.Enabled && string.Equals(MacroKey.Canonicalise(m.Key), descriptor, StringComparison.OrdinalIgnoreCase)); + + [Test] + public async Task TheQuickBarListsFunctionKeysPlainFirstAndByNumber() + { + var entries = QuickBarRenderer.Entries(Bindings, Resolve); + + await Assert.That(entries.Select(e => e.Key)).IsEquivalentTo(new[] { "F11", "F12", "⌃F3" }); + await Assert.That(entries[2].Name).IsEqualTo("cast 'cure light'"); + } + + [Test] + public async Task TheQuickBarElidesAndNeverWraps() + { + var entries = QuickBarRenderer.Entries(Bindings, Resolve); + + var wide = QuickBarRenderer.Render(entries, 100, "#00f5b7"); + await Assert.That(StripMarkup(wide)).Contains("F11 kick").And.EndsWith(QuickBarRenderer.Hint); + await Assert.That(wide).Contains($"[link={QuickBarRenderer.LinkPrefix}0]"); + + foreach (var width in new[] { 6, 12, 20, 30, 45 }) + { + var row = QuickBarRenderer.Render(entries, width, "#00f5b7"); + await Assert.That(VisibleLength(row)).IsLessThanOrEqualTo(width); + await Assert.That(row).DoesNotContain("\n"); + } + } + + // --- in a client ------------------------------------------------------------------------------------------ + + [Test] + public async Task ClickingANamePutsLookOnTheCommandLineAndSendsNothing() + { + var world = await Connected(); + world.Session.Occupants.Apply("Room.Players", """[{"name":"Ashlyn","fullname":"Ashlyn the Wanderer"}]"""); + var windowId = world.Open(PanelIds.WhoHere); + + await Assert.That(string.Join("\n", world.App.PanelMarkup(windowId))).Contains("Ashlyn the Wanderer"); + + var sent = world.Telnet.Lines.Count; + world.App.SimulatePanelClick(windowId, WhoHereRenderer.LinkPrefix + "0"); + + await Assert.That(world.App.PrimaryInputText).IsEqualTo("look Ashlyn"); + await Assert.That(world.Telnet.Lines.Count).IsEqualTo(sent).Because("the demo world's connect commands are all that went"); + } + + [Test] + public async Task ClickingAQuickBarKeyRunsItsBindingOnThePanelsCharacter() + { + var world = await Connected(); + var windowId = world.Open(PanelIds.QuickBar); + var markup = string.Join("\n", world.App.PanelMarkup(windowId)); + await Assert.That(StripMarkup(markup)).Contains("⌃F1 score"); + + var link = markup.Split($"[link={QuickBarRenderer.LinkPrefix}").Skip(1).First(part => part.Contains("score")); + world.App.SimulatePanelClick(windowId, QuickBarRenderer.LinkPrefix + link[..link.IndexOf(']')]); + + await Assert.That(world.App.LastQuickMacro).IsEqualTo("Ctrl+F1"); + await Assert.That(world.Telnet.Lines).Contains("score"); + } + + [Test] + public async Task TheVitalsPanelDrawsTheSessionsMetersAndTarget() + { + var world = await Connected(); + world.Session.GameData.SetGmcp("Char.Vitals", """{"hp":"412","maxhp":"500","mp":"23","maxmp":"120"}"""); + world.Session.GameData.SetGmcp("Char.Status", """{"enemy":"a rotting ghoul","enemypct":"40"}"""); + var windowId = world.Open(PanelIds.Vitals); + + var strip = StripMarkup(string.Join("\n", world.App.PanelMarkup(windowId))); + await Assert.That(strip).Contains("412").And.Contains("a rotting").And.Contains("40%"); + } + + /// Every registered panel is one a layout can place, and the layout counts the rest as drawing nothing. + [Test] + public async Task ThePanelsThisClientDrawsAreTheOnesItRegistered() + { + var world = await Connected(); + + foreach (var id in new[] { PanelIds.WhoHere, PanelIds.Vitals, PanelIds.QuickBar, PanelIds.Composer }) + { + await Assert.That(world.App.Panels.IsRegistered(id)).IsTrue(); + } + + await Assert.That(world.App.Panels.IsRegistered(PanelIds.GameData)).IsFalse(); + await Assert.That(world.App.LayoutAvailability(world.Session.SessionKey).HasData(PanelIds.GameData)).IsFalse(); + } + + [Test] + public async Task APanelUpdatingMovesNoPaneRectangle() + { + var world = await Connected(); + var windowId = world.Open(PanelIds.WhoHere); + world.App.DispatchCommand("layout:split-right"); + world.App.RenderNextFrame(); + var before = world.App.PaneOutputRects().ToDictionary(p => p.Key, p => p.Value); + + world.Session.Occupants.Apply("Room.Players", """[{"name":"Ann"},{"name":"Bo"},{"name":"Cy"}]"""); + world.App.RenderNextFrame(); + + await Assert.That(world.App.PaneOutputRects().ToDictionary(p => p.Key, p => p.Value)).IsEquivalentTo(before); + await Assert.That(windowId).StartsWith(TerminalPanels.WindowPrefix); + } + + private static string StripMarkup(string markup) => Plain(markup); + + private sealed record Wired(SharpMUTermApp App, RecordingTelnetSession Telnet, Core.Session.WorldSession Session) + { + internal string Open(string panelId) + { + App.DispatchCommand("panel:" + panelId); + App.RenderNextFrame(); + App.RenderNextFrame(); + return TerminalPanels.WindowId(panelId, Session.SessionKey); + } + } + + private static async Task Connected() + { + Console.SetIn(TextReader.Null); + var config = DemoScene.Build(); + var app = new SharpMUTermApp(config, Headless, new HeadlessConsoleDriver(Width, Height)); + var telnet = new RecordingTelnetSession(); + app.TelnetFactory = _ => telnet; + var session = app.BindWorldWithoutConnecting(config.Worlds[0]); + await session.ConnectAsync(); + app.RenderNextFrame(); + return new Wired(app, telnet, session); + } +} From b246c8cf8111c6916e7071d376dc0c1456928cc2 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 04:36:45 +0000 Subject: [PATCH 013/113] Deliver headless MXP pictures on the driving thread, not the pool A headless app runs OnUiThread inline, so the picture host's deliveries ran on the thread pool while the test or snapshot appended the next line. The reserved-picture draw and the append that reads ReservedPicture.Drawn raced over the pane buffer, and a row could be left blank: the intermittent APictureStopsAtTheFirstLineWithoutItsCells. Headless picture work is now queued and run at the next frame or while InlineImagesSettled is awaited. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 2 + src/SharpMUTerm.Tui/SharpMUTermApp.cs | 64 +++++++++++++++++++++++++-- 2 files changed, 62 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e3c3266a..1cd3e4f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -156,6 +156,8 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Fixed +- A `--snapshot` frame with an MXP picture in cells a server left for it no longer sometimes leaves one of + the picture's rows blank. - At 80 columns the status row no longer wraps onto a second row: the encoding and the Ctrl+P hint are dropped first. - Health, mana and movement meters stay on the status row on a narrow terminal, shown as percentages when diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 9d6212e1..f34afcb9 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -743,7 +743,7 @@ public SharpMUTermApp( _sessions.SessionRemoved += OnSessionRemoved; _inlineImages = new InlineImageHost( (url, token) => (ImageFetch ?? _imageLoader.FetchBytesAsync)(url, token), - OnUi); + OnImageUi); _mssp = mssp ?? new MsspCache(); _maps = maps ?? new MapStore(); _media = media ?? new MediaCache(); @@ -2096,7 +2096,11 @@ public string RenderSnapshot(string? view = null) /// hung/OOM'd.) A frame also arranges the layout, so control bounds are only real after one has /// been rendered. /// - private string RenderFrame() => HeadlessFrameCapture.Capture(_system.ConsoleDriver, _system.ForceRender); + private string RenderFrame() + { + DrainHeadlessImageWork(); + return HeadlessFrameCapture.Capture(_system.ConsoleDriver, _system.ForceRender); + } /// /// Renders one more frame, the way a test drives the client on past a change it has just made — @@ -2703,7 +2707,59 @@ private WorldSession OpenSession(WorldDefinition world, CharacterDefinition? cha internal Func>? ImageFetch { get; set; } /// Completes when every MXP picture asked for so far has been delivered or given up on. - internal Task InlineImagesSettled => _inlineImages.Pending; + internal Task InlineImagesSettled => _headless ? SettleHeadlessImagesAsync() : _inlineImages.Pending; + + /// + /// UI work the picture host hands back, held until whoever drives a headless app collects it. + /// + /// The host fetches and decodes on the thread pool and hands its results to . + /// A headless app has no UI thread, and there runs the action inline — which + /// for these callers means on the pool thread, at the same moment the test or snapshot is + /// appending the next line on its own. and the append that reads + /// then raced over the same buffer: the picture set + /// Drawn and scanned the lines a moment before the next line landed, that line read + /// Drawn a moment before it was set, and the row was left blank for ever. That was the + /// intermittent APictureStopsAtTheFirstLineWithoutItsCells. So a headless app queues the work + /// and runs it on the driving thread: at the next frame, or while + /// is awaited — which is also what lets a Kitty transmit, itself UI work the load waits on, finish. + /// A real run marshals onto the loop exactly as before. + /// + /// + private readonly System.Collections.Concurrent.ConcurrentQueue _headlessImageWork = new(); + + private void OnImageUi(Action action) + { + if (_headless) + { + _headlessImageWork.Enqueue(action); + return; + } + + OnUiThread(action); + } + + private void DrainHeadlessImageWork() + { + while (_headlessImageWork.TryDequeue(out var action)) + { + action(); + } + } + + private async Task SettleHeadlessImagesAsync() + { + while (true) + { + DrainHeadlessImageWork(); + var pending = _inlineImages.Pending; + if (pending.IsCompleted && _headlessImageWork.IsEmpty) + { + return; + } + + await Task.WhenAny(pending, Task.Delay(5)).ConfigureAwait(false); + } + } /// /// Waits for a snapshot scene's pictures — headless only. A Kitty picture is transmitted on the UI thread, @@ -2715,7 +2771,7 @@ private void AwaitSnapshotPictures() { if (_headless) { - _inlineImages.Pending.GetAwaiter().GetResult(); + SettleHeadlessImagesAsync().GetAwaiter().GetResult(); } } From 82ba823ba2761f8ca043ddc20d64c7f84cd2bcc3 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 04:44:09 +0000 Subject: [PATCH 014/113] Desktop window: native Layouts button, vitals gauges and map over the cells The window host draws native views in a layer above the cell view, fed through IPointerPresenter (the scrollbars' channel): a Layouts button over the header's three trailing blank cells, whose menu is built by the client from the layout library's registry commands; native vitals gauges drawn from the VitalsModel the cell strip now renders from; and a native map canvas (zoom, pan, click to walk through the client's speedwalk). The cells underneath are unchanged, so no pane rectangle moves and host parity is untouched. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 8 + CLAUDE.md | 40 ++ src/SharpMUTerm.Avalonia/CellRenderer.cs | 4 +- src/SharpMUTerm.Avalonia/DesktopLayer.cs | 298 ++++++++++++++ src/SharpMUTerm.Avalonia/MainWindow.cs | 3 + src/SharpMUTerm.Avalonia/MapCanvas.cs | 287 ++++++++++++++ src/SharpMUTerm.Avalonia/NativeMenu.cs | 58 +++ src/SharpMUTerm.Avalonia/TerminalView.cs | 79 ++-- src/SharpMUTerm.Avalonia/VitalsGauges.cs | 262 ++++++++++++ src/SharpMUTerm.Avalonia/WindowPointer.cs | 26 ++ .../Commands/BuiltInCommands.cs | 4 + .../Commands/LayoutCommands.cs | 34 ++ src/SharpMUTerm.Client/Panels/MapViewModel.cs | 94 +++++ src/SharpMUTerm.Client/Panels/VitalsModel.cs | 80 ++++ .../Panels/VitalsStripRenderer.cs | 9 + src/SharpMUTerm.Tui/Pointer/PointerTarget.cs | 64 ++- .../Pointer/SharpMUTermApp.Desktop.cs | 238 +++++++++++ src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs | 77 ++-- src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs | 26 +- src/SharpMUTerm.Tui/SharpMUTermApp.cs | 23 +- src/SharpMUTerm.Tui/StatusMeterRenderer.cs | 2 +- .../DesktopLayerTests.cs | 375 ++++++++++++++++++ .../TerminalViewTests.cs | 2 +- .../PanelModelTests.cs | 51 +++ 24 files changed, 2056 insertions(+), 88 deletions(-) create mode 100644 src/SharpMUTerm.Avalonia/DesktopLayer.cs create mode 100644 src/SharpMUTerm.Avalonia/MapCanvas.cs create mode 100644 src/SharpMUTerm.Avalonia/NativeMenu.cs create mode 100644 src/SharpMUTerm.Avalonia/VitalsGauges.cs create mode 100644 src/SharpMUTerm.Client/Commands/LayoutCommands.cs create mode 100644 src/SharpMUTerm.Client/Panels/MapViewModel.cs create mode 100644 src/SharpMUTerm.Client/Panels/VitalsModel.cs create mode 100644 src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Desktop.cs create mode 100644 tests/SharpMUTerm.Avalonia.Tests/DesktopLayerTests.cs create mode 100644 tests/SharpMUTerm.Client.Tests/PanelModelTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index e3c3266a..3542330f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,14 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- Desktop window: a Layouts button at the right end of the header opens a menu of the built-in and your saved + layouts (the one in use is checked), with *Save changes*, *Save as new*, *Use for* the world or the character, + and *Manage layouts…*. It runs the same actions as Alt+M. +- Desktop window: the vitals panel is drawn as smooth gauges, with each meter's name and numbers, the low ones + in the warning colour (*Mana · low*) and what you are fighting. A tall vitals pane stacks them; a strip lays + them side by side. +- Desktop window: the map is drawn as a canvas of rooms and exits. The wheel zooms, a drag pans, a + double-click re-centres on you, and a click on a room walks there. Hovering a room shows its name. - Ctrl+P matches as you type by initials and fragments, not only by prefix: `trig sel` finds *Make a trigger from the selection*, and the letters it matched are highlighted. The commands you last ran from it are listed first under RECENT, followed by what the moment suggests (copy while something is selected, back to diff --git a/CLAUDE.md b/CLAUDE.md index 6ddf5c59..3ea32a21 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -923,6 +923,46 @@ fallbacks) for inline images/maps. without taking them. - Screenshots of the window's cues come from a real window under Xvfb, driven with XTest; `--render-png` has no pointer and cannot show them. +- **The window draws native views over the cells, and the cells stay** (`DesktopLayer`, `HeaderButton`, + `VitalsGauges`, `MapCanvas`, `NativeMenu` in Avalonia; `SharpMUTermApp.Desktop.cs`; Client `VitalsModel`, + `MapViewModel`, `LayoutCommands`). First slice of the desktop app: a Layouts button in the header, native vitals + gauges and a native map. Decisions not to relitigate: + - **An overlay, never a cell.** The layer is a `Canvas` above `TerminalView` in the window's root panel; the + client paints every cell exactly as in a terminal underneath, so no pane rectangle moves (NAWS), the parity + test (which compares cells) does not see it, and a host that draws nothing native loses nothing. A native + view covers its pane's output rectangle and paints the pane's own plane, read off the frame's cell there, so + tint and focus show through without the client saying them twice. + - **The channel is `IPointerPresenter`**, the one the scrollbars ride, with two default-implemented members + (`Panels`, `HeaderActions`) so the terminal and the test presenters need no change. `PublishPanels` runs on + `PostBufferPaint` and publishes only on change; a panel is on screen when its window is a realised pane's + front tab. The map's model is rebuilt only when `RenderMap` has run since (`_mapRevisions`), and its walk + callback is one instance per window so an overlay compares equal frame to frame. + - **Data is a view-model both hosts draw.** `ReadVitals` builds the `VitalsModel` that `VitalsStripRenderer` + draws as cells and the gauges draw natively; `VitalsModel.LowShare` is the one low threshold + (`StatusMeterRenderer.LowShare` reads it). `MapViewModel.From` is the current room's area and level, nearest + first, at most 1,500 rooms, names bounded. + - **The window never builds a command.** The Layouts menu is `LayoutsMenuItems()`, built on the client's thread + (`HeaderAction.Menu`), each entry a registry dispatch: `layout:lib:apply:`, `…save`, `…save-new`, + `…use-world`, `…use-character` (a `CommandFamily` that lists nothing on ⌃P — ⌥M is the keyboard's list), plus + `layout:layouts` for *Manage layouts…*. Those ids run the ⌥M list's own methods, which now return a + `LayoutActionResult` the list shows as its status and a command shows as a notice. A map click is + `PanelOverlay.WalkTo` → `WalkFromMap`, the method a cell map's `mux:map:` link ends in. + - **Input, by view.** The header button is the window's alone: press, release, wheel and movement stop at it, + a right press included, and nothing reaches the client (`ThePressOnTheLayoutsButtonNeverReachesTheClient…`). + It never takes focus. It sits over the header's last three cells, which the header always leaves blank + (`right` ends in three spaces), clear of the 5 px resize band, and stands down if any of them holds text. + The vitals gauges are `IsHitTestVisible = false`: every pointer event goes to the cells, so focus, the + pane's menu and selection are the terminal's. The map takes the pointer (wheel zooms about the pointer, + drag pans from the character's room, double-click re-centres, click walks) and hands a right click on to + the client as a right click on the cell (`TerminalView.ForwardRightClick`). + - **Gauges choose their arrangement from the pane's height alone**: stacked blocks when every meter and the + target fit as name-over-bar, else side by side, where the words shrink (`Mana · low 23 / 120`, then + `mp! 23/120`, then `mp 23`) before a bar goes under 24 px. The UI font, not the cell font: this is the window's + presentation. `hp`/`mp`/`mv` read as Health/Mana/Movement (`VitalsMeter.Title`). + - **Not done**: who-here, the quick bar and the composer are still cells in the window; no animation on a + gauge change; the map draws one level and area, no exits between levels and no room colours/symbols; the + button's icon is the only header action. The window's menu is Avalonia's `ContextMenu`, which needs a second + click under a WM-less X server to take the first item (seen under Xvfb only). - **Layouts are realised as panes, one per panel that has data** (`Core/Layouts`: `LayoutFold` → `LayoutRealiser` → `WorkspaceLayout.ReplaceTree`, `LayoutCapture` for the way back; Tui `SharpMUTermApp.Layouts.cs`, diff --git a/src/SharpMUTerm.Avalonia/CellRenderer.cs b/src/SharpMUTerm.Avalonia/CellRenderer.cs index 6c332c04..04f20dff 100644 --- a/src/SharpMUTerm.Avalonia/CellRenderer.cs +++ b/src/SharpMUTerm.Avalonia/CellRenderer.cs @@ -239,14 +239,14 @@ private void DrawCaret(SKCanvas canvas, ScreenFrame frame) } } - private SKColor Background(GridCell cell) + internal SKColor Background(GridCell cell) { var colour = (cell.Decorations & TextDecoration.Invert) != 0 ? cell.Foreground : cell.Background; var fallback = (cell.Decorations & TextDecoration.Invert) != 0 ? DefaultForeground : DefaultBackground; return Resolve(colour, fallback); } - private SKColor Foreground(GridCell cell) + internal SKColor Foreground(GridCell cell) { var inverted = (cell.Decorations & TextDecoration.Invert) != 0; var colour = Resolve(inverted ? cell.Background : cell.Foreground, inverted ? DefaultBackground : DefaultForeground); diff --git a/src/SharpMUTerm.Avalonia/DesktopLayer.cs b/src/SharpMUTerm.Avalonia/DesktopLayer.cs new file mode 100644 index 00000000..c5821a3c --- /dev/null +++ b/src/SharpMUTerm.Avalonia/DesktopLayer.cs @@ -0,0 +1,298 @@ +using Avalonia; +using Avalonia.Automation; +using Avalonia.Controls; +using Avalonia.Controls.Primitives; +using Avalonia.Input; +using Avalonia.Media; +using Avalonia.Threading; +using SharpMUTerm.Core.Layouts; +using SharpMUTerm.Tui; +using SkiaSharp; + +namespace SharpMUTerm.Avalonia; + +/// +/// The window's native views, in a layer over the : header buttons, and native panels +/// drawn over the panes the client says hold them. The client's cells are painted underneath exactly as in a +/// terminal — nothing here takes a cell, moves a pane or changes what any world is told about its pane's size — +/// so this layer is the window's presentation of the same frame, and the terminal-and-window parity, which +/// compares cells, does not see it. +/// +/// Input. The layer itself has no background and so is never hit: a pointer anywhere it draws nothing goes +/// to the view, and on to the client, as before. A header button is the window's alone — its press, release, +/// movement and wheel stop at it and never reach the client, which is what lets it sit over cells the client +/// would otherwise read as a press on the header. The vitals gauges are a picture of their pane and take no input: +/// a press, a drag, a right-click or the wheel over them reaches the client as a press on the pane's cells, so +/// focus, the pane's menu and selection behave as they do in a terminal. The map is used with the pointer, so it +/// takes it (: zoom, pan, click to walk) and hands only a right click on to the client. +/// +/// +internal sealed class DesktopLayer : Canvas +{ + /// How many header cells a button covers. The header always ends in three blank cells. + internal const int ButtonCells = 3; + + private readonly TerminalView _view; + private readonly WindowPointer _pointer; + private readonly Dictionary _buttons = new(StringComparer.Ordinal); + private readonly Dictionary _gauges = new(StringComparer.Ordinal); + private readonly Dictionary _maps = new(StringComparer.Ordinal); + + public DesktopLayer(TerminalView view) + { + _view = view; + _pointer = view.Driver.Pointer; + ClipToBounds = true; + _pointer.ActionsChanged += () => Dispatcher.UIThread.Post(Sync); + _pointer.PanelsChanged += () => Dispatcher.UIThread.Post(Sync); + _view.Repainted += Sync; + Sync(); + } + + protected override void OnSizeChanged(SizeChangedEventArgs e) + { + base.OnSizeChanged(e); + Sync(); + } + + /// The header button for an action, or null. Internal for tests. + internal HeaderButton? Button(string actionId) => _buttons.GetValueOrDefault(actionId); + + /// The native vitals gauges by window id. Internal for tests. + internal IReadOnlyDictionary Gauges => _gauges; + + /// The native maps by window id. Internal for tests. + internal IReadOnlyDictionary Maps => _maps; + + /// The last header menu opened. Internal for tests. + internal ContextMenu? OpenedMenu { get; private set; } + + /// Puts every native view where the client's last word and the last frame say it goes. + internal void Sync() + { + var frame = _view.Driver.Frame; + var cell = _view.CellExtent; + SyncButtons(frame, cell); + SyncPanels(frame, cell); + } + + private void SyncButtons(ScreenFrame frame, Size cell) + { + var actions = _pointer.Actions; + foreach (var stale in _buttons.Keys.Where(id => actions.All(a => a.Id != id)).ToList()) + { + Children.Remove(_buttons[stale]); + _buttons.Remove(stale); + } + + for (var i = 0; i < actions.Count; i++) + { + var action = actions[i]; + if (!_buttons.TryGetValue(action.Id, out var button)) + { + button = new HeaderButton(action.Id); + button.Click += () => OpenMenu(action, button); + AutomationProperties.SetName(button, action.Label); + ToolTip.SetTip(button, action.Hint is { } hint ? $"{action.Label} ({hint})" : action.Label); + _buttons[action.Id] = button; + Children.Add(button); + } + + // Right to left from the header's end, one slot of blank cells each. Shown only while every cell of + // its slot is blank, so a button never covers a word of the header. + var first = frame.Width - (ButtonCells * (i + 1)); + var blank = first >= 0 && frame.Height > 0 + && Enumerable.Range(first, ButtonCells).All(x => WindowChrome.IsMoveHandle(frame, new System.Drawing.Point(x, 0))); + button.IsVisible = blank; + if (!blank) + { + continue; + } + + // Clear of the window's resize band at the right edge, which a press there is for, and a little over + // half a cell clear of whatever the header says before its blank cells, so it never touches a word. + var gridRight = (first + ButtonCells) * cell.Width; + var right = (Bounds.Width > 0 ? Math.Min(gridRight, Bounds.Width) : gridRight) - WindowChrome.EdgeBand - 1; + var size = Math.Max(8, Math.Min(cell.Height + 2, right - ((first + 0.6) * cell.Width))); + button.Width = size; + button.Height = Math.Max(4, cell.Height - 2); + SetLeft(button, right - size); + SetTop(button, 1); + var behind = _view.Renderer.Background(frame[frame.Width - 1, 0]); + button.Ink = Colour(_view.Renderer.DefaultForeground); + button.Plane = Colour(behind); + } + } + + private void SyncPanels(ScreenFrame frame, Size cell) + { + var text = Colour(_view.Renderer.DefaultForeground); + Place( + _gauges, + _pointer.Panels.Where(p => p.PanelId == PanelIds.Vitals && p.Vitals is { IsEmpty: false }), + () => new VitalsGauges(), + frame, + cell, + (gauges, panel, plane) => gauges.Show(panel.Vitals!, panel.Ink, plane, text, cell.Height)); + Place( + _maps, + _pointer.Panels.Where(p => p.PanelId == PanelIds.Map && p.Map is not null), + () => new MapCanvas(_view), + frame, + cell, + (map, panel, plane) => map.Show(panel.Map!, panel.Ink, plane, text, panel.WalkTo)); + } + + /// + /// One native control per panel window, over that pane's output rectangle; a control whose panel left the + /// screen goes with it. + /// + private void Place( + Dictionary controls, + IEnumerable panels, + Func create, + ScreenFrame frame, + Size cell, + Action show) + where T : Control + { + var wanted = panels.ToList(); + foreach (var stale in controls.Keys.Where(id => wanted.All(p => p.WindowId != id)).ToList()) + { + Children.Remove(controls[stale]); + controls.Remove(stale); + } + + foreach (var panel in wanted) + { + if (!controls.TryGetValue(panel.WindowId, out var control)) + { + control = create(); + controls[panel.WindowId] = control; + + // Under the header buttons, so a button is never covered by a panel. + Children.Insert(0, control); + } + + var rect = panel.Rect; + SetLeft(control, rect.X * cell.Width); + SetTop(control, rect.Y * cell.Height); + control.Width = rect.Width * cell.Width; + control.Height = rect.Height * cell.Height; + + // The pane's own plane, read off the frame, so the native view sits on whatever the pane wears — its + // character's tint, the focus lift — without the client having to say it twice. + var inside = rect.X >= 0 && rect.Y >= 0 && rect.X < frame.Width && rect.Y < frame.Height; + var plane = inside ? _view.Renderer.Background(frame[rect.X, rect.Y]) : _view.Renderer.DefaultBackground; + show(control, panel, Colour(plane)); + } + } + + /// The client builds the menu on its thread; it is opened here, under the button. + private void OpenMenu(HeaderAction action, HeaderButton button) => + action.Menu(items => Dispatcher.UIThread.Post(() => + { + if (items.Count == 0) + { + return; + } + + var menu = NativeMenu.Build(items, PlacementMode.BottomEdgeAlignedRight, button); + menu.Closed += (_, _) => _view.Focus(); + OpenedMenu = menu; + menu.Open(button); + })); + + internal static Color Colour(SKColor colour) => Color.FromRgb(colour.Red, colour.Green, colour.Blue); +} + +/// +/// A small icon-only button drawn by the window over blank header cells. Drawn rather than templated, so it looks +/// the same under any Avalonia theme and its hover plate is the header's own colour lifted, not a theme's grey. +/// It never takes keyboard focus: typing stays with the client. +/// +internal sealed class HeaderButton : Control +{ + private bool _pressed; + + public HeaderButton(string actionId) + { + ActionId = actionId; + Focusable = false; + Cursor = new Cursor(StandardCursorType.Hand); + } + + public string ActionId { get; } + + public Color Ink { get; set; } = Colors.White; + + public Color Plane { get; set; } = Colors.Black; + + /// Raised on a left click. + public event Action? Click; + + protected override void OnPointerEntered(PointerEventArgs e) + { + base.OnPointerEntered(e); + InvalidateVisual(); + } + + protected override void OnPointerExited(PointerEventArgs e) + { + base.OnPointerExited(e); + InvalidateVisual(); + } + + // Every pointer event over the button is the window's: handled here, so nothing routes on to the client. + protected override void OnPointerPressed(PointerPressedEventArgs e) + { + base.OnPointerPressed(e); + _pressed = e.GetCurrentPoint(this).Properties.IsLeftButtonPressed; + e.Handled = true; + InvalidateVisual(); + } + + protected override void OnPointerReleased(PointerReleasedEventArgs e) + { + base.OnPointerReleased(e); + e.Handled = true; + var click = _pressed && e.InitialPressMouseButton == MouseButton.Left && new Rect(Bounds.Size).Contains(e.GetPosition(this)); + _pressed = false; + InvalidateVisual(); + if (click) + { + Click?.Invoke(); + } + } + + protected override void OnPointerWheelChanged(PointerWheelEventArgs e) + { + base.OnPointerWheelChanged(e); + e.Handled = true; + } + + /// Clicks the button as a left press and release would. Internal for tests. + internal void PerformClick() => Click?.Invoke(); + + public override void Render(DrawingContext context) + { + var bounds = new Rect(Bounds.Size); + + // A plate that says "this is a control" at rest, a stronger one under the pointer and while pressed. + var plate = (byte)(_pressed ? 0x55 : IsPointerOver ? 0x38 : 0x16); + context.DrawRectangle(new SolidColorBrush(Color.FromArgb(plate, Ink.R, Ink.G, Ink.B)), null, bounds, 4, 4); + + // The layouts glyph: a frame split into a wide pane and a column of two, the shape of a layout. + var pen = new Pen(new SolidColorBrush(Color.FromArgb(0xE0, Ink.R, Ink.G, Ink.B)), 1.25); + var w = Math.Min(bounds.Width - 6, 14); + var h = Math.Min(bounds.Height - 6, 11); + var x = Math.Round((bounds.Width - w) / 2) + 0.5; + var y = Math.Round((bounds.Height - h) / 2) + 0.5; + var icon = new Rect(x, y, w, h); + context.DrawRectangle(null, pen, icon, 1.5, 1.5); + var split = Math.Round(x + (w * 0.58)) + 0.5; + context.DrawLine(pen, new Point(split, y), new Point(split, y + h)); + var middle = Math.Round(y + (h / 2)) + 0.5; + context.DrawLine(pen, new Point(split, middle), new Point(x + w, middle)); + } +} diff --git a/src/SharpMUTerm.Avalonia/MainWindow.cs b/src/SharpMUTerm.Avalonia/MainWindow.cs index 72326822..c0af46a8 100644 --- a/src/SharpMUTerm.Avalonia/MainWindow.cs +++ b/src/SharpMUTerm.Avalonia/MainWindow.cs @@ -61,6 +61,9 @@ public MainWindow(WindowOptions options, IClassicDesktopStyleApplicationLifetime } root.Children.Add(_view); + + // The window's native views over the cells: the header's Layouts button and native panels (DesktopLayer). + root.Children.Add(new DesktopLayer(_view)); Content = root; AutomationProperties.SetName(_view, "SharpMUTerm"); var size = _view.SizeFor(options.Columns, options.Rows); diff --git a/src/SharpMUTerm.Avalonia/MapCanvas.cs b/src/SharpMUTerm.Avalonia/MapCanvas.cs new file mode 100644 index 00000000..3e718b04 --- /dev/null +++ b/src/SharpMUTerm.Avalonia/MapCanvas.cs @@ -0,0 +1,287 @@ +using System.Globalization; +using Avalonia; +using Avalonia.Controls; +using Avalonia.Input; +using Avalonia.Media; +using SharpMUTerm.Client.Panels; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Avalonia; + +/// +/// The map as a native canvas, over the pane whose cells draw the same recorder: rooms as rounded squares joined by +/// their exits, the current room in the accent, the rooms a walk still goes through outlined in the draft colour. +/// +/// It takes the pointer, unlike the vitals gauges, because a map is used with it: the wheel zooms about the +/// pointer, a drag pans, and a click on a room walks there — through , which is the +/// client's speedwalk for the map's own character, the path a click on a cell map takes. The window never builds a +/// command. A right click is handed on to the client as a right click on the cell under it +/// (), so the pane's menu is the same here as over cells. The view is +/// centred on the character and follows them; a pan is an offset from there, and a double-click puts it back. +/// +/// +internal sealed class MapCanvas : Control +{ + /// Pixels between room centres at zoom 1. + internal const double Spacing = 34; + + private const double MinZoom = 0.35, MaxZoom = 3, DragThreshold = 4; + + private readonly TerminalView _view; + private MapViewModel _model = new(null, 0, [], [], null); + private PanelInk _ink = new("#5fafff", "#ffaf5f", "#6a6a72"); + private Color _plane = Colors.Black; + private Color _text = Colors.White; + private Action? _walkTo; + private Vector _pan; + private Point? _pressAt; + private Vector _panAtPress; + private bool _dragging; + private long? _hovered; + + public MapCanvas(TerminalView view) + { + _view = view; + ClipToBounds = true; + Focusable = false; + Cursor = new Cursor(StandardCursorType.Arrow); + } + + /// The zoom, 1 at pixels between rooms. Internal for tests. + internal double Zoom { get; private set; } = 1; + + /// The pan from the character's room, in pixels. Internal for tests. + internal Vector Pan => _pan; + + /// What it is showing. Internal for tests. + internal MapViewModel Model => _model; + + public void Show(MapViewModel model, PanelInk ink, Color plane, Color text, Action? walkTo) + { + _walkTo = walkTo; + if (model.Equals(_model) && ink == _ink && plane == _plane && text == _text) + { + return; + } + + _model = model; + _ink = ink; + _plane = plane; + _text = text; + InvalidateVisual(); + } + + /// Where a room's centre is drawn, in this control's coordinates. + internal Point CentreOf(MapViewRoom room) + { + var anchor = _model.Current ?? _model.Rooms.FirstOrDefault(); + var step = Spacing * Zoom; + var middle = new Point(Bounds.Width / 2, Bounds.Height / 2) + _pan; + return anchor is null + ? middle + : new Point(middle.X + ((room.X - anchor.X) * step), middle.Y + ((room.Y - anchor.Y) * step)); + } + + private double RoomSize => Math.Max(5, Spacing * Zoom * 0.56); + + /// The room under a point, or null. + internal MapViewRoom? RoomAt(Point point) + { + var half = (RoomSize / 2) + 2; + return _model.Rooms.FirstOrDefault(r => + { + var c = CentreOf(r); + return Math.Abs(point.X - c.X) <= half && Math.Abs(point.Y - c.Y) <= half; + }); + } + + // ── Input: the canvas's own, never routed on to the cells (bar the right click) ────────────── + + protected override void OnPointerPressed(PointerPressedEventArgs e) + { + base.OnPointerPressed(e); + var point = e.GetCurrentPoint(this); + e.Handled = true; + if (point.Properties.IsRightButtonPressed) + { + _view.ForwardRightClick(e.GetPosition(_view), e.KeyModifiers); + return; + } + + if (!point.Properties.IsLeftButtonPressed) + { + return; + } + + if (e.ClickCount == 2) + { + _pan = default; + InvalidateVisual(); + return; + } + + _pressAt = point.Position; + _panAtPress = _pan; + _dragging = false; + e.Pointer.Capture(this); + } + + protected override void OnPointerMoved(PointerEventArgs e) + { + base.OnPointerMoved(e); + e.Handled = true; + var position = e.GetPosition(this); + if (_pressAt is { } from) + { + var moved = position - from; + if (_dragging || Math.Abs(moved.X) + Math.Abs(moved.Y) > DragThreshold) + { + _dragging = true; + _pan = _panAtPress + moved; + Cursor = new Cursor(StandardCursorType.SizeAll); + InvalidateVisual(); + } + + return; + } + + var room = RoomAt(position); + if (room?.Id != _hovered) + { + _hovered = room?.Id; + Cursor = new Cursor(room is null ? StandardCursorType.Arrow : StandardCursorType.Hand); + ToolTip.SetTip(this, room is null ? null : room.Current ? $"{room.Name} — you are here" : $"{room.Name} — click to walk here"); + InvalidateVisual(); + } + } + + protected override void OnPointerReleased(PointerReleasedEventArgs e) + { + base.OnPointerReleased(e); + e.Handled = true; + if (_pressAt is null) + { + return; + } + + var wasDrag = _dragging; + _pressAt = null; + _dragging = false; + e.Pointer.Capture(null); + Cursor = new Cursor(StandardCursorType.Arrow); + if (!wasDrag && e.InitialPressMouseButton == MouseButton.Left && RoomAt(e.GetPosition(this)) is { Current: false } room) + { + _walkTo?.Invoke(room.Id); + } + } + + protected override void OnPointerWheelChanged(PointerWheelEventArgs e) + { + base.OnPointerWheelChanged(e); + e.Handled = true; + ZoomAbout(e.GetPosition(this), e.Delta.Y); + } + + /// Zooms by about , keeping what is under it there. + internal void ZoomAbout(Point point, double notches) + { + var next = Math.Clamp(Zoom * Math.Pow(1.18, notches), MinZoom, MaxZoom); + if (Math.Abs(next - Zoom) < 1e-9) + { + return; + } + + // The centre is middle + pan; a point at offset d from it moves to d·ratio, so the pan takes up the difference. + var middle = new Point(Bounds.Width / 2, Bounds.Height / 2); + var ratio = next / Zoom; + var fromCentre = point - (middle + _pan); + _pan = point - middle - (fromCentre * ratio); + Zoom = next; + InvalidateVisual(); + } + + // ── Drawing ─────────────────────────────────────────────────────────────────────────────── + + public override void Render(DrawingContext context) + { + var bounds = new Rect(Bounds.Size); + context.FillRectangle(new SolidColorBrush(_plane), bounds); + if (_model.Rooms.Count == 0) + { + DrawText(context, "No rooms mapped yet — walk somewhere.", new Point(12, 10), 12, Faded(0.7)); + return; + } + + var byId = _model.Rooms.ToDictionary(r => r.Id); + var exitPen = new Pen(new SolidColorBrush(Faded(0.42)), Math.Clamp(1.6 * Zoom, 1, 2.5), lineCap: PenLineCap.Round); + foreach (var exit in _model.Exits) + { + if (byId.TryGetValue(exit.From, out var a) && byId.TryGetValue(exit.To, out var b)) + { + context.DrawLine(exitPen, CentreOf(a), CentreOf(b)); + } + } + + var size = RoomSize; + var accent = Parse(_ink.Bar); + var path = Parse(_ink.Low); + var plainFill = new SolidColorBrush(Mix(_plane, _text, 0.16)); + var plainEdge = new Pen(new SolidColorBrush(Faded(0.55)), 1.2); + var radius = size * 0.22; + foreach (var room in _model.Rooms) + { + var c = CentreOf(room); + var rect = new Rect(c.X - (size / 2), c.Y - (size / 2), size, size); + if (!rect.Intersects(bounds)) + { + continue; + } + + if (room.Current) + { + // A soft halo, then the room in the accent: the one thing the eye should find first. + context.DrawRectangle(new SolidColorBrush(Color.FromArgb(0x40, accent.R, accent.G, accent.B)), null, rect.Inflate(size * 0.22), radius * 1.6, radius * 1.6); + context.DrawRectangle(new SolidColorBrush(accent), new Pen(new SolidColorBrush(Mix(accent, Colors.White, 0.35)), 1.5), rect, radius, radius); + continue; + } + + var fill = room.Id == _hovered ? new SolidColorBrush(Mix(_plane, _text, 0.3)) : plainFill; + var edge = room.Ahead ? new Pen(new SolidColorBrush(path), 2) : plainEdge; + context.DrawRectangle(fill, edge, rect, radius, radius); + if (room.Locked) + { + var lockPen = new Pen(new SolidColorBrush(Faded(0.6)), 1.2); + context.DrawLine(lockPen, rect.TopLeft + new Vector(size * 0.25, size * 0.25), rect.BottomRight - new Vector(size * 0.25, size * 0.25)); + } + } + + // What and where, in the corner: the area and level, and a walk under way. + var label = _model.Area is { Length: > 0 } area ? $"{area} · level {_model.Level}" : $"level {_model.Level}"; + DrawText(context, label, new Point(10, 8), 12, Faded(0.75)); + if (_model.Walking is { } walking) + { + DrawText(context, walking, new Point(10, 26), 12, path); + } + else if (_model.Current is { } here) + { + DrawText(context, here.Name, new Point(10, 26), 12, accent); + } + } + + private static void DrawText(DrawingContext context, string text, Point at, double size, Color colour) => + context.DrawText( + new FormattedText(text, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, Typeface.Default, size, new SolidColorBrush(colour)) + { + MaxLineCount = 1, + }, + at); + + private Color Faded(double opacity) => Color.FromArgb((byte)(opacity * 255), _text.R, _text.G, _text.B); + + private static Color Parse(string hex) => Color.TryParse(hex, out var colour) ? colour : Colors.Gray; + + private static Color Mix(Color from, Color to, double amount) => Color.FromRgb( + (byte)(from.R + ((to.R - from.R) * amount)), + (byte)(from.G + ((to.G - from.G) * amount)), + (byte)(from.B + ((to.B - from.B) * amount))); +} diff --git a/src/SharpMUTerm.Avalonia/NativeMenu.cs b/src/SharpMUTerm.Avalonia/NativeMenu.cs new file mode 100644 index 00000000..63aa6a4a --- /dev/null +++ b/src/SharpMUTerm.Avalonia/NativeMenu.cs @@ -0,0 +1,58 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Controls.Primitives; +using Avalonia.Layout; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Avalonia; + +/// +/// A menu the client built (s), as a native : the right-click +/// menu and the header buttons' menus are drawn by this one function, so they look and behave alike. Each entry's +/// is already marshalled onto the client's thread. +/// +internal static class NativeMenu +{ + public static ContextMenu Build(IReadOnlyList items, PlacementMode placement, Control target) + { + var menu = new ContextMenu { Placement = placement, PlacementTarget = target }; + Grid.SetIsSharedSizeScope(menu, true); + foreach (var item in items) + { + if (item.IsSeparator) + { + menu.Items.Add(new Separator()); + continue; + } + + var entry = new MenuItem { Header = Header(item), IsEnabled = item.Enabled }; + if (item.Checked) + { + entry.ToggleType = MenuItemToggleType.CheckBox; + entry.IsChecked = true; + } + + entry.Click += (_, _) => item.Run(); + menu.Items.Add(entry); + } + + return menu; + } + + /// An entry's label with its key after it, the keys lined up in a column of their own. + private static Control Header(PointerMenuItem item) + { + var grid = new Grid(); + grid.ColumnDefinitions.Add(new ColumnDefinition(GridLength.Auto) { SharedSizeGroup = "label" }); + grid.ColumnDefinitions.Add(new ColumnDefinition(GridLength.Auto) { SharedSizeGroup = "hint" }); + grid.Children.Add(new TextBlock { Text = item.Label, VerticalAlignment = VerticalAlignment.Center }); + if (item.Hint is { } hint) + { + var key = new TextBlock { Text = hint, Opacity = 0.6, Margin = new Thickness(28, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center }; + Grid.SetColumn(key, 1); + grid.Children.Add(key); + } + + return grid; + } +} diff --git a/src/SharpMUTerm.Avalonia/TerminalView.cs b/src/SharpMUTerm.Avalonia/TerminalView.cs index 7a8a79c8..b005384a 100644 --- a/src/SharpMUTerm.Avalonia/TerminalView.cs +++ b/src/SharpMUTerm.Avalonia/TerminalView.cs @@ -93,6 +93,21 @@ public TerminalView(AvaloniaConsoleDriver driver, SKColor foreground, SKColor ba pointer.MenuRequested += (_, items) => Dispatcher.UIThread.Post(() => OpenMenu(items)); } + /// The cell size in logical units, for placing a native view over cells (). + internal Size CellExtent => CellSize; + + /// What draws the cells, for a native view that matches their colours. + internal CellRenderer Renderer => _renderer; + + /// The driver this view paints. + internal AvaloniaConsoleDriver Driver => _driver; + + /// + /// Raised on the window's thread after a new frame is taken for painting, and when the cell size or the view's + /// size changes: when anything placed over cells may need to move. + /// + internal event Action? Repainted; + /// The cell size in logical units, for mapping a pointer position to a cell. private Size CellSize => new(_renderer.Fonts.CellWidth / _scale, _renderer.Fonts.CellHeight / _scale); @@ -117,6 +132,7 @@ protected override void OnSizeChanged(SizeChangedEventArgs e) base.OnSizeChanged(e); var (columns, rows) = GridFor(e.NewSize); _driver.Resize(columns, rows); + Repainted?.Invoke(); } public override void Render(DrawingContext context) @@ -152,6 +168,7 @@ private void Rescale(double scale) new CellFonts((float)(_fontPoints * scale), _family), _renderer.DefaultForeground, _renderer.DefaultBackground); + Repainted?.Invoke(); } private void OnFrameReady() @@ -163,6 +180,7 @@ private void OnFrameReady() { Volatile.Write(ref _invalidatePending, 0); InvalidateVisual(); + Repainted?.Invoke(); }, DispatcherPriority.Render); } } @@ -258,14 +276,7 @@ protected override void OnPointerPressed(PointerPressedEventArgs e) var modifiers = Modifiers(e.KeyModifiers); if (button == PointerButton.Right) { - // The client answers a right press with a menu, which takes the pointer, so this view never sees the - // release: the click is sent whole, and nothing is left held to repeat or to turn into a drag. - _driver.RaiseMouse(_mouse.Pressed(button, cell, 1, modifiers), cell); - if (_mouse.Released(button, cell, modifiers) is { } released) - { - _driver.RaiseMouse(released, cell); - } - + SendRightClick(cell, modifiers); e.Handled = true; return; } @@ -276,6 +287,25 @@ protected override void OnPointerPressed(PointerPressedEventArgs e) e.Handled = true; } + /// + /// A right click on a cell, sent whole. The client answers a right press with a menu, which takes the pointer, so + /// the release would never arrive: nothing is left held to repeat or to turn into a drag. + /// + private void SendRightClick(System.Drawing.Point cell, PointerModifiers modifiers) + { + _driver.RaiseMouse(_mouse.Pressed(PointerButton.Right, cell, 1, modifiers), cell); + if (_mouse.Released(PointerButton.Right, cell, modifiers) is { } released) + { + _driver.RaiseMouse(released, cell); + } + } + + /// + /// A right click a native view over the cells took and hands on (), so the pane's menu is + /// the same over a native view as over its cells. is in this view's coordinates. + /// + internal void ForwardRightClick(Point position, KeyModifiers keys) => SendRightClick(Cell(position), Modifiers(keys)); + protected override void OnPointerMoved(PointerEventArgs e) { base.OnPointerMoved(e); @@ -475,43 +505,12 @@ private void CloseTip() private void OpenMenu(IReadOnlyList items) { CloseTip(); - var menu = new ContextMenu { Placement = PlacementMode.Pointer, PlacementTarget = this }; - Grid.SetIsSharedSizeScope(menu, true); - foreach (var item in items) - { - if (item.IsSeparator) - { - menu.Items.Add(new Separator()); - continue; - } - - var entry = new MenuItem { Header = MenuHeader(item), IsEnabled = item.Enabled }; - entry.Click += (_, _) => item.Run(); - menu.Items.Add(entry); - } - + var menu = NativeMenu.Build(items, PlacementMode.Pointer, this); menu.Closed += (_, _) => Focus(); OpenedMenu = menu; menu.Open(this); } - /// A menu entry's label with its key after it, the keys lined up in a column of their own. - private static Control MenuHeader(PointerMenuItem item) - { - var grid = new Grid(); - grid.ColumnDefinitions.Add(new ColumnDefinition(GridLength.Auto) { SharedSizeGroup = "label" }); - grid.ColumnDefinitions.Add(new ColumnDefinition(GridLength.Auto) { SharedSizeGroup = "hint" }); - grid.Children.Add(new TextBlock { Text = item.Label, VerticalAlignment = VerticalAlignment.Center }); - if (item.Hint is { } hint) - { - var key = new TextBlock { Text = hint, Opacity = 0.6, Margin = new Thickness(28, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center }; - Grid.SetColumn(key, 1); - grid.Children.Add(key); - } - - return grid; - } - // ── Scrollbars ────────────────────────────────────────────────────────────────────────────── /// diff --git a/src/SharpMUTerm.Avalonia/VitalsGauges.cs b/src/SharpMUTerm.Avalonia/VitalsGauges.cs new file mode 100644 index 00000000..5563ec14 --- /dev/null +++ b/src/SharpMUTerm.Avalonia/VitalsGauges.cs @@ -0,0 +1,262 @@ +using System.Globalization; +using Avalonia; +using Avalonia.Controls; +using Avalonia.Media; +using SharpMUTerm.Client.Panels; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Avalonia; + +/// +/// The vitals panel as native gauges, over the pane whose cells draw the same as a strip: +/// a smooth bar per meter with its name and numbers, Mana · low in the warning colour, and what the +/// character is fighting. Drawn in the window's UI font, not the cell font — this is the window's presentation. +/// +/// Two arrangements, chosen from the pane's height alone, so a number arriving never re-arranges it: a pane +/// tall enough for every meter as a block of its own (name and numbers over the bar — the combat layout's side +/// column) stacks them; anything shorter (the strip a layout puts over the output) lays them side by side, each a +/// name, a bar and its numbers. +/// +/// It takes no input (see ): the pane under it is the client's. +/// +internal sealed class VitalsGauges : Control +{ + private VitalsModel _model = VitalsModel.Empty; + private PanelInk _ink = new("#5fafff", "#ff5f5f", "#3a3a40"); + private Color _plane = Colors.Black; + private Color _text = Colors.White; + private double _cellHeight = 16; + + public VitalsGauges() + { + IsHitTestVisible = false; + ClipToBounds = true; + } + + /// What it is showing. Internal for tests. + internal VitalsModel Model => _model; + + /// Whether the meters are stacked (true) or side by side. Internal for tests. + internal bool Stacked => StackedFor(Bounds.Height > 0 ? Bounds.Height : Height, _model); + + /// The bars drawn on the last render, in order: each bar's track and filled part. Internal for tests. + internal IReadOnlyList<(Rect Track, Rect Fill, bool Low)> DrawnBars => _drawn; + + private readonly List<(Rect Track, Rect Fill, bool Low)> _drawn = []; + + public void Show(VitalsModel model, PanelInk ink, Color plane, Color text, double cellHeight) + { + if (model.Equals(_model) && ink == _ink && plane == _plane && text == _text && Math.Abs(cellHeight - _cellHeight) < 0.01) + { + return; + } + + _model = model; + _ink = ink; + _plane = plane; + _text = text; + _cellHeight = cellHeight; + InvalidateVisual(); + } + + /// Height one stacked block takes: a line of text and a bar under it. + private static double BlockHeight(double cellHeight) => Math.Max(30, cellHeight * 2.1); + + private bool StackedFor(double height, VitalsModel model) + { + var blocks = model.Meters.Count + (model.Target is null ? 0 : 1); + return blocks > 0 && height >= (blocks * BlockHeight(_cellHeight)) + 8; + } + + public override void Render(DrawingContext context) + { + var bounds = new Rect(Bounds.Size); + _drawn.Clear(); + + // The plane covers the cells under it: the strip is drawn by this, not beside it. + context.FillRectangle(new SolidColorBrush(_plane), bounds); + if (bounds.Width < 8 || bounds.Height < 4 || _model.IsEmpty) + { + return; + } + + if (StackedFor(bounds.Height, _model)) + { + RenderStacked(context, bounds); + } + else + { + RenderRow(context, bounds); + } + } + + private void RenderStacked(DrawingContext context, Rect bounds) + { + var block = BlockHeight(_cellHeight); + var size = Math.Clamp(_cellHeight * 0.68, 10, 15); + var barHeight = Math.Clamp(_cellHeight * 0.45, 6, 10); + var inner = bounds.Deflate(new Thickness(12, 8)); + var y = inner.Top; + foreach (var meter in _model.Meters) + { + var low = meter.Low; + var title = low ? $"{meter.Title} · low" : meter.Title; + DrawText(context, title, new Point(inner.Left, y), size, low ? Parse(_ink.Low) : Dim(), bold: low, alignRight: false, inner.Width); + DrawText(context, Numbers(meter), new Point(inner.Right, y), size, _text, bold: true, alignRight: true, inner.Width); + var bar = new Rect(inner.Left, y + (size * 1.45), inner.Width, barHeight); + DrawBar(context, bar, meter.HasMax ? meter.Share ?? 0 : 1, low); + y += block; + } + + if (_model.Target is { } target) + { + DrawText(context, $"Target · {target.Name}", new Point(inner.Left, y), size, Dim(), bold: false, alignRight: false, inner.Width * 0.75); + if (target.Share is { } share) + { + DrawText(context, Percent(share), new Point(inner.Right, y), size, _text, bold: true, alignRight: true, inner.Width); + DrawBar(context, new Rect(inner.Left, y + (size * 1.45), inner.Width, barHeight), share, target.Low); + } + } + } + + /// The narrowest a side-by-side bar is drawn; below it the words get shorter first. + private const double MinimumBar = 24; + + private void RenderRow(DrawingContext context, Rect bounds) + { + var size = Math.Clamp(_cellHeight * 0.62, 9, 14); + var barHeight = Math.Clamp(bounds.Height * 0.32, 4, 9); + var inner = bounds.Deflate(new Thickness(10, 0)); + var gap = 18.0; + var shares = _model.Meters.Count + (_model.Target is null ? 0 : 1.4); + var unit = (inner.Width - (gap * Math.Max(0, Math.Ceiling(shares) - 1))) / shares; + var middle = bounds.Height / 2; + var top = middle - (size * 0.65); + + // The words shrink before the bars do, one step for every meter at once so the row reads as one: + // "Mana · low 23 / 120", then "mp! 23/120", then "mp 23". + static (string Title, string Numbers) Words(VitalsMeter m, int step) => step switch + { + 0 => (m.Low ? $"{m.Title} · low" : m.Title, Numbers(m)), + 1 => (m.Low ? $"{m.Label}!" : m.Label, m.HasMax ? $"{m.Value}/{m.Max ?? "?"}" : m.Value), + _ => (m.Label, m.Value), + }; + + var step = 0; + while (step < 2 && _model.Meters.Any(m => + { + var (t, n) = Words(m, step); + return unit - Measure(t, size, m.Low) - Measure(n, size, true) - 16 < MinimumBar; + })) + { + step++; + } + + var x = inner.Left; + foreach (var meter in _model.Meters) + { + var low = meter.Low; + var (title, numbers) = Words(meter, step); + var titleWidth = DrawText(context, title, new Point(x, top), size, low ? Parse(_ink.Low) : Dim(), bold: low, alignRight: false, unit * 0.45); + var numbersWidth = DrawText(context, numbers, new Point(x + unit, top), size, _text, bold: true, alignRight: true, unit * 0.45); + var barLeft = x + titleWidth + 8; + var barRight = x + unit - numbersWidth - 8; + if (barRight - barLeft >= 8) + { + DrawBar(context, new Rect(barLeft, middle - (barHeight / 2), barRight - barLeft, barHeight), meter.HasMax ? meter.Share ?? 0 : 1, low); + } + + x += unit + gap; + } + + if (_model.Target is { } target) + { + var width = inner.Right - x; + var pct = target.Share is { } s ? Percent(s) : null; + var pctWidth = pct is null ? 0 : Measure(pct, size, true); + var room = pct is null ? width : width - pctWidth - 16 - MinimumBar; + var nameWidth = DrawText(context, step == 0 ? $"Target · {target.Name}" : target.Name, new Point(x, top), size, Dim(), bold: false, alignRight: false, Math.Max(8, room)); + if (pct is not null) + { + DrawText(context, pct, new Point(inner.Right, top), size, _text, bold: true, alignRight: true, width); + var barLeft = x + nameWidth + 8; + var barRight = inner.Right - pctWidth - 8; + if (barRight - barLeft >= 8) + { + DrawBar(context, new Rect(barLeft, middle - (barHeight / 2), barRight - barLeft, barHeight), target.Share!.Value, target.Low); + } + } + } + } + + private static double Measure(string text, double size, bool bold) => Format(text, size, Colors.White, bold, double.PositiveInfinity).Width; + + private static FormattedText Format(string text, double size, Color colour, bool bold, double maxWidth) + { + var formatted = new FormattedText( + text, + CultureInfo.InvariantCulture, + FlowDirection.LeftToRight, + new Typeface(FontFamily.Default, FontStyle.Normal, bold ? FontWeight.SemiBold : FontWeight.Normal), + size, + new SolidColorBrush(colour)) + { + MaxLineCount = 1, + Trimming = TextTrimming.CharacterEllipsis, + }; + if (!double.IsInfinity(maxWidth)) + { + formatted.MaxTextWidth = Math.Max(1, maxWidth); + } + + return formatted; + } + + private void DrawBar(DrawingContext context, Rect track, double share, bool low) + { + var radius = track.Height / 2; + context.DrawRectangle(new SolidColorBrush(Parse(_ink.Track)), null, track, radius, radius); + var fill = new Rect(track.X, track.Y, track.Width * Math.Clamp(share, 0, 1), track.Height); + if (fill.Width > 0.5) + { + var colour = Parse(low ? _ink.Low : _ink.Bar); + var brush = new LinearGradientBrush + { + StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative), + EndPoint = new RelativePoint(0, 1, RelativeUnit.Relative), + GradientStops = + { + new GradientStop(Lighten(colour, 0.18), 0), + new GradientStop(colour, 1), + }, + }; + context.DrawRectangle(brush, null, fill, radius, radius); + } + + _drawn.Add((track, fill, low)); + } + + /// Draws text at (its right edge there when right-aligned) and returns its width. + private static double DrawText(DrawingContext context, string text, Point at, double size, Color colour, bool bold, bool alignRight, double maxWidth) + { + var formatted = Format(text, size, colour, bold, maxWidth); + var width = Math.Min(formatted.Width, Math.Max(1, maxWidth)); + context.DrawText(formatted, alignRight ? new Point(at.X - width, at.Y) : at); + return width; + } + + private static string Numbers(VitalsMeter meter) => + meter.HasMax ? $"{meter.Value} / {meter.Max ?? "?"}" : meter.Value; + + private static string Percent(double share) => + $"{Math.Clamp((int)Math.Round(share * 100), 0, 999).ToString(CultureInfo.InvariantCulture)}%"; + + private Color Dim() => Color.FromArgb(0xB0, _text.R, _text.G, _text.B); + + private static Color Parse(string hex) => Color.TryParse(hex, out var colour) ? colour : Colors.Gray; + + private static Color Lighten(Color colour, double amount) => Color.FromRgb( + (byte)(colour.R + ((255 - colour.R) * amount)), + (byte)(colour.G + ((255 - colour.G) * amount)), + (byte)(colour.B + ((255 - colour.B) * amount))); +} diff --git a/src/SharpMUTerm.Avalonia/WindowPointer.cs b/src/SharpMUTerm.Avalonia/WindowPointer.cs index 590c910a..3b4d5329 100644 --- a/src/SharpMUTerm.Avalonia/WindowPointer.cs +++ b/src/SharpMUTerm.Avalonia/WindowPointer.cs @@ -11,6 +11,8 @@ internal sealed class WindowPointer : IPointerPresenter { private PointerTarget _target = PointerTarget.Nothing; private IReadOnlyList _bars = []; + private IReadOnlyList _panels = []; + private IReadOnlyList _actions = []; /// What the pointer is over, as of the client's last word. public PointerTarget Target => Volatile.Read(ref _target); @@ -18,6 +20,18 @@ internal sealed class WindowPointer : IPointerPresenter /// The panes' scroll positions, as of the client's last word. public IReadOnlyList Bars => Volatile.Read(ref _bars); + /// The panels on screen the window draws natively, as of the client's last word. + public IReadOnlyList Panels => Volatile.Read(ref _panels); + + /// The header buttons the client offers, said once at start. + public IReadOnlyList Actions => Volatile.Read(ref _actions); + + /// Raised on the client's thread when changes. + public event Action? PanelsChanged; + + /// Raised on the client's thread when changes. + public event Action? ActionsChanged; + /// Raised on the client's thread when changes. public event Action? HoverChanged; @@ -42,4 +56,16 @@ public void Scrollbars(IReadOnlyList bars) Volatile.Write(ref _bars, bars); ScrollbarsChanged?.Invoke(bars); } + + void IPointerPresenter.Panels(IReadOnlyList panels) + { + Volatile.Write(ref _panels, panels); + PanelsChanged?.Invoke(); + } + + void IPointerPresenter.HeaderActions(IReadOnlyList actions) + { + Volatile.Write(ref _actions, actions); + ActionsChanged?.Invoke(); + } } diff --git a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs index ea1aede6..b75be21f 100644 --- a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs +++ b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs @@ -201,6 +201,10 @@ void Family(string id, string prefix, Func []); + // Pane size, in the plain words the request used ("increase/decrease a pane's horizontal or // vertical character size") rather than in the chord's terms. Listed for the same reason the // directional entries and the newline chord are: ⌥⇧+arrow is not a chord anybody guesses, and a diff --git a/src/SharpMUTerm.Client/Commands/LayoutCommands.cs b/src/SharpMUTerm.Client/Commands/LayoutCommands.cs new file mode 100644 index 00000000..a4c10159 --- /dev/null +++ b/src/SharpMUTerm.Client/Commands/LayoutCommands.cs @@ -0,0 +1,34 @@ +namespace SharpMUTerm.Client.Commands; + +/// +/// The ids of the layout library's commands: the ⌥M list's actions, as commands, so any surface — the window's +/// native Layouts menu now, a package later — runs them through the registry instead of re-implementing them. +/// They act on the focused character, and on the layout it is using unless the id names one. +/// +/// They are a family that generates no ⌃P entries: ⌥M is where a reader picks a layout from the keyboard, and +/// Layouts (layout:layouts) is the ⌃P entry that opens it. +/// +/// +public static class LayoutCommands +{ + /// The prefix every layout-library id shares. + public const string Prefix = "layout:lib:"; + + /// Prefix of "apply this layout to the focused character's panes"; the remainder is the layout id. + public const string ApplyPrefix = Prefix + "apply:"; + + /// Saves the panes as they are into the layout in use (a built-in is saved as a copy). + public const string SaveChanges = Prefix + "save"; + + /// Saves the panes as they are as a new layout of the player's own. + public const string SaveAsNew = Prefix + "save-new"; + + /// Makes the layout in use the focused character's world's default. + public const string UseForWorld = Prefix + "use-world"; + + /// Makes the layout in use the focused character's own, whatever its world uses. + public const string UseForCharacter = Prefix + "use-character"; + + /// The id that applies . + public static string Apply(string layoutId) => ApplyPrefix + layoutId; +} diff --git a/src/SharpMUTerm.Client/Panels/MapViewModel.cs b/src/SharpMUTerm.Client/Panels/MapViewModel.cs new file mode 100644 index 00000000..5f301d88 --- /dev/null +++ b/src/SharpMUTerm.Client/Panels/MapViewModel.cs @@ -0,0 +1,94 @@ +using SharpMUTerm.Core.Mapping; + +namespace SharpMUTerm.Client.Panels; + +/// One room as a map view draws it, at its map coordinates (y grows southwards, as the cell map draws it). +/// The room's id, which a click hands back to walk there. +/// The room's name, bounded; the game's text. +/// Its column on the map. +/// Its row on the map; north is smaller. +/// Whether the character is in it. +/// Whether a walk under way still goes through it. +/// Whether the player locked it out of paths. +public sealed record MapViewRoom(long Id, string Name, int X, int Y, bool Current, bool Ahead, bool Locked); + +/// A drawn exit between two rooms of the view, once per pair. +public sealed record MapViewExit(long From, long To); + +/// +/// The part of a character's map a view draws: the rooms of the current room's area on its level, nearest the +/// current room first and bounded, with the exits between them. The terminal draws its map from the recorder in +/// cells (MapRenderer); the window draws this as a canvas over the same pane. A click on a room is handed +/// back by id to the client, which walks there through the same speedwalk a cell click uses. +/// +public sealed record MapViewModel(string? Area, int Level, IReadOnlyList Rooms, IReadOnlyList Exits, string? Walking) +{ + /// The most rooms a view is given: the nearest to the current room are kept. + public const int MaxRooms = 1500; + + /// The longest room name a view is given. + public const int MaxNameLength = 80; + + /// The room the character is in, or null. + public MapViewRoom? Current => Rooms.FirstOrDefault(r => r.Current); + + /// + /// The view of around . With no current room, the level + /// and area of the most recently added room are drawn, so a map recorded earlier still shows. + /// + public static MapViewModel From(WorldMap map, long? currentRoomId, IEnumerable ahead, string? walking) + { + ArgumentNullException.ThrowIfNull(map); + var anchor = currentRoomId is { } id ? map.Room(id) : null; + anchor ??= map.Rooms.Values.LastOrDefault(); + if (anchor is null) + { + return new MapViewModel(null, 0, [], [], walking); + } + + var path = ahead.ToHashSet(); + var rooms = map.Rooms.Values + .Where(r => r.Z == anchor.Z && r.AreaId == anchor.AreaId) + .OrderBy(r => Math.Abs(r.X - anchor.X) + Math.Abs(r.Y - anchor.Y)) + .ThenBy(r => r.Id) + .Take(MaxRooms) + .Select(r => new MapViewRoom( + r.Id, + r.Name.Length <= MaxNameLength ? r.Name : r.Name[..(MaxNameLength - 1)] + "…", + r.X, + r.Y, + r.Id == currentRoomId, + path.Contains(r.Id), + r.Locked)) + .ToList(); + var ids = rooms.Select(r => r.Id).ToHashSet(); + var exits = new List(); + var seen = new HashSet<(long, long)>(); + foreach (var room in rooms) + { + foreach (var (_, _, to) in map.Room(room.Id)!.AllExits()) + { + if (to == room.Id || !ids.Contains(to)) + { + continue; + } + + var pair = room.Id < to ? (room.Id, to) : (to, room.Id); + if (seen.Add(pair)) + { + exits.Add(new MapViewExit(pair.Item1, pair.Item2)); + } + } + } + + var area = anchor.AreaId is { } areaId && map.Areas.TryGetValue(areaId, out var named) ? named.Name : null; + return new MapViewModel(area, anchor.Z, rooms, exits, walking); + } + + /// Value equality over the rooms and exits, which a record's list members do not give. + public bool Equals(MapViewModel? other) => + other is not null && Area == other.Area && Level == other.Level && Walking == other.Walking + && Rooms.SequenceEqual(other.Rooms) && Exits.SequenceEqual(other.Exits); + + public override int GetHashCode() => HashCode.Combine(Area, Level, Walking, Rooms.Count, Exits.Count); +} diff --git a/src/SharpMUTerm.Client/Panels/VitalsModel.cs b/src/SharpMUTerm.Client/Panels/VitalsModel.cs new file mode 100644 index 00000000..17d66134 --- /dev/null +++ b/src/SharpMUTerm.Client/Panels/VitalsModel.cs @@ -0,0 +1,80 @@ +using SharpMUTerm.Core.Protocols; + +namespace SharpMUTerm.Client.Panels; + +/// +/// One meter of the vitals panel, as every view of it draws it: the terminal's cell strip and the window's native +/// gauges are both drawn from this, so the two cannot disagree about a value or about what "low" is. +/// +/// The label the player gave the meter on F7 (hp). +/// The value as the game sent it. +/// The maximum as the game sent it, or null when it has not sent one. +/// Whether the meter is configured with a maximum at all, sent yet or not. +/// Value over maximum, when both are numbers and the maximum is positive. +/// Whether is under . +public sealed record VitalsMeter(string Label, string Value, string? Max, bool HasMax, double? Share, bool Low) +{ + /// + /// The label spelt out where a view has the room: hp reads as Health, mp as Mana. + /// Only the abbreviations every MUD shares; anything else is the player's own label, unchanged. + /// + public string Title => VitalsModel.TitleFor(Label); +} + +/// What the character is fighting, when the game says. +/// The target's name, bounded by . +/// Its health as a share of its maximum, when the game sends one. +public sealed record VitalsTarget(string Name, double? Share) +{ + /// Whether the target is below . + public bool Low => Share < VitalsModel.LowShare; +} + +/// +/// The vitals panel's content for one character, with no presentation in it: the meters that have a value, in +/// their configured order, and the target. The terminal draws it as a row of cells +/// (VitalsStripRenderer); the window draws native gauges over that row from the same instance. +/// +public sealed record VitalsModel(IReadOnlyList Meters, VitalsTarget? Target) +{ + /// The share under which a meter is low. One number for every view, the status row's included. + public const double LowShare = 0.25; + + /// No meter and no target: nothing for any view to draw. + public static VitalsModel Empty { get; } = new([], null); + + /// Whether there is nothing to draw. + public bool IsEmpty => Meters.Count == 0 && Target is null; + + /// The model for a Core target, or null. + public static VitalsTarget? TargetFrom(CombatTarget? target) => target is null ? null : new VitalsTarget(target.Name, target.Share); + + /// Value equality over the meters, which a record's list member does not give. + public bool Equals(VitalsModel? other) => + other is not null && Equals(Target, other.Target) && Meters.SequenceEqual(other.Meters); + + public override int GetHashCode() + { + var hash = new HashCode(); + hash.Add(Target); + foreach (var meter in Meters) + { + hash.Add(meter); + } + + return hash.ToHashCode(); + } + + /// See . + public static string TitleFor(string label) => label.Trim().ToLowerInvariant() switch + { + "hp" or "health" => "Health", + "mp" or "sp" or "mana" => "Mana", + "mv" or "moves" or "move" or "movement" => "Movement", + "ep" or "en" or "endurance" => "Endurance", + "wp" or "willpower" => "Willpower", + "st" or "sta" or "stamina" => "Stamina", + "xp" or "exp" => "Experience", + _ => label, + }; +} diff --git a/src/SharpMUTerm.Tui/Panels/VitalsStripRenderer.cs b/src/SharpMUTerm.Tui/Panels/VitalsStripRenderer.cs index 105a1da9..25ec70ca 100644 --- a/src/SharpMUTerm.Tui/Panels/VitalsStripRenderer.cs +++ b/src/SharpMUTerm.Tui/Panels/VitalsStripRenderer.cs @@ -1,4 +1,5 @@ using System.Text; +using SharpMUTerm.Client.Panels; using SharpMUTerm.Core.Configuration; using SharpMUTerm.Core.Protocols; using static SharpMUTerm.Tui.MarkupText; @@ -70,6 +71,14 @@ internal static string Render(IReadOnlyList me return ElideVisible(last!, width); } + /// The strip for a : the same model the window's native gauges are drawn from. + internal static string Render(VitalsModel vitals, int width, Ink ink) => + Render( + [.. vitals.Meters.Select(m => new StatusMeterRenderer.MeterReading(m.Label, m.Value, m.Max, m.HasMax, m.Share, m.Low))], + vitals.Target is { } target ? new CombatTarget(target.Name, target.Share) : null, + width, + ink); + private static string Compose( IReadOnlyList meters, CombatTarget? target, Level level, int width, Ink ink) { diff --git a/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs b/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs index 9733e5f9..82ecd577 100644 --- a/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs +++ b/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs @@ -74,7 +74,8 @@ internal sealed record PointerTarget(PointerKind Kind, PaneRect Area, PointerSha /// The key that does the same, when there is one, drawn after the label. /// What choosing it does. /// False draws it dimmed and unclickable, which says the action exists but not here. -internal sealed record PointerMenuItem(string Label, string? Hint, Action Run, bool Enabled = true) +/// Whether the entry is the one in force (the layout in use), drawn with a check by a host that can. +internal sealed record PointerMenuItem(string Label, string? Hint, Action Run, bool Enabled = true, bool Checked = false) { /// A rule between groups of entries. public static PointerMenuItem Separator { get; } = new("-", null, () => { }, false); @@ -122,4 +123,65 @@ internal interface IPointerPresenter /// The panes' scroll positions, whenever one of them changes. void Scrollbars(IReadOnlyList bars); + + /// + /// The panels on screen that a host may draw natively over their cells, whenever one moves or its content + /// changes. The cells stay what they are; a host that draws no native panels ignores this (the default). + /// + void Panels(IReadOnlyList panels) + { + } + + /// + /// The actions a host may offer as native buttons along the header, said once when the app starts. A host + /// with no buttons ignores this (the default); every action is also a key and a ⌃P entry. + /// + void HeaderActions(IReadOnlyList actions) + { + } +} + +/// +/// One panel on screen, for a host that draws it natively over its pane rather than in cells: where it is and what +/// it shows. The cells under it are drawn as in any host, so a host that draws nothing loses nothing, and the +/// terminal-and-window parity, which compares cells, is unaffected. +/// +/// The panel (vitals, map, …; PanelIds). +/// The window the panel is drawn in, which is the pane's front tab. +/// The pane's output rectangle, in desktop cells — the area the cells of the panel cover. +/// The colours the cells are drawn in, so a native view says the same things in the same hues. +/// For the vitals panel, its content: the same model its cell strip is drawn from. +/// For the map, the rooms around the character, drawn from the recorder the cell map is drawn from. +/// +/// For the map, walks the panel's own character to a room by id, through the speedwalk a click on a cell map uses. +/// Safe to call from any thread. The same instance for as long as the window lives, so an overlay compares equal. +/// +internal sealed record PanelOverlay( + string PanelId, + string WindowId, + PaneRect Rect, + PanelInk Ink, + SharpMUTerm.Client.Panels.VitalsModel? Vitals, + SharpMUTerm.Client.Panels.MapViewModel? Map = null, + Action? WalkTo = null); + +/// A panel's colours as #rrggbb: a bar or fill, the warning, and the empty part of a bar. +internal sealed record PanelInk(string Bar, string Low, string Track); + +/// +/// An action a host may draw as a native button in the header, over blank header cells. Its menu is built by the +/// client, on the client's thread, from the same commands its key runs — a host never builds one of its own. +/// +/// Which action (); a host picks its icon by this. +/// What it is, for a tooltip and a screen reader. +/// The key that does the same, for the tooltip. +/// +/// Builds the menu; safe to call from any thread. The client builds it on its own thread and hands it to the +/// callback there, so a host marshals in the callback itself. Each entry's is +/// already marshalled. +/// +internal sealed record HeaderAction(string Id, string Label, string? Hint, Action>> Menu) +{ + /// The layouts button: built-in and saved layouts, save, and a default for a world or a character. + public const string LayoutsId = "layouts"; } diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Desktop.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Desktop.cs new file mode 100644 index 00000000..6b57afaf --- /dev/null +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Desktop.cs @@ -0,0 +1,238 @@ +using SharpMUTerm.Client.Commands; +using SharpMUTerm.Client.Panels; +using SharpMUTerm.Core.Diagnostics; +using SharpMUTerm.Core.Layouts; +using SharpMUTerm.Core.Text; +using static SharpMUTerm.Tui.MarkupText; + +namespace SharpMUTerm.Tui; + +/// +/// What a host that draws native views over the cells is told: the header actions it may offer as buttons, and +/// the panels on screen with their content. Both go out through , the channel the +/// scrollbars already ride, and both leave every cell as it was — so a host that draws nothing native (the +/// terminal, the snapshot) is unaffected, and the window's native views are a presentation over the same frame. +/// +/// Nothing here is a second implementation. The Layouts menu is built from the layout library's commands +/// (), dispatched through the registry, which run the same methods as the ⌥M list's +/// keys; the vitals a native gauge draws are , the model the cell strip draws. +/// +/// +internal sealed partial class SharpMUTermApp +{ + private IReadOnlyList _panelOverlays = Array.Empty(); + + /// How many times each map window has been drawn; a native map's model is rebuilt only when this moves. + private readonly Dictionary _mapRevisions = new(StringComparer.Ordinal); + + /// The native map model last built for each map window, with the revision it was built at. + private readonly Dictionary _mapViews = new(StringComparer.Ordinal); + + /// One walk callback per map window, kept so an overlay compares equal from frame to frame. + private readonly Dictionary> _mapWalkers = new(StringComparer.Ordinal); + + /// Tells the host which header buttons it may draw. Once, at construction. + private void AnnounceHeaderActions() => + _pointer?.HeaderActions( + [ + new HeaderAction(HeaderAction.LayoutsId, "Layouts", "⌥M", show => OnUiThread(() => show(LayoutsMenuItems()))), + ]); + + /// The layout the focused character's panes show, or would get. + private string LayoutInUse(string key) => + _liveLayout is { } live && string.Equals(live.SessionKey, key, StringComparison.Ordinal) + ? live.LayoutId + : ResolveLayout(key).Layout.Id; + + /// + /// The window's Layouts menu: the built-ins, then the player's, the one in use checked; then the list's + /// actions on the layout in use; then the list itself. Every entry dispatches a command id. + /// Internal for tests. + /// + internal IReadOnlyList LayoutsMenuItems() + { + Action Dispatch(string id) => () => OnUiThread(() => DispatchCommand(id)); + var items = new List(); + if (LayoutsKey() is not { } key) + { + items.Add(new PointerMenuItem("No character here — a layout belongs to a character", null, () => { }, Enabled: false)); + items.Add(PointerMenuItem.Separator); + items.Add(new PointerMenuItem("Manage layouts…", "⌥M", Dispatch("layout:layouts"))); + return items; + } + + var inUse = LayoutInUse(key); + var all = Layouts.All; + foreach (var layout in all.Where(l => l.IsBuiltIn)) + { + items.Add(new PointerMenuItem(Snippet(layout.Name), null, Dispatch(LayoutCommands.Apply(layout.Id)), Checked: layout.Id == inUse)); + } + + var own = all.Where(l => !l.IsBuiltIn).ToList(); + if (own.Count > 0) + { + items.Add(PointerMenuItem.Separator); + foreach (var layout in own) + { + items.Add(new PointerMenuItem(Snippet(layout.Name), null, Dispatch(LayoutCommands.Apply(layout.Id)), Checked: layout.Id == inUse)); + } + } + + var (world, character) = LayoutOwner(key); + items.Add(PointerMenuItem.Separator); + items.Add(new PointerMenuItem("Save changes", null, Dispatch(LayoutCommands.SaveChanges))); + items.Add(new PointerMenuItem("Save as new", null, Dispatch(LayoutCommands.SaveAsNew))); + items.Add(new PointerMenuItem( + world is null ? "Use for this world" : $"Use for {Snippet(world.Name)}", null, Dispatch(LayoutCommands.UseForWorld), Enabled: world is not null)); + items.Add(new PointerMenuItem( + character is null ? "Use for this character only" : $"Use for {Snippet(character.Name)} only", + null, + Dispatch(LayoutCommands.UseForCharacter), + Enabled: character is not null)); + items.Add(PointerMenuItem.Separator); + items.Add(new PointerMenuItem("Manage layouts…", "⌥M", Dispatch("layout:layouts"))); + return items; + } + + /// + /// A layout-library command (), for the focused character: the ⌥M list's own + /// methods, with what they did said in a notice rather than in the list's status line. + /// + private bool RunLayoutCommand(string id) + { + if (LayoutsKey() is not { } key) + { + RefuseCommand("no character here — a layout belongs to a character (⌃P ▸ Switch to …)"); + return false; + } + + if (id.StartsWith(LayoutCommands.ApplyPrefix, StringComparison.Ordinal)) + { + if (Layouts.Find(id[LayoutCommands.ApplyPrefix.Length..]) is not { } chosen) + { + RefuseCommand($"there is no layout {Snippet(id[LayoutCommands.ApplyPrefix.Length..])}"); + return false; + } + + if (!ApplyLayout(key, chosen)) + { + RefuseCommand($"no window to arrange for {Snippet(key)} — switch to the character first"); + return false; + } + + Notice($"{chosen.Name} layout applied", MessageSeverity.Info, "⌥M"); + return true; + } + + var current = Layouts.Find(LayoutInUse(key)) ?? ResolveLayout(key).Layout; + var (world, character) = LayoutOwner(key); + LayoutActionResult? result = id switch + { + LayoutCommands.SaveChanges => SaveLayoutChanges(key, current, world, character), + LayoutCommands.SaveAsNew => SaveLayoutAsNew(key, current), + LayoutCommands.UseForWorld => UseLayoutForWorld(key, current, world), + LayoutCommands.UseForCharacter => UseLayoutForCharacter(key, current, character), + _ => null, + }; + if (result is not { } done) + { + RefuseCommand($"{id} isn't a layout command"); + return false; + } + + if (done.Done) + { + Notice(Capitalise(done.Status), MessageSeverity.Info, "⌥M"); + } + else + { + RefuseCommand(done.Status); + } + + return done.Done; + } + + private static string Capitalise(string text) => + text.Length == 0 ? text : char.ToUpperInvariant(text[0]) + text[1..]; + + /// + /// Tells the host which panels are on screen, where, and what they show, when any of that changed. Rides the + /// frame, for ' reason. A panel is on screen when its window is the front tab of + /// a realised pane. + /// + private void PublishPanels() + { + if (_pointer is null) + { + return; + } + + var overlays = new List(); + foreach (var (paneId, rect) in PaneOutputRects()) + { + if (_workspace.Layout.FindPane(paneId) is not { ActiveTab: { } windowId }) + { + continue; + } + + if (IsMapWindow(windowId)) + { + if (MapViewFor(windowId) is { } view) + { + var walker = _mapWalkers.TryGetValue(windowId, out var known) + ? known + : _mapWalkers[windowId] = room => OnUiThread(() => WalkFromMap(windowId, room)); + overlays.Add(new PanelOverlay( + PanelIds.Map, windowId, rect, new PanelInk(_ink.Accent, _ink.Draft, _ink.Lift(new Rgb(0x6a, 0x6a, 0x72))), null, view, walker)); + } + + continue; + } + + if (!TerminalPanels.TryParseWindowId(windowId, out var panelId, out var key)) + { + continue; + } + + if (panelId == PanelIds.Vitals) + { + var ink = VitalsInk(); + overlays.Add(new PanelOverlay(panelId, windowId, rect, new PanelInk(ink.Bar, ink.Low, ink.Empty), ReadVitals(key))); + } + } + + if (overlays.SequenceEqual(_panelOverlays)) + { + return; + } + + _panelOverlays = overlays; + _pointer.Panels(overlays); + } + + /// + /// A map window's native model, rebuilt only when the cell map has been redrawn since ( + /// counts), so a frame that changed nothing on the map costs a dictionary lookup. + /// + private MapViewModel? MapViewFor(string windowId) + { + if (MapOf(_workspace.FindWindow(windowId)?.SessionKey) is not { } map) + { + return null; + } + + var revision = _mapRevisions.GetValueOrDefault(windowId); + if (_mapViews.TryGetValue(windowId, out var cached) && cached.Revision == revision) + { + return cached.Model; + } + + var walking = map.Walk.IsWalking ? $"walking, {map.Walk.Remaining} to go" : null; + var model = MapViewModel.From(map.Map, map.Recorder.CurrentRoomId, map.Walk.RoomsAhead, walking); + _mapViews[windowId] = (revision, model); + return model; + } + + /// What the host was last told about panels. Internal for tests. + internal IReadOnlyList PanelOverlays => _panelOverlays; +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs index 38b9929b..1592339e 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs @@ -1,3 +1,4 @@ +using SharpMUTerm.Client.Commands; using SharpMUTerm.Core.Configuration; using SharpMUTerm.Core.Diagnostics; using SharpMUTerm.Core.Layouts; @@ -504,34 +505,16 @@ private bool LayoutsKeyPressed(string key, ConsoleKeyInfo k) Notice($"{selected.Name} layout applied — c keeps it for this character, w for the world", MessageSeverity.Info, "⌥M"); return false; case ConsoleKey.S when k.Modifiers == 0: - SaveLayoutChanges(key, selected, world, character); + _layoutsStatus = SaveLayoutChanges(key, selected, world, character).Status; return true; case ConsoleKey.N when k.Modifiers == 0: - SaveLayoutAsNew(key, selected); + _layoutsStatus = SaveLayoutAsNew(key, selected).Status; return true; case ConsoleKey.W when k.Modifiers == 0: - if (world is null) - { - _layoutsStatus = "this character's world is not configured"; - return true; - } - - world.Layout = selected.Id; - PersistConfiguration(); - _layoutsStatus = $"{selected.Name} is now {world.Name}'s layout"; - ReapplyIfResolvedChanged(key); + _layoutsStatus = UseLayoutForWorld(key, selected, world).Status; return true; case ConsoleKey.C when k.Modifiers == 0: - if (character is null) - { - _layoutsStatus = "no configured character to keep it for"; - return true; - } - - character.Layout = selected.Id; - PersistConfiguration(); - _layoutsStatus = $"{character.Name} uses {selected.Name}"; - ReapplyIfResolvedChanged(key); + _layoutsStatus = UseLayoutForCharacter(key, selected, character).Status; return true; default: return true; @@ -556,12 +539,42 @@ private void ReapplyIfResolvedChanged(string key) private CapturedLayout? CaptureArrangement(string key, LayoutDefinition? previous) => LayoutCapture.Capture(_workspace.Layout.Root, window => PanelOf(key, window), previous); - private void SaveLayoutChanges(string key, LayoutDefinition target, WorldDefinition? world, CharacterDefinition? character) + /// What one of the list's actions did: whether it did it, and the line that says so. + private readonly record struct LayoutActionResult(bool Done, string Status); + + /// ⌥M w and : becomes the world's default. + private LayoutActionResult UseLayoutForWorld(string key, LayoutDefinition layout, WorldDefinition? world) + { + if (world is null) + { + return new(false, "this character's world is not configured"); + } + + world.Layout = layout.Id; + PersistConfiguration(); + ReapplyIfResolvedChanged(key); + return new(true, $"{layout.Name} is now {world.Name}'s layout"); + } + + /// ⌥M c and : becomes the character's own. + private LayoutActionResult UseLayoutForCharacter(string key, LayoutDefinition layout, CharacterDefinition? character) + { + if (character is null) + { + return new(false, "no configured character to keep it for"); + } + + character.Layout = layout.Id; + PersistConfiguration(); + ReapplyIfResolvedChanged(key); + return new(true, $"{character.Name} uses {layout.Name}"); + } + + private LayoutActionResult SaveLayoutChanges(string key, LayoutDefinition target, WorldDefinition? world, CharacterDefinition? character) { if (CaptureArrangement(key, target) is not { } captured) { - _layoutsStatus = "nothing to save — no pane holds this character's output"; - return; + return new(false, "nothing to save — no pane holds this character's output"); } var result = Layouts.Update(target.Id, captured.Placements, captured.RegionShares); @@ -576,31 +589,25 @@ private void SaveLayoutChanges(string key, LayoutDefinition target, WorldDefinit { world.Layout = result.Layout.Id; } - - _layoutsStatus = $"{target.Name} is built in — saved as {result.Layout.Name}"; - } - else - { - _layoutsStatus = $"saved {result.Layout.Name}"; } PersistConfiguration(); _layoutsSelected = Layouts.All.ToList().FindIndex(l => l.Id == result.Layout.Id); AdoptArrangementAs(key, result.Layout); + return new(true, result.CreatedNew ? $"{target.Name} is built in — saved as {result.Layout.Name}" : $"saved {result.Layout.Name}"); } - private void SaveLayoutAsNew(string key, LayoutDefinition from) + private LayoutActionResult SaveLayoutAsNew(string key, LayoutDefinition from) { if (CaptureArrangement(key, from) is not { } captured) { - _layoutsStatus = "nothing to save — no pane holds this character's output"; - return; + return new(false, "nothing to save — no pane holds this character's output"); } var saved = Layouts.SaveAsNew(from.Name, captured.Placements, captured.RegionShares); PersistConfiguration(); _layoutsSelected = Layouts.All.ToList().FindIndex(l => l.Id == saved.Id); - _layoutsStatus = $"saved as {saved.Name} — c or w puts it to use"; + return new(true, $"saved as {saved.Name} — c or w puts it to use"); } /// diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs index eea3d7b6..f8ab5da9 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs @@ -11,6 +11,7 @@ using SharpMUTerm.Core.Session; using SharpMUTerm.Core.Text; using SharpMUTerm.Core.Workspaces; +using SharpMUTerm.Client.Panels; using SharpMUTerm.Tui.Panels; namespace SharpMUTerm.Tui; @@ -164,16 +165,12 @@ private IWindowControl NewVitalsPanel(TerminalPanelContext context) { var view = NewPanelView(context, (width, _) => { - if (PanelGameData(context.SessionKey) is not { } data) + if (ReadVitals(context.SessionKey) is not { } vitals) { return ["[dim]No vitals: this character is not connected.[/]"]; } - var strip = VitalsStripRenderer.Render( - StatusMeterRenderer.Read(PanelMeters(context.SessionKey), data), - CombatTarget.Read(data), - width, - VitalsInk()); + var strip = VitalsStripRenderer.Render(vitals, width, VitalsInk()); return [strip.Length > 0 ? strip : "[dim]No vitals yet — the game has sent none of the meters F7 names.[/]"]; }); @@ -186,6 +183,23 @@ private IWindowControl NewVitalsPanel(TerminalPanelContext context) return view.Control; } + /// + /// A character's vitals as the one model every view draws (): the cell strip here, and + /// the window's native gauges through . Null when the character has no game data. + /// + internal VitalsModel? ReadVitals(string sessionKey) + { + if (PanelGameData(sessionKey) is not { } data) + { + return null; + } + + var meters = StatusMeterRenderer.Read(PanelMeters(sessionKey), data) + .Select(m => new VitalsMeter(m.Label, m.Value, m.Max, m.HasMax, m.Share, m.Low)) + .ToList(); + return new VitalsModel(meters, VitalsModel.TargetFrom(CombatTarget.Read(data))); + } + /// /// The strip's colours, each held to the floor against the plane it lands on: the bars are fills but carry /// meaning, so they are lifted like text; the empty part of a bar is a grey that still reads as a track. diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 9d6212e1..4a7c0daa 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -785,6 +785,7 @@ public SharpMUTermApp( _workspace = ResumeOrNew(config); NoteRestoredOwners(); RegisterTerminalPanels(); + AnnounceHeaderActions(); var headless = host.RunsInline; _headless = headless; @@ -998,6 +999,7 @@ public SharpMUTermApp( SyncTransparentColours(); DrawSixelOverlay(buffer); PublishScrollbars(); + PublishPanels(); SyncMapSizes(); SyncPanelSizes(); }; @@ -8161,6 +8163,11 @@ internal IReadOnlyList PaneLines(string windowId) => /// private bool RunBuiltInCommand(string id) { + if (id.StartsWith(SharpMUTerm.Client.Commands.LayoutCommands.Prefix, StringComparison.Ordinal)) + { + return RunLayoutCommand(id); + } + if (DispatchGroupCommand(id)) { return true; @@ -8635,8 +8642,19 @@ private MarkupControl MapControlFor(string windowId) /// private void OnMapLinkClicked(string windowId, string url) { - if (MapRenderer.ParseLink(url) is not { } room - || MapOf(_workspace.FindWindow(windowId)?.SessionKey) is not { } map) + if (MapRenderer.ParseLink(url) is { } room) + { + WalkFromMap(windowId, room); + } + } + + /// + /// Walks a map window's own character to a room: a cell map's click and the window's native map both end here, + /// so there is one walk and one refusal. + /// + private void WalkFromMap(string windowId, long room) + { + if (MapOf(_workspace.FindWindow(windowId)?.SessionKey) is not { } map) { return; } @@ -8660,6 +8678,7 @@ private void RenderMap(string windowId) var (width, height) = MapBox(windowId); _mapSizes[windowId] = (width, height); + _mapRevisions[windowId] = _mapRevisions.GetValueOrDefault(windowId) + 1; if (MapOf(_workspace.FindWindow(windowId)?.SessionKey) is not { } map) { control.SetContent(new List { "[dim]No map: this character is not connected.[/]" }); diff --git a/src/SharpMUTerm.Tui/StatusMeterRenderer.cs b/src/SharpMUTerm.Tui/StatusMeterRenderer.cs index d56277cd..53ffb13a 100644 --- a/src/SharpMUTerm.Tui/StatusMeterRenderer.cs +++ b/src/SharpMUTerm.Tui/StatusMeterRenderer.cs @@ -24,7 +24,7 @@ internal static class StatusMeterRenderer internal const int ValueWidth = 5; /// Below this share of its maximum a value is drawn in the warning ink. - internal const double LowShare = 0.25; + internal const double LowShare = SharpMUTerm.Client.Panels.VitalsModel.LowShare; /// The cells a compact meter's share takes: 100%. internal const int ShareWidth = 4; diff --git a/tests/SharpMUTerm.Avalonia.Tests/DesktopLayerTests.cs b/tests/SharpMUTerm.Avalonia.Tests/DesktopLayerTests.cs new file mode 100644 index 00000000..815f7aeb --- /dev/null +++ b/tests/SharpMUTerm.Avalonia.Tests/DesktopLayerTests.cs @@ -0,0 +1,375 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Headless; +using Avalonia.Input; +using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Commands; +using SharpMUTerm.Client.Panels; +using SharpMUTerm.Core.Layouts; +using SharpMUTerm.Core.Workspaces; +using SharpMUTerm.Tui; +using SkiaSharp; +using Color = SharpConsoleUI.Color; +using Window = Avalonia.Controls.Window; + +namespace SharpMUTerm.Avalonia.Tests; + +/// +/// The window's native views over the cells (): the header's Layouts button, whose +/// presses are the window's and whose menu is the client's commands, and the native vitals gauges, drawn from the +/// same model as the cell strip under them and taking no input of their own. +/// +public class DesktopLayerTests +{ + private static readonly SKColor Back = new(0x10, 0x20, 0x30); + + private static readonly VitalsModel Vitals = new( + [ + new VitalsMeter("hp", "412", "500", true, 412 / 500.0, false), + new VitalsMeter("mp", "23", "120", true, 23 / 120.0, true), + ], + new VitalsTarget("a rotting ghoul", 0.4)); + + // ── The client's half: what it tells a host ────────────────────────────────────────────────── + + [Test] + public async Task TheClientPublishesTheVitalsPaneWithTheModelItsCellStripIsDrawnFrom() + { + using var driver = new AvaloniaConsoleDriver(140, 36); + await using var app = InlineWindowApp(driver); + app.RenderSnapshot("layout-combat"); + + var panel = driver.Pointer.Panels.SingleOrDefault(p => p.PanelId == PanelIds.Vitals); + await Assert.That(panel).IsNotNull(); + var pane = app.PaneOutputRects().Single(r => app.PaneWindows().GetValueOrDefault(r.Key) == panel!.WindowId); + await Assert.That(panel!.Rect).IsEqualTo(pane.Value).Because("the overlay goes exactly where the strip's cells are"); + await Assert.That(panel.Vitals).IsEqualTo(app.ReadVitals(DemoScene.ActiveSessionKey)); + await Assert.That(panel.Vitals!.Meters.Count).IsGreaterThan(0); + await Assert.That(driver.Pointer.Actions.Select(a => a.Id)).Contains(HeaderAction.LayoutsId); + } + + [Test] + public async Task PublishingPanelsMovesNoPaneRectangle() + { + using var headless = new HeadlessConsoleDriver(140, 36); + await using var terminal = new SharpMUTermApp(DemoScene.Build(), ClientHost.Headless(headless, WindowOptions.Capabilities)); + terminal.RenderSnapshot("layout-combat"); + + using var driver = new AvaloniaConsoleDriver(140, 36); + await using var window = InlineWindowApp(driver); + window.RenderSnapshot("layout-combat"); + + await Assert.That(driver.Pointer.Panels.Count).IsGreaterThan(0); + await Assert.That(window.PaneOutputRects().OrderBy(r => r.Key).ToArray()) + .IsEquivalentTo(terminal.PaneOutputRects().OrderBy(r => r.Key).ToArray()); + } + + [Test] + public async Task TheLayoutsMenuIsTheLayoutLibraryWithTheOneInUseChecked() + { + using var driver = new AvaloniaConsoleDriver(140, 36); + await using var app = InlineWindowApp(driver); + app.RenderSnapshot("layout-combat"); + + var items = app.LayoutsMenuItems(); + var labels = items.Where(i => !i.IsSeparator).Select(i => i.Label).ToArray(); + await Assert.That(labels).Contains("Roleplay"); + await Assert.That(labels).Contains("Combat"); + await Assert.That(labels).Contains("Save changes"); + await Assert.That(labels).Contains("Save as new"); + await Assert.That(labels).Contains("Use for Aetherfall"); + await Assert.That(labels).Contains("Use for Corvid only"); + await Assert.That(labels).Contains("Manage layouts…"); + await Assert.That(items.Single(i => i.Checked).Label).IsEqualTo("Combat"); + + // Choosing an entry runs the command, through the registry, that the ⌥M list's ⏎ runs. + items.Single(i => i.Label == "Roleplay").Run(); + await Assert.That(app.LiveLayoutId).IsEqualTo(BuiltInLayouts.RoleplayId); + await Assert.That(app.LayoutsMenuItems().Single(i => i.Checked).Label).IsEqualTo("Roleplay"); + } + + [Test] + public async Task EveryLayoutCommandResolvesThroughTheRegistry() + { + using var driver = new AvaloniaConsoleDriver(140, 36); + await using var app = InlineWindowApp(driver); + app.RenderSnapshot("layout-combat"); + + foreach (var id in new[] + { + LayoutCommands.Apply(BuiltInLayouts.CombatId), LayoutCommands.SaveChanges, LayoutCommands.SaveAsNew, + LayoutCommands.UseForWorld, LayoutCommands.UseForCharacter, + }) + { + await Assert.That(app.Contributions.Commands.Resolve(id)).IsNotNull().Because(id); + } + + await Assert.That(app.DispatchCommand(LayoutCommands.SaveAsNew)).IsTrue(); + await Assert.That(app.Layouts.All.Count(l => !l.IsBuiltIn)).IsEqualTo(1); + await Assert.That(app.DispatchCommand(LayoutCommands.UseForCharacter)).IsTrue(); + } + + // ── The window's half: what it draws, and where the pointer goes ───────────────────────────── + + [Test] + public async Task ThePressOnTheLayoutsButtonNeverReachesTheClientAndOpensTheClientsMenu() + { + var (visible, clientSaw, asked, entries) = await Run((window, view, layer, driver) => + { + var asked = 0; + Offer(driver, show => + { + asked++; + show([new PointerMenuItem("Combat", null, () => { }, Checked: true), PointerMenuItem.Separator, new PointerMenuItem("Manage layouts…", "⌥M", () => { })]); + }); + var clientSaw = new List>(); + driver.MouseEvent += (_, flags, _) => clientSaw.Add(flags); + + window.UpdateLayout(); + var button = layer.Button(HeaderAction.LayoutsId)!; + var centre = button.TranslatePoint(new Point(button.Bounds.Width / 2, button.Bounds.Height / 2), window)!.Value; + window.MouseMove(centre); + window.MouseDown(centre, MouseButton.Left); + window.MouseUp(centre, MouseButton.Left); + window.MouseDown(centre, MouseButton.Right); + window.MouseUp(centre, MouseButton.Right); + Drain(); + var entries = layer.OpenedMenu?.Items.Select(i => i is MenuItem m ? $"{m.IsChecked}" : "-").ToArray() ?? []; + return (button.IsVisible, clientSaw, asked, entries); + }); + + await Assert.That(visible).IsTrue(); + await Assert.That(clientSaw).IsEmpty().Because("every press on the button is the window's"); + await Assert.That(asked).IsEqualTo(1).Because("only the left click opens the menu"); + await Assert.That(entries).IsEquivalentTo(new[] { "True", "-", "False" }); + } + + [Test] + public async Task TheButtonCoversOnlyBlankHeaderCellsAndStandsDownOverText() + { + var (blank, overText) = await Run((window, view, layer, driver) => + { + Offer(driver, _ => { }); + var blank = layer.Button(HeaderAction.LayoutsId)!.IsVisible; + driver.SetNarrowCell(driver.Frame.Width - 2, 0, 'x', Color.Default, Color.Default); + driver.Flush(); + Drain(); + return (blank, layer.Button(HeaderAction.LayoutsId)!.IsVisible); + }); + + await Assert.That(blank).IsTrue(); + await Assert.That(overText).IsFalse(); + } + + [Test] + public async Task VitalsGaugesAreDrawnOverTheirPaneAndThePointerStillReachesTheCells() + { + var (gaugeRect, paneRect, bars, barColour, cellsUnchanged, clientSaw) = await Run((window, view, layer, driver) => + { + var before = driver.Frame; + Publish(driver, new PaneRect(2, 2, 36, 6)); + Drain(); + window.UpdateLayout(); + using var frame = window.CaptureRenderedFrame()!; + var gauges = layer.Gauges.Values.Single(); + var cell = view.SizeFor(1, 1); + var paneRect = new Rect(2 * cell.Width, 2 * cell.Height, 36 * cell.Width, 6 * cell.Height); + var gaugeRect = new Rect(Canvas.GetLeft(gauges), Canvas.GetTop(gauges), gauges.Bounds.Width, gauges.Bounds.Height); + var bars = gauges.DrawnBars.ToArray(); + var fill = bars[0].Fill; + var inLayer = gauges.TranslatePoint(new Point(fill.X + 3, fill.Center.Y), window)!.Value; + var barColour = Pixel(frame, inLayer.X, inLayer.Y); + + var clientSaw = new List(); + driver.MouseEvent += (_, _, at) => clientSaw.Add(at); + var press = new Point((5 * cell.Width) + 2, (4 * cell.Height) + 2); + window.MouseDown(press, MouseButton.Left); + window.MouseUp(press, MouseButton.Left); + return (gaugeRect, paneRect, bars, barColour, ReferenceEquals(before, driver.Frame), clientSaw); + }); + + await Assert.That(gaugeRect).IsEqualTo(paneRect); + await Assert.That(bars.Length).IsEqualTo(3).Because("health, mana and the target"); + await Assert.That(bars[1].Low).IsTrue(); + await Assert.That(barColour.G).IsGreaterThan(barColour.R).Because("health's bar wears the bar ink, a green"); + await Assert.That(cellsUnchanged).IsTrue().Because("the gauges draw over the frame, never into it"); + await Assert.That(clientSaw.Distinct().ToArray()).IsEquivalentTo(new[] { new System.Drawing.Point(5, 4) }); + } + + [Test] + public async Task AShortPaneLaysTheMetersSideBySideAndATallOneStacksThem() + { + var (row, stacked) = await Run((window, view, layer, driver) => + { + Publish(driver, new PaneRect(0, 2, 40, 1)); + Drain(); + window.UpdateLayout(); + var row = layer.Gauges.Values.Single().Stacked; + Publish(driver, new PaneRect(0, 2, 40, 9)); + Drain(); + window.UpdateLayout(); + return (row, layer.Gauges.Values.Single().Stacked); + }, rows: 12); + + await Assert.That(row).IsFalse(); + await Assert.That(stacked).IsTrue(); + } + + [Test] + public async Task AGaugeGoesWhenItsPanelLeavesTheScreen() + { + var (shown, after) = await Run((window, view, layer, driver) => + { + Publish(driver, new PaneRect(0, 2, 30, 3)); + Drain(); + var shown = layer.Gauges.Count; + ((IPointerPresenter)driver.Pointer).Panels([]); + Drain(); + return (shown, layer.Gauges.Count); + }); + + await Assert.That(shown).IsEqualTo(1); + await Assert.That(after).IsEqualTo(0); + } + + [Test] + public async Task TheClientPublishesTheMapAroundTheCharacterAndAWalkGoesThroughItsSpeedwalk() + { + using var driver = new AvaloniaConsoleDriver(140, 36); + await using var app = InlineWindowApp(driver); + app.RenderSnapshot("layout-combat"); + + var map = driver.Pointer.Panels.SingleOrDefault(p => p.PanelId == PanelIds.Map); + await Assert.That(map).IsNotNull(); + await Assert.That(map!.WindowId).IsEqualTo(SharpMUTermApp.MapWindowId(DemoScene.ActiveSessionKey)); + await Assert.That(map.Map!.Current).IsNotNull(); + await Assert.That(map.Map.Exits.Count).IsGreaterThan(0); + + var target = map.Map.Rooms.First(r => !r.Current); + map.WalkTo!(target.Id); + app.RenderNextFrame(); + var after = driver.Pointer.Panels.Single(p => p.PanelId == PanelIds.Map); + await Assert.That(after.Map!.Walking).IsNotNull().Because("the click started the client's own speedwalk"); + await Assert.That(after.Map.Rooms.Single(r => r.Id == target.Id).Ahead).IsTrue(); + await Assert.That(ReferenceEquals(after.WalkTo, map.WalkTo)).IsTrue().Because("one walker per window, so an overlay compares equal"); + } + + [Test] + public async Task OnTheNativeMapAClickWalksADragPansTheWheelZoomsAndARightClickReachesTheClient() + { + var (walked, pan, zoom, clientSaw) = await Run((window, view, layer, driver) => + { + var walked = new List(); + var model = new MapViewModel( + "Town", + 0, + [ + new MapViewRoom(1, "Plaza", 0, 0, Current: true, Ahead: false, Locked: false), + new MapViewRoom(2, "North Road", 0, -1, Current: false, Ahead: false, Locked: false), + ], + [new MapViewExit(1, 2)], + null); + ((IPointerPresenter)driver.Pointer).Panels( + [new PanelOverlay(PanelIds.Map, "map:demo", new PaneRect(0, 1, 40, 9), new PanelInk("#33ccff", "#ffaa33", "#555555"), null, model, walked.Add)]); + Drain(); + window.UpdateLayout(); + var canvas = layer.Maps.Values.Single(); + Point At(MapViewRoom room) => canvas.TranslatePoint(canvas.CentreOf(room), window)!.Value; + + var clientSaw = new List>(); + driver.MouseEvent += (_, flags, _) => clientSaw.Add(flags); + + // A click on the room north of the character, then a click on the character's own room (nothing to walk). + window.MouseDown(At(model.Rooms[1]), MouseButton.Left); + window.MouseUp(At(model.Rooms[1]), MouseButton.Left); + window.MouseDown(At(model.Rooms[0]), MouseButton.Left); + window.MouseUp(At(model.Rooms[0]), MouseButton.Left); + + // A drag that starts on a room pans and walks nowhere. + var from = At(model.Rooms[1]); + window.MouseDown(from, MouseButton.Left); + window.MouseMove(from + new Vector(30, 12)); + window.MouseUp(from + new Vector(30, 12), MouseButton.Left); + var pan = canvas.Pan; + + window.MouseWheel(At(model.Rooms[0]), new Vector(0, 2)); + var zoom = canvas.Zoom; + + window.MouseDown(At(model.Rooms[0]), MouseButton.Right); + window.MouseUp(At(model.Rooms[0]), MouseButton.Right); + return (walked, pan, zoom, clientSaw); + }); + + await Assert.That(walked).IsEquivalentTo(new long[] { 2 }); + await Assert.That(pan).IsEqualTo(new Vector(30, 12)); + await Assert.That(zoom).IsGreaterThan(1.0); + await Assert.That(clientSaw.Count).IsEqualTo(2).Because("only the right click is handed on, pressed and released"); + await Assert.That(clientSaw[0]).Contains(MouseFlags.Button3Pressed); + } + + // ── helpers ────────────────────────────────────────────────────────────────────────────────── + + private static SharpMUTermApp InlineWindowApp(AvaloniaConsoleDriver driver) => + new(DemoScene.Build(), WindowHost.Create(driver, clipboard: null) with + { + Capabilities = WindowOptions.Capabilities, + Audio = null, + Presence = null, + Announcer = null, + RunsInline = true, + }); + + private static void Offer(AvaloniaConsoleDriver driver, Action>> menu) + { + ((IPointerPresenter)driver.Pointer).HeaderActions([new HeaderAction(HeaderAction.LayoutsId, "Layouts", "⌥M", menu)]); + Drain(); + } + + private static void Publish(AvaloniaConsoleDriver driver, PaneRect rect) => + ((IPointerPresenter)driver.Pointer).Panels( + [new PanelOverlay(PanelIds.Vitals, "panel:vitals:demo", rect, new PanelInk("#3ccf6a", "#ff5555", "#333338"), Vitals)]); + + private static void Drain() => global::Avalonia.Threading.Dispatcher.UIThread.RunJobs(); + + private static Task Run( + Func body, int columns = 40, int rows = 10) => + Session.Dispatch(() => + { + var driver = new AvaloniaConsoleDriver(columns, rows); + var view = new TerminalView(driver, SKColors.White, Back, 16, null); + var layer = new DesktopLayer(view); + var root = new Panel(); + root.Children.Add(view); + root.Children.Add(layer); + var window = new Window { Content = root, WindowDecorations = WindowDecorations.BorderOnly }; + var size = view.SizeFor(columns, rows); + window.Width = size.Width; + window.Height = size.Height; + window.Show(); + view.Focus(); + driver.Flush(); + Drain(); + try + { + return body(window, view, layer, driver); + } + finally + { + window.Close(); + driver.Dispose(); + } + }, CancellationToken.None); + + private static global::Avalonia.Media.Color Pixel(global::Avalonia.Media.Imaging.WriteableBitmap bitmap, double x, double y) + { + using var buffer = bitmap.Lock(); + var bytes = new byte[buffer.RowBytes * buffer.Size.Height]; + System.Runtime.InteropServices.Marshal.Copy(buffer.Address, bytes, 0, bytes.Length); + var i = ((int)y * buffer.RowBytes) + ((int)x * 4); + return buffer.Format == global::Avalonia.Platform.PixelFormat.Rgba8888 + ? global::Avalonia.Media.Color.FromRgb(bytes[i], bytes[i + 1], bytes[i + 2]) + : global::Avalonia.Media.Color.FromRgb(bytes[i + 2], bytes[i + 1], bytes[i]); + } + + private static HeadlessUnitTestSession Session => TerminalViewTests.Session; +} diff --git a/tests/SharpMUTerm.Avalonia.Tests/TerminalViewTests.cs b/tests/SharpMUTerm.Avalonia.Tests/TerminalViewTests.cs index c13d75a9..67a5ec90 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/TerminalViewTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/TerminalViewTests.cs @@ -286,7 +286,7 @@ public async Task APanesScrollbarIsPaintedOnItsRightEdgeAndDraggingItScrollsInst : global::Avalonia.Media.Color.FromRgb(bytes[i + 2], bytes[i + 1], bytes[i]); } - private static readonly HeadlessUnitTestSession Session = HeadlessUnitTestSession.StartNew(typeof(TestApp)); + internal static readonly HeadlessUnitTestSession Session = HeadlessUnitTestSession.StartNew(typeof(TestApp)); private static Task Run(Func body, WindowDecorations decorations = WindowDecorations.Full) => Session.Dispatch(() => diff --git a/tests/SharpMUTerm.Client.Tests/PanelModelTests.cs b/tests/SharpMUTerm.Client.Tests/PanelModelTests.cs new file mode 100644 index 00000000..62f43f8c --- /dev/null +++ b/tests/SharpMUTerm.Client.Tests/PanelModelTests.cs @@ -0,0 +1,51 @@ +using SharpMUTerm.Client.Commands; +using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Client.Panels; +using SharpMUTerm.Core.Mapping; + +namespace SharpMUTerm.Client.Tests; + +/// The view-models both hosts draw native or cell views from, and the layout library's command ids. +public class PanelModelTests +{ + [Test] + public async Task TwoVitalsModelsWithTheSameMetersAreEqual() + { + static VitalsModel Make() => new([new VitalsMeter("hp", "10", "20", true, 0.5, false)], new VitalsTarget("a rat", 0.1)); + + await Assert.That(Make()).IsEqualTo(Make()); + await Assert.That(Make().GetHashCode()).IsEqualTo(Make().GetHashCode()); + await Assert.That(Make().Target!.Low).IsTrue(); + await Assert.That(new VitalsMeter("mp", "1", null, false, null, false).Title).IsEqualTo("Mana"); + await Assert.That(new VitalsMeter("rage", "1", null, false, null, false).Title).IsEqualTo("rage"); + } + + [Test] + public async Task TheMapViewIsTheCurrentLevelAndAreaWithEachExitOnce() + { + var map = new WorldMap(); + map.Add(new MapRoom { Id = 1, Name = "Plaza", AreaId = 1, X = 0, Y = 0, Exits = { ["north"] = 2, ["up"] = 3 } }); + map.Add(new MapRoom { Id = 2, Name = "Road", AreaId = 1, X = 0, Y = -1, Exits = { ["south"] = 1 } }); + map.Add(new MapRoom { Id = 3, Name = "Tower", AreaId = 1, X = 0, Y = 0, Z = 1 }); + map.Add(new MapRoom { Id = 4, Name = "Elsewhere", AreaId = 2, X = 5, Y = 5 }); + + var view = MapViewModel.From(map, 1, [2], "walking, 1 to go"); + + await Assert.That(view.Rooms.Select(r => r.Id)).IsEquivalentTo(new long[] { 1, 2 }); + await Assert.That(view.Exits).IsEquivalentTo(new[] { new MapViewExit(1, 2) }); + await Assert.That(view.Current!.Name).IsEqualTo("Plaza"); + await Assert.That(view.Rooms.Single(r => r.Id == 2).Ahead).IsTrue(); + await Assert.That(MapViewModel.From(map, 1, [2], "walking, 1 to go")).IsEqualTo(view); + } + + [Test] + public async Task TheLayoutLibraryIsAFamilyThatListsNothingButHandlesItsIds() + { + var registry = new ContributionRegistry(); + BuiltInCommands.Register(registry, _ => true); + + await Assert.That(registry.Commands.Resolve(LayoutCommands.Apply("combat"))).IsNotNull(); + await Assert.That(registry.Commands.Resolve(LayoutCommands.SaveChanges)).IsNotNull(); + await Assert.That(registry.Commands.Resolve("layout:layouts")).IsNotNull(); + } +} From 5afb6bbc15f41a5c5b1cc60157967e02afa2d761 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 04:44:33 +0000 Subject: [PATCH 015/113] Split a scrolled-back pane, and join lines a server hard-wrapped MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Scrolling a pane back now splits it inside its own rectangle: the history being read on top, a band ("scrolled back N rows · End returns · ⌥F freezes"), and the newest lines still arriving below. It reuses freeze's two-viewport layout with the window's own control and viewport kept on top, so the scroll keys, wheel, search landing and status row are unchanged; the tail is a re-fed copy of the buffer's last lines and indexes nothing. A split pane is not "scrolled back" for unread badging. F7 ▸ SCROLLBACK turns it off. F5 ▸ join wraps (per world, off by default) joins rows a server broke at its own column, at ingest and before the triggers, through a conservative ServerWrapJoiner: full row, unpunctuated end, lower-case continuation, same style, no prompts, structure or column layouts. A full row is held until the next line or 250 ms of quiet. New snapshot views: scrollback-split, reflow. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 10 + CLAUDE.md | 53 +++- .../Settings/BuiltInSettings.cs | 7 + .../Configuration/PreferenceSettings.cs | 8 + .../Configuration/WorldDefinition.cs | 9 + src/SharpMUTerm.Core/Session/WorldSession.cs | 111 ++++++- src/SharpMUTerm.Core/Text/ServerWrapJoiner.cs | 270 ++++++++++++++++ src/SharpMUTerm.Tui/InputBarControl.cs | 2 +- src/SharpMUTerm.Tui/ScrollSplitBarRenderer.cs | 38 +++ .../SharpMUTermApp.ReflowScene.cs | 100 ++++++ .../SharpMUTermApp.ScrollSplit.cs | 274 ++++++++++++++++ src/SharpMUTerm.Tui/SharpMUTermApp.cs | 53 +++- src/SharpMUTerm.Tui/SnapshotViews.cs | 2 +- src/SharpMUTerm.Tui/WorldsScreenRenderer.cs | 20 +- .../Session/WorldSessionReflowTests.cs | 147 +++++++++ .../Text/ServerWrapJoinerTests.cs | 293 ++++++++++++++++++ .../ActivityBarDwellTests.cs | 10 +- .../SharpMUTerm.Tui.Tests/AwayDividerTests.cs | 38 +-- .../FrameContrastTests.cs | 4 + .../JoinWrapsFieldTests.cs | 50 +++ .../OutputScrollbackTests.cs | 20 +- .../SharpMUTerm.Tui.Tests/ScreenModelTests.cs | 15 +- .../SharpMUTerm.Tui.Tests/ScrollSplitTests.cs | 211 +++++++++++++ .../SnapshotViewEmptyConfigTests.cs | 2 +- .../TabActivityIndicatorTests.cs | 1 + .../WindowActivityBoundaryTests.cs | 4 +- 26 files changed, 1705 insertions(+), 47 deletions(-) create mode 100644 src/SharpMUTerm.Core/Text/ServerWrapJoiner.cs create mode 100644 src/SharpMUTerm.Tui/ScrollSplitBarRenderer.cs create mode 100644 src/SharpMUTerm.Tui/SharpMUTermApp.ReflowScene.cs create mode 100644 src/SharpMUTerm.Tui/SharpMUTermApp.ScrollSplit.cs create mode 100644 tests/SharpMUTerm.Core.Tests/Session/WorldSessionReflowTests.cs create mode 100644 tests/SharpMUTerm.Core.Tests/Text/ServerWrapJoinerTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/JoinWrapsFieldTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/ScrollSplitTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index e3c3266a..16cc6df1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,16 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- Scrolling a pane back splits it: the history you are reading stays on top, a band says how far back you + are (`scrolled back 120 rows · End returns · ⌥F freezes`), and the newest lines keep arriving underneath. + End (with the cursor at the end of the command line), Ctrl+End, or scrolling the history back down to its end + closes it; ⌥F turns it into a freeze. The split is inside the pane, so the game is not told a new window + size. Text & display (F7) ▸ *split the pane when scrolled back* turns it off. +- Worlds & Characters (F5) has a `join wraps` row on each world: on, lines the game broke at its own width + (usually 78 or 80 columns) are joined back together, so a paragraph fills a wide pane and does not wrap twice + in a narrow one. It is careful — it joins only a full row that ends mid-sentence onto a row that carries on in + lower case, in the same colour — and triggers see the joined line. It applies to lines that arrive after you + turn it on. - Ctrl+P matches as you type by initials and fragments, not only by prefix: `trig sel` finds *Make a trigger from the selection*, and the letters it matched are highlighted. The commands you last ran from it are listed first under RECENT, followed by what the moment suggests (copy while something is selected, back to diff --git a/CLAUDE.md b/CLAUDE.md index 6ddf5c59..6001116d 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -501,6 +501,51 @@ fallbacks) for inline images/maps. it. A window that gained nothing gets no bar. - **`SimulateKey` used to discard a global shortcut's result** and swallow the key either way. Harmless while every claim returned true; wrong the moment one declined, and it now honours the decline. +- **Scrolling a pane back splits it** (`SharpMUTermApp.ScrollSplit.cs`, `ScrollSplitBarRenderer`; F7 ▸ + SCROLLBACK ▸ `split the pane when scrolled back`, on by default; the `scrollback-up`/`scrollback-split` views). + History on top, a band (`── scrolled back 120 rows · End returns · ⌥F freezes ──`), the live tail below. + Decisions not to relitigate: + - **It is freeze's layout, not a third way of drawing a pane** — one more arm of `BuildTabContent`, the same + two-viewport grid as `BuildFrozenContent`. But the halves are the other way round: the window's *own* + control and its *own* `_paneScrolls[windowId]` viewport stay on top, so the scroll position, the + scrollback keys, the wheel, `ScrollTarget`, `RevealSearchBar`/`RevealAwayBar` and the status row's segment + all keep addressing the viewport they always did. The bottom (`tail:`) is a *copy* of the buffer's + last `TailLines` (64) lines, re-fed by `RefreshScrollTail` wherever the window's control is told about a + change (`AppendWindowLine`, `RepaintPane`, `InsertImageRows`). It indexes nothing, so no chrome row, trim + or picture has a split point to move — which is why it is not built on `_freezePoints`. + - **Opened and closed in `SyncScrollbackState`**, where every scroll route lands: open while the window's + viewport is detached (`!AutoScroll`) and scrollable, closed once it re-attaches — scrolling the history down + to its end, ⌃End, or bare End. **Bare End is claimed only while a split is open and the command line's + caret is already at its end** (`CaretAtEnd`), where End has nothing left to do in the editor and where a + caret rests after typing; anywhere else End is the editor's and a second press returns. Also closed by ⌥F + (freeze takes over and splits at its freeze point, as it always does), by a frozen pane, and with the setting off. + - **The tail is 30% of the pane's viewport, at least 3 rows, and the history keeps at least 3** + (`TailRowsFor`); a pane shorter than 7 rows does not split. Fixed when the split opens (a `Cells` row), + not re-derived per frame. + - **Inside the pane rectangle, so NAWS never moves**: the band and the tail are rows of the tab's content; + `PaneOutputRects` is unchanged (`ScrollingBackSplitsThePane…` pins it). + - **A split pane is not "scrolled back" for the workspace** (`SetScrolledBack(…, !AutoScroll && !split)`): + its new lines are on screen in the tail, so they badge nothing and record no `NEW` boundary. + - **The band's count is the status row's figure** (display rows below the history viewport, capped through + `UnreadBadge` in a reserved field), refreshed on `PostBufferPaint` with the status row repainted beside it + when it moves, so the two surfaces never disagree. It says *rows*, not lines: a buffer index is not a + viewport row. +- **F5 ▸ `join wraps` joins the lines a server hard-wrapped** (`ServerWrapJoiner`, Core; `WorldSession.Reflow`; + `WorldDefinition.JoinWrappedLines`, off by default; the `reflow` view). **A false join is worse than a missed + one**, so every condition is a reason not to join: the wrap column is known (third-longest of the last 128 + non-blank lines, at least 8 seen, at least 40); neither line is a prompt, blank, rule-coloured, interactive + (MXP), or holds a three-space run (a column layout); the first row is *full* — within `Slack` (max(8, col/6)) + of the column, no longer than it, and the next line's first word would not have fitted (one cell of + tolerance) — and ends in a letter, digit or comma (never a hyphen); the next starts unindented with a + lower-case letter; the style at the break is the same on both sides. Joined with one space; a paragraph + chains, each decision against the previous *physical* row. Decisions not to relitigate: + - **Ingest-time, in Core, before the triggers** — so a trigger matches the line the player reads, including + a phrase the server split. Like `strip incoming colour`, it changes the next line and never history. + - **A full row is held until the next line says whether it continues**, and released after + `ReflowHold` (250 ms) of quiet, by a prompt, a blank line, a parser swap or a disconnect — so nothing is + shown out of order and only the last full row of a burst is ever late (a paragraph's last row is short and + never held). The read loop and that timer share `_ingestGate`; nothing on the UI thread or in a script takes + it, so it cannot close a cycle with the script host's lock. Rebuilt per connection, like the parser. - **Every server's MSSP report is kept, and the INFO screen reads it** (`MsspCache`, Core; `mssp.json` beside `config.json`, keyed by `host:port`; F5 ▸ `i`). Fourth of the `save:`/`logRoot:`/`restore:` family with **one deliberate difference**: the constructor parameter is null by default like the @@ -1130,7 +1175,11 @@ python3 tools/ansi_frame_to_image.py frame.ansi frame.html # or .svg a report, a server that answered and publishes none, and a world nothing has dialled; all three reached by driving the real `i` into a real F5, and all three needed because the two empty ones are the pair it is easy to conflate), `web`, - `rail-long`, `scrollback`, `scrollback-up`, `freeze-scrollback`, + `rail-long`, `scrollback`, `scrollback-up` (now the split opening, since split scrollback is on by default), + `scrollback-split` (the split doing its job: scrolled back, then more output arriving in the live tail under + the band while the history stays put), `reflow` (one room as a server wrapping at 78 sends it, then the same + rows through `ServerWrapJoiner` — ragged short of the edge at 120 columns, wrapping twice at 80), + `freeze-scrollback`, `links` (a URL too long for the pane it arrived in — a split, so the pane is narrower than the terminal, which is the whole defect; the frame shows one underlined span running to the pane's edge and continuing on the next row), `away`/`away-scrollback` (the bar marking where the reader was when they tabbed away from the @@ -1211,7 +1260,7 @@ python3 tools/ansi_frame_to_image.py frame.ansi frame.html # or .svg `LogFolder` or a fake sink would have passed all along. It also let a pile of per-test `character.Logging = new LoggingSettings()` workarounds be deleted — with them gone the suite exercises the gate, and an unfixed build leaks seven files a run instead of three. -- **Four views have more output than a pane holds** — `scrollback`, `scrollback-up`, +- **Five views have more output than a pane holds** — `scrollback`, `scrollback-up`, `scrollback-split`, `freeze-scrollback` and `away-scrollback`. Name them, rather than saying "the `scroll*` views": the prefix has now twice lagged behind the set it claimed to describe, and a reader looking for a long-output view goes by the list. (`away` is the shallow one and fits.) Every other view fits too, diff --git a/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs b/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs index c700a2b9..d3652a7b 100644 --- a/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs +++ b/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs @@ -32,6 +32,9 @@ public static class BuiltInSettings /// The bar marking where a reader left a window. public const string ActivityGroup = "Activity"; + /// What a pane does when it is scrolled back. + public const string ScrollbackGroup = "Scrollback"; + /// Game sound; drawn only where a host passes the sound settings. public const string SoundGroup = "Sound"; @@ -100,6 +103,10 @@ public static class BuiltInSettings c => c.Text.ActivityBarSeconds, (c, v) => c.Text.ActivityBarSeconds = v, "how long the NEW bar stays once you are back; 0 retires it at once", "unread new away"), + Flag("split-scrollback", "split the pane when scrolled back", ScrollbackGroup, + c => c.Text.SplitScrollback, (c, v) => c.Text.SplitScrollback = v, + "keep the newest lines in view below the history you are reading", "live tail history split"), + Flag("sound", "game sound", SoundGroup, c => c.Sound.Enabled, (c, v) => c.Sound.Enabled = v, "play the sounds and music a world sends", "audio mcmp msp"), diff --git a/src/SharpMUTerm.Core/Configuration/PreferenceSettings.cs b/src/SharpMUTerm.Core/Configuration/PreferenceSettings.cs index 4a643d5a..258f9da3 100644 --- a/src/SharpMUTerm.Core/Configuration/PreferenceSettings.cs +++ b/src/SharpMUTerm.Core/Configuration/PreferenceSettings.cs @@ -155,6 +155,14 @@ public sealed class TextSettings /// public int ActivityBarSeconds { get; set; } = DefaultActivityBarSeconds; + /// + /// Whether scrolling a pane back splits it: the history being read above, a band saying how far back it + /// is, and the newest few rows still arriving below (F7 ▸ SCROLLBACK, on by default). The split is inside + /// the pane, so it costs no cell of the pane's rectangle and reports no new size to a server. Off, a pane + /// scrolls as a whole, as it always did. A display setting, read when a pane is next scrolled back. + /// + public bool SplitScrollback { get; set; } = true; + /// Thirty seconds: long enough to read a screenful, short enough not to become furniture. public const int DefaultActivityBarSeconds = 30; diff --git a/src/SharpMUTerm.Core/Configuration/WorldDefinition.cs b/src/SharpMUTerm.Core/Configuration/WorldDefinition.cs index c234a6ce..8b64c6dc 100644 --- a/src/SharpMUTerm.Core/Configuration/WorldDefinition.cs +++ b/src/SharpMUTerm.Core/Configuration/WorldDefinition.cs @@ -181,6 +181,14 @@ public sealed class WorldDefinition /// public string? GrabPrefix { get; set; } + /// + /// Whether lines this world hard-wrapped at its own column are joined back together, so a paragraph + /// reflows to the pane it is read in (F5 ▸ join wraps). Off by default. Read per line at ingest, + /// so it changes the next line and never the ones already shown; triggers see the joined line. The rule + /// is 's, and it is deliberately conservative. + /// + public bool JoinWrappedLines { get; set; } + /// /// The world's accent colour, used to keep its windows traceable to their owner once they /// scatter across panes. Default resolves to a theme-derived accent. @@ -231,6 +239,7 @@ public sealed class WorldDefinition Map = Map.Clone(), DownloadMedia = DownloadMedia, GrabPrefix = GrabPrefix, + JoinWrappedLines = JoinWrappedLines, GmcpLogin = GmcpLogin, DiscordPresence = DiscordPresence, Layout = Layout, diff --git a/src/SharpMUTerm.Core/Session/WorldSession.cs b/src/SharpMUTerm.Core/Session/WorldSession.cs index 4c7a4530..ab0f9499 100644 --- a/src/SharpMUTerm.Core/Session/WorldSession.cs +++ b/src/SharpMUTerm.Core/Session/WorldSession.cs @@ -330,9 +330,13 @@ private void UpgradeParser(ContentFormat format) return; } - if (_parser.Flush() is { } tail) + lock (_ingestGate) { - ProcessOutputLine(tail); + ReleaseHeldLine(); + if (_parser.Flush() is { } tail) + { + ProcessOutputLine(tail); + } } _parser = NewParser(format); @@ -595,6 +599,11 @@ public async Task ConnectAsync(CancellationToken cancellationToken = default) // negotiated again to take it back off ANSI. _parser = NewParser(World.ContentFormat); + // No lock: the old connection's read loop has ended (its transport is disposed above), and a release + // timer still pending checks it is releasing for this joiner before it does anything. + _reflowRelease?.Dispose(); + _wrapJoiner = new ServerWrapJoiner(); + // Re-read with the parser, so an F5 change to the world's emoji switches reaches the next connection. _emoji = NewEmoji(World.Emoji); @@ -674,9 +683,97 @@ public async Task ConnectAsync(CancellationToken cancellationToken = default) } private void OnOutputReceived(object? sender, TelnetOutputEventArgs e) + { + lock (_ingestGate) + { + IngestOutput(e); + } + } + + /// + /// The joiner for , rebuilt per connection like the parser: + /// the wrap column it has learnt and any line it holds belong to one stream. + /// + private ServerWrapJoiner _wrapJoiner = new(); + + /// + /// Serialises the read loop (output, a parser swap, the disconnect) against the timer that releases a held + /// line (). Nothing on the UI thread or in a script takes it, so it cannot close a + /// cycle with the script host's lock, which a trigger script takes from inside it. + /// + private readonly object _ingestGate = new(); + + /// The pending release of a held line, or null when nothing is held. + private IDisposable? _reflowRelease; + + /// + /// How long a line that might continue waits for the next before it is shown as it is. Short, because the + /// only line ever held is a full row at the end of a burst — the rows of a paragraph arrive in + /// one write, and its last row is short and is never held. + /// + public TimeSpan ReflowHold { get; set; } = TimeSpan.FromMilliseconds(250); + + /// + /// Hands a completed line on, through the joiner when this world joins the server's wraps. Every + /// ordinary line of output goes through here; a prompt, a deliberate blank line and a parser swap release + /// what is held first (), so nothing is ever shown out of order. + /// + private void Reflow(StyledLine line) + { + if (!World.JoinWrappedLines) + { + ReleaseHeldLine(); + ProcessOutputLine(line); + return; + } + + foreach (var ready in _wrapJoiner.Push(line)) + { + ProcessOutputLine(ready); + } + + if (_wrapJoiner.Holding) + { + CancelReflowHold(); + var joiner = _wrapJoiner; + _reflowRelease = Scheduler.After(ReflowHold, () => + { + lock (_ingestGate) + { + if (ReferenceEquals(joiner, _wrapJoiner)) + { + ReleaseHeldLine(); + } + } + }, "reflow-hold"); + } + else + { + CancelReflowHold(); + } + } + + /// Shows the line the joiner is holding, unjoined, if it is holding one. Call under . + private void ReleaseHeldLine() + { + CancelReflowHold(); + if (_wrapJoiner.Flush() is { } held) + { + ProcessOutputLine(held); + } + } + + private void CancelReflowHold() + { + _reflowRelease?.Dispose(); + _reflowRelease = null; + } + + private void IngestOutput(TelnetOutputEventArgs e) { if (e.IsPrompt) { + ReleaseHeldLine(); _parser.Feed(e.Text); var flushed = _parser.Flush(); var raw = flushed ?? StyledLine.Empty; @@ -703,18 +800,19 @@ private void OnOutputReceived(object? sender, TelnetOutputEventArgs e) var emitted = false; foreach (var completed in _parser.Feed(e.Text)) { - ProcessOutputLine(completed); + Reflow(completed); emitted = true; } var tail = _parser.Flush(); if (tail is not null) { - ProcessOutputLine(tail); + Reflow(tail); emitted = true; } else if (!emitted && _parser is not MxpParser { LineSwallowed: true }) { + ReleaseHeldLine(); ProcessOutputLine(StyledLine.Empty); } } @@ -1235,6 +1333,11 @@ private void OnEncodingChanged(object? sender, SessionEncodingEventArgs e) private void OnDisconnected(object? sender, SessionDisconnectedEventArgs e) { + lock (_ingestGate) + { + ReleaseHeldLine(); + } + CancelGmcpLogin(); StopTimers(); ClearPrompt(); diff --git a/src/SharpMUTerm.Core/Text/ServerWrapJoiner.cs b/src/SharpMUTerm.Core/Text/ServerWrapJoiner.cs new file mode 100644 index 00000000..881b50e9 --- /dev/null +++ b/src/SharpMUTerm.Core/Text/ServerWrapJoiner.cs @@ -0,0 +1,270 @@ +namespace SharpMUTerm.Core.Text; + +/// +/// Joins back together the lines a server broke at its own wrap column, so a paragraph reflows to the pane +/// it is read in rather than to the 78 or 80 columns the game assumed (F5 ▸ join wraps, per world, +/// off by default; ). +/// +/// A false join is worse than a missed one, so every condition below is a reason not to join +/// and they all have to pass. A missed join leaves the text exactly as the server sent it, which is what +/// every client shows today; a false join glues a room's exits onto its description or a channel line onto +/// the one above it, and nothing on screen says it happened. The rule, exactly: +/// +/// +/// The wrap column is known: it is the third longest of the last +/// non-blank lines (trailing spaces ignored), once there are of them, and only +/// if it is at least . Third rather than first so one or two over-long lines +/// do not move it; a block of wide ASCII art does, upwards, which stops joining while it is in the window — +/// the safe direction to fail in. +/// Neither line is a prompt, blank, carries a rule colour, or holds an interactive span (an MXP +/// <SEND>, link or image): structured lines are the server's layout, not its wrapping. +/// Neither line has a run of three spaces inside it — a column layout (a who list, a score sheet) +/// is not prose. +/// The first line is full: no longer than the wrap column, no shorter than it by more than +/// , and the next line's first word would not have fitted on it (within one cell, +/// since the column is the longest row seen and can fall a cell short of the server's) — the signature of +/// a greedy word wrap, and the one condition that tells a wrapped line from a short line that happens to +/// end unpunctuated. +/// The first line ends in a letter, a digit or a comma. Not a full stop, colon, closing quote, +/// bracket or hyphen: a hyphen would have to be either kept or dropped, and both are wrong half the +/// time. +/// The next line starts, with no indentation, with a lower-case letter. +/// The style the first line ends in is the style the next one starts in. +/// +/// +/// Lines are joined with one space. A paragraph of several rows chains, each decision taken against the +/// previous physical row (its length is what the server measured), never against the joined line. +/// +/// +/// It is a stream: a line that could be continued is held until the next one says whether it is. The +/// session releases a held line after a short quiet period too (WorldSession.ReflowHold), so only +/// the last full row of a burst is ever delayed — the last row of a paragraph is short, and a short row is +/// never held. +/// +/// +public sealed class ServerWrapJoiner +{ + /// How many recent lines the wrap column is estimated from. + public const int SampleWindow = 128; + + /// How many non-blank lines must have been seen before anything is joined. + public const int MinimumSamples = 8; + + /// Below this a "wrap column" is short output, not wrapping, and nothing is joined. + public const int MinimumWrapColumn = 40; + + private readonly Queue _lengths = new(); + private StyledLine? _held; + private StyledLine? _lastPhysical; + + /// The wrap column the stream has shown so far, or null while it is unknown. + public int? WrapColumn + { + get + { + if (_lengths.Count < MinimumSamples) + { + return null; + } + + var third = _lengths.OrderByDescending(l => l).Skip(2).First(); + return third >= MinimumWrapColumn ? third : null; + } + } + + /// How far short of the wrap column a row may end and still be called full. + public static int Slack(int wrapColumn) => Math.Max(8, wrapColumn / 6); + + /// Whether a line is waiting for the next one to say whether it continues. + public bool Holding => _held is not null; + + /// + /// Takes the next line of the stream and returns the lines that are now final, in order: none while a + /// line is held, the held line (joined or not) once it is settled, and then possibly this one. + /// + public IReadOnlyList Push(StyledLine line) + { + ArgumentNullException.ThrowIfNull(line); + Observe(line); + + var ready = new List(2); + if (_held is { } held && _lastPhysical is { } last) + { + if (WrapColumn is { } column && Continues(last, line, column)) + { + _held = Join(held, line); + _lastPhysical = line; + if (!IsFull(line, column)) + { + ready.Add(_held); + _held = null; + _lastPhysical = null; + } + + return ready; + } + + ready.Add(held); + _held = null; + _lastPhysical = null; + } + + if (WrapColumn is { } wrap && IsFull(line, wrap)) + { + _held = line; + _lastPhysical = line; + } + else + { + ready.Add(line); + } + + return ready; + } + + /// Releases the held line, if there is one: the stream went quiet, or something else is about to be shown. + public StyledLine? Flush() + { + var held = _held; + _held = null; + _lastPhysical = null; + return held; + } + + /// + /// Whether is a row the server filled: the conditions that are about the first + /// line alone (items 2–5 of the rule, less the next word's fit). + /// + public static bool IsFull(StyledLine line, int wrapColumn) + { + ArgumentNullException.ThrowIfNull(line); + if (!IsPlainProse(line)) + { + return false; + } + + var text = line.Text.TrimEnd(); + if (text.Length > wrapColumn || text.Length < wrapColumn - Slack(wrapColumn)) + { + return false; + } + + var last = text[^1]; + return char.IsLetterOrDigit(last) || last == ','; + } + + /// + /// Whether continues , a row already known to be + /// full: the conditions that need both lines (items 4, 6 and 7 of the rule). + /// + public static bool Continues(StyledLine previous, StyledLine next, int wrapColumn) + { + ArgumentNullException.ThrowIfNull(previous); + ArgumentNullException.ThrowIfNull(next); + if (!IsFull(previous, wrapColumn) || !IsPlainProse(next)) + { + return false; + } + + var text = next.Text; + if (!char.IsLower(text[0])) + { + return false; + } + + // The next line's first word would not have fitted on the previous one, so the server had to break. + // One cell of tolerance, because the column is the longest row seen, which can fall a cell short of + // the server's own. + var firstWord = text.IndexOf(' ') is var space and >= 0 ? space : text.TrimEnd().Length; + if (previous.Text.TrimEnd().Length + 1 + firstWord < wrapColumn) + { + return false; + } + + return LastStyle(previous) == next.Spans[0].Style; + } + + /// One line made of two, with a single space where the server broke it. + public static StyledLine Join(StyledLine previous, StyledLine next) + { + ArgumentNullException.ThrowIfNull(previous); + ArgumentNullException.ThrowIfNull(next); + + var spans = new List(previous.Spans.Count + next.Spans.Count + 1); + spans.AddRange(previous.Spans); + + // Trailing whitespace off the first line, so the join is exactly one space whatever the server padded with. + while (spans.Count > 0 && spans[^1].Text.TrimEnd() is var trimmed && trimmed.Length < spans[^1].Text.Length) + { + var span = spans[^1]; + spans.RemoveAt(spans.Count - 1); + if (trimmed.Length > 0) + { + spans.Add(new StyledSpan(trimmed, span.Style, span.Interaction)); + break; + } + } + + var style = spans.Count > 0 ? spans[^1].Style : TextStyle.Default; + spans.Add(new StyledSpan(" ", style)); + spans.AddRange(next.Spans); + return new StyledLine(spans, previous.RuleColor, previous.IsPrompt); + } + + /// Records a line's length towards the wrap column. Blank lines say nothing about it. + private void Observe(StyledLine line) + { + var length = line.Text.TrimEnd().Length; + if (length == 0 || line.IsPrompt) + { + return; + } + + _lengths.Enqueue(length); + while (_lengths.Count > SampleWindow) + { + _lengths.Dequeue(); + } + } + + /// Item 2 and 3 of the rule: an ordinary run of text, not a prompt, a structure or a column layout. + private static bool IsPlainProse(StyledLine line) + { + if (line.IsPrompt || line.RuleColor is not null || line.Spans.Count == 0) + { + return false; + } + + foreach (var span in line.Spans) + { + if (span.IsInteractive) + { + return false; + } + } + + var text = line.Text; + var start = 0; + while (start < text.Length && text[start] == ' ') + { + start++; + } + + var body = text.AsSpan(start).TrimEnd(); + return body.Length > 0 && body.IndexOf(" ", StringComparison.Ordinal) < 0; + } + + /// The style of the last visible character of a line. + private static TextStyle LastStyle(StyledLine line) + { + for (var i = line.Spans.Count - 1; i >= 0; i--) + { + if (line.Spans[i].Text.TrimEnd().Length > 0) + { + return line.Spans[i].Style; + } + } + + return line.Spans[^1].Style; + } +} diff --git a/src/SharpMUTerm.Tui/InputBarControl.cs b/src/SharpMUTerm.Tui/InputBarControl.cs index 2ae86c63..a07bc082 100644 --- a/src/SharpMUTerm.Tui/InputBarControl.cs +++ b/src/SharpMUTerm.Tui/InputBarControl.cs @@ -237,7 +237,7 @@ private void ApplyColors() } /// Whether the caret is after the last character, which is the only place ⇥ completes. - private bool CaretAtEnd() + internal bool CaretAtEnd() { var text = Text; var last = text.LastIndexOf('\n'); diff --git a/src/SharpMUTerm.Tui/ScrollSplitBarRenderer.cs b/src/SharpMUTerm.Tui/ScrollSplitBarRenderer.cs new file mode 100644 index 00000000..7f8c4e89 --- /dev/null +++ b/src/SharpMUTerm.Tui/ScrollSplitBarRenderer.cs @@ -0,0 +1,38 @@ +namespace SharpMUTerm.Tui; + +/// +/// The band across a pane split by scrolling back (── scrolled back 120 rows · End returns · ⌥F freezes ──), +/// between the history being read above and the live tail below. Fifth of the boundary bars, and like +/// it is both the label and the divider. Pure, so its width is testable. +/// +internal static class ScrollSplitBarRenderer +{ + /// + /// The bar for a viewport display rows above its newest line, exactly + /// cells wide. The count is a reserved field capped the way the status row's is + /// (), so the label does not move as output arrives; the hints are dropped, last + /// first, when the pane is too narrow for them, and the rule takes whatever is left. + /// + public static string Bar(int rowsBack, int width, string accentHex) + { + ArgumentException.ThrowIfNullOrEmpty(accentHex); + + var count = UnreadBadge.Format(Math.Max(1, rowsBack)).PadLeft(UnreadBadge.FieldWidth); + var label = $"{Glyphs.Scrollback} scrolled back {count} rows"; + string[] hints = ["End returns", "⌥F freezes"]; + + for (var keep = hints.Length; keep >= 0; keep--) + { + var hint = keep == 0 ? string.Empty : " · " + string.Join(" · ", hints.Take(keep)); + var lead = keep > 0 || width >= label.Length + 4 ? "── " : string.Empty; + var used = lead.Length + label.Length + hint.Length + 1; // lead + label + hints + " " + if (used + 2 <= width || keep == 0) + { + var rule = new string('─', Math.Max(0, width - used)); + return $"[dim]{lead}[/][{accentHex}]{MarkupText.Escape(label)}[/][dim]{MarkupText.Escape(hint)} {rule}[/]"; + } + } + + return string.Empty; // unreachable: keep == 0 always returns + } +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.ReflowScene.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.ReflowScene.cs new file mode 100644 index 00000000..ee8bb794 --- /dev/null +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.ReflowScene.cs @@ -0,0 +1,100 @@ +using SharpMUTerm.Core.Text; + +namespace SharpMUTerm.Tui; + +/// +/// The reflow snapshot view: one room as a server that wraps at 78 columns sends it, shown twice in the +/// main window — first as the rows arrived, then through as a world with F5 ▸ +/// join wraps on shows it. The demo has no live session, so the joiner is run here over the same rows a +/// session would hand it; WorldSessionReflowTests pins the session doing the same. +/// +internal sealed partial class SharpMUTermApp +{ + /// The column the demo's server wraps at. + internal const int ReflowSceneColumn = 78; + + /// The demo room, as prose; wrapped at on the way in. + internal static readonly string[] ReflowSceneParagraphs = + [ + "The Grand Bazaar sprawls beneath a canopy of patched sailcloth. Stalls lean against one another in " + + "crooked rows, their awnings dyed every colour a merchant could afford, and the travelling Merchants " + + "of the Salt Road call out their prices over the clatter of carts.", + ]; + + /// + /// Lays the scene into the main window. Sized to fit an 80x24 pane with both halves showing: one + /// paragraph and the exits line, which is never joined (it starts with a capital), in each half. + /// + private void LoadReflowScene() + { + var rows = new List(); + foreach (var paragraph in ReflowSceneParagraphs) + { + rows.AddRange(GreedyWrap(paragraph, ReflowSceneColumn).Select(r => StyledLine.FromText(r, TextStyle.Default))); + } + + rows.Add(StyledLine.FromText("Obvious exits: north, south, east and down.", TextStyle.Default)); + + AppendWindowLine(MainWindowId, $"[dim]── join wraps off · as sent, wrapped at {ReflowSceneColumn}[/]"); + foreach (var row in rows) + { + AppendWindowLine(MainWindowId, _formatter.ToMarkup(row)); + } + + AppendWindowLine(MainWindowId, "[dim]── join wraps on · the same rows, joined[/]"); + + // Taught the column the way a session learns it, from lines it has already seen. + var joiner = new ServerWrapJoiner(); + for (var i = 0; i < ServerWrapJoiner.MinimumSamples; i++) + { + foreach (var row in rows) + { + joiner.Push(row); + } + } + + joiner.Flush(); + foreach (var row in rows) + { + foreach (var ready in joiner.Push(row)) + { + AppendWindowLine(MainWindowId, _formatter.ToMarkup(ready)); + } + } + + if (joiner.Flush() is { } held) + { + AppendWindowLine(MainWindowId, _formatter.ToMarkup(held)); + } + } + + /// A greedy word wrap, the way a server does it. + internal static List GreedyWrap(string text, int width) + { + var rows = new List(); + var row = string.Empty; + foreach (var word in text.Split(' ')) + { + if (row.Length == 0) + { + row = word; + } + else if (row.Length + 1 + word.Length <= width) + { + row += " " + word; + } + else + { + rows.Add(row); + row = word; + } + } + + if (row.Length > 0) + { + rows.Add(row); + } + + return rows; + } +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.ScrollSplit.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.ScrollSplit.cs new file mode 100644 index 00000000..9063a7ef --- /dev/null +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.ScrollSplit.cs @@ -0,0 +1,274 @@ +using SharpConsoleUI; +using SharpConsoleUI.Controls; +using SharpConsoleUI.Layout; +using SharpConsoleUI.Builders; + +namespace SharpMUTerm.Tui; + +/// +/// Split scrollback (F7 ▸ SCROLLBACK ▸ split the pane when scrolled back, on by default): a pane scrolled +/// back off its live tail splits into the history being read above, a band saying how far back it is, and the +/// newest rows still arriving below — what Mudlet and TinTin++ readers expect, where before the new lines +/// landed out of sight under the viewport. +/// +/// It is freeze's layout with a different trigger, not a third way of drawing a pane. The same grid of +/// two scroll viewports and a one-row bar (), the same ScrollViewFor +/// viewports, chosen by the same branch of . What differs is which half is the +/// window's real control: freeze moves the live control to the bottom and pins a copy of the history above; +/// here the window's own control and its own viewport stay on top — so the reader's scroll position, the +/// scrollback keys, the wheel, ⌃F's landing and the status row's segment all keep working on the viewport +/// they always addressed — and the bottom is a view of the buffer's last +/// lines, re-fed from it. It indexes nothing, so no chrome row, trim or picture has a split point to move. +/// +/// +internal sealed partial class SharpMUTermApp +{ + /// Windows currently split, and how many rows their live tail was given when the split opened. + private readonly Dictionary _scrollSplits = new(StringComparer.Ordinal); + + /// Each split window's live-tail control: a copy of the buffer's newest lines. + private readonly Dictionary _scrollTails = new(StringComparer.Ordinal); + + /// Each split window's band. + private readonly Dictionary _scrollSplitBars = new(StringComparer.Ordinal); + + /// What each band last said, so an unchanged count costs no repaint. + private readonly Dictionary _scrollSplitBarText = new(StringComparer.Ordinal); + + /// The share of a pane the live tail takes when a split opens. + internal const double TailShare = 0.3; + + /// The fewest rows a live tail is given, and the fewest the history above it keeps. + internal const int MinimumSplitRows = 3; + + /// + /// How many of the newest lines the live tail holds. Far more than it shows — a line wraps into several + /// rows in a narrow pane — and few enough that re-feeding it per line costs nothing worth measuring. + /// + internal const int TailLines = 64; + + /// + /// The rows a live tail gets in a pane whose viewport is tall, or zero when the + /// pane is too short to split: 30% of it, at least , leaving the history and + /// the band at least that many and one. + /// + internal static int TailRowsFor(int paneRows) + { + var tail = Math.Max(MinimumSplitRows, (int)Math.Round(paneRows * TailShare)); + return paneRows - 1 - tail >= MinimumSplitRows ? tail : 0; + } + + /// Whether the workspace counts a window as scrolled back, which is what unread badging reads. + internal bool IsWindowScrolledBack(string windowId) => _workspace.FindWindow(windowId)?.ScrolledBack ?? false; + + /// Whether a window is drawn split by scrollback right now. + internal bool IsScrollSplit(string windowId) => _scrollSplits.ContainsKey(windowId); + + /// + /// Opens or closes a window's split to match its viewport: open while the viewport is off its live tail, + /// closed once it is back (the reader scrolled the history down to its end, ⌃End, or End), when the pane is + /// frozen (freeze is the other split, and takes over), and when the setting is off. Called from + /// , where every scroll route lands. + /// + private void SyncScrollSplit(string windowId) + { + var open = _scrollSplits.ContainsKey(windowId); + var pane = _workspace.Layout.FindWindow(windowId); + var live = _paneScrolls.GetValueOrDefault(windowId); + var eligible = _config.Text.SplitScrollback + && pane is { Frozen: false } + && string.Equals(pane.ActiveTab, windowId, StringComparison.Ordinal) + && _panes.ContainsKey(windowId) + && !string.Equals(windowId, WebWindowId, StringComparison.Ordinal) + && live is not null; + var wanted = eligible && !live!.AutoScroll && Scrollable(live); + + if (open && !wanted) + { + CloseScrollSplit(windowId); + RebuildPaneArea(); + return; + } + + if (!open && wanted) + { + var tail = TailRowsFor(live!.ViewportHeight); + if (tail == 0) + { + return; + } + + _scrollSplits[windowId] = tail; + RefreshScrollTail(windowId); + RebuildPaneArea(); + } + + if (_scrollSplits.ContainsKey(windowId)) + { + RefreshScrollSplitBar(windowId); + } + } + + /// Forgets a window's split without rebuilding; the caller rebuilds (or is about to). + private void CloseScrollSplit(string windowId) + { + _scrollSplits.Remove(windowId); + if (_scrollTails.TryGetValue(windowId, out var tail)) + { + tail.ClearSelection(); + tail.SetContent(new List()); + } + } + + /// Drops everything a closed window kept for its split. + private void ForgetScrollSplit(string windowId) + { + _scrollSplits.Remove(windowId); + _scrollTails.Remove(windowId); + _scrollSplitBars.Remove(windowId); + _scrollSplitBarText.Remove(windowId); + _paneScrolls.Remove(TailRegionKey(windowId)); + } + + /// The key of a split window's live-tail half. + private static string TailRegionKey(string windowId) => $"tail:{windowId}"; + + /// + /// A split window's content: the window's own control in its own viewport, the band, and the live tail. + /// The tail's height is set when the split opens and kept for its life; history takes the rest. + /// + private IWindowControl BuildScrollSplitContent(string windowId, string title) + { + var live = PaneContentFor(windowId, title); + var tail = ScrollTailFor(windowId); + RefreshScrollTail(windowId); + var bar = ScrollSplitBarFor(windowId); + RefreshScrollSplitBar(windowId); + + var grid = Controls.Grid() + .WithAlignment(HorizontalAlignment.Stretch) + .WithVerticalAlignment(VerticalAlignment.Fill); + grid.Rows(GridLength.Star(1), GridLength.Cells(1), GridLength.Cells(_scrollSplits[windowId])) + .Columns(GridLength.Star(1)); + grid.Place(ScrollViewFor(windowId, live), 0, 0, 1, 1); + grid.Place(bar, 1, 0, 1, 1); + grid.Place(ScrollViewFor(TailRegionKey(windowId), tail), 2, 0, 1, 1); + return grid.Build(); + } + + private MarkupControl ScrollTailFor(string windowId) + { + if (_scrollTails.TryGetValue(windowId, out var existing)) + { + return existing; + } + + var control = new MarkupControl(new List()); + control.LinkClicked += (_, e) => OnLinkClicked(windowId, e.Url); + EnableSelection(control); + _scrollTails[windowId] = control; + return control; + } + + private MarkupControl ScrollSplitBarFor(string windowId) + { + if (_scrollSplitBars.TryGetValue(windowId, out var existing)) + { + return existing; + } + + var bar = new MarkupControl(new List()) { Wrap = false }; + _scrollSplitBars[windowId] = bar; + return bar; + } + + /// + /// Re-feeds a split window's live tail from the buffer's newest lines. Called after every change to the + /// buffer the window's own control is told about — an appended line, a re-feed, a picture — so the two + /// halves never disagree about the newest line. + /// + private void RefreshScrollTail(string windowId) + { + if (!_scrollSplits.ContainsKey(windowId) || !_lines.TryGetValue(windowId, out var buffer)) + { + return; + } + + var tail = ScrollTailFor(windowId); + var from = Math.Max(0, buffer.Count - TailLines); + FeedRange(tail, buffer, from, buffer.Count - from); + if (_paneScrolls.GetValueOrDefault(TailRegionKey(windowId)) is { } panel) + { + panel.AutoScroll = true; + } + } + + /// + /// Re-writes a split window's band from its history viewport: the rows below what the reader is looking + /// at, the same figure the status row's scrollback segment reports, so the two never disagree. + /// + private bool RefreshScrollSplitBar(string windowId) + { + if (!_scrollSplits.ContainsKey(windowId) || _paneScrolls.GetValueOrDefault(windowId) is not { } panel) + { + return false; + } + + var bar = ScrollSplitBarFor(windowId); + var width = panel.ViewportWidth > 0 ? panel.ViewportWidth : 80; + var below = panel.TotalContentHeight - panel.ViewportHeight - panel.VerticalScrollOffset; + var markup = ScrollSplitBarRenderer.Bar(below, width, _ink.Notice); + if (!string.Equals(_scrollSplitBarText.GetValueOrDefault(windowId), markup, StringComparison.Ordinal)) + { + _scrollSplitBarText[windowId] = markup; + bar.SetContent(new List { markup }); + return true; + } + + return false; + } + + /// + /// Keeps every band's count current; rides PostBufferPaint, where viewport metrics are fresh. A count + /// that moved is a count the status row's scrollback segment also reports, so the row is repainted with it + /// and the two never disagree. It converges: the next frame finds both unchanged. + /// + private void SyncScrollSplitBars() + { + var changed = false; + foreach (var windowId in _scrollSplits.Keys) + { + changed |= RefreshScrollSplitBar(windowId); + } + + if (changed) + { + RefreshStatusRow(); + } + } + + /// + /// Bare End returns a split pane to its live tail, but only when the caret is already at the end of the + /// command line: there End has nothing left to do in the editor, and that is where a caret rests after + /// typing. Anywhere else End is the editor's, and a second End returns. + /// + private bool TryEndReturnsFromSplit(KeyPressedEventArgs e) + { + if (e.KeyInfo.Key != ConsoleKey.End || e.KeyInfo.Modifiers != 0) + { + return false; + } + + var windowId = _workspace.Layout.FocusedPane.ActiveTab ?? MainWindowId; + if (!_scrollSplits.ContainsKey(windowId) || !ActiveBar().CaretAtEnd() + || _paneScrolls.GetValueOrDefault(windowId) is not { } panel) + { + return false; + } + + e.Handled = true; + BackToLive(panel); + SyncScrollbackState(); + return true; + } +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 9d6212e1..1c68a710 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -1000,6 +1000,7 @@ public SharpMUTermApp( PublishScrollbars(); SyncMapSizes(); SyncPanelSizes(); + SyncScrollSplitBars(); }; if (_sixel is not null) { @@ -1496,6 +1497,31 @@ public string RenderSnapshot(string? view = null) } } + // Split scrollback (F7 ▸ SCROLLBACK): the same long buffer scrolled back with real PgUp keys, and then + // more output arriving — which lands in the live tail under the band while the history the reader + // scrolled to stays exactly where it was. `scrollback-up` shows the split opening; this one shows it + // doing its job. + if (string.Equals(view, "scrollback-split", StringComparison.OrdinalIgnoreCase)) + { + LoadLongScene(MainWindowId, ScrollbackSceneLines); + SettleScroll(); + SimulateKey(new ConsoleKeyInfo('\0', ConsoleKey.PageUp, false, false, false)); + SimulateKey(new ConsoleKeyInfo('\0', ConsoleKey.PageUp, false, false, false)); + SettleScroll(); + LoadLongScene(MainWindowId, 4, first: ScrollbackSceneLines + 1); + SettleScroll(); + ReArmWholeFrame(); + } + + // F5 ▸ join wraps: one room as a server wrapping at 78 sends it, then the same rows joined. In a pane + // wider than 80 the first block stops short of the edge; in a narrower one its rows wrap again. + if (string.Equals(view, "reflow", StringComparison.OrdinalIgnoreCase)) + { + LoadReflowScene(); + SettleScroll(); + ReArmWholeFrame(); + } + // The bar marking where the reader was when they tabbed away from the terminal. Two views, // because the two states it has are the two ends of the consumption rule. `away` is a shallow // absence: the bar and everything below it are on screen at once, which is the frame where the @@ -3233,6 +3259,8 @@ private void AppendWindowLine( { control.AppendLine(Compose(buffer[^1])); } + + RefreshScrollTail(windowId); } /// The most lines a pane's buffer (and so its control) is trimmed back to. @@ -3475,6 +3503,8 @@ private void RepaintPane(string windowId) { FeedRange(control, buffer, 0, buffer.Count); } + + RefreshScrollTail(windowId); } /// @@ -4349,6 +4379,8 @@ private void InsertImageRows(string windowId, long anchor, IReadOnlyList { control.AppendLine(row); } + + RefreshScrollTail(windowId); } else { @@ -6194,6 +6226,11 @@ private bool TryScrollKey(KeyPressedEventArgs e) return false; } + if (TryEndReturnsFromSplit(e)) + { + return true; + } + Action? scroll = (key, ctrl, shift) switch { (ConsoleKey.PageUp, false, _) => panel => panel.ScrollVerticalBy(-PageRows(panel)), @@ -6307,8 +6344,12 @@ private void ScrollFocusedPane(Action move) private void SyncScrollbackState(string? windowId = null) { windowId ??= ActiveWindowId(); + + // A split pane is not one whose new lines go unseen — they are arriving in its live tail — so it is + // not "scrolled back" for the unread badge or the activity bar, whatever its history viewport says. + SyncScrollSplit(windowId); if (_paneScrolls.GetValueOrDefault(windowId) is { } live - && _workspace.SetScrolledBack(windowId, !live.AutoScroll)) + && _workspace.SetScrolledBack(windowId, !live.AutoScroll && !IsScrollSplit(windowId))) { RefreshTabTitles(); } @@ -9118,6 +9159,10 @@ private void ToggleFreeze() var windowId = pane.ActiveTab ?? MainWindowId; _workspace.Layout.ToggleFreezeFocused(); + // Freeze is the other split, and takes over from a scrollback one: the pane splits at the freeze + // point, as ⌥F always does, and the scrollback split is forgotten rather than drawn inside it. + CloseScrollSplit(windowId); + if (pane.Frozen) { _freezePoints[windowId] = _lines.TryGetValue(windowId, out var buf) ? buf.Count : 0; @@ -10609,6 +10654,11 @@ private IWindowControl BuildTabContent(PaneNode pane, string windowId, Workspace return BuildFrozenContent(windowId, window.Title); } + if (pane.ActiveTab == windowId && _scrollSplits.ContainsKey(windowId)) + { + return BuildScrollSplitContent(windowId, window.Title); + } + if (windowId == WebWindowId) { return BuildWebContent(window.Title); @@ -12294,6 +12344,7 @@ private void CloseWindow(string id) _paneScrolls.Remove(id); // and its scroll position: a reopened window starts live _paneScrolls.Remove(FrozenRegionKey(id)); _frozenPanes.Remove(id); + ForgetScrollSplit(id); _drafts.Forget(id); // both bars: a closed window keeps neither of its two drafts _pendingGrabs.Remove(id); _secondBars.Forget(id); // and a same-id window later starts from F8's default again diff --git a/src/SharpMUTerm.Tui/SnapshotViews.cs b/src/SharpMUTerm.Tui/SnapshotViews.cs index fb5474d4..289d3513 100644 --- a/src/SharpMUTerm.Tui/SnapshotViews.cs +++ b/src/SharpMUTerm.Tui/SnapshotViews.cs @@ -20,7 +20,7 @@ internal static class SnapshotViews "menu", "menu-split", "menu-fuzzy", "menu-recent", "messages", "quit", "connections", "characters", "tint", "tint-input", "tint-input-moved", "tint-tabs", "compose", "compose-literal", "moo-edit", "mssp", "mssp-none", "mssp-never", "web", - "rail-long", "scrollback", "scrollback-up", "links", "away", "away-scrollback", + "rail-long", "scrollback", "scrollback-up", "scrollback-split", "reflow", "links", "away", "away-scrollback", "search", "search-regex", "search-all", "search-landed", "activity-bar", "mxp-image", "mxp-figure", "input-selection", "selection", "trigger-builder", "prefix", "prefix-panel", "focus", "focus-moved", "tabs", "tabs-many", diff --git a/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs b/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs index 3a951dcb..b5b6940e 100644 --- a/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs +++ b/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs @@ -99,6 +99,12 @@ internal static class WorldsScreenRenderer /// : the layout this world's characters use, or the suggestion. internal const int WorldLayoutField = 15; + /// , as one of . + internal const int JoinWrapsField = 16; + + /// F5's words for : off shows rows as the server sent them. + internal static readonly string[] JoinWrapChoices = ["off", "join"]; + /// What a world with no layout of its own reads as: the suggestion it accepted, else Roleplay. internal const string WorldLayoutDefault = "(suggested)"; @@ -512,7 +518,12 @@ internal static ScreenModel Model( "layout", () => LayoutName(all, w.Layout) ?? WorldLayoutDefault, v => w.Layout = LayoutId(all, v), - LayoutChoices(all, WorldLayoutDefault)))) + LayoutChoices(all, WorldLayoutDefault)), + ScreenField.Choice( + "join wraps", + () => w.JoinWrappedLines ? JoinWrapChoices[1] : JoinWrapChoices[0], + v => w.JoinWrappedLines = v == JoinWrapChoices[1], + JoinWrapChoices))) .Concat(WorldButtons(worlds, selectedWorld, info)) .ToArray(); @@ -1074,6 +1085,13 @@ world.GrabPrefix is { } grab cursor, selectedWorld, WorldLayoutField)), + WorldField("join wraps", Field( + world.JoinWrappedLines + ? $"[{Value}]{JoinWrapChoices[1]} lines the server wrapped[/]" + : $"[{Label}]{JoinWrapChoices[0]} · rows as the server sent them[/]", + cursor, + selectedWorld, + JoinWrapsField)), string.Empty, $"[{accent}]├ CHARACTERS[/] [{Label}]a character is a connection[/]", }); diff --git a/tests/SharpMUTerm.Core.Tests/Session/WorldSessionReflowTests.cs b/tests/SharpMUTerm.Core.Tests/Session/WorldSessionReflowTests.cs new file mode 100644 index 00000000..d00a1777 --- /dev/null +++ b/tests/SharpMUTerm.Core.Tests/Session/WorldSessionReflowTests.cs @@ -0,0 +1,147 @@ +using SharpMUTerm.Core.Automation; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Session; +using SharpMUTerm.Core.Text; + +namespace SharpMUTerm.Core.Tests.Session; + +/// F5 ▸ join wraps, through a real session: ingest-time, triggers see the joined line, nothing out of order. +public class WorldSessionReflowTests +{ + private static readonly string[] Paragraph = + [ + "The market square is crowded with stalls selling everything from bolts of", + "dyed cloth to barrels of salted fish, and the noise of haggling rises above", + "the clatter of carts as travelling merchants call out their wares.", + ]; + + private const string Joined = + "The market square is crowded with stalls selling everything from bolts of " + + "dyed cloth to barrels of salted fish, and the noise of haggling rises above " + + "the clatter of carts as travelling merchants call out their wares."; + + private static (WorldSession Session, FakeTelnetSession Telnet, List Printed) Create( + bool join, TriggerSet? set = null) + { + var telnet = new FakeTelnetSession(); + var world = new WorldDefinition { Name = "T", Host = "h", Port = 1, JoinWrappedLines = join }; + var session = new WorldSession(world, triggerSets: set is null ? null : new[] { set }, sessionFactory: _ => telnet) + { + ReflowHold = TimeSpan.FromHours(1), // released only by what the tests send + }; + var printed = new List(); + session.LinePrinted += (_, l) => printed.Add(l); + return (session, telnet, printed); + } + + /// Lines a server filled to 76 columns, so the session learns the wrap column. + private static void Warm(FakeTelnetSession telnet) + { + for (var i = 0; i < ServerWrapJoiner.MinimumSamples; i++) + { + telnet.EmitLine(new string('=', 75) + "."); + } + } + + private static List Output(List printed) => + printed.Select(l => l.Text).Where(t => !t.StartsWith("***", StringComparison.Ordinal) && !t.StartsWith("===", StringComparison.Ordinal)).ToList(); + + [Test] + public async Task AWorldThatJoinsShowsTheParagraphAsOneLine() + { + var (session, telnet, printed) = Create(join: true); + await session.ConnectAsync(); + Warm(telnet); + + foreach (var row in Paragraph) + { + telnet.EmitLine(row); + } + + await Assert.That(Output(printed)).IsEquivalentTo(new[] { Joined }); + } + + [Test] + public async Task AWorldThatDoesNotShowsTheRowsAsSent() + { + var (session, telnet, printed) = Create(join: false); + await session.ConnectAsync(); + Warm(telnet); + + foreach (var row in Paragraph) + { + telnet.EmitLine(row); + } + + await Assert.That(Output(printed)).IsEquivalentTo(Paragraph); + } + + [Test] + public async Task ATriggerMatchesAcrossTheServersBreak() + { + var set = new TriggerSet(); + set.Triggers.Add(new Trigger { Pattern = "bolts of dyed cloth", Actions = new TriggerActions { SpawnTarget = "Shop" } }); + var (session, telnet, _) = Create(join: true, set); + var spawned = new List(); + session.SpawnLine += (_, e) => spawned.Add(e.Line.Text); + await session.ConnectAsync(); + Warm(telnet); + + foreach (var row in Paragraph) + { + telnet.EmitLine(row); + } + + await Assert.That(spawned).IsEquivalentTo(new[] { Joined }); + } + + [Test] + public async Task APromptReleasesAHeldLineFirst() + { + var (session, telnet, printed) = Create(join: true); + await session.ConnectAsync(); + Warm(telnet); + + telnet.EmitLine(Paragraph[0]); + await Assert.That(Output(printed)).IsEmpty(); + + telnet.EmitPrompt("HP:100>"); + + await Assert.That(Output(printed)).IsEquivalentTo(new[] { Paragraph[0], "HP:100>" }); + } + + [Test] + public async Task AHeldLineIsShownWhenTheStreamGoesQuiet() + { + var (session, telnet, printed) = Create(join: true); + session.ReflowHold = TimeSpan.FromMilliseconds(20); + await session.ConnectAsync(); + Warm(telnet); + + telnet.EmitLine(Paragraph[0]); + + var deadline = DateTime.UtcNow.AddSeconds(5); + while (Output(printed).Count == 0 && DateTime.UtcNow < deadline) + { + await Task.Delay(10); + } + + await Assert.That(Output(printed)).IsEquivalentTo(new[] { Paragraph[0] }); + } + + [Test] + public async Task ADisconnectReleasesAHeldLineBeforeItsOwnMessage() + { + var (session, telnet, printed) = Create(join: true); + await session.ConnectAsync(); + Warm(telnet); + + telnet.EmitLine(Paragraph[0]); + await telnet.DisconnectAsync(); + + var texts = printed.Select(l => l.Text).ToList(); + var held = texts.IndexOf(Paragraph[0]); + await Assert.That(held).IsGreaterThanOrEqualTo(0); + await Assert.That(texts.FindIndex(t => t.StartsWith("*** Disconnected", StringComparison.Ordinal))).IsGreaterThan(held); + } +} diff --git a/tests/SharpMUTerm.Core.Tests/Text/ServerWrapJoinerTests.cs b/tests/SharpMUTerm.Core.Tests/Text/ServerWrapJoinerTests.cs new file mode 100644 index 00000000..b6a9acee --- /dev/null +++ b/tests/SharpMUTerm.Core.Tests/Text/ServerWrapJoinerTests.cs @@ -0,0 +1,293 @@ +using SharpMUTerm.Core.Text; + +namespace SharpMUTerm.Core.Tests.Text; + +public class ServerWrapJoinerTests +{ + private const string Prose = + "The market square is crowded with stalls selling everything from bolts of dyed cloth to " + + "barrels of salted fish, and the noise of haggling rises above the clatter of carts as " + + "travelling merchants call out their wares to anyone who will listen, while a pair of " + + "bored guards lean on their spears by the fountain and watch the crowd for cutpurses and " + + "trouble of every other kind that a busy morning tends to bring with it."; + + /// A greedy word wrap, the way a server does it. + private static List Wrap(string text, int width) + { + var rows = new List(); + var row = string.Empty; + foreach (var word in text.Split(' ')) + { + if (row.Length == 0) + { + row = word; + } + else if (row.Length + 1 + word.Length <= width) + { + row += " " + word; + } + else + { + rows.Add(row); + row = word; + } + } + + if (row.Length > 0) + { + rows.Add(row); + } + + return rows; + } + + private static StyledLine Line(string text) => StyledLine.FromText(text, TextStyle.Default); + + /// Teaches a joiner the wrap column with lines the server filled, and throws away what they produce. + private static ServerWrapJoiner Warmed(int width = 78) + { + var joiner = new ServerWrapJoiner(); + for (var i = 0; i < ServerWrapJoiner.MinimumSamples; i++) + { + joiner.Push(Line(new string('x', width - 1) + ".")); + joiner.Push(Line(new string('y', width - 2) + ".")); + } + + joiner.Flush(); + return joiner; + } + + private static List Run(ServerWrapJoiner joiner, IEnumerable rows) + { + var shown = new List(); + foreach (var row in rows) + { + shown.AddRange(joiner.Push(Line(row)).Select(l => l.Text)); + } + + if (joiner.Flush() is { } held) + { + shown.Add(held.Text); + } + + return shown; + } + + [Test] + public async Task AParagraphTheServerWrappedComesBackAsOneLine() + { + var rows = Wrap(Prose, 78); + await Assert.That(rows.Count).IsGreaterThan(3); + + var shown = Run(Warmed(), rows); + + await Assert.That(shown).Count().IsEqualTo(1); + await Assert.That(shown[0]).IsEqualTo(Prose); + } + + [Test] + public async Task NothingIsJoinedBeforeTheWrapColumnIsKnown() + { + var rows = Wrap(Prose, 78); + var shown = Run(new ServerWrapJoiner(), rows.Take(3)); + + await Assert.That(shown).IsEquivalentTo(rows.Take(3)); + } + + [Test] + public async Task TheWrapColumnIsTheThirdLongestRecentLine() + { + var joiner = new ServerWrapJoiner(); + foreach (var length in new[] { 50, 60, 70, 75, 78, 120, 200, 40 }) + { + joiner.Push(Line(new string('a', length) + ".")); + } + + // 201 and 121 are outliers; the third longest (79, with its full stop) is the column. + await Assert.That(joiner.WrapColumn).IsEqualTo(79); + } + + [Test] + public async Task AShortStreamHasNoWrapColumn() + { + var joiner = new ServerWrapJoiner(); + for (var i = 0; i < 20; i++) + { + joiner.Push(Line("You hit the rat.")); + } + + await Assert.That(joiner.WrapColumn).IsNull(); + } + + [Test] + public async Task ARowEndingInAFullStopIsNotContinuedEvenByALowerCaseLine() + { + var first = "The merchants have packed away their stalls for the evening and gone home."; + var shown = Run(Warmed(), new[] { first, "then the rain begins to fall." }); + + await Assert.That(shown).Count().IsEqualTo(2); + } + + [Test] + public async Task ALineStartingWithACapitalIsNotAContinuation() + { + var rows = new[] + { + "The merchants have packed away their stalls for the evening and gone home to", + "Merchants Row, where the lamps are already lit and the shutters are closed.", + }; + + var shown = Run(Warmed(), rows); + + await Assert.That(shown).IsEquivalentTo(rows); + } + + [Test] + public async Task AShortRowIsNeverHeldOrJoined() + { + var rows = new[] { "You are hungry", "and thirsty." }; + var joiner = Warmed(); + + var first = joiner.Push(Line(rows[0])); + + await Assert.That(joiner.Holding).IsFalse(); + await Assert.That(first.Select(l => l.Text)).IsEquivalentTo(new[] { rows[0] }); + } + + [Test] + public async Task ARowTheNextWordWouldHaveFittedOnIsNotJoined() + { + // 66 characters: "and" would have fitted on it at 78, so the server did not have to break here. + var first = "The merchants have packed away their stalls for the evening, alone"; + await Assert.That(first.Length).IsLessThan(78 - 4); + var shown = Run(Warmed(), new[] { first, "and the square is empty." }); + + await Assert.That(shown).Count().IsEqualTo(2); + } + + [Test] + public async Task AnIndentedNextLineStartsAParagraph() + { + var rows = new[] + { + "The merchants have packed away their stalls for the evening and gone home to", + " supper while the square empties under the first drops of a cold rain.", + }; + + var shown = Run(Warmed(), rows); + + await Assert.That(shown).IsEquivalentTo(rows); + } + + [Test] + public async Task AColumnLayoutIsNotProse() + { + var rows = new[] + { + "Ann level 12 warrior online for three hours and some minutes ago", + "bob level 3 thief idle", + }; + + var shown = Run(Warmed(), rows); + + await Assert.That(shown).IsEquivalentTo(rows); + } + + [Test] + public async Task AHyphenAtTheBreakIsLeftAlone() + { + var rows = new[] + { + "The merchants have packed away their stalls for the evening and the well-", + "known tavern on the corner has opened its doors to the soaking crowd outside.", + }; + + var shown = Run(Warmed(), rows); + + await Assert.That(shown).IsEquivalentTo(rows); + } + + [Test] + public async Task AChangeOfStyleAtTheBreakIsNotJoined() + { + var joiner = Warmed(); + var first = Line("The merchants have packed away their stalls for the evening and gone home to"); + var red = new TextStyle(TerminalColor.FromIndex(1), TerminalColor.Default, TextAttributes.None); + var second = StyledLine.FromText("supper while the square empties under the first drops of rain.", red); + + var shown = joiner.Push(first).Concat(joiner.Push(second)).ToList(); + + await Assert.That(shown).Count().IsEqualTo(2); + } + + [Test] + public async Task AnInteractiveSpanKeepsALineToItself() + { + var joiner = Warmed(); + var link = new StyledLine(new[] + { + new StyledSpan("The merchants have packed away their stalls for the evening and gone ", TextStyle.Default), + new StyledSpan("home", TextStyle.Default, new SpanInteraction(InteractionKind.SendCommand, "home")), + }); + + joiner.Push(link); + + await Assert.That(joiner.Holding).IsFalse(); + } + + [Test] + public async Task APromptIsNeverJoined() + { + var prompt = StyledLine.FromText( + "The merchants have packed away their stalls for the evening and gone home to", + TextStyle.Default).WithPrompt(true); + + await Assert.That(ServerWrapJoiner.IsFull(prompt, 78)).IsFalse(); + } + + [Test] + public async Task AJoinKeepsEachSidesStylesAndPutsOneSpaceAtTheBreak() + { + var green = new TextStyle(TerminalColor.FromIndex(2), TerminalColor.Default, TextAttributes.None); + var first = new StyledLine(new[] + { + new StyledSpan("A ", TextStyle.Default), + new StyledSpan("green", green), + new StyledSpan(" word ", TextStyle.Default), + }); + var joined = ServerWrapJoiner.Join(first, Line("continues")); + + await Assert.That(joined.Text).IsEqualTo("A green word continues"); + await Assert.That(joined.Spans[1].Style).IsEqualTo(green); + } + + [Test] + public async Task AFullRowFollowedByABlankLineIsShownAsItWas() + { + var full = "The merchants have packed away their stalls for the evening and gone home to"; + var shown = Run(Warmed(), new[] { full, string.Empty, "supper." }); + + await Assert.That(shown).IsEquivalentTo(new[] { full, string.Empty, "supper." }); + } + + [Test] + public async Task ANarrowerServerReflowsToo() + { + var rows = Wrap(Prose, 60); + var shown = Run(Warmed(60), rows); + + await Assert.That(shown).IsEquivalentTo(new[] { Prose }); + } + + [Test] + public async Task TwoParagraphsStayTwo() + { + var second = "Somewhere beyond the walls a bell is ringing for the evening meal, and the gulls wheel " + + "over the harbour crying for scraps from the boats that came in with the tide."; + var rows = Wrap(Prose, 78).Concat(Wrap(second, 78)).ToList(); + + var shown = Run(Warmed(), rows); + + await Assert.That(shown).IsEquivalentTo(new[] { Prose, second }); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/ActivityBarDwellTests.cs b/tests/SharpMUTerm.Tui.Tests/ActivityBarDwellTests.cs index 331cc67a..e4badb28 100644 --- a/tests/SharpMUTerm.Tui.Tests/ActivityBarDwellTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/ActivityBarDwellTests.cs @@ -49,10 +49,10 @@ private static (SharpMUTermApp App, WorldSession Session, ManualTimeProvider Tim private static void DrawAndRead(SharpMUTermApp app, WorldSession session) { session.PrintSystem("*** before you left"); - app.SimulateKey(Key(ConsoleKey.End)); + app.SimulateKey(Key(ConsoleKey.LeftArrow)); session.PrintSystem("*** while you were away"); app.SimulateReturnFromAway(TimeSpan.FromMinutes(2)); - app.SimulateKey(Key(ConsoleKey.End)); + app.SimulateKey(Key(ConsoleKey.LeftArrow)); } [Test] @@ -64,11 +64,11 @@ public async Task TheBarSurvivesBeingReadPastUntilTheFloorHasElapsed() await Assert.That(app.AwayBarIndex(Main)).IsNotNull(); time.Advance(TimeSpan.FromSeconds(29)); - app.SimulateKey(Key(ConsoleKey.End)); + app.SimulateKey(Key(ConsoleKey.LeftArrow)); await Assert.That(app.AwayBarIndex(Main)).IsNotNull(); time.Advance(TimeSpan.FromSeconds(2)); - app.SimulateKey(Key(ConsoleKey.End)); + app.SimulateKey(Key(ConsoleKey.LeftArrow)); await Assert.That(app.AwayBarIndex(Main)).IsNull(); } @@ -107,7 +107,7 @@ public async Task TimePassingIsNotEnoughOnItsOwn() app.SimulateScrollKey(Key(ConsoleKey.PageUp)); time.Advance(TimeSpan.FromMinutes(5)); - app.SimulateKey(Key(ConsoleKey.End)); + app.SimulateKey(Key(ConsoleKey.LeftArrow)); await Assert.That(app.AwayBarIndex(Main)).IsNotNull(); } diff --git a/tests/SharpMUTerm.Tui.Tests/AwayDividerTests.cs b/tests/SharpMUTerm.Tui.Tests/AwayDividerTests.cs index bae0ee1e..016dae1e 100644 --- a/tests/SharpMUTerm.Tui.Tests/AwayDividerTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/AwayDividerTests.cs @@ -36,7 +36,7 @@ public async Task AReturnDrawsTheBarWhereTheReaderLeft() { var (app, session, _) = Bound(); session.PrintSystem("*** before you left"); - app.SimulateKey(Key(ConsoleKey.End)); // the reader is here; this is the boundary + app.SimulateKey(Key(ConsoleKey.LeftArrow)); // the reader is here; this is the boundary session.PrintSystem("*** while you were away"); session.PrintSystem("*** and again"); @@ -61,7 +61,7 @@ public async Task AWindowThatGainedNothingGetsNoBar() { var (app, session, _) = Bound(); session.PrintSystem("*** before you left"); - app.SimulateKey(Key(ConsoleKey.End)); + app.SimulateKey(Key(ConsoleKey.LeftArrow)); app.SimulateReturnFromAway(TimeSpan.FromHours(2)); @@ -75,11 +75,11 @@ public async Task AWindowThatGainedNothingGetsNoBar() public async Task ASecondReturnReplacesTheFirstBar() { var (app, session, _) = Bound(); - app.SimulateKey(Key(ConsoleKey.End)); + app.SimulateKey(Key(ConsoleKey.LeftArrow)); session.PrintSystem("*** first absence"); app.SimulateReturnFromAway(TimeSpan.FromMinutes(5)); - app.SimulateKey(Key(ConsoleKey.End)); + app.SimulateKey(Key(ConsoleKey.LeftArrow)); session.PrintSystem("*** second absence"); app.SimulateReturnFromAway(TimeSpan.FromMinutes(9)); @@ -100,7 +100,7 @@ public async Task ASecondReturnReplacesTheFirstBar() public async Task TheBarSurvivesTheFrameItIsDrawnIn() { var (app, session, _) = Bound(); - app.SimulateKey(Key(ConsoleKey.End)); + app.SimulateKey(Key(ConsoleKey.LeftArrow)); session.PrintSystem("*** while you were away"); app.SimulateReturnFromAway(TimeSpan.FromMinutes(12)); app.RenderWholeFrame(); @@ -112,12 +112,12 @@ public async Task TheBarSurvivesTheFrameItIsDrawnIn() public async Task TheBarGoesOnceItHasBeenSeenAndTheReaderTouchesSomething() { var (app, session, _) = Bound(); - app.SimulateKey(Key(ConsoleKey.End)); + app.SimulateKey(Key(ConsoleKey.LeftArrow)); session.PrintSystem("*** while you were away"); app.SimulateReturnFromAway(TimeSpan.FromMinutes(12)); app.RenderWholeFrame(); - app.SimulateKey(Key(ConsoleKey.End)); + app.SimulateKey(Key(ConsoleKey.LeftArrow)); await Assert.That(app.AwayBarIndex(Main)).IsNull(); await Assert.That(app.PaneLines(Main).Any(r => r.Contains(AwayBarRenderer.Label))).IsFalse(); @@ -142,7 +142,7 @@ public async Task TheBarGoesOnceItHasBeenSeenAndTheReaderTouchesSomething() public async Task ADeepAbsenceScrollsThePaneSoTheBarIsOnScreen() { var (app, session, _) = Bound(); - app.SimulateKey(Key(ConsoleKey.End)); + app.SimulateKey(Key(ConsoleKey.LeftArrow)); for (var i = 0; i < 200; i++) { session.PrintSystem($"*** while you were away {i}"); @@ -166,7 +166,7 @@ public async Task ADeepAbsenceScrollsThePaneSoTheBarIsOnScreen() public async Task ADeepAbsenceKeepsItsBarUntilTheReaderReadsDownToTheTail() { var (app, session, _) = Bound(); - app.SimulateKey(Key(ConsoleKey.End)); + app.SimulateKey(Key(ConsoleKey.LeftArrow)); for (var i = 0; i < 200; i++) { session.PrintSystem($"*** while you were away {i}"); @@ -177,13 +177,13 @@ public async Task ADeepAbsenceKeepsItsBarUntilTheReaderReadsDownToTheTail() app.RenderWholeFrame(); // Typing where you landed does not clear it — you have read the top of what you missed, not all. - app.SimulateKey(Key(ConsoleKey.End)); + app.SimulateKey(Key(ConsoleKey.LeftArrow)); await Assert.That(app.AwayBarIndex(Main)).IsNotNull(); // ⌃End is the way back to live output, and arriving there is the gap being crossed. app.SimulateKey(Key(ConsoleKey.End, ctrl: true)); app.RenderWholeFrame(); - app.SimulateKey(Key(ConsoleKey.End)); + app.SimulateKey(Key(ConsoleKey.LeftArrow)); await Assert.That(app.AwayBarIndex(Main)).IsNull(); } @@ -196,7 +196,7 @@ public async Task ADeepAbsenceKeepsItsBarUntilTheReaderReadsDownToTheTail() public async Task AShallowAbsenceLeavesThePaneOnItsLiveTail() { var (app, session, _) = Bound(); - app.SimulateKey(Key(ConsoleKey.End)); + app.SimulateKey(Key(ConsoleKey.LeftArrow)); session.PrintSystem("*** while you were away"); app.RenderWholeFrame(); @@ -205,7 +205,7 @@ public async Task AShallowAbsenceLeavesThePaneOnItsLiveTail() await Assert.That(Painted(app.RenderWholeFrame())).IsTrue(); // Still at the tail, so one keystroke is all it takes to be done with it. - app.SimulateKey(Key(ConsoleKey.End)); + app.SimulateKey(Key(ConsoleKey.LeftArrow)); await Assert.That(app.AwayBarIndex(Main)).IsNull(); } @@ -223,7 +223,7 @@ public async Task AShallowAbsenceLeavesThePaneOnItsLiveTail() public async Task ASecondReturnToAQuietWindowTakesTheOldBarOffTheScreen() { var (app, session, _) = Bound(); - app.SimulateKey(Key(ConsoleKey.End)); + app.SimulateKey(Key(ConsoleKey.LeftArrow)); for (var i = 0; i < 200; i++) { session.PrintSystem($"*** while you were away {i}"); @@ -249,7 +249,7 @@ public async Task ASecondReturnToAQuietWindowTakesTheOldBarOffTheScreen() public async Task TheBarIsNotCountedAsUnread() { var (app, session, _) = Bound(); - app.SimulateKey(Key(ConsoleKey.End)); + app.SimulateKey(Key(ConsoleKey.LeftArrow)); session.PrintSystem("*** while you were away"); var before = app.UnreadOf(Main); @@ -273,7 +273,7 @@ public async Task ABarTrimmedOffTheTopOfTheBufferIsForgotten() config.PaneLines = 40; var (app, session, _) = Bound(config); - app.SimulateKey(Key(ConsoleKey.End)); + app.SimulateKey(Key(ConsoleKey.LeftArrow)); session.PrintSystem("*** while you were away"); app.SimulateReturnFromAway(TimeSpan.FromMinutes(12)); await Assert.That(app.AwayBarIndex(Main)).IsNotNull(); @@ -295,7 +295,7 @@ public async Task ABarTrimmedOffTheTopOfTheBufferIsForgotten() public async Task ATabAfterAQuietGapDrawsTheBar() { var (app, session, time) = Bound(focusReporting: true); - app.SimulateKey(Key(ConsoleKey.End)); + app.SimulateKey(Key(ConsoleKey.LeftArrow)); session.PrintSystem("*** while you were away"); time.Advance(TimeSpan.FromMinutes(12)); @@ -323,7 +323,7 @@ public async Task ATabFromAReaderWhoIsSittingThereIsATab() { var (app, session, _) = Bound(focusReporting: true); ToggleSecondBar(app); - app.SimulateKey(Key(ConsoleKey.End)); + app.SimulateKey(Key(ConsoleKey.LeftArrow)); session.PrintSystem("*** a line"); await Assert.That(app.SecondBarArmed).IsTrue().Because("raising the second bar arms it"); @@ -338,7 +338,7 @@ public async Task AnAppWithNoFocusReportingClaimsNoTabAtAll() { var (app, session, time) = Bound(); ToggleSecondBar(app); - app.SimulateKey(Key(ConsoleKey.End)); + app.SimulateKey(Key(ConsoleKey.LeftArrow)); session.PrintSystem("*** while you were away"); time.Advance(TimeSpan.FromHours(3)); diff --git a/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs b/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs index 4cb736ea..e7a9efff 100644 --- a/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs @@ -48,6 +48,10 @@ public class FrameContrastTests // most to lose from a theme it was not measured against. "selection", "input-selection", "menu-fuzzy", "menu-recent", + // The split-scrollback band (the notice ink on a pane) and the reflowed room, whose two blocks carry + // dim labels and the world's own text. + "scrollback-split", "reflow", + // The four panels: who is here and the quick bar carry the accent on links, the vitals strip paints bars // and the warning in a server-driven colour, and the docked composer is an editor on its own plane. "panel-who", "panel-vitals", "panel-quickbar", "panel-composer", diff --git a/tests/SharpMUTerm.Tui.Tests/JoinWrapsFieldTests.cs b/tests/SharpMUTerm.Tui.Tests/JoinWrapsFieldTests.cs new file mode 100644 index 00000000..2a4229a6 --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/JoinWrapsFieldTests.cs @@ -0,0 +1,50 @@ +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Tui.Tests; + +/// F5's join wraps row: one world field over . +public class JoinWrapsFieldTests +{ + private static List Worlds() => + [ + new() { Name = "Aetherfall", Host = "aether.example.org", Port = 4000 }, + ]; + + [Test] + public async Task TheRowWritesTheWorldsSettingBothWays() + { + var worlds = Worlds(); + var model = WorldsScreenRenderer.Model(worlds, [], 0, 0); + var field = model.FieldAt(WorldsScreenRenderer.WorldsPane, 0, WorldsScreenRenderer.JoinWrapsField)!.Value; + + await Assert.That(field.Label).IsEqualTo("join wraps"); + await Assert.That(field.Get()).IsEqualTo("off"); + + field.Set("join"); + await Assert.That(worlds[0].JoinWrappedLines).IsTrue(); + + field.Set("off"); + await Assert.That(worlds[0].JoinWrappedLines).IsFalse(); + } + + [Test] + public async Task TheDetailColumnSaysWhatItDoes() + { + var worlds = Worlds(); + var off = WorldsScreenRenderer.DetailColumn(worlds, [], 0, 0, ScreenPalette.Accent); + worlds[0].JoinWrappedLines = true; + var on = WorldsScreenRenderer.DetailColumn(worlds, [], 0, 0, ScreenPalette.Accent); + + await Assert.That(off.Any(l => l.Contains("join wraps") && l.Contains("rows as the server sent them"))).IsTrue(); + await Assert.That(on.Any(l => l.Contains("join wraps") && l.Contains("lines the server wrapped"))).IsTrue(); + } + + [Test] + public async Task ACloneKeepsTheSetting() + { + var world = new WorldDefinition { Name = "W", JoinWrappedLines = true }; + + await Assert.That(world.Clone().JoinWrappedLines).IsTrue(); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/OutputScrollbackTests.cs b/tests/SharpMUTerm.Tui.Tests/OutputScrollbackTests.cs index e127da70..6cd15ac5 100644 --- a/tests/SharpMUTerm.Tui.Tests/OutputScrollbackTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/OutputScrollbackTests.cs @@ -42,11 +42,23 @@ public class OutputScrollbackTests private static readonly TerminalCapabilities Headless = new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + /// + /// The demo configuration with split scrollback off. This file is about the one viewport a pane scrolls + /// as a whole — what every pane does with the setting off, and the viewport a split keeps on top — so + /// the split, which shows the newest line on purpose, is ' to test. + /// + private static AppConfiguration WholePane() + { + var config = DemoScene.Build(); + config.Text.SplitScrollback = false; + return config; + } + private static SharpMUTermApp App() { // The window system reads the console for input even headless; a null reader returns EOF. Console.SetIn(TextReader.Null); - return new SharpMUTermApp(DemoScene.Build(), Headless, new HeadlessConsoleDriver(Width, Height)); + return new SharpMUTermApp(WholePane(), Headless, new HeadlessConsoleDriver(Width, Height)); } /// @@ -58,7 +70,7 @@ private static SharpMUTermApp App() private static (SharpMUTermApp App, WorldSession Session) Bound() { Console.SetIn(TextReader.Null); - var config = DemoScene.Build(); + var config = WholePane(); var app = new SharpMUTermApp(config, Headless, new HeadlessConsoleDriver(Width, Height)); var session = app.BindWorldWithoutConnecting(config.Worlds[0]); @@ -301,7 +313,7 @@ public async Task CtrlHomeReachesTheOldestLine() private static SharpMUTermApp CappedApp(int paneLines) { Console.SetIn(TextReader.Null); - var config = DemoScene.Build(); + var config = WholePane(); config.PaneLines = paneLines; return new SharpMUTermApp(config, Headless, new HeadlessConsoleDriver(Width, Height)); } @@ -516,7 +528,7 @@ public async Task TheWheelScrollsThePaneUnderThePointer() { Console.SetIn(TextReader.Null); var driver = new HeadlessConsoleDriver(Width, Height); - var app = new SharpMUTermApp(DemoScene.Build(), Headless, driver); + var app = new SharpMUTermApp(WholePane(), Headless, driver); app.RenderSnapshot("scrollback"); var bottom = app.ScrollbackOf(Main)!.Value; diff --git a/tests/SharpMUTerm.Tui.Tests/ScreenModelTests.cs b/tests/SharpMUTerm.Tui.Tests/ScreenModelTests.cs index bac21197..05ff25e7 100644 --- a/tests/SharpMUTerm.Tui.Tests/ScreenModelTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/ScreenModelTests.cs @@ -364,14 +364,15 @@ public async Task Options_NavigableRowsSkipSectionHeadersAndSpacers() var screen = OptionsScreenRenderer.TextAnsiScreen(); var model = OptionsScreenRenderer.Model(screen); - // 23 display rows: 5 group headings + 4 spacers + the meter table's column headings (drawn, never a - // stop) + 13 stops — eight settings in four groups, the three default meters, [+ meter], and the - // activity bar's hold. SOUND is left out because this caller passes no sound settings. Since F7 was - // drawn from its declared section the groups are COLOUR & LEGIBILITY, TEXT, LINKS & PICTURES, - // STATUS ROW & METERS and ACTIVITY; it was 21/10 with one row for the meters as a typed line. - await Assert.That(screen.Rows.Count).IsEqualTo(23); + // 26 display rows: 6 group headings + 5 spacers + the meter table's column headings (drawn, never a + // stop) + 14 stops — eight settings in four groups, the three default meters, [+ meter], the + // activity bar's hold and split scrollback. SOUND is left out because this caller passes no sound + // settings. Since F7 was drawn from its declared section the groups are COLOUR & LEGIBILITY, TEXT, + // LINKS & PICTURES, STATUS ROW & METERS, ACTIVITY and SCROLLBACK; it was 21/10 with one row for the + // meters as a typed line, and 23/13 before SCROLLBACK. + await Assert.That(screen.Rows.Count).IsEqualTo(26); await Assert.That(model.PaneCount).IsEqualTo(1); - await Assert.That(model.Sizes[0]).IsEqualTo(13); + await Assert.That(model.Sizes[0]).IsEqualTo(14); } /// diff --git a/tests/SharpMUTerm.Tui.Tests/ScrollSplitTests.cs b/tests/SharpMUTerm.Tui.Tests/ScrollSplitTests.cs new file mode 100644 index 00000000..924c4193 --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/ScrollSplitTests.cs @@ -0,0 +1,211 @@ +using System.Text.RegularExpressions; +using SharpConsoleUI.Drivers; +using SharpMUTerm.Graphics; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// Split scrollback (F7 ▸ SCROLLBACK): a pane scrolled back off its live tail keeps the newest rows in view +/// under a band, inside its own rectangle. Asserted on the painted frame, not on the state that drives it. +/// +[NotInParallel] +public class ScrollSplitTests +{ + private const string Main = "main"; + + private static readonly TerminalCapabilities Headless = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private static SharpMUTermApp App(bool split = true) + { + Console.SetIn(TextReader.Null); + var config = DemoScene.Build(); + config.Text.SplitScrollback = split; + var app = new SharpMUTermApp(config, Headless, new HeadlessConsoleDriver(120, 32)); + app.RenderSnapshot("scrollback"); + return app; + } + + private static ConsoleKeyInfo Key(ConsoleKey key, bool ctrl = false, bool alt = false) => + new('\0', key, shift: false, alt: alt, control: ctrl); + + private static string Plain(string ansi) => Regex.Replace(ansi, @"\x1b\[[0-9;?]*[A-Za-z]", string.Empty); + + private static string Settled(SharpMUTermApp app) + { + app.RenderWholeFrame(); + return Plain(app.RenderWholeFrame()); + } + + private static string Line(int number) => $"line {number:0000}"; + + [Test] + public async Task ScrollingBackSplitsThePaneAndKeepsTheNewestLineInView() + { + var app = App(); + var before = app.PaneOutputRects().ToDictionary(p => p.Key, p => p.Value); + + app.SimulateKey(Key(ConsoleKey.PageUp)); + app.SimulateKey(Key(ConsoleKey.PageUp)); + var frame = Settled(app); + + await Assert.That(app.IsScrollSplit(Main)).IsTrue(); + await Assert.That(frame).Contains("scrolled back"); + await Assert.That(frame).Contains("End returns"); + await Assert.That(frame).Contains(Line(SharpMUTermApp.ScrollbackSceneLines)); + + // Inside the pane: no rectangle moved, so no server is told a new size. + await Assert.That(app.PaneOutputRects()).IsEquivalentTo(before); + } + + [Test] + public async Task OutputArrivingWhileSplitLandsInTheTailAndLeavesTheHistoryWhereItWas() + { + var app = App(); + app.SimulateKey(Key(ConsoleKey.PageUp)); + app.SimulateKey(Key(ConsoleKey.PageUp)); + Settled(app); + var offset = app.ScrollbackOf(Main)!.Value.Offset; + + app.LoadLongScene(Main, 3, first: SharpMUTermApp.ScrollbackSceneLines + 1); + var frame = Settled(app); + + await Assert.That(frame).Contains(Line(SharpMUTermApp.ScrollbackSceneLines + 3)); + await Assert.That(app.ScrollbackOf(Main)!.Value.Offset).IsEqualTo(offset); + await Assert.That(app.IsScrollSplit(Main)).IsTrue(); + } + + [Test] + public async Task ASplitPaneIsNotScrolledBackForTheUnreadBadge() + { + var app = App(); + app.SimulateKey(Key(ConsoleKey.PageUp)); + Settled(app); + + await Assert.That(app.IsScrollSplit(Main)).IsTrue(); + await Assert.That(app.IsWindowScrolledBack(Main)).IsFalse(); + } + + [Test] + public async Task ALineThatLandsInTheLiveTailIsNotMissed() + { + Console.SetIn(TextReader.Null); + var config = DemoScene.Build(); + var app = new SharpMUTermApp(config, Headless, new HeadlessConsoleDriver(120, 32)); + var session = app.BindWorldWithoutConnecting(config.Worlds[0]); + for (var i = 1; i <= 80; i++) + { + session.PrintSystem($"*** line {i}"); + } + + app.RenderSnapshot(); + app.SimulateScrollKey(Key(ConsoleKey.PageUp)); + Settled(app); + await Assert.That(app.IsScrollSplit(Main)).IsTrue(); + + session.PrintSystem("*** arrived while you were reading back"); + app.SimulateScrollKey(Key(ConsoleKey.End, ctrl: true)); + + await Assert.That(app.UnreadOf(Main)).IsEqualTo(0); + await Assert.That(app.AwayBarIndex(Main)).IsNull(); + } + + [Test] + public async Task CtrlEndReturnsAndClosesTheSplit() + { + var app = App(); + app.SimulateKey(Key(ConsoleKey.PageUp)); + Settled(app); + + app.SimulateKey(Key(ConsoleKey.End, ctrl: true)); + var frame = Settled(app); + + await Assert.That(app.IsScrollSplit(Main)).IsFalse(); + await Assert.That(frame).DoesNotContain("scrolled back"); + await Assert.That(app.ScrollbackOf(Main)!.Value.AutoScroll).IsTrue(); + } + + [Test] + public async Task BareEndReturnsWhenTheCaretIsAlreadyAtTheEnd() + { + var app = App(); + app.SimulateKey(Key(ConsoleKey.PageUp)); + Settled(app); + + app.SimulateKey(Key(ConsoleKey.End)); + Settled(app); + + await Assert.That(app.IsScrollSplit(Main)).IsFalse(); + } + + [Test] + public async Task ScrollingTheHistoryBackDownToItsEndClosesTheSplit() + { + var app = App(); + app.SimulateKey(Key(ConsoleKey.PageUp)); + Settled(app); + + for (var i = 0; i < 10 && app.IsScrollSplit(Main); i++) + { + app.SimulateKey(Key(ConsoleKey.PageDown)); + Settled(app); + } + + await Assert.That(app.IsScrollSplit(Main)).IsFalse(); + } + + [Test] + public async Task WithTheSettingOffThePaneScrollsAsAWhole() + { + var app = App(split: false); + app.SimulateKey(Key(ConsoleKey.PageUp)); + var frame = Settled(app); + + await Assert.That(app.IsScrollSplit(Main)).IsFalse(); + await Assert.That(frame).DoesNotContain("scrolled back"); + await Assert.That(frame).DoesNotContain(Line(SharpMUTermApp.ScrollbackSceneLines)); + } + + [Test] + public async Task FreezingASplitPaneHandsItToFreeze() + { + var app = App(); + app.SimulateKey(Key(ConsoleKey.PageUp)); + Settled(app); + + app.SimulateKey(Key(ConsoleKey.F, alt: true)); + var frame = Settled(app); + + await Assert.That(app.IsScrollSplit(Main)).IsFalse(); + await Assert.That(frame).Contains("FROZEN"); + await Assert.That(frame).DoesNotContain("scrolled back"); + } + + [Test] + [Arguments(30, 9)] + [Arguments(20, 6)] + [Arguments(10, 3)] + [Arguments(7, 3)] + [Arguments(6, 0)] + public async Task TheLiveTailIsThirtyPercentOfThePaneAndAtLeastThreeRows(int pane, int tail) + { + await Assert.That(SharpMUTermApp.TailRowsFor(pane)).IsEqualTo(tail); + } + + [Test] + [Arguments(120)] + [Arguments(60)] + [Arguments(30)] + public async Task TheBandIsExactlyAsWideAsThePaneWhateverTheCount(int width) + { + foreach (var rows in new[] { 1, 42, 99, 4127 }) + { + var markup = ScrollSplitBarRenderer.Bar(rows, width, "#e5c07b"); + await Assert.That(MarkupStripped(markup).Length).IsEqualTo(width); + } + } + + private static string MarkupStripped(string markup) => + Regex.Replace(markup, @"\[(?:/|dim|#[0-9a-f]{6})\]", string.Empty).Replace("[[", "[").Replace("]]", "]"); +} diff --git a/tests/SharpMUTerm.Tui.Tests/SnapshotViewEmptyConfigTests.cs b/tests/SharpMUTerm.Tui.Tests/SnapshotViewEmptyConfigTests.cs index 44b8800e..852f3630 100644 --- a/tests/SharpMUTerm.Tui.Tests/SnapshotViewEmptyConfigTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/SnapshotViewEmptyConfigTests.cs @@ -39,7 +39,7 @@ public class SnapshotViewEmptyConfigTests [ "collapsed", "prefix", "prefix-panel", "timestamps", "timestamps-toggled", "spawn", "split", "focus", "focus-moved", "freeze", "freeze-scrollback", "move", "drag", "scrollback", - "scrollback-up", "away", "away-scrollback", "links", "web", "rail-long", "history", "history-search", + "scrollback-up", "scrollback-split", "reflow", "away", "away-scrollback", "links", "web", "rail-long", "history", "history-search", "history-search-filter", "draft", "draft2", "menu", "menu-split", "menu-fuzzy", "menu-recent", "messages", "quit", "connections", "characters", "tint", "tint-input", "tint-input-moved", "compose", "compose-literal", "deletions", "textansi", "input", "keypad", "password", diff --git a/tests/SharpMUTerm.Tui.Tests/TabActivityIndicatorTests.cs b/tests/SharpMUTerm.Tui.Tests/TabActivityIndicatorTests.cs index 2a6cd96d..7af76669 100644 --- a/tests/SharpMUTerm.Tui.Tests/TabActivityIndicatorTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/TabActivityIndicatorTests.cs @@ -57,6 +57,7 @@ private static (SharpMUTermApp App, WorldSession Session) Bound( { Console.SetIn(TextReader.Null); var config = DemoScene.Build(); + config.Text.SplitScrollback = false; // a split pane's new lines are on screen, so they badge nothing var app = clock is null ? new SharpMUTermApp(config, Headless, new HeadlessConsoleDriver(width, height)) : new SharpMUTermApp(config, Headless, new HeadlessConsoleDriver(width, height), clock); diff --git a/tests/SharpMUTerm.Tui.Tests/WindowActivityBoundaryTests.cs b/tests/SharpMUTerm.Tui.Tests/WindowActivityBoundaryTests.cs index e4b42151..a24250c6 100644 --- a/tests/SharpMUTerm.Tui.Tests/WindowActivityBoundaryTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/WindowActivityBoundaryTests.cs @@ -95,12 +95,14 @@ public async Task TheWindowInFrontOfTheReaderGetsNoBar() /// /// A window the reader is looking at but has scrolled back off is exactly as blind as one they are /// not looking at — OnLine's reasoning for the badge, one field over — so it accrues, and the - /// bar is there when they come back down to the tail. + /// bar is there when they come back down to the tail. With split scrollback off: a split pane's new + /// lines land in its live tail, on screen, and pins that they are not missed. /// [Test] public async Task AVisibleWindowScrolledBackAccruesAndTheBarIsThereOnTheWayBackDown() { var (app, session) = Bound(); + app.Configuration.Text.SplitScrollback = false; for (var i = 1; i <= 80; i++) { session.PrintSystem($"*** line {i}"); From f39a967e8aabd2333a02e76bb5baa92bf7bc48c6 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 04:44:52 +0000 Subject: [PATCH 016/113] Size strip panels to their content and keep panels off the rail The vitals strip and the quick bar are exactly one row, with no tab strip over a one-tab strip, and the docked composer has an editor's floor. A pane's height claim (PaneNode.FixedRows/MinRows) is derived from what it holds on every rebuild (PanelSizing) and honoured by the grid and by LayoutSolver (PaneExtent.DistributeRows); a divider beside a fixed strip neither hovers nor drags, and the resize keys take rows from a pane beyond it or refuse out loud. The status row leaves its meters out while the vitals strip is showing them. Layout panels are WindowKind.Panel: no rail row, no Alt+number, no Go to entry, so map and capture windows keep their digits. Alt+M renames (r) and deletes (d, then y) saved layouts. New snapshot view: layout-roleplay. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 7 +- CLAUDE.md | 39 ++- .../Commands/BuiltInCommands.cs | 4 +- src/SharpMUTerm.Core/Layouts/PanelSizing.cs | 66 +++++ src/SharpMUTerm.Core/Workspace/LayoutNode.cs | 18 ++ .../Workspace/LayoutSolver.cs | 3 +- src/SharpMUTerm.Core/Workspace/PaneExtent.cs | 139 +++++++++++ src/SharpMUTerm.Core/Workspace/PaneResize.cs | 56 ++++- src/SharpMUTerm.Core/Workspace/Workspace.cs | 1 + .../Workspace/WorkspaceWindow.cs | 7 + src/SharpMUTerm.Tui/ListOverlay.cs | 21 +- .../Pointer/SharpMUTermApp.Pointer.cs | 12 +- src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs | 184 +++++++++++++- src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs | 27 +- src/SharpMUTerm.Tui/SharpMUTermApp.cs | 91 ++++++- src/SharpMUTerm.Tui/SnapshotViews.cs | 2 +- .../Workspace/PaneExtentTests.cs | 209 ++++++++++++++++ .../Workspace/WindowNumberingTests.cs | 17 ++ .../SharpMUTerm.Tui.Tests/LayoutStripTests.cs | 234 ++++++++++++++++++ 19 files changed, 1094 insertions(+), 43 deletions(-) create mode 100644 src/SharpMUTerm.Core/Layouts/PanelSizing.cs create mode 100644 src/SharpMUTerm.Core/Workspace/PaneExtent.cs create mode 100644 tests/SharpMUTerm.Core.Tests/Workspace/PaneExtentTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/LayoutStripTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index e3c3266a..95e187ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,7 +19,8 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] Ctrl+P lists *Key clashes (N)* while there are any. - Layouts. Alt+M (or Ctrl+P ▸ *Layouts*) lists the built-in Roleplay and Combat layouts and the ones you save: ⏎ applies one to the panes, `s` saves the panes as they are into the selected layout, `n` saves them as a - new one, `w` makes it the world's default and `c` this character's. Worlds & Characters (F5) has a `layout` + new one, `w` makes it the world's default and `c` this character's; `r` renames one of your own and `d` + deletes it, after asking. Worlds & Characters (F5) has a `layout` row on each world and each character. A panel appears only once the game sends what it shows, so a MUSH never gets an empty map pane, and the first time you connect to a world the client picks Combat or Roleplay from what the game sends and says which in a notice. A workspace you arranged yourself is still what comes @@ -33,6 +34,10 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] with values, a warning colour when low, and what you are fighting), *Show quick bar* (your function-key macros as `F11 kick`; click one to run it) and *Dock the composer* (the F1 editor as a pane that shares F1's draft: ⌃S sends, ⌥L switches escaping, F1 opens it full screen, Esc goes back to the command line). + The vitals strip and the quick bar are exactly one row tall, with no tab over them, and the docked composer + never shrinks below a few rows. While the vitals strip is on screen the status row leaves its meters out + rather than showing them twice. Panels are part of the layout, not places you go: they take no row in the + sidebar and no Alt+number, so your map and capture windows keep theirs. - Make a trigger without writing a regex: select a line of output and choose Ctrl+P ▸ *Make a trigger from the selection* (also on the right-click menu). Triggers (F2) opens on a new rule whose pattern is the line with its numbers, quoted speech and known player names turned into `*`, and shows the regex behind it. diff --git a/CLAUDE.md b/CLAUDE.md index 6ddf5c59..ad722f51 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -926,13 +926,31 @@ fallbacks) for inline images/maps. - **Layouts are realised as panes, one per panel that has data** (`Core/Layouts`: `LayoutFold` → `LayoutRealiser` → `WorkspaceLayout.ReplaceTree`, `LayoutCapture` for the way back; Tui `SharpMUTermApp.Layouts.cs`, - `TerminalPanels.cs`; ⌥M / ⌃P ▸ *Layouts*; F5 `layout` rows; the `layouts` and `layout-combat` views). The layout's + `TerminalPanels.cs`; ⌥M / ⌃P ▸ *Layouts*; F5 `layout` rows; the `layouts`, `layout-combat` and `layout-roleplay` views). The layout's name is shown nowhere on the main screen. Decisions not to relitigate: - **A panel is a window.** `output` is the session's window, `chat` its spawn windows, `map` `map:`, and every other panel a window `panel::` (`TerminalPanels.WindowId`) whose control comes from the factory registered for that id (`Panels.Register(id, ctx => control)`, from `partial void - RegisterTerminalPanels()`), built once and re-parented like the map's. So panels get tabs, the rail, focus, - `Activate`/`SendTarget` (a panel window is owned by its session) and persistence for nothing. An id with no + RegisterTerminalPanels()`), built once and re-parented like the map's. So panels get tabs, focus, + `Activate`/`SendTarget` (a panel window is owned by its session) and persistence for nothing. + - **A panel window is furniture, not a destination** (`WindowKind.Panel`). `Workspace.WindowsFor` leaves it out, + so it has no `⌥N` and pushes no map or capture window to a later digit; `BuildRailWindows` lists no row for it; + ⌃P has no `Go to …` entry for it, because each panel's own entry (*Show vitals*, *Dock the composer*) goes to it. + ⌃O, the ⌃arrows and a click still reach it — it is a pane like any other. + - **A strip is as tall as its content** (`PanelSizing`, `PaneExtent`; `PaneNode.FixedRows`/`MinRows`). Vitals and + the quick bar are one row; the composer has a floor (`PanelSizing.ComposerMinRows` plus its tab strip). Region + shares are proportional, so the height is a pane property instead: `BuildWorkspaceRow` derives it from each + pane's tabs on every rebuild (never persisted — a strip handed an ordinary window stops being one), the grid + gives a fixed child `GridLength.Cells` and a floored one `Star(min:)`, and `LayoutSolver` shares rows the same + way (`PaneExtent.DistributeRows`; if every child is fixed the last shares, in both). A one-tab strip draws **no + tab strip** (`TabControl.ShowTabHeader`, which `PaneOutputRects` already reads) and offers no drag handle. Only + rows: a strip's width is a share. The divider beside a fixed pane is not registered with the pointer, a drag + on it returns `PaneResizeOutcome.FixedSize`, and ⌥⇧↑/↓ take rows from a sharing pane beyond the strip or + pass to the next split up, refusing out loud when only a strip could pay. + - **The status row leaves its meters out while the vitals strip shows them** (`VitalsStripShowing`: the status + row's character's vitals window is the front tab of a drawn pane, zoom included). `SyncStatusMeters` repaints + the row only when that flips (on a rebuild or an activation), so a notice is not displaced for nothing. The + rest of the row's width rules are untouched: the meters were already the optional part. An id with no factory counts as having no data (`DrawableAvailability`), so an unbuilt panel is *Waiting* and costs no cell. - **Applying never closes a window.** Windows no panel places stay in the pane they were in if its id survives, else in the output pane; a collapsed panel's windows are background tabs of the first pane in its region. @@ -946,6 +964,11 @@ fallbacks) for inline images/maps. tree's shape (`TreeShape`: pane ids and nesting) is not the one it applied: the player split, closed or moved a pane and the arrangement is theirs. A divider dragged is not a shape change and is reset by the next re-fold. A new spawn window goes into the live layout's chat pane, not the focused one. + - **⌥M renames (`r`) and deletes (`d`, then `y`) saved layouts** through `LayoutLibrary.Rename`/`Delete`; both + are refused for a built-in and the footer names them only over a layout of the player's own. The name is typed + in the list itself; Esc leaves the rename or the question before it closes anything (`ListOverlay`'s `escape:` + hook). Every footer row is always emitted, blank when idle, because the modal is sized once when it opens. + Deleting the live layout hands the panes to the player (`_liveLayout = null`) rather than re-folding them. - **Saving captures geometry, not intent.** `LayoutCapture` reads regions off the solved rectangles (above the output = top strip, right of it = side, below = bottom); panels not on screen keep their old placement. Saving changes to a built-in saves a copy and points the character (or the world using it) at the copy. @@ -1173,9 +1196,11 @@ python3 tools/ansi_frame_to_image.py frame.ansi frame.html # or .svg `tabs-many` (**more tabs than the strip can hold** — five of one character's captures in a split pane, which is the state every other tab view is too small to reach. Without eliding, that pane draws two tabs and half of a third and says nothing about the rest), plus the - `layouts` (the ⌥M list over the demo, through the registered shortcut) and `layout-combat` (the Combat layout - applied over the demo's game data and recorded streets: the map beside the output with Chat as a tab under it, - and no pane for the panels nothing draws yet), `panel-who`/`panel-vitals`/`panel-quickbar`/`panel-composer` + `layouts` (the ⌥M list over the demo, through the registered shortcut), `layout-combat` (the Combat layout + applied over the demo's game data and recorded streets: a one-row vitals strip across the top, the map beside + the output with Chat as a tab under it, a one-row quick bar under the output, and no meters on the status row) + and `layout-roleplay` (the Roleplay layout over the demo's room roster: who is here beside the output with Chat + behind it, and the composer under the output at its floor), `panel-who`/`panel-vitals`/`panel-quickbar`/`panel-composer` (each panel in a pane of its own over the demo's game data; the composer over who-here, armed, with a draft typed through its real key path), plus the default workspace @@ -1448,7 +1473,7 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] (`WindowNumberingTests.AWindowOpenedIntoAClosedOnesSlotStillTakesTheLastNumber` is the pin, and it took a four-window fixture to expose: with fewer, both orders agree). Only **placed** windows are numbered — one no pane holds is drawn `closed` and a digit for it would - name nowhere to go. + name nowhere to go — and never a layout panel (`WindowKind.Panel`), which is furniture and has no rail row. - **⌃B 1–⌃B 9 go to a pane.** It was ⌥N until windows took that; it is on the prefix because that is where the rest of the pane keymap lives, and it is kept rather than dropped because the pane numbering does not go away with the chord — move mode badges each pane with it, the move and drag diff --git a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs index ea1aede6..87377dc0 100644 --- a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs +++ b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs @@ -304,7 +304,9 @@ private static IEnumerable Windows(ICommandContext context) foreach (var window in workspace.Windows) { - if (window.Id == activeWindow) + // A layout panel is furniture, not a destination: each has its own ⌃P entry (Show vitals, Dock the + // composer…) that goes to it, so a "Go to Vitals" row would be a second spelling of one action. + if (window.Id == activeWindow || window.Kind == WindowKind.Panel) { continue; } diff --git a/src/SharpMUTerm.Core/Layouts/PanelSizing.cs b/src/SharpMUTerm.Core/Layouts/PanelSizing.cs new file mode 100644 index 00000000..683551fc --- /dev/null +++ b/src/SharpMUTerm.Core/Layouts/PanelSizing.cs @@ -0,0 +1,66 @@ +using SharpMUTerm.Core.Workspaces; + +namespace SharpMUTerm.Core.Layouts; + +/// +/// How tall a panel is drawn, in rows of content. Most panels share the window like any pane; a strip is +/// one row however much room there is (the vitals meters, the quick bar), and an editor has a floor below which it +/// stops being one (the docked composer). +/// +public static class PanelSizing +{ + /// The rows of content a docked composer is never squeezed below: its header, four rows of post and its key hints. + public const int ComposerMinRows = 6; + + /// The exact rows of content draws, or null when it shares the window. + public static int? FixedRows(string? panelId) => panelId switch + { + PanelIds.Vitals => 1, + PanelIds.QuickBar => 1, + _ => null, + }; + + /// The fewest rows of content is given, or null for the ordinary floor. + public static int? MinRows(string? panelId) => panelId switch + { + PanelIds.Composer => ComposerMinRows, + _ => null, + }; + + /// + /// Whether a pane holding (one entry per tab: its panel id, or null for a window no + /// panel draws) is a strip: every tab a fixed-height panel. A strip with one tab shows no tab strip, because + /// its content already says what it is. + /// + public static bool IsStrip(IReadOnlyList panels) => + panels.Count > 0 && panels.All(p => FixedRows(p) is not null); + + /// Whether a pane holding draws its tab strip: anything but a one-tab strip. + public static bool ShowsTabStrip(IReadOnlyList panels) => !(panels.Count == 1 && IsStrip(panels)); + + /// + /// Sets 's and from what it + /// holds. names the panel each tab draws (null for an ordinary window), and + /// is the height of the tab strip the host draws over a pane that shows one. + /// A strip is as tall as its tallest panel (plus the tab strip when it holds several); any other pane shares, + /// with a floor from the tallest floor among its panels. + /// + public static void Apply(PaneNode pane, Func panelOf, int tabStripRows) + { + ArgumentNullException.ThrowIfNull(pane); + ArgumentNullException.ThrowIfNull(panelOf); + var panels = pane.Tabs.Select(panelOf).ToList(); + var chrome = ShowsTabStrip(panels) ? Math.Max(0, tabStripRows) : 0; + + if (IsStrip(panels)) + { + pane.FixedRows = panels.Max(p => FixedRows(p)!.Value) + chrome; + pane.MinRows = null; + return; + } + + pane.FixedRows = null; + var floor = panels.Select(MinRows).Where(m => m is not null).Select(m => m!.Value).DefaultIfEmpty(0).Max(); + pane.MinRows = floor > 0 ? floor + chrome : null; + } +} diff --git a/src/SharpMUTerm.Core/Workspace/LayoutNode.cs b/src/SharpMUTerm.Core/Workspace/LayoutNode.cs index 2f96568d..dc65bb3d 100644 --- a/src/SharpMUTerm.Core/Workspace/LayoutNode.cs +++ b/src/SharpMUTerm.Core/Workspace/LayoutNode.cs @@ -92,6 +92,24 @@ public PaneNode( /// The active window id, or null when the pane is empty. public string? ActiveTab => ActiveIndex >= 0 && ActiveIndex < Tabs.Count ? Tabs[ActiveIndex] : null; + /// + /// The exact height this pane takes in a stacked split, in rows, or null for a pane that shares the space + /// (). A strip panel — one row of meters, one row of buttons — declares it, so it is as + /// tall as its content rather than a share of the window. The divider beside such a pane does not move it. + /// + /// Not persisted: the host derives it from what the pane holds every time it lays the panes out, so a pane + /// that is handed an ordinary window stops being a strip at once. + /// + /// + public int? FixedRows { get; set; } + + /// + /// The fewest rows this pane is given in a stacked split, or null for the ordinary floor. An editor declares + /// one so a short window does not squeeze it to a line. Like , derived by the host and + /// not persisted. + /// + public int? MinRows { get; set; } + public override IEnumerable Panes() { yield return this; diff --git a/src/SharpMUTerm.Core/Workspace/LayoutSolver.cs b/src/SharpMUTerm.Core/Workspace/LayoutSolver.cs index f03a02ef..1538f150 100644 --- a/src/SharpMUTerm.Core/Workspace/LayoutSolver.cs +++ b/src/SharpMUTerm.Core/Workspace/LayoutSolver.cs @@ -55,7 +55,8 @@ private static void Place(LayoutNode node, PaneRect rect, Dictionary +/// The rows a pane asks for in a stacked () split, and how a split's rows are +/// shared out once some of its panes have asked: a pane with gets exactly that, +/// one with gets at least that, and the rest is shared by the split's fractions +/// among the panes that did not fix their height. +/// +/// Only rows. A strip is one row of meters however wide it is drawn, so its width stays a share like any pane's. +/// +/// +public static class PaneExtent +{ + /// + /// The exact rows takes, or null when it shares. A stack of fixed panes is fixed at + /// their sum and dividers; a side-by-side row of them at the tallest; a subtree with any sharing pane in it + /// shares. + /// + public static int? FixedRows(LayoutNode node) + { + ArgumentNullException.ThrowIfNull(node); + if (node is PaneNode pane) + { + return pane.FixedRows is > 0 ? pane.FixedRows : null; + } + + var split = (SplitNode)node; + var rows = new List(split.Children.Count); + foreach (var child in split.Children) + { + if (FixedRows(child) is not { } fixedRows) + { + return null; + } + + rows.Add(fixedRows); + } + + return split.Direction == SplitDirection.Row + ? rows.Max() + : rows.Sum() + (LayoutSolver.DividerThickness * (rows.Count - 1)); + } + + /// The fewest rows is given: its fixed height, else its declared floor, else 0. + public static int MinRows(LayoutNode node) + { + ArgumentNullException.ThrowIfNull(node); + if (node is PaneNode pane) + { + return FixedRows(pane) ?? Math.Max(0, pane.MinRows ?? 0); + } + + var split = (SplitNode)node; + return split.Direction == SplitDirection.Row + ? split.Children.Max(MinRows) + : split.Children.Sum(MinRows) + (LayoutSolver.DividerThickness * (split.Children.Count - 1)); + } + + /// + /// Which children of are fixed in height. When every child is, the last is treated as + /// sharing, so the rows left over have somewhere to go — and the terminal's grid is built the same way. + /// + public static int?[] FixedChildren(SplitNode split) + { + ArgumentNullException.ThrowIfNull(split); + var fixedRows = split.Children.Select(FixedRows).ToArray(); + if (fixedRows.All(f => f is not null)) + { + fixedRows[^1] = null; + } + + return fixedRows; + } + + /// + /// Shares rows among a stacked split's children: fixed children first (in order, each + /// clamped to what is left), then the rest by the sharing children's fractions, and then any sharing child + /// under its floor is raised by taking from the sharing children with rows to spare. The result sums to + /// . + /// + public static int[] DistributeRows(int total, SplitNode split) + { + ArgumentNullException.ThrowIfNull(split); + var count = split.Children.Count; + var result = new int[count]; + if (total <= 0) + { + return result; + } + + var fixedRows = FixedChildren(split); + var remaining = total; + for (var i = 0; i < count; i++) + { + if (fixedRows[i] is { } rows) + { + result[i] = Math.Min(rows, remaining); + remaining -= result[i]; + } + } + + var sharing = Enumerable.Range(0, count).Where(i => fixedRows[i] is null).ToArray(); + // Distribute expects fractions of a whole, so the sharing children's are re-normalised among themselves. + var weights = sharing.Select(i => Math.Max(0, split.Sizes[i])).ToArray(); + var sum = weights.Sum(); + var fractions = sum > 0 + ? weights.Select(w => w / sum).ToArray() + : weights.Select(_ => 1.0 / weights.Length).ToArray(); + var cells = LayoutSolver.Distribute(remaining, fractions); + for (var j = 0; j < sharing.Length; j++) + { + result[sharing[j]] = cells[j]; + } + + // Floors: raise each short child from whichever sharing sibling has the most to spare. + foreach (var i in sharing) + { + var need = MinRows(split.Children[i]) - result[i]; + while (need > 0) + { + var donor = sharing + .Where(k => k != i && result[k] > MinRows(split.Children[k])) + .OrderByDescending(k => result[k] - MinRows(split.Children[k])) + .Cast() + .FirstOrDefault(); + if (donor is not { } d) + { + break; + } + + result[d]--; + result[i]++; + need--; + } + } + + return result; + } +} diff --git a/src/SharpMUTerm.Core/Workspace/PaneResize.cs b/src/SharpMUTerm.Core/Workspace/PaneResize.cs index 96f39410..95fa65de 100644 --- a/src/SharpMUTerm.Core/Workspace/PaneResize.cs +++ b/src/SharpMUTerm.Core/Workspace/PaneResize.cs @@ -17,6 +17,12 @@ public enum PaneResizeOutcome /// No rectangles for the panes involved — nothing has been laid out yet. NotMeasured, + + /// + /// The border is against a pane whose height is fixed (): a strip is as tall as + /// its content, so neither this pane nor the one beyond it can give or take rows across it. + /// + FixedSize, } /// The outcome of one resize, and the cells the border actually moved by (signed, 0 when it did not). @@ -144,17 +150,27 @@ public static PaneResizeResult Apply( var delta = direction is PaneDirection.Right or PaneDirection.Up ? step : -step; // Nearest first: the path runs root → pane, so walking it backwards is walking up from the pane. + // A split whose border is held by a fixed-height strip is passed over for the next one up, so the output + // under a vitals strip still grows by taking from a pane further out that can give. var path = Ancestry(layout.Root, layout.FocusedPaneId); + var blockedByFixed = false; for (var depth = path.Count - 1; depth >= 0; depth--) { var (split, index) = path[depth]; if (split.Direction == axis) { - return MoveBorder(split, index, horizontal, delta, rects); + var result = MoveBorder(split, index, horizontal, delta, rects); + if (result.Outcome != PaneResizeOutcome.FixedSize) + { + return result; + } + + blockedByFixed = true; } } - return new PaneResizeResult(PaneResizeOutcome.NoSplitInThatAxis, 0); + return new PaneResizeResult( + blockedByFixed ? PaneResizeOutcome.FixedSize : PaneResizeOutcome.NoSplitInThatAxis, 0); } /// @@ -183,6 +199,11 @@ public static PaneResizeResult DragBorder( } var horizontal = split.Direction == SplitDirection.Row; + if (!horizontal && (IsFixed(split.Children[index]) || IsFixed(split.Children[index + 1]))) + { + return new PaneResizeResult(PaneResizeOutcome.FixedSize, 0); + } + var extents = new int[split.Children.Count]; var start = 0; for (var i = 0; i < extents.Length; i++) @@ -247,7 +268,10 @@ public static int Minimum(LayoutNode node, bool horizontal) if (node is not SplitNode split) { - return horizontal ? MinimumPaneColumns : MinimumPaneRows; + var pane = (PaneNode)node; + return horizontal + ? MinimumPaneColumns + : PaneExtent.FixedRows(pane) ?? Math.Max(MinimumPaneRows, pane.MinRows ?? 0); } if ((split.Direction == SplitDirection.Row) != horizontal) @@ -284,6 +308,7 @@ public static string Describe(PaneResizeOutcome outcome, PaneDirection direction PaneResizeOutcome.Resized => string.Empty, PaneResizeOutcome.Zoomed => "this pane is zoomed — ⌃B z shows the others", PaneResizeOutcome.NotMeasured => "the panes have not been drawn yet", + PaneResizeOutcome.FixedSize => "a strip panel keeps the height of what it shows", PaneResizeOutcome.NoSplitInThatAxis when horizontal => "nothing divides this pane's columns — ⌃B | splits it side by side", PaneResizeOutcome.NoSplitInThatAxis => @@ -324,8 +349,28 @@ private static PaneResizeResult MoveBorder( } // The sibling on the side the border is: the next child, or the previous one at the far end. - // A SplitNode always has at least two children, so one of the two always exists. + // A SplitNode always has at least two children, so one of the two always exists. Rows are never + // taken from (or given to) a fixed-height strip: the pane on its other side pays instead, and with + // none the border cannot move. var donor = index + 1 < extents.Length ? index + 1 : index - 1; + if (!horizontal) + { + if (IsFixed(split.Children[index])) + { + return new PaneResizeResult(PaneResizeOutcome.FixedSize, 0); + } + + if (IsFixed(split.Children[donor])) + { + var other = donor == index + 1 ? index - 1 : index + 1; + if (other < 0 || other >= extents.Length || IsFixed(split.Children[other])) + { + return new PaneResizeResult(PaneResizeOutcome.FixedSize, 0); + } + + donor = other; + } + } // How far the border can travel before either side is at its floor. A pane already under its // floor — a workspace on a terminal too small for the split it holds — inverts these, and is the @@ -349,6 +394,9 @@ private static PaneResizeResult MoveBorder( return new PaneResizeResult(PaneResizeOutcome.Resized, moved); } + /// Whether a subtree's height is fixed, so no border may move rows into or out of it. + private static bool IsFixed(LayoutNode node) => PaneExtent.FixedRows(node) is not null; + /// /// A subtree's extent along one axis, in cells: its panes' rectangles unioned. Null when any of them /// has no rectangle, because a partial answer here would move a border by a made-up distance. diff --git a/src/SharpMUTerm.Core/Workspace/Workspace.cs b/src/SharpMUTerm.Core/Workspace/Workspace.cs index ad2c6212..9178aa18 100644 --- a/src/SharpMUTerm.Core/Workspace/Workspace.cs +++ b/src/SharpMUTerm.Core/Workspace/Workspace.cs @@ -96,6 +96,7 @@ public Workspace(IEnumerable windows, WorkspaceLayout layout) public IReadOnlyList WindowsFor(string? sessionKey) => _windows.Values .Where(w => Layout.FindWindow(w.Id) is not null) + .Where(w => w.Kind != WindowKind.Panel) .Where(w => w.SessionKey is null || string.Equals(w.SessionKey, sessionKey, StringComparison.Ordinal)) .OrderBy(w => w.Sequence) .ToList(); diff --git a/src/SharpMUTerm.Core/Workspace/WorkspaceWindow.cs b/src/SharpMUTerm.Core/Workspace/WorkspaceWindow.cs index 2d972c83..362e3d8c 100644 --- a/src/SharpMUTerm.Core/Workspace/WorkspaceWindow.cs +++ b/src/SharpMUTerm.Core/Workspace/WorkspaceWindow.cs @@ -11,6 +11,13 @@ public enum WindowKind /// An arbitrary auxiliary window (web view, map, notes…). Auxiliary, + + /// + /// A layout panel drawn by a control of its own (who is here, vitals, the quick bar, the docked composer): fixed + /// furniture of a layout rather than a place to go, so it has no ⌥N and no row on the rail + /// (). It is still a tab, focusable, and reached by its own ⌃P entry. + /// + Panel, } /// diff --git a/src/SharpMUTerm.Tui/ListOverlay.cs b/src/SharpMUTerm.Tui/ListOverlay.cs index a8a70f3f..7cbcc3e3 100644 --- a/src/SharpMUTerm.Tui/ListOverlay.cs +++ b/src/SharpMUTerm.Tui/ListOverlay.cs @@ -18,6 +18,7 @@ internal sealed class ListOverlay private MarkupControl? _content; private Func>? _render; private Func? _key; + private Func? _escape; private readonly ScreenTheme _scheme; @@ -39,7 +40,17 @@ public ListOverlay(ConsoleWindowSystem system, ScreenTheme? scheme = null) /// Opens a surface. draws it at a width; answers a key /// and returns whether the surface stays open. /// - public void Open(string mode, string title, Func> render, Func key, int? width = null) + /// + /// Asked first when Esc is pressed: true when the surface took it (to leave a sub-mode of its own — a name being + /// typed, a delete awaiting its answer) and stays open; with none, or false, Esc closes. + /// + public void Open( + string mode, + string title, + Func> render, + Func key, + int? width = null, + Func? escape = null) { if (_window is not null) { @@ -48,6 +59,7 @@ public void Open(string mode, string title, Func> render, Func _render = render; _key = key; + _escape = escape; var desktop = _system.DesktopDimensions; var widest = Math.Clamp(desktop.Width - 8, 44, 110); var outer = width is { } asked ? Math.Clamp(asked + 4, 24, widest) : widest; @@ -119,6 +131,12 @@ private void OnKey(object? sender, KeyPressedEventArgs e) // A key can start a fetch whose answer opens the next surface (browse, then a review). Only the // surface the key was pressed on is closed, so that answer is never closed with it. var window = _window; + if (e.KeyInfo.Key == ConsoleKey.Escape && _escape?.Invoke() == true) + { + Repaint(); + return; + } + if (e.KeyInfo.Key == ConsoleKey.Escape || !_key(e.KeyInfo)) { if (_window == window) @@ -138,6 +156,7 @@ private void Reset() _content = null; _render = null; _key = null; + _escape = null; Mode = null; } } diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs index 9eec02cf..732a802d 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs @@ -61,7 +61,17 @@ private HorizontalGridControl PaneDivider(SplitNode split, int index) { var key = new DividerKey(split, index); var rule = Divider(_litDivider is { } lit && lit.Equals(key)); - _dividers.Add(new DividerSlot(rule, split, index)); + + // The rule beside a fixed-height strip is drawn but not registered: it cannot move, so it offers no + // resize cue to hover, no drag and no double-click to even. + var held = split.Direction == SplitDirection.Column + && (PaneExtent.FixedRows(split.Children[index]) is not null + || PaneExtent.FixedRows(split.Children[index + 1]) is not null); + if (!held) + { + _dividers.Add(new DividerSlot(rule, split, index)); + } + return rule; } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs index 38b9929b..9bf7a4a4 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs @@ -71,6 +71,15 @@ private sealed record LiveLayout( private int _layoutsSelected; private string? _layoutsStatus; + /// The name being typed over the selected layout's (r), or null when no rename is under way. + private string? _layoutsRenaming; + + /// Whether the selected layout's delete (d) is waiting for its y. + private bool _layoutsConfirmingDelete; + + /// The longest name a rename takes; the list elides past its column anyway. + private const int LayoutNameMaxLength = 40; + /// The id of the layout realised in the panes, while it still owns them; for tests. internal string? LiveLayoutId => _liveLayout?.LayoutId; @@ -123,7 +132,7 @@ private string EnsurePanelWindow(string panelId, string key) var id = TerminalPanels.WindowId(panelId, key); if (_workspace.FindWindow(id) is null) { - _workspace.OpenWindow(id, PanelTitle(panelId), WindowKind.Auxiliary, key); + _workspace.OpenWindow(id, PanelTitle(panelId), WindowKind.Panel, key); } else if (_workspace.Layout.FindWindow(id) is null) { @@ -472,12 +481,108 @@ private void ShowLayouts() : ResolveLayout(key).Layout.Id; _layoutsSelected = Math.Max(0, all.ToList().FindIndex(l => l.Id == inUse)); _layoutsStatus = null; + _layoutsRenaming = null; + _layoutsConfirmingDelete = false; _layoutsView.Open( "layouts", $"Layouts · {Snippet(key)}", width => LayoutsListLines(key, width), k => LayoutsKeyPressed(key, k), - width: 64); + width: 64, + escape: LayoutsEscape); + } + + /// Esc in the ⌥M list: leaves a rename or a pending delete first, and closes the list only from rest. + private bool LayoutsEscape() + { + if (_layoutsRenaming is not null) + { + _layoutsRenaming = null; + _layoutsStatus = "rename cancelled"; + return true; + } + + if (_layoutsConfirmingDelete) + { + _layoutsConfirmingDelete = false; + _layoutsStatus = "kept"; + return true; + } + + return false; + } + + /// A key while a name is being typed: letters build it, ⏎ keeps it, ⌫ takes a letter back. + private bool LayoutsRenameKey(LayoutDefinition selected, ConsoleKeyInfo k) + { + var typed = _layoutsRenaming ?? string.Empty; + switch (k.Key) + { + case ConsoleKey.Enter: + var name = typed.Trim(); + if (name.Length == 0) + { + _layoutsStatus = "a layout needs a name — type one, or Esc keeps the old"; + return true; + } + + if (!Layouts.Rename(selected.Id, name)) + { + _layoutsStatus = Layouts.IsNameTaken(name, selected.Id) + ? $"a layout is already called {name}" + : $"{selected.Name} cannot be renamed"; + return true; + } + + PersistConfiguration(); + _layoutsRenaming = null; + _layoutsStatus = $"renamed to {name}"; + return true; + case ConsoleKey.Backspace: + _layoutsRenaming = typed.Length == 0 ? typed : typed[..^1]; + return true; + default: + if (k.KeyChar >= ' ' && !char.IsControl(k.KeyChar) + && (k.Modifiers & (ConsoleModifiers.Control | ConsoleModifiers.Alt)) == 0 + && typed.Length < LayoutNameMaxLength) + { + _layoutsRenaming = typed + k.KeyChar; + } + + return true; + } + } + + /// The answer to "delete …?": y deletes, anything else keeps it. + private bool LayoutsDeleteAnswer(string key, LayoutDefinition selected, ConsoleKeyInfo k) + { + _layoutsConfirmingDelete = false; + if (k.Key != ConsoleKey.Y || (k.Modifiers & (ConsoleModifiers.Control | ConsoleModifiers.Alt)) != 0) + { + _layoutsStatus = "kept"; + return true; + } + + if (!Layouts.Delete(selected.Id)) + { + _layoutsStatus = $"{selected.Name} cannot be deleted"; + return true; + } + + // The panes stay as they are; with the layout they were drawn from gone, they are the player's own now. + if (_liveLayout is { } live && live.LayoutId == selected.Id) + { + _liveLayout = null; + } + + PersistConfiguration(); + _layoutsSelected = Math.Clamp(_layoutsSelected, 0, Layouts.All.Count - 1); + var (world, character) = LayoutOwner(key); + var named = character?.Layout == selected.Id || world?.Layout == selected.Id; + _layoutsStatus = named + ? $"deleted {selected.Name} — this character falls back to the next layout" + : $"deleted {selected.Name}"; + return true; } private bool LayoutsKeyPressed(string key, ConsoleKeyInfo k) @@ -486,6 +591,17 @@ private bool LayoutsKeyPressed(string key, ConsoleKeyInfo k) _layoutsSelected = Math.Clamp(_layoutsSelected, 0, all.Count - 1); var selected = all[_layoutsSelected]; var (world, character) = LayoutOwner(key); + if (_layoutsRenaming is not null) + { + return LayoutsRenameKey(selected, k); + } + + if (_layoutsConfirmingDelete) + { + return LayoutsDeleteAnswer(key, selected, k); + } + + _layoutsStatus = null; switch (k.Key) { case ConsoleKey.UpArrow: @@ -509,6 +625,24 @@ private bool LayoutsKeyPressed(string key, ConsoleKeyInfo k) case ConsoleKey.N when k.Modifiers == 0: SaveLayoutAsNew(key, selected); return true; + case ConsoleKey.R when k.Modifiers == 0: + if (selected.IsBuiltIn) + { + _layoutsStatus = $"{selected.Name} is built in — n saves a copy you can rename"; + return true; + } + + _layoutsRenaming = selected.Name; + return true; + case ConsoleKey.D when k.Modifiers == 0: + if (selected.IsBuiltIn) + { + _layoutsStatus = $"{selected.Name} is built in and cannot be deleted"; + return true; + } + + _layoutsConfirmingDelete = true; + return true; case ConsoleKey.W when k.Modifiers == 0: if (world is null) { @@ -650,8 +784,11 @@ void Row(int index, LayoutDefinition layout) { var selected = index == _layoutsSelected; var mark = selected ? $"[bold {ScreenPalette.Accent}]▸[/]" : " "; - var name = Snippet(layout.Name); - name = name.Length > nameColumn - 1 ? name[..(nameColumn - 2)] + "…" : name; + var renaming = selected && _layoutsRenaming is not null; + var name = renaming ? _layoutsRenaming! + "▏" : Snippet(layout.Name); + name = renaming + ? (name.Length > nameColumn - 1 ? "…" + name[^(nameColumn - 2)..] : name) + : (name.Length > nameColumn - 1 ? name[..(nameColumn - 2)] + "…" : name); var tags = new List(); if (layout.Id == inUse) { @@ -696,18 +833,41 @@ void Row(int index, LayoutDefinition layout) lines.Add($" [{ScreenPalette.Label}]none yet — n saves the panes as they are now[/]"); } + string Key(string chord, string what) => $"[{ScreenPalette.Accent}]{chord}[/] [{ScreenPalette.Label}]{what}[/]"; + var current = all[Math.Clamp(_layoutsSelected, 0, all.Count - 1)]; + var statusLine = _layoutsStatus is { } status ? $"[{ScreenPalette.Value}]{Escape(status)}[/]" : string.Empty; + + // Every row below is always present, blank when it has nothing to say, so the modal (sized once, when it + // opens) never has a line pushed off its bottom by a status or a question. lines.Add(string.Empty); - lines.Add( - $"[{ScreenPalette.Accent}]s[/] [{ScreenPalette.Label}]save changes[/] " - + $"[{ScreenPalette.Accent}]n[/] [{ScreenPalette.Label}]save as new[/]"); - lines.Add( - $"[{ScreenPalette.Accent}]w[/] [{ScreenPalette.Label}]use for world[/] " - + $"[{ScreenPalette.Accent}]c[/] [{ScreenPalette.Label}]use for this character[/]"); - if (_layoutsStatus is { } status) + if (_layoutsRenaming is not null) { - lines.Add($"[{ScreenPalette.Value}]{Escape(status)}[/]"); + lines.Add($"[{ScreenPalette.Label}]type a new name for[/] [{ScreenPalette.Value}]{Escape(Snippet(current.Name))}[/]"); + lines.Add(string.Empty); + lines.Add(string.Empty); + lines.Add(statusLine); + lines.Add(string.Empty); + lines.Add($"[{ScreenPalette.Label}][[⏎]] Keep name [[⌫]] Erase [[Esc]] Cancel[/]"); + return lines; } + if (_layoutsConfirmingDelete) + { + lines.Add($"[{ScreenPalette.Value}]delete {Escape(Snippet(current.Name))}?[/] [{ScreenPalette.Label}]it cannot be brought back[/]"); + lines.Add(string.Empty); + lines.Add(string.Empty); + lines.Add(string.Empty); + lines.Add(string.Empty); + lines.Add($"[{ScreenPalette.Label}][[y]] Delete [[Esc]] or any other key keeps it[/]"); + return lines; + } + + lines.Add($"{Key("s", "save changes")} {Key("n", "save as new")}"); + lines.Add($"{Key("w", "use for world")} {Key("c", "use for this character")}"); + + // r and d are named only over a layout of the player's own: on a built-in neither does anything but say so. + lines.Add(current.IsBuiltIn ? string.Empty : $"{Key("r", "rename")} {Key("d", "delete")}"); + lines.Add(statusLine); lines.Add(string.Empty); lines.Add($"[{ScreenPalette.Label}]↑↓ pick [[Esc]] Close [[⏎]] Apply[/]"); return lines; diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs index eea3d7b6..cce0ffe6 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs @@ -663,12 +663,7 @@ private IReadOnlyList PanelMeters(string sessionKey) private void LoadDemoPanels(string view) { LoadDemoGameData(); - _demoOccupants.Apply( - "Room.Players", - """[{"name":"Ashlyn","fullname":"Ashlyn the Wanderer","idle":12},{"name":"Brannoc","idle":260},{"name":"Merrow","fullname":"Merrow of the Tide","idle":5},{"name":"Corvid","idle":0}]"""); - _demoOccupants.Apply( - "Char.Items.List", - """{"location":"room","items":[{"id":"9101","name":"a town crier","attrib":"m"},{"id":"9102","name":"a stray cat","attrib":"m"},{"id":"9103","name":"a lantern","attrib":"t"}]}"""); + LoadDemoOccupants(); switch (view) { @@ -705,7 +700,7 @@ private void LoadDemoPanels(string view) && _workspace.Layout.FindWindow(composer) is { } column) { var who = TerminalPanels.WindowId(PanelIds.WhoHere, DemoScene.ActiveSessionKey); - _workspace.OpenWindow(who, PanelTitle(PanelIds.WhoHere), WindowKind.Auxiliary, DemoScene.ActiveSessionKey, column.Id); + _workspace.OpenWindow(who, PanelTitle(PanelIds.WhoHere), WindowKind.Panel, DemoScene.ActiveSessionKey, column.Id); _workspace.Layout.SplitWithWindow(who, column.Id, Edge.Bottom); RebuildPaneArea(); Activate(MainWindowId); @@ -719,6 +714,21 @@ private void LoadDemoPanels(string view) RefreshRail(); } + /// The demo room's roster, written through as the wire would. + private void LoadDemoOccupants() + { + const string players = + """[{"name":"Ashlyn","fullname":"Ashlyn the Wanderer","idle":12},{"name":"Brannoc","idle":260},{"name":"Merrow","fullname":"Merrow of the Tide","idle":5},{"name":"Corvid","idle":0}]"""; + + // Into the game data too, as a session stores every GMCP package: that is where a layout reads "who is here + // is known" from (PanelAvailability), so the Roleplay layout draws the panel. + _demoGameData.SetGmcp("Room.Players", players); + _demoOccupants.Apply("Room.Players", players); + _demoOccupants.Apply( + "Char.Items.List", + """{"location":"room","items":[{"id":"9101","name":"a town crier","attrib":"m"},{"id":"9102","name":"a stray cat","attrib":"m"},{"id":"9103","name":"a lantern","attrib":"t"}]}"""); + } + /// Opens a demo panel in a new pane to the right of the main window's, wide. private string? OpenDemoPanelBeside(string panelId, int columns) { @@ -735,7 +745,7 @@ private void LoadDemoPanels(string view) return windowId; } - /// Opens a demo panel in a pane along one edge of the main window's, as short as a pane may be. + /// Opens a demo strip panel in a pane along one edge of the main window's; it is as tall as its content. private void OpenDemoPanelStrip(string panelId, Edge edge) { var mainPane = _workspace.Layout.FindWindow(MainWindowId)?.Id; @@ -747,7 +757,6 @@ private void OpenDemoPanelStrip(string panelId, Edge edge) _workspace.Layout.SplitWithWindow(windowId, mainPane, edge); RebuildPaneArea(); Activate(windowId); - SizeDemoPane(windowId, PaneResize.MinimumPaneRows); } /// diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 9d6212e1..8668ea1d 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -1831,6 +1831,15 @@ public string RenderSnapshot(string? view = null) ApplyLayout(DemoScene.ActiveSessionKey, Core.Layouts.BuiltInLayouts.Combat); } + // `layout-roleplay` is the same for the Roleplay layout: who is here beside the output (the room's roster, + // so it has data) with Chat as a tab behind it, and the docked composer under the output at its floor. + if (string.Equals(view, "layout-roleplay", StringComparison.OrdinalIgnoreCase)) + { + LoadDemoGameData(); + LoadDemoOccupants(); + ApplyLayout(DemoScene.ActiveSessionKey, Core.Layouts.BuiltInLayouts.Roleplay); + } + // The ⌃Q confirmation, over a workspace that has something to lose: a second world marked // connected (the demo scene's own way of saying so, and what the header's "n/m characters" reads), // a line typed into the command line through the bar's real change notification, and then the @@ -7719,8 +7728,10 @@ private IReadOnlyList BuildRailWindows( var windows = new List(); foreach (var window in _workspace.Windows) { + // A layout panel is not listed: it is furniture of the layout, not a window you go to, and it carries + // no ⌥N (Workspace.WindowsFor) — so the rail and the numbering stay one list. var mine = string.Equals(window.SessionKey, owner, StringComparison.Ordinal); - if (window.SessionKey is not null && !mine) + if (window.Kind == WindowKind.Panel || window.SessionKey is not null && !mine) { continue; } @@ -9921,6 +9932,14 @@ private IWindowControl BuildWorkspaceRow() _dividers.Clear(); + // Each pane's height claim, from what it holds: a strip panel is as tall as its content and an editor has a + // floor. Derived here on every rebuild rather than stored, so a pane handed an ordinary window stops being a + // strip at once. + foreach (var pane in _workspace.Layout.Root.Panes()) + { + Core.Layouts.PanelSizing.Apply(pane, PanelIdOfWindow, TabStripRows); + } + // When a pane is zoomed, render just that pane full-area; otherwise render the whole tree. var zoomed = _workspace.Layout.ZoomedPaneId is { } zid ? _workspace.Layout.FindPane(zid) : null; var paneArea = zoomed is not null @@ -10458,10 +10477,17 @@ private IWindowControl BuildLayoutNode(SharpMUTerm.Core.Workspaces.LayoutNode no // Interleave a thin 1-cell divider between children (a solid border-colour bar) instead of the // framework's double-line splitter, so splits read as a single calm line. + // A stacked split gives a strip pane exactly its rows (Cells) and an editor its floor (Star's min); the rest + // share by weight. PaneExtent.DistributeRows is the same rule, for the panes nothing has arranged yet. + var stacked = split.Direction == SplitDirection.Column; + var fixedRows = stacked ? PaneExtent.FixedChildren(split) : new int?[children.Count]; var tracks = new List(); for (var i = 0; i < children.Count; i++) { - tracks.Add(GridLength.Star(Math.Max(0.01, split.Sizes[i]))); + var floor = stacked ? PaneExtent.MinRows(split.Children[i]) : 0; + tracks.Add(fixedRows[i] is { } rows + ? GridLength.Cells(rows) + : GridLength.Star(Math.Max(0.01, split.Sizes[i]), min: floor > 0 ? floor : null)); if (i < children.Count - 1) { tracks.Add(GridLength.Cells(1)); @@ -10499,6 +10525,13 @@ private IWindowControl BuildLayoutNode(SharpMUTerm.Core.Workspaces.LayoutNode no return grid.Build(); } + /// The rows the framework's tab strip takes over a pane (the classic header style). + private const int TabStripRows = 1; + + /// The layout panel a window draws, or null for an ordinary window. + private static string? PanelIdOfWindow(string windowId) => + TerminalPanels.TryParseWindowId(windowId, out var panelId, out _) ? panelId : null; + /// Whether a pane is the one every workspace keystroke is aimed at. private bool IsFocusedPane(string paneId) => string.Equals(paneId, _workspace.Layout.FocusedPaneId, StringComparison.Ordinal); @@ -10578,6 +10611,11 @@ private IWindowControl BuildPaneTabs(PaneNode pane) PaintTabChips(tabs, PaneSurfaceTone(pane.Id)); + // A one-tab strip (the vitals meters, the quick bar) draws no tab strip: its row already says what it is, + // and a strip the height of its content has no row to spare. PaneOutputRects reads TabHeaderHeight, so the + // rectangle it reports follows. + tabs.ShowTabHeader = Core.Layouts.PanelSizing.ShowsTabStrip(pane.Tabs.Select(PanelIdOfWindow).ToList()); + var paneId = pane.Id; tabs.TabChanged += (_, e) => OnTabChanged(paneId, e.NewTab); tabs.TabCloseRequested += (_, e) => OnTabCloseRequested(e.TabPage); @@ -10718,6 +10756,7 @@ private void RebuildPaneArea() _window.InsertControl(WorkspaceRowIndex, row); _workspaceRow = row; RefreshTabTitles(); + SyncStatusMeters(); } /// How many times the pane area has been torn down and rebuilt; a test counts the reflows a change cost. @@ -11966,11 +12005,13 @@ internal PaneDragSurface PaneSnapshot() var rects = new Dictionary(StringComparer.Ordinal); var windows = new Dictionary(StringComparer.Ordinal); - foreach (var (paneId, _, rect) in RealisedPanes()) + foreach (var (paneId, tabs, rect) in RealisedPanes()) { rects[paneId] = rect; - if (_workspace.Layout.FindPane(paneId)?.ActiveTab is { } windowId) + // A pane that draws no tab strip (a one-row strip panel) has no drag handle: its one row is its + // content, and a press there belongs to that content's links. + if (tabs.ShowTabHeader && _workspace.Layout.FindPane(paneId)?.ActiveTab is { } windowId) { windows[paneId] = windowId; } @@ -12466,6 +12507,7 @@ private void SyncToFocusedPane() RefreshPromptRow(); ReportPaneSizes(); SyncComposerArm(); + SyncStatusMeters(); } /// @@ -13278,6 +13320,40 @@ internal static string RoomCell(string name, string? area) return $"[dim]⌂ {Escape(text.PadRight(room))}[/]"; } + /// Whether the status row last left its meters out because the vitals strip was showing them. + private bool _statusMetersHidden; + + /// + /// Whether the status row's character (the one its meters read) has its vitals strip on screen: the strip's + /// window is the front tab of a pane that is drawn, so the same meters are already in front of the reader. + /// + internal bool VitalsStripShowing() + { + var key = _active?.SessionKey + ?? (_sessions.Sessions.Count == 0 ? _demoActiveKey ?? DemoScene.ActiveSessionKey : null); + if (key is null) + { + return false; + } + + var windowId = TerminalPanels.WindowId(Core.Layouts.PanelIds.Vitals, key); + return _workspace.Layout.FindWindow(windowId) is { } pane + && pane.ActiveTab == windowId + && (_workspace.Layout.ZoomedPaneId is not { } zoomed || zoomed == pane.Id); + } + + /// + /// Repaints the status row when the vitals strip has come onto the screen or left it since the row was drawn, + /// so the meters move between the two. Only on a change: a repaint for nothing would displace a notice. + /// + private void SyncStatusMeters() + { + if (VitalsStripShowing() != _statusMetersHidden) + { + RefreshStatusBar(); + } + } + /// The cells the meters leave free for the typed-character count to grow into. private const int MeterSlack = 4; @@ -13285,7 +13361,12 @@ private string StatusBarMarkup(string character, string state) { var accent = ActiveWorld() is { } world ? AccentHex(world.Accent) : _ink.Accent; var left = $"[{accent}]●[/] [bold]{Escape(character)}[/] [dim]{Escape(state)}[/]"; - var meters = StatusMeterRenderer.Render(StatusMeters(), StatusData(), $"{_ink.Notice}"); + // The vitals strip already draws these meters for this character, larger; the row says them only while it + // is not on screen. Nothing else on the row moves with it: every other cell is reserved or dropped by width. + _statusMetersHidden = VitalsStripShowing(); + var meters = _statusMetersHidden + ? string.Empty + : StatusMeterRenderer.Render(StatusMeters(), StatusData(), $"{_ink.Notice}"); var right = new List(); diff --git a/src/SharpMUTerm.Tui/SnapshotViews.cs b/src/SharpMUTerm.Tui/SnapshotViews.cs index fb5474d4..338a6695 100644 --- a/src/SharpMUTerm.Tui/SnapshotViews.cs +++ b/src/SharpMUTerm.Tui/SnapshotViews.cs @@ -25,7 +25,7 @@ internal static class SnapshotViews "mxp-image", "mxp-figure", "input-selection", "selection", "trigger-builder", "prefix", "prefix-panel", "focus", "focus-moved", "tabs", "tabs-many", "collapsed", "timestamps", "timestamps-toggled", "prompt", "meters", "gamedata", "map", "map-walking", "map-split", - "packages", "package-review", "package-browse", "send-menu", "layouts", "layout-combat", + "packages", "package-review", "package-browse", "send-menu", "layouts", "layout-combat", "layout-roleplay", "panel-who", "panel-vitals", "panel-quickbar", "panel-composer", ]; } diff --git a/tests/SharpMUTerm.Core.Tests/Workspace/PaneExtentTests.cs b/tests/SharpMUTerm.Core.Tests/Workspace/PaneExtentTests.cs new file mode 100644 index 00000000..d16bea02 --- /dev/null +++ b/tests/SharpMUTerm.Core.Tests/Workspace/PaneExtentTests.cs @@ -0,0 +1,209 @@ +using SharpMUTerm.Core.Layouts; +using SharpMUTerm.Core.Workspaces; + +namespace SharpMUTerm.Core.Tests.Workspaces; + +/// +/// A strip panel (one row of meters, one row of buttons) is as tall as its content, whatever share its region was +/// given: is honoured by the solver and the resizer, and the rest of a stacked +/// split goes to the panes that share. +/// +public class PaneExtentTests +{ + private static readonly PaneRect Screen = new(0, 0, 100, 30); + + private static PaneNode Pane(string id, int? fixedRows = null, int? minRows = null) => + new(id, [id]) { FixedRows = fixedRows, MinRows = minRows }; + + [Test] + public async Task AFixedStripGetsExactlyItsRowsAndTheRestGoesToTheSharingPane() + { + // The Combat shape: a one-row strip over the output, the strip's share a tenth of the window. + var root = new SplitNode(SplitDirection.Column, [Pane("vitals", fixedRows: 1), Pane("output")], [0.1, 0.9]); + + var rects = LayoutSolver.Solve(root, Screen); + + await Assert.That(rects["vitals"]).IsEqualTo(new PaneRect(0, 0, 100, 1)); + await Assert.That(rects["output"]).IsEqualTo(new PaneRect(0, 2, 100, 28)); + } + + [Test] + public async Task TheShareAFixedPaneWasGivenDoesNotMatter() + { + var narrow = new SplitNode(SplitDirection.Column, [Pane("output"), Pane("quick", fixedRows: 1)], [0.95, 0.05]); + var wide = new SplitNode(SplitDirection.Column, [Pane("output"), Pane("quick", fixedRows: 1)], [0.2, 0.8]); + + await Assert.That(LayoutSolver.Solve(narrow, Screen)["quick"].Height).IsEqualTo(1); + await Assert.That(LayoutSolver.Solve(wide, Screen)["quick"].Height).IsEqualTo(1); + await Assert.That(LayoutSolver.Solve(wide, Screen)["output"].Height).IsEqualTo(28); + } + + [Test] + public async Task SharingPanesStillSplitWhatIsLeftByTheirFractions() + { + var root = new SplitNode( + SplitDirection.Column, + [Pane("strip", fixedRows: 2), Pane("a"), Pane("b")], + [0.5, 0.25, 0.25]); + + var rects = LayoutSolver.Solve(root, Screen); + + // 30 − 2 dividers = 28; the strip takes 2, and a and b split the 26 left evenly. + await Assert.That(rects["strip"].Height).IsEqualTo(2); + await Assert.That(rects["a"].Height).IsEqualTo(13); + await Assert.That(rects["b"].Height).IsEqualTo(13); + } + + [Test] + public async Task ColumnsAreNeverFixed() + { + var root = new SplitNode(SplitDirection.Row, [Pane("vitals", fixedRows: 1), Pane("output")]); + + var rects = LayoutSolver.Solve(root, Screen); + + await Assert.That(rects["vitals"].Height).IsEqualTo(30); + await Assert.That(rects["vitals"].Width).IsEqualTo(50); + } + + [Test] + public async Task AFloorRaisesAPaneItsShareWouldSqueeze() + { + // The Roleplay shape: the composer's region is a fifth of the window, its floor six rows. + var root = new SplitNode(SplitDirection.Column, [Pane("output"), Pane("composer", minRows: 6)], [0.9, 0.1]); + + var rects = LayoutSolver.Solve(root, Screen); + + await Assert.That(rects["composer"].Height).IsEqualTo(6); + await Assert.That(rects["output"].Height).IsEqualTo(23); + } + + [Test] + public async Task WhenEveryPaneIsFixedTheLastTakesWhatIsLeftSoNoRowIsLost() + { + var root = new SplitNode(SplitDirection.Column, [Pane("a", fixedRows: 1), Pane("b", fixedRows: 1)]); + + var rects = LayoutSolver.Solve(root, Screen); + + await Assert.That(rects["a"].Height).IsEqualTo(1); + await Assert.That(rects["b"].Height).IsEqualTo(28); + } + + [Test] + public async Task ASubtreeIsFixedOnlyWhenEveryPaneInItIs() + { + var strips = new SplitNode(SplitDirection.Row, [Pane("vitals", fixedRows: 1), Pane("quick", fixedRows: 2)]); + var stack = new SplitNode(SplitDirection.Column, [Pane("vitals2", fixedRows: 1), Pane("quick2", fixedRows: 1)]); + var mixed = new SplitNode(SplitDirection.Row, [Pane("vitals3", fixedRows: 1), Pane("output")]); + + await Assert.That(PaneExtent.FixedRows(strips)).IsEqualTo(2); + await Assert.That(PaneExtent.FixedRows(stack)).IsEqualTo(3); // two rows and the divider between them + await Assert.That(PaneExtent.FixedRows(mixed)).IsNull(); + } + + [Test] + public async Task DraggingTheDividerOfAFixedStripMovesNothing() + { + var root = new SplitNode(SplitDirection.Column, [Pane("vitals", fixedRows: 1), Pane("output")], [0.1, 0.9]); + var before = root.Sizes.ToList(); + var rects = LayoutSolver.Solve(root, Screen); + + var result = PaneResize.DragBorder(root, 0, 8, rects); + + await Assert.That(result.Outcome).IsEqualTo(PaneResizeOutcome.FixedSize); + await Assert.That(root.Sizes).IsEquivalentTo(before); + } + + [Test] + public async Task ResizingFromBesideAStripTakesTheRowsFromThePaneBeyondIt() + { + // output between a fixed strip above and a sharing pane below: ⌥⇧↑ grows output from below, not the strip. + var layout = new WorkspaceLayout( + new SplitNode(SplitDirection.Column, [Pane("strip", fixedRows: 1), Pane("output"), Pane("below")], [0.1, 0.45, 0.45]), + "output"); + var rects = LayoutSolver.Solve(layout.Root, Screen); + + var result = PaneResize.Apply(layout, PaneDirection.Up, rects); + var after = LayoutSolver.Solve(layout.Root, Screen); + + await Assert.That(result.Outcome).IsEqualTo(PaneResizeOutcome.Resized); + await Assert.That(after["strip"].Height).IsEqualTo(1); + await Assert.That(after["output"].Height).IsEqualTo(rects["output"].Height + 1); + } + + [Test] + public async Task AResizeWithOnlyAStripToPayIsRefusedAndSaysWhy() + { + var layout = new WorkspaceLayout( + new SplitNode(SplitDirection.Column, [Pane("vitals", fixedRows: 1), Pane("output")]), + "output"); + var rects = LayoutSolver.Solve(layout.Root, Screen); + + var result = PaneResize.Apply(layout, PaneDirection.Up, rects); + + await Assert.That(result.Outcome).IsEqualTo(PaneResizeOutcome.FixedSize); + await Assert.That(PaneResize.Describe(result.Outcome, PaneDirection.Up)).IsNotEmpty(); + } + + [Test] + public async Task AStripsFloorIsItsOwnHeightNotTheOrdinaryFloor() + { + await Assert.That(PaneResize.Minimum(Pane("vitals", fixedRows: 1), horizontal: false)).IsEqualTo(1); + await Assert.That(PaneResize.Minimum(Pane("composer", minRows: 6), horizontal: false)).IsEqualTo(6); + await Assert.That(PaneResize.Minimum(Pane("output"), horizontal: false)).IsEqualTo(PaneResize.MinimumPaneRows); + } + + [Test] + public async Task APaneHoldingOneStripPanelIsAsTallAsItAndDrawsNoTabStrip() + { + var pane = new PaneNode("p", ["panel:vitals:W.C"]); + + PanelSizing.Apply(pane, PanelOf, tabStripRows: 1); + + await Assert.That(pane.FixedRows).IsEqualTo(1); + await Assert.That(PanelSizing.ShowsTabStrip(pane.Tabs.Select(PanelOf).ToList())).IsFalse(); + } + + [Test] + public async Task TwoStripPanelsInOnePaneAddTheTabStripTheyThenNeed() + { + var pane = new PaneNode("p", ["panel:vitals:W.C", "panel:quick-bar:W.C"]); + + PanelSizing.Apply(pane, PanelOf, tabStripRows: 1); + + await Assert.That(pane.FixedRows).IsEqualTo(2); + await Assert.That(PanelSizing.ShowsTabStrip(pane.Tabs.Select(PanelOf).ToList())).IsTrue(); + } + + [Test] + public async Task AStripHandedAnOrdinaryWindowStopsBeingAStrip() + { + var pane = new PaneNode("p", ["panel:vitals:W.C"]) { FixedRows = 1 }; + pane.Tabs.Add("main"); + + PanelSizing.Apply(pane, PanelOf, tabStripRows: 1); + + await Assert.That(pane.FixedRows).IsNull(); + } + + [Test] + public async Task AComposerPaneHasAFloorOfItsEditorAndItsTabStrip() + { + var pane = new PaneNode("p", ["panel:composer:W.C"]); + + PanelSizing.Apply(pane, PanelOf, tabStripRows: 1); + + await Assert.That(pane.FixedRows).IsNull(); + await Assert.That(pane.MinRows).IsEqualTo(PanelSizing.ComposerMinRows + 1); + } + + private static string? PanelOf(string windowId) + { + if (!windowId.StartsWith("panel:", StringComparison.Ordinal)) + { + return null; + } + + var rest = windowId["panel:".Length..]; + return rest[..rest.IndexOf(':')]; + } +} diff --git a/tests/SharpMUTerm.Core.Tests/Workspace/WindowNumberingTests.cs b/tests/SharpMUTerm.Core.Tests/Workspace/WindowNumberingTests.cs index 3d107e11..eda4ab28 100644 --- a/tests/SharpMUTerm.Core.Tests/Workspace/WindowNumberingTests.cs +++ b/tests/SharpMUTerm.Core.Tests/Workspace/WindowNumberingTests.cs @@ -235,6 +235,23 @@ public async Task AHalfMigratedWorkspaceGivesNoTwoWindowsOneNumber() private const string Owner = "W.C"; /// The window id produces for . + /// + /// A layout panel is furniture, not a destination. The vitals strip or the quick bar opening must not + /// take a digit from the windows a player goes to — the map, a capture — nor push them to later ones; the + /// numbering stays contiguous over what is left. + /// + [Test] + public async Task ALayoutPanelTakesNoNumberAndMovesNoOtherWindowsNumber() + { + var ws = new Workspace(mainWindowId: "main", mainTitle: "Main", sessionKey: "W.C"); + ws.OpenWindow("panel:vitals:W.C", "Vitals", WindowKind.Panel, "W.C"); + ws.RouteSpawn("Chat", "W.C"); + ws.OpenWindow("panel:quick-bar:W.C", "Quick bar", WindowKind.Panel, "W.C"); + ws.OpenWindow("map:W.C", "Map", WindowKind.Auxiliary, "W.C"); + + await Assert.That(Order(ws)).IsEqualTo($"main,{Spawn("Chat")},map:W.C"); + } + private static string Spawn(string target) => Workspace.SpawnWindowId(Owner, target); private static string Order(Workspace workspace) => diff --git a/tests/SharpMUTerm.Tui.Tests/LayoutStripTests.cs b/tests/SharpMUTerm.Tui.Tests/LayoutStripTests.cs new file mode 100644 index 00000000..49c6da09 --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/LayoutStripTests.cs @@ -0,0 +1,234 @@ +using SharpConsoleUI.Drivers; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Layouts; +using SharpMUTerm.Graphics; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// The furniture of a layout in the client: a strip panel is as tall as its content and draws no tab strip, the status +/// row does not repeat meters the vitals strip is already showing, a panel takes no rail row and no ⌥N, the +/// composer keeps an editor's height, and ⌥M renames and deletes saved layouts. +/// +/// Serialised: rendering redirects the process-global Console.Out. +[NotInParallel] +public class LayoutStripTests +{ + private static readonly TerminalCapabilities Headless = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private static readonly ConsoleKeyInfo AltM = new('m', ConsoleKey.M, shift: false, alt: true, control: false); + + private static readonly ConsoleKeyInfo Down = new('\0', ConsoleKey.DownArrow, false, false, false); + + private static readonly ConsoleKeyInfo Enter = new('\r', ConsoleKey.Enter, false, false, false); + + private static readonly ConsoleKeyInfo Esc = new('\u001b', ConsoleKey.Escape, false, false, false); + + private static readonly ConsoleKeyInfo Backspace = new('\b', ConsoleKey.Backspace, false, false, false); + + private static SharpMUTermApp Demo(AppConfiguration? config = null, int width = 120, int height = 32) + { + Console.SetIn(TextReader.Null); + config ??= DemoScene.Build(); + config.ScrollbackSpill.Enabled = false; + return new SharpMUTermApp(config, Headless, new HeadlessConsoleDriver(width, height)); + } + + private static ConsoleKeyInfo Letter(char c) => + new(c, ConsoleKey.A + (char.ToUpperInvariant(c) - 'A'), char.IsUpper(c), false, false); + + private static ConsoleKeyInfo Typed(char c) => char.IsLetter(c) ? Letter(c) : new(c, ConsoleKey.Spacebar, false, false, false); + + [Test] + [Arguments(120, 32)] + [Arguments(80, 24)] + public async Task CombatsVitalsAndQuickBarAreOneRowEachWithNoTabStrip(int width, int height) + { + await using var app = Demo(width: width, height: height); + app.RenderSnapshot("layout-combat"); + + var output = app.PaneOutputRects(); + var whole = app.PaneSnapshot().Rects; + await Assert.That(output["panel:vitals"].Height).IsEqualTo(1); + await Assert.That(output["panel:quick-bar"].Height).IsEqualTo(1); + + // No tab strip: the pane is its content, so its whole rectangle is that one row too. + await Assert.That(whole["panel:vitals"].Height).IsEqualTo(1); + await Assert.That(whole["panel:quick-bar"].Height).IsEqualTo(1); + + // The output pane keeps its tab strip, and everything the strips did not take. + await Assert.That(whole["panel:output"].Height - output["panel:output"].Height).IsEqualTo(1); + await Assert.That(output["panel:output"].Height).IsGreaterThan(height / 2); + } + + [Test] + public async Task TheStatusRowLeavesOutTheMetersWhileTheVitalsStripShowsThem() + { + await using var app = Demo(); + app.RenderSnapshot("layout-combat"); + + await Assert.That(app.VitalsStripShowing()).IsTrue(); + await Assert.That(app.StatusMarkup).DoesNotContain("[dim]hp[/]"); + await Assert.That(app.StatusMarkup).Contains("Corvid"); + } + + [Test] + public async Task TheMetersComeBackToTheStatusRowWhenTheStripIsNotOnScreen() + { + await using var app = Demo(); + app.RenderSnapshot("meters"); + + await Assert.That(app.VitalsStripShowing()).IsFalse(); + await Assert.That(app.StatusMarkup).Contains("[dim]hp[/]"); + } + + [Test] + public async Task ZoomingAnotherPaneBringsTheMetersBack() + { + await using var app = Demo(); + app.RenderSnapshot("layout-combat"); + + app.DispatchCommand("layout:zoom"); + + await Assert.That(app.VitalsStripShowing()).IsFalse(); + await Assert.That(app.StatusMarkup).Contains("[dim]hp[/]"); + } + + [Test] + public async Task PanelsTakeNoRailRowAndNoNumber() + { + await using var app = Demo(); + app.RenderSnapshot("layout-combat"); + + var rail = string.Join("\n", app.RailLines); + await Assert.That(rail).DoesNotContain("Vitals"); + await Assert.That(rail).DoesNotContain("Quick bar"); + await Assert.That(app.NumberedWindowIds.Any(id => id.StartsWith(TerminalPanels.WindowPrefix, StringComparison.Ordinal))).IsFalse(); + + // The map is a place you go, so it keeps its number — the third, right after main and Chat. + await Assert.That(app.NumberedWindowIds[2]).IsEqualTo(SharpMUTermApp.MapWindowId(DemoScene.ActiveSessionKey)); + await Assert.That(rail).Contains("⌥3"); + await Assert.That(rail).DoesNotContain("⌥4"); + } + + [Test] + public async Task RoleplayDrawsWhoIsHereAndGivesTheComposerAnEditorsHeight() + { + await using var app = Demo(); + app.RenderSnapshot("layout-roleplay"); + + await Assert.That(app.LiveLayoutId).IsEqualTo(BuiltInLayouts.RoleplayId); + await Assert.That(app.PaneIds).Contains("panel:who-here"); + await Assert.That(app.PaneIds).Contains("panel:composer"); + await Assert.That(app.PaneOutputRects()["panel:composer"].Height).IsGreaterThanOrEqualTo(PanelSizing.ComposerMinRows); + } + + [Test] + public async Task RenameTypesANewNameOverTheSelectedLayout() + { + var config = DemoScene.Build(); + config.Layouts.Add(new LayoutDefinition { Id = "mine", Name = "Mine", Placements = BuiltInLayouts.Combat.Placements }); + await using var app = Demo(config); + app.RenderSnapshot(); + app.SimulateKey(AltM); + app.SimulateLayoutsKey(Down); + app.SimulateLayoutsKey(Down); // Mine + + await Assert.That(string.Join("\n", app.LayoutsLines)).Contains("rename"); + app.SimulateLayoutsKey(Letter('r')); + for (var i = 0; i < "Mine".Length; i++) + { + app.SimulateLayoutsKey(Backspace); + } + + foreach (var c in "Raid night") + { + app.SimulateLayoutsKey(Typed(c)); + } + + await Assert.That(string.Join("\n", app.LayoutsLines)).Contains("Raid night"); + app.SimulateLayoutsKey(Enter); + + await Assert.That(app.LayoutsOpen).IsTrue(); // ⏎ keeps the name; it does not apply the layout + await Assert.That(config.Layouts.Single().Name).IsEqualTo("Raid night"); + await Assert.That(string.Join("\n", app.LayoutsLines)).Contains("renamed to Raid night"); + } + + [Test] + public async Task EscLeavesARenameWithoutClosingTheListOrChangingTheName() + { + var config = DemoScene.Build(); + config.Layouts.Add(new LayoutDefinition { Id = "mine", Name = "Mine", Placements = BuiltInLayouts.Combat.Placements }); + await using var app = Demo(config); + app.RenderSnapshot(); + app.SimulateKey(AltM); + app.SimulateLayoutsKey(Down); + app.SimulateLayoutsKey(Down); + app.SimulateLayoutsKey(Letter('r')); + app.SimulateLayoutsKey(Letter('x')); + + app.SimulateLayoutsKey(Esc); + + await Assert.That(app.LayoutsOpen).IsTrue(); + await Assert.That(config.Layouts.Single().Name).IsEqualTo("Mine"); + } + + [Test] + public async Task DeleteAsksFirstAndYDeletes() + { + var config = DemoScene.Build(); + config.Layouts.Add(new LayoutDefinition { Id = "mine", Name = "Mine", Placements = BuiltInLayouts.Combat.Placements }); + await using var app = Demo(config); + app.RenderSnapshot(); + app.SimulateKey(AltM); + app.SimulateLayoutsKey(Down); + app.SimulateLayoutsKey(Down); + + app.SimulateLayoutsKey(Letter('d')); + await Assert.That(string.Join("\n", app.LayoutsLines)).Contains("delete Mine?"); + await Assert.That(config.Layouts.Count).IsEqualTo(1); // nothing yet + + app.SimulateLayoutsKey(Letter('y')); + await Assert.That(config.Layouts).IsEmpty(); + await Assert.That(app.LayoutsOpen).IsTrue(); + } + + [Test] + public async Task AnyOtherAnswerKeepsTheLayout() + { + var config = DemoScene.Build(); + config.Layouts.Add(new LayoutDefinition { Id = "mine", Name = "Mine", Placements = BuiltInLayouts.Combat.Placements }); + await using var app = Demo(config); + app.RenderSnapshot(); + app.SimulateKey(AltM); + app.SimulateLayoutsKey(Down); + app.SimulateLayoutsKey(Down); + + app.SimulateLayoutsKey(Letter('d')); + app.SimulateLayoutsKey(Letter('n')); + + await Assert.That(config.Layouts.Count).IsEqualTo(1); + await Assert.That(string.Join("\n", app.LayoutsLines)).Contains("kept"); + } + + [Test] + public async Task ABuiltInIsNeitherRenamedNorDeletedAndTheFooterDoesNotOfferEither() + { + var config = DemoScene.Build(); + await using var app = Demo(config); + app.RenderSnapshot(); + app.SimulateKey(AltM); // Roleplay, built in, is selected + + var lines = string.Join("\n", app.LayoutsLines); + await Assert.That(lines).DoesNotContain("rename"); + await Assert.That(lines).DoesNotContain("delete"); + + app.SimulateLayoutsKey(Letter('d')); + await Assert.That(string.Join("\n", app.LayoutsLines)).Contains("cannot be deleted"); + app.SimulateLayoutsKey(Letter('r')); + await Assert.That(string.Join("\n", app.LayoutsLines)).Contains("n saves a copy you can rename"); + await Assert.That(BuiltInLayouts.All.Select(l => l.Name)).IsEquivalentTo(new[] { "Roleplay", "Combat" }); + } +} From 1202adaf1e530c6a6f6da9168e4c6683d324d5ae Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 05:08:17 +0000 Subject: [PATCH 017/113] Open a first run on a welcome, and leave a key tour after its first connect A client with no worlds opens on a welcome: connect to a host (a form that goes through /connect's own path, adding the character it names), browse games from the package index (still fetched only when asked; says so in place when no index is set), or open F5, with the /connect line spelt out and a starting layout to pick (suggested by default, so the client's suggestion still applies). Esc closes it for the run; /welcome and Ctrl+P > Welcome reopen it. Under --plain (ClientHost.ScreenIsSeen false) the choices are announced as commands and /welcome layout picks the layout. The first connect of a configuration that started empty puts one chrome row naming Ctrl+P, Alt+M, F1 and F5, owed through AppConfiguration.KeyTourPending so it is shown once and survives a restart. Ctrl+P > Key tour hides and shows it. Snapshot views welcome, welcome-connect and tour. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 9 + CLAUDE.md | 30 +- src/SharpMUTerm.Avalonia/WindowHost.cs | 1 + .../Commands/BuiltInCommands.cs | 6 + .../Configuration/AppConfiguration.cs | 9 + src/SharpMUTerm.Tui/Hosting/ClientHost.cs | 10 + src/SharpMUTerm.Tui/Hosting/PlainHost.cs | 1 + src/SharpMUTerm.Tui/ListOverlay.cs | 24 +- src/SharpMUTerm.Tui/SharpMUTermApp.Connect.cs | 15 +- src/SharpMUTerm.Tui/SharpMUTermApp.Welcome.cs | 351 ++++++++++++++ src/SharpMUTerm.Tui/SharpMUTermApp.cs | 52 +- src/SharpMUTerm.Tui/SnapshotViews.cs | 1 + src/SharpMUTerm.Tui/WelcomeSurface.cs | 447 ++++++++++++++++++ .../FrameContrastTests.cs | 4 + .../SnapshotViewEmptyConfigTests.cs | 2 +- tests/SharpMUTerm.Tui.Tests/WelcomeTests.cs | 328 +++++++++++++ 16 files changed, 1281 insertions(+), 9 deletions(-) create mode 100644 src/SharpMUTerm.Tui/SharpMUTermApp.Welcome.cs create mode 100644 src/SharpMUTerm.Tui/WelcomeSurface.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/WelcomeTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 1cd3e4f7..d5b99cd6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,14 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- A first run has somewhere to start: with no worlds, the client opens on a welcome offering *Connect to a + host* (a small form for the host, port, TLS and your character's name), *Browse games* from the package + index and *Open settings*, with the `/connect` line spelt out and a starting layout to pick (Roleplay, + Combat, or suggested from what the game sends). Esc closes it; `/welcome` or Ctrl+P ▸ *Welcome* brings it + back. With `--plain` the choices are read out as commands to type. +- After the first connect of a new configuration, one row names the keys worth knowing (Ctrl+P, Alt+M, F1, + F5). Ctrl+P ▸ *Key tour* hides it and shows it again. + - Ctrl+P matches as you type by initials and fragments, not only by prefix: `trig sel` finds *Make a trigger from the selection*, and the letters it matched are highlighted. The commands you last ran from it are listed first under RECENT, followed by what the moment suggests (copy while something is selected, back to @@ -156,6 +164,7 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Fixed +- The message a client with no worlds shows no longer wraps the status row onto a second row at 80 columns. - A `--snapshot` frame with an MXP picture in cells a server left for it no longer sometimes leaves one of the picture's rows blank. - At 80 columns the status row no longer wraps onto a second row: the encoding and the Ctrl+P hint are diff --git a/CLAUDE.md b/CLAUDE.md index 6ddf5c59..e1e3d74c 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -543,6 +543,30 @@ fallbacks) for inline images/maps. leaves, so several auto-connects always land you in the same place, and a black-holed host cannot hold the other worlds' windows hostage. `ConnectAtStartup` is *not* `AutoLogin` — one opens the socket, the other sends the connect line once one is open, and either is useful alone. +- **A client with no worlds opens on a welcome, and the first connect of a new configuration leaves a key tour** + (`WelcomeSurface`, `SharpMUTermApp.Welcome.cs`; `/welcome`, ⌃P ▸ *Welcome* / *Key tour*). The welcome is a + `ListOverlay` over a pure model (the `QuitPrompt` split): *Connect to a host* (a form: host, port 4000, TLS, an + optional character, a password reminder), *Browse games* (`BrowsePackages`, so the index is still fetched only + when asked; with no https `PackageIndexUrl` it says so on the row instead), *Open settings* (F5), the + `/connect` example, and a starting layout. Decisions not to relitigate: + - **The form goes through `ConnectCommand`**, with a `shape` callback that adds the character — so it can do + nothing `/connect` cannot. Esc on the form goes back to the menu; on the menu it closes, leaving + `NoWorldsNotice` (short enough for an 80-column row, and it names `/welcome`), and nothing reopens it that + run. The menu and the form are drawn at **one height in one window**: reopening the overlay to resize it + worked headlessly and left the old window in front under the window host's loop. + - **The layout row's default is *suggested*, which writes nothing**, so `LayoutSuggester` still applies at the + first connect; Roleplay or Combat is written to `WorldDefinition.Layout`. It applies to the first world a + configuration gains however it is added, so a `/connect` typed under the welcome gets it too. + - **`--plain` gets lines, not a modal** (`ClientHost.ScreenIsSeen`, false only there): a modal on a screen + nobody reads would take the reader's typing. The choices are announced as commands, and `/welcome layout + roleplay|combat|suggested` stands in for the arrows. A host with an announcer hears the lines either way. + - **The tour is owed, not "shown"** (`AppConfiguration.KeyTourPending`): set on the way to a save + (`PersistConfiguration` → `NoteFirstWorld`) once a configuration that started the run empty has a world, and + cleared when the tour row is put up on the next `Connected`. A configuration from before the tour has + worlds and never gets it, with no migration; a new player who quits before connecting still gets it next + run. The row is chrome (`AppendWindowLine`), found again by its markup, and hidden or shown by ⌃P ▸ + *Key tour* — not by a link, because the panes' link handler is scheme-tagged server text and a client action + there would be a new trust path. - **The URLs a world prints as plain text are marked up by this client, because the terminal's own detection cannot survive a pane** (`UrlDetector`, Core; F7 ▸ `detect links in output`, default on). Kitty, WezTerm and Ghostty all find URLs in the cells they paint — across the terminal **row**. A pane @@ -1177,8 +1201,10 @@ python3 tools/ansi_frame_to_image.py frame.ansi frame.html # or .svg applied over the demo's game data and recorded streets: the map beside the output with Chat as a tab under it, and no pane for the panels nothing draws yet), `panel-who`/`panel-vitals`/`panel-quickbar`/`panel-composer` (each panel in a pane of its own over the demo's game data; the composer over who-here, armed, with a draft - typed through its real key path), plus the - default workspace + typed through its real key path), `welcome`/`welcome-connect` (the first-run welcome over an **emptied** + configuration and a main window alone — `--demo-config` has worlds, and the welcome never opens over them — and + its connect form filled in by real keys) and `tour` (the key tour row at the end of the demo's main window), plus + the default workspace (no `--view`). Any settings screen also takes a `-edit` suffix, which opens it and drives real keys in so the frame shows a field mid-edit. State toggles: `collapsed`, `prefix`, `timestamps`, and `timestamps-toggled` — the same column reached the *other* way, by dispatching the real ⌃P entry diff --git a/src/SharpMUTerm.Avalonia/WindowHost.cs b/src/SharpMUTerm.Avalonia/WindowHost.cs index 4d55e597..72178d12 100644 --- a/src/SharpMUTerm.Avalonia/WindowHost.cs +++ b/src/SharpMUTerm.Avalonia/WindowHost.cs @@ -55,5 +55,6 @@ internal static class WindowHost // A live region a screen reader watches; the terminal has none, and --plain is its answer. Announcer = driver.Announcer, + ScreenIsSeen = true, }; } diff --git a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs index ea1aede6..e3f97a0c 100644 --- a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs +++ b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs @@ -154,6 +154,12 @@ void Family(string id, string prefix, Func c.State.TimestampsOn); Add("term:timestamps-on", CommandGroup.Terminal, "Show timestamps", when: c => !c.State.TimestampsOn); Add("term:input2-off", CommandGroup.Terminal, "Hide second input", "⌃B i", "this window", diff --git a/src/SharpMUTerm.Core/Configuration/AppConfiguration.cs b/src/SharpMUTerm.Core/Configuration/AppConfiguration.cs index d1e05953..a46258ba 100644 --- a/src/SharpMUTerm.Core/Configuration/AppConfiguration.cs +++ b/src/SharpMUTerm.Core/Configuration/AppConfiguration.cs @@ -113,6 +113,15 @@ public sealed class AppConfiguration /// The ids of installed packages the player has switched off; their sets apply to nobody. public List DisabledPackages { get; set; } = new(); + /// + /// The short key tour is owed: set when a configuration that started a run with no worlds gains its first + /// one, and cleared once the tour has been shown after a connect. A pending flag rather than a "shown" one, + /// so a configuration from before the tour existed (every one that already has worlds) never gets it and + /// needs no migration; and it survives a restart, so a new player who adds a world and quits before it + /// connects still gets the tour on the connect that follows. + /// + public bool KeyTourPending { get; set; } + /// The package index Browse packages reads: an https link to an index.json. public string PackageIndexUrl { get; set; } = DefaultPackageIndexUrl; diff --git a/src/SharpMUTerm.Tui/Hosting/ClientHost.cs b/src/SharpMUTerm.Tui/Hosting/ClientHost.cs index 0aef6403..be14b3b5 100644 --- a/src/SharpMUTerm.Tui/Hosting/ClientHost.cs +++ b/src/SharpMUTerm.Tui/Hosting/ClientHost.cs @@ -83,6 +83,14 @@ internal sealed record ClientHost /// public required IAnnouncer? Announcer { get; init; } + /// + /// Whether anybody looks at the cells. False for --plain, whose screen is a headless buffer nobody + /// reads: a surface the client would open as a modal there (the first-run welcome) is said as lines through + /// and worked by typed commands instead, because a modal there would take the keys + /// the reader types and show them nothing. + /// + public required bool ScreenIsSeen { get; init; } + /// /// Whether the terminal driver's input path can decode a focus report. Not on Windows: the Windows branch of /// NetConsoleDriver is a Console.ReadKey loop with its own reassembly, and an ESC [ I @@ -119,6 +127,7 @@ public static ClientHost Terminal(TerminalCapabilities capabilities) Audio = () => DesktopAudio.TryCreate(), Presence = () => new DiscordIpc(), Announcer = null, + ScreenIsSeen = true, }; /// @@ -140,6 +149,7 @@ public static ClientHost Terminal(TerminalCapabilities capabilities) Audio = null, Presence = null, Announcer = null, + ScreenIsSeen = true, }; /// diff --git a/src/SharpMUTerm.Tui/Hosting/PlainHost.cs b/src/SharpMUTerm.Tui/Hosting/PlainHost.cs index 93246992..1917ce7d 100644 --- a/src/SharpMUTerm.Tui/Hosting/PlainHost.cs +++ b/src/SharpMUTerm.Tui/Hosting/PlainHost.cs @@ -29,6 +29,7 @@ public static ClientHost Create(TerminalCapabilities capabilities, TextWriter ou Audio = () => DesktopAudio.TryCreate(), Presence = () => new DiscordIpc(), Announcer = new PlainAnnouncer(output), + ScreenIsSeen = false, }; } diff --git a/src/SharpMUTerm.Tui/ListOverlay.cs b/src/SharpMUTerm.Tui/ListOverlay.cs index a8a70f3f..c951215a 100644 --- a/src/SharpMUTerm.Tui/ListOverlay.cs +++ b/src/SharpMUTerm.Tui/ListOverlay.cs @@ -18,6 +18,7 @@ internal sealed class ListOverlay private MarkupControl? _content; private Func>? _render; private Func? _key; + private Func? _escape; private readonly ScreenTheme _scheme; @@ -37,9 +38,16 @@ public ListOverlay(ConsoleWindowSystem system, ScreenTheme? scheme = null) /// /// Opens a surface. draws it at a width; answers a key - /// and returns whether the surface stays open. + /// and returns whether the surface stays open. , when given, is asked first about + /// Esc and keeps the surface open by returning true — a surface with a step to go back from. /// - public void Open(string mode, string title, Func> render, Func key, int? width = null) + public void Open( + string mode, + string title, + Func> render, + Func key, + int? width = null, + Func? escape = null) { if (_window is not null) { @@ -48,6 +56,7 @@ public void Open(string mode, string title, Func> render, Func _render = render; _key = key; + _escape = escape; var desktop = _system.DesktopDimensions; var widest = Math.Clamp(desktop.Width - 8, 44, 110); var outer = width is { } asked ? Math.Clamp(asked + 4, 24, widest) : widest; @@ -119,6 +128,16 @@ private void OnKey(object? sender, KeyPressedEventArgs e) // A key can start a fetch whose answer opens the next surface (browse, then a review). Only the // surface the key was pressed on is closed, so that answer is never closed with it. var window = _window; + if (e.KeyInfo.Key == ConsoleKey.Escape && _escape?.Invoke() == true) + { + if (_window == window) + { + Repaint(); + } + + return; + } + if (e.KeyInfo.Key == ConsoleKey.Escape || !_key(e.KeyInfo)) { if (_window == window) @@ -138,6 +157,7 @@ private void Reset() _content = null; _render = null; _key = null; + _escape = null; Mode = null; } } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Connect.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Connect.cs index cefe5bd8..445c76a2 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Connect.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Connect.cs @@ -19,7 +19,11 @@ internal sealed partial class SharpMUTermApp /// What /connect with nothing after it says. internal const string ConnectUsage = "/connect , or /connect [port] [tls] to add one"; - private void ConnectCommand(string windowId, string arguments) + /// + /// Finishes a world this adds before it is saved — the welcome's form adds the character it named. Not + /// called when the words name a world that already exists. + /// + private void ConnectCommand(string windowId, string arguments, Action? shape = null) { var words = arguments.Split(' ', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries); var tls = words.Any(IsTlsWord); @@ -54,6 +58,15 @@ private void ConnectCommand(string windowId, string arguments) Port = endpoint.Port, UseTls = tls, }; + + // A configuration's first world takes the layout the welcome was left at, whether it came from + // the welcome's form or from a /connect typed under it. + if (_config.Worlds.Count == 0) + { + ApplyWelcomeLayout(world); + } + + shape?.Invoke(world); _config.Worlds.Add(world); SaveConfiguration(); Notice($"added {world.Name} ({world.Host}:{world.Port}) — F5 edits it", MessageSeverity.Info, "F5"); diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Welcome.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Welcome.cs new file mode 100644 index 00000000..f1ffa912 --- /dev/null +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Welcome.cs @@ -0,0 +1,351 @@ +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Diagnostics; +using SharpMUTerm.Core.Session; +using static SharpMUTerm.Tui.MarkupText; + +namespace SharpMUTerm.Tui; + +/// +/// The first run: a welcome when the configuration has no worlds, and a short key tour after the first +/// connect. The welcome is a over where somebody sees +/// the screen, and the same choices said as lines where nobody does (--plain, +/// ). Its connect form goes through , so it +/// can do nothing /connect cannot. +/// +internal sealed partial class SharpMUTermApp +{ + private readonly ListOverlay _welcomeView; + + /// The welcome's state while it is open, and what it was left at when it closed. + private WelcomeSurface? _welcome; + + /// + /// The starting layout the welcome was left at, for the run. Applied to the first world a configuration + /// gains, however it is added — the form, or /connect typed under the welcome. + /// + private WelcomeLayout _welcomeLayout = WelcomeLayout.Suggested; + + /// Whether the configuration had no worlds when this app was made: the one state the tour is owed in. + private readonly bool _startedEmpty; + + /// Sessions whose player asked, on the welcome's form, to be reminded to save a password. + private readonly HashSet _passwordLater = new(StringComparer.Ordinal); + + /// The words the key tour row starts with, so it can be found in a buffer again. + internal const string KeyTourLead = "Keys:"; + + /// The window holding the tour row, or null when none does. + private string? _tourWindow; + + /// Whether the welcome surface is up, for the tests. + internal bool WelcomeIsOpen => _welcomeView.IsOpen; + + /// What the welcome shows now, for the tests. + internal IReadOnlyList WelcomeLines => _welcomeView.Lines; + + /// The welcome's model, for a test that reads the form it drove. + internal WelcomeSurface? Welcome => _welcome; + + /// Feeds a key to the welcome surface the way the window's own handler would. + internal void SimulateWelcomeKey(ConsoleKeyInfo key) => _welcomeView.SimulateKey(key); + + /// Why the package index cannot be browsed, or null when it can be asked for. + private string? PackageIndexProblem() => + Uri.TryCreate(_config.PackageIndexUrl, UriKind.Absolute, out var uri) && uri.Scheme == Uri.UriSchemeHttps + ? null + : string.IsNullOrWhiteSpace(_config.PackageIndexUrl) + ? "no package index is set (packageIndexUrl in config.json)" + : "the package index is not an https link (packageIndexUrl in config.json)"; + + /// + /// Shows the welcome: the surface where the screen is seen, the lines where it is not. Opened at start on + /// an empty configuration and by /welcome or ⌃P ▸ Welcome; never again on its own once closed. + /// + internal void ShowWelcome() + { + var problem = PackageIndexProblem(); + if (Host.Announcer is { } announcer) + { + foreach (var line in WelcomeSurface.PlainLines(_welcomeLayout, problem)) + { + announcer.Announce(line, Core.Accessibility.AnnouncementKind.Notice); + } + } + + if (!Host.ScreenIsSeen) + { + return; + } + + // Already up: left as it is, form and all. Asking again (a second /welcome, or the startup pass a live + // loop runs after a scene was laid out) must not throw away what the player has typed. + if (_welcomeView.IsOpen && _welcome is not null) + { + return; + } + + if (ComposerIsInTheWay("the welcome") || (AnyOverlayOpen && !_welcomeView.IsOpen && Refuse($"close {OpenOverlayName()} first"))) + { + return; + } + + _welcome = new WelcomeSurface(problem) { Layout = _welcomeLayout }; + OpenWelcomeView(); + } + + private void OpenWelcomeView() + { + var welcome = _welcome!; + _welcomeView.Open( + "welcome", + "Welcome", + welcome.Render, + key => WelcomeKey(welcome, key), + WelcomeSurface.PreferredWidth, + escape: () => + { + return welcome.Back(); + }); + } + + private bool WelcomeKey(WelcomeSurface welcome, ConsoleKeyInfo key) + { + var action = welcome.Interpret(key, words => ParseEndpoint(words)); + _welcomeLayout = welcome.Layout; + switch (action) + { + case WelcomeAction.Browse: + _welcomeView.Close(); + BrowsePackages(); + return false; + + case WelcomeAction.Settings: + _welcomeView.Close(); + if (!ComposerIsInTheWay("a settings screen")) + { + _settings.Toggle(ConsoleKey.F5, WorldsScreen); + } + + return false; + + case WelcomeAction.Connect when welcome.Request is { } request: + _welcomeView.Close(); + ConnectFromWelcome(request); + return false; + + default: + return true; + } + } + + /// The form's answer, through /connect's own path, with the character the form named. + private void ConnectFromWelcome(WelcomeConnect request) + { + var host = request.Host.Contains(':') ? $"[{request.Host}]" : request.Host; + var arguments = $"{host} {request.Port}" + (request.Tls ? " tls" : string.Empty); + ConnectCommand(ActiveWindowId(), arguments, world => + { + ApplyWelcomeLayout(world); + if (request.Character is { } name) + { + world.Characters.Add(new CharacterDefinition { Name = name }); + if (request.PasswordLater) + { + _passwordLater.Add($"{world.Name}.{name}"); + } + } + }); + } + + /// /welcome, and /welcome layout roleplay|combat|suggested for a reader with no arrows to press. + private void WelcomeCommand(string arguments) + { + var words = arguments.Split(' ', StringSplitOptions.RemoveEmptyEntries); + if (words.Length == 0) + { + ShowWelcome(); + return; + } + + if (words.Length == 2 && words[0].Equals("layout", StringComparison.OrdinalIgnoreCase) + && WelcomeSurface.ParseLayout(words[1]) is { } layout) + { + _welcomeLayout = layout; + if (_welcome is not null) + { + _welcome.Layout = layout; + } + + Notice( + layout == WelcomeLayout.Suggested + ? "starting layout: suggested from what the game sends" + : $"starting layout: {layout}", + MessageSeverity.Info); + return; + } + + RefuseCommand("/welcome, or /welcome layout roleplay, combat or suggested"); + } + + /// + /// What a world the welcome adds starts with: the welcome's layout, when the player chose one. Left alone, + /// nothing is set and the client's suggestion applies at the first connect. + /// + private void ApplyWelcomeLayout(WorldDefinition world) + { + if (WelcomeSurface.LayoutIdOf(_welcomeLayout) is { } layout) + { + world.Layout = layout; + } + } + + /// + /// Marks the tour owed once a configuration that started this run empty has a world. Called on the way to + /// every save, so a world added by the welcome, by /connect or on F5 all count. + /// + private void NoteFirstWorld() + { + if (_startedEmpty && !_tourOwedNoted && _config.Worlds.Count > 0) + { + _tourOwedNoted = true; + _config.KeyTourPending = true; + } + } + + private bool _tourOwedNoted; + + /// The first connect of a new configuration: the key tour, and a reminder the form asked for. + private void OnFirstRunConnected(WorldSession session, string windowId) + { + if (_config.KeyTourPending) + { + _config.KeyTourPending = false; + ShowKeyTour(windowId); + PersistConfiguration(); + } + + if (_passwordLater.Remove(session.SessionKey)) + { + Notice( + $"to log in by itself next time, save {Snippet(session.Character?.Name ?? session.World.Name)}'s password on F5", + MessageSeverity.Info, + "F5"); + } + } + + /// The tour row: one line naming four keys, chrome in the window, never the session's text. + internal string KeyTourMarkup() + { + string Key(string key) => $"[bold {_ink.Accent}]{Escape(key)}[/]"; + string Say(string text) => $"[{_ink.Notice}]{Escape(text)}[/]"; + return Say(KeyTourLead + " ") + + Key("⌃P") + Say(" every command · ") + + Key("⌥M") + Say(" layouts · ") + + Key("F1") + Say(" long posts · ") + + Key("F5") + Say(" worlds · ") + + Say("hide with ⌃P ▸ Key tour"); + } + + /// Puts the tour row at the end of , or moves it there. + internal void ShowKeyTour(string windowId) + { + HideKeyTour(); + AppendWindowLine(windowId, KeyTourMarkup()); + _tourWindow = windowId; + } + + /// Takes the tour row away. False when there was none. + private bool HideKeyTour() + { + if (_tourWindow is not { } windowId) + { + return false; + } + + _tourWindow = null; + if (_lines.TryGetValue(windowId, out var buffer)) + { + var markup = KeyTourMarkup(); + var at = buffer.FindLastIndex(line => string.Equals(line.Markup, markup, StringComparison.Ordinal)); + if (at >= 0) + { + RemoveChromeRow(windowId, at); + RepaintPane(windowId); + return true; + } + } + + return false; + } + + /// ⌃P ▸ Key tour: shows the row in the focused window, or hides it when it is up. + private void ToggleKeyTour() + { + if (!HideKeyTour()) + { + ShowKeyTour(ActiveWindowId()); + } + } + + /// The snapshot views that start with this: welcome and welcome-connect. + internal const string WelcomeView = "welcome"; + + /// + /// The welcome as a first run meets it: the configuration emptied, the startup path run with nothing to + /// connect (which raises the notice and opens the surface), and for welcome-connect the form + /// filled in by real keys — ⏎ on the first choice, a host, a port over the default, TLS on, a name. + /// + private string RenderWelcomeSnapshot(string view) + { + // And the workspace a first run has: the main window alone, owned by nobody. --demo-config resumes a + // saved workspace with a character's windows in it, which an empty configuration could never have. + _config.Worlds.Clear(); + foreach (var window in _workspace.Windows.Select(w => w.Id).Where(id => id != MainWindowId).ToList()) + { + _workspace.CloseWindow(window); + } + + if (_workspace.FindWindow(MainWindowId) is { } main) + { + main.Title = "Main"; + _workspace.SetWindowOwner(MainWindowId, null); + } + + RebuildPaneArea(); + RefreshHeader(); + RefreshRail(); + UpdateStatus(); + LastCommand = StartAsync([]); + + if (string.Equals(view, WelcomeView + "-connect", StringComparison.OrdinalIgnoreCase)) + { + SimulateWelcomeKey(Stroke('\r', ConsoleKey.Enter)); + Type("mud.example.org"); + SimulateWelcomeKey(Stroke('\0', ConsoleKey.DownArrow)); + for (var i = 0; i < 4; i++) + { + SimulateWelcomeKey(Stroke('\b', ConsoleKey.Backspace)); + } + + Type("4201"); + SimulateWelcomeKey(Stroke('\0', ConsoleKey.DownArrow)); + SimulateWelcomeKey(Stroke(' ', ConsoleKey.Spacebar)); + SimulateWelcomeKey(Stroke('\0', ConsoleKey.DownArrow)); + Type("Corvid"); + } + + SyncInputWidth(); + return RenderFrame(); + + void Type(string text) + { + foreach (var c in text) + { + SimulateWelcomeKey(Stroke(c, ConsoleKey.NoName)); + } + } + } + + /// Whether a tour row is on screen, for the tests. + internal bool KeyTourShown => _tourWindow is not null; +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index f34afcb9..ff3281e3 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -731,6 +731,7 @@ public SharpMUTermApp( var capabilities = host.Capabilities; Host = host; _config = config; + _startedEmpty = config.Worlds.Count == 0; _save = save; _openUrl = host.OpenUrl; _clipboard = host.Clipboard; @@ -921,6 +922,7 @@ public SharpMUTermApp( _packageView = new ListOverlay(_system, _screens); _sendMenu = new ListOverlay(_system, _screens); _layoutsView = new ListOverlay(_system, _screens); + _welcomeView = new ListOverlay(_system, _screens); _composer.Send += (_, result) => SendComposed(result); _composer.Closed += (_, result) => KeepComposeDraft(result); _quit = new QuitOverlay(_system, QuitFactsNow, Quit); @@ -1111,10 +1113,25 @@ public string RenderSnapshot(string? view = null) // one of them would count as missed, so any frame that later made such a window visible (a split, // a tab change) would carry an activity bar reporting the client's own setup as news. Same // reasoning as `_watching` itself, which the restore replay needs for the same shape of reason. + // The first-run welcome is what a client with *no* worlds opens on, so it is drawn over an empty + // configuration whatever the caller loaded — --demo-config has worlds, and the welcome never opens + // over them. + if (view is not null && view.StartsWith(WelcomeView, StringComparison.OrdinalIgnoreCase)) + { + return RenderWelcomeSnapshot(view); + } + _watching = false; LoadDemoScene(); _watching = true; + // The key tour row, as the first connect of a new configuration leaves it at the end of the window. + if (string.Equals(view, "tour", StringComparison.OrdinalIgnoreCase)) + { + ShowKeyTour(MainWindowId); + SettleScroll(); + } + // The reported bug, as a frame: the scene is already on screen with the column off, and *then* // the real ⌃P entry is dispatched. Under the old append-time gutter this frame was identical to // the default workspace — which is exactly what "the button seems to not do anything" was. @@ -2582,6 +2599,14 @@ internal async Task StartAsync(IReadOnlyList startup) Notice( empty ? NoWorldsNotice : NothingAtStartNotice, empty ? MessageSeverity.Warning : MessageSeverity.Info); + + // And the first run gets somewhere to start from: the welcome, over the notice it leaves behind + // when it is closed. + if (empty) + { + ShowWelcome(); + } + return; } @@ -2607,9 +2632,13 @@ internal async Task StartAsync(IReadOnlyList startup) await Task.WhenAll(opened.Select(o => DialAtStartupAsync(o.Session))).ConfigureAwait(false); } - /// The empty-workspace message when there is nothing to connect because there is nothing at all. + /// + /// The empty-workspace message when there is nothing to connect because there is nothing at all. It is what + /// the welcome leaves behind when it is closed, so it names the welcome's way back as well as the two ways + /// in; and it is short enough for an 80-column status row, which a longer one wrapped onto a second row. + /// internal const string NoWorldsNotice = - "No world configured. Type /connect , pass one on the command line, or add one on F5."; + "No world configured · /connect · F5 adds one · /welcome"; /// /// And when there are worlds but none of their characters is marked. It is the ordinary state of a @@ -2918,6 +2947,7 @@ private void BindSession(WorldSession session, string? windowId = null) // report beside a connection time that is already here. _mssp.RecordConnection(session.World.Host, session.World.Port, _time.GetUtcNow()); ScheduleLayoutSuggestion(session); + OnFirstRunConnected(session, windowId); } UpdateStatus(); @@ -4821,6 +4851,14 @@ private void OnCommandEntered(InputBar bar, string command) return; } + // `/welcome` shows the first-run welcome again; `/welcome layout …` picks its starting layout. + if (command.StartsWith("/welcome", StringComparison.OrdinalIgnoreCase) + && (command.Length == 8 || command[8] == ' ')) + { + WelcomeCommand(command[8..].Trim()); + return; + } + // `/package` opens the Packages screen; `/package install …` reads one for review. if (command.StartsWith("/package", StringComparison.OrdinalIgnoreCase) && (command.Length == 8 || command[8] == ' ')) @@ -5252,7 +5290,7 @@ private void ToggleHistorySearch() private bool AnyOverlayOpen => _palette.IsOpen || _settings.IsOpen || _quit.IsOpen || _messageLog.IsOpen || _historySearch.IsOpen || _prefixPanel.IsOpen || _composer.IsOpen || _search.IsOpen || _gameData.IsOpen || _packageView.IsOpen || _sendMenu.IsOpen - || _layoutsView.IsOpen; + || _layoutsView.IsOpen || _welcomeView.IsOpen; /// /// Opens the ⌃F search surface, or closes it when the chord arrives again. @@ -5371,6 +5409,7 @@ private string OpenOverlayName() => : _historySearch.IsOpen ? "the history search" : _search.IsOpen ? "the search surface" : _prefixPanel.IsOpen ? "the pane keys panel" + : _welcomeView.IsOpen ? "the welcome" : "what is open"; /// Whether either bar is holding unsent text — what the ✎ tab marker means. @@ -7106,6 +7145,7 @@ internal void SaveConfiguration() /// private void PersistConfiguration() { + NoteFirstWorld(); if (_save is null) { return; @@ -8404,6 +8444,12 @@ private bool RunBuiltInCommand(string id) case "term:package-browse": BrowsePackages(); return true; + case "term:welcome": + ShowWelcome(); + return true; + case "term:tour": + ToggleKeyTour(); + return true; case "term:package-install": ActiveBar().SetAndNotify("/package install "); return true; diff --git a/src/SharpMUTerm.Tui/SnapshotViews.cs b/src/SharpMUTerm.Tui/SnapshotViews.cs index fb5474d4..d95687d1 100644 --- a/src/SharpMUTerm.Tui/SnapshotViews.cs +++ b/src/SharpMUTerm.Tui/SnapshotViews.cs @@ -27,5 +27,6 @@ internal static class SnapshotViews "collapsed", "timestamps", "timestamps-toggled", "prompt", "meters", "gamedata", "map", "map-walking", "map-split", "packages", "package-review", "package-browse", "send-menu", "layouts", "layout-combat", "panel-who", "panel-vitals", "panel-quickbar", "panel-composer", + "welcome", "welcome-connect", "tour", ]; } diff --git a/src/SharpMUTerm.Tui/WelcomeSurface.cs b/src/SharpMUTerm.Tui/WelcomeSurface.cs new file mode 100644 index 00000000..5a735d9d --- /dev/null +++ b/src/SharpMUTerm.Tui/WelcomeSurface.cs @@ -0,0 +1,447 @@ +using SharpMUTerm.Core.Layouts; +using static SharpMUTerm.Tui.MarkupText; + +namespace SharpMUTerm.Tui; + +/// What the welcome's menu offers, in the order it lists them. +internal enum WelcomeChoice +{ + /// The small form: host, port, TLS, a character name. + Connect, + + /// The package index browser, fetched only now. + Browse, + + /// F5, to add a world by hand. + Settings, +} + +/// +/// The starting layout a first world is given. sets nothing, so the client's own +/// suggestion () still applies when it first connects; the other two are the +/// player's choice outright and are written to WorldDefinition.Layout. +/// +internal enum WelcomeLayout +{ + Suggested, + Roleplay, + Combat, +} + +/// The connect form's rows, top to bottom. +internal enum WelcomeField +{ + Host, + Port, + Tls, + Character, + Password, +} + +/// What a key on the welcome asks the app to do. +internal enum WelcomeAction +{ + /// Nothing beyond a repaint. + Redraw, + + /// Dial . + Connect, + + /// Close, and open the package index. + Browse, + + /// Close, and open F5. + Settings, +} + +/// What the connect form asks for, read once ⏎ has checked it. +internal sealed record WelcomeConnect(string Host, int Port, bool Tls, string? Character, bool PasswordLater); + +/// +/// The first-run welcome: what it says and what a key on it means, with no window in it — the +/// split, so a test reads it without a terminal. hosts it +/// in a , and is the same surface said as lines for +/// --plain, where nothing reads the cells. +/// +/// The form goes nowhere the command line cannot: ⏎ hands back a and the app runs +/// it through /connect's own path, so a world the welcome adds is the world /connect host port +/// would have added, character and layout aside. +/// +/// +internal sealed class WelcomeSurface +{ + /// The example the surface names, a host nobody owns (RFC 2606). + internal const string ExampleCommand = "/connect mud.example.org 4201 tls"; + + /// The width the surface asks for; the overlay narrows it on a small terminal. + internal const int PreferredWidth = 66; + + /// The longest host the form takes: a DNS name's limit. + private const int MaxHost = 253; + + /// A character name long enough for any game's. + private const int MaxCharacter = 40; + + private readonly string? _indexProblem; + + /// Why the package index cannot be browsed, or null when it can be asked for. + public WelcomeSurface(string? indexProblem) => _indexProblem = indexProblem; + + public WelcomeChoice Selected { get; private set; } = WelcomeChoice.Connect; + + public WelcomeLayout Layout { get; set; } = WelcomeLayout.Suggested; + + /// Whether the connect form is showing rather than the menu. + public bool InForm { get; private set; } + + public WelcomeField Field { get; private set; } = WelcomeField.Host; + + public string Host { get; private set; } = string.Empty; + + public string Port { get; private set; } = SharpMUTermApp.DefaultConnectPort.ToString(System.Globalization.CultureInfo.InvariantCulture); + + public bool Tls { get; private set; } + + public string Character { get; private set; } = string.Empty; + + public bool PasswordLater { get; private set; } + + /// What the surface says about the last thing it refused, shown in place; null when nothing. + public string? Problem { get; private set; } + + /// The checked form, once ⏎ has accepted it. + public WelcomeConnect? Request { get; private set; } + + /// The built-in layout id names, or null for the suggestion. + public string? LayoutId => LayoutIdOf(Layout); + + internal static string? LayoutIdOf(WelcomeLayout layout) => layout switch + { + WelcomeLayout.Roleplay => BuiltInLayouts.RoleplayId, + WelcomeLayout.Combat => BuiltInLayouts.CombatId, + _ => null, + }; + + /// Reads a layout word as /welcome layout takes it. + internal static WelcomeLayout? ParseLayout(string word) => word.Trim().ToLowerInvariant() switch + { + "suggested" or "suggest" or "auto" => WelcomeLayout.Suggested, + "roleplay" or "rp" => WelcomeLayout.Roleplay, + "combat" => WelcomeLayout.Combat, + _ => null, + }; + + /// Back to the menu, as it opens — for /welcome reopening a surface that was left in the form. + public void ShowMenu() + { + InForm = false; + Problem = null; + } + + /// Esc: the form goes back to the menu and stays open; on the menu Esc closes, which is the overlay's. + /// Whether Esc was taken here. + public bool Back() + { + if (!InForm) + { + return false; + } + + ShowMenu(); + return true; + } + + /// What a key does. reads a host and port the way /connect does. + public WelcomeAction Interpret(ConsoleKeyInfo key, Func, (string Host, int Port)?> parse) + { + ArgumentNullException.ThrowIfNull(parse); + return InForm ? FormKey(key, parse) : MenuKey(key); + } + + private WelcomeAction MenuKey(ConsoleKeyInfo key) + { + switch (key.Key) + { + case ConsoleKey.UpArrow: + Selected = (WelcomeChoice)Math.Max(0, (int)Selected - 1); + Problem = null; + return WelcomeAction.Redraw; + case ConsoleKey.DownArrow: + Selected = (WelcomeChoice)Math.Min((int)WelcomeChoice.Settings, (int)Selected + 1); + Problem = null; + return WelcomeAction.Redraw; + case ConsoleKey.LeftArrow: + Layout = (WelcomeLayout)(((int)Layout + 2) % 3); + return WelcomeAction.Redraw; + case ConsoleKey.RightArrow: + Layout = (WelcomeLayout)(((int)Layout + 1) % 3); + return WelcomeAction.Redraw; + case ConsoleKey.Enter: + switch (Selected) + { + case WelcomeChoice.Connect: + InForm = true; + Field = WelcomeField.Host; + Problem = null; + return WelcomeAction.Redraw; + case WelcomeChoice.Browse when _indexProblem is not null: + Problem = _indexProblem; + return WelcomeAction.Redraw; + case WelcomeChoice.Browse: + return WelcomeAction.Browse; + default: + return WelcomeAction.Settings; + } + + default: + return WelcomeAction.Redraw; + } + } + + private WelcomeAction FormKey(ConsoleKeyInfo key, Func, (string Host, int Port)?> parse) + { + var shift = (key.Modifiers & ConsoleModifiers.Shift) != 0; + switch (key.Key) + { + case ConsoleKey.UpArrow: + case ConsoleKey.Tab when shift: + Field = (WelcomeField)Math.Max(0, (int)Field - 1); + return WelcomeAction.Redraw; + case ConsoleKey.DownArrow: + case ConsoleKey.Tab: + Field = (WelcomeField)Math.Min((int)WelcomeField.Password, (int)Field + 1); + return WelcomeAction.Redraw; + case ConsoleKey.Enter: + return Submit(parse); + case ConsoleKey.Backspace: + Edit(text => text.Length == 0 ? text : text[..^1]); + return WelcomeAction.Redraw; + case ConsoleKey.Spacebar when Field is WelcomeField.Tls or WelcomeField.Password: + case ConsoleKey.LeftArrow when Field is WelcomeField.Tls or WelcomeField.Password: + case ConsoleKey.RightArrow when Field is WelcomeField.Tls or WelcomeField.Password: + if (Field == WelcomeField.Tls) + { + Tls = !Tls; + } + else + { + PasswordLater = !PasswordLater; + } + + return WelcomeAction.Redraw; + } + + // Typing, with the modifiers a printable key can carry and no others: a chord is not text. + var c = key.KeyChar; + if (char.IsControl(c) || (key.Modifiers & (ConsoleModifiers.Control | ConsoleModifiers.Alt)) != 0) + { + return WelcomeAction.Redraw; + } + + switch (Field) + { + case WelcomeField.Host when !char.IsWhiteSpace(c) && Host.Length < MaxHost: + Host += c; + break; + case WelcomeField.Port when char.IsAsciiDigit(c) && Port.Length < 5: + Port += c; + break; + case WelcomeField.Character when Character.Length < MaxCharacter && !(c == ' ' && Character.Length == 0): + Character += c; + break; + } + + Problem = null; + return WelcomeAction.Redraw; + } + + private void Edit(Func change) + { + switch (Field) + { + case WelcomeField.Host: + Host = change(Host); + break; + case WelcomeField.Port: + Port = change(Port); + break; + case WelcomeField.Character: + Character = change(Character); + break; + } + + Problem = null; + } + + private WelcomeAction Submit(Func, (string Host, int Port)?> parse) + { + if (Host.Length == 0) + { + Field = WelcomeField.Host; + Problem = "type the game's host first, for example mud.example.org"; + return WelcomeAction.Redraw; + } + + if (parse(Port.Length == 0 ? [Host] : [Host, Port]) is not { } endpoint) + { + Problem = Port.Length > 0 && !(int.TryParse(Port, out var port) && port is > 0 and <= 65535) + ? "the port is a number from 1 to 65535" + : "that is not a host name or address"; + Field = Problem.StartsWith("the port", StringComparison.Ordinal) ? WelcomeField.Port : WelcomeField.Host; + return WelcomeAction.Redraw; + } + + var character = Character.Trim(); + Request = new WelcomeConnect(endpoint.Host, endpoint.Port, Tls, character.Length == 0 ? null : character, PasswordLater); + return WelcomeAction.Connect; + } + + // ---- What it says --------------------------------------------------------------------------- + + private static string Accent(string text) => $"[bold {ScreenPalette.Accent}]{Escape(text)}[/]"; + + private static string Label(string text) => $"[{ScreenPalette.Label}]{Escape(text)}[/]"; + + private static string Value(string text, bool bold = false) => + $"[{(bold ? "bold " : string.Empty)}{ScreenPalette.Value}]{Escape(text)}[/]"; + + private static string Pad(string markup, int width) => + markup + new string(' ', Math.Max(0, width - VisibleLength(markup))); + + /// + /// The surface at a width: the menu, or the form. Both are the same number of lines, so the one window holds + /// either — the form's footer sits where the menu's does, and nothing has to be closed and reopened to switch, + /// which a window running its own loop does not do in the order a headless one does. + /// + public List Render(int width) + { + if (!InForm) + { + return RenderMenu(width); + } + + var form = RenderForm(width); + var footer = form[^1]; + form.RemoveAt(form.Count - 1); + var height = RenderMenu(width).Count; + while (form.Count < height - 1) + { + form.Add(string.Empty); + } + + form.Add(footer); + return form; + } + + private List RenderMenu(int width) + { + var lines = new List + { + Accent("Welcome to SharpMUTerm"), + Label("No games yet. Pick one of these to start."), + string.Empty, + }; + + foreach (var choice in Enum.GetValues()) + { + var selected = choice == Selected; + var (title, detail) = choice switch + { + WelcomeChoice.Connect => ("Connect to a host", "type a host and port"), + WelcomeChoice.Browse => ("Browse games", _indexProblem is null ? "from the package index" : "no package index set"), + _ => ("Open settings", "F5, add a world by hand"), + }; + var marker = selected ? $"[bold {ScreenPalette.Accent}]▸[/]" : " "; + lines.Add($"{marker} {Pad(Value(title, selected), 20)} {Label(detail)}"); + } + + lines.Add(Problem is null ? string.Empty : $" [{ScreenPalette.Caution}]{Escape(Problem)}[/]"); + lines.Add(Label("Or type it on the command line below:")); + lines.Add(" " + Value(ExampleCommand)); + lines.Add(string.Empty); + lines.Add(Label(Layout == WelcomeLayout.Suggested + ? "Starting layout, picked from what the game sends:" + : "Starting layout, whatever the game sends:")); + var chips = string.Join(" ", Enum.GetValues().Select(layout => + { + var name = layout == WelcomeLayout.Suggested ? "suggested" : layout.ToString(); + return layout == Layout + ? $"[bold {ScreenPalette.Ink} on {ScreenPalette.Accent}] {Escape(name)} [/]" + : $"[{ScreenPalette.Value}] {Escape(name)} [/]"; + })); + lines.Add(" " + chips); + lines.Add(" " + Label("saved per world · ⌥M changes it later")); + lines.Add(string.Empty); + lines.Add(Footer(width, "↑↓ select · ←→ layout", "Esc close · ⏎ choose")); + return lines; + } + + private List RenderForm(int width) + { + var lines = new List + { + Accent("Connect to a host"), + Label("Saved as a world, so you can come back to it."), + string.Empty, + }; + + var boxWidth = Math.Clamp(width - 16, 12, 44); + lines.Add(Row(WelcomeField.Host, "host", Box(Host, boxWidth, Field == WelcomeField.Host, "mud.example.org"))); + lines.Add(Row(WelcomeField.Port, "port", Box(Port, 7, Field == WelcomeField.Port, null))); + lines.Add(Row(WelcomeField.Tls, "TLS", Toggle(Tls, "on, encrypted", "off"))); + lines.Add(Row(WelcomeField.Character, "character", Box(Character, boxWidth, Field == WelcomeField.Character, "optional, the name you log in as"))); + lines.Add(Row(WelcomeField.Password, "password", Toggle(PasswordLater, "save it on F5 after connecting", "type it at the login prompt"))); + lines.Add(string.Empty); + lines.Add(Problem is null + ? Label(Layout == WelcomeLayout.Suggested + ? "Layout: suggested from what the game sends." + : $"Layout: {Layout}.") + : $"[{ScreenPalette.Caution}]{Escape(Problem)}[/]"); + lines.Add(string.Empty); + lines.Add(Footer(width, "↑↓ field · Space toggle", "Esc back · ⏎ connect")); + return lines; + } + + private string Row(WelcomeField field, string label, string value) + { + var selected = Field == field; + var marker = selected ? $"[bold {ScreenPalette.Accent}]▸[/]" : " "; + return $"{marker} {Pad(selected ? Value(label, bold: true) : Label(label), 11)} {value}"; + } + + private static string Box(string text, int width, bool editing, string? placeholder) + { + var shown = text.Length > width - 1 ? "…" + text[^(width - 2)..] : text; + var body = shown.Length == 0 && !editing && placeholder is not null + ? $"[{ScreenPalette.Muted} on {ScreenPalette.FieldBg}]{Escape(placeholder.Length > width ? placeholder[..width] : placeholder)}[/]" + : $"[{ScreenPalette.Value} on {ScreenPalette.FieldBg}]{Escape(shown)}[/]"; + var caret = editing ? $"[{ScreenPalette.Ink} on {ScreenPalette.Accent}] [/]" : string.Empty; + var used = VisibleLength(body) + (editing ? 1 : 0); + return body + caret + $"[on {ScreenPalette.FieldBg}]{new string(' ', Math.Max(0, width - used))}[/]"; + } + + private static string Toggle(bool on, string yes, string no) => + on ? $"[{ScreenPalette.Accent}]●[/] {Value(yes)}" : $"[{ScreenPalette.Label}]○[/] {Value(no)}"; + + private static string Footer(int width, string left, string right) + { + var gap = Math.Max(2, width - left.Length - right.Length); + return Label(left) + new string(' ', gap) + Label(right); + } + + /// + /// The welcome said as lines, for --plain: every choice is a command a reader can type, because + /// there is no menu to arrow through. + /// + public static IReadOnlyList PlainLines(WelcomeLayout layout, string? indexProblem) => + [ + "Welcome to SharpMUTerm. No games yet.", + "To connect, type /connect, a host and a port, and tls for an encrypted connection: " + ExampleCommand, + indexProblem is null + ? "To browse games from the package index, type /package browse" + : "Browsing games is not available: " + indexProblem, + "Starting layout: " + (layout == WelcomeLayout.Suggested ? "suggested from what the game sends" : layout.ToString()) + + ". Type /welcome layout roleplay, combat or suggested to change it.", + "Type /welcome to hear this again.", + ]; +} diff --git a/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs b/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs index 4cb736ea..b645d840 100644 --- a/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs @@ -48,6 +48,10 @@ public class FrameContrastTests // most to lose from a theme it was not measured against. "selection", "input-selection", "menu-fuzzy", "menu-recent", + // The first run: the welcome over an empty client, its connect form mid-entry (a field on FieldBg, the + // caret, the toggles), and the key tour row on a pane. + "welcome", "welcome-connect", "tour", + // The four panels: who is here and the quick bar carry the accent on links, the vitals strip paints bars // and the warning in a server-driven colour, and the docked composer is an editor on its own plane. "panel-who", "panel-vitals", "panel-quickbar", "panel-composer", diff --git a/tests/SharpMUTerm.Tui.Tests/SnapshotViewEmptyConfigTests.cs b/tests/SharpMUTerm.Tui.Tests/SnapshotViewEmptyConfigTests.cs index 44b8800e..a51e0710 100644 --- a/tests/SharpMUTerm.Tui.Tests/SnapshotViewEmptyConfigTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/SnapshotViewEmptyConfigTests.cs @@ -44,7 +44,7 @@ public class SnapshotViewEmptyConfigTests "connections", "characters", "tint", "tint-input", "tint-input-moved", "compose", "compose-literal", "deletions", "textansi", "input", "keypad", "password", "startup", "logging", "set", "triggers", "route", "highlight", "worlds", "settings", "mssp", - "mssp-none", "mssp-never", "mxp-image", "mxp-figure", + "mssp-none", "mssp-never", "mxp-image", "mxp-figure", "welcome", "welcome-connect", "tour", ]; /// diff --git a/tests/SharpMUTerm.Tui.Tests/WelcomeTests.cs b/tests/SharpMUTerm.Tui.Tests/WelcomeTests.cs new file mode 100644 index 00000000..38d4b072 --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/WelcomeTests.cs @@ -0,0 +1,328 @@ +using SharpConsoleUI.Drivers; +using SharpMUTerm.Core.Accessibility; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Layouts; +using SharpMUTerm.Core.Session; +using SharpMUTerm.Graphics; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// The first run: a client with no worlds opens on the welcome, its form dials through /connect's own +/// path, and the first connect of a new configuration leaves a one-line key tour, once. +/// +[NotInParallel] +public class WelcomeTests +{ + private static readonly TerminalCapabilities Headless = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private sealed class Recorder : IAnnouncer + { + public List Heard { get; } = []; + + public void Announce(string text, AnnouncementKind kind) => Heard.Add(text); + } + + private sealed record Run(SharpMUTermApp App, RecordingTelnetSession Wire, AppConfiguration Config, List Saved) + : IAsyncDisposable + { + public ValueTask DisposeAsync() => App.DisposeAsync(); + } + + private static async Task Start(AppConfiguration? config = null, Func? host = null) + { + Console.SetIn(TextReader.Null); + config ??= new AppConfiguration(); + var saved = new List(); + var wire = new RecordingTelnetSession(); + var baseHost = ClientHost.ForHarness(Headless, new HeadlessConsoleDriver(120, 32), null, null, null); + var app = new SharpMUTermApp(config, host?.Invoke(baseHost) ?? baseHost, save: c => saved.Add(c.KeyTourPending)); + app.TelnetFactory = _ => wire; + await app.StartAsync([]); + return new Run(app, wire, config, saved); + } + + private static ConsoleKeyInfo Key(ConsoleKey key, char c = '\0', bool shift = false) => new(c, key, shift, false, false); + + private static void Type(SharpMUTermApp app, string text) + { + foreach (var c in text) + { + app.SimulateWelcomeKey(new ConsoleKeyInfo(c, ConsoleKey.NoName, false, false, false)); + } + } + + private static void TypeCommand(SharpMUTermApp app, string text) + { + foreach (var c in text) + { + app.SimulateKey(new ConsoleKeyInfo(c, ConsoleKey.NoName, false, false, false)); + } + + app.SimulateKey(Key(ConsoleKey.Enter, '\r')); + } + + private static AppConfiguration OneWorld() => new() + { + Worlds = + { + new WorldDefinition + { + Name = "Mush", + Host = "mush.example", + Port = 4201, + Characters = { new CharacterDefinition { Name = "Ann", Logging = new LoggingSettings() } }, + }, + }, + }; + + [Test] + public async Task AClientWithNoWorldsOpensOnTheWelcomeAndKeepsTheNotice() + { + await using var run = await Start(); + + await Assert.That(run.App.WelcomeIsOpen).IsTrue(); + var text = string.Join('\n', run.App.WelcomeLines.Select(MarkupText.Plain)); + await Assert.That(text).Contains("Connect to a host").And.Contains("Browse games").And.Contains("Open settings"); + await Assert.That(text).Contains(WelcomeSurface.ExampleCommand); + await Assert.That(run.App.StatusMarkup).Contains("No world configured"); + } + + [Test] + public async Task AClientWithWorldsDoesNotOpenIt() + { + await using var run = await Start(OneWorld()); + + await Assert.That(run.App.WelcomeIsOpen).IsFalse(); + } + + [Test] + public async Task EscClosesItForTheRunAndSlashWelcomeBringsItBack() + { + await using var run = await Start(); + + run.App.SimulateWelcomeKey(Key(ConsoleKey.Escape, '\x1b')); + await Assert.That(run.App.WelcomeIsOpen).IsFalse(); + await Assert.That(run.App.StatusMarkup).Contains("No world configured"); + + TypeCommand(run.App, "/welcome"); + await Assert.That(run.App.WelcomeIsOpen).IsTrue(); + } + + [Test] + public async Task TheCommandSurfaceReopensIt() + { + await using var run = await Start(); + run.App.SimulateWelcomeKey(Key(ConsoleKey.Escape, '\x1b')); + + await Assert.That(run.App.DispatchCommand("term:welcome")).IsTrue(); + await Assert.That(run.App.WelcomeIsOpen).IsTrue(); + } + + /// The form, driven with keys, adds the world /connect would have, with the character it named, and dials it. + [Test] + public async Task TheFormAddsTheWorldAndCharacterAndDials() + { + await using var run = await Start(); + + run.App.SimulateWelcomeKey(Key(ConsoleKey.Enter, '\r')); + await Assert.That(run.App.Welcome!.InForm).IsTrue(); + Type(run.App, "mud.example.org"); + run.App.SimulateWelcomeKey(Key(ConsoleKey.Tab, '\t')); + for (var i = 0; i < 4; i++) + { + run.App.SimulateWelcomeKey(Key(ConsoleKey.Backspace, '\b')); + } + + Type(run.App, "4201"); + run.App.SimulateWelcomeKey(Key(ConsoleKey.DownArrow)); + run.App.SimulateWelcomeKey(Key(ConsoleKey.Spacebar, ' ')); + run.App.SimulateWelcomeKey(Key(ConsoleKey.DownArrow)); + Type(run.App, "Corvid"); + run.App.SimulateWelcomeKey(Key(ConsoleKey.Enter, '\r')); + await run.App.LastCommand; + + await Assert.That(run.App.WelcomeIsOpen).IsFalse(); + await Assert.That(run.Config.Worlds.Count).IsEqualTo(1); + var world = run.Config.Worlds[0]; + await Assert.That(world.Host).IsEqualTo("mud.example.org"); + await Assert.That(world.Port).IsEqualTo(4201); + await Assert.That(world.UseTls).IsTrue(); + await Assert.That(world.Characters.Single().Name).IsEqualTo("Corvid"); + await Assert.That(world.Layout).IsNull().Because("the suggestion is left to apply when nothing was chosen"); + await Assert.That(run.App.FindSession("mud.example.org.Corvid")!.State).IsEqualTo(ConnectionState.Connected); + } + + [Test] + public async Task APickedLayoutIsTheNewWorldsOwn() + { + await using var run = await Start(); + + run.App.SimulateWelcomeKey(Key(ConsoleKey.RightArrow)); + run.App.SimulateWelcomeKey(Key(ConsoleKey.RightArrow)); + await Assert.That(run.App.Welcome!.Layout).IsEqualTo(WelcomeLayout.Combat); + run.App.SimulateWelcomeKey(Key(ConsoleKey.Enter, '\r')); + Type(run.App, "mud.example.org"); + run.App.SimulateWelcomeKey(Key(ConsoleKey.Enter, '\r')); + await run.App.LastCommand; + + await Assert.That(run.Config.Worlds.Single().Layout).IsEqualTo(BuiltInLayouts.CombatId); + await Assert.That(run.Config.Worlds.Single().Port).IsEqualTo(SharpMUTermApp.DefaultConnectPort); + } + + /// The layout row applies to a /connect typed under the welcome too: it is the first world either way. + [Test] + public async Task ThePickedLayoutReachesAConnectTypedOnTheCommandLine() + { + await using var run = await Start(); + run.App.SimulateWelcomeKey(Key(ConsoleKey.RightArrow)); + run.App.SimulateWelcomeKey(Key(ConsoleKey.Escape, '\x1b')); + + TypeCommand(run.App, "/connect mud.example.org 4201"); + await run.App.LastCommand; + + await Assert.That(run.Config.Worlds.Single().Layout).IsEqualTo(BuiltInLayouts.RoleplayId); + } + + [Test] + public async Task ABadPortIsRefusedInPlace() + { + await using var run = await Start(); + run.App.SimulateWelcomeKey(Key(ConsoleKey.Enter, '\r')); + Type(run.App, "mud.example.org"); + run.App.SimulateWelcomeKey(Key(ConsoleKey.Tab, '\t')); + Type(run.App, "0000"); // 40000000 is too many digits to take, and 4000 0000 is not a port + for (var i = 0; i < 5; i++) + { + run.App.SimulateWelcomeKey(Key(ConsoleKey.Backspace, '\b')); + } + + Type(run.App, "0"); + run.App.SimulateWelcomeKey(Key(ConsoleKey.Enter, '\r')); + + await Assert.That(run.App.WelcomeIsOpen).IsTrue(); + await Assert.That(run.Config.Worlds.Count).IsEqualTo(0); + await Assert.That(string.Join('\n', run.App.WelcomeLines.Select(MarkupText.Plain))).Contains("port is a number"); + } + + [Test] + public async Task EscOnTheFormGoesBackToTheMenu() + { + await using var run = await Start(); + run.App.SimulateWelcomeKey(Key(ConsoleKey.Enter, '\r')); + + run.App.SimulateWelcomeKey(Key(ConsoleKey.Escape, '\x1b')); + + await Assert.That(run.App.WelcomeIsOpen).IsTrue(); + await Assert.That(run.App.Welcome!.InForm).IsFalse(); + } + + /// With no index to read, Browse says so where the player is looking and fetches nothing. + [Test] + public async Task BrowseWithNoIndexSaysSoInPlace() + { + await using var run = await Start(new AppConfiguration { PackageIndexUrl = string.Empty }); + + run.App.SimulateWelcomeKey(Key(ConsoleKey.DownArrow)); + run.App.SimulateWelcomeKey(Key(ConsoleKey.Enter, '\r')); + + await Assert.That(run.App.WelcomeIsOpen).IsTrue(); + await Assert.That(string.Join('\n', run.App.WelcomeLines.Select(MarkupText.Plain))).Contains("no package index is set"); + } + + [Test] + public async Task OpenSettingsGoesToF5() + { + await using var run = await Start(); + + run.App.SimulateWelcomeKey(Key(ConsoleKey.DownArrow)); + run.App.SimulateWelcomeKey(Key(ConsoleKey.DownArrow)); + run.App.SimulateWelcomeKey(Key(ConsoleKey.Enter, '\r')); + + await Assert.That(run.App.WelcomeIsOpen).IsFalse(); + await Assert.That(run.App.OpenSettingsKey).IsEqualTo(ConsoleKey.F5); + } + + // ---- The key tour --------------------------------------------------------------------------- + + [Test] + public async Task TheFirstConnectOfANewConfigurationShowsTheTourOnceAndSaysSoOnDisk() + { + await using var run = await Start(); + run.App.SimulateWelcomeKey(Key(ConsoleKey.Escape, '\x1b')); + + TypeCommand(run.App, "/connect mud.example.org 4201"); + await run.App.LastCommand; + + await Assert.That(run.App.KeyTourShown).IsTrue(); + await Assert.That(run.App.PaneLines(SharpMUTermApp.MainWindowId).Any(l => l.Contains(SharpMUTermApp.KeyTourLead))).IsTrue(); + await Assert.That(run.Saved).Contains(true).Because("the world's save carries the tour as owed"); + await Assert.That(run.Config.KeyTourPending).IsFalse(); + await Assert.That(run.Saved[^1]).IsFalse().Because("and the save after it, once shown, does not"); + } + + [Test] + public async Task AConfigurationThatStartedWithWorldsNeverGetsTheTour() + { + await using var run = await Start(OneWorld()); + + TypeCommand(run.App, "/connect Mush"); + await run.App.LastCommand; + + await Assert.That(run.App.KeyTourShown).IsFalse(); + await Assert.That(run.Config.KeyTourPending).IsFalse(); + } + + [Test] + public async Task AnOwedTourIsShownOnTheNextRunsConnect() + { + var config = OneWorld(); + config.KeyTourPending = true; + await using var run = await Start(config); + + TypeCommand(run.App, "/connect Mush"); + await run.App.LastCommand; + + await Assert.That(run.App.KeyTourShown).IsTrue(); + await Assert.That(config.KeyTourPending).IsFalse(); + } + + [Test] + public async Task TheCommandSurfaceHidesTheTourAndShowsItAgain() + { + await using var run = await Start(); + run.App.SimulateWelcomeKey(Key(ConsoleKey.Escape, '\x1b')); + TypeCommand(run.App, "/connect mud.example.org 4201"); + await run.App.LastCommand; + + run.App.DispatchCommand("term:tour"); + await Assert.That(run.App.KeyTourShown).IsFalse(); + await Assert.That(run.App.PaneLines(SharpMUTermApp.MainWindowId).Any(l => l.Contains(SharpMUTermApp.KeyTourLead))).IsFalse(); + + run.App.DispatchCommand("term:tour"); + await Assert.That(run.App.KeyTourShown).IsTrue(); + } + + // ---- Where nobody sees the screen ------------------------------------------------------------ + + /// + /// --plain: no modal to take the reader's typing; the welcome is said as lines naming commands, and + /// /welcome layout stands in for the arrows. + /// + [Test] + public async Task WhereTheScreenIsNotSeenTheWelcomeIsLinesAndCommands() + { + var heard = new Recorder(); + await using var run = await Start(host: h => h with { Announcer = heard, ScreenIsSeen = false }); + + await Assert.That(run.App.WelcomeIsOpen).IsFalse(); + await Assert.That(heard.Heard).Contains(line => line.Contains("/connect") && line.Contains(WelcomeSurface.ExampleCommand)); + + TypeCommand(run.App, "/welcome layout combat"); + TypeCommand(run.App, "/connect mud.example.org 4201"); + await run.App.LastCommand; + + await Assert.That(run.Config.Worlds.Single().Layout).IsEqualTo(BuiltInLayouts.CombatId); + } +} From f224898c6d9806a9f225a1edd54b7509151223e1 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 05:15:53 +0000 Subject: [PATCH 018/113] Drop the divider row a tab strip or a strip panel already marks In a stacked split no row is spent on a divider above a pane that draws its own tab strip: the strip is the boundary, and its empty run past the last tab is the divider's handle (hover cue, drag, double-click to even, tooltip). Fixed strip panels sit flush with no divider on either side and, unfocused, are recessed a step so they never share an unfocused pane's plane. Side by side is unchanged. The freed rows go to the panes (a NAWS change). PaneExtent.DividerRows is the one rule, read by LayoutSolver, PaneExtent, PaneResize and the terminal's grid. Adds the split-stacked snapshot view. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 4 + CLAUDE.md | 26 +++- src/SharpMUTerm.Core/Layouts/PanelSizing.cs | 1 + src/SharpMUTerm.Core/Workspace/LayoutNode.cs | 8 ++ .../Workspace/LayoutSolver.cs | 7 +- src/SharpMUTerm.Core/Workspace/PaneExtent.cs | 85 ++++++++++- src/SharpMUTerm.Core/Workspace/PaneResize.cs | 3 +- src/SharpMUTerm.Tui/PaneDragSurface.cs | 19 ++- src/SharpMUTerm.Tui/PaneDragTracker.cs | 5 +- .../Pointer/SharpMUTermApp.Pointer.cs | 135 +++++++++++++++++- src/SharpMUTerm.Tui/SharpMUTermApp.cs | 66 ++++++--- src/SharpMUTerm.Tui/SnapshotViews.cs | 2 +- .../Workspace/PaneExtentTests.cs | 103 ++++++++++++- tests/SharpMUTerm.Tui.Tests/PointerTests.cs | 75 ++++++++++ .../StackedDividerTests.cs | 117 +++++++++++++++ 15 files changed, 607 insertions(+), 49 deletions(-) create mode 100644 tests/SharpMUTerm.Tui.Tests/StackedDividerTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index b9101a5e..f0956a0e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -162,6 +162,10 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Changed +- Panes stacked one above the other no longer have an empty row between them when the lower pane shows its + tabs: the tab row is the boundary, and the panes get the row back. Drag the empty part of that tab row to + resize, or double-click it to even the panes out. The vitals and quick-bar strips sit flush against their + neighbours, on a slightly darker background. Side-by-side panes are unchanged. - The status row's meters are edited in a table on Text & display (F7): one row per meter with its label, value path and maximum path, what it reads now, `[+ meter]`, and Delete to remove one. While you are in the table it lists the game data this connection has received, and a path field offers those paths, with diff --git a/CLAUDE.md b/CLAUDE.md index dd5d80e3..f7c51035 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -245,8 +245,9 @@ fallbacks) for inline images/maps. command line (wrapping, auto-growing, per-window drafts, plus an optional per-window second bar), status line, `Ctrl+Q` quit, per-pane NAWS (every connected session is told its own pane's output rectangle, on every resize and layout change, rate-limited to four writes a second with a trailing - flush). The tab/pane set is driven by the tested `Core.Workspaces` model, with **splits** (thin - single-line dividers) and the **connection rail** now rendered as well — and **clickable**: a world, + flush). The tab/pane set is driven by the tested `Core.Workspaces` model, with **splits** (a thin + single-cell divider column side by side; stacked, a divider row only where nothing else marks the + boundary — see *No divider row where a tab strip or a strip panel already marks it* below) and the **connection rail** now rendered as well — and **clickable**: a world, character or window row switches to it, dispatched through the rail control's *own* `LinkClicked` (never the output panes' handler, so a world cannot drive the client's UI from the wire). - **Panes come back after a restart, and the log that does it is keyed by *window*** (`RestoreLog`, @@ -950,6 +951,19 @@ fallbacks) for inline images/maps. (`PaneResize.DragBorder`, which changes only the two children either side), a double-click evens the split (`PaneResize.Even`). A recolour costs no cell and moves no pane rectangle — the NAWS rule. While a drag is held the 100 ms bare-press repeat is read as "the pointer is here". + - **No divider row where a tab strip or a strip panel already marks it** (`PaneExtent.DividerRows`, read by + `LayoutSolver`, `PaneExtent`, `PaneResize.Minimum` and `BuildLayoutNode` alike). Stacked, there is no row + above a pane that draws its own tab strip (`PaneNode.DrawsHeader`, host-derived by `PanelSizing.Apply` + like `FixedRows`, false until then): that strip is the boundary, and its empty run past the last tab is + registered as the divider (`DividerSlot.HeaderPaneId`, `HeaderFill`) — the same hover, `DragBorder` drag, + double-click and tooltip, lit by recolouring those cells after the paint (`PaintHeaderDividers`; the + control's own background is what its content inherits, so it cannot be set there). A tab, its `×` and the + `│` between tabs stay the framework's, and `PaneDragSurface.IsDragHandle` keeps the run from starting a + window drag. There is no row either side of a fixed strip panel; it sits flush, and an *unfocused* strip is + recessed the backdrop's step (`SurfaceToneIn`), so it is never the same plane as an unfocused pane (2.8 L* + on Dark, 3.7 Solarized Dark, 21 Light — the pane-over-backdrop step). Side by side, nothing changed. The + freed row went to the panes, which is the point and a NAWS change; `StackedDividerTests` and the + `split-stacked` view are the pins. - **The menu is the ⌃P catalog's own entries** (`AddCommands`), so it cannot offer an action the keyboard lacks, and each says its key (`ShortHint`). A right-click on a link or output focuses that pane first, and on a tab activates it, so the entries act on what was clicked. @@ -1029,8 +1043,8 @@ fallbacks) for inline images/maps. gives a fixed child `GridLength.Cells` and a floored one `Star(min:)`, and `LayoutSolver` shares rows the same way (`PaneExtent.DistributeRows`; if every child is fixed the last shares, in both). A one-tab strip draws **no tab strip** (`TabControl.ShowTabHeader`, which `PaneOutputRects` already reads) and offers no drag handle. Only - rows: a strip's width is a share. The divider beside a fixed pane is not registered with the pointer, a drag - on it returns `PaneResizeOutcome.FixedSize`, and ⌥⇧↑/↓ take rows from a sharing pane beyond the strip or + rows: a strip's width is a share. No divider row is drawn beside a fixed pane (it sits flush, on a recessed + plane), and a drag of that border returns `PaneResizeOutcome.FixedSize`, and ⌥⇧↑/↓ take rows from a sharing pane beyond the strip or pass to the next split up, refusing out loud when only a strip could pay. - **The status row leaves its meters out while the vitals strip shows them** (`VitalsStripShowing`: the status row's character's vitals window is the front tab of a drawn pane, zoom included). `SyncStatusMeters` repaints @@ -1203,7 +1217,9 @@ python3 tools/ansi_frame_to_image.py frame.ansi frame.html # or .svg list and match counts), `settings-meters`/`settings-meters-pick` (the meter table over the demo's game data, the cursor on a meter with the received-data box under it, and the same meter's value path open with its dropdown of received paths), `settings-changed` (F7 after two real edits: the `● changed` marks and - `r reset`), `logging`, `password`, `startup`, `freeze`, `spawn`, `split`, `move`, `drag`, + `r reset`), `logging`, `password`, `startup`, `freeze`, `spawn`, `split`, + `split-stacked` (the same split stacked through the real ⌃B -, where the lower pane's tab strip is the + boundary and no divider row is drawn), `move`, `drag`, `history`, `history-search`, `history-search-filter`, `draft`, `draft2`, `menu`, `menu-split`, `menu-fuzzy` (`trig sel` typed into ⌃P after a real drag, so the trigger builder's entry is offered — the frame showing a two-word fuzzy match highlighted), `menu-recent` (⌃P opened empty after two commands ran diff --git a/src/SharpMUTerm.Core/Layouts/PanelSizing.cs b/src/SharpMUTerm.Core/Layouts/PanelSizing.cs index 683551fc..6cb0a7cb 100644 --- a/src/SharpMUTerm.Core/Layouts/PanelSizing.cs +++ b/src/SharpMUTerm.Core/Layouts/PanelSizing.cs @@ -51,6 +51,7 @@ public static void Apply(PaneNode pane, Func panelOf, int tabSt ArgumentNullException.ThrowIfNull(panelOf); var panels = pane.Tabs.Select(panelOf).ToList(); var chrome = ShowsTabStrip(panels) ? Math.Max(0, tabStripRows) : 0; + pane.DrawsHeader = chrome > 0; if (IsStrip(panels)) { diff --git a/src/SharpMUTerm.Core/Workspace/LayoutNode.cs b/src/SharpMUTerm.Core/Workspace/LayoutNode.cs index dc65bb3d..4c360e57 100644 --- a/src/SharpMUTerm.Core/Workspace/LayoutNode.cs +++ b/src/SharpMUTerm.Core/Workspace/LayoutNode.cs @@ -110,6 +110,14 @@ public PaneNode( /// public int? MinRows { get; set; } + /// + /// Whether the host draws a tab strip along this pane's top row. In a stacked split such a pane needs no divider + /// row above it: its own tab strip is the boundary, and the host makes the strip's empty run the handle a divider + /// would have been (). Like , derived by the host every + /// time it lays the panes out and not persisted; false until then, which keeps the divider. + /// + public bool DrawsHeader { get; set; } + public override IEnumerable Panes() { yield return this; diff --git a/src/SharpMUTerm.Core/Workspace/LayoutSolver.cs b/src/SharpMUTerm.Core/Workspace/LayoutSolver.cs index 1538f150..21f2f1c2 100644 --- a/src/SharpMUTerm.Core/Workspace/LayoutSolver.cs +++ b/src/SharpMUTerm.Core/Workspace/LayoutSolver.cs @@ -9,7 +9,8 @@ public readonly record struct PaneRect(int X, int Y, int Width, int Height) /// /// Turns a split tree into concrete per-pane rectangles for a given -/// bounding area, reserving one cell for the divider between siblings and honouring each split's +/// bounding area, reserving one cell for the divider between siblings (where +/// says a stacked split draws one) and honouring each split's /// fractional . Pure and deterministic; the SharpConsoleUI layer maps /// the resulting s onto views. When a pane is zoomed it fills the whole area. /// @@ -54,7 +55,7 @@ private static void Place(LayoutNode node, PaneRect rect, DictionaryThe fewest rows is given: its fixed height, else its declared floor, else 0. @@ -53,7 +53,88 @@ public static int MinRows(LayoutNode node) var split = (SplitNode)node; return split.Direction == SplitDirection.Row ? split.Children.Max(MinRows) - : split.Children.Sum(MinRows) + (LayoutSolver.DividerThickness * (split.Children.Count - 1)); + : split.Children.Sum(MinRows) + Dividers(split); + } + + /// + /// The cells between child and child + 1 of + /// . Side by side it is always a divider column. Stacked, a divider row is drawn only + /// where nothing else already marks the boundary: + /// + /// none beside a fixed-height strip, which sits flush and is told apart by its own plane — it cannot be + /// resized, so a row there would be a rule with nothing to drag; + /// none above a child whose top row is all tab strip (): that strip is the + /// boundary, and the host makes its empty run the divider's handle. + /// + /// + public static int DividerRows(SplitNode split, int index) + { + ArgumentNullException.ThrowIfNull(split); + if (index < 0 || index + 1 >= split.Children.Count) + { + throw new ArgumentOutOfRangeException(nameof(index)); + } + + if (split.Direction == SplitDirection.Row) + { + return LayoutSolver.DividerThickness; + } + + var above = split.Children[index]; + var below = split.Children[index + 1]; + if (FixedRows(above) is not null || FixedRows(below) is not null || HeaderPanes(below).Count > 0) + { + return 0; + } + + return LayoutSolver.DividerThickness; + } + + /// Every divider cell along 's axis: the sum of . + public static int Dividers(SplitNode split) + { + ArgumentNullException.ThrowIfNull(split); + var total = 0; + for (var i = 0; i + 1 < split.Children.Count; i++) + { + total += DividerRows(split, i); + } + + return total; + } + + /// + /// The panes whose tab strips run along 's whole top edge, or an empty list when any part + /// of that edge is not a tab strip. A pane is its own answer; a stack is its first child's; a side-by-side row is + /// every child's, and only when each of them has one. + /// + public static IReadOnlyList HeaderPanes(LayoutNode node) + { + ArgumentNullException.ThrowIfNull(node); + if (node is PaneNode pane) + { + return pane.DrawsHeader ? [pane] : []; + } + + var split = (SplitNode)node; + if (split.Direction == SplitDirection.Column) + { + return HeaderPanes(split.Children[0]); + } + + var panes = new List(); + foreach (var child in split.Children) + { + var below = HeaderPanes(child); + if (below.Count == 0) + { + return []; + } + + panes.AddRange(below); + } + + return panes; } /// diff --git a/src/SharpMUTerm.Core/Workspace/PaneResize.cs b/src/SharpMUTerm.Core/Workspace/PaneResize.cs index 95fa65de..08fd4d48 100644 --- a/src/SharpMUTerm.Core/Workspace/PaneResize.cs +++ b/src/SharpMUTerm.Core/Workspace/PaneResize.cs @@ -279,8 +279,7 @@ public static int Minimum(LayoutNode node, bool horizontal) return split.Children.Max(child => Minimum(child, horizontal)); } - return split.Children.Sum(child => Minimum(child, horizontal)) - + (LayoutSolver.DividerThickness * (split.Children.Count - 1)); + return split.Children.Sum(child => Minimum(child, horizontal)) + PaneExtent.Dividers(split); } /// The arrow a direction is spelled with, for the surfaces that name the chord. diff --git a/src/SharpMUTerm.Tui/PaneDragSurface.cs b/src/SharpMUTerm.Tui/PaneDragSurface.cs index d7b4f478..9718b738 100644 --- a/src/SharpMUTerm.Tui/PaneDragSurface.cs +++ b/src/SharpMUTerm.Tui/PaneDragSurface.cs @@ -12,16 +12,23 @@ internal sealed class PaneDragSurface { private readonly Dictionary _rects; private readonly Dictionary _activeWindows; + private readonly List _dividers; - /// Creates a surface from pane rectangles and each pane's active window id. + /// + /// Creates a surface from pane rectangles and each pane's active window id. are the + /// cells of a tab strip that stand in for the divider above its pane (the run past its last tab): a press there + /// resizes the split, so it is not a drag handle for the pane's window. + /// public PaneDragSurface( IReadOnlyDictionary rects, - IReadOnlyDictionary activeWindows) + IReadOnlyDictionary activeWindows, + IEnumerable? dividers = null) { ArgumentNullException.ThrowIfNull(rects); ArgumentNullException.ThrowIfNull(activeWindows); _rects = new Dictionary(rects, StringComparer.Ordinal); _activeWindows = new Dictionary(activeWindows, StringComparer.Ordinal); + _dividers = dividers is null ? new List() : new List(dividers); } /// The pane rectangles, keyed by pane id. @@ -64,4 +71,12 @@ public PaneDragSurface( /// drag, so clicking, selecting text and following links in a pane's body are all left alone. /// public bool IsTabStrip(string paneId, int y) => RectOf(paneId) is { } rect && !rect.IsEmpty && y == rect.Y; + + /// + /// True when a press at the cell starts a pane drag: it is on the pane's tab strip and not on the part of the + /// strip that is the divider above the pane. + /// + public bool IsDragHandle(string paneId, int x, int y) => + IsTabStrip(paneId, y) + && !_dividers.Any(d => x >= d.X && x < d.X + d.Width && y >= d.Y && y < d.Y + d.Height); } diff --git a/src/SharpMUTerm.Tui/PaneDragTracker.cs b/src/SharpMUTerm.Tui/PaneDragTracker.cs index ead67be9..27f569d6 100644 --- a/src/SharpMUTerm.Tui/PaneDragTracker.cs +++ b/src/SharpMUTerm.Tui/PaneDragTracker.cs @@ -203,8 +203,9 @@ private PaneDragResult OnPress(int x, int y, Func snapshot) return wasDragging ? Cancelled() : Idle(); } - // Only the tab strip is a drag handle; a press in the body belongs to the pane's content. - if (!surface.IsTabStrip(paneId, y) || surface.ActiveWindow(paneId) is not { } windowId) + // Only the tab strip is a drag handle; a press in the body belongs to the pane's content, and one on the strip's + // empty run, where that run is the divider above the pane, belongs to the divider. + if (!surface.IsDragHandle(paneId, x, y) || surface.ActiveWindow(paneId) is not { } windowId) { return wasDragging ? Cancelled() : Idle(); } diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs index 732a802d..ad4315d7 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs @@ -36,8 +36,12 @@ internal sealed partial class SharpMUTermApp private DividerDrag? _dividerDrag; private IReadOnlyList _scrollbars = Array.Empty(); - /// One divider between two children of a split, and the control that draws it. - private sealed record DividerSlot(HorizontalGridControl Control, SplitNode Split, int Index); + /// + /// One divider between two children of a split: either the control that draws it, or — in a stack where the pane + /// below draws a tab strip and so needs no divider row () — that pane's id, + /// whose strip's empty run past its last tab is the handle instead (). + /// + private sealed record DividerSlot(HorizontalGridControl? Control, SplitNode Split, int Index, string? HeaderPaneId = null); /// A divider by what it divides, which survives the rebuild that replaces its control. private readonly record struct DividerKey(SplitNode Split, int Index) @@ -62,8 +66,8 @@ private HorizontalGridControl PaneDivider(SplitNode split, int index) var key = new DividerKey(split, index); var rule = Divider(_litDivider is { } lit && lit.Equals(key)); - // The rule beside a fixed-height strip is drawn but not registered: it cannot move, so it offers no - // resize cue to hover, no drag and no double-click to even. + // Beside a fixed-height strip no rule is drawn at all (PaneExtent.DividerRows: it sits flush); should one + // ever be, it is not registered: it cannot move, so it offers no resize cue, no drag and no double-click. var held = split.Direction == SplitDirection.Column && (PaneExtent.FixedRows(split.Children[index]) is not null || PaneExtent.FixedRows(split.Children[index + 1]) is not null); @@ -75,6 +79,118 @@ private HorizontalGridControl PaneDivider(SplitNode split, int index) return rule; } + /// + /// Registers the tab strips of the panes along the top of a stacked split's child + 1 as + /// the divider above it, where drew no row. Nothing is registered beside a + /// fixed strip, for 's reason: it cannot move. + /// + private void RegisterHeaderDivider(SplitNode split, int index) + { + if (split.Direction != SplitDirection.Column + || PaneExtent.FixedRows(split.Children[index]) is not null + || PaneExtent.FixedRows(split.Children[index + 1]) is not null) + { + return; + } + + foreach (var pane in PaneExtent.HeaderPanes(split.Children[index + 1])) + { + _dividers.Add(new DividerSlot(null, split, index, pane.Id)); + } + } + + /// + /// The run of a pane's tab strip to the right of its last tab, in desktop cells, or null when the strip is not + /// drawn or its tabs fill it. Only that run is the divider: a tab, its × and the separators between tabs + /// stay the framework's, and its own hit test is what says where the last tab ends. + /// + private PaneRect? HeaderFill(string paneId) + { + TabControl? tabs; + lock (_paneTabsLock) + { + tabs = _paneTabs.GetValueOrDefault(paneId); + } + + if (tabs is not { ShowTabHeader: true } || BoundsOf(tabs) is not { Height: > 0 } rect) + { + return null; + } + + var from = rect.Width; + while (from > 0 && FrameworkHitTests.TabAt(tabs, from - 1) < 0) + { + from--; + } + + // A strip whose hit test answers nothing at all (a framework that renamed it) offers no handle rather than + // turning its tabs into one. + if (from == 0 && tabs.TabCount > 0) + { + return null; + } + + return from >= rect.Width ? null : new PaneRect(rect.X + from, rect.Y, rect.Width - from, 1); + } + + /// Every tab strip's run that is a divider's handle, for the pane drag to leave alone. + /// + /// Called from the driver's input thread (), so it reads the copy + /// swapped in, never the list a rebuild is filling. + /// + private List HeaderDividerCells() => + Volatile.Read(ref _headerDividerSlots) + .Select(AreaOf) + .Where(area => area is not null) + .Select(area => area!.Value) + .ToList(); + + /// The tab strips standing in for dividers, as of the last rebuild; swapped whole, read off-thread. + private DividerSlot[] _headerDividerSlots = []; + + /// Publishes the rebuilt pane area's tab-strip dividers for . + private void PublishHeaderDividers() => + Volatile.Write(ref _headerDividerSlots, _dividers.Where(slot => slot.HeaderPaneId is not null).ToArray()); + + /// Where a divider's handle is, in desktop cells: its control's cells, or the empty run of a tab strip. + private PaneRect? AreaOf(DividerSlot slot) => + slot.Control is { } control ? BoundsOf(control) : slot.HeaderPaneId is { } paneId ? HeaderFill(paneId) : null; + + /// + /// Lights the tab strip standing in for the divider under the pointer (or being dragged). A recolour of cells the + /// strip already drew, after the frame is painted — the framework paints that run in the control's own + /// background, which is also what the pane's content inherits, so it cannot be set on the control. + /// + private void PaintHeaderDividers(SharpConsoleUI.Layout.CharacterBuffer buffer) + { + if (_litDivider is not { } lit) + { + return; + } + + var hover = ToColor(WorkspacePalette.RuleHover(_theme)); + foreach (var slot in _dividers) + { + if (slot.HeaderPaneId is null || !lit.Equals(new DividerKey(slot.Split, slot.Index)) || AreaOf(slot) is not { } fill) + { + continue; + } + + var top = _window.Top + _system.DesktopUpperLeft.Y; + for (var x = fill.X; x < fill.X + fill.Width; x++) + { + var bx = x - _window.Left; + var by = fill.Y - top; + if (bx < 0 || by < 0 || bx >= buffer.Width || by >= buffer.Height) + { + continue; + } + + buffer.SetCellColors(bx, by, buffer.GetCell(bx, by).Foreground, hover); + } + } + } + /// /// One mouse frame, on the client's thread: a divider drag, a right-click menu, or a hover. Nothing /// here consumes the frame — the framework and the pane-drag tracker see it as they always did. @@ -174,6 +290,11 @@ private void RelightDividers() { foreach (var slot in _dividers) { + if (slot.Control is null) + { + continue; // a tab strip standing in for the divider is lit after the paint (PaintHeaderDividers) + } + var lit = _litDivider is { } key && key.Equals(new DividerKey(slot.Split, slot.Index)); slot.Control.BackgroundColor = ToColor(lit ? WorkspacePalette.RuleHover(_theme) : WorkspacePalette.Rule(_theme)); } @@ -200,7 +321,7 @@ private Dictionary PaneRectsForResize() => { foreach (var slot in _dividers) { - if (BoundsOf(slot.Control) is { } rect && Contains(rect, point)) + if (AreaOf(slot) is { } rect && Contains(rect, point)) { return slot; } @@ -210,14 +331,14 @@ private Dictionary PaneRectsForResize() => } /// The divider occupying exactly , or null. - private DividerSlot? DividerAt(PaneRect area) => _dividers.FirstOrDefault(slot => BoundsOf(slot.Control) == area); + private DividerSlot? DividerAt(PaneRect area) => _dividers.FirstOrDefault(slot => AreaOf(slot) == area); /// /// What is at a desktop cell, as the pointer sees it. Internal so a test can ask without a mouse. /// internal PointerTarget TargetAt(System.Drawing.Point point) { - if (DividerAt(point) is { } divider && BoundsOf(divider.Control) is { } line) + if (DividerAt(point) is { } divider && AreaOf(divider) is { } line) { var columns = divider.Split.Direction == SplitDirection.Row; return new PointerTarget( diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index b18e5644..2aa5f285 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -997,6 +997,7 @@ public SharpMUTermApp( ReportPaneSizes(); SyncTabStripWidths(); SyncTransparentColours(); + PaintHeaderDividers(buffer); DrawSixelOverlay(buffer); PublishScrollbars(); PublishPanels(); @@ -1306,6 +1307,14 @@ public string RenderSnapshot(string? view = null) RebuildPaneArea(); } + // The same split stacked, through the real ⌃B - keys: Chat lands in the lower pane, whose tab strip is the + // boundary between the two — there is no divider row above a pane that draws its own tab strip. + if (string.Equals(view, "split-stacked", StringComparison.OrdinalIgnoreCase)) + { + SimulateKey(Stroke('\u0002', ConsoleKey.B, ctrl: true)); + SimulateKey(Stroke('-', ConsoleKey.OemMinus)); + } + // More tabs than the strip can hold, which is the state every other tab view is too small to // show. The channels are named the way a real client's are — a character's captures, carrying // their owner as a prefix — and there are seven of them in a split pane, so the strip wants far @@ -10009,6 +10018,7 @@ private IWindowControl BuildWorkspaceRow() var paneArea = zoomed is not null ? OnSurface(BuildPaneTabs(zoomed), zoomed.Id) : BuildLayoutNode(_workspace.Layout.Root); + PublishHeaderDividers(); // Size the rail to what its rows actually need (clamped), so it never hogs width nor clips. var railLines = RenderRailLines(); @@ -10140,12 +10150,13 @@ private IWindowControl OnSurface(IWindowControl content, string? paneId = null) /// Only the body. The tab chips keep , so the selected chip still carries /// the focused pane's lift: the plane behind the text is the one cue that can be given up, because the /// chip, the ▌ and the armed command line all say the same thing. A tinted pane stays painted — - /// its colour says whose pane it is, and nothing else on the plane says that. On kitty none of this + /// its colour says whose pane it is, and nothing else on the plane says that. So does a strip panel: no divider + /// row separates it from its neighbour, and its recessed plane is the only thing that does. On kitty none of this /// applies: every plane stays painted and is named to the terminal instead (). /// /// private SColor PaneBodyColor(string? paneId) => - HandsPlanesToTheTerminal && PaneTintOf(paneId) == PaneTint.None + HandsPlanesToTheTerminal && PaneTintOf(paneId) == PaneTint.None && !IsStripPane(paneId) ? SColor.Transparent : ToColor(PaneSurfaceTone(paneId)); @@ -10355,9 +10366,22 @@ private void EmitColourControl(string sequence) private Rgb SurfaceToneIn(string? paneId, PaneTint tint) { var plane = WorkspacePalette.Tint(_theme, tint); - return paneId is not null && IsFocusedPane(paneId) ? WorkspacePalette.Focus(plane) : plane; + if (paneId is not null && IsFocusedPane(paneId)) + { + return WorkspacePalette.Focus(plane); + } + + // A fixed strip (vitals, the quick bar) sits flush against its neighbour with no divider row between them + // (PaneExtent.DividerRows), so an unfocused one is recessed the backdrop's step: two unfocused panes are + // otherwise one plane, and the strip would run straight into the output under it. Focused, it takes the + // focus lift like any pane — recessed strip, then unfocused pane, then the focused one, in luminance. + return IsStripPane(paneId) ? WorkspacePalette.Recessed(plane) : plane; } + /// Whether a pane is a fixed-height strip panel (, derived on every rebuild). + private bool IsStripPane(string? paneId) => + paneId is not null && _workspace.Layout.FindPane(paneId) is { FixedRows: not null }; + /// /// The chip an unselected tab is painted on: its own character's plane, recessed the same /// step every idle chip has always been recessed by. @@ -10540,21 +10564,35 @@ private IWindowControl BuildLayoutNode(SharpMUTerm.Core.Workspaces.LayoutNode no var children = split.Children.Select(BuildLayoutNode).ToList(); // Interleave a thin 1-cell divider between children (a solid border-colour bar) instead of the - // framework's double-line splitter, so splits read as a single calm line. + // framework's double-line splitter, so splits read as a single calm line — but only where + // PaneExtent.DividerRows says one is drawn. Stacked, there is none above a pane whose tab strip is its top + // row (that strip is the boundary, and its empty run is registered as the divider's handle) and none beside a + // fixed strip, which sits flush on a plane of its own. LayoutSolver reads the same rule, so the panes nothing + // has arranged yet are solved to the same rectangles. // A stacked split gives a strip pane exactly its rows (Cells) and an editor its floor (Star's min); the rest // share by weight. PaneExtent.DistributeRows is the same rule, for the panes nothing has arranged yet. var stacked = split.Direction == SplitDirection.Column; var fixedRows = stacked ? PaneExtent.FixedChildren(split) : new int?[children.Count]; var tracks = new List(); + var cells = new List(); for (var i = 0; i < children.Count; i++) { var floor = stacked ? PaneExtent.MinRows(split.Children[i]) : 0; tracks.Add(fixedRows[i] is { } rows ? GridLength.Cells(rows) : GridLength.Star(Math.Max(0.01, split.Sizes[i]), min: floor > 0 ? floor : null)); + cells.Add(children[i]); if (i < children.Count - 1) { - tracks.Add(GridLength.Cells(1)); + if (PaneExtent.DividerRows(split, i) > 0) + { + tracks.Add(GridLength.Cells(1)); + cells.Add(PaneDivider(split, i)); + } + else + { + RegisterHeaderDivider(split, i); + } } } @@ -10564,25 +10602,17 @@ private IWindowControl BuildLayoutNode(SharpMUTerm.Core.Workspaces.LayoutNode no if (split.Direction == SplitDirection.Row) { grid.Columns(tracks.ToArray()).Rows(GridLength.Star(1)); - for (var i = 0; i < children.Count; i++) + for (var i = 0; i < cells.Count; i++) { - grid.Place(children[i], 0, i * 2, 1, 1); - if (i < children.Count - 1) - { - grid.Place(PaneDivider(split, i), 0, i * 2 + 1, 1, 1); - } + grid.Place(cells[i], 0, i, 1, 1); } } else { grid.Rows(tracks.ToArray()).Columns(GridLength.Star(1)); - for (var i = 0; i < children.Count; i++) + for (var i = 0; i < cells.Count; i++) { - grid.Place(children[i], i * 2, 0, 1, 1); - if (i < children.Count - 1) - { - grid.Place(PaneDivider(split, i), i * 2 + 1, 0, 1, 1); - } + grid.Place(cells[i], i, 0, 1, 1); } } @@ -12086,7 +12116,7 @@ internal PaneDragSurface PaneSnapshot() } } - return new PaneDragSurface(rects, windows); + return new PaneDragSurface(rects, windows, HeaderDividerCells()); } /// diff --git a/src/SharpMUTerm.Tui/SnapshotViews.cs b/src/SharpMUTerm.Tui/SnapshotViews.cs index 1b7de907..20232942 100644 --- a/src/SharpMUTerm.Tui/SnapshotViews.cs +++ b/src/SharpMUTerm.Tui/SnapshotViews.cs @@ -15,7 +15,7 @@ internal static class SnapshotViews "input", "logging", "password", "startup", "deletions", "settings-search", "settings-meters", "settings-meters-pick", "settings-changed", "triggers-edit", "logging-edit", "keypad-edit", "password-edit", "startup-edit", - "freeze", "freeze-scrollback", "spawn", "split", "move", "drag", + "freeze", "freeze-scrollback", "spawn", "split", "split-stacked", "move", "drag", "history", "history-search", "history-search-filter", "draft", "draft2", "menu", "menu-split", "menu-fuzzy", "menu-recent", "messages", "quit", "connections", "characters", "tint", "tint-input", "tint-input-moved", "tint-tabs", diff --git a/tests/SharpMUTerm.Core.Tests/Workspace/PaneExtentTests.cs b/tests/SharpMUTerm.Core.Tests/Workspace/PaneExtentTests.cs index d16bea02..4b10a5e2 100644 --- a/tests/SharpMUTerm.Core.Tests/Workspace/PaneExtentTests.cs +++ b/tests/SharpMUTerm.Core.Tests/Workspace/PaneExtentTests.cs @@ -23,8 +23,9 @@ public async Task AFixedStripGetsExactlyItsRowsAndTheRestGoesToTheSharingPane() var rects = LayoutSolver.Solve(root, Screen); + // Flush: a strip sits against its neighbour with no divider row, so the output has the row a rule took. await Assert.That(rects["vitals"]).IsEqualTo(new PaneRect(0, 0, 100, 1)); - await Assert.That(rects["output"]).IsEqualTo(new PaneRect(0, 2, 100, 28)); + await Assert.That(rects["output"]).IsEqualTo(new PaneRect(0, 1, 100, 29)); } [Test] @@ -35,7 +36,7 @@ public async Task TheShareAFixedPaneWasGivenDoesNotMatter() await Assert.That(LayoutSolver.Solve(narrow, Screen)["quick"].Height).IsEqualTo(1); await Assert.That(LayoutSolver.Solve(wide, Screen)["quick"].Height).IsEqualTo(1); - await Assert.That(LayoutSolver.Solve(wide, Screen)["output"].Height).IsEqualTo(28); + await Assert.That(LayoutSolver.Solve(wide, Screen)["output"].Height).IsEqualTo(29); } [Test] @@ -48,10 +49,98 @@ public async Task SharingPanesStillSplitWhatIsLeftByTheirFractions() var rects = LayoutSolver.Solve(root, Screen); - // 30 − 2 dividers = 28; the strip takes 2, and a and b split the 26 left evenly. + // 30 − 1 divider (between a and b; none beside the strip) = 29; the strip takes 2, a and b split 27. await Assert.That(rects["strip"].Height).IsEqualTo(2); - await Assert.That(rects["a"].Height).IsEqualTo(13); - await Assert.That(rects["b"].Height).IsEqualTo(13); + await Assert.That(rects["a"].Height + rects["b"].Height).IsEqualTo(27); + await Assert.That(Math.Abs(rects["a"].Height - rects["b"].Height)).IsLessThanOrEqualTo(1); + } + + [Test] + public async Task NoDividerRowIsDrawnAboveAPaneThatDrawsItsOwnTabStrip() + { + var top = Pane("top"); + var below = Pane("below"); + below.DrawsHeader = true; + var root = new SplitNode(SplitDirection.Column, [top, below]); + + var rects = LayoutSolver.Solve(root, Screen); + + await Assert.That(PaneExtent.DividerRows(root, 0)).IsEqualTo(0); + await Assert.That(rects["top"]).IsEqualTo(new PaneRect(0, 0, 100, 15)); + await Assert.That(rects["below"]).IsEqualTo(new PaneRect(0, 15, 100, 15)); + } + + [Test] + public async Task APaneWithNoTabStripStillGetsItsDividerRow() + { + var top = Pane("top"); + top.DrawsHeader = true; // the strip above a boundary is not the boundary + var root = new SplitNode(SplitDirection.Column, [top, Pane("below")]); + + var rects = LayoutSolver.Solve(root, Screen); + + await Assert.That(PaneExtent.DividerRows(root, 0)).IsEqualTo(1); + await Assert.That(rects["below"].Y).IsEqualTo(rects["top"].Height + 1); + } + + [Test] + public async Task SideBySideKeepsItsDividerColumnWhateverThePanesDraw() + { + var left = Pane("left"); + var right = Pane("right"); + left.DrawsHeader = right.DrawsHeader = true; + var root = new SplitNode(SplitDirection.Row, [left, right]); + + var rects = LayoutSolver.Solve(root, Screen); + + await Assert.That(PaneExtent.DividerRows(root, 0)).IsEqualTo(1); + await Assert.That(rects["right"].X).IsEqualTo(rects["left"].Width + 1); + } + + [Test] + public async Task ARowOfPanesIsTheBoundaryOnlyWhenEveryOneOfThemDrawsATabStrip() + { + var a = Pane("a"); + var b = Pane("b"); + a.DrawsHeader = true; + var row = new SplitNode(SplitDirection.Row, [a, b]); + var root = new SplitNode(SplitDirection.Column, [Pane("top"), row]); + + await Assert.That(PaneExtent.HeaderPanes(row)).IsEmpty(); + await Assert.That(PaneExtent.DividerRows(root, 0)).IsEqualTo(1); + + b.DrawsHeader = true; + await Assert.That(PaneExtent.HeaderPanes(row).Select(p => p.Id)).IsEquivalentTo(["a", "b"]); + await Assert.That(PaneExtent.DividerRows(root, 0)).IsEqualTo(0); + } + + [Test] + public async Task DraggingATabStripBoundaryPutsTheLowerPanesStripAtTheRowAskedFor() + { + var below = Pane("below"); + below.DrawsHeader = true; + var root = new SplitNode(SplitDirection.Column, [Pane("top"), below]); + var rects = LayoutSolver.Solve(root, Screen); + + var result = PaneResize.DragBorder(root, 0, 10, rects); + var after = LayoutSolver.Solve(root, Screen); + + await Assert.That(result.Outcome).IsEqualTo(PaneResizeOutcome.Resized); + await Assert.That(after["below"].Y).IsEqualTo(10); + await Assert.That(after["top"].Height + after["below"].Height).IsEqualTo(30); + } + + [Test] + public async Task ApplyingPanelSizingSaysWhetherThePaneDrawsATabStrip() + { + var strip = new PaneNode("s", ["panel:vitals:W.C"]); + var output = new PaneNode("o", ["main"]); + + PanelSizing.Apply(strip, PanelOf, tabStripRows: 1); + PanelSizing.Apply(output, PanelOf, tabStripRows: 1); + + await Assert.That(strip.DrawsHeader).IsFalse(); + await Assert.That(output.DrawsHeader).IsTrue(); } [Test] @@ -85,7 +174,7 @@ public async Task WhenEveryPaneIsFixedTheLastTakesWhatIsLeftSoNoRowIsLost() var rects = LayoutSolver.Solve(root, Screen); await Assert.That(rects["a"].Height).IsEqualTo(1); - await Assert.That(rects["b"].Height).IsEqualTo(28); + await Assert.That(rects["b"].Height).IsEqualTo(29); } [Test] @@ -96,7 +185,7 @@ public async Task ASubtreeIsFixedOnlyWhenEveryPaneInItIs() var mixed = new SplitNode(SplitDirection.Row, [Pane("vitals3", fixedRows: 1), Pane("output")]); await Assert.That(PaneExtent.FixedRows(strips)).IsEqualTo(2); - await Assert.That(PaneExtent.FixedRows(stack)).IsEqualTo(3); // two rows and the divider between them + await Assert.That(PaneExtent.FixedRows(stack)).IsEqualTo(2); // two rows, flush: strips need no divider await Assert.That(PaneExtent.FixedRows(mixed)).IsNull(); } diff --git a/tests/SharpMUTerm.Tui.Tests/PointerTests.cs b/tests/SharpMUTerm.Tui.Tests/PointerTests.cs index 7e2dac9a..d6ec71f4 100644 --- a/tests/SharpMUTerm.Tui.Tests/PointerTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/PointerTests.cs @@ -146,6 +146,81 @@ public async Task DoubleClickingADividerEvensThePanesOut() await Assert.That(Math.Abs(widths[0] - widths[1])).IsLessThanOrEqualTo(1); } + /// + /// In a stack there is no divider row above a pane that draws its own tab strip: the strip's empty run past + /// its last tab is the divider. It is found as one (rows shape, the divider's tooltip), the tab itself is + /// still a tab, and no row of the screen between the two panes is spent on a rule. + /// + [Test] + public async Task InAStackTheLowerPanesTabStripIsTheDivider() + { + var (app, _) = App("split-stacked"); + var rects = app.PaneSnapshot().Rects.Values.OrderBy(r => r.Y).ToArray(); + await Assert.That(rects.Length).IsEqualTo(2); + await Assert.That(rects[1].Y).IsEqualTo(rects[0].Y + rects[0].Height).Because("no divider row between the panes"); + + var header = Scan(app).Where(hit => hit.Cell.Y == rects[1].Y).ToArray(); + var divider = header.Where(hit => hit.Target.Kind == PointerKind.Divider).ToArray(); + var tab = header.Where(hit => hit.Target.Kind == PointerKind.Tab).ToArray(); + await Assert.That(divider).IsNotEmpty(); + await Assert.That(tab).IsNotEmpty().Because("the tab is still the framework's"); + await Assert.That(divider.All(hit => hit.Target.Shape == PointerShape.ResizeRows)).IsTrue(); + await Assert.That(divider[0].Target.Tooltip).Contains("above and below"); + await Assert.That(divider.Min(hit => hit.Cell.X)).IsGreaterThan(tab.Max(hit => hit.Cell.X)) + .Because("only the run past the last tab is the divider"); + await Assert.That(divider.Max(hit => hit.Cell.X)).IsEqualTo(rects[1].X + rects[1].Width - 1); + } + + [Test] + public async Task HoveringTheTabStripDividerLightsOnlyItsEmptyRun() + { + var (app, pointer) = App("split-stacked"); + var before = app.PaneOutputRects(); + var cell = DividerCell(app); + var resting = FrameGrid.Backgrounds(app.RenderWholeFrame()); + + app.SimulatePointer(cell, MouseFlags.ReportMousePosition); + var lit = FrameGrid.Backgrounds(app.RenderWholeFrame()); + + await Assert.That(app.DividerLit).IsTrue(); + await Assert.That(pointer.Hovers.Last().Kind).IsEqualTo(PointerKind.Divider); + var changed = lit.Keys.Where(k => lit[k] != resting.GetValueOrDefault(k)).ToArray(); + await Assert.That(changed).IsNotEmpty(); + await Assert.That(changed.All(k => k.Row == cell.Y && k.Column >= pointer.Hovers.Last().Area.X)).IsTrue() + .Because("only the strip's empty run is recoloured, never a tab"); + await Assert.That(app.PaneOutputRects()).IsEquivalentTo(before); + + app.SimulatePointer(cell with { Y = cell.Y + 3 }, MouseFlags.ReportMousePosition); + await Assert.That(app.DividerLit).IsFalse(); + var unlit = FrameGrid.Backgrounds(app.RenderWholeFrame()); + await Assert.That(unlit.Keys.All(k => unlit[k] == resting.GetValueOrDefault(k))).IsTrue(); + } + + [Test] + public async Task DraggingTheTabStripDividerResizesTheStackAndStartsNoPaneDrag() + { + var (app, _) = App("split-stacked"); + var cell = DividerCell(app); + var top = app.PaneSnapshot().Rects.Values.OrderBy(r => r.Y).First(); + + await Assert.That(app.PaneSnapshot().IsDragHandle(app.PaneSnapshot().PaneAt(cell.X, cell.Y)!, cell.X, cell.Y)).IsFalse() + .Because("a press on the divider run is the divider's, not a window drag"); + + app.SimulatePointer(cell, MouseFlags.Button1Pressed); + app.SimulatePointer(cell with { Y = cell.Y - 4 }, MouseFlags.Button1Pressed, MouseFlags.Button1Dragged, MouseFlags.ReportMousePosition); + app.SimulatePointer(cell with { Y = cell.Y - 4 }, MouseFlags.Button1Released); + app.RenderNextFrame(); + + var rects = app.PaneSnapshot().Rects.Values.OrderBy(r => r.Y).ToArray(); + await Assert.That(rects[0].Height).IsEqualTo(top.Height - 4); + await Assert.That(rects[1].Y).IsEqualTo(cell.Y - 4).Because("the lower pane's tab strip follows the pointer"); + + app.SimulatePointer(DividerCell(app), MouseFlags.Button1DoubleClicked); + app.RenderNextFrame(); + var heights = app.PaneSnapshot().Rects.Values.Select(r => r.Height).ToArray(); + await Assert.That(Math.Abs(heights[0] - heights[1])).IsLessThanOrEqualTo(1); + } + [Test] public async Task AURLInOutputIsALinkWhoseTooltipNamesIt() { diff --git a/tests/SharpMUTerm.Tui.Tests/StackedDividerTests.cs b/tests/SharpMUTerm.Tui.Tests/StackedDividerTests.cs new file mode 100644 index 00000000..f622fa2f --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/StackedDividerTests.cs @@ -0,0 +1,117 @@ +using SharpConsoleUI.Drivers; +using SharpMUTerm.Core.Theming; +using SharpMUTerm.Core.Workspaces; +using SharpMUTerm.Graphics; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// A stacked split spends no row on a divider where something already marks the boundary: above a pane that draws +/// its own tab strip (the strip is the boundary, and its empty run is the handle), and either side of a fixed strip +/// panel, which is told apart by its plane instead. Side by side, the divider column is unchanged. +/// +/// Serialised: rendering a frame redirects the process-global Console.Out. +[NotInParallel] +public class StackedDividerTests +{ + private const int Width = 120; + private const int Height = 32; + + private static readonly TerminalCapabilities Headless = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private static SharpMUTermApp App(string view, string theme = "Dark") + { + Console.SetIn(TextReader.Null); + var config = DemoScene.Build(); + config.ThemeName = theme; + config.Theme = ThemeLibrary.Get(theme); + var app = new SharpMUTermApp(config, Headless, new HeadlessConsoleDriver(Width, Height)); + app.RenderSnapshot(view); + app.RenderNextFrame(); + return app; + } + + [Test] + public async Task AStackedSplitGivesTheDividerRowToThePanes() + { + var app = App("split-stacked"); + var rects = app.PaneSnapshot().Rects.Values.OrderBy(r => r.Y).ToArray(); + + await Assert.That(rects.Length).IsEqualTo(2); + await Assert.That(rects[1].Y).IsEqualTo(rects[0].Y + rects[0].Height); + + // The lower pane's output starts under its tab strip, which is the row the divider used to take. + var outputs = app.PaneOutputRects().Values.OrderBy(r => r.Y).ToArray(); + await Assert.That(outputs[1].Y).IsEqualTo(rects[1].Y + 1); + } + + [Test] + public async Task ASideBySideSplitKeepsItsDividerColumn() + { + var app = App("split"); + var rects = app.PaneSnapshot().Rects.Values.OrderBy(r => r.X).ToArray(); + + await Assert.That(rects.Length).IsEqualTo(2); + await Assert.That(rects[1].X).IsEqualTo(rects[0].X + rects[0].Width + 1); + } + + /// + /// The vitals strip sits flush on the panes under it and is told apart from them by its plane, on every theme + /// and whether or not the pane beside it holds the focus: an unfocused strip is recessed a step, so it is never + /// the same plane as an unfocused pane. + /// + [Test] + [Arguments("Dark")] + [Arguments("Light")] + [Arguments("Solarized Dark")] + public async Task AStripSitsFlushAndIsToldApartByItsPlane(string theme) + { + var app = App("layout-combat", theme); + foreach (var moved in new[] { false, true }) + { + if (moved) + { + // The focus goes to the map pane, so the output pane under the strip is unfocused too. + app.SimulateKey(new ConsoleKeyInfo('\0', ConsoleKey.RightArrow, shift: false, alt: false, control: true)); + } + + var frame = FrameGrid.Backgrounds(app.RenderWholeFrame()); + var rects = app.PaneSnapshot().Rects.Values.ToArray(); + var strip = rects.Where(r => r.Height == 1).OrderBy(r => r.Y).First(); + var below = rects.Where(r => r.Y == strip.Y + strip.Height).ToArray(); + + await Assert.That(below).IsNotEmpty().Because("nothing between the strip and the panes under it"); + foreach (var pane in below) + { + var stripPlane = Plane(frame, strip.Y, pane.X, pane.Width); + var panePlane = Plane(frame, pane.Y + 4, pane.X, pane.Width); + await Assert.That(Math.Abs(Lightness(stripPlane) - Lightness(panePlane))).IsGreaterThanOrEqualTo(2.5) + .Because($"{theme}, focus {(moved ? "moved" : "left")}: strip {stripPlane} against pane {panePlane}"); + } + } + } + + /// The commonest background along a run of one row. + private static (int R, int G, int B) Plane(Dictionary<(int Row, int Column), string?> frame, int row, int x, int width) => + Enumerable.Range(x, width) + .Select(column => frame.GetValueOrDefault((row, column))) + .Where(bg => bg is not null) + .GroupBy(bg => bg) + .OrderByDescending(group => group.Count()) + .Select(group => Parse(group.Key!)) + .First(); + + private static (int R, int G, int B) Parse(string sgr) + { + var parts = sgr.Split(';'); + return (int.Parse(parts[2]), int.Parse(parts[3]), int.Parse(parts[4])); + } + + private static double Lightness((int R, int G, int B) c) + { + var y = Core.Text.Contrast.RelativeLuminance(new Core.Text.Rgb((byte)c.R, (byte)c.G, (byte)c.B)); + return y > 0.008856 ? (116 * Math.Cbrt(y)) - 16 : 903.3 * y; + } +} From 9212ea2fcdb3ce6cb44f9260fc86d405fec76dc0 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 05:36:00 +0000 Subject: [PATCH 019/113] Desktop window: native settings window for F7 and F8 Built from the Client setting declarations, with the shared search, reset and meter table. Other sections open their cell screens. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 5 + CLAUDE.md | 35 +- Directory.Packages.props | 1 + .../AvaloniaConsoleDriver.cs | 3 + src/SharpMUTerm.Avalonia/MainWindow.cs | 1 + src/SharpMUTerm.Avalonia/SettingsPresenter.cs | 59 ++ src/SharpMUTerm.Avalonia/SettingsWindow.cs | 720 ++++++++++++++++++ .../SharpMUTerm.Avalonia.csproj | 1 + src/SharpMUTerm.Avalonia/WindowHost.cs | 3 + .../Settings/SettingsForm.cs | 211 +++++ src/SharpMUTerm.Tui/Hosting/ClientHost.cs | 9 + .../Hosting/INativeSettings.cs | 20 + src/SharpMUTerm.Tui/OptionsScreenRenderer.cs | 13 +- .../SharpMUTermApp.Settings.cs | 88 +++ src/SharpMUTerm.Tui/SharpMUTermApp.cs | 4 +- .../HostParityTests.cs | 4 +- .../SettingsWindowTests.cs | 218 ++++++ .../NativeSettingsRoutingTests.cs | 130 ++++ 18 files changed, 1515 insertions(+), 10 deletions(-) create mode 100644 src/SharpMUTerm.Avalonia/SettingsPresenter.cs create mode 100644 src/SharpMUTerm.Avalonia/SettingsWindow.cs create mode 100644 src/SharpMUTerm.Client/Settings/SettingsForm.cs create mode 100644 src/SharpMUTerm.Tui/Hosting/INativeSettings.cs create mode 100644 tests/SharpMUTerm.Avalonia.Tests/SettingsWindowTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/NativeSettingsRoutingTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 78fb2cbe..eb75eb44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,11 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- Desktop window: F7 (Text & display) and F8 (Input) open a settings window with real switches, number boxes + and a search box. Matches are counted per section as you type. A changed setting shows a dot and a Reset + button, and every change applies and saves as you make it. The status-row meters are a table that shows each + meter's current value, with the paths your game has sent listed for you to pick from. The other screens are + listed in the window and open as before. - Desktop window: a Layouts button at the right end of the header opens a menu of the built-in and your saved layouts (the one in use is checked), with *Save changes*, *Save as new*, *Use for* the world or the character, and *Manage layouts…*. It runs the same actions as Alt+M. diff --git a/CLAUDE.md b/CLAUDE.md index ec9bfcb2..72ec808b 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -1126,7 +1126,7 @@ The terminal (`sharpmuterm`), the desktop window (`sharpmuterm-window`) and the one `SharpMUTermApp`; a host is only the place it runs. What differs between hosts is a **`ClientHost`** (`src/SharpMUTerm.Tui/Hosting/`): driver, capabilities, clipboard, URL opener, focus reporting, keys (`HostKeys`: the newline chord, and the chords the host keeps for itself), whether there is a main loop, -the Sixel cell size, and what it does with the pointer (`IPointerPresenter`, null for none). Built by `ClientHost.Terminal`, `ClientHost.Headless`/`Snapshot` and +the Sixel cell size, and what it does with the pointer (`IPointerPresenter`, null for none), and whether it draws the declared settings natively (`INativeSettings`, null for the cell screens). Built by `ClientHost.Terminal`, `ClientHost.Headless`/`Snapshot` and `WindowHost.Create` (Avalonia). Four things keep a feature from landing in one host only: - **Every `ClientHost` and `HostKeys` member is `required`**, so a member added there does not compile until @@ -1470,7 +1470,38 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] trailing Remove button added only while the cursor is on one; the received-data box shows only while the cursor is in the table; path fields offer the received paths with their values as `ChoiceNotes`. - F7 and F8 are windowed to the screen height (`ScreenChrome.Window`), because F7 is taller than 24 rows. - - Not declared yet: F2–F6, F9 (F5's character form) and F10 are listed by title only. + - Not declared yet: F2–F6, F9 (F5's character form) and F10 are listed by title only. F9 was not declared + for the native window either: its fields are per *character*, and a `SettingBinding` reads an + `AppConfiguration`, so declaring it needs a binding that knows which character first. +- **In the window, a declared section opens a native settings window, generated from the declarations** + (`ClientHost.NativeSettings` → `INativeSettings`; Client `SettingsForm`; Avalonia `SettingsWindow`, + `SettingsPresenter` on the driver; `OpenSettingsScreen`/`TryOpenNativeSettings` in `SharpMUTermApp.Settings.cs`). + The terminal, the snapshot, the tests and the parity harness pass null, so their cells do not change. Decisions + not to relitigate: + - **Every way in goes through `OpenSettingsScreen`**: the F-key, ⌃P's `screen:` entries and the cell search's ⏎ + (`GoToSetting`). A section with fields goes native and any open cell screen is closed first. A section with + none is a cell screen as before. In the window's list it carries `↗`, and choosing it calls + `SettingsForm.OpenScreen`, which closes the window and opens the cell screen through `GoToSetting`. + - **The window only draws; the client commits.** `SettingsForm` reads values through each field's + `SettingBinding` and sends every write through one delegate. The app's delegate runs + `ScreenEdits(SaveConfiguration).Apply` on its own thread (`OnUiThread`), so a native edit is saved and re-syncs + bars, panels and automation exactly as an F7 edit does. `Changed` is raised after the change lands, and the + window re-reads values and marks. A number is clamped to its field's bounds and a text to its length, the cell + field's rules. Reset is `binding.Reset`, the default `r` uses. + - **Reads cross threads, so lists are replaced and never edited.** The window reads the live configuration on + Avalonia's thread. A declared value is a scalar or a list, so `SetMeters` builds a new list every time. + - **The meter table reads the game data of the window focused when the form opened**, captured on the client's + thread. `GameDataStore` is locked, but the focus is not safe to read from another thread. The `now` column is + re-read each second (`OptionsScreenRenderer.NowText`). The received paths feed each path box's auto-complete + and a list below it; clicking a path fills the path box last used. + - **Search is `SettingsSearch.Find` and nothing else**, so the two surfaces always find the same fields. While + searching, the page shows only matched fields, and if the section on show has none it moves to the first that + has some. + - **Fluent is applied to this window only** (`Styles.Add(new FluentTheme())`), and `RequestedThemeVariant` + follows the client's theme (`SettingsForm.IsDark`). The rest of the window stays on the Simple theme the + native menu and tooltips were built against. + - Not done: the window is not modal and does not follow a theme change while it is open. Screenshots come from a + real window under Xvfb, driven with XTest (`ux-wave4/native-settings-*.png`). - **Settings screens have no `IPasteTarget` and cannot easily have one.** They are markup rebuilt wholesale every key, with the edited field a buffer in `SettingsSession`. `SettingsOverlay` listens at `IConsoleDriver.Paste` instead. That can't double-fire *only* because no control on diff --git a/Directory.Packages.props b/Directory.Packages.props index 33fb2cc3..b1c8bec7 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -69,6 +69,7 @@ + diff --git a/src/SharpMUTerm.Avalonia/AvaloniaConsoleDriver.cs b/src/SharpMUTerm.Avalonia/AvaloniaConsoleDriver.cs index 23f46530..684b33fd 100644 --- a/src/SharpMUTerm.Avalonia/AvaloniaConsoleDriver.cs +++ b/src/SharpMUTerm.Avalonia/AvaloniaConsoleDriver.cs @@ -70,6 +70,9 @@ public AvaloniaConsoleDriver(int columns, int rows) /// The window's screen-reader regions; the window adds them beside the view. public WindowAnnouncer Announcer { get; } = new(); + /// The window's native settings window, which the main window owns (). + public SettingsPresenter Settings { get; } = new(); + public bool IsRunning { get; private set; } // ── IConsoleDriver: output ──────────────────────────────────────────────────────────────── diff --git a/src/SharpMUTerm.Avalonia/MainWindow.cs b/src/SharpMUTerm.Avalonia/MainWindow.cs index c0af46a8..ffdabba3 100644 --- a/src/SharpMUTerm.Avalonia/MainWindow.cs +++ b/src/SharpMUTerm.Avalonia/MainWindow.cs @@ -40,6 +40,7 @@ public MainWindow(WindowOptions options, IClassicDesktopStyleApplicationLifetime _view = new TerminalView(_driver, foreground, background, options.FontPoints * 96f / 72f, options.FontFamily); Title = "SharpMUTerm"; + _driver.Settings.Owner = this; // The window's own pop-ups (tooltips, the right-click menu) follow the client's theme: a light menu // over a dark client reads as somebody else's. diff --git a/src/SharpMUTerm.Avalonia/SettingsPresenter.cs b/src/SharpMUTerm.Avalonia/SettingsPresenter.cs new file mode 100644 index 00000000..1d6a01c0 --- /dev/null +++ b/src/SharpMUTerm.Avalonia/SettingsPresenter.cs @@ -0,0 +1,59 @@ +using Avalonia.Controls; +using Avalonia.Threading; +using SharpMUTerm.Client.Settings; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Avalonia; + +/// +/// The window host's : one at a time, owned by the main +/// window. The client calls in on its own thread, so everything here is posted to the window's. +/// +internal sealed class SettingsPresenter : INativeSettings +{ + private SettingsWindow? _window; + + /// The window the settings window belongs to, set once the main window exists. + public Window? Owner { get; set; } + + /// The open settings window, for a test; read on the window's thread. + public SettingsWindow? Window => _window; + + public void Show(SettingsForm form) => Dispatcher.UIThread.Post(() => ShowNow(form)); + + public void Close() => Dispatcher.UIThread.Post(() => _window?.Close()); + + /// Shows now; on the window's thread. + internal SettingsWindow ShowNow(SettingsForm form) + { + if (_window is { } open) + { + open.Load(form); + open.Activate(); + return open; + } + + var window = new SettingsWindow(form); + window.Closed += (_, _) => + { + if (ReferenceEquals(_window, window)) + { + _window = null; + } + + // The keyboard goes back to the client, as it does when a cell screen closes. + Owner?.Activate(); + }; + _window = window; + if (Owner is { IsVisible: true } owner) + { + window.Show(owner); + } + else + { + window.Show(); + } + + return window; + } +} diff --git a/src/SharpMUTerm.Avalonia/SettingsWindow.cs b/src/SharpMUTerm.Avalonia/SettingsWindow.cs new file mode 100644 index 00000000..bbd4faf6 --- /dev/null +++ b/src/SharpMUTerm.Avalonia/SettingsWindow.cs @@ -0,0 +1,720 @@ +using System.Globalization; +using Avalonia; +using Avalonia.Automation; +using Avalonia.Controls; +using Avalonia.Controls.Primitives; +using Avalonia.Controls.Shapes; +using Avalonia.Input; +using Avalonia.Layout; +using Avalonia.Media; +using Avalonia.Styling; +using Avalonia.Themes.Fluent; +using Avalonia.Threading; +using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Client.Settings; +using SharpMUTerm.Core.Configuration; + +namespace SharpMUTerm.Avalonia; + +/// +/// The desktop's settings window, generated from the declared sections (): a search box, +/// the sections down the left with match counts while searching, and the chosen section's fields on the right under +/// their group headings — each with its label, its help, the native control for its kind, a dot while it differs +/// from its default and a reset beside it. The meters are a table with a live now column and the paths this +/// connection has received to pick from. +/// +/// Nothing here writes the configuration: every change goes to the form, which commits it through the client's own +/// save funnel on the client's thread. Changes apply as they are made; there is no OK and no Cancel, as there is +/// none on a cell screen. A section that declares no fields is listed and opens its own cell screen. +/// +/// +internal sealed class SettingsWindow : Window +{ + private readonly TextBox _search; + private readonly ListBox _sections; + private readonly StackPanel _page; + private readonly ScrollViewer _scroller; + private readonly List _refreshers = []; + private readonly DispatcherTimer _clock; + private readonly Dictionary _controls = new(StringComparer.Ordinal); + private readonly Dictionary _resets = new(StringComparer.Ordinal); + private readonly Dictionary _badges = new(StringComparer.Ordinal); + private readonly List<(StatusMeter Meter, TextBlock Now)> _meterNow = []; + private SettingsForm _form; + private IReadOnlyList _matches = []; + private string? _shown; + private bool _syncing; + private bool _choosing; + private int _meterRows = -1; + + public SettingsWindow(SettingsForm form) + { + _form = form; + Title = "Settings"; + Width = 960; + Height = 680; + MinWidth = 640; + MinHeight = 420; + WindowStartupLocation = WindowStartupLocation.CenterOwner; + Styles.Add(new FluentTheme()); + + _search = new TextBox { PlaceholderText = "Search settings", Margin = new Thickness(16, 14, 16, 10) }; + AutomationProperties.SetName(_search, "Search settings"); + _search.TextChanged += (_, _) => OnQuery(); + DockPanel.SetDock(_search, Dock.Top); + + _sections = new ListBox { Width = 250, Margin = new Thickness(8, 0, 0, 12), Background = Brushes.Transparent }; + _sections.SelectionChanged += (_, _) => OnSectionChosen(); + DockPanel.SetDock(_sections, Dock.Left); + + _page = new StackPanel { Margin = new Thickness(28, 4, 28, 28), Spacing = 2 }; + _scroller = new ScrollViewer { Content = _page, HorizontalScrollBarVisibility = ScrollBarVisibility.Disabled }; + + var dock = new DockPanel { LastChildFill = true }; + dock.Children.Add(_search); + dock.Children.Add(_sections); + dock.Children.Add(_scroller); + Content = dock; + + _clock = new DispatcherTimer(TimeSpan.FromSeconds(1), DispatcherPriority.Background, (_, _) => Tick()); + Opened += (_, _) => _clock.Start(); + Closed += (_, _) => + { + _clock.Stop(); + _form.Changed -= OnChanged; + }; + KeyDown += OnKey; + + Load(form); + } + + /// The section on the right, by id. + public string? ShownSection => _shown; + + /// The ids of the fields drawn on the right, in order, for a test. + public IReadOnlyList ShownFields { get; private set; } = []; + + /// The control drawn for each field on the right, by field id, for a test. + public IReadOnlyDictionary FieldControls => _controls; + + /// The reset button of each field on the right, by field id, for a test. + public IReadOnlyDictionary ResetButtons => _resets; + + /// What each section's row says beside its title — its match count while searching — by id, for a test. + public IReadOnlyDictionary SectionBadges => + _badges.ToDictionary(b => b.Key, b => b.Value.Text ?? string.Empty, StringComparer.Ordinal); + + /// The search box. + public TextBox SearchBox => _search; + + /// The section list. + public ListBox SectionList => _sections; + + /// The meter table, for a test: a heading row and one row per meter. + public Grid? MeterGrid { get; private set; } + + /// Shows , on its initial section, replacing the form shown before. + public void Load(SettingsForm form) + { + _form.Changed -= OnChanged; + _form = form; + _form.Changed += OnChanged; + RequestedThemeVariant = form.IsDark ? ThemeVariant.Dark : ThemeVariant.Light; + _shown = null; + _matches = _form.Search(_search.Text); + BuildSectionList(); + Choose(form.Section(form.Initial) is { } initial && SettingsForm.IsDeclared(initial) + ? initial.Id + : form.Sections.FirstOrDefault(SettingsForm.IsDeclared)?.Id); + } + + // ── the section list ───────────────────────────────────────────────────────────────────────── + + private IEnumerable Items => _sections.ItemsSource as IEnumerable ?? []; + + private void BuildSectionList() + { + _badges.Clear(); + var items = new List(); + foreach (var section in _form.Sections) + { + var title = new TextBlock { Text = section.Title, VerticalAlignment = VerticalAlignment.Center, TextTrimming = TextTrimming.CharacterEllipsis }; + var badge = new TextBlock { Opacity = 0.7, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(8, 0, 0, 0) }; + _badges[section.Id] = badge; + var row = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto") }; + row.Children.Add(title); + Grid.SetColumn(badge, 1); + row.Children.Add(badge); + var item = new ListBoxItem { Content = row, Tag = section.Id, Padding = new Thickness(12, 9) }; + ToolTip.SetTip(item, SettingsForm.IsDeclared(section) ? section.Key : $"Opens the {section.Key} screen"); + items.Add(item); + } + + _choosing = true; + _sections.ItemsSource = items; + _choosing = false; + UpdateBadges(); + } + + private void UpdateBadges() + { + var counts = SettingsSearch.CountBySection(_matches); + var searching = Searching; + foreach (var section in _form.Sections) + { + var count = counts.GetValueOrDefault(section.Id); + _badges[section.Id].Text = searching + ? count.ToString(CultureInfo.InvariantCulture) + : SettingsForm.IsDeclared(section) ? string.Empty : "↗"; + if (Items.FirstOrDefault(i => Equals(i.Tag, section.Id)) is { } item) + { + item.Opacity = searching && count == 0 ? 0.45 : 1; + } + } + } + + private void OnSectionChosen() + { + if (_choosing || _sections.SelectedItem is not ListBoxItem { Tag: string id } || _form.Section(id) is not { } section) + { + return; + } + + if (!SettingsForm.IsDeclared(section)) + { + // Not drawn here yet: its own screen is the way to it, and this window gets out of its way. + Select(_shown); + _form.OpenScreen(id); + return; + } + + if (!string.Equals(id, _shown, StringComparison.Ordinal)) + { + Choose(id); + } + } + + private void Choose(string? id) + { + _shown = id; + Select(id); + BuildPage(); + } + + private void Select(string? id) + { + _choosing = true; + _sections.SelectedItem = Items.FirstOrDefault(i => Equals(i.Tag, id)); + _choosing = false; + } + + // ── search ─────────────────────────────────────────────────────────────────────────────────── + + private bool Searching => !string.IsNullOrWhiteSpace(_search.Text); + + private void OnQuery() + { + _matches = _form.Search(_search.Text); + UpdateBadges(); + if (Searching + && !_matches.Any(m => m.Field is not null && m.Section.Id == _shown) + && _matches.FirstOrDefault(m => m.Field is not null) is { } first) + { + // The section on show has nothing matching: go to the first that has. + Choose(first.Section.Id); + return; + } + + BuildPage(); + } + + // ── the page ───────────────────────────────────────────────────────────────────────────────── + + private void BuildPage() + { + _page.Children.Clear(); + _refreshers.Clear(); + _controls.Clear(); + _resets.Clear(); + _meterNow.Clear(); + MeterGrid = null; + _meterRows = -1; + if (_shown is null || _form.Section(_shown) is not { } section) + { + ShownFields = []; + return; + } + + _page.Children.Add(new TextBlock { Text = section.Title, FontSize = 24, FontWeight = FontWeight.SemiBold, Margin = new Thickness(0, 0, 0, 2) }); + if (section.Key is { } key) + { + _page.Children.Add(new TextBlock { Text = $"{key} in the client · changes apply as you make them", Opacity = 0.7, Margin = new Thickness(0, 0, 0, 6) }); + } + + var visible = Searching + ? section.Fields.Where(f => _matches.Any(m => ReferenceEquals(m.Field, f))).ToList() + : section.Fields.ToList(); + if (visible.Count == 0) + { + _page.Children.Add(new TextBlock { Text = "No setting here matches the search.", Opacity = 0.7, Margin = new Thickness(0, 16, 0, 0) }); + } + + string? group = null; + foreach (var field in visible) + { + if (field.Group is { } heading && !string.Equals(heading, group, StringComparison.Ordinal)) + { + group = heading; + _page.Children.Add(new TextBlock + { + Text = heading, + FontSize = 15, + FontWeight = FontWeight.SemiBold, + Margin = new Thickness(0, 18, 0, 4), + Foreground = Accent, + }); + } + + _page.Children.Add(field is ListField { Id: BuiltInSettings.MetersField } meters ? MeterTable(meters) : FieldRow(field)); + } + + ShownFields = visible.Select(f => f.Id).ToList(); + } + + /// The accent the changed dot and headings wear: Fluent's own, for the theme variant. + private SolidColorBrush Accent => new(_form.IsDark ? Color.Parse("#60cdff") : Color.Parse("#005fb8")); + + /// One field: label and help on the left, its control, then the changed dot and the reset. + private Grid FieldRow(SettingsField field) + { + var grid = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto,Auto"), Margin = new Thickness(0, 4), MinHeight = 44 }; + + var words = new StackPanel { VerticalAlignment = VerticalAlignment.Center, Spacing = 1, Margin = new Thickness(0, 0, 16, 0) }; + words.Children.Add(new TextBlock { Text = Capitalise(field.Label), FontSize = 14, TextWrapping = TextWrapping.Wrap }); + if (field.Help is { } help) + { + words.Children.Add(new TextBlock { Text = Capitalise(help), FontSize = 12, Opacity = 0.72, TextWrapping = TextWrapping.Wrap }); + } + + grid.Children.Add(words); + + var control = ControlFor(field); + control.VerticalAlignment = VerticalAlignment.Center; + AutomationProperties.SetName(control, field.Label); + Grid.SetColumn(control, 1); + grid.Children.Add(control); + _controls[field.Id] = control; + + grid.Children.Add(ChangedMark(field, column: 2)); + return grid; + } + + /// The dot and reset button for , shown only while it differs from its default. + private StackPanel ChangedMark(SettingsField field, int column) + { + var dot = new Ellipse { Width = 8, Height = 8, Fill = Accent, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(14, 0, 8, 0) }; + ToolTip.SetTip(dot, "Changed from its default"); + var reset = new Button { Content = "Reset", Padding = new Thickness(10, 3), VerticalAlignment = VerticalAlignment.Center }; + ToolTip.SetTip(reset, $"Back to the default: {SettingsForm.DefaultText(field)}"); + AutomationProperties.SetName(reset, $"Reset {field.Label}"); + reset.Click += (_, _) => _form.Reset(field); + _resets[field.Id] = reset; + + var panel = new StackPanel { Orientation = Orientation.Horizontal, VerticalAlignment = VerticalAlignment.Center, MinWidth = 100 }; + panel.Children.Add(dot); + panel.Children.Add(reset); + Grid.SetColumn(panel, column); + + void Refresh() + { + var changed = !_form.IsDefault(field); + dot.Opacity = changed ? 1 : 0; + reset.IsVisible = changed; + } + + Refresh(); + _refreshers.Add(Refresh); + return panel; + } + + /// The native control for a field's kind, wired to the form and refreshed from it. + private Control ControlFor(SettingsField field) + { + switch (field) + { + case BoolField when field.Binding is SettingBinding flag: + { + var toggle = new ToggleSwitch { OnContent = "On", OffContent = "Off", IsChecked = _form.Get(flag) }; + toggle.IsCheckedChanged += (_, _) => + { + if (!_syncing && toggle.IsChecked is { } on && on != _form.Get(flag)) + { + _form.Set(flag, on); + } + }; + _refreshers.Add(() => toggle.IsChecked = _form.Get(flag)); + return toggle; + } + + case NumberField number when field.Binding is SettingBinding count: + { + var box = new NumericUpDown + { + Minimum = number.Minimum, + Maximum = number.Maximum, + Increment = 1, + FormatString = "0", + Value = _form.Get(count), + Width = 150, + ClipValueToMinMax = true, + }; + box.ValueChanged += (_, e) => + { + if (!_syncing && e.NewValue is { } value && (int)value != _form.Get(count)) + { + _form.SetNumber(number, (int)value); + } + }; + _refreshers.Add(() => + { + if (!box.IsKeyboardFocusWithin) + { + box.Value = _form.Get(count); + } + }); + return box; + } + + case ChoiceField choice when field.Binding is SettingBinding named: + { + var combo = new ComboBox { ItemsSource = choice.Choices, SelectedItem = _form.Get(named), MinWidth = 180 }; + combo.SelectionChanged += (_, _) => + { + if (!_syncing && combo.SelectedItem is string value && value != _form.Get(named)) + { + _form.Set(named, value); + } + }; + _refreshers.Add(() => combo.SelectedItem = _form.Get(named)); + return combo; + } + + case ColourField colour when field.Binding is SettingBinding named: + { + var swatches = colour.Names.Select(Swatch).ToList(); + var combo = new ComboBox { ItemsSource = swatches, MinWidth = 180 }; + void Pick() => combo.SelectedItem = swatches.FirstOrDefault(c => Equals(c.Tag, _form.Get(named))); + Pick(); + combo.SelectionChanged += (_, _) => + { + if (!_syncing && combo.SelectedItem is Control { Tag: string value } && value != _form.Get(named)) + { + _form.Set(named, value); + } + }; + _refreshers.Add(Pick); + return combo; + } + + case TextField text when field.Binding is SettingBinding optional: + { + var box = new TextBox { Text = _form.Get(optional) ?? string.Empty, Width = 260 }; + if (text.Masked) + { + box.PasswordChar = '•'; + } + + if (text.MaxLength is { } max) + { + box.MaxLength = max; + } + + void Commit() + { + if (!_syncing && (box.Text ?? string.Empty) != (_form.Get(optional) ?? string.Empty)) + { + _form.SetText(text, box.Text); + } + } + + box.LostFocus += (_, _) => Commit(); + box.KeyDown += (_, e) => + { + if (e.Key == Key.Enter) + { + Commit(); + e.Handled = true; + } + }; + _refreshers.Add(() => + { + if (!box.IsKeyboardFocusWithin) + { + box.Text = _form.Get(optional) ?? string.Empty; + } + }); + return box; + } + + default: + return new TextBlock { Text = "set on its own screen", Opacity = 0.7 }; + } + } + + private static StackPanel Swatch(string name) + { + var panel = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 8, Tag = name }; + if (Color.TryParse(name, out var colour)) + { + panel.Children.Add(new Border { Width = 14, Height = 14, CornerRadius = new CornerRadius(3), Background = new SolidColorBrush(colour) }); + } + + panel.Children.Add(new TextBlock { Text = name }); + return panel; + } + + // ── the meter table ────────────────────────────────────────────────────────────────────────── + + private StackPanel MeterTable(ListField field) + { + var outer = new StackPanel { Spacing = 8, Margin = new Thickness(0, 4, 0, 4) }; + + var top = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto") }; + var words = new StackPanel { Spacing = 1 }; + words.Children.Add(new TextBlock { Text = Capitalise(field.Label), FontSize = 14 }); + if (field.Help is { } help) + { + words.Children.Add(new TextBlock { Text = Capitalise(help), FontSize = 12, Opacity = 0.72, TextWrapping = TextWrapping.Wrap }); + } + + top.Children.Add(words); + top.Children.Add(ChangedMark(field, column: 1)); + outer.Children.Add(top); + + var received = _form.Received(); + var paths = received.Select(r => r.Path).ToList(); + var meters = _form.Meters(field); + _meterRows = meters.Count; + + var grid = new Grid { ColumnDefinitions = new ColumnDefinitions("110,*,*,100,Auto"), ColumnSpacing = 8, RowSpacing = 6 }; + MeterGrid = grid; + _controls[field.Id] = grid; + string[] headings = ["Label", "Value path", "Maximum path", "Now"]; + grid.RowDefinitions.Add(new RowDefinition(GridLength.Auto)); + for (var c = 0; c < headings.Length; c++) + { + var heading = new TextBlock { Text = headings[c], FontSize = 12, FontWeight = FontWeight.SemiBold, Opacity = 0.78 }; + Grid.SetColumn(heading, c); + grid.Children.Add(heading); + } + + AutoCompleteBox? lastPath = null; + void Commit() => _form.SetMeters(field, meters); + + for (var i = 0; i < meters.Count; i++) + { + var meter = meters[i]; + var row = i + 1; + grid.RowDefinitions.Add(new RowDefinition(GridLength.Auto)); + + var label = new TextBox { Text = meter.Label, MaxLength = StatusMeter.MaxLabelLength }; + AutomationProperties.SetName(label, $"meter {row} label"); + label.LostFocus += (_, _) => + { + if ((label.Text ?? string.Empty) != meter.Label) + { + meter.Label = label.Text ?? string.Empty; + Commit(); + } + }; + + var value = PathBox(meter.Value, paths, $"meter {row} value path", v => meter.Value = v ?? string.Empty, Commit); + var max = PathBox(meter.Max, paths, $"meter {row} maximum path", v => meter.Max = v, Commit); + value.GotFocus += (_, _) => lastPath = value; + max.GotFocus += (_, _) => lastPath = max; + + var now = new TextBlock { VerticalAlignment = VerticalAlignment.Center, FontWeight = FontWeight.SemiBold }; + _meterNow.Add((meter, now)); + + var remove = new Button { Content = "✕", Padding = new Thickness(9, 3) }; + ToolTip.SetTip(remove, $"Remove {meter.Label}"); + AutomationProperties.SetName(remove, $"Remove meter {meter.Label}"); + var index = i; + remove.Click += (_, _) => + { + meters.RemoveAt(index); + Commit(); + }; + + Control[] cells = [label, value, max, now, remove]; + for (var c = 0; c < cells.Length; c++) + { + Grid.SetRow(cells[c], row); + Grid.SetColumn(cells[c], c); + grid.Children.Add(cells[c]); + } + } + + outer.Children.Add(grid); + + var add = new Button { Content = "+ Meter", HorizontalAlignment = HorizontalAlignment.Left }; + AutomationProperties.SetName(add, "Add a meter"); + add.Click += (_, _) => + { + meters.Add(new StatusMeter { Label = "new" }); + Commit(); + }; + outer.Children.Add(add); + + // What this connection has received, to pick a path from: a click puts it in the path box last used. + var box = new StackPanel { Spacing = 2 }; + box.Children.Add(new TextBlock { Text = "Received on this connection", FontSize = 12, FontWeight = FontWeight.SemiBold, Opacity = 0.78, Margin = new Thickness(0, 2, 0, 2) }); + if (received.Count == 0) + { + box.Children.Add(new TextBlock { Text = "Nothing yet — a meter shows once its value arrives.", FontSize = 12, Opacity = 0.72 }); + } + + foreach (var item in received.Take(40)) + { + var line = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto") }; + line.Children.Add(new TextBlock { Text = item.Path, FontFamily = FontFamily.Parse("monospace"), FontSize = 12 }); + var v = new TextBlock { Text = item.Value, FontSize = 12, Opacity = 0.72, Margin = new Thickness(16, 0, 0, 0) }; + Grid.SetColumn(v, 1); + line.Children.Add(v); + var pick = new Button + { + Content = line, + Background = Brushes.Transparent, + Padding = new Thickness(6, 2), + HorizontalAlignment = HorizontalAlignment.Stretch, + HorizontalContentAlignment = HorizontalAlignment.Stretch, + }; + ToolTip.SetTip(pick, "Use this path in the path box you were last in"); + pick.Click += (_, _) => + { + if (lastPath is { } target) + { + target.Text = item.Path; + target.Focus(); + } + }; + box.Children.Add(pick); + } + + outer.Children.Add(new Border + { + Child = box, + BorderThickness = new Thickness(1), + BorderBrush = new SolidColorBrush(_form.IsDark ? Color.Parse("#46464e") : Color.Parse("#c8c8d0")), + CornerRadius = new CornerRadius(6), + Padding = new Thickness(10, 6, 10, 8), + Margin = new Thickness(0, 4, 0, 0), + }); + + Tick(); + return outer; + } + + private static AutoCompleteBox PathBox(string? text, IReadOnlyList paths, string name, Action set, Action commit) + { + var box = new AutoCompleteBox + { + Text = text ?? string.Empty, + ItemsSource = paths, + FilterMode = AutoCompleteFilterMode.ContainsOrdinal, + MinimumPrefixLength = 0, + HorizontalAlignment = HorizontalAlignment.Stretch, + }; + AutomationProperties.SetName(box, name); + var held = string.IsNullOrWhiteSpace(text) ? null : text; + void Commit() + { + var now = string.IsNullOrWhiteSpace(box.Text) ? null : box.Text.Trim(); + if (!string.Equals(now, held, StringComparison.Ordinal)) + { + held = now; + set(now); + commit(); + } + } + + box.LostFocus += (_, _) => Commit(); + box.KeyDown += (_, e) => + { + if (e.Key == Key.Enter) + { + Commit(); + } + }; + return box; + } + + /// The meters' now column, re-read each second while the window is open. + private void Tick() + { + foreach (var (meter, now) in _meterNow) + { + var text = _form.Now(meter); + now.Text = text ?? "waiting"; + now.Opacity = text is null ? 0.6 : 1; + } + } + + // ── changes landing ────────────────────────────────────────────────────────────────────────── + + /// Raised on the client's thread once a change has landed; the page catches up on this one. + private void OnChanged() => Dispatcher.UIThread.Post(Refresh); + + /// Re-reads every value and indicator on the page. A meter added or removed rebuilds the page, whose rows moved. + internal void Refresh() + { + if (_meterRows >= 0 + && _form.Section(_shown ?? string.Empty)?.Fields.OfType().FirstOrDefault() is { } meters + && _form.Meters(meters).Count != _meterRows) + { + var offset = _scroller.Offset; + BuildPage(); + _scroller.Offset = offset; + return; + } + + _syncing = true; + try + { + foreach (var refresh in _refreshers) + { + refresh(); + } + } + finally + { + _syncing = false; + } + } + + private void OnKey(object? sender, KeyEventArgs e) + { + if (e.Key == Key.Escape) + { + if (Searching) + { + _search.Text = string.Empty; + } + else + { + Close(); + } + + e.Handled = true; + } + else if (e.Key == Key.F && e.KeyModifiers == KeyModifiers.Control) + { + _search.Focus(); + _search.SelectAll(); + e.Handled = true; + } + } + + private static string Capitalise(string text) => + text.Length == 0 ? text : char.ToUpper(text[0], CultureInfo.InvariantCulture) + text[1..]; +} diff --git a/src/SharpMUTerm.Avalonia/SharpMUTerm.Avalonia.csproj b/src/SharpMUTerm.Avalonia/SharpMUTerm.Avalonia.csproj index bb9bcb91..eac0ea6f 100644 --- a/src/SharpMUTerm.Avalonia/SharpMUTerm.Avalonia.csproj +++ b/src/SharpMUTerm.Avalonia/SharpMUTerm.Avalonia.csproj @@ -21,6 +21,7 @@ + diff --git a/src/SharpMUTerm.Avalonia/WindowHost.cs b/src/SharpMUTerm.Avalonia/WindowHost.cs index 72178d12..e973767b 100644 --- a/src/SharpMUTerm.Avalonia/WindowHost.cs +++ b/src/SharpMUTerm.Avalonia/WindowHost.cs @@ -56,5 +56,8 @@ internal static class WindowHost // A live region a screen reader watches; the terminal has none, and --plain is its answer. Announcer = driver.Announcer, ScreenIsSeen = true, + + // F7 and F8 open a native settings window generated from their declarations; the rest stay cell screens. + NativeSettings = driver.Settings, }; } diff --git a/src/SharpMUTerm.Client/Settings/SettingsForm.cs b/src/SharpMUTerm.Client/Settings/SettingsForm.cs new file mode 100644 index 00000000..f6d367ae --- /dev/null +++ b/src/SharpMUTerm.Client/Settings/SettingsForm.cs @@ -0,0 +1,211 @@ +using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Core.Configuration; + +namespace SharpMUTerm.Client.Settings; + +/// A value the focused connection's game data holds, as a path a meter can name and its text now. +/// The path, as a meter names it (Char.Vitals.hp). +/// What it holds now. +public sealed record ReceivedValue(string Path, string Value); + +/// +/// The declared settings as a form a host draws with its own controls: the sections in their order, every value +/// read through its field's , and every change committed through one delegate the +/// client supplies — the same funnel its cell screens commit through, so a change made here is saved, re-syncs the +/// bars and reloads automation exactly as one made on F7 does. Nothing here knows what a control is. +/// +/// Threads. A host may read values on its own thread: a declared value is a scalar, or a list that is only +/// ever replaced wholesale (this form never edits one in place), so a read never meets a half-made change. Every +/// write goes through commit, which the client runs on its own thread, and is raised +/// there once a change has landed. +/// +/// +public sealed class SettingsForm +{ + private readonly AppConfiguration _config; + private readonly Action _commit; + private readonly Action _openScreen; + private readonly Func> _received; + private readonly Func _now; + + /// Every settings section, in order — declared ones and the ones only listed by title. + /// The live configuration the values are read from and written to. + /// Runs a change to the configuration through the client's save funnel. + /// Opens a section's own screen, by id — the way to a section this form cannot draw. + /// The section to show first. + /// Whether the client's theme is a dark one, so the host's controls can follow it. + /// The focused connection's game data as meter paths, or null for none. + /// What a meter reads now (412/500), or null while its value has not arrived. + public SettingsForm( + IReadOnlyList sections, + AppConfiguration config, + Action commit, + Action openScreen, + string initial, + bool isDark, + Func>? received = null, + Func? now = null) + { + ArgumentNullException.ThrowIfNull(sections); + ArgumentNullException.ThrowIfNull(config); + ArgumentNullException.ThrowIfNull(commit); + ArgumentNullException.ThrowIfNull(openScreen); + Sections = sections; + _config = config; + _commit = commit; + _openScreen = openScreen; + Initial = initial; + IsDark = isDark; + _received = received ?? (() => Array.Empty()); + _now = now ?? (_ => null); + } + + /// Every section, in order. + public IReadOnlyList Sections { get; } + + /// The id of the section shown first. + public string Initial { get; } + + /// Whether the client's theme is dark. + public bool IsDark { get; } + + /// Raised on the client's thread after a change made through this form has landed. + public event Action? Changed; + + /// Whether a section declares its fields, and so can be drawn here; the rest open their own screen. + public static bool IsDeclared(SettingsSectionContribution section) + { + ArgumentNullException.ThrowIfNull(section); + return section.Fields.Count > 0; + } + + /// A section by id, or null. + public SettingsSectionContribution? Section(string id) => + Sections.FirstOrDefault(s => string.Equals(s.Id, id, StringComparison.Ordinal)); + + /// The value of now. + public T Get(SettingBinding binding) + { + ArgumentNullException.ThrowIfNull(binding); + return binding.Get(_config); + } + + /// Whether holds its default — what decides its changed dot and its reset. + public bool IsDefault(SettingsField field) + { + ArgumentNullException.ThrowIfNull(field); + return field.Binding?.IsDefault(_config) ?? true; + } + + /// The default of as text, for a reset button's tooltip. + public static string DefaultText(SettingsField field) + { + ArgumentNullException.ThrowIfNull(field); + return field.Binding?.DefaultText ?? string.Empty; + } + + /// + /// Writes through the save funnel. Numbers and texts go through + /// and , which hold them to the rules the cell screen's field applies first, so neither + /// surface can store what the other would refuse. + /// + public void Set(SettingBinding binding, T value) + { + ArgumentNullException.ThrowIfNull(binding); + _commit(() => binding.Set(_config, value)); + } + + /// Writes a number, held to 's bounds. + public void SetNumber(NumberField field, int value) + { + ArgumentNullException.ThrowIfNull(field); + if (field.Binding is SettingBinding binding) + { + Set(binding, Math.Clamp(value, field.Minimum, field.Maximum)); + } + } + + /// Writes a text; empty is stored as no value, the cell screen's optional-field rule. + public void SetText(TextField field, string? value) + { + ArgumentNullException.ThrowIfNull(field); + if (field.Binding is not SettingBinding binding) + { + return; + } + + var text = string.IsNullOrWhiteSpace(value) ? null : value.Trim(); + if (text is not null && field.MaxLength is { } max && text.Length > max) + { + text = text[..max]; + } + + Set(binding, text); + } + + /// Puts back to its default, through the funnel, as the cell screen's r does. + public void Reset(SettingsField field) + { + ArgumentNullException.ThrowIfNull(field); + if (field.Binding is { } binding) + { + _commit(() => binding.Reset(_config)); + } + } + + /// The meters now — a copy, so a host can edit it and hand it back to . + public List Meters(ListField field) + { + ArgumentNullException.ThrowIfNull(field); + return field.Binding is SettingBinding> binding + ? binding.Get(_config).Select(Copy).ToList() + : new List(); + } + + /// + /// Replaces the meters with (copied, labels clipped, empty maximum paths dropped), as + /// one change through the funnel. The list in the configuration is replaced, never edited in place. + /// + public void SetMeters(ListField field, IEnumerable meters) + { + ArgumentNullException.ThrowIfNull(field); + ArgumentNullException.ThrowIfNull(meters); + if (field.Binding is not SettingBinding> binding) + { + return; + } + + var list = meters.Select(m => new StatusMeter + { + Label = StatusMeter.Clip(m.Label.Trim()), + Value = m.Value.Trim(), + Max = string.IsNullOrWhiteSpace(m.Max) ? null : m.Max.Trim(), + }).ToList(); + Set(binding, list); + } + + /// The focused connection's game data as paths a meter can name, sorted by path. + public IReadOnlyList Received() => _received(); + + /// What reads now, or null while its value has not arrived. + public string? Now(StatusMeter meter) + { + ArgumentNullException.ThrowIfNull(meter); + return _now(meter); + } + + /// The settings search, over these sections: the cell surface's own matching. + public IReadOnlyList Search(string? query) => SettingsSearch.Find(Sections, query); + + /// Opens a section's own screen, by id. + public void OpenScreen(string sectionId) + { + ArgumentNullException.ThrowIfNull(sectionId); + _openScreen(sectionId); + } + + /// Raises ; the client calls it once a committed change has landed. + public void NotifyChanged() => Changed?.Invoke(); + + private static StatusMeter Copy(StatusMeter m) => new() { Label = m.Label, Value = m.Value, Max = m.Max }; +} diff --git a/src/SharpMUTerm.Tui/Hosting/ClientHost.cs b/src/SharpMUTerm.Tui/Hosting/ClientHost.cs index be14b3b5..1e8b37bb 100644 --- a/src/SharpMUTerm.Tui/Hosting/ClientHost.cs +++ b/src/SharpMUTerm.Tui/Hosting/ClientHost.cs @@ -91,6 +91,13 @@ internal sealed record ClientHost /// public required bool ScreenIsSeen { get; init; } + /// + /// Draws the declared settings sections (F7, F8) with the host's own controls, or null for a host whose settings + /// are the cell screens. Only a section that declares its fields goes here; the others keep their cell screen. + /// Null in the terminal, the snapshot, the tests and the parity harness, so every cell frame is unchanged. + /// + public required INativeSettings? NativeSettings { get; init; } + /// /// Whether the terminal driver's input path can decode a focus report. Not on Windows: the Windows branch of /// NetConsoleDriver is a Console.ReadKey loop with its own reassembly, and an ESC [ I @@ -128,6 +135,7 @@ public static ClientHost Terminal(TerminalCapabilities capabilities) Presence = () => new DiscordIpc(), Announcer = null, ScreenIsSeen = true, + NativeSettings = null, }; /// @@ -150,6 +158,7 @@ public static ClientHost Terminal(TerminalCapabilities capabilities) Presence = null, Announcer = null, ScreenIsSeen = true, + NativeSettings = null, }; /// diff --git a/src/SharpMUTerm.Tui/Hosting/INativeSettings.cs b/src/SharpMUTerm.Tui/Hosting/INativeSettings.cs new file mode 100644 index 00000000..7973e23e --- /dev/null +++ b/src/SharpMUTerm.Tui/Hosting/INativeSettings.cs @@ -0,0 +1,20 @@ +using SharpMUTerm.Client.Settings; + +namespace SharpMUTerm.Tui; + +/// +/// A host that draws the declared settings with its own controls (the desktop window's settings window) instead of +/// the cell screens. The client hands it a ; everything the form changes is committed +/// back through the client's own save funnel, so the host only draws. +/// +internal interface INativeSettings +{ + /// + /// Shows , or brings an open settings window forward on its + /// section. Called on the client's thread; the host marshals to its own. + /// + void Show(SettingsForm form); + + /// Closes the settings window if it is open. Called on the client's thread. + void Close(); +} diff --git a/src/SharpMUTerm.Tui/OptionsScreenRenderer.cs b/src/SharpMUTerm.Tui/OptionsScreenRenderer.cs index 38a21cae..e283de3e 100644 --- a/src/SharpMUTerm.Tui/OptionsScreenRenderer.cs +++ b/src/SharpMUTerm.Tui/OptionsScreenRenderer.cs @@ -645,16 +645,21 @@ private static string MeterRow(StatusMeter meter, GameDataStore? data, ScreenFie } /// The now column: 412/500, 412 with no maximum, or . - internal static string Now(StatusMeter meter, GameDataStore? data) + internal static string Now(StatusMeter meter, GameDataStore? data) => + NowText(meter, data) is { } text + ? $"[bold {ScreenPalette.Value}]{Escape(text)}[/]" + : $"[{Muted}]{Waiting}[/]"; + + /// The now column as plain text, or null while the meter's value has not arrived. + internal static string? NowText(StatusMeter meter, GameDataStore? data) { if (data is null || StatusMeter.Read(data, meter.Value) is not { } value) { - return $"[{Muted}]{Waiting}[/]"; + return null; } var max = string.IsNullOrWhiteSpace(meter.Max) ? null : StatusMeter.Read(data, meter.Max); - var text = StatusMeter.Fit(value, 5) + (max is null ? string.Empty : "/" + StatusMeter.Fit(max, 5)); - return $"[bold {ScreenPalette.Value}]{Escape(text)}[/]"; + return StatusMeter.Fit(value, 5) + (max is null ? string.Empty : "/" + StatusMeter.Fit(max, 5)); } /// diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Settings.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Settings.cs index 945d294f..73ff3a99 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Settings.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Settings.cs @@ -1,6 +1,8 @@ using SharpMUTerm.Client.Contributions; using SharpMUTerm.Client.Settings; +using SharpMUTerm.Core.Configuration; using SharpMUTerm.Core.Protocols; +using SharpMUTerm.Core.Text; namespace SharpMUTerm.Tui; @@ -55,6 +57,12 @@ private bool GoToSetting(SettingsMatch match) return true; } + // A declared section is the host's own settings window where the host has one. + if (TryOpenNativeSettings(match.Section)) + { + return true; + } + if (!Enum.TryParse(match.Section.Key, out var key) || SettingsScreens().FirstOrDefault(s => s.Key == key) is not { Open: not null } screen) { @@ -79,6 +87,86 @@ private bool GoToSetting(SettingsMatch match) _ => null, }; + /// + /// Opens the settings screen on : the host's own settings window when the host has one and + /// the screen's section declares its fields, otherwise the cell screen, toggled as it always was. Every way in — + /// the F-key, ⌃P's SETTINGS entries — comes through here, so a window host's F7 never shows the cell overlay. + /// + private void OpenSettingsScreen(ConsoleKey key, Func open) + { + var name = key.ToString(); + var section = _contributions.SettingsSections.Ordered + .FirstOrDefault(s => string.Equals(s.Key, name, StringComparison.Ordinal)); + if (!TryOpenNativeSettings(section)) + { + _settings.Toggle(key, open); + } + } + + /// + /// Shows in the host's settings window, closing any cell screen first; false when the + /// host has none (the terminal, the snapshot, the tests) or the section declares no fields, which keep their + /// cell screens. + /// + private bool TryOpenNativeSettings(SettingsSectionContribution? section) + { + if (Host.NativeSettings is not { } native || section is null || !SettingsForm.IsDeclared(section)) + { + return false; + } + + _settings.CloseAll(); + native.Show(NativeSettingsForm(section.Id)); + return true; + } + + /// + /// The declared settings as a form a host draws natively, opening on . Every change it + /// makes goes through a over — the cell screens' own + /// funnel — on this thread, so it is saved and reaches the bars and live sessions exactly as an F7 edit does. The + /// meter table reads the game data of the window focused when the form opened (), + /// captured here because the store is thread-safe and the focus is not. + /// + internal SettingsForm NativeSettingsForm(string initial) + { + var edits = new ScreenEdits(SaveConfiguration); + var data = SettingsGameData(); + SettingsForm? form = null; + form = new SettingsForm( + _contributions.SettingsSections.Ordered, + _config, + change => OnUiThread(() => + { + edits.Apply(change); + form?.NotifyChanged(); + }), + id => OnUiThread(() => OpenSectionScreen(id)), + initial, + ThemeIsDark(), + () => OptionsScreenRenderer.ReceivedPaths(data).Select(r => new ReceivedValue(r.Path, r.Value)).ToList(), + meter => OptionsScreenRenderer.NowText(meter, data)); + return form; + } + + /// + /// The settings window's way to a section it cannot draw: close the window and open that section's own screen. + /// + private void OpenSectionScreen(string id) + { + Host.NativeSettings?.Close(); + if (_contributions.SettingsSections.Find(id) is { } section) + { + GoToSetting(new SettingsMatch(section, null, section.Title, -1, 0)); + } + } + + /// Whether the client's theme is a dark one: its default background is darker than mid-grey. + private bool ThemeIsDark() + { + var bg = _theme.Resolve(TerminalColor.Default, isBackground: true); + return (0.2126 * bg.R) + (0.7152 * bg.G) + (0.0722 * bg.B) < 128; + } + /// Whether the settings search is up, for a test. internal bool SettingsSearchIsOpen => _settings.IsSearching; diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index d2d6cf54..2581d78d 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -6878,7 +6878,7 @@ private void RegisterFocusReportTab() { if (!ComposerIsInTheWay("a settings screen")) { - _settings.Toggle(key, open); + OpenSettingsScreen(key, open); } return true; @@ -8376,7 +8376,7 @@ private bool RunBuiltInCommand(string id) var view = id[ScreenCommandPrefix.Length..]; if (SettingsScreens().FirstOrDefault(s => s.Views[0] == view) is { Open: not null } screen) { - _settings.Toggle(screen.Key, screen.Open); + OpenSettingsScreen(screen.Key, screen.Open); return true; } diff --git a/tests/SharpMUTerm.Avalonia.Tests/HostParityTests.cs b/tests/SharpMUTerm.Avalonia.Tests/HostParityTests.cs index 5cc3b447..d8639ebb 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/HostParityTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/HostParityTests.cs @@ -46,7 +46,7 @@ public async Task EveryViewDrawsTheSameCellsInTheWindowAsInTheTerminal(string na using var driver = new AvaloniaConsoleDriver(Width, Height); await using (var window = new SharpMUTermApp( DemoScene.Build(), - WindowHost.Create(driver, clipboard: null) with { Capabilities = Caps, Keys = HostKeys.Terminal, Audio = null, Presence = null, Announcer = null, RunsInline = true })) + WindowHost.Create(driver, clipboard: null) with { Capabilities = Caps, Keys = HostKeys.Terminal, Audio = null, Presence = null, Announcer = null, NativeSettings = null, RunsInline = true })) { window.RenderSnapshot(view); } @@ -83,7 +83,7 @@ public async Task EveryViewDrawsTheSameCellsWhenTheWindowsLoopIsRunning(string n using var driver = new AvaloniaConsoleDriver(Width, Height); await using var window = new SharpMUTermApp( DemoScene.Build(), - WindowHost.Create(driver, clipboard: null) with { Capabilities = Caps, Keys = HostKeys.Terminal, Audio = null, Presence = null, Announcer = null }); + WindowHost.Create(driver, clipboard: null) with { Capabilities = Caps, Keys = HostKeys.Terminal, Audio = null, Presence = null, Announcer = null, NativeSettings = null }); window.OnUiThread(() => _ = window.RenderSnapshot(view)); var loop = new Thread(() => window.Run([])) { IsBackground = true }; loop.Start(); diff --git a/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowTests.cs b/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowTests.cs new file mode 100644 index 00000000..d37b677a --- /dev/null +++ b/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowTests.cs @@ -0,0 +1,218 @@ +using Avalonia.Controls; +using Avalonia.Headless; +using Avalonia.Interactivity; +using Avalonia.Threading; +using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Client.Settings; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Avalonia.Tests; + +/// +/// The desktop's settings window (), generated from the declared sections: one native +/// control per field, every edit committed through the form (and so the client's funnel), reset back to the default, +/// the search narrowing the page and counting matches per section, and the meter table's live now column. +/// +public class SettingsWindowTests +{ + private sealed class Harness + { + public AppConfiguration Config { get; } = new(); + + public int Commits { get; set; } + + public List Opened { get; } = []; + + public SettingsForm Form(string initial = "text") + { + SettingsForm? form = null; + form = new SettingsForm( + BuiltInSettings.All, + Config, + change => + { + change(); + Commits++; + form!.NotifyChanged(); + }, + Opened.Add, + initial, + isDark: true, + () => [new ReceivedValue("Char.Vitals.hp", "412"), new ReceivedValue("Char.Vitals.maxhp", "500")], + meter => meter.Value == "Char.Vitals.hp" ? "412/500" : null); + return form; + } + } + + [Test] + public async Task TheWindowBuildsOneControlPerDeclaredField() + { + var (ids, controls) = await Run(new Harness(), "text", window => + (window.ShownFields.ToArray(), window.FieldControls.ToDictionary(c => c.Key, c => c.Value.GetType()))); + + var declared = BuiltInSettings.Text.Fields.Select(f => f.Id).ToArray(); + await Assert.That(ids).IsEquivalentTo(declared); + await Assert.That(controls.Keys).IsEquivalentTo(declared); + await Assert.That(controls["legible"]).IsEqualTo(typeof(ToggleSwitch)); + await Assert.That(controls["tab-width"]).IsEqualTo(typeof(NumericUpDown)); + await Assert.That(controls[BuiltInSettings.MetersField]).IsEqualTo(typeof(Grid)); + } + + [Test] + public async Task AnEditCommitsThroughTheFormAndResetPutsTheDefaultBack() + { + var harness = new Harness(); + var fresh = new AppConfiguration().Text.KeepTextLegible; + var (afterEdit, resetShown, afterReset, resetHidden) = await Run(harness, "text", window => + { + var toggle = (ToggleSwitch)window.FieldControls["legible"]; + toggle.IsChecked = !fresh; + Dispatcher.UIThread.RunJobs(); + var edited = harness.Config.Text.KeepTextLegible; + var shown = window.ResetButtons["legible"].IsVisible; + + window.ResetButtons["legible"].RaiseEvent(new RoutedEventArgs(Button.ClickEvent)); + Dispatcher.UIThread.RunJobs(); + return (edited, shown, harness.Config.Text.KeepTextLegible, !window.ResetButtons["legible"].IsVisible && toggle.IsChecked == fresh); + }); + + await Assert.That(afterEdit).IsEqualTo(!fresh); + await Assert.That(resetShown).IsTrue().Because("a changed field carries its reset"); + await Assert.That(afterReset).IsEqualTo(fresh); + await Assert.That(resetHidden).IsTrue().Because("the toggle shows the default again and the reset goes"); + await Assert.That(harness.Commits).IsEqualTo(2); + } + + [Test] + public async Task ANumberIsCommittedWithinItsBounds() + { + var harness = new Harness(); + var wanted = new AppConfiguration().Input.Rows + 1; + await Run(harness, "input", window => + { + ((NumericUpDown)window.FieldControls["rows"]).Value = 999; + Dispatcher.UIThread.RunJobs(); + ((NumericUpDown)window.FieldControls["rows"]).Value = wanted; + Dispatcher.UIThread.RunJobs(); + return 0; + }); + + await Assert.That(harness.Config.Input.Rows).IsEqualTo(wanted); + await Assert.That(harness.Commits).IsEqualTo(2).Because("999 was clipped to the maximum and committed, then the value"); + } + + [Test] + public async Task TheSearchNarrowsThePageAndCountsEachSection() + { + var (fields, badges, section) = await Run(new Harness(), "input", window => + { + window.SearchBox.Text = "volume"; + Dispatcher.UIThread.RunJobs(); + return (window.ShownFields.ToArray(), window.SectionBadges, window.ShownSection); + }); + + var expected = SettingsSearch.Find(BuiltInSettings.All, "volume"); + await Assert.That(section).IsEqualTo("text").Because("the section on show had nothing matching, so the first that has is shown"); + await Assert.That(fields).IsEquivalentTo(expected.Where(m => m.Section.Id == "text").Select(m => m.Field!.Id).ToArray()); + await Assert.That(badges["text"]).IsEqualTo(expected.Count(m => m.Section.Id == "text").ToString(System.Globalization.CultureInfo.InvariantCulture)); + await Assert.That(badges["input"]).IsEqualTo("0"); + } + + [Test] + public async Task TheMeterTableHasARowPerMeterAndReadsNow() + { + var harness = new Harness(); + harness.Config.Text.StatusMeters = [new StatusMeter { Label = "hp", Value = "Char.Vitals.hp", Max = "Char.Vitals.maxhp" }]; + var (rows, now, rowsAfterAdd) = await Run(harness, "text", window => + { + var grid = window.MeterGrid!; + var rows = grid.RowDefinitions.Count; + var now = grid.Children.OfType().Where(t => Grid.GetRow(t) == 1 && Grid.GetColumn(t) == 3).Select(t => t.Text).Single(); + + var add = window.GetVisualDescendantsOf - private static string WorldTarget(RailWorld world) + public static string TargetFor(RailWorld world) { if (world.Characters.Count == 0) { diff --git a/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs b/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs index 82ecd577..6390f6ff 100644 --- a/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs +++ b/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs @@ -139,6 +139,14 @@ void Panels(IReadOnlyList panels) void HeaderActions(IReadOnlyList actions) { } + + /// + /// The header band and the connection sidebar, as data, whenever either moves or what it says changes. The cells + /// stay what they are; a host that draws no native chrome ignores this (the default). + /// + void Chrome(ChromeOverlay chrome) + { + } } /// diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Chrome.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Chrome.cs new file mode 100644 index 00000000..6bb0ac92 --- /dev/null +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Chrome.cs @@ -0,0 +1,177 @@ +using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Core.Workspaces; + +namespace SharpMUTerm.Tui; + +/// +/// The header band and the connection sidebar as data, for a host that draws them natively over their cells (the +/// window). Both are the view-models the cell header and the cell rail are drawn from (, +/// ), so a native view cannot say anything the cells do not. +/// +/// A click comes back as a target the client itself put in the model, and goes where the same click on the +/// cells goes: a rail target to , the rail's own handler, and the header's palette +/// target to the command surface the ribbon's ☰ opens. Never through , the output +/// panes' handler, and never a command the host spelt: a target that is not in the overlay the client last published +/// is refused. +/// +/// +internal sealed partial class SharpMUTermApp +{ + private ChromeOverlay? _chromeOverlay; + + private Action? _chromeActivate; + + /// + /// Tells the host where the header and the rail are and what they say, when any of it changed. Rides the frame, + /// for ' reason, and the main window's activation, because another window opening over + /// this one (⌃P, a settings screen, the quit prompt) repaints that window and not this one. + /// + private void PublishChrome() + { + if (_pointer is null) + { + return; + } + + var overlay = BuildChromeOverlay(); + if (overlay == _chromeOverlay) + { + return; + } + + _chromeOverlay = overlay; + _pointer.Chrome(overlay); + } + + /// The chrome as it stands. Internal for tests. + internal ChromeOverlay BuildChromeOverlay() + { + _chromeActivate ??= target => OnUiThread(() => ActivateChromeTarget(target)); + var header = BuildHeaderModel(); + var brand = FillHex(AccentPalette[2]); + var palette = new ChromePalette( + brand, + header.World is { } world ? FillHex(world.Accent) : null, + _ink.Accent, + _ink.Draft, + UnreadBadge.TintFor(_ink)); + + // Shown only while the main window is the one in front. Every other window here — the command surface, the + // settings screens, the composer, the quit prompt — is drawn in cells over this one, and a native view over + // the header or the rail would paint over it. + return new ChromeOverlay( + MainWindowInFront(), + CellRectOf(_header), + header, + RailCellRect(), + BuildSidebar(), + palette, + _chromeActivate); + } + + /// + /// Whether no other window of the client's is in front of the main one. Asked of the window system rather than of + /// the window's own active flag, which a window that has never been activated (a headless harness, the first + /// frame) reports false with nothing over it. + /// + private bool MainWindowInFront() => + _system.ActiveWindow is not { } front || ReferenceEquals(front, _window); + + /// + /// The sidebar's rectangle: its whole column, top to bottom, which is what the rail's cells (and the plane under + /// them) occupy — the rail control itself is only as tall as its rows. The control's own when there is no column yet. + /// + private PaneRect RailCellRect() + { + var rows = CellRectOf(_rail); + var column = _railColumn is null ? default : CellRectOf(_railColumn); + return column.Width > 0 && column.Height >= rows.Height ? column : rows; + } + + /// A control's arranged rectangle in desktop cells, or empty while it has none. + private PaneRect CellRectOf(SharpConsoleUI.Controls.IWindowControl control) + { + if (_window.GetLayoutNode(control) is not { } node) + { + return default; + } + + var origin = ContentOrigin(); + var bounds = node.AbsoluteBounds; + return new PaneRect(origin.X + bounds.X, origin.Y + bounds.Y, bounds.Width, bounds.Height); + } + + /// + /// A click on a native header or sidebar, by the target the client put in the model. Internal so a test can drive + /// it the way a host does; returns whether the target was one the client offered and was acted on. + /// + internal bool ActivateChromeTarget(string target) + { + var offered = _chromeOverlay ?? BuildChromeOverlay(); + if (!offered.Offers(target)) + { + RefuseCommand($"the header and sidebar never offered {Snippet(target)}"); + return false; + } + + if (target == HeaderModel.PaletteTarget) + { + // Opens, rather than the ☰'s toggle: a search box is clicked to start typing in it, never to close it. + if (!_palette.IsOpen) + { + ToggleMenu(); + } + + return true; + } + + if (target == SidebarModel.AddGameTarget) + { + return DispatchCommand(target); + } + + return DispatchRailTarget(target); + } + + /// What the host was last told about the header and the rail. Internal for tests. + internal ChromeOverlay? ChromeOverlayPublished => _chromeOverlay; +} + +/// +/// The header band and the connection sidebar, for a host that draws them natively over their cells. The cells are +/// drawn as in any host, so a host that draws nothing loses nothing, and the parity test, which compares cells, is +/// unaffected. +/// +/// Whether the main window is in front; while another window is, nothing native may be drawn. +/// The header row's rectangle, in desktop cells. +/// What the header says. +/// The rail's rectangle, in desktop cells: the sidebar column, top to bottom. +/// What the rail says. +/// The client's own colours for the active theme. +/// +/// Acts on a target from or ; safe to call from any thread. The same +/// instance for the life of the app, so an overlay compares equal from frame to frame. +/// +internal sealed record ChromeOverlay( + bool Shown, + PaneRect Header, + HeaderModel HeaderModel, + PaneRect Rail, + SidebarModel Sidebar, + ChromePalette Palette, + Action Activate) +{ + /// Whether is one this overlay offered a click on. + public bool Offers(string target) => + target == HeaderModel.PaletteTarget + || target == HeaderModel.Character?.Target + || Sidebar.Targets().Contains(target, StringComparer.Ordinal); +} + +/// +/// The chrome's own colours as #rrggbb: the brand fill of the ribbon's first segment, the world's fill (or +/// null with no world), the client's accent, the draft pen, and the unread badge. Planes are not here: a host reads +/// those off the frame's cells, so a native view sits on what the cells under it wear. +/// +internal sealed record ChromePalette(string Brand, string? WorldFill, string Accent, string Draft, string Unread); diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index d2d6cf54..bd4a7254 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -1,5 +1,6 @@ using System.Text; using Microsoft.Extensions.Logging; +using SharpMUTerm.Client.Chrome; using SharpMUTerm.Client.Palette; using SharpMUTerm.Core.Commands; using SharpMUTerm.Core.Automation; @@ -1002,6 +1003,7 @@ public SharpMUTermApp( DrawSixelOverlay(buffer); PublishScrollbars(); PublishPanels(); + PublishChrome(); SyncMapSizes(); SyncPanelSizes(); SyncScrollSplitBars(); @@ -1014,6 +1016,10 @@ public SharpMUTermApp( _window.Deactivated += (_, _) => _sixel.Invalidate(); } + // The native chrome stands down while another window is in front, and that window repaints, not this one. + _window.Activated += (_, _) => PublishChrome(); + _window.Deactivated += (_, _) => PublishChrome(); + // Pane drag-and-drop listens at the driver, not at a control: SharpConsoleUI delivers mouse // frames to the control that was pressed (it captures on Button1Pressed), so a control-level // handler would only ever see the *source* pane. The driver stream carries every frame in @@ -7800,7 +7806,14 @@ private static string Ink(string inkHex, string fillHex) => /// character — the workspace's windows with their unread/unsent detail and their own chords. /// Ranking/markup stays in the tested Core/renderer. /// - private IReadOnlyList BuildRail() + private IReadOnlyList BuildRail() => BuildSidebar().Rows(); + + /// + /// The sidebar as a view-model (): the tree 's rows are projected + /// from, plus the window in front and whether the rail is collapsed. The cell rail and the window's native sidebar + /// are both drawn from this, so it is the one place either learns what the sidebar says. + /// + internal SidebarModel BuildSidebar() { var activeKey = ActiveCharacterKey(); @@ -7845,7 +7858,7 @@ private IReadOnlyList BuildRail() index++; } - return RailModel.Build(worlds); + return new SidebarModel(worlds, ActiveWindowId(), _railCollapsed); } /// @@ -13263,11 +13276,56 @@ private void UpdateStatus() /// The design header row: the brand affordance on the left, the active world (with its accent) /// in the middle, and connection/graphics/palette hints on the right. /// - private string HeaderMarkup() + private string HeaderMarkup() => HeaderMarkup(BuildHeaderModel()); + + /// + /// The header as a view-model (): what the band says, with no presentation. The cell + /// header and the window's native header are both drawn from this. + /// + internal HeaderModel BuildHeaderModel() + { + HeaderWorld? world = null; + HeaderCharacter? character = null; + if (ActiveWorld() is { } active) + { + world = new HeaderWorld(active.World.Name, active.Accent); + if (active.Character is { } name) + { + var key = $"{active.World.Name}.{name}"; + character = new HeaderCharacter( + name, + key, + // The rail's dot and this one are one answer: ConnectedCharacters is what the dot and the fraction + // read, and a session's own state adds only "being dialled". + ConnectedCharacters().Contains(key) + ? CharacterPresence.Online + : PresenceOf.State(_sessions.Find(key)?.State) == CharacterPresence.Connecting + ? CharacterPresence.Connecting + : CharacterPresence.Offline, + active.World.Host, + active.World.Port, + active.World.UseTls, + CommandIds.Character(key)); + } + } + + return new HeaderModel( + _palette is { IsOpen: true }, + world, + character, + ConnectedCharacters().Count, + ConfiguredConnections(), + _config.Worlds.Count > 0, + HeaderLogFormat(), + _prefixArmed); + } + + /// The header row's markup, drawn from and nothing else it could disagree with. + private string HeaderMarkup(HeaderModel model) { // The menu affordance opens the command surface (caret flips to ▾ while it's open). The whole // identity cluster is a powerline ribbon — menu ▸ world ▸ character — flowing accent colours. - var caret = _palette is { IsOpen: true } ? "▾" : Glyphs.Menu; + var caret = model.MenuOpen ? "▾" : Glyphs.Menu; var dark = Hex(_theme.Resolve(TerminalColor.Default, isBackground: true)); var headerBg = Hex(_theme.StatusBackground); // The dim chrome the character segment sits on. Derived rather than the literal #3f4859 it was: @@ -13284,16 +13342,16 @@ private string HeaderMarkup() // legible is the text *on* it, so each segment's ink is measured against the fill it lands on. var brandBg = FillHex(AccentPalette[2]); // violet var sb = new System.Text.StringBuilder(); - sb.Append($"[link={MenuScheme}toggle][bold {Ink(dark, brandBg)} on {brandBg}] {caret} muterm [/][/]"); + sb.Append($"[link={HeaderModel.PaletteTarget}][bold {Ink(dark, brandBg)} on {brandBg}] {caret} muterm [/][/]"); var tail = brandBg; - if (ActiveWorld() is { } active) + if (model.World is { } active) { var worldAccent = FillHex(active.Accent); sb.Append($"[{tail} on {worldAccent}]{Glyphs.PowerRight}[/]"); - sb.Append($"[bold {Ink(dark, worldAccent)} on {worldAccent}] {Escape(active.World.Name)} [/]"); + sb.Append($"[bold {Ink(dark, worldAccent)} on {worldAccent}] {Escape(active.Name)} [/]"); tail = worldAccent; - if (active.Character is { } name) + if (model.Character?.Name is { } name) { sb.Append($"[{tail} on {chip}]{Glyphs.PowerRight}[/]"); @@ -13314,7 +13372,7 @@ private string HeaderMarkup() // cannot drift. It is picked to fit the room the identity ribbon leaves, because the header is one // row and an overlong one *wraps*, which costs a row of workspace; the widest spelling ran the // eighty-column layout to within four cells of the edge before anything was added to it. - if (_prefixArmed) + if (model.PrefixArmed) { var room = HeaderWidth() - MarkupWidth(leftBar) - 2; return $"{leftBar} {PrefixPanel.Strip(room, _ink)}"; @@ -13329,14 +13387,10 @@ private string HeaderMarkup() // graphics readout, which took the 80-column layout to precisely 80 cells; dropping that (see // below) gave the width back. InputAreaLayoutTests.TheFirstFrameFitsTheTerminalItIsOn(80) is the // test that says so, and anything added here has to keep it passing. - var connected = ConnectedCharacters().Count; - var conn = _config.Worlds.Count > 0 - ? $"{connected}/{ConfiguredConnections()} characters " - : string.Empty; - var logFormat = HeaderLogFormat(); - var log = logFormat == LogFormat.None - ? $"[dim]{Glyphs.Log} LOG off[/]" - : $"[{_ink.Accent}]{Glyphs.Log}[/] [dim]LOG {logFormat.ToString().ToLowerInvariant()}[/]"; + var conn = model.HasWorlds ? $"{model.ConnectedText} " : string.Empty; + var log = model.Log == LogFormat.None + ? $"[dim]{Glyphs.Log} {model.LogText}[/]" + : $"[{_ink.Accent}]{Glyphs.Log}[/] [dim]{model.LogText}[/]"; // No graphics readout here. Which protocol the probe settled on is decided once at startup and // never changes, so a permanent cell of chrome spends the row's scarcest resource on a fact that // cannot become news — and it was already said twice elsewhere: the session prints diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativeChromeTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativeChromeTests.cs new file mode 100644 index 00000000..cd5eaedd --- /dev/null +++ b/tests/SharpMUTerm.Avalonia.Tests/NativeChromeTests.cs @@ -0,0 +1,231 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Headless; +using Avalonia.Input; +using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Text; +using SharpMUTerm.Core.Workspaces; +using SharpMUTerm.Tui; +using SkiaSharp; +using Window = Avalonia.Controls.Window; + +namespace SharpMUTerm.Avalonia.Tests; + +/// +/// The window's native header and sidebar (, ): drawn exactly +/// over the cells the client says hold the header and the rail, from the models those cells are drawn from; a click +/// is handed back as the model's own target and never reaches the client as a press on a cell; empty header space +/// still moves the window; and no pane moves. +/// +public class NativeChromeTests +{ + private static readonly SKColor Back = new(0x10, 0x20, 0x30); + + private static readonly TerminalColor Teal = TerminalColor.FromRgb(0x00, 0xf5, 0xb7); + + private static SidebarModel Sidebar(bool collapsed = false) => new( + [ + new RailWorld("Aetherfall", "aether.example", 4000, Teal, + [ + new RailCharacter("Corvid", "Aetherfall.Corvid", Connected: true, Active: true, Unread: 3, + [ + new RailWindow("main", "session:1", "⌥1", 0, true, false), + new RailWindow("Chat", "spawn:2", "⌥2", 3, false, false), + ]), + new RailCharacter("Wren", "Aetherfall.Wren", Connected: false, Active: false, Unread: 0, [], Chord: "⌥J"), + ]), + ], + "session:1", + collapsed); + + private static HeaderModel Header(bool prefix = false) => new( + false, + new HeaderWorld("Aetherfall", Teal), + new HeaderCharacter("Corvid", "Aetherfall.Corvid", CharacterPresence.Online, "aether.example", 4000, true, CommandIds.Character("Aetherfall.Corvid")), + 1, 2, true, LogFormat.None, prefix); + + private static ChromeOverlay Overlay(Action activate, bool shown = true, bool collapsed = false, bool prefix = false) => new( + shown, + new PaneRect(0, 0, 100, 1), + Header(prefix), + new PaneRect(0, 1, 22, 28), + Sidebar(collapsed), + new ChromePalette("#9d7cff", "#00f5b7", "#00f5b7", "#ffd700", "#00f5b7"), + activate); + + [Test] + public async Task TheHeaderAndTheSidebarCoverExactlyTheCellsTheClientNamed() + { + var (header, sidebar, cell) = await Run((window, view, layer, driver) => + { + ((IPointerPresenter)driver.Pointer).Chrome(Overlay(_ => { })); + Drain(); + window.UpdateLayout(); + return (Bounds(layer.Header, window), Bounds(layer.Sidebar, window), view.CellExtent); + }); + + await Assert.That(header).IsEqualTo(new Rect(0, 0, 100 * cell.Width, cell.Height)); + await Assert.That(sidebar).IsEqualTo(new Rect(0, cell.Height, 22 * cell.Width, 28 * cell.Height)); + } + + [Test] + public async Task NothingNativeIsDrawnUnderAnotherWindowOverACollapsedRailOrOverTheArmedPrefix() + { + var states = await Run((window, view, layer, driver) => + { + var seen = new List<(bool Header, bool Sidebar)>(); + foreach (var overlay in new[] + { + Overlay(_ => { }), Overlay(_ => { }, shown: false), Overlay(_ => { }, collapsed: true), Overlay(_ => { }, prefix: true), + }) + { + ((IPointerPresenter)driver.Pointer).Chrome(overlay); + Drain(); + seen.Add((layer.Header.IsVisible, layer.Sidebar.IsVisible)); + } + + return seen; + }); + + await Assert.That(states[0]).IsEqualTo((true, true)); + await Assert.That(states[1]).IsEqualTo((false, false)); + await Assert.That(states[2]).IsEqualTo((true, false)); + await Assert.That(states[3]).IsEqualTo((false, true)); + } + + [Test] + public async Task AClickOnTheSidebarOrTheHeaderHandsBackTheModelsTargetAndNeverReachesTheClient() + { + var (activated, clientSaw, rows, focused) = await Run((window, view, layer, driver) => + { + var activated = new List(); + ((IPointerPresenter)driver.Pointer).Chrome(Overlay(activated.Add)); + Drain(); + window.UpdateLayout(); + var clientSaw = new List>(); + driver.MouseEvent += (_, flags, _) => clientSaw.Add(flags); + + void Click(Control on, Rect area) + { + var centre = on.TranslatePoint(area.Center, window)!.Value; + window.MouseMove(centre); + window.MouseDown(centre, MouseButton.Left); + window.MouseUp(centre, MouseButton.Left); + Drain(); + } + + var chat = layer.Sidebar.Rows.Single(r => r.Window?.Id == "spawn:2"); + Click(layer.Sidebar, chat.Area); + var wren = layer.Sidebar.Rows.Single(r => r.Character?.Name == "Wren"); + Click(layer.Sidebar, wren.Area); + Click(layer.Sidebar, layer.Sidebar.Hits.Single(h => h.Target == SidebarModel.AddGameTarget).Area); + Click(layer.Header, layer.Header.Hits.Last(h => h.Target == HeaderModel.PaletteTarget).Area); + Click(layer.Header, layer.Header.Hits.Single(h => h.Target.StartsWith(CommandIds.CharacterPrefix, StringComparison.Ordinal)).Area); + window.MouseWheel(window.Bounds.Center.WithX(10), new Vector(0, 1)); + Drain(); + return (activated, clientSaw, layer.Sidebar.Rows.Select(r => r.Kind).ToArray(), view.IsFocused); + }, columns: 100, rows: 30); + + await Assert.That(activated).IsEquivalentTo(new[] + { + CommandIds.Window("spawn:2"), CommandIds.Character("Aetherfall.Wren"), SidebarModel.AddGameTarget, + HeaderModel.PaletteTarget, CommandIds.Character("Aetherfall.Corvid"), + }); + await Assert.That(clientSaw.Count).IsEqualTo(0).Because("every press, release and wheel over native chrome is the window's"); + await Assert.That(focused).IsTrue().Because("the keyboard stays with the client"); + await Assert.That(rows).IsEquivalentTo(new[] { RailRowKind.World, RailRowKind.Character, RailRowKind.Window, RailRowKind.Window, RailRowKind.Character }); + } + + [Test] + public async Task APressOnEmptyHeaderSpaceMovesTheWindowAndNeverReachesTheClient() + { + var (gestures, clientSaw, activated) = await Run((window, view, layer, driver) => + { + var activated = new List(); + ((IPointerPresenter)driver.Pointer).Chrome(Overlay(activated.Add)); + Drain(); + window.UpdateLayout(); + var clientSaw = new List>(); + driver.MouseEvent += (_, flags, _) => clientSaw.Add(flags); + + // Between the brand and the search box: a gap the header leaves on purpose. + var brand = layer.Header.Hits[0].Area; + var gap = layer.Header.TranslatePoint(new Point(brand.Right + 8, layer.Header.Bounds.Height / 2), window)!.Value; + window.MouseDown(gap, MouseButton.Left); + window.MouseUp(gap, MouseButton.Left); + Drain(); + return (view.WindowGestures, clientSaw, activated); + }, columns: 100, rows: 30); + + await Assert.That(gestures).IsEqualTo(1); + await Assert.That(clientSaw.Count).IsEqualTo(0); + await Assert.That(activated.Count).IsEqualTo(0); + } + + [Test] + public async Task TheLiveClientPublishesItsOwnRectanglesAndNoPaneMovesAgainstTheTerminal() + { + using var headless = new HeadlessConsoleDriver(120, 32); + await using var terminal = new SharpMUTermApp(DemoScene.Build(), ClientHost.Headless(headless, WindowOptions.Capabilities)); + terminal.RenderSnapshot("connections"); + + using var driver = new AvaloniaConsoleDriver(120, 32); + await using var window = new SharpMUTermApp(DemoScene.Build(), WindowHost.Create(driver, clipboard: null) with + { + Capabilities = WindowOptions.Capabilities, + Audio = null, + Presence = null, + Announcer = null, + RunsInline = true, + }); + window.RenderSnapshot("connections"); + window.RenderNextFrame(); + + var chrome = driver.Pointer.Chrome; + await Assert.That(chrome).IsNotNull(); + await Assert.That(chrome!.Header).IsEqualTo(new PaneRect(0, 0, 120, 1)); + await Assert.That(chrome.Rail.Width).IsEqualTo(window.RailColumnWidth); + await Assert.That(chrome.Sidebar).IsEqualTo(window.BuildSidebar()); + await Assert.That(window.PaneOutputRects().OrderBy(r => r.Key).ToArray()) + .IsEquivalentTo(terminal.PaneOutputRects().OrderBy(r => r.Key).ToArray()); + } + + private static Rect Bounds(Control control, Window window) => + new(control.TranslatePoint(default, window)!.Value, control.Bounds.Size); + + private static void Drain() => global::Avalonia.Threading.Dispatcher.UIThread.RunJobs(); + + private static Task Run( + Func body, int columns = 100, int rows = 30) => + Session.Dispatch(() => + { + var driver = new AvaloniaConsoleDriver(columns, rows); + var view = new TerminalView(driver, SKColors.White, Back, 16, null); + var layer = new DesktopLayer(view); + var root = new Panel(); + root.Children.Add(view); + root.Children.Add(layer); + var window = new Window { Content = root, WindowDecorations = WindowDecorations.BorderOnly }; + var size = view.SizeFor(columns, rows); + window.Width = size.Width; + window.Height = size.Height; + window.Show(); + view.Focus(); + driver.Flush(); + Drain(); + try + { + return body(window, view, layer, driver); + } + finally + { + window.Close(); + driver.Dispose(); + } + }, CancellationToken.None); + + private static HeadlessUnitTestSession Session => TerminalViewTests.Session; +} diff --git a/tests/SharpMUTerm.Client.Tests/ChromeModelTests.cs b/tests/SharpMUTerm.Client.Tests/ChromeModelTests.cs new file mode 100644 index 00000000..959b38da --- /dev/null +++ b/tests/SharpMUTerm.Client.Tests/ChromeModelTests.cs @@ -0,0 +1,100 @@ +using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Client.Palette; +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Session; +using SharpMUTerm.Core.Text; +using SharpMUTerm.Core.Workspaces; + +namespace SharpMUTerm.Client.Tests; + +/// The header and sidebar view-models, which the cell chrome and the window's native chrome are both drawn from. +public class ChromeModelTests +{ + private static readonly TerminalColor Teal = TerminalColor.FromRgb(0x00, 0xf5, 0xb7); + + private static IReadOnlyList Tree(int unread = 3, bool unsent = false) => + [ + new RailWorld("Aetherfall", "aether.example", 4000, Teal, + [ + new RailCharacter("Corvid", "Aetherfall.Corvid", Connected: true, Active: true, Unread: unread, + [ + new RailWindow("main", "session:1", "⌥1", 0, unsent, false), + new RailWindow("Chat", "spawn:2", "⌥2", unread, false, false), + ]), + new RailCharacter("Wren", "Aetherfall.Wren", Connected: false, Active: false, Unread: 0, [], Chord: "⌥J"), + ]), + new RailWorld("Empty Shore", "shore.example", 23, Teal, []), + ]; + + [Test] + public async Task TheSidebarsRowsAreCoresRowProjectionOfTheSameTree() + { + var model = new SidebarModel(Tree(), "spawn:2", false); + await Assert.That(model.Rows()).IsEquivalentTo(RailModel.Build(model.Worlds)); + await Assert.That(model.Rows().Count(r => r.Kind == RailRowKind.Window)).IsEqualTo(2); + } + + [Test] + public async Task TwoSidebarsOverTheSameStateAreEqualAndAnyChangeIsNot() + { + await Assert.That(new SidebarModel(Tree(), "spawn:2", false)).IsEqualTo(new SidebarModel(Tree(), "spawn:2", false)); + await Assert.That(new SidebarModel(Tree(), "spawn:2", false).GetHashCode()) + .IsEqualTo(new SidebarModel(Tree(), "spawn:2", false).GetHashCode()); + await Assert.That(new SidebarModel(Tree(unread: 4), "spawn:2", false)).IsNotEqualTo(new SidebarModel(Tree(), "spawn:2", false)); + await Assert.That(new SidebarModel(Tree(unsent: true), "spawn:2", false)).IsNotEqualTo(new SidebarModel(Tree(), "spawn:2", false)); + await Assert.That(new SidebarModel(Tree(), "session:1", false)).IsNotEqualTo(new SidebarModel(Tree(), "spawn:2", false)); + await Assert.That(new SidebarModel(Tree(), "spawn:2", true)).IsNotEqualTo(new SidebarModel(Tree(), "spawn:2", false)); + } + + [Test] + public async Task EveryTargetTheSidebarOffersIsOneTheCellRailCarriesOrTheAddButton() + { + var model = new SidebarModel(Tree(), "spawn:2", false); + var rowTargets = model.Rows().Select(r => r.Target).OfType().ToHashSet(); + foreach (var target in model.Targets().Where(t => t != SidebarModel.AddGameTarget)) + { + await Assert.That(rowTargets).Contains(target).Because(target); + } + + await Assert.That(model.Targets()).Contains(CommandIds.Window("spawn:2")); + await Assert.That(model.Targets()).Contains(CommandIds.Character("Aetherfall.Wren")); + await Assert.That(model.Targets()).Contains(RailModel.NoCharactersTarget("Empty Shore")); + await Assert.That(model.IsSelected(model.Worlds[0].Characters[0].Windows[1])).IsTrue(); + } + + [Test] + public async Task TheHeaderWordsItsCountsAndLogTheWayTheCellRowDoes() + { + var model = new HeaderModel(false, new HeaderWorld("Aetherfall", Teal), + new HeaderCharacter("Corvid", "Aetherfall.Corvid", CharacterPresence.Online, "aether.example", 4000, true, "char:Aetherfall.Corvid"), + 2, 3, true, LogFormat.Html, false); + + await Assert.That(model.ConnectedText).IsEqualTo("2/3 characters"); + await Assert.That(model.LogText).IsEqualTo("LOG html"); + await Assert.That(model.Character!.Detail("Aetherfall")).IsEqualTo("Aetherfall · TLS"); + await Assert.That((model with { Character = model.Character with { Tls = false } }).Character!.Detail("Aetherfall")).IsEqualTo("Aetherfall"); + await Assert.That(HeaderModel.Empty.ConnectedText).IsEqualTo(string.Empty); + await Assert.That(HeaderModel.Empty.LogText).IsEqualTo("LOG off"); + await Assert.That(model).IsEqualTo(model with { }); + } + + [Test] + public async Task PresenceFollowsTheSessionsState() + { + await Assert.That(PresenceOf.State(ConnectionState.Connected)).IsEqualTo(CharacterPresence.Online); + await Assert.That(PresenceOf.State(ConnectionState.Connecting)).IsEqualTo(CharacterPresence.Connecting); + await Assert.That(PresenceOf.State(ConnectionState.Faulted)).IsEqualTo(CharacterPresence.Offline); + await Assert.That(PresenceOf.State(null)).IsEqualTo(CharacterPresence.Offline); + } + + [Test] + public async Task ChordsAreSpeltInWordsForAUiFont() + { + await Assert.That(KeyGlyphs.Words("⌥1")).IsEqualTo("Alt+1"); + await Assert.That(KeyGlyphs.Words("⌃P")).IsEqualTo("Ctrl+P"); + await Assert.That(KeyGlyphs.Words("⌥⇧→")).IsEqualTo("Alt+Shift+→"); + await Assert.That(KeyGlyphs.Words("F4")).IsEqualTo("F4"); + await Assert.That(KeyGlyphs.Normalize(KeyGlyphs.Words("⌥J"))).IsEqualTo("⌥J"); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/NativeChromeModelTests.cs b/tests/SharpMUTerm.Tui.Tests/NativeChromeModelTests.cs new file mode 100644 index 00000000..abce896f --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/NativeChromeModelTests.cs @@ -0,0 +1,171 @@ +using System.Drawing; +using SharpConsoleUI.Drivers; +using SharpConsoleUI.Parsing; +using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Core.Workspaces; +using SharpMUTerm.Graphics; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// The header and the rail as data (, ): the cell chrome is drawn from +/// the same models a host is handed, the host is told where the header and the rail are, and a click it hands back +/// goes where the same click on the cells goes — and nowhere the client did not offer. +/// +/// Serialised: rendering a frame redirects the process-global Console.Out. +[NotInParallel] +public class NativeChromeModelTests +{ + private static readonly TerminalCapabilities Headless = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private sealed class ChromePresenter : IPointerPresenter + { + public List Published { get; } = []; + + public void Hover(PointerTarget target) + { + } + + public void ShowMenu(Point cell, IReadOnlyList items) + { + } + + public bool DrawsMenus => true; + + public void Scrollbars(IReadOnlyList bars) + { + } + + public void Chrome(ChromeOverlay chrome) => Published.Add(chrome); + } + + private static (SharpMUTermApp App, ChromePresenter Pointer) App(string? view = null) + { + Console.SetIn(TextReader.Null); + var pointer = new ChromePresenter(); + var host = ClientHost.ForHarness(Headless, new HeadlessConsoleDriver(120, 32), null, null, _ => { }) with { Pointer = pointer }; + var app = new SharpMUTermApp(DemoScene.Build(), host); + app.RenderSnapshot(view); + app.RenderNextFrame(); + return (app, pointer); + } + + [Test] + public async Task TheCellHeaderSaysWhatTheHeaderModelSays() + { + var (app, _) = App("connections"); + await using var _app = app; + var model = app.BuildHeaderModel(); + await Assert.That(model.World).IsNotNull(); + await Assert.That(model.Character).IsNotNull(); + await Assert.That(app.HeaderText).Contains(model.World!.Name); + await Assert.That(app.HeaderText).Contains(model.Character!.Name); + await Assert.That(app.HeaderText).Contains(model.ConnectedText); + await Assert.That(app.HeaderText).Contains(model.LogText); + await Assert.That(app.HeaderText).Contains($"[link={HeaderModel.PaletteTarget}]"); + } + + [Test] + public async Task TheCellRailCarriesExactlyTheSidebarModelsTargets() + { + var (app, _) = App("characters"); + await using var _app = app; + var sidebar = app.BuildSidebar(); + var rowTargets = sidebar.Rows().Select(r => r.Target).OfType().Distinct().ToArray(); + var linked = string.Join("\n", app.RailLines); + foreach (var target in rowTargets) + { + await Assert.That(linked).Contains(LinkUrl.Escape(target)).Because(target); + } + + await Assert.That(app.RailLines.Count).IsEqualTo(sidebar.Rows().Count); + await Assert.That(sidebar.SelectedWindowId).IsEqualTo(app.ActiveWindowId()); + } + + [Test] + public async Task TheHostIsToldWhereTheHeaderAndTheRailAre() + { + var (app, pointer) = App("characters"); + await using var _app = app; + var chrome = pointer.Published.Last(); + await Assert.That(chrome.Shown).IsTrue(); + await Assert.That(chrome.Header).IsEqualTo(new PaneRect(0, 0, 120, 1)); + await Assert.That(chrome.Rail.X).IsEqualTo(0); + await Assert.That(chrome.Rail.Y).IsEqualTo(1); + await Assert.That(chrome.Rail.Width).IsEqualTo(app.RailColumnWidth); + await Assert.That(chrome.Rail.Height).IsGreaterThan(10); + await Assert.That(chrome.Sidebar).IsEqualTo(app.BuildSidebar()); + await Assert.That(chrome.HeaderModel).IsEqualTo(app.BuildHeaderModel()); + + // Nothing changed, nothing said: a frame that moved nothing does not re-publish. + var count = pointer.Published.Count; + app.RenderNextFrame(); + await Assert.That(pointer.Published.Count).IsEqualTo(count); + } + + [Test] + public async Task TheSearchBoxOpensTheCommandSurfaceAndTheChromeStandsDownUnderIt() + { + var (app, pointer) = App(); + await using var _app = app; + await Assert.That(app.MenuIsOpen).IsFalse(); + pointer.Published.Last().Activate(HeaderModel.PaletteTarget); + await Assert.That(app.MenuIsOpen).IsTrue(); + + // A second click on the box does not close it: a search box is for starting to type. + await Assert.That(app.ActivateChromeTarget(HeaderModel.PaletteTarget)).IsTrue(); + await Assert.That(app.MenuIsOpen).IsTrue(); + + app.RenderNextFrame(); + await Assert.That(pointer.Published.Last().Shown).IsFalse().Because("the command surface is drawn over the cells the chrome would cover"); + } + + [Test] + public async Task ASidebarClickGoesWhereTheRailsOwnClickGoes() + { + var (app, pointer) = App("characters"); + await using var _app = app; + var chrome = pointer.Published.Last(); + var other = chrome.Sidebar.Worlds.SelectMany(w => w.Characters).First(c => !c.Active); + await Assert.That(app.ActivateChromeTarget(SidebarModel.TargetOf(other))).IsTrue(); + await Assert.That(app.BuildSidebar().Worlds.SelectMany(w => w.Characters).Single(c => c.Active).SessionKey) + .IsEqualTo(other.SessionKey); + } + + [Test] + [Arguments("characters")] + [Arguments("layout-roleplay")] + [Arguments(null)] + public async Task TheHeadersPresenceDotAndTheRailsDotAreOneAnswer(string? view) + { + var (app, _) = App(view); + await using var _app = app; + var header = app.BuildHeaderModel().Character!; + var row = app.BuildSidebar().Worlds.SelectMany(w => w.Characters).Single(c => c.SessionKey == header.SessionKey); + await Assert.That(header.Presence == CharacterPresence.Online).IsEqualTo(row.Connected); + } + + [Test] + public async Task TheChromeStandsDownUnderTheQuitPrompt() + { + // The connections scene leaves the quit prompt open over the main window. + var (app, pointer) = App("connections"); + await using var _app = app; + await Assert.That(pointer.Published.Last().Shown).IsFalse(); + } + + [Test] + public async Task ATargetTheChromeNeverOfferedIsRefused() + { + var (app, _) = App("connections"); + await using var _app = app; + var before = app.ActiveWindowId(); + await Assert.That(app.ActivateChromeTarget("mux:send:@shutdown")).IsFalse(); + await Assert.That(app.ActivateChromeTarget(CommandIds.Window("no-such-window"))).IsFalse(); + await Assert.That(app.ActivateChromeTarget("layout:close")).IsFalse(); + await Assert.That(app.ActiveWindowId()).IsEqualTo(before); + } +} From db0040f42e00b4236e8c30cd462ce9aecdafde67 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 05:50:34 +0000 Subject: [PATCH 021/113] Draw who-here and the quick bar natively in the desktop window The window draws a native who-here list (presence dots, idle text, NPCs dimmed, hover plate, full-name tooltip) and native quick-bar buttons (+N overflow menu, F4 edits keys link) over their panes, from new host-neutral WhoHereModel/QuickBarModel in SharpMUTerm.Client that the cell renderers now draw from too. A click is PanelOverlay.Pick(index), read back by the client from what it published and acted on through the cell links' own methods on the panel's character; the window builds no command and never takes keyboard focus. Native panels are withdrawn while a modal is open, so they no longer sit on top of F4 or Ctrl+P. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 5 + CLAUDE.md | 29 +- src/SharpMUTerm.Avalonia/DesktopLayer.cs | 28 +- src/SharpMUTerm.Avalonia/PanelText.cs | 61 +++ src/SharpMUTerm.Avalonia/QuickBarButtons.cs | 382 ++++++++++++++++++ src/SharpMUTerm.Avalonia/WhoHereList.cs | 312 ++++++++++++++ .../Panels/QuickBarModel.cs | 49 +++ src/SharpMUTerm.Client/Panels/WhoHereModel.cs | 87 ++++ .../Panels/QuickBarRenderer.cs | 31 +- src/SharpMUTerm.Tui/Panels/WhoHereRenderer.cs | 60 +-- src/SharpMUTerm.Tui/Pointer/PointerTarget.cs | 19 +- .../Pointer/SharpMUTermApp.Desktop.cs | 48 ++- src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs | 105 +++-- src/SharpMUTerm.Tui/SharpMUTermApp.cs | 8 +- .../DesktopLayerTests.cs | 6 +- .../NativePanelTests.cs | 321 +++++++++++++++ .../TerminalPanelTests.cs | 4 +- 17 files changed, 1454 insertions(+), 101 deletions(-) create mode 100644 src/SharpMUTerm.Avalonia/PanelText.cs create mode 100644 src/SharpMUTerm.Avalonia/QuickBarButtons.cs create mode 100644 src/SharpMUTerm.Avalonia/WhoHereList.cs create mode 100644 src/SharpMUTerm.Client/Panels/QuickBarModel.cs create mode 100644 src/SharpMUTerm.Client/Panels/WhoHereModel.cs create mode 100644 tests/SharpMUTerm.Avalonia.Tests/NativePanelTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 78fb2cbe..6ab27489 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,11 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] them side by side. - Desktop window: the map is drawn as a canvas of rooms and exits. The wheel zooms, a drag pans, a double-click re-centres on you, and a click on a room walks there. Hovering a room shows its name. +- Desktop window: who is here is a native list, with a coloured dot for each player (dim when idle), how long + they have been idle, and creatures dimmed below. Hovering a name lights the row and shows the full name; a click + puts `look` and the name on that character's command line, as in the terminal. The quick bar is a row of + buttons, with the bindings that do not fit under a `+N` menu and *F4 edits keys* as a link. Neither takes the + keyboard away from the command line, and native panels no longer sit on top of a settings screen or ⌃P. - Scrolling a pane back splits it: the history you are reading stays on top, a band says how far back you are (`scrolled back 120 rows · End returns · ⌥F freezes`), and the newest lines keep arriving underneath. End (with the cursor at the end of the command line), Ctrl+End, or scrolling the history back down to its end diff --git a/CLAUDE.md b/CLAUDE.md index ec9bfcb2..e3968dd2 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -993,9 +993,10 @@ fallbacks) for inline images/maps. - Screenshots of the window's cues come from a real window under Xvfb, driven with XTest; `--render-png` has no pointer and cannot show them. - **The window draws native views over the cells, and the cells stay** (`DesktopLayer`, `HeaderButton`, - `VitalsGauges`, `MapCanvas`, `NativeMenu` in Avalonia; `SharpMUTermApp.Desktop.cs`; Client `VitalsModel`, - `MapViewModel`, `LayoutCommands`). First slice of the desktop app: a Layouts button in the header, native vitals - gauges and a native map. Decisions not to relitigate: + `VitalsGauges`, `MapCanvas`, `WhoHereList`, `QuickBarButtons`, `NativeMenu` in Avalonia; `SharpMUTermApp.Desktop.cs`; + Client `VitalsModel`, `MapViewModel`, `WhoHereModel`, `QuickBarModel`, `LayoutCommands`). A Layouts button in the + header, native vitals gauges, a native map, a native who-here list and native quick-bar buttons. Decisions not + to relitigate: - **An overlay, never a cell.** The layer is a `Canvas` above `TerminalView` in the window's root panel; the client paints every cell exactly as in a terminal underneath, so no pane rectangle moves (NAWS), the parity test (which compares cells) does not see it, and a host that draws nothing native loses nothing. A native @@ -1004,18 +1005,26 @@ fallbacks) for inline images/maps. - **The channel is `IPointerPresenter`**, the one the scrollbars ride, with two default-implemented members (`Panels`, `HeaderActions`) so the terminal and the test presenters need no change. `PublishPanels` runs on `PostBufferPaint` and publishes only on change; a panel is on screen when its window is a realised pane's - front tab. The map's model is rebuilt only when `RenderMap` has run since (`_mapRevisions`), and its walk + front tab **and no modal is open**. A settings screen, ⌃P or F1 is drawn in cells over the panes and a native + view would sit on top of it; a modal covering the whole window leaves the main window unpainted, so + `ModalStateService.StateChanged` publishes too (`TheEditLinkDispatchesTheF4ScreenAndNoNativePanelCoversIt`). The map's model is rebuilt only when `RenderMap` has run since (`_mapRevisions`), and its walk callback is one instance per window so an overlay compares equal frame to frame. - **Data is a view-model both hosts draw.** `ReadVitals` builds the `VitalsModel` that `VitalsStripRenderer` draws as cells and the gauges draw natively; `VitalsModel.LowShare` is the one low threshold (`StatusMeterRenderer.LowShare` reads it). `MapViewModel.From` is the current room's area and level, nearest - first, at most 1,500 rooms, names bounded. + first, at most 1,500 rooms, names bounded. `ReadWhoHere` builds the `WhoHereModel` and `QuickBarEntries` the + `QuickBarModel` that `WhoHereRenderer`/`QuickBarRenderer` draw as cells; row or item N is the same person or + binding in both, and the empty/unknown sentences and the `F4 edits keys` hint live on the models. - **The window never builds a command.** The Layouts menu is `LayoutsMenuItems()`, built on the client's thread (`HeaderAction.Menu`), each entry a registry dispatch: `layout:lib:apply:`, `…save`, `…save-new`, `…use-world`, `…use-character` (a `CommandFamily` that lists nothing on ⌃P — ⌥M is the keyboard's list), plus `layout:layouts` for *Manage layouts…*. Those ids run the ⌥M list's own methods, which now return a `LayoutActionResult` the list shows as its status and a command shows as a notice. A map click is - `PanelOverlay.WalkTo` → `WalkFromMap`, the method a cell map's `mux:map:` link ends in. + `PanelOverlay.WalkTo` → `WalkFromMap`, the method a cell map's `mux:map:` link ends in. A who-here or quick-bar + click is `PanelOverlay.Pick(index)`: the client reads row N back from the overlay it *published* for that + window (out of range is nothing) and runs `OfferLook` / `RunQuickMacro`, the cell links' own methods, on the + window's own character. `F4 edits keys` is `PanelOverlay.Dispatch(QuickBarModel.EditCommand)` + (`screen:keypad`). One pick callback per window (`_panelPickers`), for the map walker's reason. - **Input, by view.** The header button is the window's alone: press, release, wheel and movement stop at it, a right press included, and nothing reaches the client (`ThePressOnTheLayoutsButtonNeverReachesTheClient…`). It never takes focus. It sits over the header's last three cells, which the header always leaves blank @@ -1023,12 +1032,16 @@ fallbacks) for inline images/maps. The vitals gauges are `IsHitTestVisible = false`: every pointer event goes to the cells, so focus, the pane's menu and selection are the terminal's. The map takes the pointer (wheel zooms about the pointer, drag pans from the character's room, double-click re-centres, click walks) and hands a right click on to - the client as a right click on the cell (`TerminalView.ForwardRightClick`). + the client as a right click on the cell (`TerminalView.ForwardRightClick`). The who-here list and the quick bar + take the pointer the same way (hover plate, tooltip, left click is a pick, right click forwarded, wheel + swallowed) and are `Focusable = false`, as the map is: the keyboard stays on the client's command line. The + quick bar lays out the cells' rule in pixels — the link first, then bindings in order, `+N` for the rest, whose + `NativeMenu` entries pick by the same index. Every binding is drawn alike; only a key that does not fire is dim. - **Gauges choose their arrangement from the pane's height alone**: stacked blocks when every meter and the target fit as name-over-bar, else side by side, where the words shrink (`Mana · low 23 / 120`, then `mp! 23/120`, then `mp 23`) before a bar goes under 24 px. The UI font, not the cell font: this is the window's presentation. `hp`/`mp`/`mv` read as Health/Mana/Movement (`VitalsMeter.Title`). - - **Not done**: who-here, the quick bar and the composer are still cells in the window; no animation on a + - **Not done**: the docked composer is still cells in the window; no animation on a gauge change; the map draws one level and area, no exits between levels and no room colours/symbols; the button's icon is the only header action. The window's menu is Avalonia's `ContextMenu`, which needs a second click under a WM-less X server to take the first item (seen under Xvfb only). diff --git a/src/SharpMUTerm.Avalonia/DesktopLayer.cs b/src/SharpMUTerm.Avalonia/DesktopLayer.cs index c5821a3c..e19b916f 100644 --- a/src/SharpMUTerm.Avalonia/DesktopLayer.cs +++ b/src/SharpMUTerm.Avalonia/DesktopLayer.cs @@ -23,8 +23,10 @@ namespace SharpMUTerm.Avalonia; /// movement and wheel stop at it and never reach the client, which is what lets it sit over cells the client /// would otherwise read as a press on the header. The vitals gauges are a picture of their pane and take no input: /// a press, a drag, a right-click or the wheel over them reaches the client as a press on the pane's cells, so -/// focus, the pane's menu and selection behave as they do in a terminal. The map is used with the pointer, so it -/// takes it (: zoom, pan, click to walk) and hands only a right click on to the client. +/// focus, the pane's menu and selection behave as they do in a terminal. The map, the who-here list and the quick +/// bar are used with the pointer, so they take it (: zoom, pan, click to walk; +/// : click a name; : click a binding) and hand only a right +/// click on to the client. None of them takes keyboard focus. /// /// internal sealed class DesktopLayer : Canvas @@ -37,6 +39,8 @@ internal sealed class DesktopLayer : Canvas private readonly Dictionary _buttons = new(StringComparer.Ordinal); private readonly Dictionary _gauges = new(StringComparer.Ordinal); private readonly Dictionary _maps = new(StringComparer.Ordinal); + private readonly Dictionary _whoHere = new(StringComparer.Ordinal); + private readonly Dictionary _quickBars = new(StringComparer.Ordinal); public DesktopLayer(TerminalView view) { @@ -64,6 +68,12 @@ protected override void OnSizeChanged(SizeChangedEventArgs e) /// The native maps by window id. Internal for tests. internal IReadOnlyDictionary Maps => _maps; + /// The native who-here lists by window id. Internal for tests. + internal IReadOnlyDictionary WhoHere => _whoHere; + + /// The native quick bars by window id. Internal for tests. + internal IReadOnlyDictionary QuickBars => _quickBars; + /// The last header menu opened. Internal for tests. internal ContextMenu? OpenedMenu { get; private set; } @@ -141,6 +151,20 @@ private void SyncPanels(ScreenFrame frame, Size cell) frame, cell, (map, panel, plane) => map.Show(panel.Map!, panel.Ink, plane, text, panel.WalkTo)); + Place( + _whoHere, + _pointer.Panels.Where(p => p.PanelId == PanelIds.WhoHere && p.WhoHere is not null), + () => new WhoHereList(_view), + frame, + cell, + (list, panel, plane) => list.Show(panel.WhoHere!, panel.Ink, plane, text, cell.Height, panel.Pick)); + Place( + _quickBars, + _pointer.Panels.Where(p => p.PanelId == PanelIds.QuickBar && p.QuickBar is not null), + () => new QuickBarButtons(_view), + frame, + cell, + (bar, panel, plane) => bar.Show(panel.QuickBar!, panel.Ink, plane, text, cell.Height, panel.Pick, panel.Dispatch)); } /// diff --git a/src/SharpMUTerm.Avalonia/PanelText.cs b/src/SharpMUTerm.Avalonia/PanelText.cs new file mode 100644 index 00000000..47b9e705 --- /dev/null +++ b/src/SharpMUTerm.Avalonia/PanelText.cs @@ -0,0 +1,61 @@ +using System.Globalization; +using Avalonia; +using Avalonia.Media; + +namespace SharpMUTerm.Avalonia; + +/// +/// Text and colour for the native list panels (, ): one line of +/// the window's UI font, trimmed with an ellipsis, measured and drawn the same way, so the two panels read as one +/// family with the vitals gauges. +/// +internal static class PanelText +{ + /// One line of text, trimmed to with an ellipsis. + public static FormattedText Format(string text, double size, Color colour, bool bold, double maxWidth = double.PositiveInfinity) + { + var formatted = new FormattedText( + text, + CultureInfo.InvariantCulture, + FlowDirection.LeftToRight, + new Typeface(FontFamily.Default, FontStyle.Normal, bold ? FontWeight.SemiBold : FontWeight.Normal), + size, + new SolidColorBrush(colour)) + { + MaxLineCount = 1, + Trimming = TextTrimming.CharacterEllipsis, + }; + if (!double.IsInfinity(maxWidth)) + { + formatted.MaxTextWidth = Math.Max(1, maxWidth); + } + + return formatted; + } + + /// How wide a line is drawn, untrimmed. + public static double Measure(string text, double size, bool bold) => Format(text, size, Colors.White, bold).Width; + + /// + /// Draws a line with its left edge at (its right edge there when ), + /// centred on , and returns the width it took. + /// + public static double Draw(DrawingContext context, string text, double x, double middle, double size, Color colour, bool bold, double maxWidth, bool alignRight = false) + { + if (maxWidth < 2 || text.Length == 0) + { + return 0; + } + + var formatted = Format(text, size, colour, bold, maxWidth); + var width = Math.Min(formatted.Width, maxWidth); + context.DrawText(formatted, new Point(alignRight ? x - width : x, middle - (formatted.Height / 2))); + return width; + } + + /// The ink at an alpha: the dim and hover shades are the text colour, never a theme's grey. + public static Color Alpha(Color colour, byte alpha) => Color.FromArgb(alpha, colour.R, colour.G, colour.B); + + /// A #rrggbb from the client, or grey when it is not one. + public static Color Parse(string hex) => Color.TryParse(hex, out var colour) ? colour : Colors.Gray; +} diff --git a/src/SharpMUTerm.Avalonia/QuickBarButtons.cs b/src/SharpMUTerm.Avalonia/QuickBarButtons.cs new file mode 100644 index 00000000..de494bcb --- /dev/null +++ b/src/SharpMUTerm.Avalonia/QuickBarButtons.cs @@ -0,0 +1,382 @@ +using System.Globalization; +using Avalonia; +using Avalonia.Controls; +using Avalonia.Controls.Primitives; +using Avalonia.Input; +using Avalonia.Media; +using SharpMUTerm.Client.Panels; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Avalonia; + +/// +/// The quick bar as native buttons, over the pane whose cells draw the same : one button +/// per binding (its key in the accent, then its name), a +N button holding the bindings that do not fit, and +/// F4 edits keys as a link at the right. Every button is drawn alike — the model marks no binding as special, +/// so neither does the window — except that a key this host cannot deliver is drawn dim, as the cells draw it. +/// +/// It takes the pointer, as the map does, and never the keyboard. A click on a binding is +/// with its index: the client runs that binding on the panel's own character through +/// the path the key takes. The +N menu's entries do the same. The link dispatches +/// through . The window never builds a +/// command. A right click is handed on to the client as a right click on the cell under it. +/// +/// +internal sealed class QuickBarButtons : Control +{ + /// What a laid-out slot does when clicked. + internal enum SlotKind + { + /// Runs the binding at . + Item, + + /// Opens the menu of bindings that did not fit. + More, + + /// Opens F4. + Edit, + } + + /// One slot of the bar, in this control's coordinates. + internal readonly record struct Slot(SlotKind Kind, int Index, Rect Rect); + + /// The widest a binding's name is drawn before it is trimmed. + internal const double MaxTitleWidth = 150; + + private const double Gap = 6, PadX = 8; + + private readonly TerminalView _view; + private readonly List _slots = []; + private QuickBarModel _model = QuickBarModel.Empty; + private PanelInk _ink = new("#5fafff", "#ff5f5f", "#3a3a40"); + private Color _plane = Colors.Black; + private Color _text = Colors.White; + private double _cellHeight = 16; + private Action? _pick; + private Action? _dispatch; + private Size _laidOutFor; + private QuickBarModel? _laidOutModel; + private Slot? _hovered; + private Slot? _pressed; + + public QuickBarButtons(TerminalView view) + { + _view = view; + ClipToBounds = true; + Focusable = false; + } + + /// What it is showing. Internal for tests. + internal QuickBarModel Model => _model; + + /// The slots laid out for the current size. Internal for tests. + internal IReadOnlyList Slots + { + get + { + Layout(new Size(Bounds.Width > 0 ? Bounds.Width : Width, Bounds.Height > 0 ? Bounds.Height : Height)); + return _slots; + } + } + + /// The indexes the +N button holds. Internal for tests. + internal IReadOnlyList Overflowed + { + get + { + var shown = Slots.Where(s => s.Kind == SlotKind.Item).Select(s => s.Index).ToHashSet(); + return Enumerable.Range(0, _model.Items.Count).Where(i => !shown.Contains(i)).ToList(); + } + } + + /// The last +N menu opened. Internal for tests. + internal ContextMenu? OpenedMenu { get; private set; } + + public void Show(QuickBarModel model, PanelInk ink, Color plane, Color text, double cellHeight, Action? pick, Action? dispatch) + { + _pick = pick; + _dispatch = dispatch; + if (model.Equals(_model) && ink == _ink && plane == _plane && text == _text && Math.Abs(cellHeight - _cellHeight) < 0.01) + { + return; + } + + _model = model; + _ink = ink; + _plane = plane; + _text = text; + _cellHeight = cellHeight; + _laidOutModel = null; + Hover(null); + InvalidateVisual(); + } + + private double FontSize => Math.Clamp(_cellHeight * 0.62, 9, 13); + + private static string Trim(QuickBarItem item) => item.Title; + + private double ItemWidth(QuickBarItem item) + { + var size = FontSize; + var title = Math.Min(MaxTitleWidth, PanelText.Measure(Trim(item), size, false)); + return PadX + PanelText.Measure(item.Key, size, true) + 5 + title + PadX; + } + + private double MoreWidth(int hidden) => PadX + PanelText.Measure($"+{hidden.ToString(CultureInfo.InvariantCulture)}", FontSize, true) + PadX; + + private double EditWidth => PanelText.Measure(QuickBarModel.EditHint, FontSize, false) + (PadX * 2); + + /// + /// The cells' rule, in pixels: the link first, then as many bindings as fit in order, with +N for the + /// rest; without room for the link, the bindings alone. + /// + private void Layout(Size size) + { + if (size == _laidOutFor && ReferenceEquals(_laidOutModel, _model)) + { + return; + } + + _laidOutFor = size; + _laidOutModel = _model; + _slots.Clear(); + if (size.Width < 8 || size.Height < 4) + { + return; + } + + var height = Math.Max(4, size.Height - 4); + var top = (size.Height - height) / 2; + var items = _model.Items; + var widths = items.Select(ItemWidth).ToList(); + foreach (var withEdit in new[] { true, false }) + { + var room = size.Width - (Gap * 2) - (withEdit ? EditWidth + Gap : 0); + for (var take = items.Count; take >= 0 && room >= 0; take--) + { + var hidden = items.Count - take; + var used = widths.Take(take).Sum() + (Gap * Math.Max(0, take - 1)) + + (hidden > 0 ? (take > 0 ? Gap : 0) + MoreWidth(hidden) : 0); + if (used > room) + { + continue; + } + + var x = Gap; + for (var i = 0; i < take; i++) + { + _slots.Add(new Slot(SlotKind.Item, i, new Rect(x, top, widths[i], height))); + x += widths[i] + Gap; + } + + if (hidden > 0) + { + _slots.Add(new Slot(SlotKind.More, hidden, new Rect(x, top, MoreWidth(hidden), height))); + } + + if (withEdit) + { + _slots.Add(new Slot(SlotKind.Edit, -1, new Rect(size.Width - Gap - EditWidth, top, EditWidth, height))); + } + + return; + } + } + } + + private Slot? SlotAt(Point point) + { + Layout(Bounds.Size); + foreach (var slot in _slots) + { + if (slot.Rect.Contains(point)) + { + return slot; + } + } + + return null; + } + + private void Hover(Slot? slot) + { + if (slot == _hovered) + { + return; + } + + _hovered = slot; + Cursor = slot is null ? Cursor.Default : new Cursor(StandardCursorType.Hand); + ToolTip.SetIsOpen(this, false); + ToolTip.SetTip(this, slot is { } s ? Tip(s) : null); + InvalidateVisual(); + } + + private string? Tip(Slot slot) => slot.Kind switch + { + SlotKind.Item when slot.Index < _model.Items.Count => $"{_model.Items[slot.Index].Title} ({_model.Items[slot.Index].Key})", + SlotKind.More => $"{slot.Index.ToString(CultureInfo.InvariantCulture)} more", + SlotKind.Edit => "Edit the keys (F4)", + _ => null, + }; + + // ── Input: the bar's own, never routed on to the cells (bar the right click) ───────────────── + + protected override void OnPointerMoved(PointerEventArgs e) + { + base.OnPointerMoved(e); + e.Handled = true; + Hover(SlotAt(e.GetPosition(this))); + } + + protected override void OnPointerExited(PointerEventArgs e) + { + base.OnPointerExited(e); + Hover(null); + } + + protected override void OnPointerPressed(PointerPressedEventArgs e) + { + base.OnPointerPressed(e); + e.Handled = true; + var point = e.GetCurrentPoint(this); + if (point.Properties.IsRightButtonPressed) + { + _view.ForwardRightClick(e.GetPosition(_view), e.KeyModifiers); + return; + } + + _pressed = point.Properties.IsLeftButtonPressed ? SlotAt(point.Position) : null; + InvalidateVisual(); + } + + protected override void OnPointerReleased(PointerReleasedEventArgs e) + { + base.OnPointerReleased(e); + e.Handled = true; + var pressed = _pressed; + _pressed = null; + InvalidateVisual(); + if (e.InitialPressMouseButton == MouseButton.Left && pressed is { } slot && SlotAt(e.GetPosition(this)) == slot) + { + Activate(slot); + } + } + + protected override void OnPointerWheelChanged(PointerWheelEventArgs e) + { + base.OnPointerWheelChanged(e); + e.Handled = true; + } + + /// Clicks a slot as a left press and release over it would. Internal for tests. + internal void PerformClick(Slot slot) => Activate(slot); + + private void Activate(Slot slot) + { + switch (slot.Kind) + { + case SlotKind.Item: + _pick?.Invoke(slot.Index); + break; + case SlotKind.Edit: + _dispatch?.Invoke(QuickBarModel.EditCommand); + break; + case SlotKind.More: + OpenMore(slot); + break; + } + } + + /// The bindings that did not fit, as a native menu over the +N button; each entry is a pick. + private void OpenMore(Slot slot) + { + var pick = _pick; + var items = Overflowed + .Select(i => new PointerMenuItem(_model.Items[i].Title, _model.Items[i].Key, () => pick?.Invoke(i))) + .ToList(); + if (items.Count == 0) + { + return; + } + + var menu = NativeMenu.Build(items, PlacementMode.TopEdgeAlignedRight, this); + menu.PlacementRect = slot.Rect; + menu.Closed += (_, _) => _view.Focus(); + OpenedMenu = menu; + menu.Open(this); + } + + // ── Drawing ────────────────────────────────────────────────────────────────────────────────── + + public override void Render(DrawingContext context) + { + var bounds = new Rect(Bounds.Size); + context.FillRectangle(new SolidColorBrush(_plane), bounds); + Layout(bounds.Size); + var size = FontSize; + var accent = PanelText.Parse(_ink.Bar); + var dim = PanelText.Alpha(_text, 0xA0); + var middle = bounds.Height / 2; + + if (_model.Items.Count == 0) + { + var editLeft = _slots.FirstOrDefault(s => s.Kind == SlotKind.Edit).Rect.Left; + PanelText.Draw(context, QuickBarModel.EmptyText, Gap + 2, middle, size, dim, false, (editLeft > 0 ? editLeft : bounds.Width) - Gap - 8); + } + + foreach (var slot in _slots) + { + var hot = slot == _hovered; + var down = slot == _pressed; + var rect = slot.Rect; + switch (slot.Kind) + { + case SlotKind.Item: + { + var item = _model.Items[slot.Index]; + Plate(context, rect, hot, down); + var keyInk = item.Fires ? accent : dim; + var titleInk = item.Fires ? _text : dim; + var x = rect.Left + PadX; + x += PanelText.Draw(context, item.Key, x, middle, size, keyInk, true, rect.Width) + 5; + PanelText.Draw(context, Trim(item), x, middle, size, titleInk, false, rect.Right - PadX - x + 0.5); + break; + } + + case SlotKind.More: + Plate(context, rect, hot, down); + PanelText.Draw(context, $"+{slot.Index.ToString(CultureInfo.InvariantCulture)}", rect.Left + PadX, middle, size, _text, true, rect.Width); + break; + + case SlotKind.Edit: + { + // A link, not a button: the accent key, the words in the dim ink, underlined under the pointer. + var x = rect.Left + PadX; + var keyWidth = PanelText.Draw(context, QuickBarModel.EditKey, x, middle, size, accent, true, rect.Width); + var rest = QuickBarModel.EditHint[QuickBarModel.EditKey.Length..]; + var restWidth = PanelText.Draw(context, rest, x + keyWidth, middle, size, hot ? _text : dim, false, rect.Right - x - keyWidth); + if (hot) + { + var y = Math.Round(middle + (size * 0.62)) + 0.5; + context.DrawLine(new Pen(new SolidColorBrush(PanelText.Alpha(_text, 0xC0)), 1), new Point(x, y), new Point(x + keyWidth + restWidth, y)); + } + + break; + } + } + } + } + + /// A button's plate: the text colour at a low alpha, stronger under the pointer and while pressed. + private void Plate(DrawingContext context, Rect rect, bool hot, bool down) + { + var alpha = (byte)(down ? 0x48 : hot ? 0x30 : 0x18); + context.DrawRectangle( + new SolidColorBrush(PanelText.Alpha(_text, alpha)), + new Pen(new SolidColorBrush(PanelText.Alpha(_text, 0x26)), 1), + rect.Deflate(0.5), + 4, + 4); + } +} diff --git a/src/SharpMUTerm.Avalonia/WhoHereList.cs b/src/SharpMUTerm.Avalonia/WhoHereList.cs new file mode 100644 index 00000000..bc910ebe --- /dev/null +++ b/src/SharpMUTerm.Avalonia/WhoHereList.cs @@ -0,0 +1,312 @@ +using System.Globalization; +using Avalonia; +using Avalonia.Controls; +using Avalonia.Input; +using Avalonia.Media; +using SharpMUTerm.Client.Panels; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Avalonia; + +/// +/// The who-here panel as a native list, over the pane whose cells draw the same : the room +/// under HERE, then a row per person — a presence dot in the accent (dim when idle), the name, how long they +/// have been idle — with creatures dimmed under the players. A row lights under the pointer and its tooltip is the +/// full name. +/// +/// It takes the pointer, as the map does. A left click on a row is with the +/// row's index — the client puts look and the name on the panel's own character's command line, the action a +/// click on the cells takes; the window never builds the line. A right click is handed on to the client as a right +/// click on the cell under it (), so the pane's menu is the same here as +/// over cells. It never takes keyboard focus. +/// +/// +internal sealed class WhoHereList : Control +{ + private readonly TerminalView _view; + private readonly List<(int Index, Rect Rect)> _rows = []; + private WhoHereModel _model = WhoHereModel.Unknown; + private PanelInk _ink = new("#5fafff", "#ff5f5f", "#3a3a40"); + private Color _plane = Colors.Black; + private Color _text = Colors.White; + private double _cellHeight = 16; + private Action? _pick; + private Size _laidOutFor; + private WhoHereModel? _laidOutModel; + private int? _hovered; + private int? _pressed; + private string? _overflow; + + public WhoHereList(TerminalView view) + { + _view = view; + ClipToBounds = true; + Focusable = false; + } + + /// What it is showing. Internal for tests. + internal WhoHereModel Model => _model; + + /// The rows laid out, by model index, in this control's coordinates. Internal for tests. + internal IReadOnlyList<(int Index, Rect Rect)> Rows + { + get + { + Layout(new Size(Bounds.Width > 0 ? Bounds.Width : Width, Bounds.Height > 0 ? Bounds.Height : Height)); + return _rows; + } + } + + /// The row under the pointer, or null. Internal for tests. + internal int? Hovered => _hovered; + + /// The … and N more line, when the pane is too short for everyone. Internal for tests. + internal string? Overflow + { + get + { + _ = Rows; + return _overflow; + } + } + + public void Show(WhoHereModel model, PanelInk ink, Color plane, Color text, double cellHeight, Action? pick) + { + _pick = pick; + if (model.Equals(_model) && ink == _ink && plane == _plane && text == _text && Math.Abs(cellHeight - _cellHeight) < 0.01) + { + return; + } + + _model = model; + _ink = ink; + _plane = plane; + _text = text; + _cellHeight = cellHeight; + _laidOutModel = null; + if (_hovered >= model.Rows.Count) + { + Hover(null); + } + + InvalidateVisual(); + } + + private double FontSize => Math.Clamp(_cellHeight * 0.7, 10, 15); + + private double HeaderHeight => Math.Max(22, _cellHeight * 1.5); + + private double RowHeight => Math.Max(22, _cellHeight * 1.4); + + private const double Pad = 8; + + /// Which rows fit, and where, for a size. Every row is the same height, so it is arithmetic. + private void Layout(Size size) + { + if (size == _laidOutFor && ReferenceEquals(_laidOutModel, _model)) + { + return; + } + + _laidOutFor = size; + _laidOutModel = _model; + _rows.Clear(); + _overflow = null; + var count = _model.Rows.Count; + if (!_model.Known || count == 0) + { + return; + } + + var top = HeaderHeight + 2; + var room = Math.Max(0, (int)((size.Height - top - 4) / RowHeight)); + var fits = count <= room ? count : Math.Max(0, room - 1); + for (var i = 0; i < fits; i++) + { + _rows.Add((i, new Rect(Pad / 2, top + (i * RowHeight), Math.Max(0, size.Width - Pad), RowHeight))); + } + + if (fits < count) + { + _overflow = $"… and {(count - fits).ToString(CultureInfo.InvariantCulture)} more"; + } + } + + private int? RowAt(Point point) + { + Layout(Bounds.Size); + foreach (var (index, rect) in _rows) + { + if (rect.Contains(point)) + { + return index; + } + } + + return null; + } + + private void Hover(int? index) + { + if (index == _hovered) + { + return; + } + + _hovered = index; + Cursor = index is null ? Cursor.Default : new Cursor(StandardCursorType.Hand); + ToolTip.SetIsOpen(this, false); + ToolTip.SetTip(this, index is { } i && i < _model.Rows.Count ? Tip(_model.Rows[i]) : null); + InvalidateVisual(); + } + + private static string Tip(WhoHereRow row) + { + var who = row.Display == row.Name || row.IsNpc ? row.Display : $"{row.Display} ({row.Name})"; + return row.Idle is { } idle ? $"{who} · {idle}" : who; + } + + // ── Input: the list's own, never routed on to the cells (bar the right click) ──────────────── + + protected override void OnPointerMoved(PointerEventArgs e) + { + base.OnPointerMoved(e); + e.Handled = true; + Hover(RowAt(e.GetPosition(this))); + } + + protected override void OnPointerExited(PointerEventArgs e) + { + base.OnPointerExited(e); + Hover(null); + } + + protected override void OnPointerPressed(PointerPressedEventArgs e) + { + base.OnPointerPressed(e); + e.Handled = true; + var point = e.GetCurrentPoint(this); + if (point.Properties.IsRightButtonPressed) + { + _view.ForwardRightClick(e.GetPosition(_view), e.KeyModifiers); + return; + } + + _pressed = point.Properties.IsLeftButtonPressed ? RowAt(point.Position) : null; + InvalidateVisual(); + } + + protected override void OnPointerReleased(PointerReleasedEventArgs e) + { + base.OnPointerReleased(e); + e.Handled = true; + var pressed = _pressed; + _pressed = null; + InvalidateVisual(); + if (e.InitialPressMouseButton == MouseButton.Left && pressed is { } index && RowAt(e.GetPosition(this)) == index) + { + _pick?.Invoke(index); + } + } + + protected override void OnPointerWheelChanged(PointerWheelEventArgs e) + { + base.OnPointerWheelChanged(e); + e.Handled = true; + } + + /// Clicks row as a left press and release over it would. Internal for tests. + internal void PerformClick(int index) + { + if (Rows.Any(r => r.Index == index)) + { + _pick?.Invoke(index); + } + } + + // ── Drawing ────────────────────────────────────────────────────────────────────────────────── + + public override void Render(DrawingContext context) + { + var bounds = new Rect(Bounds.Size); + context.FillRectangle(new SolidColorBrush(_plane), bounds); + if (bounds.Width < 16 || bounds.Height < 8) + { + return; + } + + Layout(bounds.Size); + var size = FontSize; + var dim = PanelText.Alpha(_text, 0xA0); + var accent = PanelText.Parse(_ink.Bar); + var left = Pad + 4; + var right = bounds.Width - Pad - 4; + + if (!_model.Known) + { + PanelText.Draw(context, WhoHereModel.UnknownText, left, HeaderHeight / 2, size, dim, false, right - left); + return; + } + + // HERE The Grand Plaza · 4 + var middle = HeaderHeight / 2; + var x = left; + x += PanelText.Draw(context, "HERE", x, middle, size * 0.82, accent, true, right - x) + 10; + var count = $"· {_model.Rows.Count.ToString(CultureInfo.InvariantCulture)}"; + var countWidth = PanelText.Measure(count, size, false); + if (_model.Room is { } room) + { + x += PanelText.Draw(context, room, x, middle, size, _text, true, right - x - countWidth - 6) + 6; + } + + PanelText.Draw(context, count, x, middle, size, dim, false, right - x); + context.DrawLine( + new Pen(new SolidColorBrush(PanelText.Alpha(_text, 0x22)), 1), + new Point(Pad / 2, HeaderHeight + 0.5), + new Point(bounds.Width - (Pad / 2), HeaderHeight + 0.5)); + + if (_model.Rows.Count == 0) + { + PanelText.Draw(context, WhoHereModel.EmptyText, left, HeaderHeight + 2 + (RowHeight / 2), size, dim, false, right - left); + return; + } + + var idleWidth = _model.ShowsIdle ? PanelText.Measure("idle 59m", size * 0.9, false) + 8 : 0; + foreach (var (index, rect) in _rows) + { + var row = _model.Rows[index]; + if (index == _hovered || index == _pressed) + { + var plate = (byte)(index == _pressed ? 0x38 : 0x1E); + context.DrawRectangle(new SolidColorBrush(PanelText.Alpha(_text, plate)), null, rect, 4, 4); + } + + var centre = rect.Center.Y; + var dot = new Point(left + 4, centre); + if (row.IsNpc) + { + context.DrawEllipse(null, new Pen(new SolidColorBrush(PanelText.Alpha(_text, 0x70)), 1.2), dot, 3, 3); + } + else + { + var colour = row.State == WhoPresence.Idle ? PanelText.Alpha(_text, 0x60) : accent; + context.DrawEllipse(new SolidColorBrush(colour), null, dot, 4, 4); + } + + var nameLeft = left + 16; + var nameRoom = right - nameLeft - idleWidth; + PanelText.Draw(context, row.Display, nameLeft, centre, size, row.IsNpc ? PanelText.Alpha(_text, 0x88) : _text, false, nameRoom); + if (row.Idle is { } idle && idleWidth > 0) + { + var active = row.State == WhoPresence.Active; + PanelText.Draw(context, idle, right, centre, size * 0.9, active ? PanelText.Alpha(accent, 0xD0) : dim, false, idleWidth, alignRight: true); + } + } + + if (_overflow is { } more) + { + var y = HeaderHeight + 2 + (_rows.Count * RowHeight) + (RowHeight / 2); + PanelText.Draw(context, more, left, y, size * 0.9, dim, false, right - left); + } + } +} diff --git a/src/SharpMUTerm.Client/Panels/QuickBarModel.cs b/src/SharpMUTerm.Client/Panels/QuickBarModel.cs new file mode 100644 index 00000000..05875b5b --- /dev/null +++ b/src/SharpMUTerm.Client/Panels/QuickBarModel.cs @@ -0,0 +1,49 @@ +using SharpMUTerm.Core.Commands; + +namespace SharpMUTerm.Client.Panels; + +/// One binding on the quick bar, as every view of it draws it. +/// The key as printed: F1, ⌃F2. +/// The descriptor the key fires (Ctrl+F2), which the client runs on a click. +/// The binding's name, on one line. +/// Whether pressing the key reaches the binding on this host; one that does not is still +/// clickable and drawn dim. +public sealed record QuickBarItem(string Key, string Descriptor, string Title, bool Fires); + +/// +/// The quick bar's content for one character: its function-key bindings in the order every view lists them, plain +/// keys before modified ones and then by number. The terminal draws them as a row of cells (QuickBarRenderer); +/// the window draws native buttons over that row from the same instance, so an item index names the same binding +/// in both. Nothing here marks a binding as dangerous: the configuration says no such thing, so no view may. +/// +public sealed record QuickBarModel(IReadOnlyList Items) +{ + /// The key that opens the bindings, as the hint prints it. + public const string EditKey = "F4"; + + /// The hint naming where the keys are edited. + public const string EditHint = EditKey + " edits keys"; + + /// The command a click on the hint dispatches: the F4 screen, through the registry. + public const string EditCommand = CommandIds.ScreenPrefix + "keypad"; + + /// What every view says when there are no bindings to show. + public const string EmptyText = "No function keys bound"; + + /// No bindings. + public static QuickBarModel Empty { get; } = new([]); + + /// Value equality over the items, which a record's list member does not give. + public bool Equals(QuickBarModel? other) => other is not null && Items.SequenceEqual(other.Items); + + public override int GetHashCode() + { + var hash = new HashCode(); + foreach (var item in Items) + { + hash.Add(item); + } + + return hash.ToHashCode(); + } +} diff --git a/src/SharpMUTerm.Client/Panels/WhoHereModel.cs b/src/SharpMUTerm.Client/Panels/WhoHereModel.cs new file mode 100644 index 00000000..2b56efbc --- /dev/null +++ b/src/SharpMUTerm.Client/Panels/WhoHereModel.cs @@ -0,0 +1,87 @@ +using System.Globalization; +using SharpMUTerm.Core.Protocols; + +namespace SharpMUTerm.Client.Panels; + +/// Whether a person in the room is at the keyboard, as far as the game says. +public enum WhoPresence +{ + /// Active, or the game sends no idle time for them. + Active, + + /// Idle for at least . + Idle, +} + +/// One person or creature in the room, as every view of the who-here panel draws it. +/// The name a look uses: bounded and free of whitespace by . +/// What the panel shows: a player's full name when the game sends one, else the name. +/// Active or idle; a creature is always . +/// How long the player has been idle as it reads (active, idle 4m), or null when the +/// game does not say. +/// A creature from Char.Items rather than a player. +public sealed record WhoHereRow(string Name, string Display, WhoPresence State, string? Idle, bool IsNpc); + +/// +/// The who-here panel's content for one character, with no presentation in it: the room's name and who is in it, +/// in the roster's order. The terminal draws it as rows of cells (WhoHereRenderer); the window draws a +/// native list over those cells from the same instance, so a row index names the same person in both. +/// +/// Whether the game has said who is here at all. +/// The room's name, when the game sends one. +/// Who is here. +public sealed record WhoHereModel(bool Known, string? Room, IReadOnlyList Rows) +{ + /// Under this many seconds idle a player reads active. + public const int ActiveSeconds = 60; + + /// What every view says before the game has said who is here. + public const string UnknownText = "The game has not said who is here."; + + /// What every view says in a room with nobody else in it. + public const string EmptyText = "Nobody else is here."; + + /// The game has not said who is here. + public static WhoHereModel Unknown { get; } = new(false, null, []); + + /// Whether any row carries an idle time, so a view knows whether to give the column room. + public bool ShowsIdle => Rows.Any(r => r.Idle is not null); + + /// The model for a room name and a roster snapshot. + public static WhoHereModel From(string? room, IReadOnlyList occupants) => + new( + true, + string.IsNullOrWhiteSpace(room) ? null : room.Trim(), + occupants.Select(o => new WhoHereRow( + o.Name, + o.Display, + o.IsPlayer && o.IdleSeconds is >= ActiveSeconds ? WhoPresence.Idle : WhoPresence.Active, + o.IsPlayer && o.IdleSeconds is { } seconds ? IdleText(seconds) : null, + !o.IsPlayer)).ToList()); + + /// How an idle time reads: active, idle 4m, idle 2h, idle 3d. + public static string IdleText(int seconds) => seconds switch + { + < ActiveSeconds => "active", + < 3600 => $"idle {(seconds / 60).ToString(CultureInfo.InvariantCulture)}m", + < 86400 => $"idle {(seconds / 3600).ToString(CultureInfo.InvariantCulture)}h", + _ => $"idle {Math.Min(99, seconds / 86400).ToString(CultureInfo.InvariantCulture)}d", + }; + + /// Value equality over the rows, which a record's list member does not give. + public bool Equals(WhoHereModel? other) => + other is not null && Known == other.Known && Room == other.Room && Rows.SequenceEqual(other.Rows); + + public override int GetHashCode() + { + var hash = new HashCode(); + hash.Add(Known); + hash.Add(Room); + foreach (var row in Rows) + { + hash.Add(row); + } + + return hash.ToHashCode(); + } +} diff --git a/src/SharpMUTerm.Tui/Panels/QuickBarRenderer.cs b/src/SharpMUTerm.Tui/Panels/QuickBarRenderer.cs index 566ac149..a8165981 100644 --- a/src/SharpMUTerm.Tui/Panels/QuickBarRenderer.cs +++ b/src/SharpMUTerm.Tui/Panels/QuickBarRenderer.cs @@ -1,4 +1,5 @@ using System.Globalization; +using SharpMUTerm.Client.Panels; using SharpMUTerm.Core.Automation; using static SharpMUTerm.Tui.MarkupText; @@ -7,7 +8,9 @@ namespace SharpMUTerm.Tui.Panels; /// /// The quick bar: one row of the character's function-key macros — F1 kick F2 bash F3 cure light — with /// F4 edits keys at the right. Each entry is a link ( and its index) that the -/// panel's own handler runs through the macro path the key itself takes. Elided to the width, never wrapped. +/// panel's own handler runs through the macro path the key itself takes. Elided to the width, never wrapped. Drawn +/// from a , the one the window's native buttons are drawn from, so entry N is the same +/// binding in both. /// internal static class QuickBarRenderer { @@ -18,21 +21,16 @@ internal static class QuickBarRenderer internal const int MaxNameWidth = 16; /// The right-hand hint naming where the keys are edited. - internal const string Hint = "F4 edits keys"; - - /// One entry: the key as printed (F1, ⌃F2), the descriptor it fires, its name. - /// Whether pressing the key reaches the macro on this host (); - /// one that does not is still clickable and drawn dim. - internal readonly record struct Entry(string Key, string Descriptor, string Name, bool Fires); + internal const string Hint = QuickBarModel.EditHint; /// /// The function-key bindings to show, from the bindings that resolve: one per key, plain keys before modified /// ones, then by number. A binding with neither a command nor a script is left out, as the key path leaves it. /// - internal static IReadOnlyList Entries(IEnumerable macros, Func resolve) + internal static QuickBarModel Entries(IEnumerable macros, Func resolve) { var seen = new HashSet(StringComparer.OrdinalIgnoreCase); - var entries = new List<(Entry Entry, int Modifiers, int Number)>(); + var entries = new List<(QuickBarItem Entry, int Modifiers, int Number)>(); foreach (var candidate in macros) { if (!MacroKey.TryParse(candidate.Key, out var parts) @@ -58,20 +56,21 @@ internal static IReadOnlyList Entries(IEnumerable macros, Func e.Modifiers).ThenBy(e => e.Number).Select(e => e.Entry).ToList(); + return new QuickBarModel(entries.OrderBy(e => e.Modifiers).ThenBy(e => e.Number).Select(e => e.Entry).ToList()); } /// The row for cells. Entries that do not fit are counted, never wrapped. - internal static string Render(IReadOnlyList entries, int width, string accent) + internal static string Render(QuickBarModel model, int width, string accent) { + var entries = model.Items; width = Math.Max(1, width); - var hint = $"[bold {accent}]F4[/][dim] edits keys[/]"; + var hint = $"[bold {accent}]{QuickBarModel.EditKey}[/][dim]{QuickBarModel.EditHint[QuickBarModel.EditKey.Length..]}[/]"; if (entries.Count == 0) { - return ElideVisible($"[dim]No function keys bound · [/]{hint}", width); + return ElideVisible($"[dim]{QuickBarModel.EmptyText} · [/]{hint}", width); } var cells = entries.Select((e, i) => Cell(e, i, accent)).ToList(); @@ -116,9 +115,9 @@ internal static string Render(IReadOnlyList entries, int width, string ac return null; } - private static string Cell(Entry entry, int index, string accent) + private static string Cell(QuickBarItem entry, int index, string accent) { - var name = entry.Name.Length <= MaxNameWidth ? entry.Name : entry.Name[..(MaxNameWidth - 1)] + "…"; + var name = entry.Title.Length <= MaxNameWidth ? entry.Title : entry.Title[..(MaxNameWidth - 1)] + "…"; var link = $"[link={LinkPrefix}{index.ToString(CultureInfo.InvariantCulture)}]"; return entry.Fires ? $"{link}[bold {accent}]{Escape(entry.Key)}[/] {Escape(name)}[/]" diff --git a/src/SharpMUTerm.Tui/Panels/WhoHereRenderer.cs b/src/SharpMUTerm.Tui/Panels/WhoHereRenderer.cs index ff2766b5..d936b074 100644 --- a/src/SharpMUTerm.Tui/Panels/WhoHereRenderer.cs +++ b/src/SharpMUTerm.Tui/Panels/WhoHereRenderer.cs @@ -1,4 +1,5 @@ using System.Globalization; +using SharpMUTerm.Client.Panels; using SharpMUTerm.Core.Protocols; using static SharpMUTerm.Tui.MarkupText; @@ -7,7 +8,8 @@ namespace SharpMUTerm.Tui.Panels; /// /// The who-here panel: HERE The Grand Plaza · 4, then one row per person — players with a dot and how /// long they have been idle when the game says, creatures dimmed under them. Every name is a link -/// ( and its row), answered by the panel's own handler and by nothing else. +/// ( and its row), answered by the panel's own handler and by nothing else. Drawn from a +/// , the one the window's native list is drawn from, so row N is the same person in both. /// internal static class WhoHereRenderer { @@ -18,7 +20,13 @@ internal static class WhoHereRenderer internal const int IdleWidth = 8; /// Under this many seconds idle a player reads active. - internal const int ActiveSeconds = 60; + internal const int ActiveSeconds = WhoHereModel.ActiveSeconds; + + /// What the panel says before the game has said who is here. + internal const string UnknownText = WhoHereModel.UnknownText; + + /// What the panel says in an empty room. + internal const string EmptyText = WhoHereModel.EmptyText; /// The panel's colours: the dot of an active player, and the plane they are measured on. internal readonly record struct Ink(string Accent); @@ -27,38 +35,48 @@ internal static class WhoHereRenderer /// The panel's rows for a box by cells. Never wider than the /// box and never taller: a room fuller than the box ends in … and N more. /// - internal static List Render(string? room, IReadOnlyList occupants, int width, int height, Ink ink) + internal static List Render(string? room, IReadOnlyList occupants, int width, int height, Ink ink) => + Render(WhoHereModel.From(room, occupants), width, height, ink); + + /// The panel's rows for a model; see the other overload. + internal static List Render(WhoHereModel model, int width, int height, Ink ink) { + if (!model.Known) + { + return [$"[dim]{UnknownText}[/]"]; + } + width = Math.Max(8, width); height = Math.Max(1, height); var lines = new List(); + var rowsIn = model.Rows; - var count = $" · {occupants.Count.ToString(CultureInfo.InvariantCulture)}"; - var title = string.IsNullOrWhiteSpace(room) ? string.Empty : " " + Escape(room.Trim()); + var count = $" · {rowsIn.Count.ToString(CultureInfo.InvariantCulture)}"; + var title = model.Room is { } room ? " " + Escape(room) : string.Empty; lines.Add(ElideVisible($"[bold {ink.Accent}]HERE[/]{title}[dim]{count}[/]", width)); if (height == 1) { return lines; } - if (occupants.Count == 0) + if (rowsIn.Count == 0) { - lines.Add("[dim]Nobody else is here.[/]"); + lines.Add($"[dim]{EmptyText}[/]"); return lines; } - var showIdle = occupants.Any(o => o.IdleSeconds is not null) && width >= IdleWidth + 8; + var showIdle = model.ShowsIdle && width >= IdleWidth + 8; var nameWidth = width - 2 - (showIdle ? IdleWidth + 1 : 0); var rows = height - 1; - var fits = occupants.Count <= rows ? occupants.Count : Math.Max(0, rows - 1); + var fits = rowsIn.Count <= rows ? rowsIn.Count : Math.Max(0, rows - 1); for (var i = 0; i < fits; i++) { - lines.Add(Row(occupants[i], i, nameWidth, showIdle, ink)); + lines.Add(Row(rowsIn[i], i, nameWidth, showIdle, ink)); } - if (fits < occupants.Count) + if (fits < rowsIn.Count) { - lines.Add($"[dim]… and {(occupants.Count - fits).ToString(CultureInfo.InvariantCulture)} more[/]"); + lines.Add($"[dim]… and {(rowsIn.Count - fits).ToString(CultureInfo.InvariantCulture)} more[/]"); } return lines; @@ -72,33 +90,25 @@ internal static List Render(string? room, IReadOnlyList oc : null; /// How an idle time reads: active, idle 4m, idle 2h, idle 3d. - internal static string Idle(int seconds) => seconds switch - { - < ActiveSeconds => "active", - < 3600 => $"idle {(seconds / 60).ToString(CultureInfo.InvariantCulture)}m", - < 86400 => $"idle {(seconds / 3600).ToString(CultureInfo.InvariantCulture)}h", - _ => $"idle {Math.Min(99, seconds / 86400).ToString(CultureInfo.InvariantCulture)}d", - }; + internal static string Idle(int seconds) => WhoHereModel.IdleText(seconds); - private static string Row(RoomOccupant who, int index, int nameWidth, bool showIdle, Ink ink) + private static string Row(WhoHereRow who, int index, int nameWidth, bool showIdle, Ink ink) { var name = Escape(Fit(who.Display, nameWidth)); var link = $"[link={LinkPrefix}{index.ToString(CultureInfo.InvariantCulture)}]"; - if (!who.IsPlayer) + if (who.IsNpc) { return $"[dim]·[/] {link}[dim]{name}[/][/]"; } - var idle = who.IdleSeconds is { } seconds && seconds >= ActiveSeconds; - var dot = idle ? "[dim]●[/]" : $"[{ink.Accent}]●[/]"; + var dot = who.State == WhoPresence.Idle ? "[dim]●[/]" : $"[{ink.Accent}]●[/]"; var row = $"{dot} {link}{name}[/]"; if (!showIdle) { return row; } - var status = who.IdleSeconds is { } s ? Idle(s) : string.Empty; - return PadVisible(row, nameWidth + 2) + " " + $"[dim]{status.PadLeft(IdleWidth)}[/]"; + return PadVisible(row, nameWidth + 2) + " " + $"[dim]{(who.Idle ?? string.Empty).PadLeft(IdleWidth)}[/]"; } private static string Fit(string text, int width) => diff --git a/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs b/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs index 82ecd577..dd70029e 100644 --- a/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs +++ b/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs @@ -156,6 +156,19 @@ void HeaderActions(IReadOnlyList actions) /// For the map, walks the panel's own character to a room by id, through the speedwalk a click on a cell map uses. /// Safe to call from any thread. The same instance for as long as the window lives, so an overlay compares equal. /// +/// For the who-here panel, its content: the same model its cell rows are drawn from. +/// For the quick bar, its content: the same model its cell row is drawn from. +/// +/// For who-here and the quick bar, does what a click on row or item N of the cells does, on the panel's own +/// character: who-here puts look and the name on that character's command line, the quick bar runs the +/// binding through the key's own path. The index is into the model this overlay carries; the client reads the row +/// back from what it published, so the host never names a person or a command. Safe to call from any thread, and +/// the same instance for as long as the window lives. +/// +/// +/// Runs a command id through the client's registry (the quick bar's F4 edits keys is +/// ). Safe to call from any thread; one instance. +/// internal sealed record PanelOverlay( string PanelId, string WindowId, @@ -163,7 +176,11 @@ internal sealed record PanelOverlay( PanelInk Ink, SharpMUTerm.Client.Panels.VitalsModel? Vitals, SharpMUTerm.Client.Panels.MapViewModel? Map = null, - Action? WalkTo = null); + Action? WalkTo = null, + SharpMUTerm.Client.Panels.WhoHereModel? WhoHere = null, + SharpMUTerm.Client.Panels.QuickBarModel? QuickBar = null, + Action? Pick = null, + Action? Dispatch = null); /// A panel's colours as #rrggbb: a bar or fill, the warning, and the empty part of a bar. internal sealed record PanelInk(string Bar, string Low, string Track); diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Desktop.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Desktop.cs index 6b57afaf..9c3a2b4e 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Desktop.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Desktop.cs @@ -31,6 +31,12 @@ internal sealed partial class SharpMUTermApp /// One walk callback per map window, kept so an overlay compares equal from frame to frame. private readonly Dictionary> _mapWalkers = new(StringComparer.Ordinal); + /// One pick callback per who-here or quick-bar window, for the same reason. + private readonly Dictionary> _panelPickers = new(StringComparer.Ordinal); + + /// The one command callback every native panel is handed. + private Action? _panelDispatch; + /// Tells the host which header buttons it may draw. Once, at construction. private void AnnounceHeaderActions() => _pointer?.HeaderActions( @@ -158,7 +164,7 @@ private static string Capitalise(string text) => /// /// Tells the host which panels are on screen, where, and what they show, when any of that changed. Rides the /// frame, for ' reason. A panel is on screen when its window is the front tab of - /// a realised pane. + /// a realised pane and no modal window covers the main one. /// private void PublishPanels() { @@ -167,8 +173,10 @@ private void PublishPanels() return; } + // A modal over the main window (a settings screen, ⌃P, F1) is drawn in cells over the panes; a native view + // would sit on top of it, so while one is up no panel is on screen as far as the host is concerned. var overlays = new List(); - foreach (var (paneId, rect) in PaneOutputRects()) + foreach (var (paneId, rect) in !_system.ModalStateService.HasModals ? PaneOutputRects() : new Dictionary()) { if (_workspace.Layout.FindPane(paneId) is not { ActiveTab: { } windowId }) { @@ -199,6 +207,17 @@ private void PublishPanels() var ink = VitalsInk(); overlays.Add(new PanelOverlay(panelId, windowId, rect, new PanelInk(ink.Bar, ink.Low, ink.Empty), ReadVitals(key))); } + else if (panelId == PanelIds.WhoHere) + { + overlays.Add(new PanelOverlay( + panelId, windowId, rect, PanelListInk(), null, WhoHere: ReadWhoHere(key), Pick: PickerFor(windowId, key))); + } + else if (panelId == PanelIds.QuickBar) + { + overlays.Add(new PanelOverlay( + panelId, windowId, rect, PanelListInk(), null, QuickBar: QuickBarEntries(key), Pick: PickerFor(windowId, key), + Dispatch: _panelDispatch ??= id => OnUiThread(() => DispatchCommand(id)))); + } } if (overlays.SequenceEqual(_panelOverlays)) @@ -210,6 +229,31 @@ private void PublishPanels() _pointer.Panels(overlays); } + /// The list panels' colours: the accent their cells draw an active dot and a key in, and the warning. + private PanelInk PanelListInk() => new(_ink.Accent, _ink.Notice, _ink.Lift(new Rgb(0x6a, 0x6a, 0x72))); + + /// + /// A who-here or quick-bar window's pick callback: the row or item at an index of the model last published for + /// that window, acted on exactly as a click on its cells is, on the window's own character. + /// + private Action PickerFor(string windowId, string sessionKey) => + _panelPickers.TryGetValue(windowId, out var known) + ? known + : _panelPickers[windowId] = index => OnUiThread(() => PickFromPanel(windowId, sessionKey, index)); + + private void PickFromPanel(string windowId, string sessionKey, int index) + { + var published = _panelOverlays.FirstOrDefault(p => p.WindowId == windowId); + if (published?.WhoHere is { } who && index >= 0 && index < who.Rows.Count) + { + OfferLook(windowId, sessionKey, who.Rows[index].Name); + } + else if (published?.QuickBar is { } bar && index >= 0 && index < bar.Items.Count) + { + RunQuickMacro(sessionKey, bar.Items[index].Descriptor); + } + } + /// /// A map window's native model, rebuilt only when the cell map has been redrawn since ( /// counts), so a frame that changed nothing on the map costs a dictionary lookup. diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs index 48e96586..b564e791 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs @@ -94,26 +94,18 @@ private void ShowPanel(string panelId) private IWindowControl NewWhoHerePanel(TerminalPanelContext context) { - IReadOnlyList drawn = []; + IReadOnlyList drawn = []; var view = NewPanelView(context, (width, height) => { - var roster = PanelOccupants(context.SessionKey); - if (roster is not { Known: true }) - { - drawn = []; - return ["[dim]The game has not said who is here.[/]"]; - } - - drawn = roster.Snapshot; - var data = PanelGameData(context.SessionKey); - var room = data is null ? null : StatusMeter.Read(data, "Room.Info.name|MSDP.ROOM_NAME"); - return WhoHereRenderer.Render(room, drawn, width, height, new WhoHereRenderer.Ink(_ink.Accent)); + var model = ReadWhoHere(context.SessionKey); + drawn = model.Rows; + return WhoHereRenderer.Render(model, width, height, new WhoHereRenderer.Ink(_ink.Accent)); }); view.Click = url => { if (WhoHereRenderer.ParseLink(url) is { } index && index < drawn.Count) { - OfferLook(context, drawn[index]); + OfferLook(context.WindowId, context.SessionKey, drawn[index].Name); } }; @@ -137,17 +129,33 @@ private IWindowControl NewWhoHerePanel(TerminalPanelContext context) return view.Control; } + /// + /// A character's who-here panel as the one model every view draws (): the cell rows + /// here, and the window's native list through . + /// + internal WhoHereModel ReadWhoHere(string sessionKey) + { + if (PanelOccupants(sessionKey) is not { Known: true } roster) + { + return WhoHereModel.Unknown; + } + + var data = PanelGameData(sessionKey); + var room = data is null ? null : StatusMeter.Read(data, "Room.Info.name|MSDP.ROOM_NAME"); + return WhoHereModel.From(room, roster.Snapshot); + } + /// /// A click on a name puts look Name on the character's command line and sends nothing: the name is the /// game's text, and the player sees the line before ⏎. It lands on the bar of the panel's own character — the /// panel's window is brought forward when the one in front belongs to someone else. /// - private void OfferLook(TerminalPanelContext context, RoomOccupant who) + private void OfferLook(string windowId, string sessionKey, string name) { var owner = WindowSession(ActiveWindowId())?.SessionKey ?? _workspace.FindWindow(ActiveWindowId())?.SessionKey; - if (!string.Equals(owner, context.SessionKey, StringComparison.Ordinal)) + if (!string.Equals(owner, sessionKey, StringComparison.Ordinal)) { - Activate(context.WindowId); + Activate(windowId); } if (ArmedComposer() is not null) @@ -155,8 +163,8 @@ private void OfferLook(TerminalPanelContext context, RoomOccupant who) ReleaseComposer(); } - PlaceGrab(ActiveBar(), $"look {who.Name}", context.SessionKey); - Notice($"look {Snippet(who.Name)} is on the command line — ⏎ sends it", MessageSeverity.Info); + PlaceGrab(ActiveBar(), $"look {name}", sessionKey); + Notice($"look {Snippet(name)} is on the command line — ⏎ sends it", MessageSeverity.Info); } // --- Vitals ----------------------------------------------------------------------------------------------- @@ -211,17 +219,18 @@ private VitalsStripRenderer.Ink VitalsInk() => private IWindowControl NewQuickBarPanel(TerminalPanelContext context) { - IReadOnlyList drawn = []; + IReadOnlyList drawn = []; var view = NewPanelView(context, (width, _) => { - drawn = QuickBarEntries(context.SessionKey); - return [QuickBarRenderer.Render(drawn, width, _ink.Accent)]; + var model = QuickBarEntries(context.SessionKey); + drawn = model.Items; + return [QuickBarRenderer.Render(model, width, _ink.Accent)]; }); view.Click = url => { if (QuickBarRenderer.ParseLink(url) is { } index && index < drawn.Count) { - RunQuickMacro(context, drawn[index]); + RunQuickMacro(context.SessionKey, drawn[index].Descriptor); } }; return view.Control; @@ -231,7 +240,7 @@ private IWindowControl NewQuickBarPanel(TerminalPanelContext context) /// The function-key bindings a character's quick bar lists: its session's engine when it has one (so a script's /// runtime binding shows), else the bindings its trigger sets configure. /// - private IReadOnlyList QuickBarEntries(string sessionKey) + internal QuickBarModel QuickBarEntries(string sessionKey) { if (FindSession(sessionKey) is { } session) { @@ -240,7 +249,7 @@ private IWindowControl NewQuickBarPanel(TerminalPanelContext context) if (FindCharacter(sessionKey) is not { } found) { - return []; + return QuickBarModel.Empty; } var macros = _config.ResolveTriggerSets(found.Character, found.World).SelectMany(s => s.Macros).ToList(); @@ -252,16 +261,16 @@ private IWindowControl NewQuickBarPanel(TerminalPanelContext context) /// A click on an entry runs that binding through — the path the key /// itself takes — on the panel's own character, never the one in front. /// - private void RunQuickMacro(TerminalPanelContext context, QuickBarRenderer.Entry entry) + private void RunQuickMacro(string sessionKey, string descriptor) { - if (FindSession(context.SessionKey) is not { } session) + if (FindSession(sessionKey) is not { } session) { - RefuseCommand($"{Snippet(context.SessionKey)} has no open session — ⌃P ▸ Switch to it opens one"); + RefuseCommand($"{Snippet(sessionKey)} has no open session — ⌃P ▸ Switch to it opens one"); return; } - _ = session.HandleKeyAsync(entry.Descriptor); - LastQuickMacro = entry.Descriptor; + _ = session.HandleKeyAsync(descriptor); + LastQuickMacro = descriptor; } /// The descriptor the quick bar last ran, for the tests. @@ -666,6 +675,31 @@ private IReadOnlyList PanelMeters(string sessionKey) // --- The snapshot views ----------------------------------------------------------------------------------- + /// + /// Function-key bindings for the demo character, which the demo configuration does not carry: a trigger set + /// named Quick, added and listed the way F2 and F5 would. For the quick-bar views. + /// + private void LoadDemoBindings() + { + if (_config.TriggerSets.Any(s => s.Name == "Quick")) + { + return; + } + + _config.TriggerSets.Add(new TriggerSet + { + Name = "Quick", + Macros = + { + new Macro { Name = "kick", Key = "F11", Command = "kick" }, + new Macro { Name = "bash", Key = "F12", Command = "bash" }, + new Macro { Name = "cure light", Key = "Ctrl+F3", Command = "cast 'cure light'" }, + new Macro { Name = "quaff mana", Key = "Ctrl+F4", Command = "quaff mana" }, + }, + }); + FindCharacter(DemoScene.ActiveSessionKey)?.Character.TriggerSets.Add("Quick"); + } + /// /// The four panel views, each opened through its real ⌃P entry and placed the way its layout places it: /// panel-who a narrow column beside the output; panel-vitals a strip over it, with a target; @@ -693,18 +727,7 @@ private void LoadDemoPanels(string view) break; case "panel-quickbar": - _config.TriggerSets.Add(new TriggerSet - { - Name = "Quick", - Macros = - { - new Macro { Name = "kick", Key = "F11", Command = "kick" }, - new Macro { Name = "bash", Key = "F12", Command = "bash" }, - new Macro { Name = "cure light", Key = "Ctrl+F3", Command = "cast 'cure light'" }, - new Macro { Name = "quaff mana", Key = "Ctrl+F4", Command = "quaff mana" }, - }, - }); - FindCharacter(DemoScene.ActiveSessionKey)?.Character.TriggerSets.Add("Quick"); + LoadDemoBindings(); OpenDemoPanelStrip(PanelIds.QuickBar, Edge.Bottom); Activate(MainWindowId); break; diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index d2d6cf54..190757bc 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -1006,6 +1006,10 @@ public SharpMUTermApp( SyncPanelSizes(); SyncScrollSplitBars(); }; + + // A modal that covers the main window entirely leaves it unpainted, so no PostBufferPaint says the native + // panels are now under it; the modal stack changing says it instead. + _system.ModalStateService.StateChanged += (_, _) => PublishPanels(); if (_sixel is not null) { // Another window over this one rewrites the cells a picture sits on, and the frame that puts @@ -1862,7 +1866,8 @@ public string RenderSnapshot(string? view = null) // Layouts. `layouts` is the ⌥M list over the demo, opened through the registered shortcut itself; // `layout-combat` is the demo with the Combat layout realised through the same ApplyLayout ⌥M ⏎ runs, over - // the demo's game data (vitals, so the meters have values) and its recorded streets (so the map has rooms). + // the demo's game data (vitals, so the meters have values), its recorded streets (so the map has rooms) and + // a few function-key bindings (so the quick bar has buttons). // Panels nothing draws yet stay out, which is the data gating the frame is there to show. if (string.Equals(view, "layouts", StringComparison.OrdinalIgnoreCase)) { @@ -1873,6 +1878,7 @@ public string RenderSnapshot(string? view = null) { LoadDemoGameData(); LoadDemoMap(); + LoadDemoBindings(); ApplyLayout(DemoScene.ActiveSessionKey, Core.Layouts.BuiltInLayouts.Combat); } diff --git a/tests/SharpMUTerm.Avalonia.Tests/DesktopLayerTests.cs b/tests/SharpMUTerm.Avalonia.Tests/DesktopLayerTests.cs index 815f7aeb..36281a5c 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/DesktopLayerTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/DesktopLayerTests.cs @@ -309,7 +309,7 @@ [new MapViewExit(1, 2)], // ── helpers ────────────────────────────────────────────────────────────────────────────────── - private static SharpMUTermApp InlineWindowApp(AvaloniaConsoleDriver driver) => + internal static SharpMUTermApp InlineWindowApp(AvaloniaConsoleDriver driver) => new(DemoScene.Build(), WindowHost.Create(driver, clipboard: null) with { Capabilities = WindowOptions.Capabilities, @@ -329,9 +329,9 @@ private static void Publish(AvaloniaConsoleDriver driver, PaneRect rect) => ((IPointerPresenter)driver.Pointer).Panels( [new PanelOverlay(PanelIds.Vitals, "panel:vitals:demo", rect, new PanelInk("#3ccf6a", "#ff5555", "#333338"), Vitals)]); - private static void Drain() => global::Avalonia.Threading.Dispatcher.UIThread.RunJobs(); + internal static void Drain() => global::Avalonia.Threading.Dispatcher.UIThread.RunJobs(); - private static Task Run( + internal static Task Run( Func body, int columns = 40, int rows = 10) => Session.Dispatch(() => { diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativePanelTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativePanelTests.cs new file mode 100644 index 00000000..bc0830b4 --- /dev/null +++ b/tests/SharpMUTerm.Avalonia.Tests/NativePanelTests.cs @@ -0,0 +1,321 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Headless; +using Avalonia.Input; +using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Panels; +using SharpMUTerm.Core.Layouts; +using SharpMUTerm.Core.Protocols; +using SharpMUTerm.Core.Workspaces; +using SharpMUTerm.Tui; +using SharpMUTerm.Tui.Panels; +using static SharpMUTerm.Avalonia.Tests.DesktopLayerTests; +using static SharpMUTerm.Tui.MarkupText; + +namespace SharpMUTerm.Avalonia.Tests; + +/// +/// The window's native who-here list and quick bar (, ): drawn +/// over their panes from the models the cell panels are drawn from, moving no pane, and handing a click to the +/// client's own callback — never to the driver, and never as a command the window built. +/// +public class NativePanelTests +{ + private static readonly WhoHereModel Who = WhoHereModel.From( + "The Grand Plaza", + [ + new RoomOccupant("Ashlyn", "Ashlyn the Wanderer", true, 30), + new RoomOccupant("Bo", "Bo", true, 900), + new RoomOccupant("rat", "a sewer rat", false, Id: "7"), + ]); + + private static readonly QuickBarModel Bar = new( + [ + new QuickBarItem("F11", "F11", "kick", true), + new QuickBarItem("F12", "F12", "bash", true), + new QuickBarItem("⌃F3", "Ctrl+F3", "cure light", true), + new QuickBarItem("⌃F4", "Ctrl+F4", "quaff mana", true), + new QuickBarItem("⌃F5", "Ctrl+F5", "rescue", false), + ]); + + private static readonly PanelInk Ink = new("#3ccf6a", "#ff5555", "#333338"); + + // ── The client's half ──────────────────────────────────────────────────────────────────────── + + [Test] + public async Task TheClientPublishesWhoHereWithTheModelItsCellRowsAreDrawnFrom() + { + using var driver = new AvaloniaConsoleDriver(140, 36); + await using var app = InlineWindowApp(driver); + app.RenderSnapshot("layout-roleplay"); + + var panel = driver.Pointer.Panels.SingleOrDefault(p => p.PanelId == PanelIds.WhoHere); + await Assert.That(panel).IsNotNull(); + var pane = app.PaneOutputRects().Single(r => app.PaneWindows().GetValueOrDefault(r.Key) == panel!.WindowId); + await Assert.That(panel!.Rect).IsEqualTo(pane.Value); + await Assert.That(panel.WhoHere).IsEqualTo(app.ReadWhoHere(DemoScene.ActiveSessionKey)); + await Assert.That(panel.WhoHere!.Rows.Count).IsGreaterThan(0); + await Assert.That(panel.Pick).IsNotNull(); + + // Row N of the model is row N of the cells: the same name under the same link index. + var cells = WhoHereRenderer.Render(panel.WhoHere, 60, 40, new WhoHereRenderer.Ink("#00f5b7")); + for (var i = 0; i < panel.WhoHere.Rows.Count; i++) + { + var line = cells.Single(l => l.Contains($"[link={WhoHereRenderer.LinkPrefix}{i}]", StringComparison.Ordinal)); + await Assert.That(Plain(line)).Contains(panel.WhoHere.Rows[i].Display); + } + } + + [Test] + public async Task TheClientPublishesTheQuickBarWithTheModelItsCellRowIsDrawnFrom() + { + using var driver = new AvaloniaConsoleDriver(140, 36); + await using var app = InlineWindowApp(driver); + app.RenderSnapshot("layout-combat"); + + var panel = driver.Pointer.Panels.SingleOrDefault(p => p.PanelId == PanelIds.QuickBar); + await Assert.That(panel).IsNotNull(); + var pane = app.PaneOutputRects().Single(r => app.PaneWindows().GetValueOrDefault(r.Key) == panel!.WindowId); + await Assert.That(panel!.Rect).IsEqualTo(pane.Value); + await Assert.That(panel.QuickBar).IsEqualTo(app.QuickBarEntries(DemoScene.ActiveSessionKey)); + await Assert.That(panel.QuickBar!.Items.Select(i => i.Key).Take(2)).IsEquivalentTo(new[] { "F11", "F12" }); + + var row = QuickBarRenderer.Render(panel.QuickBar, 140, "#00f5b7"); + for (var i = 0; i < panel.QuickBar.Items.Count; i++) + { + var item = panel.QuickBar.Items[i]; + await Assert.That(row).Contains($"[link={QuickBarRenderer.LinkPrefix}{i}]"); + await Assert.That(Plain(row)).Contains($"{item.Key} {item.Title}"); + } + } + + [Test] + public async Task NativeListsMoveNoPaneRectangle() + { + foreach (var view in new[] { "layout-roleplay", "layout-combat" }) + { + using var headless = new HeadlessConsoleDriver(140, 36); + await using var terminal = new SharpMUTermApp(DemoScene.Build(), ClientHost.Headless(headless, WindowOptions.Capabilities)); + terminal.RenderSnapshot(view); + + using var driver = new AvaloniaConsoleDriver(140, 36); + await using var window = InlineWindowApp(driver); + window.RenderSnapshot(view); + + await Assert.That(driver.Pointer.Panels.Any(p => p.WhoHere is not null || p.QuickBar is not null)).IsTrue().Because(view); + await Assert.That(window.PaneOutputRects().OrderBy(r => r.Key).ToArray()) + .IsEquivalentTo(terminal.PaneOutputRects().OrderBy(r => r.Key).ToArray()); + } + } + + [Test] + public async Task APickFromTheNativeListPutsLookOnTheCommandLineAndSendsNothing() + { + using var driver = new AvaloniaConsoleDriver(140, 36); + await using var app = InlineWindowApp(driver); + app.RenderSnapshot("layout-roleplay"); + + var panel = driver.Pointer.Panels.Single(p => p.PanelId == PanelIds.WhoHere); + var first = panel.WhoHere!.Rows[0]; + panel.Pick!(0); + app.RenderNextFrame(); + + await Assert.That(app.PrimaryInputText).IsEqualTo($"look {first.Name}"); + + // Out of range is nothing: the index is read back from what the client published, never trusted. + panel.Pick(999); + app.RenderNextFrame(); + await Assert.That(app.PrimaryInputText).IsEqualTo($"look {first.Name}"); + await Assert.That(ReferenceEquals(driver.Pointer.Panels.Single(p => p.PanelId == PanelIds.WhoHere).Pick, panel.Pick)) + .IsTrue().Because("one pick callback per window, so an overlay compares equal"); + } + + [Test] + public async Task TheEditLinkDispatchesTheF4ScreenAndNoNativePanelCoversIt() + { + using var driver = new AvaloniaConsoleDriver(140, 36); + await using var app = InlineWindowApp(driver); + app.RenderSnapshot("layout-combat"); + + var panel = driver.Pointer.Panels.Single(p => p.PanelId == PanelIds.QuickBar); + await Assert.That(app.Contributions.Commands.Resolve(QuickBarModel.EditCommand)).IsNotNull(); + panel.Dispatch!(QuickBarModel.EditCommand); + app.RenderNextFrame(); + await Assert.That(app.OpenSettingsKey).IsEqualTo(ConsoleKey.F4); + await Assert.That(driver.Pointer.Panels).IsEmpty().Because("a native view would sit over the modal's cells"); + } + + // ── The window's half ──────────────────────────────────────────────────────────────────────── + + [Test] + public async Task TheWhoHereListCoversItsPaneAndAClickReachesThePickNotTheDriver() + { + var (listRect, paneRect, picked, clientSaw, rows, hovered, tip) = await Run((window, view, layer, driver) => + { + var picked = new List(); + ((IPointerPresenter)driver.Pointer).Panels([new PanelOverlay(PanelIds.WhoHere, "panel:who:demo", new PaneRect(2, 1, 30, 8), Ink, null, WhoHere: Who, Pick: picked.Add)]); + Drain(); + window.UpdateLayout(); + var list = layer.WhoHere.Values.Single(); + var cell = view.SizeFor(1, 1); + var paneRect = new Rect(2 * cell.Width, 1 * cell.Height, 30 * cell.Width, 8 * cell.Height); + var listRect = new Rect(Canvas.GetLeft(list), Canvas.GetTop(list), list.Bounds.Width, list.Bounds.Height); + + var clientSaw = new List>(); + driver.MouseEvent += (_, flags, _) => clientSaw.Add(flags); + var second = list.Rows.Single(r => r.Index == 1).Rect; + var at = list.TranslatePoint(second.Center, window)!.Value; + window.MouseMove(at); + var hovered = list.Hovered; + var tip = ToolTip.GetTip(list) as string; + window.MouseDown(at, MouseButton.Left); + window.MouseUp(at, MouseButton.Left); + + // A right click is the client's: the pane's menu, as over cells. + window.MouseDown(at, MouseButton.Right); + window.MouseUp(at, MouseButton.Right); + return (listRect, paneRect, picked, clientSaw, list.Rows.Count, hovered, tip); + }, columns: 40, rows: 12); + + await Assert.That(listRect).IsEqualTo(paneRect); + await Assert.That(rows).IsEqualTo(3); + await Assert.That(picked).IsEquivalentTo(new[] { 1 }); + await Assert.That(hovered).IsEqualTo(1); + await Assert.That(tip).IsNotNull().And.Contains("Bo").And.Contains("idle 15m"); + await Assert.That(clientSaw.Count).IsEqualTo(2).Because("only the right click is handed on, pressed and released"); + await Assert.That(clientSaw[0]).Contains(MouseFlags.Button3Pressed); + } + + [Test] + public async Task AShortPaneSaysHowManyTheListCouldNotShow() + { + var (rows, overflow) = await Run((window, view, layer, driver) => + { + var many = WhoHereModel.From("Hall", Enumerable.Range(0, 20).Select(i => new RoomOccupant($"P{i}", $"P{i}", true)).ToList()); + ((IPointerPresenter)driver.Pointer).Panels([new PanelOverlay(PanelIds.WhoHere, "panel:who:demo", new PaneRect(0, 1, 30, 6), Ink, null, WhoHere: many, Pick: _ => { })]); + Drain(); + window.UpdateLayout(); + var list = layer.WhoHere.Values.Single(); + return (list.Rows.Count, list.Overflow); + }, columns: 40, rows: 10); + + await Assert.That(rows).IsGreaterThan(0).And.IsLessThan(20); + await Assert.That(overflow).IsEqualTo($"… and {20 - rows} more"); + } + + [Test] + public async Task TheQuickBarIsAButtonPerBindingWithTheLinkAndAClickReachesThePickNotTheDriver() + { + var (barRect, paneRect, kinds, picked, dispatched, clientSaw) = await Run((window, view, layer, driver) => + { + var picked = new List(); + var dispatched = new List(); + ((IPointerPresenter)driver.Pointer).Panels( + [new PanelOverlay(PanelIds.QuickBar, "panel:quickbar:demo", new PaneRect(0, 8, 100, 1), Ink, null, QuickBar: Bar, Pick: picked.Add, Dispatch: dispatched.Add)]); + Drain(); + window.UpdateLayout(); + var bar = layer.QuickBars.Values.Single(); + var cell = view.SizeFor(1, 1); + var paneRect = new Rect(0, 8 * cell.Height, 100 * cell.Width, cell.Height); + var barRect = new Rect(Canvas.GetLeft(bar), Canvas.GetTop(bar), bar.Bounds.Width, bar.Bounds.Height); + var clientSaw = new List>(); + driver.MouseEvent += (_, flags, _) => clientSaw.Add(flags); + + void Click(QuickBarButtons.Slot slot) + { + var at = bar.TranslatePoint(slot.Rect.Center, window)!.Value; + window.MouseDown(at, MouseButton.Left); + window.MouseUp(at, MouseButton.Left); + } + + var slots = bar.Slots.ToList(); + Click(slots.Single(s => s.Kind == QuickBarButtons.SlotKind.Item && s.Index == 2)); + Click(slots.Single(s => s.Kind == QuickBarButtons.SlotKind.Edit)); + return (barRect, paneRect, slots.Select(s => s.Kind).ToArray(), picked, dispatched, clientSaw); + }, columns: 100, rows: 10); + + await Assert.That(barRect).IsEqualTo(paneRect); + await Assert.That(kinds.Count(k => k == QuickBarButtons.SlotKind.Item)).IsEqualTo(5).Because("every binding fits a wide bar"); + await Assert.That(kinds).Contains(QuickBarButtons.SlotKind.Edit); + await Assert.That(kinds).DoesNotContain(QuickBarButtons.SlotKind.More); + await Assert.That(picked).IsEquivalentTo(new[] { 2 }); + await Assert.That(dispatched).IsEquivalentTo(new[] { QuickBarModel.EditCommand }); + await Assert.That(clientSaw).IsEmpty().Because("a left click on the bar is the bar's"); + } + + [Test] + public async Task ANarrowBarPutsWhatDoesNotFitUnderPlusNAndItsMenuPicksOnTheSameIndex() + { + var (more, overflowed, menu, picked) = await Run((window, view, layer, driver) => + { + var picked = new List(); + ((IPointerPresenter)driver.Pointer).Panels( + [new PanelOverlay(PanelIds.QuickBar, "panel:quickbar:demo", new PaneRect(0, 8, 40, 1), Ink, null, QuickBar: Bar, Pick: picked.Add, Dispatch: _ => { })]); + Drain(); + window.UpdateLayout(); + var bar = layer.QuickBars.Values.Single(); + var more = bar.Slots.Single(s => s.Kind == QuickBarButtons.SlotKind.More); + var overflowed = bar.Overflowed.ToArray(); + bar.PerformClick(more); + Drain(); + var items = bar.OpenedMenu!.Items.OfType().ToList(); + items[^1].RaiseEvent(new global::Avalonia.Interactivity.RoutedEventArgs(MenuItem.ClickEvent)); + bar.OpenedMenu.Close(); + return (more, overflowed, items.Count, picked); + }, columns: 40, rows: 10); + + await Assert.That(overflowed.Length).IsGreaterThan(0); + await Assert.That(more.Index).IsEqualTo(overflowed.Length).Because("+N counts what it holds"); + await Assert.That(menu).IsEqualTo(overflowed.Length); + await Assert.That(picked).IsEquivalentTo(new[] { overflowed[^1] }); + } + + [Test] + public async Task NeitherNativePanelTakesKeyboardFocus() + { + var (whoFocusable, barFocusable, viewFocused) = await Run((window, view, layer, driver) => + { + ((IPointerPresenter)driver.Pointer).Panels( + [ + new PanelOverlay(PanelIds.WhoHere, "panel:who:demo", new PaneRect(0, 1, 20, 6), Ink, null, WhoHere: Who, Pick: _ => { }), + new PanelOverlay(PanelIds.QuickBar, "panel:quickbar:demo", new PaneRect(20, 8, 40, 1), Ink, null, QuickBar: Bar, Pick: _ => { }, Dispatch: _ => { }), + ]); + Drain(); + window.UpdateLayout(); + var list = layer.WhoHere.Values.Single(); + var bar = layer.QuickBars.Values.Single(); + var at = list.TranslatePoint(list.Rows[0].Rect.Center, window)!.Value; + window.MouseDown(at, MouseButton.Left); + window.MouseUp(at, MouseButton.Left); + var b = bar.TranslatePoint(bar.Slots[0].Rect.Center, window)!.Value; + window.MouseDown(b, MouseButton.Left); + window.MouseUp(b, MouseButton.Left); + return (list.Focusable, bar.Focusable, view.IsFocused); + }, columns: 60, rows: 10); + + await Assert.That(whoFocusable).IsFalse(); + await Assert.That(barFocusable).IsFalse(); + await Assert.That(viewFocused).IsTrue(); + } + + [Test] + public async Task ANativePanelGoesWhenItLeavesTheScreen() + { + var (shown, after) = await Run((window, view, layer, driver) => + { + ((IPointerPresenter)driver.Pointer).Panels( + [ + new PanelOverlay(PanelIds.WhoHere, "panel:who:demo", new PaneRect(0, 1, 20, 6), Ink, null, WhoHere: Who, Pick: _ => { }), + new PanelOverlay(PanelIds.QuickBar, "panel:quickbar:demo", new PaneRect(20, 8, 20, 1), Ink, null, QuickBar: Bar, Pick: _ => { }, Dispatch: _ => { }), + ]); + Drain(); + var shown = layer.WhoHere.Count + layer.QuickBars.Count; + ((IPointerPresenter)driver.Pointer).Panels([]); + Drain(); + return (shown, layer.WhoHere.Count + layer.QuickBars.Count); + }); + + await Assert.That(shown).IsEqualTo(2); + await Assert.That(after).IsEqualTo(0); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/TerminalPanelTests.cs b/tests/SharpMUTerm.Tui.Tests/TerminalPanelTests.cs index 039a496a..fd1e35fa 100644 --- a/tests/SharpMUTerm.Tui.Tests/TerminalPanelTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/TerminalPanelTests.cs @@ -121,8 +121,8 @@ public async Task TheQuickBarListsFunctionKeysPlainFirstAndByNumber() { var entries = QuickBarRenderer.Entries(Bindings, Resolve); - await Assert.That(entries.Select(e => e.Key)).IsEquivalentTo(new[] { "F11", "F12", "⌃F3" }); - await Assert.That(entries[2].Name).IsEqualTo("cast 'cure light'"); + await Assert.That(entries.Items.Select(e => e.Key)).IsEquivalentTo(new[] { "F11", "F12", "⌃F3" }); + await Assert.That(entries.Items[2].Title).IsEqualTo("cast 'cure light'"); } [Test] From 766567032e5491647d6209f223b1a947c15d04d7 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 06:15:42 +0000 Subject: [PATCH 022/113] Open a native command palette on Ctrl+P in the desktop window The window host gets ClientHost.NativePalette (INativePalette, null in the terminal, snapshot, tests and parity harness). ToggleMenu/OpenMenu are the one funnel: Ctrl+P, the native header's search box and brand, the pointer menu's new "More commands..." entry and the menu* views all ask the host first. The client captures a PaletteSession (Client) on its own thread; the window's PaletteOverlay filters it with CommandPaletteModel, so both hosts list the same rows, and runs the chosen id back through RunFromPalette so recents are recorded identically. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 5 + CLAUDE.md | 27 +- .../AvaloniaConsoleDriver.cs | 3 + src/SharpMUTerm.Avalonia/MainWindow.cs | 3 + src/SharpMUTerm.Avalonia/PaletteOverlay.cs | 493 ++++++++++++++++++ src/SharpMUTerm.Avalonia/PalettePresenter.cs | 77 +++ src/SharpMUTerm.Avalonia/WindowHost.cs | 3 + .../Palette/PaletteSession.cs | 111 ++++ src/SharpMUTerm.Tui/Hosting/ClientHost.cs | 9 + src/SharpMUTerm.Tui/Hosting/INativePalette.cs | 21 + .../Pointer/SharpMUTermApp.Chrome.cs | 5 +- .../Pointer/SharpMUTermApp.Pointer.cs | 11 + .../SharpMUTermApp.NativePalette.cs | 104 ++++ src/SharpMUTerm.Tui/SharpMUTermApp.cs | 29 +- .../HostParityTests.cs | 4 +- .../NativePaletteTests.cs | 213 ++++++++ .../PaletteSessionTests.cs | 73 +++ .../NativePaletteRoutingTests.cs | 210 ++++++++ 18 files changed, 1385 insertions(+), 16 deletions(-) create mode 100644 src/SharpMUTerm.Avalonia/PaletteOverlay.cs create mode 100644 src/SharpMUTerm.Avalonia/PalettePresenter.cs create mode 100644 src/SharpMUTerm.Client/Palette/PaletteSession.cs create mode 100644 src/SharpMUTerm.Tui/Hosting/INativePalette.cs create mode 100644 src/SharpMUTerm.Tui/SharpMUTermApp.NativePalette.cs create mode 100644 tests/SharpMUTerm.Avalonia.Tests/NativePaletteTests.cs create mode 100644 tests/SharpMUTerm.Client.Tests/PaletteSessionTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/NativePaletteRoutingTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d72e617..3fad42b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,11 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- Desktop window: Ctrl+P opens a native command palette, a rounded popup near the top of the window with a + search box, grouped results, the matched letters highlighted and each command's key on the right. It lists + the same commands in the same order as the terminal's palette, recent and suggested first. Arrow keys and the + mouse choose, Enter runs, Escape closes and returns you to the command line. The header's search box and a new + *More commands…* entry at the foot of every right-click menu open it too. - Desktop window: F7 (Text & display) and F8 (Input) open a settings window with real switches, number boxes and a search box. Matches are counted per section as you type. A changed setting shows a dot and a Reset button, and every change applies and saves as you make it. The status-row meters are a table that shows each diff --git a/CLAUDE.md b/CLAUDE.md index aa95d2fc..af7b7265 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -1188,7 +1188,8 @@ The terminal (`sharpmuterm`), the desktop window (`sharpmuterm-window`) and the one `SharpMUTermApp`; a host is only the place it runs. What differs between hosts is a **`ClientHost`** (`src/SharpMUTerm.Tui/Hosting/`): driver, capabilities, clipboard, URL opener, focus reporting, keys (`HostKeys`: the newline chord, and the chords the host keeps for itself), whether there is a main loop, -the Sixel cell size, and what it does with the pointer (`IPointerPresenter`, null for none), and whether it draws the declared settings natively (`INativeSettings`, null for the cell screens). Built by `ClientHost.Terminal`, `ClientHost.Headless`/`Snapshot` and +the Sixel cell size, and what it does with the pointer (`IPointerPresenter`, null for none), whether it draws the declared settings natively (`INativeSettings`, null for the cell screens), and whether it +draws ⌃P natively (`INativePalette`, null for the cell popup). Built by `ClientHost.Terminal`, `ClientHost.Headless`/`Snapshot` and `WindowHost.Create` (Avalonia). Four things keep a feature from landing in one host only: - **Every `ClientHost` and `HostKeys` member is `required`**, so a member added there does not compile until @@ -1566,6 +1567,30 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] native menu and tooltips were built against. - Not done: the window is not modal and does not follow a theme change while it is open. Screenshots come from a real window under Xvfb, driven with XTest (`ux-wave4/native-settings-*.png`). +- **In the window, ⌃P is a native palette over the window, listing the cell palette's rows** (`ClientHost.NativePalette` + → `INativePalette`; Client `PaletteSession`; Avalonia `PaletteOverlay`, `PalettePresenter` on the driver; + `SharpMUTermApp.NativePalette.cs`). The terminal, the snapshot, the tests and the parity harness pass null. Decisions + not to relitigate: + - **One funnel**: `ToggleMenu` (⌃P, the header ☰ link) and `OpenMenu` (the native header's search box and brand + through `ActivateChromeTarget`, the pointer menu's last entry *More commands…*, the `menu*` snapshot views) ask + `TryOpenNativePalette` first. ⌃P is a toggle in both. The composer refusal is `ToggleMenu`'s, so it holds for both. + `PaletteIsOpen` (either palette) feeds `AnyOverlayOpen`, `OpenOverlayName`, `MenuIsOpen` and the header's caret. + - **The session is captured on the client's thread** — catalog, recents, suggestions, `acting on`, dark or light, + an opening query — so the window filters with `CommandPaletteModel.Build` on its own thread and locks nothing. + The rows are therefore the cell palette's for the same query (`NativePaletteTests.TheRowsAreTheModelsForTheSameQuery`). + - **Running goes back through the session**: `Run` closes, then the client runs `RunFromPalette` on its own thread, + so recents are recorded exactly as from the cells. A session runs once and closes once; a session an earlier + opening left behind is ignored when it reports closing. + - **It is an overlay, not a window**: `PalettePresenter.Attach(root, refocus)` from `MainWindow`, and the overlay is + added as the root panel's *last* child when it opens, so it lies over the cells, `DesktopLayer`'s panels and the + native chrome. A scrim covers the rest; a press on it closes. Closing gives the keyboard back to `TerminalView`, + which is the client's command line by the focus pin. Fluent is applied to the card alone (`ThemeVariantScope`), + in the client's variant. + - **Keys are words** (`KeyGlyphs.Words`, as the native chrome does): the UI font draws `Ctrl+⏎` better than `⌃⏎`, + and the window's catalog already carries the window's newline. A sequence (`⌃B |`) is one chip per key. + - **Hover selects on movement only** (`PointerMoved`, not `PointerEntered`), so the row that opens under a resting + pointer is not chosen. ↑↓ wrap as in the cells; PgUp/PgDn stop at the ends. + - Screenshots from a real window under Xvfb, driven with XTest (`ux-wave5/native-palette-*.png`). - **Settings screens have no `IPasteTarget` and cannot easily have one.** They are markup rebuilt wholesale every key, with the edited field a buffer in `SettingsSession`. `SettingsOverlay` listens at `IConsoleDriver.Paste` instead. That can't double-fire *only* because no control on diff --git a/src/SharpMUTerm.Avalonia/AvaloniaConsoleDriver.cs b/src/SharpMUTerm.Avalonia/AvaloniaConsoleDriver.cs index 684b33fd..e3aa00fb 100644 --- a/src/SharpMUTerm.Avalonia/AvaloniaConsoleDriver.cs +++ b/src/SharpMUTerm.Avalonia/AvaloniaConsoleDriver.cs @@ -73,6 +73,9 @@ public AvaloniaConsoleDriver(int columns, int rows) /// The window's native settings window, which the main window owns (). public SettingsPresenter Settings { get; } = new(); + /// The window's native ⌃P, drawn over everything in the main window (). + public PalettePresenter Palette { get; } = new(); + public bool IsRunning { get; private set; } // ── IConsoleDriver: output ──────────────────────────────────────────────────────────────── diff --git a/src/SharpMUTerm.Avalonia/MainWindow.cs b/src/SharpMUTerm.Avalonia/MainWindow.cs index ffdabba3..6e50935d 100644 --- a/src/SharpMUTerm.Avalonia/MainWindow.cs +++ b/src/SharpMUTerm.Avalonia/MainWindow.cs @@ -65,6 +65,9 @@ public MainWindow(WindowOptions options, IClassicDesktopStyleApplicationLifetime // The window's native views over the cells: the header's Layouts button and native panels (DesktopLayer). root.Children.Add(new DesktopLayer(_view)); + + // ⌃P, over everything above; it is added last when it opens, and gives the keyboard back to the cells. + _driver.Palette.Attach(root, () => _view.Focus()); Content = root; AutomationProperties.SetName(_view, "SharpMUTerm"); var size = _view.SizeFor(options.Columns, options.Rows); diff --git a/src/SharpMUTerm.Avalonia/PaletteOverlay.cs b/src/SharpMUTerm.Avalonia/PaletteOverlay.cs new file mode 100644 index 00000000..0f674b7a --- /dev/null +++ b/src/SharpMUTerm.Avalonia/PaletteOverlay.cs @@ -0,0 +1,493 @@ +using Avalonia; +using Avalonia.Automation; +using Avalonia.Controls; +using Avalonia.Controls.Documents; +using Avalonia.Controls.Primitives; +using Avalonia.Input; +using Avalonia.Interactivity; +using Avalonia.Layout; +using Avalonia.Media; +using Avalonia.Styling; +using Avalonia.Themes.Fluent; +using SharpMUTerm.Client.Palette; + +namespace SharpMUTerm.Avalonia; + +/// +/// The window's ⌃P: a rounded card near the top of the window over a faint scrim, with a search box that has the +/// keyboard, the status line the cell palette leads with, and the rows of — group +/// headers, each entry's title with the matched characters in the accent, its detail dimmed, and its key in a +/// right-aligned column in the host's words (). ↑↓ and PgUp/PgDn walk the entries, +/// ⏎ runs the selected one, Esc (or ⌃P, or a click outside the card) closes. The pointer selects what it hovers +/// and runs what it clicks. +/// +/// It lies over everything else in the window — cells, native panels and chrome — because it is the last child of +/// the window's root panel. Fluent is applied to the card only, and its variant follows the client's theme. +/// +/// +internal sealed class PaletteOverlay : Panel +{ + /// The widest the card is drawn. + private const double CardWidth = 680; + + /// How far below the window's top the card sits. + private const double CardTop = 56; + + private readonly PaletteSession _session; + private readonly Action _remove; + private readonly Colours _colours; + private readonly Border _card; + private readonly TextBox _search; + private readonly TextBlock _status; + private readonly StackPanel _list; + private readonly ScrollViewer _scroller; + private readonly List _entryRows = []; + private readonly List _rowTexts = []; + private readonly List _keyTexts = []; + private PaletteView _view; + private int _selected = -1; + + /// What to list, and where a choice goes. + /// Takes the overlay out of the window and gives the keyboard back to the cells. + public PaletteOverlay(PaletteSession session, Action remove) + { + _session = session; + _remove = remove; + _colours = session.IsDark ? Colours.Dark : Colours.Light; + _view = session.View(string.Empty); + + Background = new SolidColorBrush(_colours.Scrim); + Focusable = false; + AutomationProperties.SetName(this, "Command palette"); + + _search = new TextBox + { + PlaceholderText = "Type a command, a character, a window or a setting", + FontSize = 16, + Margin = new Thickness(14, 14, 14, 6), + Padding = new Thickness(12, 9), + CornerRadius = new CornerRadius(8), + }; + AutomationProperties.SetName(_search, "Search commands"); + _search.TextChanged += (_, _) => Refresh(resetSelection: true); + DockPanel.SetDock(_search, Dock.Top); + + _status = new TextBlock + { + FontSize = 12, + Foreground = new SolidColorBrush(_colours.Dim), + Margin = new Thickness(20, 0, 20, 6), + }; + DockPanel.SetDock(_status, Dock.Top); + + var footer = new TextBlock + { + Text = "↑↓ move ⏎ run Esc close", + FontSize = 11.5, + Foreground = new SolidColorBrush(_colours.Dim), + Margin = new Thickness(20, 6, 20, 10), + HorizontalAlignment = HorizontalAlignment.Right, + }; + DockPanel.SetDock(footer, Dock.Bottom); + + _list = new StackPanel { Margin = new Thickness(8, 0, 8, 4) }; + _scroller = new ScrollViewer + { + Content = _list, + HorizontalScrollBarVisibility = ScrollBarVisibility.Disabled, + VerticalScrollBarVisibility = ScrollBarVisibility.Auto, + }; + + var dock = new DockPanel { LastChildFill = true }; + dock.Children.Add(_search); + dock.Children.Add(_status); + dock.Children.Add(footer); + dock.Children.Add(new Border + { + BorderBrush = new SolidColorBrush(_colours.Rule), + BorderThickness = new Thickness(0, 1, 0, 1), + Child = _scroller, + }); + + _card = new Border + { + Background = new SolidColorBrush(_colours.Card), + BorderBrush = new SolidColorBrush(_colours.Edge), + BorderThickness = new Thickness(1), + CornerRadius = new CornerRadius(12), + BoxShadow = BoxShadows.Parse("0 16 40 0 #66000000"), + ClipToBounds = true, + Child = dock, + }; + + // Fluent for the card alone, in the client's variant; the rest of the window keeps the Simple theme its + // menus and tooltips were built against. + var scope = new ThemeVariantScope + { + RequestedThemeVariant = session.IsDark ? ThemeVariant.Dark : ThemeVariant.Light, + HorizontalAlignment = HorizontalAlignment.Center, + VerticalAlignment = VerticalAlignment.Top, + Margin = new Thickness(16, CardTop, 16, 16), + Child = _card, + }; + scope.Styles.Add(new FluentTheme()); + Children.Add(scope); + + AddHandler(KeyDownEvent, OnKey, RoutingStrategies.Tunnel); + PointerPressed += OnScrimPressed; + SizeChanged += (_, _) => Fit(); + Loaded += (_, _) => _search.Focus(); + + _search.Text = session.InitialQuery; + _search.CaretIndex = session.InitialQuery.Length; + Refresh(resetSelection: true); + } + + /// The session shown. + public PaletteSession Session => _session; + + /// The search box, which has the keyboard while the palette is open. + public TextBox SearchBox => _search; + + /// The card, for a test that measures where it sits. + public Border Card => _card; + + /// What is listed now: the model's view for the query in the box. + public PaletteView View => _view; + + /// The selected entry's index in , or -1 with nothing listed. + public int Selected => _selected; + + /// Each row as drawn, in order: a header's label, an entry's title. + public IReadOnlyList RowTexts => _rowTexts; + + /// Each entry's key column as drawn, in entry order; null where the entry has no key. + public IReadOnlyList KeyTexts => _keyTexts; + + /// The drawn row of each entry, in entry order, for a test that hovers or clicks one. + public IReadOnlyList EntryRows => _entryRows; + + /// The line over the list. + public string StatusText => _status.Text ?? string.Empty; + + /// Runs the selected entry, as ⏎ does. + public void Commit() + { + if (_selected < 0 || _selected >= _view.Entries.Count) + { + return; + } + + var id = _view.Entries[_selected].Item.Id; + _remove(this); + _session.Run(id); + } + + /// Closes without running anything, as Esc does. + public void Dismiss() + { + _remove(this); + _session.Dismiss(); + } + + /// Moves the selection by entries, wrapping as the cell palette does. + public void Move(int delta) + { + var count = _view.Entries.Count; + if (count == 0) + { + return; + } + + Select(((_selected + delta) % count + count) % count, reveal: true); + } + + private void Fit() + { + var width = Math.Max(240, Math.Min(CardWidth, Bounds.Width - 32)); + _card.Width = width; + _card.MaxHeight = Math.Max(160, Bounds.Height - CardTop - 32); + } + + private void Refresh(bool resetSelection) + { + _view = _session.View(_search.Text ?? string.Empty); + _status.Text = _session.Status(_view); + _list.Children.Clear(); + _entryRows.Clear(); + _rowTexts.Clear(); + _keyTexts.Clear(); + + var first = true; + foreach (var row in _view.Rows) + { + switch (row) + { + case PaletteHeader header: + _rowTexts.Add(header.Label); + _list.Children.Add(new TextBlock + { + Text = header.Label, + FontSize = 11, + FontWeight = FontWeight.SemiBold, + LetterSpacing = 0.8, + Foreground = new SolidColorBrush(_colours.Header), + Margin = new Thickness(12, first ? 8 : 14, 12, 4), + }); + break; + case PaletteEntry entry: + _rowTexts.Add(entry.Item.Title); + var key = entry.Key is null ? null : KeyGlyphs.Words(entry.Key); + _keyTexts.Add(key); + var drawn = EntryRow(entry, key, _entryRows.Count); + _entryRows.Add(drawn); + _list.Children.Add(drawn); + break; + } + + first = false; + } + + if (_view.Entries.Count == 0) + { + _list.Children.Add(new TextBlock + { + Text = "No matching commands", + Foreground = new SolidColorBrush(_colours.Dim), + Margin = new Thickness(12, 14), + }); + } + + var selected = resetSelection ? 0 : _selected; + _selected = -1; + if (_view.Entries.Count > 0) + { + Select(Math.Clamp(selected, 0, _view.Entries.Count - 1), reveal: false); + _scroller.Offset = default; + } + } + + private Border EntryRow(PaletteEntry entry, string? key, int index) + { + var title = new TextBlock + { + FontSize = 14, + Foreground = new SolidColorBrush(_colours.Text), + VerticalAlignment = VerticalAlignment.Center, + TextTrimming = TextTrimming.CharacterEllipsis, + }; + title.Inlines = TitleInlines(entry); + + var left = new DockPanel { LastChildFill = true }; + if (entry.Detail is { Length: > 0 } detail) + { + var words = new TextBlock + { + Text = detail, + FontSize = 12.5, + Foreground = new SolidColorBrush(_colours.Dim), + Margin = new Thickness(12, 0, 0, 0), + VerticalAlignment = VerticalAlignment.Center, + TextTrimming = TextTrimming.CharacterEllipsis, + }; + DockPanel.SetDock(title, Dock.Left); + left.Children.Add(title); + left.Children.Add(words); + } + else + { + left.Children.Add(title); + } + + var grid = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto") }; + grid.Children.Add(left); + if (key is not null) + { + // A sequence (⌃B |) is a chip per key, so the second key does not read as a caret in the first. + var chips = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 4, Margin = new Thickness(16, 0, 0, 0) }; + foreach (var part in key.Split(' ', StringSplitOptions.RemoveEmptyEntries)) + { + chips.Children.Add(new Border + { + Background = new SolidColorBrush(_colours.KeyFill), + BorderBrush = new SolidColorBrush(_colours.Edge), + BorderThickness = new Thickness(1), + CornerRadius = new CornerRadius(5), + Padding = new Thickness(7, 1), + VerticalAlignment = VerticalAlignment.Center, + Child = new TextBlock { Text = part, FontSize = 12, Foreground = new SolidColorBrush(_colours.KeyInk) }, + }); + } + + Grid.SetColumn(chips, 1); + grid.Children.Add(chips); + } + + var row = new Border + { + CornerRadius = new CornerRadius(7), + Padding = new Thickness(12, 7), + Background = Brushes.Transparent, + Child = grid, + Cursor = new Cursor(StandardCursorType.Hand), + }; + AutomationProperties.SetName(row, entry.Item.Title); + // On movement only: a row that appears under a pointer resting where the card opened is not chosen. + row.PointerMoved += (_, _) => Select(index, reveal: false); + row.PointerPressed += (_, e) => + { + e.Handled = true; + if (e.GetCurrentPoint(row).Properties.IsLeftButtonPressed) + { + Select(index, reveal: false); + Commit(); + } + }; + return row; + } + + private InlineCollection TitleInlines(PaletteEntry entry) + { + var text = entry.Item.Title; + var inlines = new InlineCollection(); + var at = 0; + foreach (var range in entry.TitleMatches) + { + if (range.Start < at || range.Start + range.Length > text.Length) + { + continue; + } + + if (range.Start > at) + { + inlines.Add(new Run(text[at..range.Start])); + } + + inlines.Add(new Run(text.Substring(range.Start, range.Length)) + { + FontWeight = FontWeight.Bold, + Foreground = new SolidColorBrush(_colours.Accent), + }); + at = range.Start + range.Length; + } + + if (at < text.Length) + { + inlines.Add(new Run(text[at..])); + } + + return inlines; + } + + private void Select(int index, bool reveal) + { + if (index == _selected) + { + return; + } + + if (_selected >= 0 && _selected < _entryRows.Count) + { + _entryRows[_selected].Background = Brushes.Transparent; + } + + _selected = index; + if (index >= 0 && index < _entryRows.Count) + { + var row = _entryRows[index]; + row.Background = new SolidColorBrush(_colours.Selected); + if (reveal) + { + row.BringIntoView(); + } + } + } + + private void OnKey(object? sender, KeyEventArgs e) + { + switch (e.Key) + { + case Key.Down: + Move(1); + break; + case Key.Up: + Move(-1); + break; + case Key.PageDown: + Page(1); + break; + case Key.PageUp: + Page(-1); + break; + case Key.Enter: + Commit(); + break; + case Key.Escape: + Dismiss(); + break; + case Key.P when e.KeyModifiers == KeyModifiers.Control: + // ⌃P is a toggle in the cell palette too. + Dismiss(); + break; + default: + return; + } + + e.Handled = true; + } + + /// Moves about a screenful of entries; a page stops at either end rather than wrapping. + private void Page(int direction) + { + var count = _view.Entries.Count; + if (count == 0) + { + return; + } + + var rowHeight = _entryRows[0].Bounds.Height > 0 ? _entryRows[0].Bounds.Height : 32; + var page = (int)Math.Max(1, (_scroller.Viewport.Height / rowHeight) - 1); + Select(Math.Clamp(_selected + (direction * page), 0, count - 1), reveal: true); + } + + private void OnScrimPressed(object? sender, PointerPressedEventArgs e) + { + // Only a press on the scrim itself; one on the card has already been handled or belongs to the card. + if (ReferenceEquals(e.Source, this)) + { + e.Handled = true; + Dismiss(); + } + } + + /// The card's colours, one set per variant: the client's accent marks a match, as in the cells. + private sealed record Colours( + Color Scrim, Color Card, Color Edge, Color Rule, Color Text, Color Dim, Color Header, Color Selected, Color Accent, Color KeyFill, Color KeyInk) + { + public static Colours Dark { get; } = new( + Color.FromArgb(0x59, 0, 0, 0), + Color.Parse("#1e1e25"), + Color.Parse("#3a3a46"), + Color.Parse("#2c2c36"), + Color.Parse("#ececf1"), + Color.Parse("#9a9aab"), + Color.Parse("#80808f"), + Color.Parse("#22403a"), + Color.Parse("#00f5b7"), + Color.Parse("#2a2a34"), + Color.Parse("#cfcfdb")); + + public static Colours Light { get; } = new( + Color.FromArgb(0x33, 0, 0, 0), + Color.Parse("#ffffff"), + Color.Parse("#d4d4dd"), + Color.Parse("#e6e6ec"), + Color.Parse("#1d1d24"), + Color.Parse("#626270"), + Color.Parse("#7a7a88"), + Color.Parse("#d5efe7"), + Color.Parse("#007a63"), + Color.Parse("#f1f1f5"), + Color.Parse("#40404c")); + } +} diff --git a/src/SharpMUTerm.Avalonia/PalettePresenter.cs b/src/SharpMUTerm.Avalonia/PalettePresenter.cs new file mode 100644 index 00000000..a3aa6ae0 --- /dev/null +++ b/src/SharpMUTerm.Avalonia/PalettePresenter.cs @@ -0,0 +1,77 @@ +using Avalonia.Controls; +using Avalonia.Threading; +using SharpMUTerm.Client.Palette; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Avalonia; + +/// +/// The window host's : one at a time, added as the last child +/// of the window's root panel so it lies over the cells, the native panels and the chrome. The client calls in on its +/// own thread, so everything here is posted to the window's. When the palette goes, the keyboard goes back to the +/// cells — which is the client's command line, since the client pins its focus there. +/// +internal sealed class PalettePresenter : INativePalette +{ + private Panel? _host; + private Action? _refocus; + private PaletteOverlay? _overlay; + + /// The open palette, for a test; read on the window's thread. + public PaletteOverlay? Overlay => _overlay; + + /// + /// Where the palette is drawn, and what takes the keyboard back when it closes. Set once by the main window (or a + /// test), on the window's thread. + /// + public void Attach(Panel host, Action refocus) + { + _host = host; + _refocus = refocus; + } + + public void Show(PaletteSession session) => Dispatcher.UIThread.Post(() => ShowNow(session)); + + public void Close() => Dispatcher.UIThread.Post(() => + { + if (_overlay is { } open) + { + Remove(open); + } + }); + + /// Shows now, replacing a palette already open; on the window's thread. + internal PaletteOverlay? ShowNow(PaletteSession session) + { + if (_overlay is { } open) + { + Remove(open); + open.Session.Dismiss(); + } + + if (_host is not { } host) + { + // Nowhere to draw it: say it closed, so the client is not left thinking a palette is up. + session.Dismiss(); + return null; + } + + var overlay = new PaletteOverlay(session, Remove); + _overlay = overlay; + host.Children.Add(overlay); + overlay.SearchBox.Focus(); + return overlay; + } + + private void Remove(PaletteOverlay overlay) + { + if (!ReferenceEquals(_overlay, overlay)) + { + return; + } + + _overlay = null; + _host?.Children.Remove(overlay); + _refocus?.Invoke(); + } +} diff --git a/src/SharpMUTerm.Avalonia/WindowHost.cs b/src/SharpMUTerm.Avalonia/WindowHost.cs index e973767b..1fc9b08d 100644 --- a/src/SharpMUTerm.Avalonia/WindowHost.cs +++ b/src/SharpMUTerm.Avalonia/WindowHost.cs @@ -59,5 +59,8 @@ internal static class WindowHost // F7 and F8 open a native settings window generated from their declarations; the rest stay cell screens. NativeSettings = driver.Settings, + + // ⌃P is a native palette over the window, listing the same rows as the cell one. + NativePalette = driver.Palette, }; } diff --git a/src/SharpMUTerm.Client/Palette/PaletteSession.cs b/src/SharpMUTerm.Client/Palette/PaletteSession.cs new file mode 100644 index 00000000..664128bd --- /dev/null +++ b/src/SharpMUTerm.Client/Palette/PaletteSession.cs @@ -0,0 +1,111 @@ +using SharpMUTerm.Core.Commands; + +namespace SharpMUTerm.Client.Palette; + +/// +/// One opening of ⌃P, for a host that draws the palette with its own controls. Everything that depends on the +/// client's state is captured when it opens, on the client's thread — the catalog, the recent ids, the suggested +/// ones and whose session the entries act on — so a host can filter it on its own thread with nothing to lock. +/// is over that capture, so a native palette lists the +/// same rows in the same order as the cell one for the same query. +/// +/// Running an entry and closing go back through two delegates the client supplies; the client marshals them onto +/// its own thread and runs the entry through the cell palette's own path (RunFromPalette), so recents are +/// recorded exactly as they are there. Each session runs at most one entry and closes once. +/// +/// +public sealed class PaletteSession +{ + private readonly IReadOnlyList _catalog; + private readonly IReadOnlyList _recent; + private readonly IReadOnlyList _suggested; + private readonly Action _run; + private readonly Action _closed; + private int _ended; + + /// Every entry offered when the palette opened, in registration order. + /// Ids run from the palette, newest first. + /// Ids the client's state makes likely (). + /// Whose session the entries act on, or null; the cell palette's acting on. + /// Whether the client's theme is a dark one, so the host can follow it. + /// What the palette opens with typed in; empty for nothing. + /// Runs an entry by id; called once, from any thread. + /// Told the palette closed, whether or not an entry ran; called once, from any thread. + public PaletteSession( + IReadOnlyList catalog, + IReadOnlyList recent, + IReadOnlyList suggested, + string? context, + bool isDark, + string initialQuery, + Action run, + Action closed) + { + ArgumentNullException.ThrowIfNull(initialQuery); + ArgumentNullException.ThrowIfNull(catalog); + ArgumentNullException.ThrowIfNull(recent); + ArgumentNullException.ThrowIfNull(suggested); + ArgumentNullException.ThrowIfNull(run); + ArgumentNullException.ThrowIfNull(closed); + _catalog = catalog.ToArray(); + _recent = recent.ToArray(); + _suggested = suggested.ToArray(); + _run = run; + _closed = closed; + Context = context; + IsDark = isDark; + InitialQuery = initialQuery; + } + + /// What the palette opens with typed in its box; empty for nothing. + public string InitialQuery { get; } + + /// Whose session the entries act on, or null. + public string? Context { get; } + + /// Whether the client's theme is a dark one. + public bool IsDark { get; } + + /// How many entries the catalog held when the palette opened. + public int Total => _catalog.Count; + + /// Whether or has been called. + public bool IsEnded => Volatile.Read(ref _ended) != 0; + + /// The rows for : exactly what the cell palette lists for it. + public PaletteView View(string query) => + CommandPaletteModel.Build(query ?? string.Empty, _catalog, _recent, _suggested); + + /// + /// The line over the list, in the cell palette's words: 12 of 80 acting on Aetherfall.Corvid. + /// + public string Status(PaletteView view) + { + ArgumentNullException.ThrowIfNull(view); + var count = $"{view.Entries.Count} of {view.Total}"; + return string.IsNullOrEmpty(Context) ? count : $"{count} acting on {Context}"; + } + + /// Closes the palette and runs . Ignored once the session has ended. + public void Run(string id) + { + ArgumentNullException.ThrowIfNull(id); + if (Interlocked.Exchange(ref _ended, 1) != 0) + { + return; + } + + // Closed first, as the cell palette closes before it dispatches: the entry may open another surface. + _closed(); + _run(id); + } + + /// Closes the palette without running anything. Ignored once the session has ended. + public void Dismiss() + { + if (Interlocked.Exchange(ref _ended, 1) == 0) + { + _closed(); + } + } +} diff --git a/src/SharpMUTerm.Tui/Hosting/ClientHost.cs b/src/SharpMUTerm.Tui/Hosting/ClientHost.cs index 1e8b37bb..f5d848d4 100644 --- a/src/SharpMUTerm.Tui/Hosting/ClientHost.cs +++ b/src/SharpMUTerm.Tui/Hosting/ClientHost.cs @@ -98,6 +98,13 @@ internal sealed record ClientHost /// public required INativeSettings? NativeSettings { get; init; } + /// + /// Draws ⌃P with the host's own controls, or null for a host whose palette is the cell popup. Every way in (⌃P, + /// the header, the pointer menu's More commands…) goes through one funnel that asks this first. Null in + /// the terminal, the snapshot, the tests and the parity harness, so every cell frame is unchanged. + /// + public required INativePalette? NativePalette { get; init; } + /// /// Whether the terminal driver's input path can decode a focus report. Not on Windows: the Windows branch of /// NetConsoleDriver is a Console.ReadKey loop with its own reassembly, and an ESC [ I @@ -136,6 +143,7 @@ public static ClientHost Terminal(TerminalCapabilities capabilities) Announcer = null, ScreenIsSeen = true, NativeSettings = null, + NativePalette = null, }; /// @@ -159,6 +167,7 @@ public static ClientHost Terminal(TerminalCapabilities capabilities) Announcer = null, ScreenIsSeen = true, NativeSettings = null, + NativePalette = null, }; /// diff --git a/src/SharpMUTerm.Tui/Hosting/INativePalette.cs b/src/SharpMUTerm.Tui/Hosting/INativePalette.cs new file mode 100644 index 00000000..af237441 --- /dev/null +++ b/src/SharpMUTerm.Tui/Hosting/INativePalette.cs @@ -0,0 +1,21 @@ +using SharpMUTerm.Client.Palette; + +namespace SharpMUTerm.Tui; + +/// +/// A host that draws ⌃P with its own controls (the desktop window's native palette) instead of the cell popup. The +/// client hands it a captured on the client's thread; the host filters it with the +/// shared model, and the entry chosen goes back through the session to the cell palette's own dispatch path, so +/// the host only draws. +/// +internal interface INativePalette +{ + /// + /// Shows , replacing a palette already open. Called on the client's thread; the host + /// marshals to its own. + /// + void Show(PaletteSession session); + + /// Closes the palette if it is open, running nothing. Called on the client's thread. + void Close(); +} diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Chrome.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Chrome.cs index 6bb0ac92..36ada1a2 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Chrome.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Chrome.cs @@ -118,10 +118,7 @@ internal bool ActivateChromeTarget(string target) if (target == HeaderModel.PaletteTarget) { // Opens, rather than the ☰'s toggle: a search box is clicked to start typing in it, never to close it. - if (!_palette.IsOpen) - { - ToggleMenu(); - } + OpenMenu(); return true; } diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs index ad4315d7..b683ee27 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs @@ -1,6 +1,7 @@ using System.Runtime.CompilerServices; using SharpConsoleUI.Controls; using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Chrome; using SharpMUTerm.Core.Commands; using SharpMUTerm.Core.Configuration; using SharpMUTerm.Core.Diagnostics; @@ -532,6 +533,9 @@ private void ShowPointerMenu(System.Drawing.Point point) } } + /// The pointer menu's last entry, which opens ⌃P. + internal const string MoreCommandsLabel = "More commands…"; + /// The menu would show. Internal so a test can read it. internal IReadOnlyList PointerMenu(System.Drawing.Point point) { @@ -611,6 +615,13 @@ internal IReadOnlyList PointerMenu(System.Drawing.Point point) break; } + // Everything else is on ⌃P, and the menu says so: the same palette the chord opens, native in the window. + if (items.Count > 0 && target.Kind != PointerKind.Divider) + { + items.Add(PointerMenuItem.Separator); + items.Add(new PointerMenuItem(MoreCommandsLabel, HeaderModel.PaletteKey, () => OnUiThread(() => OpenMenu()))); + } + return Tidy(items); } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.NativePalette.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.NativePalette.cs new file mode 100644 index 00000000..abb9e151 --- /dev/null +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.NativePalette.cs @@ -0,0 +1,104 @@ +using SharpMUTerm.Client.Palette; + +namespace SharpMUTerm.Tui; + +/// +/// ⌃P in a host that draws it natively (). Every way to the palette — ⌃P, the +/// header's brand and search box, the pointer menu's More commands… — ends in or +/// , and those ask the host first. A host without one (the terminal, the snapshot, the tests) +/// gets the cell popup, unchanged. +/// +internal sealed partial class SharpMUTermApp +{ + /// The session the host's palette is showing, or null while it is closed. Read on the client's thread. + private PaletteSession? _nativePaletteSession; + + /// Whether either palette is up: the cell popup or the host's own. + private bool PaletteIsOpen => _palette.IsOpen || _nativePaletteSession is not null; + + /// What SUGGESTED lists right now, in either palette. + internal IReadOnlyList SuggestedCommandIds => CommandPaletteModel.Suggested(CommandState()); + + /// Whether the host's palette is up, for a test. + internal bool NativePaletteIsOpen => _nativePaletteSession is not null; + + /// + /// Opens ⌃P if it is not up — never closes it. For a search box or a menu entry, which is chosen to start + /// searching, never to stop. + /// + /// What the palette opens with typed in; null for nothing. + internal void OpenMenu(string? query = null) + { + if (PaletteIsOpen) + { + return; + } + + _openingQuery = query; + try + { + ToggleMenu(); + } + finally + { + _openingQuery = null; + } + + if (query is not null && _palette.IsOpen) + { + _palette.SetQuery(query); + } + } + + /// The query asked for, while it is opening the palette. + private string? _openingQuery; + + /// + /// Shows the palette in the host's own controls; false when the host has none. The catalog, recents and + /// suggestions are captured here, on the client's thread, so the host can filter on its own. The entry it runs + /// comes back through , the cell palette's own path. + /// + private bool TryOpenNativePalette() + { + if (Host.NativePalette is not { } native) + { + return false; + } + + PaletteSession? session = null; + session = new PaletteSession( + BuildCatalog(), + _recentCommands.Ids, + SuggestedCommandIds, + _active?.SessionKey, + ThemeIsDark(), + _openingQuery ?? string.Empty, + id => OnUiThread(() => RunFromPalette(id)), + () => OnUiThread(() => NativePaletteClosed(session!))); + _nativePaletteSession = session; + native.Show(session); + return true; + } + + /// Closes the host's palette, running nothing. + private void CloseNativePalette() + { + if (_nativePaletteSession is { } session) + { + session.Dismiss(); + Host.NativePalette?.Close(); + } + } + + /// The host's palette has closed; a session an earlier opening left behind is ignored. + private void NativePaletteClosed(PaletteSession session) + { + if (!ReferenceEquals(_nativePaletteSession, session)) + { + return; + } + + _nativePaletteSession = null; + _header.SetContent(new List { HeaderMarkup() }); + } +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 7576598e..4087dce0 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -1769,7 +1769,7 @@ public string RenderSnapshot(string? view = null) RebuildPaneArea(); } - _palette.Toggle(); + OpenMenu(); } // The command surface searched: a real drag across the output first, because "Make a trigger from @@ -1780,8 +1780,7 @@ public string RenderSnapshot(string? view = null) RenderWholeFrame(); SimulatePaneDrag(MainWindowId, 0, 1, 46, 3); ReArmWholeFrame(); - _palette.Toggle(); - _palette.SetQuery("trig sel"); + OpenMenu("trig sel"); } // The command surface opened with nothing typed after two commands were run through the palette's @@ -1790,7 +1789,7 @@ public string RenderSnapshot(string? view = null) { RunFromPalette("layout:split-right"); RunFromPalette("layout:cycle"); - _palette.Toggle(); + OpenMenu(); } // The ⌃B which-key panel over the demo workspace: what the arming timer opens when no key has @@ -5352,7 +5351,7 @@ private void ToggleHistorySearch() /// how the framework happens to dispatch, and the next surface may not be modal. /// private bool AnyOverlayOpen => - _palette.IsOpen || _settings.IsOpen || _quit.IsOpen || _messageLog.IsOpen || _historySearch.IsOpen + PaletteIsOpen || _settings.IsOpen || _quit.IsOpen || _messageLog.IsOpen || _historySearch.IsOpen || _prefixPanel.IsOpen || _composer.IsOpen || _search.IsOpen || _gameData.IsOpen || _packageView.IsOpen || _sendMenu.IsOpen || _layoutsView.IsOpen || _welcomeView.IsOpen; @@ -5464,7 +5463,7 @@ private bool ComposerIsInTheWay(string surface) /// private string OpenOverlayName() => _settings.IsOpen ? "the settings screen" - : _palette.IsOpen ? "the command surface" + : PaletteIsOpen ? "the command surface" : _quit.IsOpen ? "the quit prompt" : _messageLog.IsOpen ? "the client messages" : _gameData.IsOpen ? "the game data" @@ -8181,7 +8180,7 @@ private void CycleCharacter(int delta) internal IReadOnlyList WindowIds() => _workspace.Windows.Select(w => w.Id).ToArray(); /// Whether the ⌃P command surface is up — the header's ☰ opens it, and only the header may. - internal bool MenuIsOpen => _palette.IsOpen; + internal bool MenuIsOpen => PaletteIsOpen; /// /// Clicks the connection rail at a cell measured from the rail's own top-left, the way the framework @@ -9345,12 +9344,24 @@ private void ToggleFreeze() /// Opens/closes the command surface (⌃P or the header ☰ menu) and flips the header caret. private void ToggleMenu() { + // The host's palette is a toggle too: ⌃P reaches here only when the host passes it on. + if (_nativePaletteSession is not null) + { + CloseNativePalette(); + return; + } + if (ComposerIsInTheWay("the command surface")) { return; } - _palette.Toggle(); + // A host that draws ⌃P itself gets it, unless the cell popup is already up (then this closes that). + if (_palette.IsOpen || !TryOpenNativePalette()) + { + _palette.Toggle(); + } + _header.SetContent(new List { HeaderMarkup() }); } @@ -13346,7 +13357,7 @@ internal HeaderModel BuildHeaderModel() } return new HeaderModel( - _palette is { IsOpen: true }, + _palette is { IsOpen: true } || _nativePaletteSession is not null, world, character, ConnectedCharacters().Count, diff --git a/tests/SharpMUTerm.Avalonia.Tests/HostParityTests.cs b/tests/SharpMUTerm.Avalonia.Tests/HostParityTests.cs index d8639ebb..128970bb 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/HostParityTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/HostParityTests.cs @@ -46,7 +46,7 @@ public async Task EveryViewDrawsTheSameCellsInTheWindowAsInTheTerminal(string na using var driver = new AvaloniaConsoleDriver(Width, Height); await using (var window = new SharpMUTermApp( DemoScene.Build(), - WindowHost.Create(driver, clipboard: null) with { Capabilities = Caps, Keys = HostKeys.Terminal, Audio = null, Presence = null, Announcer = null, NativeSettings = null, RunsInline = true })) + WindowHost.Create(driver, clipboard: null) with { Capabilities = Caps, Keys = HostKeys.Terminal, Audio = null, Presence = null, Announcer = null, NativeSettings = null, NativePalette = null, RunsInline = true })) { window.RenderSnapshot(view); } @@ -83,7 +83,7 @@ public async Task EveryViewDrawsTheSameCellsWhenTheWindowsLoopIsRunning(string n using var driver = new AvaloniaConsoleDriver(Width, Height); await using var window = new SharpMUTermApp( DemoScene.Build(), - WindowHost.Create(driver, clipboard: null) with { Capabilities = Caps, Keys = HostKeys.Terminal, Audio = null, Presence = null, Announcer = null, NativeSettings = null }); + WindowHost.Create(driver, clipboard: null) with { Capabilities = Caps, Keys = HostKeys.Terminal, Audio = null, Presence = null, Announcer = null, NativeSettings = null, NativePalette = null }); window.OnUiThread(() => _ = window.RenderSnapshot(view)); var loop = new Thread(() => window.Run([])) { IsBackground = true }; loop.Start(); diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativePaletteTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativePaletteTests.cs new file mode 100644 index 00000000..0be9227d --- /dev/null +++ b/tests/SharpMUTerm.Avalonia.Tests/NativePaletteTests.cs @@ -0,0 +1,213 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Controls.Documents; +using Avalonia.Headless; +using Avalonia.Input; +using SharpMUTerm.Client.Palette; +using SharpMUTerm.Tui; +using SkiaSharp; +using Window = Avalonia.Controls.Window; + +namespace SharpMUTerm.Avalonia.Tests; + +/// +/// The window's native ⌃P (), driven from the real client in the window host: it lists the +/// shared model's rows for the query in its box, ⏎ and a click run the selected id through the cell palette's own +/// path, Esc closes and gives the keyboard back to the cells, and the key column is in the window's keys. +/// +[NotInParallel] +public class NativePaletteTests +{ + private sealed record Rig(Window Window, TerminalView View, SharpMUTermApp App, AvaloniaConsoleDriver Driver); + + private static readonly ConsoleKeyInfo CtrlP = new('\x10', ConsoleKey.P, false, false, true); + + private static Task Run(Func body) => + Session.Dispatch(() => + { + var driver = new AvaloniaConsoleDriver(120, 34); + var view = new TerminalView(driver, SKColors.White, new SKColor(0x1e, 0x1e, 0x24), 14, null); + var root = new Panel(); + root.Children.Add(view); + root.Children.Add(new DesktopLayer(view)); + driver.Palette.Attach(root, () => view.Focus()); + var window = new Window { Content = root, Width = 1000, Height = 700 }; + window.Show(); + view.Focus(); + var app = new SharpMUTermApp(DemoScene.Build(), WindowHost.Create(driver, clipboard: null) with + { + Audio = null, + Presence = null, + Announcer = null, + NativeSettings = null, + RunsInline = true, + }); + try + { + DesktopLayerTests.Drain(); + return body(new Rig(window, view, app, driver)); + } + finally + { + app.DisposeAsync().AsTask().GetAwaiter().GetResult(); + window.Close(); + driver.Dispose(); + } + }, CancellationToken.None); + + private static PaletteOverlay Open(Rig rig) + { + rig.App.SimulateKey(CtrlP); + DesktopLayerTests.Drain(); + return rig.Driver.Palette.Overlay ?? throw new InvalidOperationException("the palette did not open"); + } + + private static void Type(PaletteOverlay overlay, string query) + { + overlay.SearchBox.Text = query; + DesktopLayerTests.Drain(); + } + + private static void Press(PaletteOverlay overlay, Key key) + { + overlay.SearchBox.RaiseEvent(new KeyEventArgs { RoutedEvent = InputElement.KeyDownEvent, Key = key, Source = overlay.SearchBox }); + DesktopLayerTests.Drain(); + } + + private static string[] ModelRows(PaletteView view) => + view.Rows.Select(r => r is PaletteHeader h ? h.Label : ((PaletteEntry)r).Item.Title).ToArray(); + + [Test] + public async Task CtrlPOpensTheNativePaletteWithTheSearchFocusedAndNoCellPopup() + { + var (focused, cellOpen, onTop) = await Run(rig => + { + var overlay = Open(rig); + var root = (Panel)rig.Window.Content!; + return (overlay.SearchBox.IsFocused, rig.App.Palette.IsOpen, ReferenceEquals(root.Children[^1], overlay)); + }); + + await Assert.That(focused).IsTrue(); + await Assert.That(cellOpen).IsFalse(); + await Assert.That(onTop).IsTrue().Because("nothing native draws over it: it is the root panel's last child"); + } + + [Test] + public async Task TheRowsAreTheModelsForTheSameQuery() + { + var results = await Run(rig => + { + rig.App.RunFromPalette("layout:split-right"); + var overlay = Open(rig); + var list = new List<(string Query, string[] Drawn, string[] Model, string Status, string Count)>(); + foreach (var query in new[] { string.Empty, "split", "frz", "zzzz" }) + { + Type(overlay, query); + var model = CommandPaletteModel.Build(query, rig.App.BuildCatalog(), rig.App.RecentCommandIds, rig.App.SuggestedCommandIds); + list.Add((query, overlay.RowTexts.ToArray(), ModelRows(model), overlay.StatusText, $"{model.Entries.Count} of {model.Total}")); + } + + return list; + }); + + foreach (var (query, drawn, model, status, count) in results) + { + await Assert.That(drawn).IsEquivalentTo(model, TUnit.Assertions.Enums.CollectionOrdering.Matching).Because($"query '{query}'"); + await Assert.That(status).StartsWith(count); + } + + await Assert.That(results[0].Drawn[0]).IsEqualTo(CommandPaletteModel.RecentLabel); + } + + [Test] + public async Task MatchedCharactersAreHighlighted() + { + var bold = await Run(rig => + { + var overlay = Open(rig); + Type(overlay, "split"); + var title = overlay.EntryRows[0].GetVisualDescendantsOf().First(); + return title.Inlines!.OfType().Where(r => r.FontWeight == global::Avalonia.Media.FontWeight.Bold).Select(r => r.Text).ToArray(); + }); + + await Assert.That(string.Concat(bold)).IsEqualTo("Split").Because("the matched run is drawn bold in the accent"); + } + + [Test] + public async Task EnterRunsTheSelectedIdThroughThePalettesOwnPath() + { + var (expected, recent, panes, open, focused) = await Run(rig => + { + var overlay = Open(rig); + Type(overlay, "split right"); + Press(overlay, Key.Down); + Press(overlay, Key.Up); + var id = overlay.View.Entries[overlay.Selected].Item.Id; + Press(overlay, Key.Enter); + return (id, rig.App.RecentCommandIds.FirstOrDefault(), rig.App.PaneOutputRects().Count, rig.Driver.Palette.Overlay is not null, rig.View.IsFocused); + }); + + await Assert.That(expected).IsEqualTo("layout:split-right"); + await Assert.That(recent).IsEqualTo(expected); + await Assert.That(panes).IsEqualTo(2); + await Assert.That(open).IsFalse(); + await Assert.That(focused).IsTrue().Because("the keyboard goes back to the cells, and so to the command line"); + } + + [Test] + public async Task EscapeClosesRunsNothingAndGivesTheKeyboardBack() + { + var (open, clientOpen, recent, focused) = await Run(rig => + { + var overlay = Open(rig); + Type(overlay, "split"); + Press(overlay, Key.Escape); + return (rig.Driver.Palette.Overlay is not null, rig.App.NativePaletteIsOpen, rig.App.RecentCommandIds.Count, rig.View.IsFocused); + }); + + await Assert.That(open).IsFalse(); + await Assert.That(clientOpen).IsFalse(); + await Assert.That(recent).IsEqualTo(0); + await Assert.That(focused).IsTrue(); + } + + [Test] + public async Task HoverSelectsAndAClickRuns() + { + var (hovered, ran, expected) = await Run(rig => + { + var overlay = Open(rig); + Type(overlay, "split"); + var row = overlay.EntryRows[1]; + var centre = row.TranslatePoint(new Point(row.Bounds.Width / 2, row.Bounds.Height / 2), rig.Window)!.Value; + rig.Window.MouseMove(centre); + DesktopLayerTests.Drain(); + var selected = overlay.Selected; + var id = overlay.View.Entries[1].Item.Id; + rig.Window.MouseDown(centre, MouseButton.Left); + rig.Window.MouseUp(centre, MouseButton.Left); + DesktopLayerTests.Drain(); + return (selected, rig.App.RecentCommandIds.FirstOrDefault(), id); + }); + + await Assert.That(hovered).IsEqualTo(1); + await Assert.That(ran).IsEqualTo(expected); + } + + [Test] + public async Task TheKeyColumnIsInTheWindowsKeys() + { + var (newline, any) = await Run(rig => + { + var overlay = Open(rig); + var index = overlay.View.Entries.ToList().FindIndex(e => e.Item.Id == "term:newline"); + return (index < 0 ? null : overlay.KeyTexts[index], overlay.KeyTexts.Where(k => k is not null).ToArray()); + }); + + await Assert.That(newline).IsEqualTo("Ctrl+⏎"); + await Assert.That(any).DoesNotContain("Alt+⏎"); + await Assert.That(any.Any(k => k!.Contains('⌃') || k.Contains('⌥'))).IsFalse().Because("the window's UI font reads keys in words"); + } + + private static HeadlessUnitTestSession Session => TerminalViewTests.Session; +} diff --git a/tests/SharpMUTerm.Client.Tests/PaletteSessionTests.cs b/tests/SharpMUTerm.Client.Tests/PaletteSessionTests.cs new file mode 100644 index 00000000..afe3580d --- /dev/null +++ b/tests/SharpMUTerm.Client.Tests/PaletteSessionTests.cs @@ -0,0 +1,73 @@ +using SharpMUTerm.Client.Palette; +using SharpMUTerm.Core.Commands; +using TUnit.Assertions.Enums; + +namespace SharpMUTerm.Client.Tests; + +/// +/// One opening of a host's native palette (): its rows are the shared model's over what +/// was captured when it opened, it runs at most one entry, and it says it closed exactly once. +/// +public class PaletteSessionTests +{ + private static readonly CommandItem[] Catalog = + [ + new(CommandGroup.Terminal, "Newline", "term:newline", "Ctrl+⏎") { Key = "Ctrl+⏎" }, + new(CommandGroup.Layout, "Split right", "layout:split-right", "⌃B |") { Key = "⌃B |" }, + new(CommandGroup.Terminal, "Freeze pane", "term:freeze", "⌥F") { Key = "⌥F" }, + ]; + + private static (PaletteSession Session, List Ran, List Closed) Make(List? catalog = null) + { + var ran = new List(); + var closed = new List(); + var session = new PaletteSession( + catalog ?? [.. Catalog], ["layout:split-right"], ["term:freeze"], "Aetherfall.Corvid", isDark: true, string.Empty, + id => ran.Add(id), () => closed.Add("closed")); + return (session, ran, closed); + } + + [Test] + public async Task TheRowsAreTheModelsOverTheCapture() + { + var catalog = Catalog.ToList(); + var (session, _, _) = Make(catalog); + catalog.Clear(); + + foreach (var query in new[] { string.Empty, "spl", "zz" }) + { + var expected = CommandPaletteModel.Build(query, Catalog, ["layout:split-right"], ["term:freeze"]); + await Assert.That(session.View(query).Rows).IsEquivalentTo(expected.Rows, CollectionOrdering.Matching); + } + + await Assert.That(session.View(string.Empty).Entries.Select(e => e.Key)).Contains("⌃⏎"); + await Assert.That(session.Status(session.View("spl"))).IsEqualTo("1 of 3 acting on Aetherfall.Corvid"); + } + + [Test] + public async Task RunClosesFirstThenRunsAndOnlyOnce() + { + var order = new List(); + var session = new PaletteSession(Catalog, [], [], null, isDark: false, string.Empty, id => order.Add(id), () => order.Add("closed")); + + session.Run("term:freeze"); + session.Run("term:newline"); + session.Dismiss(); + + await Assert.That(order).IsEquivalentTo(new[] { "closed", "term:freeze" }, CollectionOrdering.Matching); + await Assert.That(session.IsEnded).IsTrue(); + } + + [Test] + public async Task DismissClosesOnceAndRunsNothing() + { + var (session, ran, closed) = Make(); + + session.Dismiss(); + session.Dismiss(); + session.Run("term:freeze"); + + await Assert.That(ran).IsEmpty(); + await Assert.That(closed.Count).IsEqualTo(1); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/NativePaletteRoutingTests.cs b/tests/SharpMUTerm.Tui.Tests/NativePaletteRoutingTests.cs new file mode 100644 index 00000000..3a4a8ee0 --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/NativePaletteRoutingTests.cs @@ -0,0 +1,210 @@ +using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Client.Palette; +using SharpMUTerm.Graphics; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// A host with its own palette () gets every way to ⌃P — the chord, the header, +/// the pointer menu's More commands… — and no cell popup; a host without one keeps the cell popup. The rows a +/// native palette is handed are the shared model's, and the entry it runs goes through the cell palette's own path. +/// +[NotInParallel] +public class NativePaletteRoutingTests +{ + private static readonly TerminalCapabilities Caps = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private sealed class Presenter : INativePalette + { + public List Shown { get; } = []; + + public int Closed { get; private set; } + + public void Show(PaletteSession session) => Shown.Add(session); + + public void Close() => Closed++; + } + + private static (SharpMUTermApp App, Presenter Native) App(bool native = true) + { + Console.SetIn(TextReader.Null); + var presenter = new Presenter(); + var host = ClientHost.Headless(new HeadlessConsoleDriver(120, 34), Caps) with + { + NativePalette = native ? presenter : null, + }; + return (new SharpMUTermApp(DemoScene.Build(), host), presenter); + } + + private static readonly ConsoleKeyInfo CtrlP = new('\x10', ConsoleKey.P, false, false, true); + + private static IEnumerable Shape(PaletteView view) => + view.Rows.Select(row => row switch + { + PaletteHeader header => "# " + header.Label, + PaletteEntry entry => $"{entry.Item.Id}|{entry.Key}|{string.Join(',', entry.TitleMatches)}", + _ => "?", + }); + + private static System.Drawing.Point CommandLineCell(SharpMUTermApp app) + { + for (var y = 33; y >= 0; y--) + { + for (var x = 0; x < 120; x++) + { + var cell = new System.Drawing.Point(x, y); + if (app.TargetAt(cell).Kind == PointerKind.CommandLine) + { + return cell; + } + } + } + + throw new InvalidOperationException("no command line on screen"); + } + + [Test] + public async Task CtrlPOpensTheHostsPaletteAndNoCellPopup() + { + var (app, native) = App(); + + app.SimulateKey(CtrlP); + + await Assert.That(native.Shown.Count).IsEqualTo(1); + await Assert.That(app.Palette.IsOpen).IsFalse().Because("no cell popup opens under a native one"); + await Assert.That(app.NativePaletteIsOpen).IsTrue(); + await Assert.That(app.MenuIsOpen).IsTrue(); + await Assert.That(app.BuildHeaderModel().MenuOpen).IsTrue().Because("the header's caret flips for either palette"); + } + + [Test] + public async Task AHostWithNoPaletteOpensTheCellPopup() + { + var (app, native) = App(native: false); + + app.SimulateKey(CtrlP); + + await Assert.That(native.Shown).IsEmpty(); + await Assert.That(app.Palette.IsOpen).IsTrue(); + } + + [Test] + public async Task TheSessionListsTheModelsRowsForEveryQuery() + { + var (app, native) = App(); + app.RunFromPalette("layout:split-right"); + app.SimulateKey(CtrlP); + var session = native.Shown.Single(); + + foreach (var query in new[] { string.Empty, "trig sel", "split", "zzzz" }) + { + var expected = CommandPaletteModel.Build( + query, app.BuildCatalog(), app.RecentCommandIds, app.SuggestedCommandIds); + await Assert.That(Shape(session.View(query))).IsEquivalentTo(Shape(expected), TUnit.Assertions.Enums.CollectionOrdering.Matching); + } + + await Assert.That(session.View(string.Empty).Rows[0]).IsEqualTo(new PaletteHeader(CommandPaletteModel.RecentLabel)); + } + + [Test] + public async Task RunningAnEntryRecordsItAndDispatchesItAsTheCellPaletteDoes() + { + var (app, native) = App(); + app.SimulateKey(CtrlP); + var session = native.Shown.Single(); + + session.Run("layout:split-right"); + + await Assert.That(app.RecentCommandIds[0]).IsEqualTo("layout:split-right"); + await Assert.That(app.PaneOutputRects().Count).IsEqualTo(2).Because("the split ran"); + await Assert.That(app.NativePaletteIsOpen).IsFalse(); + await Assert.That(app.BuildHeaderModel().MenuOpen).IsFalse(); + } + + [Test] + public async Task EscapeInTheHostClosesItAndRunsNothing() + { + var (app, native) = App(); + app.SimulateKey(CtrlP); + + native.Shown.Single().Dismiss(); + + await Assert.That(app.NativePaletteIsOpen).IsFalse(); + await Assert.That(app.RecentCommandIds).IsEmpty(); + } + + [Test] + public async Task CtrlPAgainClosesTheHostsPalette() + { + var (app, native) = App(); + app.SimulateKey(CtrlP); + app.SimulateKey(CtrlP); + + await Assert.That(native.Closed).IsEqualTo(1); + await Assert.That(native.Shown.Single().IsEnded).IsTrue(); + await Assert.That(app.NativePaletteIsOpen).IsFalse(); + + app.SimulateKey(CtrlP); + await Assert.That(native.Shown.Count).IsEqualTo(2).Because("a third press opens it again"); + } + + [Test] + public async Task TheHeaderOpensTheHostsPaletteAndNeverClosesIt() + { + var (app, native) = App(); + + await Assert.That(app.ActivateChromeTarget(HeaderModel.PaletteTarget)).IsTrue(); + await Assert.That(app.ActivateChromeTarget(HeaderModel.PaletteTarget)).IsTrue(); + + await Assert.That(native.Shown.Count).IsEqualTo(1); + await Assert.That(native.Closed).IsEqualTo(0); + await Assert.That(app.Palette.IsOpen).IsFalse(); + } + + [Test] + public async Task ThePointerMenusMoreCommandsOpensThePalette() + { + foreach (var native in new[] { true, false }) + { + var (app, presenter) = App(native); + app.RenderWholeFrame(); + var input = CommandLineCell(app); + var more = app.PointerMenu(input).Single(item => item.Label == SharpMUTermApp.MoreCommandsLabel); + await Assert.That(more.Hint).IsEqualTo(HeaderModel.PaletteKey); + + more.Run(); + + await Assert.That(presenter.Shown.Count).IsEqualTo(native ? 1 : 0); + await Assert.That(app.Palette.IsOpen).IsEqualTo(!native); + } + } + + [Test] + public async Task OpeningWithAQueryHandsItToEitherPalette() + { + var (app, native) = App(); + app.OpenMenu("trig sel"); + await Assert.That(native.Shown.Single().InitialQuery).IsEqualTo("trig sel"); + + var (cells, _) = App(native: false); + cells.OpenMenu("trig sel"); + await Assert.That(cells.Palette.IsOpen).IsTrue(); + await Assert.That(cells.Palette.View.Entries.Count).IsLessThan(cells.BuildCatalog().Count).Because("the cell popup filtered by it"); + } + + [Test] + public async Task ItRefusesOverTheComposerAsTheCellPopupDoes() + { + var (app, native) = App(); + await Assert.That(app.DispatchCommand("term:compose")).IsTrue(); + await Assert.That(app.Composer.IsOpen).IsTrue(); + + app.SimulateKey(CtrlP); + app.ActivateChromeTarget(HeaderModel.PaletteTarget); + + await Assert.That(native.Shown).IsEmpty(); + await Assert.That(app.Palette.IsOpen).IsFalse(); + } +} From f82e23aadd713d9e1720f15ac037616584f972a5 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 06:16:26 +0000 Subject: [PATCH 023/113] WIP native layout --- src/SharpMUTerm.Avalonia/ClientLaunch.cs | 4 +- src/SharpMUTerm.Avalonia/DesktopLayer.cs | 165 +++-- src/SharpMUTerm.Avalonia/MainWindow.cs | 18 +- src/SharpMUTerm.Avalonia/NativeChrome.cs | 577 ++++++++++++------ src/SharpMUTerm.Avalonia/TerminalView.cs | 43 +- src/SharpMUTerm.Avalonia/WindowHost.cs | 12 +- src/SharpMUTerm.Avalonia/WindowOptions.cs | 17 +- src/SharpMUTerm.Client/Chrome/HeaderModel.cs | 31 + src/SharpMUTerm.Client/Chrome/SidebarModel.cs | 7 + src/SharpMUTerm.Tui/Hosting/ClientHost.cs | 31 + .../Pointer/SharpMUTermApp.Chrome.cs | 120 ++-- src/SharpMUTerm.Tui/SharpMUTermApp.cs | 69 ++- .../DesktopLayerTests.cs | 4 +- .../HostParityTests.cs | 30 +- .../NativeChromeTests.cs | 222 ++++--- .../NativePanelTests.cs | 2 +- .../HostChromeLayoutTests.cs | 248 ++++++++ .../NativeChromeModelTests.cs | 22 +- 18 files changed, 1233 insertions(+), 389 deletions(-) create mode 100644 tests/SharpMUTerm.Tui.Tests/HostChromeLayoutTests.cs diff --git a/src/SharpMUTerm.Avalonia/ClientLaunch.cs b/src/SharpMUTerm.Avalonia/ClientLaunch.cs index 10f3d0b8..31d0e4e6 100644 --- a/src/SharpMUTerm.Avalonia/ClientLaunch.cs +++ b/src/SharpMUTerm.Avalonia/ClientLaunch.cs @@ -37,13 +37,13 @@ public static int Run(WindowOptions options, AppConfiguration config, IReadOnlyL return app.Run([]); } - return Tui.Program.RunLive(options.ClientArgs, config, notices, WindowHost.Create(driver, clipboard)); + return Tui.Program.RunLive(options.ClientArgs, config, notices, WindowHost.Create(driver, clipboard, options.Chrome)); } /// The demo client, with its --view scene laid out and not yet running. public static SharpMUTermApp Demo(WindowOptions options, AppConfiguration config, AvaloniaConsoleDriver driver, Action? clipboard) { - var app = new SharpMUTermApp(config, WindowHost.Create(driver, clipboard)); + var app = new SharpMUTermApp(config, WindowHost.Create(driver, clipboard, options.Chrome)); // The snapshot's scene builder is the demo: it pours the demo output in and opens the named view. What // it returns is the headless driver's capture, which on this driver is empty and not wanted. It is queued diff --git a/src/SharpMUTerm.Avalonia/DesktopLayer.cs b/src/SharpMUTerm.Avalonia/DesktopLayer.cs index 7345c40e..4f5f828c 100644 --- a/src/SharpMUTerm.Avalonia/DesktopLayer.cs +++ b/src/SharpMUTerm.Avalonia/DesktopLayer.cs @@ -13,11 +13,12 @@ namespace SharpMUTerm.Avalonia; /// -/// The window's native views, in a layer over the : header buttons, and native panels -/// drawn over the panes the client says hold them. The client's cells are painted underneath exactly as in a -/// terminal — nothing here takes a cell, moves a pane or changes what any world is told about its pane's size — -/// so this layer is the window's presentation of the same frame, and the terminal-and-window parity, which -/// compares cells, does not see it. +/// The window's native views, in a layer over the whole window: the header band and the connections sidebar beside +/// the (when the window draws them, ), the header buttons, and +/// native panels drawn over the panes the client says hold them. The header and the sidebar have no cells under +/// them — the client leaves no row or column for them, and this layer moves the view out of their way +/// () — while a panel sits over its pane's cells, which are painted underneath exactly as in +/// a terminal, so nothing a panel does takes a cell, moves a pane or changes what any world is told. /// /// Input. The layer itself has no background and so is never hit: a pointer anywhere it draws nothing goes /// to the view, and on to the client, as before. A header button is the window's alone — its press, release, @@ -37,6 +38,7 @@ internal sealed class DesktopLayer : Canvas private readonly TerminalView _view; private readonly WindowPointer _pointer; + private readonly HostChrome _chrome; private readonly Dictionary _buttons = new(StringComparer.Ordinal); private readonly Dictionary _gauges = new(StringComparer.Ordinal); private readonly Dictionary _maps = new(StringComparer.Ordinal); @@ -45,10 +47,17 @@ internal sealed class DesktopLayer : Canvas private readonly Dictionary _whoHere = new(StringComparer.Ordinal); private readonly Dictionary _quickBars = new(StringComparer.Ordinal); - public DesktopLayer(TerminalView view) + /// The cells. + /// + /// Which chrome the window draws: the same value the client was told (), so the part + /// the client leaves out of the cells is the part this layer draws, and nothing is drawn twice or not at all. + /// + public DesktopLayer(TerminalView view, HostChrome chrome) { _view = view; + _chrome = chrome; _pointer = view.Driver.Pointer; + _view.CellsHoldHeader = !chrome.Header; ClipToBounds = true; _pointer.ActionsChanged += () => Dispatcher.UIThread.Post(Sync); _pointer.PanelsChanged += () => Dispatcher.UIThread.Post(Sync); @@ -60,9 +69,32 @@ public DesktopLayer(TerminalView view) Children.Add(_header); Children.Add(_sidebar); _view.Repainted += Sync; + SyncInsets(collapsed: false); Sync(); } + /// Which chrome this layer draws. Internal for tests. + internal HostChrome Chrome => _chrome; + + /// + /// Where the cells start in this layer: past the native header and sidebar. Every view placed over cells is placed + /// from here, so a panel sits on its pane however wide the sidebar is. + /// + internal Point CellOrigin => new(_view.Margin.Left, _view.Margin.Top); + + /// + /// Moves the cells out of the way of the native header and sidebar: the view's margin is their size, so the view — + /// and the grid it hands the driver, and so every pane the client lays out — is what is left of the window. + /// + private void SyncInsets(bool collapsed) + { + var insets = NativeLayout.Insets(_chrome, collapsed); + if (_view.Margin != insets) + { + _view.Margin = insets; + } + } + protected override void OnSizeChanged(SizeChangedEventArgs e) { base.OnSizeChanged(e); @@ -98,52 +130,52 @@ internal void Sync() { var frame = _view.Driver.Frame; var cell = _view.CellExtent; + SyncChrome(); SyncButtons(frame, cell); SyncPanels(frame, cell); - SyncChrome(frame, cell); } /// - /// The native header and sidebar over the cells the client says hold them, each painting the plane read off its - /// own cells. Neither is drawn while another of the client's windows is in front (it would paint over it), the - /// header not while ⌃B is armed (the cells then say what the next key does), the sidebar not while collapsed. + /// The native header across the top and the sidebar down the left, when the window draws them — always, a modal in + /// front included: the client draws its modals in the cells, which no longer reach under either, so the chrome + /// stays where a desktop app's stays and only goes inert (). ⌃B armed is said + /// by the header itself, and a collapsed rail is the sidebar's slim strip. /// - private void SyncChrome(ScreenFrame frame, Size cell) + private void SyncChrome() { var chrome = _pointer.Chrome; - var ink = Colour(_view.Renderer.DefaultForeground); - Cover(_header, chrome, chrome is { Shown: true, HeaderModel.PrefixArmed: false } ? chrome.Header : default, frame, cell, ink, header: true); - Cover(_sidebar, chrome, chrome is { Shown: true, Sidebar.Collapsed: false } ? chrome.Rail : default, frame, cell, ink, header: false); + SyncInsets(chrome?.Sidebar.Collapsed ?? false); + var width = Bounds.Width; + var height = Bounds.Height; + var top = _chrome.Header ? NativeLayout.HeaderHeight : 0; + + // The header buttons' slots, plus the resize band, stay clear for the buttons drawn above the header. + _header.ReserveRight = _chrome.Header + ? (_pointer.Actions.Count * (NativeLayout.ButtonSize + NativeLayout.ButtonGap)) + WindowChrome.EdgeBand + 4 + : 0; + + // Before the client has said anything the bands are drawn empty, on the view's own colours, so a window never + // opens with a hole where its header will be. + var ink = chrome is null ? Colour(_view.Renderer.DefaultForeground) : NativeChromeView.Parse(chrome.Palette.Ink); + Place(_header, _chrome.Header, new Rect(0, 0, width, NativeLayout.HeaderHeight), chrome, + chrome is null ? Colour(_view.Renderer.DefaultBackground) : NativeChromeView.Parse(chrome.Palette.HeaderPlane), ink); + Place(_sidebar, _chrome.Rail, new Rect(0, top, _view.Margin.Left, Math.Max(0, height - top)), chrome, + chrome is null ? Colour(_view.Renderer.DefaultBackground) : NativeChromeView.Parse(chrome.Palette.RailPlane), ink); } - private void Cover(NativeChromeView view, ChromeOverlay? chrome, PaneRect rect, ScreenFrame frame, Size cell, Color ink, bool header) + private static void Place(NativeChromeView view, bool drawn, Rect area, ChromeOverlay? chrome, Color plane, Color ink) { - var inside = rect.Width > 0 && rect.Height > 0 && rect.X >= 0 && rect.Y >= 0 - && rect.X + rect.Width <= frame.Width && rect.Y + rect.Height <= frame.Height; - if (chrome is null || !inside) + if (!drawn || area.Width <= 0 || area.Height <= 0) { view.IsVisible = false; return; } - SetLeft(view, rect.X * cell.Width); - SetTop(view, rect.Y * cell.Height); - view.Width = rect.Width * cell.Width; - view.Height = rect.Height * cell.Height; - if (view is NativeHeader nativeHeader) - { - // The header buttons' slots, plus the resize band, stay clear for the buttons drawn above this view. - nativeHeader.ReserveRight = (_pointer.Actions.Count * ButtonCells * cell.Width) + WindowChrome.EdgeBand; - } - else if (view is NativeSidebar sidebar) - { - sidebar.SetCellHeight(cell.Height); - } - - // The plane is read off the last cell of the rectangle's first row: the header's right end and the rail's - // margin column are blank in every state, so the colour is the band's own and not a segment's fill. - var plane = _view.Renderer.Background(frame[rect.X + rect.Width - 1, rect.Y]); - view.Show(chrome, Colour(plane), ink); + SetLeft(view, area.X); + SetTop(view, area.Y); + view.Width = area.Width; + view.Height = area.Height; + view.Show(chrome, plane, ink); view.IsVisible = true; } @@ -156,6 +188,7 @@ private void SyncButtons(ScreenFrame frame, Size cell) _buttons.Remove(stale); } + var origin = CellOrigin; for (var i = 0; i < actions.Count; i++) { var action = actions[i]; @@ -169,6 +202,21 @@ private void SyncButtons(ScreenFrame frame, Size cell) Children.Add(button); } + if (_chrome.Header) + { + // In the window's own header: right to left from its end, clear of the resize band, on its plane. + var side = NativeLayout.ButtonSize; + button.Width = side; + button.Height = side; + SetLeft(button, Bounds.Width - WindowChrome.EdgeBand - 4 - ((i + 1) * (side + NativeLayout.ButtonGap)) + NativeLayout.ButtonGap); + SetTop(button, Math.Round((NativeLayout.HeaderHeight - side) / 2)); + var said = _pointer.Chrome; + button.Ink = said is null ? Colour(_view.Renderer.DefaultForeground) : NativeChromeView.Parse(said.Palette.Ink); + button.Plane = said is null ? Colour(_view.Renderer.DefaultBackground) : NativeChromeView.Parse(said.Palette.HeaderPlane); + button.IsVisible = Bounds.Width > 0; + continue; + } + // Right to left from the header's end, one slot of blank cells each. Shown only while every cell of // its slot is blank, so a button never covers a word of the header. var first = frame.Width - (ButtonCells * (i + 1)); @@ -187,8 +235,8 @@ private void SyncButtons(ScreenFrame frame, Size cell) var size = Math.Max(8, Math.Min(cell.Height + 2, right - ((first + 0.6) * cell.Width))); button.Width = size; button.Height = Math.Max(4, cell.Height - 2); - SetLeft(button, right - size); - SetTop(button, 1); + SetLeft(button, origin.X + right - size); + SetTop(button, origin.Y + 1); var behind = _view.Renderer.Background(frame[frame.Width - 1, 0]); button.Ink = Colour(_view.Renderer.DefaultForeground); button.Plane = Colour(behind); @@ -260,8 +308,9 @@ private void Place( } var rect = panel.Rect; - SetLeft(control, rect.X * cell.Width); - SetTop(control, rect.Y * cell.Height); + var origin = CellOrigin; + SetLeft(control, origin.X + (rect.X * cell.Width)); + SetTop(control, origin.Y + (rect.Y * cell.Height)); control.Width = rect.Width * cell.Width; control.Height = rect.Height * cell.Height; @@ -381,3 +430,39 @@ public override void Render(DrawingContext context) context.DrawLine(pen, new Point(split, middle), new Point(x + w, middle)); } } + +/// +/// How big the window's own chrome is, in logical pixels: the header band across the top and the sidebar down the +/// left, each the size of a desktop app's rather than a cell's. The client is told only that it draws neither +/// (); the sizes are the window's, and the cell grid is the rest of the window. +/// +internal static class NativeLayout +{ + /// The header band's height. + public const double HeaderHeight = 42; + + /// The sidebar's width, open. + public const double SidebarWidth = 232; + + /// The sidebar's width folded to its strip (⌃B b, or its own fold button). + public const double SidebarSlim = 48; + + /// + /// The sidebar's breathing room before the panes: its own plane carried a few pixels on, so a pane's first column + /// of text does not sit hard against the sidebar's edge. Part of the sidebar, never of a pane, so it costs no cell. + /// + public const double SidebarGutter = 8; + + /// A header button's side. + public const double ButtonSize = 30; + + /// The gap between two header buttons. + public const double ButtonGap = 6; + + /// The cells' margin in the window: the space the native header and sidebar take. + public static Thickness Insets(HostChrome chrome, bool collapsed) => new( + chrome.Rail ? (collapsed ? SidebarSlim : SidebarWidth) + SidebarGutter : 0, + chrome.Header ? HeaderHeight : 0, + 0, + 0); +} diff --git a/src/SharpMUTerm.Avalonia/MainWindow.cs b/src/SharpMUTerm.Avalonia/MainWindow.cs index ffdabba3..50f75893 100644 --- a/src/SharpMUTerm.Avalonia/MainWindow.cs +++ b/src/SharpMUTerm.Avalonia/MainWindow.cs @@ -50,11 +50,12 @@ public MainWindow(WindowOptions options, IClassicDesktopStyleApplicationLifetime app.RequestedThemeVariant = luma < 128 ? ThemeVariant.Dark : ThemeVariant.Light; } - // No title bar: the client's own header is the top of the window, as it is the top of a terminal. The - // border stays, and the header's blank cells move the window (WindowChrome). --title-bar brings it back. + // No title bar: the header is the top of the window — the window's own (NativeHeader), or the client's cells + // with --cell-chrome. The border stays, and the header's empty space moves the window (WindowChrome). + // --title-bar brings it back. WindowDecorations = options.TitleBar ? WindowDecorations.Full : WindowDecorations.BorderOnly; Background = new SolidColorBrush(Color.FromRgb(background.Red, background.Green, background.Blue)); - // The view fills the window; the screen-reader regions sit under it, unseen. + // The view fills the window past the native chrome; the screen-reader regions sit under it, unseen. var root = new Panel(); foreach (var region in _driver.Announcer.Regions()) { @@ -63,11 +64,16 @@ public MainWindow(WindowOptions options, IClassicDesktopStyleApplicationLifetime root.Children.Add(_view); - // The window's native views over the cells: the header's Layouts button and native panels (DesktopLayer). - root.Children.Add(new DesktopLayer(_view)); + // The window's native views: the header band and the connections sidebar beside the cells (the layer moves the + // view out of their way, so no cell lies under either), the Layouts button, and native panels over their panes. + root.Children.Add(new DesktopLayer(_view, options.Chrome)); Content = root; AutomationProperties.SetName(_view, "SharpMUTerm"); - var size = _view.SizeFor(options.Columns, options.Rows); + + // --size names the grid, so the window is that grid plus the native chrome around it. + var insets = NativeLayout.Insets(options.Chrome, collapsed: false); + var cells = _view.SizeFor(options.Columns, options.Rows); + var size = new Size(cells.Width + insets.Left, cells.Height + insets.Top); Width = size.Width; Height = size.Height; _normalSize = size; diff --git a/src/SharpMUTerm.Avalonia/NativeChrome.cs b/src/SharpMUTerm.Avalonia/NativeChrome.cs index 448144b6..72e151ab 100644 --- a/src/SharpMUTerm.Avalonia/NativeChrome.cs +++ b/src/SharpMUTerm.Avalonia/NativeChrome.cs @@ -15,9 +15,12 @@ namespace SharpMUTerm.Avalonia; /// What the native header and sidebar share: a clickable area naming the target the client put in its model, and the /// pointer handling that turns a press and release on one area into that target. Nothing here spells a target: every /// one comes out of or , and goes back through -/// , which acts on it exactly as a click on the cells under it would. +/// , which acts on it exactly as a click on the cell rail or header would. /// -/// Never focusable: the keyboard stays with the client, as a click on the cells leaves it. +/// Both sit beside the cells, never over them (): the client leaves no row or column for +/// them. The window's resize band runs along their outer edges as it does along the cells'. Never focusable: the +/// keyboard stays with the client. While a modal of the client's is in front ( +/// false) they stay drawn, under a veil, and take no click. /// /// internal abstract class NativeChromeView : Control @@ -35,36 +38,43 @@ protected NativeChromeView(TerminalView view) protected TerminalView View { get; } - /// What the client last said, or null. + /// What the client last said, or null before it has said anything. internal ChromeOverlay? Overlay { get; private set; } protected Color Plane { get; private set; } = Colors.Black; protected Color Ink { get; private set; } = Colors.White; + /// Whether the chrome is drawn but takes no click, because a modal of the client's is in front. + internal bool Inert => Overlay is { Interactive: false }; + /// The clickable areas and their targets, as last laid out. Internal for tests. internal IReadOnlyList<(Rect Area, string Target, string Tip)> Hits => _hits; - /// Takes what the client said and the plane under the view, read off the frame, and redraws. - public void Show(ChromeOverlay overlay, Color plane, Color ink) + /// Takes what the client said and the plane and ink to draw with, and redraws. + public void Show(ChromeOverlay? overlay, Color plane, Color ink) { Overlay = overlay; Plane = plane; Ink = ink; _hits.Clear(); - Layout(_hits); + if (overlay is not null && !double.IsNaN(Width) && !double.IsNaN(Height)) + { + Layout(overlay, _hits); + } + InvalidateVisual(); } /// Works out where each clickable thing goes, for the size the view has been given. - protected abstract void Layout(List<(Rect Area, string Target, string Tip)> hits); + protected abstract void Layout(ChromeOverlay overlay, List<(Rect Area, string Target, string Tip)> hits); /// A left press on no clickable area. The header moves the window; the sidebar does nothing. protected virtual void PressedEmpty(PointerPressedEventArgs e) { } - /// The area under , or null. + /// The area under , or null. An area with no target only carries a tooltip. protected (Rect Area, string Target, string Tip)? HitAt(Point point) { foreach (var hit in _hits) @@ -79,23 +89,32 @@ protected virtual void PressedEmpty(PointerPressedEventArgs e) } /// Whether the pointer is over , for a hover plate. - protected bool Hovered(Rect area) => _hover == area; + protected bool Hovered(Rect area) => !Inert && _hover == area; /// Whether is being pressed. protected bool Pressing(Rect area) => _pressed is not null && _hover == area; /// Acts on a target as a click would. Internal for tests. - internal void Click(string target) => Overlay?.Activate(target); + internal void Click(string target) + { + if (!Inert && target.Length > 0) + { + Overlay?.Activate(target); + } + } protected override void OnPointerMoved(PointerEventArgs e) { base.OnPointerMoved(e); var hit = HitAt(e.GetPosition(this)); var area = hit?.Area; + var edge = View.EdgeCursorFromChrome(e); + Cursor = edge is { } resize ? new Cursor(resize) + : hit is { Target.Length: > 0 } && !Inert ? new Cursor(StandardCursorType.Hand) + : Cursor.Default; if (area != _hover) { _hover = area; - Cursor = hit is null ? Cursor.Default : new Cursor(StandardCursorType.Hand); ToolTip.SetTip(this, hit?.Tip); InvalidateVisual(); } @@ -110,30 +129,24 @@ protected override void OnPointerExited(PointerEventArgs e) InvalidateVisual(); } - // Every pointer event over the view is the window's, as over a header button: nothing routes on to the cells, - // which would read a press on whatever the client drew there. + // Every pointer event over the view is the window's: there is no cell under it to reach, and the client's own + // cells beside it are a different place. protected override void OnPointerPressed(PointerPressedEventArgs e) { base.OnPointerPressed(e); e.Handled = true; var point = e.GetCurrentPoint(this); - if (point.Properties.IsRightButtonPressed) + if (!point.Properties.IsLeftButtonPressed) { - // The client's own menu for the place under the pointer, as over the cells (the map does the same). - if (this.TranslatePoint(point.Position, View) is { } onView) - { - View.ForwardRightClick(onView, e.KeyModifiers); - } - return; } - if (!point.Properties.IsLeftButtonPressed) + if (View.ResizeFromChrome(e)) { return; } - if (HitAt(point.Position) is { } hit) + if (!Inert && HitAt(point.Position) is { Target.Length: > 0 } hit) { _pressed = hit.Target; _hover = hit.Area; @@ -166,7 +179,10 @@ protected override void OnPointerWheelChanged(PointerWheelEventArgs e) // ── Drawing ──────────────────────────────────────────────────────────────────────────────── - protected Color Dim => Color.FromArgb(0xA0, Ink.R, Ink.G, Ink.B); + /// The UI font size the chrome's text is set in. + protected const double FontSize = 13; + + protected Color Dim => Color.FromArgb(0xA8, Ink.R, Ink.G, Ink.B); protected Color Faint(byte alpha) => Color.FromArgb(alpha, Ink.R, Ink.G, Ink.B); @@ -182,10 +198,29 @@ protected Color Accent(TerminalColor accent) => protected static Color On(Color fill, Color ink) => ToColour(Contrast.Legible(new Rgb(ink.R, ink.G, ink.B), new Rgb(fill.R, fill.G, fill.B))); - protected static Color Parse(string? hex) => hex is not null && Color.TryParse(hex, out var colour) ? colour : Colors.Gray; + /// A #rrggbb the client handed over, or grey. + internal static Color Parse(string? hex) => hex is not null && Color.TryParse(hex, out var colour) ? colour : Colors.Gray; private static Color ToColour(Rgb rgb) => Color.FromRgb(rgb.R, rgb.G, rgb.B); + /// The plane lifted (on a dark theme) or lowered (on a light one) by : a raised surface. + protected Color Raised(double amount) + { + var luma = (0.2126 * Plane.R) + (0.7152 * Plane.G) + (0.0722 * Plane.B); + var target = luma < 128 ? Colors.White : Colors.Black; + byte Mix(byte a, byte b) => (byte)Math.Round(a + ((b - a) * amount)); + return Color.FromRgb(Mix(Plane.R, target.R), Mix(Plane.G, target.G), Mix(Plane.B, target.B)); + } + + /// The veil a modal in front lays over the chrome: drawn, readable, and plainly not the thing in use. + protected void DrawVeil(DrawingContext context) + { + if (Inert) + { + context.DrawRectangle(new SolidColorBrush(Color.FromArgb(0x70, Plane.R, Plane.G, Plane.B)), null, new Rect(Bounds.Size)); + } + } + protected static FormattedText Format(string text, double size, Color colour, bool bold = false, double maxWidth = double.PositiveInfinity) { var formatted = new FormattedText( @@ -225,28 +260,74 @@ protected double Badge(DrawingContext context, int unread, double right, double { var text = UnreadText(unread); var fill = Legible(Parse(Overlay?.Palette.Unread)); - var width = Measure(text, size * 0.85, bold: true) + (size * 0.9); - var height = Math.Max(size * 1.15, 10); + var width = Math.Max(Measure(text, size * 0.85, bold: true) + (size * 0.9), size * 1.4); + var height = Math.Max(size * 1.3, 10); var pill = new Rect(right - width, middle - (height / 2), width, height); context.DrawRectangle(new SolidColorBrush(fill), null, pill, height / 2, height / 2); Text(context, text, pill.X + ((width - Measure(text, size * 0.85, bold: true)) / 2), middle, size * 0.85, On(fill, Plane), bold: true); return width; } + /// A presence dot: filled while connected, a ring while being dialled or offline. + protected static void Dot(DrawingContext context, Point centre, double radius, Color colour, bool filled, bool diamond = false) + { + if (diamond) + { + // A member of the send group wears a diamond, as on the cells. + var shape = new StreamGeometry(); + using (var g = shape.Open()) + { + g.BeginFigure(centre + new Point(0, -radius * 1.25), true); + g.LineTo(centre + new Point(radius * 1.25, 0)); + g.LineTo(centre + new Point(0, radius * 1.25)); + g.LineTo(centre + new Point(-radius * 1.25, 0)); + g.EndFigure(true); + } + + context.DrawGeometry(filled ? new SolidColorBrush(colour) : null, new Pen(new SolidColorBrush(colour), 1.3), shape); + return; + } + + if (filled) + { + context.DrawEllipse(new SolidColorBrush(colour), null, centre, radius, radius); + } + else + { + context.DrawEllipse(null, new Pen(new SolidColorBrush(colour), 1.3), centre, radius, radius); + } + } + + /// A chevron pointing left () or right, centred in . + protected static void Chevron(DrawingContext context, Rect area, bool left, Color colour) + { + var pen = new Pen(new SolidColorBrush(colour), 1.6, lineCap: PenLineCap.Round, lineJoin: PenLineJoin.Round); + var c = area.Center; + var s = Math.Min(area.Width, area.Height) * 0.18; + foreach (var dx in new[] { -s * 0.9, s * 0.9 }) + { + var tip = left ? c.X + dx - s : c.X + dx + s; + var back = left ? c.X + dx + s : c.X + dx - s; + context.DrawLine(pen, new Point(back, c.Y - (s * 1.6)), new Point(tip, c.Y)); + context.DrawLine(pen, new Point(tip, c.Y), new Point(back, c.Y + (s * 1.6))); + } + } + /// A count as the cells write it (99+ past the cap), so the two views agree about one count. internal static string UnreadText(int unread) => unread > 99 ? "99+" : unread.ToString(CultureInfo.InvariantCulture); } /// -/// The window's own header, drawn over the client's header row: the app's name, a search box that opens the command -/// surface (⌃P), the connected count and log state, and the character in front as a pill — a presence dot, the name, -/// and world · TLS. Everything it says is , the model the cell ribbon under it is -/// drawn from. +/// The window's own header band, across the top of the window above the cells: the app's name, a search box that +/// opens the command surface (⌃P), the connected count and log state, and the character in front as a pill — a +/// presence dot, the name, and world · TLS. Everything it says is , the model the cell +/// ribbon would be drawn from; the client draws no header row in this host. /// -/// Within the row, never taller. The header is one cell row and stays one; a taller native header needs the -/// client's layout to leave the room (see CLAUDE.md, native chrome). The right end is left clear for the header -/// buttons (), which sit above this view. A press on empty space moves the -/// window and a double-click maximises, as a blank header cell does (). +/// While ⌃B is armed the search box and the counts give way to the keymap (): the +/// chord, each key it answers (a key that cannot run now is dimmed, and its tooltip says why), and the way out — what +/// the cell header's strip says, with the room to say all of it. The right end is left clear for the header buttons +/// (), which sit above this view. A press on empty space moves the window and a +/// double-click maximises (). /// /// internal sealed class NativeHeader(TerminalView view) : NativeChromeView(view) @@ -254,6 +335,9 @@ internal sealed class NativeHeader(TerminalView view) : NativeChromeView(view) /// What the search box says. ⌃P lists commands, characters and windows, and settings screens. internal const string SearchText = "Search commands, windows, settings"; + /// The prefix's leading word, beside its chord. + internal const string PrefixWord = "awaiting a pane key"; + /// Width kept clear at the right for the header buttons. public double ReserveRight { get; set; } @@ -261,57 +345,97 @@ internal sealed class NativeHeader(TerminalView view) : NativeChromeView(view) private Rect _search; private Rect _pill; private Rect _counts; + private Rect _prefix; + private readonly List<(Rect Area, HeaderPrefixKey Key)> _keys = []; + private Rect _exit; - private double Size => Math.Clamp(Height * 0.6, 9, 14); + /// The ⌃B keys as last laid out. Internal for tests. + internal IReadOnlyList<(Rect Area, HeaderPrefixKey Key)> PrefixKeys => _keys; - protected override void Layout(List<(Rect Area, string Target, string Tip)> hits) - { - _brand = _search = _pill = _counts = default; - if (Overlay is not { } overlay || double.IsNaN(Width) || double.IsNaN(Height)) - { - return; - } + private const double PlateHeight = 30; + protected override void Layout(ChromeOverlay overlay, List<(Rect Area, string Target, string Tip)> hits) + { + _brand = _search = _pill = _counts = _prefix = _exit = default; + _keys.Clear(); var model = overlay.HeaderModel; - var size = Size; + const double size = FontSize; var h = Height; - var plateTop = 1.0; - var plateHeight = Math.Max(4, h - 2); - var pad = Math.Round(size * 0.8); + var plateHeight = Math.Min(PlateHeight, Math.Max(4, h - 6)); + var plateTop = Math.Round((h - plateHeight) / 2); + const double pad = 12; - _brand = new Rect(6, plateTop, Measure("SharpMUTerm", size, bold: true) + (pad * 2), plateHeight); + _brand = new Rect(10, plateTop, Measure("SharpMUTerm", size + 1, bold: true) + pad + 22, plateHeight); hits.Add((_brand, HeaderModel.PaletteTarget, $"Commands ({KeyGlyphs.Words(HeaderModel.PaletteKey)})")); - var right = Width - ReserveRight - 6; + var right = Width - ReserveRight - 8; if (model.Character is { } character && model.World is { } world) { var name = Measure(character.Name, size, bold: true); - var detail = Measure(character.Detail(world.Name), size * 0.9); - var width = Math.Min(pad + size + name + pad + detail + pad, Math.Max(0, right - _brand.Right - 24)); + var detail = Measure(character.Detail(world.Name), size - 1); + var width = Math.Min(pad + 10 + 8 + name + 10 + detail + pad, Math.Max(0, right - _brand.Right - 24)); _pill = new Rect(right - width, plateTop, width, plateHeight); - hits.Add((_pill, character.Target, $"{character.Name} on {world.Name}")); - right = _pill.Left - 12; + hits.Add((_pill, character.Target, $"{character.Name} on {world.Name} — {character.Host}:{character.Port}")); + right = _pill.Left - 16; + } + + var start = _brand.Right + 20; + if (model.Prefix is { } prefix) + { + LayoutPrefix(prefix, start, right, plateTop, plateHeight, hits); + return; } var counts = CountsText(model); - var countsWidth = Measure(counts, size * 0.9); - var searchStart = _brand.Right + 16; - var keyWidth = Measure(KeyGlyphs.Words(HeaderModel.PaletteKey), size * 0.85) + 10; - var searchFloor = size + Measure("Search", size) + keyWidth + (pad * 3); - if (right - countsWidth - 16 - searchStart >= searchFloor) + var countsWidth = Measure(counts, size - 1); + var keyWidth = Measure(KeyGlyphs.Words(HeaderModel.PaletteKey), size - 1.5) + 12; + var searchFloor = 18 + Measure("Search", size) + keyWidth + (pad * 3); + if (right - countsWidth - 20 - start >= searchFloor) { _counts = new Rect(right - countsWidth, 0, countsWidth, h); - right = _counts.Left - 16; + right = _counts.Left - 20; } - if (right - searchStart >= searchFloor) + if (right - start >= searchFloor) { - var width = Math.Min(420, right - searchStart); - _search = new Rect(searchStart, plateTop, width, plateHeight); + var width = Math.Min(460, right - start); + _search = new Rect(start, plateTop, width, plateHeight); hits.Add((_search, HeaderModel.PaletteTarget, $"Commands, characters, windows and settings ({KeyGlyphs.Words(HeaderModel.PaletteKey)})")); } } + private void LayoutPrefix(HeaderPrefix prefix, double start, double right, double plateTop, double plateHeight, List<(Rect Area, string Target, string Tip)> hits) + { + const double size = FontSize; + var chipHeight = plateHeight - 6; + var chipTop = plateTop + 3; + var lead = Measure(HeaderPrefix.Chord, size, bold: true) + Measure(PrefixWord, size - 1) + 34; + _prefix = new Rect(start, plateTop, Math.Min(lead, Math.Max(0, right - start)), plateHeight); + hits.Add((_prefix, string.Empty, $"{HeaderPrefix.Chord} is armed: the next key acts on the workspace. {prefix.Exit}.")); + + var exitWidth = Measure(prefix.Exit, size - 1) + 8; + var x = _prefix.Right + 12; + var limit = right - exitWidth - 12; + foreach (var key in prefix.Keys) + { + var width = Measure(key.Keys, size, bold: true) + 16; + if (x + width > limit) + { + break; + } + + var area = new Rect(x, chipTop, width, chipHeight); + _keys.Add((area, key)); + hits.Add((area, string.Empty, key.Available ? $"{key.Keys} {key.Title}" : $"{key.Keys} {key.Title} — {key.Blocked}")); + x += width + 5; + } + + if (right - x >= exitWidth) + { + _exit = new Rect(right - exitWidth, 0, exitWidth, Height); + } + } + private static string CountsText(HeaderModel model) => model.HasWorlds ? $"{model.ConnectedText} · {model.LogText}" : model.LogText; @@ -319,18 +443,22 @@ private static string CountsText(HeaderModel model) => public override void Render(DrawingContext context) { - context.DrawRectangle(new SolidColorBrush(Plane), null, new Rect(Bounds.Size)); + var bounds = new Rect(Bounds.Size); + context.DrawRectangle(new SolidColorBrush(Plane), null, bounds); + + // A hairline under the band, where a desktop app's toolbar meets its content. + context.DrawRectangle(new SolidColorBrush(Faint(0x24)), null, new Rect(0, bounds.Height - 1, bounds.Width, 1)); if (Overlay is not { } overlay) { return; } var model = overlay.HeaderModel; - var size = Size; + const double size = FontSize; var middle = Bounds.Height / 2; - var radius = Math.Min(6, _brand.Height / 2); + const double radius = 7; - // The brand: the ribbon's first segment, in its own fill. + // The brand: the ribbon's first segment, in its own fill, with the ☰ the ribbon carries. var brand = Parse(overlay.Palette.Brand); if (Pressing(_brand) || Hovered(_brand)) { @@ -338,77 +466,110 @@ public override void Render(DrawingContext context) } context.DrawRectangle(new SolidColorBrush(brand), null, _brand, radius, radius); - Text(context, "SharpMUTerm", _brand.X + ((_brand.Width - Measure("SharpMUTerm", size, true)) / 2), middle, size, On(brand, Colors.Black), bold: true); - - if (_search.Width > 0) + var brandInk = On(brand, Colors.Black); + var menu = new Pen(new SolidColorBrush(brandInk), 1.6, lineCap: PenLineCap.Round); + var mx = _brand.X + 12; + foreach (var dy in new[] { -4.0, 0, 4 }) { - var fill = Faint((byte)(Hovered(_search) ? 0x26 : 0x14)); - context.DrawRectangle(new SolidColorBrush(fill), new Pen(new SolidColorBrush(Faint(0x38)), 1), _search.Deflate(0.5), radius, radius); - var pad = Math.Round(size * 0.8); + context.DrawLine(menu, new Point(mx, middle + dy), new Point(mx + 11, middle + dy)); + } - // A magnifier: a ring and its handle. - var ring = size * 0.32; - var centre = new Point(_search.X + pad + ring, middle - (ring * 0.25)); - var pen = new Pen(new SolidColorBrush(Dim), 1.3); - context.DrawEllipse(null, pen, centre, ring, ring); - context.DrawLine(pen, centre + new Point(ring * 0.7, ring * 0.7), centre + new Point(ring * 1.5, ring * 1.5)); + Text(context, "SharpMUTerm", mx + 18, middle, size + 1, brandInk, bold: true); - var key = KeyGlyphs.Words(HeaderModel.PaletteKey); - var keyWidth = Measure(key, size * 0.85) + 10; - var cap = new Rect(_search.Right - pad - keyWidth, middle - (_search.Height * 0.36), keyWidth, _search.Height * 0.72); - context.DrawRectangle(null, new Pen(new SolidColorBrush(Faint(0x50)), 1), cap.Deflate(0.5), 3, 3); - Text(context, key, cap.X + 5, middle, size * 0.85, Dim); - var textLeft = centre.X + (ring * 2) + 6; - Text(context, SearchText, textLeft, middle, size, Dim, maxWidth: Math.Max(1, cap.Left - 8 - textLeft)); + if (_search.Width > 0) + { + DrawSearch(context, middle, radius); } if (_counts.Width > 0) { - Text(context, CountsText(model), _counts.X, middle, size * 0.9, Dim); + Text(context, CountsText(model), _counts.X, middle, size - 1, Dim); + } + + if (model.Prefix is { } prefix) + { + DrawPrefix(context, prefix, overlay, middle); } if (_pill.Width > 0 && model.Character is { } character && model.World is { } world) { - var fill = Faint((byte)(Hovered(_pill) ? 0x2A : 0x18)); + var fill = Hovered(_pill) ? Raised(0.16) : Raised(0.09); context.DrawRectangle(new SolidColorBrush(fill), null, _pill, _pill.Height / 2, _pill.Height / 2); - var pad = Math.Round(size * 0.8); - var dot = size * 0.32; - var dotCentre = new Point(_pill.X + pad + dot, middle); var accent = Accent(world.Accent); - switch (character.Presence) - { - case CharacterPresence.Online: - context.DrawEllipse(new SolidColorBrush(accent), null, dotCentre, dot, dot); - break; - case CharacterPresence.Connecting: - context.DrawEllipse(null, new Pen(new SolidColorBrush(accent), 1.5), dotCentre, dot, dot); - break; - default: - context.DrawEllipse(null, new Pen(new SolidColorBrush(Dim), 1.2), dotCentre, dot, dot); - break; - } - - var x = dotCentre.X + dot + 6; - var room = _pill.Right - pad - x; + var dotCentre = new Point(_pill.X + 12 + 4.5, middle); + Dot(context, dotCentre, 4.5, character.Presence == CharacterPresence.Offline ? Dim : accent, character.Presence == CharacterPresence.Online); + var x = dotCentre.X + 4.5 + 8; + var room = _pill.Right - 12 - x; var nameWidth = Text(context, character.Name, x, middle, size, Ink, bold: true, maxWidth: room); - x += nameWidth + 8; - if (_pill.Right - pad - x > 12) + x += nameWidth + 10; + if (_pill.Right - 12 - x > 12) { - Text(context, character.Detail(world.Name), x, middle, size * 0.9, Dim, maxWidth: _pill.Right - pad - x); + Text(context, character.Detail(world.Name), x, middle, size - 1, Dim, maxWidth: _pill.Right - 12 - x); } } + + DrawVeil(context); + } + + private void DrawSearch(DrawingContext context, double middle, double radius) + { + const double size = FontSize; + var fill = Hovered(_search) ? Raised(0.13) : Raised(0.07); + context.DrawRectangle(new SolidColorBrush(fill), new Pen(new SolidColorBrush(Faint(0x30)), 1), _search.Deflate(0.5), radius, radius); + + // A magnifier: a ring and its handle. + const double ring = 5; + var centre = new Point(_search.X + 14 + ring, middle - 1); + var pen = new Pen(new SolidColorBrush(Dim), 1.4, lineCap: PenLineCap.Round); + context.DrawEllipse(null, pen, centre, ring, ring); + context.DrawLine(pen, centre + new Point(ring * 0.72, ring * 0.72), centre + new Point(ring * 1.55, ring * 1.55)); + + var key = KeyGlyphs.Words(HeaderModel.PaletteKey); + var keyWidth = Measure(key, size - 1.5) + 12; + var cap = new Rect(_search.Right - 8 - keyWidth, middle - 10, keyWidth, 20); + context.DrawRectangle(null, new Pen(new SolidColorBrush(Faint(0x50)), 1), cap.Deflate(0.5), 4, 4); + Text(context, key, cap.X + 6, middle, size - 1.5, Dim); + var textLeft = centre.X + (ring * 2) + 8; + Text(context, SearchText, textLeft, middle, size, Dim, maxWidth: Math.Max(1, cap.Left - 10 - textLeft)); + } + + private void DrawPrefix(DrawingContext context, HeaderPrefix prefix, ChromeOverlay overlay, double middle) + { + const double size = FontSize; + var notice = Legible(Parse(overlay.Palette.Notice)); + if (_prefix.Width > 0) + { + var plate = Color.FromArgb(0x2A, notice.R, notice.G, notice.B); + context.DrawRectangle(new SolidColorBrush(plate), new Pen(new SolidColorBrush(Color.FromArgb(0x90, notice.R, notice.G, notice.B)), 1), _prefix.Deflate(0.5), 7, 7); + var x = _prefix.X + 12; + x += Text(context, HeaderPrefix.Chord, x, middle, size, notice, bold: true) + 8; + Text(context, PrefixWord, x, middle, size - 1, Ink, maxWidth: Math.Max(1, _prefix.Right - 10 - x)); + } + + foreach (var (area, key) in _keys) + { + var colour = key.Available ? Ink : Faint(0x60); + context.DrawRectangle(new SolidColorBrush(Raised(key.Available ? 0.12 : 0.04)), new Pen(new SolidColorBrush(Faint(key.Available ? (byte)0x40 : (byte)0x20)), 1), area.Deflate(0.5), 5, 5); + Text(context, key.Keys, area.X + 8, middle, size, colour, bold: true); + } + + if (_exit.Width > 0) + { + Text(context, prefix.Exit, _exit.Right, middle, size - 1, Dim, alignRight: true); + } } } /// -/// The window's own sidebar, drawn over the client's rail: CONNECTIONS, worlds as headings, characters with a -/// presence dot and an unread badge (offline ones greyed and saying so), the open character's windows indented with -/// the chord that reaches each and its unread count, and an "add a game" button at the foot. Everything it says is -/// , the model the cell rail under it is drawn from, and every click goes back as the -/// target that model gave — the rail's own handler acts on it. +/// The window's own sidebar, down the left of the window beside the cells: CONNECTIONS, worlds as headings, +/// characters with a presence dot and an unread badge (offline ones greyed and saying so), the open character's +/// windows indented with the chord that reaches each and its unread count, and an "add a game" button at the foot. +/// Everything it says is , the model the cell rail would be drawn from, and every click goes +/// back as the target that model gave — the rail's own handler acts on it. The client draws no rail column here. /// -/// It draws within the rail's cells and never wider, so no pane moves and no world is told a new size. While the -/// rail is collapsed (⌃B b) it draws nothing and the cells' narrow strip shows. +/// Folded (⌃B b, or the fold button beside the title) it is a slim strip, the cell rail's collapsed form at a +/// desktop app's size: an unfold button, an accent mark per world, and a dot with an initial per character (filled +/// while connected, with an unread mark), each still a click on its target, with the name in its tooltip. /// /// internal sealed class NativeSidebar(TerminalView view) : NativeChromeView(view) @@ -416,38 +577,38 @@ internal sealed class NativeSidebar(TerminalView view) : NativeChromeView(view) /// What the button at the foot says. internal const string AddGameText = "+ Add a game or connect"; + /// The fold button's tooltip, open and folded. + internal const string FoldTip = "Fold the sidebar (⌃B b)", UnfoldTip = "Open the sidebar (⌃B b)"; + /// One drawn row: what it is, where, and its node. internal sealed record Row(RailRowKind Kind, Rect Area, RailWorld World, RailCharacter? Character = null, RailWindow? Window = null); private readonly List _rows = []; private Rect _add; + private Rect _fold; /// The rows as last laid out. Internal for tests. internal IReadOnlyList Rows => _rows; - private double CellHeight { get; set; } = 16; - - /// The height of a cell, which the rows are spaced from. - public void SetCellHeight(double height) => CellHeight = Math.Max(8, height); + private const double RowHeight = 28; - private double Size => Math.Clamp(CellHeight * 0.66, 9, 14); + private const double TitleHeight = 40; - private double RowHeight => Math.Round(Math.Max(CellHeight * 1.3, Size * 1.9)); + private bool Folded => Overlay?.Sidebar.Collapsed ?? false; - protected override void Layout(List<(Rect Area, string Target, string Tip)> hits) + protected override void Layout(ChromeOverlay overlay, List<(Rect Area, string Target, string Tip)> hits) { _rows.Clear(); _add = default; - if (Overlay is not { } overlay || double.IsNaN(Width) || double.IsNaN(Height)) - { - return; - } + var width = Width - NativeLayout.SidebarGutter; // the gutter is plane, never a row + var folded = overlay.Sidebar.Collapsed; + _fold = folded ? new Rect((width - 32) / 2, 6, 32, 28) : new Rect(width - 38, 6, 30, 28); + hits.Add((_fold, SidebarModel.CollapseTarget, folded ? UnfoldTip : FoldTip)); - var row = RowHeight; - var width = Width; - _add = new Rect(8, Height - row - 8, Math.Max(0, width - 16), row); + var row = folded ? 32 : RowHeight; + _add = folded ? new Rect((width - 32) / 2, Height - 32 - 10, 32, 32) : new Rect(10, Height - row - 12, Math.Max(0, width - 20), row + 2); var bottom = _add.Top - 6; - var y = row + 4; // under the CONNECTIONS title + var y = TitleHeight; void Add(Row r, string target, string tip) { if (r.Area.Bottom > bottom) @@ -461,34 +622,52 @@ void Add(Row r, string target, string tip) foreach (var world in overlay.Sidebar.Worlds) { - y += 6; - Add(new Row(RailRowKind.World, new Rect(4, y, width - 8, row), world), SidebarModel.TargetOf(world), world.Name); - y += row; - if (world.Characters.Count == 0) + y += folded ? 4 : 8; + if (folded) + { + // The world's accent mark, one short rule: where its characters begin. + Add(new Row(RailRowKind.World, new Rect(6, y, width - 12, 10), world), SidebarModel.TargetOf(world), world.Name); + y += 10; + } + else { - Add(new Row(RailRowKind.Empty, new Rect(4, y, width - 8, row), world), SidebarModel.TargetOf(world), $"{world.Name} has no characters yet"); + Add(new Row(RailRowKind.World, new Rect(6, y, width - 12, row), world), SidebarModel.TargetOf(world), $"{world.Name} — {world.Host}:{world.Port}"); y += row; + } + + if (world.Characters.Count == 0) + { + if (!folded) + { + Add(new Row(RailRowKind.Empty, new Rect(6, y, width - 12, row), world), SidebarModel.TargetOf(world), $"{world.Name} has no characters yet"); + y += row; + } + continue; } foreach (var character in world.Characters) { - Add(new Row(RailRowKind.Character, new Rect(4, y, width - 8, row), world, character), SidebarModel.TargetOf(character), $"Switch to {character.Name}"); + var area = folded ? new Rect((width - 36) / 2, y, 36, row) : new Rect(6, y, width - 12, row); + var tip = folded + ? $"{character.Name} on {world.Name}{(character.Connected ? string.Empty : " (offline)")}{(character.Unread > 0 ? $", {UnreadText(character.Unread)} unread" : string.Empty)}" + : $"Switch to {character.Name}"; + Add(new Row(RailRowKind.Character, area, world, character), SidebarModel.TargetOf(character), tip); y += row; - if (!character.Active) + if (!character.Active || folded) { continue; } foreach (var window in character.Windows) { - Add(new Row(RailRowKind.Window, new Rect(4, y, width - 8, row), world, character, window), SidebarModel.TargetOf(window), window.Closed ? $"{window.Title} is closed" : $"Go to {window.Title}"); + Add(new Row(RailRowKind.Window, new Rect(6, y, width - 12, row), world, character, window), SidebarModel.TargetOf(window), window.Closed ? $"{window.Title} is closed" : $"Go to {window.Title}"); y += row; } } } - if (_add.Width > 40 && _add.Top > row) + if (_add.Width > 20 && _add.Top > TitleHeight) { hits.Add((_add, SidebarModel.AddGameTarget, "Connect to a game, or add one")); } @@ -500,38 +679,53 @@ void Add(Row r, string target, string tip) public override void Render(DrawingContext context) { + // The plane runs on through the gutter to the panes (NativeLayout.SidebarGutter): the pane's own raised surface + // against it is the edge, as the cell rail's backdrop is. context.DrawRectangle(new SolidColorBrush(Plane), null, new Rect(Bounds.Size)); if (Overlay is not { } overlay) { return; } - var size = Size; - var row = RowHeight; - Text(context, "CONNECTIONS", 12, row / 2 + 4, size * 0.8, Dim, bold: true); + const double size = FontSize; + if (Hovered(_fold)) + { + context.DrawRectangle(new SolidColorBrush(Raised(0.12)), null, _fold, 6, 6); + } + + Chevron(context, _fold, left: !Folded, Dim); + if (!Folded) + { + Text(context, "CONNECTIONS", 16, _fold.Center.Y, size - 2.5, Dim, bold: true); + } foreach (var r in _rows) { + if (Folded) + { + DrawFolded(context, r, overlay); + continue; + } + var middle = r.Area.Center.Y; var hovered = Hovered(r.Area); var selected = r.Window is { } w && overlay.Sidebar.IsSelected(w) || r.Kind == RailRowKind.Character && r.Character!.Active; if (selected || hovered) { - var plate = (byte)(selected && hovered ? 0x30 : selected ? 0x22 : 0x14); - context.DrawRectangle(new SolidColorBrush(Faint(plate)), null, r.Area, 5, 5); + context.DrawRectangle(new SolidColorBrush(Raised(selected && hovered ? 0.16 : selected ? 0.11 : 0.07)), null, r.Area, 6, 6); } var accent = Accent(r.World.Accent); - var right = r.Area.Right - 8; + var right = r.Area.Right - 10; switch (r.Kind) { case RailRowKind.World: - context.DrawRectangle(new SolidColorBrush(accent), null, new Rect(r.Area.X + 4, middle - (size * 0.55), 3, size * 1.1), 1.5, 1.5); - Text(context, r.World.Name, r.Area.X + 14, middle, size, Ink, bold: true, maxWidth: right - r.Area.X - 14); + context.DrawRectangle(new SolidColorBrush(accent), null, new Rect(r.Area.X + 6, middle - 7, 3, 14), 1.5, 1.5); + Text(context, r.World.Name, r.Area.X + 18, middle, size, Ink, bold: true, maxWidth: right - r.Area.X - 18); break; case RailRowKind.Empty: - Text(context, "no characters", r.Area.X + 24, middle, size * 0.92, Dim, maxWidth: right - r.Area.X - 24); + Text(context, "no characters", r.Area.X + 28, middle, size - 1, Dim, maxWidth: right - r.Area.X - 28); break; case RailRowKind.Character: @@ -546,41 +740,72 @@ public override void Render(DrawingContext context) if (_add.Width > 0) { - var fill = Faint((byte)(Hovered(_add) ? 0x22 : 0x0E)); - context.DrawRectangle(new SolidColorBrush(fill), new Pen(new SolidColorBrush(Faint(0x40)), 1), _add.Deflate(0.5), 6, 6); - Text(context, AddGameText, _add.Center.X - (Math.Min(Measure(AddGameText, size), _add.Width - 12) / 2), _add.Center.Y, size, Ink, maxWidth: _add.Width - 12); + var fill = Hovered(_add) ? Raised(0.12) : Raised(0.05); + context.DrawRectangle(new SolidColorBrush(fill), new Pen(new SolidColorBrush(Faint(0x40)), 1), _add.Deflate(0.5), 7, 7); + if (Folded) + { + var pen = new Pen(new SolidColorBrush(Ink), 1.6, lineCap: PenLineCap.Round); + var c = _add.Center; + context.DrawLine(pen, c + new Point(-6, 0), c + new Point(6, 0)); + context.DrawLine(pen, c + new Point(0, -6), c + new Point(0, 6)); + } + else + { + Text(context, AddGameText, _add.Center.X - (Math.Min(Measure(AddGameText, size), _add.Width - 12) / 2), _add.Center.Y, size, Ink, maxWidth: _add.Width - 12); + } } + + DrawVeil(context); } - private void DrawCharacter(DrawingContext context, Row r, RailCharacter character, Color accent, double middle, double right, double size) + private void DrawFolded(DrawingContext context, Row r, ChromeOverlay overlay) { - var dot = size * 0.32; - var centre = new Point(r.Area.X + 22, middle); - var colour = character.Connected ? accent : Dim; - if (character.InGroup) + var accent = Accent(r.World.Accent); + if (r.Kind == RailRowKind.World) { - // A member of the send group wears a diamond, as on the cells. - var diamond = new StreamGeometry(); - using (var g = diamond.Open()) - { - g.BeginFigure(centre + new Point(0, -dot * 1.2), true); - g.LineTo(centre + new Point(dot * 1.2, 0)); - g.LineTo(centre + new Point(0, dot * 1.2)); - g.LineTo(centre + new Point(-dot * 1.2, 0)); - g.EndFigure(true); - } + context.DrawRectangle(new SolidColorBrush(accent), null, new Rect(r.Area.Center.X - 9, r.Area.Center.Y - 1.5, 18, 3), 1.5, 1.5); + return; + } - context.DrawGeometry(character.Connected ? new SolidColorBrush(colour) : null, new Pen(new SolidColorBrush(colour), 1.2), diamond); + if (r.Character is not { } character) + { + return; } - else if (character.Connected) + + // A disc with the character's initial: filled in the world's colour while connected, a ring while not. + var centre = r.Area.Center; + const double radius = 12; + if (character.Active || Hovered(r.Area)) + { + context.DrawRectangle(new SolidColorBrush(Raised(character.Active ? 0.12 : 0.07)), null, r.Area, 7, 7); + } + + var colour = character.Connected ? accent : Dim; + if (character.Connected) { - context.DrawEllipse(new SolidColorBrush(colour), null, centre, dot, dot); + context.DrawEllipse(new SolidColorBrush(colour), null, centre, radius, radius); } else { - context.DrawEllipse(null, new Pen(new SolidColorBrush(colour), 1.2), centre, dot, dot); + context.DrawEllipse(null, new Pen(new SolidColorBrush(colour), 1.4), centre, radius, radius); } + var initial = character.Name.Length > 0 ? char.ToUpperInvariant(character.Name[0]).ToString() : "?"; + var ink = character.Connected ? On(colour, Plane) : Dim; + Text(context, initial, centre.X - (Measure(initial, FontSize, bold: true) / 2), centre.Y, FontSize, ink, bold: true); + if (character.Unread > 0) + { + var mark = Legible(Parse(overlay.Palette.Unread)); + context.DrawEllipse(new SolidColorBrush(mark), new Pen(new SolidColorBrush(Plane), 1.5), centre + new Point(radius * 0.75, -radius * 0.75), 4, 4); + } + } + + private void DrawCharacter(DrawingContext context, Row r, RailCharacter character, Color accent, double middle, double right, double size) + { + var centre = new Point(r.Area.X + 24, middle); + var colour = character.Connected ? accent : Dim; + Dot(context, centre, 4.5, colour, character.Connected, diamond: character.InGroup); + // Right to left: the unread badge or the offline word, then the cycle chord. if (character.Unread > 0) { @@ -588,24 +813,24 @@ private void DrawCharacter(DrawingContext context, Row r, RailCharacter characte } else if (!character.Connected) { - right -= Text(context, "offline", right, middle, size * 0.85, Dim, alignRight: true) + 6; + right -= Text(context, "offline", right, middle, size - 1.5, Dim, alignRight: true) + 6; } if (character.Chord is { Length: > 0 } chord) { - right -= Text(context, KeyGlyphs.Words(chord), right, middle, size * 0.85, Dim, alignRight: true) + 6; + right -= Text(context, KeyGlyphs.Words(chord), right, middle, size - 1.5, Dim, alignRight: true) + 6; } - var x = centre.X + dot + 7; + var x = centre.X + 12; Text(context, character.Name, x, middle, size, character.Connected ? Ink : Dim, bold: character.Active, maxWidth: Math.Max(1, right - x)); } private void DrawWindow(DrawingContext context, Row r, RailWindow window, Color accent, bool selected, double middle, double right, double size) { - var x = r.Area.X + 36; + var x = r.Area.X + 40; if (selected) { - context.DrawRectangle(new SolidColorBrush(accent), null, new Rect(r.Area.X + 28, middle - (size * 0.5), 2.5, size), 1, 1); + context.DrawRectangle(new SolidColorBrush(accent), null, new Rect(r.Area.X + 31, middle - 7, 3, 14), 1.5, 1.5); } if (window.Unread > 0) @@ -615,12 +840,12 @@ private void DrawWindow(DrawingContext context, Row r, RailWindow window, Color if (!window.Closed && window.Chord is { Length: > 0 } chord) { - right -= Text(context, KeyGlyphs.Words(chord), right, middle, size * 0.85, Dim, alignRight: true) + 6; + right -= Text(context, KeyGlyphs.Words(chord), right, middle, size - 1.5, Dim, alignRight: true) + 6; } if (window.Closed) { - right -= Text(context, "closed", right, middle, size * 0.85, Dim, alignRight: true) + 6; + right -= Text(context, "closed", right, middle, size - 1.5, Dim, alignRight: true) + 6; } if (window.HasUnsent) diff --git a/src/SharpMUTerm.Avalonia/TerminalView.cs b/src/SharpMUTerm.Avalonia/TerminalView.cs index 11b2f9b4..81384662 100644 --- a/src/SharpMUTerm.Avalonia/TerminalView.cs +++ b/src/SharpMUTerm.Avalonia/TerminalView.cs @@ -102,6 +102,13 @@ public TerminalView(AvaloniaConsoleDriver driver, SKColor foreground, SKColor ba /// The driver this view paints. internal AvaloniaConsoleDriver Driver => _driver; + /// + /// Whether the client's header is the cells' first row, so a blank cell there moves the window as a title bar + /// would. False when the window draws the header itself (): the first row is then a + /// pane's tab strip, whose blank run is the client's and never a handle. + /// + internal bool CellsHoldHeader { get; set; } = true; + /// /// Raised on the window's thread after a new frame is taken for painting, and when the cell size or the view's /// size changes: when anything placed over cells may need to move. @@ -393,13 +400,13 @@ private bool TryWindowGesture(PointerPressedEventArgs e, Point position, bool em return false; } - if (window.WindowState == WindowState.Normal && WindowChrome.EdgeAt(position, Bounds.Size) is { } edge) + if (EdgeAt(position) is { } edge) { window.BeginResizeDrag(edge, e); return true; } - if (!emptyChrome && !WindowChrome.IsMoveHandle(_driver.Frame, Cell(position))) + if (!emptyChrome && (!CellsHoldHeader || !WindowChrome.IsMoveHandle(_driver.Frame, Cell(position)))) { return false; } @@ -418,6 +425,36 @@ private bool TryWindowGesture(PointerPressedEventArgs e, Point position, bool em return true; } + /// + /// The window edge a pointer at (in this view's coordinates, which may lie outside it — + /// a native view beside the cells asks with its own pointer) would resize, or null. Measured against the + /// window: the view does not reach the window's top or left edge when the window draws its own header + /// and sidebar there. + /// + private WindowEdge? EdgeAt(Point position) => + Undecorated is { WindowState: WindowState.Normal } window && this.TranslatePoint(position, window) is { } inWindow + ? WindowChrome.EdgeAt(inWindow, window.ClientSize) + : null; + + /// The resize cursor for a native view's pointer over a window edge, or null when it is not over one. + internal StandardCursorType? EdgeCursorFromChrome(PointerEventArgs e) => + EdgeAt(e.GetPosition(this)) is { } edge ? WindowChrome.CursorFor(edge) : null; + + /// + /// A left press on a native view beside the cells that lands in the window's resize band: begins the resize, as a + /// press on a cell there does. Returns false off the band, and with a title bar. + /// + internal bool ResizeFromChrome(PointerPressedEventArgs e) + { + if (Undecorated is not { } window || EdgeAt(e.GetPosition(this)) is not { } edge) + { + return false; + } + + window.BeginResizeDrag(edge, e); + return true; + } + /// How many presses this view has turned into a move or a maximise. Internal for tests. internal int WindowGestures { get; private set; } @@ -435,7 +472,7 @@ private void ToggleMaximised() /// private void UpdateCursor(Point position) { - var edge = Undecorated is { WindowState: WindowState.Normal } && !_mouse.IsHeld ? WindowChrome.EdgeAt(position, Bounds.Size) : null; + var edge = !_mouse.IsHeld ? EdgeAt(position) : null; var cursor = edge is { } e ? WindowChrome.CursorFor(e) : _scrollDrag is not null || _barHovered is not null ? StandardCursorType.Arrow : CursorFor(_target.Shape); diff --git a/src/SharpMUTerm.Avalonia/WindowHost.cs b/src/SharpMUTerm.Avalonia/WindowHost.cs index e973767b..40eab64f 100644 --- a/src/SharpMUTerm.Avalonia/WindowHost.cs +++ b/src/SharpMUTerm.Avalonia/WindowHost.cs @@ -31,7 +31,13 @@ internal static class WindowHost Reserved = [Maximise, .. Paste], }; - public static ClientHost Create(AvaloniaConsoleDriver driver, Action? clipboard) => new() + /// The window's driver. + /// Where a copy goes. + /// + /// Which chrome the window draws natively. The header and the rail by default, which is the window a person runs; + /// for --render-png and --cell-chrome, where the cells carry it all. + /// + public static ClientHost Create(AvaloniaConsoleDriver driver, Action? clipboard, HostChrome? chrome = null) => new() { Name = "window", Driver = driver, @@ -59,5 +65,9 @@ internal static class WindowHost // F7 and F8 open a native settings window generated from their declarations; the rest stay cell screens. NativeSettings = driver.Settings, + + // The header band and the connections sidebar are the window's own controls, beside the cell grid rather + // than over it (MainWindow, DesktopLayer): the client draws neither. + Chrome = chrome ?? HostChrome.HeaderAndRail, }; } diff --git a/src/SharpMUTerm.Avalonia/WindowOptions.cs b/src/SharpMUTerm.Avalonia/WindowOptions.cs index 7c0772e6..857321a5 100644 --- a/src/SharpMUTerm.Avalonia/WindowOptions.cs +++ b/src/SharpMUTerm.Avalonia/WindowOptions.cs @@ -23,8 +23,15 @@ internal sealed record WindowOptions( string? RenderPng, int Columns, int Rows, - bool TitleBar = false) + bool TitleBar = false, + bool CellChrome = false) { + /// + /// Which chrome the window draws natively: the header and the sidebar, unless --cell-chrome asked for the + /// terminal's cells or this is --render-png, which draws cells and nothing native. + /// + public HostChrome Chrome => CellChrome || RenderPng is not null ? HostChrome.None : HostChrome.HeaderAndRail; + /// /// What the client is told about this "terminal": Kitty graphics and truecolour. Both are true by /// construction — this driver is the thing drawing the pixels — so nothing is probed. @@ -39,6 +46,7 @@ public static WindowOptions Parse(string[] args) var points = 14f; var demo = false; var titleBar = false; + var cellChrome = false; var (columns, rows) = (120, 36); for (var i = 0; i < args.Length; i++) { @@ -55,6 +63,7 @@ public static WindowOptions Parse(string[] args) break; case "--demo-config": demo = true; break; case "--title-bar": titleBar = true; break; + case "--cell-chrome": cellChrome = true; break; case WindowHandoff.Flag: break; // already in a window case "--view": view = Next(); break; case "--theme": theme = Next(); break; @@ -70,7 +79,7 @@ public static WindowOptions Parse(string[] args) } } - return new WindowOptions([.. rest], font, points, demo, view, theme, png, columns, rows, titleBar); + return new WindowOptions([.. rest], font, points, demo, view, theme, png, columns, rows, titleBar, cellChrome); } /// Applies --theme, the way the snapshot does: name and inline theme both. @@ -118,8 +127,10 @@ public static string Usage new("--font ", "Monospace font (default: the first installed Nerd Font, then Cascadia, Consolas…)."), new("--font-size ", "Font size (default 14)."), new("--size ", "The window's first size in cells, and the grid for --render-png (default 120x36)."), - new("--title-bar", "Keep the system title bar. Without it, drag the blank part of the top row", + new("--title-bar", "Keep the system title bar. Without it, drag the blank part of the header", "to move the window, double-click it to maximise, and drag an edge to resize."), + new("--cell-chrome", "Draw the header and the connections sidebar in cells, as the terminal does,", + "instead of as the window's own controls."), ]), ("Demo:", [ diff --git a/src/SharpMUTerm.Client/Chrome/HeaderModel.cs b/src/SharpMUTerm.Client/Chrome/HeaderModel.cs index f965378c..ebee1f4a 100644 --- a/src/SharpMUTerm.Client/Chrome/HeaderModel.cs +++ b/src/SharpMUTerm.Client/Chrome/HeaderModel.cs @@ -45,6 +45,37 @@ public sealed record HeaderModel( /// The log cell as the header words it. public string LogText => Log == LogFormat.None ? "LOG off" : $"LOG {Log.ToString().ToLowerInvariant()}"; + + /// + /// While ⌃B is armed, what the next key does — the which-key keymap the cell header's strip abbreviates and the + /// panel lists in full; null otherwise. A host drawing its own header shows this in place of the search box. + /// + public HeaderPrefix? Prefix { get; init; } +} + +/// The ⌃B keymap as the header shows it while the prefix is armed. +/// Every key the prefix answers, in the panel's order. +/// How the prefix is left, as every surface words it. +public sealed record HeaderPrefix(IReadOnlyList Keys, string Exit) +{ + /// The chord that arms the prefix. + public const string Chord = "⌃B"; + + /// Value equality over the keys, which a record's list member does not give. + public bool Equals(HeaderPrefix? other) => + other is not null && Exit == other.Exit && Keys.SequenceEqual(other.Keys); + + public override int GetHashCode() => HashCode.Combine(Exit, Keys.Count); +} + +/// One key of the ⌃B keymap. +/// The key, or keys, as the panel writes them (|, 1–9, < > ← →). +/// What it does. +/// Why it cannot run now, or null when it can. +public sealed record HeaderPrefixKey(string Keys, string Title, string? Blocked) +{ + /// Whether the key does something now. + public bool Available => Blocked is null; } /// The world in front, as the header names it. diff --git a/src/SharpMUTerm.Client/Chrome/SidebarModel.cs b/src/SharpMUTerm.Client/Chrome/SidebarModel.cs index 255b440b..3ddff292 100644 --- a/src/SharpMUTerm.Client/Chrome/SidebarModel.cs +++ b/src/SharpMUTerm.Client/Chrome/SidebarModel.cs @@ -30,6 +30,13 @@ public sealed record SidebarModel(IReadOnlyList Worlds, string? Selec /// public const string AddGameTarget = "term:welcome"; + /// + /// The sidebar's own target for folding it to its slim strip and back: what ⌃B b does. A chrome target, never a + /// server's — only the chrome's own handler reads it — and offered only by a host that draws the sidebar itself, + /// because the cell rail is folded with the keys. + /// + public const string CollapseTarget = "sharpmuterm-rail:toggle"; + /// The flat rows the cell rail draws (). public IReadOnlyList Rows() => RailModel.Build(Worlds); diff --git a/src/SharpMUTerm.Tui/Hosting/ClientHost.cs b/src/SharpMUTerm.Tui/Hosting/ClientHost.cs index 1e8b37bb..b942f8d4 100644 --- a/src/SharpMUTerm.Tui/Hosting/ClientHost.cs +++ b/src/SharpMUTerm.Tui/Hosting/ClientHost.cs @@ -98,6 +98,14 @@ internal sealed record ClientHost /// public required INativeSettings? NativeSettings { get; init; } + /// + /// Which of the client's chrome the host draws itself, outside the cells (). The client + /// draws no cell for a part the host draws: no header row when , no rail column + /// when , so the cell grid the host hands the driver is only what is left. None in + /// the terminal, the snapshot and the tests, so their frames are the ones they always were. + /// + public required HostChrome Chrome { get; init; } + /// /// Whether the terminal driver's input path can decode a focus report. Not on Windows: the Windows branch of /// NetConsoleDriver is a Console.ReadKey loop with its own reassembly, and an ESC [ I @@ -136,6 +144,7 @@ public static ClientHost Terminal(TerminalCapabilities capabilities) Announcer = null, ScreenIsSeen = true, NativeSettings = null, + Chrome = HostChrome.None, }; /// @@ -159,6 +168,7 @@ public static ClientHost Terminal(TerminalCapabilities capabilities) Announcer = null, ScreenIsSeen = true, NativeSettings = null, + Chrome = HostChrome.None, }; /// @@ -209,3 +219,24 @@ internal static ClientHost HarnessTerminal( Presence = null, // nor talks to Discord }; } + +/// +/// The parts of the client's chrome a host draws with its own controls, outside the cell grid. The space they take is +/// the host's business, in its own units (the window's header is 42 pixels, not a row): the client is told only +/// that the part is not its to draw, and leaves no cell for it. So nothing is drawn twice, nothing native sits over a +/// cell it hides, and every count the client makes of its own rows — the input-height veto, the layout, the pane +/// rectangles and therefore NAWS — is made over the cells that really exist. +/// +/// The host draws the header band (the client's first row). +/// The host draws the connection rail (the client's left column, with its divider and spacer). +internal sealed record HostChrome(bool Header, bool Rail) +{ + /// The client draws all of its chrome in cells: the terminal, the snapshot, the tests. + public static HostChrome None { get; } = new(false, false); + + /// The host draws the header and the rail natively: the desktop window. + public static HostChrome HeaderAndRail { get; } = new(true, true); + + /// Whether the host draws anything at all. + public bool Any => Header || Rail; +} diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Chrome.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Chrome.cs index 6bb0ac92..b3602075 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Chrome.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Chrome.cs @@ -5,9 +5,10 @@ namespace SharpMUTerm.Tui; /// -/// The header band and the connection sidebar as data, for a host that draws them natively over their cells (the -/// window). Both are the view-models the cell header and the cell rail are drawn from (, -/// ), so a native view cannot say anything the cells do not. +/// The header band and the connection sidebar as data, for a host that draws them itself, outside the cells (the +/// window; ). Both are the view-models the cell header and the cell rail are drawn +/// from (, ), so a native view cannot say anything the cells +/// would not. /// /// A click comes back as a target the client itself put in the model, and goes where the same click on the /// cells goes: a rail target to , the rail's own handler, and the header's palette @@ -23,13 +24,15 @@ internal sealed partial class SharpMUTermApp private Action? _chromeActivate; /// - /// Tells the host where the header and the rail are and what they say, when any of it changed. Rides the frame, - /// for ' reason, and the main window's activation, because another window opening over - /// this one (⌃P, a settings screen, the quit prompt) repaints that window and not this one. + /// Tells the host what the header and the rail say, when any of it changed — only a host that draws them + /// (). Rides the frame, for ' reason; the main window's + /// activation, because another window opening over this one (⌃P, a settings screen) repaints that window and not + /// this one; and every refresh of the header or the rail (), because with neither in + /// the cells a change to them may move no cell and paint no frame. /// private void PublishChrome() { - if (_pointer is null) + if (_pointer is null || !Host.Chrome.Any) { return; } @@ -44,6 +47,18 @@ private void PublishChrome() _pointer.Chrome(overlay); } + /// + /// from a refresh of the header or the rail, which can run while the app is still + /// being built (the window and the overlays not there yet), when there is nothing to publish. + /// + private void PublishHostChrome() + { + if (_window is not null && _palette is not null) + { + PublishChrome(); + } + } + /// The chrome as it stands. Internal for tests. internal ChromeOverlay BuildChromeOverlay() { @@ -55,16 +70,16 @@ internal ChromeOverlay BuildChromeOverlay() header.World is { } world ? FillHex(world.Accent) : null, _ink.Accent, _ink.Draft, - UnreadBadge.TintFor(_ink)); + UnreadBadge.TintFor(_ink), + _ink.Notice, + Hex(_theme.StatusBackground), + Hex(WorkspacePalette.Backdrop(_theme)), + Hex(_theme.Resolve(Core.Text.TerminalColor.Default, isBackground: false))); - // Shown only while the main window is the one in front. Every other window here — the command surface, the - // settings screens, the composer, the quit prompt — is drawn in cells over this one, and a native view over - // the header or the rail would paint over it. return new ChromeOverlay( + Host.Chrome, MainWindowInFront(), - CellRectOf(_header), header, - RailCellRect(), BuildSidebar(), palette, _chromeActivate); @@ -78,30 +93,6 @@ internal ChromeOverlay BuildChromeOverlay() private bool MainWindowInFront() => _system.ActiveWindow is not { } front || ReferenceEquals(front, _window); - /// - /// The sidebar's rectangle: its whole column, top to bottom, which is what the rail's cells (and the plane under - /// them) occupy — the rail control itself is only as tall as its rows. The control's own when there is no column yet. - /// - private PaneRect RailCellRect() - { - var rows = CellRectOf(_rail); - var column = _railColumn is null ? default : CellRectOf(_railColumn); - return column.Width > 0 && column.Height >= rows.Height ? column : rows; - } - - /// A control's arranged rectangle in desktop cells, or empty while it has none. - private PaneRect CellRectOf(SharpConsoleUI.Controls.IWindowControl control) - { - if (_window.GetLayoutNode(control) is not { } node) - { - return default; - } - - var origin = ContentOrigin(); - var bounds = node.AbsoluteBounds; - return new PaneRect(origin.X + bounds.X, origin.Y + bounds.Y, bounds.Width, bounds.Height); - } - /// /// A click on a native header or sidebar, by the target the client put in the model. Internal so a test can drive /// it the way a host does; returns whether the target was one the client offered and was acted on. @@ -115,6 +106,13 @@ internal bool ActivateChromeTarget(string target) return false; } + // A modal in front (⌃P, a settings screen, the composer, the quit prompt) owns the keys and the screen; the + // chrome stays drawn beside it, inert, as a desktop app's does under its own dialog. + if (!MainWindowInFront()) + { + return false; + } + if (target == HeaderModel.PaletteTarget) { // Opens, rather than the ☰'s toggle: a search box is clicked to start typing in it, never to close it. @@ -126,6 +124,12 @@ internal bool ActivateChromeTarget(string target) return true; } + if (target == SidebarModel.CollapseTarget) + { + ToggleRail(); + return true; + } + if (target == SidebarModel.AddGameTarget) { return DispatchCommand(target); @@ -139,39 +143,49 @@ internal bool ActivateChromeTarget(string target) } /// -/// The header band and the connection sidebar, for a host that draws them natively over their cells. The cells are -/// drawn as in any host, so a host that draws nothing loses nothing, and the parity test, which compares cells, is -/// unaffected. +/// The header band and the connection sidebar, for a host that draws them itself beside the cells +/// (). There are no cells under them: the client leaves no row or column for a part the +/// host draws, so the host places them in its own units and the cell grid is what is left. /// -/// Whether the main window is in front; while another window is, nothing native may be drawn. -/// The header row's rectangle, in desktop cells. +/// Which parts the host draws; a part it does not draw is in the cells and is not its to show. +/// +/// Whether the main window is in front. While another of the client's windows is (⌃P, a settings screen, the +/// composer, the quit prompt), the chrome stays drawn and takes no click: the modal owns the screen. +/// /// What the header says. -/// The rail's rectangle, in desktop cells: the sidebar column, top to bottom. /// What the rail says. -/// The client's own colours for the active theme. +/// The client's own colours for the active theme, planes included. /// /// Acts on a target from or ; safe to call from any thread. The same /// instance for the life of the app, so an overlay compares equal from frame to frame. /// internal sealed record ChromeOverlay( - bool Shown, - PaneRect Header, + HostChrome Drawn, + bool Interactive, HeaderModel HeaderModel, - PaneRect Rail, SidebarModel Sidebar, ChromePalette Palette, Action Activate) { /// Whether is one this overlay offered a click on. public bool Offers(string target) => - target == HeaderModel.PaletteTarget - || target == HeaderModel.Character?.Target - || Sidebar.Targets().Contains(target, StringComparer.Ordinal); + (Drawn.Header && (target == HeaderModel.PaletteTarget || target == HeaderModel.Character?.Target)) + || (Drawn.Rail && (target == SidebarModel.CollapseTarget || Sidebar.Targets().Contains(target, StringComparer.Ordinal))); } /// /// The chrome's own colours as #rrggbb: the brand fill of the ribbon's first segment, the world's fill (or -/// null with no world), the client's accent, the draft pen, and the unread badge. Planes are not here: a host reads -/// those off the frame's cells, so a native view sits on what the cells under it wear. +/// null with no world), the client's accent, the draft pen, the unread badge, the client's notice voice (the armed +/// ⌃B), and the three a host needs to sit its views on the client's palette with no cell to read them off — the header +/// band's plane, the backdrop the rail sits on, and the default ink. /// -internal sealed record ChromePalette(string Brand, string? WorldFill, string Accent, string Draft, string Unread); +internal sealed record ChromePalette( + string Brand, + string? WorldFill, + string Accent, + string Draft, + string Unread, + string Notice, + string HeaderPlane, + string RailPlane, + string Ink); diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 7576598e..c43f894f 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -838,6 +838,10 @@ public SharpMUTermApp( _header.FocusedLinkBackgroundColor = ToColor(new Rgb(brand.R, brand.G, brand.B)); _header.FocusedLinkForegroundColor = ToColor(_theme.Resolve(TerminalColor.Default, isBackground: true)); + // A host that draws the header (the window) gets no header row at all: hidden, a sticky band takes no row, + // so the workspace starts at row 0 and every count of the chrome below follows (ChromeRows). + _header.Visible = !host.Chrome.Header; + var main = NewPaneControl(MainWindowId); // The connection rail (worlds → characters → windows) sits left of the pane area, joined by @@ -950,7 +954,7 @@ public SharpMUTermApp( // *old* window's arranged rectangles — the new ones don't exist until the next frame is // laid out — so a report made here would announce a size that was already wrong. The // repaint this resize forces reports them once they are real; see ReportPaneSizes. - _header.SetContent(new List { HeaderMarkup() }); // re-align the status cluster to the new width + RefreshHeader(); // re-align the status cluster to the new width SyncInputWidth(); // keep the input band spanning the full row after a resize SyncInputBars(); // and re-derive how tall the bars may grow in the new window }; @@ -1801,7 +1805,7 @@ public string RenderSnapshot(string? view = null) if (string.Equals(view, "prefix-panel", StringComparison.OrdinalIgnoreCase)) { _prefixArmed = true; - _header.SetContent(new List { HeaderMarkup() }); + RefreshHeader(); _prefixPanel.Open(); } @@ -1915,7 +1919,7 @@ public string RenderSnapshot(string? view = null) if (_config.Worlds.ElementAtOrDefault(1) is { Characters.Count: > 0 } second) { _demoConnectedKeys.Add($"{second.Name}.{second.Characters[0].Name}"); - _header.SetContent(new List { HeaderMarkup() }); // the band counts them: 2/3 + RefreshHeader(); // the band counts them: 2/3 } _input.SetAndNotify("say back in a moment — kettle's on"); @@ -2344,7 +2348,7 @@ void Feed(string windowId, string ansiLine) // would read "utf-8 forced" and a server that never negotiated "utf-8 assumed". _demoEncoding = new SessionEncoding(Encoding.UTF8, EncodingSource.Negotiated); _statusBar.SetContent(new List { StatusBarMarkup("Corvid", "connected") }); - _header.SetContent(new List { HeaderMarkup() }); + RefreshHeader(); _input.SetAndNotify("say hello there"); RebuildPaneArea(); // realise the Chat spawn tab, then refresh badges } @@ -5647,7 +5651,8 @@ private void SyncInputHeights(bool secondShown) /// on the first frame too, and nothing has been arranged yet when the window is built. /// private int ChromeRows() => - InputLayout.WrappedRows(MarkupWidth(_header.Text), HeaderWidth()) + // No row for a header the host draws: it is not in the cells, so the bars may have the row it would take. + (_header.Visible ? InputLayout.WrappedRows(MarkupWidth(_header.Text), HeaderWidth()) : 0) + InputLayout.WrappedRows(MarkupWidth(_statusBar.Text), HeaderWidth()) // One, not WrappedRows: the prompt row is elided to a single row by construction, precisely so // that a long prompt cannot take a second row off the panes. See PromptRowRenderer. @@ -8044,6 +8049,7 @@ private void RefreshRail() var lines = RenderRailLines(); _rail.SetContent(lines); ApplyRailWidth(RailWidth(lines)); + PublishHostChrome(); // a rail the host draws has no cell to repaint (RefreshHeader's reason) } /// @@ -9351,7 +9357,7 @@ private void ToggleMenu() } _palette.Toggle(); - _header.SetContent(new List { HeaderMarkup() }); + RefreshHeader(); } /// @@ -10152,6 +10158,18 @@ private IWindowControl BuildWorkspaceRow() // Stretch (control default is Left) so the window arranges the whole row at the full console // width; without it the row floats at content width and the Flex pane column can't claim the // space to the right edge. (SharpConsoleUI docs/patterns.md — sidebar+content layouts.) + // A host that draws the rail itself (the window) gets the pane area alone: no rail column, no divider and no + // spacer, so the panes start at column 0 and are as wide as the cells really are — which is what NAWS reports. + if (Host.Chrome.Rail) + { + _railColumn = null; + return Controls.HorizontalGrid() + .WithAlignment(HorizontalAlignment.Stretch) + .WithVerticalAlignment(VerticalAlignment.Fill) + .Column(c => c.Flex(1).Add(paneArea)) + .Build(); + } + var row = Controls.HorizontalGrid() .WithAlignment(HorizontalAlignment.Stretch) .WithVerticalAlignment(VerticalAlignment.Fill) @@ -10596,6 +10614,18 @@ private List RenderRailLines() : RailRenderer.Render(rows, RailMaxWidth - RailMargin, _ink); } + /// + /// Folds the rail to its narrow strip, or opens it again: ⌃B b, and the native sidebar's own fold button. With the + /// rail in the cells that is a rebuild of the row it shares with the panes; with the rail the host's, the cells do + /// not change at all and only the host is told — its sidebar narrows, and the cell grid it hands the driver widens. + /// + private void ToggleRail() + { + _railCollapsed = !_railCollapsed; + RebuildPaneArea(); + PublishHostChrome(); + } + /// The narrowest the expanded sidebar goes, so a sparse rail still reads as a column. private const int RailMinWidth = 16; @@ -11047,7 +11077,7 @@ private void ArmPrefix() } _prefixArmed = true; - _header.SetContent(new List { HeaderMarkup() }); + RefreshHeader(); _prefixTimer ??= _time.CreateTimer( _ => OnUiThread(ShowPrefixPanel), null, Timeout.InfiniteTimeSpan, Timeout.InfiniteTimeSpan); _prefixTimer.Change(PrefixPanelDelay, Timeout.InfiniteTimeSpan); @@ -11068,7 +11098,7 @@ private void DisarmPrefix() _prefixArmed = false; _prefixTimer?.Change(Timeout.InfiniteTimeSpan, Timeout.InfiniteTimeSpan); _prefixPanel.Close(); - _header.SetContent(new List { HeaderMarkup() }); + RefreshHeader(); } /// @@ -11799,8 +11829,7 @@ private void RunPrefixCommand(char key) break; case 'b': - _railCollapsed = !_railCollapsed; - RebuildPaneArea(); + ToggleRail(); break; case '<': @@ -13296,7 +13325,7 @@ private void UpdateStatus() var character = session.Character?.Name ?? session.World.Name; _statusIdentity = (character, session.World.Host, session.World.Port, session.State.ToString().ToLowerInvariant()); RefreshStatusBar(); - _header.SetContent(new List { HeaderMarkup() }); + RefreshHeader(); RefreshRail(); } @@ -13306,7 +13335,14 @@ private void UpdateStatus() /// connected fraction reading the old denominator until the next connect or disconnect happened to /// repaint it. /// - private void RefreshHeader() => _header.SetContent(new List { HeaderMarkup() }); + private void RefreshHeader() + { + _header.SetContent(new List { HeaderMarkup() }); + + // A host that draws the header itself has no cell of it to repaint, so a change that moves no cell (⌃B + // armed, a world connecting) might paint no frame and the host would not hear of it on PostBufferPaint. + PublishHostChrome(); + } /// /// The design header row: the brand affordance on the left, the active world (with its accent) @@ -13353,7 +13389,14 @@ internal HeaderModel BuildHeaderModel() ConfiguredConnections(), _config.Worlds.Count > 0, HeaderLogFormat(), - _prefixArmed); + _prefixArmed) + { + Prefix = _prefixArmed + ? new HeaderPrefix( + [.. PrefixPanel.Entries(PrefixFactsNow()).Select(e => new HeaderPrefixKey(e.Keys, e.Title, e.Blocked))], + "Esc cancels") + : null, + }; } /// The header row's markup, drawn from and nothing else it could disagree with. diff --git a/tests/SharpMUTerm.Avalonia.Tests/DesktopLayerTests.cs b/tests/SharpMUTerm.Avalonia.Tests/DesktopLayerTests.cs index 36281a5c..5fbaa577 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/DesktopLayerTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/DesktopLayerTests.cs @@ -52,7 +52,7 @@ public async Task TheClientPublishesTheVitalsPaneWithTheModelItsCellStripIsDrawn public async Task PublishingPanelsMovesNoPaneRectangle() { using var headless = new HeadlessConsoleDriver(140, 36); - await using var terminal = new SharpMUTermApp(DemoScene.Build(), ClientHost.Headless(headless, WindowOptions.Capabilities)); + await using var terminal = new SharpMUTermApp(DemoScene.Build(), ClientHost.Headless(headless, WindowOptions.Capabilities) with { Chrome = HostChrome.HeaderAndRail }); terminal.RenderSnapshot("layout-combat"); using var driver = new AvaloniaConsoleDriver(140, 36); @@ -337,7 +337,7 @@ internal static Task Run( { var driver = new AvaloniaConsoleDriver(columns, rows); var view = new TerminalView(driver, SKColors.White, Back, 16, null); - var layer = new DesktopLayer(view); + var layer = new DesktopLayer(view, HostChrome.None); var root = new Panel(); root.Children.Add(view); root.Children.Add(layer); diff --git a/tests/SharpMUTerm.Avalonia.Tests/HostParityTests.cs b/tests/SharpMUTerm.Avalonia.Tests/HostParityTests.cs index d8639ebb..46f1edb9 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/HostParityTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/HostParityTests.cs @@ -24,29 +24,43 @@ public partial class HostParityTests public static IEnumerable Views() => SnapshotViews.All.Select(v => v ?? "(default)"); + /// + /// Every view under both chrome arrangements: the client's chrome in cells (the terminal's, and the window's with + /// --cell-chrome), and the header and rail drawn by the host (the window as a person runs it). Both hosts + /// are told the same arrangement each time, so the comparison is still of drivers and nothing else, over every + /// cell either one draws. + /// + public static IEnumerable<(string View, bool HostChrome)> ViewsUnderBothChromes() => + from view in Views() + from native in new[] { false, true } + select (view, native); + + private static HostChrome ChromeFor(bool native) => native ? HostChrome.HeaderAndRail : HostChrome.None; + /// /// A view drawn in the window is the view drawn in the terminal, cell for cell. What this catches is the /// driver falling behind the framework — a cell it does not store, a write path it does not implement — /// for any view, including the next one added (EveryViewTheSnapshotKnowsIsInTheParityList). /// [Test] - [MethodDataSource(nameof(Views))] - public async Task EveryViewDrawsTheSameCellsInTheWindowAsInTheTerminal(string name) + [MethodDataSource(nameof(ViewsUnderBothChromes))] + public async Task EveryViewDrawsTheSameCellsInTheWindowAsInTheTerminal(string name, bool hostChrome) { var view = name == "(default)" ? null : name; + var chrome = ChromeFor(hostChrome); Console.SetIn(TextReader.Null); string ansi; using (var headless = new HeadlessConsoleDriver(Width, Height)) { - await using var terminal = new SharpMUTermApp(DemoScene.Build(), ClientHost.Headless(headless, Caps)); + await using var terminal = new SharpMUTermApp(DemoScene.Build(), ClientHost.Headless(headless, Caps) with { Chrome = chrome }); ansi = terminal.RenderSnapshot(view); } using var driver = new AvaloniaConsoleDriver(Width, Height); await using (var window = new SharpMUTermApp( DemoScene.Build(), - WindowHost.Create(driver, clipboard: null) with { Capabilities = Caps, Keys = HostKeys.Terminal, Audio = null, Presence = null, Announcer = null, NativeSettings = null, RunsInline = true })) + WindowHost.Create(driver, clipboard: null, chrome) with { Capabilities = Caps, Keys = HostKeys.Terminal, Audio = null, Presence = null, Announcer = null, NativeSettings = null, RunsInline = true })) { window.RenderSnapshot(view); } @@ -60,12 +74,14 @@ public async Task EveryViewDrawsTheSameCellsInTheWindowAsInTheTerminal(string na /// above draws every view inline, with no loop, and that is how a ⌃P menu and an F1 composer that the window /// drew as empty frames went unnoticed: inline they were whole. The bottom row is left out — a running client /// has been through startup, and says on that row that nothing connects at start, where a snapshot never - /// started — and so are the views that read the clock, which a loop does and a snapshot pins. + /// started — and so are the views that read the clock, which a loop does and a snapshot pins. Drawn with the + /// window's own chrome, because that is how a person runs it; the terminal is told the same. /// [Test] [MethodDataSource(nameof(Views))] public async Task EveryViewDrawsTheSameCellsWhenTheWindowsLoopIsRunning(string name) { + var chrome = HostChrome.HeaderAndRail; var view = name == "(default)" ? null : name; if (view is "timestamps" or "timestamps-toggled") { @@ -76,14 +92,14 @@ public async Task EveryViewDrawsTheSameCellsWhenTheWindowsLoopIsRunning(string n string ansi; using (var headless = new HeadlessConsoleDriver(Width, Height)) { - await using var terminal = new SharpMUTermApp(DemoScene.Build(), ClientHost.Headless(headless, Caps)); + await using var terminal = new SharpMUTermApp(DemoScene.Build(), ClientHost.Headless(headless, Caps) with { Chrome = chrome }); ansi = terminal.RenderSnapshot(view); } using var driver = new AvaloniaConsoleDriver(Width, Height); await using var window = new SharpMUTermApp( DemoScene.Build(), - WindowHost.Create(driver, clipboard: null) with { Capabilities = Caps, Keys = HostKeys.Terminal, Audio = null, Presence = null, Announcer = null, NativeSettings = null }); + WindowHost.Create(driver, clipboard: null, chrome) with { Capabilities = Caps, Keys = HostKeys.Terminal, Audio = null, Presence = null, Announcer = null, NativeSettings = null }); window.OnUiThread(() => _ = window.RenderSnapshot(view)); var loop = new Thread(() => window.Run([])) { IsBackground = true }; loop.Start(); diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativeChromeTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativeChromeTests.cs index cd5eaedd..499bde6d 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/NativeChromeTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/NativeChromeTests.cs @@ -15,10 +15,11 @@ namespace SharpMUTerm.Avalonia.Tests; /// -/// The window's native header and sidebar (, ): drawn exactly -/// over the cells the client says hold the header and the rail, from the models those cells are drawn from; a click -/// is handed back as the model's own target and never reaches the client as a press on a cell; empty header space -/// still moves the window; and no pane moves. +/// The window's native header and sidebar (, ): drawn beside the +/// cells at a desktop app's size, with no cell under either — the view is moved out of their way, so the grid the +/// driver holds is what is left of the window; a click is handed back as the model's own target and never reaches the +/// client as a press on a cell; a press on the cells still lands on the cell under the pointer; empty header space +/// still moves the window; and no pane is laid out differently from a terminal told the same chrome. /// public class NativeChromeTests { @@ -26,6 +27,8 @@ public class NativeChromeTests private static readonly TerminalColor Teal = TerminalColor.FromRgb(0x00, 0xf5, 0xb7); + private const int Columns = 100, Rows = 30; + private static SidebarModel Sidebar(bool collapsed = false) => new( [ new RailWorld("Aetherfall", "aether.example", 4000, Teal, @@ -45,55 +48,93 @@ public class NativeChromeTests false, new HeaderWorld("Aetherfall", Teal), new HeaderCharacter("Corvid", "Aetherfall.Corvid", CharacterPresence.Online, "aether.example", 4000, true, CommandIds.Character("Aetherfall.Corvid")), - 1, 2, true, LogFormat.None, prefix); + 1, 2, true, LogFormat.None, prefix) + { + Prefix = prefix + ? new HeaderPrefix([new HeaderPrefixKey("|", "split this pane side by side", null), new HeaderPrefixKey("z", "zoom", "needs a second pane")], "Esc cancels") + : null, + }; - private static ChromeOverlay Overlay(Action activate, bool shown = true, bool collapsed = false, bool prefix = false) => new( - shown, - new PaneRect(0, 0, 100, 1), + private static ChromeOverlay Overlay(Action activate, bool interactive = true, bool collapsed = false, bool prefix = false) => new( + HostChrome.HeaderAndRail, + interactive, Header(prefix), - new PaneRect(0, 1, 22, 28), Sidebar(collapsed), - new ChromePalette("#9d7cff", "#00f5b7", "#00f5b7", "#ffd700", "#00f5b7"), + new ChromePalette("#9d7cff", "#00f5b7", "#00f5b7", "#ffd700", "#00f5b7", "#ffaf00", "#202028", "#18181d", "#e0e0e0"), activate); [Test] - public async Task TheHeaderAndTheSidebarCoverExactlyTheCellsTheClientNamed() + public async Task TheHeaderAndTheSidebarSitBesideTheCellsAndNoCellIsUnderThem() { - var (header, sidebar, cell) = await Run((window, view, layer, driver) => + var (header, sidebar, view, grid, cell, windowSize) = await Run((window, view, layer, driver) => { ((IPointerPresenter)driver.Pointer).Chrome(Overlay(_ => { })); Drain(); window.UpdateLayout(); - return (Bounds(layer.Header, window), Bounds(layer.Sidebar, window), view.CellExtent); + Drain(); + return (Bounds(layer.Header, window), Bounds(layer.Sidebar, window), Bounds(view, window), + (driver.ScreenSize.Width, driver.ScreenSize.Height), view.CellExtent, window.ClientSize); }); - await Assert.That(header).IsEqualTo(new Rect(0, 0, 100 * cell.Width, cell.Height)); - await Assert.That(sidebar).IsEqualTo(new Rect(0, cell.Height, 22 * cell.Width, 28 * cell.Height)); + await Assert.That(header).IsEqualTo(new Rect(0, 0, windowSize.Width, NativeLayout.HeaderHeight)); + await Assert.That(sidebar).IsEqualTo(new Rect(0, NativeLayout.HeaderHeight, NativeLayout.SidebarWidth + NativeLayout.SidebarGutter, windowSize.Height - NativeLayout.HeaderHeight)); + await Assert.That(view.Position).IsEqualTo(new Point(NativeLayout.SidebarWidth + NativeLayout.SidebarGutter, NativeLayout.HeaderHeight)); + await Assert.That(header.Height).IsGreaterThan(cell.Height * 1.5).Because("a desktop header, not a squeezed cell row"); + + // The grid is the view's, and the view is what the chrome leaves: the client's cells start past both. + await Assert.That(grid).IsEqualTo(((int)(view.Width / cell.Width), (int)(view.Height / cell.Height))); + await Assert.That(grid.Width).IsEqualTo(Columns).Because("the window was sized to hold the requested grid beside its chrome"); + await Assert.That(grid.Height).IsEqualTo(Rows); } [Test] - public async Task NothingNativeIsDrawnUnderAnotherWindowOverACollapsedRailOrOverTheArmedPrefix() + public async Task AFoldedRailIsASlimStripAndTheGridWidensIntoTheRoomItGaveBack() { - var states = await Run((window, view, layer, driver) => + var (open, folded, openColumns, foldedColumns, rows) = await Run((window, view, layer, driver) => { - var seen = new List<(bool Header, bool Sidebar)>(); - foreach (var overlay in new[] - { - Overlay(_ => { }), Overlay(_ => { }, shown: false), Overlay(_ => { }, collapsed: true), Overlay(_ => { }, prefix: true), - }) - { - ((IPointerPresenter)driver.Pointer).Chrome(overlay); - Drain(); - seen.Add((layer.Header.IsVisible, layer.Sidebar.IsVisible)); - } + ((IPointerPresenter)driver.Pointer).Chrome(Overlay(_ => { })); + Drain(); + window.UpdateLayout(); + Drain(); + var open = layer.Sidebar.Bounds.Width; + var openColumns = driver.ScreenSize.Width; + ((IPointerPresenter)driver.Pointer).Chrome(Overlay(_ => { }, collapsed: true)); + Drain(); + window.UpdateLayout(); + Drain(); + return (open, layer.Sidebar.Bounds.Width, openColumns, driver.ScreenSize.Width, layer.Sidebar.Rows.Select(r => r.Kind).ToArray()); + }); + + await Assert.That(open).IsEqualTo(NativeLayout.SidebarWidth + NativeLayout.SidebarGutter); + await Assert.That(folded).IsEqualTo(NativeLayout.SidebarSlim + NativeLayout.SidebarGutter); + await Assert.That(foldedColumns).IsGreaterThan(openColumns); + await Assert.That(rows).IsEquivalentTo(new[] { RailRowKind.World, RailRowKind.Character, RailRowKind.Character }) + .Because("folded, a world is its mark and each character its disc; windows are the open sidebar's"); + } - return seen; + [Test] + public async Task UnderAModalTheChromeStaysAndTakesNoClickAndTheArmedPrefixIsInTheHeader() + { + var (visible, activated, prefixKeys) = await Run((window, view, layer, driver) => + { + var activated = new List(); + ((IPointerPresenter)driver.Pointer).Chrome(Overlay(activated.Add, interactive: false)); + Drain(); + window.UpdateLayout(); + Drain(); + var visible = (layer.Header.IsVisible, layer.Sidebar.IsVisible, layer.Header.Inert); + Click(window, layer.Sidebar, layer.Sidebar.Rows.Single(r => r.Character?.Name == "Wren").Area); + + ((IPointerPresenter)driver.Pointer).Chrome(Overlay(activated.Add, prefix: true)); + Drain(); + window.UpdateLayout(); + Drain(); + return (visible, activated, layer.Header.PrefixKeys.Select(k => (k.Key.Keys, k.Key.Available)).ToArray()); }); - await Assert.That(states[0]).IsEqualTo((true, true)); - await Assert.That(states[1]).IsEqualTo((false, false)); - await Assert.That(states[2]).IsEqualTo((true, false)); - await Assert.That(states[3]).IsEqualTo((false, true)); + await Assert.That(visible).IsEqualTo((true, true, true)); + await Assert.That(activated).IsEmpty().Because("a modal owns the screen; the chrome beside it is inert"); + await Assert.That(prefixKeys).IsEquivalentTo(new[] { ("|", true), ("z", false) }); } [Test] @@ -105,72 +146,104 @@ public async Task AClickOnTheSidebarOrTheHeaderHandsBackTheModelsTargetAndNeverR ((IPointerPresenter)driver.Pointer).Chrome(Overlay(activated.Add)); Drain(); window.UpdateLayout(); + Drain(); var clientSaw = new List>(); driver.MouseEvent += (_, flags, _) => clientSaw.Add(flags); - void Click(Control on, Rect area) - { - var centre = on.TranslatePoint(area.Center, window)!.Value; - window.MouseMove(centre); - window.MouseDown(centre, MouseButton.Left); - window.MouseUp(centre, MouseButton.Left); - Drain(); - } - var chat = layer.Sidebar.Rows.Single(r => r.Window?.Id == "spawn:2"); - Click(layer.Sidebar, chat.Area); + Click(window, layer.Sidebar, chat.Area); var wren = layer.Sidebar.Rows.Single(r => r.Character?.Name == "Wren"); - Click(layer.Sidebar, wren.Area); - Click(layer.Sidebar, layer.Sidebar.Hits.Single(h => h.Target == SidebarModel.AddGameTarget).Area); - Click(layer.Header, layer.Header.Hits.Last(h => h.Target == HeaderModel.PaletteTarget).Area); - Click(layer.Header, layer.Header.Hits.Single(h => h.Target.StartsWith(CommandIds.CharacterPrefix, StringComparison.Ordinal)).Area); - window.MouseWheel(window.Bounds.Center.WithX(10), new Vector(0, 1)); + Click(window, layer.Sidebar, wren.Area); + Click(window, layer.Sidebar, layer.Sidebar.Hits.Single(h => h.Target == SidebarModel.AddGameTarget).Area); + Click(window, layer.Sidebar, layer.Sidebar.Hits.Single(h => h.Target == SidebarModel.CollapseTarget).Area); + Click(window, layer.Header, layer.Header.Hits.Last(h => h.Target == HeaderModel.PaletteTarget).Area); + Click(window, layer.Header, layer.Header.Hits.Single(h => h.Target.StartsWith(CommandIds.CharacterPrefix, StringComparison.Ordinal)).Area); + window.MouseWheel(new Point(40, window.ClientSize.Height / 2), new Vector(0, 1)); Drain(); return (activated, clientSaw, layer.Sidebar.Rows.Select(r => r.Kind).ToArray(), view.IsFocused); - }, columns: 100, rows: 30); + }); await Assert.That(activated).IsEquivalentTo(new[] { CommandIds.Window("spawn:2"), CommandIds.Character("Aetherfall.Wren"), SidebarModel.AddGameTarget, - HeaderModel.PaletteTarget, CommandIds.Character("Aetherfall.Corvid"), + SidebarModel.CollapseTarget, HeaderModel.PaletteTarget, CommandIds.Character("Aetherfall.Corvid"), }); await Assert.That(clientSaw.Count).IsEqualTo(0).Because("every press, release and wheel over native chrome is the window's"); await Assert.That(focused).IsTrue().Because("the keyboard stays with the client"); await Assert.That(rows).IsEquivalentTo(new[] { RailRowKind.World, RailRowKind.Character, RailRowKind.Window, RailRowKind.Window, RailRowKind.Character }); } + [Test] + public async Task APressOnTheCellsLandsOnTheCellUnderThePointerPastTheChrome() + { + var landed = await Run((window, view, layer, driver) => + { + ((IPointerPresenter)driver.Pointer).Chrome(Overlay(_ => { })); + Drain(); + window.UpdateLayout(); + Drain(); + var cells = new List(); + driver.MouseEvent += (_, _, point) => cells.Add(point); + + // The middle of cell (5, 3), in window coordinates: past the sidebar and under the header. + var cell = view.CellExtent; + var at = view.TranslatePoint(new Point((5.5 * cell.Width), (3.5 * cell.Height)), window)!.Value; + window.MouseDown(at, MouseButton.Left); + window.MouseUp(at, MouseButton.Left); + Drain(); + return cells; + }); + + await Assert.That(landed.Count).IsGreaterThan(0); + await Assert.That(landed.Distinct()).IsEquivalentTo(new[] { new System.Drawing.Point(5, 3) }); + } + [Test] public async Task APressOnEmptyHeaderSpaceMovesTheWindowAndNeverReachesTheClient() { - var (gestures, clientSaw, activated) = await Run((window, view, layer, driver) => + var (gestures, clientSaw, activated, cellRowMoves) = await Run((window, view, layer, driver) => { var activated = new List(); ((IPointerPresenter)driver.Pointer).Chrome(Overlay(activated.Add)); Drain(); window.UpdateLayout(); + Drain(); var clientSaw = new List>(); driver.MouseEvent += (_, flags, _) => clientSaw.Add(flags); // Between the brand and the search box: a gap the header leaves on purpose. var brand = layer.Header.Hits[0].Area; - var gap = layer.Header.TranslatePoint(new Point(brand.Right + 8, layer.Header.Bounds.Height / 2), window)!.Value; + var gap = layer.Header.TranslatePoint(new Point(brand.Right + 10, layer.Header.Bounds.Height / 2), window)!.Value; window.MouseDown(gap, MouseButton.Left); window.MouseUp(gap, MouseButton.Left); Drain(); - return (view.WindowGestures, clientSaw, activated); - }, columns: 100, rows: 30); + var gestures = view.WindowGestures; + var fromHeader = clientSaw.Count; + + // The cells' first row is a pane's tab strip here, never a handle: a blank cell there is the client's. + var blank = view.TranslatePoint(new Point(view.Bounds.Width - 40, view.CellExtent.Height / 2), window)!.Value; + window.MouseDown(blank, MouseButton.Left); + window.MouseUp(blank, MouseButton.Left); + Drain(); + return (gestures, (fromHeader, clientSaw.Count), activated, view.WindowGestures - gestures); + }); await Assert.That(gestures).IsEqualTo(1); - await Assert.That(clientSaw.Count).IsEqualTo(0); + await Assert.That(clientSaw.Item1).IsEqualTo(0).Because("a press on the header is the window's"); + await Assert.That(clientSaw.Item2).IsGreaterThan(0).Because("a press on the cells' first row is the client's"); await Assert.That(activated.Count).IsEqualTo(0); + await Assert.That(cellRowMoves).IsEqualTo(0); } [Test] - public async Task TheLiveClientPublishesItsOwnRectanglesAndNoPaneMovesAgainstTheTerminal() + [Arguments("connections")] + [Arguments("layout-roleplay")] + [Arguments("layout-combat")] + public async Task TheLiveClientDrawsNoChromeCellAndLaysThePanesOutAsATerminalToldTheSame(string view) { using var headless = new HeadlessConsoleDriver(120, 32); - await using var terminal = new SharpMUTermApp(DemoScene.Build(), ClientHost.Headless(headless, WindowOptions.Capabilities)); - terminal.RenderSnapshot("connections"); + await using var terminal = new SharpMUTermApp(DemoScene.Build(), ClientHost.Headless(headless, WindowOptions.Capabilities) with { Chrome = HostChrome.HeaderAndRail }); + terminal.RenderSnapshot(view); using var driver = new AvaloniaConsoleDriver(120, 32); await using var window = new SharpMUTermApp(DemoScene.Build(), WindowHost.Create(driver, clipboard: null) with @@ -181,16 +254,28 @@ public async Task TheLiveClientPublishesItsOwnRectanglesAndNoPaneMovesAgainstThe Announcer = null, RunsInline = true, }); - window.RenderSnapshot("connections"); + window.RenderSnapshot(view); window.RenderNextFrame(); var chrome = driver.Pointer.Chrome; await Assert.That(chrome).IsNotNull(); - await Assert.That(chrome!.Header).IsEqualTo(new PaneRect(0, 0, 120, 1)); - await Assert.That(chrome.Rail.Width).IsEqualTo(window.RailColumnWidth); + await Assert.That(chrome!.Drawn).IsEqualTo(HostChrome.HeaderAndRail); await Assert.That(chrome.Sidebar).IsEqualTo(window.BuildSidebar()); - await Assert.That(window.PaneOutputRects().OrderBy(r => r.Key).ToArray()) - .IsEquivalentTo(terminal.PaneOutputRects().OrderBy(r => r.Key).ToArray()); + await Assert.That(window.LaidOutRows.Header).IsEqualTo(0); + await Assert.That(Enumerable.Range(0, 32).Any(y => driver.Frame.RowText(y).Contains("muterm", StringComparison.Ordinal))).IsFalse() + .Because("the cell header is not drawn when the window draws its own"); + var rects = window.PaneOutputRects(); + await Assert.That(rects.Values.Min(r => r.X)).IsEqualTo(0).Because("no rail column comes before the panes"); + await Assert.That(rects.OrderBy(r => r.Key).ToArray()).IsEquivalentTo(terminal.PaneOutputRects().OrderBy(r => r.Key).ToArray()); + } + + private static void Click(Window window, Control on, Rect area) + { + var centre = on.TranslatePoint(area.Center, window)!.Value; + window.MouseMove(centre); + window.MouseDown(centre, MouseButton.Left); + window.MouseUp(centre, MouseButton.Left); + Drain(); } private static Rect Bounds(Control control, Window window) => @@ -198,20 +283,19 @@ private static Rect Bounds(Control control, Window window) => private static void Drain() => global::Avalonia.Threading.Dispatcher.UIThread.RunJobs(); - private static Task Run( - Func body, int columns = 100, int rows = 30) => + private static Task Run(Func body) => Session.Dispatch(() => { - var driver = new AvaloniaConsoleDriver(columns, rows); + var driver = new AvaloniaConsoleDriver(Columns, Rows); var view = new TerminalView(driver, SKColors.White, Back, 16, null); - var layer = new DesktopLayer(view); + var layer = new DesktopLayer(view, HostChrome.HeaderAndRail); var root = new Panel(); root.Children.Add(view); root.Children.Add(layer); var window = new Window { Content = root, WindowDecorations = WindowDecorations.BorderOnly }; - var size = view.SizeFor(columns, rows); - window.Width = size.Width; - window.Height = size.Height; + var cells = view.SizeFor(Columns, Rows); + window.Width = cells.Width + NativeLayout.SidebarWidth + NativeLayout.SidebarGutter; + window.Height = cells.Height + NativeLayout.HeaderHeight; window.Show(); view.Focus(); driver.Flush(); diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativePanelTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativePanelTests.cs index bc0830b4..d7278ce3 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/NativePanelTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/NativePanelTests.cs @@ -95,7 +95,7 @@ public async Task NativeListsMoveNoPaneRectangle() foreach (var view in new[] { "layout-roleplay", "layout-combat" }) { using var headless = new HeadlessConsoleDriver(140, 36); - await using var terminal = new SharpMUTermApp(DemoScene.Build(), ClientHost.Headless(headless, WindowOptions.Capabilities)); + await using var terminal = new SharpMUTermApp(DemoScene.Build(), ClientHost.Headless(headless, WindowOptions.Capabilities) with { Chrome = HostChrome.HeaderAndRail }); terminal.RenderSnapshot(view); using var driver = new AvaloniaConsoleDriver(140, 36); diff --git a/tests/SharpMUTerm.Tui.Tests/HostChromeLayoutTests.cs b/tests/SharpMUTerm.Tui.Tests/HostChromeLayoutTests.cs new file mode 100644 index 00000000..4ff70b81 --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/HostChromeLayoutTests.cs @@ -0,0 +1,248 @@ +using System.Drawing; +using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Session; +using SharpMUTerm.Core.Workspaces; +using SharpMUTerm.Graphics; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// A host that draws the header or the rail itself () gets no cell for it: no header +/// row, no rail column, and every count the client makes of its own rows and columns — the layout, the input-height +/// veto, the pane rectangles and so what each world is told over NAWS — is made over the cells that are left. +/// +/// Serialised: rendering a frame redirects the process-global Console.Out. +[NotInParallel] +public class HostChromeLayoutTests +{ + private const int Width = 120; + private const int Height = 32; + + private static readonly TerminalCapabilities Caps = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private sealed class ChromePresenter : IPointerPresenter + { + public List Published { get; } = []; + + public void Hover(PointerTarget target) + { + } + + public void ShowMenu(Point cell, IReadOnlyList items) + { + } + + public bool DrawsMenus => true; + + public void Scrollbars(IReadOnlyList bars) + { + } + + public void Chrome(ChromeOverlay chrome) => Published.Add(chrome); + } + + private static SharpMUTermApp App(HostChrome chrome, out string frame, string? view = null, int width = Width, int height = Height, IPointerPresenter? pointer = null) + { + Console.SetIn(TextReader.Null); + var host = ClientHost.Headless(new HeadlessConsoleDriver(width, height), Caps) with { Chrome = chrome, Pointer = pointer }; + var app = new SharpMUTermApp(DemoScene.Build(), host); + frame = app.RenderSnapshot(view); + app.RenderNextFrame(); + return app; + } + + private static async Task<(WorldSession Session, RecordingTelnetSession Telnet)> ConnectedAsync(string name) + { + var telnet = new RecordingTelnetSession(); + var session = new WorldSession(new WorldDefinition { Name = name, Host = "h", Port = 1 }, sessionFactory: _ => telnet); + await session.ConnectAsync(); + return (session, telnet); + } + + [Test] + public async Task EveryHostTheRepositoryBuildsSaysWhichChromeItDraws() + { + await Assert.That(ClientHost.Headless(new HeadlessConsoleDriver(40, 10), Caps).Chrome).IsEqualTo(HostChrome.None); + await Assert.That(ClientHost.Snapshot(40, 10, Caps).Chrome).IsEqualTo(HostChrome.None); + await Assert.That(ClientHost.ForHarness(Caps, new HeadlessConsoleDriver(40, 10), null, null, null).Chrome).IsEqualTo(HostChrome.None); + await Assert.That(HostChrome.None.Any).IsFalse(); + await Assert.That(HostChrome.HeaderAndRail.Any).IsTrue(); + } + + [Test] + public async Task AHostThatDrawsTheHeaderGetsNoHeaderRowAndTheWorkspaceTakesIt() + { + await using var cells = App(HostChrome.None, out var cellFrame); + await using var native = App(HostChrome.HeaderAndRail with { Rail = false }, out var nativeFrame); + + await Assert.That(cells.LaidOutRows.Header).IsEqualTo(1); + await Assert.That(native.LaidOutRows.Header).IsEqualTo(0); + await Assert.That(native.LaidOutRows.Workspace).IsEqualTo(cells.LaidOutRows.Workspace + 1); + + // The ribbon's brand is on the terminal's first row and on no row of the window's cells. + await Assert.That(FrameGrid.Decode(cellFrame, Width, Height)[0]).Contains("muterm"); + await Assert.That(FrameGrid.Decode(nativeFrame, Width, Height).Any(row => row.Contains("muterm", StringComparison.Ordinal))).IsFalse(); + + // The bands still fill the grid exactly: nothing promised to a header that is not there. + var rows = native.LaidOutRows; + await Assert.That(rows.Header + rows.Workspace + rows.Primary + rows.Second + rows.Status).IsEqualTo(Height); + } + + [Test] + public async Task AHostThatDrawsTheRailGetsNoRailColumnAndThePanesStartAtTheEdge() + { + await using var cells = App(HostChrome.None, out _); + await using var native = App(HostChrome.HeaderAndRail with { Header = false }, out var nativeFrame); + + var cellPane = cells.PaneOutputRects().Values.Single(); + var nativePane = native.PaneOutputRects().Values.Single(); + await Assert.That(cellPane.X).IsGreaterThan(0).Because("the terminal's rail, divider and spacer come first"); + await Assert.That(nativePane.X).IsEqualTo(0); + await Assert.That(nativePane.Width).IsEqualTo(Width); + await Assert.That(nativePane.Width).IsEqualTo(cellPane.Width + cellPane.X); + await Assert.That(nativePane.Height).IsEqualTo(cellPane.Height); + + // No rail row in the cells: the world's heading the terminal's rail opens with is nowhere in the first columns. + var world = DemoScene.Build().Worlds[0].Name; + await Assert.That(FrameGrid.Decode(nativeFrame, Width, Height).Skip(1).Any(row => row.TrimStart().StartsWith(world, StringComparison.Ordinal))) + .IsFalse(); + } + + [Test] + [Arguments(null)] + [Arguments("split")] + [Arguments("layout-combat")] + [Arguments("layout-roleplay")] + public async Task ThePanesTileTheWholeGridWhenTheHostDrawsBoth(string? view) + { + await using var app = App(HostChrome.HeaderAndRail, out _, view); + var rects = app.PaneSnapshot().Rects.Values.ToList(); + await Assert.That(rects.Min(r => r.X)).IsEqualTo(0); + await Assert.That(rects.Min(r => r.Y)).IsEqualTo(0); + await Assert.That(rects.Max(r => r.X + r.Width)).IsEqualTo(Width); + await Assert.That(app.LaidOutRows.Header).IsEqualTo(0); + } + + [Test] + public async Task EachWorldIsToldItsPanesRealSizeWhenTheHostDrawsTheChrome() + { + await using var app = App(HostChrome.HeaderAndRail, out _, "split"); + var left = await ConnectedAsync("Left"); + var right = await ConnectedAsync("Right"); + app.AttachSession(left.Session, "main"); + app.AttachSession(right.Session, DemoScene.ChatWindowId); + app.RenderNextFrame(); + + var surface = app.PaneSnapshot(); + PaneRect Output(string windowId) => app.PaneOutputRects()[surface.Rects.Keys.Single(id => surface.ActiveWindow(id) == windowId)]; + var l = Output("main"); + var r = Output(DemoScene.ChatWindowId); + + await Assert.That(left.Telnet.Sizes[^1]).IsEqualTo((l.Width, l.Height)); + await Assert.That(right.Telnet.Sizes[^1]).IsEqualTo((r.Width, r.Height)); + + // The two panes and the divider between them are the whole width: no rail column was taken off either. + await Assert.That(l.X).IsEqualTo(0); + await Assert.That(l.Width + r.Width + 1).IsEqualTo(Width); + } + + [Test] + [Arguments(6)] + [Arguments(8)] + [Arguments(12)] + public async Task TheInputVetoCountsNoHeaderRowAndTheBandsFitASmallGrid(int height) + { + await using var app = App(HostChrome.HeaderAndRail, out _, height: height, width: 80); + var rows = app.LaidOutRows; + await Assert.That(rows.Header).IsEqualTo(0); + await Assert.That(rows.Header + rows.Workspace + rows.Primary + rows.Second + rows.Status).IsEqualTo(height); + await Assert.That(rows.Status).IsGreaterThan(0).Because("the status line is never arranged off the grid"); + } + + // ── What the host is told ───────────────────────────────────────────────────────────────────── + + [Test] + public async Task OnlyAHostThatDrawsChromeIsToldAboutIt() + { + var cells = new ChromePresenter(); + await using (App(HostChrome.None, out _, pointer: cells)) + { + await Assert.That(cells.Published).IsEmpty(); + } + + var native = new ChromePresenter(); + await using var app = App(HostChrome.HeaderAndRail, out _, "characters", pointer: native); + var chrome = native.Published.Last(); + await Assert.That(chrome.Drawn).IsEqualTo(HostChrome.HeaderAndRail); + await Assert.That(chrome.Interactive).IsTrue(); + await Assert.That(chrome.Sidebar).IsEqualTo(app.BuildSidebar()); + await Assert.That(chrome.HeaderModel).IsEqualTo(app.BuildHeaderModel()); + await Assert.That(chrome.Palette.HeaderPlane).StartsWith("#"); + await Assert.That(chrome.Palette.RailPlane).StartsWith("#"); + } + + [Test] + public async Task TheChromeStaysUnderAModalAndTakesNoClick() + { + var pointer = new ChromePresenter(); + + // The connections scene leaves the quit prompt open over the main window. + await using var app = App(HostChrome.HeaderAndRail, out _, "connections", pointer: pointer); + var chrome = pointer.Published.Last(); + await Assert.That(chrome.Interactive).IsFalse(); + + var before = app.ActiveWindowId(); + var other = chrome.Sidebar.Worlds.SelectMany(w => w.Characters).SelectMany(c => c.Windows).First(w => w.Id != before); + await Assert.That(app.ActivateChromeTarget(SidebarModel.TargetOf(other))).IsFalse(); + await Assert.That(app.ActiveWindowId()).IsEqualTo(before); + } + + [Test] + public async Task TheArmedPrefixIsInTheHeaderModelWithEveryKeyThePanelLists() + { + var pointer = new ChromePresenter(); + await using var app = App(HostChrome.HeaderAndRail, out _, "prefix", pointer: pointer); + var prefix = app.BuildHeaderModel().Prefix; + await Assert.That(prefix).IsNotNull(); + await Assert.That(prefix!.Keys.Select(k => k.Keys)).IsEquivalentTo(PrefixPanel.Entries(app.PrefixFactsSnapshot).Select(e => e.Keys)); + await Assert.That(prefix.Exit).Contains("Esc"); + await Assert.That(pointer.Published.Last().HeaderModel.Prefix).IsEqualTo(prefix); + + await using var idle = App(HostChrome.HeaderAndRail, out _); + await Assert.That(idle.BuildHeaderModel().Prefix).IsNull(); + } + + [Test] + public async Task TheSidebarsFoldButtonFoldsTheRailAndSaysSo() + { + var pointer = new ChromePresenter(); + await using var app = App(HostChrome.HeaderAndRail, out _, pointer: pointer); + var panes = app.PaneOutputRects(); + await Assert.That(pointer.Published.Last().Offers(SidebarModel.CollapseTarget)).IsTrue(); + + await Assert.That(app.ActivateChromeTarget(SidebarModel.CollapseTarget)).IsTrue(); + app.RenderNextFrame(); + await Assert.That(pointer.Published.Last().Sidebar.Collapsed).IsTrue(); + await Assert.That(app.PaneOutputRects()).IsEquivalentTo(panes).Because("the cells hold no rail to fold; only the host's sidebar narrows"); + + await Assert.That(app.ActivateChromeTarget(SidebarModel.CollapseTarget)).IsTrue(); + app.RenderNextFrame(); + await Assert.That(pointer.Published.Last().Sidebar.Collapsed).IsFalse(); + } + + [Test] + public async Task AHostDrawingOnlyTheHeaderIsOfferedNoRailTarget() + { + var pointer = new ChromePresenter(); + await using var app = App(HostChrome.HeaderAndRail with { Rail = false }, out _, "characters", pointer: pointer); + var chrome = pointer.Published.Last(); + var window = chrome.Sidebar.Worlds.SelectMany(w => w.Characters).SelectMany(c => c.Windows).First(); + await Assert.That(chrome.Offers(SidebarModel.TargetOf(window))).IsFalse(); + await Assert.That(chrome.Offers(SidebarModel.CollapseTarget)).IsFalse(); + await Assert.That(chrome.Offers(HeaderModel.PaletteTarget)).IsTrue(); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/NativeChromeModelTests.cs b/tests/SharpMUTerm.Tui.Tests/NativeChromeModelTests.cs index abce896f..f5457d3e 100644 --- a/tests/SharpMUTerm.Tui.Tests/NativeChromeModelTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/NativeChromeModelTests.cs @@ -11,7 +11,7 @@ namespace SharpMUTerm.Tui.Tests; /// /// The header and the rail as data (, ): the cell chrome is drawn from -/// the same models a host is handed, the host is told where the header and the rail are, and a click it hands back +/// the same models a host is handed, the host that draws them is told what they say, and a click it hands back /// goes where the same click on the cells goes — and nowhere the client did not offer. /// /// Serialised: rendering a frame redirects the process-global Console.Out. @@ -46,7 +46,7 @@ private static (SharpMUTermApp App, ChromePresenter Pointer) App(string? view = { Console.SetIn(TextReader.Null); var pointer = new ChromePresenter(); - var host = ClientHost.ForHarness(Headless, new HeadlessConsoleDriver(120, 32), null, null, _ => { }) with { Pointer = pointer }; + var host = ClientHost.ForHarness(Headless, new HeadlessConsoleDriver(120, 32), null, null, _ => { }) with { Pointer = pointer, Chrome = HostChrome.HeaderAndRail }; var app = new SharpMUTermApp(DemoScene.Build(), host); app.RenderSnapshot(view); app.RenderNextFrame(); @@ -86,17 +86,13 @@ public async Task TheCellRailCarriesExactlyTheSidebarModelsTargets() } [Test] - public async Task TheHostIsToldWhereTheHeaderAndTheRailAre() + public async Task TheHostIsToldWhatTheHeaderAndTheRailSay() { var (app, pointer) = App("characters"); await using var _app = app; var chrome = pointer.Published.Last(); - await Assert.That(chrome.Shown).IsTrue(); - await Assert.That(chrome.Header).IsEqualTo(new PaneRect(0, 0, 120, 1)); - await Assert.That(chrome.Rail.X).IsEqualTo(0); - await Assert.That(chrome.Rail.Y).IsEqualTo(1); - await Assert.That(chrome.Rail.Width).IsEqualTo(app.RailColumnWidth); - await Assert.That(chrome.Rail.Height).IsGreaterThan(10); + await Assert.That(chrome.Interactive).IsTrue(); + await Assert.That(chrome.Drawn).IsEqualTo(HostChrome.HeaderAndRail); await Assert.That(chrome.Sidebar).IsEqualTo(app.BuildSidebar()); await Assert.That(chrome.HeaderModel).IsEqualTo(app.BuildHeaderModel()); @@ -107,7 +103,7 @@ public async Task TheHostIsToldWhereTheHeaderAndTheRailAre() } [Test] - public async Task TheSearchBoxOpensTheCommandSurfaceAndTheChromeStandsDownUnderIt() + public async Task TheSearchBoxOpensTheCommandSurfaceAndTheChromeGoesInertUnderIt() { var (app, pointer) = App(); await using var _app = app; @@ -120,7 +116,7 @@ public async Task TheSearchBoxOpensTheCommandSurfaceAndTheChromeStandsDownUnderI await Assert.That(app.MenuIsOpen).IsTrue(); app.RenderNextFrame(); - await Assert.That(pointer.Published.Last().Shown).IsFalse().Because("the command surface is drawn over the cells the chrome would cover"); + await Assert.That(pointer.Published.Last().Interactive).IsFalse().Because("the command surface owns the screen while it is up"); } [Test] @@ -149,12 +145,12 @@ public async Task TheHeadersPresenceDotAndTheRailsDotAreOneAnswer(string? view) } [Test] - public async Task TheChromeStandsDownUnderTheQuitPrompt() + public async Task TheChromeGoesInertUnderTheQuitPrompt() { // The connections scene leaves the quit prompt open over the main window. var (app, pointer) = App("connections"); await using var _app = app; - await Assert.That(pointer.Published.Last().Shown).IsFalse(); + await Assert.That(pointer.Published.Last().Interactive).IsFalse(); } [Test] From 71824ce8e567b03b51b5a5992fe144be212ca6d0 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 06:28:49 +0000 Subject: [PATCH 024/113] Give the desktop header and sidebar room of their own beside the cells ClientHost.Chrome (HostChrome(Header, Rail), required) says which chrome the host draws; the client then leaves no cell for it (hidden header band, no rail column), so the veto, the layout, PaneOutputRects and per-pane NAWS follow from arranged bounds. The window draws a 42 px header and a 232 px sidebar (48 px folded) and moves TerminalView into what is left; modals draw in the cell area with the chrome inert beside them, and an armed Ctrl+B shows its keys in the native header. The header's search box opens the palette and a second click while it is up is not a refusal. HostParityTests compares both hosts under both arrangements. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 7 ++ CLAUDE.md | 94 ++++++++++++------- src/SharpMUTerm.Avalonia/NativeChrome.cs | 6 +- .../Pointer/SharpMUTermApp.Chrome.cs | 27 ++++-- .../NativePaletteRoutingTests.cs | 2 + 5 files changed, 92 insertions(+), 44 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fad42b2..e2574a85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,13 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- Desktop window: the header and the connections sidebar now have room of their own — a full-height toolbar + across the top and a 232-pixel sidebar down the left — instead of being squeezed into one row and one column + of text, and the text area is the rest of the window, so every pane is as wide and tall as it really is (and + that is the size your games are told). While Ctrl+B is armed the header lists the keys it answers, dimming the + ones that cannot run, with each key's meaning in its tooltip. The sidebar folds to a slim strip of characters + with the chevron at its top or Ctrl+B b, and stays in place, inactive, while a dialog or settings screen is + open. `--cell-chrome` draws them as text, the way the terminal does. - Desktop window: Ctrl+P opens a native command palette, a rounded popup near the top of the window with a search box, grouped results, the matched letters highlighted and each command's key on the right. It lists the same commands in the same order as the terminal's palette, recent and suggested first. Arrow keys and the diff --git a/CLAUDE.md b/CLAUDE.md index af7b7265..effbc326 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -1060,40 +1060,67 @@ fallbacks) for inline images/maps. button's icon is the only header action. The window's menu is Avalonia's `ContextMenu`, which needs a second click under a WM-less X server to take the first item (seen under Xvfb only). -- **The header and the sidebar are data, and the window draws them natively over their cells** (Client - `Chrome/HeaderModel`, `Chrome/SidebarModel`; Tui `Pointer/SharpMUTermApp.Chrome.cs`, `ChromeOverlay`; Avalonia - `NativeChrome.cs`: `NativeHeader`, `NativeSidebar`). Second slice of the desktop app, on `DesktopLayer`'s model. +- **The header and the sidebar are data, and the window draws them natively beside the cells** (Client + `Chrome/HeaderModel`, `Chrome/SidebarModel`; Tui `Hosting/ClientHost.cs` `HostChrome`, `Pointer/SharpMUTermApp.Chrome.cs`, + `ChromeOverlay`; Avalonia `NativeChrome.cs`: `NativeHeader`, `NativeSidebar`; `DesktopLayer`'s `NativeLayout`). Decisions not to relitigate: - **One model per surface, and the cells render from it.** `BuildHeaderModel()` feeds `HeaderMarkup(model)`; - `BuildSidebar()` feeds `BuildRail()` (`SidebarModel.Rows()` is Core's `RailModel.Build` over the same tree), so - the cell frames are byte-identical to before (checked by diffing `default`, `rail-long`, `connections`, - `characters`, `tint`, `tint-tabs`, `collapsed`, `prefix`, `menu`, `layout-roleplay`). `SidebarModel` wraps Core's - `RailWorld`/`RailCharacter`/`RailWindow` tree rather than duplicating it, adding the selected window, collapsed, - targets and value equality. It is not called `RailModel` because Core's `RailModel` is the row projection. - The header's presence dot reads `ConnectedCharacters()`, the same answer as the rail's dot and the fraction. - - **The channel is `IPointerPresenter.Chrome(ChromeOverlay)`**, default-implemented, published on `PostBufferPaint` - and on the main window's `Activated`/`Deactivated`, only on change. Rectangles are the header control's and the - rail's *column* (the rail control is only as tall as its rows), in desktop cells. + `BuildSidebar()` feeds `BuildRail()` (`SidebarModel.Rows()` is Core's `RailModel.Build` over the same tree). + `SidebarModel` wraps Core's `RailWorld`/`RailCharacter`/`RailWindow` tree rather than duplicating it, adding the + selected window, collapsed, targets and value equality. It is not called `RailModel` because Core's `RailModel` + is the row projection. The header's presence dot reads `ConnectedCharacters()`, the same answer as the rail's + dot and the fraction. While ⌃B is armed `HeaderModel.Prefix` carries `PrefixPanel.Entries` (key, title, why it + is blocked) and the exit, so the native header shows the keymap where the cell header shows its strip. + - **`ClientHost.Chrome` (`HostChrome(Header, Rail)`, required) says which chrome the host draws, and the client + leaves no cell for it.** `HostChrome.None` for the terminal, the snapshot, `--plain` and the tests; + `HeaderAndRail` for the window (`WindowHost.Create`, from `WindowOptions.Chrome`; `--cell-chrome` and + `--render-png` say None). It is a flag per part, not a size: the space is the host's own business (42 px, 232 px, + `NativeLayout`), and the client is only told the part is not its to draw. With `Header` the header control is + `Visible = false` — a hidden sticky band takes no row — and `ChromeRows()` counts no header row, so the + input-height veto (`SyncInputHeights`) and the layout agree. With `Rail` `BuildWorkspaceRow` builds the pane area + alone (no rail column, divider or spacer; `_railColumn` is null, so `ApplyRailWidth` does nothing). Everything + else follows from arranged bounds: `PaneOutputRects` and so per-pane NAWS are the panes the cells really hold. + `HostChromeLayoutTests` pins rows, rectangles, NAWS and the veto at 80×6. + - **The window moves the cells out of the way; nothing native sits over a cell.** `DesktopLayer` spans the window + and sets `TerminalView.Margin` to `NativeLayout.Insets` (header height on top, sidebar width plus an 8 px gutter of + the sidebar's plane on the left; the slim width while `Sidebar.Collapsed`), so the view, the grid it hands the + driver and every pane are what is left. `MainWindow` sizes the window as the `--size` grid plus the insets. + Panels and the cell-mode header buttons are placed from `DesktopLayer.CellOrigin`; scrollbars, hovers, tooltips + and pointer-to-cell mapping are the view's own coordinates and needed no offset. The window's resize band is + measured against the *window* (`TerminalView.EdgeAt` translates), so it works over the header and sidebar too + (`ResizeFromChrome`, `EdgeCursorFromChrome`); a blank cell on row 0 moves the window only while + `CellsHoldHeader` (row 0 is a tab strip otherwise). The native palette (`PaletteOverlay`) is the root panel's last + child and centres over the whole window, its card starting under the header (`ThePaletteCentresOverTheWhole…`). + - **The channel is `IPointerPresenter.Chrome(ChromeOverlay)`**, published only to a host whose `Chrome.Any`, on + `PostBufferPaint`, the main window's `Activated`/`Deactivated`, and every `RefreshHeader`/`RefreshRail`/`ToggleRail` + (`PublishHostChrome`): with no cell of either a change may paint no frame. Only on change. It carries no + rectangles; `ChromePalette` carries the planes (`HeaderPlane`, `RailPlane`, `Ink`) and the notice voice, because + there is no cell to read them off. - **A click hands back a target the client put in the model**, and `ActivateChromeTarget` refuses one the last - overlay did not offer. Rail targets go to `DispatchRailTarget` (the rail's own `LinkClicked` handler), the search - box and brand to `HeaderModel.PaletteTarget` (opens ⌃P, never toggles it shut), *Add a game* to `term:welcome`. - Never `OnLinkClicked`, and the host spells no command. - - **Native chrome stands down** while another of the client's windows is in front (`_system.ActiveWindow` is not - the main window: ⌃P, settings, composer, quit prompt), because those are cells a native view would cover; the - header also while ⌃B is armed (the cells then show the which-key strip), and the sidebar while collapsed. - - **Input**: every press, release and wheel over the native views is the window's (`NativeChromeView`), a right - press is forwarded as a right click on the cell (`ForwardRightClick`), and nothing is focusable. A left press on - empty header space calls `TerminalView.WindowGestureFromChrome`: edge band resizes, the rest moves the window, - double-click maximises, whatever cell lies under it. The header leaves the header buttons' slots clear. - - **It draws inside one cell row.** A real 44 px header (and a 232 px sidebar wider than its cells) needs the - client's layout to make room, so that the cell grid starts below a header band the client does not draw: a - `ClientHost` member giving the host-drawn header's height in rows (the client then skips its own header row and - every `HeaderHeight`/`ChromeRows`/`InputLayout` count follows), the window offsetting `TerminalView` by the - native height and mapping pointer positions through that offset, and the parity test comparing cells below it. - The sidebar likewise needs a host-declared rail width in cells, so NAWS stays what the panes really are. - - **Not done**: no tooltips beyond the native `ToolTip`, no keyboard navigation of the native views (the keys are - the client's: ⌥N, ⌥J/⌥K, ⌃P), no scrolling of an overlong sidebar (rows past the foot are cut), the collapsed - strip stays cells. + overlay did not offer (a rail target is offered only when `Drawn.Rail`). Rail targets go to `DispatchRailTarget`, + the search box and brand to `HeaderModel.PaletteTarget` (opens ⌃P, never toggles it shut), *Add a game* to + `term:welcome`, the sidebar's chevron to `SidebarModel.CollapseTarget` (`ToggleRail`, what ⌃B b runs). Never + `OnLinkClicked`, and the host spells no command. + - **A modal does not hide the chrome.** ⌃P, a settings screen, the composer and the quit prompt are drawn in the + cells, which no longer reach under the header or sidebar, so the chrome stays where a desktop app's stays, under + a veil, and takes no click (`ChromeOverlay.Interactive`, `MainWindowInFront`; refused client-side too). The + settings screens and F1 size to the driver's screen, which is the cell area, so they fit and centre there. + - **Folded, the sidebar is a 48 px strip**: the unfold chevron, an accent mark per world, a disc with the initial + per character (filled while connected, an unread dot), "+" at the foot; names in tooltips. + - **Input**: every press, release and wheel over the native views is the window's (`NativeChromeView`); a right + press does nothing (there is no cell under it to forward to), and nothing is focusable. A left press on empty + header space calls `TerminalView.WindowGestureFromChrome`: edge band resizes, the rest moves the window, + double-click maximises. The header leaves the header buttons' slots clear; with a native header the buttons sit + in it, 30 px, right-aligned. + - **Parity is cells against cells under the same `HostChrome`.** `HostParityTests` draws every view twice inline — + both hosts told `None`, and both told `HeaderAndRail` — and the looping pass with `HeaderAndRail`, comparing every + cell. Telling both hosts the same arrangement keeps the comparison a comparison of drivers (the guarantee it + exists for), and covering both arrangements means the layout a person actually runs in the window is held to + the terminal's cell for cell, rather than compared below an offset or skipped. What the native header and + sidebar *say* is held to the cells by the shared models (`NativeChromeModelTests`), not by pixels. + - **Not done**: no keyboard navigation of the native views (the keys are the client's: ⌥N, ⌥J/⌥K, ⌃P), no + scrolling of an overlong sidebar (rows past the foot are cut), no right-click menu on a sidebar row, no + animation when the sidebar folds. - **Layouts are realised as panes, one per panel that has data** (`Core/Layouts`: `LayoutFold` → `LayoutRealiser` → `WorkspaceLayout.ReplaceTree`, `LayoutCapture` for the way back; Tui `SharpMUTermApp.Layouts.cs`, @@ -1189,7 +1216,7 @@ one `SharpMUTermApp`; a host is only the place it runs. What differs between hos (`src/SharpMUTerm.Tui/Hosting/`): driver, capabilities, clipboard, URL opener, focus reporting, keys (`HostKeys`: the newline chord, and the chords the host keeps for itself), whether there is a main loop, the Sixel cell size, and what it does with the pointer (`IPointerPresenter`, null for none), whether it draws the declared settings natively (`INativeSettings`, null for the cell screens), and whether it -draws ⌃P natively (`INativePalette`, null for the cell popup). Built by `ClientHost.Terminal`, `ClientHost.Headless`/`Snapshot` and +draws ⌃P natively (`INativePalette`, null for the cell popup), and which chrome it draws itself beside the cells (`HostChrome`: the header and the rail, which the client then leaves out of the grid). Built by `ClientHost.Terminal`, `ClientHost.Headless`/`Snapshot` and `WindowHost.Create` (Avalonia). Four things keep a feature from landing in one host only: - **Every `ClientHost` and `HostKeys` member is `required`**, so a member added there does not compile until @@ -1204,7 +1231,8 @@ draws ⌃P natively (`INativePalette`, null for the cell popup). Built by `Clien `ClientHost`. Don't use `WarningsAsErrors` for it: that ignores the folder's `severity = none`. - **Every snapshot view is drawn through both drivers and compared cell for cell**, glyph and background (`HostParityTests.EveryViewDrawsTheSameCellsInTheWindowAsInTheTerminal`, Avalonia suite), with the same - capabilities and keys, so a difference can only be the driver. The list is `SnapshotViews.All`, and + capabilities, keys and `HostChrome` — once with the chrome in cells and once with the header and rail drawn by + the host, as the window runs — so a difference can only be the driver. The list is `SnapshotViews.All`, and `EveryViewTheSnapshotKnowsIsInTheParityList` reads `RenderSnapshot`'s source and fails when it learns a view the list does not name. The harness drag goes through `IMouseInjector` so `drag` draws in both. A second pass (`EveryViewDrawsTheSameCellsWhenTheWindowsLoopIsRunning`) draws each view with the window's loop diff --git a/src/SharpMUTerm.Avalonia/NativeChrome.cs b/src/SharpMUTerm.Avalonia/NativeChrome.cs index 72e151ab..50eb41ef 100644 --- a/src/SharpMUTerm.Avalonia/NativeChrome.cs +++ b/src/SharpMUTerm.Avalonia/NativeChrome.cs @@ -409,9 +409,9 @@ private void LayoutPrefix(HeaderPrefix prefix, double start, double right, doubl const double size = FontSize; var chipHeight = plateHeight - 6; var chipTop = plateTop + 3; - var lead = Measure(HeaderPrefix.Chord, size, bold: true) + Measure(PrefixWord, size - 1) + 34; + var lead = Measure(KeyGlyphs.Words(HeaderPrefix.Chord), size, bold: true) + Measure(PrefixWord, size - 1) + 34; _prefix = new Rect(start, plateTop, Math.Min(lead, Math.Max(0, right - start)), plateHeight); - hits.Add((_prefix, string.Empty, $"{HeaderPrefix.Chord} is armed: the next key acts on the workspace. {prefix.Exit}.")); + hits.Add((_prefix, string.Empty, $"{KeyGlyphs.Words(HeaderPrefix.Chord)} is armed: the next key acts on the workspace. {prefix.Exit}.")); var exitWidth = Measure(prefix.Exit, size - 1) + 8; var x = _prefix.Right + 12; @@ -542,7 +542,7 @@ private void DrawPrefix(DrawingContext context, HeaderPrefix prefix, ChromeOverl var plate = Color.FromArgb(0x2A, notice.R, notice.G, notice.B); context.DrawRectangle(new SolidColorBrush(plate), new Pen(new SolidColorBrush(Color.FromArgb(0x90, notice.R, notice.G, notice.B)), 1), _prefix.Deflate(0.5), 7, 7); var x = _prefix.X + 12; - x += Text(context, HeaderPrefix.Chord, x, middle, size, notice, bold: true) + 8; + x += Text(context, KeyGlyphs.Words(HeaderPrefix.Chord), x, middle, size, notice, bold: true) + 8; Text(context, PrefixWord, x, middle, size - 1, Ink, maxWidth: Math.Max(1, _prefix.Right - 10 - x)); } diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Chrome.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Chrome.cs index c44a3b89..dcc86098 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Chrome.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Chrome.cs @@ -106,21 +106,32 @@ internal bool ActivateChromeTarget(string target) return false; } - // A modal in front (⌃P, a settings screen, the composer, the quit prompt) owns the keys and the screen; the - // chrome stays drawn beside it, inert, as a desktop app's does under its own dialog. - if (!MainWindowInFront()) - { - return false; - } - if (target == HeaderModel.PaletteTarget) { - // Opens, rather than the ☰'s toggle: a search box is clicked to start typing in it, never to close it. + // Opens, rather than the ☰'s toggle: a search box is clicked to start typing in it, never to close it. A + // second click while the palette is up is that same answer, not a refusal. + if (_palette.IsOpen || NativePaletteIsOpen) + { + return true; + } + + if (!MainWindowInFront()) + { + return false; + } + OpenMenu(); return true; } + // A modal in front (⌃P, a settings screen, the composer, the quit prompt) owns the keys and the screen; the + // chrome stays drawn beside it, inert, as a desktop app's does under its own dialog. + if (!MainWindowInFront()) + { + return false; + } + if (target == SidebarModel.CollapseTarget) { ToggleRail(); diff --git a/tests/SharpMUTerm.Tui.Tests/NativePaletteRoutingTests.cs b/tests/SharpMUTerm.Tui.Tests/NativePaletteRoutingTests.cs index 3a4a8ee0..f9e8c938 100644 --- a/tests/SharpMUTerm.Tui.Tests/NativePaletteRoutingTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/NativePaletteRoutingTests.cs @@ -34,6 +34,8 @@ private static (SharpMUTermApp App, Presenter Native) App(bool native = true) var host = ClientHost.Headless(new HeadlessConsoleDriver(120, 34), Caps) with { NativePalette = native ? presenter : null, + // The header's search box is the host's own header: only a host that draws it is offered its target. + Chrome = HostChrome.HeaderAndRail, }; return (new SharpMUTermApp(DemoScene.Build(), host), presenter); } From dad8be569ce28ac99403b6f2a0119266f6544279 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 06:36:28 +0000 Subject: [PATCH 025/113] Surface catalog: one declaration per surface, held to both hosts SurfaceCatalog (Client/Surfaces) declares every surface a host may draw with its own controls - header, sidebar, folded rail strip, armed Ctrl+B keymap, vitals, map, who-here, quick bar, settings, the Layouts menu and Ctrl+P - with its Client model, its actions and the client method each ends in, how each host draws it, its cell renderer and its native views. Three suites hold the hosts to it: - SurfaceCatalogTests (Client): ids, hosts, models in Client/Core, a native-only door names where the cells offer it. - SurfaceCellTests (Tui): every cell renderer takes its model, every action's method exists, every command resolves; F4's terminal verdicts. - SurfaceParityTests (Avalonia): every Control in the window is declared and handed its model; each native model equals the one the cells drew in the same frame; each native action and its cell link leave two clients in the same state; F4 and the quick bar's window verdicts. F4 and the quick bar are per host: MacroKeys.Verdict and the keypad, clash and quick-bar code take HostKeys, and HostKeys.ReportsChordsWhole says the window delivers Ctrl+digit and friends as themselves. Divergences fixed on the way: the quick bar's "F4 edits keys" is a cell link too; the map's anchor with no current room is one rule (and the native map gets the model instance the cells drew); the Layouts menu is a MenuModel whose choices come back through HeaderAction.Dispatch and are refused unless offered; the Ctrl+B keymap is one model (exit hint included) for the cell panel and the native header; the sidebar's fold button has a Ctrl+P command, layout:toggle-rail. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 7 + CLAUDE.md | 25 +- src/SharpMUTerm.Avalonia/DesktopLayer.cs | 6 +- src/SharpMUTerm.Avalonia/NativeMenu.cs | 60 ++- src/SharpMUTerm.Avalonia/WindowHost.cs | 3 + .../Commands/BuiltInCommands.cs | 3 + .../Commands/LayoutCommands.cs | 3 + src/SharpMUTerm.Client/Commands/MenuModel.cs | 48 ++ src/SharpMUTerm.Client/Panels/MapViewModel.cs | 10 +- .../Surfaces/SurfaceCatalog.cs | 276 +++++++++++ src/SharpMUTerm.Tui/CommandPalette.cs | 14 + src/SharpMUTerm.Tui/Hosting/HostKeys.cs | 27 + src/SharpMUTerm.Tui/KeyClashes.cs | 12 +- src/SharpMUTerm.Tui/KeypadScreenRenderer.cs | 54 +- src/SharpMUTerm.Tui/KeypadScreenView.cs | 11 +- src/SharpMUTerm.Tui/MacroKeys.cs | 55 ++- src/SharpMUTerm.Tui/MapRenderer.cs | 32 +- .../Panels/QuickBarRenderer.cs | 9 +- src/SharpMUTerm.Tui/Pointer/PointerTarget.cs | 14 +- .../Pointer/SharpMUTermApp.Desktop.cs | 70 ++- .../Pointer/SharpMUTermApp.Surfaces.cs | 63 +++ src/SharpMUTerm.Tui/PrefixOverlay.cs | 6 +- src/SharpMUTerm.Tui/PrefixPanel.cs | 16 +- src/SharpMUTerm.Tui/RailRenderer.cs | 11 + src/SharpMUTerm.Tui/ScreenField.cs | 4 +- src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs | 16 +- src/SharpMUTerm.Tui/SharpMUTermApp.cs | 31 +- .../DesktopLayerTests.cs | 15 +- .../SurfaceParityTests.cs | 467 ++++++++++++++++++ .../SurfaceCatalogTests.cs | 101 ++++ .../AdvertisedKeyHonestyTests.cs | 2 +- .../ClientHostContractTests.cs | 1 + .../ConnectionKeysTests.cs | 6 +- .../KeypadScreenRendererTests.cs | 16 +- .../MacroKeyCaptureTests.cs | 31 +- .../PaletteDiscoverabilityTests.cs | 22 +- tests/SharpMUTerm.Tui.Tests/PaneJumpTests.cs | 2 +- .../PaneResizeEndToEndTests.cs | 2 +- .../ScreenButtonTests.cs | 2 +- .../ScreenCursorTests.cs | 8 +- .../ScreenDeleteKeyTests.cs | 7 +- .../ScreenFieldRenderingTests.cs | 11 +- .../ScreenFooterTests.cs | 4 +- .../SharpMUTerm.Tui.Tests/ScreenHintTests.cs | 2 +- .../ScreenLayoutTests.cs | 2 +- .../ScreenListButtonTests.cs | 30 +- .../SharpMUTerm.Tui.Tests/ScreenModelTests.cs | 4 +- .../SharpMUTerm.Tui.Tests/ScreenNameTests.cs | 4 +- .../ScreenPaneNavigationTests.cs | 3 +- .../ScreenReachabilityTests.cs | 4 +- .../ScreenReadOnlyTests.cs | 8 +- .../SettingsPasteTests.cs | 4 +- .../SharpMUTerm.Tui.Tests/SurfaceCellTests.cs | 108 ++++ .../TerminalPanelTests.cs | 4 +- .../TriggerSetManagementTests.cs | 6 +- .../SharpMUTerm.Tui.Tests/WindowJumpTests.cs | 6 +- 56 files changed, 1523 insertions(+), 245 deletions(-) create mode 100644 src/SharpMUTerm.Client/Commands/MenuModel.cs create mode 100644 src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs create mode 100644 src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Surfaces.cs create mode 100644 tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs create mode 100644 tests/SharpMUTerm.Client.Tests/SurfaceCatalogTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/SurfaceCellTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index e2574a85..5aafdc4e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- Ctrl+P lists *Fold or unfold the connection rail*, the same fold as Ctrl+B b and as the desktop window's + sidebar button. - Desktop window: the header and the connections sidebar now have room of their own — a full-height toolbar across the top and a 232-pixel sidebar down the left — instead of being squeezed into one row and one column of text, and the text area is the rest of the window, so every pane is as wide and tall as it really is (and @@ -219,6 +221,11 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Fixed +- Desktop window: the Keys screen (F4) and the quick bar now describe the window's keys rather than a + terminal's. Ctrl+digit, Ctrl+Shift+letter, Ctrl+Tab and Alt+O are shown as working keys you can bind, and + Alt+Enter is marked as taken because it maximises the window. +- Terminal: the quick bar's *F4 edits keys* can be clicked, as it already could in the desktop window. With no + room known, the map panel now centres on the same room in the terminal as in the window. - The message a client with no worlds shows no longer wraps the status row onto a second row at 80 columns. - A `--snapshot` frame with an MXP picture in cells a server left for it no longer sometimes leaves one of the picture's rows blank. diff --git a/CLAUDE.md b/CLAUDE.md index effbc326..230e1f4f 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -1240,6 +1240,23 @@ draws ⌃P natively (`INativePalette`, null for the cell popup), and which chrom came out as an empty frame — ⌃P and F1 blank — while the inline pass was green. The scene is now queued for the loop's first tick (`ClientLaunch.Demo`). That pass skips the bottom row (a live client has been through startup) and the two timestamp views (a loop reads the clock). +- **Every native view is a declared surface, drawn from the model the cells drew** (`SurfaceCatalog`, Client + `Surfaces/`). A surface (header, sidebar, the folded rail strip, the armed ⌃B keymap, each panel, settings, the + Layouts menu, ⌃P) is declared once: id, + Client model, actions (each naming the client method it ends in), per host `Cells`/`Native`/`Both`, its cell + renderer and its native views. Three suites hold the hosts to it: `SurfaceCatalogTests` (Client: the + declaration's own rules), `SurfaceCellTests` (Tui: the renderer takes the model, every action's method exists, + every command resolves) and `SurfaceParityTests` (Avalonia: every `Control` in the window assembly is declared; + each native model equals `DrawnModel` — what the cell renderer recorded through `Drawing(...)` in the same frame; + each native action and its cell link leave two identical clients in the same state, and not the state before). + A door only the native view offers says where the cells offer it (`CellsVia`: another surface or a ⌃P command — + which is why the sidebar's fold button has `layout:toggle-rail` beside ⌃B b). The ⌃B keymap is one model + (`PrefixPanel.Model` → `HeaderPrefix`) for the cell panel and the native header, exit hint included. + The window never builds a command: a menu is a `MenuModel` of entries the client offered, and a choice comes + back through `HeaderAction.Dispatch` and is refused if it was not offered. **To add a native surface**: put its + model in Client, draw its cells from it through `Drawing(...)`, publish the same instance to the host, declare + it in `SurfaceCatalog.All`, and add its model and action probes to `SurfaceParityTests`, whose coverage guards + fail until you do. - **Every surface that names a key is read once per host** (`EverySurfaceNamesThisHostsKeys`): ⌃P and `--help` must name the host's newline and none of the chords the host keeps (`HostKeys.Reserved`, which `TerminalView` acts on, so the window's chords and the list are one). The help page is one writer @@ -1257,9 +1274,11 @@ turned into the window by `AppRun` itself rather than by the hand-off, because a program it started exits and the hand-off exits at once. The installer is Inno Setup, per-user by default, with an optional PATH entry so `sharpmuterm` runs from any terminal. -**Not covered yet**: F4's verdicts (`MacroKeys.Verdict`) describe the terminal only. In the window ⌃digit -does arrive (F4 says it cannot), and ⌥⏎ never reaches a macro. Making it per host means threading `HostKeys` -through `MacroKeys`, `ScreenField` and the keypad renderer. +**F4 and the quick bar read the host's keys** (`MacroKeys.Verdict(HostKeys, …)`, threaded through `ScreenField`, +`KeyClashes`, the keypad renderer and `QuickBarRenderer`). `HostKeys.ReportsChordsWhole` says whether the host +delivers a modified key as itself (the window: ⌃digit, ⌃⇧letter, ⌃Tab and ⌥O fire) or as the terminal's bytes; +a chord in `HostKeys.Reserved` or the host's newline is *Taken* with the host's own reason (the window's ⌥⏎ +maximises). `SurfaceCellTests.F4TellsTheTerminalsTruth` and `SurfaceParityTests.F4TellsTheWindowsTruth` pin each. ## Building and testing diff --git a/src/SharpMUTerm.Avalonia/DesktopLayer.cs b/src/SharpMUTerm.Avalonia/DesktopLayer.cs index 4f5f828c..cc6c25a7 100644 --- a/src/SharpMUTerm.Avalonia/DesktopLayer.cs +++ b/src/SharpMUTerm.Avalonia/DesktopLayer.cs @@ -324,14 +324,14 @@ private void Place( /// The client builds the menu on its thread; it is opened here, under the button. private void OpenMenu(HeaderAction action, HeaderButton button) => - action.Menu(items => Dispatcher.UIThread.Post(() => + action.Menu(model => Dispatcher.UIThread.Post(() => { - if (items.Count == 0) + if (model.Entries.Count == 0) { return; } - var menu = NativeMenu.Build(items, PlacementMode.BottomEdgeAlignedRight, button); + var menu = NativeMenu.Build(model, action.Dispatch, PlacementMode.BottomEdgeAlignedRight, button); menu.Closed += (_, _) => _view.Focus(); OpenedMenu = menu; menu.Open(button); diff --git a/src/SharpMUTerm.Avalonia/NativeMenu.cs b/src/SharpMUTerm.Avalonia/NativeMenu.cs index 63aa6a4a..e541dc15 100644 --- a/src/SharpMUTerm.Avalonia/NativeMenu.cs +++ b/src/SharpMUTerm.Avalonia/NativeMenu.cs @@ -2,55 +2,81 @@ using Avalonia.Controls; using Avalonia.Controls.Primitives; using Avalonia.Layout; +using SharpMUTerm.Client.Commands; using SharpMUTerm.Tui; namespace SharpMUTerm.Avalonia; /// -/// A menu the client built (s), as a native : the right-click -/// menu and the header buttons' menus are drawn by this one function, so they look and behave alike. Each entry's -/// is already marshalled onto the client's thread. +/// A menu the client built, as a native : the right-click menu (s) +/// and the header buttons' menus (a ) are drawn by this one class, so they look and behave +/// alike. A right-click entry's is already marshalled onto the client's thread; a +/// header menu entry hands its command id back through the action's own dispatch, which the client checks against +/// the menu it built. /// internal static class NativeMenu { - public static ContextMenu Build(IReadOnlyList items, PlacementMode placement, Control target) + public static ContextMenu Build(IReadOnlyList items, PlacementMode placement, Control target) => + Build( + items.Select(i => i.IsSeparator ? null : ((string, string?, bool, bool, Action)?)(i.Label, i.Hint, i.Enabled, i.Checked, i.Run)), + placement, + target); + + /// A header button's menu: each entry hands its command id to . + public static ContextMenu Build(MenuModel model, Action dispatch, PlacementMode placement, Control target) => + Build( + model.Entries.Select(e => e.IsSeparator + ? null + : ((string, string?, bool, bool, Action)?)(e.Label, e.Key, e.Enabled && e.Command is not null, e.Checked, () => + { + if (e.Command is { } command) + { + dispatch(command); + } + })), + placement, + target); + + private static ContextMenu Build( + IEnumerable<(string Label, string? Hint, bool Enabled, bool Checked, Action Run)?> items, PlacementMode placement, Control target) { var menu = new ContextMenu { Placement = placement, PlacementTarget = target }; Grid.SetIsSharedSizeScope(menu, true); foreach (var item in items) { - if (item.IsSeparator) + if (item is not { } entry) { menu.Items.Add(new Separator()); continue; } - var entry = new MenuItem { Header = Header(item), IsEnabled = item.Enabled }; - if (item.Checked) + var menuItem = new MenuItem { Header = Header(entry.Label, entry.Hint), IsEnabled = entry.Enabled }; + if (entry.Checked) { - entry.ToggleType = MenuItemToggleType.CheckBox; - entry.IsChecked = true; + menuItem.ToggleType = MenuItemToggleType.CheckBox; + menuItem.IsChecked = true; } - entry.Click += (_, _) => item.Run(); - menu.Items.Add(entry); + var run = entry.Run; + menuItem.Click += (_, _) => run(); + menu.Items.Add(menuItem); } return menu; } /// An entry's label with its key after it, the keys lined up in a column of their own. - private static Control Header(PointerMenuItem item) + private static Control Header(string label, string? hint) { var grid = new Grid(); grid.ColumnDefinitions.Add(new ColumnDefinition(GridLength.Auto) { SharedSizeGroup = "label" }); grid.ColumnDefinitions.Add(new ColumnDefinition(GridLength.Auto) { SharedSizeGroup = "hint" }); - grid.Children.Add(new TextBlock { Text = item.Label, VerticalAlignment = VerticalAlignment.Center }); - if (item.Hint is { } hint) + grid.Children.Add(new TextBlock { Text = label, VerticalAlignment = VerticalAlignment.Center }); + if (hint is { } key) { - var key = new TextBlock { Text = hint, Opacity = 0.6, Margin = new Thickness(28, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center }; - Grid.SetColumn(key, 1); - grid.Children.Add(key); + var text = new TextBlock { Text = key, Opacity = 0.6, Margin = new Thickness(28, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center }; + Grid.SetColumn(text, 1); + grid.Children.Add(text); } return grid; diff --git a/src/SharpMUTerm.Avalonia/WindowHost.cs b/src/SharpMUTerm.Avalonia/WindowHost.cs index 16191e68..c35ea924 100644 --- a/src/SharpMUTerm.Avalonia/WindowHost.cs +++ b/src/SharpMUTerm.Avalonia/WindowHost.cs @@ -29,6 +29,9 @@ internal static class WindowHost { Newline = new HostChord(ConsoleKey.Enter, ConsoleModifiers.Control, "Ctrl+⏎", "Ctrl+Enter"), Reserved = [Maximise, .. Paste], + + // Avalonia reports the key and its modifiers: ⌃digit, ⌃⇧letter, ⌃Tab and ⌥O arrive as themselves. + ReportsChordsWhole = true, }; /// The window's driver. diff --git a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs index 3cb7e5d5..bcffae17 100644 --- a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs +++ b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs @@ -201,6 +201,9 @@ void Family(string id, string prefix, FuncMakes the layout in use the focused character's own, whatever its world uses. public const string UseForCharacter = Prefix + "use-character"; + /// Opens the ⌥M list itself: the ⌃P entry, and the menu's last entry. Not under . + public const string Manage = "layout:layouts"; + /// The id that applies . public static string Apply(string layoutId) => ApplyPrefix + layoutId; } diff --git a/src/SharpMUTerm.Client/Commands/MenuModel.cs b/src/SharpMUTerm.Client/Commands/MenuModel.cs new file mode 100644 index 00000000..211f834f --- /dev/null +++ b/src/SharpMUTerm.Client/Commands/MenuModel.cs @@ -0,0 +1,48 @@ +namespace SharpMUTerm.Client.Commands; + +/// +/// One entry of a menu the client builds for a host to draw: what it says, the key that does the same, and the +/// command id it dispatches. A host never names a command of its own — it hands the id back to the client, which +/// runs it through the registry, as a key or a ⌃P entry would. +/// +/// What the entry says; may carry the game's or the player's text, already bounded. +/// The key that does the same, for the entry's key column, or null. +/// The command id the entry dispatches, or null for an entry that does nothing. +/// Whether the entry is ticked: the one in use. +/// Whether it can be chosen. +public sealed record MenuEntry(string Label, string? Key, string? Command, bool Checked = false, bool Enabled = true) +{ + /// A rule between groups of entries. + public static MenuEntry Separator { get; } = new("-", null, null, Enabled: false); + + /// Whether this is the rule between groups. + public bool IsSeparator => Equals(Separator); +} + +/// +/// A menu as data, built by the client and drawn by a host (the window's Layouts button draws it as a native +/// menu). Every entry carries the command id it runs, so the menu cannot offer what the registry does not have. +/// +public sealed record MenuModel(IReadOnlyList Entries) +{ + /// No entries. + public static MenuModel Empty { get; } = new([]); + + /// Every command id the menu offers, so a host's answer can be checked against what was offered. + public IEnumerable Commands() => + Entries.Where(e => e.Enabled && e.Command is not null).Select(e => e.Command!); + + /// Value equality over the entries, which a record's list member does not give. + public bool Equals(MenuModel? other) => other is not null && Entries.SequenceEqual(other.Entries); + + public override int GetHashCode() + { + var hash = new HashCode(); + foreach (var entry in Entries) + { + hash.Add(entry); + } + + return hash.ToHashCode(); + } +} diff --git a/src/SharpMUTerm.Client/Panels/MapViewModel.cs b/src/SharpMUTerm.Client/Panels/MapViewModel.cs index 5f301d88..334578fb 100644 --- a/src/SharpMUTerm.Client/Panels/MapViewModel.cs +++ b/src/SharpMUTerm.Client/Panels/MapViewModel.cs @@ -29,6 +29,12 @@ public sealed record MapViewModel(string? Area, int Level, IReadOnlyListThe longest room name a view is given. public const int MaxNameLength = 80; + /// + /// The room the view is drawn around: the character's, or with no current room the most recently recorded one. + /// Null when nothing is mapped. The cell map centres on this room too, so the two views never disagree about it. + /// + public long? AnchorId { get; init; } + /// The room the character is in, or null. public MapViewRoom? Current => Rooms.FirstOrDefault(r => r.Current); @@ -82,12 +88,12 @@ public static MapViewModel From(WorldMap map, long? currentRoomId, IEnumerableValue equality over the rooms and exits, which a record's list members do not give. public bool Equals(MapViewModel? other) => - other is not null && Area == other.Area && Level == other.Level && Walking == other.Walking + other is not null && Area == other.Area && Level == other.Level && Walking == other.Walking && AnchorId == other.AnchorId && Rooms.SequenceEqual(other.Rooms) && Exits.SequenceEqual(other.Exits); public override int GetHashCode() => HashCode.Combine(Area, Level, Walking, Rooms.Count, Exits.Count); diff --git a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs new file mode 100644 index 00000000..1f576228 --- /dev/null +++ b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs @@ -0,0 +1,276 @@ +using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Client.Commands; +using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Client.Palette; +using SharpMUTerm.Client.Panels; +using SharpMUTerm.Core.Layouts; + +namespace SharpMUTerm.Client.Surfaces; + +/// How a surface is drawn on one host. +[Flags] +public enum SurfaceDrawing +{ + /// Not drawn on this host; its actions are reached another way (). + None = 0, + + /// Drawn as cells by the client. + Cells = 1, + + /// Drawn by the host with its own controls. + Native = 2, + + /// Drawn as cells, with the host's native view over them: the cells stay underneath. + Both = Cells | Native, +} + +/// What kind of input a surface hands back to the client. +public enum SurfaceActionKind +{ + /// A command id, run through the registry. + Command, + + /// An index into the model the surface was drawn from (row N, item N). + Pick, + + /// A click target the client put in the model. + Target, + + /// A room id on the map. + Walk, + + /// A change to a declared setting, committed through the client's save funnel. + Edit, +} + +/// +/// One thing a surface can ask the client to do, and the one client method every view of the surface ends in. +/// +/// What the view hands back. +/// A command id for ; otherwise what is picked or targeted. +/// The client method the cells and the native view both end in. +/// +/// Null when the surface's cells carry the action themselves. Otherwise the action is the native view's alone, and +/// this names where the cells offer the same thing: another surface's id, or a command id (a key, a ⌃P entry). A +/// native view may add a door; it may not add a room. +/// +public sealed record SurfaceAction(SurfaceActionKind Kind, string Name, string Reaches, string? CellsVia = null); + +/// The hosts a surface is declared for, by ClientHost.Name. +public static class SurfaceHosts +{ + /// The terminal: cells only, since nothing in a terminal can draw over a cell without taking it. + public const string Terminal = "terminal"; + + /// The desktop window: cells, and native views over them. + public const string Window = "window"; + + /// Every host a declaration states. + public static IReadOnlyList All { get; } = [Terminal, Window]; +} + +/// +/// One user-facing surface, declared once: its model, what it can ask for, and how each host draws it. +/// +/// Stable id. For a panel, the layout's panel id (). +/// The Client model every view of the surface is drawn from. +/// What the surface can hand back to the client. +/// Per host (), how it is drawn. +/// +/// The Tui method that draws the cells, as Namespace.Type.Method; one of its overloads takes +/// . Null only for a surface no host draws in cells. +/// +/// The window's classes that draw it natively, as Namespace.Type. +/// +/// For a surface no host draws in cells: the command id that reaches the same actions from the keyboard. +/// +public sealed record SurfaceDeclaration( + string Id, + Type Model, + IReadOnlyList Actions, + IReadOnlyDictionary Drawing, + string? CellRenderer, + IReadOnlyList NativeViews, + string? KeyboardPath = null) +{ + /// How draws this surface. + public SurfaceDrawing On(string host) => Drawing.TryGetValue(host, out var drawing) ? drawing : SurfaceDrawing.None; + + /// Whether any host draws it as cells. + public bool HasCells => Drawing.Values.Any(d => d.HasFlag(SurfaceDrawing.Cells)); + + /// Whether any host draws it natively. + public bool HasNative => Drawing.Values.Any(d => d.HasFlag(SurfaceDrawing.Native)); +} + +/// +/// Every user-facing surface that a host may draw with its own controls, declared once. The terminal and the +/// window run one client; what keeps their surfaces saying the same things is that each has one Client model, the +/// cells are drawn from it, the window's native view is drawn from the same instance, and every click comes back to +/// one client method. This catalog is where that is written down, and the tests read it: a native view no surface +/// declares, a declared surface whose cell renderer does not take its model, a native action that ends somewhere a +/// cell click does not, and a native model that differs from the one the cells drew in the same frame all fail. +/// +/// Adding a native surface: give it a model here in Client, draw its cells from that model, publish the same +/// instance to the host, declare it below, and add its probes to the window suite's SurfaceParityTests +/// (which fails until it has them). +/// +/// +public static class SurfaceCatalog +{ + /// The header band. + public const string Header = "header"; + + /// The connection sidebar. + public const string Sidebar = "sidebar"; + + /// The declared settings sections (F7, F8). + public const string Settings = "settings"; + + /// The Layouts button's menu. + public const string LayoutsMenu = "layouts-menu"; + + /// ⌃P, the command palette. + public const string Palette = "palette"; + + /// The ⌃B keymap while the prefix is armed: a cell panel, or the window's native header. + public const string Prefix = "prefix"; + + /// The folded sidebar: a strip of dots in cells, the window's narrow native strip. + public const string RailStrip = "rail-strip"; + + /// + /// The header and the rail: cells in a terminal; in the window (HostChrome.HeaderAndRail) native views + /// beside the cells, which then leave them out. + /// + private static readonly IReadOnlyDictionary NativeChrome = new Dictionary + { + [SurfaceHosts.Terminal] = SurfaceDrawing.Cells, + [SurfaceHosts.Window] = SurfaceDrawing.Native, + }; + + private static readonly IReadOnlyDictionary CellsUnderNative = new Dictionary + { + [SurfaceHosts.Terminal] = SurfaceDrawing.Cells, + [SurfaceHosts.Window] = SurfaceDrawing.Both, + }; + + /// Every declared surface. + public static IReadOnlyList All { get; } = + [ + new( + Header, + typeof(HeaderModel), + [ + new(SurfaceActionKind.Target, HeaderModel.PaletteTarget, "ToggleMenu"), + new(SurfaceActionKind.Target, "character", "DispatchRailTarget", CellsVia: Sidebar), + ], + NativeChrome, + "SharpMUTerm.Tui.SharpMUTermApp.HeaderMarkup", + ["SharpMUTerm.Avalonia.NativeHeader"]), + new( + Sidebar, + typeof(SidebarModel), + [ + new(SurfaceActionKind.Target, "world, character or window", "DispatchRailTarget"), + new(SurfaceActionKind.Command, SidebarModel.AddGameTarget, "DispatchCommand", CellsVia: SidebarModel.AddGameTarget), + ], + NativeChrome, + "SharpMUTerm.Tui.RailRenderer.Render", + ["SharpMUTerm.Avalonia.NativeSidebar"]), + new( + RailStrip, + typeof(SidebarModel), + [new(SurfaceActionKind.Target, SidebarModel.CollapseTarget, "ToggleRail", CellsVia: "layout:toggle-rail")], + NativeChrome, + "SharpMUTerm.Tui.RailRenderer.Render", + ["SharpMUTerm.Avalonia.NativeSidebar"]), + new( + Prefix, + typeof(HeaderPrefix), + [], + NativeChrome, + "SharpMUTerm.Tui.PrefixPanel.Render", + ["SharpMUTerm.Avalonia.NativeHeader"]), + new( + PanelIds.Vitals, + typeof(VitalsModel), + [], + CellsUnderNative, + "SharpMUTerm.Tui.Panels.VitalsStripRenderer.Render", + ["SharpMUTerm.Avalonia.VitalsGauges"]), + new( + PanelIds.Map, + typeof(MapViewModel), + [new(SurfaceActionKind.Walk, "room", "WalkFromMap")], + CellsUnderNative, + "SharpMUTerm.Tui.MapRenderer.Render", + ["SharpMUTerm.Avalonia.MapCanvas"]), + new( + PanelIds.WhoHere, + typeof(WhoHereModel), + [new(SurfaceActionKind.Pick, "row", "OfferLook")], + CellsUnderNative, + "SharpMUTerm.Tui.Panels.WhoHereRenderer.Render", + ["SharpMUTerm.Avalonia.WhoHereList"]), + new( + PanelIds.QuickBar, + typeof(QuickBarModel), + [ + new(SurfaceActionKind.Pick, "item", "RunQuickMacro"), + new(SurfaceActionKind.Command, QuickBarModel.EditCommand, "DispatchCommand"), + ], + CellsUnderNative, + "SharpMUTerm.Tui.Panels.QuickBarRenderer.Render", + ["SharpMUTerm.Avalonia.QuickBarButtons"]), + new( + Settings, + typeof(SettingsSectionContribution), + [new(SurfaceActionKind.Edit, "field", "ScreenEdits.Apply")], + new Dictionary + { + [SurfaceHosts.Terminal] = SurfaceDrawing.Cells, + + // A declared section opens the native settings window instead of its cell screen. + [SurfaceHosts.Window] = SurfaceDrawing.Native, + }, + "SharpMUTerm.Tui.OptionsScreenRenderer.FromSection", + ["SharpMUTerm.Avalonia.SettingsWindow"]), + new( + LayoutsMenu, + typeof(MenuModel), + [ + new(SurfaceActionKind.Command, LayoutCommands.Apply(BuiltInLayouts.CombatId), "RunLayoutCommand"), + new(SurfaceActionKind.Command, LayoutCommands.SaveChanges, "RunLayoutCommand"), + new(SurfaceActionKind.Command, LayoutCommands.SaveAsNew, "RunLayoutCommand"), + new(SurfaceActionKind.Command, LayoutCommands.UseForWorld, "RunLayoutCommand"), + new(SurfaceActionKind.Command, LayoutCommands.UseForCharacter, "RunLayoutCommand"), + new(SurfaceActionKind.Command, LayoutCommands.Manage, "DispatchCommand"), + ], + new Dictionary + { + // A terminal has no header buttons; ⌥M's list is the same commands from the keyboard. + [SurfaceHosts.Terminal] = SurfaceDrawing.None, + [SurfaceHosts.Window] = SurfaceDrawing.Native, + }, + null, + ["SharpMUTerm.Avalonia.HeaderButton", "SharpMUTerm.Avalonia.NativeMenu"], + KeyboardPath: LayoutCommands.Manage), + new( + Palette, + typeof(PaletteView), + [new(SurfaceActionKind.Pick, "entry", "RunFromPalette")], + new Dictionary + { + [SurfaceHosts.Terminal] = SurfaceDrawing.Cells, + + // A window with a native palette opens it instead of the cell popup (ClientHost.NativePalette). + [SurfaceHosts.Window] = SurfaceDrawing.Native, + }, + "SharpMUTerm.Tui.CommandSurfaceRenderer.Render", + ["SharpMUTerm.Avalonia.PaletteOverlay"]), + ]; + + /// The surface with , or null. + public static SurfaceDeclaration? Find(string id) => All.FirstOrDefault(s => s.Id == id); +} diff --git a/src/SharpMUTerm.Tui/CommandPalette.cs b/src/SharpMUTerm.Tui/CommandPalette.cs index b88d2333..6bfcab80 100644 --- a/src/SharpMUTerm.Tui/CommandPalette.cs +++ b/src/SharpMUTerm.Tui/CommandPalette.cs @@ -157,6 +157,20 @@ private void Move(int delta) Paint(); } + /// Selects the listed entry with and commits it, as arrows and ⏎ would; for a test. + internal bool Choose(string id) + { + var index = _view.Entries.ToList().FindIndex(e => e.Item.Id == id); + if (index < 0) + { + return false; + } + + _selected = index; + Commit(); + return true; + } + private void Commit() { if (_selected >= 0 && _selected < _view.Entries.Count) diff --git a/src/SharpMUTerm.Tui/Hosting/HostKeys.cs b/src/SharpMUTerm.Tui/Hosting/HostKeys.cs index c2669678..70b4c04c 100644 --- a/src/SharpMUTerm.Tui/Hosting/HostKeys.cs +++ b/src/SharpMUTerm.Tui/Hosting/HostKeys.cs @@ -1,3 +1,5 @@ +using SharpMUTerm.Core.Automation; + namespace SharpMUTerm.Tui; /// A chord as a host spells it: the key, its exact modifiers, and the two ways a surface names it. @@ -24,8 +26,32 @@ internal sealed record HostKeys /// Chords the host acts on itself; the client never receives them, so no surface may offer them. public required IReadOnlyList Reserved { get; init; } + /// + /// Whether the host reports every chord as the key and the modifiers that were pressed. A window does. A + /// terminal does not: it writes Ctrl+letter as a control byte (losing Shift, and spelling ⌃H/⌃I/⌃J/⌃M as + /// Backspace, Tab and Enter), Ctrl+digit as whatever byte the ASCII table gives it, Ctrl+Tab as a bare Tab, and + /// its emulator and the framework's parser spend chords of their own (kitty's ⌃⇧←/→, the parser's ⌥O). F4 and + /// the quick bar read this through , so a binding is drawn live on the host + /// where it fires and dead where it never arrives. + /// + public required bool ReportsChordsWhole { get; init; } + public bool Reserves(ConsoleKeyInfo key) => Reserved.Any(r => r.Chord.Matches(key)); + /// The reserved chord a descriptor names, or null. + internal ReservedChord? ReservedFor(MacroKeyParts parts) => + Reserved.FirstOrDefault(r => Same(r.Chord, parts)); + + /// Whether a descriptor names the newline chord. + internal bool IsNewline(MacroKeyParts parts) => Same(Newline, parts); + + private static bool Same(HostChord chord, MacroKeyParts parts) => + MacroKeys.NameOf(chord.Key) is { } name + && string.Equals(name, parts.Key, StringComparison.OrdinalIgnoreCase) + && chord.Modifiers.HasFlag(ConsoleModifiers.Control) == parts.Ctrl + && chord.Modifiers.HasFlag(ConsoleModifiers.Alt) == parts.Alt + && chord.Modifiers.HasFlag(ConsoleModifiers.Shift) == parts.Shift; + /// /// A terminal: ⌥⏎ is the newline, reassembled from the Escape and Enter it arrives as /// (SharpMUTermApp.TryAltEnter). ⇧⏎ and ⌃⏎ arrive as a bare ⏎ and are named nowhere. The emulator's @@ -35,5 +61,6 @@ internal sealed record HostKeys { Newline = new HostChord(ConsoleKey.Enter, ConsoleModifiers.Alt, "Alt+⏎", "Alt+Enter"), Reserved = [], + ReportsChordsWhole = false, }; } diff --git a/src/SharpMUTerm.Tui/KeyClashes.cs b/src/SharpMUTerm.Tui/KeyClashes.cs index db76170c..7b373451 100644 --- a/src/SharpMUTerm.Tui/KeyClashes.cs +++ b/src/SharpMUTerm.Tui/KeyClashes.cs @@ -44,13 +44,13 @@ internal readonly record struct KeyClash(Macro Macro, KeyClashKind Kind, string internal static class KeyClashes { /// Every clash among , in list order. - internal static IReadOnlyList Find(IReadOnlyList macros) + internal static IReadOnlyList Find(HostKeys keys, IReadOnlyList macros) { ArgumentNullException.ThrowIfNull(macros); var clashes = new List(); foreach (var macro in macros) { - if (For(macro, macros) is { } clash) + if (For(keys, macro, macros) is { } clash) { clashes.Add(clash); } @@ -64,11 +64,11 @@ internal static IReadOnlyList Find(IReadOnlyList macros) /// on its chord, and every binding that hides one of the client's own keys. A binding that shadows a later /// one is not counted again — the later one already is. /// - internal static int Count(IReadOnlyList macros) => - Find(macros).Count(c => c.Kind != KeyClashKind.Shadows); + internal static int Count(HostKeys keys, IReadOnlyList macros) => + Find(keys, macros).Count(c => c.Kind != KeyClashKind.Shadows); /// The clash is part of, or null. - internal static KeyClash? For(Macro macro, IReadOnlyList macros) + internal static KeyClash? For(HostKeys keys, Macro macro, IReadOnlyList macros) { ArgumentNullException.ThrowIfNull(macro); ArgumentNullException.ThrowIfNull(macros); @@ -91,7 +91,7 @@ internal static int Count(IReadOnlyList macros) => return new KeyClash(macro, KeyClashKind.Shadowed, $"{Name(holders[0])} holds {chord} first; this never runs"); } - if (!MacroKeys.Verdict(chord).Fires) + if (!MacroKeys.Verdict(keys, chord).Fires) { return null; } diff --git a/src/SharpMUTerm.Tui/KeypadScreenRenderer.cs b/src/SharpMUTerm.Tui/KeypadScreenRenderer.cs index 530a5aea..8a02f865 100644 --- a/src/SharpMUTerm.Tui/KeypadScreenRenderer.cs +++ b/src/SharpMUTerm.Tui/KeypadScreenRenderer.cs @@ -170,14 +170,14 @@ internal static int NumpadWidth(IReadOnlyList macros) /// panels instead. /// public static List Render( - IReadOnlyList macros, IReadOnlyList? sets = null, int selected = -1) + HostKeys keys, IReadOnlyList macros, IReadOnlyList? sets = null, int selected = -1) { ArgumentNullException.ThrowIfNull(macros); - var left = NumpadColumn(macros); - var right = HotkeysColumn(macros, null, sets, selected); + var left = NumpadColumn(keys, macros); + var right = HotkeysColumn(keys, macros, null, sets, selected); - var lines = new List { HeaderLine(0, Model(macros, sets, selected)), string.Empty }; + var lines = new List { HeaderLine(0, Model(keys, macros, sets, selected)), string.Empty }; var rowCount = Math.Max(left.Count, right.Count); for (var i = 0; i < rowCount; i++) @@ -188,7 +188,7 @@ public static List Render( } lines.Add(string.Empty); - lines.Add(FooterLine(macros, 0, null, selected)); + lines.Add(FooterLine(keys, macros, 0, null, selected)); return lines; } @@ -221,12 +221,13 @@ internal static string HeaderLine(int width, ScreenModel? model = null, ScreenFo /// /// Which binding the cursor has anchored, or -1 for none. internal static ScreenModel Model( + HostKeys keys, IReadOnlyList macros, IReadOnlyList? sets = null, int selected = -1) { ArgumentNullException.ThrowIfNull(macros); - return new ScreenModel(ScreenModel.Rows(macros, macro => BindingRow(macro, macros, sets)) - .Concat(Buttons(sets, selected)) + return new ScreenModel(ScreenModel.Rows(macros, macro => BindingRow(keys, macro, macros, sets)) + .Concat(Buttons(keys, sets, selected)) .ToArray()); } @@ -235,13 +236,13 @@ internal static ScreenModel Model( /// the screen knows which sets the bindings came from — the set that owns it. /// private static ScreenRow BindingRow( - Macro macro, IReadOnlyList macros, IReadOnlyList? sets) + HostKeys keys, Macro macro, IReadOnlyList macros, IReadOnlyList? sets) { var fields = new List { ScreenField.Name("name", () => macro.Name, v => macro.Name = v), ScreenField.Text("command", () => macro.Command, v => macro.Command = v), - ScreenField.Key("key", () => macro.Key, v => macro.Key = v, key => AlreadyBound(macros, macro, key)), + ScreenField.Key(keys, "key", () => macro.Key, v => macro.Key = v, key => AlreadyBound(macros, macro, key)), }; if (sets is not null) @@ -300,7 +301,7 @@ private static ScreenRow BindingRow( /// contradicting the field beside it. /// /// - private static List Buttons(IReadOnlyList? sets, int selected) + private static List Buttons(HostKeys keys, IReadOnlyList? sets, int selected) { var rows = new List(); if (sets is null) @@ -310,7 +311,7 @@ private static List Buttons(IReadOnlyList? sets, int sele var bound = sets.SelectMany(s => s.Macros).Select(m => m.Key).ToList(); if (ScreenLists.Target(sets, s => s.Macros, selected) is { } target - && FreeBindableKey(bound) is { } key) + && FreeBindableKey(keys, bound) is { } key) { rows.Add(ScreenRow.Of(ScreenButton.Add( AddBindingLabel, @@ -338,9 +339,9 @@ private static List Buttons(IReadOnlyList? sets, int sele /// Null when every candidate is taken, which is what stops the button being drawn at all. /// Comparison is case-insensitive because 's lookup is. /// - private static string? FreeBindableKey(IReadOnlyList bound) + private static string? FreeBindableKey(HostKeys keys, IReadOnlyList bound) { - foreach (var key in MacroKeys.Bindable) + foreach (var key in MacroKeys.Bindable(keys)) { if (!bound.Contains(key, StringComparer.OrdinalIgnoreCase)) { @@ -380,7 +381,7 @@ private static string Identify(Macro macro) => /// stays on the binding the screen is showing; the footer has to report that one, not the last. /// internal static string FooterLine( - IReadOnlyList macros, int width, ScreenFocus? focus = null, int selected = -1) + HostKeys keys, IReadOnlyList macros, int width, ScreenFocus? focus = null, int selected = -1) { ArgumentNullException.ThrowIfNull(macros); @@ -392,8 +393,8 @@ internal static string FooterLine( // The row can only spare a handful of cells for a reason; the footer has the width to give // the whole one, for the binding the cursor is actually on. - var verdict = MacroKeys.Verdict(macros[at].Key); - var clash = KeyClashes.For(macros[at], macros); + var verdict = MacroKeys.Verdict(keys, macros[at].Key); + var clash = KeyClashes.For(keys, macros[at], macros); context = ScreenChrome.Context( ScreenChrome.Position("binding", at, macros.Count), Escape(Identify(macros[at])), @@ -421,7 +422,7 @@ clash is { } c /// whole command and a narrow one ellipsises it — rather than every screen ellipsising at ten /// characters because that was the width the grid was first drawn at. /// - internal static List NumpadColumn(IReadOnlyList macros, int width = 0) + internal static List NumpadColumn(HostKeys keys, IReadOnlyList macros, int width = 0) { ArgumentNullException.ThrowIfNull(macros); @@ -429,7 +430,7 @@ internal static List NumpadColumn(IReadOnlyList macros, int width ? NumpadCommandWidth : Math.Clamp((width - NumpadRowChrome) / 3, MinNumpadCommandWidth, MaxNumpadCommandWidth); - var lines = new List { $"[dim]NUMPAD[/]{Caveat(MacroKeys.Verdict("Num5"))}" }; + var lines = new List { $"[dim]NUMPAD[/]{Caveat(MacroKeys.Verdict(keys, "Num5"))}" }; foreach (var row in NumpadRows) { lines.Add(NumpadRow(row, macros, command)); @@ -441,6 +442,7 @@ internal static List NumpadColumn(IReadOnlyList macros, int width /// The binding list — every macro with its enabled state, key, name, and command. /// How wide the column runs, which its cursor bars and dropdown are sized to. internal static List HotkeysColumn( + HostKeys keys, IReadOnlyList macros, ScreenFocus? focus = null, IReadOnlyList? sets = null, @@ -450,7 +452,7 @@ internal static List HotkeysColumn( ArgumentNullException.ThrowIfNull(macros); var cursor = focus ?? ScreenFocus.None; - var lines = new List { $"[dim]HOTKEYS[/]{DeadCount(macros)}" }; + var lines = new List { $"[dim]HOTKEYS[/]{DeadCount(keys, macros)}" }; if (macros.Count == 0) { lines.Add(" [dim]no hotkeys[/]"); @@ -460,6 +462,7 @@ internal static List HotkeysColumn( { lines.Add(ScreenChrome.Cursor( Hotkey( + keys, macros[i], macros, sets is null ? null : ScreenLists.OwnerOf(sets, s => s.Macros, macros[i])?.Name, @@ -484,7 +487,7 @@ internal static List HotkeysColumn( lines.Add(string.Empty); lines.AddRange(ScreenChrome.Buttons( - Buttons(sets, selected), cursor, 0, macros.Count, width)); + Buttons(keys, sets, selected), cursor, 0, macros.Count, width)); return ScreenChrome.Choices(lines, cursor.Edit, width); } @@ -533,6 +536,7 @@ private static string NumpadCell(int digit, IReadOnlyList macros, int wid /// /// private static string Hotkey( + HostKeys keys, Macro macro, IReadOnlyList macros, string? setName, @@ -541,8 +545,8 @@ private static string Hotkey( ScreenFieldEdit? key, ScreenFieldEdit? set) { - var verdict = MacroKeys.Verdict(macro.Key); - var clash = KeyClashes.For(macro, macros); + var verdict = MacroKeys.Verdict(keys, macro.Key); + var clash = KeyClashes.For(keys, macro, macros); var tick = macro.Enabled ? $"[{Accent}]✓[/]" : "[dim]·[/]"; // A clash is marked inside the key's own well, where the ▲ already goes, so it costs the row no @@ -588,11 +592,11 @@ private static string Caveat(MacroKeyVerdict verdict) => /// count, though, is the one thing neither the rows nor the footer can say: how much of this list is /// scenery. /// - private static string DeadCount(IReadOnlyList macros) + private static string DeadCount(HostKeys keys, IReadOnlyList macros) { var dead = macros.Count(m => - !MacroKeys.Verdict(m.Key).Fires || KeyClashes.For(m, macros) is { Kind: KeyClashKind.Shadowed }); - var hiding = macros.Count(m => KeyClashes.For(m, macros) is { Kind: KeyClashKind.BindingWins }); + !MacroKeys.Verdict(keys, m.Key).Fires || KeyClashes.For(keys, m, macros) is { Kind: KeyClashKind.Shadowed }); + var hiding = macros.Count(m => KeyClashes.For(keys, m, macros) is { Kind: KeyClashKind.BindingWins }); var caption = dead == 0 ? string.Empty : $" [{Muted}]▲ {dead} of {macros.Count} cannot fire[/]"; return hiding == 0 ? caption : caption + $" [{Caution}]△ {hiding} hide a client key[/]"; } diff --git a/src/SharpMUTerm.Tui/KeypadScreenView.cs b/src/SharpMUTerm.Tui/KeypadScreenView.cs index e1e83dd6..ec9a55da 100644 --- a/src/SharpMUTerm.Tui/KeypadScreenView.cs +++ b/src/SharpMUTerm.Tui/KeypadScreenView.cs @@ -22,6 +22,7 @@ namespace SharpMUTerm.Tui; internal static class KeypadScreenView { public static IWindowControl Build( + HostKeys keys, IReadOnlyList macros, IReadOnlyList sets, int selected, @@ -31,10 +32,10 @@ public static IWindowControl Build( int height = 0) { var header = ScreenChrome.Band( - KeypadScreenRenderer.HeaderLine(width, KeypadScreenRenderer.Model(macros, sets, selected), focus), + KeypadScreenRenderer.HeaderLine(width, KeypadScreenRenderer.Model(keys, macros, sets, selected), focus), ScreenPalette.HeaderBg, scheme); var footer = ScreenChrome.Band( - KeypadScreenRenderer.FooterLine(macros, width, focus, selected), ScreenPalette.FooterBg, scheme); + KeypadScreenRenderer.FooterLine(keys, macros, width, focus, selected), ScreenPalette.FooterBg, scheme); // While a key capture is armed the binding row swaps its key well for a prompt twice the width, // so the list asks for more and the diagram gives it up for as long as the prompt is up. The @@ -47,7 +48,7 @@ public static IWindowControl Build( { // The diagram is a picture of the bindings the list already holds, so a narrow screen drops it // and keeps the list, which is where every key on this screen acts. - var only = KeypadScreenRenderer.HotkeysColumn(macros, focus, sets, selected, width); + var only = KeypadScreenRenderer.HotkeysColumn(keys, macros, focus, sets, selected, width); return ScreenChrome.Single( header, footer, ScreenChrome.Stretch(new MarkupControl(ScreenChrome.Window(only, rows))), only.Count, rows); @@ -58,9 +59,9 @@ public static IWindowControl Build( KeypadScreenRenderer.NumpadWidth(macros), KeypadScreenRenderer.MinNumpadWidth, hotkeysMinimum); - var left = KeypadScreenRenderer.NumpadColumn(macros, numpad); + var left = KeypadScreenRenderer.NumpadColumn(keys, macros, numpad); var right = KeypadScreenRenderer.HotkeysColumn( - macros, focus, sets, selected, width <= 0 ? numpad : width - numpad - ScreenChrome.ColumnDivider); + keys, macros, focus, sets, selected, width <= 0 ? numpad : width - numpad - ScreenChrome.ColumnDivider); var numpadCol = ScreenChrome.Stretch(ScreenChrome.Panel(ScreenChrome.Window(left, rows), scheme)); var hotkeysCol = ScreenChrome.Stretch( diff --git a/src/SharpMUTerm.Tui/MacroKeys.cs b/src/SharpMUTerm.Tui/MacroKeys.cs index 3f5f0b91..cbf62d69 100644 --- a/src/SharpMUTerm.Tui/MacroKeys.cs +++ b/src/SharpMUTerm.Tui/MacroKeys.cs @@ -281,10 +281,9 @@ void Add(string key, bool ctrl, bool alt, bool shift, string does) => /// test rather than trusted — a list of candidates that drifted from the verdicts would hand out /// keys that cannot be reached, which is the exact defect it exists to prevent. /// - internal static IReadOnlyList Bindable { get; } = BuildBindable(); - - private static List BuildBindable() + internal static IReadOnlyList Bindable(HostKeys keys) { + ArgumentNullException.ThrowIfNull(keys); var candidates = new List(); for (var f = 1; f <= 12; f++) { @@ -296,7 +295,7 @@ private static List BuildBindable() candidates.Add(MacroKey.Describe($"F{f}", ctrl: true)); } - return candidates.FindAll(c => Verdict(c).Fires); + return candidates.FindAll(c => Verdict(keys, c).Fires); } /// @@ -305,21 +304,36 @@ private static List BuildBindable() /// filtered by so that the rows F4 draws as live are /// precisely the ones this returns for. /// - internal static string? Descriptor(ConsoleKeyInfo key) => - Capture(key) is { } descriptor && Verdict(descriptor).Fires ? descriptor : null; + internal static string? Descriptor(HostKeys keys, ConsoleKeyInfo key) => + Capture(key) is { } descriptor && Verdict(keys, descriptor).Fires ? descriptor : null; /// - /// What a stored descriptor is worth on this host. Every answer is a fact about the parser, the app's - /// own shortcuts, or the prompt — never a guess — and the reason is short enough to print on the - /// binding's own row. + /// What a stored descriptor is worth on the host whose keys are . Every answer is a + /// fact about the host's input (what its terminal writes, or what its window reports), the chords the host + /// keeps, the app's own shortcuts, or the prompt — never a guess — and the reason is short enough to print on + /// the binding's own row. The terminal and the window differ: in a window ⌃digit, ⌃⇧letter and ⌥O arrive, and + /// ⌥⏎ never reaches the client at all. /// - internal static MacroKeyVerdict Verdict(string? descriptor) + internal static MacroKeyVerdict Verdict(HostKeys keys, string? descriptor) { + ArgumentNullException.ThrowIfNull(keys); if (!MacroKey.TryParse(descriptor, out var parts)) { return Never("not a key this client knows"); } + // The host acts on these before the client sees the key, so nothing the client holds can outrank them. + if (keys.ReservedFor(parts) is { } reserved) + { + return new MacroKeyVerdict(MacroKeyDelivery.Taken, $"{reserved.Chord.Glyph} {reserved.Action}"); + } + + if (keys.IsNewline(parts)) + { + return new MacroKeyVerdict(MacroKeyDelivery.Taken, $"{keys.Newline.Glyph} is the newline"); + } + + var whole = keys.ReportsChordsWhole; var canonical = MacroKey.Describe(parts.Key, parts.Ctrl, parts.Alt, parts.Shift); if (Claimed.TryGetValue(canonical, out var does)) { @@ -336,7 +350,8 @@ internal static MacroKeyVerdict Verdict(string? descriptor) if (parts.Ctrl && parts.Alt) { - return Never("Ctrl+Alt arrives as two keys"); + // A window hands Ctrl+Alt to the keyboard layout as AltGr, which types a character instead. + return Never(whole ? "Ctrl+Alt is AltGr here: it types a character" : "Ctrl+Alt arrives as two keys"); } if (IsFunction(parts.Key)) @@ -346,7 +361,7 @@ internal static MacroKeyVerdict Verdict(string? descriptor) if (IsLetter(parts.Key) || IsDigit(parts.Key)) { - return Chord(parts); + return Chord(parts, whole); } if (Navigation.Contains(parts.Key)) @@ -358,7 +373,7 @@ internal static MacroKeyVerdict Verdict(string? descriptor) // the pane-resize chord was on it, was reported dead, and moved to Alt+Shift because of this. // The vertical pair is not listed: kitty_mod+up/down is scroll_line_up/down, which returns // "passthrough" while the alternate screen is up, so those do arrive. - if (parts.Ctrl && parts.Shift && !parts.Alt && parts.Key is "Left" or "Right") + if (!whole && parts.Ctrl && parts.Shift && !parts.Alt && parts.Key is "Left" or "Right") { return Never("the terminal keeps ⌃⇧←/→ for its tabs"); } @@ -372,7 +387,8 @@ internal static MacroKeyVerdict Verdict(string? descriptor) // letter, and it is here rather than in Chord() because Chord() only sees letters and digits. if (parts.Ctrl && ControlBytes.TryGetValue(parts.Key, out var spentOn)) { - return Never($"the terminal sends {spentOn} instead"); + // A window reports ⌃Tab as itself. + return whole ? new MacroKeyVerdict(MacroKeyDelivery.Fires) : Never($"the terminal sends {spentOn} instead"); } return Never("only F-keys and Ctrl/Alt chords arrive"); @@ -387,13 +403,19 @@ internal static MacroKeyVerdict Verdict(string? descriptor) /// which is why the window-jump chords are on it — then reports ⌥1–⌥9 as /// taken through , and ⌥0 stays free for a macro. /// - private static MacroKeyVerdict Chord(MacroKeyParts parts) + private static MacroKeyVerdict Chord(MacroKeyParts parts, bool whole) { if (!parts.Ctrl && !parts.Alt) { return new MacroKeyVerdict(MacroKeyDelivery.Taken, "plain keys type into the prompt"); } + // A window reports the key and its modifiers as pressed: no control byte, no ESC prefix, no SS3. + if (whole) + { + return new MacroKeyVerdict(MacroKeyDelivery.Fires); + } + if (parts.Ctrl) { if (parts.Shift) @@ -498,6 +520,9 @@ private static Dictionary BuildClaims() return claims; } + /// The descriptor name of a , or null (see ). + internal static string? NameOf(ConsoleKey key) => Name(key); + /// /// The descriptor name of a , or null for one a binding cannot be written /// for. It is deliberately wider than what will accept — the numpad keys have diff --git a/src/SharpMUTerm.Tui/MapRenderer.cs b/src/SharpMUTerm.Tui/MapRenderer.cs index ff701cda..5349cc17 100644 --- a/src/SharpMUTerm.Tui/MapRenderer.cs +++ b/src/SharpMUTerm.Tui/MapRenderer.cs @@ -1,5 +1,6 @@ using System.Globalization; using System.Text; +using SharpMUTerm.Client.Panels; using SharpMUTerm.Core.Mapping; namespace SharpMUTerm.Tui; @@ -55,9 +56,8 @@ private enum Kind : null; /// - /// The map as rows at most, each at most cells. The first - /// row is the title; the rest is the grid around . With no current room the map is - /// drawn around the lowest-numbered room, and an empty map says so. + /// The map as rows at most, each at most cells, around + /// ; see the overload that takes a , which this builds. /// internal static List Render( WorldMap map, @@ -66,14 +66,23 @@ internal static List Render( int width, int height, Ink ink, - string? walking = null) + string? walking = null) => + Render(MapViewModel.From(map, current, ahead, walking), map, width, height, ink); + + /// + /// The map as rows at most, each at most cells. The first + /// row is the title; the rest is the grid. Where, which level, who is where and whether a walk is under way + /// are the view's (the model the window's native map is drawn from), so the two cannot centre on different + /// rooms or title different areas. Only the exits' geometry (directions, stubs, ways off the level), which the + /// view does not carry, is read from . An empty map says so. + /// + internal static List Render(MapViewModel view, WorldMap map, int width, int height, Ink ink) { width = Math.Max(1, width); height = Math.Max(1, height); var lines = new List(); - var centre = current is { } c ? map.Room(c) : null; - centre ??= map.Rooms.Values.OrderBy(r => r.Id).FirstOrDefault(); + var centre = view.AnchorId is { } anchor ? map.Room(anchor) : null; if (centre is null) { lines.Add(Title("Map · nothing mapped yet", width, ink)); @@ -81,15 +90,16 @@ internal static List Render( return lines.Take(height).ToList(); } - var area = centre.AreaId is { } a && map.Areas.TryGetValue(a, out var found) ? found.Name : null; + var current = view.Current?.Id; + var ahead = view.Rooms.Where(r => r.Ahead).Select(r => r.Id); var title = new StringBuilder("Map"); - if (!string.IsNullOrWhiteSpace(area)) + if (!string.IsNullOrWhiteSpace(view.Area)) { - title.Append(" · ").Append(area); + title.Append(" · ").Append(view.Area); } - title.Append(" · z ").Append(centre.Z.ToString(CultureInfo.InvariantCulture)); - if (walking is not null) + title.Append(" · z ").Append(view.Level.ToString(CultureInfo.InvariantCulture)); + if (view.Walking is { } walking) { title.Append(" · ").Append(walking); } diff --git a/src/SharpMUTerm.Tui/Panels/QuickBarRenderer.cs b/src/SharpMUTerm.Tui/Panels/QuickBarRenderer.cs index a8165981..d6291aad 100644 --- a/src/SharpMUTerm.Tui/Panels/QuickBarRenderer.cs +++ b/src/SharpMUTerm.Tui/Panels/QuickBarRenderer.cs @@ -17,6 +17,9 @@ internal static class QuickBarRenderer /// The scheme an entry's link carries, followed by its index in the list drawn. internal const string LinkPrefix = "mux:quick:"; + /// The hint's link: a click opens the F4 screen (), as the window's does. + internal const string EditLink = LinkPrefix + "edit"; + /// The longest a macro's name is drawn before it is cut. internal const int MaxNameWidth = 16; @@ -27,7 +30,7 @@ internal static class QuickBarRenderer /// The function-key bindings to show, from the bindings that resolve: one per key, plain keys before modified /// ones, then by number. A binding with neither a command nor a script is left out, as the key path leaves it. /// - internal static QuickBarModel Entries(IEnumerable macros, Func resolve) + internal static QuickBarModel Entries(HostKeys keys, IEnumerable macros, Func resolve) { var seen = new HashSet(StringComparer.OrdinalIgnoreCase); var entries = new List<(QuickBarItem Entry, int Modifiers, int Number)>(); @@ -56,7 +59,7 @@ internal static QuickBarModel Entries(IEnumerable macros, Func e.Modifiers).ThenBy(e => e.Number).Select(e => e.Entry).ToList()); @@ -67,7 +70,7 @@ internal static string Render(QuickBarModel model, int width, string accent) { var entries = model.Items; width = Math.Max(1, width); - var hint = $"[bold {accent}]{QuickBarModel.EditKey}[/][dim]{QuickBarModel.EditHint[QuickBarModel.EditKey.Length..]}[/]"; + var hint = $"[link={EditLink}][bold {accent}]{QuickBarModel.EditKey}[/][dim]{QuickBarModel.EditHint[QuickBarModel.EditKey.Length..]}[/][/]"; if (entries.Count == 0) { return ElideVisible($"[dim]{QuickBarModel.EmptyText} · [/]{hint}", width); diff --git a/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs b/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs index f433d34d..1e6c56b3 100644 --- a/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs +++ b/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs @@ -202,10 +202,18 @@ internal sealed record PanelInk(string Bar, string Low, string Track); /// The key that does the same, for the tooltip. /// /// Builds the menu; safe to call from any thread. The client builds it on its own thread and hands it to the -/// callback there, so a host marshals in the callback itself. Each entry's is -/// already marshalled. +/// callback there, so a host marshals in the callback itself. /// -internal sealed record HeaderAction(string Id, string Label, string? Hint, Action>> Menu) +/// +/// Runs an entry by the command id the menu carried; safe to call from any thread. An id the last menu built did +/// not offer is refused, so a host can choose an entry and never name a command of its own. +/// +internal sealed record HeaderAction( + string Id, + string Label, + string? Hint, + Action> Menu, + Action Dispatch) { /// The layouts button: built-in and saved layouts, save, and a default for a world or a character. public const string LayoutsId = "layouts"; diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Desktop.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Desktop.cs index 9c3a2b4e..f062d66f 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Desktop.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Desktop.cs @@ -37,11 +37,19 @@ internal sealed partial class SharpMUTermApp /// The one command callback every native panel is handed. private Action? _panelDispatch; + /// The Layouts menu the client last built, so a command handed back can be checked against it. + private MenuModel _layoutsMenuOffered = MenuModel.Empty; + /// Tells the host which header buttons it may draw. Once, at construction. private void AnnounceHeaderActions() => _pointer?.HeaderActions( [ - new HeaderAction(HeaderAction.LayoutsId, "Layouts", "⌥M", show => OnUiThread(() => show(LayoutsMenuItems()))), + new HeaderAction( + HeaderAction.LayoutsId, + "Layouts", + "⌥M", + show => OnUiThread(() => show(_layoutsMenuOffered = LayoutsMenu())), + id => OnUiThread(() => RunLayoutsMenuEntry(id))), ]); /// The layout the focused character's panes show, or would get. @@ -52,54 +60,72 @@ private string LayoutInUse(string key) => /// /// The window's Layouts menu: the built-ins, then the player's, the one in use checked; then the list's - /// actions on the layout in use; then the list itself. Every entry dispatches a command id. + /// actions on the layout in use; then the list itself. Every entry names a command id the registry runs. /// Internal for tests. /// - internal IReadOnlyList LayoutsMenuItems() + internal MenuModel LayoutsMenu() { - Action Dispatch(string id) => () => OnUiThread(() => DispatchCommand(id)); - var items = new List(); + var entries = new List(); if (LayoutsKey() is not { } key) { - items.Add(new PointerMenuItem("No character here — a layout belongs to a character", null, () => { }, Enabled: false)); - items.Add(PointerMenuItem.Separator); - items.Add(new PointerMenuItem("Manage layouts…", "⌥M", Dispatch("layout:layouts"))); - return items; + entries.Add(new MenuEntry("No character here — a layout belongs to a character", null, null, Enabled: false)); + entries.Add(MenuEntry.Separator); + entries.Add(new MenuEntry("Manage layouts…", "⌥M", LayoutCommands.Manage)); + return new MenuModel(entries); } var inUse = LayoutInUse(key); var all = Layouts.All; foreach (var layout in all.Where(l => l.IsBuiltIn)) { - items.Add(new PointerMenuItem(Snippet(layout.Name), null, Dispatch(LayoutCommands.Apply(layout.Id)), Checked: layout.Id == inUse)); + entries.Add(new MenuEntry(Snippet(layout.Name), null, LayoutCommands.Apply(layout.Id), Checked: layout.Id == inUse)); } var own = all.Where(l => !l.IsBuiltIn).ToList(); if (own.Count > 0) { - items.Add(PointerMenuItem.Separator); + entries.Add(MenuEntry.Separator); foreach (var layout in own) { - items.Add(new PointerMenuItem(Snippet(layout.Name), null, Dispatch(LayoutCommands.Apply(layout.Id)), Checked: layout.Id == inUse)); + entries.Add(new MenuEntry(Snippet(layout.Name), null, LayoutCommands.Apply(layout.Id), Checked: layout.Id == inUse)); } } var (world, character) = LayoutOwner(key); - items.Add(PointerMenuItem.Separator); - items.Add(new PointerMenuItem("Save changes", null, Dispatch(LayoutCommands.SaveChanges))); - items.Add(new PointerMenuItem("Save as new", null, Dispatch(LayoutCommands.SaveAsNew))); - items.Add(new PointerMenuItem( - world is null ? "Use for this world" : $"Use for {Snippet(world.Name)}", null, Dispatch(LayoutCommands.UseForWorld), Enabled: world is not null)); - items.Add(new PointerMenuItem( + entries.Add(MenuEntry.Separator); + entries.Add(new MenuEntry("Save changes", null, LayoutCommands.SaveChanges)); + entries.Add(new MenuEntry("Save as new", null, LayoutCommands.SaveAsNew)); + entries.Add(new MenuEntry( + world is null ? "Use for this world" : $"Use for {Snippet(world.Name)}", null, LayoutCommands.UseForWorld, Enabled: world is not null)); + entries.Add(new MenuEntry( character is null ? "Use for this character only" : $"Use for {Snippet(character.Name)} only", null, - Dispatch(LayoutCommands.UseForCharacter), + LayoutCommands.UseForCharacter, Enabled: character is not null)); - items.Add(PointerMenuItem.Separator); - items.Add(new PointerMenuItem("Manage layouts…", "⌥M", Dispatch("layout:layouts"))); - return items; + entries.Add(MenuEntry.Separator); + entries.Add(new MenuEntry("Manage layouts…", "⌥M", LayoutCommands.Manage)); + return new MenuModel(entries); } + /// + /// An entry chosen from the window's Layouts menu, by the command id the client put in it. A command the menu last + /// built did not offer is refused, the chrome's rule: the host hands back a choice, never a command of its own. + /// Internal so a test can drive it as the window does. + /// + internal bool RunLayoutsMenuEntry(string id) + { + if (!_layoutsMenuOffered.Commands().Contains(id, StringComparer.Ordinal)) + { + RefuseCommand($"the Layouts menu never offered {Snippet(id)}"); + return false; + } + + return DispatchCommand(id); + } + + /// Builds the Layouts menu as the header button does, and remembers it as offered. Internal for tests. + internal MenuModel OfferLayoutsMenu() => _layoutsMenuOffered = LayoutsMenu(); + /// /// A layout-library command (), for the focused character: the ⌥M list's own /// methods, with what they did said in a notice rather than in the list's status line. diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Surfaces.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Surfaces.cs new file mode 100644 index 00000000..388e3f43 --- /dev/null +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Surfaces.cs @@ -0,0 +1,63 @@ +using SharpMUTerm.Client.Surfaces; + +namespace SharpMUTerm.Tui; + +/// +/// The model each declared surface's cells were last drawn from (), by surface and by +/// window. The cell renderers record what they were handed; the window suite compares it with what the host was +/// told in the same frame, so a native view drawn from anything but the model the cells drew fails a test rather +/// than drifting. +/// +internal sealed partial class SharpMUTermApp +{ + private readonly Dictionary<(string Surface, string Key), object> _drawnModels = new(); + + /// Records as the one 's cells are about to draw. + private T Drawing(string surface, string key, T model) + where T : notnull + { + _drawnModels[(surface, key)] = model; + return model; + } + + /// + /// The model a surface's cells were last drawn from: is the window id for a panel, empty + /// for the header and the sidebar. Null when they have not been drawn. Internal for tests. + /// + internal object? DrawnModel(string surface, string key = "") => + surface == SurfaceCatalog.Palette ? (_palette.IsOpen ? _palette.View : null) + : surface == SurfaceCatalog.Prefix ? (_prefixPanel.IsOpen ? _prefixPanel.Drawn : null) + : _drawnModels.TryGetValue((surface, key), out var model) ? model : null; + + /// A click on a header link, as the header's own handler receives it. + internal void SimulateHeaderLink(string url) => OnChromeLinkClicked(url); + + /// The notice on the status row right now, as markup, or null; for a test comparing two paths' outcomes. + internal string? LastNotice => _notice; + + /// Each session's walk — under way or not, and the rooms still ahead — for a test comparing two paths. + internal string WalkState => string.Join( + ";", + _recorders.Select(r => (r.Key.SessionKey, r.Value)) + .Concat(_demoMap is null ? [] : [(DemoScene.ActiveSessionKey, _demoMap)]) + .Select(r => $"{r.Item1}:{r.Item2.Walk.IsWalking}:{string.Join('/', r.Item2.Walk.RoomsAhead)}") + .Order(StringComparer.Ordinal)); + + /// Types into the open cell palette, as if it had been keyed in. + internal void SimulateCellPaletteQuery(string query) => _palette.SetQuery(query); + + /// + /// Types into the open cell palette and commits the entry with , as + /// arrows and ⏎ would. False when the palette is closed or does not list it. + /// + internal bool SimulateCellPaletteChoice(string query, string id) + { + if (!_palette.IsOpen) + { + return false; + } + + _palette.SetQuery(query); + return _palette.Choose(id); + } +} diff --git a/src/SharpMUTerm.Tui/PrefixOverlay.cs b/src/SharpMUTerm.Tui/PrefixOverlay.cs index 20ba88b1..00eeec1a 100644 --- a/src/SharpMUTerm.Tui/PrefixOverlay.cs +++ b/src/SharpMUTerm.Tui/PrefixOverlay.cs @@ -67,6 +67,9 @@ public PrefixOverlay(ConsoleWindowSystem system, Func facts, Action /// What the panel is showing — or would show if it opened now — for a headless test to read. internal IReadOnlyList Lines => PrefixPanel.Render(Current); + /// The model the panel was last opened with, for the surface parity test. + internal SharpMUTerm.Client.Chrome.HeaderPrefix? Drawn { get; private set; } + /// The keymap it is drawing, or would draw, availability and all. internal IReadOnlyList Entries => PrefixPanel.Entries(Current); @@ -79,7 +82,8 @@ public void Open() } _current = _facts(); - var lines = PrefixPanel.Render(_current); + Drawn = PrefixPanel.Model(_current); + var lines = PrefixPanel.Render(Drawn); // Hug the content, the way QuitOverlay does. Centred *after* WithSize, because the builder reads // the bounds set so far and falls back to 80x25 otherwise. diff --git a/src/SharpMUTerm.Tui/PrefixPanel.cs b/src/SharpMUTerm.Tui/PrefixPanel.cs index 7664b4dd..5bc803da 100644 --- a/src/SharpMUTerm.Tui/PrefixPanel.cs +++ b/src/SharpMUTerm.Tui/PrefixPanel.cs @@ -170,9 +170,19 @@ internal static IReadOnlyList Entries(PrefixFacts facts) /// The whole panel as markup lines: one row per command, dimmed with its reason where it cannot run, /// then the footer naming the way out. /// - internal static List Render(PrefixFacts facts) + /// + /// The keymap as the shared model both hosts draw: the cell panel here, the window's native header while ⌃B is + /// armed (). + /// + internal static SharpMUTerm.Client.Chrome.HeaderPrefix Model(PrefixFacts facts) => + new([.. Entries(facts).Select(e => new SharpMUTerm.Client.Chrome.HeaderPrefixKey(e.Keys, e.Title, e.Blocked))], Footer); + + internal static List Render(PrefixFacts facts) => Render(Model(facts)); + + /// Builds the panel's lines from and nothing else. + internal static List Render(SharpMUTerm.Client.Chrome.HeaderPrefix model) { - var entries = Entries(facts); + var entries = model.Keys; var keyColumn = entries.Max(e => e.Keys.Length); var titleColumn = entries.Max(e => e.Title.Length); @@ -192,7 +202,7 @@ internal static List Render(PrefixFacts facts) } lines.Add(string.Empty); - lines.Add($" [{Label}]{Escape(Footer)}[/]"); + lines.Add($" [{Label}]{Escape(model.Exit)}[/]"); return lines; } diff --git a/src/SharpMUTerm.Tui/RailRenderer.cs b/src/SharpMUTerm.Tui/RailRenderer.cs index 1da5ddc2..fe03f7cf 100644 --- a/src/SharpMUTerm.Tui/RailRenderer.cs +++ b/src/SharpMUTerm.Tui/RailRenderer.cs @@ -1,4 +1,5 @@ using SharpConsoleUI.Parsing; +using SharpMUTerm.Client.Chrome; using SharpMUTerm.Core.Text; using SharpMUTerm.Core.Workspaces; using static SharpMUTerm.Tui.MarkupText; @@ -19,6 +20,16 @@ namespace SharpMUTerm.Tui; /// internal static class RailRenderer { + /// + /// The sidebar's cells, drawn from the model the window's native sidebar is drawn from: the collapsed strip + /// when the model says collapsed, else the full rail fitted to . + /// + public static List Render(SidebarModel model, int maxWidth, ChromeInk? ink) + { + ArgumentNullException.ThrowIfNull(model); + var rows = model.Rows(); + return model.Collapsed ? RenderCollapsed(rows, ink) : Render(rows, maxWidth, ink); + } /// The rail's rows, as projects them. /// diff --git a/src/SharpMUTerm.Tui/ScreenField.cs b/src/SharpMUTerm.Tui/ScreenField.cs index 7df78259..5e9435f2 100644 --- a/src/SharpMUTerm.Tui/ScreenField.cs +++ b/src/SharpMUTerm.Tui/ScreenField.cs @@ -768,7 +768,7 @@ internal static ScreenField Enumeration(string label, Func get, Ac /// /// Names the binding already holding a descriptor, or null when it is free. internal static ScreenField Key( - string label, Func get, Action set, Func taken) + HostKeys keys, string label, Func get, Action set, Func taken) { ArgumentNullException.ThrowIfNull(get); ArgumentNullException.ThrowIfNull(set); @@ -777,7 +777,7 @@ internal static ScreenField Key( return new ScreenField( label, get, - value => MacroKeys.Verdict(value) is { Fires: false } verdict ? verdict.Reason : taken(value), + value => MacroKeys.Verdict(keys, value) is { Fires: false } verdict ? verdict.Reason : taken(value), value => set(MacroKey.Canonicalise(value) ?? value.Trim()), Capture: true); } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs index b564e791..3747e134 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs @@ -97,7 +97,7 @@ private IWindowControl NewWhoHerePanel(TerminalPanelContext context) IReadOnlyList drawn = []; var view = NewPanelView(context, (width, height) => { - var model = ReadWhoHere(context.SessionKey); + var model = Drawing(PanelIds.WhoHere, context.WindowId, ReadWhoHere(context.SessionKey)); drawn = model.Rows; return WhoHereRenderer.Render(model, width, height, new WhoHereRenderer.Ink(_ink.Accent)); }); @@ -178,7 +178,7 @@ private IWindowControl NewVitalsPanel(TerminalPanelContext context) return ["[dim]No vitals: this character is not connected.[/]"]; } - var strip = VitalsStripRenderer.Render(vitals, width, VitalsInk()); + var strip = VitalsStripRenderer.Render(Drawing(PanelIds.Vitals, context.WindowId, vitals), width, VitalsInk()); return [strip.Length > 0 ? strip : "[dim]No vitals yet — the game has sent none of the meters F7 names.[/]"]; }); @@ -222,13 +222,17 @@ private IWindowControl NewQuickBarPanel(TerminalPanelContext context) IReadOnlyList drawn = []; var view = NewPanelView(context, (width, _) => { - var model = QuickBarEntries(context.SessionKey); + var model = Drawing(PanelIds.QuickBar, context.WindowId, QuickBarEntries(context.SessionKey)); drawn = model.Items; return [QuickBarRenderer.Render(model, width, _ink.Accent)]; }); view.Click = url => { - if (QuickBarRenderer.ParseLink(url) is { } index && index < drawn.Count) + if (url == QuickBarRenderer.EditLink) + { + DispatchCommand(QuickBarModel.EditCommand); + } + else if (QuickBarRenderer.ParseLink(url) is { } index && index < drawn.Count) { RunQuickMacro(context.SessionKey, drawn[index].Descriptor); } @@ -244,7 +248,7 @@ internal QuickBarModel QuickBarEntries(string sessionKey) { if (FindSession(sessionKey) is { } session) { - return QuickBarRenderer.Entries(session.Macros.Macros, session.Macros.Resolve); + return QuickBarRenderer.Entries(Host.Keys, session.Macros.Macros, session.Macros.Resolve); } if (FindCharacter(sessionKey) is not { } found) @@ -253,7 +257,7 @@ internal QuickBarModel QuickBarEntries(string sessionKey) } var macros = _config.ResolveTriggerSets(found.Character, found.World).SelectMany(s => s.Macros).ToList(); - return QuickBarRenderer.Entries(macros, key => macros.FirstOrDefault( + return QuickBarRenderer.Entries(Host.Keys, macros, key => macros.FirstOrDefault( m => string.Equals(MacroKey.Canonicalise(m.Key), key, StringComparison.OrdinalIgnoreCase)) is { Enabled: true } m ? m : null); } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 3dbf8201..e7f81a73 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -2,6 +2,7 @@ using Microsoft.Extensions.Logging; using SharpMUTerm.Client.Chrome; using SharpMUTerm.Client.Palette; +using SharpMUTerm.Client.Surfaces; using SharpMUTerm.Core.Commands; using SharpMUTerm.Core.Automation; using SharpMUTerm.Core.Configuration; @@ -7508,10 +7509,11 @@ private ScreenBinding AliasesScreen() private ScreenBinding KeypadScreen() { var session = new SettingsSession(selection => - KeypadScreenRenderer.Model(Macros(), _config.TriggerSets, selection.SelectionIn(0)), + KeypadScreenRenderer.Model(Host.Keys, Macros(), _config.TriggerSets, selection.SelectionIn(0)), SaveConfiguration); return new ScreenBinding(session, () => KeypadScreenView.Build( + Host.Keys, Macros(), _config.TriggerSets, session.Selection.SelectionIn(0), @@ -8083,7 +8085,7 @@ private CommandContext CommandState() Sound: CanPlaySound ? !_muted : null, Announced: Host.Announcer is null ? null : IsAnnounced(ActiveWindowId()), OutputSelected: HasOutputSelection, - KeyClashes: KeyClashes.Count(Macros())); + KeyClashes: KeyClashes.Count(Host.Keys, Macros())); } /// @@ -8472,6 +8474,9 @@ private bool RunBuiltInCommand(string id) case "layout:next-tab": NextWindow(); // refuses out loud on a pane with one tab, the same as the chord does return true; + case "layout:toggle-rail": + ToggleRail(); // ⌃B b's fold, and the window sidebar's fold button + return true; case "term:newline": // The same edit Alt+⏎ makes, through the same key table, so the surface cannot drift from // the chord it advertises. @@ -8872,10 +8877,13 @@ private void RenderMap(string windowId) return; } + // One model per drawing, and the window's native map is handed this same instance (MapViewFor), so the two + // cannot disagree about where the character is, which level is shown or whether a walk is under way. var walking = map.Walk.IsWalking ? $"walking, {map.Walk.Remaining} to go" : null; + var view = Drawing(Core.Layouts.PanelIds.Map, windowId, SharpMUTerm.Client.Panels.MapViewModel.From(map.Map, map.Recorder.CurrentRoomId, map.Walk.RoomsAhead, walking)); + _mapViews[windowId] = (_mapRevisions[windowId], view); var ink = new MapRenderer.Ink(_ink.Accent, _ink.Accent, _ink.Notice, _ink.Draft); - var lines = MapRenderer.Render( - map.Map, map.Recorder.CurrentRoomId, map.Walk.RoomsAhead, width, height, ink, walking); + var lines = MapRenderer.Render(view, map.Map, width, height, ink); _mapMarkup[windowId] = lines; control.SetContent(lines.ToList()); } @@ -10619,10 +10627,7 @@ private void RefreshPaneFocus() /// private List RenderRailLines() { - var rows = BuildRail(); - return _railCollapsed - ? RailRenderer.RenderCollapsed(rows, _ink) - : RailRenderer.Render(rows, RailMaxWidth - RailMargin, _ink); + return RailRenderer.Render(Drawing(SurfaceCatalog.Sidebar, string.Empty, BuildSidebar()), RailMaxWidth - RailMargin, _ink); } /// @@ -11946,7 +11951,7 @@ private void SplitFocusedPane(PaneCommand command) // The focused window's session, not _active: a macro key is a keystroke, and a keystroke may not // reach a world other than the one whose pane is focused (see SendTarget). A pane with no // connection fires no macro and the key falls through the rest of the chain unclaimed. - if (SendTarget() is not { } session || MacroKeys.Descriptor(key) is not { } descriptor) + if (SendTarget() is not { } session || MacroKeys.Descriptor(Host.Keys, key) is not { } descriptor) { return null; } @@ -13402,17 +13407,15 @@ internal HeaderModel BuildHeaderModel() HeaderLogFormat(), _prefixArmed) { - Prefix = _prefixArmed - ? new HeaderPrefix( - [.. PrefixPanel.Entries(PrefixFactsNow()).Select(e => new HeaderPrefixKey(e.Keys, e.Title, e.Blocked))], - "Esc cancels") - : null, + Prefix = _prefixArmed ? PrefixPanel.Model(PrefixFactsNow()) : null, }; } /// The header row's markup, drawn from and nothing else it could disagree with. private string HeaderMarkup(HeaderModel model) { + Drawing(SurfaceCatalog.Header, string.Empty, model); + // The menu affordance opens the command surface (caret flips to ▾ while it's open). The whole // identity cluster is a powerline ribbon — menu ▸ world ▸ character — flowing accent colours. var caret = model.MenuOpen ? "▾" : Glyphs.Menu; diff --git a/tests/SharpMUTerm.Avalonia.Tests/DesktopLayerTests.cs b/tests/SharpMUTerm.Avalonia.Tests/DesktopLayerTests.cs index 5fbaa577..12a3e0f6 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/DesktopLayerTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/DesktopLayerTests.cs @@ -71,7 +71,7 @@ public async Task TheLayoutsMenuIsTheLayoutLibraryWithTheOneInUseChecked() await using var app = InlineWindowApp(driver); app.RenderSnapshot("layout-combat"); - var items = app.LayoutsMenuItems(); + var items = app.OfferLayoutsMenu().Entries; var labels = items.Where(i => !i.IsSeparator).Select(i => i.Label).ToArray(); await Assert.That(labels).Contains("Roleplay"); await Assert.That(labels).Contains("Combat"); @@ -83,9 +83,12 @@ public async Task TheLayoutsMenuIsTheLayoutLibraryWithTheOneInUseChecked() await Assert.That(items.Single(i => i.Checked).Label).IsEqualTo("Combat"); // Choosing an entry runs the command, through the registry, that the ⌥M list's ⏎ runs. - items.Single(i => i.Label == "Roleplay").Run(); + await Assert.That(app.RunLayoutsMenuEntry(items.Single(i => i.Label == "Roleplay").Command!)).IsTrue(); await Assert.That(app.LiveLayoutId).IsEqualTo(BuiltInLayouts.RoleplayId); - await Assert.That(app.LayoutsMenuItems().Single(i => i.Checked).Label).IsEqualTo("Roleplay"); + await Assert.That(app.LayoutsMenu().Entries.Single(i => i.Checked).Label).IsEqualTo("Roleplay"); + + // A command the menu did not offer is refused: the window chooses an entry, it never names a command. + await Assert.That(app.RunLayoutsMenuEntry("term:quit")).IsFalse(); } [Test] @@ -120,7 +123,7 @@ public async Task ThePressOnTheLayoutsButtonNeverReachesTheClientAndOpensTheClie Offer(driver, show => { asked++; - show([new PointerMenuItem("Combat", null, () => { }, Checked: true), PointerMenuItem.Separator, new PointerMenuItem("Manage layouts…", "⌥M", () => { })]); + show(new MenuModel([new MenuEntry("Combat", null, "layout:lib:apply:combat", Checked: true), MenuEntry.Separator, new MenuEntry("Manage layouts…", "⌥M", LayoutCommands.Manage)])); }); var clientSaw = new List>(); driver.MouseEvent += (_, flags, _) => clientSaw.Add(flags); @@ -319,9 +322,9 @@ internal static SharpMUTermApp InlineWindowApp(AvaloniaConsoleDriver driver) => RunsInline = true, }); - private static void Offer(AvaloniaConsoleDriver driver, Action>> menu) + private static void Offer(AvaloniaConsoleDriver driver, Action> menu, Action? dispatch = null) { - ((IPointerPresenter)driver.Pointer).HeaderActions([new HeaderAction(HeaderAction.LayoutsId, "Layouts", "⌥M", menu)]); + ((IPointerPresenter)driver.Pointer).HeaderActions([new HeaderAction(HeaderAction.LayoutsId, "Layouts", "⌥M", menu, dispatch ?? (_ => { }))]); Drain(); } diff --git a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs new file mode 100644 index 00000000..ad1fa43e --- /dev/null +++ b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs @@ -0,0 +1,467 @@ +using System.Reflection; +using Avalonia.Controls; +using Avalonia.Input; +using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Client.Commands; +using SharpMUTerm.Client.Palette; +using SharpMUTerm.Client.Panels; +using SharpMUTerm.Client.Settings; +using SharpMUTerm.Client.Surfaces; +using SharpMUTerm.Core.Automation; +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Layouts; +using SharpMUTerm.Tui; +using SharpMUTerm.Tui.Panels; + +namespace SharpMUTerm.Avalonia.Tests; + +/// +/// The window's half of the surface catalog (): every native view the window draws is a +/// declared surface, is handed that surface's model, is handed the very model the cells drew in the same frame, and +/// every click on it ends where the matching cell click ends. The terminal's half is SurfaceCellTests. +/// +[NotInParallel] +public class SurfaceParityTests +{ + /// Controls of the window that are the window itself rather than a surface of the client's. + private static readonly HashSet Infrastructure = [typeof(TerminalView), typeof(DesktopLayer), typeof(MainWindow)]; + + private static readonly Assembly Window = typeof(DesktopLayer).Assembly; + + // ── every native view is declared ──────────────────────────────────────────────────────────── + + /// + /// A control the window draws over the cells that no surface declares is a view nobody holds to the cells: it + /// can say what it likes. Found by reflection, so a new one fails here until it is declared. + /// + [Test] + public async Task EveryNativeViewIsADeclaredSurface() + { + var declared = SurfaceCatalog.All.SelectMany(s => s.NativeViews).ToHashSet(StringComparer.Ordinal); + var views = Window.GetTypes() + .Where(t => typeof(Control).IsAssignableFrom(t) && !t.IsAbstract && !Infrastructure.Contains(t)) + .Where(t => !t.IsNested) + .ToList(); + + await Assert.That(views.Count).IsGreaterThan(5).Because("the scan still finds the window's views"); + foreach (var view in views) + { + await Assert.That(declared).Contains(view.FullName!).Because($"{view.Name} draws over the cells and no surface declares it"); + } + + foreach (var name in declared) + { + await Assert.That(Window.GetType(name)).IsNotNull().Because($"{name} is declared and is not a type in the window"); + } + } + + /// + /// Some native view of each surface is handed the surface's model — as a parameter, or inside what it is handed + /// (a property, a list, or a method of it that returns the model) — never state of its own. + /// + [Test] + public async Task ANativeViewOfEachSurfaceReceivesItsModel() + { + foreach (var surface in SurfaceCatalog.All.Where(s => s.HasNative)) + { + var takes = surface.NativeViews + .Select(Window.GetType) + .OfType() + .SelectMany(t => t.GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static) + .Cast() + .Concat(t.GetConstructors(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance))) + .SelectMany(m => m.GetParameters()) + .Any(p => Carries(p.ParameterType, surface.Model)); + await Assert.That(takes).IsTrue().Because($"{surface.Id}: no view of it is handed a {surface.Model.Name}"); + } + } + + private static bool Carries(Type type, Type model) => + type == model + || type.GetProperties().Any(p => p.PropertyType == model || typeof(IEnumerable<>).MakeGenericType(model).IsAssignableFrom(p.PropertyType)) + || type.GetMethods(BindingFlags.Public | BindingFlags.Instance).Any(m => m.ReturnType == model); + + // ── the native model is the model the cells drew ───────────────────────────────────────────── + + /// + /// What the window was told in a frame is what the cells were drawn from in that frame: every panel overlay, the + /// header and the sidebar, the settings window's sections, the Layouts menu and ⌃P. A native view built from a + /// model of its own would fail here before it showed something the terminal does not. + /// + [Test] + public async Task NativeModelsAreTheModelsTheCellsDrew() + { + var covered = new HashSet(StringComparer.Ordinal); + + foreach (var view in new[] { "layout-combat", "layout-roleplay" }) + { + using var driver = new AvaloniaConsoleDriver(140, 36); + await using var app = App(driver, DemoScene.Build()); + app.RenderSnapshot(view); + + foreach (var panel in driver.Pointer.Panels) + { + object? model = (object?)panel.Vitals ?? (object?)panel.Map ?? (object?)panel.WhoHere ?? panel.QuickBar; + if (model is null) + { + continue; + } + + await Assert.That(app.DrawnModel(panel.PanelId, panel.WindowId)).IsEqualTo(model).Because($"{view}: {panel.PanelId}"); + covered.Add(panel.PanelId); + } + + var chrome = driver.Pointer.Chrome; + await Assert.That(chrome).IsNotNull(); + await Assert.That(app.DrawnModel(SurfaceCatalog.Header)).IsEqualTo(chrome!.HeaderModel).Because($"{view}: header"); + await Assert.That(app.DrawnModel(SurfaceCatalog.Sidebar)).IsEqualTo(chrome.Sidebar).Because($"{view}: sidebar"); + covered.Add(SurfaceCatalog.Header); + covered.Add(SurfaceCatalog.Sidebar); + + // The Layouts button's menu is the one the ⌥M commands answer for. + MenuModel? offered = null; + driver.Pointer.Actions.Single(a => a.Id == HeaderAction.LayoutsId).Menu(m => offered = m); + await Assert.That(offered).IsEqualTo(app.LayoutsMenu()).Because($"{view}: layouts menu"); + covered.Add(SurfaceCatalog.LayoutsMenu); + } + + // Settings: the window is handed the sections F7 and F8's cells are drawn from. + { + using var driver = new AvaloniaConsoleDriver(140, 36); + var settings = new FakeSettings(); + await using var app = App(driver, DemoScene.Build(), settings: settings); + app.RenderSnapshot(null); + await Assert.That(app.DispatchCommand("screen:input")).IsTrue(); + await Assert.That(settings.Form).IsNotNull().Because("F8 opens the native settings window"); + await Assert.That(settings.Form!.Sections.SequenceEqual(app.Contributions.SettingsSections.Ordered)).IsTrue(); + covered.Add(SurfaceCatalog.Settings); + } + + // ⌃P: the native palette's rows for a query are the cell palette's rows for it. + foreach (var query in new[] { string.Empty, "split", "tog tim" }) + { + using var nativeDriver = new AvaloniaConsoleDriver(140, 36); + var palette = new FakePalette(); + await using var native = App(nativeDriver, DemoScene.Build(), palette: palette); + native.RenderSnapshot(null); + native.OpenMenu(); + await Assert.That(palette.Session).IsNotNull(); + + using var cellDriver = new AvaloniaConsoleDriver(140, 36); + await using var cells = App(cellDriver, DemoScene.Build()); + cells.RenderSnapshot(null); + cells.OpenMenu(); + cells.SimulateCellPaletteQuery(query); + + var drawn = (PaletteView?)cells.DrawnModel(SurfaceCatalog.Palette); + await Assert.That(drawn).IsNotNull(); + await Assert.That(Rows(palette.Session!.View(query))).IsEquivalentTo(Rows(drawn!), TUnit.Assertions.Enums.CollectionOrdering.Matching) + .Because($"query '{query}'"); + } + + covered.Add(SurfaceCatalog.Palette); + + // ⌃B armed: the window's header lists the keymap the cell panel draws. + { + using var driver = new AvaloniaConsoleDriver(140, 36); + await using var app = App(driver, DemoScene.Build()); + app.RenderSnapshot("prefix-panel"); + var prefix = driver.Pointer.Chrome?.HeaderModel.Prefix; + await Assert.That(prefix).IsNotNull().Because("the native header shows the armed keymap"); + await Assert.That(app.DrawnModel(SurfaceCatalog.Prefix)).IsEqualTo(prefix).Because("prefix"); + covered.Add(SurfaceCatalog.Prefix); + } + + // The folded rail: the window's strip is drawn from the sidebar model the cells drew folded. + { + using var driver = new AvaloniaConsoleDriver(140, 36); + await using var app = App(driver, DemoScene.Build()); + app.RenderSnapshot(null); + await Assert.That(app.DispatchCommand("layout:toggle-rail")).IsTrue(); + app.RenderSnapshot(null); + var sidebar = driver.Pointer.Chrome!.Sidebar; + await Assert.That(sidebar.Collapsed).IsTrue(); + await Assert.That(app.DrawnModel(SurfaceCatalog.Sidebar)).IsEqualTo(sidebar).Because("rail-strip"); + covered.Add(SurfaceCatalog.RailStrip); + } + + var drawnNatively = SurfaceCatalog.All.Where(s => s.On(SurfaceHosts.Window).HasFlag(SurfaceDrawing.Native)).Select(s => s.Id); + await Assert.That(covered).IsEquivalentTo(drawnNatively).Because("every surface the window draws natively has its model compared here"); + } + + private static string[] Rows(PaletteView view) => + view.Rows.Select(r => r is PaletteHeader h ? "# " + h.Label : ((PaletteEntry)r).Item.Id + " " + ((PaletteEntry)r).Item.Key).ToArray(); + + // ── a native action ends where the cell action ends ────────────────────────────────────────── + + /// + /// For each surface, its native action and the matching cell click are run on two clients built alike, and the + /// client's state after each is the same — and is not the state before, so a path that does nothing on both + /// sides does not pass. + /// + [Test] + public async Task ANativeActionEndsWhereTheCellActionEnds() + { + var probed = new HashSet(StringComparer.Ordinal); + + // Header: the search box opens ⌃P; the ☰ link does too. The character click is the sidebar's. + await Same("header: palette", "layout-combat", + (app, _) => app.ActivateChromeTarget(HeaderModel.PaletteTarget), + (app, _) => app.SimulateHeaderLink(HeaderModel.PaletteTarget)); + await Same("header: character", "layout-combat", + (app, _) => app.ActivateChromeTarget(app.BuildChromeOverlay().HeaderModel.Character!.Target), + (app, _) => app.DispatchRailTarget(app.BuildChromeOverlay().HeaderModel.Character!.Target)); + probed.Add(SurfaceCatalog.Header); + + // Sidebar: a window row, and Add a game (⌃P ▸ Welcome in cells). + await Same("sidebar: window", "layout-combat", + (app, _) => app.ActivateChromeTarget(OtherWindow(app)), + (app, _) => app.DispatchRailTarget(OtherWindow(app))); + await Same("sidebar: add a game", "layout-combat", + (app, _) => app.ActivateChromeTarget(SidebarModel.AddGameTarget), + (app, _) => app.DispatchCommand(SidebarModel.AddGameTarget)); + probed.Add(SurfaceCatalog.Sidebar); + + // The folded rail: the strip's fold button, and the ⌃P command beside ⌃B b. + await Same("rail-strip: fold", "layout-combat", + (app, _) => app.ActivateChromeTarget(SidebarModel.CollapseTarget), + (app, _) => app.DispatchCommand("layout:toggle-rail")); + probed.Add(SurfaceCatalog.RailStrip); + + // Map: a room clicked on the canvas and the same room's cell link. + await Same("map: walk", "layout-combat", + (app, d) => Panel(d, PanelIds.Map).WalkTo!(OtherRoom(Panel(d, PanelIds.Map).Map!)), + (app, d) => app.SimulateMapClick(Panel(d, PanelIds.Map).WindowId, MapRenderer.LinkPrefix + OtherRoom(Panel(d, PanelIds.Map).Map!))); + probed.Add(PanelIds.Map); + + // Who is here: the first row. + await Same("who-here: pick", "layout-roleplay", + (app, d) => Panel(d, PanelIds.WhoHere).Pick!(0), + (app, d) => app.SimulatePanelClick(Panel(d, PanelIds.WhoHere).WindowId, WhoHereRenderer.LinkPrefix + "0")); + probed.Add(PanelIds.WhoHere); + + // Quick bar: the first key, and "F4 edits keys". + await Same("quick-bar: pick", "layout-combat", + (app, d) => Panel(d, PanelIds.QuickBar).Pick!(0), + (app, d) => app.SimulatePanelClick(Panel(d, PanelIds.QuickBar).WindowId, QuickBarRenderer.LinkPrefix + "0")); + await Same("quick-bar: edit", "layout-combat", + (app, d) => Panel(d, PanelIds.QuickBar).Dispatch!(QuickBarModel.EditCommand), + (app, d) => app.SimulatePanelClick(Panel(d, PanelIds.QuickBar).WindowId, QuickBarRenderer.EditLink)); + probed.Add(PanelIds.QuickBar); + + // Layouts: choosing Roleplay in the menu, and running the ⌥M list's command for it. + await Same("layouts-menu: apply", "layout-combat", + (app, d) => + { + var action = d.Pointer.Actions.Single(a => a.Id == HeaderAction.LayoutsId); + MenuModel? menu = null; + action.Menu(m => menu = m); + action.Dispatch(menu!.Entries.Single(e => e.Label == "Roleplay").Command!); + }, + (app, _) => app.DispatchCommand(LayoutCommands.Apply(BuiltInLayouts.RoleplayId))); + probed.Add(SurfaceCatalog.LayoutsMenu); + + // Settings: resetting a changed field in the window, and r on the same field of F8's cells. + { + var (nativeEcho, nativeSaves) = SettingsReset(native: true); + var (cellEcho, cellSaves) = SettingsReset(native: false); + await Assert.That(nativeEcho).IsTrue(); + await Assert.That(nativeEcho).IsEqualTo(cellEcho); + await Assert.That(nativeSaves).IsEqualTo(cellSaves).Because("both go through the one save funnel, once"); + probed.Add(SurfaceCatalog.Settings); + } + + // ⌃P: an entry run from the native palette, and the same entry chosen in the cell palette. + { + using var nativeDriver = new AvaloniaConsoleDriver(140, 36); + var palette = new FakePalette(); + await using var native = App(nativeDriver, DemoScene.Build(), palette: palette); + native.RenderSnapshot(null); + var before = Outcome(native); + native.OpenMenu(); + palette.Session!.Run("layout:split-right"); + + using var cellDriver = new AvaloniaConsoleDriver(140, 36); + await using var cells = App(cellDriver, DemoScene.Build()); + cells.RenderSnapshot(null); + cells.OpenMenu(); + await Assert.That(cells.SimulateCellPaletteChoice("split right", "layout:split-right")).IsTrue(); + + await Assert.That(Outcome(native)).IsNotEqualTo(before); + await Assert.That(Outcome(native)).IsEqualTo(Outcome(cells)).Because("palette: run"); + probed.Add(SurfaceCatalog.Palette); + } + + var acting = SurfaceCatalog.All.Where(s => s.HasNative && s.Actions.Count > 0).Select(s => s.Id); + await Assert.That(probed).IsEquivalentTo(acting).Because("every native surface with actions has a probe here"); + } + + private static (bool Echo, int Saves) SettingsReset(bool native) + { + using var driver = new AvaloniaConsoleDriver(140, 36); + var config = DemoScene.Build(); + config.Input.LocalEcho = false; + var saves = 0; + var settings = native ? new FakeSettings() : null; + var app = App(driver, config, settings: settings, save: _ => saves++); + try + { + app.RenderSnapshot(null); + app.DispatchCommand("screen:input"); + if (settings is not null) + { + var form = settings.Form!; + var field = form.Section("input")!.Fields.First(f => f.Binding is not null && !form.IsDefault(f)); + form.Reset(field); + } + else + { + app.SimulateSettingsKey(new ConsoleKeyInfo('r', ConsoleKey.R, false, false, false)); + } + + return (config.Input.LocalEcho, saves); + } + finally + { + app.DisposeAsync().AsTask().GetAwaiter().GetResult(); + } + } + + private static async Task Same( + string probe, string view, Action native, Action cells) + { + using var nativeDriver = new AvaloniaConsoleDriver(140, 36); + await using var a = App(nativeDriver, DemoScene.Build()); + a.RenderSnapshot(view); + var before = Outcome(a); + native(a, nativeDriver); + + using var cellDriver = new AvaloniaConsoleDriver(140, 36); + await using var b = App(cellDriver, DemoScene.Build()); + b.RenderSnapshot(view); + cells(b, cellDriver); + + await Assert.That(Outcome(a)).IsNotEqualTo(before).Because($"{probe}: the native action did something"); + await Assert.That(Outcome(a)).IsEqualTo(Outcome(b)).Because(probe); + } + + /// Everything a surface's action can change, read off the client. + private static string Outcome(SharpMUTermApp app) => string.Join( + " | ", + "input=" + app.PrimaryInputText, + "window=" + app.ActiveWindowId(), + "panes=" + app.PaneIds.Count, + "menu=" + app.MenuIsOpen, + "screen=" + app.OpenSettingsKey, + "layout=" + app.LiveLayoutId, + "welcome=" + app.WelcomeIsOpen, + "quick=" + app.LastQuickMacro, + "walk=" + app.WalkState, + "rail=" + (app.BuildChromeOverlay().Sidebar.Collapsed ? "folded" : "open"), + "notice=" + app.LastNotice, + "recent=" + string.Join(",", app.RecentCommandIds)); + + private static PanelOverlay Panel(AvaloniaConsoleDriver driver, string id) => + driver.Pointer.Panels.First(p => p.PanelId == id); + + private static string OtherWindow(SharpMUTermApp app) + { + var sidebar = app.BuildChromeOverlay().Sidebar; + var selected = CommandIds.Window(app.ActiveWindowId()); + return sidebar.Targets().Last(t => t.StartsWith(CommandIds.Window(string.Empty), StringComparison.Ordinal) && t != selected); + } + + private static long OtherRoom(MapViewModel map) => + map.Rooms.First(r => !r.Current && r.Id != map.AnchorId).Id; + + // ── F4 and the quick bar, per host ────────────────────────────────────────────────────────── + + /// + /// The window's verdicts: ⌃3 arrives here and fires, ⌥⏎ is the window's (it maximises) and never reaches a macro; + /// a macro on ⌃3 runs from the key path and F4 does not mark it dead. + /// + [Test] + public async Task F4TellsTheWindowsTruth() + { + await Assert.That(MacroKeys.Verdict(WindowHost.Keys, "Ctrl+3").Fires).IsTrue(); + await Assert.That(MacroKeys.Verdict(WindowHost.Keys, "Ctrl+Shift+Left").Fires).IsTrue(); + await Assert.That(MacroKeys.Verdict(WindowHost.Keys, "Alt+Enter").Delivery).IsEqualTo(MacroKeyDelivery.Taken); + await Assert.That(MacroKeys.Verdict(WindowHost.Keys, "Alt+Enter").Reason).Contains("maximises"); + await Assert.That(MacroKeys.Verdict(WindowHost.Keys, "Ctrl+Enter").Fires).IsFalse().Because("Ctrl+⏎ is the window's newline"); + + var config = DemoScene.Build(); + using var driver = new AvaloniaConsoleDriver(120, 34); + await using var app = App(driver, config); + app.BindWorldWithoutConnecting(config.Worlds[0]); + var macro = config.TriggerSets.SelectMany(s => s.Macros).Single(m => m.Key == "Ctrl+F1"); + macro.Key = "Ctrl+3"; + + var key = KeyMapper.FromKeyDown(Key.D3, KeyModifiers.Control); + await Assert.That(key).IsNotNull(); + await Assert.That(app.SimulateKey(key!.Value)).IsEqualTo("score"); + + var hotkeys = string.Join('\n', KeypadScreenRenderer.HotkeysColumn(app.Host.Keys, config.TriggerSets.SelectMany(s => s.Macros).ToList())); + await Assert.That(hotkeys).Contains("Ctrl+3"); + await Assert.That(hotkeys).DoesNotContain("▲ Ctrl+3"); + } + + /// The quick bar reads the host's keys: a chord the host keeps for itself is drawn as one that does not fire. + [Test] + public async Task TheQuickBarReadsTheHostsKeys() + { + var keeps = WindowHost.Keys with + { + Reserved = [.. WindowHost.Keys.Reserved, new ReservedChord(new HostChord(ConsoleKey.F1, ConsoleModifiers.Control, "Ctrl+F1", "Ctrl+F1"), "a test")], + }; + + using var driver = new AvaloniaConsoleDriver(120, 34); + await using var window = App(driver, DemoScene.Build(), keys: keeps); + using var plain = new AvaloniaConsoleDriver(120, 34); + await using var terminalKeys = App(plain, DemoScene.Build(), keys: HostKeys.Terminal); + + var kept = window.QuickBarEntries(DemoScene.ActiveSessionKey).Items.Single(i => i.Key == "⌃F1"); + var free = terminalKeys.QuickBarEntries(DemoScene.ActiveSessionKey).Items.Single(i => i.Key == "⌃F1"); + await Assert.That(kept.Fires).IsFalse(); + await Assert.That(free.Fires).IsTrue(); + } + + // ── helpers ────────────────────────────────────────────────────────────────────────────────── + + private static SharpMUTermApp App( + AvaloniaConsoleDriver driver, + AppConfiguration config, + INativeSettings? settings = null, + INativePalette? palette = null, + Action? save = null, + HostKeys? keys = null) => + new(config, WindowHost.Create(driver, clipboard: null) with + { + Capabilities = WindowOptions.Capabilities, + Audio = null, + Presence = null, + Announcer = null, + RunsInline = true, + NativeSettings = settings, + NativePalette = palette, + Keys = keys ?? WindowHost.Keys, + }, save: save); + + private sealed class FakeSettings : INativeSettings + { + public SettingsForm? Form { get; private set; } + + public void Show(SettingsForm form) => Form = form; + + public void Close() => Form = null; + } + + private sealed class FakePalette : INativePalette + { + public PaletteSession? Session { get; private set; } + + public void Show(PaletteSession session) => Session = session; + + public void Close() => Session = null; + } +} diff --git a/tests/SharpMUTerm.Client.Tests/SurfaceCatalogTests.cs b/tests/SharpMUTerm.Client.Tests/SurfaceCatalogTests.cs new file mode 100644 index 00000000..48856d14 --- /dev/null +++ b/tests/SharpMUTerm.Client.Tests/SurfaceCatalogTests.cs @@ -0,0 +1,101 @@ +using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Client.Surfaces; +using SharpMUTerm.Core.Layouts; + +namespace SharpMUTerm.Client.Tests; + +/// +/// The surface catalog's own rules (): each surface declared once, for every host, with a +/// Client model, and drawn somewhere a reader can reach. The window suite's SurfaceParityTests and the +/// terminal suite's SurfaceCellTests hold the hosts to what is declared here. +/// +public class SurfaceCatalogTests +{ + [Test] + public async Task EverySurfaceIsDeclaredOnceUnderAStableId() + { + var ids = SurfaceCatalog.All.Select(s => s.Id).ToList(); + await Assert.That(ids.Distinct(StringComparer.Ordinal).Count()).IsEqualTo(ids.Count); + await Assert.That(ids.All(id => id.Length > 0 && id == id.Trim() && id == id.ToLowerInvariant())).IsTrue(); + } + + [Test] + public async Task EverySurfaceSaysHowEachHostDrawsIt() + { + foreach (var surface in SurfaceCatalog.All) + { + await Assert.That(surface.Drawing.Keys.Order(StringComparer.Ordinal)) + .IsEquivalentTo(SurfaceHosts.All.Order(StringComparer.Ordinal)).Because(surface.Id); + } + } + + /// A terminal has nothing that can draw over a cell without taking it, so it draws nothing natively. + [Test] + public async Task TheTerminalDrawsNothingNatively() + { + foreach (var surface in SurfaceCatalog.All) + { + await Assert.That(surface.On(SurfaceHosts.Terminal).HasFlag(SurfaceDrawing.Native)).IsFalse().Because(surface.Id); + } + } + + [Test] + public async Task ANativeSurfaceNamesItsViewsAndACellSurfaceItsRenderer() + { + foreach (var surface in SurfaceCatalog.All) + { + await Assert.That(surface.HasNative).IsEqualTo(surface.NativeViews.Count > 0).Because(surface.Id); + await Assert.That(surface.HasCells).IsEqualTo(surface.CellRenderer is not null).Because(surface.Id); + + // Drawn in cells nowhere: the keyboard must reach the same actions, by a command. + if (!surface.HasCells) + { + await Assert.That(surface.KeyboardPath).IsNotNull().Because(surface.Id); + } + } + } + + /// The model is shared data, so it lives where both hosts can read it: Client or Core, never a UI type. + [Test] + public async Task EveryModelIsAClientOrCoreType() + { + var allowed = new[] { typeof(ContributionRegistry).Assembly, typeof(PanelIds).Assembly }; + foreach (var surface in SurfaceCatalog.All) + { + await Assert.That(allowed).Contains(surface.Model.Assembly).Because(surface.Id); + } + } + + /// A panel surface's id is the layout's panel id, so a published panel names its surface. + [Test] + public async Task PanelSurfacesAreKnownPanels() + { + var panels = SurfaceCatalog.All.Where(s => s.Id is not (SurfaceCatalog.Header or SurfaceCatalog.Sidebar + or SurfaceCatalog.Settings or SurfaceCatalog.LayoutsMenu or SurfaceCatalog.Palette + or SurfaceCatalog.Prefix or SurfaceCatalog.RailStrip)); + foreach (var surface in panels) + { + await Assert.That(PanelIds.Known).Contains(surface.Id); + } + } + + /// + /// A native view may offer a door the cells of the same surface do not; it must then say where the cells offer + /// it — another surface ending in the same method, or a command (a key, a ⌃P entry). + /// + [Test] + public async Task ANativeOnlyActionNamesWhereTheCellsOfferIt() + { + foreach (var surface in SurfaceCatalog.All) + { + foreach (var action in surface.Actions.Where(a => a.CellsVia is not null)) + { + var via = SurfaceCatalog.Find(action.CellsVia!); + var ok = via is not null + ? via.HasCells && via.Actions.Any(a => a.CellsVia is null && a.Reaches == action.Reaches) + : action.CellsVia!.Contains(':', StringComparison.Ordinal); + await Assert.That(ok).IsTrue().Because($"{surface.Id}: {action.Name} → {action.CellsVia}"); + } + } + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/AdvertisedKeyHonestyTests.cs b/tests/SharpMUTerm.Tui.Tests/AdvertisedKeyHonestyTests.cs index 5fb07416..838843dd 100644 --- a/tests/SharpMUTerm.Tui.Tests/AdvertisedKeyHonestyTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/AdvertisedKeyHonestyTests.cs @@ -308,7 +308,7 @@ public async Task AMacroOnACtrlArrowStillOutranksPaneNavigation() { foreach (var descriptor in new[] { "Ctrl+Left", "Ctrl+Right", "Ctrl+Up", "Ctrl+Down" }) { - await Assert.That(MacroKeys.Verdict(descriptor).Fires) + await Assert.That(MacroKeys.Verdict(HostKeys.Terminal, descriptor).Fires) .IsTrue() .Because($"F4 says a macro on {descriptor} fires, so pane navigation must not pre-empt it"); } diff --git a/tests/SharpMUTerm.Tui.Tests/ClientHostContractTests.cs b/tests/SharpMUTerm.Tui.Tests/ClientHostContractTests.cs index f405c5c8..96636e2e 100644 --- a/tests/SharpMUTerm.Tui.Tests/ClientHostContractTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/ClientHostContractTests.cs @@ -65,6 +65,7 @@ public async Task TheCatalogNamesTheHostsNewlineChord() { Newline = new HostChord(ConsoleKey.Enter, ConsoleModifiers.Control, "Ctrl+⏎", "Ctrl+Enter"), Reserved = [], + ReportsChordsWhole = false, }; await using var app = new SharpMUTermApp(DemoScene.Build(), ClientHost.Headless(driver, Caps) with { Keys = keys }); diff --git a/tests/SharpMUTerm.Tui.Tests/ConnectionKeysTests.cs b/tests/SharpMUTerm.Tui.Tests/ConnectionKeysTests.cs index 8e93888d..01eae0f8 100644 --- a/tests/SharpMUTerm.Tui.Tests/ConnectionKeysTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/ConnectionKeysTests.cs @@ -145,12 +145,12 @@ await Assert.That(MacroKeys.AppShortcuts.Any( s => s.Modifiers == ConsoleModifiers.Control && s.Key == ConsoleKey.D)) .IsFalse() .Because("a second key for one action is a duplicate row on every surface that lists chords"); - await Assert.That(MacroKeys.Verdict("Ctrl+D").Fires).IsTrue(); + await Assert.That(MacroKeys.Verdict(HostKeys.Terminal, "Ctrl+D").Fires).IsTrue(); // Which is what makes F4 honest about a macro bound to either of them. foreach (var descriptor in new[] { "Alt+D", "Alt+R" }) { - var verdict = MacroKeys.Verdict(descriptor); + var verdict = MacroKeys.Verdict(HostKeys.Terminal, descriptor); await Assert.That(verdict.Delivery).IsEqualTo(MacroKeyDelivery.Taken).Because(descriptor); await Assert.That(verdict.Reason).Contains(descriptor); } @@ -166,7 +166,7 @@ public async Task NeitherChordIsOneTheTerminalCannotReport() { foreach (var dead in new[] { "Ctrl+I", "Ctrl+M", "Ctrl+J", "Ctrl+H" }) { - await Assert.That(MacroKeys.Verdict(dead).Delivery) + await Assert.That(MacroKeys.Verdict(HostKeys.Terminal, dead).Delivery) .IsEqualTo(MacroKeyDelivery.NeverArrives) .Because($"{dead} collapses onto its ASCII byte — this is the list the new chords avoid"); } diff --git a/tests/SharpMUTerm.Tui.Tests/KeypadScreenRendererTests.cs b/tests/SharpMUTerm.Tui.Tests/KeypadScreenRendererTests.cs index 43ea9bbd..6f7ff135 100644 --- a/tests/SharpMUTerm.Tui.Tests/KeypadScreenRendererTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/KeypadScreenRendererTests.cs @@ -16,7 +16,7 @@ public class KeypadScreenRendererTests [Test] public async Task Render_NumpadCellShowsCommandBoundToNum5() { - var lines = KeypadScreenRenderer.Render(Scene()); + var lines = KeypadScreenRenderer.Render(HostKeys.Terminal, Scene()); var middleRow = lines.Single(l => l.Contains("[5]")); await Assert.That(middleRow).Contains("look"); } @@ -37,7 +37,7 @@ public async Task NumpadColumn_ColumnsAlignRegardlessOfBoundCommandLength() }; // Skip(1): the first entry is the "NUMPAD" caption, not a key row. - var offsets = KeypadScreenRenderer.NumpadColumn(macros).Skip(1).Select(CellOffsets).ToList(); + var offsets = KeypadScreenRenderer.NumpadColumn(HostKeys.Terminal, macros).Skip(1).Select(CellOffsets).ToList(); await Assert.That(offsets).Count().IsEqualTo(3); await Assert.That(offsets[1]).IsEqualTo(offsets[0]); @@ -67,7 +67,7 @@ private static string CellOffsets(string row) [Test] public async Task Render_UnboundNumpadCellShowsPlaceholder() { - var lines = KeypadScreenRenderer.Render(Scene()); + var lines = KeypadScreenRenderer.Render(HostKeys.Terminal, Scene()); var topRow = lines.Single(l => l.Contains("[7]")); await Assert.That(topRow).Contains("[dim]—[/]"); } @@ -75,7 +75,7 @@ public async Task Render_UnboundNumpadCellShowsPlaceholder() [Test] public async Task Render_HotkeyListShowsCtrlF1BindingCommandAndEnabledTick() { - var lines = KeypadScreenRenderer.Render(Scene()); + var lines = KeypadScreenRenderer.Render(HostKeys.Terminal, Scene()); var row = lines.Single(l => l.Contains("Ctrl+F1")); await Assert.That(row).Contains("ping"); await Assert.That(row).Contains("✓"); @@ -84,7 +84,7 @@ public async Task Render_HotkeyListShowsCtrlF1BindingCommandAndEnabledTick() [Test] public async Task Render_DisabledHotkeyShowsDimMarker() { - var lines = KeypadScreenRenderer.Render(Scene()); + var lines = KeypadScreenRenderer.Render(HostKeys.Terminal, Scene()); var row = lines.Single(l => l.Contains("Ctrl+F2")); await Assert.That(row).Contains("who"); await Assert.That(row).Contains("[dim]·[/]"); @@ -93,7 +93,7 @@ public async Task Render_DisabledHotkeyShowsDimMarker() [Test] public async Task Render_EmptyMacrosRendersGridWithNoHotkeys() { - var lines = KeypadScreenRenderer.Render(Array.Empty()); + var lines = KeypadScreenRenderer.Render(HostKeys.Terminal, Array.Empty()); await Assert.That(lines.Any(l => l.Contains("[5]") && l.Contains("[dim]—[/]"))).IsTrue(); await Assert.That(lines.Any(l => l.Contains("no hotkeys"))).IsTrue(); } @@ -101,7 +101,7 @@ public async Task Render_EmptyMacrosRendersGridWithNoHotkeys() [Test] public async Task Render_HeaderContainsF4AndTitle() { - var lines = KeypadScreenRenderer.Render(Scene()); + var lines = KeypadScreenRenderer.Render(HostKeys.Terminal, Scene()); await Assert.That(lines[0]).Contains("Keypad & hotkeys"); await Assert.That(lines[0]).Contains("F4"); } @@ -113,7 +113,7 @@ public async Task Render_EscapesMarkupBracketsInCommand() { new Macro { Name = "Weird", Key = "Ctrl+F9", Enabled = true, Command = "say [hi]" }, }; - var lines = KeypadScreenRenderer.Render(macros); + var lines = KeypadScreenRenderer.Render(HostKeys.Terminal, macros); var row = lines.Single(l => l.Contains("Ctrl+F9")); await Assert.That(row).Contains("say [[hi]]"); } diff --git a/tests/SharpMUTerm.Tui.Tests/MacroKeyCaptureTests.cs b/tests/SharpMUTerm.Tui.Tests/MacroKeyCaptureTests.cs index 0c0c9c7e..923296b6 100644 --- a/tests/SharpMUTerm.Tui.Tests/MacroKeyCaptureTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/MacroKeyCaptureTests.cs @@ -31,8 +31,7 @@ public class MacroKeyCaptureTests }; private static SettingsSession Session(IReadOnlyList sets) => - new(selection => KeypadScreenRenderer.Model( - sets.SelectMany(s => s.Macros).ToList(), sets, selection.SelectionIn(0))); + new(selection => KeypadScreenRenderer.Model(HostKeys.Terminal, sets.SelectMany(s => s.Macros).ToList(), sets, selection.SelectionIn(0))); private static ConsoleKeyInfo Chord(ConsoleKey key, bool ctrl = false, bool alt = false, bool shift = false) => new('\0', key, shift, alt, ctrl); @@ -96,7 +95,7 @@ private static void ArmCapture(SettingsSession session) [Arguments("Up", nameof(MacroKeyDelivery.Taken))] public async Task TheVerdictSaysWhatWillHappenToAChord(string descriptor, string expected) { - var verdict = MacroKeys.Verdict(descriptor); + var verdict = MacroKeys.Verdict(HostKeys.Terminal, descriptor); await Assert.That(verdict.Delivery.ToString()).IsEqualTo(expected).Because(descriptor); await Assert.That(verdict.Reason.Length > 0).IsEqualTo(expected != nameof(MacroKeyDelivery.Fires)) @@ -125,7 +124,7 @@ public async Task WhateverTheScreenCallsLiveIsWhatTheDispatcherActsOn() { var stroke = Chord(key, modifiers.ctrl, modifiers.alt, modifiers.shift); var captured = MacroKeys.Capture(stroke); - var dispatched = MacroKeys.Descriptor(stroke); + var dispatched = MacroKeys.Descriptor(HostKeys.Terminal, stroke); if (captured is null) { @@ -134,7 +133,7 @@ public async Task WhateverTheScreenCallsLiveIsWhatTheDispatcherActsOn() } await Assert.That(dispatched) - .IsEqualTo(MacroKeys.Verdict(captured).Fires ? captured : null) + .IsEqualTo(MacroKeys.Verdict(HostKeys.Terminal, captured).Fires ? captured : null) .Because(captured); } } @@ -154,7 +153,7 @@ await Assert.That(dispatched) public async Task ABindingThatCannotFireIsMarkedOnItsRowAndExplainedInTheFooter() { var macros = Sets()[0].Macros; - var rows = KeypadScreenRenderer.HotkeysColumn(macros); + var rows = KeypadScreenRenderer.HotkeysColumn(HostKeys.Terminal, macros); var dead = rows.Single(l => l.Contains("Num5", StringComparison.Ordinal)); await Assert.That(dead).Contains("▲"); @@ -166,9 +165,9 @@ public async Task ABindingThatCannotFireIsMarkedOnItsRowAndExplainedInTheFooter( await Assert.That(rows[0]).Contains("HOTKEYS"); await Assert.That(rows[0]).Contains("1 of 2 cannot fire"); - await Assert.That(KeypadScreenRenderer.FooterLine(macros, 120, new ScreenFocus(0, 0))) - .Contains(MacroKeys.Verdict("Num5").Reason); - await Assert.That(KeypadScreenRenderer.FooterLine(macros, 120, new ScreenFocus(0, 1))) + await Assert.That(KeypadScreenRenderer.FooterLine(HostKeys.Terminal, macros, 120, new ScreenFocus(0, 0))) + .Contains(MacroKeys.Verdict(HostKeys.Terminal, "Num5").Reason); + await Assert.That(KeypadScreenRenderer.FooterLine(HostKeys.Terminal, macros, 120, new ScreenFocus(0, 1))) .DoesNotContain("▲"); } @@ -177,7 +176,7 @@ public async Task ABindingThatCannotFireIsMarkedOnItsRowAndExplainedInTheFooter( public async Task AListOfLiveBindingsCarriesNoCaveatAtAll() { var macros = new List { new() { Name = "Score", Key = "Ctrl+F1", Command = "score" } }; - var rows = KeypadScreenRenderer.HotkeysColumn(macros); + var rows = KeypadScreenRenderer.HotkeysColumn(HostKeys.Terminal, macros); await Assert.That(rows[0]).DoesNotContain("▲"); await Assert.That(rows.Any(l => l.Contains("▲", StringComparison.Ordinal))).IsFalse(); @@ -191,10 +190,10 @@ public async Task AListOfLiveBindingsCarriesNoCaveatAtAll() [Test] public async Task TheNumpadGridSaysThatNothingReachesIt() { - var caption = KeypadScreenRenderer.NumpadColumn(Sets()[0].Macros)[0]; + var caption = KeypadScreenRenderer.NumpadColumn(HostKeys.Terminal, Sets()[0].Macros)[0]; await Assert.That(caption).Contains("NUMPAD"); - await Assert.That(caption).Contains(MacroKeys.Verdict("Num5").Reason); + await Assert.That(caption).Contains(MacroKeys.Verdict(HostKeys.Terminal, "Num5").Reason); } // ---- the capture mode ------------------------------------------------------------------------ @@ -209,7 +208,7 @@ public async Task TheNumpadGridSaysThatNothingReachesIt() public async Task TheBindingRowCarriesItsKeyAsACaptureField() { var sets = Sets(); - var model = KeypadScreenRenderer.Model(sets.SelectMany(s => s.Macros).ToList(), sets, 0); + var model = KeypadScreenRenderer.Model(HostKeys.Terminal, sets.SelectMany(s => s.Macros).ToList(), sets, 0); var row = model.RowAt(0, 0); await Assert.That(row.FieldCount).IsEqualTo(4); @@ -384,18 +383,18 @@ public async Task TheChromeOffersOnlyWhatACaptureActuallyAnswersTo() var focus = session.Focus(); var header = KeypadScreenRenderer.HeaderLine( - 120, KeypadScreenRenderer.Model(sets[0].Macros, sets, 0), focus); + 120, KeypadScreenRenderer.Model(HostKeys.Terminal, sets[0].Macros, sets, 0), focus); await Assert.That(header).Contains(ScreenChrome.CaptureHints); await Assert.That(header).DoesNotContain(ScreenChrome.EditingHints); await Assert.That(header).DoesNotContain(ScreenChrome.NextFieldHint); await Assert.That(Visible(header)).DoesNotContain("F4 close"); - var footer = KeypadScreenRenderer.FooterLine(sets[0].Macros, 120, focus); + var footer = KeypadScreenRenderer.FooterLine(HostKeys.Terminal, sets[0].Macros, 120, focus); await Assert.That(footer).Contains(ScreenChrome.BindAction); await Assert.That(footer).DoesNotContain(ScreenChrome.CommitAction); // And the field itself is a prompt, not a caret over a buffer there is no way to type into. - var row = KeypadScreenRenderer.HotkeysColumn(sets[0].Macros, focus) + var row = KeypadScreenRenderer.HotkeysColumn(HostKeys.Terminal, sets[0].Macros, focus) .Single(l => l.Contains(ScreenChrome.CapturePrompt, StringComparison.Ordinal)); await Assert.That(row).Contains("look"); } diff --git a/tests/SharpMUTerm.Tui.Tests/PaletteDiscoverabilityTests.cs b/tests/SharpMUTerm.Tui.Tests/PaletteDiscoverabilityTests.cs index 23398365..ec4d5da1 100644 --- a/tests/SharpMUTerm.Tui.Tests/PaletteDiscoverabilityTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/PaletteDiscoverabilityTests.cs @@ -96,7 +96,7 @@ private static Macro M(string key, string command = "x", string name = "") => public async Task AGlobalShortcutWins_AndSaysSo() { var f2 = M("F2"); - var clash = KeyClashes.For(f2, [f2]); + var clash = KeyClashes.For(HostKeys.Terminal, f2, [f2]); await Assert.That(clash?.Kind).IsEqualTo(KeyClashKind.ClientWins); await Assert.That(clash!.Value.Reason).Contains("the client wins"); await Assert.That(clash.Value.BindingRuns).IsFalse(); @@ -106,13 +106,13 @@ public async Task AGlobalShortcutWins_AndSaysSo() public async Task AChordTheWindowTakesAfterTheMacrosIsTheBindingsAndAWarning() { var copy = M("Ctrl+C"); - var clash = KeyClashes.For(copy, [copy]); + var clash = KeyClashes.For(HostKeys.Terminal, copy, [copy]); await Assert.That(clash?.Kind).IsEqualTo(KeyClashKind.BindingWins); await Assert.That(clash!.Value.BindingRuns).IsTrue(); await Assert.That(clash.Value.Reason).Contains("no longer copies the selection"); // Verdict agrees that the binding fires: the warning is not a second opinion on deliverability. - await Assert.That(MacroKeys.Verdict("Ctrl+C").Fires).IsTrue(); + await Assert.That(MacroKeys.Verdict(HostKeys.Terminal, "Ctrl+C").Fires).IsTrue(); } [Test] @@ -121,23 +121,23 @@ public async Task TwoBindingsOnOneChord_TheFirstAnswers_EvenDisabled() var first = M("F11", name: "north"); first.Enabled = false; var second = M("F11", name: "south"); - await Assert.That(KeyClashes.For(second, [first, second])?.Kind).IsEqualTo(KeyClashKind.Shadowed); - await Assert.That(KeyClashes.For(second, [first, second])!.Value.Reason).Contains("north holds F11 first"); + await Assert.That(KeyClashes.For(HostKeys.Terminal, second, [first, second])?.Kind).IsEqualTo(KeyClashKind.Shadowed); + await Assert.That(KeyClashes.For(HostKeys.Terminal, second, [first, second])!.Value.Reason).Contains("north holds F11 first"); // A disabled binding clashes with nothing itself. - await Assert.That(KeyClashes.For(first, [first, second])).IsNull(); + await Assert.That(KeyClashes.For(HostKeys.Terminal, first, [first, second])).IsNull(); first.Enabled = true; - await Assert.That(KeyClashes.For(first, [first, second])?.Kind).IsEqualTo(KeyClashKind.Shadows); - await Assert.That(KeyClashes.Count([first, second])).IsEqualTo(1); + await Assert.That(KeyClashes.For(HostKeys.Terminal, first, [first, second])?.Kind).IsEqualTo(KeyClashKind.Shadows); + await Assert.That(KeyClashes.Count(HostKeys.Terminal, [first, second])).IsEqualTo(1); } [Test] public async Task AFreeChordClashesWithNothing() { var free = M("F11"); - await Assert.That(KeyClashes.For(free, [free])).IsNull(); - await Assert.That(KeyClashes.For(M("Num5"), [M("Num5")])).IsNull(); // never arrives: not a clash + await Assert.That(KeyClashes.For(HostKeys.Terminal, free, [free])).IsNull(); + await Assert.That(KeyClashes.For(HostKeys.Terminal, M("Num5"), [M("Num5")])).IsNull(); // never arrives: not a clash } [Test] @@ -147,7 +147,7 @@ public async Task EveryYieldedChordIsOneTheVerdictSaysFires() foreach (var chord in new[] { "Ctrl+C", "Ctrl+Left", "Alt+Shift+Up", "Shift+Up", "Alt+Up", "Ctrl+A", "Ctrl+X" }) { await Assert.That(MacroKeys.YieldedBy(chord)).IsNotNull(); - await Assert.That(MacroKeys.Verdict(chord).Fires).IsTrue(); + await Assert.That(MacroKeys.Verdict(HostKeys.Terminal, chord).Fires).IsTrue(); } } } diff --git a/tests/SharpMUTerm.Tui.Tests/PaneJumpTests.cs b/tests/SharpMUTerm.Tui.Tests/PaneJumpTests.cs index e9319bd5..3a88cdf8 100644 --- a/tests/SharpMUTerm.Tui.Tests/PaneJumpTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/PaneJumpTests.cs @@ -248,7 +248,7 @@ public async Task ABareDigitStillTypesRatherThanJumping() await Assert.That(app.ArmedInputText).Contains("2"); await Assert.That(app.FocusedPaneId).IsEqualTo(pane); - await Assert.That(MacroKeys.Verdict("2").Delivery).IsEqualTo(MacroKeyDelivery.Taken); + await Assert.That(MacroKeys.Verdict(HostKeys.Terminal, "2").Delivery).IsEqualTo(MacroKeyDelivery.Taken); await Assert.That(MacroKeys.AppShortcuts.Any(s => s.Modifiers == 0 && s.Key == ConsoleKey.D2)).IsFalse(); } diff --git a/tests/SharpMUTerm.Tui.Tests/PaneResizeEndToEndTests.cs b/tests/SharpMUTerm.Tui.Tests/PaneResizeEndToEndTests.cs index 38fde540..b9290d88 100644 --- a/tests/SharpMUTerm.Tui.Tests/PaneResizeEndToEndTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/PaneResizeEndToEndTests.cs @@ -701,7 +701,7 @@ public async Task ABoundMacroWinsTheChordAndTheLayoutStaysPut() "Alt+Shift+Left", "Alt+Shift+Right", "Alt+Shift+Up", "Alt+Shift+Down", }) { - await Assert.That(MacroKeys.Verdict(descriptor).Fires) + await Assert.That(MacroKeys.Verdict(HostKeys.Terminal, descriptor).Fires) .IsTrue() .Because($"F4 says a macro on {descriptor} fires, so the resize must not pre-empt it"); } diff --git a/tests/SharpMUTerm.Tui.Tests/ScreenButtonTests.cs b/tests/SharpMUTerm.Tui.Tests/ScreenButtonTests.cs index 19c23875..abb6685f 100644 --- a/tests/SharpMUTerm.Tui.Tests/ScreenButtonTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/ScreenButtonTests.cs @@ -366,7 +366,7 @@ public async Task NoReachableRowIsADestructiveButton() { ("F2 triggers", TriggersScreenRenderer.Model(sets, 0)), ("F3 aliases", AliasesScreenRenderer.Model(sets, 0)), - ("F4 keypad", KeypadScreenRenderer.Model(macros, sets, 0)), + ("F4 keypad", KeypadScreenRenderer.Model(HostKeys.Terminal, macros, sets, 0)), ("F5 worlds", WorldsScreenRenderer.Model(worlds, sets, 0, 0)), ("F6 timers", TimersScreenRenderer.Model(sets, 0)), }; diff --git a/tests/SharpMUTerm.Tui.Tests/ScreenCursorTests.cs b/tests/SharpMUTerm.Tui.Tests/ScreenCursorTests.cs index 8d75617f..18c1570b 100644 --- a/tests/SharpMUTerm.Tui.Tests/ScreenCursorTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/ScreenCursorTests.cs @@ -52,7 +52,7 @@ public async Task NoFocus_DrawsNoCursorBarAtAll() await Assert.That(Barred(TriggersScreenRenderer.RulesColumn(sets, 0))).IsEqualTo(0); await Assert.That(Barred(AliasesScreenRenderer.ListColumn(sets, 0))).IsEqualTo(0); await Assert.That(Barred(TimersScreenRenderer.ListColumn(sets, 0))).IsEqualTo(0); - await Assert.That(Barred(KeypadScreenRenderer.HotkeysColumn(sets[0].Macros))).IsEqualTo(0); + await Assert.That(Barred(KeypadScreenRenderer.HotkeysColumn(HostKeys.Terminal, sets[0].Macros))).IsEqualTo(0); } [Test] @@ -103,7 +103,7 @@ public async Task Timers_BarsTheFocusedTimer_AndTheEditorsOneShotRow() [Test] public async Task Keypad_BarsTheFocusedBinding() { - var lines = KeypadScreenRenderer.HotkeysColumn(Sets()[0].Macros, new ScreenFocus(0, 1)); + var lines = KeypadScreenRenderer.HotkeysColumn(HostKeys.Terminal, Sets()[0].Macros, new ScreenFocus(0, 1)); await Assert.That(Barred(lines)).IsEqualTo(1); await Assert.That(lines.Single(l => l.Contains(Bar, StringComparison.Ordinal))).Contains("Num1"); @@ -293,7 +293,7 @@ public async Task HeaderHints_SwapToTheEditingKeysWhileAFieldIsOpen() Pair(TriggersScreenRenderer.Model(sets, 0), m => TriggersScreenRenderer.HeaderLine(0, m)), Pair(AliasesScreenRenderer.Model(sets, 0), m => AliasesScreenRenderer.HeaderLine(0, m)), Pair(TimersScreenRenderer.Model(sets, 0), m => TimersScreenRenderer.HeaderLine(0, m)), - Pair(KeypadScreenRenderer.Model(sets[0].Macros), m => KeypadScreenRenderer.HeaderLine(0, m)), + Pair(KeypadScreenRenderer.Model(HostKeys.Terminal, sets[0].Macros), m => KeypadScreenRenderer.HeaderLine(0, m)), Pair( WorldsScreenRenderer.Model(worlds, sets, 0, 0), m => WorldsScreenRenderer.HeaderLine(0, m)), @@ -332,7 +332,7 @@ public async Task HeaderHints_SwapToTheEditingKeysWhileAFieldIsOpen() Pair(AliasesScreenRenderer.Model(empty, -1), m => AliasesScreenRenderer.HeaderLine(0, m)), Pair(TimersScreenRenderer.Model(empty, -1), m => TimersScreenRenderer.HeaderLine(0, m)), Pair( - KeypadScreenRenderer.Model(Array.Empty()), + KeypadScreenRenderer.Model(HostKeys.Terminal, Array.Empty()), m => KeypadScreenRenderer.HeaderLine(0, m)), Pair( WorldsScreenRenderer.Model(Array.Empty(), empty, -1, -1), diff --git a/tests/SharpMUTerm.Tui.Tests/ScreenDeleteKeyTests.cs b/tests/SharpMUTerm.Tui.Tests/ScreenDeleteKeyTests.cs index fdad0f77..42d93bc7 100644 --- a/tests/SharpMUTerm.Tui.Tests/ScreenDeleteKeyTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/ScreenDeleteKeyTests.cs @@ -78,8 +78,7 @@ public async Task Delete_WorksOnEveryScreenThatHasSomethingToRemove() var triggers = new SettingsSession(s => TriggersScreenRenderer.Model(sets, s.SelectionIn(0))); var aliases = new SettingsSession(s => AliasesScreenRenderer.Model(sets, s.SelectionIn(0))); var timers = new SettingsSession(s => TimersScreenRenderer.Model(sets, s.SelectionIn(0))); - var keypad = new SettingsSession(s => KeypadScreenRenderer.Model( - sets.SelectMany(x => x.Macros).ToList(), sets, s.SelectionIn(0))); + var keypad = new SettingsSession(s => KeypadScreenRenderer.Model(HostKeys.Terminal, sets.SelectMany(x => x.Macros).ToList(), sets, s.SelectionIn(0))); var f5 = new SettingsSession(s => WorldsScreenRenderer.Model( worlds, sets, s.SelectionIn(0), s.SelectionIn(1))); @@ -236,12 +235,12 @@ void Add(string name, ScreenModel model, Func header) => Add("F2", TriggersScreenRenderer.Model(sets, 0), m => TriggersScreenRenderer.HeaderLine(120, m)); Add("F3", AliasesScreenRenderer.Model(sets, 0), m => AliasesScreenRenderer.HeaderLine(120, m)); - Add("F4", KeypadScreenRenderer.Model(sets[0].Macros, sets, 0), m => KeypadScreenRenderer.HeaderLine(120, m)); + Add("F4", KeypadScreenRenderer.Model(HostKeys.Terminal, sets[0].Macros, sets, 0), m => KeypadScreenRenderer.HeaderLine(120, m)); Add("F5", WorldsScreenRenderer.Model(worlds, sets, 0, 0), m => WorldsScreenRenderer.HeaderLine(120, m)); Add("F6", TimersScreenRenderer.Model(sets, 0), m => TimersScreenRenderer.HeaderLine(120, m)); Add("F2 empty", TriggersScreenRenderer.Model(empty, -1), m => TriggersScreenRenderer.HeaderLine(120, m)); Add("F3 empty", AliasesScreenRenderer.Model(empty, -1), m => AliasesScreenRenderer.HeaderLine(120, m)); - Add("F4 no sets", KeypadScreenRenderer.Model(Array.Empty()), m => KeypadScreenRenderer.HeaderLine(120, m)); + Add("F4 no sets", KeypadScreenRenderer.Model(HostKeys.Terminal, Array.Empty()), m => KeypadScreenRenderer.HeaderLine(120, m)); Add("F6 empty", TimersScreenRenderer.Model(empty, -1), m => TimersScreenRenderer.HeaderLine(120, m)); Add( "F7 options", diff --git a/tests/SharpMUTerm.Tui.Tests/ScreenFieldRenderingTests.cs b/tests/SharpMUTerm.Tui.Tests/ScreenFieldRenderingTests.cs index af7774bc..8a3c5221 100644 --- a/tests/SharpMUTerm.Tui.Tests/ScreenFieldRenderingTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/ScreenFieldRenderingTests.cs @@ -54,7 +54,7 @@ public async Task NoOpenEdit_DrawsNoCaretOnAnyScreen() await Assert.That(Carets(TriggersScreenRenderer.EditorColumn(sets, 0, Array.Empty()))).IsEqualTo(0); await Assert.That(Carets(AliasesScreenRenderer.EditorColumn(sets, 0))).IsEqualTo(0); await Assert.That(Carets(TimersScreenRenderer.EditorColumn(sets, 0))).IsEqualTo(0); - await Assert.That(Carets(KeypadScreenRenderer.HotkeysColumn(sets[0].Macros))).IsEqualTo(0); + await Assert.That(Carets(KeypadScreenRenderer.HotkeysColumn(HostKeys.Terminal, sets[0].Macros))).IsEqualTo(0); await Assert.That(Carets( WorldsScreenRenderer.DetailColumn(worlds, sets, 0, 0, ScreenPalette.Accent))).IsEqualTo(0); await Assert.That(Carets( @@ -187,16 +187,14 @@ public async Task Keypad_DrawsTheNameAndCommandBuffersInTheBindingRowItself() { var macros = Sets()[0].Macros; - var command = KeypadScreenRenderer.HotkeysColumn( - macros, Edit(0, 0, KeypadScreenRenderer.CommandField, "look here")); + var command = KeypadScreenRenderer.HotkeysColumn(HostKeys.Terminal, macros, Edit(0, 0, KeypadScreenRenderer.CommandField, "look here")); await Assert.That(Carets(command)).IsEqualTo(1); var edited = command.Single(HasCaret); await Assert.That(edited).Contains("Num5"); await Assert.That(edited).Contains("look her"); - var name = KeypadScreenRenderer.HotkeysColumn( - macros, Edit(0, 0, KeypadScreenRenderer.NameField, "Survey")); + var name = KeypadScreenRenderer.HotkeysColumn(HostKeys.Terminal, macros, Edit(0, 0, KeypadScreenRenderer.NameField, "Survey")); await Assert.That(Carets(name)).IsEqualTo(1); await Assert.That(name.Single(HasCaret)).Contains("Surve"); @@ -278,8 +276,7 @@ public async Task ARefusedValueIsMarkedOnTheRowThatRefusedIt() [Test] public async Task BracketsTypedIntoABufferAreEscaped_NotRenderedAsMarkup() { - var lines = KeypadScreenRenderer.HotkeysColumn( - Sets()[0].Macros, Edit(0, 0, KeypadScreenRenderer.CommandField, "say [red]hi")); + var lines = KeypadScreenRenderer.HotkeysColumn(HostKeys.Terminal, Sets()[0].Macros, Edit(0, 0, KeypadScreenRenderer.CommandField, "say [red]hi")); var edited = lines.Single(HasCaret); await Assert.That(edited).Contains("[[red]]hi"); diff --git a/tests/SharpMUTerm.Tui.Tests/ScreenFooterTests.cs b/tests/SharpMUTerm.Tui.Tests/ScreenFooterTests.cs index 2babb2e2..de808082 100644 --- a/tests/SharpMUTerm.Tui.Tests/ScreenFooterTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/ScreenFooterTests.cs @@ -60,8 +60,8 @@ public class ScreenFooterTests AliasesScreenRenderer.FooterLine(sets, 0, 80), AliasesScreenRenderer.FooterLine(sets, 0, 80, Editing)), ("F4 keypad", - KeypadScreenRenderer.FooterLine(macros, 80), - KeypadScreenRenderer.FooterLine(macros, 80, Editing)), + KeypadScreenRenderer.FooterLine(HostKeys.Terminal, macros, 80), + KeypadScreenRenderer.FooterLine(HostKeys.Terminal, macros, 80, Editing)), ("F5 worlds", WorldsScreenRenderer.FooterLine(worlds, 0, 0, accent, 80), WorldsScreenRenderer.FooterLine(worlds, 0, 0, accent, 80, Editing)), diff --git a/tests/SharpMUTerm.Tui.Tests/ScreenHintTests.cs b/tests/SharpMUTerm.Tui.Tests/ScreenHintTests.cs index 8ce23050..63e1c337 100644 --- a/tests/SharpMUTerm.Tui.Tests/ScreenHintTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/ScreenHintTests.cs @@ -144,7 +144,7 @@ public async Task TheSidewaysHintGoesAwayWhileAFieldIsOpen() var triggers = TriggersScreenRenderer.Model(sets, 0); var aliases = AliasesScreenRenderer.Model(sets, 0); - var keypad = KeypadScreenRenderer.Model(macros, sets, 0); + var keypad = KeypadScreenRenderer.Model(HostKeys.Terminal, macros, sets, 0); var timers = TimersScreenRenderer.Model(sets, 0); var world = WorldsScreenRenderer.Model(worlds, sets, 0, 0); var text = OptionsScreenRenderer.Model(textAnsi); diff --git a/tests/SharpMUTerm.Tui.Tests/ScreenLayoutTests.cs b/tests/SharpMUTerm.Tui.Tests/ScreenLayoutTests.cs index 76d0c5f0..9da98c22 100644 --- a/tests/SharpMUTerm.Tui.Tests/ScreenLayoutTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/ScreenLayoutTests.cs @@ -213,7 +213,7 @@ await Assert.That(KeypadScreenRenderer.NumpadWidth(wide)) .IsGreaterThan(KeypadScreenRenderer.NumpadWidth(narrow)); // Given that width, the cell draws the command whole — the asymmetry the review named. - var grid = KeypadScreenRenderer.NumpadColumn(wide, KeypadScreenRenderer.NumpadWidth(wide)); + var grid = KeypadScreenRenderer.NumpadColumn(HostKeys.Terminal, wide, KeypadScreenRenderer.NumpadWidth(wide)); await Assert.That(grid.Single(l => l.Contains("[[1]]"))).Contains("look at altar"); } diff --git a/tests/SharpMUTerm.Tui.Tests/ScreenListButtonTests.cs b/tests/SharpMUTerm.Tui.Tests/ScreenListButtonTests.cs index 467aa6bb..3f81c9c8 100644 --- a/tests/SharpMUTerm.Tui.Tests/ScreenListButtonTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/ScreenListButtonTests.cs @@ -100,7 +100,7 @@ await Assert.That(triggers.ButtonAt(0, 4)!.Value.Label) // Nor does F4: a copied binding would land on the key its original already holds, and the // second macro on a key never fires. - var keypad = KeypadScreenRenderer.Model(sets[0].Macros, sets, 0); + var keypad = KeypadScreenRenderer.Model(HostKeys.Terminal, sets[0].Macros, sets, 0); await Assert.That(keypad.ListSizes[0]).IsEqualTo(1); await Assert.That(keypad.ButtonAt(0, 1)!.Value.Label).IsEqualTo(KeypadScreenRenderer.AddBindingLabel); await Assert.That(keypad.ButtonAt(0, 2)!.Value.Label).IsEqualTo(ScreenButton.RemoveKeyLabel); @@ -141,7 +141,7 @@ public async Task APaneWithNothingSelectedOffersOnlyItsAddButton() await Assert.That(TriggersScreenRenderer.Model(empty, -1).Sizes[0]).IsEqualTo(0); await Assert.That(AliasesScreenRenderer.Model(empty, -1).Sizes[0]).IsEqualTo(0); await Assert.That(TimersScreenRenderer.Model(empty, -1).Sizes[0]).IsEqualTo(0); - await Assert.That(KeypadScreenRenderer.Model(Array.Empty(), empty, -1).Sizes[0]).IsEqualTo(0); + await Assert.That(KeypadScreenRenderer.Model(HostKeys.Terminal, Array.Empty(), empty, -1).Sizes[0]).IsEqualTo(0); } /// @@ -212,7 +212,7 @@ public async Task ANewTimerArrivesDisabled_UnlikeANewTriggerOrBinding() new ScreenEdits().Apply( ButtonNamed(AliasesScreenRenderer.Model(sets, 0), 0, AliasesScreenRenderer.AddAliasLabel)); new ScreenEdits().Apply(ButtonNamed( - KeypadScreenRenderer.Model(sets[0].Macros, sets, 0), 0, KeypadScreenRenderer.AddBindingLabel)); + KeypadScreenRenderer.Model(HostKeys.Terminal, sets[0].Macros, sets, 0), 0, KeypadScreenRenderer.AddBindingLabel)); await Assert.That(sets[0].Timers[^1].Enabled).IsFalse(); await Assert.That(sets[0].Aliases[^1].Enabled).IsTrue(); @@ -240,7 +240,7 @@ public async Task RemovingUndoesBackIntoItsOwnIndexOnEveryScreen() edits.Apply(Removal(TimersScreenRenderer.Model(sets, 0), 0)); await Assert.That(sets[0].Timers).IsEmpty(); - edits.Apply(Removal(KeypadScreenRenderer.Model(sets[0].Macros, sets, 0), 0)); + edits.Apply(Removal(KeypadScreenRenderer.Model(HostKeys.Terminal, sets[0].Macros, sets, 0), 0)); await Assert.That(sets[0].Macros).IsEmpty(); edits.Revert(); @@ -345,7 +345,7 @@ await Assert.That(sets[0].Triggers.Select(t => t.Name)) /// /// F4's add button is the one that cannot simply append. A is identified by its /// , so the button claims a free one and says which on its own row. It claims - /// from rather than the numpad: no numpad key ever reaches this + /// from rather than the numpad: no numpad key ever reaches this /// client, so a binding born on one could never fire, and a button whose whole job is to name the /// key it takes must not name a dead one. /// @@ -354,21 +354,21 @@ public async Task AddingABindingClaimsAFreeKeyThatCanActuallyFire_AndNamesIt() { var sets = Sets(); var button = ButtonNamed( - KeypadScreenRenderer.Model(sets[0].Macros, sets, 0), 0, KeypadScreenRenderer.AddBindingLabel); + KeypadScreenRenderer.Model(HostKeys.Terminal, sets[0].Macros, sets, 0), 0, KeypadScreenRenderer.AddBindingLabel); - var first = MacroKeys.Bindable[0]; + var first = MacroKeys.Bindable(HostKeys.Terminal)[0]; await Assert.That(button.Target).IsEqualTo(first); - await Assert.That(MacroKeys.Verdict(first).Fires).IsTrue(); + await Assert.That(MacroKeys.Verdict(HostKeys.Terminal, first).Fires).IsTrue(); new ScreenEdits().Apply(button); await Assert.That(sets[0].Macros[^1].Key).IsEqualTo(first); // The next one takes the next free key, not the same one again. var again = ButtonNamed( - KeypadScreenRenderer.Model(sets.SelectMany(s => s.Macros).ToList(), sets, 0), + KeypadScreenRenderer.Model(HostKeys.Terminal, sets.SelectMany(s => s.Macros).ToList(), sets, 0), 0, KeypadScreenRenderer.AddBindingLabel); - await Assert.That(again.Target).IsEqualTo(MacroKeys.Bindable[1]); + await Assert.That(again.Target).IsEqualTo(MacroKeys.Bindable(HostKeys.Terminal)[1]); } /// @@ -380,13 +380,13 @@ public async Task AddingABindingClaimsAFreeKeyThatCanActuallyFire_AndNamesIt() public async Task NoBindingCanBeAddedOnceEveryBindableKeyIsTaken() { var sets = new List { new() { Name = "All" } }; - foreach (var key in MacroKeys.Bindable) + foreach (var key in MacroKeys.Bindable(HostKeys.Terminal)) { sets[0].Macros.Add(new Macro { Name = key, Key = key, Command = "look" }); } - var model = KeypadScreenRenderer.Model(sets[0].Macros, sets, 0); - var bindings = MacroKeys.Bindable.Count; + var model = KeypadScreenRenderer.Model(HostKeys.Terminal, sets[0].Macros, sets, 0); + var bindings = MacroKeys.Bindable(HostKeys.Terminal).Count; // The bindings and nothing else the cursor can reach: the add button is gone because there is no // free chord left to claim, and the removal past them is drawn but not a stop (was bindings + 1). @@ -422,9 +422,9 @@ bool Removes(IEnumerable column, string target) => column.Any(l => await Assert.That(Removes(AliasesScreenRenderer.ListColumn(sets, 0), "gr")).IsTrue(); await Assert.That(Removes(TimersScreenRenderer.ListColumn(sets, 0), "ping")).IsTrue(); - var bindings = KeypadScreenRenderer.HotkeysColumn(sets[0].Macros, null, sets, 0); + var bindings = KeypadScreenRenderer.HotkeysColumn(HostKeys.Terminal, sets[0].Macros, null, sets, 0); await Assert.That(Removes(bindings, "Look")).IsTrue(); - await Assert.That(bindings.Any(l => l.Contains("[[+ binding]]") && l.Contains(MacroKeys.Bindable[0]))) + await Assert.That(bindings.Any(l => l.Contains("[[+ binding]]") && l.Contains(MacroKeys.Bindable(HostKeys.Terminal)[0]))) .IsTrue(); } diff --git a/tests/SharpMUTerm.Tui.Tests/ScreenModelTests.cs b/tests/SharpMUTerm.Tui.Tests/ScreenModelTests.cs index 05ff25e7..693276af 100644 --- a/tests/SharpMUTerm.Tui.Tests/ScreenModelTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/ScreenModelTests.cs @@ -143,7 +143,7 @@ public async Task Timers_ListTogglesEnabled_AndTheEditorTogglesOneShotThenEnable public async Task Keypad_IsOnePaneOfMacroToggles() { var macros = Sets()[0].Macros; - var model = KeypadScreenRenderer.Model(macros); + var model = KeypadScreenRenderer.Model(HostKeys.Terminal, macros); await Assert.That(model.PaneCount).IsEqualTo(1); @@ -164,7 +164,7 @@ public async Task Keypad_IsOnePaneOfMacroToggles() public async Task Keypad_GrowsItsButtonsOnceItKnowsWhichSetsTheBindingsLiveIn() { var sets = Sets(); - var model = KeypadScreenRenderer.Model(sets[0].Macros, sets, selected: 0); + var model = KeypadScreenRenderer.Model(HostKeys.Terminal, sets[0].Macros, sets, selected: 0); await Assert.That(model.ListSizes[0]).IsEqualTo(1); await Assert.That(model.Sizes[0]).IsEqualTo(2); // was 3, with the removal reachable diff --git a/tests/SharpMUTerm.Tui.Tests/ScreenNameTests.cs b/tests/SharpMUTerm.Tui.Tests/ScreenNameTests.cs index 0269b7ad..0dc98b75 100644 --- a/tests/SharpMUTerm.Tui.Tests/ScreenNameTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/ScreenNameTests.cs @@ -58,7 +58,7 @@ public class ScreenNameTests AliasesScreenRenderer.Model(sets, 0).FieldAt(0, 0, AliasesScreenRenderer.NameField)!.Value, () => alias.Name), ("F4 keypad", - KeypadScreenRenderer.Model(sets[0].Macros).FieldAt(0, 0, KeypadScreenRenderer.NameField)!.Value, + KeypadScreenRenderer.Model(HostKeys.Terminal, sets[0].Macros).FieldAt(0, 0, KeypadScreenRenderer.NameField)!.Value, () => macro.Name), ("F6 timers", TimersScreenRenderer.Model(sets, 0).FieldAt(0, 0, TimersScreenRenderer.NameField)!.Value, @@ -82,7 +82,7 @@ private static List FirstFields(List sets, List AliasesScreenRenderer.Model(sets, selection.SelectionIn(0)))); yield return ("F4 keypad", new SettingsSession( - selection => KeypadScreenRenderer.Model( - sets.SelectMany(s => s.Macros).ToList(), sets, selection.SelectionIn(0)))); + selection => KeypadScreenRenderer.Model(HostKeys.Terminal, sets.SelectMany(s => s.Macros).ToList(), sets, selection.SelectionIn(0)))); yield return ("F5 worlds", WorldsSession(Worlds(), sets)); yield return ("F6 timers", new SettingsSession( selection => TimersScreenRenderer.Model(sets, selection.SelectionIn(0)))); diff --git a/tests/SharpMUTerm.Tui.Tests/ScreenReachabilityTests.cs b/tests/SharpMUTerm.Tui.Tests/ScreenReachabilityTests.cs index 865cbeb8..dae0af9b 100644 --- a/tests/SharpMUTerm.Tui.Tests/ScreenReachabilityTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/ScreenReachabilityTests.cs @@ -240,11 +240,11 @@ public async Task RemovingLeavesNoFieldOpen() var keypadSets = Sets(); List Macros() => keypadSets.SelectMany(s => s.Macros).ToList(); var keypad = new SettingsSession( - selection => KeypadScreenRenderer.Model(Macros(), keypadSets, selection.SelectionIn(0))); + selection => KeypadScreenRenderer.Model(HostKeys.Terminal, Macros(), keypadSets, selection.SelectionIn(0))); yield return ( "F4 keypad", keypad, - () => KeypadScreenRenderer.Model(Macros(), keypadSets, keypad.Selection.SelectionIn(0)), + () => KeypadScreenRenderer.Model(HostKeys.Terminal, Macros(), keypadSets, keypad.Selection.SelectionIn(0)), KeypadScreenRenderer.AddBindingLabel, "New Binding"); diff --git a/tests/SharpMUTerm.Tui.Tests/ScreenReadOnlyTests.cs b/tests/SharpMUTerm.Tui.Tests/ScreenReadOnlyTests.cs index 20319a80..da3951f6 100644 --- a/tests/SharpMUTerm.Tui.Tests/ScreenReadOnlyTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/ScreenReadOnlyTests.cs @@ -433,12 +433,12 @@ public async Task Keypad_TheNumpadGridIsAReadoutAndTheBindingListIsNot() { var macros = Sets()[0].Macros; - var grid = KeypadScreenRenderer.NumpadColumn(macros); + var grid = KeypadScreenRenderer.NumpadColumn(HostKeys.Terminal, macros); await Assert.That(grid.Any(InAWell)).IsFalse(); await Assert.That(grid.Single(l => l.Contains("look", StringComparison.Ordinal))) .Contains(ScreenPalette.Muted); - var list = KeypadScreenRenderer.HotkeysColumn(macros); + var list = KeypadScreenRenderer.HotkeysColumn(HostKeys.Terminal, macros); await Assert.That(list.Single(l => l.Contains("Num5", StringComparison.Ordinal))).Contains(Well); } @@ -501,7 +501,7 @@ private static List Headers() { TriggersScreenRenderer.HeaderLine(80, TriggersScreenRenderer.Model(sets, 0)), AliasesScreenRenderer.HeaderLine(80, AliasesScreenRenderer.Model(sets, 0)), - KeypadScreenRenderer.HeaderLine(80, KeypadScreenRenderer.Model(sets[0].Macros)), + KeypadScreenRenderer.HeaderLine(80, KeypadScreenRenderer.Model(HostKeys.Terminal, sets[0].Macros)), WorldsScreenRenderer.HeaderLine(80, WorldsScreenRenderer.Model(worlds, sets, 0, 0)), TimersScreenRenderer.HeaderLine(80, TimersScreenRenderer.Model(sets, 0)), Header(OptionsScreenRenderer.TextAnsiScreen()), @@ -524,7 +524,7 @@ private static string Header(OptionsScreenRenderer.OptionsScreen screen) => { ("F2 triggers", TriggersScreenRenderer.FooterLine(sets, 0, 80)), ("F3 aliases", AliasesScreenRenderer.FooterLine(sets, 0, 80)), - ("F4 keypad", KeypadScreenRenderer.FooterLine(sets[0].Macros, 80)), + ("F4 keypad", KeypadScreenRenderer.FooterLine(HostKeys.Terminal, sets[0].Macros, 80)), ("F5 worlds", WorldsScreenRenderer.FooterLine(worlds, 0, 0, accent, 80)), ("F6 timers", TimersScreenRenderer.FooterLine(sets, 0, 80)), ("F7 text", OptionsScreenRenderer.FooterLine(OptionsScreenRenderer.TextAnsiScreen().Rows, 80)), diff --git a/tests/SharpMUTerm.Tui.Tests/SettingsPasteTests.cs b/tests/SharpMUTerm.Tui.Tests/SettingsPasteTests.cs index 8fc7ee07..bd566387 100644 --- a/tests/SharpMUTerm.Tui.Tests/SettingsPasteTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/SettingsPasteTests.cs @@ -175,7 +175,7 @@ public async Task AKeyCaptureFieldSwallowsAPaste() var binding = "F5"; var session = new SettingsSession(_ => new ScreenModel(new[] { - ScreenRow.Of(ScreenField.Key("key", () => binding, v => binding = v, _ => null)), + ScreenRow.Of(ScreenField.Key(HostKeys.Terminal, "key", () => binding, v => binding = v, _ => null)), })); session.Handle(Key(ConsoleKey.Enter)); await Assert.That(session.IsEditing).IsTrue(); @@ -228,7 +228,7 @@ public async Task CtrlV_OverAKeyCaptureIsStillRecordedAsABinding() var binding = "F5"; var session = new SettingsSession(_ => new ScreenModel(new[] { - ScreenRow.Of(ScreenField.Key("key", () => binding, v => binding = v, _ => null)), + ScreenRow.Of(ScreenField.Key(HostKeys.Terminal, "key", () => binding, v => binding = v, _ => null)), })); var system = new ConsoleWindowSystem( new HeadlessConsoleDriver(120, 34), new ConsoleWindowSystemOptions()); diff --git a/tests/SharpMUTerm.Tui.Tests/SurfaceCellTests.cs b/tests/SharpMUTerm.Tui.Tests/SurfaceCellTests.cs new file mode 100644 index 00000000..d9044013 --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/SurfaceCellTests.cs @@ -0,0 +1,108 @@ +using System.Reflection; +using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Surfaces; +using SharpMUTerm.Core.Automation; +using SharpMUTerm.Graphics; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// The terminal's half of the surface catalog (): every surface drawn in cells is drawn +/// by a renderer that takes the surface's model, every command a surface raises is one the registry runs, and every +/// action ends in a client method that exists. The window's half is SurfaceParityTests. +/// +[NotInParallel] +public class SurfaceCellTests +{ + private static readonly TerminalCapabilities Caps = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private static readonly Assembly Tui = typeof(SharpMUTermApp).Assembly; + + /// + /// A cell renderer that stopped taking the model — reading the app's state itself — could say something the + /// native view does not. The renderer is named in the catalog and one of its overloads must take the model. + /// + [Test] + public async Task EverySurfaceDrawnInCellsHasACellRendererThatTakesItsModel() + { + foreach (var surface in SurfaceCatalog.All.Where(s => s.HasCells)) + { + var name = surface.CellRenderer!; + var dot = name.LastIndexOf('.'); + var type = Tui.GetType(name[..dot]); + await Assert.That(type).IsNotNull().Because($"{surface.Id}: {name[..dot]} is not a type in the terminal client"); + var overloads = type!.GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.Instance) + .Where(m => m.Name == name[(dot + 1)..]) + .ToList(); + await Assert.That(overloads).IsNotEmpty().Because($"{surface.Id}: {name} does not exist"); + await Assert.That(overloads.Any(m => m.GetParameters().Any(p => p.ParameterType == surface.Model))) + .IsTrue().Because($"{surface.Id}: no overload of {name} takes a {surface.Model.Name}"); + } + } + + /// Every action names the client method both views end in, and that method is there to end in. + [Test] + public async Task EveryActionReachesAClientMethodThatExists() + { + foreach (var surface in SurfaceCatalog.All) + { + foreach (var action in surface.Actions) + { + var dot = action.Reaches.LastIndexOf('.'); + var type = dot < 0 ? typeof(SharpMUTermApp) : Tui.GetType("SharpMUTerm.Tui." + action.Reaches[..dot]); + var method = dot < 0 ? action.Reaches : action.Reaches[(dot + 1)..]; + var found = type?.GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.Instance) + .Any(m => m.Name == method) ?? false; + await Assert.That(found).IsTrue().Because($"{surface.Id}: {action.Reaches}"); + } + } + } + + /// A command a surface raises, or names as its keyboard path, is one the registry runs. + [Test] + public async Task EveryCommandASurfaceRaisesResolvesThroughTheRegistry() + { + Console.SetIn(TextReader.Null); + using var driver = new HeadlessConsoleDriver(120, 34); + await using var app = new SharpMUTermApp(DemoScene.Build(), ClientHost.Headless(driver, Caps)); + + var ids = SurfaceCatalog.All.SelectMany(s => s.Actions.Where(a => a.Kind == SurfaceActionKind.Command).Select(a => a.Name)) + .Concat(SurfaceCatalog.All.SelectMany(s => s.Actions.Select(a => a.CellsVia)).OfType().Where(v => SurfaceCatalog.Find(v) is null)) + .Concat(SurfaceCatalog.All.Select(s => s.KeyboardPath).OfType()) + .Distinct(StringComparer.Ordinal); + foreach (var id in ids) + { + await Assert.That(app.Contributions.Commands.Resolve(id)).IsNotNull().Because(id); + } + } + + /// + /// The terminal's verdicts, read through the app's own host: ⌃3 is the Escape byte here and never fires, ⌥⏎ is + /// the newline, ⌃⇧←/→ are kitty's; and a macro on ⌃3 is dead on F4 and is not dispatched by the key path. + /// + [Test] + public async Task F4TellsTheTerminalsTruth() + { + Console.SetIn(TextReader.Null); + var config = DemoScene.Build(); + await using var app = new SharpMUTermApp(config, ClientHost.Headless(new HeadlessConsoleDriver(120, 34), Caps)); + app.BindWorldWithoutConnecting(config.Worlds[0]); + var keys = app.Host.Keys; + + await Assert.That(MacroKeys.Verdict(keys, "Ctrl+3").Delivery).IsEqualTo(MacroKeyDelivery.NeverArrives); + await Assert.That(MacroKeys.Verdict(keys, "Ctrl+3").Reason).Contains("Escape"); + await Assert.That(MacroKeys.Verdict(keys, "Alt+Enter").Delivery).IsEqualTo(MacroKeyDelivery.Taken); + await Assert.That(MacroKeys.Verdict(keys, "Alt+Enter").Reason).IsEqualTo("Alt+⏎ is the newline"); + await Assert.That(MacroKeys.Verdict(keys, "Ctrl+Shift+Left").Fires).IsFalse(); + await Assert.That(MacroKeys.Verdict(keys, "Ctrl+Shift+A").Fires).IsFalse(); + await Assert.That(MacroKeys.Verdict(keys, "Alt+O").Fires).IsFalse(); + + var macro = config.TriggerSets.SelectMany(s => s.Macros).Single(m => m.Key == "Ctrl+F1"); + macro.Key = "Ctrl+3"; + await Assert.That(app.SimulateKey(new ConsoleKeyInfo('3', ConsoleKey.D3, false, false, true))).IsNull(); + + var hotkeys = string.Join('\n', KeypadScreenRenderer.HotkeysColumn(keys, config.TriggerSets.SelectMany(s => s.Macros).ToList())); + await Assert.That(hotkeys).Contains("▲ Ctrl+3"); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/TerminalPanelTests.cs b/tests/SharpMUTerm.Tui.Tests/TerminalPanelTests.cs index fd1e35fa..6e5db705 100644 --- a/tests/SharpMUTerm.Tui.Tests/TerminalPanelTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/TerminalPanelTests.cs @@ -119,7 +119,7 @@ public async Task NothingToShowIsNoStrip() [Test] public async Task TheQuickBarListsFunctionKeysPlainFirstAndByNumber() { - var entries = QuickBarRenderer.Entries(Bindings, Resolve); + var entries = QuickBarRenderer.Entries(HostKeys.Terminal, Bindings, Resolve); await Assert.That(entries.Items.Select(e => e.Key)).IsEquivalentTo(new[] { "F11", "F12", "⌃F3" }); await Assert.That(entries.Items[2].Title).IsEqualTo("cast 'cure light'"); @@ -128,7 +128,7 @@ public async Task TheQuickBarListsFunctionKeysPlainFirstAndByNumber() [Test] public async Task TheQuickBarElidesAndNeverWraps() { - var entries = QuickBarRenderer.Entries(Bindings, Resolve); + var entries = QuickBarRenderer.Entries(HostKeys.Terminal, Bindings, Resolve); var wide = QuickBarRenderer.Render(entries, 100, "#00f5b7"); await Assert.That(StripMarkup(wide)).Contains("F11 kick").And.EndsWith(QuickBarRenderer.Hint); diff --git a/tests/SharpMUTerm.Tui.Tests/TriggerSetManagementTests.cs b/tests/SharpMUTerm.Tui.Tests/TriggerSetManagementTests.cs index 013feec0..8e622c19 100644 --- a/tests/SharpMUTerm.Tui.Tests/TriggerSetManagementTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/TriggerSetManagementTests.cs @@ -472,7 +472,7 @@ public async Task EveryFlattenedScreenCanMoveItsItemsBetweenSets() await Assert.That(sets[1].Timers.Select(t => t.Name)).IsEquivalentTo(new[] { "ping" }); var macros = sets.SelectMany(s => s.Macros).ToList(); - var binding = KeypadScreenRenderer.Model(macros, sets, 0) + var binding = KeypadScreenRenderer.Model(HostKeys.Terminal, macros, sets, 0) .FieldAt(0, 0, KeypadScreenRenderer.SetField)!.Value; await Assert.That(new ScreenEdits().Apply(binding, "Trade")).IsNull(); await Assert.That(sets[0].Macros).IsEmpty(); @@ -487,7 +487,7 @@ public async Task EveryFlattenedScreenCanMoveItsItemsBetweenSets() [Test] public async Task TheKeypadOffersNoSetFieldWhenItWasNotToldWhichSetsTheBindingsCameFrom() { - var row = KeypadScreenRenderer.Model(Sets()[0].Macros).RowAt(0, 0); + var row = KeypadScreenRenderer.Model(HostKeys.Terminal, Sets()[0].Macros).RowAt(0, 0); await Assert.That(row.FieldCount).IsEqualTo(3); await Assert.That(row.FieldAt(KeypadScreenRenderer.SetField)).IsNull(); @@ -582,7 +582,7 @@ await Assert.That(AliasesScreenRenderer.ListColumn(sets, 0) .Any(l => l.Contains("▪ Combat — no aliases", StringComparison.Ordinal))).IsTrue(); await Assert.That(TimersScreenRenderer.ListColumn(sets, 0) .Any(l => l.Contains("▪ Combat — no timers", StringComparison.Ordinal))).IsTrue(); - await Assert.That(KeypadScreenRenderer.HotkeysColumn(macros, null, sets, 0) + await Assert.That(KeypadScreenRenderer.HotkeysColumn(HostKeys.Terminal, macros, null, sets, 0) .Any(l => l.Contains("▪ Combat — no bindings", StringComparison.Ordinal))).IsTrue(); // Trade holds triggers but no aliases, so it is named on F3 and not on F2 — the placeholder is diff --git a/tests/SharpMUTerm.Tui.Tests/WindowJumpTests.cs b/tests/SharpMUTerm.Tui.Tests/WindowJumpTests.cs index 0181aed9..c576f2d3 100644 --- a/tests/SharpMUTerm.Tui.Tests/WindowJumpTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/WindowJumpTests.cs @@ -548,7 +548,7 @@ await Assert.That(MacroKeys.AppShortcuts.Any(s => s.Modifiers == ConsoleModifier await Assert.That(MacroKeys.WindowJumpNumber(ConsoleKey.D0)).IsNull(); await Assert.That(MacroKeys.AppShortcuts.Any( s => s.Modifiers == ConsoleModifiers.Alt && s.Key == ConsoleKey.D0)).IsFalse(); - await Assert.That(MacroKeys.Verdict("Alt+0").Fires).IsTrue(); + await Assert.That(MacroKeys.Verdict(HostKeys.Terminal, "Alt+0").Fires).IsTrue(); } /// @@ -682,7 +682,7 @@ public async Task TheKeypadScreenSaysWhatHasEachDigit() { for (var n = 1; n <= 9; n++) { - var verdict = MacroKeys.Verdict($"Alt+{n}"); + var verdict = MacroKeys.Verdict(HostKeys.Terminal, $"Alt+{n}"); await Assert.That(verdict.Delivery).IsEqualTo(MacroKeyDelivery.Taken); await Assert.That(verdict.Reason).Contains($"window {n}"); @@ -702,7 +702,7 @@ public async Task TheKeypadScreenSaysWhatHasEachDigit() [Arguments(9, "bare 9")] public async Task CtrlDigitIsReportedAsUnreachableWithTheByteTheTerminalSends(int digit, string byteName) { - var verdict = MacroKeys.Verdict($"Ctrl+{digit}"); + var verdict = MacroKeys.Verdict(HostKeys.Terminal, $"Ctrl+{digit}"); await Assert.That(verdict.Delivery).IsEqualTo(MacroKeyDelivery.NeverArrives); await Assert.That(verdict.Reason).Contains(byteName); From c60528657dcc244159ed7f6b6e1bc8fe34cc45c9 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 07:07:44 +0000 Subject: [PATCH 026/113] Narrow layout below 100 columns, and mode-aware key hints on the status row Below 100 columns the connection rail folds itself to its strip (whichever rail is drawn, through SidebarModel.Collapsed; the window measures its whole width via IPointerPresenter.WindowColumns so the fold cannot undo itself), acting only when the width crosses the line so a player's own fold wins. Below 100 columns or 30 rows an empty command line is one row and grows as before; a growing bar now takes back the editor's scroll. While the focused pane is scrolled back, split, frozen, carrying the search bar, or a docked composer holds the keyboard, the status row names that mode's keys (ModeHints, Client), resolved through the host's spellings, in place of the pane hints and only where they fit. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 8 + CLAUDE.md | 27 +++ src/SharpMUTerm.Avalonia/TerminalView.cs | 4 + src/SharpMUTerm.Avalonia/WindowPointer.cs | 14 ++ src/SharpMUTerm.Client/Chrome/ModeHints.cs | 82 +++++++ src/SharpMUTerm.Tui/InputBarControl.cs | 17 +- src/SharpMUTerm.Tui/Pointer/PointerTarget.cs | 8 + .../SharpMUTermApp.ModeHints.cs | 80 +++++++ src/SharpMUTerm.Tui/SharpMUTermApp.Narrow.cs | 84 +++++++ src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs | 1 + src/SharpMUTerm.Tui/SharpMUTermApp.cs | 59 ++++- .../HostParityTests.cs | 51 ++++ .../NativeChromeTests.cs | 12 +- .../NewlineKeyTests.cs | 5 +- .../ModeHintsTests.cs | 51 ++++ .../InputAreaLayoutTests.cs | 6 +- .../NarrowLayoutTests.cs | 218 ++++++++++++++++++ 17 files changed, 717 insertions(+), 10 deletions(-) create mode 100644 src/SharpMUTerm.Client/Chrome/ModeHints.cs create mode 100644 src/SharpMUTerm.Tui/SharpMUTermApp.ModeHints.cs create mode 100644 src/SharpMUTerm.Tui/SharpMUTermApp.Narrow.cs create mode 100644 tests/SharpMUTerm.Client.Tests/ModeHintsTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/NarrowLayoutTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 5aafdc4e..20ec6a15 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,14 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- A narrow terminal gives its room to the game: below 100 columns the connection rail folds to its slim strip + on its own (in the desktop window, the sidebar does), and below 100 columns or 30 rows an empty command line + is one row tall and grows as you type. At 80×24 a pane is now 72 columns wide instead of 60, two rows taller, + and a world's 80-column text no longer leaves a stray word on every other line. Folding or unfolding the rail + yourself (Ctrl+B b) always wins, until the window next crosses 100 columns. +- The status row names the keys of whatever you are in: scrolled back (End returns, Alt+F freezes), frozen + (Alt+F thaws), on a search result (Alt+G next hit), or writing in a docked composer (Ctrl+S sends, Esc + releases, F1 full screen), in place of the pane hints, and only where they fit. - Ctrl+P lists *Fold or unfold the connection rail*, the same fold as Ctrl+B b and as the desktop window's sidebar button. - Desktop window: the header and the connections sidebar now have room of their own — a full-height toolbar diff --git a/CLAUDE.md b/CLAUDE.md index 230e1f4f..fc628ff4 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -531,6 +531,33 @@ fallbacks) for inline images/maps. `UnreadBadge` in a reserved field), refreshed on `PostBufferPaint` with the status row repainted beside it when it moves, so the two surfaces never disagree. It says *rows*, not lines: a buffer index is not a viewport row. +- **Below 100 columns the layout is narrow** (`SharpMUTermApp.Narrow.cs`; `NarrowColumns`, `ShortRows`; + `NarrowLayoutTests`). The rail folds itself to its strip, and below 100 columns *or* 30 rows an empty command line + is one row (`SyncInputHeights`: `MinRows` becomes `InputSettings.MinRows`; it still grows to `MaxRows` as it wraps). + At 80×24 that is a 72-column pane instead of 60 and two more output rows. Decisions not to relitigate: + - **100 because of the server's wrap width**: the open rail, divider and spacer cost ~20 columns, so 100 still + leaves the pane 80; below it a world's 80-column text orphans a word on every other row. 30 rows because above it + the output keeps 24 rows with a three-row bar. Height never folds the rail. + - **The automatic fold acts only on a crossing** (`_narrowSeen`) and once at start, never on a resize that stays on + one side, so ⌃B b / ⌃P / the window sidebar's fold button win until the width next crosses 100. It is the same + `_railCollapsed` those toggle, published as `SidebarModel.Collapsed`, so whichever rail is drawn folds. + - **The window measures its whole width, not its cells** (`LayoutColumns`; `IPointerPresenter.WindowColumns`, set by + `TerminalView` before each grid resize as the view's width plus its margin, in cells). Folding a sidebar the host + draws widens the cells; measured on them, the fold would cross back over the line and undo itself. A host that + says nothing (the terminal, every test presenter) is measured on its cells. + - **A growing bar takes back the editor's scroll** (`InputBarControl.MeasureDOM`, `_verticalScrollOffset` by + reflection). The editor scrolls to keep the caret on a row the viewport does not have yet and never scrolls back + when the viewport grows, so a newline in a one-row bar drew the new row and a blank. The three-row floor had hidden + it; `NewlineKeyTests` caught it. +- **The status row names the keys of the mode you are in** (`ModeHints`/`StatusMode`, Client; + `SharpMUTermApp.ModeHints.cs`). Composer armed > search bar in the focused window > frozen > split > scrolled back; + while one holds, its hints replace `FocusHints` (`End returns · ⌥F freezes`, `⌥F thaws`, `⌥G next hit · ⌃F searches + again`, `⌃S sends · Esc releases · F1 full screen`). The keys are `KeyHint`s resolved through the host's + `HostKeyGlyphs` and written through `KeyGlyphs.Normalize`; `HostParityTests.TheStatusRowNamesEachModesKeysAsThisHost…` + reads each mode's row once per host at 80 and 120 columns. The longest candidate goes in that fits once as few of the + encoding and `⌃P palette` cells as it needs are given up; meters and the scrollback segment are never given up for + it, and nothing may wrap the row (the D1 lesson). A change of mode alone repaints the row: `SyncStatusMode` rides + `PostBufferPaint` as well as freeze, the composer's bands and the scroll path. - **F5 ▸ `join wraps` joins the lines a server hard-wrapped** (`ServerWrapJoiner`, Core; `WorldSession.Reflow`; `WorldDefinition.JoinWrappedLines`, off by default; the `reflow` view). **A false join is worse than a missed one**, so every condition is a reason not to join: the wrap column is known (third-longest of the last 128 diff --git a/src/SharpMUTerm.Avalonia/TerminalView.cs b/src/SharpMUTerm.Avalonia/TerminalView.cs index 81384662..0ca2dd51 100644 --- a/src/SharpMUTerm.Avalonia/TerminalView.cs +++ b/src/SharpMUTerm.Avalonia/TerminalView.cs @@ -138,6 +138,10 @@ protected override void OnSizeChanged(SizeChangedEventArgs e) { base.OnSizeChanged(e); var (columns, rows) = GridFor(e.NewSize); + + // The width a terminal this window's size would have, sidebar and all, said before the grid moves: the + // client's narrow layout reads it with the resize, and it does not change when the sidebar folds. + _driver.Pointer.WindowColumnsMeasured = Math.Max(columns, (int)((e.NewSize.Width + Margin.Left + Margin.Right) / CellSize.Width)); _driver.Resize(columns, rows); Repainted?.Invoke(); } diff --git a/src/SharpMUTerm.Avalonia/WindowPointer.cs b/src/SharpMUTerm.Avalonia/WindowPointer.cs index a372c140..22561ab1 100644 --- a/src/SharpMUTerm.Avalonia/WindowPointer.cs +++ b/src/SharpMUTerm.Avalonia/WindowPointer.cs @@ -58,6 +58,20 @@ public void Hover(PointerTarget target) public bool DrawsMenus => true; + private int _windowColumns; + + /// + /// The window's whole width in cells, the native header and sidebar included: written by + /// before each resize of the grid, so the client reads it fresh with the resize. Zero until then. + /// + internal int WindowColumnsMeasured + { + get => Volatile.Read(ref _windowColumns); + set => Volatile.Write(ref _windowColumns, value); + } + + int? IPointerPresenter.WindowColumns => WindowColumnsMeasured is > 0 and var columns ? columns : null; + public void Scrollbars(IReadOnlyList bars) { Volatile.Write(ref _bars, bars); diff --git a/src/SharpMUTerm.Client/Chrome/ModeHints.cs b/src/SharpMUTerm.Client/Chrome/ModeHints.cs new file mode 100644 index 00000000..695893f1 --- /dev/null +++ b/src/SharpMUTerm.Client/Chrome/ModeHints.cs @@ -0,0 +1,82 @@ +using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Client.Palette; + +namespace SharpMUTerm.Client.Chrome; + +/// +/// A state the focused pane (or the keyboard) is in that changes what the keys do, and so changes which keys the +/// status row names. Zellij's idea: the row that otherwise teaches the pane chords teaches the way out of whatever +/// you are in. Listed in priority order, lowest first; when two hold at once the higher one is named. +/// +public enum StatusMode +{ + /// Nothing special: the row names the pane, tab and command-line chords (FocusHints). + None, + + /// The focused pane is scrolled back with the split off: the history fills the pane. + ScrolledBack, + + /// The focused pane is scrolled back and split, the live tail under a band. + SplitScrollback, + + /// The focused pane is frozen (⌥F). + Frozen, + + /// The focused window carries the ⌃F search's result bar. + SearchResult, + + /// A docked composer holds the keyboard. + Composer, +} + +/// One key a mode answers, and what it does: ⌥F thaws. +/// The chord, as the ⌃P catalog writes keys. +/// What it does, as a verb the row reads after the key. +public sealed record ModeHint(KeyHint Key, string Does) +{ + /// The hint as the row writes it on the host whose spellings are . + public string Text(HostKeyGlyphs keys) => $"{KeyGlyphs.Normalize(Key.Resolve(keys))} {Does}"; +} + +/// +/// The keys the status row names while a holds. Pure, so both hosts — and the tests — read +/// one list, and a key is resolved through the host's own spellings () and written in the +/// palette's one vocabulary (), never typed out a second time by whoever draws the row. +/// +/// Most important first, and the row takes the longest prefix that fits: a narrow terminal keeps the way out +/// and loses the extras, rather than losing both because the pair no longer fitted — FocusHints' rule. +/// +/// +public static class ModeHints +{ + /// What 's keys are, most important first; empty for . + public static IReadOnlyList For(StatusMode mode) => mode switch + { + // The scrollback segment beside it already says ⌃End live, so this row adds what that one does not. + StatusMode.ScrolledBack => [new("⌥F", "freezes"), new("PgDn", "pages down")], + + // Bare End is claimed only while a split is open (and the caret is at the end of the line, where it rests). + StatusMode.SplitScrollback => [new("End", "returns"), new("⌥F", "freezes")], + StatusMode.Frozen => [new("⌥F", "thaws")], + StatusMode.SearchResult => [new("⌥G", "next hit"), new("⌃F", "searches again")], + StatusMode.Composer => [new("⌃S", "sends"), new("Esc", "releases"), new("F1", "full screen")], + _ => [], + }; + + /// + /// The row's candidates for on the host whose spellings are : every + /// hint, then one fewer, down to the first alone. Joined with the row's own · . + /// + public static IReadOnlyList Candidates(StatusMode mode, HostKeyGlyphs keys) + { + ArgumentNullException.ThrowIfNull(keys); + var hints = For(mode).Select(h => h.Text(keys)).ToList(); + var candidates = new List(hints.Count); + for (var n = hints.Count; n > 0; n--) + { + candidates.Add(string.Join(" · ", hints.Take(n))); + } + + return candidates; + } +} diff --git a/src/SharpMUTerm.Tui/InputBarControl.cs b/src/SharpMUTerm.Tui/InputBarControl.cs index a07bc082..febf1f8d 100644 --- a/src/SharpMUTerm.Tui/InputBarControl.cs +++ b/src/SharpMUTerm.Tui/InputBarControl.cs @@ -56,6 +56,9 @@ internal sealed class InputBarControl : MultilineEditControl, private static readonly MethodInfo? WrappedLinesMethod = typeof(MultilineEditControl).GetMethod( "GetWrappedLines", BindingFlags.Instance | BindingFlags.NonPublic, [typeof(int)]); + private static readonly FieldInfo? VerticalScrollField = typeof(MultilineEditControl).GetField( + "_verticalScrollOffset", BindingFlags.Instance | BindingFlags.NonPublic); + private readonly PromptGutter _gutter; private bool _armed = true; private int _minRows = 3; @@ -574,7 +577,19 @@ private int WrappedRowCount(int fieldWidth) public override LayoutSize MeasureDOM(LayoutConstraints constraints) { var width = Width ?? constraints.MaxWidth; - ViewportHeight = InputLayout.Height(WrappedRowCount(FieldWidth(width)), MinRows, MaxRows); + var rows = WrappedRowCount(FieldWidth(width)); + ViewportHeight = InputLayout.Height(rows, MinRows, MaxRows); + + // A bar that grows lets the rows it scrolled past back into view. The editor scrolled to keep the caret on a + // row the viewport did not yet have (a newline typed into a one-row bar), and nothing in it scrolls back when + // the viewport is made taller: the bar would grow to two rows and show the second and a blank. Private, so by + // reflection, and a rename only costs that frame. + var most = Math.Max(0, rows - ViewportHeight); + if (VerticalScrollOffset > most) + { + VerticalScrollField?.SetValue(this, most); + } + return base.MeasureDOM(constraints); } diff --git a/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs b/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs index 1e6c56b3..e2e4a6c6 100644 --- a/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs +++ b/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs @@ -147,6 +147,14 @@ void HeaderActions(IReadOnlyList actions) void Chrome(ChromeOverlay chrome) { } + + /// + /// How many columns a terminal the size of the host's whole window would have: its cells plus the chrome it draws + /// beside them, in cells. Null when the cells are the whole window (the terminal, and the default). The client's + /// narrow layout measures this rather than the cells (SharpMUTermApp.LayoutColumns), because folding a + /// sidebar the host draws gives the cells its width: measured on the cells, the fold would undo itself. + /// + int? WindowColumns => null; } /// diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.ModeHints.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.ModeHints.cs new file mode 100644 index 00000000..a12cd463 --- /dev/null +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.ModeHints.cs @@ -0,0 +1,80 @@ +using SharpMUTerm.Client.Chrome; + +namespace SharpMUTerm.Tui; + +/// +/// The status row's mode-aware key hints. While the focused pane is scrolled back, split, frozen, carrying the ⌃F +/// result bar, or a docked composer holds the keyboard, the row's hint names that mode's keys instead of the pane +/// and tab chords — the way out of where you are outranks the way around. The keys come from +/// (Client), resolved through this host's spellings, so the row cannot name a chord the host +/// keeps for itself; the hint goes in only where it fits, like every other droppable cell on the row. +/// +internal sealed partial class SharpMUTermApp +{ + /// The mode the status row last named the keys of, so a change of mode alone repaints it. + private StatusMode _statusModeShown; + + /// + /// The mode the keyboard is in, as far as the status row is concerned, the highest first: an armed composer, the + /// focused window carrying the search bar, the focused pane frozen, split, or scrolled back. Internal for tests. + /// + internal StatusMode CurrentStatusMode() + { + if (ComposerArmed) + { + return StatusMode.Composer; + } + + var pane = _workspace.Layout.FocusedPane; + var windowId = pane.ActiveTab ?? MainWindowId; + if (_searchMark is { } mark && string.Equals(mark.WindowId, windowId, StringComparison.Ordinal)) + { + return StatusMode.SearchResult; + } + + if (pane.Frozen) + { + return StatusMode.Frozen; + } + + if (IsScrollSplit(windowId)) + { + return StatusMode.SplitScrollback; + } + + return ScrollTarget() is { CanScrollDown: true } ? StatusMode.ScrolledBack : StatusMode.None; + } + + /// + /// The row's candidates for , longest first, as markup: each key in the client's notice + /// voice and what it does dimmed, so the way out reads at a glance. Every candidate is exactly as wide as the + /// plain text gives, which is what the row measures. + /// + private List ModeHintMarkup(StatusMode mode) + { + var keys = HostKeyGlyphs(); + var hints = ModeHints.For(mode) + .Select(h => $"[{_ink.Notice}]{MarkupText.Escape(Client.Palette.KeyGlyphs.Normalize(h.Key.Resolve(keys)))}[/] [dim]{MarkupText.Escape(h.Does)}[/]") + .ToList(); + var candidates = new List(hints.Count); + for (var n = hints.Count; n > 0; n--) + { + candidates.Add(string.Join("[dim] · [/]", hints.Take(n))); + } + + return candidates; + } + + /// + /// Repaints the status row when the mode has changed since it was drawn. Rides the frame as well as the places + /// that change a mode, because a mode can begin with no key of ours (a click in a composer, the wheel). Never + /// displaces a notice: keeps it and the resting row comes back with the hint. + /// + private void SyncStatusMode() + { + if (CurrentStatusMode() != _statusModeShown) + { + RefreshStatusRow(); + } + } +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Narrow.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Narrow.cs new file mode 100644 index 00000000..326afb16 --- /dev/null +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Narrow.cs @@ -0,0 +1,84 @@ +using SharpMUTerm.Client.Chrome; + +namespace SharpMUTerm.Tui; + +/// +/// The layout below a comfortable size: the rail folds to its strip on its own, and an empty command line is one row +/// rather than the configured height. Both give their room to the output, which is what a narrow terminal is short of. +/// +/// Why 100 columns. A MU* server wraps at 78 or 80. The open rail with its divider and spacer takes about 20 +/// columns (more with long names), so a terminal of 100 still leaves the pane the 80 a server wraps to; below that every +/// other row of a room description ends in one stray word, which was the 80×24 finding. The folded strip costs 8, so +/// at 80 the pane is 72 instead of 60. +/// +/// +/// Why 30 rows, for the command line only. The two extra rows of an empty three-row command line are kept for +/// a line that wraps, and they cost output on every frame. At 30 rows the output keeps 24 or more with them, the +/// height servers page for; below it each one is a line of the game that is not shown. Width alone decides the rail: +/// a short terminal has columns to spare. +/// +/// +/// A player's own fold wins until the width next crosses the line. The automatic fold acts only when the width +/// moves from one side of to the other (and once at start), so ⌃B b, ⌃P and the window +/// sidebar's fold button are never undone by a resize that stays on one side. The fold is the same +/// _railCollapsed they toggle, published as , so whichever rail is drawn — +/// the cells' or the window's own sidebar — folds, and both hosts agree. +/// +/// +internal sealed partial class SharpMUTermApp +{ + /// Below this many columns the rail folds itself and an empty command line is one row. + internal const int NarrowColumns = 100; + + /// Below this many rows an empty command line is one row, whatever the width. + internal const int ShortRows = 30; + + /// Which side of the width was last seen on; null before the first look. + private bool? _narrowSeen; + + /// + /// The width the narrow layout is decided on: the whole window's in cells. In a terminal that is the cells; in a + /// window that draws its own sidebar it is the cells plus the sidebar (), + /// which a fold of that sidebar does not change — measured on the cells, folding would widen them past the line + /// and the next resize would unfold it again. + /// + internal int LayoutColumns() => _pointer?.WindowColumns ?? HeaderWidth(); + + /// Whether the layout is narrow: the rail folds itself. + internal bool IsNarrow() => LayoutColumns() < NarrowColumns; + + /// Whether an empty command line is one row: a narrow or a short window. + internal bool CompactInput() => IsNarrow() || HeaderHeight() < ShortRows; + + /// Whether the rail is folded, by the player or by the narrow layout. Internal for tests. + internal bool RailCollapsed => _railCollapsed; + + /// + /// Folds or unfolds the rail when the width has crossed since it was last looked at, + /// and on the first look. Called on every resize (and by tests, which have no resize to raise); returns whether it + /// changed the rail. + /// + internal bool SyncNarrowLayout() + { + var narrow = IsNarrow(); + if (_narrowSeen == narrow) + { + return false; + } + + _narrowSeen = narrow; + if (_railCollapsed == narrow) + { + return false; + } + + _railCollapsed = narrow; + if (_workspaceRow is not null) + { + RebuildPaneArea(); + } + + PublishHostChrome(); + return true; + } +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs index 3747e134..e8a7a11d 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs @@ -369,6 +369,7 @@ private void SyncComposerBands() _input.Armed = armed is null && ReferenceEquals(_armed, _input); _second.Armed = armed is null && ReferenceEquals(_armed, _second); + SyncStatusMode(); // the composer's keys on the status row, or the pane's again } /// Re-derives who holds the keyboard after the focused pane or window changed. diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index e7f81a73..dcfc1c58 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -852,6 +852,8 @@ public SharpMUTermApp( // The pane area renders the workspace's split tree (one TabControl per leaf pane). It's built // from the model and rebuilt whenever the layout changes; the initial row goes into the window. + // A narrow terminal starts with the rail folded (SyncNarrowLayout), so the first row is built that way. + SyncNarrowLayout(); _workspaceRow = BuildWorkspaceRow(); // The input area is one or two bars pinned above the status line. Each paints its own full-width @@ -956,6 +958,7 @@ public SharpMUTermApp( // laid out — so a report made here would announce a size that was already wrong. The // repaint this resize forces reports them once they are real; see ReportPaneSizes. RefreshHeader(); // re-align the status cluster to the new width + SyncNarrowLayout(); // fold or unfold the rail if the width crossed the narrow line SyncInputWidth(); // keep the input band spanning the full row after a resize SyncInputBars(); // and re-derive how tall the bars may grow in the new window }; @@ -1013,6 +1016,7 @@ public SharpMUTermApp( SyncMapSizes(); SyncPanelSizes(); SyncScrollSplitBars(); + SyncStatusMode(); }; // A modal that covers the main window entirely leaves it unpainted, so no PostBufferPaint says the native @@ -5637,9 +5641,12 @@ private void SyncInputBars() private void SyncInputHeights(bool secondShown) { var room = InputLayout.Room(HeaderHeight(), ChromeRows(), secondShown ? 2 : 1); + + // A narrow or short window starts an empty command line at one row; it still grows to MaxRows as it wraps. + var rows = CompactInput() ? InputSettings.MinRows : _config.Input.Rows; foreach (var bar in new[] { _input, _second }) { - bar.MinRows = Math.Min(_config.Input.Rows, room); + bar.MinRows = Math.Min(rows, room); bar.MaxRows = Math.Min(_config.Input.MaxRows, room); } } @@ -9350,6 +9357,7 @@ private void ToggleFreeze() } RebuildPaneArea(); + SyncStatusMode(); // ⌥F thaws, or the scrollback keys again } /// The custom link scheme the header's ☰ affordance uses to open the menu. @@ -13320,7 +13328,16 @@ private string NotConnectedMarkup() { var scrollback = ScrollbackStatus(); var suffix = scrollback.Length == 0 ? string.Empty : $" {scrollback}"; - return $"[dim]not connected · Graphics {Escape(_capabilities.Protocol.ToString())} · ⌃P palette · ⌃Q quit[/]{suffix}"; + var row = $"[dim]not connected · Graphics {Escape(_capabilities.Protocol.ToString())} · ⌃P palette · ⌃Q quit[/]{suffix}"; + + // A client with nothing connected is still read back through, frozen and searched: the mode's keys go on + // the end where they fit, the longest that does. + var mode = CurrentStatusMode(); + _statusModeShown = mode; + return mode != StatusMode.None + && ModeHintMarkup(mode).FirstOrDefault(h => MarkupWidth(row) + 3 + MarkupWidth(h) <= HeaderWidth()) is { } hint + ? $"{row} {hint}" + : row; } private void UpdateStatus() @@ -13796,6 +13813,42 @@ private string StatusBarMarkup(string character, string state) left = $"{left} {meters}"; } + // A mode's keys outrank the room and the MOO's status, and the encoding and the palette hint too: while the + // pane is scrolled back, frozen, carrying a search bar or a composer holds the keyboard, the way out is the + // thing the reader needs from this row. The longest candidate goes in that fits once as few of those two + // cells as it needs are given up (the encoding first, as the drop loop above does); a mode is temporary, and + // ⌃P is also on the header. The focus hints are not offered at all while a mode holds. + var mode = CurrentStatusMode(); + _statusModeShown = mode; + if (mode != StatusMode.None) + { + bool Fits(string hint, IEnumerable cluster) => + MarkupWidth(left) + 3 + MarkupWidth(hint) + MarkupWidth(string.Join(" ", cluster)) + MinStatusGap <= HeaderWidth(); + + var droppables = new[] { encodingCell, paletteCell }.OfType().Where(right.Contains).ToList(); + foreach (var hint in ModeHintMarkup(mode)) + { + var given = 0; + while (!Fits(hint, right.Except(droppables.Take(given))) && given < droppables.Count) + { + given++; + } + + if (!Fits(hint, right.Except(droppables.Take(given)))) + { + continue; + } + + right.RemoveAll(c => droppables.Take(given).Contains(c)); + + // Leftmost of the cluster but for the scrollback segment, which states the mode the hint answers. + right.Insert(right.Count > 0 && ScrollbackStatus().Length > 0 ? 1 : 0, hint); + break; + } + + rightBar = string.Join(" ", right); + } + // Where the character stands, once the map knows. A reserved width, so a walk does not move the right // cluster with every room name; a name too long for it is elided, never wrapped. if (StatusRoom() is { } here) @@ -13816,7 +13869,7 @@ private string StatusBarMarkup(string character, string state) } var room = HeaderWidth() - MarkupWidth(left) - MarkupWidth(rightBar) - MinStatusGap; - foreach (var focusHint in FocusHints()) + foreach (var focusHint in mode == StatusMode.None ? FocusHints() : []) { if (MarkupWidth(focusHint) + 3 <= room) { diff --git a/tests/SharpMUTerm.Avalonia.Tests/HostParityTests.cs b/tests/SharpMUTerm.Avalonia.Tests/HostParityTests.cs index 11259924..c402d8a7 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/HostParityTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/HostParityTests.cs @@ -1,4 +1,6 @@ using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Client.Palette; using SharpMUTerm.Graphics; using SharpMUTerm.Tui; using SharpMUTerm.Tui.Tests; @@ -214,6 +216,55 @@ await Assert.That(text).DoesNotContain(reserved.Chord.Text) } } + public static IEnumerable<(string Host, string View, StatusMode Mode, int Width, int Height)> ModeViews() => + from host in Hosts() + from view in new (string View, StatusMode Mode)[] + { + ("scrollback-up", StatusMode.SplitScrollback), + ("scrollback-split", StatusMode.SplitScrollback), + ("freeze", StatusMode.Frozen), + ("freeze-scrollback", StatusMode.Frozen), + ("search-landed", StatusMode.SearchResult), + ("panel-composer", StatusMode.Composer), + } + from size in new[] { (80, 24), (120, 32) } + select (host, view.View, view.Mode, size.Item1, size.Item2); + + /// + /// While a mode holds, the status row names that mode's keys — at least the first, the way out — as this host + /// spells them, and none of the chords the host keeps; and the row still fits on one row at 80 columns, where a + /// status line that wrapped once took a row off every pane and re-announced every pane's size. + /// + [Test] + [MethodDataSource(nameof(ModeViews))] + public async Task TheStatusRowNamesEachModesKeysAsThisHostSpellsThem(string name, string view, StatusMode mode, int width, int height) + { + var (keys, _) = HostNamed(name); + Console.SetIn(TextReader.Null); + using var headless = new HeadlessConsoleDriver(width, height); + await using var app = new SharpMUTermApp(DemoScene.Build(), ClientHost.Headless(headless, Caps) with { Keys = keys }); + var frame = app.RenderSnapshot(view); + + await Assert.That(app.CurrentStatusMode()).IsEqualTo(mode); + var glyphs = new SharpMUTerm.Client.Contributions.HostKeyGlyphs(keys.Newline.Glyph); + var status = System.Text.RegularExpressions.Regex.Replace(app.StatusMarkup, @"\[[^\]]*\]", string.Empty); + await Assert.That(status).Contains(ModeHints.Candidates(mode, glyphs)[^1]); + if (width >= 120) + { + await Assert.That(status).Contains(ModeHints.Candidates(mode, glyphs)[0]).Because("a wide row has room for every key"); + } + + foreach (var reserved in keys.Reserved) + { + await Assert.That(status).DoesNotContain(reserved.Chord.Glyph); + await Assert.That(status).DoesNotContain(KeyGlyphs.Normalize(reserved.Chord.Glyph)); + } + + await Assert.That(app.LaidOutRows.Status).IsEqualTo(1).Because("the status row never wraps"); + await Assert.That(SharpMUTermApp.MarkupWidth(app.StatusMarkup)).IsLessThanOrEqualTo(width); + await Assert.That(FrameGrid.Decode(frame, width, height)[height - 1]).Contains(ModeHints.Candidates(mode, glyphs)[^1]); + } + /// The chord the window names as its newline is one it hands the client, not one it keeps. [Test] public async Task TheWindowsNewlineIsNotOneOfItsOwnChords() diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativeChromeTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativeChromeTests.cs index 499bde6d..db436713 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/NativeChromeTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/NativeChromeTests.cs @@ -90,7 +90,7 @@ public async Task TheHeaderAndTheSidebarSitBesideTheCellsAndNoCellIsUnderThem() [Test] public async Task AFoldedRailIsASlimStripAndTheGridWidensIntoTheRoomItGaveBack() { - var (open, folded, openColumns, foldedColumns, rows) = await Run((window, view, layer, driver) => + var (open, folded, openColumns, foldedColumns, rows, openWindow, foldedWindow) = await Run((window, view, layer, driver) => { ((IPointerPresenter)driver.Pointer).Chrome(Overlay(_ => { })); Drain(); @@ -98,13 +98,21 @@ public async Task AFoldedRailIsASlimStripAndTheGridWidensIntoTheRoomItGaveBack() Drain(); var open = layer.Sidebar.Bounds.Width; var openColumns = driver.ScreenSize.Width; + var openWindow = ((IPointerPresenter)driver.Pointer).WindowColumns; ((IPointerPresenter)driver.Pointer).Chrome(Overlay(_ => { }, collapsed: true)); Drain(); window.UpdateLayout(); Drain(); - return (open, layer.Sidebar.Bounds.Width, openColumns, driver.ScreenSize.Width, layer.Sidebar.Rows.Select(r => r.Kind).ToArray()); + return (open, layer.Sidebar.Bounds.Width, openColumns, driver.ScreenSize.Width, layer.Sidebar.Rows.Select(r => r.Kind).ToArray(), + openWindow, ((IPointerPresenter)driver.Pointer).WindowColumns); }); + // The client's narrow layout reads the window's whole width, which the fold does not change: measured on the + // cells, the fold that widened them would read as the window growing past the line and undo itself. + await Assert.That(openWindow).IsNotNull(); + await Assert.That(openWindow!.Value).IsGreaterThan(openColumns); + await Assert.That(foldedWindow).IsEqualTo(openWindow); + await Assert.That(open).IsEqualTo(NativeLayout.SidebarWidth + NativeLayout.SidebarGutter); await Assert.That(folded).IsEqualTo(NativeLayout.SidebarSlim + NativeLayout.SidebarGutter); await Assert.That(foldedColumns).IsGreaterThan(openColumns); diff --git a/tests/SharpMUTerm.Avalonia.Tests/NewlineKeyTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NewlineKeyTests.cs index a5ab7c13..539080e3 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/NewlineKeyTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/NewlineKeyTests.cs @@ -18,8 +18,11 @@ public async Task CtrlOrShiftEnterBreaksTheLineInsteadOfSendingIt(bool ctrl, boo await Assert.That(before.Caret.Y).IsEqualTo(draftRow); // Still drafted, not sent, and the caret has gone down a row to the start of the new one. + // Below 100 columns the empty bar is one row and grows upwards by the row the newline added, so the draft is + // read off the frame after the key rather than assumed to have stayed where it was. await Assert.That(ClientResizeTests.Rows(after).Count(r => r.Contains("say hello there"))).IsEqualTo(1); - await Assert.That(after.Caret.Y).IsEqualTo(draftRow + 1); + var draftAfter = Array.FindIndex(ClientResizeTests.Rows(after), r => r.Contains("say hello there")); + await Assert.That(after.Caret.Y).IsEqualTo(draftAfter + 1); await Assert.That(after.Caret.X).IsLessThan(before.Caret.X); } } diff --git a/tests/SharpMUTerm.Client.Tests/ModeHintsTests.cs b/tests/SharpMUTerm.Client.Tests/ModeHintsTests.cs new file mode 100644 index 00000000..fdf963eb --- /dev/null +++ b/tests/SharpMUTerm.Client.Tests/ModeHintsTests.cs @@ -0,0 +1,51 @@ +using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Client.Contributions; + +namespace SharpMUTerm.Client.Tests; + +public class ModeHintsTests +{ + [Test] + public async Task NoModeNamesNoKeys() + { + await Assert.That(ModeHints.For(StatusMode.None)).IsEmpty(); + await Assert.That(ModeHints.Candidates(StatusMode.None, HostKeyGlyphs.Terminal)).IsEmpty(); + } + + [Test] + [Arguments(StatusMode.ScrolledBack)] + [Arguments(StatusMode.SplitScrollback)] + [Arguments(StatusMode.Frozen)] + [Arguments(StatusMode.SearchResult)] + [Arguments(StatusMode.Composer)] + public async Task EveryModeNamesAtLeastItsWayOutAndCandidatesShrinkFromTheEnd(StatusMode mode) + { + var candidates = ModeHints.Candidates(mode, HostKeyGlyphs.Terminal); + await Assert.That(candidates.Count).IsEqualTo(ModeHints.For(mode).Count); + await Assert.That(candidates.Count).IsGreaterThan(0); + for (var i = 1; i < candidates.Count; i++) + { + await Assert.That(candidates[i - 1]).StartsWith(candidates[i]).Because("a narrower row loses the last key, never the first"); + await Assert.That(candidates[i].Length).IsLessThan(candidates[i - 1].Length); + } + } + + [Test] + public async Task TheKeysAreTheOnesTheModesAnswer() + { + await Assert.That(ModeHints.Candidates(StatusMode.SplitScrollback, HostKeyGlyphs.Terminal)[0]).IsEqualTo("End returns · ⌥F freezes"); + await Assert.That(ModeHints.Candidates(StatusMode.Frozen, HostKeyGlyphs.Terminal)[0]).IsEqualTo("⌥F thaws"); + await Assert.That(ModeHints.Candidates(StatusMode.SearchResult, HostKeyGlyphs.Terminal)[^1]).IsEqualTo("⌥G next hit"); + await Assert.That(ModeHints.Candidates(StatusMode.Composer, HostKeyGlyphs.Terminal)[0]) + .IsEqualTo("⌃S sends · Esc releases · F1 full screen"); + } + + /// A key is written in the palette's one vocabulary, so a host's word spelling reads as a glyph. + [Test] + public async Task AHostSpelledKeyIsNormalisedToGlyphs() + { + var hint = new ModeHint(KeyHint.ForHost(HostKey.Newline), "breaks the line"); + await Assert.That(hint.Text(new HostKeyGlyphs("Ctrl+⏎"))).IsEqualTo("⌃⏎ breaks the line"); + await Assert.That(hint.Text(HostKeyGlyphs.Terminal)).IsEqualTo("⌥⏎ breaks the line"); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/InputAreaLayoutTests.cs b/tests/SharpMUTerm.Tui.Tests/InputAreaLayoutTests.cs index e8f9b730..438af39d 100644 --- a/tests/SharpMUTerm.Tui.Tests/InputAreaLayoutTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/InputAreaLayoutTests.cs @@ -125,7 +125,7 @@ private static int RowsPainted(string ansi, int width, int height, string backgr /// [Test] [Arguments(120, 34)] - [Arguments(100, 24)] + [Arguments(100, 30)] // the smallest size that keeps the configured rows (NarrowColumns, ShortRows) public async Task OneBar_GetsItsConfiguredRows_AndTheWorkspaceTakesTheRest(int width, int height) { var frame = Frame(width, height); @@ -143,7 +143,7 @@ await Assert.That(frame.Rows.Workspace) /// [Test] [Arguments(120, 34)] - [Arguments(100, 24)] + [Arguments(100, 30)] // the smallest size that keeps the configured rows (NarrowColumns, ShortRows) public async Task TwoBars_EachGetTheirRows_AndTheWorkspaceGivesThemUp(int width, int height) { Console.SetIn(TextReader.Null); @@ -171,7 +171,7 @@ await Assert.That(two.Header + two.Workspace + two.Primary + two.Second + two.St /// [Test] [Arguments(120, 34)] - [Arguments(100, 24)] + [Arguments(100, 30)] // the smallest size that keeps the configured rows (NarrowColumns, ShortRows) public async Task BothBands_ArePaintedForAsManyRowsAsTheyWereGiven(int width, int height) { // draft2 raises the second bar, puts a line in each, and arms the second — so the armed band diff --git a/tests/SharpMUTerm.Tui.Tests/NarrowLayoutTests.cs b/tests/SharpMUTerm.Tui.Tests/NarrowLayoutTests.cs new file mode 100644 index 00000000..40410aea --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/NarrowLayoutTests.cs @@ -0,0 +1,218 @@ +using System.Drawing; +using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Session; +using SharpMUTerm.Graphics; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// Below the rail folds itself and an empty command line is one row, so a +/// narrow terminal's room goes to the output. Pinned on the pane's width and on what the world is told over NAWS at +/// the three sizes the audit measured, on the player's own fold winning until the width next crosses the line, and on +/// the window's rail folding by the same rule through . +/// +/// Serialised: rendering a frame redirects the process-global Console.Out. +[NotInParallel] +public class NarrowLayoutTests +{ + private static readonly TerminalCapabilities Caps = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private sealed class WindowPresenter : IPointerPresenter + { + public int? Columns { get; set; } + + public List Published { get; } = []; + + public void Hover(PointerTarget target) + { + } + + public void ShowMenu(Point cell, IReadOnlyList items) + { + } + + public bool DrawsMenus => true; + + public void Scrollbars(IReadOnlyList bars) + { + } + + public void Chrome(ChromeOverlay chrome) => Published.Add(chrome); + + public int? WindowColumns => Columns; + } + + private static SharpMUTermApp App(int width, int height, HostChrome? chrome = null, IPointerPresenter? pointer = null, string? view = null) + { + Console.SetIn(TextReader.Null); + var host = ClientHost.Headless(new HeadlessConsoleDriver(width, height), Caps) with { Chrome = chrome ?? HostChrome.None, Pointer = pointer }; + var app = new SharpMUTermApp(DemoScene.Build(), host); + app.RenderSnapshot(view); + app.RenderNextFrame(); + return app; + } + + private static async Task ConnectMainAsync(SharpMUTermApp app) + { + var telnet = new RecordingTelnetSession(); + var session = new WorldSession(new WorldDefinition { Name = "W", Host = "h", Port = 1 }, sessionFactory: _ => telnet); + await session.ConnectAsync(); + app.AttachSession(session, SharpMUTermApp.MainWindowId); + app.RenderNextFrame(); + return telnet; + } + + /// + /// At 80×24 the rail is its strip and the command line one row: the pane is 72 columns where it was 60, and the + /// output is two rows taller. The world is told the pane it is really drawn in. + /// + [Test] + public async Task At80By24TheRailFoldsAndTheCommandLineIsOneRow() + { + await using var app = App(80, 24); + await Assert.That(app.RailCollapsed).IsTrue(); + await Assert.That(app.LaidOutRows.Primary).IsEqualTo(1); + + var telnet = await ConnectMainAsync(app); + var pane = app.PaneOutputRects().Values.Single(); + await Assert.That(pane.Width).IsGreaterThanOrEqualTo(72).Because("the folded strip and its divider cost 8 columns, the open rail 20"); + await Assert.That(pane.X + pane.Width).IsEqualTo(80); + await Assert.That(telnet.Sizes[^1]).IsEqualTo((pane.Width, pane.Height)); + } + + /// At 100×30 the layout is the full one: the open rail leaves the pane the 80 columns a server wraps at. + [Test] + public async Task At100By30TheRailIsOpenAndTheCommandLineKeepsItsRows() + { + await using var app = App(100, 30); + await Assert.That(app.RailCollapsed).IsFalse(); + await Assert.That(app.LaidOutRows.Primary).IsEqualTo(new InputSettings().Rows); + + var telnet = await ConnectMainAsync(app); + var pane = app.PaneOutputRects().Values.Single(); + await Assert.That(pane.Width).IsGreaterThanOrEqualTo(78).Because("100 is chosen so the open rail still leaves a server's wrap width"); + await Assert.That(telnet.Sizes[^1]).IsEqualTo((pane.Width, pane.Height)); + } + + [Test] + public async Task At120By32NothingFolds() + { + await using var app = App(120, 32); + await Assert.That(app.RailCollapsed).IsFalse(); + await Assert.That(app.LaidOutRows.Primary).IsEqualTo(new InputSettings().Rows); + + var telnet = await ConnectMainAsync(app); + var pane = app.PaneOutputRects().Values.Single(); + await Assert.That(telnet.Sizes[^1]).IsEqualTo((pane.Width, pane.Height)); + } + + /// A short but wide terminal keeps its rail and gives the command line's spare rows to the output. + [Test] + public async Task AShortWideTerminalKeepsItsRailAndStartsTheCommandLineAtOneRow() + { + await using var app = App(140, 24); + await Assert.That(app.RailCollapsed).IsFalse(); + await Assert.That(app.LaidOutRows.Primary).IsEqualTo(1); + } + + /// The one-row command line still grows as it wraps, as it always has. + [Test] + public async Task TheOneRowCommandLineGrowsAsItWraps() + { + await using var app = App(80, 24); + var rows = app.LaidOutRows; + foreach (var ch in new string('x', 200)) + { + app.SimulateKey(new ConsoleKeyInfo(ch, ConsoleKey.X, false, false, false)); + } + + app.RenderNextFrame(); + app.RenderNextFrame(); + await Assert.That(app.LaidOutRows.Primary).IsGreaterThan(1); + await Assert.That(app.LaidOutRows.Workspace).IsLessThan(rows.Workspace); + } + + /// + /// A newline typed into the one-row bar grows it to two and both rows are on screen: the editor had scrolled to + /// keep the caret on a row the viewport did not have yet, and the bar takes that scroll back when it grows. + /// + [Test] + public async Task ANewlineInTheOneRowBarShowsBothRows() + { + await using var app = App(80, 24); + app.SimulateKey(new ConsoleKeyInfo('\u001b', ConsoleKey.Escape, false, false, false)); + app.SimulateKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false)); + app.RenderNextFrame(); + var frame = app.RenderWholeFrame(); + + await Assert.That(app.LaidOutRows.Primary).IsEqualTo(2); + var rows = FrameGrid.Decode(frame, 80, 24); + await Assert.That(rows.Count(r => r.Contains("say hello there", StringComparison.Ordinal))).IsEqualTo(1); + } + + /// + /// ⌃B b (or ⌃P, or the window's fold button) wins over the automatic fold until the width crosses the line again: + /// a resize that stays on one side changes nothing the player chose. + /// + [Test] + public async Task APlayersFoldWinsUntilTheWidthCrossesTheLine() + { + var window = new WindowPresenter { Columns = 120 }; + await using var app = App(120, 32, HostChrome.HeaderAndRail, window); + await Assert.That(app.RailCollapsed).IsFalse(); + + // Folded by hand on a wide window, and kept through a resize that stays wide. + await Assert.That(app.DispatchCommand("layout:toggle-rail")).IsTrue(); + window.Columns = 110; + await Assert.That(app.SyncNarrowLayout()).IsFalse(); + await Assert.That(app.RailCollapsed).IsTrue(); + + // Narrowed: already folded, so nothing to do — and opened by hand, it stays open while it stays narrow. + window.Columns = 90; + app.SyncNarrowLayout(); + await Assert.That(app.RailCollapsed).IsTrue(); + await Assert.That(app.DispatchCommand("layout:toggle-rail")).IsTrue(); + window.Columns = 85; + await Assert.That(app.SyncNarrowLayout()).IsFalse(); + await Assert.That(app.RailCollapsed).IsFalse(); + + // Widened past the line and narrowed again: each crossing is the automatic fold's. + window.Columns = 120; + app.SyncNarrowLayout(); + await Assert.That(app.RailCollapsed).IsFalse(); + app.DispatchCommand("layout:toggle-rail"); + window.Columns = 95; + app.SyncNarrowLayout(); + await Assert.That(app.RailCollapsed).IsTrue(); + window.Columns = 125; + await Assert.That(app.SyncNarrowLayout()).IsTrue(); + await Assert.That(app.RailCollapsed).IsFalse(); + } + + /// + /// In a window that draws its own sidebar the fold is decided on the whole window's width, not the cells'; and the + /// host is told through the sidebar's model, so the rail it draws is the one that folds. + /// + [Test] + public async Task TheWindowsOwnSidebarFoldsByTheWindowsWidthNotTheCells() + { + // 90 columns of cells in a window 120 wide: the sidebar is open, and the cells are not what is measured. + var wide = new WindowPresenter { Columns = 120 }; + await using (var app = App(90, 30, HostChrome.HeaderAndRail, wide)) + { + await Assert.That(app.RailCollapsed).IsFalse(); + await Assert.That(wide.Published.Last().Sidebar.Collapsed).IsFalse(); + } + + // 90 columns of cells in a window 95 wide: narrow, so the window's sidebar folds and is told so. + var narrow = new WindowPresenter { Columns = 95 }; + await using var folded = App(90, 30, HostChrome.HeaderAndRail, narrow); + await Assert.That(folded.RailCollapsed).IsTrue(); + await Assert.That(narrow.Published.Last().Sidebar.Collapsed).IsTrue(); + await Assert.That(folded.BuildSidebar().Collapsed).IsTrue(); + } +} From 0f538f3af01e60cebcf47ab018d0f213a942c632 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 07:25:41 +0000 Subject: [PATCH 027/113] Notices as toasts in the window; area colours, stairs and a legend on both maps A notice is now a Client model (NoticeModel: text, severity, optional action command, time). The terminal draws the status row from it exactly as before; the window also shows it as a toast bottom-right above the pane area, held while hovered, faded after six seconds, never focused, and a click runs its action through the registry (refused unless a notice offered it). Declared as the `notice` surface with model and action probes in SurfaceParityTests. MapViewModel carries area colours (MapAreaPalette: stable per area name, dark and light sets that clear the floor on every theme), stairs flags and the area an exit leads to. The cell map colours rooms through Contrast.Legible and draws a one-line legend; the native map adds names at zoom, a hover plate, stairs marks, a current-room halo and a legend. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 6 + CLAUDE.md | 37 +- src/SharpMUTerm.Avalonia/DesktopLayer.cs | 28 ++ src/SharpMUTerm.Avalonia/MapCanvas.cs | 189 ++++++++++- src/SharpMUTerm.Avalonia/NoticeToasts.cs | 320 ++++++++++++++++++ src/SharpMUTerm.Avalonia/WindowPointer.cs | 18 + src/SharpMUTerm.Client/Chrome/NoticeModel.cs | 37 ++ .../Panels/MapAreaPalette.cs | 68 ++++ src/SharpMUTerm.Client/Panels/MapViewModel.cs | 122 ++++++- .../Surfaces/SurfaceCatalog.cs | 15 + src/SharpMUTerm.Tui/MapRenderer.cs | 187 ++++++++-- src/SharpMUTerm.Tui/Pointer/PointerTarget.cs | 9 + .../Pointer/SharpMUTermApp.Desktop.cs | 5 +- .../Pointer/SharpMUTermApp.Notices.cs | 171 ++++++++++ src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs | 7 +- src/SharpMUTerm.Tui/SharpMUTermApp.cs | 63 +++- src/SharpMUTerm.Tui/SnapshotViews.cs | 2 +- src/SharpMUTerm.Tui/WorkspacePalette.cs | 10 + .../NoticeToastTests.cs | 129 +++++++ .../SurfaceParityTests.cs | 30 ++ .../PanelModelTests.cs | 50 +++ .../SurfaceCatalogTests.cs | 2 +- .../MapAreaPaletteTests.cs | 79 +++++ .../NoticeAndMapSurfaceTests.cs | 166 +++++++++ .../SnapshotViewEmptyConfigTests.cs | 2 +- 25 files changed, 1669 insertions(+), 83 deletions(-) create mode 100644 src/SharpMUTerm.Avalonia/NoticeToasts.cs create mode 100644 src/SharpMUTerm.Client/Chrome/NoticeModel.cs create mode 100644 src/SharpMUTerm.Client/Panels/MapAreaPalette.cs create mode 100644 src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Notices.cs create mode 100644 tests/SharpMUTerm.Avalonia.Tests/NoticeToastTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/MapAreaPaletteTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/NoticeAndMapSurfaceTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 5aafdc4e..f4ba28d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,12 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- Desktop window: notices also appear as toasts in the bottom-right corner. They stay while you hover over them, + fade after a few seconds, and never take the keyboard. Some carry a button, such as *Change layout* or + *Reconnect*. The status row still shows each notice, as it does in the terminal. +- Maps colour each area, mark rooms with stairs up or down, and show a legend: a one-line legend under the map in + the terminal, and a legend in the corner in the desktop window. In the window, room names appear when you zoom + in, and hovering over a room shows its name. - Ctrl+P lists *Fold or unfold the connection rail*, the same fold as Ctrl+B b and as the desktop window's sidebar button. - Desktop window: the header and the connections sidebar now have room of their own — a full-height toolbar diff --git a/CLAUDE.md b/CLAUDE.md index 230e1f4f..b595bbf7 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -135,6 +135,16 @@ fallbacks) for inline images/maps. changes (`SyncMapSizes` on `PostBufferPaint`), never fed from a line buffer, so its control lives in `_mapControls` and not `_panes`. Its `LinkClicked` is its own and answers only `mux:map:` — the output panes' handler never sees a map link, and the map's never sees a send. + - **Both hosts draw the map from one `MapViewModel`, which carries the colours** (`MapAreaPalette`, Client; + `MapRenderer` cells, `MapCanvas` native). Each area's colour is picked by a stable hash of its name (FNV-1a, + so the same area is the same colour every run and in both hosts) from one of two eight-hue sets, dark-pane + and light-pane (`WorkspacePalette.DarkPanes`), because no fixed hex clears 3:1 on both kinds of theme; every + entry clears the floor on its themes' reading planes (`MapAreaPaletteTests`), and the cells still pass each + colour through `Contrast.Legible`. `Areas` lists the drawn area first, then areas reached by an exit. A room + carries `Up`/`Down` (an up/down exit or stub, or an exit to a room on another level) and `Elsewhere` (the + other area an exit leads to). The cells draw a one-line legend on the last row from 6 rows up — words go + first, then names shorten, then areas are counted (`+2`); it never wraps. The window adds names from zoom + 1.6, the hovered name on a plate, stairs triangles, a halo on the current room and a legend plate. - **A speedwalk sends one step and waits for the map to say it arrived** (`Speedwalk`); it goes through `SendCommandAsync`, so the recorder sees the step. It stops off the path, on the world's `WalkFailurePattern`, after `StepTimeout` with no room, and on disconnect. @@ -1056,8 +1066,8 @@ fallbacks) for inline images/maps. `mp! 23/120`, then `mp 23`) before a bar goes under 24 px. The UI font, not the cell font: this is the window's presentation. `hp`/`mp`/`mv` read as Health/Mana/Movement (`VitalsMeter.Title`). - **Not done**: the docked composer is still cells in the window; no animation on a - gauge change; the map draws one level and area, no exits between levels and no room colours/symbols; the - button's icon is the only header action. The window's menu is Avalonia's `ContextMenu`, which needs a second + gauge change; the map draws one level and area (other levels show only as stairs marks, other areas only as + a coloured spur), with no room symbols beyond the game's own; the button's icon is the only header action. The window's menu is Avalonia's `ContextMenu`, which needs a second click under a WM-less X server to take the first item (seen under Xvfb only). - **The header and the sidebar are data, and the window draws them natively beside the cells** (Client @@ -1257,6 +1267,27 @@ draws ⌃P natively (`INativePalette`, null for the cell popup), and which chrom model in Client, draw its cells from it through `Drawing(...)`, publish the same instance to the host, declare it in `SurfaceCatalog.All`, and add its model and action probes to `SurfaceParityTests`, whose coverage guards fail until you do. +- **A notice is a model, drawn as the status row's text in both hosts and as a toast in the window** + (`NoticeModel`/`NoticeSeverity`/`NoticeAction`, Client `Chrome/`; `SharpMUTermApp.Notices.cs`; `NoticeToasts`, + Avalonia; surface `notice`, `CellsUnderNative`; the `notices` view). `Notice(...)` builds one model per call + (`Drawing`), draws the row from it with the same markup as before (`NoticeMarkup`; terminal frames are + byte-identical) and publishes it through `IPointerPresenter.Notice`. Decisions not to relitigate: + - **The window keeps the status-row copy in cells.** The toast is an overlay above the cells, never a + replacement: `HostParityTests` compares cells, the row is what a screen reader and a keyboard user read + (the announcer speaks the same notice), and the row has rules of its own (reserved fields, drop order) a + toast must not fork. The cost is one notice said in two places in the window, for six seconds. + - **A toast never takes focus and nothing on it reaches the client**: not focusable, every press on a card is + the window's, a press beside the stack goes to the cells. The stack is bottom-right inside the cell area, + ending above the row the pane area ends at (`NoticeOverlay.AboveRow`), newest at the bottom, four at most. + It fades after `NoticeModel.Duration`, held while hovered (plus a 2 s grace). Right click dismisses. + - **An action is a registry command the client offered**: a click runs `NoticeOverlay.Run` → + `RunNoticeAction`, which refuses a command no recent notice carried, then `DispatchCommand`. The cells' way to + the same door is ⌃P (`CellsVia: term:messages`). Three notices carry one so far: the layout suggestion + (*Change layout*), "switched to … · offline" (*Reconnect*) and the orphan trigger-set notice (*Open F5*). + - **Severity is mapped from `MessageSeverity`**: Info → info, Error → warning (a failure), Warning → refusal + (the default voice of `Notice`). Edge colours are the accent, `ScreenPalette.Warn` and the notice ink, held to + 4.5:1 on the status plane because they also ink the key chip and the action line. + - The message log (⌃P ▸ *Show client messages*) stays the history; a toast keeps nothing. - **Every surface that names a key is read once per host** (`EverySurfaceNamesThisHostsKeys`): ⌃P and `--help` must name the host's newline and none of the chords the host keeps (`HostKeys.Reserved`, which `TerminalView` acts on, so the window's chords and the list are one). The help page is one writer @@ -1344,7 +1375,7 @@ python3 tools/ansi_frame_to_image.py frame.ansi frame.html # or .svg `menu-fuzzy` (`trig sel` typed into ⌃P after a real drag, so the trigger builder's entry is offered — the frame showing a two-word fuzzy match highlighted), `menu-recent` (⌃P opened empty after two commands ran through the palette's own path, `RunFromPalette` — RECENT at the top, newest first, listed once), - `messages`, `quit`, `connections` (**two connections on one world** — the one view where the header's + `messages`, `notices` (two notices with a refusal between them, the first carrying an action — the window shows them as toasts over the same cells), `quit`, `connections` (**two connections on one world** — the one view where the header's fraction, the rail's dots and the quit prompt's count are all visible together and all have to agree; every other view has at most one character connected per world, which is what hid a header dividing connections by *worlds* and a quit prompt reducing them to distinct world names), `characters` (**two diff --git a/src/SharpMUTerm.Avalonia/DesktopLayer.cs b/src/SharpMUTerm.Avalonia/DesktopLayer.cs index cc6c25a7..d454a25f 100644 --- a/src/SharpMUTerm.Avalonia/DesktopLayer.cs +++ b/src/SharpMUTerm.Avalonia/DesktopLayer.cs @@ -46,6 +46,8 @@ internal sealed class DesktopLayer : Canvas private readonly NativeSidebar _sidebar; private readonly Dictionary _whoHere = new(StringComparer.Ordinal); private readonly Dictionary _quickBars = new(StringComparer.Ordinal); + private readonly NoticeToasts _toasts; + private int _noticeAboveRow; /// The cells. /// @@ -68,6 +70,16 @@ public DesktopLayer(TerminalView view, HostChrome chrome) _sidebar = new NativeSidebar(view) { IsVisible = false }; Children.Add(_header); Children.Add(_sidebar); + + // The toasts last, over everything: a notice is the one thing the window says over a panel. + _toasts = new NoticeToasts(); + Children.Add(_toasts); + _pointer.NoticeSaid += notice => Dispatcher.UIThread.Post(() => + { + _noticeAboveRow = notice.AboveRow; + Sync(); + _toasts.Show(notice); + }); _view.Repainted += Sync; SyncInsets(collapsed: false); Sync(); @@ -133,8 +145,24 @@ internal void Sync() SyncChrome(); SyncButtons(frame, cell); SyncPanels(frame, cell); + SyncToasts(frame, cell); } + /// The toasts over the cell area, their stack sitting on the row the client said the pane area ends at. + private void SyncToasts(ScreenFrame frame, Size cell) + { + var origin = CellOrigin; + SetLeft(_toasts, origin.X); + SetTop(_toasts, origin.Y); + _toasts.Width = Math.Max(0, frame.Width * cell.Width); + _toasts.Height = Math.Max(0, frame.Height * cell.Height); + var above = _noticeAboveRow > 0 && _noticeAboveRow < frame.Height ? _noticeAboveRow : Math.Max(0, frame.Height - 2); + _toasts.Bottom = above * cell.Height; + } + + /// The notice toasts. Internal for tests. + internal NoticeToasts Toasts => _toasts; + /// /// The native header across the top and the sidebar down the left, when the window draws them — always, a modal in /// front included: the client draws its modals in the cells, which no longer reach under either, so the chrome diff --git a/src/SharpMUTerm.Avalonia/MapCanvas.cs b/src/SharpMUTerm.Avalonia/MapCanvas.cs index 3e718b04..9d2787f5 100644 --- a/src/SharpMUTerm.Avalonia/MapCanvas.cs +++ b/src/SharpMUTerm.Avalonia/MapCanvas.cs @@ -150,7 +150,8 @@ protected override void OnPointerMoved(PointerEventArgs e) { _hovered = room?.Id; Cursor = new Cursor(room is null ? StandardCursorType.Arrow : StandardCursorType.Hand); - ToolTip.SetTip(this, room is null ? null : room.Current ? $"{room.Name} — you are here" : $"{room.Name} — click to walk here"); + // The name is drawn on the canvas beside the room; the tip says only what a click does. + ToolTip.SetTip(this, room is null || room.Current ? null : "Click to walk here"); InvalidateVisual(); } } @@ -202,6 +203,41 @@ internal void ZoomAbout(Point point, double notches) // ── Drawing ─────────────────────────────────────────────────────────────────────────────── + /// The zoom from which every room's name is written under it, not only the hovered one's. + internal const double NamesFromZoom = 1.6; + + /// + /// The colour a room is drawn in: its area's, as the view gives it (), or the + /// text colour faded when the area has no name. Internal for tests, which hold it to the model's hex. + /// + internal Color AreaColourOf(MapViewRoom room) => + _model.AreaColour is { } hex ? Parse(hex) : Faded(0.55); + + /// The colour of the area a room's way out leads into, or null. Internal for tests. + internal Color? ElsewhereColourOf(MapViewRoom room) => + _model.ColourOf(room.Elsewhere) is { } hex ? Parse(hex) : null; + + /// + /// The legend's entries, in the order drawn: you, the stairs marks when a room has them, a walk under way, then + /// every area the view names in its colour. Internal for tests. + /// + internal IReadOnlyList<(string Label, Color Swatch)> LegendEntries() + { + var entries = new List<(string, Color)> { ("you", Parse(_ink.Bar)) }; + if (_model.Rooms.Any(r => r.Up || r.Down)) + { + entries.Add(("stairs up / down", Faded(0.85))); + } + + if (_model.Rooms.Any(r => r.Ahead)) + { + entries.Add(("walk", Parse(_ink.Low))); + } + + entries.AddRange(_model.Areas.Select(a => (a.Name, Parse(a.Colour)))); + return entries; + } + public override void Render(DrawingContext context) { var bounds = new Rect(Bounds.Size); @@ -225,39 +261,62 @@ public override void Render(DrawingContext context) var size = RoomSize; var accent = Parse(_ink.Bar); var path = Parse(_ink.Low); - var plainFill = new SolidColorBrush(Mix(_plane, _text, 0.16)); - var plainEdge = new Pen(new SolidColorBrush(Faded(0.55)), 1.2); var radius = size * 0.22; + var names = Zoom >= NamesFromZoom; foreach (var room in _model.Rooms) { var c = CentreOf(room); var rect = new Rect(c.X - (size / 2), c.Y - (size / 2), size, size); - if (!rect.Intersects(bounds)) + if (!rect.Inflate(size).Intersects(bounds)) { continue; } + // A way into another area: a short spur off the room's corner, in that area's colour. + if (ElsewhereColourOf(room) is { } elsewhere) + { + var spur = new Pen(new SolidColorBrush(elsewhere), Math.Clamp(2 * Zoom, 1.5, 3), lineCap: PenLineCap.Round); + context.DrawLine(spur, rect.BottomRight - new Vector(size * 0.1, size * 0.1), rect.BottomRight + new Vector(size * 0.32, size * 0.32)); + context.DrawEllipse(new SolidColorBrush(elsewhere), null, rect.BottomRight + new Vector(size * 0.36, size * 0.36), size * 0.12, size * 0.12); + } + + var area = AreaColourOf(room); if (room.Current) { - // A soft halo, then the room in the accent: the one thing the eye should find first. - context.DrawRectangle(new SolidColorBrush(Color.FromArgb(0x40, accent.R, accent.G, accent.B)), null, rect.Inflate(size * 0.22), radius * 1.6, radius * 1.6); + // A soft halo and a ring, then the room in the accent: the one thing the eye should find first. + context.DrawRectangle(new SolidColorBrush(Color.FromArgb(0x38, accent.R, accent.G, accent.B)), null, rect.Inflate(size * 0.34), radius * 2, radius * 2); + context.DrawRectangle(null, new Pen(new SolidColorBrush(Color.FromArgb(0xB0, accent.R, accent.G, accent.B)), 1.5), rect.Inflate(size * 0.2), radius * 1.6, radius * 1.6); context.DrawRectangle(new SolidColorBrush(accent), new Pen(new SolidColorBrush(Mix(accent, Colors.White, 0.35)), 1.5), rect, radius, radius); - continue; + } + else + { + var fill = new SolidColorBrush(Mix(_plane, area, room.Id == _hovered ? 0.55 : 0.3)); + var edge = room.Ahead ? new Pen(new SolidColorBrush(path), 2.2) : new Pen(new SolidColorBrush(area), 1.4); + context.DrawRectangle(fill, edge, rect, radius, radius); + if (room.Locked) + { + var lockPen = new Pen(new SolidColorBrush(Faded(0.7)), 1.2); + context.DrawLine(lockPen, rect.TopLeft + new Vector(size * 0.25, size * 0.25), rect.BottomRight - new Vector(size * 0.25, size * 0.25)); + } } - var fill = room.Id == _hovered ? new SolidColorBrush(Mix(_plane, _text, 0.3)) : plainFill; - var edge = room.Ahead ? new Pen(new SolidColorBrush(path), 2) : plainEdge; - context.DrawRectangle(fill, edge, rect, radius, radius); - if (room.Locked) + DrawStairs(context, room, rect, room.Current ? Contrasting(accent) : _text); + + if ((names || room.Id == _hovered) && room.Id != _hovered) { - var lockPen = new Pen(new SolidColorBrush(Faded(0.6)), 1.2); - context.DrawLine(lockPen, rect.TopLeft + new Vector(size * 0.25, size * 0.25), rect.BottomRight - new Vector(size * 0.25, size * 0.25)); + DrawName(context, room.Name, c, size, plate: false); } } + // The hovered room's name last, on a plate, so it reads over its neighbours. + if (_hovered is { } hoveredId && byId.TryGetValue(hoveredId, out var hovered)) + { + DrawName(context, hovered.Current ? $"{hovered.Name} — you are here" : hovered.Name, CentreOf(hovered), size, plate: true); + } + // What and where, in the corner: the area and level, and a walk under way. - var label = _model.Area is { Length: > 0 } area ? $"{area} · level {_model.Level}" : $"level {_model.Level}"; - DrawText(context, label, new Point(10, 8), 12, Faded(0.75)); + var label = _model.Area is { Length: > 0 } areaName ? $"{areaName} · level {_model.Level}" : $"level {_model.Level}"; + DrawText(context, label, new Point(10, 8), 12, _model.AreaColour is { } areaHex ? Parse(areaHex) : Faded(0.75)); if (_model.Walking is { } walking) { DrawText(context, walking, new Point(10, 26), 12, path); @@ -266,8 +325,108 @@ public override void Render(DrawingContext context) { DrawText(context, here.Name, new Point(10, 26), 12, accent); } + + DrawLegend(context, bounds); + } + + /// Up and down marks: a small triangle at the top of the room for a way up, at the bottom for a way down. + private void DrawStairs(DrawingContext context, MapViewRoom room, Rect rect, Color ink) + { + if (!room.Up && !room.Down) + { + return; + } + + var brush = new SolidColorBrush(Color.FromArgb(0xE0, ink.R, ink.G, ink.B)); + var w = rect.Width * 0.26; + var h = rect.Height * 0.2; + var mid = rect.Center.X; + if (room.Up) + { + var top = rect.Y + (rect.Height * 0.16); + context.DrawGeometry(brush, null, Triangle(new Point(mid, top), new Point(mid - w, top + h), new Point(mid + w, top + h))); + } + + if (room.Down) + { + var bottom = rect.Bottom - (rect.Height * 0.16); + context.DrawGeometry(brush, null, Triangle(new Point(mid, bottom), new Point(mid - w, bottom - h), new Point(mid + w, bottom - h))); + } + } + + private static StreamGeometry Triangle(Point a, Point b, Point c) + { + var geometry = new StreamGeometry(); + using var g = geometry.Open(); + g.BeginFigure(a, isFilled: true); + g.LineTo(b); + g.LineTo(c); + g.EndFigure(isClosed: true); + return geometry; } + /// A room's name centred under it; on a plate of the pane's own colour when . + private void DrawName(DrawingContext context, string name, Point centre, double size, bool plate) + { + var maxWidth = plate ? 280 : Math.Max(30, (Spacing * Zoom) - 4); + var text = PanelText.Format(name, 11, plate ? _text : Faded(0.8), bold: plate, maxWidth); + var at = new Point(centre.X - (text.Width / 2), centre.Y + (size / 2) + 3); + if (plate) + { + var back = new Rect(at.X - 6, at.Y - 2, text.Width + 12, text.Height + 4); + context.DrawRectangle(new SolidColorBrush(Mix(_plane, _text, 0.12)), new Pen(new SolidColorBrush(Faded(0.35)), 1), back, 4, 4); + } + else + { + // The pane's own plane behind the words, so an exit line passing under a room does not strike them out. + context.DrawRectangle(new SolidColorBrush(Color.FromArgb(0xD0, _plane.R, _plane.G, _plane.B)), null, new Rect(at.X - 2, at.Y, text.Width + 4, text.Height), 2, 2); + } + + context.DrawText(text, at); + } + + /// + /// The legend, in the bottom-left corner on a plate: you, the stairs, a walk, and each area in its colour. Drawn only + /// where it fits, and it never takes the pointer from a room under it (the canvas hit-tests rooms only). + /// + private void DrawLegend(DrawingContext context, Rect bounds) + { + var entries = LegendEntries(); + const double size = 11, row = 16, pad = 8, swatch = 9; + var widest = entries.Max(e => PanelText.Measure(e.Label, size, bold: false)); + var width = pad + swatch + 6 + widest + pad; + var height = (pad * 2) + (entries.Count * row) - (row - size - 3); + if (width > bounds.Width * 0.6 || height > bounds.Height * 0.6) + { + return; + } + + var plate = new Rect(10, bounds.Height - height - 10, width, height); + context.DrawRectangle(new SolidColorBrush(Color.FromArgb(0xE6, _plane.R, _plane.G, _plane.B)), new Pen(new SolidColorBrush(Faded(0.25)), 1), plate, 5, 5); + var y = plate.Y + pad; + foreach (var (label, colour) in entries) + { + var mark = new Rect(plate.X + pad, y + 2, swatch, swatch); + if (label == "stairs up / down") + { + var brush = new SolidColorBrush(colour); + context.DrawGeometry(brush, null, Triangle(new Point(mark.Center.X, mark.Y), new Point(mark.X, mark.Center.Y - 0.5), new Point(mark.Right, mark.Center.Y - 0.5))); + context.DrawGeometry(brush, null, Triangle(new Point(mark.Center.X, mark.Bottom), new Point(mark.X, mark.Center.Y + 0.5), new Point(mark.Right, mark.Center.Y + 0.5))); + } + else + { + context.DrawRectangle(new SolidColorBrush(colour), null, mark, 2, 2); + } + + context.DrawText(PanelText.Format(label, size, Faded(0.85), bold: false, widest + 1), new Point(mark.Right + 6, y)); + y += row; + } + } + + /// Black or white, whichever reads on : the stairs marks on the accent room. + private static Color Contrasting(Color fill) => + (0.299 * fill.R) + (0.587 * fill.G) + (0.114 * fill.B) > 140 ? Color.FromRgb(0x10, 0x10, 0x14) : Colors.White; + private static void DrawText(DrawingContext context, string text, Point at, double size, Color colour) => context.DrawText( new FormattedText(text, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, Typeface.Default, size, new SolidColorBrush(colour)) diff --git a/src/SharpMUTerm.Avalonia/NoticeToasts.cs b/src/SharpMUTerm.Avalonia/NoticeToasts.cs new file mode 100644 index 00000000..2b1f0fc8 --- /dev/null +++ b/src/SharpMUTerm.Avalonia/NoticeToasts.cs @@ -0,0 +1,320 @@ +using System.Diagnostics; +using System.Globalization; +using Avalonia; +using Avalonia.Automation; +using Avalonia.Controls; +using Avalonia.Input; +using Avalonia.Media; +using Avalonia.Threading; +using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Avalonia; + +/// +/// The client's notices as toasts: stacked at the bottom right of the cell area, just above the command line and the +/// status row, newest at the bottom. Each is the very the status row's cells were drawn from +/// (which still carry it underneath — the toast is an overlay, so the cells are what they are in a terminal), and the +/// message log stays the history: a toast fades after and is not kept. +/// +/// Input. Only a toast is hit: the control paints nothing between its toasts, and Avalonia hits only what was +/// painted, so everywhere else in the control the pointer goes through to the cells. While the pointer is over a toast it stays, and for a moment after it leaves. A left click on +/// a toast with an action runs it — through , the registry, never a command the window +/// built — and a click without one, or a right click, dismisses it. Nothing here is focusable, so a toast never takes +/// the keyboard from the command line. +/// +/// +internal sealed class NoticeToasts : Control +{ + /// How many toasts are stacked at once; an older one is retired when a fifth arrives. + internal const int MaxShown = 4; + + /// How long a toast takes to fade once its time is up. + internal static readonly TimeSpan FadeTime = TimeSpan.FromMilliseconds(450); + + /// How long a toast stays after the pointer leaves it. + internal static readonly TimeSpan HoverGrace = TimeSpan.FromSeconds(2); + + private const double Inset = 12, Gap = 8, Padding = 10, EdgeWidth = 4, CardWidth = 380, TextSize = 13, ChipSize = 11; + + private readonly List _toasts = []; + private readonly Stopwatch _clock = Stopwatch.StartNew(); + private readonly DispatcherTimer _timer; + private Point? _pointer; + + public NoticeToasts() + { + Focusable = false; + IsTabStop = false; + ClipToBounds = true; + _timer = new DispatcherTimer(TimeSpan.FromMilliseconds(50), DispatcherPriority.Background, (_, _) => Tick()); + AutomationProperties.SetName(this, "Notices"); + } + + /// The toasts on screen, oldest first. Internal for tests. + internal IReadOnlyList Shown => _toasts.Select(t => t.Overlay.Notice).ToList(); + + /// The bottom of the stack, in this control's coordinates: just above the pane area's last row. + internal double Bottom { get; set; } + + /// Shows a notice the client said. A toast for the same notice (by sequence) is not shown twice. + public void Show(NoticeOverlay overlay) + { + ArgumentNullException.ThrowIfNull(overlay); + if (_toasts.Any(t => t.Overlay.Notice.Sequence == overlay.Notice.Sequence)) + { + return; + } + + _toasts.Add(new Toast(overlay, _clock.Elapsed)); + while (_toasts.Count > MaxShown) + { + _toasts.RemoveAt(0); + } + + _timer.Start(); + InvalidateVisual(); + } + + /// + /// Runs or dismisses the toast showing notice , as a left click on it does. Internal for + /// tests; a real click comes through . + /// + internal void Click(long sequence) + { + var toast = _toasts.FirstOrDefault(t => t.Overlay.Notice.Sequence == sequence); + if (toast is null) + { + return; + } + + _toasts.Remove(toast); + if (toast.Overlay.Notice.Action is { } action) + { + toast.Overlay.Run(action.Command); + } + + InvalidateVisual(); + } + + /// Moves every toast's clock on by , as time passing would. Internal for tests. + internal void Advance(TimeSpan by) + { + foreach (var toast in _toasts) + { + toast.Shown -= by; + toast.HeldUntil -= by; + } + + Tick(); + } + + /// Where each toast is drawn, oldest first, in this control's coordinates. Internal for tests. + internal IReadOnlyList Rects() => Layout().Select(l => l.Rect).ToList(); + + private void Tick() + { + var now = _clock.Elapsed; + var hovered = HoveredToast(); + foreach (var toast in _toasts) + { + if (toast == hovered) + { + toast.HeldUntil = now + HoverGrace; + } + } + + var before = _toasts.Count; + _toasts.RemoveAll(t => FadeOf(t, now) <= 0); + if (_toasts.Count == 0) + { + _timer.Stop(); + } + + if (before != _toasts.Count || _toasts.Any(t => Fading(t, now))) + { + InvalidateVisual(); + } + } + + private static TimeSpan Due(Toast toast) => toast.Shown + NoticeModel.Duration > toast.HeldUntil ? toast.Shown + NoticeModel.Duration : toast.HeldUntil; + + private static bool Fading(Toast toast, TimeSpan now) => now > Due(toast); + + private static double FadeOf(Toast toast, TimeSpan now) + { + var past = (now - Due(toast)).TotalMilliseconds; + return past <= 0 ? 1 : Math.Max(0, 1 - (past / FadeTime.TotalMilliseconds)); + } + + private Toast? HoveredToast() => + _pointer is { } at ? Layout().LastOrDefault(l => l.Rect.Contains(at)).Toast : null; + + // ── Layout ─────────────────────────────────────────────────────────────────────────────── + + private readonly record struct Placed(Toast Toast, Rect Rect, FormattedText Text, FormattedText? Chip, FormattedText? Action); + + private List Layout() + { + var placed = new List(); + var width = Math.Min(CardWidth, Bounds.Width - (2 * Inset)); + if (width < 120 || _toasts.Count == 0) + { + return placed; + } + + var bottom = (Bottom > 0 ? Math.Min(Bottom, Bounds.Height) : Bounds.Height) - Gap; + var x = Bounds.Width - Inset - width; + + // Newest at the bottom: lay out from the newest upwards, then hand them back oldest first. + for (var i = _toasts.Count - 1; i >= 0; i--) + { + var toast = _toasts[i]; + var palette = toast.Overlay.Palette; + var ink = PanelText.Parse(palette.Text); + var inner = width - EdgeWidth - (2 * Padding); + var chip = toast.Overlay.Notice.Key is { } key ? Format(key, ChipSize, PanelText.Parse(palette.Edge(toast.Overlay.Notice.Severity)), bold: true, inner) : null; + var textWidth = inner - (chip is null ? 0 : chip.Width + 8); + var text = Format(toast.Overlay.Notice.Text, TextSize, ink, bold: false, Math.Max(40, textWidth), lines: 3); + var action = toast.Overlay.Notice.Action is { } a ? Format($"{a.Label} ›", ChipSize, PanelText.Parse(palette.Edge(toast.Overlay.Notice.Severity)), bold: true, inner) : null; + var height = (2 * Padding) + text.Height + (action is null ? 0 : action.Height + 6); + var top = bottom - height; + if (top < Inset) + { + break; + } + + placed.Insert(0, new Placed(toast, new Rect(x, top, width, height), text, chip, action)); + bottom = top - Gap; + } + + return placed; + } + + private static FormattedText Format(string text, double size, Color colour, bool bold, double maxWidth, int lines = 1) => + new(text, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, + new Typeface(FontFamily.Default, FontStyle.Normal, bold ? FontWeight.SemiBold : FontWeight.Normal), size, new SolidColorBrush(colour)) + { + MaxTextWidth = Math.Max(1, maxWidth), + MaxLineCount = lines, + Trimming = TextTrimming.CharacterEllipsis, + }; + + // ── Input ──────────────────────────────────────────────────────────────────────────────── + + internal bool Hits(Point point) => Layout().Any(l => l.Rect.Contains(point)); + + protected override void OnPointerMoved(PointerEventArgs e) + { + base.OnPointerMoved(e); + _pointer = e.GetPosition(this); + var over = HoveredToast(); + Cursor = new Cursor(over?.Overlay.Notice.Action is not null ? StandardCursorType.Hand : StandardCursorType.Arrow); + ToolTip.SetTip(this, over?.Overlay.Notice.Action is { } action ? $"{action.Label} — click" : over is null ? null : "Click to dismiss"); + e.Handled = true; + Tick(); + } + + protected override void OnPointerExited(PointerEventArgs e) + { + base.OnPointerExited(e); + _pointer = null; + ToolTip.SetTip(this, null); + } + + protected override void OnPointerPressed(PointerPressedEventArgs e) + { + base.OnPointerPressed(e); + e.Handled = true; + var at = e.GetPosition(this); + var hit = Layout().LastOrDefault(l => l.Rect.Contains(at)); + if (hit.Toast is null) + { + return; + } + + var point = e.GetCurrentPoint(this); + if (point.Properties.IsRightButtonPressed) + { + _toasts.Remove(hit.Toast); + InvalidateVisual(); + return; + } + + if (point.Properties.IsLeftButtonPressed) + { + Click(hit.Toast.Overlay.Notice.Sequence); + } + } + + protected override void OnPointerReleased(PointerReleasedEventArgs e) + { + base.OnPointerReleased(e); + e.Handled = true; + } + + protected override void OnPointerWheelChanged(PointerWheelEventArgs e) + { + base.OnPointerWheelChanged(e); + e.Handled = true; + } + + // ── Drawing ────────────────────────────────────────────────────────────────────────────── + + public override void Render(DrawingContext context) + { + var now = _clock.Elapsed; + var hovered = HoveredToast(); + foreach (var (toast, rect, text, chip, action) in Layout()) + { + var palette = toast.Overlay.Palette; + var plane = PanelText.Parse(palette.Plane); + var edge = PanelText.Parse(palette.Edge(toast.Overlay.Notice.Severity)); + using var _ = context.PushOpacity(FadeOf(toast, now)); + + // A soft shadow, the card, and the severity edge down its left side. + context.DrawRectangle(new SolidColorBrush(Color.FromArgb(0x50, 0, 0, 0)), null, rect.Translate(new Vector(0, 2)).Inflate(1), 7, 7); + var lift = toast == hovered ? 0.08 : 0; + context.DrawRectangle( + new SolidColorBrush(Mix(plane, PanelText.Parse(palette.Text), lift)), + new Pen(new SolidColorBrush(Color.FromArgb(0x60, edge.R, edge.G, edge.B)), 1), + rect, + 6, + 6); + using (context.PushClip(new RoundedRect(rect, 6))) + { + context.FillRectangle(new SolidColorBrush(edge), new Rect(rect.X, rect.Y, EdgeWidth, rect.Height)); + } + + var x = rect.X + EdgeWidth + Padding; + var y = rect.Y + Padding; + if (chip is not null) + { + var chipRect = new Rect(x - 3, y + 1, chip.Width + 6, chip.Height); + context.DrawRectangle(new SolidColorBrush(Color.FromArgb(0x30, edge.R, edge.G, edge.B)), null, chipRect, 3, 3); + context.DrawText(chip, new Point(x, y + 1)); + x += chip.Width + 8; + } + + context.DrawText(text, new Point(x, y)); + if (action is not null) + { + context.DrawText(action, new Point(rect.X + EdgeWidth + Padding, y + text.Height + 6)); + } + } + } + + private static Color Mix(Color from, Color to, double amount) => Color.FromRgb( + (byte)(from.R + ((to.R - from.R) * amount)), + (byte)(from.G + ((to.G - from.G) * amount)), + (byte)(from.B + ((to.B - from.B) * amount))); + + private sealed class Toast(NoticeOverlay overlay, TimeSpan shown) + { + public NoticeOverlay Overlay { get; } = overlay; + + public TimeSpan Shown { get; set; } = shown; + + public TimeSpan HeldUntil { get; set; } + } +} diff --git a/src/SharpMUTerm.Avalonia/WindowPointer.cs b/src/SharpMUTerm.Avalonia/WindowPointer.cs index a372c140..f37fb8ad 100644 --- a/src/SharpMUTerm.Avalonia/WindowPointer.cs +++ b/src/SharpMUTerm.Avalonia/WindowPointer.cs @@ -81,4 +81,22 @@ void IPointerPresenter.Chrome(ChromeOverlay chrome) Volatile.Write(ref _chrome, chrome); ChromeChanged?.Invoke(); } + + private IReadOnlyList _notices = []; + + /// The notices the client has said, newest last, the most recent . + public IReadOnlyList Notices => Volatile.Read(ref _notices); + + /// How many notices are kept for the toasts; the message log is the history. + public const int NoticesKept = 8; + + /// Raised on the client's thread with each notice the client says. + public event Action? NoticeSaid; + + void IPointerPresenter.Notice(NoticeOverlay notice) + { + var next = Notices.Append(notice).TakeLast(NoticesKept).ToList(); + Volatile.Write(ref _notices, next); + NoticeSaid?.Invoke(notice); + } } diff --git a/src/SharpMUTerm.Client/Chrome/NoticeModel.cs b/src/SharpMUTerm.Client/Chrome/NoticeModel.cs new file mode 100644 index 00000000..e557033a --- /dev/null +++ b/src/SharpMUTerm.Client/Chrome/NoticeModel.cs @@ -0,0 +1,37 @@ +namespace SharpMUTerm.Client.Chrome; + +/// How loud a notice is. Each host says it in its own way: the status row by ink, a toast by its edge. +public enum NoticeSeverity +{ + /// Something happened that the player asked for (a character switched, a layout applied). + Info, + + /// Something failed: a connection that would not open, a settings file that would not save. + Warning, + + /// The client declined to do what was asked, or did less than the label promised (the default). + Refusal, +} + +/// A command a notice offers, by registry id, with what a host may call it. +/// The command id; run through the client's registry, never built by a host. +/// What the action does, for a button or a tooltip (Reconnect). +public sealed record NoticeAction(string Command, string Label); + +/// +/// One notice, as data: the client's display-message, said once and gone in a few seconds. The terminal draws +/// it on the status row (SharpMUTermApp.NoticeMarkup); the window draws the same instance as a toast over the +/// cells. Every notice is kept in the client message log as well (⌃P ▸ Show client messages), which is the history: +/// neither view keeps one. +/// +/// What it says, as plain text. +/// How loud it is. +/// An optional chip naming the surface that spoke (⌃B, ⌃P, ⌥M). +/// A command the notice offers, or null. Only the window can offer it as a click. +/// When it was said, on the client's clock. +/// Counts the run's notices, so two that say the same thing are still two. +public sealed record NoticeModel(string Text, NoticeSeverity Severity, string? Key, NoticeAction? Action, DateTimeOffset At, long Sequence) +{ + /// How long a notice holds the status row, and how long a toast stays before it fades. + public static readonly TimeSpan Duration = TimeSpan.FromSeconds(6); +} diff --git a/src/SharpMUTerm.Client/Panels/MapAreaPalette.cs b/src/SharpMUTerm.Client/Panels/MapAreaPalette.cs new file mode 100644 index 00000000..237e5508 --- /dev/null +++ b/src/SharpMUTerm.Client/Panels/MapAreaPalette.cs @@ -0,0 +1,68 @@ +namespace SharpMUTerm.Client.Panels; + +/// +/// The colours a map gives its areas: one per area name, the same every run and in both hosts, from a closed +/// set of eight hues. +/// +/// Two sets of hexes, one set of hues. A colour is read against the pane it lands on, and the pane planes of a +/// dark theme and a light one leave no colour that clears the legibility floor (3:1) on both: the darkest plane a +/// Light pane can wear wants a foreground no brighter than about 0.13 in relative luminance, the brightest a Dark or +/// Solarized Dark pane can wear wants one no darker than about 0.18. So each hue has a dark-theme hex and a +/// light-theme hex, and the client picks the set by its theme (). The index an area gets is the same +/// in both, so an area keeps its hue when the theme changes. MapAreaPaletteTests holds every hex to the floor +/// against every pane plane of the themes it serves. +/// +/// +/// The index is a hash of the name (FNV-1a over its characters, ordinal), never , +/// which changes from run to run. Two areas can share a hue; the legend names them, and an area's name is the second +/// cue wherever its colour is the first. +/// +/// +public sealed class MapAreaPalette +{ + private readonly string[] _colours; + + private MapAreaPalette(string name, string[] colours) + { + Name = name; + _colours = colours; + } + + /// Amber, jade, azure, orchid, coral, moss, cyan, lavender — for a dark theme's panes. + public static MapAreaPalette Dark { get; } = new( + "dark", + ["#e0a458", "#5ec79f", "#7fa8ff", "#e08fd6", "#f08a7e", "#b5c46a", "#5cc3dc", "#b9a2ff"]); + + /// The same hues, deep enough for a light theme's panes. + public static MapAreaPalette Light { get; } = new( + "light", + ["#7a4600", "#0f6a4a", "#2a52b0", "#86307c", "#a02c22", "#4c5a06", "#0b5a6e", "#5b3aa8"]); + + /// Which set this is (dark, light). + public string Name { get; } + + /// The colours, by index. + public IReadOnlyList Colours => _colours; + + /// The set for a theme whose panes are dark () or light. + public static MapAreaPalette For(bool darkPanes) => darkPanes ? Dark : Light; + + /// The index gets in every set. + public static int IndexOf(string area) + { + ArgumentNullException.ThrowIfNull(area); + unchecked + { + var hash = 2166136261u; + foreach (var c in area) + { + hash = (hash ^ c) * 16777619u; + } + + return (int)(hash % 8u); + } + } + + /// The colour of the area called , as #rrggbb. + public string Colour(string area) => _colours[IndexOf(area)]; +} diff --git a/src/SharpMUTerm.Client/Panels/MapViewModel.cs b/src/SharpMUTerm.Client/Panels/MapViewModel.cs index 334578fb..e62bccbd 100644 --- a/src/SharpMUTerm.Client/Panels/MapViewModel.cs +++ b/src/SharpMUTerm.Client/Panels/MapViewModel.cs @@ -10,23 +10,38 @@ namespace SharpMUTerm.Client.Panels; /// Whether the character is in it. /// Whether a walk under way still goes through it. /// Whether the player locked it out of paths. -public sealed record MapViewRoom(long Id, string Name, int X, int Y, bool Current, bool Ahead, bool Locked); +/// Whether it has a way to a level above: an up exit, or any exit to a room higher up. +/// Whether it has a way to a level below. +/// +/// The name of another area one of its exits leads into (the first by name), or null. Both views mark the way out in +/// that area's colour (). +/// +public sealed record MapViewRoom( + long Id, string Name, int X, int Y, bool Current, bool Ahead, bool Locked, bool Up = false, bool Down = false, string? Elsewhere = null); /// A drawn exit between two rooms of the view, once per pair. public sealed record MapViewExit(long From, long To); +/// An area a view names, with the colour every view draws it in. +/// The area's name, bounded; the game's text. +/// Its colour as #rrggbb, from : stable for the name. +/// True for the area the view draws; false for one its exits lead into. +public sealed record MapViewArea(string Name, string Colour, bool Drawn); + /// /// The part of a character's map a view draws: the rooms of the current room's area on its level, nearest the -/// current room first and bounded, with the exits between them. The terminal draws its map from the recorder in -/// cells (MapRenderer); the window draws this as a canvas over the same pane. A click on a room is handed -/// back by id to the client, which walks there through the same speedwalk a cell click uses. +/// current room first and bounded, with the exits between them, which rooms have a way up or down, which lead into +/// another area, and the colour of every area named. The terminal draws its map in cells (MapRenderer) and the +/// window draws a canvas over the same pane, both from this, so they cannot disagree about where the character is, +/// what colour an area is or which rooms have stairs. A click on a room is handed back by id to the client, which +/// walks there through the same speedwalk a cell click uses. /// public sealed record MapViewModel(string? Area, int Level, IReadOnlyList Rooms, IReadOnlyList Exits, string? Walking) { /// The most rooms a view is given: the nearest to the current room are kept. public const int MaxRooms = 1500; - /// The longest room name a view is given. + /// The longest room or area name a view is given. public const int MaxNameLength = 80; /// @@ -35,16 +50,36 @@ public sealed record MapViewModel(string? Area, int Level, IReadOnlyList public long? AnchorId { get; init; } + /// + /// The areas the view names, with their colours: the drawn area first (when it has a name), then every area an + /// exit of a drawn room leads into, by name. Both views read their area colours here and nowhere else, and both + /// draw their legend from this list. + /// + public IReadOnlyList Areas { get; init; } = []; + /// The room the character is in, or null. public MapViewRoom? Current => Rooms.FirstOrDefault(r => r.Current); + /// The colour of the area the view draws, or null when that area has no name. + public string? AreaColour => Areas.FirstOrDefault(a => a.Drawn)?.Colour; + + /// The colour the view gives the area called , or null when it names no such area. + public string? ColourOf(string? name) => + name is null ? null : Areas.FirstOrDefault(a => string.Equals(a.Name, name, StringComparison.Ordinal))?.Colour; + /// /// The view of around . With no current room, the level /// and area of the most recently added room are drawn, so a map recorded earlier still shows. /// - public static MapViewModel From(WorldMap map, long? currentRoomId, IEnumerable ahead, string? walking) + /// The map. + /// The character's room, or null. + /// The rooms a walk under way still goes through. + /// What the walk says about itself, or null. + /// The area colours for the theme in use ( by default). + public static MapViewModel From(WorldMap map, long? currentRoomId, IEnumerable ahead, string? walking, MapAreaPalette? palette = null) { ArgumentNullException.ThrowIfNull(map); + palette ??= MapAreaPalette.Dark; var anchor = currentRoomId is { } id ? map.Room(id) : null; anchor ??= map.Rooms.Values.LastOrDefault(); if (anchor is null) @@ -60,12 +95,15 @@ public static MapViewModel From(WorldMap map, long? currentRoomId, IEnumerable new MapViewRoom( r.Id, - r.Name.Length <= MaxNameLength ? r.Name : r.Name[..(MaxNameLength - 1)] + "…", + Bounded(r.Name), r.X, r.Y, r.Id == currentRoomId, path.Contains(r.Id), - r.Locked)) + r.Locked, + Climbs(map, r, up: true), + Climbs(map, r, up: false), + Elsewhere(map, r))) .ToList(); var ids = rooms.Select(r => r.Id).ToHashSet(); var exits = new List(); @@ -87,14 +125,72 @@ public static MapViewModel From(WorldMap map, long? currentRoomId, IEnumerable(); + if (area is not null) + { + areas.Add(new MapViewArea(area, palette.Colour(area), Drawn: true)); + } + + foreach (var other in rooms.Select(r => r.Elsewhere).OfType().Distinct(StringComparer.Ordinal).Order(StringComparer.Ordinal)) + { + if (!string.Equals(other, area, StringComparison.Ordinal)) + { + areas.Add(new MapViewArea(other, palette.Colour(other), Drawn: false)); + } + } + + return new MapViewModel(area, anchor.Z, rooms, exits, walking) { AnchorId = anchor.Id, Areas = areas }; + } + + private static string Bounded(string name) => name.Length <= MaxNameLength ? name : name[..(MaxNameLength - 1)] + "…"; + + /// An area's name, bounded, or null for none. + private static string? AreaName(WorldMap map, int? areaId) => + areaId is { } id && map.Areas.TryGetValue(id, out var named) && !string.IsNullOrWhiteSpace(named.Name) + ? Bounded(named.Name) + : null; + + /// Whether has a way up (or down): the direction itself, or an exit to another level. + private static bool Climbs(WorldMap map, MapRoom room, bool up) + { + var direction = up ? "up" : "down"; + if (room.Exits.ContainsKey(direction) || room.Stubs.Contains(direction)) + { + return true; + } + + foreach (var (_, _, to) in room.AllExits()) + { + if (map.Room(to) is { } next && (up ? next.Z > room.Z : next.Z < room.Z)) + { + return true; + } + } + + return false; + } + + /// The first other area, by name, that an exit of leads into. + private static string? Elsewhere(WorldMap map, MapRoom room) + { + string? first = null; + foreach (var (_, _, to) in room.AllExits()) + { + if (map.Room(to) is { } next && next.AreaId != room.AreaId && AreaName(map, next.AreaId) is { } name + && (first is null || string.CompareOrdinal(name, first) < 0)) + { + first = name; + } + } + + return first; } - /// Value equality over the rooms and exits, which a record's list members do not give. + /// Value equality over the rooms, exits and areas, which a record's list members do not give. public bool Equals(MapViewModel? other) => other is not null && Area == other.Area && Level == other.Level && Walking == other.Walking && AnchorId == other.AnchorId - && Rooms.SequenceEqual(other.Rooms) && Exits.SequenceEqual(other.Exits); + && Rooms.SequenceEqual(other.Rooms) && Exits.SequenceEqual(other.Exits) && Areas.SequenceEqual(other.Areas); - public override int GetHashCode() => HashCode.Combine(Area, Level, Walking, Rooms.Count, Exits.Count); + public override int GetHashCode() => HashCode.Combine(Area, Level, Walking, Rooms.Count, Exits.Count, Areas.Count); } diff --git a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs index 1f576228..4764fd3a 100644 --- a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs +++ b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs @@ -139,6 +139,9 @@ public static class SurfaceCatalog /// The folded sidebar: a strip of dots in cells, the window's narrow native strip. public const string RailStrip = "rail-strip"; + /// A notice: the status row's message in cells, and in the window a toast over them as well. + public const string Notice = "notice"; + /// /// The header and the rail: cells in a terminal; in the window (HostChrome.HeaderAndRail) native views /// beside the cells, which then leave them out. @@ -269,6 +272,18 @@ public static class SurfaceCatalog }, "SharpMUTerm.Tui.CommandSurfaceRenderer.Render", ["SharpMUTerm.Avalonia.PaletteOverlay"]), + new( + Notice, + typeof(NoticeModel), + [ + // The toast's click runs the action the client put in the notice. The status row is not a button; the + // action is a registry command, so the cells reach it as a ⌃P entry, and the message log is where a + // notice that has gone is found again. + new(SurfaceActionKind.Target, "action", "RunNoticeAction", CellsVia: "term:messages"), + ], + CellsUnderNative, + "SharpMUTerm.Tui.SharpMUTermApp.NoticeMarkup", + ["SharpMUTerm.Avalonia.NoticeToasts"]), ]; /// The surface with , or null. diff --git a/src/SharpMUTerm.Tui/MapRenderer.cs b/src/SharpMUTerm.Tui/MapRenderer.cs index 5349cc17..f3c6c25c 100644 --- a/src/SharpMUTerm.Tui/MapRenderer.cs +++ b/src/SharpMUTerm.Tui/MapRenderer.cs @@ -2,6 +2,7 @@ using System.Text; using SharpMUTerm.Client.Panels; using SharpMUTerm.Core.Mapping; +using SharpMUTerm.Core.Text; namespace SharpMUTerm.Tui; @@ -11,16 +12,23 @@ namespace SharpMUTerm.Tui; /// A room is three cells, [ ], and the grid is four columns by two rows, which leaves one cell /// between rooms for an east–west line and one row for the north–south and diagonal ones. The middle cell says /// what the room is: @ where you are, the room's own symbol when it has one, an arrow when it has a way -/// up or down, otherwise blank. A room on the walk ahead wears the notice ink; a locked one the draft ink. +/// up or down (the view's /), otherwise blank. A room is +/// drawn in its area's colour (); a room on the walk ahead wears the notice ink, +/// a locked one the draft ink, and an exit into another area is drawn in that area's colour. Every area +/// colour is the view's, held to the legibility floor on the pane (), which leaves the +/// palette's hexes as they are. /// /// /// Each room is a link ( and its number), which the map window's own handler /// answers by walking there. The payload is never a mux:send:: what a click on a map does is the -/// client's decision, and nothing on the map is text a server chose — room names are drawn only in the title. +/// client's decision, and nothing on the map is text a server chose — room and area names are drawn only in the +/// title and the legend. /// /// /// An exit leading to a room off this level or area is drawn as its first segment only; an unexplored exit -/// (a stub) is drawn dim. Nothing is drawn past the box it was given, so a map can never wrap. +/// (a stub) is drawn dim. Nothing is drawn past the box it was given, so a map can never wrap. With room for it +/// ( rows), the last row is a one-line legend: @ you, the stairs marks when any +/// room has one, and each area the view names in its colour. /// /// internal static class MapRenderer @@ -32,8 +40,14 @@ internal static class MapRenderer internal const int CellHeight = 2; - /// The inks a map is drawn in. Hexes, already held to the legibility floor by the caller. - internal readonly record struct Ink(string Title, string Current, string Path, string Locked); + /// The fewest rows a map needs before it spends one on the legend. + internal const int LegendMinHeight = 6; + + /// + /// The inks a map is drawn in. Hexes, already held to the legibility floor by the caller; + /// is the pane plane the area colours are held to, or null to draw them as the view gives them. + /// + internal readonly record struct Ink(string Title, string Current, string Path, string Locked, Rgb? Plane = null); private enum Kind { @@ -46,7 +60,7 @@ private enum Kind Locked, } - private readonly record struct Cell(char Glyph, Kind Kind, long? Room); + private readonly record struct Cell(char Glyph, Kind Kind, long? Room, string? Colour = null); /// The room number a map link names, or null for anything else. internal static long? ParseLink(string url) => @@ -71,9 +85,10 @@ internal static List Render( /// /// The map as rows at most, each at most cells. The first - /// row is the title; the rest is the grid. Where, which level, who is where and whether a walk is under way - /// are the view's (the model the window's native map is drawn from), so the two cannot centre on different - /// rooms or title different areas. Only the exits' geometry (directions, stubs, ways off the level), which the + /// row is the title; the rest is the grid, and the legend under it when there is room. Where, which level, who + /// is where, whether a walk is under way, which rooms have stairs and what colour each area is are the view's + /// (the model the window's native map is drawn from), so the two cannot centre on different rooms, title different + /// areas or colour them differently. Only the exits' geometry (directions, stubs, ways off the level), which the /// view does not carry, is read from . An empty map says so. /// internal static List Render(MapViewModel view, WorldMap map, int width, int height, Ink ink) @@ -110,9 +125,12 @@ internal static List Render(MapViewModel view, WorldMap map, int width, return lines; } - var rows = height - 1; + var legend = height >= LegendMinHeight; + var rows = height - 1 - (legend ? 1 : 0); var grid = new Cell[rows, width]; var ahead_ = ahead.ToHashSet(); + var byId = view.Rooms.ToDictionary(r => r.Id); + var roomInk = AreaInk(view.AreaColour, ink); // Rooms are placed so the centre room's middle cell lands in the middle of the box. var originCol = width / 2 - 1; @@ -124,7 +142,7 @@ internal static List Render(MapViewModel view, WorldMap map, int width, .Where(r => r.Z == centre.Z && r.AreaId == centre.AreaId) .ToList(); - void Put(int col, int row, char glyph, Kind kind, long? room = null) + void Put(int col, int row, char glyph, Kind kind, long? room = null, string? colour = null) { if (row < 0 || row >= rows || col < 0 || col >= width) { @@ -142,22 +160,27 @@ void Put(int col, int row, char glyph, Kind kind, long? room = null) return; } - grid[row, col] = new Cell(glyph, kind, room); + grid[row, col] = new Cell(glyph, kind, room, colour); } foreach (var room in level) { var (col, row) = At(room); - foreach (var (_, key, _) in room.AllExits()) + foreach (var (_, key, to) in room.AllExits()) { - Connect(col, row, key, Kind.Line); + // A way into another area is drawn in that area's colour, which is the view's. + var into = map.Room(to) is { } next && next.AreaId != room.AreaId && next.AreaId is { } areaId + && map.Areas.TryGetValue(areaId, out var area) + ? AreaInk(view.ColourOf(area.Name), ink) + : null; + Connect(col, row, key, Kind.Line, into); } foreach (var stub in room.Stubs) { if (MapDirections.Normalise(stub) is { } direction) { - Connect(col, row, direction, Kind.Stub); + Connect(col, row, direction, Kind.Stub, null); } } } @@ -169,9 +192,10 @@ void Put(int col, int row, char glyph, Kind kind, long? room = null) : room.Locked ? Kind.Locked : ahead_.Contains(room.Id) ? Kind.Path : Kind.Room; - Put(col, row, '[', kind, room.Id); - Put(col + 1, row, Middle(room, current), kind, room.Id); - Put(col + 2, row, ']', kind, room.Id); + var colour = kind == Kind.Room ? roomInk : null; + Put(col, row, '[', kind, room.Id, colour); + Put(col + 1, row, Middle(room, byId.GetValueOrDefault(room.Id), current), kind, room.Id, colour); + Put(col + 2, row, ']', kind, room.Id, colour); } for (var row = 0; row < rows; row++) @@ -179,41 +203,138 @@ void Put(int col, int row, char glyph, Kind kind, long? room = null) lines.Add(Row(grid, row, width, ink)); } + if (legend) + { + lines.Add(Legend(view, width, ink)); + } + return lines; - void Connect(int col, int row, string direction, Kind kind) + void Connect(int col, int row, string direction, Kind kind, string? colour) { switch (direction) { case "east": - Put(col + 3, row, '─', kind); + Put(col + 3, row, '─', kind, colour: colour); break; case "west": - Put(col - 1, row, '─', kind); + Put(col - 1, row, '─', kind, colour: colour); break; case "south": - Put(col + 1, row + 1, '│', kind); + Put(col + 1, row + 1, '│', kind, colour: colour); break; case "north": - Put(col + 1, row - 1, '│', kind); + Put(col + 1, row - 1, '│', kind, colour: colour); break; case "southeast": - Put(col + 3, row + 1, '╲', kind); + Put(col + 3, row + 1, '╲', kind, colour: colour); break; case "northwest": - Put(col - 1, row - 1, '╲', kind); + Put(col - 1, row - 1, '╲', kind, colour: colour); break; case "southwest": - Put(col - 1, row + 1, '╱', kind); + Put(col - 1, row + 1, '╱', kind, colour: colour); break; case "northeast": - Put(col + 3, row - 1, '╱', kind); + Put(col + 3, row - 1, '╱', kind, colour: colour); break; } } } - private static char Middle(MapRoom room, long? current) + /// + /// An area colour from the view, held to the floor on the pane. The palette clears it on every built-in theme, + /// so this returns the view's hex unchanged there; a custom theme may move it. + /// + internal static string? AreaInk(string? colour, Ink ink) + { + if (colour is null || ink.Plane is not { } plane || !TryParse(colour, out var rgb)) + { + return colour; + } + + var legible = Contrast.Legible(rgb, plane); + return legible == rgb ? colour : $"#{legible.R:x2}{legible.G:x2}{legible.B:x2}"; + } + + private static bool TryParse(string hex, out Rgb rgb) + { + rgb = default; + if (hex.Length != 7 || hex[0] != '#' + || !byte.TryParse(hex.AsSpan(1, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out var r) + || !byte.TryParse(hex.AsSpan(3, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out var g) + || !byte.TryParse(hex.AsSpan(5, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out var b)) + { + return false; + } + + rgb = new Rgb(r, g, b); + return true; + } + + /// + /// The one-line legend: where you are, the stairs marks when a room has one, a walk under way, then each area in + /// its colour. The areas are what a narrow pane keeps longest: the words beside the marks go first (@ you + /// becomes @), then area names are shortened, and only then are areas counted (+2) instead of named. + /// It never wraps. + /// + private static string Legend(MapViewModel view, int width, Ink ink) + { + var stairs = view.Rooms.Any(r => r.Up || r.Down); + var walk = view.Rooms.Any(r => r.Ahead); + List<(string Markup, int Length)> Marks(bool words) + { + var marks = new List<(string, int)> { ($"[bold {ink.Current}]@[/]" + (words ? " [dim]you[/]" : string.Empty), words ? 5 : 1) }; + if (stairs) + { + marks.Add(("[dim]↑↓" + (words ? " stairs" : string.Empty) + "[/]", words ? 9 : 2)); + } + + if (walk) + { + marks.Add(($"[{ink.Path}][[ ]][/]" + (words ? " [dim]walk[/]" : string.Empty), words ? 8 : 3)); + } + + return marks; + } + + List<(string Markup, int Length)> Areas(int cap) => view.Areas + .Select(a => + { + var name = a.Name.Length <= cap ? a.Name : a.Name[..(cap - 1)] + "…"; + return (Markup: $"[{AreaInk(a.Colour, ink)}]■[/] [dim]{MarkupText.Escape(name)}[/]", Length: 2 + name.Length); + }) + .ToList(); + + for (var keep = view.Areas.Count; keep >= 0; keep--) + { + foreach (var words in new[] { true, false }) + { + foreach (var cap in LegendNameCaps) + { + var items = Marks(words).Concat(Areas(cap).Take(keep)).ToList(); + if (keep < view.Areas.Count) + { + var more = $"+{view.Areas.Count - keep}"; + items.Add(($"[dim]{more}[/]", more.Length)); + } + + if (items.Sum(i => i.Length) + (3 * (items.Count - 1)) <= width) + { + return string.Join(" [dim]·[/] ", items.Select(i => i.Markup)); + } + } + } + } + + return Fit(string.Join(" [dim]·[/] ", Marks(words: false).Select(p => p.Markup)), width); + } + + /// The lengths an area name is shortened through, longest first, before an area is counted instead. + private static readonly int[] LegendNameCaps = [24, 14, 8]; + + + private static char Middle(MapRoom room, MapViewRoom? seen, long? current) { if (room.Id == current) { @@ -225,8 +346,9 @@ private static char Middle(MapRoom room, long? current) return room.Symbol[0]; } - var up = room.Exits.ContainsKey("up"); - var down = room.Exits.ContainsKey("down"); + // The stairs are the view's, so the window's marks and these arrows are one answer. + var up = seen?.Up ?? false; + var down = seen?.Down ?? false; return up && down ? '↕' : up ? '↑' : down ? '↓' : ' '; } @@ -254,7 +376,7 @@ private static string Row(Cell[,] grid, int row, int width, Ink ink) { var cell = grid[row, col]; var end = col + 1; - while (end <= last && grid[row, end].Kind == cell.Kind && grid[row, end].Room == cell.Room) + while (end <= last && grid[row, end].Kind == cell.Kind && grid[row, end].Room == cell.Room && grid[row, end].Colour == cell.Colour) { end++; } @@ -268,7 +390,8 @@ private static string Row(Cell[,] grid, int row, int width, Ink ink) var escaped = MarkupText.Escape(text.ToString()); var styled = cell.Kind switch { - Kind.Blank or Kind.Line or Kind.Room => escaped, + Kind.Blank => escaped, + Kind.Line or Kind.Room => cell.Colour is { } colour ? $"[{colour}]{escaped}[/]" : escaped, Kind.Stub => $"[dim]{escaped}[/]", Kind.Current => $"[bold {ink.Current}]{escaped}[/]", Kind.Path => $"[{ink.Path}]{escaped}[/]", diff --git a/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs b/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs index 1e6c56b3..24db4485 100644 --- a/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs +++ b/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs @@ -147,6 +147,15 @@ void HeaderActions(IReadOnlyList actions) void Chrome(ChromeOverlay chrome) { } + + /// + /// A notice was said, as it is drawn on the status row. The status row's cells carry it in every host; a host that + /// draws notices natively (the window's toasts) shows this over the cells and ignores nothing else. It must never + /// take focus. A host that draws none ignores this (the default). + /// + void Notice(NoticeOverlay notice) + { + } } /// diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Desktop.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Desktop.cs index f062d66f..069b2a8f 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Desktop.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Desktop.cs @@ -298,11 +298,14 @@ private void PickFromPanel(string windowId, string sessionKey, int index) } var walking = map.Walk.IsWalking ? $"walking, {map.Walk.Remaining} to go" : null; - var model = MapViewModel.From(map.Map, map.Recorder.CurrentRoomId, map.Walk.RoomsAhead, walking); + var model = MapViewModel.From(map.Map, map.Recorder.CurrentRoomId, map.Walk.RoomsAhead, walking, MapPalette()); _mapViews[windowId] = (revision, model); return model; } + /// The map's area colours for the theme in use: the set that clears the floor on its panes. + private MapAreaPalette MapPalette() => MapAreaPalette.For(WorkspacePalette.DarkPanes(_theme)); + /// What the host was last told about panels. Internal for tests. internal IReadOnlyList PanelOverlays => _panelOverlays; } diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Notices.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Notices.cs new file mode 100644 index 00000000..16d17960 --- /dev/null +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Notices.cs @@ -0,0 +1,171 @@ +using System.Globalization; +using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Client.Surfaces; +using SharpMUTerm.Core.Diagnostics; +using SharpMUTerm.Core.Text; +using static SharpMUTerm.Tui.MarkupText; + +namespace SharpMUTerm.Tui; + +/// +/// The notice surface (): one per , +/// drawn by the terminal on the status row (, unchanged from before the model existed) and +/// handed to a host that draws notices natively () as the same instance. The +/// window's toast is an overlay: the status row's cells still carry the notice under it in every host, so the cells +/// of both hosts stay the same and the message log (⌃P ▸ Show client messages) stays the one history. +/// +internal sealed partial class SharpMUTermApp +{ + /// How many notices this run has raised; each model's . + private long _noticeSequence; + + /// The action commands of the notices a host was handed, newest last, so a click can be checked against them. + private readonly List _noticeActionsOffered = []; + + /// The most notice actions remembered; a host offers a click only while its toast is up. + private const int NoticeActionsKept = 16; + + /// The one callback every published notice carries, so a host compares overlays by value. + private Action? _noticeRun; + + /// + /// The log's severity in the notice's words. The log's Warning is "the client refused or did less" — a + /// refusal; its Error is "something failed" — the notice's warning. + /// + internal static NoticeSeverity NoticeSeverityOf(MessageSeverity severity) => severity switch + { + MessageSeverity.Info => NoticeSeverity.Info, + MessageSeverity.Error => NoticeSeverity.Warning, + _ => NoticeSeverity.Refusal, + }; + + /// + /// The status row's markup for a notice: the key chip in the notice ink, then the text — in the warning red when + /// something failed, otherwise dim. The cell renderer of the notice surface; byte for byte what the row drew + /// before the model existed. + /// + internal string NoticeMarkup(NoticeModel notice) + { + ArgumentNullException.ThrowIfNull(notice); + var body = notice.Severity == NoticeSeverity.Warning + ? $"[{ScreenPalette.Warn}]{Escape(notice.Text)}[/]" + : $"[dim]{Escape(notice.Text)}[/]"; + return notice.Key is null ? body : $"[{_ink.Notice}]{Escape(notice.Key)}[/] {body}"; + } + + /// Hands a notice to a host that draws notices natively; nothing for one that does not. + private void PublishNotice(NoticeModel notice) + { + if (_pointer is null) + { + return; + } + + if (notice.Action is { } action) + { + _noticeActionsOffered.Add(action.Command); + if (_noticeActionsOffered.Count > NoticeActionsKept) + { + _noticeActionsOffered.RemoveAt(0); + } + } + + _noticeRun ??= id => OnUiThread(() => RunNoticeAction(id)); + _pointer.Notice(new NoticeOverlay(notice, NoticeAboveRow(), NoticePalette(), _noticeRun)); + } + + /// + /// The row a toast sits above: the top of the command line and status row, which is the bottom of the pane area. + /// A toast stacked above it covers neither the row it repeats nor the line being typed. + /// + private int NoticeAboveRow() + { + var bottom = 0; + foreach (var rect in PaneOutputRects().Values) + { + bottom = Math.Max(bottom, rect.Y + rect.Height); + } + + return bottom > 0 ? bottom : Math.Max(0, _system.ConsoleDriver.ScreenSize.Height - 2); + } + + /// + /// A notice's action, as a toast's click hands it back. Only a command a notice offered is run, through the + /// registry as any other command is; anything else is refused, the chrome's rule. Internal for tests. + /// + internal bool RunNoticeAction(string command) + { + if (!_noticeActionsOffered.Contains(command, StringComparer.Ordinal)) + { + RefuseCommand($"no notice offered {Snippet(command)}"); + return false; + } + + return DispatchCommand(command); + } + + /// + /// The toast's colours: the status row's plane, the theme's text held to the floor on it, and one edge per + /// severity — the accent for news, the notice voice for a refusal, the warning red for a failure, each held to a + /// floor on the plane as well. An edge also inks the key chip and the action line, which are small text, so it is held to 4.5:1 + /// rather than the 3:1 floor. + /// + private NoticePalette NoticePalette() + { + var plane = _theme.StatusBackground; + string On(string hex) => TryParseRgb(hex, out var rgb) ? Hex(Contrast.Legible(rgb, plane, 4.5)) : hex; + return new NoticePalette( + Hex(plane), + Hex(Contrast.Legible(_theme.StatusForeground, plane, 4.5)), + On(_ink.Accent), + On(ScreenPalette.Warn), + On(_ink.Notice)); + } + + private static bool TryParseRgb(string hex, out Rgb rgb) + { + rgb = default; + if (hex.Length != 7 || hex[0] != '#' + || !byte.TryParse(hex.AsSpan(1, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out var r) + || !byte.TryParse(hex.AsSpan(3, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out var g) + || !byte.TryParse(hex.AsSpan(5, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out var b)) + { + return false; + } + + rgb = new Rgb(r, g, b); + return true; + } + + /// The notice the status row's cells were last drawn from, or null; for a test comparing hosts. + internal NoticeModel? LastNoticeModel => DrawnModel(SurfaceCatalog.Notice) as NoticeModel; + + /// Says a notice through the real , as a test needs one with an action. + internal void SimulateNotice(string text, MessageSeverity severity, string? key, NoticeAction? action) => + Notice(text, severity, key, action); +} + +/// +/// A notice for a host that draws it natively, over the cells: the model the status row was drawn from, where the +/// pane area ends, the colours, and the one way back. +/// +/// The notice; the very instance the status row's cells were drawn from. +/// The grid row a toast stacks above: the top of the command line and status row. +/// The colours to draw it in, already held to the floor. +/// +/// Runs the notice's action by its command id, through the registry; a command no notice offered is refused. Safe to +/// call from any thread. The same instance for the life of the client. +/// +internal sealed record NoticeOverlay(NoticeModel Notice, int AboveRow, NoticePalette Palette, Action Run); + +/// A toast's colours as #rrggbb: its plane, its text, and its edge per severity. +internal sealed record NoticePalette(string Plane, string Text, string Info, string Warning, string Refusal) +{ + /// The edge for . + public string Edge(NoticeSeverity severity) => severity switch + { + NoticeSeverity.Info => Info, + NoticeSeverity.Warning => Warning, + _ => Refusal, + }; +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs index 6050f5ed..d9d21a1a 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs @@ -1,3 +1,4 @@ +using SharpMUTerm.Client.Chrome; using SharpMUTerm.Client.Commands; using SharpMUTerm.Core.Configuration; using SharpMUTerm.Core.Diagnostics; @@ -429,7 +430,11 @@ internal void AcceptLayoutSuggestion(WorldSession session) : "it is a roleplay server", _ => "nothing it sends points elsewhere", }; - Notice($"Using the {name} layout for {Snippet(session.World.Name)}: {why}. ⌥M changes it.", MessageSeverity.Info, "⌥M"); + Notice( + $"Using the {name} layout for {Snippet(session.World.Name)}: {why}. ⌥M changes it.", + MessageSeverity.Info, + "⌥M", + new NoticeAction(LayoutCommands.Manage, "Change layout")); if (_liveLayout is { } live && string.Equals(live.SessionKey, session.SessionKey, StringComparison.Ordinal) diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index e7f81a73..deec091e 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -1816,11 +1816,29 @@ public string RenderSnapshot(string? view = null) { RefusePrefix(PrefixPanel.NoSplitRefusal); RefuseCommand("nothing to reconnect — pick a character first (⌃P ▸ Switch to …)"); - Notice("switched to Corvid · offline — Alt+R (⌃P ▸ Reconnect) connects it", MessageSeverity.Info, "⌃P"); + Notice( + "switched to Corvid · offline — Alt+R (⌃P ▸ Reconnect) connects it", + MessageSeverity.Info, + "⌃P", + new NoticeAction("world:reconnect", "Reconnect")); Notice("could not connect to aetherfall.mux:4201 — no route to host", MessageSeverity.Error, "⌃P"); _messageLog.Toggle(); } + // Three notices over the demo workspace and no modal: in a terminal the status row carries the last of them, + // as it always has; in the window each is a toast as well, stacked over the cells, the first offering its + // action as a click. One of each severity, in the order a session might say them. + if (string.Equals(view, "notices", StringComparison.OrdinalIgnoreCase)) + { + Notice( + "Using the Combat layout for Aetherfall: the game sends vitals. ⌥M changes it.", + MessageSeverity.Info, + "⌥M", + new NoticeAction(Client.Commands.LayoutCommands.Manage, "Change layout")); + RefusePrefix(PrefixPanel.NoSplitRefusal); + Notice("could not connect to aetherfall.mux:4201 — no route to host", MessageSeverity.Error, "⌃P"); + } + // The map window, over the demo's recorded streets: opened through the real ⌃P entry; `map-walking` // starts a walk to the docks through the real `/walk`, so the path ahead is marked; `map-split` puts // the map beside the output, the way it is meant to be read. @@ -3101,7 +3119,8 @@ private void ReportAutomation(WorldSession session) Notice( $"{who} is assigned a trigger set called {orphan}, and no such set exists — F2 defines sets, F5 assigns them", MessageSeverity.Warning, - "⌃P"); + "⌃P", + new NoticeAction("screen:worlds", "Open F5")); } } @@ -3208,7 +3227,11 @@ private void SwitchToCharacter(string sessionKey) var state = session.IsConnected ? "connected" : "offline — Alt+R (⌃P ▸ Reconnect) connects it"; - Notice($"switched to {SessionTitle(session)} · {state}", MessageSeverity.Info, "⌃P"); + Notice( + $"switched to {SessionTitle(session)} · {state}", + MessageSeverity.Info, + "⌃P", + session.IsConnected ? null : new NoticeAction("world:reconnect", "Reconnect")); } /// @@ -8880,9 +8903,9 @@ private void RenderMap(string windowId) // One model per drawing, and the window's native map is handed this same instance (MapViewFor), so the two // cannot disagree about where the character is, which level is shown or whether a walk is under way. var walking = map.Walk.IsWalking ? $"walking, {map.Walk.Remaining} to go" : null; - var view = Drawing(Core.Layouts.PanelIds.Map, windowId, SharpMUTerm.Client.Panels.MapViewModel.From(map.Map, map.Recorder.CurrentRoomId, map.Walk.RoomsAhead, walking)); + var view = Drawing(Core.Layouts.PanelIds.Map, windowId, SharpMUTerm.Client.Panels.MapViewModel.From(map.Map, map.Recorder.CurrentRoomId, map.Walk.RoomsAhead, walking, MapPalette())); _mapViews[windowId] = (_mapRevisions[windowId], view); - var ink = new MapRenderer.Ink(_ink.Accent, _ink.Accent, _ink.Notice, _ink.Draft); + var ink = new MapRenderer.Ink(_ink.Accent, _ink.Accent, _ink.Notice, _ink.Draft, WorkspacePalette.ReadingPlane(_theme)); var lines = MapRenderer.Render(view, map.Map, width, height, ink); _mapMarkup[windowId] = lines; control.SetContent(lines.ToList()); @@ -9102,24 +9125,28 @@ private void LoadDemoMap() [4203] = ("Temple of the Tide", [("south", 4202)]), [4210] = ("Market Row", [("west", 4201), ("east", 4211), ("southeast", 4212)]), [4211] = ("Spice Stall", [("west", 4210)]), - [4212] = ("Docks Gate", [("northwest", 4210), ("south", null)]), + [4212] = ("Docks Gate", [("northwest", 4210), ("south", 4300)]), [4199] = ("Lantern Street", [("north", 4201), ("south", null), ("southwest", 4198)]), [4198] = ("Old Well", [("northeast", 4199)]), [4220] = ("Guildhall", [("east", 4201), ("west", null)]), + + // A floor up and an area next door, so the map has stairs and a second area colour to show. + [4250] = ("Bell Tower", [("down", 4202)]), + [4300] = ("The Quay", [("north", 4212), ("east", null)]), }; void Arrive(long id) => recorder.Apply(new RoomObservation( id, rooms[id].Name, rooms[id].Exits.Select(e => new ObservedExit(e.Item1, e.Item2)).ToList()) { - Area = "Aetherfall", + Area = id >= 4300 ? "Saltmarsh Docks" : "Aetherfall", }); Arrive(4201); foreach (var (command, to) in new (string, long)[] { - ("n", 4202), ("n", 4203), ("s", 4202), ("s", 4201), ("e", 4210), ("e", 4211), ("w", 4210), - ("se", 4212), ("nw", 4210), ("w", 4201), ("s", 4199), ("sw", 4198), ("ne", 4199), ("n", 4201), + ("n", 4202), ("n", 4203), ("s", 4202), ("u", 4250), ("d", 4202), ("s", 4201), ("e", 4210), ("e", 4211), ("w", 4210), + ("se", 4212), ("s", 4300), ("n", 4212), ("nw", 4210), ("w", 4201), ("s", 4199), ("sw", 4198), ("ne", 4199), ("n", 4201), ("w", 4220), ("e", 4201), }) { @@ -13228,7 +13255,7 @@ private void SetStatus(string markup, bool displace = false) /// five seconds of unhurried reading. Six gives that a margin without a refusal outstaying the thing /// it refused. Nothing is lost to it either way: every notice is echoed into the output window. /// - internal static readonly TimeSpan NoticeDuration = TimeSpan.FromSeconds(6); + internal static readonly TimeSpan NoticeDuration = NoticeModel.Duration; /// The transient message currently laid over the resting row, or null when there is none. private string? _notice; @@ -13262,7 +13289,11 @@ private void SetStatus(string markup, bool displace = false) /// The message, as plain text — the log keeps this, and the row's markup is built from it. /// How loud it is; the viewer colours and labels rows by this. /// An optional leading chip naming the surface that refused (⌃B, ⌃P). - private void Notice(string text, MessageSeverity severity = MessageSeverity.Warning, string? key = null) + /// + /// A command the notice offers. The status row never draws it (a terminal cell is not a button, and the text + /// already names the key); a host that draws notices natively offers it as a click (). + /// + private void Notice(string text, MessageSeverity severity = MessageSeverity.Warning, string? key = null, NoticeAction? action = null) { // Through the logger, not straight into the buffer: the client's own messages and the telnet // stack's diagnostics then share one ordered history (and one rolling file), which is the point @@ -13278,13 +13309,15 @@ private void Notice(string text, MessageSeverity severity = MessageSeverity.Warn key is null ? text : $"{key} {text}"); AnnounceNotice(text); - var body = severity == MessageSeverity.Error - ? $"[{ScreenPalette.Warn}]{Escape(text)}[/]" - : $"[dim]{Escape(text)}[/]"; - var markup = key is null ? body : $"[{_ink.Notice}]{Escape(key)}[/] {body}"; + var model = Drawing( + SurfaceCatalog.Notice, + string.Empty, + new NoticeModel(text, NoticeSeverityOf(severity), key, action, _time.GetUtcNow(), ++_noticeSequence)); + var markup = NoticeMarkup(model); _notice = markup; PaintStatus(markup); + PublishNotice(model); _noticeTimer ??= _time.CreateTimer( _ => OnUiThread(ClearNotice), null, Timeout.InfiniteTimeSpan, Timeout.InfiniteTimeSpan); _noticeTimer.Change(NoticeDuration, Timeout.InfiniteTimeSpan); diff --git a/src/SharpMUTerm.Tui/SnapshotViews.cs b/src/SharpMUTerm.Tui/SnapshotViews.cs index 0796e858..1b9a6bfb 100644 --- a/src/SharpMUTerm.Tui/SnapshotViews.cs +++ b/src/SharpMUTerm.Tui/SnapshotViews.cs @@ -17,7 +17,7 @@ internal static class SnapshotViews "triggers-edit", "logging-edit", "keypad-edit", "password-edit", "startup-edit", "freeze", "freeze-scrollback", "spawn", "split", "split-stacked", "move", "drag", "history", "history-search", "history-search-filter", "draft", "draft2", - "menu", "menu-split", "menu-fuzzy", "menu-recent", "messages", "quit", "connections", "characters", + "menu", "menu-split", "menu-fuzzy", "menu-recent", "messages", "notices", "quit", "connections", "characters", "tint", "tint-input", "tint-input-moved", "tint-tabs", "compose", "compose-literal", "moo-edit", "mssp", "mssp-none", "mssp-never", "web", "rail-long", "scrollback", "scrollback-up", "scrollback-split", "reflow", "links", "away", "away-scrollback", diff --git a/src/SharpMUTerm.Tui/WorkspacePalette.cs b/src/SharpMUTerm.Tui/WorkspacePalette.cs index de1ec5fb..614d95bf 100644 --- a/src/SharpMUTerm.Tui/WorkspacePalette.cs +++ b/src/SharpMUTerm.Tui/WorkspacePalette.cs @@ -330,6 +330,16 @@ internal static Rgb ReadingPlane(Theme theme) return Extreme(PanePlanes(theme), Surface(theme)); } + /// + /// Whether a theme's panes are dark — a foreground on them is lifted rather than darkened. The map's area colours + /// take their dark or light set by this (MapAreaPalette.For). + /// + internal static bool DarkPanes(Theme theme) + { + ArgumentNullException.ThrowIfNull(theme); + return Contrast.RelativeLuminance(Surface(theme)) < LightPlaneLuminance; + } + /// /// The band a selected run of a pane's output is painted on. /// diff --git a/tests/SharpMUTerm.Avalonia.Tests/NoticeToastTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NoticeToastTests.cs new file mode 100644 index 00000000..457f0cd2 --- /dev/null +++ b/tests/SharpMUTerm.Avalonia.Tests/NoticeToastTests.cs @@ -0,0 +1,129 @@ +using Avalonia; +using Avalonia.Headless; +using Avalonia.Input; +using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Client.Panels; +using SharpMUTerm.Core.Layouts; +using SharpMUTerm.Core.Workspaces; +using SharpMUTerm.Tui; +using static SharpMUTerm.Avalonia.Tests.DesktopLayerTests; + +namespace SharpMUTerm.Avalonia.Tests; + +/// +/// The window's toasts () and the native map's legend and colours: a toast is the notice the +/// status row drew, stacked over the cells above the command line, held while hovered, faded after its time, never +/// focused; a click runs its action through the client and nothing else reaches the client. The map canvas draws its +/// areas in the model's colours. +/// +public class NoticeToastTests +{ + private static readonly NoticePalette Palette = new("#333344", "#e0e0e0", "#5fafff", "#ff6b6b", "#ffaf5f"); + + private static NoticeOverlay Overlay(long sequence, string text, NoticeAction? action, Action run, int aboveRow = 8) => + new(new NoticeModel(text, NoticeSeverity.Info, "⌥M", action, DateTimeOffset.UnixEpoch, sequence), aboveRow, Palette, run); + + [Test] + public async Task AToastStacksAboveTheCommandLineAndAClickRunsItsActionWithoutTakingFocus() + { + var (shown, rects, bottom, ran, focused, clientSaw, remaining, passedThrough) = await Run((window, view, layer, driver) => + { + var ran = new List(); + var notices = (IPointerPresenter)driver.Pointer; + notices.Notice(Overlay(1, "Using the Combat layout: the game sends vitals.", new NoticeAction("layout:layouts", "Change layout"), ran.Add)); + notices.Notice(Overlay(2, "nothing to split", null, ran.Add)); + Drain(); + window.UpdateLayout(); + + var toasts = layer.Toasts; + var shown = toasts.Shown.Select(n => n.Sequence).ToList(); + var rects = toasts.Rects(); + var bottom = toasts.Bottom; + + var clientSaw = new List>(); + driver.MouseEvent += (_, flags, _) => clientSaw.Add(flags); + + // A click on the toast with an action: it runs, the toast goes, and the client never sees the press. + var on = toasts.TranslatePoint(rects[0].Center, window)!.Value; + window.MouseDown(on, MouseButton.Left); + window.MouseUp(on, MouseButton.Left); + var focused = view.IsFocused; + var remaining = toasts.Shown.Select(n => n.Sequence).ToList(); + var sawOnToast = clientSaw.Count; + + // A press beside the toasts goes through to the cells. + var beside = toasts.TranslatePoint(new Point(40, 30), window)!.Value; + window.MouseDown(beside, MouseButton.Left); + window.MouseUp(beside, MouseButton.Left); + return (shown, rects, bottom, ran, focused, sawOnToast, remaining, clientSaw.Count > sawOnToast); + }, columns: 80, rows: 12); + + await Assert.That(shown).IsEquivalentTo(new long[] { 1, 2 }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(rects[1].Y).IsGreaterThan(rects[0].Y).Because("the newest is at the bottom of the stack"); + await Assert.That(rects[1].Bottom).IsLessThanOrEqualTo(bottom).Because("the stack sits above the row the pane area ends at"); + await Assert.That(ran).IsEquivalentTo(new[] { "layout:layouts" }); + await Assert.That(focused).IsTrue().Because("a toast never takes the keyboard from the cells"); + await Assert.That(clientSaw).IsEqualTo(0).Because("a press on a toast is the window's"); + await Assert.That(remaining).IsEquivalentTo(new long[] { 2 }); + await Assert.That(passedThrough).IsTrue().Because("only a toast is hit; the rest of the layer is the cells'"); + } + + [Test] + public async Task AToastFadesAfterItsTimeButStaysWhileHovered() + { + var (held, faded, gone) = await Run((window, view, layer, driver) => + { + ((IPointerPresenter)driver.Pointer).Notice(Overlay(1, "saved", null, _ => { })); + Drain(); + window.UpdateLayout(); + var toasts = layer.Toasts; + var over = toasts.TranslatePoint(toasts.Rects()[0].Center, window)!.Value; + + window.MouseMove(over); + toasts.Advance(NoticeModel.Duration + TimeSpan.FromSeconds(2)); + var held = toasts.Shown.Count; + + window.MouseMove(toasts.TranslatePoint(new Point(2, 2), window)!.Value); + toasts.Advance(NoticeToasts.HoverGrace + TimeSpan.FromMilliseconds(100)); + var faded = toasts.Shown.Count; + toasts.Advance(NoticeToasts.FadeTime); + return (held, faded, toasts.Shown.Count); + }, columns: 80, rows: 12); + + await Assert.That(held).IsEqualTo(1).Because("a hovered toast stays"); + await Assert.That(faded).IsEqualTo(1).Because("it is fading, not gone"); + await Assert.That(gone).IsEqualTo(0); + } + + [Test] + public async Task TheNativeMapDrawsItsAreasInTheModelsColours() + { + var (room, elsewhere, legend) = await Run((window, view, layer, driver) => + { + var model = new MapViewModel( + "Town", + 0, + [ + new MapViewRoom(1, "Plaza", 0, 0, Current: true, Ahead: false, Locked: false, Up: true), + new MapViewRoom(2, "Gate", 1, 0, Current: false, Ahead: false, Locked: false, Elsewhere: "Docks"), + ], + [new MapViewExit(1, 2)], + null) + { + Areas = [new MapViewArea("Town", "#abcdef", Drawn: true), new MapViewArea("Docks", "#fedcba", Drawn: false)], + }; + ((IPointerPresenter)driver.Pointer).Panels( + [new PanelOverlay(PanelIds.Map, "map:demo", new PaneRect(0, 1, 40, 9), new PanelInk("#33ccff", "#ffaa33", "#555555"), null, model, _ => { })]); + Drain(); + window.UpdateLayout(); + var canvas = layer.Maps.Values.Single(); + return (canvas.AreaColourOf(model.Rooms[1]), canvas.ElsewhereColourOf(model.Rooms[1]), canvas.LegendEntries()); + }); + + await Assert.That(room.ToString()).IsEqualTo("#ffabcdef"); + await Assert.That(elsewhere?.ToString()).IsEqualTo("#fffedcba"); + await Assert.That(legend.Select(e => e.Label)).IsEquivalentTo(new[] { "you", "stairs up / down", "Town", "Docks" }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(legend[2].Swatch.ToString()).IsEqualTo("#ffabcdef"); + } +} diff --git a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs index ad1fa43e..abcfbce5 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs @@ -186,6 +186,20 @@ await Assert.That(Rows(palette.Session!.View(query))).IsEquivalentTo(Rows(drawn! covered.Add(SurfaceCatalog.RailStrip); } + // Notices: each toast the window was handed is the model the status row was drawn from, and the last is the + // one the row carries now. + { + using var driver = new AvaloniaConsoleDriver(140, 36); + await using var app = App(driver, DemoScene.Build()); + app.RenderSnapshot("notices"); + var said = driver.Pointer.Notices; + await Assert.That(said.Count).IsEqualTo(3); + await Assert.That((object)said[^1].Notice).IsEqualTo(app.DrawnModel(SurfaceCatalog.Notice)).Because("notice"); + await Assert.That(app.NoticeMarkup(said[^1].Notice)).IsEqualTo(app.LastNotice); + await Assert.That(said[0].Notice.Action).IsNotNull().Because("the first offers its action"); + covered.Add(SurfaceCatalog.Notice); + } + var drawnNatively = SurfaceCatalog.All.Where(s => s.On(SurfaceHosts.Window).HasFlag(SurfaceDrawing.Native)).Select(s => s.Id); await Assert.That(covered).IsEquivalentTo(drawnNatively).Because("every surface the window draws natively has its model compared here"); } @@ -293,6 +307,22 @@ await Same("layouts-menu: apply", "layout-combat", probed.Add(SurfaceCatalog.Palette); } + // Notice: a click on a toast runs its action; in cells the same command is the ⌃P entry, run by the registry. + var openF5 = new SharpMUTerm.Client.Chrome.NoticeAction("screen:worlds", "Open F5"); + await Same("notice: action", "layout-combat", + (app, d) => + { + app.SimulateNotice("a set is missing", SharpMUTerm.Core.Diagnostics.MessageSeverity.Warning, "⌃P", openF5); + var toast = d.Pointer.Notices[^1]; + toast.Run(toast.Notice.Action!.Command); + }, + (app, _) => + { + app.SimulateNotice("a set is missing", SharpMUTerm.Core.Diagnostics.MessageSeverity.Warning, "⌃P", openF5); + app.DispatchCommand(openF5.Command); + }); + probed.Add(SurfaceCatalog.Notice); + var acting = SurfaceCatalog.All.Where(s => s.HasNative && s.Actions.Count > 0).Select(s => s.Id); await Assert.That(probed).IsEquivalentTo(acting).Because("every native surface with actions has a probe here"); } diff --git a/tests/SharpMUTerm.Client.Tests/PanelModelTests.cs b/tests/SharpMUTerm.Client.Tests/PanelModelTests.cs index 62f43f8c..3e76faf2 100644 --- a/tests/SharpMUTerm.Client.Tests/PanelModelTests.cs +++ b/tests/SharpMUTerm.Client.Tests/PanelModelTests.cs @@ -38,6 +38,56 @@ public async Task TheMapViewIsTheCurrentLevelAndAreaWithEachExitOnce() await Assert.That(MapViewModel.From(map, 1, [2], "walking, 1 to go")).IsEqualTo(view); } + /// + /// The view says which rooms have stairs, which lead into another area, and the colour of every area it names — + /// the drawn area first, from the palette the client chose, stable for the name. + /// + [Test] + public async Task TheMapViewCarriesStairsWaysOutAndAreaColours() + { + var map = new WorldMap(); + var town = map.AreaNamed("Town"); + var docks = map.AreaNamed("Docks"); + map.Add(new MapRoom { Id = 1, Name = "Plaza", AreaId = town.Id, Exits = { ["north"] = 2, ["up"] = 3, ["south"] = 4 } }); + map.Add(new MapRoom { Id = 2, Name = "Cellar Stair", AreaId = town.Id, Y = -1, Exits = { ["south"] = 1, ["east"] = 5 } }); + map.Add(new MapRoom { Id = 3, Name = "Tower", AreaId = town.Id, Z = 1, Exits = { ["down"] = 1 } }); + map.Add(new MapRoom { Id = 4, Name = "Quay", AreaId = docks.Id, Y = 1, Exits = { ["north"] = 1 } }); + map.Add(new MapRoom { Id = 5, Name = "Crypt", AreaId = town.Id, X = 1, Y = -1, Z = -1 }); + + var view = MapViewModel.From(map, 1, [], null, MapAreaPalette.Light); + + var plaza = view.Rooms.Single(r => r.Id == 1); + var stair = view.Rooms.Single(r => r.Id == 2); + await Assert.That(plaza.Up).IsTrue(); + await Assert.That(plaza.Down).IsFalse(); + await Assert.That(stair.Down).IsTrue().Because("an exit to a room on a lower level is a way down whatever its direction"); + await Assert.That(plaza.Elsewhere).IsEqualTo("Docks"); + await Assert.That(stair.Elsewhere).IsNull(); + + await Assert.That(view.Areas).IsEquivalentTo( + new[] + { + new MapViewArea("Town", MapAreaPalette.Light.Colour("Town"), Drawn: true), + new MapViewArea("Docks", MapAreaPalette.Light.Colour("Docks"), Drawn: false), + }, + TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(view.AreaColour).IsEqualTo(MapAreaPalette.Light.Colour("Town")); + await Assert.That(view.ColourOf("Docks")).IsEqualTo(MapAreaPalette.Light.Colour("Docks")); + await Assert.That(MapAreaPalette.IndexOf("Town")).IsEqualTo(MapAreaPalette.IndexOf("Town")); + await Assert.That(MapViewModel.From(map, 1, [], null, MapAreaPalette.Dark)).IsNotEqualTo(view).Because("the palette is part of the view"); + await Assert.That(MapViewModel.From(map, 1, [], null, MapAreaPalette.Light)).IsEqualTo(view); + } + + [Test] + public async Task TwoNoticesThatSayTheSameThingAreStillTwo() + { + var at = new DateTimeOffset(2026, 11, 4, 12, 0, 0, TimeSpan.Zero); + var first = new SharpMUTerm.Client.Chrome.NoticeModel("saved", SharpMUTerm.Client.Chrome.NoticeSeverity.Info, null, null, at, 1); + await Assert.That(first with { }).IsEqualTo(first); + await Assert.That(first with { Sequence = 2 }).IsNotEqualTo(first); + await Assert.That(SharpMUTerm.Client.Chrome.NoticeModel.Duration).IsEqualTo(TimeSpan.FromSeconds(6)); + } + [Test] public async Task TheLayoutLibraryIsAFamilyThatListsNothingButHandlesItsIds() { diff --git a/tests/SharpMUTerm.Client.Tests/SurfaceCatalogTests.cs b/tests/SharpMUTerm.Client.Tests/SurfaceCatalogTests.cs index 48856d14..48366e94 100644 --- a/tests/SharpMUTerm.Client.Tests/SurfaceCatalogTests.cs +++ b/tests/SharpMUTerm.Client.Tests/SurfaceCatalogTests.cs @@ -72,7 +72,7 @@ public async Task PanelSurfacesAreKnownPanels() { var panels = SurfaceCatalog.All.Where(s => s.Id is not (SurfaceCatalog.Header or SurfaceCatalog.Sidebar or SurfaceCatalog.Settings or SurfaceCatalog.LayoutsMenu or SurfaceCatalog.Palette - or SurfaceCatalog.Prefix or SurfaceCatalog.RailStrip)); + or SurfaceCatalog.Prefix or SurfaceCatalog.RailStrip or SurfaceCatalog.Notice)); foreach (var surface in panels) { await Assert.That(PanelIds.Known).Contains(surface.Id); diff --git a/tests/SharpMUTerm.Tui.Tests/MapAreaPaletteTests.cs b/tests/SharpMUTerm.Tui.Tests/MapAreaPaletteTests.cs new file mode 100644 index 00000000..3af70578 --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/MapAreaPaletteTests.cs @@ -0,0 +1,79 @@ +using SharpMUTerm.Client.Panels; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Text; +using SharpMUTerm.Core.Theming; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// The map's area colours () against the planes they are drawn on: every hex of the set a +/// theme takes clears the legibility floor on the worst pane plane of that theme, so the terminal's +/// leaves them exactly as the model says and the window draws the same hex. +/// +public class MapAreaPaletteTests +{ + [Test] + public async Task EveryAreaColourClearsTheFloorOnEveryBuiltInTheme() + { + var failures = new List(); + foreach (var name in ThemeLibrary.Names) + { + var theme = ThemeLibrary.Get(name); + var palette = MapAreaPalette.For(WorkspacePalette.DarkPanes(theme)); + var plane = WorkspacePalette.ReadingPlane(theme); + foreach (var hex in palette.Colours) + { + var colour = Parse(hex); + var ratio = Contrast.Ratio(colour, plane); + if (ratio < Contrast.Floor) + { + failures.Add($"{name}: {hex} is {ratio:F2}:1 on {plane}"); + } + + if (Contrast.Legible(colour, plane) != colour) + { + failures.Add($"{name}: {hex} is moved by the floor"); + } + } + } + + await Assert.That(failures).IsEmpty(); + } + + [Test] + public async Task TheDarkAndLightThemesTakeDifferentSetsOfTheSameHues() + { + await Assert.That(WorkspacePalette.DarkPanes(ThemeLibrary.Get("Dark"))).IsTrue(); + await Assert.That(WorkspacePalette.DarkPanes(ThemeLibrary.Get("Solarized Dark"))).IsTrue(); + await Assert.That(WorkspacePalette.DarkPanes(ThemeLibrary.Get("Light"))).IsFalse(); + await Assert.That(MapAreaPalette.Dark.Colours.Count).IsEqualTo(MapAreaPalette.Light.Colours.Count); + } + + [Test] + public async Task AnAreasColourIsStableForItsName() + { + await Assert.That(MapAreaPalette.Dark.Colour("Aetherfall")).IsEqualTo(MapAreaPalette.Dark.Colour("Aetherfall")); + await Assert.That(MapAreaPalette.IndexOf("Aetherfall")).IsEqualTo(MapAreaPalette.IndexOf("Aetherfall")); + + // Pinned, so a change to the hash (which would recolour every player's areas) is a decision, not an accident. + await Assert.That(MapAreaPalette.IndexOf("Aetherfall")).IsEqualTo(Fnv("Aetherfall")); + var spread = Enumerable.Range(0, 64).Select(i => MapAreaPalette.IndexOf($"Area {i}")).Distinct().Count(); + await Assert.That(spread).IsEqualTo(8); + } + + private static int Fnv(string text) + { + var hash = 2166136261u; + foreach (var c in text) + { + hash = unchecked((hash ^ c) * 16777619u); + } + + return (int)(hash % 8u); + } + + private static Rgb Parse(string hex) => new( + Convert.ToByte(hex.Substring(1, 2), 16), + Convert.ToByte(hex.Substring(3, 2), 16), + Convert.ToByte(hex.Substring(5, 2), 16)); +} diff --git a/tests/SharpMUTerm.Tui.Tests/NoticeAndMapSurfaceTests.cs b/tests/SharpMUTerm.Tui.Tests/NoticeAndMapSurfaceTests.cs new file mode 100644 index 00000000..0711de0d --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/NoticeAndMapSurfaceTests.cs @@ -0,0 +1,166 @@ +using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Client.Panels; +using SharpMUTerm.Client.Surfaces; +using SharpMUTerm.Core.Diagnostics; +using SharpMUTerm.Core.Mapping; +using SharpMUTerm.Core.Text; +using SharpMUTerm.Graphics; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// The terminal's half of two surfaces: the notice, whose status-row markup is what it always was now that it is drawn +/// from a ; and the map, whose cells take their area colours, stairs and legend from the +/// the window's canvas is handed. +/// +[NotInParallel] +public class NoticeAndMapSurfaceTests +{ + private static readonly TerminalCapabilities Caps = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private static SharpMUTermApp App() + { + Console.SetIn(TextReader.Null); + return new SharpMUTermApp(DemoScene.Build(), ClientHost.Headless(new HeadlessConsoleDriver(120, 34), Caps)); + } + + // ── notices ────────────────────────────────────────────────────────────────────────────── + + /// + /// The row reads exactly as before the model: a key chip in the notice ink, the text dim — or in the warning red when + /// something failed — and an action changes nothing on it, since a cell is not a button. + /// + [Test] + public async Task TheStatusRowDrawsANoticeAsItAlwaysHas() + { + await using var app = App(); + app.RenderSnapshot(null); + + app.SimulateNotice("nothing to split", MessageSeverity.Warning, "⌃B", null); + var plain = app.LastNotice!; + await Assert.That(plain).EndsWith("]⌃B[/] [dim]nothing to split[/]"); + var chip = plain[..plain.IndexOf("⌃B", StringComparison.Ordinal)]; + + app.SimulateNotice("nothing to split", MessageSeverity.Warning, "⌃B", new NoticeAction("layout:layouts", "Change layout")); + await Assert.That(app.LastNotice).IsEqualTo(plain).Because("the action is the window's to offer; the row is unchanged"); + + app.SimulateNotice("no route to host", MessageSeverity.Error, null, null); + await Assert.That(app.LastNotice).IsEqualTo($"[{ScreenPalette.Warn}]no route to host[/]"); + + app.SimulateNotice("saved [x]", MessageSeverity.Info, "F5", null); + await Assert.That(app.LastNotice).IsEqualTo($"{chip}F5[/] [dim]saved [[x]][/]"); + } + + /// The model the row was drawn from is recorded as the notice surface's drawn model, sequence and all. + [Test] + public async Task EachNoticeIsOneModelTheRowIsDrawnFrom() + { + await using var app = App(); + app.RenderSnapshot(null); + var action = new NoticeAction("layout:layouts", "Change layout"); + + app.SimulateNotice("first", MessageSeverity.Info, "⌥M", action); + var first = (NoticeModel?)app.DrawnModel(SurfaceCatalog.Notice); + app.SimulateNotice("second", MessageSeverity.Error, null, null); + var second = (NoticeModel?)app.DrawnModel(SurfaceCatalog.Notice); + + await Assert.That(first).IsNotNull(); + await Assert.That(first!.Severity).IsEqualTo(NoticeSeverity.Info); + await Assert.That(first.Action).IsEqualTo(action); + await Assert.That(first.Key).IsEqualTo("⌥M"); + await Assert.That(second!.Severity).IsEqualTo(NoticeSeverity.Warning).Because("the log's Error is the notice's warning"); + await Assert.That(second.Sequence).IsEqualTo(first.Sequence + 1); + await Assert.That(app.NoticeMarkup(second)).IsEqualTo(app.LastNotice); + await Assert.That(SharpMUTermApp.NoticeSeverityOf(MessageSeverity.Warning)).IsEqualTo(NoticeSeverity.Refusal); + await Assert.That(app.Messages.Entries.Select(e => e.Text)).Contains("second").Because("the message log stays the history"); + } + + /// A notice action runs only if a notice offered it, and the terminal offers none: it has no toast to click. + [Test] + public async Task ANoticeActionNoNoticeOfferedIsRefused() + { + await using var app = App(); + app.RenderSnapshot(null); + app.SimulateNotice("first", MessageSeverity.Info, "⌥M", new NoticeAction("layout:layouts", "Change layout")); + + await Assert.That(app.RunNoticeAction("layout:layouts")).IsFalse().Because("a terminal host publishes no notice, so offers no click"); + await Assert.That(app.LastNotice).Contains("no notice offered"); + } + + // ── the map ────────────────────────────────────────────────────────────────────────────── + + private static (WorldMap Map, MapViewModel View) TwoAreas(MapAreaPalette palette) + { + var map = new WorldMap(); + var town = map.AreaNamed("Town"); + var docks = map.AreaNamed("Docks"); + map.Add(new MapRoom { Id = 1, Name = "Plaza", AreaId = town.Id, Exits = { ["east"] = 2, ["south"] = 3 } }); + map.Add(new MapRoom { Id = 2, Name = "Stair", AreaId = town.Id, X = 1, Exits = { ["west"] = 1, ["up"] = 4 } }); + map.Add(new MapRoom { Id = 3, Name = "Quay", AreaId = docks.Id, Y = 1, Exits = { ["north"] = 1 } }); + map.Add(new MapRoom { Id = 4, Name = "Loft", AreaId = town.Id, X = 1, Z = 1, Exits = { ["down"] = 2 } }); + return (map, MapViewModel.From(map, 1, [], null, palette)); + } + + /// + /// Rooms in the drawn area's colour, the way into another area in that area's colour, and the legend naming both — + /// every colour the view's own. A view handed made-up colours draws exactly those, so the cells read the model and + /// not a palette of their own. + /// + [Test] + public async Task TheCellMapDrawsTheViewsAreaColoursStairsAndLegend() + { + var (map, view) = TwoAreas(MapAreaPalette.Dark); + var invented = view with + { + Areas = [new MapViewArea("Town", "#abcdef", Drawn: true), new MapViewArea("Docks", "#fedcba", Drawn: false)], + }; + var ink = new MapRenderer.Ink("#ffffff", "#00ff00", "#ffff00", "#ff00ff"); + + var lines = MapRenderer.Render(invented, map, 40, 9, ink); + var all = string.Join('\n', lines); + + await Assert.That(all).Contains("[link=mux:map:2][#abcdef][[↑]][/][/]").Because("a room wears its area's colour and the view's stairs"); + await Assert.That(all).Contains("[#fedcba]│[/]").Because("the way south into the docks is drawn in the docks' colour"); + await Assert.That(MarkupText.Plain(lines[^1])).IsEqualTo("@ you · ↑↓ stairs · ■ Town · ■ Docks"); + await Assert.That(lines[^1]).Contains("[#abcdef]■[/]"); + await Assert.That(lines[^1]).Contains("[#fedcba]■[/]"); + + // The stairs mark is the view's: a room the view says has none draws none, whatever the map holds. + var flat = invented with { Rooms = invented.Rooms.Select(r => r with { Up = false, Down = false }).ToList() }; + await Assert.That(string.Join('\n', MapRenderer.Render(flat, map, 40, 9, ink))).DoesNotContain("↑"); + } + + /// On every built-in theme the floor leaves the palette's colours as the model says them. + [Test] + public async Task TheFloorLeavesThePalettesAreaColoursAlone() + { + foreach (var name in Core.Theming.ThemeLibrary.Names) + { + var theme = Core.Theming.ThemeLibrary.Get(name); + var (map, view) = TwoAreas(MapAreaPalette.For(WorkspacePalette.DarkPanes(theme))); + var ink = new MapRenderer.Ink("#ffffff", "#00ff00", "#ffff00", "#ff00ff", WorkspacePalette.ReadingPlane(theme)); + var all = string.Join('\n', MapRenderer.Render(view, map, 40, 9, ink)); + await Assert.That(all).Contains($"[{view.AreaColour}]").Because(name); + await Assert.That(all).Contains($"[{view.ColourOf("Docks")}]").Because(name); + } + } + + /// The demo's map window draws from the model the client recorded for it, area colour included. + [Test] + public async Task TheDemoMapIsDrawnFromItsRecordedModel() + { + await using var app = App(); + app.RenderSnapshot("map"); + var window = SharpMUTermApp.MapWindowId(DemoScene.ActiveSessionKey); + var view = (MapViewModel?)app.DrawnModel(Core.Layouts.PanelIds.Map, window); + + await Assert.That(view).IsNotNull(); + await Assert.That(view!.Areas.Select(a => a.Name)).IsEquivalentTo(new[] { "Aetherfall", "Saltmarsh Docks" }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(view.Rooms.Single(r => r.Name == "Temple Steps").Up).IsTrue(); + var markup = string.Join('\n', app.MapMarkup(window)); + await Assert.That(markup).Contains($"[{view.AreaColour}]"); + await Assert.That(markup).Contains($"[{view.ColourOf("Saltmarsh Docks")}]■[/]"); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/SnapshotViewEmptyConfigTests.cs b/tests/SharpMUTerm.Tui.Tests/SnapshotViewEmptyConfigTests.cs index b15c4bc8..c5b4e5db 100644 --- a/tests/SharpMUTerm.Tui.Tests/SnapshotViewEmptyConfigTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/SnapshotViewEmptyConfigTests.cs @@ -40,7 +40,7 @@ public class SnapshotViewEmptyConfigTests "collapsed", "prefix", "prefix-panel", "timestamps", "timestamps-toggled", "spawn", "split", "focus", "focus-moved", "freeze", "freeze-scrollback", "move", "drag", "scrollback", "scrollback-up", "scrollback-split", "reflow", "away", "away-scrollback", "links", "web", "rail-long", "history", "history-search", - "history-search-filter", "draft", "draft2", "menu", "menu-split", "menu-fuzzy", "menu-recent", "messages", "quit", + "history-search-filter", "draft", "draft2", "menu", "menu-split", "menu-fuzzy", "menu-recent", "messages", "notices", "quit", "connections", "characters", "tint", "tint-input", "tint-input-moved", "compose", "compose-literal", "deletions", "textansi", "input", "keypad", "password", "startup", "logging", "set", "triggers", "route", "highlight", "worlds", "settings", "mssp", From 3c9676d5a35bc28bb58e10d568093f7256267ce2 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 07:27:32 +0000 Subject: [PATCH 028/113] Theme picker in both hosts; F5 and F9 declared with scoped bindings F7 opens with a THEME group: one row per theme (built-ins, the customised theme in force, CustomThemes) with a seven-row preview of the theme under the cursor - an ANSI pane, the focused pane with a tab strip, a tinted pane and the armed command line - drawn from one Client model (ThemePreview / ThemeCard, built by Tui ThemePreviews). Moving the cursor paints the screen in that theme; Esc closes with nothing committed; Enter commits through ScreenEdits.Apply, and SaveConfiguration puts the new theme into force (ApplyThemeIfChanged / ApplyTheme), with a notice that output already on screen keeps its colours. The desktop settings window draws the same model as native cards (ThemeCardView); a click uses the theme and the window follows the variant. SettingBinding now reads a SettingTarget (configuration, world, character) with ForWorld/ForCharacter factories and a section Scope. F5's world fields and F9's character fields are declared (BuiltInSettings.World and .Character) with TextRules shared by both surfaces. The cell F5 builds its world, security and character rows from those declarations in its own ordinal order; the settings window edits them with a subject picker and a door to the cell screen for the lists. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 6 + CLAUDE.md | 50 ++- src/SharpMUTerm.Avalonia/SettingsWindow.cs | 159 +++++++++- src/SharpMUTerm.Avalonia/ThemeCardView.cs | 137 +++++++++ .../Contributions/Descriptors.cs | 35 ++- .../Settings/BuiltInSettings.cs | 288 +++++++++++++++++- .../Settings/SettingBinding.cs | 204 +++++++++++-- .../Settings/SettingsForm.cs | 148 +++++++-- src/SharpMUTerm.Client/Settings/TextRules.cs | 96 ++++++ .../Settings/ThemeChoices.cs | 100 ++++++ .../Settings/ThemePreview.cs | 109 +++++++ .../Settings/WorldFieldValues.cs | 171 +++++++++++ .../Surfaces/SurfaceCatalog.cs | 2 +- .../Configuration/AppConfiguration.cs | 8 + src/SharpMUTerm.Core/Theming/Theme.cs | 15 + src/SharpMUTerm.Tui/ComposeOverlay.cs | 5 +- src/SharpMUTerm.Tui/DeclaredFields.cs | 61 ++++ src/SharpMUTerm.Tui/EditReviewOverlay.cs | 5 +- src/SharpMUTerm.Tui/ListOverlay.cs | 5 +- src/SharpMUTerm.Tui/OptionsScreenRenderer.cs | 214 ++++++++++++- src/SharpMUTerm.Tui/OptionsScreenView.cs | 16 + src/SharpMUTerm.Tui/ScreenChrome.cs | 11 +- src/SharpMUTerm.Tui/ScreenFocus.cs | 3 + src/SharpMUTerm.Tui/ScreenModel.cs | 6 + src/SharpMUTerm.Tui/SettingsOverlay.cs | 23 +- src/SharpMUTerm.Tui/SettingsSession.cs | 4 +- .../SharpMUTermApp.Settings.cs | 37 ++- src/SharpMUTerm.Tui/SharpMUTermApp.Theme.cs | 100 ++++++ src/SharpMUTerm.Tui/SharpMUTermApp.cs | 79 +++-- src/SharpMUTerm.Tui/SnapshotViews.cs | 1 + src/SharpMUTerm.Tui/ThemePreviews.cs | 102 +++++++ src/SharpMUTerm.Tui/WorldsScreenRenderer.cs | 202 ++++-------- .../SettingsWindowTests.cs | 108 ++++++- .../ScopedSettingsTests.cs | 183 +++++++++++ .../CommandSurfaceSettingsTests.cs | 14 +- .../DeclaredWorldSettingsTests.cs | 186 +++++++++++ .../FrameContrastTests.cs | 1 + .../ScreenCursorTests.cs | 7 +- .../SharpMUTerm.Tui.Tests/ScreenModelTests.cs | 25 +- .../SessionStateAccountingTests.cs | 7 +- 40 files changed, 2671 insertions(+), 262 deletions(-) create mode 100644 src/SharpMUTerm.Avalonia/ThemeCardView.cs create mode 100644 src/SharpMUTerm.Client/Settings/TextRules.cs create mode 100644 src/SharpMUTerm.Client/Settings/ThemeChoices.cs create mode 100644 src/SharpMUTerm.Client/Settings/ThemePreview.cs create mode 100644 src/SharpMUTerm.Client/Settings/WorldFieldValues.cs create mode 100644 src/SharpMUTerm.Tui/DeclaredFields.cs create mode 100644 src/SharpMUTerm.Tui/SharpMUTermApp.Theme.cs create mode 100644 src/SharpMUTerm.Tui/ThemePreviews.cs create mode 100644 tests/SharpMUTerm.Client.Tests/ScopedSettingsTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/DeclaredWorldSettingsTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 5aafdc4e..e093ca81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,12 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- A theme picker at the top of F7: each theme with a preview of the panes, a tab strip and the command line. + Moving onto a theme shows the screen in it, Enter uses it and Esc keeps the one you had. The desktop window's + settings show the same themes as cards; click one to use it. A customised theme stays in the list when you + try another. +- Desktop window: the settings window now edits Worlds & Characters (F5) and Characters (F9) too, with a + picker for which world or character you are editing and a button to the full screen for adding and deleting. - Ctrl+P lists *Fold or unfold the connection rail*, the same fold as Ctrl+B b and as the desktop window's sidebar button. - Desktop window: the header and the connections sidebar now have room of their own — a full-height toolbar diff --git a/CLAUDE.md b/CLAUDE.md index 230e1f4f..81bf1a25 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -1334,7 +1334,9 @@ python3 tools/ansi_frame_to_image.py frame.ansi frame.html # or .svg same way. - **Views:** `worlds`/`settings`, `triggers`, `route`, `highlight`, `aliases`, `timers`, `keypad`, `set`, `textansi`, `input`, `settings-search` (F7, `/`, `meter` typed: the search with its section - list and match counts), `settings-meters`/`settings-meters-pick` (the meter table over the demo's game + list and match counts), `settings-themes`/`settings-themes-solarized`/`settings-themes-used` (F7's theme + picker with the cursor on Light and on Solarized Dark — the screen painted in the previewed theme — and Light + used with ⏎), `settings-meters`/`settings-meters-pick` (the meter table over the demo's game data, the cursor on a meter with the received-data box under it, and the same meter's value path open with its dropdown of received paths), `settings-changed` (F7 after two real edits: the `● changed` marks and `r reset`), `logging`, `password`, `startup`, `freeze`, `spawn`, `split`, @@ -1582,9 +1584,34 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] trailing Remove button added only while the cursor is on one; the received-data box shows only while the cursor is in the table; path fields offer the received paths with their values as `ChoiceNotes`. - F7 and F8 are windowed to the screen height (`ScreenChrome.Window`), because F7 is taller than 24 rows. - - Not declared yet: F2–F6, F9 (F5's character form) and F10 are listed by title only. F9 was not declared - for the native window either: its fields are per *character*, and a `SettingBinding` reads an - `AppConfiguration`, so declaring it needs a binding that knows which character first. + - **F5's world fields and F9's character fields are declared, with scoped bindings** (`BuiltInSettings.World` + and `.Character`; `SettingScope`, `SettingTarget`, `SettingBinding.ForWorld`/`ForCharacter`; + `WorldFieldValues`, `TextRules`; Tui `DeclaredFields`). A binding reads a `SettingTarget` (the configuration + plus a world and a character, implicitly just the configuration), and a section's `Scope` says which it needs. + A target that does not reach the scope reads as default, shows `per world`/`per character`, and resets nothing. + Defaults come off a fresh `WorldDefinition`/`CharacterDefinition`, the rule above. Identity fields (name, host, + port, character name, password) are declared not resettable. **The cell F5 is not drawn by `FromSection`**: its + world row, security checkboxes and character row are built from the declarations through `DeclaredFields`, in + the order `WorldFieldOrder`/`SecurityFieldOrder`/`CharacterFieldOrder` name, because ⇥ order and the field + ordinals tests navigate by are the cell screen's, while the declaration's order is the window's grouping. A + `TextRule` (Required, Name, Pattern, Secret, Defaulted) is the one rule both the cell field and + `SettingsForm.SetText` apply. The lists (characters, trigger sets, adding and deleting) stay the cell screen's. + `DeclaredWorldSettingsTests` holds the two surfaces' field lists together. + - **The theme is F7's first field, a `ThemeField`** (`ThemeChoices`, `ThemePreview`/`ThemeCard`, Client; + `ThemePreviews`, `SharpMUTermApp.Theme.cs`, Tui; `ThemeCardView`, Avalonia). One Client model per theme: three + panes (ANSI, focused with a tab strip, tinted) and the armed command line, every colour resolved by + `ThemePreviews.Preview` the way the workspace paints it and held to the floor. The cell picker draws a row per + theme (an `Apply` button: `ScreenButtonKind.Apply`, `[⏎] Use`) and a seven-row preview of the theme under the + cursor; the window draws the same cards natively. **Moving the cursor previews by painting the screen in that + theme** (`OptionsScreen.Preview` → `SchemeFor`), so Esc closing with nothing committed is the revert; ⏎ commits + through `ScreenEdits.Apply`. F7 opens with the cursor on the theme in force. **A theme change is noticed in + `SaveConfiguration`** (`ApplyThemeIfChanged`, by colour signature) and `ApplyTheme` re-derives the chrome, the + formatters, every overlay's `Scheme` and the panes' planes. **Output already in a pane keeps its colours** — + it is markup by then — and the notice says so; on a light theme the old dark-theme greys are faint until they + scroll away. A customised theme replaced by the picker is kept in `AppConfiguration.CustomThemes` (no schema + bump), and listed. Unstyled text on a settings screen takes the scheme's ink (`ScreenChrome.Panel`/`Band` + set `ForegroundColor`), not the window's, because the window is still the theme in force while one is previewed. + - Not declared yet: F2–F4, F6 and F10 are listed by title only. - **In the window, a declared section opens a native settings window, generated from the declarations** (`ClientHost.NativeSettings` → `INativeSettings`; Client `SettingsForm`; Avalonia `SettingsWindow`, `SettingsPresenter` on the driver; `OpenSettingsScreen`/`TryOpenNativeSettings` in `SharpMUTermApp.Settings.cs`). @@ -1606,14 +1633,21 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] thread. `GameDataStore` is locked, but the focus is not safe to read from another thread. The `now` column is re-read each second (`OptionsScreenRenderer.NowText`). The received paths feed each path box's auto-complete and a list below it; clicking a path fills the path box last used. + - **A scoped section (F5, F9) has a subject picker and a door.** `SettingsForm.Subjects`/`Choose` pick the world + or character its fields edit; the form opens on the focused window's (`FocusedSubject`, resolved on the client's + thread). A write captures the subject at the moment it is made. `Open the F5 screen ↗` (`OpenScreen`) is the way + to the lists, and opens the *cell* screen: `OpenSectionScreen` calls `GoToSetting(…, native: false)`, or the door + would reopen this window. With no world there are no fields, only a sentence and the door. A text the rule + refuses is put back with the reason as a tooltip. - **Search is `SettingsSearch.Find` and nothing else**, so the two surfaces always find the same fields. While searching, the page shows only matched fields, and if the section on show has none it moves to the first that has some. - **Fluent is applied to this window only** (`Styles.Add(new FluentTheme())`), and `RequestedThemeVariant` - follows the client's theme (`SettingsForm.IsDark`). The rest of the window stays on the Simple theme the - native menu and tooltips were built against. - - Not done: the window is not modal and does not follow a theme change while it is open. Screenshots come from a - real window under Xvfb, driven with XTest (`ux-wave4/native-settings-*.png`). + follows the client's theme (`SettingsForm.IsDark`, read live), so a theme card clicked here flips the window's + variant and rebuilds the page. The rest of the window stays on the Simple theme the native menu and tooltips + were built against. + - Not done: the window is not modal. Screenshots come from a real window under Xvfb, driven with XTest + (`ux-wave4/native-settings-*.png`, `ux-wave6/settings-themes-window-*.png`). - **In the window, ⌃P is a native palette over the window, listing the cell palette's rows** (`ClientHost.NativePalette` → `INativePalette`; Client `PaletteSession`; Avalonia `PaletteOverlay`, `PalettePresenter` on the driver; `SharpMUTermApp.NativePalette.cs`). The terminal, the snapshot, the tests and the parity harness pass null. Decisions diff --git a/src/SharpMUTerm.Avalonia/SettingsWindow.cs b/src/SharpMUTerm.Avalonia/SettingsWindow.cs index bbd4faf6..ecefd3d1 100644 --- a/src/SharpMUTerm.Avalonia/SettingsWindow.cs +++ b/src/SharpMUTerm.Avalonia/SettingsWindow.cs @@ -40,6 +40,7 @@ internal sealed class SettingsWindow : Window private readonly Dictionary _resets = new(StringComparer.Ordinal); private readonly Dictionary _badges = new(StringComparer.Ordinal); private readonly List<(StatusMeter Meter, TextBlock Now)> _meterNow = []; + private readonly List _themeCards = []; private SettingsForm _form; private IReadOnlyList _matches = []; private string? _shown; @@ -110,6 +111,15 @@ public SettingsWindow(SettingsForm form) /// The section list. public ListBox SectionList => _sections; + /// The theme cards on the page, for a test. + public IReadOnlyList ThemeCards => _themeCards; + + /// The world or character picker of a scoped section, for a test; null on an app-wide one. + public ComboBox? SubjectPicker { get; private set; } + + /// The button that opens the section's own cell screen, for a test; null where there is none. + public Button? ScreenDoor { get; private set; } + /// The meter table, for a test: a heading row and one row per meter. public Grid? MeterGrid { get; private set; } @@ -237,6 +247,9 @@ private void BuildPage() _controls.Clear(); _resets.Clear(); _meterNow.Clear(); + _themeCards.Clear(); + SubjectPicker = null; + ScreenDoor = null; MeterGrid = null; _meterRows = -1; if (_shown is null || _form.Section(_shown) is not { } section) @@ -251,6 +264,16 @@ private void BuildPage() _page.Children.Add(new TextBlock { Text = $"{key} in the client · changes apply as you make them", Opacity = 0.7, Margin = new Thickness(0, 0, 0, 6) }); } + if (section.Scope != SettingScope.App) + { + _page.Children.Add(SubjectRow(section)); + if (!_form.HasSubject(section)) + { + ShownFields = []; + return; + } + } + var visible = Searching ? section.Fields.Where(f => _matches.Any(m => ReferenceEquals(m.Field, f))).ToList() : section.Fields.ToList(); @@ -275,12 +298,114 @@ private void BuildPage() }); } - _page.Children.Add(field is ListField { Id: BuiltInSettings.MetersField } meters ? MeterTable(meters) : FieldRow(field)); + _page.Children.Add(field switch + { + ListField { Id: BuiltInSettings.MetersField } meters => MeterTable(meters), + ThemeField theme => ThemePicker(theme), + _ => FieldRow(field), + }); } ShownFields = visible.Select(f => f.Id).ToList(); } + /// + /// A scoped section's header row: which world or character its fields are for, picked from every one there is, and + /// the way to the section's own cell screen for what is not a field — the lists of characters and trigger sets, + /// adding and deleting. With nothing to edit yet it says so and offers only the screen. + /// + private StackPanel SubjectRow(SettingsSectionContribution section) + { + var row = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 10, Margin = new Thickness(0, 6, 0, 2) }; + var subjects = _form.Subjects(section.Scope); + var noun = section.Scope == SettingScope.World ? "world" : "character"; + if (subjects.Count == 0) + { + row.Children.Add(new TextBlock { Text = $"There is no {noun} yet.", VerticalAlignment = VerticalAlignment.Center, Opacity = 0.8 }); + } + else + { + var labels = subjects.Select(s => s.Label).ToList(); + var current = _form.Subject(section.Scope); + var picker = new ComboBox { ItemsSource = labels, MinWidth = 240, SelectedItem = current?.Label }; + AutomationProperties.SetName(picker, $"The {noun} these settings are for"); + picker.SelectionChanged += (_, _) => + { + if (!_syncing && picker.SelectedIndex is >= 0 and var i && i < subjects.Count + && !string.Equals(subjects[i].Label, _form.Subject(section.Scope)?.Label, StringComparison.Ordinal)) + { + _form.Choose(subjects[i]); + var offset = _scroller.Offset; + BuildPage(); + _scroller.Offset = offset; + } + }; + SubjectPicker = picker; + row.Children.Add(new TextBlock { Text = section.Scope == SettingScope.World ? "World" : "Character", VerticalAlignment = VerticalAlignment.Center, FontWeight = FontWeight.SemiBold }); + row.Children.Add(picker); + } + + if (section.Key is { } key) + { + var door = new Button { Content = $"Open the {key} screen ↗", VerticalAlignment = VerticalAlignment.Center }; + ToolTip.SetTip(door, section.Scope == SettingScope.World + ? "Adding and deleting worlds, their characters and trigger sets are on the cell screen" + : "Adding and deleting characters is on the cell screen"); + AutomationProperties.SetName(door, $"Open the {key} screen"); + var id = section.Id; + door.Click += (_, _) => _form.OpenScreen(id); + ScreenDoor = door; + row.Children.Add(door); + } + + return row; + } + + /// The theme field: a card per theme, its preview drawn from the client's model; a click uses it. + private StackPanel ThemePicker(ThemeField field) + { + var outer = new StackPanel { Spacing = 6, Margin = new Thickness(0, 4, 0, 4) }; + var words = new StackPanel { Spacing = 1 }; + words.Children.Add(new TextBlock { Text = Capitalise(field.Label), FontSize = 14 }); + if (field.Help is { } help) + { + words.Children.Add(new TextBlock { Text = Capitalise(help), FontSize = 12, Opacity = 0.72, TextWrapping = TextWrapping.Wrap }); + } + + outer.Children.Add(words); + + var wrap = new WrapPanel { Orientation = Orientation.Horizontal, Margin = new Thickness(0, 6, 0, 0) }; + var inUse = CurrentTheme(field); + foreach (var card in _form.Themes()) + { + var view = new ThemeCardView(card, string.Equals(card.Name, inUse, StringComparison.OrdinalIgnoreCase), _form.IsDark); + view.Click += (_, _) => + { + if (!string.Equals(card.Name, CurrentTheme(field), StringComparison.OrdinalIgnoreCase)) + { + _form.SetTheme(field, card.Name); + } + }; + _themeCards.Add(view); + wrap.Children.Add(view); + } + + _controls[field.Id] = wrap; + _refreshers.Add(() => + { + var now = CurrentTheme(field); + foreach (var view in _themeCards) + { + view.SetInUse(string.Equals(view.Card.Name, now, StringComparison.OrdinalIgnoreCase), _form.IsDark); + } + }); + outer.Children.Add(wrap); + return outer; + } + + private string? CurrentTheme(ThemeField field) => + field.Binding is SettingBinding binding ? _form.Get(binding) : null; + /// The accent the changed dot and headings wear: Fluent's own, for the theme variant. private SolidColorBrush Accent => new(_form.IsDark ? Color.Parse("#60cdff") : Color.Parse("#005fb8")); @@ -387,7 +512,7 @@ private Control ControlFor(SettingsField field) case ChoiceField choice when field.Binding is SettingBinding named: { - var combo = new ComboBox { ItemsSource = choice.Choices, SelectedItem = _form.Get(named), MinWidth = 180 }; + var combo = new ComboBox { ItemsSource = _form.Choices(choice), SelectedItem = _form.Get(named), MinWidth = 180 }; combo.SelectionChanged += (_, _) => { if (!_syncing && combo.SelectedItem is string value && value != _form.Get(named)) @@ -416,9 +541,9 @@ private Control ControlFor(SettingsField field) return combo; } - case TextField text when field.Binding is SettingBinding optional: + case TextField text when field.Binding is SettingBinding: { - var box = new TextBox { Text = _form.Get(optional) ?? string.Empty, Width = 260 }; + var box = new TextBox { Text = _form.Text(text), Width = 260 }; if (text.Masked) { box.PasswordChar = '•'; @@ -431,9 +556,19 @@ private Control ControlFor(SettingsField field) void Commit() { - if (!_syncing && (box.Text ?? string.Empty) != (_form.Get(optional) ?? string.Empty)) + if (!_syncing && (box.Text ?? string.Empty) != _form.Text(text)) { - _form.SetText(text, box.Text); + if (_form.SetText(text, box.Text) is { } refused) + { + // Refused by the rule the cell screen's field applies: put the value back and say why. + box.Text = _form.Text(text); + ToolTip.SetTip(box, refused); + ToolTip.SetIsOpen(box, true); + } + else + { + ToolTip.SetTip(box, null); + } } } @@ -450,7 +585,7 @@ void Commit() { if (!box.IsKeyboardFocusWithin) { - box.Text = _form.Get(optional) ?? string.Empty; + box.Text = _form.Text(text); } }); return box; @@ -668,9 +803,13 @@ private void Tick() /// Re-reads every value and indicator on the page. A meter added or removed rebuilds the page, whose rows moved. internal void Refresh() { - if (_meterRows >= 0 - && _form.Section(_shown ?? string.Empty)?.Fields.OfType().FirstOrDefault() is { } meters - && _form.Meters(meters).Count != _meterRows) + var variant = _form.IsDark ? ThemeVariant.Dark : ThemeVariant.Light; + var flipped = RequestedThemeVariant != variant; + RequestedThemeVariant = variant; + if (flipped + || (_meterRows >= 0 + && _form.Section(_shown ?? string.Empty)?.Fields.OfType().FirstOrDefault() is { } meters + && _form.Meters(meters).Count != _meterRows)) { var offset = _scroller.Offset; BuildPage(); diff --git a/src/SharpMUTerm.Avalonia/ThemeCardView.cs b/src/SharpMUTerm.Avalonia/ThemeCardView.cs new file mode 100644 index 00000000..b122db5a --- /dev/null +++ b/src/SharpMUTerm.Avalonia/ThemeCardView.cs @@ -0,0 +1,137 @@ +using Avalonia; +using Avalonia.Automation; +using Avalonia.Controls; +using Avalonia.Controls.Documents; +using Avalonia.Layout; +using Avalonia.Media; +using SharpMUTerm.Client.Settings; +using SharpMUTerm.Core.Text; + +namespace SharpMUTerm.Avalonia; + +/// +/// One theme in the settings window's theme field: its preview drawn natively — three panes with their tab strips on +/// the workspace backdrop and the armed command line under them — and its name, kind and whether it is in use. Every +/// colour is the client's (), the instance the cell picker draws, so the two cannot +/// disagree. A click is the card's ; the window hands it to the form. +/// +internal sealed class ThemeCardView : Button +{ + private readonly Border _frame; + private readonly TextBlock _state; + + public ThemeCardView(ThemeCard card, bool inUse, bool windowIsDark) + { + ArgumentNullException.ThrowIfNull(card); + Card = card; + Padding = new Thickness(0); + Background = Brushes.Transparent; + BorderThickness = new Thickness(0); + HorizontalContentAlignment = HorizontalAlignment.Stretch; + Margin = new Thickness(0, 0, 14, 14); + Width = 300; + AutomationProperties.SetName(this, $"Use the {card.Name} theme"); + ToolTip.SetTip(this, $"Use {card.Name}"); + + var name = new TextBlock { Text = card.Name, FontSize = 14, FontWeight = FontWeight.SemiBold }; + _state = new TextBlock { FontSize = 12, Opacity = 0.72 }; + var words = new StackPanel { Margin = new Thickness(10, 8, 10, 8), Spacing = 1 }; + words.Children.Add(name); + words.Children.Add(_state); + + var body = new StackPanel(); + body.Children.Add(Preview(card.Preview)); + body.Children.Add(words); + + _frame = new Border + { + Child = body, + CornerRadius = new CornerRadius(8), + ClipToBounds = true, + BorderThickness = new Thickness(2), + Background = new SolidColorBrush(windowIsDark ? Color.Parse("#2b2b30") : Color.Parse("#f3f3f5")), + }; + Content = _frame; + SetInUse(inUse, windowIsDark); + } + + /// The theme this card shows. + public ThemeCard Card { get; } + + /// Whether the card is marked as the theme in use, for a test. + public bool InUse { get; private set; } + + /// Marks the card as the theme in use, or not. + public void SetInUse(bool inUse, bool windowIsDark) + { + InUse = inUse; + var kind = $"{(Card.IsDark ? "dark" : "light")} · {(Card.IsCustom ? "your own" : "built in")}"; + _state.Text = inUse ? $"In use · {kind}" : kind; + _frame.BorderBrush = inUse + ? new SolidColorBrush(windowIsDark ? Color.Parse("#60cdff") : Color.Parse("#005fb8")) + : new SolidColorBrush(windowIsDark ? Color.Parse("#46464e") : Color.Parse("#c8c8d0")); + } + + private static readonly FontFamily Mono = FontFamily.Parse("monospace"); + + private static IBrush Brush(Rgb colour) => new SolidColorBrush(Color.FromRgb(colour.R, colour.G, colour.B)); + + /// The backdrop with the panes side by side on it and the command line under them. + private static Border Preview(ThemePreview preview) + { + var panes = new Grid { ColumnSpacing = 3 }; + for (var i = 0; i < preview.Panes.Count; i++) + { + panes.ColumnDefinitions.Add(new ColumnDefinition(GridLength.Star)); + var pane = Pane(preview.Panes[i]); + Grid.SetColumn(pane, i); + panes.Children.Add(pane); + } + + var line = preview.CommandLine; + var command = new TextBlock { FontFamily = Mono, FontSize = 9, Padding = new Thickness(4, 2), TextTrimming = TextTrimming.CharacterEllipsis }; + command.Inlines!.Add(new Run(line.Prompt + " ") { Foreground = Brush(line.PromptInk), FontWeight = FontWeight.Bold }); + command.Inlines.Add(new Run(line.Text) { Foreground = Brush(line.Ink) }); + + var stack = new StackPanel { Spacing = 3 }; + stack.Children.Add(panes); + stack.Children.Add(new Border { Background = Brush(line.Band), Child = command }); + + return new Border { Background = Brush(preview.Backdrop), Padding = new Thickness(3), Child = stack }; + } + + private static Border Pane(PreviewPane pane) + { + var tabs = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 1 }; + foreach (var tab in pane.Tabs) + { + var title = new TextBlock { FontFamily = Mono, FontSize = 9, Padding = new Thickness(3, 1) }; + title.Inlines!.Add(new Run(tab.Title) { Foreground = Brush(tab.Ink), FontWeight = tab.Selected ? FontWeight.Bold : FontWeight.Normal }); + if (tab.Badge is { } badge) + { + title.Inlines.Add(new Run($" {badge}") { Foreground = Brush(tab.BadgeInk ?? tab.Ink) }); + } + + tabs.Children.Add(new Border { Background = Brush(tab.Chip), Child = title }); + } + + var lines = new StackPanel { Margin = new Thickness(4, 3, 4, 4) }; + foreach (var runs in pane.Lines) + { + var text = new TextBlock { FontFamily = Mono, FontSize = 9, TextTrimming = TextTrimming.CharacterEllipsis }; + foreach (var run in runs) + { + text.Inlines!.Add(new Run(run.Text) { Foreground = Brush(run.Ink), FontWeight = run.Bold ? FontWeight.Bold : FontWeight.Normal }); + } + + lines.Children.Add(text); + } + + var stack = new StackPanel(); + stack.Children.Add(new Border { Child = tabs, ClipToBounds = true }); + stack.Children.Add(lines); + var plane = new Border { Background = Brush(pane.Plane), Child = stack, MinHeight = 70 }; + ToolTip.SetTip(plane, pane.Role); + return plane; + } +} diff --git a/src/SharpMUTerm.Client/Contributions/Descriptors.cs b/src/SharpMUTerm.Client/Contributions/Descriptors.cs index e5a5295b..963b93e5 100644 --- a/src/SharpMUTerm.Client/Contributions/Descriptors.cs +++ b/src/SharpMUTerm.Client/Contributions/Descriptors.cs @@ -1,4 +1,5 @@ using SharpMUTerm.Client.Settings; +using SharpMUTerm.Core.Configuration; using SharpMUTerm.Core.Text; namespace SharpMUTerm.Client.Contributions; @@ -51,6 +52,12 @@ public sealed class SettingsSectionContribution : IContribution /// The key that opens its screen (F7), or null for a section no key opens. public string? Key { get; init; } + + /// + /// What its fields belong to: the client (F7, F8), one world (F5) or one character (F9). A surface drawing a + /// scoped section first says which world or character it is editing; every field's binding is of this scope. + /// + public SettingScope Scope { get; init; } = SettingScope.App; } /// @@ -79,7 +86,17 @@ public sealed record BoolField(string Id, string Label, string? Help = null) : S /// One of a closed set of values. public sealed record ChoiceField(string Id, string Label, IReadOnlyList Choices, string? Help = null) - : SettingsField(Id, Label, Help); + : SettingsField(Id, Label, Help) +{ + /// + /// The choices when they depend on the configuration (a layout row lists the player's own layouts), or null for + /// the fixed . + /// + public Func>? ChoicesFrom { get; init; } + + /// The choices over . + public IReadOnlyList ChoicesIn(AppConfiguration config) => ChoicesFrom?.Invoke(config) ?? Choices; +} /// A whole number within bounds. public sealed record NumberField(string Id, string Label, int Minimum, int Maximum, string? Help = null) @@ -87,7 +104,21 @@ public sealed record NumberField(string Id, string Label, int Minimum, int Maxim /// Free text; for a password. public sealed record TextField(string Id, string Label, int? MaxLength = null, bool Masked = false, string? Help = null) - : SettingsField(Id, Label, Help); + : SettingsField(Id, Label, Help) +{ + /// What the text may be and how it is stored (); optional free text by default. + public TextRule Rule { get; init; } = TextRule.Optional; + + /// For : the value an unset field stands for, and is shown and opened as. + public string? Fallback { get; init; } +} + +/// +/// The client's theme, picked from a list where each theme is shown as a preview (): a pane +/// in a world's colours, a tinted pane, the focused pane, the command line and a tab strip, all in that theme. Its +/// binding holds the theme's name; the choices are . +/// +public sealed record ThemeField(string Id, string Label, string? Help = null) : SettingsField(Id, Label, Help); /// A colour from a named palette (never a free hex: a name survives a theme change, a hex does not). public sealed record ColourField(string Id, string Label, IReadOnlyList Names, string? Help = null) diff --git a/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs b/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs index d3652a7b..5f00f041 100644 --- a/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs +++ b/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs @@ -17,7 +17,13 @@ namespace SharpMUTerm.Client.Settings; /// public static class BuiltInSettings { - /// F7's groups, in the order they are drawn. Colour and legibility: what the client does with the colours a world sends. + /// F7's groups, in the order they are drawn. The theme: the client's own colours, picked with a preview. + public const string ThemeGroup = "Theme"; + + /// The id of the theme field, which a host draws as a list of previews rather than one value. + public const string ThemeFieldId = "theme"; + + /// Colour and legibility: what the client does with the colours a world sends. public const string ColourGroup = "Colour & legibility"; /// Text: how a line's characters are laid out. @@ -50,6 +56,13 @@ public static class BuiltInSettings Order = 60, Fields = [ + new ThemeField(ThemeFieldId, "theme", "the colours of the panes, the bars and these screens") + { + Group = ThemeGroup, + Keywords = "colour color dark light solarized palette appearance look", + Binding = new SettingBinding(ThemeChoices.Current, ThemeChoices.Apply), + }, + Flag("strip-colour", "strip incoming ANSI colour", ColourGroup, c => c.Text.StripIncomingColour, (c, v) => c.Text.StripIncomingColour = v, "draw every line in the theme's own colours", "sgr monochrome color"), @@ -159,17 +172,203 @@ public static class BuiltInSettings ], }; + /// F5's world groups. + public const string ConnectionGroup = "Connection"; + + /// What the world speaks and how it logs in. + public const string ProtocolGroup = "Protocols & login"; + + /// How the world's text is taken in. + public const string WorldTextGroup = "Text"; + + /// What the mapper reads. + public const string MapGroup = "Map"; + + /// Sound and the starting layout. + public const string WorldMediaGroup = "Sound & layout"; + + /// + /// F5: one world's own fields, edited for the world a surface has chosen. The cell screen builds its world row from + /// these (in its own ⇥ order, by id — see WorldsScreenRenderer.WorldFieldOrder), and its CHARACTERS and TRIGGER + /// SETS panes — lists, not fields — stay the cell screen's, which the native window links to. + /// + public static SettingsSectionContribution World { get; } = new() + { + Id = "worlds", + Title = "Worlds & Characters", + Key = "F5", + Order = 10, + Scope = SettingScope.World, + Fields = + [ + WorldText("name", "name", TextRule.Name, ConnectionGroup, + (_, w) => w.Name, (_, w, v) => w.Name = v ?? w.Name, "what the world is called here", resettable: false), + WorldText("host", "host", TextRule.Required, ConnectionGroup, + (_, w) => w.Host, (_, w, v) => w.Host = v ?? w.Host, "the address to dial", "address server dns", resettable: false), + new NumberField("port", "port", 1, 65535, "the port to dial") + { + Group = ConnectionGroup, + Binding = SettingBinding.ForWorld((_, w) => w.Port, (_, w, v) => w.Port = v, resettable: false), + }, + WorldFlag("tls", "TLS", ConnectionGroup, w => w.UseTls, (w, v) => w.UseTls = v, + "connect over an encrypted connection", "ssl secure encrypted"), + WorldFlag("invalid-certificates", "accept invalid certificates", ConnectionGroup, + w => w.AllowInvalidCertificates, (w, v) => w.AllowInvalidCertificates = v, + "connect even when the server's certificate does not check out", "ssl tls self-signed insecure"), + WorldChoice("encoding", "encoding", WorldFieldValues.Encodings, ConnectionGroup, + (_, w) => w.Encoding, (_, w, v) => w.Encoding = v, + "auto follows what the server agrees; anything else overrides it", "charset utf-8 latin"), + new NumberField("keepalive", "keepalive", 0, 86400, "seconds between keepalives; 0 is off") + { + Group = ConnectionGroup, + Keywords = "idle timeout ping", + Binding = SettingBinding.ForWorld((_, w) => w.KeepaliveSeconds, (_, w, v) => w.KeepaliveSeconds = v), + }, + + WorldChoice("content", "content", WorldFieldValues.ContentChoices, ProtocolGroup, + (_, w) => WorldFieldValues.ContentName(w.ContentFormat), (_, w, v) => w.ContentFormat = WorldFieldValues.ContentOf(v), + "the markup the world sends; auto follows what it negotiates", "mxp pueblo ansi markup"), + WorldText("gmcp-modules", "gmcp modules", TextRule.Optional, ProtocolGroup, + (_, w) => WorldFieldValues.JoinModules(w), (_, w, v) => WorldFieldValues.SplitModules(w, v), + "extra GMCP packages to ask for, such as IRE.Rift 1", "gmcp packages supports"), + WorldChoice("gmcp-login", "gmcp login", WorldFieldValues.LoginChoices, ProtocolGroup, + (_, w) => w.GmcpLogin ? WorldFieldValues.LoginChoices[1] : WorldFieldValues.LoginChoices[0], + (_, w, v) => w.GmcpLogin = v == WorldFieldValues.LoginChoices[1], + "log in over GMCP when the server offers it", "char.login password credentials"), + WorldChoice("discord", "discord", WorldFieldValues.DiscordChoices, ProtocolGroup, + (_, w) => w.DiscordPresence ? WorldFieldValues.DiscordChoices[1] : WorldFieldValues.DiscordChoices[0], + (_, w, v) => w.DiscordPresence = v == WorldFieldValues.DiscordChoices[1], + "show what the game says you are doing on Discord", "presence rich status"), + + WorldChoice("emoji", "emoji", WorldFieldValues.EmojiChoices, WorldTextGroup, + (_, w) => WorldFieldValues.EmojiName(w.Emoji), (_, w, v) => WorldFieldValues.SetEmoji(w.Emoji, v), + "which emoji substitutions run on this world's text", "emoticons shortcodes"), + WorldChoice("join-wraps", "join wraps", WorldFieldValues.JoinWrapChoices, WorldTextGroup, + (_, w) => w.JoinWrappedLines ? WorldFieldValues.JoinWrapChoices[1] : WorldFieldValues.JoinWrapChoices[0], + (_, w, v) => w.JoinWrappedLines = v == WorldFieldValues.JoinWrapChoices[1], + "join lines the server wrapped at its own width", "reflow wrap hard"), + WorldText("edit-grab", "edit grab", TextRule.Optional, WorldTextGroup, + (_, w) => w.GrabPrefix, (_, w, v) => w.GrabPrefix = v, + "a line starting with this goes on the command line instead of the output", "fugueedit mush edit prefix"), + + WorldText("map-room", "map room", TextRule.Pattern, MapGroup, + (_, w) => w.Map.RoomNamePattern, (_, w, v) => w.Map.RoomNamePattern = v, + "a pattern matching a room's name line", "mapper regex"), + WorldText("map-exits", "map exits", TextRule.Pattern, MapGroup, + (_, w) => w.Map.ExitsPattern, (_, w, v) => w.Map.ExitsPattern = v, + "a pattern matching a room's exits line", "mapper regex"), + WorldText("walk-fail", "walk fail", TextRule.Pattern, MapGroup, + (_, w) => w.Map.WalkFailurePattern, (_, w, v) => w.Map.WalkFailurePattern = v, + "a pattern that stops a speedwalk", "speedwalk mapper regex"), + + WorldChoice("sounds", "sounds", WorldFieldValues.SoundChoices, WorldMediaGroup, + (_, w) => w.DownloadMedia ? WorldFieldValues.SoundChoices[0] : WorldFieldValues.SoundChoices[1], + (_, w, v) => w.DownloadMedia = v == WorldFieldValues.SoundChoices[0], + "fetch the sounds the game asks for, or play only those already cached", "audio media download"), + new ChoiceField("layout", "layout", [WorldFieldValues.WorldLayoutDefault], "the layout this world's characters start in") + { + Group = WorldMediaGroup, + Keywords = "panes combat roleplay", + ChoicesFrom = c => WorldFieldValues.LayoutChoices(WorldFieldValues.Layouts(c), WorldFieldValues.WorldLayoutDefault), + Binding = SettingBinding.ForWorld( + (c, w) => WorldFieldValues.LayoutName(WorldFieldValues.Layouts(c), w.Layout) ?? WorldFieldValues.WorldLayoutDefault, + (c, w, v) => w.Layout = WorldFieldValues.LayoutId(WorldFieldValues.Layouts(c), v)), + }, + ], + }; + + /// F9's character groups. + public const string CharacterGroup = "Character"; + + /// The character's transcript and restore log. + public const string LoggingGroup = "Logging"; + + /// How the character's panes look. + public const string LookGroup = "Panes"; + + /// + /// F9: one character's own fields, edited for the character a surface has chosen. The cell screen builds its + /// character row from these (in its ⇥ order, by id — WorldsScreenRenderer.CharacterFieldOrder); the trigger + /// sets a character uses are a list, and stay on the cell screen. + /// + public static SettingsSectionContribution Character { get; } = new() + { + Id = "logging", + Title = "Characters", + Key = "F9", + Order = 80, + Scope = SettingScope.Character, + Fields = + [ + CharacterText("name", "name", TextRule.Name, CharacterGroup, + (_, c) => c.Name, (_, c, v) => c.Name = v ?? c.Name, "the name the connect line logs in as", resettable: false), + new TextField("password", "password", Masked: true, Help: "saved in secrets.json, in plain text") + { + Group = CharacterGroup, + Rule = TextRule.Secret, + Keywords = "secret login", + Binding = SettingBinding.ForCharacter((_, c) => c.Password, (_, c, v) => c.Password = v, resettable: false), + }, + new TextField("connect", "connect", Help: "the login line; %CHARACTER% and %PASSWORD% are filled in") + { + Group = CharacterGroup, + Rule = TextRule.Defaulted, + Fallback = ConnectStringTemplate.Default, + Keywords = "login auto-login connect string", + Binding = SettingBinding.ForCharacter((_, c) => c.ConnectString, (_, c, v) => c.ConnectString = v), + }, + CharacterText("on-connect", "on connect", TextRule.Optional, CharacterGroup, + (_, c) => c.OnConnect, (_, c, v) => c.OnConnect = v, "a command sent once logged in", "commands startup"), + CharacterText("disconnect", "disconnect", TextRule.Optional, CharacterGroup, + (_, c) => c.OnDisconnect, (_, c, v) => c.OnDisconnect = v, "a command sent before hanging up", "quit logout"), + CharacterChoice("at-start", "at start", WorldFieldValues.StartupChoices, CharacterGroup, + (_, c) => c.ConnectAtStartup ? WorldFieldValues.StartupOn : WorldFieldValues.StartupOff, + (_, c, v) => c.ConnectAtStartup = string.Equals(v, WorldFieldValues.StartupOn, StringComparison.OrdinalIgnoreCase), + "connect this character when the client starts", "startup launch auto connect"), + + CharacterChoice("log", "log", WorldFieldValues.LogFormats, LoggingGroup, + (_, c) => c.Logging.Format.ToString(), + (_, c, v) => c.Logging.Format = Enum.TryParse(v, ignoreCase: true, out var f) ? f : c.Logging.Format, + "write this character's session to a transcript", "transcript html text logging"), + CharacterText("log-folder", "log folder", TextRule.Optional, LoggingGroup, + (_, c) => c.Logging.Directory, (_, c, v) => c.Logging.Directory = v, + "where transcripts go; blank is the default folder", "directory path logging"), + CharacterChoice("restore", "restore", WorldFieldValues.RestoreChoices, LoggingGroup, + (_, c) => c.Logging.RestoreLog ? WorldFieldValues.RestoreOn : WorldFieldValues.RestoreOff, + (_, c, v) => c.Logging.RestoreLog = string.Equals(v, WorldFieldValues.RestoreOn, StringComparison.OrdinalIgnoreCase), + "panes refill after a restart", "restart history"), + + new ColourField("tint", "tint", WorldFieldValues.Tints, "this character's pane colour") + { + Group = LookGroup, + Keywords = "colour color pane tint", + Binding = SettingBinding.ForCharacter( + (_, c) => c.Tint.ToString(), + (_, c, v) => c.Tint = Enum.TryParse(v, ignoreCase: true, out var t) ? t : c.Tint), + }, + new ChoiceField("layout", "layout", [WorldFieldValues.CharacterLayoutDefault], "the layout this character starts in") + { + Group = LookGroup, + Keywords = "panes combat roleplay", + ChoicesFrom = c => WorldFieldValues.LayoutChoices(WorldFieldValues.Layouts(c), WorldFieldValues.CharacterLayoutDefault), + Binding = SettingBinding.ForCharacter( + (c, ch) => WorldFieldValues.LayoutName(WorldFieldValues.Layouts(c), ch.Layout) ?? WorldFieldValues.CharacterLayoutDefault, + (c, ch, v) => ch.Layout = WorldFieldValues.LayoutId(WorldFieldValues.Layouts(c), v)), + }, + ], + }; + /// Every section the client declares, in their order: the screens F2 to F10. public static IReadOnlyList All { get; } = [ - Listed("worlds", "Worlds & Characters", "F5", 10), + World, Listed("triggers", "Triggers & spawn routing", "F2", 20), Listed("aliases", "Aliases", "F3", 30), Listed("keypad", "Keypad & hotkeys", "F4", 40), Listed("timers", "Timers", "F6", 50), Text, Input, - Listed("logging", "Character logging", "F9", 80), + Character, Listed("packages", "Packages", "F10", 90), ]; @@ -201,6 +400,89 @@ private static BoolField Flag( Binding = new SettingBinding(get, set, v => v ? "on" : "off"), }; + private static BoolField WorldFlag( + string id, + string label, + string group, + Func get, + Action set, + string? help = null, + string? keywords = null) => + new(id, label, help) + { + Group = group, + Keywords = keywords, + Binding = SettingBinding.ForWorld((_, w) => get(w), (_, w, v) => set(w, v), v => v ? "on" : "off"), + }; + + private static ChoiceField WorldChoice( + string id, + string label, + IReadOnlyList choices, + string group, + Func get, + Action set, + string? help = null, + string? keywords = null) => + new(id, label, choices, help) + { + Group = group, + Keywords = keywords, + Binding = SettingBinding.ForWorld(get, set), + }; + + private static TextField WorldText( + string id, + string label, + TextRule rule, + string group, + Func get, + Action set, + string? help = null, + string? keywords = null, + bool resettable = true) => + new(id, label, Help: help) + { + Group = group, + Rule = rule, + Keywords = keywords, + Binding = SettingBinding.ForWorld(get, set, resettable: resettable), + }; + + private static ChoiceField CharacterChoice( + string id, + string label, + IReadOnlyList choices, + string group, + Func get, + Action set, + string? help = null, + string? keywords = null) => + new(id, label, choices, help) + { + Group = group, + Keywords = keywords, + Binding = SettingBinding.ForCharacter(get, set), + }; + + private static TextField CharacterText( + string id, + string label, + TextRule rule, + string group, + Func get, + Action set, + string? help = null, + string? keywords = null, + bool resettable = true) => + new(id, label, Help: help) + { + Group = group, + Rule = rule, + Keywords = keywords, + Binding = SettingBinding.ForCharacter(get, set, resettable: resettable), + }; + private static NumberField Number( string id, string label, diff --git a/src/SharpMUTerm.Client/Settings/SettingBinding.cs b/src/SharpMUTerm.Client/Settings/SettingBinding.cs index 6a3c4ca7..690f3aa1 100644 --- a/src/SharpMUTerm.Client/Settings/SettingBinding.cs +++ b/src/SharpMUTerm.Client/Settings/SettingBinding.cs @@ -4,26 +4,82 @@ namespace SharpMUTerm.Client.Settings; /// -/// Where a declared setting lives in the : how to read it, how to write it, and -/// what it is when nobody has touched it. The untyped half is what every surface needs to say -/// ● changed and to reset a value; is what a renderer reads the value -/// through. +/// What a declared setting belongs to: the whole client, one world, or one character. A world's fields and a +/// character's fields are declared once, like the client's own, and edited for whichever world or character a +/// surface has chosen (). +/// +public enum SettingScope +{ + /// The whole client: a property of . + App, + + /// One world: a property of a . + World, + + /// One character: a property of a . + Character, +} + +/// +/// Where a binding reads and writes: the configuration, and — for a world's or a character's field — the world +/// or character being edited. An converts to one with neither, so every surface +/// that only ever edited app-wide settings passes its configuration exactly as before. +/// +/// The live configuration. +/// The world a world-scoped field edits, or null. +/// The character a character-scoped field edits, or null. +public readonly record struct SettingTarget( + AppConfiguration Config, WorldDefinition? World = null, CharacterDefinition? Character = null) +{ + /// An app-wide target over . + public static implicit operator SettingTarget(AppConfiguration config) => new(config); + + /// Whether this target names what a field of edits. + public bool Reaches(SettingScope scope) => scope switch + { + SettingScope.World => World is not null, + SettingScope.Character => Character is not null, + _ => true, + }; +} + +/// +/// Where a declared setting lives in the configuration: how to read it, how to write it, and what it is when nobody +/// has touched it. The untyped half is what every surface needs to say ● changed and to reset a value; +/// is what a renderer reads the value through. /// /// The default is never written down. It is whatever the binding reads off a freshly constructed -/// , so the configuration types stay the one place a default is decided and a +/// — or, for a world's or a character's field, a fresh or +/// — so the configuration types stay the one place a default is decided and a /// declaration cannot disagree with them. /// +/// +/// A scoped binding handed a target that does not name its owner (the settings search reading a world's field +/// with no world chosen) reads as per world / per character, is at its default and resets nothing, +/// rather than throwing: the search lists fields from every section and must not need a world to do it. Reading or +/// writing the value itself without one does throw. +/// /// public abstract class SettingBinding { - /// Whether the value in is its default. - public abstract bool IsDefault(AppConfiguration config); + /// What the setting belongs to. + public abstract SettingScope Scope { get; } - /// Puts the default back into . - public abstract void Reset(AppConfiguration config); + /// + /// Whether the value has a default worth going back to. An identity — a world's name and host, a character's + /// name and password — does not: "reset" would turn one world into a blank template, so such a field never shows + /// ● changed and offers no reset. + /// + public bool Resettable { get; protected init; } = true; + + /// Whether the value in is its default. + public abstract bool IsDefault(SettingTarget target); + + /// Puts the default back into . + public abstract void Reset(SettingTarget target); /// The value as text, the way a search result or a summary shows it. - public abstract string Text(AppConfiguration config); + public abstract string Text(SettingTarget target); /// The default as text. public abstract string DefaultText { get; } @@ -33,8 +89,9 @@ public abstract class SettingBinding /// What the configuration holds. public sealed class SettingBinding : SettingBinding { - private readonly Func _get; - private readonly Action _set; + private readonly SettingScope _scope; + private readonly Func _get; + private readonly Action _set; private readonly Func? _format; private readonly Func? _describe; private readonly Lazy _defaultText; @@ -54,27 +111,86 @@ public SettingBinding( Action set, Func? format = null, Func? describe = null) + : this( + SettingScope.App, + OnConfig(get), + OnConfig(set), + format, + describe, + resettable: true) { - ArgumentNullException.ThrowIfNull(get); - ArgumentNullException.ThrowIfNull(set); + } + + private SettingBinding( + SettingScope scope, + Func get, + Action set, + Func? format, + Func? describe, + bool resettable) + { + _scope = scope; _get = get; _set = set; _format = format; _describe = describe; + Resettable = resettable; _defaultText = new Lazy(() => Format(Default)); } - /// The value in . - public T Get(AppConfiguration config) => _get(config); + /// A field of one world: read and written on the world a surface has chosen. + /// Reads the value; the configuration is there for what a world's value is looked up in (its layouts). + /// Writes the value. + /// As for the app-wide constructor. + /// False for an identity (). + public static SettingBinding ForWorld( + Func get, + Action set, + Func? format = null, + bool resettable = true) + { + ArgumentNullException.ThrowIfNull(get); + ArgumentNullException.ThrowIfNull(set); + return new SettingBinding( + SettingScope.World, t => get(t.Config, t.World!), (t, v) => set(t.Config, t.World!, v), format, null, resettable); + } + + /// A field of one character: read and written on the character a surface has chosen. + /// Reads the value. + /// Writes the value. + /// As for the app-wide constructor. + /// False for an identity (). + public static SettingBinding ForCharacter( + Func get, + Action set, + Func? format = null, + bool resettable = true) + { + ArgumentNullException.ThrowIfNull(get); + ArgumentNullException.ThrowIfNull(set); + return new SettingBinding( + SettingScope.Character, + t => get(t.Config, t.Character!), + (t, v) => set(t.Config, t.Character!, v), + format, + null, + resettable); + } + + /// + public override SettingScope Scope => _scope; + + /// The value in . + public T Get(SettingTarget target) => _get(Checked(target)); - /// Writes into . - public void Set(AppConfiguration config, T value) => _set(config, value); + /// Writes into . + public void Set(SettingTarget target, T value) => _set(Checked(target), value); /// - /// The default, read off a fresh configuration each time — so a default that is a list is never one - /// instance shared between every configuration that is reset to it. + /// The default, read off a fresh configuration (and a fresh world and character) each time — so a default + /// that is a list is never one instance shared between every configuration that is reset to it. /// - public T Default => _get(new AppConfiguration()); + public T Default => _get(new SettingTarget(new AppConfiguration(), new WorldDefinition(), new CharacterDefinition())); /// A value as text. public string Format(T value) => @@ -84,16 +200,52 @@ public string Format(T value) => public override string DefaultText => _defaultText.Value; /// - public override bool IsDefault(AppConfiguration config) => - string.Equals(Format(Get(config)), DefaultText, StringComparison.Ordinal); + public override bool IsDefault(SettingTarget target) => + !Resettable + || !target.Reaches(_scope) + || string.Equals(Format(Get(target)), DefaultText, StringComparison.Ordinal); /// - public override void Reset(AppConfiguration config) => Set(config, Default); + public override void Reset(SettingTarget target) + { + if (Resettable && target.Reaches(_scope)) + { + Set(target, Default); + } + } /// - public override string Text(AppConfiguration config) + public override string Text(SettingTarget target) { - var value = Get(config); + if (!target.Reaches(_scope)) + { + return _scope == SettingScope.World ? "per world" : "per character"; + } + + var value = Get(target); return value is bool flag ? (flag ? "on" : "off") : _describe?.Invoke(value) ?? Format(value); } + + private SettingTarget Checked(SettingTarget target) + { + if (target.Reaches(_scope)) + { + return target; + } + + var noun = _scope.ToString().ToLowerInvariant(); + throw new InvalidOperationException($"A {noun} setting needs a {noun} to read or write."); + } + + private static Func OnConfig(Func get) + { + ArgumentNullException.ThrowIfNull(get); + return t => get(t.Config); + } + + private static Action OnConfig(Action set) + { + ArgumentNullException.ThrowIfNull(set); + return (t, v) => set(t.Config, v); + } } diff --git a/src/SharpMUTerm.Client/Settings/SettingsForm.cs b/src/SharpMUTerm.Client/Settings/SettingsForm.cs index f6d367ae..edc98640 100644 --- a/src/SharpMUTerm.Client/Settings/SettingsForm.cs +++ b/src/SharpMUTerm.Client/Settings/SettingsForm.cs @@ -8,6 +8,12 @@ namespace SharpMUTerm.Client.Settings; /// What it holds now. public sealed record ReceivedValue(string Path, string Value); +/// A world or character a scoped section can be edited for, as a host lists it. +/// What the list says: the world's name, or Corvid · Aetherfall. +/// The world. +/// The character, for a character-scoped section; null for a world. +public sealed record SettingsSubject(string Label, WorldDefinition World, CharacterDefinition? Character); + /// /// The declared settings as a form a host draws with its own controls: the sections in their order, every value /// read through its field's , and every change committed through one delegate the @@ -27,6 +33,10 @@ public sealed class SettingsForm private readonly Action _openScreen; private readonly Func> _received; private readonly Func _now; + private readonly Func> _themes; + private readonly Func _isDark; + private WorldDefinition? _world; + private CharacterDefinition? _character; /// Every settings section, in order — declared ones and the ones only listed by title. /// The live configuration the values are read from and written to. @@ -36,6 +46,10 @@ public sealed class SettingsForm /// Whether the client's theme is a dark one, so the host's controls can follow it. /// The focused connection's game data as meter paths, or null for none. /// What a meter reads now (412/500), or null while its value has not arrived. + /// The themes the theme field offers, each with its preview, or null for none. + /// Whether the client's theme is dark now — it changes when a theme is picked here. + /// The world a world-scoped section is edited for first, or null for the first world. + /// The character a character-scoped section is edited for first, or null for the first. public SettingsForm( IReadOnlyList sections, AppConfiguration config, @@ -44,7 +58,11 @@ public SettingsForm( string initial, bool isDark, Func>? received = null, - Func? now = null) + Func? now = null, + Func>? themes = null, + Func? isDarkNow = null, + WorldDefinition? world = null, + CharacterDefinition? character = null) { ArgumentNullException.ThrowIfNull(sections); ArgumentNullException.ThrowIfNull(config); @@ -55,9 +73,19 @@ public SettingsForm( _commit = commit; _openScreen = openScreen; Initial = initial; - IsDark = isDark; + _isDark = isDarkNow ?? (() => isDark); _received = received ?? (() => Array.Empty()); _now = now ?? (_ => null); + _themes = themes ?? (() => Array.Empty()); + var worlds = config.Worlds.ToArray(); + _character = character; + _world = world ?? (character is null ? null : worlds.FirstOrDefault(w => w.Characters.Contains(character))) + ?? worlds.FirstOrDefault(); + _character ??= _world?.Characters.FirstOrDefault() ?? worlds.SelectMany(w => w.Characters).FirstOrDefault(); + if (_character is not null && _world?.Characters.Contains(_character) != true) + { + _world = worlds.FirstOrDefault(w => w.Characters.Contains(_character)) ?? _world; + } } /// Every section, in order. @@ -66,8 +94,81 @@ public SettingsForm( /// The id of the section shown first. public string Initial { get; } - /// Whether the client's theme is dark. - public bool IsDark { get; } + /// Whether the client's theme is dark — now, so a theme picked here is followed. + public bool IsDark => _isDark(); + + /// + /// Every world (for ) or every character (for ) + /// a scoped section can be edited for, in configuration order; empty for an app-wide section. + /// + public IReadOnlyList Subjects(SettingScope scope) + { + var worlds = _config.Worlds.ToArray(); + return scope switch + { + SettingScope.World => [.. worlds.Select(w => new SettingsSubject(w.Name, w, null))], + SettingScope.Character => + [.. worlds.SelectMany(w => w.Characters.ToArray().Select(c => new SettingsSubject($"{c.Name} · {w.Name}", w, c)))], + _ => [], + }; + } + + /// The world or character a scoped section is being edited for, or null when there is none to edit. + public SettingsSubject? Subject(SettingScope scope) => scope switch + { + SettingScope.World when _world is { } w => new SettingsSubject(w.Name, w, null), + SettingScope.Character when _character is { } c && _world is { } w => new SettingsSubject($"{c.Name} · {w.Name}", w, c), + _ => null, + }; + + /// + /// Edits the scoped sections for from now on: a world's fields for its world, a + /// character's for its character (and its world). + /// + public void Choose(SettingsSubject subject) + { + ArgumentNullException.ThrowIfNull(subject); + _world = subject.World; + if (subject.Character is { } character) + { + _character = character; + } + else if (_character is null || !subject.World.Characters.Contains(_character)) + { + _character = subject.World.Characters.FirstOrDefault() ?? _character; + } + } + + /// Whether a section can be edited now: an app-wide one always, a scoped one once it has a world or character. + public bool HasSubject(SettingsSectionContribution section) + { + ArgumentNullException.ThrowIfNull(section); + return Target.Reaches(section.Scope); + } + + /// Where every binding reads and writes now: the configuration and the chosen world and character. + private SettingTarget Target => new(_config, _world, _character); + + /// The choices offers now (a layout row lists the player's own layouts). + public IReadOnlyList Choices(ChoiceField field) + { + ArgumentNullException.ThrowIfNull(field); + return field.ChoicesIn(_config); + } + + /// The themes the theme field offers, each with its preview — the model the cell picker draws too. + public IReadOnlyList Themes() => _themes(); + + /// Makes the client's theme, through the save funnel. + public void SetTheme(ThemeField field, string name) + { + ArgumentNullException.ThrowIfNull(field); + ArgumentNullException.ThrowIfNull(name); + if (field.Binding is SettingBinding binding) + { + Set(binding, name); + } + } /// Raised on the client's thread after a change made through this form has landed. public event Action? Changed; @@ -87,14 +188,14 @@ public static bool IsDeclared(SettingsSectionContribution section) public T Get(SettingBinding binding) { ArgumentNullException.ThrowIfNull(binding); - return binding.Get(_config); + return binding.Get(Target); } /// Whether holds its default — what decides its changed dot and its reset. public bool IsDefault(SettingsField field) { ArgumentNullException.ThrowIfNull(field); - return field.Binding?.IsDefault(_config) ?? true; + return field.Binding?.IsDefault(Target) ?? true; } /// The default of as text, for a reset button's tooltip. @@ -107,12 +208,14 @@ public static string DefaultText(SettingsField field) /// /// Writes through the save funnel. Numbers and texts go through /// and , which hold them to the rules the cell screen's field applies first, so neither - /// surface can store what the other would refuse. + /// surface can store what the other would refuse. A scoped field is written to the world or character chosen + /// when the change was made, even if the choice moves before the client runs it. /// public void Set(SettingBinding binding, T value) { ArgumentNullException.ThrowIfNull(binding); - _commit(() => binding.Set(_config, value)); + var target = Target; + _commit(() => binding.Set(target, value)); } /// Writes a number, held to 's bounds. @@ -125,22 +228,32 @@ public void SetNumber(NumberField field, int value) } } - /// Writes a text; empty is stored as no value, the cell screen's optional-field rule. - public void SetText(TextField field, string? value) + /// + /// Writes a text by its field's — refused, trimmed, blank as no value — the rule the cell + /// screen's field of the same kind applies. Returns why it was refused, or null once it is on its way. + /// + public string? SetText(TextField field, string? value) { ArgumentNullException.ThrowIfNull(field); if (field.Binding is not SettingBinding binding) { - return; + return null; } - var text = string.IsNullOrWhiteSpace(value) ? null : value.Trim(); - if (text is not null && field.MaxLength is { } max && text.Length > max) + if (TextRules.Check(field, value) is { } refused) { - text = text[..max]; + return refused; } - Set(binding, text); + Set(binding, TextRules.Store(field, value)); + return null; + } + + /// What a text field shows now: its value, or the fallback a defaulted field stands for. + public string Text(TextField field) + { + ArgumentNullException.ThrowIfNull(field); + return field.Binding is SettingBinding binding ? TextRules.Shown(field, Get(binding)) : string.Empty; } /// Puts back to its default, through the funnel, as the cell screen's r does. @@ -149,7 +262,8 @@ public void Reset(SettingsField field) ArgumentNullException.ThrowIfNull(field); if (field.Binding is { } binding) { - _commit(() => binding.Reset(_config)); + var target = Target; + _commit(() => binding.Reset(target)); } } @@ -158,7 +272,7 @@ public List Meters(ListField field) { ArgumentNullException.ThrowIfNull(field); return field.Binding is SettingBinding> binding - ? binding.Get(_config).Select(Copy).ToList() + ? binding.Get(Target).Select(Copy).ToList() : new List(); } diff --git a/src/SharpMUTerm.Client/Settings/TextRules.cs b/src/SharpMUTerm.Client/Settings/TextRules.cs new file mode 100644 index 00000000..d8efd279 --- /dev/null +++ b/src/SharpMUTerm.Client/Settings/TextRules.cs @@ -0,0 +1,96 @@ +using System.Text.RegularExpressions; +using SharpMUTerm.Client.Contributions; + +namespace SharpMUTerm.Client.Settings; + +/// What a declared text field may hold and how it is stored. Both hosts apply the same rule. +public enum TextRule +{ + /// Free text that may be blank, stored as null when it is; trimmed (an on-connect command). + Optional, + + /// Free text that may not be blank; trimmed (a host). + Required, + + /// What a thing is called: not blank, no control characters; trimmed. + Name, + + /// A regular expression that may be blank (stored as null); refused when it does not parse; not trimmed. + Pattern, + + /// A secret: blank is no value, no control characters, and never trimmed — a trimmed password is another password. + Secret, + + /// + /// A value with a default behind it (): shown as the fallback while unset, and + /// blank or the fallback itself stores null again, so "unset" has one spelling. + /// + Defaulted, +} + +/// +/// The rules of , applied by the native settings window; the cell screens build their own field +/// of the matching kind from the same rule, so the two surfaces refuse and store the same things. +/// +public static class TextRules +{ + /// Why is refused for , or null when it is accepted. + public static string? Check(TextField field, string? value) + { + ArgumentNullException.ThrowIfNull(field); + var text = value ?? string.Empty; + return field.Rule switch + { + TextRule.Required when string.IsNullOrWhiteSpace(text) => $"{field.Label} cannot be empty", + TextRule.Name when string.IsNullOrWhiteSpace(text) => $"{field.Label} cannot be empty", + TextRule.Name or TextRule.Secret or TextRule.Defaulted when text.Any(char.IsControl) => + $"{field.Label} cannot contain control characters", + TextRule.Pattern when !string.IsNullOrWhiteSpace(text) => PatternError(text), + _ => null, + }; + } + + /// What is stored for an accepted : trimmed or not, and null for "unset". + public static string? Store(TextField field, string? value) + { + ArgumentNullException.ThrowIfNull(field); + var text = value ?? string.Empty; + string? stored = field.Rule switch + { + TextRule.Required or TextRule.Name => text.Trim(), + TextRule.Pattern => string.IsNullOrWhiteSpace(text) ? null : text, + TextRule.Secret => text.Length == 0 ? null : text, + TextRule.Defaulted => text.Trim() is var t && (t.Length == 0 || string.Equals(t, field.Fallback, StringComparison.Ordinal)) + ? null + : t, + _ => string.IsNullOrWhiteSpace(text) ? null : text.Trim(), + }; + + if (stored is not null && field.MaxLength is { } max && stored.Length > max) + { + stored = stored[..max]; + } + + return stored; + } + + /// What a field shows for a stored value: the fallback for an unset defaulted field. + public static string Shown(TextField field, string? stored) + { + ArgumentNullException.ThrowIfNull(field); + return stored ?? (field.Rule == TextRule.Defaulted ? field.Fallback ?? string.Empty : string.Empty); + } + + private static string? PatternError(string pattern) + { + try + { + _ = new Regex(pattern, RegexOptions.None, TimeSpan.FromMilliseconds(100)); + return null; + } + catch (ArgumentException e) + { + return e.Message; + } + } +} diff --git a/src/SharpMUTerm.Client/Settings/ThemeChoices.cs b/src/SharpMUTerm.Client/Settings/ThemeChoices.cs new file mode 100644 index 00000000..3057d2d3 --- /dev/null +++ b/src/SharpMUTerm.Client/Settings/ThemeChoices.cs @@ -0,0 +1,100 @@ +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Theming; + +namespace SharpMUTerm.Client.Settings; + +/// +/// The themes a player can pick and how picking one is written: the built-ins (), the +/// customised theme in use if it is one of the player's own, and the player's other themes +/// (). One place, so the cell picker, the native cards and the client's +/// own theme resolution agree on what a name means. +/// +public static class ThemeChoices +{ + /// Whether names a built-in theme. + public static bool IsBuiltIn(string? name) => + name is not null && ThemeLibrary.Names.Contains(name, StringComparer.OrdinalIgnoreCase); + + /// + /// The theme in force: the inline theme when it is one of the player's own (its name is not a built-in's, or + /// disagrees with ), otherwise the built-in by name. + /// + public static Theme Resolve(AppConfiguration config) + { + ArgumentNullException.ThrowIfNull(config); + if (config.Theme is { } inline + && (!string.Equals(inline.Name, config.ThemeName, StringComparison.OrdinalIgnoreCase) || !IsBuiltIn(config.ThemeName))) + { + return inline; + } + + return ThemeLibrary.Get(config.ThemeName); + } + + /// The name of the theme in force. + public static string Current(AppConfiguration config) => Resolve(config).Name; + + /// Every theme the picker lists, by name: the built-ins in their order, then the player's own. + public static IReadOnlyList Names(AppConfiguration config) => [.. All(config).Select(t => t.Name)]; + + /// Every theme the picker lists, in order, each a copy safe to read on another thread. + public static IReadOnlyList All(AppConfiguration config) + { + ArgumentNullException.ThrowIfNull(config); + var themes = ThemeLibrary.Names.Select(ThemeLibrary.Get).ToList(); + var current = Resolve(config); + if (!IsBuiltIn(current.Name)) + { + themes.Add(current.Clone()); + } + + foreach (var own in config.CustomThemes) + { + if (!themes.Any(t => string.Equals(t.Name, own.Name, StringComparison.OrdinalIgnoreCase))) + { + themes.Add(own.Clone()); + } + } + + return themes; + } + + /// Whether is one of the player's own themes rather than a built-in. + public static bool IsCustom(string name) => !IsBuiltIn(name); + + /// The theme called , or null when the picker lists none by that name. + public static Theme? Find(AppConfiguration config, string name) => + All(config).FirstOrDefault(t => string.Equals(t.Name, name, StringComparison.OrdinalIgnoreCase)); + + /// + /// Makes the theme in force. A customised theme being replaced is kept in + /// , so nothing the player made is lost by trying another theme; a + /// name the picker does not list changes nothing. + /// + public static void Apply(AppConfiguration config, string name) + { + ArgumentNullException.ThrowIfNull(config); + ArgumentNullException.ThrowIfNull(name); + var chosen = Find(config, name); + if (chosen is null) + { + return; + } + + var current = Resolve(config); + if (string.Equals(current.Name, chosen.Name, StringComparison.OrdinalIgnoreCase)) + { + return; + } + + if (!IsBuiltIn(current.Name) + && !config.CustomThemes.Any(t => string.Equals(t.Name, current.Name, StringComparison.OrdinalIgnoreCase))) + { + config.CustomThemes.Add(current.Clone()); + } + + config.CustomThemes.RemoveAll(t => string.Equals(t.Name, chosen.Name, StringComparison.OrdinalIgnoreCase)); + config.ThemeName = chosen.Name; + config.Theme = chosen; + } +} diff --git a/src/SharpMUTerm.Client/Settings/ThemePreview.cs b/src/SharpMUTerm.Client/Settings/ThemePreview.cs new file mode 100644 index 00000000..480d0078 --- /dev/null +++ b/src/SharpMUTerm.Client/Settings/ThemePreview.cs @@ -0,0 +1,109 @@ +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Text; + +namespace SharpMUTerm.Client.Settings; + +/// One run of preview text and the colour it is drawn in, already held to the legibility floor on its pane. +/// The text. +/// Its colour. +/// Whether it is bold. +public sealed record PreviewRun(string Text, Rgb Ink, bool Bold = false); + +/// One tab of a preview pane's strip. +/// The window's name. +/// The chip it is painted on. +/// Its text colour on the chip. +/// Whether it is the tab in front. +/// An unread count, or null. +/// The count's colour on the chip. +public sealed record PreviewTab(string Title, Rgb Chip, Rgb Ink, bool Selected, string? Badge = null, Rgb? BadgeInk = null); + +/// One preview pane: what it stands for, its plane, its tab strip and its lines. +/// What the pane shows about the theme (ANSI colours, focused, tinted · moss). +/// The pane's surface. +/// Its tab strip. +/// Its output, line by line. +/// Whether it is the pane holding the keyboard. +public sealed record PreviewPane( + string Role, Rgb Plane, IReadOnlyList Tabs, IReadOnlyList> Lines, bool Focused); + +/// The armed command line under the panes. +/// The prompt, Corvid ›. +/// The prompt's colour. +/// The line being typed. +/// Its colour. +/// The band it is drawn on. +public sealed record PreviewCommandLine(string Prompt, Rgb PromptInk, string Text, Rgb Ink, Rgb Band); + +/// +/// A theme as the theme picker shows it: three panes on the workspace's backdrop — a world's ANSI colours, the focused +/// pane, a character's tinted pane — each with its tab strip, and the command line under them. Every colour is +/// resolved by the client from the theme exactly as it paints the workspace, so the cell picker and the native cards +/// draw one instance and cannot disagree. The words are 's. +/// +/// The workspace backdrop the panes sit on. +/// The panes, left to right. +/// The command line. +public sealed record ThemePreview(Rgb Backdrop, IReadOnlyList Panes, PreviewCommandLine CommandLine); + +/// A theme the picker lists, with its preview. +/// The theme's name, which is what is stored. +/// Whether its background is dark. +/// Whether it is one of the player's own rather than a built-in. +/// How it looks. +public sealed record ThemeCard(string Name, bool IsDark, bool IsCustom, ThemePreview Preview); + +/// A run of sample text: its words and the ANSI colour (0–15) a world would send it in, or null for the default. +/// The words. +/// An ANSI index, or null for the pane's default foreground. +/// Whether it is bold. +public sealed record SampleRun(string Text, int? Colour = null, bool Bold = false); + +/// +/// What every theme preview says, whatever its colours: the words both hosts draw. Kept here, beside the model, so a +/// change to the sample is one change for both. Short lines, because a cell preview splits the screen in three. +/// +public static class ThemePreviewContent +{ + /// The character the preview's focused pane and command line belong to. + public const string Character = "Corvid"; + + /// The second character, whose pane wears a tint. + public const string TintedCharacter = "Wren"; + + /// The tint the second character's pane wears. + public const PaneTint Tint = PaneTint.Moss; + + /// What the focused pane's command line holds. + public const string Typed = "say Well met."; + + /// The pane showing a world's ANSI colours. + public static IReadOnlyList> Ansi { get; } = + [ + [new("The Grand Plaza", Bold: true)], + [new("Exits: "), new("north", 6), new(", "), new("east", 6)], + [new("Mara", 2), new(" says, "), new("\"Hi!\"", 3)], + [new(" ", 5), new("Tam: brb")], + [new("HP ", 1), new("412", 9), new("/500 "), new("MP ", 4), new("88", 12)], + ]; + + /// The focused pane. + public static IReadOnlyList> Focused { get; } = + [ + [new("You enter the hall.")], + [new("A lantern burns", 3), new(" low.")], + [new("Ilse", 2), new(" waves.")], + [new("[Chat] ", 13), new("Ash: hello")], + [new("> ", 8), new("look")], + ]; + + /// The tinted pane. + public static IReadOnlyList> Tinted { get; } = + [ + [new("Wren pages: ready?")], + [new("You page Wren.", 8)], + [new("The bell tolls.", 11)], + [new("Rain on the roof.")], + [new("* ", 10), new("Wren nods.")], + ]; +} diff --git a/src/SharpMUTerm.Client/Settings/WorldFieldValues.cs b/src/SharpMUTerm.Client/Settings/WorldFieldValues.cs new file mode 100644 index 00000000..a8fc3051 --- /dev/null +++ b/src/SharpMUTerm.Client/Settings/WorldFieldValues.cs @@ -0,0 +1,171 @@ +using System.Globalization; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Layouts; +using SharpMUTerm.Core.Telnet; + +namespace SharpMUTerm.Client.Settings; + +/// +/// The words F5's world fields and F9's character fields are written in, and how each is read from and written to the +/// configuration: one list per choice field, one pair of functions per value that is not stored the way it is shown. +/// The declarations (, ) are built from +/// these, and the cell F5 screen draws its detail column with the same words, so the two cannot drift. +/// +public static class WorldFieldValues +{ + /// The encodings a world may be set to; auto follows CHARSET, every other entry is an override. + public static IReadOnlyList Encodings { get; } = + [TelnetSessionOptions.AutoEncodingName, "UTF-8", "ISO-8859-1", "ASCII", "CP437", "CP1252"]; + + /// The content field's words. auto is , the stored default. + public static IReadOnlyList ContentChoices { get; } = ["auto", "ansi", "mxp", "pueblo"]; + + /// A content format's word. + public static string ContentName(ContentFormat format) => format switch + { + ContentFormat.AnsiOnly => "ansi", + ContentFormat.Mxp => "mxp", + ContentFormat.Pueblo => "pueblo", + _ => "auto", + }; + + /// The content format a word names. + public static ContentFormat ContentOf(string name) => name.ToLowerInvariant() switch + { + "ansi" => ContentFormat.AnsiOnly, + "mxp" => ContentFormat.Mxp, + "pueblo" => ContentFormat.Pueblo, + _ => ContentFormat.Ansi, + }; + + /// The emoji field's word for "neither substitution". + public const string EmojiOff = "off"; + + /// The emoji field's words: which of the two substitutions run. + public static IReadOnlyList EmojiChoices { get; } = [EmojiOff, "emoticons", "shortcodes", "both"]; + + /// A world's emoji settings as one word. + public static string EmojiName(EmojiSettings emoji) + { + ArgumentNullException.ThrowIfNull(emoji); + return (emoji.Enabled, emoji.Emoticons, emoji.Shortcodes) switch + { + (false, _, _) or (true, false, false) => EmojiOff, + (true, true, false) => "emoticons", + (true, false, true) => "shortcodes", + _ => "both", + }; + } + + /// Writes one word back into a world's three emoji switches. + public static void SetEmoji(EmojiSettings emoji, string name) + { + ArgumentNullException.ThrowIfNull(emoji); + ArgumentNullException.ThrowIfNull(name); + var choice = name.ToLowerInvariant(); + emoji.Enabled = choice != EmojiOff; + if (emoji.Enabled) + { + emoji.Emoticons = choice is "emoticons" or "both"; + emoji.Shortcodes = choice is "shortcodes" or "both"; + } + } + + /// The words for : on fetches what the game asks for. + public static IReadOnlyList SoundChoices { get; } = ["download", "cached only"]; + + /// The words for . + public static IReadOnlyList LoginChoices { get; } = ["off", "if offered"]; + + /// The words for . + public static IReadOnlyList DiscordChoices { get; } = ["off", "show status"]; + + /// The words for . + public static IReadOnlyList JoinWrapChoices { get; } = ["off", "join"]; + + /// What a world's layout row says while it names none. + public const string WorldLayoutDefault = "(suggested)"; + + /// What a character's layout row says while it names none. + public const string CharacterLayoutDefault = "(world default)"; + + /// The at start word for connecting at launch. + public const string StartupOn = "connect"; + + /// The at start word for not. + public const string StartupOff = "off"; + + /// The at start field's words. + public static IReadOnlyList StartupChoices { get; } = [StartupOn, StartupOff]; + + /// The restore word for on. + public const string RestoreOn = "on"; + + /// The restore word for off. + public const string RestoreOff = "off"; + + /// The restore field's words. + public static IReadOnlyList RestoreChoices { get; } = [RestoreOn, RestoreOff]; + + /// The log formats, by name. + public static IReadOnlyList LogFormats { get; } = Enum.GetNames(); + + /// The pane tints, by name. + public static IReadOnlyList Tints { get; } = Enum.GetNames(); + + /// Every layout a world or character may name: the built-ins and the player's own. + public static IReadOnlyList Layouts(AppConfiguration config) + { + ArgumentNullException.ThrowIfNull(config); + return new LayoutLibrary(config.Layouts).All; + } + + /// The layout row's choices: the default word, then every layout by name. + public static IReadOnlyList LayoutChoices(IReadOnlyList layouts, string unset) + { + ArgumentNullException.ThrowIfNull(layouts); + return [unset, .. layouts.Select(l => l.Name)]; + } + + /// The name of the layout names, or null for none (or one that is gone). + public static string? LayoutName(IReadOnlyList layouts, string? id) + { + ArgumentNullException.ThrowIfNull(layouts); + return id is null ? null : layouts.FirstOrDefault(l => string.Equals(l.Id, id, StringComparison.Ordinal))?.Name; + } + + /// The id of the layout called , or null for the default word. + public static string? LayoutId(IReadOnlyList layouts, string name) + { + ArgumentNullException.ThrowIfNull(layouts); + return layouts.FirstOrDefault(l => string.Equals(l.Name, name, StringComparison.OrdinalIgnoreCase))?.Id; + } + + /// A world's extra GMCP modules as one line, or null for none. + public static string? JoinModules(WorldDefinition world) + { + ArgumentNullException.ThrowIfNull(world); + return world.GmcpModules.Count == 0 ? null : string.Join(", ", world.GmcpModules); + } + + /// + /// Writes the line back: split on commas, and only entries accepts are kept, + /// normalised to Name Version, so what is saved is what will be sent. A new list, never an edit of the old + /// one, so a surface reading on another thread never meets a half-made change. + /// + public static void SplitModules(WorldDefinition world, string? value) + { + ArgumentNullException.ThrowIfNull(world); + var modules = new List(); + foreach (var part in (value ?? string.Empty).Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries)) + { + if (GmcpHandshake.Parse(part) is { } module + && !modules.Any(m => m.StartsWith(module.Name + " ", StringComparison.OrdinalIgnoreCase))) + { + modules.Add($"{module.Name} {module.Version.ToString(CultureInfo.InvariantCulture)}"); + } + } + + world.GmcpModules = modules; + } +} diff --git a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs index 1f576228..00862326 100644 --- a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs +++ b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs @@ -235,7 +235,7 @@ public static class SurfaceCatalog [SurfaceHosts.Window] = SurfaceDrawing.Native, }, "SharpMUTerm.Tui.OptionsScreenRenderer.FromSection", - ["SharpMUTerm.Avalonia.SettingsWindow"]), + ["SharpMUTerm.Avalonia.SettingsWindow", "SharpMUTerm.Avalonia.ThemeCardView"]), new( LayoutsMenu, typeof(MenuModel), diff --git a/src/SharpMUTerm.Core/Configuration/AppConfiguration.cs b/src/SharpMUTerm.Core/Configuration/AppConfiguration.cs index a46258ba..cf709f96 100644 --- a/src/SharpMUTerm.Core/Configuration/AppConfiguration.cs +++ b/src/SharpMUTerm.Core/Configuration/AppConfiguration.cs @@ -22,6 +22,14 @@ public sealed class AppConfiguration /// public Theme Theme { get; set; } = ThemeLibrary.Dark(); + /// + /// The player's own themes that are not in use. A customised theme lives in while it is the + /// active one; picking another moves it here rather than dropping it, so the theme picker can offer it again. + /// Empty by default; no schema version moved for it, since a configuration without it has no custom theme to + /// keep. + /// + public List CustomThemes { get; set; } = new(); + /// /// Maximum scrollback lines retained per session. See /// for why the default is ten diff --git a/src/SharpMUTerm.Core/Theming/Theme.cs b/src/SharpMUTerm.Core/Theming/Theme.cs index 154b5df4..cdae71e3 100644 --- a/src/SharpMUTerm.Core/Theming/Theme.cs +++ b/src/SharpMUTerm.Core/Theming/Theme.cs @@ -41,6 +41,21 @@ public sealed class Theme /// public List? Palette16 { get; set; } + /// A copy that shares nothing with this theme, so editing one never edits the other. + public Theme Clone() => new() + { + Name = Name, + Foreground = Foreground, + Background = Background, + StatusForeground = StatusForeground, + StatusBackground = StatusBackground, + Border = Border, + SystemMessage = SystemMessage, + LocalEcho = LocalEcho, + Prompt = Prompt, + Palette16 = Palette16 is null ? null : [.. Palette16], + }; + /// Resolves a palette index (0-255) honouring any override. public Rgb ResolveIndex(int index) { diff --git a/src/SharpMUTerm.Tui/ComposeOverlay.cs b/src/SharpMUTerm.Tui/ComposeOverlay.cs index ffd51d19..36285219 100644 --- a/src/SharpMUTerm.Tui/ComposeOverlay.cs +++ b/src/SharpMUTerm.Tui/ComposeOverlay.cs @@ -67,7 +67,10 @@ internal ComposeOverlay(ConsoleWindowSystem system, Func? spellin _scheme = scheme ?? ScreenTheme.Dark; } - private readonly ScreenTheme _scheme; + private ScreenTheme _scheme; + + /// The palette it is painted in; the app replaces it when the theme changes, and the next time it is drawn follows. + internal ScreenTheme Scheme { get => _scheme; set => _scheme = value ?? ScreenTheme.Dark; } /// /// The dictionary marking this post, or null: none was found, or this is a MOO edit, whose buffer is as often diff --git a/src/SharpMUTerm.Tui/DeclaredFields.cs b/src/SharpMUTerm.Tui/DeclaredFields.cs new file mode 100644 index 00000000..7872efb2 --- /dev/null +++ b/src/SharpMUTerm.Tui/DeclaredFields.cs @@ -0,0 +1,61 @@ +using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Client.Settings; + +namespace SharpMUTerm.Tui; + +/// +/// A declared field () as the cell screens' field: the of the kind +/// its rule names, reading and writing through the field's own binding on 's world or +/// character. It is how F5's world row and character row are built, so the cell screen and the native settings window +/// edit one object through one binding and refuse the same values. +/// +internal static class DeclaredFields +{ + /// The field with in . + internal static SettingsField Find(SettingsSectionContribution section, string id) => + section.Fields.FirstOrDefault(f => string.Equals(f.Id, id, StringComparison.Ordinal)) + ?? throw new InvalidOperationException($"{section.Id} declares no field '{id}'."); + + /// The cell screen's field for , editing . + internal static ScreenField Screen(SettingsField field, SettingTarget target) + { + ArgumentNullException.ThrowIfNull(field); + switch (field) + { + case TextField text when field.Binding is SettingBinding binding: + { + string? Get() => binding.Get(target); + void Set(string? value) => binding.Set(target, value); + return text.Rule switch + { + TextRule.Name => ScreenField.Name(field.Label, () => Get() ?? string.Empty, v => Set(v)), + TextRule.Required => ScreenField.Text(field.Label, () => Get() ?? string.Empty, v => Set(v)), + TextRule.Pattern => ScreenField.OptionalPattern(field.Label, Get, Set), + TextRule.Secret => ScreenField.Password(field.Label, Get, Set), + TextRule.Defaulted => ScreenField.Defaulted(field.Label, Get, Set, text.Fallback ?? string.Empty), + _ => ScreenField.Optional(field.Label, Get, Set), + }; + } + + case NumberField number when field.Binding is SettingBinding count: + return ScreenField.Integer( + field.Label, () => count.Get(target), v => count.Set(target, v), number.Minimum, number.Maximum); + + case ChoiceField choice when field.Binding is SettingBinding named: + return ScreenField.Choice( + field.Label, () => named.Get(target), v => named.Set(target, v), choice.ChoicesIn(target.Config)); + + case ColourField colour when field.Binding is SettingBinding named: + return ScreenField.Choice(field.Label, () => named.Get(target), v => named.Set(target, v), colour.Names); + + default: + throw new InvalidOperationException($"No cell field draws {field.GetType().Name} '{field.Id}'."); + } + } + + /// The cell screen's checkbox for a declared flag, editing . + internal static ScreenToggle Toggle(SettingsField field, SettingTarget target) => + field.Binding is SettingBinding flag + ? ScreenToggle.Bind(() => flag.Get(target), v => flag.Set(target, v)) + : throw new InvalidOperationException($"'{field.Id}' is not a flag."); +} diff --git a/src/SharpMUTerm.Tui/EditReviewOverlay.cs b/src/SharpMUTerm.Tui/EditReviewOverlay.cs index 8701eaee..3b4faa72 100644 --- a/src/SharpMUTerm.Tui/EditReviewOverlay.cs +++ b/src/SharpMUTerm.Tui/EditReviewOverlay.cs @@ -35,7 +35,10 @@ internal sealed class EditReviewOverlay private Action? _keep; private Action? _undo; - private readonly ScreenTheme _scheme; + private ScreenTheme _scheme; + + /// The palette it is painted in; the app replaces it when the theme changes. + internal ScreenTheme Scheme { get => _scheme; set => _scheme = value ?? ScreenTheme.Dark; } public EditReviewOverlay(ConsoleWindowSystem system, ScreenTheme? scheme = null) { diff --git a/src/SharpMUTerm.Tui/ListOverlay.cs b/src/SharpMUTerm.Tui/ListOverlay.cs index f09c52da..ef463426 100644 --- a/src/SharpMUTerm.Tui/ListOverlay.cs +++ b/src/SharpMUTerm.Tui/ListOverlay.cs @@ -20,7 +20,10 @@ internal sealed class ListOverlay private Func? _key; private Func? _escape; - private readonly ScreenTheme _scheme; + private ScreenTheme _scheme; + + /// The palette it is painted in; the app replaces it when the theme changes, and the next time it is drawn follows. + internal ScreenTheme Scheme { get => _scheme; set => _scheme = value ?? ScreenTheme.Dark; } public ListOverlay(ConsoleWindowSystem system, ScreenTheme? scheme = null) { diff --git a/src/SharpMUTerm.Tui/OptionsScreenRenderer.cs b/src/SharpMUTerm.Tui/OptionsScreenRenderer.cs index e283de3e..905bd68b 100644 --- a/src/SharpMUTerm.Tui/OptionsScreenRenderer.cs +++ b/src/SharpMUTerm.Tui/OptionsScreenRenderer.cs @@ -93,10 +93,11 @@ public readonly record struct OptionRow( /// /// One options screen: the title and F-key its chrome shows, the rows it lists, and — while the cursor is /// on a row Delete can take out (a meter) — that removal, which the model carries as its pane's hidden - /// trailing button. + /// trailing button. is the theme under the cursor in the theme picker, or null while + /// the cursor is elsewhere: the screen is painted in that theme while it is, which is the picker's live preview. /// internal readonly record struct OptionsScreen( - string Title, string FKey, IReadOnlyList Rows, ScreenButton? Remove = null); + string Title, string FKey, IReadOnlyList Rows, ScreenButton? Remove = null, string? Preview = null); /// /// Merges every sub-block into one line list (header, options, footer). Used by the unit tests and @@ -405,6 +406,7 @@ internal static OptionsScreen FromSection( var rows = new List(); ScreenButton? remove = null; + string? preview = null; string? group = null; var navigable = 0; foreach (var field in section.Fields) @@ -434,13 +436,217 @@ internal static OptionsScreen FromSection( continue; } + if (field is ThemeField { Binding: SettingBinding theme }) + { + preview = ThemeRows(rows, config, field, theme, cursor, ref navigable) ?? preview; + continue; + } + rows.Add(Row(field, config)); navigable++; } - return new OptionsScreen(section.Title, section.Key ?? string.Empty, rows, remove); + return new OptionsScreen(section.Title, section.Key ?? string.Empty, rows, remove, preview); + } + + /// What the theme picker's caption says of the theme in use. + internal const string ThemeInUse = "in use"; + + /// The width a preview is drawn at when the screen is rendered without one (the unit tests' merged path). + private const int PreviewFallbackWidth = 76; + + /// + /// F7's theme picker, appended to : one cursor stop per theme (⏎ uses it, through the + /// screen's edits and so the save funnel), then the preview of the theme under the cursor — or of the theme in use, + /// while the cursor is elsewhere. Returns the theme under the cursor, which the screen is painted in while it is + /// there; Esc closes the screen with nothing committed, which is the revert. + /// + private static string? ThemeRows( + List rows, + AppConfiguration config, + SettingsField field, + SettingBinding binding, + int cursor, + ref int navigable) + { + var cards = ThemePreviews.Cards(config); + var current = binding.Get(config); + var reset = binding.IsDefault(config) ? null : (Action)(() => binding.Reset(config)); + string? under = null; + for (var i = 0; i < cards.Count; i++) + { + var card = cards[i]; + rows.Add(new OptionRow( + card.Name, null, null, + Button: UseTheme(binding, config, card.Name), + Reset: reset, + FieldId: i == 0 ? field.Id : null, + Where: ScreenChrome.Position("theme", i, cards.Count), + Draw: (_, width) => ThemeRow(card, current, reset is not null && i == 0))); + if (navigable == cursor) + { + under = card.Name; + } + + navigable++; + } + + var shown = cards.FirstOrDefault(c => string.Equals(c.Name, under ?? current, StringComparison.OrdinalIgnoreCase)) + ?? cards[0]; + var caption = under is null || string.Equals(under, current, StringComparison.OrdinalIgnoreCase) + ? $"[dim]preview · {Escape(shown.Name)} · {ThemeInUse}[/]" + : $"[dim]preview · {Escape(shown.Name)} · ⏎ uses it, Esc keeps {Escape(current)}[/]"; + rows.Add(new OptionRow(string.Empty, null, null, Static: true, Draw: (_, _) => new string(' ', AffordanceWidth) + caption)); + for (var line = 0; line < PreviewRows; line++) + { + var at = line; + rows.Add(new OptionRow(string.Empty, null, null, Static: true, + Draw: (_, width) => PreviewLines(shown.Preview, width > 0 ? width : PreviewFallbackWidth)[at])); + } + + return under; + } + + /// ⏎ on a theme: make it the theme, with the old one as the undo. + private static ScreenButton UseTheme(SettingBinding binding, AppConfiguration config, string name) => new( + "use", + () => + { + var before = binding.Get(config); + binding.Set(config, name); + return new ScreenPress(() => binding.Set(config, before)); + }, + ScreenButtonKind.Apply, + name); + + /// One theme's row: the in-use mark, its name, a strip of its planes, and what kind of theme it is. + private static string ThemeRow(ThemeCard card, string current, bool changed) + { + var inUse = string.Equals(card.Name, current, StringComparison.OrdinalIgnoreCase); + var mark = inUse ? $"[{Accent}]●[/] " : new string(' ', AffordanceWidth); + var preview = card.Preview; + var strip = string.Concat( + new[] { preview.Backdrop, preview.Panes[0].Plane, preview.Panes[1].Plane, preview.Panes[2].Plane, preview.CommandLine.Band } + .Select(p => $"[{p.ToHex()}]██[/]")); + var kind = $"{(card.IsDark ? "dark" : "light")} · {(card.IsCustom ? "your own" : "built in")}"; + var name = Escape(card.Name).PadRight(LabelWidth - AffordanceWidth - 12); + var label = inUse ? $"[{Value}]{name}[/]" : name; + return $"{mark}{label} {strip} [dim]{kind}[/]{(inUse ? $" [{Accent}]{ThemeInUse}[/]" : string.Empty)}" + + (changed ? Changed() : string.Empty); + } + + /// How many rows a preview takes under its caption: the tab strips, five lines, the command line. + internal const int PreviewRows = 7; + + /// + /// A preview as rows of markup, wide: three panes on the + /// backdrop, each with its tab strip, and the command line across them. Every colour is the model's own, so the + /// window's cards and these rows say the same thing. + /// + internal static IReadOnlyList PreviewLines(ThemePreview preview, int width) + { + ArgumentNullException.ThrowIfNull(preview); + var indent = new string(' ', AffordanceWidth); + var room = Math.Max(3 * 8 + 4, width - AffordanceWidth - 1); + var paneWidth = (room - 4) / 3; + var full = (paneWidth * 3) + 4; + var backdrop = preview.Backdrop.ToHex(); + var gap = $"[on {backdrop}] [/]"; + + var lines = new List(PreviewRows); + var strips = new List(); + foreach (var pane in preview.Panes) + { + strips.Add(TabStrip(pane, paneWidth, backdrop)); + } + + lines.Add(indent + gap + string.Join(gap, strips) + gap); + var depth = preview.Panes.Max(p => p.Lines.Count); + for (var row = 0; row < Math.Min(depth, PreviewRows - 2); row++) + { + var cells = preview.Panes.Select(p => PaneLine(p, row, paneWidth)); + lines.Add(indent + gap + string.Join(gap, cells) + gap); + } + + while (lines.Count < PreviewRows - 1) + { + lines.Add(indent + gap + string.Join(gap, preview.Panes.Select(p => $"[on {p.Plane.ToHex()}]{new string(' ', paneWidth)}[/]")) + gap); + } + + var line = preview.CommandLine; + var band = line.Band.ToHex(); + var prompt = Clip(line.Prompt, full - 2); + var typed = Clip(line.Text, Math.Max(0, full - 3 - prompt.Length)); + var used = prompt.Length + 1 + typed.Length; + lines.Add(indent + gap + + $"[{line.PromptInk.ToHex()} on {band}]{Escape(prompt)}[/][on {band}] [/]" + + $"[{line.Ink.ToHex()} on {band}]{Escape(typed)}[/]" + + $"[on {band}]{new string(' ', Math.Max(0, full - 2 - used))}[/]" + gap); + return lines; } + private static string TabStrip(PreviewPane pane, int width, string backdrop) + { + var markup = new System.Text.StringBuilder(); + var used = 0; + foreach (var tab in pane.Tabs) + { + var title = $" {tab.Title}"; + var badge = tab.Badge is null ? string.Empty : $" {tab.Badge}"; + var cost = title.Length + badge.Length + 1; + if (used + cost > width) + { + break; + } + + var chip = tab.Chip.ToHex(); + var weight = tab.Selected ? "bold " : string.Empty; + markup.Append($"[{weight}{tab.Ink.ToHex()} on {chip}]{Escape(title)}[/]"); + if (tab.Badge is { } count && tab.BadgeInk is { } ink) + { + markup.Append($"[{ink.ToHex()} on {chip}]{Escape(" " + count)}[/]"); + } + + markup.Append($"[on {chip}] [/]"); + used += cost; + } + + if (used < width) + { + markup.Append($"[on {backdrop}]{new string(' ', width - used)}[/]"); + } + + return markup.ToString(); + } + + private static string PaneLine(PreviewPane pane, int row, int width) + { + var plane = pane.Plane.ToHex(); + var markup = new System.Text.StringBuilder($"[on {plane}] [/]"); + var used = 1; + if (row < pane.Lines.Count) + { + foreach (var run in pane.Lines[row]) + { + var text = Clip(run.Text, width - 1 - used); + if (text.Length == 0) + { + break; + } + + var weight = run.Bold ? "bold " : string.Empty; + markup.Append($"[{weight}{run.Ink.ToHex()} on {plane}]{Escape(text)}[/]"); + used += text.Length; + } + } + + markup.Append($"[on {plane}]{new string(' ', Math.Max(0, width - used))}[/]"); + return markup.ToString(); + } + + private static string Clip(string text, int width) => + width <= 0 ? string.Empty : text.Length <= width ? text : width == 1 ? "…" : text[..(width - 1)] + "…"; + /// One declared field as a row, by kind. A field with no binding the row understands is shown read-only. private static OptionRow Row(SettingsField field, AppConfiguration config) { @@ -466,7 +672,7 @@ private static OptionRow Row(SettingsField field, AppConfiguration config) case ChoiceField choice when field.Binding is SettingBinding named: return new OptionRow( field.Label, named.Get(config), null, null, null, - ScreenField.Choice(field.Label, () => named.Get(config), v => named.Set(config, v), choice.Choices), + ScreenField.Choice(field.Label, () => named.Get(config), v => named.Set(config, v), choice.ChoicesIn(config)), Reset: reset, FieldId: field.Id); case TextField when field.Binding is SettingBinding text: diff --git a/src/SharpMUTerm.Tui/OptionsScreenView.cs b/src/SharpMUTerm.Tui/OptionsScreenView.cs index 1724d95f..87a47af4 100644 --- a/src/SharpMUTerm.Tui/OptionsScreenView.cs +++ b/src/SharpMUTerm.Tui/OptionsScreenView.cs @@ -62,11 +62,27 @@ public static IWindowControl Build( .Columns(GridLength.Star(1)); root.Place(header, 0, 0, 1, 1); root.Place(card, 1, 0, 1, 1); + root.Place(Backdrop(scheme), 2, 0, 1, 1); root.Place(footer, 3, 0, 1, 1); return root.Build(); } + /// + /// The backdrop under the card, painted from rather than left to the window: while F7's + /// theme picker previews another theme, the window behind is still the theme in force. + /// + private static IWindowControl Backdrop(ScreenTheme scheme) + { + var fill = Controls.HorizontalGrid() + .WithAlignment(HorizontalAlignment.Stretch) + .WithVerticalAlignment(VerticalAlignment.Fill) + .Column(c => c.Flex(1).Add(ScreenChrome.Panel([string.Empty], scheme, ScreenPalette.PanelBg))) + .Build(); + fill.BackgroundColor = scheme.Colour(ScreenPalette.PanelBg); + return fill; + } + /// /// The full-width elevated card holding the list. A only paints the /// cells its lines cover, so the card is a grid — a grid's background covers its whole arranged diff --git a/src/SharpMUTerm.Tui/ScreenChrome.cs b/src/SharpMUTerm.Tui/ScreenChrome.cs index 0be6c83f..6bbca503 100644 --- a/src/SharpMUTerm.Tui/ScreenChrome.cs +++ b/src/SharpMUTerm.Tui/ScreenChrome.cs @@ -141,6 +141,9 @@ internal static string Hints( /// And on one of a pane's building buttons, which is the other row ⏎ acts on. internal const string AddAction = "[[⏎]] Add"; + /// And on a value to use — a theme in F7's picker. + internal const string UseAction = "[[⏎]] Use"; + /// /// And on a row that is neither, where ⏎ leaves the screen. It says Done rather than /// Save because there is nothing left to save — every committed value is already on disk (see @@ -191,6 +194,7 @@ internal static string Actions(string? accent = null, ScreenFocus? focus = null) { ScreenEnter.Edit => EditAction, ScreenEnter.Add => AddAction, + ScreenEnter.Apply => UseAction, _ => DoneAction, }; @@ -733,17 +737,20 @@ internal static MarkupControl Band(string line, string bg, ScreenTheme scheme) = new(new List { scheme.Paint(line, bg) }) { BackgroundColor = scheme.Colour(bg), + ForegroundColor = scheme.Colour(ScreenPalette.PanelFg), HorizontalAlignment = HorizontalAlignment.Stretch, }; /// /// A column of a renderer's lines, resolved for and drawn on /// (a role: the backdrop unless the column sits on - /// a card). The one place a screen's markup becomes a control, so it is the one place it is themed. + /// a card). The one place a screen's markup becomes a control, so it is the one place it is themed — unstyled + /// text included, which takes the scheme's ink rather than the window's: while F7 previews a theme the window + /// behind is still the theme in force. /// internal static MarkupControl Panel( IEnumerable lines, ScreenTheme scheme, string plane = ScreenPalette.PanelBg) => - new(scheme.Lines(lines, plane)); + new(scheme.Lines(lines, plane)) { ForegroundColor = scheme.Colour(ScreenPalette.PanelFg) }; /// /// How many rows a two-column screen's body has: everything but the header band and the action bar. diff --git a/src/SharpMUTerm.Tui/ScreenFocus.cs b/src/SharpMUTerm.Tui/ScreenFocus.cs index 2259e14d..70304503 100644 --- a/src/SharpMUTerm.Tui/ScreenFocus.cs +++ b/src/SharpMUTerm.Tui/ScreenFocus.cs @@ -11,6 +11,9 @@ internal enum ScreenEnter /// The row is a button; ⏎ runs it. Only the building ones are reachable. Add, + + /// The row is a value to use (a theme); ⏎ makes it the setting. + Apply, } /// diff --git a/src/SharpMUTerm.Tui/ScreenModel.cs b/src/SharpMUTerm.Tui/ScreenModel.cs index 31a22b84..ad1b5fa6 100644 --- a/src/SharpMUTerm.Tui/ScreenModel.cs +++ b/src/SharpMUTerm.Tui/ScreenModel.cs @@ -196,6 +196,12 @@ internal enum ScreenButtonKind /// "only the last world can be deleted", one feature later. /// Detail, + + /// + /// Makes the row's own value the setting — a theme in F7's picker. A cursor stop like , but it + /// builds nothing, so ⏎ opens no field after it and the action bar says Use. + /// + Apply, } /// diff --git a/src/SharpMUTerm.Tui/SettingsOverlay.cs b/src/SharpMUTerm.Tui/SettingsOverlay.cs index 33d4b046..4825e352 100644 --- a/src/SharpMUTerm.Tui/SettingsOverlay.cs +++ b/src/SharpMUTerm.Tui/SettingsOverlay.cs @@ -79,15 +79,32 @@ internal sealed class SettingsOverlay public SettingsOverlay(ConsoleWindowSystem system, ScreenTheme? scheme = null) { _system = system; - Scheme = scheme ?? ScreenTheme.Dark; - _review = new EditReviewOverlay(system, Scheme); + _scheme = scheme ?? ScreenTheme.Dark; + _review = new EditReviewOverlay(system, _scheme); } /// /// The palette the screens are painted in — the app's theme, resolved once. The window's own /// backdrop is painted from it here; each screen's view paints its panels from the same instance. /// - internal ScreenTheme Scheme { get; } + internal ScreenTheme Scheme + { + get => _scheme; + set + { + _scheme = value ?? ScreenTheme.Dark; + _review.Scheme = _scheme; + if (_window is { } window) + { + // A theme picked on F7 lands while F7 is open: repaint the window's own backdrop and the screen in it. + window.BackgroundColor = _scheme.Colour(PanelBg); + window.ForegroundColor = _scheme.Colour(PanelFg); + Refresh(); + } + } + } + + private ScreenTheme _scheme = ScreenTheme.Dark; /// The F-key of the currently open screen, or null when closed. public ConsoleKey? OpenKey => _window is null ? null : _openKey; diff --git a/src/SharpMUTerm.Tui/SettingsSession.cs b/src/SharpMUTerm.Tui/SettingsSession.cs index e106878d..6bb03c9b 100644 --- a/src/SharpMUTerm.Tui/SettingsSession.cs +++ b/src/SharpMUTerm.Tui/SettingsSession.cs @@ -165,9 +165,9 @@ internal ScreenFocus Focus() private ScreenEnter Enter(ScreenModel model) { var row = model.RowAt(Selection.Pane, Selection.Index); - if (row.Button is not null) + if (row.Button is { } button) { - return ScreenEnter.Add; + return button.Kind == ScreenButtonKind.Apply ? ScreenEnter.Apply : ScreenEnter.Add; } return row.FieldCount > 0 ? ScreenEnter.Edit : ScreenEnter.Close; diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Settings.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Settings.cs index 73ff3a99..c3f1680d 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Settings.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Settings.cs @@ -48,7 +48,14 @@ private SettingsSearchHost SettingsSearchHost() => /// The search's ⏎: opens the match's screen in the same window and, for a declared field, puts the cursor /// on the row drawing it. Packages (F10) is not a settings screen and is opened its own way. /// - private bool GoToSetting(SettingsMatch match) + private bool GoToSetting(SettingsMatch match) => GoToSetting(match, native: true); + + /// What to go to. + /// + /// Whether a declared section may open in the host's settings window. False when the window itself asked for the + /// cell screen — F5's world lists and trigger sets are the cell screen's, and the window links to it. + /// + private bool GoToSetting(SettingsMatch match, bool native) { if (string.Equals(match.Section.Id, "packages", StringComparison.Ordinal)) { @@ -58,7 +65,7 @@ private bool GoToSetting(SettingsMatch match) } // A declared section is the host's own settings window where the host has one. - if (TryOpenNativeSettings(match.Section)) + if (native && TryOpenNativeSettings(match.Section)) { return true; } @@ -131,6 +138,13 @@ internal SettingsForm NativeSettingsForm(string initial) { var edits = new ScreenEdits(SaveConfiguration); var data = SettingsGameData(); + var (world, character) = FocusedSubject(); + + // The theme cards are built here, on the client's thread, and re-built only when a theme is added — the themes + // do not change while the window is open except by being picked, which changes which one is in use, not how + // each looks. + var cards = ThemePreviews.Cards(_config); + IReadOnlyList themes() => cards; SettingsForm? form = null; form = new SettingsForm( _contributions.SettingsSections.Ordered, @@ -144,10 +158,25 @@ internal SettingsForm NativeSettingsForm(string initial) initial, ThemeIsDark(), () => OptionsScreenRenderer.ReceivedPaths(data).Select(r => new ReceivedValue(r.Path, r.Value)).ToList(), - meter => OptionsScreenRenderer.NowText(meter, data)); + meter => OptionsScreenRenderer.NowText(meter, data), + themes, + () => ThemePreviews.IsDark(_theme), + world, + character); return form; } + /// + /// The world and character the focused window belongs to — what F5 and F9 open on — or nulls, and the form takes the + /// first. Resolved here, on the client's thread, because the focus is not safe to read from the window's. + /// + private (WorldDefinition? World, CharacterDefinition? Character) FocusedSubject() + { + var world = _config.Worlds.ElementAtOrDefault(ActiveWorldIndex()); + var character = world?.Characters.ElementAtOrDefault(ActiveCharacterIndex()); + return (world, character); + } + /// /// The settings window's way to a section it cannot draw: close the window and open that section's own screen. /// @@ -156,7 +185,7 @@ private void OpenSectionScreen(string id) Host.NativeSettings?.Close(); if (_contributions.SettingsSections.Find(id) is { } section) { - GoToSetting(new SettingsMatch(section, null, section.Title, -1, 0)); + GoToSetting(new SettingsMatch(section, null, section.Title, -1, 0), native: false); } } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Theme.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Theme.cs new file mode 100644 index 00000000..50d1fbb8 --- /dev/null +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Theme.cs @@ -0,0 +1,100 @@ +using SharpMUTerm.Client.Settings; +using SharpMUTerm.Core.Text; +using SharpMUTerm.Core.Theming; + +namespace SharpMUTerm.Tui; + +/// +/// The theme, changed while the client runs. F7's theme picker and the desktop's theme cards both commit through +/// , and that is where a new theme is noticed and put into force: every colour the client +/// derives from it — the workspace planes, the bars, the header, the settings screens and the popups — is re-derived and +/// repainted. What it cannot recolour is output already in a pane: a line's colours were resolved against the theme it +/// arrived under and held there as markup (), so the notice says so rather than leaving a reader to +/// wonder why the old lines look different. +/// +internal sealed partial class SharpMUTermApp +{ + /// Screen palettes for themes previewed on F7, by name, so moving the cursor does not re-derive one per key. + private readonly Dictionary _previewSchemes = new(StringComparer.OrdinalIgnoreCase); + + /// The theme in force, for a test. + internal string ThemeName => _theme.Name; + + /// + /// The palette F7 is painted in while the theme picker's cursor is on : that theme's, which + /// is the live preview; otherwise the theme in force. + /// + private ScreenTheme SchemeFor(string? preview) + { + if (preview is null || string.Equals(preview, _theme.Name, StringComparison.OrdinalIgnoreCase)) + { + return _screens; + } + + if (!_previewSchemes.TryGetValue(preview, out var scheme)) + { + scheme = ThemeChoices.Find(_config, preview) is { } theme ? ScreenTheme.For(theme) : _screens; + _previewSchemes[preview] = scheme; + } + + return scheme; + } + + /// Puts the configuration's theme into force when it is not the one the client is painting in. + private void ApplyThemeIfChanged() + { + var theme = ThemeChoices.Resolve(_config); + if (!string.Equals(Signature(theme), Signature(_theme), StringComparison.Ordinal)) + { + ApplyTheme(theme); + } + } + + /// + /// Re-derives everything the client paints from . The caller () + /// goes on to repaint the header, the rail, the pane planes, the bars and the backdrop, which all read + /// as they paint; this does the parts that were resolved once at start. + /// + private void ApplyTheme(Theme theme) + { + _theme = theme; + _ink = WorkspacePalette.Chrome(theme); + _formatter = new MarkupFormatter(theme, _config.Text); + _promptFormatter = new MarkupFormatter(theme, _config.Text, WorkspacePalette.IdleBand(theme)); + _screens = ScreenTheme.For(theme); + _previewSchemes.Clear(); + + _settings.Scheme = _screens; + _composer.Scheme = _screens; + _packageView.Scheme = _screens; + _sendMenu.Scheme = _screens; + _layoutsView.Scheme = _screens; + _welcomeView.Scheme = _screens; + + _header.BackgroundColor = ToColor(theme.StatusBackground); + _header.FocusedLinkForegroundColor = ToColor(theme.Resolve(TerminalColor.Default, isBackground: true)); + _window.ForegroundColor = ToColor(theme.Resolve(TerminalColor.Default, isBackground: false)); + foreach (var control in _panes.Values) + { + control.SelectionBackgroundColor = ToColor(WorkspacePalette.SelectionBand(theme)); + control.SelectionForegroundColor = ToColor(WorkspacePalette.SelectionInk(theme)); + } + + RebuildPaneArea(); + RefreshPanels(); + Notice( + $"Theme {theme.Name}. Output already on screen keeps the colours it arrived in.", + Core.Diagnostics.MessageSeverity.Info, + "theme"); + } + + /// A theme's name and colours as one string, so two resolutions of one theme compare equal. + private static string Signature(Theme theme) => string.Join( + ' ', + new[] + { + theme.Name, theme.Foreground.ToHex(), theme.Background.ToHex(), theme.StatusForeground.ToHex(), + theme.StatusBackground.ToHex(), theme.Border.ToHex(), theme.SystemMessage.ToHex(), theme.LocalEcho.ToHex(), + theme.Prompt.ToHex(), + }.Concat(theme.Palette16?.Select(c => c.ToHex()) ?? [])); +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index e7f81a73..29d08923 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -53,14 +53,14 @@ internal sealed partial class SharpMUTermApp : IAsyncDisposable private readonly AppConfiguration _config; private readonly SessionManager _sessions = new(); private readonly TerminalCapabilities _capabilities; - private readonly Theme _theme; + private Theme _theme; /// /// The settings screens' palette, resolved from once (). /// Handed to every surface built from 's roles — F1–F10, the deletion review /// and the package and send lists — so they follow a Light theme instead of staying dark. /// - private readonly ScreenTheme _screens; + private ScreenTheme _screens; /// /// The colours this client paints in its own voice, resolved from and held to @@ -68,9 +68,9 @@ internal sealed partial class SharpMUTermApp : IAsyncDisposable /// hexes written into the markup at each use site, each picked against a dark theme and then painted /// on whatever plane the workspace happened to have. /// - private readonly ChromeInk _ink; - private readonly MarkupFormatter _formatter; - private readonly MarkupFormatter _promptFormatter; + private ChromeInk _ink; + private MarkupFormatter _formatter; + private MarkupFormatter _promptFormatter; private readonly Workspace _workspace; private readonly Dictionary _panes = new(StringComparer.Ordinal); @@ -765,7 +765,7 @@ public SharpMUTermApp( _ownsDiagnostics = diagnostics is null; _messages = _diagnostics.Messages; _sessions.Logger = _diagnostics.For("SharpMUTerm.Session"); - _theme = ResolveTheme(config); + _theme = SharpMUTerm.Client.Settings.ThemeChoices.Resolve(config); _ink = WorkspacePalette.Chrome(_theme); _formatter = new MarkupFormatter(_theme, config.Text); @@ -2100,10 +2100,35 @@ public string RenderSnapshot(string? view = null) // demo's game data holds. The game data is written through SetGmcp, the call the wire makes. // `settings-changed` is F7 after two real edits — Space on `emoji substitution`, and `8` typed into // the tab width — so the frame carries the `● changed` marks and the header's `r reset`. + // `settings-themes` is F7 opened and ↓ pressed once: the cursor on the second theme, so the screen is painted + // in it and its preview is drawn — the theme picker's live preview, before anything is committed. + // `settings-themes-solarized` presses ↓ twice. `settings-themes-used` presses ⏎ on the second theme, so the + // frame is the client after a theme was committed live. + if (view is not null && view.StartsWith("settings-themes", StringComparison.OrdinalIgnoreCase)) + { + _settings.OpenForSnapshot(ConsoleKey.F7, TextAnsiScreen()); + var downs = view.EndsWith("-solarized", StringComparison.OrdinalIgnoreCase) ? 2 : 1; + for (var down = 0; down < downs; down++) + { + _settings.SimulateKey(Stroke('\0', ConsoleKey.DownArrow)); + } + + if (view.EndsWith("-used", StringComparison.OrdinalIgnoreCase)) + { + _settings.SimulateKey(Stroke('\r', ConsoleKey.Enter)); + } + + SyncInputWidth(); + return RenderFrame(); + } + if (string.Equals(view, "settings-changed", StringComparison.OrdinalIgnoreCase)) { _settings.OpenForSnapshot(ConsoleKey.F7, TextAnsiScreen()); - for (var down = 0; down < 5; down++) + + // Past the theme picker's rows first, then down to `emoji substitution`. + var themes = SharpMUTerm.Client.Settings.ThemeChoices.Names(_config).Count; + for (var down = 0; down < themes + 5; down++) { _settings.SimulateKey(Stroke('\0', ConsoleKey.DownArrow)); } @@ -7166,6 +7191,10 @@ private void ReloadAutomation() /// internal void SaveConfiguration() { + // F7's theme picker (or the desktop's theme cards): a new theme is put into force first, so everything + // repainted below is painted in it. See SharpMUTermApp.Theme.cs. + ApplyThemeIfChanged(); + // F8 edits the live InputSettings, so a committed height applies to the bars immediately rather // than at the next launch. SyncInputBars(); @@ -7540,7 +7569,20 @@ private ScreenBinding TimersScreen() } /// Opens the F7 Text & display screen, drawn from its declared section. - private ScreenBinding TextAnsiScreen() => OptionsScreen(TextProjection); + private ScreenBinding TextAnsiScreen() + { + // The cursor opens on the theme in force, so opening F7 previews nothing but what is already on screen. + var binding = OptionsScreen(TextProjection); + var names = SharpMUTerm.Client.Settings.ThemeChoices.Names(_config); + var current = SharpMUTerm.Client.Settings.ThemeChoices.Current(_config); + var row = names.ToList().FindIndex(n => string.Equals(n, current, StringComparison.OrdinalIgnoreCase)); + if (row > 0) + { + binding.Session.Selection.Seed(0, row); + } + + return binding; + } /// Opens the F8 Input screen, drawn from its declared section. private ScreenBinding InputScreen() => OptionsScreen(_ => InputProjection()); @@ -7558,10 +7600,14 @@ private ScreenBinding OptionsScreen(Func { var focus = session.Focus(); + var shown = screen(session.Selection.CursorIn(0)); + + // On the theme picker the screen is painted in the theme under the cursor: the live preview. Nothing is + // committed until ⏎, so Esc closes on the theme in force. return OptionsScreenView.Build( - screen(session.Selection.CursorIn(0)), + shown, _system.DesktopDimensions.Width, - _screens, + SchemeFor(shown.Preview), focus, _system.DesktopDimensions.Height); }); @@ -13840,19 +13886,6 @@ private string StatusBarMarkup(string character, string state) private static SColor ToColor(Rgb rgb) => new(rgb.R, rgb.G, rgb.B, 255); - /// - /// Resolves the active theme: a built-in by unless - /// the config carries a customised inline . - /// - private static Theme ResolveTheme(AppConfiguration config) - { - if (config.Theme is { } inline && !string.Equals(inline.Name, config.ThemeName, StringComparison.OrdinalIgnoreCase)) - { - return inline; - } - - return ThemeLibrary.Get(config.ThemeName); - } public async ValueTask DisposeAsync() { diff --git a/src/SharpMUTerm.Tui/SnapshotViews.cs b/src/SharpMUTerm.Tui/SnapshotViews.cs index 0796e858..c98bd80f 100644 --- a/src/SharpMUTerm.Tui/SnapshotViews.cs +++ b/src/SharpMUTerm.Tui/SnapshotViews.cs @@ -14,6 +14,7 @@ internal static class SnapshotViews "worlds", "settings", "triggers", "route", "highlight", "set", "aliases", "timers", "keypad", "textansi", "input", "logging", "password", "startup", "deletions", "settings-search", "settings-meters", "settings-meters-pick", "settings-changed", + "settings-themes", "settings-themes-solarized", "settings-themes-used", "triggers-edit", "logging-edit", "keypad-edit", "password-edit", "startup-edit", "freeze", "freeze-scrollback", "spawn", "split", "split-stacked", "move", "drag", "history", "history-search", "history-search-filter", "draft", "draft2", diff --git a/src/SharpMUTerm.Tui/ThemePreviews.cs b/src/SharpMUTerm.Tui/ThemePreviews.cs new file mode 100644 index 00000000..d5bdeff9 --- /dev/null +++ b/src/SharpMUTerm.Tui/ThemePreviews.cs @@ -0,0 +1,102 @@ +using SharpMUTerm.Client.Settings; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Text; +using SharpMUTerm.Core.Theming; + +namespace SharpMUTerm.Tui; + +/// +/// Resolves a theme into the theme picker's model (): every plane and ink the workspace +/// would paint in that theme — the surface, the focused plane, a tinted pane, the recessed tab chips, the armed +/// command line — computed by and held to as the +/// workspace holds them. The cell picker draws it () and the window's cards draw +/// the same instance, so the two hosts cannot show a theme differently. +/// +internal static class ThemePreviews +{ + /// Every theme the picker lists, each with its preview. + internal static IReadOnlyList Cards(AppConfiguration config) + { + ArgumentNullException.ThrowIfNull(config); + return [.. ThemeChoices.All(config).Select(Card)]; + } + + /// One theme, with its preview. + internal static ThemeCard Card(Theme theme) + { + ArgumentNullException.ThrowIfNull(theme); + return new ThemeCard(theme.Name, IsDark(theme), ThemeChoices.IsCustom(theme.Name), Preview(theme)); + } + + /// Whether a theme's background is darker than mid-grey. + internal static bool IsDark(Theme theme) + { + var bg = theme.Resolve(TerminalColor.Default, isBackground: true); + return (0.2126 * bg.R) + (0.7152 * bg.G) + (0.0722 * bg.B) < 128; + } + + /// The preview of . + internal static ThemePreview Preview(Theme theme) + { + var surface = WorkspacePalette.Surface(theme); + var focused = WorkspacePalette.Focus(surface); + var tinted = WorkspacePalette.Tint(theme, ThemePreviewContent.Tint); + var other = WorkspacePalette.Recessed(WorkspacePalette.Focus(WorkspacePalette.Tint(theme, PaneTint.Rose))); + + var panes = new[] + { + Pane(theme, "ANSI colours", surface, false, ThemePreviewContent.Ansi, [Tab(theme, "Aetherfall", surface, true, false)]), + Pane(theme, "focused", focused, true, ThemePreviewContent.Focused, + [ + Tab(theme, ThemePreviewContent.Character, focused, true, true), + Tab(theme, "Chat", WorkspacePalette.Recessed(focused), false, false, "3"), + Tab(theme, "Ash", other, false, false), + ]), + Pane(theme, $"tinted · {ThemePreviewContent.Tint.ToString().ToLowerInvariant()}", tinted, false, ThemePreviewContent.Tinted, + [Tab(theme, ThemePreviewContent.TintedCharacter, tinted, true, false)]), + }; + + var band = WorkspacePalette.ArmedBand(theme); + var line = new PreviewCommandLine( + $"{ThemePreviewContent.Character} ›", + Contrast.Legible(theme.Prompt, band), + ThemePreviewContent.Typed, + Contrast.Legible(theme.Resolve(TerminalColor.Default, isBackground: false), band), + band); + return new ThemePreview(WorkspacePalette.Backdrop(theme), panes, line); + } + + private static PreviewPane Pane( + Theme theme, + string role, + Rgb plane, + bool focused, + IReadOnlyList> sample, + IReadOnlyList tabs) + { + var lines = sample + .Select(runs => (IReadOnlyList)[.. runs.Select(r => new PreviewRun(r.Text, Ink(theme, r.Colour, plane), r.Bold))]) + .ToList(); + return new PreviewPane(role, plane, tabs, lines, focused); + } + + private static PreviewTab Tab(Theme theme, string title, Rgb chip, bool selected, bool focused, string? badge = null) + { + var ink = selected + ? Contrast.Legible(theme.Resolve(TerminalColor.Default, isBackground: false), chip) + : Contrast.Legible(WorkspacePalette.IdleInk(theme), chip); + return new PreviewTab( + focused ? "▌" + title : title, + chip, + ink, + selected, + badge, + badge is null ? null : Contrast.Legible(ChromeInk.BaseAccent, chip)); + } + + private static Rgb Ink(Theme theme, int? colour, Rgb plane) + { + var given = colour is { } index ? theme.ResolveIndex(index) : theme.Resolve(TerminalColor.Default, isBackground: false); + return Contrast.Legible(given, plane); + } +} diff --git a/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs b/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs index b5b6940e..e4e62262 100644 --- a/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs +++ b/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs @@ -1,3 +1,5 @@ +using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Client.Settings; using SharpMUTerm.Core.Layouts; using System.Globalization; using SharpMUTerm.Core.Configuration; @@ -103,37 +105,34 @@ internal static class WorldsScreenRenderer internal const int JoinWrapsField = 16; /// F5's words for : off shows rows as the server sent them. - internal static readonly string[] JoinWrapChoices = ["off", "join"]; + internal static readonly IReadOnlyList JoinWrapChoices = WorldFieldValues.JoinWrapChoices; /// What a world with no layout of its own reads as: the suggestion it accepted, else Roleplay. - internal const string WorldLayoutDefault = "(suggested)"; + internal const string WorldLayoutDefault = WorldFieldValues.WorldLayoutDefault; /// What a character with no layout of its own reads as. - internal const string CharacterLayoutDefault = "(world default)"; + internal const string CharacterLayoutDefault = WorldFieldValues.CharacterLayoutDefault; /// The layout row's choices: the default word, then every layout by name. - internal static IReadOnlyList LayoutChoices(IReadOnlyList layouts, string unset) => - [unset, .. layouts.Select(l => l.Name)]; + internal static IReadOnlyList LayoutChoices(IReadOnlyList layouts, string unset) => WorldFieldValues.LayoutChoices(layouts, unset); /// The name of the layout names, or null for none (or one that is gone). - internal static string? LayoutName(IReadOnlyList layouts, string? id) => - id is null ? null : layouts.FirstOrDefault(l => string.Equals(l.Id, id, StringComparison.Ordinal))?.Name; + internal static string? LayoutName(IReadOnlyList layouts, string? id) => WorldFieldValues.LayoutName(layouts, id); /// The id of the layout called , or null for the default word. - internal static string? LayoutId(IReadOnlyList layouts, string name) => - layouts.FirstOrDefault(l => string.Equals(l.Name, name, StringComparison.OrdinalIgnoreCase))?.Id; + internal static string? LayoutId(IReadOnlyList layouts, string name) => WorldFieldValues.LayoutId(layouts, name); /// F5's words for . - internal static readonly string[] DiscordChoices = ["off", "show status"]; + internal static readonly IReadOnlyList DiscordChoices = WorldFieldValues.DiscordChoices; /// F5's words for : how a character with a saved password logs in. - internal static readonly string[] LoginChoices = ["off", "if offered"]; + internal static readonly IReadOnlyList LoginChoices = WorldFieldValues.LoginChoices; /// The prefix the grab row suggests while it is off: AresMUSH's, and the one its /edit commands use. internal const string SuggestedGrabPrefix = "FugueEdit >"; /// F5's words for : on fetches what the game asks for. - internal static readonly string[] SoundChoices = ["download", "cached only"]; + internal static readonly IReadOnlyList SoundChoices = WorldFieldValues.SoundChoices; /// /// The character row's field ordinals, in the order ⇥ steps through them — which is the order the @@ -338,8 +337,7 @@ internal static string HeaderLine( /// and is the default: it follows CHARSET negotiation. Every other entry is an override — /// used whatever the server says — which is why the detail column labels them as one. /// - private static readonly string[] Encodings = - { TelnetSessionOptions.AutoEncodingName, "UTF-8", "ISO-8859-1", "ASCII", "CP437", "CP1252" }; + /// The label the WORLDS list's add button carries, and the row the renderer draws for it. internal const string AddWorldLabel = "+ world"; @@ -371,16 +369,16 @@ internal static string HeaderLine( internal const string StartupLabel = "at start"; /// Marked: this character is dialled when the client launches. - internal const string StartupOn = "connect"; + internal const string StartupOn = WorldFieldValues.StartupOn; /// /// Unmarked — the default. It reads off rather than no so it matches the world's /// keepalive row four lines above it, the screen's other "this feature is simply not on" /// value, and is drawn in the same muted ink for the same reason. /// - internal const string StartupOff = "off"; + internal const string StartupOff = WorldFieldValues.StartupOff; - private static readonly string[] StartupChoices = { StartupOn, StartupOff }; + /// /// The row for . It says restore and not "restore @@ -399,15 +397,15 @@ internal static string HeaderLine( internal const string RestoreNote = "panes refill after a restart"; /// The default: the panes come back. - internal const string RestoreOn = "on"; + internal const string RestoreOn = WorldFieldValues.RestoreOn; /// /// Opted out. It reads off to match at start and the world's keepalive row — /// the screen's other "this feature is simply not on" values — and is drawn in the same muted ink. /// - internal const string RestoreOff = "off"; + internal const string RestoreOff = WorldFieldValues.RestoreOff; - private static readonly string[] RestoreChoices = { RestoreOn, RestoreOff }; + /// /// The row for . One word, because the CHARACTER panel is 48 @@ -486,44 +484,14 @@ internal static ScreenModel Model( (selectedWorld, selectedCharacter) = Resolve(worlds, selectedWorld, selectedCharacter); - var worldRows = ScreenModel.Rows(worlds, w => ScreenRow.Of( - ScreenField.Name("name", () => w.Name, v => w.Name = v), - ScreenField.Text("host", () => w.Host, v => w.Host = v), - ScreenField.Integer("port", () => w.Port, v => w.Port = v, 1, 65535), - ScreenField.Choice("encoding", () => w.Encoding, v => w.Encoding = v, Encodings), - ScreenField.Integer("keepalive", () => w.KeepaliveSeconds, v => w.KeepaliveSeconds = v, 0, 86400), - ScreenField.Optional("gmcp modules", () => JoinModules(w), v => SplitModules(w, v)), - ScreenField.Choice("content", () => ContentName(w.ContentFormat), v => w.ContentFormat = ContentOf(v), ContentChoices), - ScreenField.Choice("emoji", () => EmojiName(w.Emoji), v => SetEmoji(w.Emoji, v), EmojiChoices), - ScreenField.OptionalPattern("map room", () => w.Map.RoomNamePattern, v => w.Map.RoomNamePattern = v), - ScreenField.OptionalPattern("map exits", () => w.Map.ExitsPattern, v => w.Map.ExitsPattern = v), - ScreenField.OptionalPattern("walk fail", () => w.Map.WalkFailurePattern, v => w.Map.WalkFailurePattern = v), - ScreenField.Choice( - "sounds", - () => w.DownloadMedia ? SoundChoices[0] : SoundChoices[1], - v => w.DownloadMedia = v == SoundChoices[0], - SoundChoices), - ScreenField.Optional("edit grab", () => w.GrabPrefix, v => w.GrabPrefix = v), - ScreenField.Choice( - "gmcp login", - () => w.GmcpLogin ? LoginChoices[1] : LoginChoices[0], - v => w.GmcpLogin = v == LoginChoices[1], - LoginChoices), - ScreenField.Choice( - "discord", - () => w.DiscordPresence ? DiscordChoices[1] : DiscordChoices[0], - v => w.DiscordPresence = v == DiscordChoices[1], - DiscordChoices), - ScreenField.Choice( - "layout", - () => LayoutName(all, w.Layout) ?? WorldLayoutDefault, - v => w.Layout = LayoutId(all, v), - LayoutChoices(all, WorldLayoutDefault)), - ScreenField.Choice( - "join wraps", - () => w.JoinWrappedLines ? JoinWrapChoices[1] : JoinWrapChoices[0], - v => w.JoinWrappedLines = v == JoinWrapChoices[1], - JoinWrapChoices))) + // The world's and character's fields are the declared ones (BuiltInSettings.World/.Character), built into cell + // fields through their own bindings, so this screen and the desktop's settings window edit one object one way. + // The bindings look a layout up in the configuration, so they are handed one holding these layouts. + var context = new AppConfiguration + { + Layouts = [.. all.Where(l => !BuiltInLayouts.All.Any(b => string.Equals(b.Id, l.Id, StringComparison.Ordinal)))], + }; + var worldRows = ScreenModel.Rows(worlds, w => ScreenRow.Of(DeclaredRow(BuiltInSettings.World, WorldFieldOrder, new SettingTarget(context, w)))) .Concat(WorldButtons(worlds, selectedWorld, info)) .ToArray(); @@ -536,34 +504,11 @@ internal static ScreenModel Model( // Every remaining ScreenToggle in this file is drawn where it is bound; see the security // rows and the trigger-set assignments, both of which render a real `[x]`. : ScreenModel.Rows(world.Characters, c => ScreenRow.Of( - ScreenField.Name("name", () => c.Name, v => c.Name = v), - ScreenField.Password("password", () => c.Password, v => c.Password = v), - ScreenField.Defaulted( - "connect", () => c.ConnectString, v => c.ConnectString = v, ConnectStringTemplate.Default), - ScreenField.Optional("on connect", () => c.OnConnect, v => c.OnConnect = v), - ScreenField.Optional("disconnect", () => c.OnDisconnect, v => c.OnDisconnect = v), - ScreenField.Choice( - StartupLabel, - () => c.ConnectAtStartup ? StartupOn : StartupOff, - v => c.ConnectAtStartup = string.Equals(v, StartupOn, StringComparison.OrdinalIgnoreCase), - StartupChoices), - ScreenField.Enumeration("log", () => c.Logging.Format, v => c.Logging.Format = v), - ScreenField.Optional("log folder", () => c.Logging.Directory, v => c.Logging.Directory = v), - ScreenField.Choice( - RestoreLabel, - () => c.Logging.RestoreLog ? RestoreOn : RestoreOff, - v => c.Logging.RestoreLog = string.Equals(v, RestoreOn, StringComparison.OrdinalIgnoreCase), - RestoreChoices), - ScreenField.Enumeration(TintLabel, () => c.Tint, v => c.Tint = v), - ScreenField.Choice( - "layout", - () => LayoutName(all, c.Layout) ?? CharacterLayoutDefault, - v => c.Layout = LayoutId(all, v), - LayoutChoices(all, CharacterLayoutDefault)))) + DeclaredRow(BuiltInSettings.Character, CharacterFieldOrder, new SettingTarget(context, world, c)))) .Concat(CharacterButtons(world, selectedCharacter)) .ToArray(); - var securityRows = world is null ? Array.Empty() : SecurityRows(world); + var securityRows = world is null ? Array.Empty() : SecurityRows(new SettingTarget(context, world)); if (!HasCharacter(worlds, selectedWorld, selectedCharacter)) { @@ -629,8 +574,7 @@ internal static ScreenModel Model( }); /// A world's extra GMCP modules as the well shows and edits them, or null for none. - internal static string? JoinModules(WorldDefinition world) => - world.GmcpModules.Count == 0 ? null : string.Join(", ", world.GmcpModules); + internal static string? JoinModules(WorldDefinition world) => WorldFieldValues.JoinModules(world); /// /// Writes the well back: split on commas, and only entries accepts are @@ -639,18 +583,7 @@ internal static ScreenModel Model( private static string PatternDetail(string? pattern, string unset) => string.IsNullOrWhiteSpace(pattern) ? $"[{Label}]{unset}[/]" : $"[{Value}]{Escape(pattern)}[/]"; - internal static void SplitModules(WorldDefinition world, string? value) - { - world.GmcpModules.Clear(); - foreach (var part in (value ?? string.Empty).Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries)) - { - if (GmcpHandshake.Parse(part) is { } module - && !world.GmcpModules.Any(m => m.StartsWith(module.Name + " ", StringComparison.OrdinalIgnoreCase))) - { - world.GmcpModules.Add($"{module.Name} {module.Version.ToString(CultureInfo.InvariantCulture)}"); - } - } - } + internal static void SplitModules(WorldDefinition world, string? value) => WorldFieldValues.SplitModules(world, value); /// A set's script files as the well shows and edits them, or null for none. internal static string? JoinScripts(TriggerSet set) => @@ -806,12 +739,34 @@ private static string DescribeWorld(WorldDefinition world) => /// be one negation away from silently turning verification off. /// /// - private static ScreenRow[] SecurityRows(WorldDefinition world) => new[] - { - ScreenRow.Of(ScreenToggle.Bind(() => world.UseTls, v => world.UseTls = v)), - ScreenRow.Of(ScreenToggle.Bind( - () => world.AllowInvalidCertificates, v => world.AllowInvalidCertificates = v)), - }; + private static ScreenRow[] SecurityRows(SettingTarget world) => + [ + .. SecurityFieldOrder.Select(id => ScreenRow.Of(DeclaredFields.Toggle(DeclaredFields.Find(BuiltInSettings.World, id), world))), + ]; + + /// + /// The world row's fields, in the order ⇥ steps through them and the ordinals above number them ( …), by declared id. The declaration's own order is the settings window's grouping; this is + /// the cell screen's, which tests and muscle memory address by position. + /// + internal static readonly IReadOnlyList WorldFieldOrder = + [ + "name", "host", "port", "encoding", "keepalive", "gmcp-modules", "content", "emoji", "map-room", "map-exits", + "walk-fail", "sounds", "edit-grab", "gmcp-login", "discord", "layout", "join-wraps", + ]; + + /// The world's two security checkboxes, drawn in the WORLD block (), by declared id. + internal static readonly IReadOnlyList SecurityFieldOrder = ["tls", "invalid-certificates"]; + + /// The character row's fields, in ⇥ order ( …), by declared id. + internal static readonly IReadOnlyList CharacterFieldOrder = + [ + "name", "password", "connect", "on-connect", "disconnect", "at-start", "log", "log-folder", "restore", "tint", "layout", + ]; + + /// A row of cell fields built from the declared fields names, editing . + private static ScreenField[] DeclaredRow(SettingsSectionContribution section, IReadOnlyList order, SettingTarget target) => + [.. order.Select(id => DeclaredFields.Screen(DeclaredFields.Find(section, id), target))]; /// /// The WORLDS pane's buttons, in the order needs them: the cursor @@ -1310,50 +1265,23 @@ internal static List FormColumn( /// The content field's words. auto is , the stored default, /// which starts on ANSI and follows a negotiated MXP; ansi is the deliberate choice not to. /// - internal static readonly IReadOnlyList ContentChoices = ["auto", "ansi", "mxp", "pueblo"]; + internal static readonly IReadOnlyList ContentChoices = WorldFieldValues.ContentChoices; - internal static string ContentName(ContentFormat format) => format switch - { - ContentFormat.AnsiOnly => "ansi", - ContentFormat.Mxp => "mxp", - ContentFormat.Pueblo => "pueblo", - _ => "auto", - }; + internal static string ContentName(ContentFormat format) => WorldFieldValues.ContentName(format); - internal static ContentFormat ContentOf(string name) => name.ToLowerInvariant() switch - { - "ansi" => ContentFormat.AnsiOnly, - "mxp" => ContentFormat.Mxp, - "pueblo" => ContentFormat.Pueblo, - _ => ContentFormat.Ansi, - }; + internal static ContentFormat ContentOf(string name) => WorldFieldValues.ContentOf(name); - internal const string EmojiOff = "off"; + internal const string EmojiOff = WorldFieldValues.EmojiOff; /// /// The emoji field's words: which of the two substitutions run. Three switches in the /// configuration, one field here, because "on, with neither kind" is not a state anybody wants. /// - internal static readonly IReadOnlyList EmojiChoices = [EmojiOff, "emoticons", "shortcodes", "both"]; + internal static readonly IReadOnlyList EmojiChoices = WorldFieldValues.EmojiChoices; - internal static string EmojiName(EmojiSettings emoji) => (emoji.Enabled, emoji.Emoticons, emoji.Shortcodes) switch - { - (false, _, _) or (true, false, false) => EmojiOff, - (true, true, false) => "emoticons", - (true, false, true) => "shortcodes", - _ => "both", - }; + internal static string EmojiName(EmojiSettings emoji) => WorldFieldValues.EmojiName(emoji); - internal static void SetEmoji(EmojiSettings emoji, string name) - { - var choice = name.ToLowerInvariant(); - emoji.Enabled = choice != EmojiOff; - if (emoji.Enabled) - { - emoji.Emoticons = choice is "emoticons" or "both"; - emoji.Shortcodes = choice is "shortcodes" or "both"; - } - } + internal static void SetEmoji(EmojiSettings emoji, string name) => WorldFieldValues.SetEmoji(emoji, name); /// /// What an unset log directory reads as. The field itself holds null — the logger picks a diff --git a/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowTests.cs b/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowTests.cs index d37b677a..64957aa2 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowTests.cs @@ -40,7 +40,9 @@ public SettingsForm Form(string initial = "text") initial, isDark: true, () => [new ReceivedValue("Char.Vitals.hp", "412"), new ReceivedValue("Char.Vitals.maxhp", "500")], - meter => meter.Value == "Char.Vitals.hp" ? "412/500" : null); + meter => meter.Value == "Char.Vitals.hp" ? "412/500" : null, + () => ThemePreviews.Cards(Config), + () => ThemePreviews.IsDark(ThemeChoices.Resolve(Config))); return form; } } @@ -158,6 +160,110 @@ public async Task AnUndeclaredSectionOpensItsOwnScreen() await Assert.That(shown).IsEqualTo("text"); } + /// The theme field is a card per theme, the one in use marked; a click uses another and the mark follows. + [Test] + public async Task TheThemeFieldIsCardsAndAClickUsesTheTheme() + { + var harness = new Harness(); + var (names, before, after, dark) = await Run(harness, "text", window => + { + var cards = window.ThemeCards; + var names = cards.Select(c => c.Card.Name).ToArray(); + var before = cards.Single(c => c.InUse).Card.Name; + cards.Single(c => c.Card.Name == "Light").RaiseEvent(new RoutedEventArgs(Button.ClickEvent)); + Dispatcher.UIThread.RunJobs(); + return (names, before, window.ThemeCards.Single(c => c.InUse).Card.Name, window.RequestedThemeVariant == global::Avalonia.Styling.ThemeVariant.Dark); + }); + + await Assert.That(names).IsEquivalentTo(ThemeChoices.Names(new AppConfiguration())); + await Assert.That(before).IsEqualTo("Dark"); + await Assert.That(harness.Config.ThemeName).IsEqualTo("Light"); + await Assert.That(harness.Commits).IsEqualTo(1); + await Assert.That(after).IsEqualTo("Light"); + await Assert.That(dark).IsFalse(); + } + + private static Harness TwoWorlds() + { + var harness = new Harness(); + harness.Config.Worlds.Clear(); + harness.Config.Worlds.Add(new WorldDefinition { Name = "Aetherfall", Host = "aether.example", Characters = { new CharacterDefinition { Name = "Corvid" } } }); + harness.Config.Worlds.Add(new WorldDefinition { Name = "Brightwater", Host = "bright.example", Characters = { new CharacterDefinition { Name = "Wren" } } }); + return harness; + } + + /// F5's section is drawn here: a world picker over the declared fields, and an edit lands on the world picked. + [Test] + public async Task AWorldSectionPicksItsWorldAndEditsIt() + { + var harness = TwoWorlds(); + var (fields, subjects) = await Run(harness, "worlds", window => + { + var subjects = window.SubjectPicker!.ItemCount; + window.SubjectPicker.SelectedIndex = 1; + Dispatcher.UIThread.RunJobs(); + var box = (TextBox)window.FieldControls["edit-grab"]; + box.Text = "Edit>"; + box.RaiseEvent(new global::Avalonia.Input.KeyEventArgs { RoutedEvent = global::Avalonia.Input.InputElement.KeyDownEvent, Key = global::Avalonia.Input.Key.Enter }); + Dispatcher.UIThread.RunJobs(); + return (window.ShownFields.ToArray(), subjects); + }); + + await Assert.That(subjects).IsEqualTo(2); + await Assert.That(fields).IsEquivalentTo(BuiltInSettings.World.Fields.Select(f => f.Id).ToArray()); + await Assert.That(harness.Config.Worlds[1].GrabPrefix).IsEqualTo("Edit>"); + await Assert.That(harness.Config.Worlds[0].GrabPrefix).IsNull(); + await Assert.That(harness.Commits).IsEqualTo(1); + } + + /// A text the cell screen would refuse is refused here too, and the box shows the value kept. + [Test] + public async Task ARefusedTextIsPutBack() + { + var harness = TwoWorlds(); + var shown = await Run(harness, "worlds", window => + { + var box = (TextBox)window.FieldControls["host"]; + box.Text = " "; + box.RaiseEvent(new global::Avalonia.Input.KeyEventArgs { RoutedEvent = global::Avalonia.Input.InputElement.KeyDownEvent, Key = global::Avalonia.Input.Key.Enter }); + Dispatcher.UIThread.RunJobs(); + return box.Text; + }); + + await Assert.That(shown).IsEqualTo("aether.example"); + await Assert.That(harness.Config.Worlds[0].Host).IsEqualTo("aether.example"); + await Assert.That(harness.Commits).IsEqualTo(0); + } + + /// The lists F5 holds (characters, trigger sets, adding and deleting) are its cell screen's; the door opens it. + [Test] + public async Task TheWorldSectionsDoorOpensTheCellScreen() + { + var harness = TwoWorlds(); + await Run(harness, "worlds", window => + { + window.ScreenDoor!.RaiseEvent(new RoutedEventArgs(Button.ClickEvent)); + Dispatcher.UIThread.RunJobs(); + return 0; + }); + + await Assert.That(harness.Opened).IsEquivalentTo(new[] { "worlds" }); + } + + /// With no world there is nothing to edit: no fields, a sentence saying so, and the door to F5. + [Test] + public async Task AWorldSectionWithNoWorldsShowsOnlyTheDoor() + { + var harness = new Harness(); + harness.Config.Worlds.Clear(); + var (fields, door, picker) = await Run(harness, "worlds", window => + (window.ShownFields.Count, window.ScreenDoor is not null, window.SubjectPicker is not null)); + + await Assert.That(fields).IsEqualTo(0); + await Assert.That(door).IsTrue(); + await Assert.That(picker).IsFalse(); + } + /// F7 in the window host reaches the presenter, which opens the settings window on that section. [Test] public async Task F7InTheWindowHostOpensTheSettingsWindow() diff --git a/tests/SharpMUTerm.Client.Tests/ScopedSettingsTests.cs b/tests/SharpMUTerm.Client.Tests/ScopedSettingsTests.cs new file mode 100644 index 00000000..5ecab3cb --- /dev/null +++ b/tests/SharpMUTerm.Client.Tests/ScopedSettingsTests.cs @@ -0,0 +1,183 @@ +using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Client.Settings; +using SharpMUTerm.Core.Configuration; + +namespace SharpMUTerm.Client.Tests; + +/// +/// F5's world fields and F9's character fields, declared with scoped bindings, and the theme field: a scoped field reads +/// and writes the world or character it is aimed at and no other, resets to a fresh world's or character's default, +/// refuses what the cell screen refuses, and is found by the search; the theme field keeps a customised theme when +/// another is tried. +/// +public class ScopedSettingsTests +{ + private static AppConfiguration TwoWorlds() + { + var config = new AppConfiguration(); + config.Worlds.Clear(); + config.Worlds.Add(new WorldDefinition { Name = "Aetherfall", Host = "aether.example", Characters = { new CharacterDefinition { Name = "Corvid" } } }); + config.Worlds.Add(new WorldDefinition { Name = "Brightwater", Host = "bright.example", Characters = { new CharacterDefinition { Name = "Wren" } } }); + return config; + } + + private static SettingsField World(string id) => BuiltInSettings.World.Fields.Single(f => f.Id == id); + + private static SettingsField Character(string id) => BuiltInSettings.Character.Fields.Single(f => f.Id == id); + + [Test] + public async Task TheWorldAndCharacterSectionsAreScoped() + { + await Assert.That(BuiltInSettings.World.Scope).IsEqualTo(SettingScope.World); + await Assert.That(BuiltInSettings.Character.Scope).IsEqualTo(SettingScope.Character); + await Assert.That(BuiltInSettings.Text.Scope).IsEqualTo(SettingScope.App); + await Assert.That(BuiltInSettings.World.Fields.All(f => f.Binding!.Scope == SettingScope.World)).IsTrue(); + await Assert.That(BuiltInSettings.Character.Fields.All(f => f.Binding!.Scope == SettingScope.Character)).IsTrue(); + } + + [Test] + public async Task AWorldFieldWritesTheWorldItIsAimedAtAndResetsToAFreshWorldsDefault() + { + var config = TwoWorlds(); + var second = config.Worlds[1]; + var grab = (SettingBinding)World("edit-grab").Binding!; + var target = new SettingTarget(config, second); + + grab.Set(target, "FugueEdit > "); + + await Assert.That(second.GrabPrefix).IsEqualTo("FugueEdit > "); + await Assert.That(config.Worlds[0].GrabPrefix).IsNull(); + await Assert.That(grab.IsDefault(target)).IsFalse(); + await Assert.That(grab.IsDefault(new SettingTarget(config, config.Worlds[0]))).IsTrue(); + + grab.Reset(target); + await Assert.That(second.GrabPrefix).IsEqualTo(new WorldDefinition().GrabPrefix); + } + + [Test] + public async Task AScopedFieldWithNoSubjectSaysSoAndChangesNothing() + { + var config = new AppConfiguration(); + var grab = World("edit-grab").Binding!; + + await Assert.That(grab.IsDefault(config)).IsTrue(); + await Assert.That(grab.Text(config)).IsEqualTo("per world"); + await Assert.That(Character("tint").Binding!.Text(config)).IsEqualTo("per character"); + } + + [Test] + public async Task IdentityFieldsAreNotReset() + { + foreach (var id in new[] { "name", "host", "port" }) + { + await Assert.That(World(id).Binding!.Resettable).IsFalse(); + } + + await Assert.That(Character("name").Binding!.Resettable).IsFalse(); + await Assert.That(Character("password").Binding!.Resettable).IsFalse(); + await Assert.That(World("edit-grab").Binding!.Resettable).IsTrue(); + } + + [Test] + public async Task TheFormEditsTheChosenSubjectThroughOneCommitEach() + { + var config = TwoWorlds(); + var commits = 0; + var form = new SettingsForm(BuiltInSettings.All, config, change => { change(); commits++; }, _ => { }, "worlds", isDark: true); + + await Assert.That(form.Subject(SettingScope.World)!.World).IsSameReferenceAs(config.Worlds[0]); + form.Choose(form.Subjects(SettingScope.World)[1]); + await Assert.That(form.Subject(SettingScope.Character)!.Character!.Name).IsEqualTo("Wren"); + + var grab = (TextField)World("edit-grab"); + await Assert.That(form.SetText(grab, " Edit> ")).IsNull(); + await Assert.That(commits).IsEqualTo(1); + await Assert.That(config.Worlds[1].GrabPrefix).IsEqualTo("Edit>"); + await Assert.That(config.Worlds[0].GrabPrefix).IsNull(); + + form.Reset(grab); + await Assert.That(commits).IsEqualTo(2); + await Assert.That(config.Worlds[1].GrabPrefix).IsNull(); + + var tint = (SettingBinding)Character("tint").Binding!; + form.Set(tint, "Moss"); + await Assert.That(config.Worlds[1].Characters[0].Tint).IsEqualTo(PaneTint.Moss); + await Assert.That(config.Worlds[0].Characters[0].Tint).IsEqualTo(PaneTint.None); + } + + [Test] + public async Task TheFormRefusesWhatTheCellScreenRefuses() + { + var config = TwoWorlds(); + var commits = 0; + var form = new SettingsForm(BuiltInSettings.All, config, change => { change(); commits++; }, _ => { }, "worlds", isDark: true); + + await Assert.That(form.SetText((TextField)World("host"), " ")).IsNotNull(); + await Assert.That(form.SetText((TextField)World("walk-fail"), "(unclosed")).IsNotNull(); + await Assert.That(commits).IsEqualTo(0); + await Assert.That(config.Worlds[0].Host).IsEqualTo("aether.example"); + } + + [Test] + public async Task AConnectLineLeftUnsetShowsTheDefaultTemplate() + { + var config = TwoWorlds(); + var form = new SettingsForm(BuiltInSettings.All, config, change => change(), _ => { }, "logging", isDark: true); + var connect = (TextField)Character("connect"); + + await Assert.That(form.Text(connect)).IsEqualTo(connect.Fallback!); + } + + [Test] + public async Task TheSearchFindsWorldAndCharacterFields() + { + var grab = SettingsSearch.Find(BuiltInSettings.All, "edit grab"); + await Assert.That(grab.Any(m => m.Section.Id == BuiltInSettings.World.Id && m.Field?.Id == "edit-grab")).IsTrue(); + + var tint = SettingsSearch.Find(BuiltInSettings.All, "pane colour"); + await Assert.That(tint.Any(m => m.Section.Id == BuiltInSettings.Character.Id && m.Field?.Id == "tint")).IsTrue(); + + var theme = SettingsSearch.Find(BuiltInSettings.All, "solarized"); + await Assert.That(theme.Any(m => m.Field?.Id == BuiltInSettings.ThemeFieldId)).IsTrue(); + } + + [Test] + public async Task PickingAThemeSetsItsNameAndColours() + { + var config = new AppConfiguration(); + ThemeChoices.Apply(config, "Light"); + + await Assert.That(config.ThemeName).IsEqualTo("Light"); + await Assert.That(config.Theme.Name).IsEqualTo("Light"); + await Assert.That(ThemeChoices.Current(config)).IsEqualTo("Light"); + await Assert.That(ThemeChoices.Names(config)).Contains("Solarized Dark"); + } + + [Test] + public async Task TryingAnotherThemeKeepsTheCustomisedOne() + { + var config = new AppConfiguration(); + var mine = config.Theme.Clone(); + mine.Name = "Midnight"; + config.Theme = mine; + config.ThemeName = "Midnight"; + await Assert.That(ThemeChoices.Current(config)).IsEqualTo("Midnight"); + + ThemeChoices.Apply(config, "Dark"); + + await Assert.That(ThemeChoices.Current(config)).IsEqualTo("Dark"); + await Assert.That(config.CustomThemes.Select(t => t.Name)).Contains("Midnight"); + await Assert.That(ThemeChoices.Names(config)).Contains("Midnight"); + + ThemeChoices.Apply(config, "Midnight"); + await Assert.That(ThemeChoices.Current(config)).IsEqualTo("Midnight"); + } + + [Test] + public async Task ANameThePickerDoesNotListChangesNothing() + { + var config = new AppConfiguration(); + ThemeChoices.Apply(config, "No Such Theme"); + await Assert.That(config.ThemeName).IsEqualTo("Dark"); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/CommandSurfaceSettingsTests.cs b/tests/SharpMUTerm.Tui.Tests/CommandSurfaceSettingsTests.cs index 3bc30549..9f8c64b2 100644 --- a/tests/SharpMUTerm.Tui.Tests/CommandSurfaceSettingsTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/CommandSurfaceSettingsTests.cs @@ -53,7 +53,12 @@ public async Task ACommittedSettingsEditIsPersistedThroughTheAppsSaveAction() new HeadlessConsoleDriver(Width, Height), save: _ => saves++); - app.DispatchCommand("screen:textansi"); // F7: every row a checkbox + app.DispatchCommand("screen:textansi"); // F7: past the theme rows, a checkbox + foreach (var _ in Enumerable.Range(0, 3)) + { + app.SimulateSettingsKey(new ConsoleKeyInfo('\0', ConsoleKey.DownArrow, false, false, false)); + } + app.SimulateSettingsKey(new ConsoleKeyInfo(' ', ConsoleKey.Spacebar, false, false, false)); await Assert.That(saves).IsGreaterThan(0); @@ -75,7 +80,12 @@ public async Task AnAppWithNoSaveActionPersistsNothing() { var app = App(); - app.DispatchCommand("screen:textansi"); + app.DispatchCommand("screen:textansi"); // F7: past the theme rows, a checkbox + foreach (var _ in Enumerable.Range(0, 3)) + { + app.SimulateSettingsKey(new ConsoleKeyInfo('\0', ConsoleKey.DownArrow, false, false, false)); + } + app.SimulateSettingsKey(new ConsoleKeyInfo(' ', ConsoleKey.Spacebar, false, false, false)); // Nothing threw and nothing was written: the only route to disk is the action the entry point diff --git a/tests/SharpMUTerm.Tui.Tests/DeclaredWorldSettingsTests.cs b/tests/SharpMUTerm.Tui.Tests/DeclaredWorldSettingsTests.cs new file mode 100644 index 00000000..81a7e2ed --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/DeclaredWorldSettingsTests.cs @@ -0,0 +1,186 @@ +using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Client.Settings; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Graphics; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// F5's world fields and F9's character fields are declared, and the cell screen and the desktop's settings window are +/// both drawn from the declarations: they list the same fields, an edit in either reaches the same property through the +/// one save funnel, and F7's theme picker previews as the cursor moves, reverts on Esc and commits once on ⏎. +/// +[NotInParallel] +public class DeclaredWorldSettingsTests +{ + private static readonly TerminalCapabilities Headless = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private static (SharpMUTermApp App, AppConfiguration Config, Func Saves) App() + { + Console.SetIn(TextReader.Null); + var config = DemoScene.Build(); + var saves = 0; + var app = new SharpMUTermApp(config, Headless, new HeadlessConsoleDriver(120, 40), save: _ => saves++); + return (app, config, () => saves); + } + + private static void Key(SharpMUTermApp app, ConsoleKey key, char ch = '\0') => + app.SimulateSettingsKey(new ConsoleKeyInfo(ch, key, false, false, false)); + + private static void Type(SharpMUTermApp app, string text) + { + foreach (var ch in text) + { + app.SimulateSettingsKey(new ConsoleKeyInfo(ch, char.IsLetter(ch) ? (ConsoleKey)char.ToUpperInvariant(ch) : ConsoleKey.Oem1, char.IsUpper(ch), false, false)); + } + } + + [Test] + public async Task TheCellScreenAndTheWindowListTheSameWorldFields() + { + var declared = BuiltInSettings.World.Fields.Select(f => f.Id).ToHashSet(StringComparer.Ordinal); + var drawn = WorldsScreenRenderer.WorldFieldOrder.Concat(WorldsScreenRenderer.SecurityFieldOrder).ToList(); + + await Assert.That(drawn.Count).IsEqualTo(declared.Count); + await Assert.That(drawn.ToHashSet(StringComparer.Ordinal).SetEquals(declared)).IsTrue(); + + var worlds = DemoScene.Build().Worlds; + var model = WorldsScreenRenderer.Model(worlds, [], 0, 0); + for (var i = 0; i < WorldsScreenRenderer.WorldFieldOrder.Count; i++) + { + var field = BuiltInSettings.World.Fields.Single(f => f.Id == WorldsScreenRenderer.WorldFieldOrder[i]); + await Assert.That(model.FieldAt(0, 0, i)!.Value.Label).IsEqualTo(field.Label); + } + } + + [Test] + public async Task TheCellScreenAndTheWindowListTheSameCharacterFields() + { + var declared = BuiltInSettings.Character.Fields.Select(f => f.Id).ToList(); + await Assert.That(WorldsScreenRenderer.CharacterFieldOrder.ToHashSet(StringComparer.Ordinal).SetEquals(declared)).IsTrue(); + await Assert.That(WorldsScreenRenderer.CharacterFieldOrder.Count).IsEqualTo(declared.Count); + + var worlds = DemoScene.Build().Worlds; + var model = WorldsScreenRenderer.Model(worlds, [], 0, 0); + for (var i = 0; i < WorldsScreenRenderer.CharacterFieldOrder.Count; i++) + { + var field = BuiltInSettings.Character.Fields.Single(f => f.Id == WorldsScreenRenderer.CharacterFieldOrder[i]); + await Assert.That(model.FieldAt(1, 0, i)!.Value.Label).IsEqualTo(field.Label); + } + } + + [Test] + public async Task AWindowEditReachesTheWorldAndIsSavedOnce() + { + var (app, config, saves) = App(); + var form = app.NativeSettingsForm("worlds"); + var world = form.Subject(SettingScope.World)!.World; + + await Assert.That(form.SetText((TextField)BuiltInSettings.World.Fields.Single(f => f.Id == "edit-grab"), "Edit> ")).IsNull(); + + await Assert.That(world.GrabPrefix).IsEqualTo("Edit>"); + await Assert.That(config.Worlds.Contains(world)).IsTrue(); + await Assert.That(saves()).IsEqualTo(1); + + form.Reset(BuiltInSettings.World.Fields.Single(f => f.Id == "edit-grab")); + await Assert.That(world.GrabPrefix).IsNull(); + await Assert.That(saves()).IsEqualTo(2); + } + + [Test] + public async Task AWindowEditOfACharacterReachesTheCellScreensCharacter() + { + var (app, config, saves) = App(); + var form = app.NativeSettingsForm("logging"); + var character = form.Subject(SettingScope.Character)!.Character!; + + form.Set((SettingBinding)BuiltInSettings.Character.Fields.Single(f => f.Id == "tint").Binding!, "Rose"); + + await Assert.That(character.Tint).IsEqualTo(PaneTint.Rose); + await Assert.That(saves()).IsEqualTo(1); + + // The cell screen's tint field reads the same property through the same declaration. + var world = config.Worlds.First(w => w.Characters.Contains(character)); + var model = WorldsScreenRenderer.Model(config.Worlds, [], config.Worlds.IndexOf(world), world.Characters.IndexOf(character)); + var tint = WorldsScreenRenderer.CharacterFieldOrder.ToList().IndexOf("tint"); + var row = world.Characters.IndexOf(character); + await Assert.That(model.FieldAt(1, row, tint)!.Value.Get()).IsEqualTo("Rose"); + } + + [Test] + public async Task ACellEditReachesTheSamePropertyThroughTheSaveFunnel() + { + var (app, config, saves) = App(); + var world = config.Worlds[0]; + var grab = WorldsScreenRenderer.WorldFieldOrder.ToList().IndexOf("edit-grab"); + + app.DispatchCommand("screen:worlds"); + Key(app, ConsoleKey.Enter); + for (var i = 0; i < grab; i++) + { + Key(app, ConsoleKey.Tab, '\t'); + } + + Type(app, "Edit;"); + Key(app, ConsoleKey.Enter, '\r'); + + await Assert.That(world.GrabPrefix).IsEqualTo("Edit;"); + await Assert.That(saves()).IsGreaterThan(0); + } + + [Test] + public async Task MovingOverAThemePreviewsItAndEscCommitsNothing() + { + var (app, config, saves) = App(); + app.DispatchCommand("screen:textansi"); + Key(app, ConsoleKey.DownArrow); + + await Assert.That(app.ThemeName).IsEqualTo("Dark"); + await Assert.That(config.ThemeName).IsEqualTo("Dark"); + + Key(app, ConsoleKey.Escape, '\u001b'); + + await Assert.That(app.SettingsOpenKey).IsNull(); + await Assert.That(app.ThemeName).IsEqualTo("Dark"); + await Assert.That(saves()).IsEqualTo(0); + } + + [Test] + public async Task EnterOnAThemeUsesItAndSavesOnce() + { + var (app, config, saves) = App(); + app.DispatchCommand("screen:textansi"); + Key(app, ConsoleKey.DownArrow); + Key(app, ConsoleKey.Enter, '\r'); + + await Assert.That(config.ThemeName).IsEqualTo("Light"); + await Assert.That(app.ThemeName).IsEqualTo("Light"); + await Assert.That(saves()).IsEqualTo(1); + } + + [Test] + public async Task F7OpensWithTheCursorOnTheThemeInForce() + { + var (app, config, _) = App(); + ThemeChoices.Apply(config, "Solarized Dark"); + app.DispatchCommand("screen:textansi"); + + await Assert.That(app.SettingsFocus!.Value.Index).IsEqualTo(ThemeChoices.Names(config).ToList().IndexOf("Solarized Dark")); + } + + [Test] + public async Task TheWindowsThemeCardsAreTheCellPickersThemes() + { + var (app, config, _) = App(); + var form = app.NativeSettingsForm("text"); + + await Assert.That(form.Themes().Select(c => c.Name)).IsEquivalentTo(ThemeChoices.Names(config)); + + form.SetTheme((ThemeField)BuiltInSettings.Text.Fields.Single(f => f.Id == BuiltInSettings.ThemeFieldId), "Light"); + await Assert.That(app.ThemeName).IsEqualTo("Light"); + await Assert.That(form.IsDark).IsFalse(); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs b/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs index 44e96147..36a6b72d 100644 --- a/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs @@ -76,6 +76,7 @@ public class FrameContrastTests // The settings search marks its matches in the accent and the changed marks wear it too; the meter // editor's dropdown carries the received values as muted notes beside each path. "settings-search", "settings-meters", "settings-meters-pick", "settings-changed", + "settings-themes", "settings-themes-solarized", "settings-themes-used", // The prompt row is the only thing this client paints outside a pane that carries the // *game's* colours rather than its own, so the floor is applied against the idle input band diff --git a/tests/SharpMUTerm.Tui.Tests/ScreenCursorTests.cs b/tests/SharpMUTerm.Tui.Tests/ScreenCursorTests.cs index 18c1570b..07d2a790 100644 --- a/tests/SharpMUTerm.Tui.Tests/ScreenCursorTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/ScreenCursorTests.cs @@ -112,10 +112,11 @@ public async Task Keypad_BarsTheFocusedBinding() [Test] public async Task Options_BarsTheFocusedOptionAndNeverASectionHeader() { - // Navigable row 5 is "emoji substitution" — the headings and spacers are skipped, the four - // COLOUR & LEGIBILITY rows come first, and "tab width (spaces)" sits at 4 above it in TEXT. + // Navigable row 5 past the three theme rows is "emoji substitution" — the headings, spacers and the + // theme preview are skipped, the four COLOUR & LEGIBILITY rows come first, and "tab width (spaces)" + // sits at 4 above it in TEXT. var screen = OptionsScreenRenderer.TextAnsiScreen(); - var lines = OptionsScreenRenderer.BodyColumn(screen.Rows, new ScreenFocus(0, 5)); + var lines = OptionsScreenRenderer.BodyColumn(screen.Rows, new ScreenFocus(0, 3 + 5)); await Assert.That(Barred(lines)).IsEqualTo(1); await Assert.That(lines.Single(l => l.Contains(Bar, StringComparison.Ordinal))).Contains("emoji substitution"); diff --git a/tests/SharpMUTerm.Tui.Tests/ScreenModelTests.cs b/tests/SharpMUTerm.Tui.Tests/ScreenModelTests.cs index 693276af..8b52b543 100644 --- a/tests/SharpMUTerm.Tui.Tests/ScreenModelTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/ScreenModelTests.cs @@ -370,9 +370,11 @@ public async Task Options_NavigableRowsSkipSectionHeadersAndSpacers() // settings. Since F7 was drawn from its declared section the groups are COLOUR & LEGIBILITY, TEXT, // LINKS & PICTURES, STATUS ROW & METERS, ACTIVITY and SCROLLBACK; it was 21/10 with one row for the // meters as a typed line, and 23/13 before SCROLLBACK. - await Assert.That(screen.Rows.Count).IsEqualTo(26); + // The THEME group on top adds thirteen rows and three stops: its heading and spacer, a row per built-in + // theme, and the preview's caption and seven rows, which are drawn and never a stop. + await Assert.That(screen.Rows.Count).IsEqualTo(39); await Assert.That(model.PaneCount).IsEqualTo(1); - await Assert.That(model.Sizes[0]).IsEqualTo(14); + await Assert.That(model.Sizes[0]).IsEqualTo(17); } /// @@ -387,33 +389,36 @@ public async Task Options_TextAnsiRowsWriteBackToTheTextSettings() var text = new TextSettings(); var model = OptionsScreenRenderer.Model(OptionsScreenRenderer.TextAnsiScreen(text)); - model.ToggleAt(0, 0)!.Value.Flip(); + // The three built-in themes are the first three stops; the ordinals below count from after them. + const int Themes = 3; + + model.ToggleAt(0, Themes + 0)!.Value.Flip(); await Assert.That(text.StripIncomingColour).IsTrue(); // 1 is "keep text legible", which sits directly under the row above because the two are the ends // of one question's range — discard every colour the server sent, or keep them and move the few // that cannot be read. - model.ToggleAt(0, 1)!.Value.Flip(); + model.ToggleAt(0, Themes + 1)!.Value.Flip(); await Assert.That(text.KeepTextLegible).IsFalse(); - model.ToggleAt(0, 6)!.Value.Flip(); + model.ToggleAt(0, Themes + 6)!.Value.Flip(); await Assert.That(text.UnderlineHyperlinks).IsFalse(); - model.ToggleAt(0, 7)!.Value.Flip(); + model.ToggleAt(0, Themes + 7)!.Value.Flip(); await Assert.That(text.DetectLinks).IsFalse(); - model.ToggleAt(0, 5)!.Value.Flip(); + model.ToggleAt(0, Themes + 5)!.Value.Flip(); await Assert.That(text.EmojiSubstitution).IsFalse(); // Row 4 is the tab width — a count, so it is a field rather than a toggle, and it is what makes // this screen carry an editable row at all. - await Assert.That(model.ToggleAt(0, 4)).IsNull(); + await Assert.That(model.ToggleAt(0, Themes + 4)).IsNull(); await Assert.That(model.HasEditableRow).IsTrue(); // Row 3 is the background transparency, a percentage rather than the checkbox it started as, at the // foot of COLOUR & LEGIBILITY. - await Assert.That(model.ToggleAt(0, 3)).IsNull(); - var transparency = model.FieldAt(0, 3, 0)!.Value; + await Assert.That(model.ToggleAt(0, Themes + 3)).IsNull(); + var transparency = model.FieldAt(0, Themes + 3, 0)!.Value; await Assert.That(transparency.Validate("101")).IsNotNull(); transparency.Set("60"); await Assert.That(text.BackgroundTransparency).IsEqualTo(60); diff --git a/tests/SharpMUTerm.Tui.Tests/SessionStateAccountingTests.cs b/tests/SharpMUTerm.Tui.Tests/SessionStateAccountingTests.cs index 8e190630..c5c8b914 100644 --- a/tests/SharpMUTerm.Tui.Tests/SessionStateAccountingTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/SessionStateAccountingTests.cs @@ -124,7 +124,12 @@ public async Task ACommittedEditOnAnySettingsScreen_IsWhatMakesAnAutomationChang var wired = await Wired(); wired.Config.Worlds[0].Characters[0].TriggerSets.Add("Comms"); - wired.App.DispatchCommand("screen:textansi"); + wired.App.DispatchCommand("screen:textansi"); // F7: past the theme rows, a checkbox + foreach (var _ in Enumerable.Range(0, 3)) + { + wired.App.SimulateSettingsKey(new ConsoleKeyInfo('\0', ConsoleKey.DownArrow, false, false, false)); + } + wired.App.SimulateSettingsKey(new ConsoleKeyInfo(' ', ConsoleKey.Spacebar, false, false, false)); wired.Receive(wired.MannazWire, PublicLine); From 9a7311220847b0967275ac2d16fa61e53246e5f5 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 08:17:15 +0000 Subject: [PATCH 029/113] Theme switch repaints history; sidebar keys, scrolling and row menus A theme change now formats every pane line again against the new reading plane, in place: a PaneLine keeps the StyledLine it was formatted from (Source) and a chrome bar the function that draws it (Bar), so freeze, away/missed/search bars, picture anchors and the selection all survive. About 106 ms and 743 KiB at the 2,000-line pane cap. Space on a theme row does what Enter does. Alt+C moves the keyboard into the connection sidebar in both hosts (SidebarModel.Cursor, layout:rail-keys, the rail-keys view): arrows, Home and End walk, Enter goes, Esc or any other key returns. The cell rail bands the row; the native sidebar rings it. The native sidebar scrolls with the wheel and an overlay bar, and a right click on a row opens the client's menu of registry commands for it (SidebarRowMenu), which the cell rail's pointer menu also uses. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 9 + CLAUDE.md | 33 ++- src/SharpMUTerm.Avalonia/NativeChrome.cs | 273 +++++++++++++++++- src/SharpMUTerm.Client/Chrome/SidebarModel.cs | 25 +- .../Commands/BuiltInCommands.cs | 6 + .../Surfaces/SurfaceCatalog.cs | 4 + src/SharpMUTerm.Tui/MacroKeys.cs | 4 + src/SharpMUTerm.Tui/OptionsScreenRenderer.cs | 2 +- src/SharpMUTerm.Tui/PaneLine.cs | 17 +- src/SharpMUTerm.Tui/PictureSlots.cs | 18 +- .../Pointer/SharpMUTermApp.Chrome.cs | 22 +- .../Pointer/SharpMUTermApp.Pointer.cs | 25 +- src/SharpMUTerm.Tui/RailRenderer.cs | 48 ++- src/SharpMUTerm.Tui/SettingsSession.cs | 6 +- .../SharpMUTermApp.RailKeys.cs | 268 +++++++++++++++++ .../SharpMUTermApp.ReflowScene.cs | 6 +- src/SharpMUTerm.Tui/SharpMUTermApp.Theme.cs | 60 +++- src/SharpMUTerm.Tui/SharpMUTermApp.cs | 138 +++++++-- src/SharpMUTerm.Tui/SnapshotViews.cs | 2 +- .../NativeChromeTests.cs | 133 ++++++++- .../SurfaceParityTests.cs | 15 + .../DeclaredWorldSettingsTests.cs | 15 + .../FrameContrastTests.cs | 2 +- tests/SharpMUTerm.Tui.Tests/RailKeysTests.cs | 164 +++++++++++ .../SnapshotViewEmptyConfigTests.cs | 2 +- .../ThemeRepaintTests.cs | 247 ++++++++++++++++ 26 files changed, 1445 insertions(+), 99 deletions(-) create mode 100644 src/SharpMUTerm.Tui/SharpMUTermApp.RailKeys.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/RailKeysTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/ThemeRepaintTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a258638..373f0e01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,15 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- Alt+C moves the keyboard into the connection sidebar, in the terminal and the desktop window: the arrow keys, + Home and End walk its rows, Enter goes to the one you are on, and Esc (or Alt+C, or just typing) returns to the + command line. +- Desktop window: a sidebar with more rows than fit scrolls, with the mouse wheel or a scrollbar like the panes', + and a right click on a world, character or window opens a menu of what you can do with it (switch, connect or + disconnect, edit, go to, close, clear), each with its key. +- Switching theme repaints the output already on screen, not only what arrives next, and Space on a theme in the + picker uses it as Enter does. + - A narrow terminal gives its room to the game: below 100 columns the connection rail folds to its slim strip on its own (in the desktop window, the sidebar does), and below 100 columns or 30 rows an empty command line is one row tall and grows as you type. At 80×24 a pane is now 72 columns wide instead of 60, two rows taller, diff --git a/CLAUDE.md b/CLAUDE.md index c13d83e6..f3b52bba 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -1155,9 +1155,24 @@ fallbacks) for inline images/maps. exists for), and covering both arrangements means the layout a person actually runs in the window is held to the terminal's cell for cell, rather than compared below an offset or skipped. What the native header and sidebar *say* is held to the cells by the shared models (`NativeChromeModelTests`), not by pixels. - - **Not done**: no keyboard navigation of the native views (the keys are the client's: ⌥N, ⌥J/⌥K, ⌃P), no - scrolling of an overlong sidebar (rows past the foot are cut), no right-click menu on a sidebar row, no - animation when the sidebar folds. + - **An overlong sidebar scrolls** under the title and above the foot button, with the wheel or the panes' overlay + bar (4 px, 8 px under the pointer, dragged by its thumb); rows are laid out unscrolled, the scroll clamped, and + a row half under the title is clickable only where it shows (hit areas intersect the list). + - **⌥C moves the keyboard into the sidebar, in both hosts** (`SharpMUTermApp.RailKeys.cs`; `SidebarModel.Cursor`; + ⌃P `layout:rail-keys`; the `rail-keys` view). ↑↓ Home End walk `NavigableRows()`, ⏎ goes where a click goes + (`DispatchRailTarget`), Esc or ⌥C hands the keys back, and any other key hands them back *and* does what it does + on the command line. Focus never moves: the cursor is client state `HandleWindowKey` reads first (`TryRailKey`), + the way an armed ⌃B is, and every other global shortcut leaves it before acting. The cell rail draws the row on + the armed band padded to the rail's widest row (no cell spent; inks re-held to the floor on the band, + `RailRenderer.OnBand`); the native sidebar draws an accent ring and scrolls the row into view. ⌥C because it + is `ESC c` (one Alt chord in a terminal), C names CONNECTIONS, and nothing claimed it — not `AppShortcuts`, the + bar's table, nor the window's `HostKeys.Reserved`. + - **A right click on a sidebar row opens the client's menu for that row** (`SidebarRowMenu`, `RunSidebarMenuEntry`; + `ChromeOverlay.RowMenu`/`RunRowMenu`; the cell rail's pointer menu reads the same method). Entries are registry + commands with their keys (switch, connect/disconnect, edit in F5/F9, go to, close, clear), each offered only if + the registry resolves it; running one brings the row forward first, and an id the menu did not offer is refused. + - **Not done**: no animation when the sidebar folds; the command line keeps its armed band while the sidebar holds + the keys; the terminal has no row menu (no pointer menus there), its entries are ⌃P's. - **Layouts are realised as panes, one per panel that has data** (`Core/Layouts`: `LayoutFold` → `LayoutRealiser` → `WorkspaceLayout.ReplaceTree`, `LayoutCapture` for the way back; Tui `SharpMUTermApp.Layouts.cs`, @@ -1664,9 +1679,15 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] theme** (`OptionsScreen.Preview` → `SchemeFor`), so Esc closing with nothing committed is the revert; ⏎ commits through `ScreenEdits.Apply`. F7 opens with the cursor on the theme in force. **A theme change is noticed in `SaveConfiguration`** (`ApplyThemeIfChanged`, by colour signature) and `ApplyTheme` re-derives the chrome, the - formatters, every overlay's `Scheme` and the panes' planes. **Output already in a pane keeps its colours** — - it is markup by then — and the notice says so; on a light theme the old dark-theme greys are faint until they - scroll away. A customised theme replaced by the picker is kept in `AppConfiguration.CustomThemes` (no schema + formatters, every overlay's `Scheme` and the panes' planes. **Output already in a pane is repainted too** + (`RestylePaneLines`, the `theme-switched` view): a `PaneLine` keeps the `StyledLine` it was formatted from + (`Source`) and a chrome bar the function that draws it (`Bar`), and the switch formats each again against the new + reading plane *in place*, so no index moves — freeze point, away/missed/search bars, picture anchors (a reserved + picture's pieces through `PictureSlots.Cuts`/`Restyle`) — and the selection is kept (`keepSelection`), since only + colours changed. Rows nothing holds a source for (a picture's own rows, the restore replay) keep their markup. + Measured at the 2,000-line pane cap: ~106 ms for the switch, ~743 KiB of `StyledLine`s for a window whose lines + are not shared with the session's ring (a spawn window; a session window shares the ring's instances). + Space on a theme row does what ⏎ does (`SettingsSession.Toggle` on an `Apply` button). A customised theme replaced by the picker is kept in `AppConfiguration.CustomThemes` (no schema bump), and listed. Unstyled text on a settings screen takes the scheme's ink (`ScreenChrome.Panel`/`Band` set `ForegroundColor`), not the window's, because the window is still the theme in force while one is previewed. - Not declared yet: F2–F4, F6 and F10 are listed by title only. diff --git a/src/SharpMUTerm.Avalonia/NativeChrome.cs b/src/SharpMUTerm.Avalonia/NativeChrome.cs index 50eb41ef..e7bcaa49 100644 --- a/src/SharpMUTerm.Avalonia/NativeChrome.cs +++ b/src/SharpMUTerm.Avalonia/NativeChrome.cs @@ -1,8 +1,10 @@ using System.Globalization; using Avalonia; using Avalonia.Controls; +using Avalonia.Controls.Primitives; using Avalonia.Input; using Avalonia.Media; +using Avalonia.Threading; using SharpMUTerm.Client.Chrome; using SharpMUTerm.Client.Palette; using SharpMUTerm.Core.Text; @@ -571,6 +573,13 @@ private void DrawPrefix(DrawingContext context, HeaderPrefix prefix, ChromeOverl /// desktop app's size: an unfold button, an accent mark per world, and a dot with an initial per character (filled /// while connected, with an unread mark), each still a click on its target, with the name in its tooltip. /// +/// +/// More rows than fit scroll under the title and above the foot button, with the wheel or by dragging an overlay +/// scrollbar drawn like the panes' (thin, widening under the pointer). A right click on a row opens a native menu of the +/// client's entries for that row (, the registry's commands with their keys); and +/// while the keyboard is on the sidebar (⌥C, ) its row wears a focus ring and is +/// scrolled into view. The keys themselves are the client's: nothing here is focusable. +/// /// internal sealed class NativeSidebar(TerminalView view) : NativeChromeView(view) { @@ -587,6 +596,22 @@ internal sealed record Row(RailRowKind Kind, Rect Area, RailWorld World, RailCha private Rect _add; private Rect _fold; + /// How far the rows are scrolled, in pixels, and the list area they scroll in. + private double _scroll; + private double _content; + private Rect _list; + private bool _barHovered; + private double? _barGrab; + + /// How far the rows are scrolled, in pixels. Internal for tests. + internal double ScrollOffset => _scroll; + + /// The most the rows can be scrolled: zero when they all fit. Internal for tests. + internal double ScrollRange => Math.Max(0, _content - _list.Height); + + /// The row menu last opened, for a test. + internal ContextMenu? OpenedMenu { get; private set; } + /// The rows as last laid out. Internal for tests. internal IReadOnlyList Rows => _rows; @@ -608,17 +633,13 @@ protected override void Layout(ChromeOverlay overlay, List<(Rect Area, string Ta var row = folded ? 32 : RowHeight; _add = folded ? new Rect((width - 32) / 2, Height - 32 - 10, 32, 32) : new Rect(10, Height - row - 12, Math.Max(0, width - 20), row + 2); var bottom = _add.Top - 6; + _list = new Rect(0, TitleHeight, width, Math.Max(0, bottom - TitleHeight)); var y = TitleHeight; - void Add(Row r, string target, string tip) - { - if (r.Area.Bottom > bottom) - { - return; - } - _rows.Add(r); - hits.Add((r.Area, target, tip)); - } + // Laid out unscrolled first: the scroll is clamped to what the rows need, and moved to keep the keyboard's row + // in view, before anything is placed. + var laid = new List<(Row Row, string Target, string Tip)>(); + void Add(Row r, string target, string tip) => laid.Add((r, target, tip)); foreach (var world in overlay.Sidebar.Worlds) { @@ -667,6 +688,32 @@ void Add(Row r, string target, string tip) } } + _content = y + 4 - TitleHeight; + if (overlay.Sidebar.Cursor is { } cursor && laid.FirstOrDefault(l => KeyOf(l.Row) == cursor) is { Row: { } focused }) + { + if (focused.Area.Top - _scroll < _list.Top) + { + _scroll = focused.Area.Top - _list.Top - 4; + } + else if (focused.Area.Bottom - _scroll > _list.Bottom) + { + _scroll = focused.Area.Bottom - _list.Bottom + 4; + } + } + + _scroll = Math.Clamp(_scroll, 0, ScrollRange); + foreach (var (r, target, tip) in laid) + { + var area = r.Area.Translate(new Vector(0, -_scroll)); + if (area.Bottom <= _list.Top || area.Top >= _list.Bottom) + { + continue; + } + + _rows.Add(r with { Area = area }); + hits.Add((area.Intersect(_list), target, tip)); + } + if (_add.Width > 20 && _add.Top > TitleHeight) { hits.Add((_add, SidebarModel.AddGameTarget, "Connect to a game, or add one")); @@ -677,6 +724,178 @@ void Add(Row r, string target, string tip) } } + /// A drawn row's identity, as the client keys it (). + internal static string KeyOf(Row row) => SidebarModel.KeyOf(row.Kind, TargetOf(row)); + + /// The target the cell rail gives the same row. + internal static string TargetOf(Row row) => row.Kind switch + { + RailRowKind.Window => SidebarModel.TargetOf(row.Window!), + RailRowKind.Character => SidebarModel.TargetOf(row.Character!), + RailRowKind.Empty => RailModel.NoCharactersTarget(row.World.Name), + _ => SidebarModel.TargetOf(row.World), + }; + + /// The row under , inside the list area, or null. + private Row? RowAt(Point point) => + _list.Contains(point) ? _rows.FirstOrDefault(r => r.Area.Contains(point)) : null; + + /// Scrolls the rows by (positive is down the list) and lays them out again. + internal void ScrollBy(double pixels) + { + var before = _scroll; + _scroll = Math.Clamp(_scroll + pixels, 0, ScrollRange); + if (_scroll != before) + { + Show(Overlay, Plane, Ink); + } + } + + protected override void OnPointerWheelChanged(PointerWheelEventArgs e) + { + base.OnPointerWheelChanged(e); + ScrollBy(-e.Delta.Y * RowHeight * 3); + } + + /// + /// Asks the client for 's menu and opens it at the pointer. The client builds it on its own + /// thread and answers there; the menu is opened on this one. Internal for tests. + /// + internal void OpenRowMenu(string rowKey) + { + if (Overlay is not { } overlay || Inert) + { + return; + } + + overlay.RowMenu(rowKey, model => Dispatcher.UIThread.Post(() => + { + if (model.Entries.Count == 0) + { + return; + } + + var menu = NativeMenu.Build(model, overlay.RunRowMenu, PlacementMode.Pointer, this); + OpenedMenu = menu; + menu.Open(this); + })); + } + + protected override void OnPointerPressed(PointerPressedEventArgs e) + { + var point = e.GetCurrentPoint(this); + if (!Inert && point.Properties.IsRightButtonPressed && RowAt(point.Position) is { } row) + { + e.Handled = true; + OpenRowMenu(KeyOf(row)); + return; + } + + if (!Inert && point.Properties.IsLeftButtonPressed && Bar() is { } bar && bar.Zone.Contains(point.Position)) + { + e.Handled = true; + _barGrab = bar.Thumb.Contains(point.Position) ? point.Position.Y - bar.Thumb.Top : bar.Thumb.Height / 2; + e.Pointer.Capture(this); + DragBar(point.Position.Y); + return; + } + + base.OnPointerPressed(e); + } + + protected override void OnPointerMoved(PointerEventArgs e) + { + var position = e.GetPosition(this); + if (_barGrab is not null) + { + DragBar(position.Y); + e.Handled = true; + return; + } + + var hovered = Bar() is { } bar && bar.Zone.Contains(position); + if (hovered != _barHovered) + { + _barHovered = hovered; + InvalidateVisual(); + } + + base.OnPointerMoved(e); + } + + protected override void OnPointerReleased(PointerReleasedEventArgs e) + { + if (_barGrab is not null) + { + _barGrab = null; + e.Pointer.Capture(null); + e.Handled = true; + InvalidateVisual(); + return; + } + + base.OnPointerReleased(e); + } + + protected override void OnPointerExited(PointerEventArgs e) + { + _barHovered = false; + base.OnPointerExited(e); + } + + /// The panes' bar, at the panes' sizes: over the list's right edge, never in a column of it. + private const double BarWidth = 4, BarWidthHovered = 8, BarZone = 12, MinimumThumb = 18; + + /// The scrollbar's zone and thumb, or null when every row fits. Internal for tests. + internal (Rect Zone, Rect Thumb, double Travel)? Bar() + { + if (ScrollRange <= 0 || _list.Height <= 0) + { + return null; + } + + var thumb = Math.Min(_list.Height, Math.Max(MinimumThumb, _list.Height * _list.Height / _content)); + var travel = _list.Height - thumb; + var y = _list.Top + (travel * _scroll / ScrollRange); + var width = _barHovered || _barGrab is not null ? BarWidthHovered : BarWidth; + return (new Rect(_list.Right - BarZone, _list.Top, BarZone, _list.Height), new Rect(_list.Right - width - 2, y, width, thumb), travel); + } + + private void DragBar(double y) + { + if (Bar() is not { } bar || bar.Travel <= 0 || _barGrab is not { } grab) + { + return; + } + + var fraction = Math.Clamp((y - grab - bar.Zone.Top) / bar.Travel, 0, 1); + ScrollBy((fraction * ScrollRange) - _scroll); + } + + private void DrawBar(DrawingContext context) + { + if (Bar() is not { } bar) + { + return; + } + + var active = _barHovered || _barGrab is not null; + if (active) + { + var track = new Rect(bar.Thumb.X, bar.Zone.Y, bar.Thumb.Width, bar.Zone.Height); + context.DrawRectangle(new SolidColorBrush(Faint(0x22)), null, track, bar.Thumb.Width / 2, bar.Thumb.Width / 2); + } + + context.DrawRectangle(new SolidColorBrush(Faint(active ? (byte)0xB0 : (byte)0x60)), null, bar.Thumb, bar.Thumb.Width / 2, bar.Thumb.Width / 2); + } + + /// The keyboard's row: a ring in the client's accent, over a lifted plate, so it reads apart from a hover. + private void DrawCursor(DrawingContext context, Row row) + { + var accent = Legible(Parse(Overlay?.Palette.Accent)); + context.DrawRectangle(null, new Pen(new SolidColorBrush(accent), 1.6), row.Area.Deflate(1), 6, 6); + } + public override void Render(DrawingContext context) { // The plane runs on through the gutter to the panes (NativeLayout.SidebarGutter): the pane's own raised surface @@ -699,18 +918,40 @@ public override void Render(DrawingContext context) Text(context, "CONNECTIONS", 16, _fold.Center.Y, size - 2.5, Dim, bold: true); } - foreach (var r in _rows) + using (context.PushClip(_list)) { + foreach (var r in _rows) + { + var focused = overlay.Sidebar.Cursor is { } cursor && KeyOf(r) == cursor; + DrawRow(context, r, overlay, focused, size); + if (focused) + { + DrawCursor(context, r); + } + } + } + + DrawBar(context); + DrawFoot(context, size); + DrawVeil(context); + } + + private void DrawRow(DrawingContext context, Row r, ChromeOverlay overlay, bool focused, double size) + { if (Folded) { DrawFolded(context, r, overlay); - continue; + return; } var middle = r.Area.Center.Y; - var hovered = Hovered(r.Area); + var hovered = Hovered(r.Area.Intersect(_list)); var selected = r.Window is { } w && overlay.Sidebar.IsSelected(w) || r.Kind == RailRowKind.Character && r.Character!.Active; - if (selected || hovered) + if (focused) + { + context.DrawRectangle(new SolidColorBrush(Raised(0.14)), null, r.Area, 6, 6); + } + else if (selected || hovered) { context.DrawRectangle(new SolidColorBrush(Raised(selected && hovered ? 0.16 : selected ? 0.11 : 0.07)), null, r.Area, 6, 6); } @@ -736,8 +977,10 @@ public override void Render(DrawingContext context) DrawWindow(context, r, r.Window!, accent, overlay.Sidebar.IsSelected(r.Window!), middle, right, size); break; } - } + } + private void DrawFoot(DrawingContext context, double size) + { if (_add.Width > 0) { var fill = Hovered(_add) ? Raised(0.12) : Raised(0.05); @@ -754,8 +997,6 @@ public override void Render(DrawingContext context) Text(context, AddGameText, _add.Center.X - (Math.Min(Measure(AddGameText, size), _add.Width - 12) / 2), _add.Center.Y, size, Ink, maxWidth: _add.Width - 12); } } - - DrawVeil(context); } private void DrawFolded(DrawingContext context, Row r, ChromeOverlay overlay) diff --git a/src/SharpMUTerm.Client/Chrome/SidebarModel.cs b/src/SharpMUTerm.Client/Chrome/SidebarModel.cs index 3ddff292..8d464679 100644 --- a/src/SharpMUTerm.Client/Chrome/SidebarModel.cs +++ b/src/SharpMUTerm.Client/Chrome/SidebarModel.cs @@ -19,7 +19,12 @@ namespace SharpMUTerm.Client.Chrome; /// The worlds in configuration order, each with its characters. /// The window in front of the focused pane, or null. /// Whether the rail is the narrow strip (⌃B b) rather than the full sidebar. -public sealed record SidebarModel(IReadOnlyList Worlds, string? SelectedWindowId, bool Collapsed) +/// +/// The row the keyboard is on () while the sidebar holds the keys (⌥C), or null. Both views +/// draw it — the cell rail as a band across the row, the native sidebar as a focus ring — so a reader sees where ⏎ goes +/// in either host. +/// +public sealed record SidebarModel(IReadOnlyList Worlds, string? SelectedWindowId, bool Collapsed, string? Cursor = null) { /// No worlds: the sidebar of a client with nothing configured. public static SidebarModel Empty { get; } = new([], null, false); @@ -40,6 +45,22 @@ public sealed record SidebarModel(IReadOnlyList Worlds, string? Selec /// The flat rows the cell rail draws (). public IReadOnlyList Rows() => RailModel.Build(Worlds); + /// + /// A row's identity, which outlives a rebuild of the model: its kind and its click target. The kind is part of it + /// because a world's target is one of its characters', and the two rows are different places to stand. + /// + public static string KeyOf(RailRowKind kind, string? target) => $"{kind}|{target}"; + + /// + public static string KeyOf(RailRow row) => KeyOf(row.Kind, row.Target); + + /// + /// The rows the keyboard walks, in the order both views draw them: every row with a target, and while folded only + /// the worlds and characters, because the strip draws nothing else. + /// + public IReadOnlyList NavigableRows() => + [.. Rows().Where(r => r.Target is not null && (!Collapsed || r.Kind is RailRowKind.World or RailRowKind.Character))]; + /// Where a click on a world goes: the character already in front there, else a live one, else the first. public static string TargetOf(RailWorld world) => RailModel.TargetFor(world); @@ -77,6 +98,7 @@ public IEnumerable Targets() public bool Equals(SidebarModel? other) => other is not null && Collapsed == other.Collapsed + && string.Equals(Cursor, other.Cursor, StringComparison.Ordinal) && string.Equals(SelectedWindowId, other.SelectedWindowId, StringComparison.Ordinal) && Worlds.Count == other.Worlds.Count && Worlds.Zip(other.Worlds).All(p => SameWorld(p.First, p.Second)); @@ -86,6 +108,7 @@ public override int GetHashCode() var hash = new HashCode(); hash.Add(Collapsed); hash.Add(SelectedWindowId); + hash.Add(Cursor); foreach (var world in Worlds) { hash.Add(world.Name); diff --git a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs index bcffae17..b19863ae 100644 --- a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs +++ b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs @@ -17,6 +17,9 @@ namespace SharpMUTerm.Client.Commands; /// public static class BuiltInCommands { + /// The command that moves the keyboard into the connection sidebar (⌥C). + public const string RailKeysCommand = "layout:rail-keys"; + /// /// Registers every built-in command. does the work for an id and returns false when /// it did not do what the label promised; it is called for every id these contributions handle, offered or not. @@ -204,6 +207,9 @@ void Family(string id, string prefix, Func new string(' ', AffordanceWidth) + caption)); for (var line = 0; line < PreviewRows; line++) { diff --git a/src/SharpMUTerm.Tui/PaneLine.cs b/src/SharpMUTerm.Tui/PaneLine.cs index 8c44793b..bf47639c 100644 --- a/src/SharpMUTerm.Tui/PaneLine.cs +++ b/src/SharpMUTerm.Tui/PaneLine.cs @@ -57,9 +57,24 @@ namespace SharpMUTerm.Tui; /// drawn there and is rebuilt from these; keeps the text the /// server sent, so a search still finds the picture's label. /// +/// +/// The world's line this markup was formatted from, or null when the row is not one (client replies, a picture's +/// rows, the numbered demo scene). Held so the colour decision is a render-time one, like the gutter: a theme +/// change re-formats every line that has one against the new theme's reading plane +/// (SharpMUTermApp.RestylePaneLines), where markup alone would keep the colours the old theme resolved — +/// faint greys on a light theme until they scrolled away. A spawn window's history exists nowhere else, so it has to +/// be kept here rather than re-read from WorldSession.Scrollback. For a session window the instance is usually +/// the one the session's ring already holds, so it costs a reference. +/// +/// +/// For a chrome row (the restore, away, activity and search bars), how to draw it again in a given accent, so a +/// theme change recolours the bars as well as the lines between them. Null on every other row. +/// internal readonly record struct PaneLine( string Markup, string? Stamp = null, string Plain = "", long ImageAnchor = 0, - PictureSlots? Pictures = null); + PictureSlots? Pictures = null, + Core.Text.StyledLine? Source = null, + Func? Bar = null); diff --git a/src/SharpMUTerm.Tui/PictureSlots.cs b/src/SharpMUTerm.Tui/PictureSlots.cs index 081f86ae..201ffad0 100644 --- a/src/SharpMUTerm.Tui/PictureSlots.cs +++ b/src/SharpMUTerm.Tui/PictureSlots.cs @@ -14,7 +14,7 @@ namespace SharpMUTerm.Tui; /// internal sealed class PictureSlots { - private readonly string[] _pieces; + private string[] _pieces; private readonly Slot[] _slots; /// @@ -36,6 +36,22 @@ public PictureSlots(string[] pieces, IReadOnlyList<(long Picture, int Row, int C } /// Whether a row of is on this line. + /// Where each slot was cut from the line (start column and width), so the pieces can be cut again. + public IReadOnlyList<(int Start, int Length)> Cuts { get; init; } = []; + + /// + /// Replaces the text either side of the slots with the same text formatted again — a theme change re-formats the + /// line it was cut from (), and the pictures drawn in the slots stay as they are. + /// + public void Restyle(string[] pieces) + { + ArgumentNullException.ThrowIfNull(pieces); + if (pieces.Length == _pieces.Length) + { + _pieces = pieces; + } + } + public bool Holds(long picture) => _slots.Any(slot => slot.Picture == picture); /// diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Chrome.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Chrome.cs index dcc86098..b56f1ae0 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Chrome.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Chrome.cs @@ -63,6 +63,14 @@ private void PublishHostChrome() internal ChromeOverlay BuildChromeOverlay() { _chromeActivate ??= target => OnUiThread(() => ActivateChromeTarget(target)); + _sidebarMenuRequest ??= (row, show) => OnUiThread(() => + { + if (MainWindowInFront()) + { + show(SidebarRowMenu(row)); + } + }); + _sidebarMenuRun ??= id => OnUiThread(() => RunSidebarMenuEntry(id)); var header = BuildHeaderModel(); var brand = FillHex(AccentPalette[2]); var palette = new ChromePalette( @@ -82,7 +90,9 @@ internal ChromeOverlay BuildChromeOverlay() header, BuildSidebar(), palette, - _chromeActivate); + _chromeActivate, + _sidebarMenuRequest, + _sidebarMenuRun); } /// @@ -167,13 +177,21 @@ internal bool ActivateChromeTarget(string target) /// Acts on a target from or ; safe to call from any thread. The same /// instance for the life of the app, so an overlay compares equal from frame to frame. /// +/// +/// Asks the client for a sidebar row's menu, by the row's key (); the client +/// builds it on its thread and hands it to the callback, which runs there (the host marshals). Nothing is handed back +/// while a modal of the client's is in front. Same instance for the life of the app. +/// +/// Runs an entry of the menu last built, by its command id; safe from any thread. internal sealed record ChromeOverlay( HostChrome Drawn, bool Interactive, HeaderModel HeaderModel, SidebarModel Sidebar, ChromePalette Palette, - Action Activate) + Action Activate, + Action> RowMenu, + Action RunRowMenu) { /// Whether is one this overlay offered a click on. public bool Offers(string target) => diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs index b683ee27..c76b56c9 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs @@ -554,26 +554,13 @@ internal IReadOnlyList PointerMenu(System.Drawing.Point point) break; case PointerKind.RailRow: - var railTarget = target.Key["rail:".Length..]; - if (railTarget.StartsWith(CommandIds.CharacterPrefix, StringComparison.Ordinal) || - railTarget.StartsWith(CommandIds.WindowPrefix, StringComparison.Ordinal)) + // The native sidebar's row menu, entry for entry (SidebarRowMenu): one menu for one row, whichever + // host draws the rail. + foreach (var entry in SidebarRowMenu(RailRowKeyFor(target.Key["rail:".Length..])).Entries) { - var go = BuildCatalog().FirstOrDefault(c => c.Id == railTarget); - items.Add(new PointerMenuItem(go?.Title ?? "Go to it", null, () => OnUiThread(() => DispatchRailTarget(railTarget)))); - } - - if (railTarget.StartsWith(CommandIds.CharacterPrefix, StringComparison.Ordinal)) - { - items.Add(new PointerMenuItem("Connect", "⌥R", () => OnUiThread(() => - { - DispatchRailTarget(railTarget); - DispatchCommand("world:reconnect"); - }))); - items.Add(new PointerMenuItem("Disconnect", "⌥D", () => OnUiThread(() => - { - DispatchRailTarget(railTarget); - DispatchCommand("world:disconnect"); - }))); + items.Add(entry.IsSeparator + ? PointerMenuItem.Separator + : new PointerMenuItem(entry.Label, entry.Key, () => OnUiThread(() => RunSidebarMenuEntry(entry.Command!)), entry.Enabled)); } break; diff --git a/src/SharpMUTerm.Tui/RailRenderer.cs b/src/SharpMUTerm.Tui/RailRenderer.cs index fe03f7cf..60788df6 100644 --- a/src/SharpMUTerm.Tui/RailRenderer.cs +++ b/src/SharpMUTerm.Tui/RailRenderer.cs @@ -18,19 +18,61 @@ namespace SharpMUTerm.Tui; /// rail lands on nothing. /// /// -internal static class RailRenderer +internal static partial class RailRenderer { /// /// The sidebar's cells, drawn from the model the window's native sidebar is drawn from: the collapsed strip /// when the model says collapsed, else the full rail fitted to . /// - public static List Render(SidebarModel model, int maxWidth, ChromeInk? ink) + /// + /// The band the keyboard cursor's row is drawn on while the sidebar holds the keys (, + /// ⌥C): a background, or #ink on #band for the row's unstyled text. The row is padded to the widest row so the band runs the width of the rail and costs no column. + /// + public static List Render(SidebarModel model, int maxWidth, ChromeInk? ink, string? cursorBand = null) { ArgumentNullException.ThrowIfNull(model); var rows = model.Rows(); - return model.Collapsed ? RenderCollapsed(rows, ink) : Render(rows, maxWidth, ink); + var lines = model.Collapsed ? RenderCollapsed(rows, ink) : Render(rows, maxWidth, ink); + if (model.Cursor is not { } cursor || cursorBand is null) + { + return lines; + } + + // Which line each row became: one per row expanded, worlds and characters only when folded. + var drawn = model.Collapsed ? rows.Where(r => r.Kind is RailRowKind.World or RailRowKind.Character).ToList() : rows.ToList(); + var at = drawn.FindIndex(r => r.Target is not null && SidebarModel.KeyOf(r) == cursor); + if (at >= 0 && at < lines.Count) + { + var widest = lines.Max(SharpMUTermApp.MarkupWidth); + var pad = new string(' ', Math.Max(0, widest - SharpMUTermApp.MarkupWidth(lines[at]))); + var on = cursorBand.IndexOf(" on ", StringComparison.Ordinal); + var band = on < 0 ? cursorBand : cursorBand[(on + 4)..]; + lines[at] = $"[{(on < 0 ? "on " + cursorBand : cursorBand)}]{OnBand(lines[at], band)}{pad}[/]"; + } + + return lines; } + /// + /// The row's inks held to the floor on the band it is drawn on: they were resolved against the rail's plane, and a + /// quiet one (`offline`, a chord) can fall under 3:1 on the brighter band. A span with a background of its own + /// keeps its pair; escaped text ([[) is never a tag. + /// + private static string OnBand(string line, string band) + { + var plane = Hex(band); + return Tag().Replace(line, tag => Ink().Replace(tag.Value, ink => Contrast.Legible(Hex(ink.Value), plane).ToHex())); + + static Rgb Hex(string hex) => new( + Convert.ToByte(hex.Substring(1, 2), 16), Convert.ToByte(hex.Substring(3, 2), 16), Convert.ToByte(hex.Substring(5, 2), 16)); + } + + [System.Text.RegularExpressions.GeneratedRegex(@"(?The rail's rows, as projects them. /// /// The widest a row may be in visible cells. The sidebar's width is the widest row's clamped diff --git a/src/SharpMUTerm.Tui/SettingsSession.cs b/src/SharpMUTerm.Tui/SettingsSession.cs index 6bb03c9b..d082b48c 100644 --- a/src/SharpMUTerm.Tui/SettingsSession.cs +++ b/src/SharpMUTerm.Tui/SettingsSession.cs @@ -336,7 +336,11 @@ private ScreenAction Toggle(ScreenModel model) { if (model.ToggleAt(Selection.Pane, Selection.Index) is not { } toggle) { - return ScreenAction.Consumed; + // A choice row (a theme on F7: the cursor already previews it) takes Space as a checkbox does — as + // the commit — so Space is ⏎ there. Every other row with nothing to toggle swallows it, as before. + return model.RowAt(Selection.Pane, Selection.Index).Button is { Kind: ScreenButtonKind.Apply } + ? Activate(model) + : ScreenAction.Consumed; } Edits.Apply(toggle); diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.RailKeys.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.RailKeys.cs new file mode 100644 index 00000000..6b5d1f12 --- /dev/null +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.RailKeys.cs @@ -0,0 +1,268 @@ +using SharpConsoleUI; +using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Client.Commands; +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Core.Diagnostics; +using SharpMUTerm.Core.Text; +using SharpMUTerm.Core.Workspaces; + +namespace SharpMUTerm.Tui; + +/// +/// The connection sidebar from the keyboard, and the menu a right click on one of its rows opens — in both hosts, from +/// one model. ⌥C puts a cursor on the sidebar (); ↑↓, Home and End walk its rows, ⏎ goes +/// where a click on that row goes (), and Esc or ⌥C hands the keys back to the command +/// line. Any other key does too, and then does what it does there, so a reader who starts typing is never stuck. +/// +/// Focus does not move. The framework's focus stays pinned to the armed command line +/// (); the cursor is client state the main window's key chain reads first, the way an +/// armed ⌃B is. That is what makes it the same feature in the terminal and the window: the cell rail draws the cursor as +/// a band across its row, the native sidebar as a ring, and both read it off the same model. +/// +/// +/// The row menu is the ⌃P catalog's entries for that row (): switch, reconnect or +/// disconnect, edit in F5 or F9, go to, close, clear. Each names a registry command and the key that does the same, so a +/// menu cannot offer what the keyboard lacks; choosing one first brings the row forward (a right click on a tab does the +/// same), then runs the command, and a command the menu did not offer is refused. +/// +/// +internal sealed partial class SharpMUTermApp +{ + /// The key () of the row the keyboard is on, or null. + private string? _railCursor; + + /// The menu the sidebar was last offered, and the row it was for. + private (string Row, MenuModel Menu) _sidebarMenuOffered = (string.Empty, MenuModel.Empty); + + /// The two delegates the chrome overlay carries for the row menu; one instance each, so overlays compare equal. + private Action>? _sidebarMenuRequest; + + private Action? _sidebarMenuRun; + + /// Whether the sidebar holds the keys. Internal for tests. + internal bool RailKeysActive => _railCursor is not null; + + /// The row the keyboard is on, for a test. + internal string? RailCursor => _railCursor; + + /// ⌥C: into the sidebar, or back out of it. + private void ToggleRailKeys() + { + if (_railCursor is not null) + { + LeaveRailKeys(); + return; + } + + var rows = BuildSidebar().NavigableRows(); + if (rows.Count == 0) + { + RefuseCommand("the sidebar has nothing to walk yet — ⌃P ▸ Welcome adds a game"); + return; + } + + // Start where the reader is: the window in front, else the character in front, else the top. + var selected = CommandIds.Window(ActiveWindowId()); + var start = rows.FirstOrDefault(r => r.Kind == RailRowKind.Window && r.Target == selected) + ?? rows.FirstOrDefault(r => r.Kind == RailRowKind.Character && r.Active) + ?? rows[0]; + _railCursor = SidebarModel.KeyOf(start); + RefreshRail(); + Notice("sidebar: ↑↓ walk · ⏎ goes · Esc returns", MessageSeverity.Info, "⌥C"); + } + + /// Hands the keys back to the command line. Does nothing when the sidebar does not hold them. + private void LeaveRailKeys() + { + if (_railCursor is null) + { + return; + } + + _railCursor = null; + RefreshRail(); + } + + /// + /// A key while the sidebar holds the keyboard. Returns true for the keys it answers; anything else gives the keys + /// back and returns false, so the key goes on down the chain to the command line. + /// + private bool TryRailKey(KeyPressedEventArgs e) + { + if (_railCursor is null) + { + return false; + } + + var key = e.KeyInfo; + var bare = key.Modifiers == 0; + switch (key.Key) + { + case ConsoleKey.UpArrow when bare: + MoveRailCursor(-1); + break; + case ConsoleKey.DownArrow when bare: + MoveRailCursor(1); + break; + case ConsoleKey.Home when bare: + MoveRailCursor(int.MinValue); + break; + case ConsoleKey.End when bare: + MoveRailCursor(int.MaxValue); + break; + case ConsoleKey.Escape: + LeaveRailKeys(); + break; + case ConsoleKey.Enter when bare: + var row = BuildSidebar().NavigableRows().FirstOrDefault(r => SidebarModel.KeyOf(r) == _railCursor); + LeaveRailKeys(); + if (row?.Target is { } target) + { + DispatchRailTarget(target); + } + + break; + default: + LeaveRailKeys(); + return false; + } + + e.Handled = true; + return true; + } + + /// Moves the cursor by rows, clamped; the extremes of int go to the ends. + private void MoveRailCursor(int step) + { + var rows = BuildSidebar().NavigableRows(); + if (rows.Count == 0) + { + LeaveRailKeys(); + return; + } + + var at = rows.ToList().FindIndex(r => SidebarModel.KeyOf(r) == _railCursor); + var next = step switch + { + int.MinValue => 0, + int.MaxValue => rows.Count - 1, + _ => Math.Clamp((at < 0 ? 0 : at) + step, 0, rows.Count - 1), + }; + _railCursor = SidebarModel.KeyOf(rows[next]); + RefreshRail(); + } + + /// + /// The band the cell rail draws the keyboard cursor's row on: the armed command line's, because it says the same + /// thing there — this is where the keys go. + /// + private string RailCursorBand() + { + var band = WorkspacePalette.ArmedBand(_theme); + return $"{Contrast.Legible(_theme.Foreground, band).ToHex()} on {band.ToHex()}"; + } + + /// Drives a key into the sidebar's key handling as the main window would. Internal for tests. + internal bool SimulateRailKey(ConsoleKeyInfo key) => TryRailKey(new KeyPressedEventArgs(key, false)); + + /// + /// The menu for one row of the sidebar, by its key (): the ⌃P entries that + /// act on what the row names, each with its key. Remembered as offered, so the answer can be checked. Internal for + /// tests and for the cell rail's own pointer menu. + /// + internal MenuModel SidebarRowMenu(string rowKey) + { + var model = BuildSidebar(); + var row = model.Rows().FirstOrDefault(r => r.Target is not null && SidebarModel.KeyOf(r) == rowKey); + var entries = new List(); + if (row?.Target is { } target) + { + var world = model.Worlds.FirstOrDefault(w => RowsOf(w).Contains(rowKey)); + var character = world?.Characters.FirstOrDefault(c => c.Windows.Any(w => CommandIds.Window(w.Id) == target) + || CommandIds.Character(c.SessionKey) == target); + var title = Snippet(row.Label); + switch (row.Kind) + { + case RailRowKind.World: + var pick = world?.Characters.FirstOrDefault(c => CommandIds.Character(c.SessionKey) == target); + Offer(entries, $"Switch to {Snippet(pick?.Name ?? title)}", pick?.Chord, target); + entries.Add(MenuEntry.Separator); + Offer(entries, $"Edit {title} in F5", "F5", ScreenCommandPrefix + "worlds"); + break; + + case RailRowKind.Empty: + Offer(entries, $"Add a character to {Snippet(world?.Name ?? string.Empty)} in F5", "F5", ScreenCommandPrefix + "worlds"); + break; + + case RailRowKind.Character: + Offer(entries, row.Active ? $"{title} is in front" : $"Switch to {title}", row.Chord, target, enabled: !row.Active); + Offer(entries, row.Connected ? "Disconnect" : "Connect", row.Connected ? "⌥D" : "⌥R", + row.Connected ? "world:disconnect" : "world:reconnect"); + entries.Add(MenuEntry.Separator); + Offer(entries, $"Edit {Snippet(world?.Name ?? string.Empty)} in F5", "F5", ScreenCommandPrefix + "worlds"); + Offer(entries, $"Edit {title} in F9", "F9", ScreenCommandPrefix + "logging"); + break; + + case RailRowKind.Window: + var window = character?.Windows.FirstOrDefault(w => CommandIds.Window(w.Id) == target); + var front = model.IsSelected(window ?? new RailWindow(string.Empty, string.Empty, null, 0, false, false)); + Offer(entries, front ? $"{title} is in front" : $"Go to {title}", row.Chord, target, enabled: !front && !row.Closed); + if (!row.Closed) + { + // ⌃W closes the window in front; the session's main window is the session and never closes. + Offer(entries, "Close this window", "⌃W", "layout:close", enabled: window?.Id != MainWindowId); + Offer(entries, "Clear this window", null, "term:clear"); + } + + break; + } + } + + var menu = new MenuModel(entries); + _sidebarMenuOffered = (rowKey, menu); + return menu; + + IEnumerable RowsOf(RailWorld w) => RailModel.Build([w]).Where(r => r.Target is not null).Select(SidebarModel.KeyOf); + } + + /// An entry, only when the registry runs its command. + private void Offer(List entries, string label, string? key, string command, bool enabled = true) + { + if (_contributions.Commands.Resolve(command) is not null) + { + entries.Add(new MenuEntry(label, key, command, Enabled: enabled)); + } + } + + /// + /// An entry chosen from a sidebar row's menu: the row is brought forward first (unless the entry is that very + /// step), then the command runs, as a right click on a tab focuses it before its menu acts. A command the menu last + /// offered did not carry is refused. Internal so a test can drive it as the window does. + /// + internal bool RunSidebarMenuEntry(string id) + { + var (rowKey, menu) = _sidebarMenuOffered; + if (!menu.Commands().Contains(id, StringComparer.Ordinal)) + { + RefuseCommand($"the sidebar's menu never offered {Snippet(id)}"); + return false; + } + + var target = rowKey[(rowKey.IndexOf('|', StringComparison.Ordinal) + 1)..]; + if (!string.Equals(id, target, StringComparison.Ordinal) + && (target.StartsWith(CommandIds.CharacterPrefix, StringComparison.Ordinal) || target.StartsWith(CommandIds.WindowPrefix, StringComparison.Ordinal))) + { + DispatchRailTarget(target); + } + + return string.Equals(id, target, StringComparison.Ordinal) ? DispatchRailTarget(id) : DispatchCommand(id); + } + + /// The row key a cell rail target is drawn as: its character or window row, else its world row. + private string RailRowKeyFor(string target) + { + var rows = BuildSidebar().Rows().Where(r => r.Target == target).ToList(); + var row = rows.FirstOrDefault(r => r.Kind is RailRowKind.Character or RailRowKind.Window) ?? rows.FirstOrDefault(); + return row is null ? SidebarModel.KeyOf(RailRowKind.Character, target) : SidebarModel.KeyOf(row); + } +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.ReflowScene.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.ReflowScene.cs index ee8bb794..966171d7 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.ReflowScene.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.ReflowScene.cs @@ -38,7 +38,7 @@ private void LoadReflowScene() AppendWindowLine(MainWindowId, $"[dim]── join wraps off · as sent, wrapped at {ReflowSceneColumn}[/]"); foreach (var row in rows) { - AppendWindowLine(MainWindowId, _formatter.ToMarkup(row)); + AppendWindowLine(MainWindowId, row); } AppendWindowLine(MainWindowId, "[dim]── join wraps on · the same rows, joined[/]"); @@ -58,13 +58,13 @@ private void LoadReflowScene() { foreach (var ready in joiner.Push(row)) { - AppendWindowLine(MainWindowId, _formatter.ToMarkup(ready)); + AppendWindowLine(MainWindowId, ready); } } if (joiner.Flush() is { } held) { - AppendWindowLine(MainWindowId, _formatter.ToMarkup(held)); + AppendWindowLine(MainWindowId, held); } } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Theme.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Theme.cs index 50d1fbb8..e7ba65b0 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Theme.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Theme.cs @@ -8,9 +8,8 @@ namespace SharpMUTerm.Tui; /// The theme, changed while the client runs. F7's theme picker and the desktop's theme cards both commit through /// , and that is where a new theme is noticed and put into force: every colour the client /// derives from it — the workspace planes, the bars, the header, the settings screens and the popups — is re-derived and -/// repainted. What it cannot recolour is output already in a pane: a line's colours were resolved against the theme it -/// arrived under and held there as markup (), so the notice says so rather than leaving a reader to -/// wonder why the old lines look different. +/// repainted — output already in a pane included: every world line is kept beside its markup +/// () and formatted again against the new theme (). /// internal sealed partial class SharpMUTermApp { @@ -80,12 +79,59 @@ private void ApplyTheme(Theme theme) control.SelectionForegroundColor = ToColor(WorkspacePalette.SelectionInk(theme)); } + RestylePaneLines(); RebuildPaneArea(); RefreshPanels(); - Notice( - $"Theme {theme.Name}. Output already on screen keeps the colours it arrived in.", - Core.Diagnostics.MessageSeverity.Info, - "theme"); + Notice($"Painting in {theme.Name}, output on screen included.", Core.Diagnostics.MessageSeverity.Info, "theme"); + } + + /// + /// Formats every buffered world line again against the theme in force, redraws every bar in its accent, and + /// re-feeds the panes. A line's colours were resolved against the reading plane of the theme it arrived under + /// (, ), so without this a switch from Dark to Light left the + /// history in greys lifted for a dark plane — faint on a light one until it scrolled away. + /// + /// Nothing moves. Each row is replaced in place, so the count and the order of every buffer are what they + /// were, and every index into one — the freeze point, the away and activity marks, the NEW boundary, the + /// search bar, a picture's anchor — still names the row it named. The plain text is not touched (it is the same + /// text), so ⌃F finds what it found. A row with no (a picture's rows, a client + /// reply, the demo's numbered lines) keeps its markup: a picture's pixels are not the theme's, and a reply is + /// [dim], which the framework resolves to one grey whatever the theme. The re-feed keeps the selection, + /// because only colours changed. + /// + /// + /// This is the whole-buffer path the timestamp toggle uses (), bounded by the same kind + /// of event: one deliberate commit of a new theme. + /// + /// + internal void RestylePaneLines() + { + var accent = FrozenAccentHex(); + foreach (var buffer in _lines.Values) + { + for (var i = 0; i < buffer.Count; i++) + { + var line = buffer[i]; + if (line.Bar is { } bar) + { + buffer[i] = line with { Markup = bar(accent) }; + } + else if (line.Source is { } source) + { + if (line.Pictures is { } pictures) + { + pictures.Restyle(_formatter.ToMarkupPieces(source, pictures.Cuts)); + buffer[i] = line with { Markup = pictures.Compose() }; + } + else + { + buffer[i] = line with { Markup = _formatter.ToMarkup(source) }; + } + } + } + } + + RepaintPanes(keepSelection: true); } /// A theme's name and colours as one string, so two resolutions of one theme compare equal. diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 5dbb1822..37511402 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -1170,6 +1170,28 @@ public string RenderSnapshot(string? view = null) DispatchCommand("term:timestamps-on"); } + // A theme switched while the scene is on screen, over a split so a session window and a spawn window are + // both in the frame: every line already there is formatted again against Light (PaneLine.Source), so this + // frame's output matches what `--theme Light` draws from the start. Before the repaint the history kept the + // colours it arrived in, and the white and grey lines were faint on the light planes. + if (string.Equals(view, "theme-switched", StringComparison.OrdinalIgnoreCase)) + { + PaneCommands.Apply(_workspace.Layout, PaneCommand.SplitRight); + RebuildPaneArea(); + Client.Settings.ThemeChoices.Apply(_config, "Light"); + SaveConfiguration(); + SettleScroll(); + } + + // The sidebar holding the keys (⌥C), its cursor walked one row down by a real ↓: the cell rail draws the row on + // the armed command line's band, padded to the rail's width, so the frame shows where ⏎ will go and that no + // cell moved. The window's sidebar draws the same cursor as a ring. Nothing when the rail has no rows. + if (string.Equals(view, "rail-keys", StringComparison.OrdinalIgnoreCase)) + { + SimulateKey(new ConsoleKeyInfo('c', ConsoleKey.C, false, true, false)); + SimulateKey(new ConsoleKeyInfo('\0', ConsoleKey.DownArrow, false, false, false)); + } + // Bring the Chat spawn window to the front, so one frame shows a *routed* window as the active tab // with the character's own window sitting behind it in the same strip. It used to exist for the dim // "⇱ capture …" header a spawn pane drew over its output; that header is gone (the user asked for @@ -1447,7 +1469,7 @@ public string RenderSnapshot(string? view = null) { foreach (var line in parser.Feed(text + "\n")) { - AppendWindowLine(MainWindowId, _formatter.ToMarkup(line), StampNow()); + AppendWindowLine(MainWindowId, line, StampNow()); } } } @@ -2332,7 +2354,7 @@ private void SimulateSnapshotDrag() private void AppendDemoLine(string windowId, StyledLine line) { var shown = _config.Text.DetectLinks ? UrlDetector.ApplyToLine(line) : line; - AppendWindowLine(windowId, _formatter.ToMarkup(shown), StampNow()); + AppendWindowLine(windowId, shown, StampNow()); } private void LoadDemoScene() @@ -2361,13 +2383,13 @@ void Feed(string windowId, string ansiLine) new StyledSpan(" ", TextStyle.Default), Link("east"), }); - AppendWindowLine(MainWindowId, _formatter.ToMarkup(exits), StampNow()); + AppendWindowLine(MainWindowId, exits, StampNow()); // A trigger-highlighted line: carries a left-rule colour, so it gets the 2-col rule treatment. var highlighted = new StyledLine( new[] { new StyledSpan("[public] Rivane: to the crypt, then!", TextStyle.Default) }, TerminalColor.FromRgb(0x00, 0xf5, 0xb7)); - AppendWindowLine(MainWindowId, _formatter.ToMarkup(highlighted), StampNow()); + AppendWindowLine(MainWindowId, highlighted, StampNow()); // The Chat spawn window already exists (opened by the resumed session); feed its backlog and // leave it in the background with unread, as if lines arrived while another tab was focused. @@ -2382,7 +2404,7 @@ void Feed(string windowId, string ansiLine) { foreach (var line in chatParser.Feed(text + "\n")) { - AppendWindowLine(chatId, _formatter.ToMarkup(line), StampNow()); + AppendWindowLine(chatId, line, StampNow()); } _workspace.NoteActivity(chatId); // each line accrues unread while Chat is in the background @@ -2517,14 +2539,17 @@ private void RestorePreviousSession() foreach (var line in window.Lines) { - AppendWindowLine(windowId, _formatter.ToMarkup(line.Line), line.Stamp); + AppendWindowLine(windowId, line.Line, line.Stamp); } // The boundary marker carries no stamp: it did not arrive, it was drawn, and a timestamp // gutter beside it would be claiming a time for a row the game never sent. + var restored = window.Lines.Count; + var written = window.LastWritten; AppendWindowLine( windowId, - RestoreBarRenderer.Bar(window.Lines.Count, window.LastWritten, FrozenAccentHex())); + RestoreBarRenderer.Bar(restored, written, FrozenAccentHex()), + bar: accent => RestoreBarRenderer.Bar(restored, written, accent)); restoredWindows++; restoredLines += window.Lines.Count; @@ -3029,7 +3054,7 @@ private void BindSession(WorldSession session, string? windowId = null) PaneContentFor(windowId, session.World.Name); foreach (var line in session.Scrollback.Snapshot()) { - AppendWindowLine(windowId, _formatter.ToMarkup(line)); + AppendWindowLine(windowId, line); } session.LinePrinted += (_, line) => OnUi(() => OnLine(session, windowId, line)); @@ -3320,6 +3345,13 @@ private bool ShowTimestamps private string Compose(PaneLine line) => MarkupFormatter.WithTimestamp(line.Markup, ShowTimestamps ? line.Stamp : null); + /// + /// Appends one of a world's lines to a window, formatted against the theme in force and kept beside its markup + /// () so a theme change can format it again. + /// + private void AppendWindowLine(string windowId, StyledLine line, string? stamp = null) => + AppendWindowLine(windowId, _formatter.ToMarkup(line), stamp, source: line); + /// /// Appends one already-formatted markup line to a window: records it in the scrollback buffer and, /// if the window has a live control, paints it. A frozen pane's live control is its tail region, so @@ -3334,7 +3366,9 @@ private void AppendWindowLine( string markup, string? stamp = null, long imageAnchor = 0, - PictureSlots? pictures = null) + PictureSlots? pictures = null, + StyledLine? source = null, + Func? bar = null) { if (!_lines.TryGetValue(windowId, out var buffer)) { @@ -3361,7 +3395,7 @@ private void AppendWindowLine( // The plain text is computed here, once, and not on demand: ⌃F refilters on every keystroke over // every line of every window (see PaneLine.Plain). - buffer.Add(new PaneLine(markup, stamp, MarkupText.Plain(markup), imageAnchor, pictures)); + buffer.Add(new PaneLine(markup, stamp, MarkupText.Plain(markup), imageAnchor, pictures, source, bar)); // Cap what the pane holds, and trim its control with it. The control re-parses every line it @@ -3563,7 +3597,7 @@ private void RecordForRestore(WorldSession session, string windowId, string titl /// Keep new callers going through here rather than touching a control's content directly. /// /// - private void FeedRange(MarkupControl control, List buffer, int from, int count) + private void FeedRange(MarkupControl control, List buffer, int from, int count, bool keepSelection = false) { var start = Math.Clamp(from, 0, buffer.Count); var length = Math.Clamp(count, 0, buffer.Count - start); @@ -3582,7 +3616,15 @@ private void FeedRange(MarkupControl control, List buffer, int from, i // // MarkupControl.SetContent does not do this itself — only its append path does // (OnContentAppended) — so it cannot be left to the framework. - control.ClearSelection(); + // + // The one exception is a re-feed that changes colours and nothing else (a theme change, + // RestylePaneLines): every row holds the same text in the same place, so the selection still + // describes exactly what was dragged across, and dropping it would punish a reader for opening F7. + if (!keepSelection) + { + control.ClearSelection(); + } + control.SetContent(markup); } @@ -3632,11 +3674,11 @@ private void SetTimestamps(bool on) /// no arrival times and have no gutter to gain. /// /// - private void RepaintPanes() + private void RepaintPanes(bool keepSelection = false) { foreach (var windowId in _lines.Keys) { - RepaintPane(windowId); + RepaintPane(windowId, keepSelection); } } @@ -3647,7 +3689,7 @@ private void RepaintPanes() /// () is one — it happens when the reader comes back and when they have /// read what they missed, not per line and not per frame. /// - private void RepaintPane(string windowId) + private void RepaintPane(string windowId, bool keepSelection = false) { // Skipped for the reason RepaintPanes gives: the web view's pane is not fed from this buffer at // all, so re-feeding it would replace the page with whatever last printed into that window. @@ -3662,12 +3704,12 @@ private void RepaintPane(string windowId) var split = Math.Clamp(point, 0, buffer.Count); if (_frozenPanes.TryGetValue(windowId, out var frozen)) { - FeedRange(frozen, buffer, 0, split); + FeedRange(frozen, buffer, 0, split, keepSelection); } if (_panes.TryGetValue(windowId, out var tail)) { - FeedRange(tail, buffer, split, buffer.Count - split); + FeedRange(tail, buffer, split, buffer.Count - split, keepSelection); } return; @@ -3675,7 +3717,7 @@ private void RepaintPane(string windowId) if (_panes.TryGetValue(windowId, out var control)) { - FeedRange(control, buffer, 0, buffer.Count); + FeedRange(control, buffer, 0, buffer.Count, keepSelection); } RefreshScrollTail(windowId); @@ -3749,7 +3791,6 @@ private void NoteReaderInput(long at) /// private void MarkWhereTheReaderLeft(TimeSpan away) { - var accent = FrozenAccentHex(); foreach (var windowId in _lines.Keys.ToArray()) { if (string.Equals(windowId, WebWindowId, StringComparison.Ordinal)) @@ -3790,7 +3831,7 @@ private void MarkWhereTheReaderLeft(TimeSpan away) continue; } - InsertChromeRow(windowId, at, AwayBarRenderer.Bar(missed, away, accent)); + InsertChromeRow(windowId, at, ink => AwayBarRenderer.Bar(missed, away, ink)); var mark = new AwayMark { Index = at, DrawnAfter = _focus.InputCount, DrawnAt = _time.GetUtcNow() }; _awayMarks[windowId] = mark; @@ -3861,7 +3902,8 @@ private void MarkMissedLines(bool reveal) at = Math.Clamp(at, 0, buffer.Count); } - InsertChromeRow(windowId, at, AwayBarRenderer.Missed(buffer.Count - at, FrozenAccentHex())); + var count = buffer.Count - at; + InsertChromeRow(windowId, at, accent => AwayBarRenderer.Missed(count, accent)); var mark = new AwayMark { @@ -4116,9 +4158,13 @@ private void AppendSessionLine(string windowId, StyledLine line, string stamp) else { slots.Sort((a, b) => a.Start.CompareTo(b.Start)); + var cuts = slots.Select(slot => (slot.Start, slot.Columns)).ToArray(); pictures = new PictureSlots( - _formatter.ToMarkupPieces(line, slots.Select(slot => (slot.Start, slot.Columns)).ToArray()), - slots.Select(slot => (slot.Picture, slot.Row, slot.Columns)).ToArray()); + _formatter.ToMarkupPieces(line, cuts), + slots.Select(slot => (slot.Picture, slot.Row, slot.Columns)).ToArray()) + { + Cuts = cuts, + }; foreach (var picture in arrived) { pictures.Draw(picture.Id, picture.Drawn!); @@ -4127,7 +4173,7 @@ private void AppendSessionLine(string windowId, StyledLine line, string stamp) markup = pictures.Compose(); } - AppendWindowLine(windowId, markup, stamp, anchor, pictures); + AppendWindowLine(windowId, markup, stamp, anchor, pictures, line); IGraphicsProtocol? Kitty() => WebGraphicsSurface().CanPlaceKitty ? _system.ConsoleDriver as IGraphicsProtocol : null; if (anchor != 0) @@ -4215,7 +4261,7 @@ private void PlaceInlinePicture(string windowId, long anchor, InlinePictureLine // picture by its name. if (first && empty) { - buffer[at] = buffer[at] with { Markup = rows[0] }; + buffer[at] = buffer[at] with { Markup = rows[0], Source = null }; InsertImageRows(windowId, anchor, rows.Skip(1).ToArray(), repaint: true); } else if (empty && at + 1 < buffer.Count && buffer[at + 1].ImageAnchor == -anchor) @@ -4223,13 +4269,13 @@ private void PlaceInlinePicture(string windowId, long anchor, InlinePictureLine // The last label of a line holding only pictures, with the earlier ones already under it. This // picture cannot take the line, or it would sit above them; the first row under the line moves // up into it instead, so no blank row is left above the pictures. - buffer[at] = buffer[at] with { Markup = buffer[at + 1].Markup }; + buffer[at] = buffer[at] with { Markup = buffer[at + 1].Markup, Source = buffer[at + 1].Source }; RemoveChromeRow(windowId, at + 1); InsertImageRows(windowId, anchor, rows, repaint: true); } else { - buffer[at] = buffer[at] with { Markup = _formatter.ToMarkup(rest) }; + buffer[at] = buffer[at] with { Markup = _formatter.ToMarkup(rest), Source = rest }; InsertImageRows(windowId, anchor, rows, repaint: true); } } @@ -4577,7 +4623,7 @@ private void InsertImageRows(string windowId, long anchor, IReadOnlyList /// The row carries no plain text, so a search cannot find it (see ). /// /// - private void InsertChromeRow(string windowId, int at, string markup) + private void InsertChromeRow(string windowId, int at, Func bar) { if (!_lines.TryGetValue(windowId, out var buffer)) { @@ -4585,7 +4631,7 @@ private void InsertChromeRow(string windowId, int at, string markup) } at = Math.Clamp(at, 0, buffer.Count); - buffer.Insert(at, new PaneLine(markup)); + buffer.Insert(at, new PaneLine(bar(FrozenAccentHex()), Bar: bar)); if (_freezePoints.TryGetValue(windowId, out var freeze) && freeze > at) { @@ -4731,7 +4777,7 @@ private void GoToSearchHit(SearchRow row, string query, int ordinal, int total) } var at = Math.Clamp(row.LineIndex, 0, buffer.Count); - InsertChromeRow(row.WindowId, at, SearchBarRenderer.Bar(query, ordinal, total, FrozenAccentHex())); + InsertChromeRow(row.WindowId, at, accent => SearchBarRenderer.Bar(query, ordinal, total, accent)); _searchMark = (row.WindowId, at); RepaintPane(row.WindowId); @@ -6881,6 +6927,14 @@ private void RegisterGlobalShortcuts() action = () => { DisarmPrefix(); return claimed(); }; } + // And every one but ⌥C itself hands the keys back from the sidebar: a chord that opens a surface leaves + // the reader somewhere else, and arrows arriving later must not walk a sidebar nobody is looking at. + if (claim.Modifiers != ConsoleModifiers.Alt || claim.Key != ConsoleKey.C) + { + var claimed = action; + action = () => { LeaveRailKeys(); return claimed(); }; + } + _system.RegisterGlobalShortcut(claim.Modifiers, claim.Key, action); _shortcuts[(claim.Modifiers, claim.Key)] = action; } @@ -7013,6 +7067,12 @@ private void RegisterFocusReportTab() return () => { ShowLayouts(); return true; }; } + // ⌥C moves the keyboard into the connection sidebar, and back. ESC c, like the rest. + if (claim.Key == ConsoleKey.C) + { + return () => { ToggleRailKeys(); return true; }; + } + // ⌥F freezes and resumes the focused pane. It was ⌃F, and moved so that search could have the // chord every reader on every platform reaches for. Same delivery story as ⌥D and ⌥R: ESC + a // printable byte, decoded as that letter with Alt set. @@ -7955,7 +8015,10 @@ internal SidebarModel BuildSidebar() index++; } - return new SidebarModel(worlds, ActiveWindowId(), _railCollapsed); + var sidebar = new SidebarModel(worlds, ActiveWindowId(), _railCollapsed); + return _railCursor is { } cursor && sidebar.NavigableRows().Any(r => SidebarModel.KeyOf(r) == cursor) + ? sidebar with { Cursor = cursor } + : sidebar; } /// @@ -8553,6 +8616,9 @@ private bool RunBuiltInCommand(string id) case "layout:toggle-rail": ToggleRail(); // ⌃B b's fold, and the window sidebar's fold button return true; + case Client.Commands.BuiltInCommands.RailKeysCommand: + ToggleRailKeys(); // ⌥C + return true; case "term:newline": // The same edit Alt+⏎ makes, through the same key table, so the surface cannot drift from // the chord it advertises. @@ -10708,7 +10774,8 @@ private void RefreshPaneFocus() /// private List RenderRailLines() { - return RailRenderer.Render(Drawing(SurfaceCatalog.Sidebar, string.Empty, BuildSidebar()), RailMaxWidth - RailMargin, _ink); + return RailRenderer.Render( + Drawing(SurfaceCatalog.Sidebar, string.Empty, BuildSidebar()), RailMaxWidth - RailMargin, _ink, RailCursorBand()); } /// @@ -11758,6 +11825,13 @@ private bool RouteToInput(ConsoleKeyInfo key) return null; } + // ⌥C put the keys on the connection sidebar: its arrows, ⏎ and Esc come first, and anything else hands + // the keys back and carries on down this chain (SharpMUTermApp.RailKeys.cs). + if (TryRailKey(e)) + { + return null; + } + // A docked composer holding the keyboard takes the keys an editor takes; see HandleComposerKey. if (ArmedComposer() is { } composer) { diff --git a/src/SharpMUTerm.Tui/SnapshotViews.cs b/src/SharpMUTerm.Tui/SnapshotViews.cs index 5592140d..f07a8b45 100644 --- a/src/SharpMUTerm.Tui/SnapshotViews.cs +++ b/src/SharpMUTerm.Tui/SnapshotViews.cs @@ -25,7 +25,7 @@ internal static class SnapshotViews "search", "search-regex", "search-all", "search-landed", "activity-bar", "mxp-image", "mxp-figure", "input-selection", "selection", "trigger-builder", "prefix", "prefix-panel", "focus", "focus-moved", "tabs", "tabs-many", - "collapsed", "timestamps", "timestamps-toggled", "prompt", "meters", "gamedata", "map", "map-walking", "map-split", + "collapsed", "timestamps", "timestamps-toggled", "theme-switched", "rail-keys", "prompt", "meters", "gamedata", "map", "map-walking", "map-split", "packages", "package-review", "package-browse", "send-menu", "layouts", "layout-combat", "layout-roleplay", "panel-who", "panel-vitals", "panel-quickbar", "panel-composer", "welcome", "welcome-connect", "tour", diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativeChromeTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativeChromeTests.cs index db436713..62104f46 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/NativeChromeTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/NativeChromeTests.cs @@ -55,13 +55,33 @@ public class NativeChromeTests : null, }; - private static ChromeOverlay Overlay(Action activate, bool interactive = true, bool collapsed = false, bool prefix = false) => new( + private static ChromeOverlay Overlay(Action activate, bool interactive = true, bool collapsed = false, bool prefix = false) => + Overlay(activate, Sidebar(collapsed), interactive, prefix); + + /// A sidebar with more rows than the window holds: one character with forty windows. + private static SidebarModel LongSidebar(string? cursor = null) => new( + [ + new RailWorld("Aetherfall", "aether.example", 4000, Teal, + [ + new RailCharacter("Corvid", "Aetherfall.Corvid", Connected: true, Active: true, Unread: 0, + [.. Enumerable.Range(1, 40).Select(i => new RailWindow($"Channel {i}", $"spawn:{i}", null, 0, i == 1, false))]), + ]), + ], + "spawn:1", + false, + cursor); + + private static ChromeOverlay Overlay( + Action activate, SidebarModel sidebar, bool interactive = true, bool prefix = false, + Action>? rowMenu = null) => new( HostChrome.HeaderAndRail, interactive, Header(prefix), - Sidebar(collapsed), + sidebar, new ChromePalette("#9d7cff", "#00f5b7", "#00f5b7", "#ffd700", "#00f5b7", "#ffaf00", "#202028", "#18181d", "#e0e0e0"), - activate); + activate, + rowMenu ?? ((_, show) => show(SharpMUTerm.Client.Commands.MenuModel.Empty)), + _ => { }); [Test] public async Task TheHeaderAndTheSidebarSitBesideTheCellsAndNoCellIsUnderThem() @@ -181,6 +201,113 @@ await Assert.That(activated).IsEquivalentTo(new[] await Assert.That(rows).IsEquivalentTo(new[] { RailRowKind.World, RailRowKind.Character, RailRowKind.Window, RailRowKind.Window, RailRowKind.Character }); } + /// + /// More rows than fit scroll under the title, with the wheel and with an overlay bar like the panes': the rows + /// move, the hit areas stay inside the list, and nothing reaches the client. + /// + [Test] + public async Task ALongSidebarScrollsWithTheWheelAndItsBarAndNothingReachesTheClient() + { + var (range, bar, wheeled, firstBefore, firstAfter, hitsInside, dragged, clientSaw) = await Run((window, view, layer, driver) => + { + ((IPointerPresenter)driver.Pointer).Chrome(Overlay(_ => { }, LongSidebar())); + Drain(); + window.UpdateLayout(); + Drain(); + var clientSaw = 0; + driver.MouseEvent += (_, _, _) => clientSaw++; + var sidebar = layer.Sidebar; + var range = sidebar.ScrollRange; + var bar = sidebar.Bar(); + var firstBefore = sidebar.Rows[0].Kind; + + var middle = sidebar.TranslatePoint(new Point(sidebar.Bounds.Width / 2, sidebar.Bounds.Height / 2), window)!.Value; + window.MouseWheel(middle, new Vector(0, -2)); + Drain(); + var wheeled = sidebar.ScrollOffset; + var firstAfter = sidebar.Rows[0].Kind; + var hitsInside = sidebar.Hits.Where(h => h.Target.StartsWith(CommandIds.WindowPrefix, StringComparison.Ordinal)) + .All(h => h.Area.Top >= bar!.Value.Zone.Top - 0.5 && h.Area.Bottom <= bar.Value.Zone.Bottom + 0.5); + + // Drag the thumb to the bottom of its track. + var thumb = sidebar.Bar()!.Value.Thumb; + var from = sidebar.TranslatePoint(thumb.Center, window)!.Value; + var to = sidebar.TranslatePoint(new Point(thumb.Center.X, sidebar.Bounds.Height), window)!.Value; + window.MouseMove(from); + window.MouseDown(from, MouseButton.Left); + window.MouseMove(to); + window.MouseUp(to, MouseButton.Left); + Drain(); + return (range, bar, wheeled, firstBefore, firstAfter, hitsInside, sidebar.ScrollOffset, clientSaw); + }); + + await Assert.That(range).IsGreaterThan(0); + await Assert.That(bar).IsNotNull(); + await Assert.That(wheeled).IsGreaterThan(0).Because("the wheel scrolls the rows"); + await Assert.That(firstBefore).IsEqualTo(RailRowKind.World); + await Assert.That(firstAfter).IsNotEqualTo(RailRowKind.World).Because("the world row scrolled out of the list"); + await Assert.That(hitsInside).IsTrue().Because("a row half under the title is clickable only where it shows"); + await Assert.That(dragged).IsEqualTo(range).Because("the thumb dragged to the end scrolls to the end"); + await Assert.That(clientSaw).IsEqualTo(0); + } + + /// The keyboard's row (⌥C) wears a ring and is scrolled into view, however far down the list it is. + [Test] + public async Task TheKeyboardsRowIsScrolledIntoView() + { + var key = SidebarModel.KeyOf(RailRowKind.Window, CommandIds.Window("spawn:40")); + var (offset, shown) = await Run((window, view, layer, driver) => + { + ((IPointerPresenter)driver.Pointer).Chrome(Overlay(_ => { }, LongSidebar(key))); + Drain(); + window.UpdateLayout(); + Drain(); + var sidebar = layer.Sidebar; + var row = sidebar.Rows.SingleOrDefault(r => NativeSidebar.KeyOf(r) == key); + return (sidebar.ScrollOffset, row is not null && row.Area.Bottom <= sidebar.Bar()!.Value.Zone.Bottom + 0.5); + }); + + await Assert.That(offset).IsGreaterThan(0); + await Assert.That(shown).IsTrue(); + } + + /// A right click on a row asks the client for that row's menu, by the row's key, and opens it natively. + [Test] + public async Task ARightClickOnARowOpensTheClientsMenuForThatRow() + { + var (asked, opened, entries, clientSaw) = await Run((window, view, layer, driver) => + { + var asked = new List(); + var menu = new SharpMUTerm.Client.Commands.MenuModel([new SharpMUTerm.Client.Commands.MenuEntry("Close this window", "⌃W", "layout:close")]); + ((IPointerPresenter)driver.Pointer).Chrome(Overlay(_ => { }, Sidebar(), rowMenu: (row, show) => + { + asked.Add(row); + show(menu); + })); + Drain(); + window.UpdateLayout(); + Drain(); + var clientSaw = 0; + driver.MouseEvent += (_, _, _) => clientSaw++; + var chat = layer.Sidebar.Rows.Single(r => r.Window?.Id == "spawn:2"); + var centre = layer.Sidebar.TranslatePoint(chat.Area.Center, window)!.Value; + window.MouseMove(centre); + window.MouseDown(centre, MouseButton.Right); + window.MouseUp(centre, MouseButton.Right); + Drain(); + var opened = layer.Sidebar.OpenedMenu; + var entries = opened?.Items.OfType().Count() ?? 0; + opened?.Close(); + Drain(); + return (asked, opened is not null, entries, clientSaw); + }); + + await Assert.That(asked).IsEquivalentTo(new[] { SidebarModel.KeyOf(RailRowKind.Window, CommandIds.Window("spawn:2")) }); + await Assert.That(opened).IsTrue(); + await Assert.That(entries).IsEqualTo(1); + await Assert.That(clientSaw).IsEqualTo(0); + } + [Test] public async Task APressOnTheCellsLandsOnTheCellUnderThePointerPastTheChrome() { diff --git a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs index abcfbce5..9f4bc24b 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs @@ -11,6 +11,7 @@ using SharpMUTerm.Core.Commands; using SharpMUTerm.Core.Configuration; using SharpMUTerm.Core.Layouts; +using SharpMUTerm.Core.Workspaces; using SharpMUTerm.Tui; using SharpMUTerm.Tui.Panels; @@ -235,6 +236,20 @@ await Same("sidebar: window", "layout-combat", await Same("sidebar: add a game", "layout-combat", (app, _) => app.ActivateChromeTarget(SidebarModel.AddGameTarget), (app, _) => app.DispatchCommand(SidebarModel.AddGameTarget)); + + // Sidebar: a window row's menu, Close this window — the row is brought forward, then ⌃W's command runs. + await Same("sidebar: row menu", "layout-combat", + (app, _) => + { + var target = OtherWindow(app); + var menu = app.SidebarRowMenu(SidebarModel.KeyOf(RailRowKind.Window, target)); + app.RunSidebarMenuEntry(menu.Entries.Single(e => e.Command == "layout:close").Command!); + }, + (app, _) => + { + app.DispatchRailTarget(OtherWindow(app)); + app.DispatchCommand("layout:close"); + }); probed.Add(SurfaceCatalog.Sidebar); // The folded rail: the strip's fold button, and the ⌃P command beside ⌃B b. diff --git a/tests/SharpMUTerm.Tui.Tests/DeclaredWorldSettingsTests.cs b/tests/SharpMUTerm.Tui.Tests/DeclaredWorldSettingsTests.cs index 81a7e2ed..273922d5 100644 --- a/tests/SharpMUTerm.Tui.Tests/DeclaredWorldSettingsTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/DeclaredWorldSettingsTests.cs @@ -161,6 +161,21 @@ public async Task EnterOnAThemeUsesItAndSavesOnce() await Assert.That(saves()).IsEqualTo(1); } + /// Space on a theme row is ⏎, as it is the commit on a checkbox row: the cursor already previews. + [Test] + public async Task SpaceOnAThemeUsesItAsEnterDoes() + { + var (app, config, saves) = App(); + app.DispatchCommand("screen:textansi"); + Key(app, ConsoleKey.DownArrow); + Key(app, ConsoleKey.Spacebar, ' '); + + await Assert.That(config.ThemeName).IsEqualTo("Light"); + await Assert.That(app.ThemeName).IsEqualTo("Light"); + await Assert.That(saves()).IsEqualTo(1); + await Assert.That(app.SettingsOpenKey).IsNotNull(); + } + [Test] public async Task F7OpensWithTheCursorOnTheThemeInForce() { diff --git a/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs b/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs index 36a6b72d..bbd0c3b4 100644 --- a/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs @@ -46,7 +46,7 @@ public class FrameContrastTests // The selection band is the one plane this client invents rather than derives from a pane, and // its ink replaces the world's own colour on every selected cell — so it is the pair with the // most to lose from a theme it was not measured against. - "selection", "input-selection", "menu-fuzzy", "menu-recent", + "selection", "input-selection", "rail-keys", "menu-fuzzy", "menu-recent", // The split-scrollback band (the notice ink on a pane) and the reflowed room, whose two blocks carry // dim labels and the world's own text. diff --git a/tests/SharpMUTerm.Tui.Tests/RailKeysTests.cs b/tests/SharpMUTerm.Tui.Tests/RailKeysTests.cs new file mode 100644 index 00000000..b6f09dca --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/RailKeysTests.cs @@ -0,0 +1,164 @@ +using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Core.Workspaces; +using SharpMUTerm.Graphics; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// ⌥C puts a cursor on the connection sidebar: ↑↓ Home End walk it, ⏎ goes where a click on the row goes, Esc and +/// ⌥C hand the keys back, and any other key does too and then does what it does on the command line. The cursor is +/// client state on the shared , so the cell rail draws it as a band and the window's +/// sidebar as a ring. Also the row menu both hosts open on a right click: registry commands only. +/// +/// Serialised: rendering redirects the process-global Console.Out. +[NotInParallel] +public class RailKeysTests +{ + private static readonly TerminalCapabilities Caps = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private static ConsoleKeyInfo Key(ConsoleKey key, char c = '\0', bool alt = false) => new(c, key, false, alt, false); + + private static readonly ConsoleKeyInfo AltC = Key(ConsoleKey.C, 'c', alt: true); + + private static async Task App(string? view = "characters") + { + Console.SetIn(TextReader.Null); + var app = new SharpMUTermApp(DemoScene.Build(), ClientHost.Headless(new HeadlessConsoleDriver(120, 34), Caps)); + app.RenderSnapshot(view); + await Task.CompletedTask; + return app; + } + + [Test] + public async Task AltCPutsTheCursorOnTheWindowInFrontAndAltCTakesItOff() + { + await using var app = await App(); + var front = SidebarModel.KeyOf(RailRowKind.Window, CommandIds.Window(app.ActiveWindowId())); + + app.SimulateKey(AltC); + await Assert.That(app.RailKeysActive).IsTrue(); + await Assert.That(app.RailCursor).IsEqualTo(front); + await Assert.That(app.BuildChromeOverlay().Sidebar.Cursor).IsEqualTo(front).Because("the window's sidebar reads the same model"); + + app.SimulateKey(AltC); + await Assert.That(app.RailKeysActive).IsFalse(); + await Assert.That(app.BuildChromeOverlay().Sidebar.Cursor).IsNull(); + } + + [Test] + public async Task TheArrowsWalkTheRowsAClickWouldReachAndStopAtTheEnds() + { + await using var app = await App(); + var rows = app.BuildChromeOverlay().Sidebar.NavigableRows().Select(SidebarModel.KeyOf).ToList(); + app.SimulateKey(AltC); + + app.SimulateKey(Key(ConsoleKey.Home)); + await Assert.That(app.RailCursor).IsEqualTo(rows[0]); + app.SimulateKey(Key(ConsoleKey.UpArrow)); + await Assert.That(app.RailCursor).IsEqualTo(rows[0]).Because("clamped, not wrapped"); + app.SimulateKey(Key(ConsoleKey.DownArrow)); + await Assert.That(app.RailCursor).IsEqualTo(rows[1]); + app.SimulateKey(Key(ConsoleKey.End)); + await Assert.That(app.RailCursor).IsEqualTo(rows[^1]); + app.SimulateKey(Key(ConsoleKey.DownArrow)); + await Assert.That(app.RailCursor).IsEqualTo(rows[^1]); + } + + [Test] + public async Task EnterGoesWhereAClickOnTheRowGoesAndHandsTheKeysBack() + { + await using var app = await App(); + var before = app.ActiveWindowId(); + var target = app.BuildChromeOverlay().Sidebar.NavigableRows() + .Last(r => r.Kind == RailRowKind.Window && r.Target != CommandIds.Window(before) && !r.Closed).Target!; + + app.SimulateKey(AltC); + app.SimulateKey(Key(ConsoleKey.End)); + while (app.RailCursor != SidebarModel.KeyOf(RailRowKind.Window, target)) + { + app.SimulateKey(Key(ConsoleKey.UpArrow)); + } + + app.SimulateKey(Key(ConsoleKey.Enter, '\r')); + + await Assert.That(app.RailKeysActive).IsFalse(); + await Assert.That(CommandIds.Window(app.ActiveWindowId())).IsEqualTo(target); + } + + [Test] + public async Task EscReturnsAndATypedKeyReturnsAndIsTyped() + { + await using var app = await App(); + var draft = app.PrimaryInputText; + app.SimulateKey(AltC); + app.SimulateKey(Key(ConsoleKey.Escape, '\u001b')); + await Assert.That(app.RailKeysActive).IsFalse(); + await Assert.That(app.PrimaryInputText).IsEqualTo(draft); + + app.SimulateKey(AltC); + app.SimulateKey(Key(ConsoleKey.L, 'l')); + await Assert.That(app.RailKeysActive).IsFalse(); + await Assert.That(app.PrimaryInputText).IsEqualTo(draft + "l").Because("a reader who starts typing is never stuck"); + } + + /// The cell rail draws the cursor as a band on its row, padded to the rail's width: no cell is spent. + [Test] + public async Task TheCellRailBandsTheCursorRowAndMovesNoPane() + { + await using var app = await App(); + var rects = app.PaneOutputRects().ToDictionary(p => p.Key, p => p.Value); + var widths = app.RailLines.Select(SharpMUTermApp.MarkupWidth).ToList(); + + app.SimulateKey(AltC); + + var lines = app.RailLines; + await Assert.That(lines.Count(l => System.Text.RegularExpressions.Regex.IsMatch(l, "^\\[#[0-9a-f]{6} on #"))).IsEqualTo(1); + await Assert.That(lines.Select(SharpMUTermApp.MarkupWidth).Max()).IsEqualTo(widths.Max()); + await Assert.That(app.PaneOutputRects()).IsEquivalentTo(rects); + } + + [Test] + public async Task TheRowMenuOffersOnlyRegistryCommandsWithTheirKeys() + { + await using var app = await App(); + foreach (var row in app.BuildChromeOverlay().Sidebar.NavigableRows()) + { + var menu = app.SidebarRowMenu(SidebarModel.KeyOf(row)); + foreach (var id in menu.Commands()) + { + await Assert.That(app.Contributions.Commands.Resolve(id) is not null || id == row.Target).IsTrue().Because(id); + } + } + + var character = app.BuildChromeOverlay().Sidebar.NavigableRows().First(r => r.Kind == RailRowKind.Character); + var labels = app.SidebarRowMenu(SidebarModel.KeyOf(character)).Entries.Select(e => e.Label).ToList(); + await Assert.That(labels.Any(l => l.Contains("in F5", StringComparison.Ordinal))).IsTrue(); + await Assert.That(labels.Any(l => l is "Connect" or "Disconnect")).IsTrue(); + } + + [Test] + public async Task AnEntryTheMenuNeverOfferedIsRefused() + { + await using var app = await App(); + var window = app.BuildChromeOverlay().Sidebar.NavigableRows().First(r => r.Kind == RailRowKind.Window); + app.SidebarRowMenu(SidebarModel.KeyOf(window)); + + await Assert.That(app.RunSidebarMenuEntry("app:quit")).IsFalse(); + await Assert.That(app.LastNotice).Contains("never offered"); + } + + [Test] + public async Task AnEntryBringsItsRowForwardFirst() + { + await using var app = await App(); + var settings = app.BuildChromeOverlay().Sidebar.NavigableRows().First(r => r.Kind == RailRowKind.Character); + var menu = app.SidebarRowMenu(SidebarModel.KeyOf(settings)); + var edit = menu.Entries.First(e => e.Label.Contains("in F5", StringComparison.Ordinal)).Command!; + + await Assert.That(app.RunSidebarMenuEntry(edit)).IsTrue(); + await Assert.That(app.OpenSettingsKey).IsNotNull(); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/SnapshotViewEmptyConfigTests.cs b/tests/SharpMUTerm.Tui.Tests/SnapshotViewEmptyConfigTests.cs index c5b4e5db..ba737b24 100644 --- a/tests/SharpMUTerm.Tui.Tests/SnapshotViewEmptyConfigTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/SnapshotViewEmptyConfigTests.cs @@ -37,7 +37,7 @@ public class SnapshotViewEmptyConfigTests /// private static readonly string[] Views = [ - "collapsed", "prefix", "prefix-panel", "timestamps", "timestamps-toggled", "spawn", "split", + "collapsed", "prefix", "prefix-panel", "timestamps", "timestamps-toggled", "theme-switched", "rail-keys", "spawn", "split", "focus", "focus-moved", "freeze", "freeze-scrollback", "move", "drag", "scrollback", "scrollback-up", "scrollback-split", "reflow", "away", "away-scrollback", "links", "web", "rail-long", "history", "history-search", "history-search-filter", "draft", "draft2", "menu", "menu-split", "menu-fuzzy", "menu-recent", "messages", "notices", "quit", diff --git a/tests/SharpMUTerm.Tui.Tests/ThemeRepaintTests.cs b/tests/SharpMUTerm.Tui.Tests/ThemeRepaintTests.cs new file mode 100644 index 00000000..f3169a81 --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/ThemeRepaintTests.cs @@ -0,0 +1,247 @@ +using System.Diagnostics; +using SharpConsoleUI.Drivers; +using SharpConsoleUI.Parsing; +using SharpMUTerm.Client.Settings; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Text; +using SharpMUTerm.Graphics; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// A theme change repaints the history. A line's colours are resolved against the reading plane of the theme in +/// force (, ), and a pane line used to be held as that markup +/// alone, so after Dark → Light every old line kept greys and whites lifted for a dark plane — faint, or white on +/// near-white, until it scrolled away. Each world line is now kept beside its markup (PaneLine.Source) and +/// formatted again on the switch, in place, so nothing indexing a buffer moves. +/// +/// Serialised: rendering redirects the process-global Console.Out. +[NotInParallel] +public class ThemeRepaintTests +{ + private const int Width = 120; + private const int Height = 32; + private const string Main = "main"; + private const string Bright = "the beacon burns a pale white"; + + private static readonly TerminalCapabilities Headless = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + [Test] + public async Task AfterASwitchToLightAnOldLinesCellsClearTheFloorOnTheNewPane() + { + var world = await Connected(); + world.Receive($"\u001b[97m{Bright}\u001b[0m\n"); + world.Receive("\u001b[37mand the grey stones answer it\u001b[0m\n"); + + // On Dark the bright white is legible as it is; on Light it is the colour of the paper. + await Assert.That(WorstRatio(world.App, Bright)).IsGreaterThanOrEqualTo(Contrast.Floor - 0.05); + + SwitchTo(world.App, "Light"); + + await Assert.That(world.App.ThemeName).IsEqualTo("Light"); + await Assert.That(WorstRatio(world.App, Bright)).IsGreaterThanOrEqualTo(Contrast.Floor - 0.05); + await Assert.That(WorstRatio(world.App, "the grey stones answer it")).IsGreaterThanOrEqualTo(Contrast.Floor - 0.05); + } + + /// The line's markup after the switch is exactly what a line arriving under Light would get. + [Test] + public async Task AnOldLineIsFormattedAsANewLineWouldBe() + { + var world = await Connected(); + world.Receive($"\u001b[97m{Bright}\u001b[0m\n"); + SwitchTo(world.App, "Light"); + world.Receive($"\u001b[97m{Bright}\u001b[0m\n"); + + var rows = world.App.PaneLines(Main).Where(r => r.Contains(Bright, StringComparison.Ordinal)).ToList(); + await Assert.That(rows.Count).IsEqualTo(2); + await Assert.That(rows[0]).IsEqualTo(rows[1]); + } + + [Test] + public async Task ALinkStillClicksAfterTheSwitch() + { + var world = await Connected(); + world.Receive("\u001b[97mthe notice board:\u001b[0m https://example.org/board\n"); + SwitchTo(world.App, "Light"); + + await Assert.That(Click(world, "https://example.org/board")).IsTrue(); + await Assert.That(world.Opened).IsEquivalentTo(new[] { "https://example.org/board" }); + } + + /// + /// A bar is a row of the buffer: the switch replaces rows in place, so the away bar is at the same index, with + /// the same lines either side of it, and drawn in the new theme's accent. + /// + [Test] + public async Task TheAwayBarStaysWhereItWasAndTakesTheNewAccent() + { + var world = await Connected(); + world.Receive("\u001b[37mbefore you left\u001b[0m\n"); + world.App.SimulateKey(new ConsoleKeyInfo('\0', ConsoleKey.LeftArrow, false, false, false)); + world.Receive("\u001b[97mwhile you were away\u001b[0m\n"); + world.App.SimulateReturnFromAway(TimeSpan.FromMinutes(12)); + world.App.RenderNextFrame(); + + var index = world.App.AwayBarIndex(Main); + await Assert.That(index).IsNotNull(); + var before = world.App.PaneLines(Main); + var barBefore = before[index!.Value]; + + SwitchTo(world.App, "Light"); + + var after = world.App.PaneLines(Main); + await Assert.That(world.App.AwayBarIndex(Main)).IsEqualTo(index); + await Assert.That(after.Count).IsEqualTo(before.Count); + await Assert.That(after[index.Value - 1]).Contains("before you left"); + await Assert.That(after[index.Value]).Contains(AwayBarRenderer.Label); + await Assert.That(after[index.Value + 1]).Contains("while you were away"); + await Assert.That(after[index.Value]).IsNotEqualTo(barBefore); + } + + /// Only colours change, so a selection made before the switch still names the same text. + [Test] + public async Task ASelectionSurvivesTheSwitch() + { + Console.SetIn(TextReader.Null); + var copied = new List(); + var config = DemoScene.Build(); + var app = new SharpMUTermApp(config, Headless, new HeadlessConsoleDriver(Width, Height), clipboard: copied.Add); + app.RenderSnapshot(); + app.SimulatePaneDrag(SharpMUTermApp.MainWindowId, 0, 0, 25, 1); + var selected = app.PaneSelection(SharpMUTermApp.MainWindowId); + await Assert.That(selected).IsNotEmpty(); + + SwitchTo(app, "Light"); + app.SimulateKey(new ConsoleKeyInfo('\0', ConsoleKey.C, shift: false, alt: false, control: true)); + + await Assert.That(copied).HasSingleItem(); + await Assert.That(copied[0]).IsEqualTo(selected); + } + + /// + /// What the repaint costs: a window at the pane cap (2,000 lines), restyled and re-fed, and what keeping the + /// lines costs. Held to generous ceilings so a slow CI box passes; the measured figures are in CLAUDE.md. + /// + [Test] + public async Task RestylingAFullWindowIsBounded() + { + var world = await Connected(); + var text = Enumerable.Range(0, 2000) + .Select(i => $"\u001b[3{i % 8}mline {i} the courier \u001b[1mruns on past\u001b[0m the northern watch, {i % 7} leagues out\n") + .ToArray(); + foreach (var line in text) + { + world.Telnet.Receive(line); + } + + world.App.RenderNextFrame(); + var clock = Stopwatch.StartNew(); + SwitchTo(world.App, "Light"); + clock.Stop(); + + // What 2,000 such lines weigh as StyledLines, the most a window can add by keeping them (a session window's + // are the very instances its scrollback ring already holds, so there it is a reference per line). + var parser = new AnsiParser(); + var before = GC.GetTotalMemory(forceFullCollection: true); + var kept = text.SelectMany(parser.Feed).ToList(); + var after = GC.GetTotalMemory(forceFullCollection: true); + Console.Error.WriteLine( + $"theme switch over 2000 lines: {clock.ElapsedMilliseconds} ms; 2000 StyledLines: {(after - before) / 1024} KiB"); + GC.KeepAlive(kept); + + await Assert.That(kept.Count).IsEqualTo(2000); + await Assert.That(clock.Elapsed).IsLessThan(TimeSpan.FromSeconds(5)); + await Assert.That(after - before).IsLessThan(4L * 1024 * 1024); + } + + // ---- Harness --------------------------------------------------------------------------- + + private static void SwitchTo(SharpMUTermApp app, string theme) + { + ThemeChoices.Apply(app.Configuration, theme); + app.SaveConfiguration(); + app.RenderNextFrame(); + } + + /// The lowest contrast any visible cell of has against its own background. + private static double WorstRatio(SharpMUTermApp app, string text) + { + var frame = app.RenderWholeFrame(); + var cells = FrameGrid.Cells(frame, Width, Height); + var rows = FrameGrid.Decode(frame, Width, Height); + var worst = double.MaxValue; + var found = false; + for (var row = 0; row < rows.Count; row++) + { + var at = rows[row].IndexOf(text, StringComparison.Ordinal); + if (at < 0) + { + continue; + } + + found = true; + for (var col = at; col < at + text.Length; col++) + { + var cell = cells[(row, col)]; + if (cell.Glyph == ' ' || cell.Foreground is not { } fg || cell.Background is not { } bg) + { + continue; + } + + worst = Math.Min(worst, Contrast.Ratio(fg, bg)); + } + } + + if (!found) + { + throw new InvalidOperationException($"'{text}' is not on the frame:\n{string.Join('\n', rows)}"); + } + + return worst; + } + + private sealed record Wired(SharpMUTermApp App, RecordingTelnetSession Telnet, List Opened) + { + public void Receive(string text) + { + Telnet.Receive(text); + App.RenderNextFrame(); + } + } + + private static async Task Connected() + { + Console.SetIn(TextReader.Null); + var config = new AppConfiguration(); + config.ScrollbackSpill.Enabled = false; + config.Text.ActivityBarSeconds = 0; + config.Worlds.Add(new WorldDefinition { Name = "Beacon", Host = "beacon.example.org", Port = 4000 }); + + var opened = new List(); + var app = new SharpMUTermApp(config, Headless, new HeadlessConsoleDriver(Width, Height), openUrl: opened.Add); + var telnet = new RecordingTelnetSession(); + app.TelnetFactory = _ => telnet; + await app.BindWorldWithoutConnecting(config.Worlds[0]).ConnectAsync(); + app.RenderNextFrame(); + return new Wired(app, telnet, opened); + } + + private static bool Click(Wired world, string text) + { + var lines = world.App.PaneLines(Main); + for (var row = 0; row < lines.Count; row++) + { + MarkupParser.Parse(lines[row], SharpConsoleUI.Color.White, SharpConsoleUI.Color.Black, out var links); + foreach (var link in links) + { + if (link.Text.Contains(text, StringComparison.Ordinal)) + { + return world.App.SimulatePaneClick(Main, link.StartCol, row); + } + } + } + + throw new InvalidOperationException($"no link reading '{text}'"); + } +} From ee679308f76cff10c33116cfa2224664c01d9294 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 08:18:41 +0000 Subject: [PATCH 030/113] feat(window): the composer is a native editor in the desktop window MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit F1 opens a native TextBox editor over the cell area and the docked composer is a native editor over its pane, both drawn from one Client ComposerModel (target, draft, escaping, MOO edit, dictionary, marks as ranges, key row) that the cell composers now render from too. Gestures go back through a ComposerSession to the methods the cell keys end in, so ⌃S sends the same command (ComposeMessage.Build) and a MOO edit saves its lines. Misspellings get a real wavy underline from the same SpellChecker, with suggestions and Add to dictionary in the right-click menu. New host member ClientHost.NativeComposer (INativeComposer); the terminal, headless and snapshot hosts pass null. Declared in the surface catalog (compose, composer) with model comparison and wire-level outcome probes. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 5 + CLAUDE.md | 52 +- .../AvaloniaConsoleDriver.cs | 3 + src/SharpMUTerm.Avalonia/ClientLaunch.cs | 7 +- src/SharpMUTerm.Avalonia/ComposerEditor.cs | 179 +++++ src/SharpMUTerm.Avalonia/ComposerOverlay.cs | 66 ++ src/SharpMUTerm.Avalonia/ComposerPresenter.cs | 90 +++ src/SharpMUTerm.Avalonia/ComposerView.cs | 627 ++++++++++++++++++ src/SharpMUTerm.Avalonia/DesktopLayer.cs | 28 + src/SharpMUTerm.Avalonia/MainWindow.cs | 9 +- src/SharpMUTerm.Avalonia/TerminalView.cs | 2 +- src/SharpMUTerm.Avalonia/WindowHost.cs | 4 + .../Composer/ComposerModel.cs | 235 +++++++ .../Composer/ComposerSession.cs | 160 +++++ .../Surfaces/SurfaceCatalog.cs | 45 ++ src/SharpMUTerm.Core/Text/SpellChecker.cs | 48 +- src/SharpMUTerm.Tui/ComposeOverlay.cs | 97 +-- src/SharpMUTerm.Tui/Hosting/ClientHost.cs | 10 + .../Hosting/INativeComposer.cs | 32 + src/SharpMUTerm.Tui/Panels/DockedComposer.cs | 116 +++- src/SharpMUTerm.Tui/Pointer/PointerTarget.cs | 12 +- .../Pointer/SharpMUTermApp.Chrome.cs | 2 +- .../Pointer/SharpMUTermApp.Desktop.cs | 11 +- .../Pointer/SharpMUTermApp.Surfaces.cs | 1 + src/SharpMUTerm.Tui/SharpMUTermApp.MooEdit.cs | 2 +- .../SharpMUTermApp.NativeComposer.cs | 310 +++++++++ src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs | 17 +- src/SharpMUTerm.Tui/SharpMUTermApp.cs | 26 +- .../NativeComposerTests.cs | 406 ++++++++++++ .../SharpMUTerm.Avalonia.Tests.csproj | 3 + .../SurfaceParityTests.cs | 190 +++++- .../ComposerModelTests.cs | 138 ++++ .../SurfaceCatalogTests.cs | 2 +- .../NativeComposerRoutingTests.cs | 409 ++++++++++++ 34 files changed, 3253 insertions(+), 91 deletions(-) create mode 100644 src/SharpMUTerm.Avalonia/ComposerEditor.cs create mode 100644 src/SharpMUTerm.Avalonia/ComposerOverlay.cs create mode 100644 src/SharpMUTerm.Avalonia/ComposerPresenter.cs create mode 100644 src/SharpMUTerm.Avalonia/ComposerView.cs create mode 100644 src/SharpMUTerm.Client/Composer/ComposerModel.cs create mode 100644 src/SharpMUTerm.Client/Composer/ComposerSession.cs create mode 100644 src/SharpMUTerm.Tui/Hosting/INativeComposer.cs create mode 100644 src/SharpMUTerm.Tui/SharpMUTermApp.NativeComposer.cs create mode 100644 tests/SharpMUTerm.Avalonia.Tests/NativeComposerTests.cs create mode 100644 tests/SharpMUTerm.Client.Tests/ComposerModelTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/NativeComposerRoutingTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a258638..af25801f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,11 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- Desktop window: the composer is a native text editor. F1 opens full screen over the panes and the docked composer + is an editor in its pane, with the platform's selection, undo, input methods and paste, a monospace or proportional + face (right-click), and a wavy red line under a misspelt word whose right-click menu offers suggestions and Add to + dictionary. The draft, Ctrl+S, Alt+L, Alt+W and Esc work exactly as in the terminal, and the same text sends the same + command. - A narrow terminal gives its room to the game: below 100 columns the connection rail folds to its slim strip on its own (in the desktop window, the sidebar does), and below 100 columns or 30 rows an empty command line is one row tall and grows as you type. At 80×24 a pane is now 72 columns wide instead of 60, two rows taller, diff --git a/CLAUDE.md b/CLAUDE.md index c13d83e6..4b6569c7 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -737,7 +737,7 @@ fallbacks) for inline images/maps. named only while a dictionary is open. - **Spelling is a colour, not an underline** (`SpellChecker`, Core; `SpellingHighlighter`, Tui). The marks go through `MultilineEditControl.SyntaxHighlighter`, whose tokens carry a foreground and nothing else; - an underline needs a styling hook upstream. Hunspell via WeCantSpell.Hunspell, **no dictionary + an underline needs a styling hook upstream (the window's native editor draws a real one, see below). Hunspell via WeCantSpell.Hunspell, **no dictionary bundled**: `dictionaries/` beside `config.json`, then the system folders, chosen by the POSIX locale variables — not `CultureInfo`, because the build is `InvariantGlobalization` and every culture is the invariant one. The dictionary is opened the first time F1 opens, never at startup, and the app takes a @@ -1092,7 +1092,7 @@ fallbacks) for inline images/maps. target fit as name-over-bar, else side by side, where the words shrink (`Mana · low 23 / 120`, then `mp! 23/120`, then `mp 23`) before a bar goes under 24 px. The UI font, not the cell font: this is the window's presentation. `hp`/`mp`/`mv` read as Health/Mana/Movement (`VitalsMeter.Title`). - - **Not done**: the docked composer is still cells in the window; no animation on a + - **Not done**: no animation on a gauge change; the map draws one level and area (other levels show only as stairs marks, other areas only as a coloured spur), with no room symbols beyond the game's own; the button's icon is the only header action. The window's menu is Avalonia's `ContextMenu`, which needs a second click under a WM-less X server to take the first item (seen under Xvfb only). @@ -1253,7 +1253,7 @@ one `SharpMUTermApp`; a host is only the place it runs. What differs between hos (`src/SharpMUTerm.Tui/Hosting/`): driver, capabilities, clipboard, URL opener, focus reporting, keys (`HostKeys`: the newline chord, and the chords the host keeps for itself), whether there is a main loop, the Sixel cell size, and what it does with the pointer (`IPointerPresenter`, null for none), whether it draws the declared settings natively (`INativeSettings`, null for the cell screens), and whether it -draws ⌃P natively (`INativePalette`, null for the cell popup), and which chrome it draws itself beside the cells (`HostChrome`: the header and the rail, which the client then leaves out of the grid). Built by `ClientHost.Terminal`, `ClientHost.Headless`/`Snapshot` and +draws ⌃P natively (`INativePalette`, null for the cell popup), whether it draws the composer with its own editor (`INativeComposer`, null for cells), and which chrome it draws itself beside the cells (`HostChrome`: the header and the rail, which the client then leaves out of the grid). Built by `ClientHost.Terminal`, `ClientHost.Headless`/`Snapshot` and `WindowHost.Create` (Avalonia). Four things keep a feature from landing in one host only: - **Every `ClientHost` and `HostKeys` member is `required`**, so a member added there does not compile until @@ -1730,6 +1730,52 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] - **Hover selects on movement only** (`PointerMoved`, not `PointerEntered`), so the row that opens under a resting pointer is not chosen. ↑↓ wrap as in the cells; PgUp/PgDn stop at the ends. - Screenshots from a real window under Xvfb, driven with XTest (`ux-wave5/native-palette-*.png`). +- **In the window, the composer is a native editor: F1 over the cells, and the docked panel over its pane** + (`ClientHost.NativeComposer` → `INativeComposer`; Client `ComposerModel`, `ComposerMarks`, `ComposerSession`; + Avalonia `ComposerView`, `ComposerEditor`, `ComposerOverlay`, `ComposerPresenter` on the driver; + `SharpMUTermApp.NativeComposer.cs`). A `TextBox`: wrapping, undo and redo, selection, IME, paste and the platform's + caret, with a monospace face by default and a proportional one from its right-click menu (for the run). Decisions + not to relitigate: + - **One model, both hosts.** `ComposerModel` (target, draft, escaping, MOO edit, dictionary, marks as ranges, the + key row) is what the cell F1 (`ComposeOverlay.Render(model)`), the cell panel (`DockedComposer.Render(model)`) and + the native views draw. `ComposeOverlay.ModelFor` is the F1 model in both hosts; `DescribeDocked` is the panel's, + recorded as drawn (`SurfaceCatalog.Compose`, `PanelIds.Composer`). The marks are `SpellChecker.Misspellings` per + line, the call the cell highlighter makes, so both hosts mark the same words. + - **F1 goes through one funnel** (`OpenComposer`/`CloseComposer`): the key, ⌃P, a MOO edit arriving and the demo + views. With an available host editor it opens there and the cell modal is never built; `ComposerOpen` (either) + feeds every refusal the cell modal fed (`AnyOverlayOpen`, the quit facts, `MainWindowInFront`, the panes being + covered). Closing keeps the draft through `KeepComposeDraft`, exactly as the cell window's `Closed` does, so a send + still closes first and forgets after. `Available` is false until the main window attaches the presenter, so + `--render-png`, the parity harness and any test without a window get the cells. + - **Every gesture goes back through the session**, on the client's thread (`OnUiThread`): ⌃S to `SendComposed` / + `SendDocked` (a MOO edit saves its lines), ⌥L, ⌥W (the word at the caret, `ComposerMarks.WordAt`), Esc (F1 closes + keeping the draft; the panel releases to the command line), a click (the panel arms, `ArmComposer`). A session the + client has ended passes nothing on. The window never builds a command. + - **The draft is the client's; the editor keeps its own caret.** The host hands its text back as it changes; the + client's text replaces the editor's only when `ComposerModel.Revision` moved — a send clearing it, F1 closing over + the panel, a key the cells took. `DockedComposer.SetFromHost` writes without moving it. + - **The docked editor lies over its cells, which stay the draft** (`CellsUnderNative`): it rides the panel channel + (`PanelOverlay.Composer`/`ComposerSession`) and `DesktopLayer` places it like any panel. It takes the keyboard when + the model says armed and gives it to `TerminalView` when it says not. It hands the client the chords it has no + use for (`ComposerView.ReachesTheClient`: F-keys, ⌃P, ⌃O, ⌃↑/↓, ⌃←/→, ⌥J/K, ⌥digits) through the driver, as its + cells would receive them; ⌃A/C/X/V/Z/Y, word movement and typing stay the editor's. While F1 is open natively the + panels are not published, so F1 is never under a docked editor. + - **F1 is an overlay over the cell area, under the desktop layer**, so the native header and sidebar stay (inert, as + under a modal) and a toast is still seen over it. ⌥⏎ is the window's (it maximises); ⏎, ⌃⏎ and ⇧⏎ are newlines. + ⌃Q in F1 closes it first and then asks to quit, so the cell quit prompt is never hidden under it. + - **The misspelling is a real wavy line**, drawn by a layer over the editor (`ComposerView.MarkLayer`) from the + editor's own text layout (`TextLayout.HitTestTextRange`), so it follows wrapping and scrolling. The right-click menu + offers WeCantSpell's suggestions (`SpellChecker.Suggest`, six at most), Add to dictionary, the editor's edits and the + face. Its colour is the settings screens' warning, which the cell editor marks in (`ComposerInk`). + - **Parity**: `HostParityTests` builds both drivers with no attached presenter, so the cells it compares are the cell + composer's in both. The native side is held by `SurfaceParityTests` instead — F1's model equals the cell window's + for `compose`, `compose-literal` and `moo-edit`, the panel's equals the cells' in `panel-composer`, and ⌃S from the + native session puts the same command on a `RecordingTelnetSession` as the cell keys do, as typed and literal, one + line and several paragraphs. `NativeComposerRoutingTests` (Tui) and `NativeComposerTests` (Avalonia, headless) + drive the routing and the editor. + - Screenshots from a real window under Xvfb, driven with XTest (`ux-wave7/composer-*.png`). `--demo-config` in the + window opens the installed dictionary read-only. Not done: no per-character face choice saved, no find bar, and + the window's ⌥W adds to the run's dictionary in the demo only (a live client writes `user-words.txt` as F1 does). - **Settings screens have no `IPasteTarget` and cannot easily have one.** They are markup rebuilt wholesale every key, with the edited field a buffer in `SettingsSession`. `SettingsOverlay` listens at `IConsoleDriver.Paste` instead. That can't double-fire *only* because no control on diff --git a/src/SharpMUTerm.Avalonia/AvaloniaConsoleDriver.cs b/src/SharpMUTerm.Avalonia/AvaloniaConsoleDriver.cs index e3aa00fb..e67b927d 100644 --- a/src/SharpMUTerm.Avalonia/AvaloniaConsoleDriver.cs +++ b/src/SharpMUTerm.Avalonia/AvaloniaConsoleDriver.cs @@ -76,6 +76,9 @@ public AvaloniaConsoleDriver(int columns, int rows) /// The window's native ⌃P, drawn over everything in the main window (). public PalettePresenter Palette { get; } = new(); + /// The window's native F1, drawn over the cells in the main window (). + public ComposerPresenter Composer { get; } = new(); + public bool IsRunning { get; private set; } // ── IConsoleDriver: output ──────────────────────────────────────────────────────────────── diff --git a/src/SharpMUTerm.Avalonia/ClientLaunch.cs b/src/SharpMUTerm.Avalonia/ClientLaunch.cs index 31d0e4e6..edfed745 100644 --- a/src/SharpMUTerm.Avalonia/ClientLaunch.cs +++ b/src/SharpMUTerm.Avalonia/ClientLaunch.cs @@ -1,4 +1,5 @@ using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Text; using SharpMUTerm.Tui; namespace SharpMUTerm.Avalonia; @@ -43,7 +44,11 @@ public static int Run(WindowOptions options, AppConfiguration config, IReadOnlyL /// The demo client, with its --view scene laid out and not yet running. public static SharpMUTermApp Demo(WindowOptions options, AppConfiguration config, AvaloniaConsoleDriver driver, Action? clipboard) { - var app = new SharpMUTermApp(config, WindowHost.Create(driver, clipboard, options.Chrome)); + // The installed dictionary, read-only: the demo's ⌥W adds a word for the run and writes no user-words file. + var app = new SharpMUTermApp( + config, + WindowHost.Create(driver, clipboard, options.Chrome), + spelling: () => SpellChecker.Find(SpellChecker.SearchFolders(null), SpellChecker.PreferredLanguage(), null)); // The snapshot's scene builder is the demo: it pours the demo output in and opens the named view. What // it returns is the headless driver's capture, which on this driver is empty and not wanted. It is queued diff --git a/src/SharpMUTerm.Avalonia/ComposerEditor.cs b/src/SharpMUTerm.Avalonia/ComposerEditor.cs new file mode 100644 index 00000000..840110b6 --- /dev/null +++ b/src/SharpMUTerm.Avalonia/ComposerEditor.cs @@ -0,0 +1,179 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Controls.Presenters; +using Avalonia.Controls.Primitives; +using Avalonia.Media; +using SharpMUTerm.Client.Composer; + +namespace SharpMUTerm.Avalonia; + +/// +/// The composer's text: a native — wrapping, undo and redo, selection, the platform's IME and +/// paste — that draws a wavy underline under each word the dictionary does not know. The underline is drawn over the +/// text from the box's own layout (), so it follows wrapping, scrolling and the +/// face exactly; the ranges are , the function the client marks its cells by. +/// +/// Lines are broken by \n whatever the platform (), so an offset into +/// is an offset into the client's buffer and a mark lands on the word it names. +/// +/// +internal sealed class ComposerEditor : TextBox +{ + private TextPresenter? _presenter; + private ScrollViewer? _scroller; + private IReadOnlyList _marks = []; + + public ComposerEditor() + { + AcceptsReturn = true; + AcceptsTab = false; + TextWrapping = TextWrapping.Wrap; + NewLine = "\n"; + BorderThickness = new Thickness(0); + Padding = new Thickness(12, 10); + MinHeight = 0; + ClipToBounds = true; + } + + /// The TextBox's own look: this is a text box, not a new control to style. + protected override Type StyleKeyOverride => typeof(TextBox); + + /// The wavy line's colour. + public Color MarkColour { get; set; } = Color.FromRgb(0xff, 0x6b, 0x6b); + + /// The words underlined now, as ranges of . + public IReadOnlyList Marks + { + get => _marks; + set + { + if (!_marks.SequenceEqual(value)) + { + _marks = value; + MarksMoved?.Invoke(); + } + } + } + + protected override void OnApplyTemplate(TemplateAppliedEventArgs e) + { + base.OnApplyTemplate(e); + if (_scroller is not null) + { + _scroller.ScrollChanged -= OnScrolled; + } + + _presenter = e.NameScope.Find("PART_TextPresenter"); + _scroller = e.NameScope.Find("PART_ScrollViewer"); + if (_scroller is not null) + { + _scroller.ScrollChanged += OnScrolled; + } + + if (_presenter is not null) + { + _presenter.LayoutUpdated += (_, _) => MarksMoved?.Invoke(); + } + } + + private void OnScrolled(object? sender, ScrollChangedEventArgs e) => MarksMoved?.Invoke(); + + /// Raised when the marks, or where the text lies, changed: the layer drawing the lines repaints. + public event Action? MarksMoved; + + /// The box's own text layout, for a test and the context menu; null before the template is applied. + internal TextPresenter? Presenter => _presenter; + + /// The offset into at a point in this control's coordinates, or null. + internal int? OffsetAt(Point point) + { + if (_presenter is not { TextLayout: { } layout } presenter || this.TranslatePoint(point, presenter) is not { } at) + { + return null; + } + + var hit = layout.HitTestPoint(at); + return Math.Clamp(hit.TextPosition + (hit.IsTrailing ? 1 : 0), 0, (Text ?? string.Empty).Length); + } + + /// + /// The rectangles each mark covers, in this control's coordinates, clipped to what is in view: one per line a + /// wrapped word lands on. Empty before the template is applied. + /// + public IReadOnlyList MarkRects() + { + if (_presenter is not { } presenter || _marks.Count == 0 || presenter.TextLayout is not { } layout) + { + return []; + } + + var text = Text ?? string.Empty; + var view = new Rect(Bounds.Size); + var rects = new List(); + foreach (var mark in _marks) + { + if (mark.Start < 0 || mark.Start + mark.Length > text.Length || mark.Length <= 0) + { + continue; + } + + foreach (var hit in layout.HitTestTextRange(mark.Start, mark.Length)) + { + if (presenter.TranslatePoint(hit.TopLeft, this) is { } at) + { + var rect = new Rect(at, hit.Size); + if (rect.Intersects(view)) + { + rects.Add(rect); + } + } + } + } + + return rects; + } + + /// + /// Draws the wavy lines onto . A paints its text and its own + /// background in children of its template, which are drawn after anything the box itself draws, so the lines are + /// drawn by a layer lying over the editor (), which calls this. + /// + public void DrawMarks(DrawingContext context, Visual surface) + { + var rects = MarkRects(); + if (rects.Count == 0) + { + return; + } + + var pen = new Pen(new SolidColorBrush(MarkColour), 1.2, lineCap: PenLineCap.Round); + foreach (var rect in rects) + { + if (this.TranslatePoint(rect.BottomLeft, surface) is not { } origin) + { + continue; + } + + var y = origin.Y - 1.5; + var geometry = new StreamGeometry(); + using (var g = geometry.Open()) + { + const double step = 2.0; + var x = origin.X; + var end = origin.X + rect.Width; + g.BeginFigure(new Point(x, y), false); + var up = true; + while (x < end) + { + x = Math.Min(end, x + step); + g.LineTo(new Point(x, up ? y - 1.6 : y)); + up = !up; + } + + g.EndFigure(false); + } + + context.DrawGeometry(null, pen, geometry); + } + } +} diff --git a/src/SharpMUTerm.Avalonia/ComposerOverlay.cs b/src/SharpMUTerm.Avalonia/ComposerOverlay.cs new file mode 100644 index 00000000..e3f24ee6 --- /dev/null +++ b/src/SharpMUTerm.Avalonia/ComposerOverlay.cs @@ -0,0 +1,66 @@ +using Avalonia.Controls; +using Avalonia.Media; +using Avalonia.Threading; +using SharpMUTerm.Client.Composer; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Avalonia; + +/// +/// F1 drawn by the window: a over the whole cell area, in the theme's own colours, in place +/// of the cell modal. The native header and sidebar stay where they are (inert while it is up, as under any modal); +/// the toasts are drawn over it, so a refusal is still seen. It follows its : the client +/// publishes a new model when the escaping flips or a word is added, and that is all it ever redraws from. +/// +internal sealed class ComposerOverlay : Border +{ + private readonly TerminalView _view; + private readonly ComposerSession _session; + private readonly PanelInk _ink; + private readonly ComposerView _composer; + + public ComposerOverlay(TerminalView view, ComposerSession session, PanelInk ink) + { + _view = view; + _session = session; + _ink = ink; + Focusable = false; + Margin = view.Margin; + _composer = new ComposerView(view, fullScreen: true); + Child = _composer; + _session.Changed += OnChanged; + _view.PropertyChanged += OnViewChanged; + Show(_session.Model); + } + + /// The session it draws. Internal for tests. + internal ComposerSession Session => _session; + + /// The editor and its bands. Internal for tests. + internal ComposerView Composer => _composer; + + /// Stops following the session and the view; the presenter calls it when the overlay goes. + internal void Detach() + { + _session.Changed -= OnChanged; + _view.PropertyChanged -= OnViewChanged; + } + + private void OnChanged(ComposerModel model) => Dispatcher.UIThread.Post(() => Show(model)); + + private void OnViewChanged(object? sender, global::Avalonia.AvaloniaPropertyChangedEventArgs e) + { + if (e.Property == MarginProperty) + { + Margin = _view.Margin; + } + } + + private void Show(ComposerModel model) + { + var plane = DesktopLayer.Colour(_view.Renderer.DefaultBackground); + var text = DesktopLayer.Colour(_view.Renderer.DefaultForeground); + Background = new SolidColorBrush(plane); + _composer.Show(model, _session, _ink, plane, text); + } +} diff --git a/src/SharpMUTerm.Avalonia/ComposerPresenter.cs b/src/SharpMUTerm.Avalonia/ComposerPresenter.cs new file mode 100644 index 00000000..a1f7a80c --- /dev/null +++ b/src/SharpMUTerm.Avalonia/ComposerPresenter.cs @@ -0,0 +1,90 @@ +using Avalonia.Controls; +using Avalonia.Threading; +using SharpMUTerm.Client.Composer; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Avalonia; + +/// +/// The window host's : F1 as a over the cell area, under +/// the desktop layer (so the toasts are drawn over it) and over the cells. The client calls in on its own thread, so +/// everything here is posted to the window's. A host never attached — --render-png, a test that builds no +/// window — is not , and the client opens its cell composer instead. +/// +internal sealed class ComposerPresenter : INativeComposer +{ + private volatile bool _attached; + private Panel? _root; + private Control? _below; + private TerminalView? _view; + private Action? _refocus; + private ComposerOverlay? _overlay; + + /// The open F1, for a test; read on the window's thread. + public ComposerOverlay? Overlay => _overlay; + + public bool Available => _attached; + + /// + /// Where F1 is drawn: in , just under (the desktop layer), over the + /// cells of ; and what takes the keyboard back when it closes. On the window's thread. + /// + public void Attach(Panel root, Control below, TerminalView view, Action refocus) + { + _root = root; + _below = below; + _view = view; + _refocus = refocus; + _attached = true; + } + + public void Open(ComposerSession session, PanelInk ink) => Dispatcher.UIThread.Post(() => OpenNow(session, ink)); + + public void Close() => Dispatcher.UIThread.Post(CloseNow); + + /// Shows F1 for now, replacing one already open; on the window's thread. + internal ComposerOverlay? OpenNow(ComposerSession session, PanelInk ink) + { + if (_overlay is { } open) + { + Remove(open, refocus: false); + } + + if (_root is not { } root || _view is not { } view || session.IsEnded) + { + return null; + } + + var overlay = new ComposerOverlay(view, session, ink); + _overlay = overlay; + var at = _below is not null ? root.Children.IndexOf(_below) : -1; + root.Children.Insert(at < 0 ? root.Children.Count : at, overlay); + overlay.Composer.Editor.Focus(); + return overlay; + } + + /// Takes F1 down now; on the window's thread. + internal void CloseNow() + { + if (_overlay is { } open) + { + Remove(open, refocus: true); + } + } + + private void Remove(ComposerOverlay overlay, bool refocus) + { + if (!ReferenceEquals(_overlay, overlay)) + { + return; + } + + _overlay = null; + overlay.Detach(); + _root?.Children.Remove(overlay); + if (refocus) + { + _refocus?.Invoke(); + } + } +} diff --git a/src/SharpMUTerm.Avalonia/ComposerView.cs b/src/SharpMUTerm.Avalonia/ComposerView.cs new file mode 100644 index 00000000..a51c59ec --- /dev/null +++ b/src/SharpMUTerm.Avalonia/ComposerView.cs @@ -0,0 +1,627 @@ +using Avalonia; +using Avalonia.Automation; +using Avalonia.Controls; +using Avalonia.Input; +using Avalonia.Interactivity; +using Avalonia.Layout; +using Avalonia.Media; +using Avalonia.Threading; +using SharpMUTerm.Client.Composer; +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Avalonia; + +/// +/// A composer drawn by the window: a header (what it is, who it goes to, the escaping mode, the dictionary), a native +/// editor (), and the key row — all read off the client's , the +/// model the cell composer is drawn from. Used for the docked panel, over its pane's cells, and for F1, over the whole +/// cell area (). +/// +/// Every gesture goes back through the , so it ends in the client method the cell +/// composer's key ends in: ⌃S sends (or saves a MOO edit), ⌥L flips the escaping, ⌥W adds the word at the caret, Esc +/// releases a docked composer to the command line or closes F1 keeping the draft. The text the editor holds is handed +/// back as it changes; the client's text replaces it only when the model's revision moved, so typing here never has +/// its caret or its undo taken away by its own echo. +/// +/// +/// Arming is the client's one fact. A click in a docked editor asks to arm it, and the editor takes the keyboard +/// when the model says it is armed and gives it back to the cells when the model says it is not. ⌥⏎ is the window's +/// (it maximises), so a newline is ⏎, ⌃⏎ or ⇧⏎ here. Chords the editor has no use for — ⌃P, ⌃O, ⌃↑/⌃↓, ⌥J, the +/// function keys — reach the client from a docked editor exactly as they would from its cells. +/// +/// +internal sealed class ComposerView : Border +{ + private readonly TerminalView _view; + private readonly bool _fullScreen; + private readonly ComposerEditor _editor; + private readonly MarkLayer _marks; + private readonly Border _header; + private readonly TextBlock _title; + private readonly TextBlock _target; + private readonly StackPanel _chips; + private readonly Border _footer; + private readonly WrapPanel _keys; + private readonly Border _rule; + private ComposerSession? _session; + private ComposerModel? _model; + private long _applied = -1; + private bool _applying; + private bool? _armed; + private PanelInk _ink = new("#5fafff", "#ff5f5f", "#3a3a40"); + private Color _plane = Colors.Black; + private Color _text = Colors.White; + + /// The cells: where the keyboard goes back to, and the face the editor's monospace text uses. + /// F1 rather than the docked panel. + public ComposerView(TerminalView view, bool fullScreen) + { + _view = view; + _fullScreen = fullScreen; + ClipToBounds = true; + Focusable = false; + + _editor = new ComposerEditor + { + Background = Brushes.Transparent, + Padding = fullScreen ? new Thickness(22, 14) : new Thickness(12, 6), + }; + AutomationProperties.SetName(_editor, fullScreen ? "Compose a post" : "Docked composer"); + _editor.TextChanged += (_, _) => OnTextChanged(); + _editor.AddHandler(KeyDownEvent, OnEditorKeyDown, RoutingStrategies.Tunnel); + _editor.AddHandler(PointerPressedEvent, (_, _) => AskToArm(), RoutingStrategies.Tunnel, handledEventsToo: true); + _editor.GotFocus += (_, _) => AskToArm(); + _editor.ContextRequested += OnContextRequested; + _marks = new MarkLayer(_editor); + + _title = new TextBlock { FontWeight = FontWeight.Bold, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(0, 0, 10, 0) }; + _target = new TextBlock { VerticalAlignment = VerticalAlignment.Center, TextTrimming = TextTrimming.CharacterEllipsis }; + _chips = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 6, VerticalAlignment = VerticalAlignment.Center }; + var headerRow = new DockPanel { LastChildFill = true }; + DockPanel.SetDock(_title, Dock.Left); + DockPanel.SetDock(_chips, Dock.Right); + headerRow.Children.Add(_title); + headerRow.Children.Add(_chips); + headerRow.Children.Add(_target); + _header = new Border { Child = headerRow, Padding = fullScreen ? new Thickness(22, 10) : new Thickness(12, 3, 8, 3) }; + + _keys = new WrapPanel { Orientation = Orientation.Horizontal, VerticalAlignment = VerticalAlignment.Center }; + _footer = new Border { Child = _keys, Padding = fullScreen ? new Thickness(22, 8) : new Thickness(12, 2, 8, 3) }; + + // The armed rule down the docked editor's left edge: the cell composer's ▌ marker, in the accent. + _rule = new Border { Width = 3, HorizontalAlignment = HorizontalAlignment.Left }; + + var body = new Panel(); + body.Children.Add(_editor); + body.Children.Add(_marks); + body.Children.Add(_rule); + + var grid = new Grid { RowDefinitions = new RowDefinitions("Auto,*,Auto") }; + Grid.SetRow(_header, 0); + Grid.SetRow(body, 1); + Grid.SetRow(_footer, 2); + grid.Children.Add(_header); + grid.Children.Add(body); + grid.Children.Add(_footer); + Child = grid; + ApplyFont(); + } + + /// + /// Whether the editors write in the UI's proportional face rather than the cells' monospace one. For the run, for + /// every composer the window draws; chosen from the editor's right-click menu. + /// + internal static bool Proportional { get; set; } + + /// Raised when the face changes, so every composer on screen follows. + internal static event Action? FaceChanged; + + /// The editor. Internal for tests. + internal ComposerEditor Editor => _editor; + + /// What it shows now. Internal for tests. + internal ComposerModel? Model => _model; + + /// The session it hands gestures to. Internal for tests. + internal ComposerSession? Session => _session; + + /// The header's words, joined, for a test. + internal string HeaderText => string.Join(" ", new[] { _title.Text, _target.Text } + .Concat(_chips.Children.OfType().Select(b => (b.Child as TextBlock)?.Text)).Where(t => !string.IsNullOrEmpty(t))); + + /// The key row's words, joined, for a test. + internal string FooterText => string.Join(" · ", _keys.Children.OfType() + .Select(p => string.Join(" ", p.Children.OfType().Select(Words).Where(t => t.Length > 0)))); + + /// The menu the editor last opened. Internal for tests. + internal ContextMenu? OpenedMenu { get; private set; } + + private static string Words(Control control) => control switch + { + TextBlock t => t.Text ?? string.Empty, + Border { Child: TextBlock t } => t.Text ?? string.Empty, + _ => string.Empty, + }; + + protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e) + { + base.OnAttachedToVisualTree(e); + FaceChanged += ApplyFont; + if (_model is { Armed: true }) + { + Dispatcher.UIThread.Post(() => _editor.Focus(), DispatcherPriority.Input); + } + } + + protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e) + { + FaceChanged -= ApplyFont; + base.OnDetachedFromVisualTree(e); + } + + /// + /// Shows , handing gestures to , in the pane's colours: the accent + /// and warning of , on , in . + /// + public void Show(ComposerModel model, ComposerSession session, PanelInk ink, Color plane, Color text) + { + if (!ReferenceEquals(session, _session)) + { + _session = session; + _applied = -1; + _armed = null; + } + + var coloursChanged = ink != _ink || plane != _plane || text != _text; + _ink = ink; + _plane = plane; + _text = text; + var previous = _model; + _model = model; + + if (model.Revision != _applied) + { + _applied = model.Revision; + if (!string.Equals(_editor.Text ?? string.Empty, model.Body, StringComparison.Ordinal)) + { + _applying = true; + try + { + _editor.Text = model.Body; + _editor.CaretIndex = model.Body.Length; + _editor.ClearSelection(); + } + finally + { + _applying = false; + } + } + } + + if (previous is null || !previous.Equals(model)) + { + _editor.Marks = session.Marks(_editor.Text ?? string.Empty); + } + + if (coloursChanged || previous is null) + { + Paint(); + } + + if (previous is null || !SameChrome(previous, model) || coloursChanged) + { + Label(model); + } + + _rule.IsVisible = !_fullScreen && model.Armed; + if (_armed != model.Armed) + { + var was = _armed; + _armed = model.Armed; + if (model.Armed) + { + if (VisualRoot is not null) + { + Dispatcher.UIThread.Post(() => _editor.Focus(), DispatcherPriority.Input); + } + } + else if (was == true && _editor.IsKeyboardFocusWithin) + { + _view.Focus(); + } + } + } + + private static bool SameChrome(ComposerModel a, ComposerModel b) => + a.Target == b.Target && a.Escaping == b.Escaping && a.Edit == b.Edit && a.Dictionary == b.Dictionary + && a.CanSend == b.CanSend && a.Armed == b.Armed && a.Keys.SequenceEqual(b.Keys) && a.Verb == b.Verb; + + // ── drawing ────────────────────────────────────────────────────────────────────────────── + + private Color Accent => Parse(_ink.Bar, Color.FromRgb(0x5f, 0xaf, 0xff)); + + private Color Warn => Parse(_ink.Low, Color.FromRgb(0xff, 0x6b, 0x6b)); + + private Color Dim => Mix(_text, _plane, 0.42); + + /// The bands' plane: the pane's, one step toward the text, so the editor reads as the page between them. + private Color Band => Mix(_plane, _text, _fullScreen ? 0.06 : 0.045); + + private void Paint() + { + Background = new SolidColorBrush(_plane); + _header.Background = new SolidColorBrush(Band); + _footer.Background = new SolidColorBrush(Band); + _header.BorderBrush = new SolidColorBrush(Mix(_plane, _text, 0.12)); + _header.BorderThickness = new Thickness(0, 0, 0, 1); + _footer.BorderBrush = _header.BorderBrush; + _footer.BorderThickness = new Thickness(0, 1, 0, 0); + _rule.Background = new SolidColorBrush(Accent); + _editor.Foreground = new SolidColorBrush(_text); + _editor.CaretBrush = new SolidColorBrush(Accent); + _editor.SelectionBrush = new SolidColorBrush(Color.FromArgb(0x70, Accent.R, Accent.G, Accent.B)); + _editor.SelectionForegroundBrush = new SolidColorBrush(_text); + _editor.MarkColour = Warn; + _title.Foreground = new SolidColorBrush(Accent); + _target.Foreground = new SolidColorBrush(_text); + _marks.InvalidateVisual(); + } + + private void ApplyFont() + { + var cell = _view.CellExtent.Height > 0 ? _view.CellExtent.Height : 17; + var ui = Math.Clamp(cell * 0.72, 11, 15); + _title.FontSize = ui; + _target.FontSize = ui; + _editor.FontSize = Proportional ? Math.Clamp(cell * 0.86, 12, 19) : Math.Clamp(cell * 0.8, 11, 18); + _editor.FontFamily = Proportional + ? FontFamily.Default + : new FontFamily($"{_view.Renderer.Fonts.FamilyName}, {CellFonts.BundledFamily}, DejaVu Sans Mono, Liberation Mono, Consolas, Menlo, monospace"); + if (_model is { } model) + { + Label(model); + } + } + + /// The header and the key row, from the model. + private void Label(ComposerModel model) + { + var ui = _title.FontSize; + if (model.Edit is { } edit) + { + _title.Text = "EDIT"; + _target.Text = $"{edit.Name} {edit.Type} · from {(model.Target.Length == 0 ? "no connection" : model.Target)}"; + } + else + { + _title.Text = "COMPOSE"; + var verb = !_fullScreen && model.Verb.Length > 0 ? $"{model.Verb} " : string.Empty; + _target.Text = model.Target.Length == 0 ? $"{verb}no connection" : $"{verb}to {model.Target}"; + } + + _target.Foreground = new SolidColorBrush(model.Target.Length == 0 ? Warn : _text); + + _chips.Children.Clear(); + if (model.Edit is null) + { + _chips.Children.Add(Chip(model.Escaping == ComposeEscaping.Literal ? "literal" : "as typed", + model.Escaping == ComposeEscaping.Literal ? Accent : _text, ui - 1.5)); + if (_fullScreen || model.Armed) + { + _chips.Children.Add(Chip(model.Dictionary ?? "no dictionary", model.Dictionary is null ? Dim : _text, ui - 1.5)); + } + } + + _keys.Children.Clear(); + var narrow = !_fullScreen && Bounds.Width is > 0 and < 560; + foreach (var key in model.Keys) + { + var item = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 5, Margin = new Thickness(0, 1, 14, 1) }; + if (key.Key.Length > 0) + { + item.Children.Add(Chip(key.Key, Accent, ui - 1.5)); + } + + item.Children.Add(new TextBlock + { + Text = narrow && key.Short is { } brief ? brief : key.Label, + FontSize = ui - 1, + Foreground = new SolidColorBrush(Dim), + VerticalAlignment = VerticalAlignment.Center, + }); + _keys.Children.Add(item); + } + + // A docked composer too short for its key row keeps the editor and drops the row. + _footer.IsVisible = _fullScreen || Bounds.Height is 0 or >= 64; + _editor.PlaceholderText = model.Armed || _fullScreen ? null : "Click to write a post"; + _editor.PlaceholderForeground = new SolidColorBrush(Dim); + } + + private Border Chip(string words, Color ink, double size) => new() + { + Background = new SolidColorBrush(Mix(_plane, ink, 0.14)), + BorderBrush = new SolidColorBrush(Mix(_plane, ink, 0.32)), + BorderThickness = new Thickness(1), + CornerRadius = new CornerRadius(4), + Padding = new Thickness(6, 0, 6, 1), + VerticalAlignment = VerticalAlignment.Center, + Child = new TextBlock { Text = words, FontSize = Math.Max(9, size), Foreground = new SolidColorBrush(ink) }, + }; + + protected override void OnSizeChanged(SizeChangedEventArgs e) + { + base.OnSizeChanged(e); + if (_model is { } model) + { + Label(model); + } + } + + // ── text ───────────────────────────────────────────────────────────────────────────────── + + private void OnTextChanged() + { + var text = _editor.Text ?? string.Empty; + if (_session is { } session) + { + _editor.Marks = session.Marks(text); + if (!_applying) + { + session.Edited(text); + } + } + } + + private void AskToArm() + { + if (!_fullScreen && _model is { Armed: false } && _session is { } session) + { + session.Arm(); + } + } + + // ── keys ───────────────────────────────────────────────────────────────────────────────── + + private void OnEditorKeyDown(object? sender, KeyEventArgs e) + { + if (_session is not { } session || _model is not { } model) + { + return; + } + + var mods = e.KeyModifiers & (KeyModifiers.Control | KeyModifiers.Alt | KeyModifiers.Shift); + var text = _editor.Text ?? string.Empty; + var mapped = KeyMapper.FromKeyDown(e.Key, e.KeyModifiers); + + // ⌥⏎ is the window's: it maximises here, so the client's ⌥⏎ newline is ⌃⏎ or ⇧⏎ (and ⏎ itself, in an editor). + if (mapped is { } chord && WindowHost.Maximise.Chord.Matches(chord)) + { + e.Handled = true; + _view.ToggleMaximised(); + return; + } + + switch (e.Key, mods) + { + case (Key.S, KeyModifiers.Control): + e.Handled = true; + session.Send(text); + return; + + case (Key.L, KeyModifiers.Alt): + e.Handled = true; + session.ToggleEscaping(); + return; + + case (Key.W, KeyModifiers.Alt): + e.Handled = true; + if (session.CanAddWords && ComposerMarks.WordAt(text, _editor.CaretIndex) is { } word) + { + session.AddWord(word); + } + + return; + + case (Key.Escape, KeyModifiers.None): + e.Handled = true; + if (_fullScreen) + { + session.Close(text); + } + else + { + session.Release(); + _view.Focus(); + } + + return; + + case (Key.Enter, KeyModifiers.Control): + case (Key.Enter, KeyModifiers.Shift): + e.Handled = true; + Type("\n"); + return; + + case (Key.V, KeyModifiers.Control | KeyModifiers.Shift): + e.Handled = true; + _editor.Paste(); + return; + } + + if (_fullScreen) + { + // F1 again closes it, as the cell window's F1 does; ⌃Q closes it first so the quit prompt is not under it. + if (e.Key == Key.F1 && mods == KeyModifiers.None) + { + e.Handled = true; + session.Close(text); + } + else if (e.Key == Key.Q && mods == KeyModifiers.Control && mapped is { } quit) + { + e.Handled = true; + session.Close(text); + _view.Driver.RaiseKey(quit); + } + + return; + } + + if (mapped is { } forward && ReachesTheClient(e.Key, mods)) + { + e.Handled = true; + _view.Driver.RaiseKey(forward); + } + } + + /// + /// Whether a docked editor hands a key on to the client: the function keys, and every Ctrl or Alt chord the editor + /// has no use for of its own — so ⌃P, ⌃O, ⌃B, ⌃↑/⌃↓, ⌃←/⌃→, ⌥J/⌥K and ⌥1–⌥9 do from here what they do from the + /// cells. Typing, the caret keys, selection, ⌃A/⌃C/⌃X/⌃V/⌃Z/⌃Y and word deletion stay the editor's. + /// + internal static bool ReachesTheClient(Key key, KeyModifiers mods) + { + if (key is >= Key.F1 and <= Key.F24) + { + return true; + } + + var ctrl = (mods & KeyModifiers.Control) != 0; + var alt = (mods & KeyModifiers.Alt) != 0; + var shift = (mods & KeyModifiers.Shift) != 0; + if (alt && !ctrl) + { + // ⌥←/→ are word movement in the editor, as on the command line. + return key is not (Key.Left or Key.Right or Key.Back or Key.Delete); + } + + if (!ctrl || alt) + { + return false; + } + + if (shift) + { + // ⌃⇧←/→ extend by a word; ⌃⇧Z is redo. + return key is not (Key.Left or Key.Right or Key.Home or Key.End or Key.Z); + } + + return key is not (Key.A or Key.C or Key.X or Key.V or Key.Z or Key.Y or Key.Home or Key.End + or Key.Back or Key.Delete or Key.Insert); + } + + /// Types text at the caret through the editor's own input path, so it is one undo step like any typing. + private void Type(string text) => _editor.RaiseEvent(new TextInputEventArgs { RoutedEvent = TextInputEvent, Text = text }); + + // ── the right-click menu ───────────────────────────────────────────────────────────────── + + private void OnContextRequested(object? sender, ContextRequestedEventArgs e) + { + e.Handled = true; + var at = e.TryGetPosition(_editor, out var point) ? _editor.OffsetAt(point) : _editor.CaretIndex; + OpenMenu(at ?? _editor.CaretIndex); + } + + /// + /// Opens the editor's menu for the text at : the dictionary's suggestions and Add to + /// dictionary when a marked word is there, then the editor's own edits and the face. Internal for tests. + /// + internal ContextMenu OpenMenu(int offset) + { + var text = _editor.Text ?? string.Empty; + var items = new List(); + var mark = _editor.Marks.FirstOrDefault(m => offset >= m.Start && offset <= m.Start + m.Length); + if (_session is { } session && mark.Length > 0 && mark.Start + mark.Length <= text.Length) + { + var word = text.Substring(mark.Start, mark.Length); + var suggestions = session.Suggestions(word); + foreach (var suggestion in suggestions) + { + var replacement = suggestion; + items.Add(Item(replacement, () => Replace(mark, replacement), bold: true)); + } + + if (suggestions.Count == 0) + { + items.Add(new MenuItem { Header = "No suggestions", IsEnabled = false }); + } + + if (session.CanAddWords) + { + items.Add(Item($"Add “{word}” to dictionary", () => session.AddWord(word))); + } + + items.Add(new Separator()); + } + + items.Add(Item("Undo", _editor.Undo, enabled: _editor.CanUndo)); + items.Add(Item("Redo", _editor.Redo, enabled: _editor.CanRedo)); + items.Add(new Separator()); + items.Add(Item("Cut", _editor.Cut, enabled: _editor.CanCut)); + items.Add(Item("Copy", _editor.Copy, enabled: _editor.CanCopy)); + items.Add(Item("Paste", _editor.Paste, enabled: _editor.CanPaste)); + items.Add(Item("Select all", _editor.SelectAll)); + items.Add(new Separator()); + items.Add(Item(Proportional ? "Monospace font" : "Proportional font", () => + { + Proportional = !Proportional; + FaceChanged?.Invoke(); + })); + + var menu = new ContextMenu { ItemsSource = items }; + menu.Closed += (_, _) => _editor.Focus(); + OpenedMenu = menu; + menu.Open(_editor); + return menu; + } + + private static MenuItem Item(string header, Action act, bool enabled = true, bool bold = false) + { + var item = new MenuItem { Header = header, IsEnabled = enabled }; + if (bold) + { + item.FontWeight = FontWeight.SemiBold; + } + + item.Click += (_, _) => act(); + return item; + } + + /// Replaces a marked word with a suggestion, through the editor's input path so it can be undone. + private void Replace(SpellRange mark, string replacement) + { + _editor.SelectionStart = mark.Start; + _editor.SelectionEnd = mark.Start + mark.Length; + Type(replacement); + } + + // ── colours ────────────────────────────────────────────────────────────────────────────── + + internal static Color Mix(Color a, Color b, double t) => Color.FromRgb( + (byte)Math.Round(a.R + ((b.R - a.R) * t)), + (byte)Math.Round(a.G + ((b.G - a.G) * t)), + (byte)Math.Round(a.B + ((b.B - a.B) * t))); + + private static Color Parse(string hex, Color fallback) => Color.TryParse(hex, out var colour) ? colour : fallback; + + /// + /// The wavy lines under the misspelt words, drawn over the editor: the editor's own template paints its background + /// and text after anything the editor draws itself. It takes no input. + /// + internal sealed class MarkLayer : Control + { + private readonly ComposerEditor _editor; + + public MarkLayer(ComposerEditor editor) + { + _editor = editor; + IsHitTestVisible = false; + Focusable = false; + ClipToBounds = true; + editor.MarksMoved += InvalidateVisual; + } + + public override void Render(DrawingContext context) => _editor.DrawMarks(context, this); + } +} diff --git a/src/SharpMUTerm.Avalonia/DesktopLayer.cs b/src/SharpMUTerm.Avalonia/DesktopLayer.cs index d454a25f..e384b6ed 100644 --- a/src/SharpMUTerm.Avalonia/DesktopLayer.cs +++ b/src/SharpMUTerm.Avalonia/DesktopLayer.cs @@ -46,6 +46,7 @@ internal sealed class DesktopLayer : Canvas private readonly NativeSidebar _sidebar; private readonly Dictionary _whoHere = new(StringComparer.Ordinal); private readonly Dictionary _quickBars = new(StringComparer.Ordinal); + private readonly Dictionary _composers = new(StringComparer.Ordinal); private readonly NoticeToasts _toasts; private int _noticeAboveRow; @@ -134,6 +135,24 @@ protected override void OnSizeChanged(SizeChangedEventArgs e) /// The native quick bars by window id. Internal for tests. internal IReadOnlyDictionary QuickBars => _quickBars; + /// The native docked composers by window id. Internal for tests. + internal IReadOnlyDictionary Composers => _composers; + + /// + /// Gives the keyboard to the docked composer the client says is armed, or else to the cells: where it goes back to + /// when ⌃P or F1 closes. + /// + internal void FocusArmedComposer() + { + if (_composers.Values.FirstOrDefault(c => c.Model is { Armed: true }) is { } armed) + { + armed.Editor.Focus(); + return; + } + + _view.Focus(); + } + /// The last header menu opened. Internal for tests. internal ContextMenu? OpenedMenu { get; private set; } @@ -302,6 +321,15 @@ private void SyncPanels(ScreenFrame frame, Size cell) frame, cell, (bar, panel, plane) => bar.Show(panel.QuickBar!, panel.Ink, plane, text, cell.Height, panel.Pick, panel.Dispatch)); + + // The docked composer: a native editor over its pane, the cell editor still drawn (and still the draft) under it. + Place( + _composers, + _pointer.Panels.Where(p => p.PanelId == PanelIds.Composer && p.Composer is not null && p.ComposerSession is not null), + () => new ComposerView(_view, fullScreen: false), + frame, + cell, + (composer, panel, plane) => composer.Show(panel.Composer!, panel.ComposerSession!, panel.Ink, plane, text)); } /// diff --git a/src/SharpMUTerm.Avalonia/MainWindow.cs b/src/SharpMUTerm.Avalonia/MainWindow.cs index ff470f55..1822306e 100644 --- a/src/SharpMUTerm.Avalonia/MainWindow.cs +++ b/src/SharpMUTerm.Avalonia/MainWindow.cs @@ -66,10 +66,15 @@ public MainWindow(WindowOptions options, IClassicDesktopStyleApplicationLifetime // The window's native views: the header band and the connections sidebar beside the cells (the layer moves the // view out of their way, so no cell lies under either), the Layouts button, and native panels over their panes. - root.Children.Add(new DesktopLayer(_view, options.Chrome)); + var layer = new DesktopLayer(_view, options.Chrome); + root.Children.Add(layer); + + // F1, over the cells and under the layer, so a toast is still seen over it. Closing it gives the keyboard to an + // armed docked composer if there is one, else to the cells. + _driver.Composer.Attach(root, layer, _view, () => layer.FocusArmedComposer()); // ⌃P, over everything above; it is added last when it opens, and gives the keyboard back to the cells. - _driver.Palette.Attach(root, () => _view.Focus()); + _driver.Palette.Attach(root, () => layer.FocusArmedComposer()); Content = root; AutomationProperties.SetName(_view, "SharpMUTerm"); diff --git a/src/SharpMUTerm.Avalonia/TerminalView.cs b/src/SharpMUTerm.Avalonia/TerminalView.cs index 0ca2dd51..49c139b7 100644 --- a/src/SharpMUTerm.Avalonia/TerminalView.cs +++ b/src/SharpMUTerm.Avalonia/TerminalView.cs @@ -462,7 +462,7 @@ internal bool ResizeFromChrome(PointerPressedEventArgs e) /// How many presses this view has turned into a move or a maximise. Internal for tests. internal int WindowGestures { get; private set; } - private void ToggleMaximised() + internal void ToggleMaximised() { if (TopLevel.GetTopLevel(this) is Window window) { diff --git a/src/SharpMUTerm.Avalonia/WindowHost.cs b/src/SharpMUTerm.Avalonia/WindowHost.cs index c35ea924..5d379300 100644 --- a/src/SharpMUTerm.Avalonia/WindowHost.cs +++ b/src/SharpMUTerm.Avalonia/WindowHost.cs @@ -74,5 +74,9 @@ internal static class WindowHost Chrome = chrome ?? HostChrome.HeaderAndRail, // ⌃P is a native palette over the window, listing the same rows as the cell one. NativePalette = driver.Palette, + + // F1 and the docked composer are a native editor: a proportional or monospace face, IME, native selection and + // a real underline under a misspelling. The draft, the send and the keys stay the client's. + NativeComposer = driver.Composer, }; } diff --git a/src/SharpMUTerm.Client/Composer/ComposerModel.cs b/src/SharpMUTerm.Client/Composer/ComposerModel.cs new file mode 100644 index 00000000..b1a556d3 --- /dev/null +++ b/src/SharpMUTerm.Client/Composer/ComposerModel.cs @@ -0,0 +1,235 @@ +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Core.Text; + +namespace SharpMUTerm.Client.Composer; + +/// Where a composer is drawn: F1's full screen, or a pane of a layout. +public enum ComposerPlace +{ + /// F1: a modal over the workspace. + FullScreen, + + /// The docked composer panel, in a pane. + Docked, +} + +/// A word the dictionary does not know, as a range of the whole buffer (lines broken by \n). +/// Offset into the buffer. +/// How many characters. +public readonly record struct SpellRange(int Start, int Length); + +/// +/// One entry of a composer's key row: a chord in the cell glyphs (⌃S, ⌥L, Esc) and what it does. +/// A host that draws keys in words (the window) spells the chord with KeyGlyphs.Words. +/// +/// The chord; empty for a hint that is no key (click here to write). +/// What it does. +/// A shorter label for a narrow pane; null when is already short. +public sealed record ComposerKey(string Key, string Label, string? Short = null); + +/// A MOO buffer being edited (MCP simpleedit): what it is called and its type. +public sealed record ComposerEdit(string Name, string Type); + +/// +/// A composer, as both hosts draw it. The terminal draws F1 and the docked panel in cells; the window draws them +/// with a native editor. Both read this: who the post goes to, the draft, the escaping mode, the MOO edit it is (if it +/// is one), which dictionary marks it and the words it marks, and the keys the footer offers. +/// +/// The draft is the client's. is the character's draft as the client holds it, and +/// moves only when the client replaced it — F1 closing over a docked copy, a send clearing it, +/// a key the cells took. A native editor that typed the change itself sees the revision unmoved and keeps its own +/// text (and its caret and undo); one that sees it move takes the client's. +/// +/// +/// Equal by value, lists included, because the window is told about a panel only when it changed and a +/// model rebuilt on every frame must compare equal to the last one. +/// +/// +/// F1 or the docked panel. +/// Who it sends to, as the window title names the connection; empty when nothing is connected. +/// The draft, lines broken by \n. +/// ⌥L's mode. +/// The MOO buffer this is an edit of, or null for a post. +/// The dictionary's name (en_GB), or null for none — and none for a MOO edit. +/// Whether there is a connection for ⌃S to reach. +/// Whether typing goes here: always for F1; for the docked panel, the client's one fact. +/// Moves when the client replaced . +/// The words the dictionary does not know, over . +/// The key row. +public sealed record ComposerModel( + ComposerPlace Place, + string Target, + string Body, + ComposeEscaping Escaping, + ComposerEdit? Edit, + string? Dictionary, + bool CanSend, + bool Armed, + long Revision, + IReadOnlyList Marks, + IReadOnlyList Keys) +{ + /// What ⌃S sends for this draft: , or null for nothing (or an edit). + public string? Command => Edit is null ? ComposeMessage.Build(Body, Escaping) : null; + + /// + /// The verb the post starts with — +pose, say — for the docked header, so a reader can see what the + /// buffer will be sent as without reading it. Empty for an empty buffer. + /// + public string Verb => VerbOf(Body); + + /// + /// The model for a composer's state. The keys are worked out here, so the cells and the window offer the same row: + /// F1 names ⌃S, ⌥L (a post only), ⌥W (while a dictionary marks it) and Esc; the docked panel adds F1 and says what + /// Esc does there. + /// + /// The dictionary, or null; ignored for a MOO edit, whose buffer is as often code as prose. + public static ComposerModel Create( + ComposerPlace place, + string target, + string body, + ComposeEscaping escaping, + ComposerEdit? edit, + SpellChecker? spelling, + bool canSend, + bool armed, + long revision) + { + ArgumentNullException.ThrowIfNull(target); + ArgumentNullException.ThrowIfNull(body); + body = body.Replace("\r\n", "\n", StringComparison.Ordinal); + var checker = edit is null ? spelling : null; + return new ComposerModel( + place, + target, + body, + escaping, + edit, + checker?.Name, + canSend, + armed, + revision, + ComposerMarks.For(body, checker), + KeysFor(place, edit is not null, checker is not null, canSend, armed)); + } + + /// The key row for a composer in this state. + public static IReadOnlyList KeysFor(ComposerPlace place, bool edit, bool dictionary, bool canSend, bool armed) + { + if (place == ComposerPlace.Docked) + { + if (!armed) + { + return [new(string.Empty, "click here to write", "click to write"), new("F1", "full screen", "full")]; + } + + var docked = new List { new("⌃S", "send"), new("⌥L", "literal") }; + if (dictionary) + { + docked.Add(new("⌥W", "add word", "word")); + } + + docked.Add(new("F1", "full screen", "full")); + docked.Add(new("Esc", "command line", "back")); + return docked; + } + + if (edit) + { + return + [ + new("⌃S", canSend ? "save" : "save (nothing connected)"), + new("Esc", "close (keeps the edit)"), + ]; + } + + var keys = new List + { + new("⌃S", canSend ? "send" : "send (nothing connected)"), + new("⌥L", "escaping"), + }; + if (dictionary) + { + keys.Add(new("⌥W", "add word")); + } + + keys.Add(new("Esc", "close (keeps the draft)")); + return keys; + } + + /// The first word of the first non-blank line, at most sixteen characters. + public static string VerbOf(string body) + { + ArgumentNullException.ThrowIfNull(body); + var first = body.Split('\n').Select(l => l.Trim()).FirstOrDefault(l => l.Length > 0) ?? string.Empty; + var space = first.IndexOfAny([' ', '\t']); + var verb = space < 0 ? first : first[..space]; + return verb.Length <= 16 ? verb : verb[..15] + "…"; + } + + /// + public bool Equals(ComposerModel? other) => + other is not null + && Place == other.Place + && Target == other.Target + && Body == other.Body + && Escaping == other.Escaping + && Equals(Edit, other.Edit) + && Dictionary == other.Dictionary + && CanSend == other.CanSend + && Armed == other.Armed + && Revision == other.Revision + && Marks.SequenceEqual(other.Marks) + && Keys.SequenceEqual(other.Keys); + + /// + public override int GetHashCode() => HashCode.Combine(Place, Body, Escaping, Armed, Revision, Marks.Count, Keys.Count); +} + +/// The words a dictionary marks in a whole buffer, as one list of ranges. +public static class ComposerMarks +{ + /// + /// The words does not know in , each as a range of the whole + /// buffer. Line by line, through — the very call the cell editor's + /// highlighter makes per line — so the two hosts mark the same words. Empty with no dictionary. + /// + public static IReadOnlyList For(string body, SpellChecker? spelling) + { + ArgumentNullException.ThrowIfNull(body); + if (spelling is null || body.Length == 0) + { + return []; + } + + var marks = new List(); + var offset = 0; + foreach (var line in body.Replace("\r\n", "\n", StringComparison.Ordinal).Split('\n')) + { + foreach (var miss in spelling.Misspellings(line)) + { + marks.Add(new SpellRange(offset + miss.Start, miss.Length)); + } + + offset += line.Length + 1; + } + + return marks; + } + + /// + /// The word at in (in it, or just after it), or null: the word ⌥W + /// adds. on the caret's line, the cell composer's rule. + /// + public static string? WordAt(string body, int caret) + { + ArgumentNullException.ThrowIfNull(body); + body = body.Replace("\r\n", "\n", StringComparison.Ordinal); + caret = Math.Clamp(caret, 0, body.Length); + var start = caret == 0 ? 0 : body.LastIndexOf('\n', caret - 1) + 1; + + var end = body.IndexOf('\n', caret); + var line = body[start..(end < 0 ? body.Length : end)]; + return SpellChecker.WordAt(line, caret - start); + } +} diff --git a/src/SharpMUTerm.Client/Composer/ComposerSession.cs b/src/SharpMUTerm.Client/Composer/ComposerSession.cs new file mode 100644 index 00000000..42c4755e --- /dev/null +++ b/src/SharpMUTerm.Client/Composer/ComposerSession.cs @@ -0,0 +1,160 @@ +using SharpMUTerm.Core.Text; + +namespace SharpMUTerm.Client.Composer; + +/// +/// What a native composer hands back to the client. Each is called from the host's own thread; the client marshals +/// onto its own and runs the path the cell composer's key runs (⌃S, ⌥L, ⌥W, Esc), so a gesture in either host ends in +/// the same client method. Any may be null where a composer has no such gesture (F1 is never released or armed). +/// +public sealed record ComposerCallbacks +{ + /// The writer changed the text: the whole buffer, lines broken by \n. + public Action? Edited { get; init; } + + /// ⌃S, with the buffer as it stands. + public Action? Send { get; init; } + + /// ⌥L. + public Action? ToggleEscaping { get; init; } + + /// ⌥W, or the menu's Add to dictionary, with the word. + public Action? AddWord { get; init; } + + /// Esc in a docked composer: the keyboard goes back to the command line. + public Action? Release { get; init; } + + /// A click in a docked composer: it takes the keyboard. + public Action? Arm { get; init; } + + /// Esc (or F1) in F1: the window closes, with the buffer to keep. + public Action? Closed { get; init; } +} + +/// +/// One composer, for a host that draws it with its own editor: the model the client publishes, the dictionary to mark +/// and suggest from on the host's thread, and the way back. F1 gets a session per opening; a docked composer one per +/// panel window, for as long as the panel lives. +/// +/// The client publishes; the host draws. is the client's (on its thread), and raises +/// only when the model differs, so a host can redraw on every one. Everything else is the host's. +/// Once the client has ed a session (F1 closed by a send, the panel gone), nothing the host says is +/// passed on: a late Esc cannot close a composer that already closed. +/// +/// +public sealed class ComposerSession +{ + private readonly Func? _spelling; + private readonly ComposerCallbacks _callbacks; + private ComposerModel _model; + private int _ended; + + /// The model to open on. + /// + /// The dictionary the client marks with, read on the host's thread; it must not open one (a dictionary is opened by + /// the client, which then says so in ). Null for none. + /// + /// Where the host's gestures go. + public ComposerSession(ComposerModel model, Func? spelling, ComposerCallbacks callbacks) + { + ArgumentNullException.ThrowIfNull(model); + ArgumentNullException.ThrowIfNull(callbacks); + _model = model; + _spelling = spelling; + _callbacks = callbacks; + } + + /// The model last published. + public ComposerModel Model => Volatile.Read(ref _model); + + /// Raised on the client's thread when a published model differs from the last; a host marshals. + public event Action? Changed; + + /// Whether the client has ended the session. + public bool IsEnded => Volatile.Read(ref _ended) != 0; + + /// The client's: a new model, passed on when it differs from the last. + public void Publish(ComposerModel model) + { + ArgumentNullException.ThrowIfNull(model); + var old = Interlocked.Exchange(ref _model, model); + if (!model.Equals(old)) + { + Changed?.Invoke(model); + } + } + + /// The client's: nothing the host says from now on is passed on. + public void End() => Volatile.Write(ref _ended, 1); + + /// + /// The words to mark in — the host's text as it is now, which may be a keystroke ahead of + /// . The same function the model's are made by, so for the + /// same text the two agree. None for a MOO edit or with no dictionary. + /// + public IReadOnlyList Marks(string body) => + Model is { Edit: null, Dictionary: not null } ? ComposerMarks.For(body ?? string.Empty, _spelling?.Invoke()) : []; + + /// The dictionary's suggestions for a marked word, for the host's menu; empty with none. + public IReadOnlyList Suggestions(string word) => + CanAddWords && _spelling?.Invoke() is { } checker ? checker.Suggest(word) : []; + + /// Whether ⌥W does anything here: a post marked by a dictionary. + public bool CanAddWords => Model is { Edit: null, Dictionary: not null }; + + /// The host's: the writer changed the text. + public void Edited(string body) => Pass(_callbacks.Edited, Normalise(body)); + + /// The host's: ⌃S. + public void Send(string body) => Pass(_callbacks.Send, Normalise(body)); + + /// The host's: ⌥L. Nothing for a MOO edit, which is saved as its lines. + public void ToggleEscaping() + { + if (Model.Edit is null && !IsEnded) + { + _callbacks.ToggleEscaping?.Invoke(); + } + } + + /// The host's: ⌥W on . + public void AddWord(string word) + { + if (CanAddWords && !string.IsNullOrWhiteSpace(word)) + { + Pass(_callbacks.AddWord, word.Trim()); + } + } + + /// The host's: Esc in a docked composer. + public void Release() + { + if (!IsEnded) + { + _callbacks.Release?.Invoke(); + } + } + + /// The host's: a click in a docked composer. + public void Arm() + { + if (!IsEnded) + { + _callbacks.Arm?.Invoke(); + } + } + + /// The host's: F1 closing by Esc, with the buffer. + public void Close(string body) => Pass(_callbacks.Closed, Normalise(body)); + + private void Pass(Action? action, string value) + { + if (!IsEnded) + { + action?.Invoke(value); + } + } + + /// Lines broken by \n: a native text box on Windows writes CRLF. + private static string Normalise(string? body) => (body ?? string.Empty).Replace("\r\n", "\n", StringComparison.Ordinal); +} diff --git a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs index 89c93b44..4060bce7 100644 --- a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs +++ b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs @@ -1,5 +1,6 @@ using SharpMUTerm.Client.Chrome; using SharpMUTerm.Client.Commands; +using SharpMUTerm.Client.Composer; using SharpMUTerm.Client.Contributions; using SharpMUTerm.Client.Palette; using SharpMUTerm.Client.Panels; @@ -41,6 +42,12 @@ public enum SurfaceActionKind /// A change to a declared setting, committed through the client's save funnel. Edit, + + /// + /// A composer's gesture — its text sent, the escaping flipped, a word added, the keyboard released or taken — + /// handed back through the composer's session (ComposerSession). + /// + Compose, } /// @@ -142,6 +149,9 @@ public static class SurfaceCatalog /// A notice: the status row's message in cells, and in the window a toast over them as well. public const string Notice = "notice"; + /// F1, the full-screen composer: a cell modal in a terminal, the window's native editor in its place. + public const string Compose = "compose"; + /// /// The header and the rail: cells in a terminal; in the window (HostChrome.HeaderAndRail) native views /// beside the cells, which then leave them out. @@ -284,6 +294,41 @@ public static class SurfaceCatalog CellsUnderNative, "SharpMUTerm.Tui.SharpMUTermApp.NoticeMarkup", ["SharpMUTerm.Avalonia.NoticeToasts"]), + new( + Compose, + typeof(ComposerModel), + [ + // ⌃S: the buffer through ComposeMessage.Build to the window's character (a MOO edit saves as lines). + new(SurfaceActionKind.Compose, "send", "SendComposed"), + + // Esc: the window closes and the buffer is kept as the character's draft. + new(SurfaceActionKind.Compose, "close", "CloseComposer"), + new(SurfaceActionKind.Compose, "add word", "AddComposerWord"), + ], + new Dictionary + { + [SurfaceHosts.Terminal] = SurfaceDrawing.Cells, + + // A window with a native composer opens F1 there instead of the cell modal (ClientHost.NativeComposer). + [SurfaceHosts.Window] = SurfaceDrawing.Native, + }, + "SharpMUTerm.Tui.ComposeOverlay.Render", + ["SharpMUTerm.Avalonia.ComposerOverlay", "SharpMUTerm.Avalonia.ComposerView", "SharpMUTerm.Avalonia.ComposerEditor"]), + new( + PanelIds.Composer, + typeof(ComposerModel), + [ + new(SurfaceActionKind.Compose, "send", "SendDocked"), + new(SurfaceActionKind.Compose, "release", "ReleaseComposer"), + + // A click on the cell editor arms it through the framework's focus (ArmClickedComposer); the native + // editor asks for the same thing by name. + new(SurfaceActionKind.Compose, "arm", "ArmComposer"), + new(SurfaceActionKind.Compose, "add word", "AddComposerWord"), + ], + CellsUnderNative, + "SharpMUTerm.Tui.Panels.DockedComposer.Render", + ["SharpMUTerm.Avalonia.ComposerView", "SharpMUTerm.Avalonia.ComposerEditor"]), ]; /// The surface with , or null. diff --git a/src/SharpMUTerm.Core/Text/SpellChecker.cs b/src/SharpMUTerm.Core/Text/SpellChecker.cs index 65de70bc..4ffb930e 100644 --- a/src/SharpMUTerm.Core/Text/SpellChecker.cs +++ b/src/SharpMUTerm.Core/Text/SpellChecker.cs @@ -33,6 +33,14 @@ public sealed class SpellChecker private readonly Dictionary _cache = new(StringComparer.Ordinal); private readonly string? _userWordsPath; + /// + /// Held around every read and write of the word list, the added words and the cache. The terminal asks from the + /// client's thread only; the window's native composer marks and suggests from its own thread while the client + /// adds a word from the other, and a written on one thread and read on + /// another throws. + /// + private readonly Lock _gate = new(); + /// Most cached answers kept; past this the cache is dropped and refilled. private const int CacheLimit = 20_000; @@ -173,6 +181,14 @@ public static IReadOnlyList SearchFolders(string? own) /// Whether a word is spelt right, or was added. public bool Check(string word) + { + lock (_gate) + { + return CheckLocked(word); + } + } + + private bool CheckLocked(string word) { if (_added.Contains(word)) { @@ -221,9 +237,12 @@ public bool Add(string word) return false; } - if (!_added.Add(word)) + lock (_gate) { - return true; + if (!_added.Add(word)) + { + return true; + } } if (_userWordsPath is { } path) @@ -242,6 +261,31 @@ public bool Add(string word) return true; } + /// + /// The dictionary's suggestions for , best first, at most ; empty for a + /// word it knows, or one this checker would never mark. Hunspell's suggester is slow beside a check (a few + /// milliseconds a word), so this is for a menu opened on one word, never for a whole buffer. + /// + public IReadOnlyList Suggest(string word, int max = 6) + { + ArgumentNullException.ThrowIfNull(word); + word = word.Trim(); + if (word.Length == 0 || max <= 0) + { + return []; + } + + lock (_gate) + { + if (CheckLocked(word)) + { + return []; + } + + return _words.Suggest(word).Take(max).ToArray(); + } + } + /// The word at on (or just before it), or null. public static string? WordAt(string line, int column) { diff --git a/src/SharpMUTerm.Tui/ComposeOverlay.cs b/src/SharpMUTerm.Tui/ComposeOverlay.cs index 36285219..3f2c94a3 100644 --- a/src/SharpMUTerm.Tui/ComposeOverlay.cs +++ b/src/SharpMUTerm.Tui/ComposeOverlay.cs @@ -2,6 +2,7 @@ using SharpConsoleUI.Builders; using SharpConsoleUI.Controls; using SharpConsoleUI.Layout; +using SharpMUTerm.Client.Composer; using SharpMUTerm.Core.Commands; using SharpMUTerm.Core.Telnet; using SharpMUTerm.Core.Text; @@ -107,7 +108,30 @@ internal ComposeOverlay(ConsoleWindowSystem system, Func? spellin internal MooEdit? Edit => _edit; /// The header row's markup, so a test can read who the window says it will send to. - internal string HeaderMarkup => Header(); + internal string HeaderMarkup => Render(Model).Header; + + /// + /// What the window draws, as the shared model a native composer draws: the target, the buffer as it stands, the + /// mode, the edit, the dictionary and its marks, and the key row. + /// + internal ComposerModel Model => ModelFor(_target, Body, _escaping, _edit, Spelling, _canSend); + + /// + /// F1's model for a draft, in either host: the cell window builds its own from this, and a native F1 is opened on + /// it, so the two say the same thing for the same draft. Revision 1: F1 opens on a draft and nothing replaces it + /// while it is open. + /// + internal static ComposerModel ModelFor(string target, string body, ComposeEscaping escaping, MooEdit? edit, SpellChecker? spelling, bool canSend) => + ComposerModel.Create( + ComposerPlace.FullScreen, + target, + body, + escaping, + edit is null ? null : new ComposerEdit(edit.Name, edit.Type), + spelling, + canSend, + armed: true, + revision: 1); /// /// Opens the composer on , or closes it when it is already open — the same @@ -356,71 +380,56 @@ private void Redraw() /// private MarkupControl HeaderBand() { - var band = ScreenChrome.Band(Header(), ScreenPalette.HeaderBg, _scheme); + var band = ScreenChrome.Band(Render(Model).Header, ScreenPalette.HeaderBg, _scheme); band.StickyPosition = StickyPosition.Top; return band; } private MarkupControl FooterBand() { - var band = ScreenChrome.Band(Footer(), ScreenPalette.FooterBg, _scheme); + var band = ScreenChrome.Band(Render(Model).Footer, ScreenPalette.FooterBg, _scheme); band.StickyPosition = StickyPosition.Bottom; return band; } /// - /// The title row: what this is, who it sends to, and which mode it is in. The target is escaped - /// because a character's name is configuration and a world's name can be anything. + /// The two chrome rows for . The title row says what this is, who it sends to, and which + /// mode it is in; the target is escaped because a character's name is configuration and a world's name can be + /// anything. The key row is the model's keys and nothing else, because this screen is held to the same honesty + /// rule as the settings screens: every key printed here works, and none that works is hidden. There is + /// deliberately no ⌃F find — the control has a find API but no chord bound to it. /// - private string Header() + internal static (string Header, string Footer) Render(ComposerModel model) { - var target = _target.Length == 0 + var target = model.Target.Length == 0 ? $"[{ScreenPalette.Warn}]no connection[/]" - : $"[{ScreenPalette.Value}]{Escape(_target)}[/]"; + : $"[{ScreenPalette.Value}]{Escape(model.Target)}[/]"; - if (_edit is { } edit) + string header; + if (model.Edit is { } edit) { - return $"[{ScreenPalette.Accent}]EDIT[/] [{ScreenPalette.Value}]{Escape(edit.Name)}[/]" + header = $"[{ScreenPalette.Accent}]EDIT[/] [{ScreenPalette.Value}]{Escape(edit.Name)}[/]" + $"[{ScreenPalette.Label}] {Escape(edit.Type)} · from [/]{target}"; } + else + { + var mode = model.Escaping == ComposeEscaping.Literal + ? $"[{ScreenPalette.Accent}]literal[/]" + : $"[{ScreenPalette.Value}]as typed[/]"; - var mode = _escaping == ComposeEscaping.Literal - ? $"[{ScreenPalette.Accent}]literal[/]" - : $"[{ScreenPalette.Value}]as typed[/]"; - - var spelling = _spelling is { } checker - ? $"[{ScreenPalette.Value}]{Escape(checker.Name)}[/]" - : $"[{ScreenPalette.Muted}]no dictionary[/]"; - - return $"[{ScreenPalette.Accent}]COMPOSE[/][{ScreenPalette.Label}] to [/]{target}" - + $"[{ScreenPalette.Label}] · text [/]{mode}" - + $"[{ScreenPalette.Label}] · spelling [/]{spelling}"; - } + var spelling = model.Dictionary is { } name + ? $"[{ScreenPalette.Value}]{Escape(name)}[/]" + : $"[{ScreenPalette.Muted}]no dictionary[/]"; - /// - /// The key row. It names ⌃S, ⌥L, ⌥W (while there is a dictionary) and Esc and nothing else, because this screen is held to the same - /// honesty rule as the settings screens: every key printed here works, and none that works is - /// hidden. There is deliberately no ⌃F find — the control has a find API but no chord bound - /// to it, and advertising one would send a reader to press a key that does nothing. - /// - private string Footer() - { - if (_edit is not null) - { - return (_canSend - ? $"[{ScreenPalette.Accent}]⌃S[/][{ScreenPalette.Label}] save[/]" - : $"[{ScreenPalette.Accent}]⌃S[/][{ScreenPalette.Label}] save (nothing connected)[/]") - + $"[{ScreenPalette.Label}] · [/][{ScreenPalette.Accent}]Esc[/][{ScreenPalette.Label}] close (keeps the edit)[/]"; + header = $"[{ScreenPalette.Accent}]COMPOSE[/][{ScreenPalette.Label}] to [/]{target}" + + $"[{ScreenPalette.Label}] · text [/]{mode}" + + $"[{ScreenPalette.Label}] · spelling [/]{spelling}"; } - var send = _canSend - ? $"[{ScreenPalette.Accent}]⌃S[/][{ScreenPalette.Label}] send[/]" - : $"[{ScreenPalette.Accent}]⌃S[/][{ScreenPalette.Label}] send (nothing connected)[/]"; - - return send - + $"[{ScreenPalette.Label}] · [/][{ScreenPalette.Accent}]⌥L[/][{ScreenPalette.Label}] escaping[/]" - + (Spelling is null ? string.Empty : $"[{ScreenPalette.Label}] · [/][{ScreenPalette.Accent}]⌥W[/][{ScreenPalette.Label}] add word[/]") - + $"[{ScreenPalette.Label}] · [/][{ScreenPalette.Accent}]Esc[/][{ScreenPalette.Label}] close (keeps the draft)[/]"; + var footer = string.Join( + $"[{ScreenPalette.Label}] · [/]", + model.Keys.Select(k => $"[{ScreenPalette.Accent}]{Escape(k.Key)}[/][{ScreenPalette.Label}] {Escape(k.Label)}[/]")); + return (header, footer); } /// diff --git a/src/SharpMUTerm.Tui/Hosting/ClientHost.cs b/src/SharpMUTerm.Tui/Hosting/ClientHost.cs index df52a465..dd7195f9 100644 --- a/src/SharpMUTerm.Tui/Hosting/ClientHost.cs +++ b/src/SharpMUTerm.Tui/Hosting/ClientHost.cs @@ -111,6 +111,14 @@ internal sealed record ClientHost /// public required INativePalette? NativePalette { get; init; } + /// + /// Draws the composer — F1 and the docked panel — with the host's own editor, or null for a host whose composer is + /// cells. F1 opens there instead of the cell modal; a docked composer keeps its cells and the host's editor lies + /// over them, kept to the same draft. Null in the terminal, the snapshot, the tests and the parity harness, so every + /// cell frame is unchanged. + /// + public required INativeComposer? NativeComposer { get; init; } + /// /// Whether the terminal driver's input path can decode a focus report. Not on Windows: the Windows branch of /// NetConsoleDriver is a Console.ReadKey loop with its own reassembly, and an ESC [ I @@ -151,6 +159,7 @@ public static ClientHost Terminal(TerminalCapabilities capabilities) NativeSettings = null, Chrome = HostChrome.None, NativePalette = null, + NativeComposer = null, }; /// @@ -176,6 +185,7 @@ public static ClientHost Terminal(TerminalCapabilities capabilities) NativeSettings = null, Chrome = HostChrome.None, NativePalette = null, + NativeComposer = null, }; /// diff --git a/src/SharpMUTerm.Tui/Hosting/INativeComposer.cs b/src/SharpMUTerm.Tui/Hosting/INativeComposer.cs new file mode 100644 index 00000000..3eeaaba3 --- /dev/null +++ b/src/SharpMUTerm.Tui/Hosting/INativeComposer.cs @@ -0,0 +1,32 @@ +using SharpMUTerm.Client.Composer; + +namespace SharpMUTerm.Tui; + +/// +/// A host that draws the composer with its own editor (the desktop window's native text editor) instead of cells: F1 +/// as a full-screen editor in place of the cell modal, and each docked composer panel as an editor over its pane's +/// cells. The client hands it a ; the host draws the session's +/// and hands every gesture back through it, so ⌃S, ⌥L, ⌥W and Esc end in the client methods the cell composer's keys +/// end in. +/// +/// The docked editors arrive with the panels (), placed like every native panel; +/// only F1, which has no pane, comes through here. +/// +/// +internal interface INativeComposer +{ + /// + /// Whether the host has somewhere to draw a composer now. False for a host built without a window (the window's + /// --render-png, a test), which then gets the cell composer. Read on the client's thread. + /// + bool Available { get; } + + /// + /// Shows F1 for , in : the accent its title and keys wear, and the + /// colour of the line under a misspelling. Called on the client's thread; the host marshals. + /// + void Open(ComposerSession session, PanelInk ink); + + /// Closes F1 if it is open, saying nothing back. Called on the client's thread. + void Close(); +} diff --git a/src/SharpMUTerm.Tui/Panels/DockedComposer.cs b/src/SharpMUTerm.Tui/Panels/DockedComposer.cs index 13c5192e..d7e0d9c7 100644 --- a/src/SharpMUTerm.Tui/Panels/DockedComposer.cs +++ b/src/SharpMUTerm.Tui/Panels/DockedComposer.cs @@ -2,7 +2,9 @@ using SharpConsoleUI.Builders; using SharpConsoleUI.Controls; using SharpConsoleUI.Layout; +using SharpMUTerm.Client.Composer; using SharpMUTerm.Core.Commands; +using SharpMUTerm.Core.Text; using static SharpMUTerm.Tui.MarkupText; namespace SharpMUTerm.Tui.Panels; @@ -23,6 +25,12 @@ namespace SharpMUTerm.Tui.Panels; /// line follows, and it is what keeps one fact behind "which control gets a keystroke". /// /// +/// It draws from a , the one the window's native editor draws: the host describes the +/// composer (describe) and turns the model into the header and key rows, so +/// the two hosts offer the same keys and say the same mode. moves whenever the buffer changes by +/// any hand but a native editor's (), which is how that editor knows to take the text. +/// +/// /// The grid is kept and re-parented across pane rebuilds. A disposed GridControl disposes its children and /// nothing else, and none of these three keeps state that a dispose clears, so the same instance serves for the /// life of the panel (pinned by DockedComposerTests). @@ -33,14 +41,20 @@ internal sealed class DockedComposer private readonly MarkupControl _header; private readonly MarkupControl _footer; private readonly string _accent; + private readonly Func _describe; private bool _armed; private bool _quiet; + private bool _fromHost; - internal DockedComposer(string windowId, string sessionKey, ScreenTheme scheme, string accent) + /// + /// The model for this composer's state, which the host also records as drawn and hands a native editor. + /// + internal DockedComposer(string windowId, string sessionKey, ScreenTheme scheme, string accent, Func describe) { WindowId = windowId; SessionKey = sessionKey; _accent = accent; + _describe = describe; Editor = new MultilineEditControl { WrapMode = WrapMode.WrapWords, @@ -65,6 +79,11 @@ internal DockedComposer(string windowId, string sessionKey, ScreenTheme scheme, }; Editor.ContentChanged += (_, _) => { + if (!_fromHost) + { + Revision++; + } + if (!_quiet) { Redraw(); @@ -118,6 +137,50 @@ internal bool Armed } } + /// + /// Moves whenever the buffer is replaced or edited by anything but : a key the cells took, + /// F1 closing over this copy, a send clearing it. A native editor takes the text only when this has moved. + /// + internal long Revision { get; private set; } + + /// The model last drawn. + internal ComposerModel? Model { get; private set; } + + /// The dictionary marking this buffer, once one is opened for it. + internal SpellChecker? Spelling { get; private set; } + + /// Marks the words does not know, in , as F1 does. + internal void UseSpelling(SpellChecker checker, Color marked) + { + Spelling = checker; + Editor.SyntaxHighlighter = new SpellingHighlighter(checker, marked); + Redraw(); + } + + /// + /// The text a native editor over this composer now holds: written into the buffer without moving + /// , so the editor that sent it keeps its own caret and undo, and raising + /// like a keystroke, so the draft store follows. + /// + internal void SetFromHost(string body) + { + body = body.Replace("\r\n", "\n", StringComparison.Ordinal); + if (string.Equals(Body, body, StringComparison.Ordinal)) + { + return; + } + + _fromHost = true; + try + { + Editor.SetContent(body); + } + finally + { + _fromHost = false; + } + } + /// Raised after the buffer or the mode changed by the writer's hand (never by ). internal event EventHandler? Changed; @@ -131,6 +194,7 @@ internal bool Armed internal void Load(string body, ComposeEscaping escaping) { Escaping = escaping; + Revision++; if (!string.Equals(Body, body, StringComparison.Ordinal)) { _quiet = true; @@ -178,38 +242,54 @@ internal void Fit(int width, int height) /// The verb the post starts with — +pose, say — for the header, so a reader can see what the /// buffer will be sent as without reading it. Empty for an empty buffer. /// - internal static string Verb(string body) + internal static string Verb(string body) => ComposerModel.VerbOf(body); + + /// Re-describes the composer and draws the model. + internal void Redraw() { - var first = body.Split('\n').Select(l => l.Trim()).FirstOrDefault(l => l.Length > 0) ?? string.Empty; - var space = first.IndexOfAny([' ', '\t']); - var verb = space < 0 ? first : first[..space]; - return verb.Length <= 16 ? verb : verb[..15] + "…"; + var model = _describe(this); + Model = model; + Render(model); } - private void Redraw() + /// + /// The cell header and key row for : ▌COMPOSE +pose literal, and the model's keys + /// in the long form, or the short one when the pane is too narrow for it. Both forms list the same keys, so a + /// narrow pane hides no gesture. + /// + internal void Render(ComposerModel model) { - var verb = Verb(Body); - var mode = Escaping == ComposeEscaping.Literal ? $"[{_accent}]literal[/]" : "[dim]as typed[/]"; - var marker = _armed ? $"[{_accent}]▌[/]" : " "; + var verb = model.Verb; + var mode = model.Escaping == ComposeEscaping.Literal ? $"[{_accent}]literal[/]" : "[dim]as typed[/]"; + var marker = model.Armed ? $"[{_accent}]▌[/]" : " "; _header.SetContent(new List { $"{marker}[bold {_accent}]COMPOSE[/]" + (verb.Length > 0 ? $" {Escape(verb)}" : string.Empty) + $" {mode}", }); - // The long form names what each key does; the short one, for a narrow column, keeps every key and the - // two words that matter. Both list the same keys, so a narrow pane hides no gesture. - var footer = _armed - ? $" {Key("⌃S")}[dim] send · [/]{Key("⌥L")}[dim] literal · [/]{Key("F1")}[dim] full screen · [/]{Key("Esc")}[dim] command line[/]" - : $" [dim]click here to write · [/]{Key("F1")}[dim] full screen[/]"; + var footer = KeyRow(model.Keys, shortForm: false); if (_width > 0 && VisibleLength(footer) > _width) { - footer = _armed - ? $" {Key("⌃S")}[dim] send · [/]{Key("⌥L")}[dim] literal · [/]{Key("F1")}[dim] full · [/]{Key("Esc")}[dim] back[/]" - : $" [dim]click to write · [/]{Key("F1")}[dim] full[/]"; + footer = KeyRow(model.Keys, shortForm: true); } _footer.SetContent(new List { _width > 0 ? ElideVisible(footer, _width) : footer }); } + /// The key row: ⌃S send · ⌥L literal · …, a key in the accent and its word dimmed. + private string KeyRow(IReadOnlyList keys, bool shortForm) + { + var row = new System.Text.StringBuilder(" "); + for (var i = 0; i < keys.Count; i++) + { + var key = keys[i]; + var label = Escape(shortForm ? key.Short ?? key.Label : key.Label); + row.Append(key.Key.Length > 0 ? $"{Key(key.Key)}[dim] {label}" : $"[dim]{label}"); + row.Append(i < keys.Count - 1 ? " · [/]" : "[/]"); + } + + return row.ToString(); + } + private string Key(string key) => $"[{_accent}]{key}[/]"; } diff --git a/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs b/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs index 6493ad39..a01cce55 100644 --- a/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs +++ b/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs @@ -194,6 +194,14 @@ void Notice(NoticeOverlay notice) /// Runs a command id through the client's registry (the quick bar's F4 edits keys is /// ). Safe to call from any thread; one instance. /// +/// +/// For the docked composer, its content: the model its cell header, editor and key row are drawn from. Only for a +/// host with a native composer (). +/// +/// +/// For the docked composer, the way a native editor's text and keys go back to the client: one instance for as long as +/// the panel lives, so an overlay compares equal from frame to frame. +/// internal sealed record PanelOverlay( string PanelId, string WindowId, @@ -205,7 +213,9 @@ internal sealed record PanelOverlay( SharpMUTerm.Client.Panels.WhoHereModel? WhoHere = null, SharpMUTerm.Client.Panels.QuickBarModel? QuickBar = null, Action? Pick = null, - Action? Dispatch = null); + Action? Dispatch = null, + SharpMUTerm.Client.Composer.ComposerModel? Composer = null, + SharpMUTerm.Client.Composer.ComposerSession? ComposerSession = null); /// A panel's colours as #rrggbb: a bar or fill, the warning, and the empty part of a bar. internal sealed record PanelInk(string Bar, string Low, string Track); diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Chrome.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Chrome.cs index dcc86098..1430d3d8 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Chrome.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Chrome.cs @@ -91,7 +91,7 @@ internal ChromeOverlay BuildChromeOverlay() /// frame) reports false with nothing over it. /// private bool MainWindowInFront() => - _system.ActiveWindow is not { } front || ReferenceEquals(front, _window); + _nativeCompose is null && (_system.ActiveWindow is not { } front || ReferenceEquals(front, _window)); /// /// A click on a native header or sidebar, by the target the client put in the model. Internal so a test can drive diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Desktop.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Desktop.cs index 069b2a8f..d7990f80 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Desktop.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Desktop.cs @@ -202,7 +202,9 @@ private void PublishPanels() // A modal over the main window (a settings screen, ⌃P, F1) is drawn in cells over the panes; a native view // would sit on top of it, so while one is up no panel is on screen as far as the host is concerned. var overlays = new List(); - foreach (var (paneId, rect) in !_system.ModalStateService.HasModals ? PaneOutputRects() : new Dictionary()) + // F1 drawn by the host covers the panes the same way, though it is no framework modal. + var covered = _system.ModalStateService.HasModals || _nativeCompose is not null; + foreach (var (paneId, rect) in !covered ? PaneOutputRects() : new Dictionary()) { if (_workspace.Layout.FindPane(paneId) is not { ActiveTab: { } windowId }) { @@ -244,6 +246,13 @@ private void PublishPanels() panelId, windowId, rect, PanelListInk(), null, QuickBar: QuickBarEntries(key), Pick: PickerFor(windowId, key), Dispatch: _panelDispatch ??= id => OnUiThread(() => DispatchCommand(id)))); } + else if (panelId == PanelIds.Composer && NativeComposerHost is not null + && _dockedComposers.TryGetValue(windowId, out var docked) && docked.Model is { } composer) + { + // Only to a host with its own editor: the cells stay underneath it, and the editor is kept to them. + overlays.Add(new PanelOverlay( + panelId, windowId, rect, ComposerInk(), null, Composer: composer, ComposerSession: DockedSessionFor(docked))); + } } if (overlays.SequenceEqual(_panelOverlays)) diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Surfaces.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Surfaces.cs index 388e3f43..4ff89cf5 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Surfaces.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Surfaces.cs @@ -27,6 +27,7 @@ private T Drawing(string surface, string key, T model) internal object? DrawnModel(string surface, string key = "") => surface == SurfaceCatalog.Palette ? (_palette.IsOpen ? _palette.View : null) : surface == SurfaceCatalog.Prefix ? (_prefixPanel.IsOpen ? _prefixPanel.Drawn : null) + : surface == SurfaceCatalog.Compose ? (_composer.IsOpen ? _composer.Model : null) : _drawnModels.TryGetValue((surface, key), out var model) ? model : null; /// A click on a header link, as the header's own handler receives it. diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.MooEdit.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.MooEdit.cs index 56070887..42ab5d42 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.MooEdit.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.MooEdit.cs @@ -48,7 +48,7 @@ private void ReceiveMooEdit(WorldSession session, MooEdit edit) /// private void SaveMooEdit(WorldSession session, MooEdit edit, string body) { - _composer.Close(); + CloseComposer(); var key = session.SessionKey; var lines = MooEditing.LinesOf(body); _ = SaveAsync(); diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.NativeComposer.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.NativeComposer.cs new file mode 100644 index 00000000..56f32614 --- /dev/null +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.NativeComposer.cs @@ -0,0 +1,310 @@ +using SharpMUTerm.Client.Composer; +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Core.Layouts; +using SharpMUTerm.Core.Telnet; +using SharpMUTerm.Core.Text; +using SharpMUTerm.Tui.Panels; + +namespace SharpMUTerm.Tui; + +/// +/// The composer in a host that draws it with its own editor (), and the model +/// both hosts draw it from (). +/// +/// F1 opens there instead of the cell modal, through one funnel () that every way in +/// takes — the key, ⌃P, a MOO edit arriving, the demo views. It is closed through one funnel too +/// (), which keeps the draft exactly as the cell window's Closed does, so the +/// send path's "close first, forget after" holds for both. +/// +/// +/// A docked composer keeps its cells, and the host's editor lies over them. The cell editor stays the draft: +/// the native editor's text is written into it as it changes (), and the model +/// handed back carries a revision that moves only when something else changed the buffer. Arming stays the client's +/// one fact: a click in the native editor asks to arm, Esc in it releases, and the model says which it is. +/// +/// +internal sealed partial class SharpMUTermApp +{ + /// F1 drawn by the host: the session and the draft it holds, or null while none is open. + private NativeCompose? _nativeCompose; + + /// The native editor's channel for each docked composer, by window id; one per panel window. + private readonly Dictionary _dockedSessions = new(StringComparer.Ordinal); + + /// The dictionary, once opened: by the first F1, or the first time a docked composer is armed. + private SpellChecker? _composerSpelling; + + private bool _composerSpellingOpened; + + /// The host's composer, when it has somewhere to draw one; null for cells. + private INativeComposer? NativeComposerHost => Host.NativeComposer is { Available: true } native ? native : null; + + /// Whether F1 is open, in cells or natively. + internal bool ComposerOpen => _composer.IsOpen || _nativeCompose is not null; + + /// Whether F1 is open in the host's own editor, for the tests. + internal bool NativeComposerIsOpen => _nativeCompose is not null; + + /// The native F1's session, for the tests; null while none is open. + internal ComposerSession? NativeComposerSession => _nativeCompose?.Session; + + /// The buffer F1 holds now, in either host. + private string ComposerBody => _nativeCompose?.Body ?? _composer.Body; + + /// + /// The composer's dictionary, opened the first time anything asks — never at startup, so a client nobody writes a + /// post in reads none. + /// + private SpellChecker? ComposerSpelling() + { + if (!_composerSpellingOpened) + { + _composerSpellingOpened = true; + _composerSpelling = _spelling?.Invoke(); + } + + return _composerSpelling; + } + + /// + /// Opens F1 on a draft: in the host's editor when it has one, else the cell window. Both are given the same draft + /// and say the same thing about it (). + /// + private void OpenComposer(string target, string draft, ComposeEscaping escaping, bool canSend, MooEdit? edit = null) + { + if (NativeComposerHost is not { } native) + { + _composer.Toggle(target, draft, escaping, canSend, edit); + return; + } + + var open = new NativeCompose(target, canSend, edit) { Body = draft.Replace("\r\n", "\n", StringComparison.Ordinal), Escaping = escaping }; + open.Session = new ComposerSession( + NativeComposeModel(open), + () => _composerSpelling, + new ComposerCallbacks + { + Edited = body => OnUiThread(() => + { + if (ReferenceEquals(_nativeCompose, open)) + { + // The model follows the text, so the marks it carries are the marks the cell window would draw. + open.Body = body; + open.Session.Publish(NativeComposeModel(open)); + } + }), + Send = body => OnUiThread(() => + { + if (ReferenceEquals(_nativeCompose, open)) + { + open.Body = body; + SendComposed(new ComposeResult(body, open.Escaping, open.Edit)); + } + }), + ToggleEscaping = () => OnUiThread(() => + { + if (ReferenceEquals(_nativeCompose, open) && open.Edit is null) + { + open.Escaping = open.Escaping == ComposeEscaping.Literal ? ComposeEscaping.AsTyped : ComposeEscaping.Literal; + open.Session.Publish(NativeComposeModel(open)); + } + }), + AddWord = word => OnUiThread(() => AddComposerWord(word)), + Closed = body => OnUiThread(() => + { + if (ReferenceEquals(_nativeCompose, open)) + { + open.Body = body; + CloseComposer(); + } + }), + }); + _nativeCompose = open; + native.Open(open.Session, ComposerInk()); + PublishPanels(); + PublishHostChrome(); + } + + /// + /// A host editor's colours: the accent its title and keys wear, and the settings screens' warning for the line under + /// a misspelling — the colour the cell editor marks the word in. + /// + internal PanelInk ComposerInk() => PanelListInk() with { Low = _screens.Role(ScreenPalette.Warn) }; + + /// The native F1's model for what it holds now; the cell window's for the same draft. + private ComposerModel NativeComposeModel(NativeCompose open) => + ComposeOverlay.ModelFor(open.Target, open.Body, open.Escaping, open.Edit, open.Edit is null ? ComposerSpelling() : null, open.CanSend); + + /// + /// Closes F1, in whichever host it is open, keeping its buffer as the character's draft (or MOO edit) exactly as the + /// cell window's Closed does. A send closes through here first and forgets the draft after. + /// + private void CloseComposer() + { + if (_nativeCompose is not { } open) + { + _composer.Close(); + return; + } + + _nativeCompose = null; + open.Session.End(); + Host.NativeComposer?.Close(); + KeepComposeDraft(new ComposeResult(open.Body, open.Escaping, open.Edit)); + PublishPanels(); + PublishHostChrome(); + } + + /// + /// Adds a word to the dictionary from either composer, and re-marks everything a composer shows: the cell editors + /// and the models handed to native editors. + /// + private void AddComposerWord(string word) + { + if (ComposerSpelling() is not { } checker || !checker.Add(word)) + { + return; + } + + foreach (var docked in _dockedComposers.Values) + { + docked.Editor.RefreshSyntaxHighlighting(); + docked.Redraw(); + } + + if (_nativeCompose is { } open) + { + open.Session.Publish(NativeComposeModel(open)); + } + } + + // --- The docked composer's model and native channel ---------------------------------------------------------- + + /// + /// The docked composer's model: what its cells draw, recorded as drawn, and handed to its native editor. The target + /// is the session's title, or the character's name while it has none (and then nothing can be sent). + /// + private ComposerModel DescribeDocked(DockedComposer composer) + { + var session = FindSession(composer.SessionKey); + var target = session is not null + ? SessionTitle(session) + : FindCharacter(composer.SessionKey)?.Character.Name ?? string.Empty; + var model = ComposerModel.Create( + ComposerPlace.Docked, + target, + composer.Body, + composer.Escaping, + edit: null, + composer.Spelling, + canSend: session is not null, + composer.Armed, + composer.Revision); + Drawing(PanelIds.Composer, composer.WindowId, model); + if (_dockedSessions.TryGetValue(composer.WindowId, out var native)) + { + native.Publish(model); + } + + return model; + } + + /// + /// The native editor's channel for a docked composer: its text written into the cells, ⌃S through + /// , ⌥L, ⌥W, Esc through and a click through + /// — the methods the cell composer's keys and clicks end in. + /// + private ComposerSession DockedSessionFor(DockedComposer composer) + { + if (_dockedSessions.TryGetValue(composer.WindowId, out var known)) + { + return known; + } + + var session = new ComposerSession( + composer.Model ?? DescribeDocked(composer), + () => composer.Spelling, + new ComposerCallbacks + { + Edited = body => OnUiThread(() => composer.SetFromHost(body)), + Send = body => OnUiThread(() => + { + composer.SetFromHost(body); + SendDocked(composer); + }), + ToggleEscaping = () => OnUiThread(composer.ToggleEscaping), + AddWord = word => OnUiThread(() => AddComposerWord(word)), + Release = () => OnUiThread(() => + { + if (ReferenceEquals(ArmedComposer(), composer)) + { + ReleaseComposer(); + } + }), + Arm = () => OnUiThread(() => ArmComposer(composer)), + }); + _dockedSessions[composer.WindowId] = session; + return session; + } + + /// + /// A click in a docked composer's native editor: arm it, bringing its window to the front when it is not — what a + /// click on its cell editor does (). Refused while a modal owns the screen. + /// + private void ArmComposer(DockedComposer composer) + { + if (!_window.GetIsActive() || ComposerOpen) + { + return; + } + + if (!string.Equals(ActiveWindowId(), composer.WindowId, StringComparison.Ordinal)) + { + _pinningFocus = true; + try + { + Activate(composer.WindowId); + } + finally + { + _pinningFocus = false; + } + } + + _composerArmWindow = composer.WindowId; + _composerReleased = false; + SyncComposerArm(); + } + + /// + /// ⌥W in a docked composer's cells: adds the word the caret is in (or just after) to the dictionary, as F1's ⌥W. + /// + private void AddDockedWordAtCaret(DockedComposer composer) + { + var lines = composer.Body.Split('\n'); + var row = composer.Editor.CurrentLine - 1; + if (row >= 0 && row < lines.Length && SpellChecker.WordAt(lines[row], composer.Editor.CurrentColumn - 1) is { } word) + { + AddComposerWord(word); + } + } + + /// The native editor's channel for the docked composer in , for the tests. + internal ComposerSession? DockedComposerSession(string windowId) => _dockedSessions.GetValueOrDefault(windowId); + + /// F1 open in the host's editor: what it was opened for, and what it holds now. Read on the client's thread. + private sealed class NativeCompose(string target, bool canSend, MooEdit? edit) + { + internal string Target { get; } = target; + + internal bool CanSend { get; } = canSend; + + internal MooEdit? Edit { get; } = edit; + + internal string Body { get; set; } = string.Empty; + + internal ComposeEscaping Escaping { get; set; } + + internal ComposerSession Session { get; set; } = null!; + } +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs index e8a7a11d..99d4bcee 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs @@ -284,7 +284,7 @@ private void RunQuickMacro(string sessionKey, string descriptor) private IWindowControl NewDockedComposer(TerminalPanelContext context) { - var composer = new DockedComposer(context.WindowId, context.SessionKey, _screens, _ink.Accent); + var composer = new DockedComposer(context.WindowId, context.SessionKey, _screens, _ink.Accent, DescribeDocked); if (_composeDrafts.TryGetValue(context.SessionKey, out var draft)) { composer.Load(draft.Body, draft.Escaping); @@ -362,6 +362,14 @@ private void SyncDockedComposers(string? sessionKey) private void SyncComposerBands() { var armed = ArmedComposer(); + + // The dictionary is opened the first time a docked composer takes the keyboard, as F1 opens it on its first + // opening: a client that never writes a post reads none. + if (armed is { Spelling: null } && ComposerSpelling() is { } checker) + { + armed.UseSpelling(checker, _screens.Colour(ScreenPalette.Warn)); + } + foreach (var composer in _dockedComposers.Values) { composer.Armed = ReferenceEquals(composer, armed); @@ -474,6 +482,13 @@ private void ArmClickedComposer() return null; } + if (alt && key.Key == ConsoleKey.W && composer.Spelling is not null) + { + e.Handled = true; + AddDockedWordAtCaret(composer); + return null; + } + if (key.Key == ConsoleKey.Escape && key.Modifiers == 0) { e.Handled = true; diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 5dbb1822..cbdc7fd1 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -927,7 +927,7 @@ public SharpMUTermApp( _gameData = new GameDataOverlay(_system, _time); _screens = ScreenTheme.For(_theme); _settings = new SettingsOverlay(_system, _screens) { SearchHost = SettingsSearchHost() }; - _composer = new ComposeOverlay(_system, _spelling, _screens); + _composer = new ComposeOverlay(_system, ComposerSpelling, _screens); _packageView = new ListOverlay(_system, _screens); _sendMenu = new ListOverlay(_system, _screens); _layoutsView = new ListOverlay(_system, _screens); @@ -1193,7 +1193,7 @@ public string RenderSnapshot(string? view = null) if (string.Equals(view, "compose", StringComparison.OrdinalIgnoreCase) || string.Equals(view, "compose-literal", StringComparison.OrdinalIgnoreCase)) { - _composer.Toggle( + OpenComposer( DemoScene.MainCharacterName, "+bbpost 12=The Long Winter\n\nThe caravan reached the pass at dusk, 100% frozen and\n" + "short two horses. [Nobody] said what everyone was thinking.\n\n" @@ -1208,7 +1208,7 @@ public string RenderSnapshot(string? view = null) // save and no escaping. The demo has no MCP session, so the edit is handed in as the composer takes it. if (string.Equals(view, "moo-edit", StringComparison.OrdinalIgnoreCase)) { - _composer.Toggle( + OpenComposer( DemoScene.MainCharacterName, "\"Usage: look [object]\";\nif (!args)\n player:tell(this.location:description());\n return 1;\nendif\n" + "thing = player:my_match_object(argstr);\nthing:look_self();", @@ -5085,15 +5085,15 @@ private void ToggleComposer() // Any surface, not just a settings screen. The settings screens are the case with teeth — see the // paste reasoning above — but the rule this app already states is that a modal surface owns the // screen, and the composer is one, so it may not be stacked on top of another. - if (!_composer.IsOpen && AnyOverlayOpen) + if (!ComposerOpen && AnyOverlayOpen) { RefuseCommand($"close {OpenOverlayName()} first — the composer cannot open over it"); return; } - if (_composer.IsOpen) + if (ComposerOpen) { - _composer.Close(); + CloseComposer(); return; } @@ -5106,7 +5106,7 @@ private void ToggleComposer() ? kept : new ComposeResult(string.Empty, ComposeEscaping.AsTyped); - _composer.Toggle( + OpenComposer( session is null ? string.Empty : SessionTitle(session), draft.Body, draft.Escaping, @@ -5172,7 +5172,7 @@ private void SendComposed(ComposeResult result) // Close first, then forget: closing raises Closed, which is what keeps a draft, so a removal // before it is undone by the very act of shutting the window — the post came back next time it // was opened, already sent. - _composer.Close(); + CloseComposer(); _composeDrafts.Remove(session.SessionKey); SyncDockedComposers(session.SessionKey); HistoryFor(BarKind(ActiveBar())).Add(line); @@ -5409,7 +5409,7 @@ private void ToggleHistorySearch() /// private bool AnyOverlayOpen => PaletteIsOpen || _settings.IsOpen || _quit.IsOpen || _messageLog.IsOpen || _historySearch.IsOpen - || _prefixPanel.IsOpen || _composer.IsOpen || _search.IsOpen || _gameData.IsOpen || _packageView.IsOpen || _sendMenu.IsOpen + || _prefixPanel.IsOpen || ComposerOpen || _search.IsOpen || _gameData.IsOpen || _packageView.IsOpen || _sendMenu.IsOpen || _layoutsView.IsOpen || _welcomeView.IsOpen; /// @@ -5429,7 +5429,7 @@ private void ToggleSearch() return; } - if (_composer.IsOpen) + if (ComposerOpen) { RefuseCommand("close the composer first — search cannot open over it"); return; @@ -5504,7 +5504,7 @@ private IReadOnlyList SearchableWindows(bool all) /// private bool ComposerIsInTheWay(string surface) { - if (!_composer.IsOpen) + if (!ComposerOpen) { return false; } @@ -7095,9 +7095,9 @@ private QuitFacts QuitFactsNow() // The open composer's *own* character is then excluded from the stored count, because after Esc // and F1 that post is in both places at once: the dictionary kept it on the way out and the // window is holding it again. Counting both said "2 unsent drafts" for one post. - var openKey = _composer.IsOpen ? ComposeDraftKey(activeId) : null; + var openKey = ComposerOpen ? ComposeDraftKey(activeId) : null; var posts = _composeDrafts.Count(d => d.Key != openKey) - + (_composer.IsOpen && _composer.Body.Trim().Length > 0 ? 1 : 0); + + (ComposerOpen && ComposerBody.Trim().Length > 0 ? 1 : 0); var drafts = holding.Count(w => w.Id != activeId) + bars + posts; // An open settings screen is deliberately not among the facts. It used to contribute "F5 is open diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativeComposerTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativeComposerTests.cs new file mode 100644 index 00000000..0f3dedda --- /dev/null +++ b/tests/SharpMUTerm.Avalonia.Tests/NativeComposerTests.cs @@ -0,0 +1,406 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Headless; +using Avalonia.Input; +using Avalonia.Interactivity; +using SharpMUTerm.Client.Composer; +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Layouts; +using SharpMUTerm.Core.Telnet; +using SharpMUTerm.Core.Text; +using SharpMUTerm.Tui; +using SharpMUTerm.Tui.Tests; +using SkiaSharp; +using Window = Avalonia.Controls.Window; + +namespace SharpMUTerm.Avalonia.Tests; + +/// +/// The window's composer, driven from the real client in the window host over a connected session: F1 opens the native +/// editor over the cells, typing and ⌃S send exactly what the cell composer sends, Esc keeps the draft, the wavy lines +/// are the model's marks, ⌥W and the right-click menu reach the dictionary, a MOO edit saves its lines, and the docked +/// composer's editor arms, sends and releases through the client's one fact. +/// +[NotInParallel] +public class NativeComposerTests +{ + private static readonly MooEdit Look = new("#98.look", "Test:look", "moo-code", ["player:tell(\"Hi.\");", "return 1;"]); + + private sealed record Rig(Window Window, TerminalView View, DesktopLayer Layer, SharpMUTermApp App, AvaloniaConsoleDriver Driver, RecordingTelnetSession Telnet); + + private static SpellChecker Dictionary() => + SpellChecker.FromStreams(new MemoryStream("5\nhello\nthe\nworld\nwaves\nsits\n"u8.ToArray()), new MemoryStream("SET UTF-8\n"u8.ToArray()), "en_GB"); + + private static Task Run(Func body, bool spelling = false) => + Session.Dispatch(() => + { + var driver = new AvaloniaConsoleDriver(120, 34); + var view = new TerminalView(driver, SKColors.White, new SKColor(0x1e, 0x1e, 0x24), 14, null); + var root = new Panel(); + root.Children.Add(view); + var layer = new DesktopLayer(view, HostChrome.HeaderAndRail); + root.Children.Add(layer); + driver.Composer.Attach(root, layer, view, layer.FocusArmedComposer); + var window = new Window { Content = root, Width = 1100, Height = 760 }; + window.Show(); + view.Focus(); + + var config = new AppConfiguration(); + var world = new WorldDefinition { Name = "Quiet", Host = "quiet.example.org", Port = 4000 }; + world.Characters.Add(new CharacterDefinition { Name = "Ann", Logging = new LoggingSettings() }); + config.Worlds.Add(world); + var checker = spelling ? Dictionary() : null; + var app = new SharpMUTermApp( + config, + WindowHost.Create(driver, clipboard: null) with + { + Audio = null, + Presence = null, + Announcer = null, + NativeSettings = null, + NativePalette = null, + RunsInline = true, + }, + spelling: checker is null ? null : () => checker); + var telnet = new RecordingTelnetSession(); + app.TelnetFactory = _ => telnet; + + // No loop runs here, so a key the window hands the driver is delivered the way the loop would deliver it. + driver.KeyPressed += (_, key) => app.SimulateKey(key); + try + { + app.BindWorldWithoutConnecting(world).ConnectAsync().GetAwaiter().GetResult(); + app.RenderNextFrame(); + Drain(); + return body(new Rig(window, view, layer, app, driver, telnet)); + } + finally + { + app.DisposeAsync().AsTask().GetAwaiter().GetResult(); + window.Close(); + driver.Dispose(); + } + }, CancellationToken.None); + + private static void Drain() + { + DesktopLayerTests.Drain(); + DesktopLayerTests.Drain(); + } + + private static ComposerOverlay OpenF1(Rig rig) + { + rig.App.SimulateKey(new ConsoleKeyInfo('\0', ConsoleKey.F1, false, false, false)); + Drain(); + rig.Window.UpdateLayout(); + Drain(); + return rig.Driver.Composer.Overlay ?? throw new InvalidOperationException("F1 did not open in the window"); + } + + private static void Type(ComposerEditor editor, string text) + { + editor.RaiseEvent(new TextInputEventArgs { RoutedEvent = InputElement.TextInputEvent, Text = text, Source = editor }); + Drain(); + } + + private static void Press(ComposerEditor editor, Key key, KeyModifiers modifiers = KeyModifiers.None) + { + editor.RaiseEvent(new KeyEventArgs { RoutedEvent = InputElement.KeyDownEvent, Key = key, KeyModifiers = modifiers, Source = editor }); + Drain(); + } + + // ── F1 ─────────────────────────────────────────────────────────────────────────────────── + + [Test] + public async Task F1OpensTheNativeEditorFocusedOverTheCellsAndNotTheCellModal() + { + var (focused, cellOpen, header, footer, below, margin) = await Run(rig => + { + var overlay = OpenF1(rig); + var root = (Panel)rig.Window.Content!; + return (overlay.Composer.Editor.IsFocused, rig.App.Composer.IsOpen, overlay.Composer.HeaderText, overlay.Composer.FooterText, + root.Children.IndexOf(overlay) == root.Children.IndexOf(rig.Layer) - 1, overlay.Margin == rig.View.Margin); + }); + + await Assert.That(focused).IsTrue(); + await Assert.That(cellOpen).IsFalse(); + await Assert.That(header).Contains("COMPOSE").And.Contains("to Ann").And.Contains("as typed").And.Contains("no dictionary"); + await Assert.That(footer).Contains("⌃S send").And.Contains("⌥L escaping").And.Contains("Esc close (keeps the draft)"); + await Assert.That(below).IsTrue().Because("under the layer, so a toast is drawn over it"); + await Assert.That(margin).IsTrue().Because("over the cells, clear of the native header and sidebar"); + } + + [Test] + [Arguments("+pose waves\nand sits", false)] + [Arguments("+bbpost 1=Title\n\nFirst, 50% [done].\n", true)] + public async Task TypingAndCtrlSSendWhatTheCellComposerSends(string draft, bool literal) + { + var (sent, open) = await Run(rig => + { + var overlay = OpenF1(rig); + var editor = overlay.Composer.Editor; + Type(editor, draft); + if (literal) + { + Press(editor, Key.L, KeyModifiers.Alt); + } + + Press(editor, Key.S, KeyModifiers.Control); + return (rig.Telnet.Lines.ToList(), rig.Driver.Composer.Overlay is not null); + }); + + await Assert.That(sent).IsEquivalentTo(new[] { ComposeMessage.Build(draft, literal ? ComposeEscaping.Literal : ComposeEscaping.AsTyped) }); + await Assert.That(open).IsFalse().Because("a send closes it"); + } + + [Test] + public async Task AltLFlipsTheHeadersModeFromTheClientsModel() + { + var header = await Run(rig => + { + var overlay = OpenF1(rig); + Press(overlay.Composer.Editor, Key.L, KeyModifiers.Alt); + return overlay.Composer.HeaderText; + }); + + await Assert.That(header).Contains("literal"); + } + + [Test] + public async Task EscKeepsTheDraftForTheNextF1() + { + var (closed, sent, reopened, focusBack) = await Run(rig => + { + var first = OpenF1(rig); + Type(first.Composer.Editor, "half a post"); + Press(first.Composer.Editor, Key.Escape); + var closed = rig.Driver.Composer.Overlay is null; + var focus = rig.View.IsFocused; + var second = OpenF1(rig); + return (closed, rig.Telnet.Lines.ToList(), second.Composer.Editor.Text, focus); + }); + + await Assert.That(closed).IsTrue(); + await Assert.That(sent).IsEmpty(); + await Assert.That(reopened).IsEqualTo("half a post"); + await Assert.That(focusBack).IsTrue().Because("the keyboard goes back to the cells"); + } + + [Test] + public async Task CtrlEnterAndShiftEnterAreNewlinesAndAltEnterIsTheWindows() + { + var text = await Run(rig => + { + var editor = OpenF1(rig).Composer.Editor; + Type(editor, "one"); + Press(editor, Key.Enter, KeyModifiers.Control); + Type(editor, "two"); + Press(editor, Key.Enter, KeyModifiers.Shift); + Type(editor, "three"); + return editor.Text; + }); + + await Assert.That(text).IsEqualTo("one\ntwo\nthree"); + } + + // ── spelling ───────────────────────────────────────────────────────────────────────────── + + [Test] + public async Task TheWavyLinesAreTheModelsMarks() + { + var (marks, model, cell, rects, header) = await Run( + rig => + { + var overlay = OpenF1(rig); + Type(overlay.Composer.Editor, "hello wrold\nthe waves zork"); + rig.Window.UpdateLayout(); + Drain(); + var session = overlay.Session; + var text = overlay.Composer.Editor.Text!; + return (overlay.Composer.Editor.Marks.ToList(), session.Model.Marks.ToList(), + ComposeOverlay.ModelFor("Ann", text, ComposeEscaping.AsTyped, null, Dictionary(), true).Marks.ToList(), + overlay.Composer.Editor.MarkRects().Count, overlay.Composer.HeaderText); + }, + spelling: true); + + await Assert.That(marks).IsEquivalentTo(new[] { new SpellRange(6, 5), new SpellRange(22, 4) }); + await Assert.That(marks).IsEquivalentTo(model); + await Assert.That(marks).IsEquivalentTo(cell).Because("the cell composer marks the same words"); + await Assert.That(rects).IsEqualTo(2).Because("each mark is a rectangle of the laid-out text, so a line is drawn under it"); + await Assert.That(header).Contains("en_GB"); + } + + [Test] + public async Task AltWAddsTheWordAtTheCaret() + { + var marks = await Run( + rig => + { + var editor = OpenF1(rig).Composer.Editor; + Type(editor, "hello wrold"); + Press(editor, Key.W, KeyModifiers.Alt); + return editor.Marks.ToList(); + }, + spelling: true); + + await Assert.That(marks).IsEmpty(); + } + + [Test] + public async Task TheRightClickMenuOffersSuggestionsAndReplacesTheWord() + { + var (headers, text) = await Run( + rig => + { + var composer = OpenF1(rig).Composer; + Type(composer.Editor, "hello wrold"); + var menu = composer.OpenMenu(8); + var items = menu.ItemsSource!.OfType().ToList(); + var headers = items.Select(i => i.Header?.ToString() ?? string.Empty).ToList(); + items.First(i => (string?)i.Header == "world").RaiseEvent(new RoutedEventArgs(MenuItem.ClickEvent)); + menu.Close(); + Drain(); + return (headers, composer.Editor.Text); + }, + spelling: true); + + await Assert.That(headers).Contains("world"); + await Assert.That(headers).Contains("Add “wrold” to dictionary"); + await Assert.That(headers).Contains("Proportional font"); + await Assert.That(text).IsEqualTo("hello world"); + } + + // ── MOO edits ──────────────────────────────────────────────────────────────────────────── + + [Test] + public async Task AMooEditOpensNativelyAndCtrlSSavesItsLines() + { + var (header, footer, saved, sent) = await Run(rig => + { + rig.Telnet.ReceiveMooEdit(Look); + Drain(); + var overlay = rig.Driver.Composer.Overlay!; + var editor = overlay.Composer.Editor; + editor.CaretIndex = editor.Text!.Length; + Type(editor, "\n// 100% [sure]; done\n"); + var header = overlay.Composer.HeaderText; + var footer = overlay.Composer.FooterText; + Press(editor, Key.S, KeyModifiers.Control); + return (header, footer, rig.Telnet.SavedEdits.Single().Lines.ToList(), rig.Telnet.Lines.ToList()); + }); + + await Assert.That(header).Contains("EDIT").And.Contains("Test:look").And.DoesNotContain("as typed"); + await Assert.That(footer).Contains("⌃S save").And.DoesNotContain("⌥L"); + await Assert.That(saved).IsEquivalentTo(new[] { "player:tell(\"Hi.\");", "return 1;", "// 100% [sure]; done" }); + await Assert.That(sent).IsEmpty(); + } + + // ── the docked composer ────────────────────────────────────────────────────────────────── + + private static ComposerView Dock(Rig rig) + { + rig.App.DispatchCommand("panel:composer"); + rig.App.RenderNextFrame(); + rig.App.RenderNextFrame(); + Drain(); + rig.Window.UpdateLayout(); + Drain(); + return rig.Layer.Composers.Values.Single(); + } + + [Test] + public async Task TheDockedEditorLiesOverItsPaneAndTakesTheKeyboardWhenArmed() + { + var (focused, armed, header, footer, width) = await Run(rig => + { + var composer = Dock(rig); + return (composer.Editor.IsFocused, composer.Model!.Armed, composer.HeaderText, composer.FooterText, composer.Bounds.Width); + }); + + await Assert.That(armed).IsTrue(); + await Assert.That(focused).IsTrue(); + await Assert.That(header).Contains("COMPOSE").And.Contains("to Ann"); + await Assert.That(footer).Contains("⌃S").And.Contains("Esc"); + await Assert.That(width).IsGreaterThan(0); + } + + [Test] + public async Task TypingInTheDockedEditorIsTheDraftAndCtrlSSendsIt() + { + var (draft, sent, after) = await Run(rig => + { + var composer = Dock(rig); + var windowId = composer.Session!.Model.Place == ComposerPlace.Docked ? rig.Layer.Composers.Keys.Single() : string.Empty; + Type(composer.Editor, "+pose waves\nand sits"); + var draft = rig.App.DockedComposerIn(windowId)!.Body; + Press(composer.Editor, Key.S, KeyModifiers.Control); + rig.App.RenderNextFrame(); + Drain(); + return (draft, rig.Telnet.Lines.ToList(), rig.Layer.Composers.Values.Single().Editor.Text); + }); + + await Assert.That(draft).IsEqualTo("+pose waves\nand sits"); + await Assert.That(sent).IsEquivalentTo(new[] { "+pose waves%rand sits" }); + await Assert.That(after).IsEqualTo(string.Empty).Because("the client cleared the draft, and the editor takes the client's text"); + } + + [Test] + public async Task EscReleasesToTheCellsAndAClickArmsAgain() + { + var (releasedArmed, viewFocused, rearmed, editorFocused) = await Run(rig => + { + var composer = Dock(rig); + Press(composer.Editor, Key.Escape); + rig.App.RenderNextFrame(); + Drain(); + var released = rig.App.ComposerArmed; + var view = rig.View.IsFocused; + + var centre = composer.Editor.TranslatePoint(new Point(composer.Editor.Bounds.Width / 2, composer.Editor.Bounds.Height / 2), rig.Window)!.Value; + rig.Window.MouseDown(centre, MouseButton.Left); + rig.Window.MouseUp(centre, MouseButton.Left); + Drain(); + rig.App.RenderNextFrame(); + Drain(); + return (released, view, rig.App.ComposerArmed, rig.Layer.Composers.Values.Single().Editor.IsKeyboardFocusWithin); + }); + + await Assert.That(releasedArmed).IsFalse(); + await Assert.That(viewFocused).IsTrue(); + await Assert.That(rearmed).IsTrue(); + await Assert.That(editorFocused).IsTrue(); + } + + [Test] + public async Task F1FromTheDockedEditorOpensTheSameDraftFullScreen() + { + var (body, docked) = await Run(rig => + { + var composer = Dock(rig); + Type(composer.Editor, "half a post"); + Press(composer.Editor, Key.F1); + rig.App.RenderNextFrame(); + Drain(); + return (rig.Driver.Composer.Overlay?.Composer.Editor.Text, rig.Layer.Composers.Count); + }); + + await Assert.That(body).IsEqualTo("half a post"); + await Assert.That(docked).IsEqualTo(0).Because("F1 covers the panes, as the cell modal does"); + } + + [Test] + public async Task TheDockedEditorHandsTheClientsChordsOnAndKeepsItsOwn() + { + await Assert.That(ComposerView.ReachesTheClient(Key.P, KeyModifiers.Control)).IsTrue(); + await Assert.That(ComposerView.ReachesTheClient(Key.Up, KeyModifiers.Control)).IsTrue(); + await Assert.That(ComposerView.ReachesTheClient(Key.J, KeyModifiers.Alt)).IsTrue(); + await Assert.That(ComposerView.ReachesTheClient(Key.F2, KeyModifiers.None)).IsTrue(); + await Assert.That(ComposerView.ReachesTheClient(Key.C, KeyModifiers.Control)).IsFalse(); + await Assert.That(ComposerView.ReachesTheClient(Key.Z, KeyModifiers.Control)).IsFalse(); + await Assert.That(ComposerView.ReachesTheClient(Key.Left, KeyModifiers.Alt)).IsFalse(); + await Assert.That(ComposerView.ReachesTheClient(Key.A, KeyModifiers.None)).IsFalse(); + } + + private static HeadlessUnitTestSession Session => TerminalViewTests.Session; +} diff --git a/tests/SharpMUTerm.Avalonia.Tests/SharpMUTerm.Avalonia.Tests.csproj b/tests/SharpMUTerm.Avalonia.Tests/SharpMUTerm.Avalonia.Tests.csproj index ad6993ea..1ce5bad6 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/SharpMUTerm.Avalonia.Tests.csproj +++ b/tests/SharpMUTerm.Avalonia.Tests/SharpMUTerm.Avalonia.Tests.csproj @@ -17,6 +17,9 @@ + + + diff --git a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs index abcfbce5..bc149d46 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs @@ -3,6 +3,7 @@ using Avalonia.Input; using SharpMUTerm.Client.Chrome; using SharpMUTerm.Client.Commands; +using SharpMUTerm.Client.Composer; using SharpMUTerm.Client.Palette; using SharpMUTerm.Client.Panels; using SharpMUTerm.Client.Settings; @@ -200,6 +201,45 @@ await Assert.That(Rows(palette.Session!.View(query))).IsEquivalentTo(Rows(drawn! covered.Add(SurfaceCatalog.Notice); } + // F1: the window's editor is handed the model the cell window draws for the same draft, in each mode and for a + // MOO edit. Two clients, one with the window's editor and one without, opened on the same scene. + foreach (var view in new[] { "compose", "compose-literal", "moo-edit" }) + { + using var nativeDriver = new AvaloniaConsoleDriver(140, 36); + var composer = new FakeComposer(); + await using var native = App(nativeDriver, DemoScene.Build(), composer: composer); + native.RenderSnapshot(view); + + using var cellDriver = new AvaloniaConsoleDriver(140, 36); + await using var cells = App(cellDriver, DemoScene.Build()); + cells.RenderSnapshot(view); + + await Assert.That(composer.Session).IsNotNull().Because($"{view}: F1 opened in the window's editor"); + await Assert.That(native.Composer.IsOpen).IsFalse().Because($"{view}: and not in cells under it"); + await Assert.That(cells.DrawnModel(SurfaceCatalog.Compose)).IsEqualTo((object)composer.Session!.Model).Because(view); + } + + covered.Add(SurfaceCatalog.Compose); + + // The docked composer: the panel's model is the one its cells drew in that frame, and the one a client with no + // native editor draws for the same scene. + { + using var nativeDriver = new AvaloniaConsoleDriver(140, 36); + await using var native = App(nativeDriver, DemoScene.Build(), composer: new FakeComposer()); + native.RenderSnapshot("panel-composer"); + var panel = nativeDriver.Pointer.Panels.Single(p => p.PanelId == PanelIds.Composer); + + using var cellDriver = new AvaloniaConsoleDriver(140, 36); + await using var cells = App(cellDriver, DemoScene.Build()); + cells.RenderSnapshot("panel-composer"); + + await Assert.That(panel.Composer).IsNotNull(); + await Assert.That(panel.Composer!.Body).IsNotEmpty().Because("the scene types a draft"); + await Assert.That(native.DrawnModel(PanelIds.Composer, panel.WindowId)).IsEqualTo((object)panel.Composer).Because("panel-composer"); + await Assert.That(cells.DrawnModel(PanelIds.Composer, panel.WindowId)).IsEqualTo((object)panel.Composer).Because("panel-composer: the cell client"); + covered.Add(PanelIds.Composer); + } + var drawnNatively = SurfaceCatalog.All.Where(s => s.On(SurfaceHosts.Window).HasFlag(SurfaceDrawing.Native)).Select(s => s.Id); await Assert.That(covered).IsEquivalentTo(drawnNatively).Because("every surface the window draws natively has its model compared here"); } @@ -323,10 +363,144 @@ await Same("notice: action", "layout-combat", }); probed.Add(SurfaceCatalog.Notice); + // F1: ⌃S in the window's editor and ⌃S in the cell window send the same command for the same draft — as typed and + // literal, one line and several paragraphs. Esc keeps the draft, and its mode, in both. + foreach (var (draft, literal) in new[] + { + ("+pose waves\nand sits", false), + ("say 100% [sure]; {x}", true), + ("+bbpost 1=Title\n\nFirst paragraph.\n\nSecond, 50% [done].\n", false), + ("+bbpost 1=Title\n\nFirst paragraph.\n\nSecond, 50% [done].\n", true), + }) + { + var native = await ComposeOnTheWire(native: true, draft, literal, send: true); + var cells = await ComposeOnTheWire(native: false, draft, literal, send: true); + await Assert.That(native.Sent).IsNotEmpty(); + await Assert.That(native.Sent).IsEquivalentTo(cells.Sent).Because($"compose: send '{draft}' literal={literal}"); + await Assert.That(native.Outcome).IsEqualTo(cells.Outcome); + } + + { + var native = await ComposeOnTheWire(native: true, "half a post", literal: true, send: false); + var cells = await ComposeOnTheWire(native: false, "half a post", literal: true, send: false); + await Assert.That(native.Sent).IsEmpty(); + await Assert.That(native.Outcome).IsEqualTo(cells.Outcome).Because("compose: close keeps the draft"); + await Assert.That(native.Outcome).Contains("draft=half a post literal"); + } + + probed.Add(SurfaceCatalog.Compose); + + // The docked composer: ⌃S from the window's editor and from the cells send one command to its character, and + // Esc releases it to the command line in both. + { + var native = await DockedOnTheWire(native: true); + var cells = await DockedOnTheWire(native: false); + await Assert.That(native.Sent).IsEquivalentTo(new[] { "+pose waves%rand sits" }); + await Assert.That(native.Sent).IsEquivalentTo(cells.Sent).Because("composer: send"); + await Assert.That(native.Outcome).IsEqualTo(cells.Outcome).Because("composer: release"); + probed.Add(PanelIds.Composer); + } + var acting = SurfaceCatalog.All.Where(s => s.HasNative && s.Actions.Count > 0).Select(s => s.Id); await Assert.That(probed).IsEquivalentTo(acting).Because("every native surface with actions has a probe here"); } + /// + /// A connected client writes in F1 — the window's editor through its session, or the cell + /// window through its keys — and sends it with ⌃S or closes it with Esc. What reached the wire, and the state left. + /// + private static async Task<(IReadOnlyList Sent, string Outcome)> ComposeOnTheWire(bool native, string draft, bool literal, bool send) + { + using var driver = new AvaloniaConsoleDriver(140, 36); + var composer = native ? new FakeComposer() : null; + var (app, telnet) = await Connected(driver, composer); + await using var _ = app; + app.SimulateKey(new ConsoleKeyInfo('\0', ConsoleKey.F1, false, false, false)); + if (composer is not null) + { + var session = composer.Session!; + session.Edited(draft); + if (literal) + { + session.ToggleEscaping(); + } + + if (send) + { + session.Send(draft); + } + else + { + session.Close(draft); + } + } + else + { + app.Composer.SimulateTyping(draft); + if (literal) + { + app.Composer.SimulateKey(new ConsoleKeyInfo('\0', ConsoleKey.L, false, true, false)); + } + + app.Composer.SimulateKey(send + ? new ConsoleKeyInfo('\x13', ConsoleKey.S, false, false, true) + : new ConsoleKeyInfo('\x1b', ConsoleKey.Escape, false, false, false)); + } + + // Where the draft went: reopened, F1 says what it holds and in which mode. + app.SimulateKey(new ConsoleKeyInfo('\0', ConsoleKey.F1, false, false, false)); + var held = composer is not null + ? $"{composer.Session!.Model.Body} {(composer.Session.Model.Escaping == ComposeEscaping.Literal ? "literal" : "as typed")}" + : $"{app.Composer.Body} {(app.Composer.HeaderMarkup.Contains("literal", StringComparison.Ordinal) ? "literal" : "as typed")}"; + return (telnet.Lines.ToList(), Outcome(app) + " | draft=" + held); + } + + /// + /// A connected client docks its composer, types into it — the window's editor through its session, or the cells + /// through the composer's keys — sends with ⌃S, types again and releases with Esc. + /// + private static async Task<(IReadOnlyList Sent, string Outcome)> DockedOnTheWire(bool native) + { + using var driver = new AvaloniaConsoleDriver(140, 36); + var (app, telnet) = await Connected(driver, native ? new FakeComposer() : null); + await using var _ = app; + app.DispatchCommand("panel:composer"); + app.RenderNextFrame(); + var windowId = TerminalPanels.WindowId(PanelIds.Composer, "Quiet.Ann"); + var session = native ? driver.Pointer.Panels.Single(p => p.PanelId == PanelIds.Composer).ComposerSession! : null; + if (session is not null) + { + session.Edited("+pose waves\nand sits"); + session.Send("+pose waves\nand sits"); + session.Edited("next"); + session.Release(); + } + else + { + app.SimulateComposerTyping("+pose waves\nand sits"); + app.SimulateKey(new ConsoleKeyInfo('\x13', ConsoleKey.S, false, false, true)); + app.SimulateComposerTyping("next"); + app.SimulateKey(new ConsoleKeyInfo('\x1b', ConsoleKey.Escape, false, false, false)); + } + + return (telnet.Lines.ToList(), $"{Outcome(app)} | armed={app.ComposerArmed} | docked={app.DockedComposerIn(windowId)!.Body}"); + } + + private static async Task<(SharpMUTermApp App, SharpMUTerm.Tui.Tests.RecordingTelnetSession Telnet)> Connected( + AvaloniaConsoleDriver driver, INativeComposer? composer) + { + var config = new AppConfiguration(); + var world = new WorldDefinition { Name = "Quiet", Host = "quiet.example.org", Port = 4000 }; + world.Characters.Add(new CharacterDefinition { Name = "Ann", Logging = new LoggingSettings() }); + config.Worlds.Add(world); + var app = App(driver, config, composer: composer); + var telnet = new SharpMUTerm.Tui.Tests.RecordingTelnetSession(); + app.TelnetFactory = _ => telnet; + await app.BindWorldWithoutConnecting(world).ConnectAsync(); + app.RenderNextFrame(); + return (app, telnet); + } + private static (bool Echo, int Saves) SettingsReset(bool native) { using var driver = new AvaloniaConsoleDriver(140, 36); @@ -464,7 +638,8 @@ private static SharpMUTermApp App( INativeSettings? settings = null, INativePalette? palette = null, Action? save = null, - HostKeys? keys = null) => + HostKeys? keys = null, + INativeComposer? composer = null) => new(config, WindowHost.Create(driver, clipboard: null) with { Capabilities = WindowOptions.Capabilities, @@ -475,8 +650,21 @@ private static SharpMUTermApp App( NativeSettings = settings, NativePalette = palette, Keys = keys ?? WindowHost.Keys, + NativeComposer = composer, }, save: save); + /// A window editor that only records the session it was handed, so the client's side can be driven. + private sealed class FakeComposer : INativeComposer + { + public ComposerSession? Session { get; private set; } + + public bool Available => true; + + public void Open(ComposerSession session, PanelInk ink) => Session = session; + + public void Close() => Session = null; + } + private sealed class FakeSettings : INativeSettings { public SettingsForm? Form { get; private set; } diff --git a/tests/SharpMUTerm.Client.Tests/ComposerModelTests.cs b/tests/SharpMUTerm.Client.Tests/ComposerModelTests.cs new file mode 100644 index 00000000..b5ef0d60 --- /dev/null +++ b/tests/SharpMUTerm.Client.Tests/ComposerModelTests.cs @@ -0,0 +1,138 @@ +using SharpMUTerm.Client.Composer; +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Core.Text; + +namespace SharpMUTerm.Client.Tests; + +/// +/// The composer's model both hosts draw (), the marks a dictionary puts on a whole buffer +/// (), and the channel a host's editor talks back through (). +/// +public class ComposerModelTests +{ + private static SpellChecker Dictionary() => + SpellChecker.FromStreams(new MemoryStream("4\nhello\nthe\nworld\npose\n"u8.ToArray()), new MemoryStream("SET UTF-8\n"u8.ToArray()), "en_GB"); + + private static ComposerModel Post(string body, ComposeEscaping escaping = ComposeEscaping.AsTyped, SpellChecker? spelling = null) => + ComposerModel.Create(ComposerPlace.FullScreen, "Ann", body, escaping, null, spelling, canSend: true, armed: true, revision: 1); + + [Test] + public async Task TheCommandIsComposeMessageBuildOfTheDraft() + { + foreach (var escaping in new[] { ComposeEscaping.AsTyped, ComposeEscaping.Literal }) + { + const string draft = "+bbpost 1=Title\n\nFirst, 50% [done].\n"; + await Assert.That(Post(draft, escaping).Command).IsEqualTo(ComposeMessage.Build(draft, escaping)); + } + } + + [Test] + public async Task AMooEditHasNoCommandNoDictionaryAndOnlySaveAndClose() + { + var model = ComposerModel.Create(ComposerPlace.FullScreen, "Ann", "return 1;", ComposeEscaping.Literal, + new ComposerEdit("Test:look", "moo-code"), Dictionary(), canSend: true, armed: true, revision: 1); + + await Assert.That(model.Command).IsNull(); + await Assert.That(model.Dictionary).IsNull(); + await Assert.That(model.Marks).IsEmpty(); + await Assert.That(model.Keys.Select(k => k.Key)).IsEquivalentTo(new[] { "⌃S", "Esc" }); + await Assert.That(model.Keys[0].Label).IsEqualTo("save"); + } + + [Test] + public async Task LineEndingsAreTheClientsBreaks() + { + await Assert.That(Post("a\r\nb").Body).IsEqualTo("a\nb"); + } + + [Test] + public async Task TwoModelsBuiltFromTheSameDraftAreEqual() + { + var spelling = Dictionary(); + var a = Post("hello wrold\nthe pose", spelling: spelling); + var b = Post("hello wrold\nthe pose", spelling: spelling); + + await Assert.That(a).IsEqualTo(b); + await Assert.That(a.GetHashCode()).IsEqualTo(b.GetHashCode()); + await Assert.That(a).IsNotEqualTo(a with { Revision = 2 }); + await Assert.That(a).IsNotEqualTo(Post("hello wrold\nthe pose", ComposeEscaping.Literal, spelling)); + } + + [Test] + public async Task MarksAreRangesOfTheWholeBufferOnEveryLine() + { + var body = "hello wrold\nthe pose zork"; + var marks = ComposerMarks.For(body, Dictionary()); + + await Assert.That(marks.Select(m => body.Substring(m.Start, m.Length))).IsEquivalentTo(new[] { "wrold", "zork" }); + await Assert.That(ComposerMarks.For(body, null)).IsEmpty(); + } + + [Test] + public async Task TheWordAtTheCaretIsTheOneItIsInOrJustAfter() + { + const string body = "hello wrold\nthe zork"; + await Assert.That(ComposerMarks.WordAt(body, 8)).IsEqualTo("wrold"); + await Assert.That(ComposerMarks.WordAt(body, 11)).IsEqualTo("wrold").Because("just after the word, at the line's end"); + await Assert.That(ComposerMarks.WordAt(body, body.Length)).IsEqualTo("zork"); + await Assert.That(ComposerMarks.WordAt(body, 0)).IsEqualTo("hello"); + } + + [Test] + public async Task TheDockedKeyRowSaysWhatTheCellsSay() + { + await Assert.That(ComposerModel.KeysFor(ComposerPlace.Docked, false, false, true, armed: false).Select(k => k.Label)) + .IsEquivalentTo(new[] { "click here to write", "full screen" }); + await Assert.That(ComposerModel.KeysFor(ComposerPlace.Docked, false, true, true, armed: true).Select(k => k.Key)) + .IsEquivalentTo(new[] { "⌃S", "⌥L", "⌥W", "F1", "Esc" }); + } + + [Test] + public async Task ASessionPassesGesturesOnUntilItEnds() + { + var sent = new List(); + var edited = new List(); + var session = new ComposerSession(Post(string.Empty), null, new ComposerCallbacks + { + Send = sent.Add, + Edited = edited.Add, + }); + + session.Edited("a\r\nb"); + session.Send("a\nb"); + session.End(); + session.Send("late"); + + await Assert.That(edited).IsEquivalentTo(new[] { "a\nb" }); + await Assert.That(sent).IsEquivalentTo(new[] { "a\nb" }); + await Assert.That(session.IsEnded).IsTrue(); + } + + [Test] + public async Task ASessionRaisesChangedOnlyWhenTheModelDiffers() + { + var session = new ComposerSession(Post("x"), null, new ComposerCallbacks()); + var raised = 0; + session.Changed += _ => raised++; + + session.Publish(Post("x")); + session.Publish(Post("y")); + + await Assert.That(raised).IsEqualTo(1); + await Assert.That(session.Model.Body).IsEqualTo("y"); + } + + [Test] + public async Task ASessionMarksWithTheClientsDictionaryOnlyOnceTheModelSaysOne() + { + var spelling = Dictionary(); + var none = new ComposerSession(Post("wrold"), () => spelling, new ComposerCallbacks()); + var some = new ComposerSession(Post("wrold", spelling: spelling), () => spelling, new ComposerCallbacks()); + + await Assert.That(none.Marks("wrold")).IsEmpty().Because("the model says no dictionary is open"); + await Assert.That(some.Marks("hello wrold")).IsEquivalentTo(new[] { new SpellRange(6, 5) }); + await Assert.That(some.Suggestions("wrold")).Contains("world"); + await Assert.That(some.CanAddWords).IsTrue(); + await Assert.That(none.CanAddWords).IsFalse(); + } +} diff --git a/tests/SharpMUTerm.Client.Tests/SurfaceCatalogTests.cs b/tests/SharpMUTerm.Client.Tests/SurfaceCatalogTests.cs index 48366e94..98f9c273 100644 --- a/tests/SharpMUTerm.Client.Tests/SurfaceCatalogTests.cs +++ b/tests/SharpMUTerm.Client.Tests/SurfaceCatalogTests.cs @@ -72,7 +72,7 @@ public async Task PanelSurfacesAreKnownPanels() { var panels = SurfaceCatalog.All.Where(s => s.Id is not (SurfaceCatalog.Header or SurfaceCatalog.Sidebar or SurfaceCatalog.Settings or SurfaceCatalog.LayoutsMenu or SurfaceCatalog.Palette - or SurfaceCatalog.Prefix or SurfaceCatalog.RailStrip or SurfaceCatalog.Notice)); + or SurfaceCatalog.Prefix or SurfaceCatalog.RailStrip or SurfaceCatalog.Notice or SurfaceCatalog.Compose)); foreach (var surface in panels) { await Assert.That(PanelIds.Known).Contains(surface.Id); diff --git a/tests/SharpMUTerm.Tui.Tests/NativeComposerRoutingTests.cs b/tests/SharpMUTerm.Tui.Tests/NativeComposerRoutingTests.cs new file mode 100644 index 00000000..23e1d779 --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/NativeComposerRoutingTests.cs @@ -0,0 +1,409 @@ +using System.Drawing; +using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Composer; +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Layouts; +using SharpMUTerm.Core.Telnet; +using SharpMUTerm.Graphics; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// The composer in a host with its own editor (): F1 opens there instead of the +/// cell modal, on the same draft and the same model; what the host hands back through the session ends in the methods +/// the cell composer's keys end in, so the command a world receives is the cell path's for the same text. The docked +/// composer keeps its cells, and the host's editor rides the panel channel with a session of its own. +/// +/// Serialised: rendering a frame redirects the process-global Console.Out. +[NotInParallel] +public class NativeComposerRoutingTests +{ + private static readonly TerminalCapabilities Headless = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private static readonly MooEdit Look = new("#98.look", "Test:look", "moo-code", ["player:tell(\"Hi.\");", "return 1;"]); + + private static ConsoleKeyInfo Key(ConsoleKey key, ConsoleModifiers modifiers = 0) => + new('\0', key, modifiers.HasFlag(ConsoleModifiers.Shift), + modifiers.HasFlag(ConsoleModifiers.Alt), modifiers.HasFlag(ConsoleModifiers.Control)); + + /// A host's editor that records what it was asked to show. + private sealed class FakeComposer(bool available = true) : INativeComposer + { + public bool Available { get; set; } = available; + + public List Opened { get; } = []; + + public int Closed { get; private set; } + + public ComposerSession? Last => Opened.Count > 0 ? Opened[^1] : null; + + public void Open(ComposerSession session, PanelInk ink) => Opened.Add(session); + + public void Close() => Closed++; + } + + /// Records the panels the client publishes, which is how a docked composer's editor reaches a host. + private sealed class PanelPresenter : IPointerPresenter + { + public IReadOnlyList Last { get; private set; } = []; + + public void Hover(PointerTarget target) + { + } + + public void ShowMenu(Point cell, IReadOnlyList items) + { + } + + public bool DrawsMenus => true; + + public void Scrollbars(IReadOnlyList bars) + { + } + + public void Panels(IReadOnlyList panels) => Last = panels; + } + + private sealed record Wired(SharpMUTermApp App, RecordingTelnetSession Telnet, FakeComposer Native, PanelPresenter Pointer, string Key); + + private static async Task Connected(bool native = true) + { + Console.SetIn(TextReader.Null); + var config = new AppConfiguration(); + var world = new WorldDefinition { Name = "Quiet", Host = "quiet.example.org", Port = 4000 }; + world.Characters.Add(new CharacterDefinition { Name = "Ann", Logging = new LoggingSettings() }); + config.Worlds.Add(world); + + var fake = new FakeComposer(native); + var pointer = new PanelPresenter(); + var host = ClientHost.ForHarness(Headless, new HeadlessConsoleDriver(120, 32), null, null, null) with + { + NativeComposer = fake, + Pointer = pointer, + }; + var app = new SharpMUTermApp(config, host); + var telnet = new RecordingTelnetSession(); + app.TelnetFactory = _ => telnet; + var session = app.BindWorldWithoutConnecting(world); + await session.ConnectAsync(); + app.RenderNextFrame(); + return new Wired(app, telnet, fake, pointer, session.SessionKey); + } + + /// The cell path's command for a draft: typed into the cell F1 and sent with ⌃S, escaping as given. + private static async Task SentThroughTheCells(string draft, bool literal) + { + var world = await Connected(native: false); + await using var _ = world.App; + world.App.SimulateKey(Key(ConsoleKey.F1)); + world.App.Composer.SimulateTyping(draft); + if (literal) + { + world.App.Composer.SimulateKey(Key(ConsoleKey.L, ConsoleModifiers.Alt)); + } + + world.App.Composer.SimulateKey(Key(ConsoleKey.S, ConsoleModifiers.Control)); + return world.Telnet.Lines.Single(); + } + + // ── F1 ─────────────────────────────────────────────────────────────────────────────────── + + [Test] + public async Task F1OpensTheHostsEditorAndNotTheCellModal() + { + var world = await Connected(); + await using var _ = world.App; + + world.App.SimulateKey(Key(ConsoleKey.F1)); + + await Assert.That(world.Native.Opened.Count).IsEqualTo(1); + await Assert.That(world.App.Composer.IsOpen).IsFalse().Because("the cell modal is not opened under the native editor"); + await Assert.That(world.App.NativeComposerIsOpen).IsTrue(); + + var model = world.Native.Last!.Model; + await Assert.That(model.Place).IsEqualTo(ComposerPlace.FullScreen); + await Assert.That(model.Target).IsEqualTo("Ann"); + await Assert.That(model.CanSend).IsTrue(); + await Assert.That(model.Keys.Select(k => k.Key)).IsEquivalentTo(new[] { "⌃S", "⌥L", "Esc" }); + } + + [Test] + public async Task AHostWithNowhereToDrawItGetsTheCellComposer() + { + var world = await Connected(native: false); + await using var _ = world.App; + + world.App.SimulateKey(Key(ConsoleKey.F1)); + + await Assert.That(world.Native.Opened).IsEmpty(); + await Assert.That(world.App.Composer.IsOpen).IsTrue(); + } + + [Test] + public async Task TheNativeModelIsTheModelTheCellWindowDrawsForTheSameDraft() + { + var world = await Connected(); + await using var _ = world.App; + world.App.SimulateKey(Key(ConsoleKey.F1)); + var session = world.Native.Last!; + + session.Edited("+pose waves\r\nand sits"); + session.ToggleEscaping(); + + var cell = ComposeOverlay.ModelFor("Ann", "+pose waves\nand sits", ComposeEscaping.Literal, null, null, canSend: true); + await Assert.That(session.Model).IsEqualTo(cell); + await Assert.That(ComposeOverlay.Render(session.Model)).IsEqualTo(ComposeOverlay.Render(cell)); + } + + [Test] + [Arguments("+pose waves\nand sits", false)] + [Arguments("100% [sure]; {x}", true)] + [Arguments("100% [sure]; {x}", false)] + [Arguments("+bbpost 1=Title\n\nFirst paragraph.\n\nSecond, 50% [done].\n", true)] + [Arguments("+bbpost 1=Title\n\nFirst paragraph.\n\nSecond, 50% [done].\n", false)] + public async Task CtrlSInTheHostsEditorSendsWhatTheCellComposerSends(string draft, bool literal) + { + var expected = await SentThroughTheCells(draft, literal); + + var world = await Connected(); + await using var _ = world.App; + world.App.SimulateKey(Key(ConsoleKey.F1)); + var session = world.Native.Last!; + if (literal) + { + session.ToggleEscaping(); + } + + session.Send(draft); + + await Assert.That(world.Telnet.Lines).IsEquivalentTo(new[] { expected }); + await Assert.That(expected).IsEqualTo(ComposeMessage.Build(draft, literal ? ComposeEscaping.Literal : ComposeEscaping.AsTyped)); + await Assert.That(world.App.NativeComposerIsOpen).IsFalse().Because("a send closes it"); + await Assert.That(world.Native.Closed).IsEqualTo(1); + + // Close first, forget after: the next F1 opens empty. + world.App.SimulateKey(Key(ConsoleKey.F1)); + await Assert.That(world.Native.Last!.Model.Body).IsEqualTo(string.Empty); + } + + [Test] + public async Task EscKeepsTheDraftForTheNextF1() + { + var world = await Connected(); + await using var _ = world.App; + world.App.SimulateKey(Key(ConsoleKey.F1)); + var first = world.Native.Last!; + first.ToggleEscaping(); + + first.Close("half a post"); + + await Assert.That(world.App.NativeComposerIsOpen).IsFalse(); + await Assert.That(world.Telnet.Lines).IsEmpty(); + await Assert.That(first.IsEnded).IsTrue(); + + world.App.SimulateKey(Key(ConsoleKey.F1)); + var second = world.Native.Last!; + await Assert.That(second).IsNotSameReferenceAs(first); + await Assert.That(second.Model.Body).IsEqualTo("half a post"); + await Assert.That(second.Model.Escaping).IsEqualTo(ComposeEscaping.Literal).Because("the mode travels with the draft"); + } + + [Test] + public async Task AGestureFromAnEndedSessionDoesNothing() + { + var world = await Connected(); + await using var _ = world.App; + world.App.SimulateKey(Key(ConsoleKey.F1)); + var session = world.Native.Last!; + session.Close("kept"); + + session.Send("sent late"); + + await Assert.That(world.Telnet.Lines).IsEmpty(); + } + + [Test] + public async Task F1StillRefusesOverASettingsScreen() + { + var world = await Connected(); + await using var _ = world.App; + world.App.SimulateKey(Key(ConsoleKey.F7)); + + world.App.SimulateKey(Key(ConsoleKey.F1)); + + await Assert.That(world.Native.Opened).IsEmpty(); + await Assert.That(world.App.StatusMarkup).Contains("close the settings screen first"); + } + + [Test] + public async Task NothingOpensOverTheHostsEditor() + { + var world = await Connected(); + await using var _ = world.App; + world.App.SimulateKey(Key(ConsoleKey.F1)); + + world.App.SimulateKey(Key(ConsoleKey.P, ConsoleModifiers.Control)); + world.App.SimulateKey(Key(ConsoleKey.F7)); + + await Assert.That(world.App.MenuIsOpen).IsFalse(); + await Assert.That(world.App.OpenSettingsKey).IsNull(); + await Assert.That(world.App.NativeComposerIsOpen).IsTrue(); + } + + // ── MOO edits ──────────────────────────────────────────────────────────────────────────── + + [Test] + public async Task AMooEditOpensInTheHostsEditorAndSavesItsLines() + { + var world = await Connected(); + await using var _ = world.App; + + world.Telnet.ReceiveMooEdit(Look); + + var session = world.Native.Last; + await Assert.That(session).IsNotNull(); + await Assert.That(session!.Model.Edit).IsEqualTo(new ComposerEdit("Test:look", "moo-code")); + await Assert.That(session.Model.Dictionary).IsNull().Because("a MOO edit is not checked"); + await Assert.That(session.Model.Keys.Select(k => k.Key)).IsEquivalentTo(new[] { "⌃S", "Esc" }); + await Assert.That(session.Model.Body).IsEqualTo("player:tell(\"Hi.\");\nreturn 1;"); + + session.Send(session.Model.Body + "\n// 100% [sure]; done\n"); + + var saved = world.Telnet.SavedEdits.Single(); + await Assert.That(saved.Lines).IsEquivalentTo(new[] { "player:tell(\"Hi.\");", "return 1;", "// 100% [sure]; done" }); + await Assert.That(world.Telnet.Lines).IsEmpty(); + await Assert.That(world.App.HeldMooEdit(world.Key)).IsNull(); + } + + [Test] + public async Task AMooEditIsHeldWhileSomethingElseIsOpen() + { + var world = await Connected(); + await using var _ = world.App; + world.App.SimulateKey(Key(ConsoleKey.F7)); + + world.Telnet.ReceiveMooEdit(Look); + + await Assert.That(world.Native.Opened).IsEmpty(); + await Assert.That(world.App.HeldMooEdit(world.Key)).IsEqualTo(Look); + + world.App.SimulateKey(Key(ConsoleKey.F7)); + world.App.SimulateKey(Key(ConsoleKey.F1)); + await Assert.That(world.Native.Last!.Model.Edit).IsNotNull(); + } + + [Test] + public async Task AMooEditIsHeldWhileTheHostsEditorHasAPostOpen() + { + var world = await Connected(); + await using var _ = world.App; + world.App.SimulateKey(Key(ConsoleKey.F1)); + world.Native.Last!.Edited("+bbpost 1=half written"); + + world.Telnet.ReceiveMooEdit(Look); + + await Assert.That(world.Native.Opened.Count).IsEqualTo(1).Because("a post being written is not replaced by wire input"); + await Assert.That(world.App.HeldMooEdit(world.Key)).IsEqualTo(Look); + } + + // ── the docked composer ────────────────────────────────────────────────────────────────── + + private static string OpenDocked(Wired world) + { + world.App.DispatchCommand("panel:composer"); + world.App.RenderNextFrame(); + world.App.RenderNextFrame(); + return TerminalPanels.WindowId(PanelIds.Composer, world.Key); + } + + private static PanelOverlay? DockedPanel(Wired world, string windowId) => + world.Pointer.Last.FirstOrDefault(p => p.PanelId == PanelIds.Composer && p.WindowId == windowId); + + [Test] + public async Task TheDockedComposerReachesTheHostWithTheModelItsCellsDrew() + { + var world = await Connected(); + await using var _ = world.App; + var windowId = OpenDocked(world); + + var panel = DockedPanel(world, windowId); + await Assert.That(panel).IsNotNull(); + await Assert.That((object?)panel!.Composer).IsEqualTo(world.App.DrawnModel(PanelIds.Composer, windowId)); + await Assert.That(panel.ComposerSession).IsSameReferenceAs(world.App.DockedComposerSession(windowId)); + await Assert.That(panel.Composer!.Armed).IsTrue(); + await Assert.That(panel.Composer.Place).IsEqualTo(ComposerPlace.Docked); + } + + [Test] + public async Task TheHostsTextIsTheDockedDraftAndCtrlSSendsIt() + { + var world = await Connected(); + await using var _ = world.App; + var windowId = OpenDocked(world); + var session = world.App.DockedComposerSession(windowId)!; + var before = session.Model.Revision; + + session.Edited("+pose waves\nand sits"); + + var docked = world.App.DockedComposerIn(windowId)!; + await Assert.That(docked.Body).IsEqualTo("+pose waves\nand sits"); + await Assert.That(session.Model.Body).IsEqualTo("+pose waves\nand sits"); + await Assert.That(session.Model.Revision).IsEqualTo(before).Because("the host's own typing does not move the revision"); + + session.Send("+pose waves\nand sits"); + + await Assert.That(world.Telnet.Lines).IsEquivalentTo(new[] { "+pose waves%rand sits" }); + await Assert.That(docked.Body).IsEqualTo(string.Empty); + await Assert.That(session.Model.Revision).IsGreaterThan(before).Because("the client cleared it, so the host takes the client's text"); + } + + [Test] + public async Task EscFromTheHostsEditorReleasesAndAClickArmsAgain() + { + var world = await Connected(); + await using var _ = world.App; + var windowId = OpenDocked(world); + var session = world.App.DockedComposerSession(windowId)!; + + session.Release(); + await Assert.That(world.App.ComposerArmed).IsFalse(); + await Assert.That(session.Model.Armed).IsFalse(); + await Assert.That(world.App.ArmedBarHasFocus).IsTrue(); + + session.Arm(); + await Assert.That(world.App.ComposerArmed).IsTrue(); + await Assert.That(session.Model.Armed).IsTrue(); + } + + [Test] + public async Task TheDockedEditorIsNotPublishedWhileF1IsOpenNatively() + { + var world = await Connected(); + await using var _ = world.App; + var windowId = OpenDocked(world); + world.App.DockedComposerSession(windowId)!.Edited("half a post"); + + world.App.SimulateKey(Key(ConsoleKey.F1)); + world.App.RenderNextFrame(); + + await Assert.That(DockedPanel(world, windowId)).IsNull().Because("F1 covers the panes, as the cell modal does"); + await Assert.That(world.Native.Last!.Model.Body).IsEqualTo("half a post").Because("the docked buffer is the draft F1 opens"); + + world.Native.Last!.Close("half a post and the rest"); + world.App.RenderNextFrame(); + await Assert.That(world.App.DockedComposerIn(windowId)!.Body).IsEqualTo("half a post and the rest"); + await Assert.That(DockedPanel(world, windowId)).IsNotNull(); + } + + [Test] + public async Task WithoutAHostEditorTheDockedPanelCarriesNoSession() + { + var world = await Connected(native: false); + await using var _ = world.App; + var windowId = OpenDocked(world); + + await Assert.That(DockedPanel(world, windowId)).IsNull(); + } +} From 6ff71718b4830e01a2556c1b3dbfadf023190fc9 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 08:18:50 +0000 Subject: [PATCH 031/113] Declare F2, F3, F4 and F6 as list sections, with a native master-detail editor A list declaration kind in Client (SettingsCollection, item-scoped bindings, SettingsContext): add, duplicate, delete, reorder, enable and move to another set, every change through the form's one commit and replacing lists rather than editing them. Package sets are listed read-only with copy-to-edit. The cell screens build their rows from the declarations with every ordinal and frame unchanged, plus Alt+Up/Down to move an item within its set. The desktop window draws each list section as a master-detail editor with the F2 live test under the pattern, and the trigger builder opens it on the new rule. F4's key field asks the host's own MacroKeys verdict. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 6 + CLAUDE.md | 42 +- src/SharpMUTerm.Avalonia/ListEditorView.cs | 891 ++++++++++++++++++ src/SharpMUTerm.Avalonia/SettingsWindow.cs | 50 + .../Contributions/Descriptors.cs | 40 + .../Settings/BuiltInLists.cs | 437 +++++++++ .../Settings/BuiltInSettings.cs | 18 +- src/SharpMUTerm.Client/Settings/ItemValues.cs | 175 ++++ .../Settings/SettingBinding.cs | 58 +- .../Settings/SettingsCollection.cs | 303 ++++++ .../Settings/SettingsForm.cs | 256 ++++- .../Settings/SettingsSearch.cs | 15 +- src/SharpMUTerm.Client/Settings/TextRules.cs | 51 +- .../Surfaces/SurfaceCatalog.cs | 2 +- src/SharpMUTerm.Tui/AliasesScreenRenderer.cs | 43 +- src/SharpMUTerm.Tui/DeclaredFields.cs | 85 ++ src/SharpMUTerm.Tui/KeypadScreenRenderer.cs | 41 +- src/SharpMUTerm.Tui/ScreenChrome.cs | 17 +- src/SharpMUTerm.Tui/ScreenColours.cs | 95 +- src/SharpMUTerm.Tui/ScreenLists.cs | 32 + src/SharpMUTerm.Tui/ScreenModel.cs | 7 +- src/SharpMUTerm.Tui/SettingsSession.cs | 29 + .../SharpMUTermApp.Settings.cs | 24 +- .../SharpMUTermApp.TriggerBuilder.cs | 7 + src/SharpMUTerm.Tui/TimersScreenRenderer.cs | 51 +- src/SharpMUTerm.Tui/TriggersScreenRenderer.cs | 102 +- .../DesktopLayerTests.cs | 9 +- .../ListEditorTests.cs | 220 +++++ .../NativePanelTests.cs | 30 +- .../SettingsWindowTests.cs | 4 +- .../ListSettingsTests.cs | 204 ++++ .../SettingsDeclarationTests.cs | 8 +- .../DeclaredListScreensTests.cs | 158 ++++ .../NativeSettingsRoutingTests.cs | 6 +- 34 files changed, 3274 insertions(+), 242 deletions(-) create mode 100644 src/SharpMUTerm.Avalonia/ListEditorView.cs create mode 100644 src/SharpMUTerm.Client/Settings/BuiltInLists.cs create mode 100644 src/SharpMUTerm.Client/Settings/ItemValues.cs create mode 100644 src/SharpMUTerm.Client/Settings/SettingsCollection.cs create mode 100644 tests/SharpMUTerm.Avalonia.Tests/ListEditorTests.cs create mode 100644 tests/SharpMUTerm.Client.Tests/ListSettingsTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/DeclaredListScreensTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a258638..6a866600 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,12 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- Triggers, aliases, key bindings and timers (F2, F3, F4, F6) open in the desktop window's settings as a list + beside the selected item's fields: tick a box to switch one on or off, add, copy, delete or move it up and down, + and watch the trigger's live test mark the matching lines as you type its pattern. A package's sets are shown + read-only with *Copy to edit*. *Make a trigger from the selection* opens there on the new rule. In the terminal, + Alt+Up and Alt+Down move the item under the cursor within its set, and the settings search finds every one of + their fields. - A narrow terminal gives its room to the game: below 100 columns the connection rail folds to its slim strip on its own (in the desktop window, the sidebar does), and below 100 columns or 30 rows an empty command line is one row tall and grows as you type. At 80×24 a pane is now 72 columns wide instead of 60, two rows taller, diff --git a/CLAUDE.md b/CLAUDE.md index c13d83e6..42c92908 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -1669,7 +1669,33 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] scroll away. A customised theme replaced by the picker is kept in `AppConfiguration.CustomThemes` (no schema bump), and listed. Unstyled text on a settings screen takes the scheme's ink (`ScreenChrome.Panel`/`Band` set `ForegroundColor`), not the window's, because the window is still the theme in force while one is previewed. - - Not declared yet: F2–F4, F6 and F10 are listed by title only. + - **F2, F3, F4 and F6 are list sections** (`SettingsCollection`/`SettingsCollection`, `SettingsContext`, + `SettingsItemGroup`, Client; `BuiltInSettings.Triggers`/`Aliases`/`Keypad`/`Timers` in `BuiltInLists.cs`). A + list section has `Scope = SettingScope.Item` and a `Collection`: the noun, the item fields (ordinary descriptors + whose bindings are `SettingBinding.ForItem`, reading `SettingTarget.Item`, defaults off a fresh item), and how + to list, make, copy, rename, add, delete, move within a set (`Move`) and move to another set (`MoveTo`, a + `ChoiceField` with `MovesItem`). Every list operation **replaces** the set's list rather than editing it, the + reads-cross-threads rule below. New kinds for item fields: `DecimalField` (timer interval), `HighlightField` + (`HighlightColours`, the palette F2's picker offers), `FlagsField` (`FlagWords`), `KeyField` (a chord), and + `TextRule` gains `RequiredPattern`, `TriggerPattern` (checked against the rule's own match kind), `Template`, + `Lines` and `Window`. `TextField.Suggest` gives the route its windows and the script its callbacks. Decisions: + - **A package's set is listed, read-only, and never written.** `SettingsForm.Groups` lists the player's sets, + then each installed package's (`set · Package`), and every write to one of those items is refused + (`ReadOnlyRefusal`); `CopyToEdit` copies the set into the player's own through the commit, F10's `c`. + - **What a list needs from the host is a `SettingsContext`** built on the client's thread (`ListContext`): the + route targets, the panes' recent lines (`TriggerTestLines`, so `SettingsForm.Preview` is the cell live test's + `TriggerPreview` over the same corpus), and the host's own answer to which chords a binding can have + (`MacroKeys.Verdict(Host.Keys, …)`, `MacroKeys.Bindable(Host.Keys)`). F4's key field is refused in the window + for what the *window* cannot deliver; `SetKey` also refuses a chord another binding holds. + - **The cell screens build their rows from the declarations** (`DeclaredFields.Item`, which maps each + descriptor to the cell field it always was), in the order `RowFieldOrder`/`EditorFieldOrder` name, so the + ordinals, ⇥ order and every frame are unchanged: F2's match kind is still field 10 on the heading row. + `DeclaredListScreensTests.EachCellScreenDrawsExactlyTheDeclaredFields` holds the two lists together. + - **⌥↑/⌥↓ move an item within its set on the cell screens** (`ScreenRow.Move`, `ScreenLists.Mover`, + `SettingsSession.Reorder`), saved only when it moved, the cursor following; a `⌥↑↓ moves …` hint row sits + under `Del removes …`. That is the one cell row this added. Order is meaning for a trigger (first stop wins). + - The search searches item fields too (`SettingsSearch.Searchable`). F10 is the one section left listed by + title only. - **In the window, a declared section opens a native settings window, generated from the declarations** (`ClientHost.NativeSettings` → `INativeSettings`; Client `SettingsForm`; Avalonia `SettingsWindow`, `SettingsPresenter` on the driver; `OpenSettingsScreen`/`TryOpenNativeSettings` in `SharpMUTermApp.Settings.cs`). @@ -1704,8 +1730,15 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] follows the client's theme (`SettingsForm.IsDark`, read live), so a theme card clicked here flips the window's variant and rebuilds the page. The rest of the window stays on the Simple theme the native menu and tooltips were built against. + - **A list section is a master-detail editor** (`ListEditorView`, Avalonia; `SettingsWindow.ListEditor`): the + sets and their items on the left (an enable check box per item, `+ Add`/`Copy`/`Delete`/`↑`/`↓` over it, ⌥↑/⌥↓, + Delete and Space on the list), the item's declared fields on the right, grouped. It fills the page below the + title and scrolls in its two halves. A package's set is drawn read-only with *Copy to edit*. F2's pattern field + has the live test under it, re-run on every keystroke, each matching line with the match marked. The trigger + builder opens it on the rule it made (`TryOpenNativeSettings(section, item)`); with no window it opens the cell + F2 as before. - Not done: the window is not modal. Screenshots come from a real window under Xvfb, driven with XTest - (`ux-wave4/native-settings-*.png`, `ux-wave6/settings-themes-window-*.png`). + (`ux-wave4/native-settings-*.png`, `ux-wave6/settings-themes-window-*.png`, `ux-wave7/lists-*.png`). - **In the window, ⌃P is a native palette over the window, listing the cell palette's rows** (`ClientHost.NativePalette` → `INativePalette`; Client `PaletteSession`; Avalonia `PaletteOverlay`, `PalettePresenter` on the driver; `SharpMUTermApp.NativePalette.cs`). The terminal, the snapshot, the tests and the parity harness pass null. Decisions @@ -2546,7 +2579,10 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] rows so typing never moves the rows below. - **The match kind is field 10, appended**, though it is drawn on the `match pattern` heading row: that keeps every ordinal and costs no row in a pane that already fills a 24-row screen. Switching *to* a - regex rewrites the pattern as the regex it meant, so the rule keeps matching what it matched. + regex rewrites the pattern as the regex it meant, so the rule keeps matching what it matched + (`BuiltInSettings.SetMatchType`, the one both surfaces call). + - **In the window the rule opens in the native F2** (`TryOpenNativeSettings(Section("triggers"), trigger)`), selected, + with its live test; elsewhere the cell F2 opens with the pattern being typed. - **The send group is session keys in memory** (`SendGroup`, Core; `SharpMUTermApp.SendGroup.cs`; ⌃P `group:` ids). It is never saved, because a saved group would be a standing order to send one line to several worlds. It is offered once two characters are open. Members are marked on the rail by swapping the dot for ◆/◇ in diff --git a/src/SharpMUTerm.Avalonia/ListEditorView.cs b/src/SharpMUTerm.Avalonia/ListEditorView.cs new file mode 100644 index 00000000..5c26deba --- /dev/null +++ b/src/SharpMUTerm.Avalonia/ListEditorView.cs @@ -0,0 +1,891 @@ +using System.Globalization; +using Avalonia; +using Avalonia.Automation; +using Avalonia.Controls; +using Avalonia.Controls.Templates; +using Avalonia.Controls.Documents; +using Avalonia.Input; +using Avalonia.Layout; +using Avalonia.Media; +using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Client.Settings; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Text; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Avalonia; + +/// +/// A list section (F2 triggers, F3 aliases, F4 key bindings, F6 timers) as a master-detail editor, drawn from its +/// : the items down the left grouped by trigger set, each with its enable check box, +/// and add, duplicate, delete and move above them; the selected item's declared fields on the right under their group +/// headings. A package's sets are listed read-only, with a button that copies one into the player's sets to edit. +/// F2's pattern carries the live test: how many of the recent lines it matches, and the newest few with the match +/// marked, re-run as the pattern is typed. +/// +/// Nothing here writes the configuration: every change goes to the form, which commits it through the client's own +/// save funnel; catches up once the change has landed. +/// +/// +internal sealed class ListEditorView : Grid +{ + private readonly SettingsForm _form; + private readonly SettingsSectionContribution _section; + private readonly SettingsCollection _collection; + private readonly Func _visible; + private readonly IBrush _accent; + private readonly ListBox _list; + private readonly StackPanel _detail; + private readonly List _refreshers = []; + private readonly Dictionary _controls = new(StringComparer.Ordinal); + private readonly List<(object Item, ListBoxItem Row, CheckBox Enabled)> _rows = []; + private readonly List public SettingScope Scope { get; init; } = SettingScope.App; + + /// + /// For a list section (F2, F3, F4, F6): the items it holds, grouped by the trigger set each lives in, with each + /// item's fields as ordinary s over bindings. Null for a + /// section of plain fields. A list section is drawn as a list with an editor beside it, and the settings search finds + /// its item fields like any other. + /// + public SettingsCollection? Collection { get; init; } } /// @@ -96,6 +104,12 @@ public sealed record ChoiceField(string Id, string Label, IReadOnlyList /// The choices over . public IReadOnlyList ChoicesIn(AppConfiguration config) => ChoicesFrom?.Invoke(config) ?? Choices; + + /// + /// Whether choosing moves the item to another list — an item's set: the choices are the trigger sets, and + /// a surface that keeps a cursor on the item follows it there. + /// + public bool MovesItem { get; init; } } /// A whole number within bounds. @@ -111,8 +125,34 @@ public sealed record TextField(string Id, string Label, int? MaxLength = null, b /// For : the value an unset field stands for, and is shown and opened as. public string? Fallback { get; init; } + + /// + /// Values offered as suggestions — not the permitted set — over the item being edited and what the host knows + /// (the windows a route can name), or null for none. + /// + public Func>? Suggest { get; init; } } +/// A number that may have a fraction (a timer's interval in seconds), within bounds. +public sealed record DecimalField(string Id, string Label, double Minimum, double Maximum, string? Help = null) + : SettingsField(Id, Label, Help); + +/// +/// A highlight colour, or none: a name from , or #rrggbb / idx:N for +/// one no name covers. Its binding holds a , null for none. +/// +public sealed record HighlightField(string Id, string Label, string? Help = null) : SettingsField(Id, Label, Help); + +/// Several independent flags, held as their words (): are the words. +public sealed record FlagsField(string Id, string Label, IReadOnlyList Names, string? Help = null) + : SettingsField(Id, Label, Help); + +/// +/// A key binding's chord, taken from the keyboard rather than typed. Whether a chord can fire is the host's to say — +/// — because a window and a terminal deliver different chords. +/// +public sealed record KeyField(string Id, string Label, string? Help = null) : SettingsField(Id, Label, Help); + /// /// The client's theme, picked from a list where each theme is shown as a preview (): a pane /// in a world's colours, a tinted pane, the focused pane, the command line and a tab strip, all in that theme. Its diff --git a/src/SharpMUTerm.Client/Settings/BuiltInLists.cs b/src/SharpMUTerm.Client/Settings/BuiltInLists.cs new file mode 100644 index 00000000..469ff55c --- /dev/null +++ b/src/SharpMUTerm.Client/Settings/BuiltInLists.cs @@ -0,0 +1,437 @@ +using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Core.Automation; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Text; + +namespace SharpMUTerm.Client.Settings; + +/// +/// The list sections — F2 triggers, F3 aliases, F4 key bindings, F6 timers — declared: each a +/// whose item fields are ordinary descriptors over +/// bindings. The cell screens build their rows from these fields (in their own ⇥ order, by id) and the window draws +/// them as a master-detail editor, so both list the same fields and edit the same objects. +/// +public static partial class BuiltInSettings +{ + /// F2's item groups. + public const string RuleGroup = "Rule"; + + /// Where a matched line goes and how it looks. + public const string DeliveryGroup = "Route & highlight"; + + /// What a matched line makes happen. + public const string ActionsGroup = "Actions"; + + /// The rule's switches. + public const string BehaviourGroup = "Behaviour"; + + /// + /// What the route field calls a rule that delivers nowhere of its own (a null SpawnTarget): the line goes + /// where the other matched rules send it, else to the session's own window. A new rule's route. + /// + public const string NoRoute = "(none)"; + + /// A new trigger's name and pattern — a placeholder rather than blank, because a blank pattern is refused. + public const string NewTriggerName = "New Trigger"; + + /// A new trigger's pattern. + public const string NewTriggerPattern = "text to match"; + + /// A new alias's name. + public const string NewAliasName = "New Alias"; + + /// A new alias's pattern. + public const string NewAliasPattern = "^alias$"; + + /// A new alias's expansion. + public const string NewAliasSubstitution = "look"; + + /// A new timer's name. + public const string NewTimerName = "New Timer"; + + /// A new timer's interval: a minute, long enough that a timer switched on by accident is not a flood. + public const double NewTimerIntervalSeconds = 60; + + /// A new timer's command. + public const string NewTimerCommand = "look"; + + /// A new key binding's name. + public const string NewBindingName = "New Binding"; + + /// A new key binding's command. + public const string NewBindingCommand = "look"; + + /// The shortest interval a timer may have; zero is "off", which is what its check box is for. + public const double MinIntervalSeconds = 0.1; + + /// A day: past this an interval is likelier a typo than a schedule. + public const double MaxIntervalSeconds = 86400; + + /// The words F2's match field offers, in 's order. + public static IReadOnlyList MatchTypeNames { get; } = + TriggerPatterns.Offered.Select(TriggerPatterns.Describe).ToArray(); + + /// The words F2's attributes field accepts. + public static IReadOnlyList AttributeNames { get; } = FlagWords.Names(); + + /// F2: the trigger rules of every set. + public static SettingsSectionContribution Triggers { get; } = new() + { + Id = "triggers", + Title = "Triggers & spawn routing", + Key = "F2", + Order = 20, + Scope = SettingScope.Item, + Collection = new SettingsCollection + { + Noun = "trigger", + Plural = "triggers", + Items = s => s.Triggers, + SetItems = (s, v) => s.Triggers = v, + New = (_, _) => new Trigger { Name = NewTriggerName, Pattern = NewTriggerPattern }, + Copy = t => t.Clone(), + Name = t => t.Name, + Rename = (t, v) => t.Name = v, + Title = t => t.Pattern, + Detail = t => $"{TriggerPatterns.Describe(t.MatchType)}: {t.Pattern}", + Fields = + [ + ItemFlag("enabled", "enabled", RuleGroup, t => t.Enabled, (t, v) => t.Enabled = v, + "whether the rule runs", "on off disable", () => NewTrigger()), + ItemText("name", "name", TextRule.Name, RuleGroup, (_, t) => t.Name, (_, t, v) => t.Name = v ?? t.Name, + "what the rule is called in the list", NewTrigger), + new ChoiceField("match", "match", MatchTypeNames, "how the pattern is read") + { + Group = RuleGroup, + Keywords = "contains starts wildcard regex regular expression kind", + Binding = SettingBinding.ForItem( + (_, t) => TriggerPatterns.Describe(t.MatchType), + (_, t, v) => SetMatchType(t, TriggerPatterns.Parse(v) ?? t.MatchType), + NewTrigger), + }, + ItemText("pattern", "match pattern", TextRule.TriggerPattern, RuleGroup, + (_, t) => t.Pattern, (_, t, v) => t.Pattern = v ?? t.Pattern, + "the text a line is matched against; the live test shows what it matches", NewTrigger, + "regex wildcard test preview"), + new ChoiceField("set", "set", [], "the trigger set the rule lives in") + { + Group = RuleGroup, + MovesItem = true, + Keywords = "trigger set group", + ChoicesFrom = c => c.TriggerSets.Select(s => s.Name).ToArray(), + Binding = SettingBinding.ForItem( + (c, t) => c.TriggerSets.FirstOrDefault(s => s.Triggers.Contains(t))?.Name ?? string.Empty, + (c, t, v) => Triggers!.Collection!.MoveTo(c, t, v), + NewTrigger), + }, + + new TextField("route", "route", Help: "the window the line goes to; (none) leaves it where other rules send it") + { + Group = DeliveryGroup, + Rule = TextRule.Window, + Keywords = "spawn window capture channel tab destination", + Suggest = (t, context) => Routes((Trigger)t.Item!, context.Windows), + Binding = SettingBinding.ForItem( + (_, t) => t.Actions.SpawnTarget ?? NoRoute, + (_, t, v) => t.Actions.SpawnTarget = v is null || v == NoRoute ? null : v.Trim(), + NewTrigger), + }, + new HighlightField("fg", "highlight fg", "the colour the matched text is drawn in") + { + Group = DeliveryGroup, + Keywords = "colour color foreground", + Binding = SettingBinding.ForItem( + (_, t) => t.Actions.HighlightForeground, (_, t, v) => t.Actions.HighlightForeground = v, NewTrigger, + HighlightColours.Format), + }, + new HighlightField("bg", "highlight bg", "the colour behind the matched text") + { + Group = DeliveryGroup, + Keywords = "colour color background", + Binding = SettingBinding.ForItem( + (_, t) => t.Actions.HighlightBackground, (_, t, v) => t.Actions.HighlightBackground = v, NewTrigger, + HighlightColours.Format), + }, + new FlagsField("attributes", "attributes", AttributeNames, "added to the matched text") + { + Group = DeliveryGroup, + Keywords = "bold underline italic", + Binding = SettingBinding.ForItem( + (_, t) => FlagWords.Format(t.Actions.AddAttributes), + (_, t, v) => t.Actions.AddAttributes = FlagWords.Parse(v), + NewTrigger), + }, + ItemFlag("gag", "gag line", DeliveryGroup, t => t.Actions.Gag, (t, v) => t.Actions.Gag = v, + "keep the line out of its usual window", "hide suppress", () => NewTrigger()), + + ItemText("rewrite", "rewrite", TextRule.Template, ActionsGroup, + (_, t) => t.Actions.Rewrite, (_, t, v) => t.Actions.Rewrite = v, + "replace the line with this; $1..$9 insert captures", NewTrigger, "substitute replace"), + ItemText("respond", "respond", TextRule.Template, ActionsGroup, + (_, t) => t.Actions.SendResponse, (_, t, v) => t.Actions.SendResponse = v, + "send this to the game; $1..$9 insert captures", NewTrigger, "send command reply"), + new TextField("script", "script", Help: "a Lua function to call") + { + Group = ActionsGroup, + Rule = TextRule.Template, + Keywords = "lua callback function", + Suggest = (t, _) => Callbacks(t.Config, ((Trigger)t.Item!).Actions.ScriptCallback), + Binding = SettingBinding.ForItem( + (_, t) => t.Actions.ScriptCallback, (_, t, v) => t.Actions.ScriptCallback = v, NewTrigger), + }, + + ItemFlag("stop", "stop processing", BehaviourGroup, t => t.StopProcessing, (t, v) => t.StopProcessing = v, + "no later rule sees a line this one matched", "halt last", () => NewTrigger()), + ItemFlag("case", "case sensitive", BehaviourGroup, t => t.CaseSensitive, (t, v) => t.CaseSensitive = v, + "match capitals exactly", "uppercase", () => NewTrigger()), + ], + }, + }; + + /// F3: the aliases of every set. + public static SettingsSectionContribution Aliases { get; } = new() + { + Id = "aliases", + Title = "Aliases", + Key = "F3", + Order = 30, + Scope = SettingScope.Item, + Collection = new SettingsCollection + { + Noun = "alias", + Plural = "aliases", + Items = s => s.Aliases, + SetItems = (s, v) => s.Aliases = v, + New = (_, _) => NewAlias(), + Copy = a => a.Clone(), + Name = a => a.Name, + Rename = (a, v) => a.Name = v, + Title = a => a.Pattern, + Detail = a => $"{a.Pattern} → {a.Substitution.Replace('\n', ';')}", + Fields = + [ + ItemFlag("enabled", "enabled", RuleGroup, a => a.Enabled, (a, v) => a.Enabled = v, + "whether the alias runs", "on off disable", NewAlias), + ItemText("name", "name", TextRule.Name, RuleGroup, (_, a) => a.Name, (_, a, v) => a.Name = v ?? a.Name, + "what the alias is called in the list", NewAlias), + ItemText("pattern", "match pattern", TextRule.RequiredPattern, RuleGroup, + (_, a) => a.Pattern, (_, a, v) => a.Pattern = v ?? a.Pattern, + "a regular expression matched against what you type", NewAlias, "regex command"), + ItemText("expansion", "expansion", TextRule.Lines, RuleGroup, + (_, a) => a.Substitution, (_, a, v) => a.Substitution = v ?? a.Substitution, + "what is sent instead, one command per line; $1..$9 insert captures", NewAlias, "substitution send"), + OwnerField(s => s.Aliases, NewAlias, () => Aliases!), + ItemFlag("case", "case sensitive", BehaviourGroup, a => a.CaseSensitive, (a, v) => a.CaseSensitive = v, + "match capitals exactly", "uppercase", NewAlias), + ], + }, + }; + + /// F6: the timers of every set. + public static SettingsSectionContribution Timers { get; } = new() + { + Id = "timers", + Title = "Timers", + Key = "F6", + Order = 50, + Scope = SettingScope.Item, + Collection = new SettingsCollection + { + Noun = "timer", + Plural = "timers", + CanDuplicate = false, + Items = s => s.Timers, + SetItems = (s, v) => s.Timers = v, + New = (_, _) => NewTimer(), + Copy = t => new TimerDefinition + { + Name = t.Name, IntervalSeconds = t.IntervalSeconds, Command = t.Command, OneShot = t.OneShot, + Enabled = t.Enabled, ScriptCallback = t.ScriptCallback, + }, + Name = t => t.Name, + Rename = (t, v) => t.Name = v, + Title = t => t.Command, + Detail = t => $"every {t.IntervalSeconds.ToString("0.####", System.Globalization.CultureInfo.InvariantCulture)} s: {t.Command}", + Fields = + [ + ItemFlag("enabled", "enabled", RuleGroup, t => t.Enabled, (t, v) => t.Enabled = v, + "whether the timer fires", "on off disable", NewTimer), + ItemText("name", "name", TextRule.Name, RuleGroup, (_, t) => t.Name, (_, t, v) => t.Name = v ?? t.Name, + "what the timer is called in the list", NewTimer), + new DecimalField("interval", "interval", MinIntervalSeconds, MaxIntervalSeconds, "seconds between firings") + { + Group = RuleGroup, + Keywords = "period seconds every repeat", + Binding = SettingBinding.ForItem( + (_, t) => t.IntervalSeconds, (_, t, v) => t.IntervalSeconds = v, NewTimer), + }, + ItemText("command", "command", TextRule.Required, RuleGroup, + (_, t) => t.Command, (_, t, v) => t.Command = v ?? t.Command, "what is sent each time", NewTimer, "send"), + OwnerField(s => s.Timers, NewTimer, () => Timers!), + ItemFlag("one-shot", "one-shot", BehaviourGroup, t => t.OneShot, (t, v) => t.OneShot = v, + "fire once and stop", "once single", NewTimer), + ], + }, + }; + + /// F4: the key bindings of every set. + public static SettingsSectionContribution Keypad { get; } = new() + { + Id = "keypad", + Title = "Keypad & hotkeys", + Key = "F4", + Order = 40, + Scope = SettingScope.Item, + Collection = new SettingsCollection + { + Noun = "binding", + Plural = "bindings", + CanDuplicate = false, + Items = s => s.Macros, + SetItems = (s, v) => s.Macros = v, + New = (context, all) => context.Bindable.FirstOrDefault(k => !all.Any(m => string.Equals(m.Key, k, StringComparison.OrdinalIgnoreCase))) + is { } key + ? new Macro { Name = NewBindingName, Key = key, Command = NewBindingCommand } + : null, + Copy = m => new Macro { Name = m.Name, Key = m.Key, Enabled = m.Enabled, Command = m.Command, ScriptCallback = m.ScriptCallback }, + Name = m => m.Name, + Rename = (m, v) => m.Name = v, + Title = m => m.Key, + Detail = m => $"{m.Key}: {m.Command}", + Fields = + [ + ItemFlag("enabled", "enabled", RuleGroup, m => m.Enabled, (m, v) => m.Enabled = v, + "whether the binding answers its key", "on off disable", NewMacro), + ItemText("name", "name", TextRule.Name, RuleGroup, (_, m) => m.Name, (_, m, v) => m.Name = v ?? m.Name, + "what the binding is called in the list", NewMacro), + ItemText("command", "command", TextRule.Required, RuleGroup, + (_, m) => m.Command, (_, m, v) => m.Command = v ?? m.Command, "what the key sends", NewMacro, "send"), + new KeyField("key", "key", "the chord that runs it; press it to set it") + { + Group = RuleGroup, + Keywords = "hotkey chord shortcut macro keypad", + Binding = SettingBinding.ForItem((_, m) => m.Key, (_, m, v) => m.Key = v, NewMacro), + }, + OwnerField(s => s.Macros, NewMacro, () => Keypad!), + ], + }, + }; + + /// + /// Changes how a rule's pattern is read. Moving to a regex rewrites the pattern as the regex it already + /// meant, so the rule goes on matching exactly what it matched; moving away leaves the text as typed. + /// + public static void SetMatchType(Trigger trigger, TriggerMatchType type) + { + ArgumentNullException.ThrowIfNull(trigger); + if (type == TriggerMatchType.Regex && trigger.MatchType != TriggerMatchType.Regex) + { + trigger.Pattern = TriggerPatterns.ToRegex(trigger.MatchType, trigger.Pattern); + } + + trigger.MatchType = type; + } + + /// + /// The routes offered for : (none), main, every window the host knows, and + /// the rule's own — suggestions, not the permitted set: a new name makes a new capture window. + /// + public static IReadOnlyList Routes(Trigger trigger, IReadOnlyList? windows) + { + ArgumentNullException.ThrowIfNull(trigger); + var routes = new List { NoRoute, TriggerActions.MainWindow }; + foreach (var target in (windows ?? []).Append(trigger.Actions.SpawnTarget ?? NoRoute)) + { + if (!string.IsNullOrEmpty(target) && !routes.Contains(target, StringComparer.Ordinal)) + { + routes.Add(target); + } + } + + return routes; + } + + /// Every script callback the configuration names (and ), as suggestions. + public static IReadOnlyList Callbacks(AppConfiguration config, string? own) + { + ArgumentNullException.ThrowIfNull(config); + var named = new List(); + var all = config.TriggerSets.SelectMany(set => set.Triggers.Select(t => t.Actions.ScriptCallback) + .Concat(set.Aliases.Select(a => a.ScriptCallback)) + .Concat(set.Timers.Select(t => t.ScriptCallback)) + .Concat(set.Macros.Select(m => m.ScriptCallback))) + .Append(own); + foreach (var callback in all) + { + if (!string.IsNullOrWhiteSpace(callback) && !named.Contains(callback, StringComparer.Ordinal)) + { + named.Add(callback); + } + } + + return named; + } + + private static Trigger NewTrigger() => new() { Name = NewTriggerName, Pattern = NewTriggerPattern }; + + private static Alias NewAlias() => + new() { Name = NewAliasName, Pattern = NewAliasPattern, Substitution = NewAliasSubstitution }; + + private static TimerDefinition NewTimer() => new() + { + Name = NewTimerName, IntervalSeconds = NewTimerIntervalSeconds, Command = NewTimerCommand, Enabled = false, + }; + + private static Macro NewMacro() => new() { Name = NewBindingName, Key = "F12", Command = NewBindingCommand }; + + private static BoolField ItemFlag( + string id, + string label, + string group, + Func get, + Action set, + string? help, + string? keywords, + Func fresh) + where TItem : class => + new(id, label, help) + { + Group = group, + Keywords = keywords, + Binding = SettingBinding.ForItem((_, i) => get(i), (_, i, v) => set(i, v), fresh, v => v ? "on" : "off"), + }; + + private static TextField ItemText( + string id, + string label, + TextRule rule, + string group, + Func get, + Action set, + string? help, + Func fresh, + string? keywords = null) + where TItem : class => + new(id, label, Help: help) + { + Group = group, + Rule = rule, + Keywords = keywords, + Binding = SettingBinding.ForItem(get, set, fresh), + }; + + private static ChoiceField OwnerField( + Func> items, Func fresh, Func section) + where TItem : class => + new("set", "set", [], "the trigger set it lives in") + { + Group = RuleGroup, + MovesItem = true, + Keywords = "trigger set group", + ChoicesFrom = c => c.TriggerSets.Select(s => s.Name).ToArray(), + Binding = SettingBinding.ForItem( + (c, i) => c.TriggerSets.FirstOrDefault(s => items(s).Contains(i))?.Name ?? string.Empty, + (c, i, v) => section().Collection!.MoveTo(c, i, v), + fresh), + }; +} diff --git a/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs b/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs index 5f00f041..c5053f78 100644 --- a/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs +++ b/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs @@ -15,7 +15,7 @@ namespace SharpMUTerm.Client.Settings; /// else written — the default is read off a fresh , never restated here. /// /// -public static class BuiltInSettings +public static partial class BuiltInSettings { /// F7's groups, in the order they are drawn. The theme: the client's own colours, picked with a preview. public const string ThemeGroup = "Theme"; @@ -359,19 +359,25 @@ public static class BuiltInSettings }; /// Every section the client declares, in their order: the screens F2 to F10. - public static IReadOnlyList All { get; } = + /// + /// Built on first read rather than in a field initializer: the list sections are declared in another file of this + /// partial class, and the order static initializers run in across files is not one to depend on. + /// + public static IReadOnlyList All => _all ??= [ World, - Listed("triggers", "Triggers & spawn routing", "F2", 20), - Listed("aliases", "Aliases", "F3", 30), - Listed("keypad", "Keypad & hotkeys", "F4", 40), - Listed("timers", "Timers", "F6", 50), + Triggers, + Aliases, + Keypad, + Timers, Text, Input, Character, Listed("packages", "Packages", "F10", 90), ]; + private static IReadOnlyList? _all; + /// Registers every built-in section. public static void Register(SettingsSectionList sections) { diff --git a/src/SharpMUTerm.Client/Settings/ItemValues.cs b/src/SharpMUTerm.Client/Settings/ItemValues.cs new file mode 100644 index 00000000..31ce5e9c --- /dev/null +++ b/src/SharpMUTerm.Client/Settings/ItemValues.cs @@ -0,0 +1,175 @@ +using System.Globalization; +using SharpMUTerm.Core.Text; + +namespace SharpMUTerm.Client.Settings; + +/// +/// The colours a trigger's highlight is picked from, and how one is written as text: a short palette of names, plus +/// #rrggbb and idx:N for a colour already in the configuration that no name covers. Both hosts read +/// and write a highlight through this, so the cell field and the native picker accept and show the same things. +/// +public static class HighlightColours +{ + /// What "no colour" reads and is typed as. + public const string None = "none"; + + /// The terminal's default colour, as a name. + public const string DefaultName = "default"; + + /// The names a picker steps through, first. + public static IReadOnlyList Palette { get; } = + [ + None, "red", "orange", "gold", "yellow", "lime", "green", "cyan", "teal", + "blue", "magenta", "purple", "pink", "white", "silver", "grey", "black", + ]; + + /// A colour as text: a palette name where one matches, else #rrggbb or idx:N. + public static string Format(TerminalColor? colour) + { + if (colour is not { } value) + { + return None; + } + + foreach (var name in Palette) + { + if (name != None && WebColors.TryParse(name, out var named) && named == value) + { + return name; + } + } + + return value.Kind switch + { + TerminalColorKind.Rgb => $"#{value.R:x2}{value.G:x2}{value.B:x2}", + TerminalColorKind.Indexed => $"idx:{value.Index.ToString(CultureInfo.InvariantCulture)}", + _ => DefaultName, + }; + } + + /// Reads a colour as writes it (or any web colour name); false when it is none of those. + public static bool TryParse(string text, out TerminalColor? colour) + { + ArgumentNullException.ThrowIfNull(text); + + colour = null; + var trimmed = text.Trim(); + if (trimmed.Length == 0 || trimmed.Equals(None, StringComparison.OrdinalIgnoreCase)) + { + return true; + } + + if (trimmed.Equals(DefaultName, StringComparison.OrdinalIgnoreCase)) + { + colour = TerminalColor.Default; + return true; + } + + if (trimmed.StartsWith("idx:", StringComparison.OrdinalIgnoreCase) + && int.TryParse(trimmed.AsSpan(4), NumberStyles.Integer, CultureInfo.InvariantCulture, out var index) + && index is >= 0 and <= 255) + { + colour = TerminalColor.FromIndex(index); + return true; + } + + if (WebColors.TryParse(trimmed, out var parsed)) + { + colour = parsed; + return true; + } + + return false; + } + + /// A colour as #rrggbb for a swatch, or null for none and the terminal's default. + public static string? Hex(TerminalColor? colour) => colour switch + { + { Kind: TerminalColorKind.Rgb } c => $"#{c.R:x2}{c.G:x2}{c.B:x2}", + { Kind: TerminalColorKind.Indexed } c => AnsiPalette.ToRgb(c.Index).ToHex(), + _ => null, + }; +} + +/// +/// A [Flags] enumeration written as words — bold underline, or none — the way a trigger's added +/// attributes are typed on the cell screen and ticked in the window. +/// +public static class FlagWords +{ + /// What a set with nothing in it reads and is typed as. + public const string NoFlags = "none"; + + private static readonly char[] Separators = [' ', '\t', ',', '|', '+']; + + /// Every non-zero member, lower-cased, in declaration order. + public static IReadOnlyList Names() + where TEnum : struct, Enum => + Enum.GetValues() + .Where(v => Convert.ToInt64(v, CultureInfo.InvariantCulture) != 0) + .Select(v => v.ToString().ToLowerInvariant()) + .ToArray(); + + /// A value as its words, or . + public static string Format(TEnum value) + where TEnum : struct, Enum + { + var bits = Convert.ToInt64(value, CultureInfo.InvariantCulture); + var set = Enum.GetValues() + .Select(v => (Name: v.ToString().ToLowerInvariant(), Bits: Convert.ToInt64(v, CultureInfo.InvariantCulture))) + .Where(f => f.Bits != 0 && (bits & f.Bits) == f.Bits) + .Select(f => f.Name) + .ToArray(); + + return set.Length == 0 ? NoFlags : string.Join(' ', set); + } + + /// Whether a typed list names . + public static bool IsListed(string spec, string name) + { + ArgumentNullException.ThrowIfNull(spec); + return spec.Split(Separators, StringSplitOptions.RemoveEmptyEntries) + .Any(word => string.Equals(word, name, StringComparison.OrdinalIgnoreCase)); + } + + /// The first word of a typed list that names nothing in , or null. + public static string? Unknown(string value, IReadOnlyList names) + { + ArgumentNullException.ThrowIfNull(value); + ArgumentNullException.ThrowIfNull(names); + foreach (var word in value.Split(Separators, StringSplitOptions.RemoveEmptyEntries)) + { + if (!string.Equals(word, NoFlags, StringComparison.OrdinalIgnoreCase) + && !names.Contains(word, StringComparer.OrdinalIgnoreCase)) + { + return word; + } + } + + return null; + } + + /// The value a typed list names; words that name nothing are ignored. + public static TEnum Parse(string value) + where TEnum : struct, Enum + { + ArgumentNullException.ThrowIfNull(value); + var members = Enum.GetValues() + .Select(v => (Name: v.ToString(), Bits: Convert.ToInt64(v, CultureInfo.InvariantCulture))) + .ToArray(); + + var bits = 0L; + foreach (var word in value.Split(Separators, StringSplitOptions.RemoveEmptyEntries)) + { + foreach (var member in members) + { + if (string.Equals(member.Name, word, StringComparison.OrdinalIgnoreCase)) + { + bits |= member.Bits; + } + } + } + + return (TEnum)Enum.ToObject(typeof(TEnum), bits); + } +} diff --git a/src/SharpMUTerm.Client/Settings/SettingBinding.cs b/src/SharpMUTerm.Client/Settings/SettingBinding.cs index 690f3aa1..8c9120b4 100644 --- a/src/SharpMUTerm.Client/Settings/SettingBinding.cs +++ b/src/SharpMUTerm.Client/Settings/SettingBinding.cs @@ -18,6 +18,12 @@ public enum SettingScope /// One character: a property of a . Character, + + /// + /// One item of a list section (): a property of a rule, an alias, a timer or a key + /// binding, edited on the item a surface has selected (). + /// + Item, } /// @@ -28,8 +34,9 @@ public enum SettingScope /// The live configuration. /// The world a world-scoped field edits, or null. /// The character a character-scoped field edits, or null. +/// The item (a trigger, an alias, a timer, a key binding) an item-scoped field edits, or null. public readonly record struct SettingTarget( - AppConfiguration Config, WorldDefinition? World = null, CharacterDefinition? Character = null) + AppConfiguration Config, WorldDefinition? World = null, CharacterDefinition? Character = null, object? Item = null) { /// An app-wide target over . public static implicit operator SettingTarget(AppConfiguration config) => new(config); @@ -39,6 +46,7 @@ public readonly record struct SettingTarget( { SettingScope.World => World is not null, SettingScope.Character => Character is not null, + SettingScope.Item => Item is not null, _ => true, }; } @@ -95,6 +103,7 @@ public sealed class SettingBinding : SettingBinding private readonly Func? _format; private readonly Func? _describe; private readonly Lazy _defaultText; + private readonly Func _fresh = FreshTarget; /// Reads the value. It must not change the configuration. /// Writes the value. @@ -127,9 +136,11 @@ private SettingBinding( Action set, Func? format, Func? describe, - bool resettable) + bool resettable, + Func? fresh = null) { _scope = scope; + _fresh = fresh ?? FreshTarget; _get = get; _set = set; _format = format; @@ -177,6 +188,37 @@ public static SettingBinding ForCharacter( resettable); } + /// + /// A field of one item of a list section — a trigger, an alias, a timer, a key binding — read and written on the + /// item a surface has selected, which must be a . Not resettable unless asked: a rule's + /// pattern has no default worth going back to, and an item's fields are its identity. + /// + /// Reads the value; the configuration is there for what a value is looked up in (the sets). + /// Writes the value. + /// A new item, which is what the default is read off. + /// As for the app-wide constructor. + /// Whether the field offers a reset. + public static SettingBinding ForItem( + Func get, + Action set, + Func fresh, + Func? format = null, + bool resettable = false) + where TItem : class + { + ArgumentNullException.ThrowIfNull(get); + ArgumentNullException.ThrowIfNull(set); + ArgumentNullException.ThrowIfNull(fresh); + return new SettingBinding( + SettingScope.Item, + t => get(t.Config, (TItem)t.Item!), + (t, v) => set(t.Config, (TItem)t.Item!, v), + format, + null, + resettable, + () => new SettingTarget(new AppConfiguration(), Item: fresh())); + } + /// public override SettingScope Scope => _scope; @@ -190,7 +232,10 @@ public static SettingBinding ForCharacter( /// The default, read off a fresh configuration (and a fresh world and character) each time — so a default /// that is a list is never one instance shared between every configuration that is reset to it. /// - public T Default => _get(new SettingTarget(new AppConfiguration(), new WorldDefinition(), new CharacterDefinition())); + public T Default => _get(_fresh()); + + private static SettingTarget FreshTarget() => + new(new AppConfiguration(), new WorldDefinition(), new CharacterDefinition()); /// A value as text. public string Format(T value) => @@ -219,7 +264,12 @@ public override string Text(SettingTarget target) { if (!target.Reaches(_scope)) { - return _scope == SettingScope.World ? "per world" : "per character"; + return _scope switch + { + SettingScope.World => "per world", + SettingScope.Character => "per character", + _ => "per item", + }; } var value = Get(target); diff --git a/src/SharpMUTerm.Client/Settings/SettingsCollection.cs b/src/SharpMUTerm.Client/Settings/SettingsCollection.cs new file mode 100644 index 00000000..37dca1df --- /dev/null +++ b/src/SharpMUTerm.Client/Settings/SettingsCollection.cs @@ -0,0 +1,303 @@ +using System.Globalization; +using System.Text.Json; +using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Core.Configuration; + +namespace SharpMUTerm.Client.Settings; + +/// +/// What a host knows that a list section's fields need and the configuration does not hold: the windows a trigger can +/// route to (the workspace's), the recent output a trigger's pattern is tested against (the panes'), and which chords +/// this host can deliver to a key binding. Captured on the client's thread when a surface opens. +/// +/// The windows a route can name beyond (none) and main. +/// Recent output, oldest first, the newest of which a pattern is tested against. +/// Why a chord cannot fire in this host, or null when it can. +/// The chords a new key binding may be born on, in the order a host offers them. +public sealed record SettingsContext( + IReadOnlyList Windows, + IReadOnlyList Lines, + Func KeyProblem, + IReadOnlyList Bindable) +{ + /// Nothing known: no windows, no output, every chord allowed, none offered to a new binding. + public static SettingsContext Empty { get; } = new([], [], _ => null, []); +} + +/// +/// One trigger set as a list section shows it: its items of the section's kind, and whether they may be edited. A +/// package's sets are listed read-only — a package update replaces them wholesale, so an edit there would be lost +/// — and offer a copy into the player's own sets instead. +/// +/// The set. +/// What the list calls it: the set's name, and the package's for a package's set. +/// Whether it is a package's, and refuses edits. +/// The package it came from, or null for one of the player's own. +/// Its items of the section's kind, in order. +public sealed record SettingsItemGroup( + TriggerSet Set, string Label, bool ReadOnly, string? PackageId, IReadOnlyList Items); + +/// +/// A list section's declaration (F2's triggers, F3's aliases, F4's key bindings, F6's timers): the items, each held in +/// a ; each item's fields as ordinary s over +/// bindings; and add, duplicate, delete, reorder and enable. Both hosts draw a list +/// section from this — the cells as their list-and-editor screen, the window as a master-detail editor — so the two +/// list the same fields and edit the same objects. +/// +/// Lists are replaced, never edited in place: an add, a delete or a move builds the set's new list and assigns +/// it, so a host reading the configuration on its own thread never meets a list half-way through a change. The +/// operations here are pure over the configuration; a surface runs them through its save funnel. +/// +/// +public abstract class SettingsCollection +{ + /// What one item is called (trigger). + public required string Noun { get; init; } + + /// What several are called (triggers). + public required string Plural { get; init; } + + /// Every field of an item, in the order a form shows them. + public required IReadOnlyList Fields { get; init; } + + /// The id of the field that enables the item, which a list shows as each row's check box. + public string EnabledField { get; init; } = "enabled"; + + /// The id of the field naming the item. + public string NameField { get; init; } = "name"; + + /// Whether an item can be duplicated (a timer cannot: its copy would differ in everything). + public bool CanDuplicate { get; init; } = true; + + /// A field by id. + public SettingsField Field(string id) => + Fields.FirstOrDefault(f => string.Equals(f.Id, id, StringComparison.Ordinal)) + ?? throw new InvalidOperationException($"The {Plural} declare no field '{id}'."); + + /// The items of , in order. + public abstract IReadOnlyList ItemsIn(TriggerSet set); + + /// Whether is one of this collection's kind. + public abstract bool IsItem(object item); + + /// What a list row says for : its name, or what it does when it has none. + public abstract string TitleOf(object item); + + /// The second line a list row says (a pattern, an interval), or null. + public abstract string? DetailOf(object item); + + /// Whether is enabled. + public bool IsEnabled(AppConfiguration config, object item) => + Field(EnabledField).Binding is SettingBinding flag && flag.Get(new SettingTarget(config, Item: item)); + + /// + /// A new item for , named so it can be told from the rest, not yet added; null when none can + /// be made (every chord a key binding could be born on is taken). + /// + public abstract object? Create(AppConfiguration config, SettingsContext context); + + /// A deep copy of , renamed, not yet added. + public abstract object Duplicate(AppConfiguration config, object item); + + /// Replaces 's items with . + protected abstract void Replace(TriggerSet set, IEnumerable items); + + /// The set holding among , or null. + public TriggerSet? OwnerOf(IEnumerable sets, object item) + { + ArgumentNullException.ThrowIfNull(sets); + return sets.FirstOrDefault(s => ItemsIn(s).Any(i => ReferenceEquals(i, item))); + } + + /// Adds at the end of . + public void Add(TriggerSet set, object item) + { + ArgumentNullException.ThrowIfNull(set); + ArgumentNullException.ThrowIfNull(item); + Replace(set, [.. ItemsIn(set), item]); + } + + /// Puts straight after in the set that holds it. + public void InsertAfter(AppConfiguration config, object source, object copy) + { + ArgumentNullException.ThrowIfNull(config); + if (OwnerOf(config.TriggerSets, source) is not { } set) + { + return; + } + + var items = ItemsIn(set).ToList(); + items.Insert(items.FindIndex(i => ReferenceEquals(i, source)) + 1, copy); + Replace(set, items); + } + + /// Takes out of whichever of the configuration's sets holds it. + public bool Delete(AppConfiguration config, object item) + { + ArgumentNullException.ThrowIfNull(config); + if (OwnerOf(config.TriggerSets, item) is not { } set) + { + return false; + } + + Replace(set, ItemsIn(set).Where(i => !ReferenceEquals(i, item))); + return true; + } + + /// + /// Moves places within its set — order is meaning for a trigger + /// (the first match that stops processing wins) — and false when it is already at that end. + /// + public bool Move(AppConfiguration config, object item, int delta) + { + ArgumentNullException.ThrowIfNull(config); + if (OwnerOf(config.TriggerSets, item) is not { } set) + { + return false; + } + + var items = ItemsIn(set).ToList(); + var at = items.FindIndex(i => ReferenceEquals(i, item)); + var to = at + delta; + if (to < 0 || to >= items.Count || to == at) + { + return false; + } + + items.RemoveAt(at); + items.Insert(to, item); + Replace(set, items); + return true; + } + + /// Moves to the end of the set named . + public void MoveTo(AppConfiguration config, object item, string name) + { + ArgumentNullException.ThrowIfNull(config); + var target = config.TriggerSets.FirstOrDefault(s => string.Equals(s.Name, name?.Trim(), StringComparison.OrdinalIgnoreCase)); + if (target is null || OwnerOf(config.TriggerSets, item) is not { } owner || ReferenceEquals(owner, target)) + { + return; + } + + Replace(owner, ItemsIn(owner).Where(i => !ReferenceEquals(i, item))); + Add(target, item); + } + + /// + /// , or — when another item already has it — the first of name 2, name 3… that + /// none has. The cell screens' rule (ScreenLists.Available). + /// + public static string Available(IEnumerable taken, string name) + { + ArgumentNullException.ThrowIfNull(taken); + var used = new HashSet(taken, StringComparer.OrdinalIgnoreCase); + var candidate = name; + for (var n = 2; used.Contains(candidate); n++) + { + candidate = $"{name} {n.ToString(CultureInfo.InvariantCulture)}"; + } + + return candidate; + } + + /// + /// A copy of a package's among the player's own, named (copy) when its name is taken + /// — F10's c, one set at a time. The copy is a deep one, so editing it never touches the package's. + /// + public static TriggerSet CopyToEdit(AppConfiguration config, TriggerSet set) + { + ArgumentNullException.ThrowIfNull(config); + ArgumentNullException.ThrowIfNull(set); + var copy = JsonSerializer.Deserialize( + JsonSerializer.SerializeToUtf8Bytes(set, ConfigurationStore.SerializerOptions), ConfigurationStore.SerializerOptions)!; + var name = set.Name; + for (var n = 1; config.TriggerSets.Any(s => string.Equals(s.Name, name, StringComparison.OrdinalIgnoreCase)); n++) + { + name = n == 1 ? $"{set.Name} (copy)" : $"{set.Name} (copy {n.ToString(CultureInfo.InvariantCulture)})"; + } + + copy.Name = name; + config.TriggerSets.Add(copy); + return copy; + } +} + +/// A list section's declaration over items of type . +public sealed class SettingsCollection : SettingsCollection + where TItem : class +{ + /// The list of a set that holds the items. + public required Func> Items { get; init; } + + /// Replaces that list. + public required Action> SetItems { get; init; } + + /// A new item, before it is named; null when none can be made in this host. + public required Func, TItem?> New { get; init; } + + /// A deep copy. + public required Func Copy { get; init; } + + /// The item's name. + public required Func Name { get; init; } + + /// Renames the item. + public required Action Rename { get; init; } + + /// A list row's title when the name is blank, or null to show the name. + public Func? Title { get; init; } + + /// A list row's second line, or null. + public Func? Detail { get; init; } + + /// + public override IReadOnlyList ItemsIn(TriggerSet set) + { + ArgumentNullException.ThrowIfNull(set); + return Items(set).ToArray(); + } + + /// + public override bool IsItem(object item) => item is TItem; + + /// + public override string TitleOf(object item) + { + var typed = (TItem)item; + var name = Name(typed); + return string.IsNullOrWhiteSpace(name) && Title is not null ? Title(typed) : name; + } + + /// + public override string? DetailOf(object item) => Detail?.Invoke((TItem)item); + + /// + public override object? Create(AppConfiguration config, SettingsContext context) + { + ArgumentNullException.ThrowIfNull(config); + ArgumentNullException.ThrowIfNull(context); + var all = config.TriggerSets.SelectMany(Items).ToList(); + if (New(context, all) is not { } item) + { + return null; + } + + Rename(item, Available(all.Select(Name), Name(item))); + return item; + } + + /// + public override object Duplicate(AppConfiguration config, object item) + { + ArgumentNullException.ThrowIfNull(config); + var source = (TItem)item; + var copy = Copy(source); + Rename(copy, Available(config.TriggerSets.SelectMany(Items).Select(Name), Name(source) + " copy")); + return copy; + } + + /// + protected override void Replace(TriggerSet set, IEnumerable items) => + SetItems(set, items.Cast().ToList()); +} diff --git a/src/SharpMUTerm.Client/Settings/SettingsForm.cs b/src/SharpMUTerm.Client/Settings/SettingsForm.cs index edc98640..9f845f97 100644 --- a/src/SharpMUTerm.Client/Settings/SettingsForm.cs +++ b/src/SharpMUTerm.Client/Settings/SettingsForm.cs @@ -1,4 +1,5 @@ using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Core.Automation; using SharpMUTerm.Core.Configuration; namespace SharpMUTerm.Client.Settings; @@ -35,8 +36,10 @@ public sealed class SettingsForm private readonly Func _now; private readonly Func> _themes; private readonly Func _isDark; + private readonly SettingsContext _context; private WorldDefinition? _world; private CharacterDefinition? _character; + private object? _item; /// Every settings section, in order — declared ones and the ones only listed by title. /// The live configuration the values are read from and written to. @@ -50,6 +53,8 @@ public sealed class SettingsForm /// Whether the client's theme is dark now — it changes when a theme is picked here. /// The world a world-scoped section is edited for first, or null for the first world. /// The character a character-scoped section is edited for first, or null for the first. + /// What the host knows that a list section's fields need (windows, recent output, chords). + /// The item a list section opens on (the trigger builder's new rule), or null for the first. public SettingsForm( IReadOnlyList sections, AppConfiguration config, @@ -62,7 +67,9 @@ public SettingsForm( Func>? themes = null, Func? isDarkNow = null, WorldDefinition? world = null, - CharacterDefinition? character = null) + CharacterDefinition? character = null, + SettingsContext? context = null, + object? item = null) { ArgumentNullException.ThrowIfNull(sections); ArgumentNullException.ThrowIfNull(config); @@ -77,6 +84,8 @@ public SettingsForm( _received = received ?? (() => Array.Empty()); _now = now ?? (_ => null); _themes = themes ?? (() => Array.Empty()); + _context = context ?? SettingsContext.Empty; + _item = item; var worlds = config.Worlds.ToArray(); _character = character; _world = world ?? (character is null ? null : worlds.FirstOrDefault(w => w.Characters.Contains(character))) @@ -147,7 +156,7 @@ public bool HasSubject(SettingsSectionContribution section) } /// Where every binding reads and writes now: the configuration and the chosen world and character. - private SettingTarget Target => new(_config, _world, _character); + private SettingTarget Target => new(_config, _world, _character, _item); /// The choices offers now (a layout row lists the player's own layouts). public IReadOnlyList Choices(ChoiceField field) @@ -177,7 +186,7 @@ public void SetTheme(ThemeField field, string name) public static bool IsDeclared(SettingsSectionContribution section) { ArgumentNullException.ThrowIfNull(section); - return section.Fields.Count > 0; + return section.Fields.Count > 0 || section.Collection is not null; } /// A section by id, or null. @@ -211,11 +220,18 @@ public static string DefaultText(SettingsField field) /// surface can store what the other would refuse. A scoped field is written to the world or character chosen /// when the change was made, even if the choice moves before the client runs it. /// - public void Set(SettingBinding binding, T value) + /// False when the value is not written: an item of a package's set (). + public bool Set(SettingBinding binding, T value) { ArgumentNullException.ThrowIfNull(binding); var target = Target; + if (binding.Scope == SettingScope.Item && (target.Item is null || IsReadOnly(target.Item))) + { + return false; + } + _commit(() => binding.Set(target, value)); + return true; } /// Writes a number, held to 's bounds. @@ -224,7 +240,7 @@ public void SetNumber(NumberField field, int value) ArgumentNullException.ThrowIfNull(field); if (field.Binding is SettingBinding binding) { - Set(binding, Math.Clamp(value, field.Minimum, field.Maximum)); + _ = Set(binding, Math.Clamp(value, field.Minimum, field.Maximum)); } } @@ -240,7 +256,12 @@ public void SetNumber(NumberField field, int value) return null; } - if (TextRules.Check(field, value) is { } refused) + if (field.Binding.Scope == SettingScope.Item && _item is { } item && IsReadOnly(item)) + { + return ReadOnlyRefusal; + } + + if (TextRules.Check(field, value, Target) is { } refused) { return refused; } @@ -267,6 +288,229 @@ public void Reset(SettingsField field) } } + // ── list sections ──────────────────────────────────────────────────────────────────────────── + + /// What an edit to a package's set is refused with. + public const string ReadOnlyRefusal = "this set is a package's and is replaced when it updates — copy it to edit"; + + /// What the host knows that a list section's fields need. + public SettingsContext Context => _context; + + /// The item a list section's fields edit now, or null. + public object? Item => _item; + + /// Edits 's fields from now on (null for none). + public void Select(object? item) => _item = item; + + /// + /// 's items, by set: the player's own sets in order, then every installed package's sets, + /// read-only. Each set's items are a snapshot of its list now. + /// + public IReadOnlyList Groups(SettingsSectionContribution section) + { + ArgumentNullException.ThrowIfNull(section); + if (section.Collection is not { } collection) + { + return []; + } + + var groups = _config.TriggerSets.ToArray() + .Select(s => new SettingsItemGroup(s, s.Name, false, null, collection.ItemsIn(s))) + .ToList(); + foreach (var package in _config.Packages) + { + groups.AddRange(package.Sets.Select(s => + new SettingsItemGroup(s, $"{s.Name} · {package.Manifest.Name}", true, package.Manifest.Id, collection.ItemsIn(s)))); + } + + return groups; + } + + /// Whether lives in a package's set, and so refuses edits. + public bool IsReadOnly(object item) => + _config.Packages.Any(p => p.Sets.Any(s => ItemsOf(s).Any(i => ReferenceEquals(i, item)))); + + /// + /// Adds a new item to through the funnel and selects it; null when the set is a package's or + /// no item can be made (every chord a binding could be born on is taken). + /// + public object? Add(SettingsSectionContribution section, TriggerSet set) + { + ArgumentNullException.ThrowIfNull(section); + ArgumentNullException.ThrowIfNull(set); + if (section.Collection is not { } collection || IsPackageSet(set) + || collection.Create(_config, _context) is not { } item) + { + return null; + } + + _item = item; + _commit(() => collection.Add(set, item)); + return item; + } + + /// Adds a copy of after it through the funnel and selects it; null when refused. + public object? Duplicate(SettingsSectionContribution section, object item) + { + ArgumentNullException.ThrowIfNull(section); + ArgumentNullException.ThrowIfNull(item); + if (section.Collection is not { CanDuplicate: true } collection || IsReadOnly(item)) + { + return null; + } + + var copy = collection.Duplicate(_config, item); + _item = copy; + _commit(() => collection.InsertAfter(_config, item, copy)); + return copy; + } + + /// Deletes through the funnel; false when it is a package's. + public bool Delete(SettingsSectionContribution section, object item) + { + ArgumentNullException.ThrowIfNull(section); + ArgumentNullException.ThrowIfNull(item); + if (section.Collection is not { } collection || IsReadOnly(item)) + { + return false; + } + + if (ReferenceEquals(_item, item)) + { + _item = null; + } + + _commit(() => collection.Delete(_config, item)); + return true; + } + + /// Moves up (−1) or down (+1) within its set, through the funnel. + public bool Move(SettingsSectionContribution section, object item, int delta) + { + ArgumentNullException.ThrowIfNull(section); + ArgumentNullException.ThrowIfNull(item); + if (section.Collection is not { } collection || IsReadOnly(item) + || collection.OwnerOf(_config.TriggerSets, item) is not { } set) + { + return false; + } + + var items = collection.ItemsIn(set).ToList(); + var at = items.FindIndex(i => ReferenceEquals(i, item)); + if (at + delta < 0 || at + delta >= items.Count) + { + return false; + } + + _commit(() => collection.Move(_config, item, delta)); + return true; + } + + /// Switches on or off through the funnel; false when it is a package's. + public bool SetEnabled(SettingsSectionContribution section, object item, bool on) + { + ArgumentNullException.ThrowIfNull(section); + ArgumentNullException.ThrowIfNull(item); + if (section.Collection?.Field(section.Collection.EnabledField).Binding is not SettingBinding flag + || IsReadOnly(item)) + { + return false; + } + + var target = new SettingTarget(_config, _world, _character, item); + _commit(() => flag.Set(target, on)); + return true; + } + + /// Whether is enabled now. + public bool IsEnabled(SettingsSectionContribution section, object item) + { + ArgumentNullException.ThrowIfNull(section); + return section.Collection?.IsEnabled(_config, item) ?? false; + } + + /// + /// Copies a package's into the player's own sets through the funnel, where it can be edited. + /// The copy is made on the client's thread with the commit; false when is not a package's. + /// + public bool CopyToEdit(TriggerSet set) + { + ArgumentNullException.ThrowIfNull(set); + if (!IsPackageSet(set)) + { + return false; + } + + _commit(() => SettingsCollection.CopyToEdit(_config, set)); + return true; + } + + /// The suggestions offers for the item selected now. + public IReadOnlyList Suggestions(TextField field) + { + ArgumentNullException.ThrowIfNull(field); + return field.Suggest is { } suggest && Target.Reaches(field.Binding?.Scope ?? SettingScope.App) + ? suggest(Target, _context) + : []; + } + + /// Writes a fractional number, held to 's bounds. + public bool SetDecimal(DecimalField field, double value) + { + ArgumentNullException.ThrowIfNull(field); + return field.Binding is SettingBinding binding + && Set(binding, Math.Clamp(value, field.Minimum, field.Maximum)); + } + + /// + /// Sets a key binding's chord, refused (with the reason) when this host cannot deliver it or another binding holds + /// it — the two refusals the cell screen's key capture makes. + /// + public string? SetKey(KeyField field, string chord) + { + ArgumentNullException.ThrowIfNull(field); + ArgumentNullException.ThrowIfNull(chord); + if (field.Binding is not SettingBinding binding || _item is not { } item) + { + return null; + } + + if (IsReadOnly(item)) + { + return ReadOnlyRefusal; + } + + var canonical = MacroKey.Canonicalise(chord) ?? chord.Trim(); + if (_context.KeyProblem(canonical) is { } problem) + { + return problem; + } + + if (_config.TriggerSets.SelectMany(s => s.Macros) + .FirstOrDefault(m => !ReferenceEquals(m, item) && string.Equals(m.Key, canonical, StringComparison.OrdinalIgnoreCase)) is { } holder) + { + return $"already bound to {(string.IsNullOrWhiteSpace(holder.Name) ? holder.Key : holder.Name)}"; + } + + _ = Set(binding, canonical); + return null; + } + + /// + /// The live test for the trigger selected now, with in place of its own while one is being + /// typed: how many of the recent lines it matches, and the newest few with where. + /// + public TriggerPreviewResult? Preview(string? pattern = null, int samples = 6) => + _item is Trigger trigger + ? TriggerPreview.Run(_context.Lines, trigger.MatchType, pattern ?? trigger.Pattern, trigger.CaseSensitive, samples) + : null; + + private bool IsPackageSet(TriggerSet set) => _config.Packages.Any(p => p.Sets.Contains(set)); + + private static IEnumerable ItemsOf(TriggerSet set) => + set.Triggers.Cast().Concat(set.Aliases).Concat(set.Timers).Concat(set.Macros); + + /// The meters now — a copy, so a host can edit it and hand it back to . public List Meters(ListField field) { diff --git a/src/SharpMUTerm.Client/Settings/SettingsSearch.cs b/src/SharpMUTerm.Client/Settings/SettingsSearch.cs index 9f1eef47..33b1e590 100644 --- a/src/SharpMUTerm.Client/Settings/SettingsSearch.cs +++ b/src/SharpMUTerm.Client/Settings/SettingsSearch.cs @@ -17,7 +17,8 @@ public sealed record SettingsMatch( SettingsSectionContribution Section, SettingsField? Field, string Text, int Start, int Length); /// -/// The settings search: a query matched against every declared field's label, group, help line and keywords, +/// The settings search: a query matched against every declared field's label, group, help line and keywords — +/// a list section's item fields included — /// and against every section's title — so a screen whose fields are not declared yet is still found by name. /// Case is ignored and the match is a plain substring, the rule ⌃R and ⌃F already follow. Pure, so the whole /// contract is testable without a screen. @@ -42,7 +43,7 @@ public static IReadOnlyList Find(IEnumerable= 0 || Contains(field.Group, q) || Contains(field.Help, q) || Contains(field.Keywords, q)) @@ -70,6 +71,16 @@ public static IReadOnlyDictionary CountBySection(IEnumerable g.Key, g => g.Count(), StringComparer.Ordinal); } + /// + /// A section's searchable fields: its own, then — for a list section — every field of its items, so route or + /// expansion finds the screen that edits one. + /// + public static IEnumerable Searchable(SettingsSectionContribution section) + { + ArgumentNullException.ThrowIfNull(section); + return section.Collection is { } collection ? section.Fields.Concat(collection.Fields) : section.Fields; + } + private static bool Contains(string? text, string query) => text is not null && text.Contains(query, StringComparison.OrdinalIgnoreCase); } diff --git a/src/SharpMUTerm.Client/Settings/TextRules.cs b/src/SharpMUTerm.Client/Settings/TextRules.cs index d8efd279..0d042885 100644 --- a/src/SharpMUTerm.Client/Settings/TextRules.cs +++ b/src/SharpMUTerm.Client/Settings/TextRules.cs @@ -1,5 +1,6 @@ using System.Text.RegularExpressions; using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Core.Automation; namespace SharpMUTerm.Client.Settings; @@ -26,6 +27,24 @@ public enum TextRule /// blank or the fallback itself stores null again, so "unset" has one spelling. /// Defaulted, + + /// A regular expression that may not be blank and must parse (an alias's pattern); not trimmed. + RequiredPattern, + + /// + /// A trigger's pattern, read as the trigger's own : only a regex can fail to parse, + /// and the plain kinds refuse only a pattern that would match every line. + /// + TriggerPattern, + + /// Optional text with no control characters, stored trimmed or as null when blank (a response, a rewrite). + Template, + + /// Text that may hold line breaks (an alias's expansion) and may not be empty; stored as typed. + Lines, + + /// The name of a window: not blank, no control characters; trimmed (a route). + Window, } /// @@ -35,12 +54,25 @@ public enum TextRule public static class TextRules { /// Why is refused for , or null when it is accepted. - public static string? Check(TextField field, string? value) + public static string? Check(TextField field, string? value) => Check(field, value, default); + + /// + /// Why is refused for on 's item (a trigger's + /// pattern is read as that trigger's match kind), or null when it is accepted. + /// + public static string? Check(TextField field, string? value, SettingTarget target) { ArgumentNullException.ThrowIfNull(field); var text = value ?? string.Empty; return field.Rule switch { + TextRule.RequiredPattern => text.Length == 0 ? "pattern cannot be empty" : RegexError(text), + TextRule.TriggerPattern => TriggerPatterns.Validate( + target.Item is Trigger trigger ? trigger.MatchType : TriggerMatchType.Regex, text), + TextRule.Template when text.Any(char.IsControl) => $"{field.Label} cannot contain control characters", + TextRule.Lines when text.Length == 0 => $"{field.Label} cannot be empty", + TextRule.Window when string.IsNullOrWhiteSpace(text) => $"{field.Label} cannot be empty", + TextRule.Window when text.Any(char.IsControl) => $"{field.Label} cannot contain control characters", TextRule.Required when string.IsNullOrWhiteSpace(text) => $"{field.Label} cannot be empty", TextRule.Name when string.IsNullOrWhiteSpace(text) => $"{field.Label} cannot be empty", TextRule.Name or TextRule.Secret or TextRule.Defaulted when text.Any(char.IsControl) => @@ -57,7 +89,9 @@ TextRule.Name or TextRule.Secret or TextRule.Defaulted when text.Any(char.IsCont var text = value ?? string.Empty; string? stored = field.Rule switch { - TextRule.Required or TextRule.Name => text.Trim(), + TextRule.Required or TextRule.Name or TextRule.Window => text.Trim(), + TextRule.RequiredPattern or TextRule.TriggerPattern or TextRule.Lines => text, + TextRule.Template => string.IsNullOrWhiteSpace(text) ? null : text.Trim(), TextRule.Pattern => string.IsNullOrWhiteSpace(text) ? null : text, TextRule.Secret => text.Length == 0 ? null : text, TextRule.Defaulted => text.Trim() is var t && (t.Length == 0 || string.Equals(t, field.Fallback, StringComparison.Ordinal)) @@ -81,6 +115,19 @@ public static string Shown(TextField field, string? stored) return stored ?? (field.Rule == TextRule.Defaulted ? field.Fallback ?? string.Empty : string.Empty); } + private static string? RegexError(string pattern) + { + try + { + _ = new Regex(pattern); + return null; + } + catch (ArgumentException e) + { + return "not a valid regex: " + e.Message.Split('\n')[0].Trim(); + } + } + private static string? PatternError(string pattern) { try diff --git a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs index 89c93b44..9f8fbe86 100644 --- a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs +++ b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs @@ -238,7 +238,7 @@ public static class SurfaceCatalog [SurfaceHosts.Window] = SurfaceDrawing.Native, }, "SharpMUTerm.Tui.OptionsScreenRenderer.FromSection", - ["SharpMUTerm.Avalonia.SettingsWindow", "SharpMUTerm.Avalonia.ThemeCardView"]), + ["SharpMUTerm.Avalonia.SettingsWindow", "SharpMUTerm.Avalonia.ThemeCardView", "SharpMUTerm.Avalonia.ListEditorView"]), new( LayoutsMenu, typeof(MenuModel), diff --git a/src/SharpMUTerm.Tui/AliasesScreenRenderer.cs b/src/SharpMUTerm.Tui/AliasesScreenRenderer.cs index 298d4dd9..01ade1fa 100644 --- a/src/SharpMUTerm.Tui/AliasesScreenRenderer.cs +++ b/src/SharpMUTerm.Tui/AliasesScreenRenderer.cs @@ -1,3 +1,4 @@ +using SharpMUTerm.Client.Settings; using SharpMUTerm.Core.Automation; using SharpMUTerm.Core.Configuration; using static SharpMUTerm.Tui.MarkupText; @@ -70,11 +71,11 @@ internal static class AliasesScreenRenderer /// empty expansion — so a new alias is a working placeholder rather than an empty shell that /// couldn't be committed. It is left enabled because an alias only acts on input the user types. /// - private const string NewAliasName = "New Alias"; + private const string NewAliasName = BuiltInSettings.NewAliasName; - private const string NewAliasPattern = "^alias$"; + private const string NewAliasPattern = BuiltInSettings.NewAliasPattern; - private const string NewAliasSubstitution = "look"; + private const string NewAliasSubstitution = BuiltInSettings.NewAliasSubstitution; /// /// Merges every sub-block into one line list (header, alias list | editor, footer). Used by the @@ -123,17 +124,31 @@ internal static string HeaderLine(int width, ScreenModel? model = null, ScreenFo /// draws them. Both values hang off the list row rather than becoming /// rows of their own, so the editor pane's cursor indices keep meaning what they meant. /// + /// F3's declared list (), whose item fields the rows are built from. + internal static SettingsCollection Declared => BuiltInSettings.Aliases.Collection!; + + /// The alias row's fields by declared id, in ⇥ order. + internal static IReadOnlyList RowFieldOrder { get; } = ["name", "pattern", "expansion", "set"]; + + /// The editor pane's check boxes by declared id. + internal static IReadOnlyList EditorFieldOrder { get; } = ["case"]; + internal static ScreenModel Model(IReadOnlyList sets, int selected) { ArgumentNullException.ThrowIfNull(sets); var entries = Flatten(sets); - var list = ScreenModel.Rows(entries, entry => ScreenRow.Of( - ScreenToggle.Bind(() => entry.Alias.Enabled, v => entry.Alias.Enabled = v), - ScreenField.Name("name", () => entry.Alias.Name, v => entry.Alias.Name = v), - ScreenField.Pattern("match pattern", () => entry.Alias.Pattern, v => entry.Alias.Pattern = v), - ScreenField.Lines("expansion", () => entry.Alias.Substitution, v => entry.Alias.Substitution = v), - ScreenLists.Owner(sets, s => s.Aliases, entry.Alias))) + var config = DeclaredFields.Over(sets); + var list = ScreenModel.Rows(entries, entry => + { + var target = new SettingTarget(config, Item: entry.Alias); + return ScreenRow.Of( + DeclaredFields.Toggle(Declared.Field(Declared.EnabledField), target), + RowFieldOrder.Select(id => DeclaredFields.Item( + Declared.Field(id), target, SettingsContext.Empty, + () => ScreenLists.Owner(sets, s => s.Aliases, entry.Alias))).ToArray()) + with { Move = ScreenLists.Mover(sets, s => s.Aliases, entry.Alias) }; + }) .Concat(Buttons(sets, selected)) .ToArray(); @@ -143,10 +158,10 @@ internal static ScreenModel Model(IReadOnlyList sets, int selected) } var alias = entries[selected].Alias; - var editor = new[] - { - ScreenRow.Of(ScreenToggle.Bind(() => alias.CaseSensitive, v => alias.CaseSensitive = v)), - }; + var selectedTarget = new SettingTarget(config, Item: alias); + var editor = EditorFieldOrder + .Select(id => ScreenRow.Of(DeclaredFields.Toggle(Declared.Field(id), selectedTarget))) + .ToArray(); return new ScreenModel(list, editor); } @@ -260,7 +275,7 @@ internal static List ListColumn( } lines.Add(string.Empty); - lines.AddRange(ScreenChrome.Buttons(Buttons(sets, selected), cursor, 0, entries.Count, width)); + lines.AddRange(ScreenChrome.Buttons(Buttons(sets, selected), cursor, 0, entries.Count, width, movable: true)); lines.Add(string.Empty); var picked = selected >= 0 && selected < entries.Count ? entries[selected].Alias : null; lines.AddRange(ScreenChrome.Legend( diff --git a/src/SharpMUTerm.Tui/DeclaredFields.cs b/src/SharpMUTerm.Tui/DeclaredFields.cs index 7872efb2..80bec5d4 100644 --- a/src/SharpMUTerm.Tui/DeclaredFields.cs +++ b/src/SharpMUTerm.Tui/DeclaredFields.cs @@ -1,5 +1,8 @@ using SharpMUTerm.Client.Contributions; using SharpMUTerm.Client.Settings; +using SharpMUTerm.Core.Automation; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Text; namespace SharpMUTerm.Tui; @@ -11,6 +14,19 @@ namespace SharpMUTerm.Tui; /// internal static class DeclaredFields { + private static readonly System.Runtime.CompilerServices.ConditionalWeakTable, AppConfiguration> Configs = new(); + + /// + /// A configuration over a list screen's , for the item bindings that look a value up in the + /// sets (the scripts the configuration already names). The list screens are handed the sets rather than the whole + /// configuration; this holds the very same list, so a binding reads and moves the screen's own sets. + /// + internal static AppConfiguration Over(IReadOnlyList sets) + { + ArgumentNullException.ThrowIfNull(sets); + return Configs.GetValue(sets, s => new AppConfiguration { TriggerSets = s as List ?? s.ToList() }); + } + /// The field with in . internal static SettingsField Find(SettingsSectionContribution section, string id) => section.Fields.FirstOrDefault(f => string.Equals(f.Id, id, StringComparison.Ordinal)) @@ -53,6 +69,75 @@ internal static ScreenField Screen(SettingsField field, SettingTarget target) } } + /// + /// The cell screen's field for one of a list section's item fields (), editing + /// 's item: the same factory each list screen used to call by hand, so a declared field + /// refuses and stores exactly what that row always did. Suggestions come from the field's own + /// over . + /// + /// The row's set field, which moves the item and so needs the screen's own sets. + /// For a key field: the host whose chords it may take. + /// For a key field: names the binding already holding a chord. + internal static ScreenField Item( + SettingsField field, + SettingTarget target, + SettingsContext context, + Func? owner = null, + HostKeys? keys = null, + Func? taken = null) + { + ArgumentNullException.ThrowIfNull(field); + ArgumentNullException.ThrowIfNull(context); + switch (field) + { + case ChoiceField { MovesItem: true } when owner is not null: + return owner() with { Label = field.Label }; + + case TextField text when field.Binding is SettingBinding binding: + { + string? Get() => binding.Get(target); + void Set(string? value) => binding.Set(target, value); + var known = text.Suggest?.Invoke(target, context); + return text.Rule switch + { + TextRule.Name => ScreenField.Name(field.Label, () => Get() ?? string.Empty, v => Set(v)), + TextRule.Required => ScreenField.Text(field.Label, () => Get() ?? string.Empty, v => Set(v), known), + TextRule.TriggerPattern => ScreenField.TriggerPattern( + field.Label, + () => Get() ?? string.Empty, + v => Set(v), + () => target.Item is Trigger trigger ? trigger.MatchType : TriggerMatchType.Regex), + TextRule.RequiredPattern => ScreenField.Pattern(field.Label, () => Get() ?? string.Empty, v => Set(v)), + TextRule.Template => ScreenField.Template(field.Label, Get, Set, known), + TextRule.Lines => ScreenField.Lines(field.Label, () => Get() ?? string.Empty, v => Set(v)), + TextRule.Window => ScreenField.WindowName( + field.Label, () => Get() ?? string.Empty, v => Set(v), known ?? Array.Empty()), + _ => Screen(field, target), + }; + } + + case DecimalField number when field.Binding is SettingBinding value: + return ScreenField.Number( + field.Label, () => value.Get(target), v => value.Set(target, v), number.Minimum, number.Maximum); + + case HighlightField when field.Binding is SettingBinding colour: + return ScreenField.Colour(field.Label, () => colour.Get(target), v => colour.Set(target, v)); + + case FlagsField flags when field.Binding is SettingBinding words: + return new ScreenField( + field.Label, + () => words.Get(target), + value => FlagWords.Unknown(value, flags.Names) is { } bad ? $"{field.Label} has no '{bad}'" : null, + value => words.Set(target, value)); + + case KeyField when field.Binding is SettingBinding chord && keys is not null: + return ScreenField.Key(keys, field.Label, () => chord.Get(target), v => chord.Set(target, v), taken ?? (_ => null)); + + default: + return Screen(field, target); + } + } + /// The cell screen's checkbox for a declared flag, editing . internal static ScreenToggle Toggle(SettingsField field, SettingTarget target) => field.Binding is SettingBinding flag diff --git a/src/SharpMUTerm.Tui/KeypadScreenRenderer.cs b/src/SharpMUTerm.Tui/KeypadScreenRenderer.cs index 8a02f865..040124ac 100644 --- a/src/SharpMUTerm.Tui/KeypadScreenRenderer.cs +++ b/src/SharpMUTerm.Tui/KeypadScreenRenderer.cs @@ -1,3 +1,4 @@ +using SharpMUTerm.Client.Settings; using System.Globalization; using SharpMUTerm.Core.Automation; using SharpMUTerm.Core.Configuration; @@ -96,9 +97,9 @@ internal static class KeypadScreenRenderer internal const string AddBindingLabel = "+ binding"; /// What a brand-new binding is called and sends, before it is edited. - private const string NewBindingName = "New Binding"; + private const string NewBindingName = BuiltInSettings.NewBindingName; - private const string NewBindingCommand = "look"; + private const string NewBindingCommand = BuiltInSettings.NewBindingCommand; /// /// Longest command a numpad cell shows when the column has no width to reason from — the merged @@ -220,6 +221,12 @@ internal static string HeaderLine(int width, ScreenModel? model = null, ScreenFo /// without them the screen simply offers no buttons rather than offering ones that would throw. /// /// Which binding the cursor has anchored, or -1 for none. + /// F4's declared list (), whose item fields the rows are built from. + internal static SettingsCollection Declared => BuiltInSettings.Keypad.Collection!; + + /// The binding row's fields by declared id, in ⇥ order; set only when the screen knows the sets. + internal static IReadOnlyList RowFieldOrder { get; } = ["name", "command", "key", "set"]; + internal static ScreenModel Model( HostKeys keys, IReadOnlyList macros, IReadOnlyList? sets = null, int selected = -1) @@ -238,20 +245,20 @@ internal static ScreenModel Model( private static ScreenRow BindingRow( HostKeys keys, Macro macro, IReadOnlyList macros, IReadOnlyList? sets) { - var fields = new List - { - ScreenField.Name("name", () => macro.Name, v => macro.Name = v), - ScreenField.Text("command", () => macro.Command, v => macro.Command = v), - ScreenField.Key(keys, "key", () => macro.Key, v => macro.Key = v, key => AlreadyBound(macros, macro, key)), - }; - - if (sets is not null) - { - fields.Add(ScreenLists.Owner(sets, s => s.Macros, macro)); - } - - return ScreenRow.Of( - ScreenToggle.Bind(() => macro.Enabled, v => macro.Enabled = v), fields.ToArray()); + var target = new SettingTarget(DeclaredFields.Over(sets ?? Array.Empty()), Item: macro); + var fields = RowFieldOrder + .Where(id => sets is not null || id != "set") + .Select(id => DeclaredFields.Item( + Declared.Field(id), + target, + SettingsContext.Empty, + () => ScreenLists.Owner(sets!, s => s.Macros, macro), + keys, + key => AlreadyBound(macros, macro, key))) + .ToArray(); + + return ScreenRow.Of(DeclaredFields.Toggle(Declared.Field(Declared.EnabledField), target), fields) + with { Move = sets is null ? null : ScreenLists.Mover(sets, s => s.Macros, macro) }; } /// @@ -487,7 +494,7 @@ internal static List HotkeysColumn( lines.Add(string.Empty); lines.AddRange(ScreenChrome.Buttons( - Buttons(keys, sets, selected), cursor, 0, macros.Count, width)); + Buttons(keys, sets, selected), cursor, 0, macros.Count, width, movable: sets is not null)); return ScreenChrome.Choices(lines, cursor.Edit, width); } diff --git a/src/SharpMUTerm.Tui/ScreenChrome.cs b/src/SharpMUTerm.Tui/ScreenChrome.cs index 6bbca503..526b6aa2 100644 --- a/src/SharpMUTerm.Tui/ScreenChrome.cs +++ b/src/SharpMUTerm.Tui/ScreenChrome.cs @@ -657,8 +657,12 @@ internal static string EmptySet(string set, string noun) => /// Which pane these belong to. /// The pane row index of the first button — i.e. the list's length. /// How wide the cursor bar runs, matching the pane's other rows. + /// + /// Whether the list's items can be moved with ⌥↑/⌥↓; a row under the removal row then says so, naming the same + /// item — the key acts on the row the cursor is on, as Delete does, so it is drawn the way Delete's row is. + /// internal static List Buttons( - IReadOnlyList buttons, ScreenFocus cursor, int pane, int firstIndex, int width) + IReadOnlyList buttons, ScreenFocus cursor, int pane, int firstIndex, int width, bool movable = false) { ArgumentNullException.ThrowIfNull(buttons); @@ -676,6 +680,11 @@ internal static List Buttons( ScreenButtonKind.Detail => KeyHintRow(button, InfoWords), _ => Cursor(AddRow(button), cursor.IsOn(pane, firstIndex + i), width), }); + + if (movable && button.Kind == ScreenButtonKind.Remove) + { + lines.Add(KeyHintRow(button with { Label = MoveKeyLabel }, MovesWord)); + } } return lines; @@ -700,6 +709,12 @@ private static string KeyHintRow(ScreenButton button, string verb) => + $" [{ScreenPalette.Label}]{verb}[/] " + $"[{ScreenPalette.Value}]{MarkupText.Escape(button.Target ?? string.Empty)}[/]"; + /// The keys a list row is moved with, as its hint row names them. + internal const string MoveKeyLabel = "⌥↑↓"; + + /// The verb on the move row. + internal const string MovesWord = "moves"; + /// The verb on a removal row, between the key and what it would take. internal const string RemovesWord = "removes"; diff --git a/src/SharpMUTerm.Tui/ScreenColours.cs b/src/SharpMUTerm.Tui/ScreenColours.cs index 9e632052..f5a99dd8 100644 --- a/src/SharpMUTerm.Tui/ScreenColours.cs +++ b/src/SharpMUTerm.Tui/ScreenColours.cs @@ -1,3 +1,4 @@ +using SharpMUTerm.Client.Settings; using SharpMUTerm.Core.Text; namespace SharpMUTerm.Tui; @@ -18,95 +19,21 @@ namespace SharpMUTerm.Tui; /// internal static class ScreenColours { - /// The name for "no colour at all" — the null a highlight is unset with. - internal const string None = "none"; + /// What "no colour" reads as — . + internal const string None = HighlightColours.None; - /// The name for the terminal's own default colour. - internal const string DefaultName = "default"; + /// The terminal's default colour, as a name. + internal const string DefaultName = HighlightColours.DefaultName; - /// - /// The named choices ↑↓ steps through, in the order they cycle: "no colour" first, then a spread - /// wide enough to tell two highlights apart at a glance. Every name resolves through - /// , so the picker and MXP/Pueblo markup agree on what "gold" means. - /// - internal static readonly IReadOnlyList Palette = new[] - { - None, "red", "orange", "gold", "yellow", "lime", "green", "cyan", "teal", - "blue", "magenta", "purple", "pink", "white", "silver", "grey", "black", - }; - - /// - /// The text a field shows for a colour: the palette name when one matches exactly, else the - /// literal syntax reads back. Null — an unset highlight — is - /// . - /// - internal static string Format(TerminalColor? colour) - { - if (colour is not { } value) - { - return None; - } - - foreach (var name in Palette) - { - if (name != None && WebColors.TryParse(name, out var named) && named == value) - { - return name; - } - } - - return value.Kind switch - { - TerminalColorKind.Rgb => $"#{value.R:x2}{value.G:x2}{value.B:x2}", - TerminalColorKind.Indexed => $"idx:{value.Index}", - _ => DefaultName, - }; - } - - /// - /// Reads a typed colour. Returns false when the text names nothing — the field's validator, so a - /// misspelling is refused at commit rather than silently becoming "no highlight". - /// is null for , which is a legal value. - /// - internal static bool TryParse(string text, out TerminalColor? colour) - { - ArgumentNullException.ThrowIfNull(text); - - colour = null; - var trimmed = text.Trim(); - if (trimmed.Length == 0 || trimmed.Equals(None, StringComparison.OrdinalIgnoreCase)) - { - return true; - } - - if (trimmed.Equals(DefaultName, StringComparison.OrdinalIgnoreCase)) - { - colour = TerminalColor.Default; - return true; - } - - if (trimmed.StartsWith("idx:", StringComparison.OrdinalIgnoreCase) - && int.TryParse(trimmed.AsSpan(4), out var index) - && index is >= 0 and <= 255) - { - colour = TerminalColor.FromIndex(index); - return true; - } + /// The names ↑↓ steps through — the Client's palette, so both hosts offer the same. + internal static readonly IReadOnlyList Palette = HighlightColours.Palette; - if (WebColors.TryParse(trimmed, out var parsed)) - { - colour = parsed; - return true; - } + /// A colour as text (). + internal static string Format(TerminalColor? colour) => HighlightColours.Format(colour); - return false; - } + /// Reads a colour (). + internal static bool TryParse(string text, out TerminalColor? colour) => HighlightColours.TryParse(text, out colour); - /// - /// The markup hex a swatch is painted with. Indexed colours resolve through the xterm palette - /// rather than falling back to the accent, so a swatch shows the colour the terminal will - /// actually use; only the terminal *default* has no hex of its own. - /// internal static string Hex(TerminalColor colour, string fallback) => colour.Kind switch { TerminalColorKind.Rgb => $"#{colour.R:x2}{colour.G:x2}{colour.B:x2}", diff --git a/src/SharpMUTerm.Tui/ScreenLists.cs b/src/SharpMUTerm.Tui/ScreenLists.cs index ef8bc597..403254d7 100644 --- a/src/SharpMUTerm.Tui/ScreenLists.cs +++ b/src/SharpMUTerm.Tui/ScreenLists.cs @@ -202,6 +202,38 @@ private static void Move( /// The row an item occupies in the flattened pane: every earlier set's items, then its own position. /// -1 when no set holds it. /// + /// + /// A list row's ⌥↑/⌥↓: moves one place within the set holding it and answers its new + /// flattened index, or null at either end of its set — a move never carries an item into the next set, which is + /// what is for. + /// + internal static Func Mover(IReadOnlyList sets, Func> items, T item) + where T : class + { + ArgumentNullException.ThrowIfNull(sets); + ArgumentNullException.ThrowIfNull(items); + ArgumentNullException.ThrowIfNull(item); + return delta => + { + if (OwnerOf(sets, items, item) is not { } owner) + { + return null; + } + + var list = items(owner); + var at = IndexOf(list, item); + var to = at + delta; + if (to < 0 || to >= list.Count) + { + return null; + } + + list.RemoveAt(at); + list.Insert(to, item); + return Flattened(sets, items, item); + }; + } + internal static int Flattened(IReadOnlyList sets, Func> items, T item) where T : class { diff --git a/src/SharpMUTerm.Tui/ScreenModel.cs b/src/SharpMUTerm.Tui/ScreenModel.cs index ad1b5fa6..1e5d5d66 100644 --- a/src/SharpMUTerm.Tui/ScreenModel.cs +++ b/src/SharpMUTerm.Tui/ScreenModel.cs @@ -221,11 +221,16 @@ internal enum ScreenButtonKind /// Puts the row's value back to its default, or null when the row is at its default or has none to go back /// to — so r reset is offered exactly where it would do something. Only declared settings carry one. /// +/// +/// Moves the row's item up (−1) or down (+1) within its list — ⌥↑/⌥↓ on a list screen — and answers the row it now +/// sits at, or null when it is already at that end. Only the list screens' item rows carry one. +/// internal readonly record struct ScreenRow( ScreenToggle? Toggle = null, IReadOnlyList? Fields = null, ScreenButton? Button = null, - Action? Reset = null) + Action? Reset = null, + Func? Move = null) { /// A selectable row with nothing to press and nothing to type into. internal static ScreenRow Stop => default; diff --git a/src/SharpMUTerm.Tui/SettingsSession.cs b/src/SharpMUTerm.Tui/SettingsSession.cs index 6bb03c9b..a988f9af 100644 --- a/src/SharpMUTerm.Tui/SettingsSession.cs +++ b/src/SharpMUTerm.Tui/SettingsSession.cs @@ -208,6 +208,12 @@ private ScreenAction Interpret(ConsoleKeyInfo key) case ConsoleKey.Enter: return Activate(model); + case ConsoleKey.UpArrow when key.Modifiers == ConsoleModifiers.Alt: + return Reorder(model, -1); + + case ConsoleKey.DownArrow when key.Modifiers == ConsoleModifiers.Alt: + return Reorder(model, 1); + case ConsoleKey.UpArrow: return Changed(Selection.MoveVertically(-1, model.Sizes, model.Layout)); @@ -332,6 +338,29 @@ private ScreenAction Reset(ScreenModel model) return ScreenAction.Redraw; } + /// + /// ⌥↑/⌥↓ on a list screen's item moves that item one place within its set — order is meaning for a trigger, + /// since the first rule that stops processing wins — through , and the cursor goes with it. + /// At either end of its set, and on a row that is not an item, the key is not ours. + /// + private ScreenAction Reorder(ScreenModel model, int delta) + { + if (model.RowAt(Selection.Pane, Selection.Index).Move is not { } move) + { + return ScreenAction.None; + } + + // The move is made first and saved only if it happened: at the end of its set nothing changed to save. + if (move(delta) is not { } row) + { + return ScreenAction.None; + } + + Edits.Apply(() => { }); + Selection.Seed(Selection.Pane, row); + return ScreenAction.Redraw; + } + private ScreenAction Toggle(ScreenModel model) { if (model.ToggleAt(Selection.Pane, Selection.Index) is not { } toggle) diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Settings.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Settings.cs index c3f1680d..480b8e65 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Settings.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Settings.cs @@ -115,7 +115,9 @@ private void OpenSettingsScreen(ConsoleKey key, Func open) /// host has none (the terminal, the snapshot, the tests) or the section declares no fields, which keep their /// cell screens. /// - private bool TryOpenNativeSettings(SettingsSectionContribution? section) + /// The section to open on. + /// For a list section, the item to open on (the trigger builder's new rule), or null. + private bool TryOpenNativeSettings(SettingsSectionContribution? section, object? item = null) { if (Host.NativeSettings is not { } native || section is null || !SettingsForm.IsDeclared(section)) { @@ -123,10 +125,22 @@ private bool TryOpenNativeSettings(SettingsSectionContribution? section) } _settings.CloseAll(); - native.Show(NativeSettingsForm(section.Id)); + native.Show(NativeSettingsForm(section.Id, item)); return true; } + /// + /// What the list sections need that the configuration does not hold, read here on the client's thread: the windows a + /// route can name, the panes' recent output for F2's live test, and this host's own answer to which chords a key + /// binding can be given ( over ), so the window's F4 says + /// what is true of the window and the terminal's what is true of the terminal. + /// + private SettingsContext ListContext() => new( + RouteTargets(), + TriggerTestLines(), + key => MacroKeys.Verdict(Host.Keys, key) is { Fires: false } verdict ? verdict.Reason : null, + MacroKeys.Bindable(Host.Keys)); + /// /// The declared settings as a form a host draws natively, opening on . Every change it /// makes goes through a over — the cell screens' own @@ -134,7 +148,7 @@ private bool TryOpenNativeSettings(SettingsSectionContribution? section) /// meter table reads the game data of the window focused when the form opened (), /// captured here because the store is thread-safe and the focus is not. /// - internal SettingsForm NativeSettingsForm(string initial) + internal SettingsForm NativeSettingsForm(string initial, object? item = null) { var edits = new ScreenEdits(SaveConfiguration); var data = SettingsGameData(); @@ -162,7 +176,9 @@ internal SettingsForm NativeSettingsForm(string initial) themes, () => ThemePreviews.IsDark(_theme), world, - character); + character, + ListContext(), + item); return form; } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.TriggerBuilder.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.TriggerBuilder.cs index bae7a12b..9b6741bd 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.TriggerBuilder.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.TriggerBuilder.cs @@ -85,6 +85,13 @@ private bool MakeTriggerFromSelection() set.Triggers.Add(trigger); SaveConfiguration(); + // The declared editor in either host: the window's native list on the new rule, or the cell F2 with its pattern + // being typed. + if (TryOpenNativeSettings(Section("triggers"), trigger)) + { + return true; + } + var index = _config.TriggerSets.SelectMany(s => s.Triggers).ToList().IndexOf(trigger); _settings.Toggle(ConsoleKey.F2, () => TriggersScreen(editPattern: index)); return true; diff --git a/src/SharpMUTerm.Tui/TimersScreenRenderer.cs b/src/SharpMUTerm.Tui/TimersScreenRenderer.cs index a5a84937..b5ea5e9d 100644 --- a/src/SharpMUTerm.Tui/TimersScreenRenderer.cs +++ b/src/SharpMUTerm.Tui/TimersScreenRenderer.cs @@ -1,3 +1,4 @@ +using SharpMUTerm.Client.Settings; using System.Globalization; using SharpMUTerm.Core.Automation; using SharpMUTerm.Core.Configuration; @@ -70,11 +71,11 @@ internal static class TimersScreenRenderer /// nobody asked for. A new trigger only reacts to output and a new binding only to a keypress, so /// those stay live. /// - private const string NewTimerName = "New Timer"; + private const string NewTimerName = BuiltInSettings.NewTimerName; private const double NewTimerIntervalSeconds = 60; - private const string NewTimerCommand = "look"; + private const string NewTimerCommand = BuiltInSettings.NewTimerCommand; /// /// Merges every sub-block into one line list (header, timer list | editor, footer). Used by the @@ -123,22 +124,31 @@ internal static string HeaderLine(int width, ScreenModel? model = null, ScreenFo /// draws them. Both values hang off the list row rather than becoming /// rows of their own, so the editor pane's cursor indices keep meaning what they meant. /// + /// F6's declared list (), whose item fields the rows are built from. + internal static SettingsCollection Declared => BuiltInSettings.Timers.Collection!; + + /// The timer row's fields by declared id, in ⇥ order. + internal static IReadOnlyList RowFieldOrder { get; } = ["name", "interval", "command", "set"]; + + /// The editor pane's check boxes by declared id, in the order the pane draws them. + internal static IReadOnlyList EditorFieldOrder { get; } = ["one-shot", "enabled"]; + internal static ScreenModel Model(IReadOnlyList sets, int selected) { ArgumentNullException.ThrowIfNull(sets); var entries = Flatten(sets); - var list = ScreenModel.Rows(entries, entry => ScreenRow.Of( - ScreenToggle.Bind(() => entry.Timer.Enabled, v => entry.Timer.Enabled = v), - ScreenField.Name("name", () => entry.Timer.Name, v => entry.Timer.Name = v), - ScreenField.Number( - "interval", - () => entry.Timer.IntervalSeconds, - v => entry.Timer.IntervalSeconds = v, - MinIntervalSeconds, - MaxIntervalSeconds), - ScreenField.Text("command", () => entry.Timer.Command, v => entry.Timer.Command = v), - ScreenLists.Owner(sets, s => s.Timers, entry.Timer))) + var config = DeclaredFields.Over(sets); + var list = ScreenModel.Rows(entries, entry => + { + var target = new SettingTarget(config, Item: entry.Timer); + return ScreenRow.Of( + DeclaredFields.Toggle(Declared.Field(Declared.EnabledField), target), + RowFieldOrder.Select(id => DeclaredFields.Item( + Declared.Field(id), target, SettingsContext.Empty, + () => ScreenLists.Owner(sets, s => s.Timers, entry.Timer))).ToArray()) + with { Move = ScreenLists.Mover(sets, s => s.Timers, entry.Timer) }; + }) .Concat(Buttons(sets, selected)) .ToArray(); @@ -148,11 +158,10 @@ internal static ScreenModel Model(IReadOnlyList sets, int selected) } var timer = entries[selected].Timer; - var editor = new[] - { - ScreenRow.Of(ScreenToggle.Bind(() => timer.OneShot, v => timer.OneShot = v)), - ScreenRow.Of(ScreenToggle.Bind(() => timer.Enabled, v => timer.Enabled = v)), - }; + var selectedTarget = new SettingTarget(config, Item: timer); + var editor = EditorFieldOrder + .Select(id => ScreenRow.Of(DeclaredFields.Toggle(Declared.Field(id), selectedTarget))) + .ToArray(); return new ScreenModel(list, editor); } @@ -162,10 +171,10 @@ internal static ScreenModel Model(IReadOnlyList sets, int selected) /// is what the Enabled checkbox is for — typing it into the interval would silently turn the timer /// off while it still read as on. /// - private const double MinIntervalSeconds = 0.1; + private const double MinIntervalSeconds = BuiltInSettings.MinIntervalSeconds; /// A day; past this the value is far likelier to be a typo than a schedule. - private const double MaxIntervalSeconds = 86400; + private const double MaxIntervalSeconds = BuiltInSettings.MaxIntervalSeconds; /// /// The timer list's buttons. A timer is added to the set that owns the selection, so a new one @@ -264,7 +273,7 @@ internal static List ListColumn( } lines.Add(string.Empty); - lines.AddRange(ScreenChrome.Buttons(Buttons(sets, selected), cursor, 0, entries.Count, width)); + lines.AddRange(ScreenChrome.Buttons(Buttons(sets, selected), cursor, 0, entries.Count, width, movable: true)); lines.Add(string.Empty); var picked = selected >= 0 && selected < entries.Count ? entries[selected].Timer : null; lines.AddRange(ScreenChrome.Legend( diff --git a/src/SharpMUTerm.Tui/TriggersScreenRenderer.cs b/src/SharpMUTerm.Tui/TriggersScreenRenderer.cs index 8ef9fcac..527b0ecf 100644 --- a/src/SharpMUTerm.Tui/TriggersScreenRenderer.cs +++ b/src/SharpMUTerm.Tui/TriggersScreenRenderer.cs @@ -1,3 +1,4 @@ +using SharpMUTerm.Client.Settings; using SharpMUTerm.Core.Theming; using SharpMUTerm.Core.Automation; using SharpMUTerm.Core.Configuration; @@ -102,8 +103,21 @@ internal static class TriggersScreenRenderer internal const int MatchTypeField = 10; /// The words the match field offers, in the order gives. - internal static IReadOnlyList MatchTypeNames { get; } = - TriggerPatterns.Offered.Select(TriggerPatterns.Describe).ToArray(); + internal static IReadOnlyList MatchTypeNames => BuiltInSettings.MatchTypeNames; + + /// F2's declared list (), whose item fields this screen's rows are built from. + internal static SettingsCollection Declared => BuiltInSettings.Triggers.Collection!; + + /// + /// The rule row's fields by declared id, in ⇥ order — so position holds name, + /// holds match, and every ordinal addresses what it always did. The declaration's + /// own order is the window's grouping; this is the cell screen's. + /// + internal static IReadOnlyList RowFieldOrder { get; } = + ["name", "pattern", "route", "fg", "bg", "attributes", "rewrite", "respond", "script", "set", "match"]; + + /// The editor pane's check boxes by declared id, in the order the pane draws them. + internal static IReadOnlyList EditorFieldOrder { get; } = ["gag", "stop", "case"]; /// /// How many sample rows the live test always draws, matching or not, so the rows under it do not jump @@ -144,9 +158,9 @@ internal static class TriggersScreenRenderer /// matches, which is why a new trigger is left enabled while a new timer is not (a timer fires /// without being provoked; a trigger with nothing to do does not). /// - private const string NewTriggerName = "New Trigger"; + private const string NewTriggerName = BuiltInSettings.NewTriggerName; - private const string NewTriggerPattern = "text to match"; + private const string NewTriggerPattern = BuiltInSettings.NewTriggerPattern; /// The window a rule routes to, as the route field reads and writes it. private static string Route(Trigger trigger) => trigger.Actions.SpawnTarget ?? NoRoute; @@ -311,49 +325,20 @@ internal static ScreenModel Model( ArgumentNullException.ThrowIfNull(sets); var flattened = Flatten(sets); - var callbacks = NamedCallbacks(sets); - var rules = ScreenModel.Rows(flattened, entry => ScreenRow.Of( - ScreenToggle.Bind(() => entry.Trigger.Enabled, v => entry.Trigger.Enabled = v), - ScreenField.Name("name", () => entry.Trigger.Name, v => entry.Trigger.Name = v), - ScreenField.TriggerPattern( - "match pattern", - () => entry.Trigger.Pattern, - v => entry.Trigger.Pattern = v, - () => entry.Trigger.MatchType), - ScreenField.WindowName( - "route", - () => Route(entry.Trigger), - v => entry.Trigger.Actions.SpawnTarget = v == NoRoute ? null : v.Trim(), - Routes(entry.Trigger, routeTargets)), - ScreenField.Colour( - "highlight fg", - () => entry.Trigger.Actions.HighlightForeground, - v => entry.Trigger.Actions.HighlightForeground = v), - ScreenField.Colour( - "highlight bg", - () => entry.Trigger.Actions.HighlightBackground, - v => entry.Trigger.Actions.HighlightBackground = v), - ScreenField.Flags( - "attributes", - () => entry.Trigger.Actions.AddAttributes, - v => entry.Trigger.Actions.AddAttributes = v), - ScreenField.Template( - "rewrite", () => entry.Trigger.Actions.Rewrite, v => entry.Trigger.Actions.Rewrite = v), - ScreenField.Template( - "respond", - () => entry.Trigger.Actions.SendResponse, - v => entry.Trigger.Actions.SendResponse = v), - ScreenField.Template( - "script", - () => entry.Trigger.Actions.ScriptCallback, - v => entry.Trigger.Actions.ScriptCallback = v, - Callbacks(entry.Trigger, callbacks)), - ScreenLists.Owner(sets, s => s.Triggers, entry.Trigger), - ScreenField.Choice( - "match", - () => TriggerPatterns.Describe(entry.Trigger.MatchType), - v => SetMatchType(entry.Trigger, TriggerPatterns.Parse(v) ?? entry.Trigger.MatchType), - MatchTypeNames))) + var config = DeclaredFields.Over(sets); + var context = SettingsContext.Empty with { Windows = routeTargets ?? Array.Empty() }; + var rules = ScreenModel.Rows(flattened, entry => + { + var target = new SettingTarget(config, Item: entry.Trigger); + return ScreenRow.Of( + DeclaredFields.Toggle(Declared.Field(Declared.EnabledField), target), + RowFieldOrder.Select(id => DeclaredFields.Item( + Declared.Field(id), + target, + context, + () => ScreenLists.Owner(sets, s => s.Triggers, entry.Trigger))).ToArray()) + with { Move = ScreenLists.Mover(sets, s => s.Triggers, entry.Trigger) }; + }) .Concat(Buttons(sets, selectedTrigger)) .ToArray(); @@ -365,12 +350,10 @@ internal static ScreenModel Model( var trigger = flattened[selectedTrigger].Trigger; // Appended rather than inserted: these are the pane's cursor stops, and putting the new one // above the two that were here would renumber rows the screen (and its tests) already address. - var editor = new[] - { - ScreenRow.Of(ScreenToggle.Bind(() => trigger.Actions.Gag, v => trigger.Actions.Gag = v)), - ScreenRow.Of(ScreenToggle.Bind(() => trigger.StopProcessing, v => trigger.StopProcessing = v)), - ScreenRow.Of(ScreenToggle.Bind(() => trigger.CaseSensitive, v => trigger.CaseSensitive = v)), - }; + var selected = new SettingTarget(config, Item: trigger); + var editor = EditorFieldOrder + .Select(id => ScreenRow.Of(DeclaredFields.Toggle(Declared.Field(id), selected))) + .ToArray(); return new ScreenModel(rules, editor); } @@ -381,16 +364,7 @@ internal static ScreenModel Model( /// form of what they built; moving away leaves the text as typed, because there is no plain-language /// reading of an arbitrary regex to convert it to. /// - internal static void SetMatchType(Trigger trigger, TriggerMatchType type) - { - ArgumentNullException.ThrowIfNull(trigger); - if (type == TriggerMatchType.Regex && trigger.MatchType != TriggerMatchType.Regex) - { - trigger.Pattern = TriggerPatterns.ToRegex(trigger.MatchType, trigger.Pattern); - } - - trigger.MatchType = type; - } + internal static void SetMatchType(Trigger trigger, TriggerMatchType type) => BuiltInSettings.SetMatchType(trigger, type); /// /// The rule list's buttons. A rule is added to the set that owns the selection rather than to some @@ -504,7 +478,7 @@ internal static List RulesColumn( left.Add(string.Empty); left.AddRange(ScreenChrome.Buttons( - Buttons(sets, selectedTrigger), cursor, 0, flattened.Count, width)); + Buttons(sets, selectedTrigger), cursor, 0, flattened.Count, width, movable: true)); left.Add(string.Empty); left.AddRange(FlagLegend(Selected(flattened, selectedTrigger), width)); return left; diff --git a/tests/SharpMUTerm.Avalonia.Tests/DesktopLayerTests.cs b/tests/SharpMUTerm.Avalonia.Tests/DesktopLayerTests.cs index 12a3e0f6..cd4387ab 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/DesktopLayerTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/DesktopLayerTests.cs @@ -312,15 +312,18 @@ [new MapViewExit(1, 2)], // ── helpers ────────────────────────────────────────────────────────────────────────────────── - internal static SharpMUTermApp InlineWindowApp(AvaloniaConsoleDriver driver) => - new(DemoScene.Build(), WindowHost.Create(driver, clipboard: null) with + internal static SharpMUTermApp InlineWindowApp(AvaloniaConsoleDriver driver) => new(DemoScene.Build(), InlineHost(driver)); + + /// The window's host as builds it, for a test that changes one member. + internal static ClientHost InlineHost(AvaloniaConsoleDriver driver) => + WindowHost.Create(driver, clipboard: null) with { Capabilities = WindowOptions.Capabilities, Audio = null, Presence = null, Announcer = null, RunsInline = true, - }); + }; private static void Offer(AvaloniaConsoleDriver driver, Action> menu, Action? dispatch = null) { diff --git a/tests/SharpMUTerm.Avalonia.Tests/ListEditorTests.cs b/tests/SharpMUTerm.Avalonia.Tests/ListEditorTests.cs new file mode 100644 index 00000000..de37fbab --- /dev/null +++ b/tests/SharpMUTerm.Avalonia.Tests/ListEditorTests.cs @@ -0,0 +1,220 @@ +using Avalonia.Controls; +using Avalonia.Controls.Documents; +using Avalonia.Headless; +using Avalonia.Interactivity; +using Avalonia.Threading; +using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Client.Settings; +using SharpMUTerm.Core.Automation; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Packages; + +namespace SharpMUTerm.Avalonia.Tests; + +/// +/// The settings window's list sections (F2, F3, F4, F6): a master-detail editor whose detail is one control per +/// declared item field, whose buttons add, duplicate, delete and reorder through the form's one commit, which +/// refuses a package's set and offers to copy it, and whose F2 page runs the live test over recent output. +/// +[NotInParallel] +public class ListEditorTests +{ + private sealed class Harness + { + public Harness() + { + Config.TriggerSets.Clear(); + Config.TriggerSets.Add(Own); + Config.Packages = [new InstalledPackage(new PackageManifest { Id = "pack", Name = "Pack", Version = "1.0.0" }, [Package])]; + } + + public AppConfiguration Config { get; } = new(); + + public TriggerSet Own { get; } = new() + { + Name = "public", + Triggers = + { + new Trigger { Name = "xp", Pattern = "You gain * experience", MatchType = TriggerMatchType.Wildcard }, + new Trigger { Name = "tell", Pattern = "tells you" }, + }, + }; + + public TriggerSet Package { get; } = new() { Name = "combat", Triggers = { new Trigger { Name = "theirs", Pattern = "x" } } }; + + public int Commits { get; set; } + + public SettingsForm Form(string initial, object? item = null) + { + SettingsForm? form = null; + var context = new SettingsContext( + ["Chat"], + ["You gain 40 experience points.", "A guard nods.", "You gain 7 experience points."], + _ => null, + ["F10", "F11", "F12"]); + form = new SettingsForm( + BuiltInSettings.All, + Config, + change => + { + change(); + Commits++; + form!.NotifyChanged(); + }, + _ => { }, + initial, + isDark: true, + context: context, + item: item); + return form; + } + } + + private static void Click(Button button) => button.RaiseEvent(new RoutedEventArgs(Button.ClickEvent)); + + [Test] + public async Task EachListPageDrawsOneControlPerDeclaredItemField() + { + foreach (var section in new[] { BuiltInSettings.Triggers, BuiltInSettings.Aliases, BuiltInSettings.Timers }) + { + var harness = new Harness(); + harness.Own.Aliases.Add(new Alias { Name = "a", Pattern = "^a$", Substitution = "look" }); + harness.Own.Timers.Add(new TimerDefinition { Name = "t", Command = "look" }); + var (shown, controls) = await Run(harness, section.Id, window => + (window.ShownFields.ToArray(), window.FieldControls.Keys.ToArray())); + + var declared = section.Collection!.Fields.Select(f => f.Id).ToArray(); + await Assert.That(shown).IsEquivalentTo(declared); + await Assert.That(controls.Except([section.Collection.EnabledField])).IsEquivalentTo(declared.Except([section.Collection.EnabledField])); + } + } + + [Test] + public async Task TheButtonsAddDuplicateMoveAndDeleteThroughTheCommit() + { + var harness = new Harness(); + var own = harness.Own; + var xp = own.Triggers[0]; + var (afterAdd, afterDuplicate, afterMove, afterDelete) = await Run(harness, "triggers", window => + { + var editor = window.ListEditor!; + editor.Choose(xp); + + Click(editor.AddButton); + Dispatcher.UIThread.RunJobs(); + var added = own.Triggers.Count; + + editor.Choose(xp); + Click(editor.DuplicateButton); + Dispatcher.UIThread.RunJobs(); + var duplicated = own.Triggers.Select(t => t.Name).ToArray(); + + editor.Choose(xp); + Click(editor.DownButton); + Dispatcher.UIThread.RunJobs(); + var moved = own.Triggers.IndexOf(xp); + + Click(editor.DeleteButton); + Dispatcher.UIThread.RunJobs(); + return (added, duplicated, moved, own.Triggers.Contains(xp)); + }); + + await Assert.That(afterAdd).IsEqualTo(3); + await Assert.That(afterDuplicate.Take(2)).IsEquivalentTo(new[] { "xp", "xp copy" }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(afterMove).IsEqualTo(1); + await Assert.That(afterDelete).IsFalse(); + await Assert.That(harness.Commits).IsEqualTo(4); + } + + [Test] + public async Task APackagesRuleIsReadOnlyAndItsSetCanBeCopiedToEdit() + { + var harness = new Harness(); + var theirs = harness.Package.Triggers[0]; + var (enabledControls, rowEnabled, copies) = await Run(harness, "triggers", window => + { + var editor = window.ListEditor!; + editor.Choose(theirs); + var controls = editor.FieldControls.Values.Count(c => c.IsEnabled); + var row = editor.Rows.Single(r => ReferenceEquals(r.Item, theirs)).Enabled.IsEnabled; + Click(editor.DeleteButton); + Dispatcher.UIThread.RunJobs(); + var buttons = editor.CopyButtons.Count; + Click(editor.CopyButtons.Single()); + Dispatcher.UIThread.RunJobs(); + return (controls, row, buttons); + }); + + await Assert.That(enabledControls).IsEqualTo(0); + await Assert.That(rowEnabled).IsFalse(); + await Assert.That(copies).IsEqualTo(1); + await Assert.That(harness.Package.Triggers.Single()).IsSameReferenceAs(theirs).Because("nothing deleted it"); + await Assert.That(harness.Config.TriggerSets.Count).IsEqualTo(2); + await Assert.That(harness.Config.TriggerSets[1].Triggers.Single().Name).IsEqualTo("theirs"); + await Assert.That(harness.Commits).IsEqualTo(1); + } + + [Test] + public async Task TheLiveTestListsTheMatchingLinesWithTheMatchMarked() + { + var harness = new Harness(); + var (lines, marked) = await Run(harness, "triggers", window => + { + var editor = window.ListEditor!; + editor.Choose(harness.Own.Triggers[0]); + var blocks = editor.PreviewLines; + var bold = blocks.Skip(1) + .Select(b => b.Inlines?.OfType().FirstOrDefault(r => r.FontWeight == global::Avalonia.Media.FontWeight.Bold)?.Text) + .ToArray(); + return (blocks.Select(b => b.Text ?? string.Concat(b.Inlines!.OfType().Select(r => r.Text))).ToArray(), bold); + }); + + await Assert.That(lines[0]).Contains("matches 2 of the last 3"); + await Assert.That(lines.Skip(1).Count()).IsEqualTo(2); + await Assert.That(marked).All().Satisfy(m => m.StartsWith("You gain", StringComparison.Ordinal), m => m.IsTrue()); + } + + [Test] + public async Task AFormOpenedOnARuleSelectsIt() + { + var harness = new Harness(); + var tell = harness.Own.Triggers[1]; + var (selected, row) = await Run(harness, "triggers", window => + (window.ListEditor!.SelectedItem, (window.ListEditor.List.SelectedItem as ListBoxItem)?.Tag), tell); + + await Assert.That(selected).IsSameReferenceAs(tell); + await Assert.That(row).IsSameReferenceAs(tell); + } + + [Test] + public async Task TheSearchFindsAnItemFieldAndShowsOnlyIt() + { + var harness = new Harness(); + var shown = await Run(harness, "text", window => + { + window.SearchBox.Text = "gag line"; + Dispatcher.UIThread.RunJobs(); + return (window.ShownSection, window.ShownFields.ToArray()); + }); + + await Assert.That(shown.ShownSection).IsEqualTo("triggers"); + await Assert.That(shown.Item2).Contains("gag"); + await Assert.That(shown.Item2).DoesNotContain("pattern"); + } + + private static Task Run(Harness harness, string initial, Func body, object? item = null) => + TerminalViewTests.Session.Dispatch(() => + { + var window = new SettingsWindow(harness.Form(initial, item)); + window.Show(); + Dispatcher.UIThread.RunJobs(); + try + { + return body(window); + } + finally + { + window.Close(); + } + }, CancellationToken.None); +} diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativePanelTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativePanelTests.cs index d7278ce3..0751fcf8 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/NativePanelTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/NativePanelTests.cs @@ -131,20 +131,46 @@ await Assert.That(ReferenceEquals(driver.Pointer.Panels.Single(p => p.PanelId == } [Test] - public async Task TheEditLinkDispatchesTheF4ScreenAndNoNativePanelCoversIt() + public async Task TheEditLinkOpensTheDeclaredKeyEditorInTheSettingsWindow() { using var driver = new AvaloniaConsoleDriver(140, 36); - await using var app = InlineWindowApp(driver); + var settings = new RecordingSettings(); + await using var app = new SharpMUTermApp(DemoScene.Build(), InlineHost(driver) with { NativeSettings = settings }); app.RenderSnapshot("layout-combat"); var panel = driver.Pointer.Panels.Single(p => p.PanelId == PanelIds.QuickBar); await Assert.That(app.Contributions.Commands.Resolve(QuickBarModel.EditCommand)).IsNotNull(); panel.Dispatch!(QuickBarModel.EditCommand); app.RenderNextFrame(); + await Assert.That(settings.Shown.Single().Initial).IsEqualTo("keypad"); + await Assert.That(app.OpenSettingsKey).IsNull().Because("F4 is declared, so the window draws it and no cell modal opens"); + } + + [Test] + public async Task WithNoSettingsWindowTheEditLinkOpensF4AndNoNativePanelCoversIt() + { + using var driver = new AvaloniaConsoleDriver(140, 36); + await using var app = new SharpMUTermApp(DemoScene.Build(), InlineHost(driver) with { NativeSettings = null }); + app.RenderSnapshot("layout-combat"); + + var panel = driver.Pointer.Panels.Single(p => p.PanelId == PanelIds.QuickBar); + panel.Dispatch!(QuickBarModel.EditCommand); + app.RenderNextFrame(); await Assert.That(app.OpenSettingsKey).IsEqualTo(ConsoleKey.F4); await Assert.That(driver.Pointer.Panels).IsEmpty().Because("a native view would sit over the modal's cells"); } + private sealed class RecordingSettings : INativeSettings + { + public List Shown { get; } = []; + + public void Show(SharpMUTerm.Client.Settings.SettingsForm form) => Shown.Add(form); + + public void Close() + { + } + } + // ── The window's half ──────────────────────────────────────────────────────────────────────── [Test] diff --git a/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowTests.cs b/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowTests.cs index 64957aa2..f4bf0a9a 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowTests.cs @@ -150,13 +150,13 @@ public async Task AnUndeclaredSectionOpensItsOwnScreen() var harness = new Harness(); var shown = await Run(harness, "text", window => { - var item = window.SectionList.Items.OfType().Single(i => Equals(i.Tag, "triggers")); + var item = window.SectionList.Items.OfType().Single(i => Equals(i.Tag, "packages")); window.SectionList.SelectedItem = item; Dispatcher.UIThread.RunJobs(); return window.ShownSection; }); - await Assert.That(harness.Opened).IsEquivalentTo(new[] { "triggers" }); + await Assert.That(harness.Opened).IsEquivalentTo(new[] { "packages" }); await Assert.That(shown).IsEqualTo("text"); } diff --git a/tests/SharpMUTerm.Client.Tests/ListSettingsTests.cs b/tests/SharpMUTerm.Client.Tests/ListSettingsTests.cs new file mode 100644 index 00000000..4bcebef5 --- /dev/null +++ b/tests/SharpMUTerm.Client.Tests/ListSettingsTests.cs @@ -0,0 +1,204 @@ +using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Client.Settings; +using SharpMUTerm.Core.Automation; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Packages; + +namespace SharpMUTerm.Client.Tests; + +/// +/// The list declaration kind: F2, F3, F4 and F6 are sections over trigger sets whose item fields are ordinary +/// descriptors bound to the item itself. Every change goes through the form's one commit, a package's set refuses +/// every edit and can be copied to edit, and the search finds item fields. +/// +public class ListSettingsTests +{ + private static (AppConfiguration Config, TriggerSet Own, TriggerSet Package) Configuration() + { + var config = new AppConfiguration(); + config.TriggerSets.Clear(); + var own = new TriggerSet + { + Name = "public", + Triggers = + { + new Trigger { Name = "first", Pattern = "a" }, + new Trigger { Name = "second", Pattern = "b" }, + new Trigger { Name = "third", Pattern = "c" }, + }, + }; + config.TriggerSets.Add(own); + var package = new TriggerSet { Name = "combat", Triggers = { new Trigger { Name = "theirs", Pattern = "x" } } }; + config.Packages = + [ + new InstalledPackage(new PackageManifest { Id = "pack", Name = "Pack", Version = "1.0.0" }, [package]), + ]; + return (config, own, package); + } + + private static SettingsForm Form(AppConfiguration config, Action count, object? item = null, string section = "triggers") => + new(BuiltInSettings.All, config, change => { change(); count(); }, _ => { }, section, isDark: true, item: item); + + [Test] + public async Task TheListScreensAreDeclaredWithACollection() + { + foreach (var id in new[] { "triggers", "aliases", "keypad", "timers" }) + { + var section = BuiltInSettings.All.Single(s => s.Id == id); + await Assert.That(section.Collection).IsNotNull(); + await Assert.That(section.Scope).IsEqualTo(SettingScope.Item); + await Assert.That(SettingsForm.IsDeclared(section)).IsTrue(); + await Assert.That(section.Collection!.Fields.All(f => f.Binding?.Scope == SettingScope.Item)).IsTrue(); + } + + var triggers = BuiltInSettings.Triggers.Collection!.Fields.Select(f => f.Id).ToList(); + await Assert.That(triggers).IsEquivalentTo( + new[] { "enabled", "name", "match", "pattern", "set", "route", "fg", "bg", "attributes", "gag", "rewrite", "respond", "script", "stop", "case" }); + } + + [Test] + public async Task AnItemFieldEditsTheItemAndCommitsOnce() + { + var (config, own, _) = Configuration(); + var commits = 0; + var second = own.Triggers[1]; + var form = Form(config, () => commits++, second); + var collection = BuiltInSettings.Triggers.Collection!; + var gag = (BoolField)collection.Field("gag"); + + await Assert.That(form.Set((SettingBinding)gag.Binding!, true)).IsTrue(); + await Assert.That(second.Actions.Gag).IsTrue(); + await Assert.That(own.Triggers[0].Actions.Gag).IsFalse(); + await Assert.That(commits).IsEqualTo(1); + + var pattern = (TextField)collection.Field("pattern"); + await Assert.That(form.SetText(pattern, "you gain *")).IsNull(); + await Assert.That(second.Pattern).IsEqualTo("you gain *"); + await Assert.That(commits).IsEqualTo(2); + } + + [Test] + public async Task APatternThatIsNotARegexIsRefusedForARegexRule() + { + var (config, own, _) = Configuration(); + var commits = 0; + var form = Form(config, () => commits++, own.Triggers[0]); + var pattern = (TextField)BuiltInSettings.Triggers.Collection!.Field("pattern"); + + await Assert.That(form.SetText(pattern, "(")).IsNotNull(); + await Assert.That(own.Triggers[0].Pattern).IsEqualTo("a"); + await Assert.That(commits).IsEqualTo(0); + } + + [Test] + public async Task AddDuplicateDeleteAndMoveEditTheSet() + { + var (config, own, _) = Configuration(); + var commits = 0; + var form = Form(config, () => commits++); + var section = BuiltInSettings.Triggers; + + var added = form.Add(section, own) as Trigger; + await Assert.That(added).IsNotNull(); + await Assert.That(own.Triggers[^1]).IsSameReferenceAs(added!); + await Assert.That(form.Item).IsSameReferenceAs(added); + + var copy = form.Duplicate(section, own.Triggers[0]) as Trigger; + await Assert.That(own.Triggers[1]).IsSameReferenceAs(copy!); + await Assert.That(copy!.Name).IsEqualTo("first copy"); + + var third = own.Triggers.Single(t => t.Name == "third"); + await Assert.That(form.Move(section, third, -1)).IsTrue(); + await Assert.That(own.Triggers.Select(t => t.Name).ToList()) + .IsEquivalentTo(new[] { "first", "first copy", "third", "second", added!.Name }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(form.Move(section, own.Triggers[0], -1)).IsFalse(); + + await Assert.That(form.Delete(section, copy)).IsTrue(); + await Assert.That(own.Triggers.Contains(copy)).IsFalse(); + await Assert.That(commits).IsEqualTo(4); + } + + [Test] + public async Task APackagesSetRefusesEveryEditAndCanBeCopiedToEdit() + { + var (config, _, package) = Configuration(); + var commits = 0; + var theirs = package.Triggers[0]; + var form = Form(config, () => commits++, theirs); + var section = BuiltInSettings.Triggers; + var collection = section.Collection!; + + var groups = form.Groups(section); + await Assert.That(groups.Single(g => ReferenceEquals(g.Set, package)).ReadOnly).IsTrue(); + await Assert.That(form.IsReadOnly(theirs)).IsTrue(); + await Assert.That(form.Set((SettingBinding)collection.Field("gag").Binding!, true)).IsFalse(); + await Assert.That(form.SetText((TextField)collection.Field("pattern"), "y")).IsEqualTo(SettingsForm.ReadOnlyRefusal); + await Assert.That(form.Add(section, package)).IsNull(); + await Assert.That(form.Duplicate(section, theirs)).IsNull(); + await Assert.That(form.Delete(section, theirs)).IsFalse(); + await Assert.That(form.SetEnabled(section, theirs, false)).IsFalse(); + await Assert.That(theirs.Actions.Gag).IsFalse(); + await Assert.That(theirs.Pattern).IsEqualTo("x"); + await Assert.That(commits).IsEqualTo(0); + + await Assert.That(form.CopyToEdit(package)).IsTrue(); + var copied = config.TriggerSets.Single(s => s.Name.StartsWith("combat", StringComparison.Ordinal)); + await Assert.That(copied.Triggers.Single().Name).IsEqualTo("theirs"); + await Assert.That(copied.Triggers.Single()).IsNotSameReferenceAs(theirs); + await Assert.That(commits).IsEqualTo(1); + } + + [Test] + public async Task MovingARuleToAnotherSetMovesIt() + { + var (config, own, _) = Configuration(); + var other = new TriggerSet { Name = "other" }; + config.TriggerSets.Add(other); + var commits = 0; + var rule = own.Triggers[0]; + var form = Form(config, () => commits++, rule); + var set = (ChoiceField)BuiltInSettings.Triggers.Collection!.Field("set"); + + await Assert.That(form.Choices(set)).Contains("other"); + await Assert.That(form.Set((SettingBinding)set.Binding!, "other")).IsTrue(); + await Assert.That(other.Triggers.Single()).IsSameReferenceAs(rule); + await Assert.That(own.Triggers.Contains(rule)).IsFalse(); + } + + [Test] + public async Task AKeyBindingRefusesAChordTheHostCannotDeliverOrAnotherHolds() + { + var config = new AppConfiguration(); + config.TriggerSets.Clear(); + var set = new TriggerSet + { + Name = "keys", + Macros = { new Macro { Name = "north", Key = "F12", Command = "n" }, new Macro { Name = "south", Key = "F11", Command = "s" } }, + }; + config.TriggerSets.Add(set); + var context = new SettingsContext([], [], key => key == "Ctrl+H" ? "arrives as Backspace" : null, ["F10", "F11", "F12"]); + var form = new SettingsForm(BuiltInSettings.All, config, change => change(), _ => { }, "keypad", isDark: true, context: context, item: set.Macros[1]); + var key = (KeyField)BuiltInSettings.Keypad.Collection!.Field("key"); + + await Assert.That(form.SetKey(key, "Ctrl+H")).IsEqualTo("arrives as Backspace"); + await Assert.That(form.SetKey(key, "F12")).Contains("north"); + await Assert.That(form.SetKey(key, "F10")).IsNull(); + await Assert.That(set.Macros[1].Key).IsEqualTo("F10"); + } + + [Test] + public async Task TheLiveTestRunsTheSelectedRuleOverTheContextsLines() + { + var config = new AppConfiguration(); + config.TriggerSets.Clear(); + var rule = new Trigger { Name = "xp", Pattern = "You gain * experience", MatchType = TriggerMatchType.Wildcard }; + config.TriggerSets.Add(new TriggerSet { Name = "s", Triggers = { rule } }); + var context = new SettingsContext([], ["You gain 40 experience points.", "A guard nods.", "You gain 7 experience points."], _ => null, []); + var form = new SettingsForm(BuiltInSettings.All, config, change => change(), _ => { }, "triggers", isDark: true, context: context, item: rule); + + var result = form.Preview(); + await Assert.That(result).IsNotNull(); + await Assert.That(result!.Value.Matched).IsEqualTo(2); + await Assert.That(form.Preview("dragon")!.Value.Matched).IsEqualTo(0); + } +} diff --git a/tests/SharpMUTerm.Client.Tests/SettingsDeclarationTests.cs b/tests/SharpMUTerm.Client.Tests/SettingsDeclarationTests.cs index 68680102..2d364b0c 100644 --- a/tests/SharpMUTerm.Client.Tests/SettingsDeclarationTests.cs +++ b/tests/SharpMUTerm.Client.Tests/SettingsDeclarationTests.cs @@ -79,9 +79,13 @@ public async Task TheSearchFindsLabelsKeywordsAndTitles() await Assert.That(byKeyword.Single().Field!.Id).IsEqualTo("transparency"); await Assert.That(byKeyword.Single().Start).IsEqualTo(-1); - var byTitle = SettingsSearch.Find(BuiltInSettings.All, "alias"); + // A section with no fields (F10) is found by its title. + var byTitle = SettingsSearch.Find(BuiltInSettings.All, "packages").Where(m => m.Section.Id == "packages").ToList(); await Assert.That(byTitle.Single().Field).IsNull(); - await Assert.That(byTitle.Single().Section.Id).IsEqualTo("aliases"); + + // A list section's item fields are searched like any other field. + var byItemField = SettingsSearch.Find(BuiltInSettings.All, "gag"); + await Assert.That(byItemField.Any(m => m.Section.Id == "triggers" && m.Field?.Id == "gag")).IsTrue(); await Assert.That(SettingsSearch.Find(BuiltInSettings.All, " ")).IsEmpty(); } diff --git a/tests/SharpMUTerm.Tui.Tests/DeclaredListScreensTests.cs b/tests/SharpMUTerm.Tui.Tests/DeclaredListScreensTests.cs new file mode 100644 index 00000000..ee5aec89 --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/DeclaredListScreensTests.cs @@ -0,0 +1,158 @@ +using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Client.Settings; +using SharpMUTerm.Core.Automation; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Graphics; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// F2, F3, F4 and F6 drawn from their declarations: the cell screens' fields are the declared collection's, an edit +/// on one lands on the rule and is saved once, ⌥↑/⌥↓ reorder a rule within its set, and a host with a settings window +/// shows them there — the trigger builder included, on the rule it made. +/// +[NotInParallel] +public class DeclaredListScreensTests +{ + private static readonly TerminalCapabilities Caps = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private sealed class Presenter : INativeSettings + { + public List Shown { get; } = []; + + public void Show(SettingsForm form) => Shown.Add(form); + + public void Close() + { + } + } + + private static (SharpMUTermApp App, Presenter Native, List Saves) App(bool native) + { + Console.SetIn(TextReader.Null); + var presenter = new Presenter(); + var saves = new List(); + var host = ClientHost.Headless(new HeadlessConsoleDriver(120, 32), Caps) with + { + NativeSettings = native ? presenter : null, + }; + return (new SharpMUTermApp(DemoScene.Build(), host, save: saves.Add), presenter, saves); + } + + private static ConsoleKeyInfo Key(ConsoleKey key, bool alt = false) => new('\0', key, false, alt, false); + + [Test] + public async Task EachCellScreenDrawsExactlyTheDeclaredFields() + { + static IEnumerable Ids(SettingsSectionContribution section) => + section.Collection!.Fields.Select(f => f.Id).OrderBy(id => id, StringComparer.Ordinal); + + static IEnumerable Cells(IEnumerable row, IEnumerable editor) => + row.Concat(editor).Append("enabled").Distinct().OrderBy(id => id, StringComparer.Ordinal); + + await Assert.That(Cells(TriggersScreenRenderer.RowFieldOrder, TriggersScreenRenderer.EditorFieldOrder)) + .IsEquivalentTo(Ids(BuiltInSettings.Triggers)); + await Assert.That(Cells(AliasesScreenRenderer.RowFieldOrder, AliasesScreenRenderer.EditorFieldOrder)) + .IsEquivalentTo(Ids(BuiltInSettings.Aliases)); + await Assert.That(Cells(TimersScreenRenderer.RowFieldOrder, TimersScreenRenderer.EditorFieldOrder)) + .IsEquivalentTo(Ids(BuiltInSettings.Timers)); + await Assert.That(Cells(KeypadScreenRenderer.RowFieldOrder, [])) + .IsEquivalentTo(Ids(BuiltInSettings.Keypad)); + + // The ordinals the screen, the snapshot keys and the tests address are where the declarations put them. + await Assert.That(TriggersScreenRenderer.RowFieldOrder[TriggersScreenRenderer.MatchTypeField]).IsEqualTo("match"); + await Assert.That(TriggersScreenRenderer.RowFieldOrder[TriggersScreenRenderer.PatternField]).IsEqualTo("pattern"); + } + + [Test] + public async Task ACellEditLandsOnTheRuleAndIsSavedOnce() + { + var (app, _, saves) = App(native: false); + app.SimulateKey(Key(ConsoleKey.F2)); + var first = app.Configuration.TriggerSets.SelectMany(s => s.Triggers).First(); + var was = first.Enabled; + + app.Settings.SimulateKey(new ConsoleKeyInfo(' ', ConsoleKey.Spacebar, false, false, false)); + + await Assert.That(first.Enabled).IsEqualTo(!was); + await Assert.That(saves.Count).IsEqualTo(1); + } + + [Test] + public async Task AltArrowsMoveARuleWithinItsSetAndTheCursorGoesWithIt() + { + var (app, _, saves) = App(native: false); + app.SimulateKey(Key(ConsoleKey.F2)); + var set = app.Configuration.TriggerSets.First(s => s.Triggers.Count >= 2); + var top = set.Triggers[0]; + var next = set.Triggers[1]; + + app.Settings.SimulateKey(Key(ConsoleKey.DownArrow, alt: true)); + + await Assert.That(set.Triggers[0]).IsSameReferenceAs(next); + await Assert.That(set.Triggers[1]).IsSameReferenceAs(top); + await Assert.That(saves.Count).IsEqualTo(1); + await Assert.That(app.SettingsFocus!.Value.Index).IsEqualTo(1); + + // At the top of its set the key does nothing and saves nothing. + app.Settings.SimulateKey(Key(ConsoleKey.UpArrow, alt: true)); + app.Settings.SimulateKey(Key(ConsoleKey.UpArrow, alt: true)); + await Assert.That(set.Triggers[0]).IsSameReferenceAs(top); + await Assert.That(saves.Count).IsEqualTo(2); + } + + [Test] + public async Task TheListKeysOpenTheHostsWindowOnTheirSection() + { + var (app, native, _) = App(native: true); + + foreach (var (key, id) in new[] { (ConsoleKey.F2, "triggers"), (ConsoleKey.F3, "aliases"), (ConsoleKey.F4, "keypad"), (ConsoleKey.F6, "timers") }) + { + app.SimulateKey(Key(key)); + await Assert.That(native.Shown[^1].Initial).IsEqualTo(id); + await Assert.That(app.SettingsOpenKey).IsNull(); + } + } + + [Test] + public async Task AnEditInTheWindowLandsOnTheSameRuleAndIsSavedOnce() + { + var (app, native, saves) = App(native: true); + app.SimulateKey(Key(ConsoleKey.F2)); + var form = native.Shown.Single(); + var rule = app.Configuration.TriggerSets.SelectMany(s => s.Triggers).First(); + form.Select(rule); + + await Assert.That(form.SetText((TextField)BuiltInSettings.Triggers.Collection!.Field("pattern"), "you gain")).IsNull(); + + await Assert.That(rule.Pattern).IsEqualTo("you gain"); + await Assert.That(saves.Count).IsEqualTo(1); + } + + [Test] + public async Task TheTriggerBuilderOpensTheWindowOnTheRuleItMade() + { + var (app, native, _) = App(native: true); + + app.RenderSnapshot("trigger-builder"); + + var made = app.Configuration.TriggerSets.SelectMany(s => s.Triggers).Last(t => t.Name.StartsWith("You gain", StringComparison.Ordinal)); + var form = native.Shown.Single(); + await Assert.That(form.Initial).IsEqualTo("triggers"); + await Assert.That(form.Item).IsSameReferenceAs(made); + await Assert.That(app.SettingsOpenKey).IsNull(); + await Assert.That(form.Preview()!.Value.Matched).IsEqualTo(2); + } + + [Test] + public async Task TheTriggerBuilderOpensTheCellEditorWhereThereIsNoWindow() + { + var (app, _, _) = App(native: false); + + app.RenderSnapshot("trigger-builder"); + + await Assert.That(app.SettingsOpenKey).IsEqualTo(ConsoleKey.F2); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/NativeSettingsRoutingTests.cs b/tests/SharpMUTerm.Tui.Tests/NativeSettingsRoutingTests.cs index 2684d6b5..ca824cee 100644 --- a/tests/SharpMUTerm.Tui.Tests/NativeSettingsRoutingTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/NativeSettingsRoutingTests.cs @@ -59,14 +59,14 @@ public async Task F7AndF8OpenTheHostsWindowAndNoCellScreen() } [Test] - public async Task AnUndeclaredScreenStaysACellScreen() + public async Task AListScreenOpensTheHostsWindowToo() { var (app, native, _) = App(); app.SimulateKey(F(ConsoleKey.F2)); - await Assert.That(native.Shown).IsEmpty(); - await Assert.That(app.SettingsOpenKey).IsEqualTo(ConsoleKey.F2); + await Assert.That(native.Shown.Single().Initial).IsEqualTo("triggers"); + await Assert.That(app.SettingsOpenKey).IsNull(); } [Test] From e9ceb07b30d2c6f542883f005e0c3fa838a82f9a Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 09:10:17 +0000 Subject: [PATCH 032/113] feat(packages): declare F10 in Client, native package manager in the window F10 is a declared list section (BuiltInSettings.Packages, PackageCollection): an enabled switch whose binding replaces DisabledPackages, read-only fields for name, version, games, author, description, sets, scripts, media, update and characters, and the Space/c/Del/b actions. The cell modal and the window's PackagePageView draw the same fields in the same order. The window gets a package manager page: an Installed tab (switches, details, copy sets, remove) and a Browse tab that fetches the index only when asked and lists the focused world's packages first. Install opens a native review drawn from the same PackageReviewModel as the cell review, leading with what can act as the player; both end in AcceptPackage, which refuses a stale review, so nothing is written until the player installs. Every gesture goes to the client through IPackageHost. A settings --view opens the native window in the window host; the parity harness still compares cells. The demo scene serves a fake index from memory. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 6 + CLAUDE.md | 30 +- src/SharpMUTerm.Avalonia/PackagePageView.cs | 715 ++++++++++++++++++ src/SharpMUTerm.Avalonia/SettingsWindow.cs | 55 ++ .../Contributions/Descriptors.cs | 18 + .../Packages/PackageManager.cs | 200 +++++ .../Packages/PackageModels.cs | 181 +++++ .../Settings/BuiltInSettings.cs | 5 +- .../Settings/PackageCollection.cs | 247 ++++++ .../Settings/SettingsForm.cs | 8 +- .../Settings/SettingsSearch.cs | 4 +- .../Surfaces/SurfaceCatalog.cs | 2 +- src/SharpMUTerm.Core/Packages/PackageStore.cs | 41 +- src/SharpMUTerm.Tui/PackageScreen.cs | 154 ++-- .../SharpMUTermApp.Packages.cs | 387 +++++++--- .../SharpMUTermApp.Settings.cs | 19 +- src/SharpMUTerm.Tui/SharpMUTermApp.cs | 9 + .../PackagePageTests.cs | 224 ++++++ .../SettingsWindowTests.cs | 14 +- .../PackageSettingsTests.cs | 242 ++++++ .../NativePackagesTests.cs | 407 ++++++++++ .../SharpMUTerm.Tui.Tests/PackagesAppTests.cs | 2 +- 22 files changed, 2767 insertions(+), 203 deletions(-) create mode 100644 src/SharpMUTerm.Avalonia/PackagePageView.cs create mode 100644 src/SharpMUTerm.Client/Packages/PackageManager.cs create mode 100644 src/SharpMUTerm.Client/Packages/PackageModels.cs create mode 100644 src/SharpMUTerm.Client/Settings/PackageCollection.cs create mode 100644 tests/SharpMUTerm.Avalonia.Tests/PackagePageTests.cs create mode 100644 tests/SharpMUTerm.Client.Tests/PackageSettingsTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/NativePackagesTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 063f7b42..02bb12d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,12 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- Packages (F10) open in the desktop window's settings as a package manager: switch each installed package on or + off, see what it adds, who it applies to and whether the index offers an update, copy its sets to edit or remove + it. The Browse tab fetches the package index only when you ask, lists your world's packages first, and Install + shows a review that leads with what can act as you; nothing is written until you install. In the terminal, F10 + now also shows each package's author, description, scripts, media and update, and the install review opens with + what can send commands as you. - Triggers, aliases, key bindings and timers (F2, F3, F4, F6) open in the desktop window's settings as a list beside the selected item's fields: tick a box to switch one on or off, add, copy, delete or move it up and down, and watch the trigger's live test mark the matching lines as you type its pattern. A package's sets are shown diff --git a/CLAUDE.md b/CLAUDE.md index 763a96aa..5917cb2a 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -191,7 +191,9 @@ fallbacks) for inline images/maps. character's own, so an update replaces them wholesale and never touches the player's edits; `c` on F10 copies them into the player's sets to edit. The only thing saved is `DisabledPackages`. - **The review is the consent step**: nothing is written until ⏎, and it leads with what can act as the - player (rules that send, scripts that run). Downloads are https only, capped while streaming. + player (rules that send, scripts that run). Downloads are https only, capped while streaming. The review is one + `PackageReviewModel` (Client) drawn by both hosts, and F10 itself is declared in Client + (`BuiltInSettings.Packages`); see *F10 is a package manager page* under the native settings window. - **Scripts are `package:/`** and `SessionScripts` resolves them only under that package's `scripts/`, through `PackageStore.ResolveScript`. They still need the scripts root, like any script. - One folder per package (`packages//`, beside `config.json`), swapped in through a `.id.new` staging @@ -1715,8 +1717,7 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] - **⌥↑/⌥↓ move an item within its set on the cell screens** (`ScreenRow.Move`, `ScreenLists.Mover`, `SettingsSession.Reorder`), saved only when it moved, the cursor following; a `⌥↑↓ moves …` hint row sits under `Del removes …`. That is the one cell row this added. Order is meaning for a trigger (first stop wins). - - The search searches item fields too (`SettingsSearch.Searchable`). F10 is the one section left listed by - title only. + - The search searches item fields too (`SettingsSearch.Searchable`), F10's package fields included. - **In the window, a declared section opens a native settings window, generated from the declarations** (`ClientHost.NativeSettings` → `INativeSettings`; Client `SettingsForm`; Avalonia `SettingsWindow`, `SettingsPresenter` on the driver; `OpenSettingsScreen`/`TryOpenNativeSettings` in `SharpMUTermApp.Settings.cs`). @@ -1758,6 +1759,29 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] has the live test under it, re-run on every keystroke, each matching line with the match marked. The trigger builder opens it on the rule it made (`TryOpenNativeSettings(section, item)`); with no window it opens the cell F2 as before. + - **F10 is a package manager page** (`PackagePageView`, Avalonia; Client `PackageCollection`, `PackageManager`, + `PackageReviewModel`, `PackageBrowseModel`; `SharpMUTermApp.Packages.cs`). F10 is declared as a list of + installed packages (`SettingsSectionContribution.Packages`): one `BoolField` (`enabled`, whose binding replaces + `DisabledPackages`, the one thing it writes) and read-only `InfoField`s (name, version, games, by, about, sets, + scripts, media, update, characters), plus four actions (Space, `c`, Del, `b`). The cell modal + (`PackageScreen.List`) and the page draw the same fields in the same order + (`PackagePageTests.ThePageDrawsTheDeclaredFieldsTheCellScreenDraws`). Decisions: + - **Every gesture goes to the client** through `IPackageHost` (`PackageHostCalls`, marshalled with `OnUiThread`): + on/off (`SetPackageEnabled`, one `SaveConfiguration`), remove, copy sets, fetch the index, install, accept, + cancel. The page writes nothing; `PackageManager` is what the client publishes for it to read + (`PublishIndex`/`PublishReview`/`PublishStatus`, `Changed`). + - **One consent path in both hosts**: `ReviewPackage` checks the SHA-256, id and version, then builds one + `PackageReviewModel`; the cell overlay draws it with `PackageScreen.Review`, the window as a card over the page. + Both end in `AcceptPackage(model)`, which refuses a model that is not the pending one, so a stale review + cannot install. It leads with `WHAT CAN ACT AS YOU`. + - **The index is fetched only from the Browse tab's button** (or `b`/⌃P ▸ *Browse packages*, which bring the tab + forward through `BrowseRequests`), never when the page opens. The browse list is `PackageBrowseModel`, the + focused world's packages first, as on the cells. + - The `--demo-config` scene installs two fake packages and serves a fake index from memory (`DemoFetch`, real + SHA-256s); screenshots `ux-wave8/packages-window-*.png` and `packages-terminal-*.png`. + - **A settings `--view` opens the native window when the host has one** (`RenderSnapshot`: a declared screen with + no `-edit` goes through `TryOpenNativeSettings`, as do `packages`/`package-browse`/`package-review`). The parity + harness passes `NativeSettings = null`, so its cells are still compared. - Not done: the window is not modal. Screenshots come from a real window under Xvfb, driven with XTest (`ux-wave4/native-settings-*.png`, `ux-wave6/settings-themes-window-*.png`, `ux-wave7/lists-*.png`). - **In the window, ⌃P is a native palette over the window, listing the cell palette's rows** (`ClientHost.NativePalette` diff --git a/src/SharpMUTerm.Avalonia/PackagePageView.cs b/src/SharpMUTerm.Avalonia/PackagePageView.cs new file mode 100644 index 00000000..f504b23f --- /dev/null +++ b/src/SharpMUTerm.Avalonia/PackagePageView.cs @@ -0,0 +1,715 @@ +using System.Globalization; +using Avalonia; +using Avalonia.Automation; +using Avalonia.Controls; +using Avalonia.Controls.Primitives; +using Avalonia.Layout; +using Avalonia.Media; +using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Client.Packages; +using SharpMUTerm.Client.Settings; + +namespace SharpMUTerm.Avalonia; + +/// +/// F10 in the settings window: a package manager drawn from F10's declaration () and the +/// client's . Installed lists the packages with an on/off switch each and the selected +/// one's declared fields beside it, with Copy sets to edit and Remove; Browse lists the package index, +/// the focused window's world's packages first — fetched only when the player opens it; and an install opens the +/// review over the page, drawn from , the model the cell review draws. +/// +/// Nothing here installs, removes or switches anything: every gesture goes to the manager, which hands it to the client +/// on the client's thread, and catches up once the client has published what happened. +/// +/// +internal sealed class PackagePageView : Grid +{ + private readonly PackageManager _manager; + private readonly PackageCollection _declaration; + private readonly Func _visible; + private readonly IBrush _accent; + private readonly bool _dark; + private readonly TabControl _tabs; + private readonly ListBox _installed = new() { Background = Brushes.Transparent }; + private readonly StackPanel _detail = new() { Spacing = 2, Margin = new Thickness(4, 0, 4, 16) }; + private readonly ListBox _browse = new() { Background = Brushes.Transparent }; + private readonly StackPanel _browseDetail = new() { Spacing = 6, Margin = new Thickness(4, 0, 4, 16) }; + private readonly ContentControl _browseBody = new(); + private readonly Border _reviewLayer; + private readonly TextBlock _status = new() { Opacity = 0.8, TextWrapping = TextWrapping.Wrap, Margin = new Thickness(0, 8, 0, 0) }; + private readonly Dictionary _values = new(StringComparer.Ordinal); + private readonly List<(PackageItem Item, ToggleSwitch Switch)> _rows = []; + private string? _selected; + private int _browseSelected; + private bool _confirmRemove; + private bool _syncing; + private PackageBrowseModel? _shownBrowse; + private bool _shownFetching; + private PackageReviewModel? _shownReview; + + public PackagePageView(PackageManager manager, Func visible, IBrush accent, bool dark) + { + _manager = manager; + _declaration = manager.Declaration; + _visible = visible; + _accent = accent; + _dark = dark; + RowDefinitions = new RowDefinitions("*,Auto"); + Margin = new Thickness(0, 6, 0, 0); + + _installed.SelectionChanged += (_, _) => + { + if (!_syncing && _installed.SelectedItem is ListBoxItem { Tag: string id }) + { + _selected = id; + _confirmRemove = false; + BuildDetail(); + } + }; + AutomationProperties.SetName(_installed, "Installed packages"); + _browse.SelectionChanged += (_, _) => + { + if (!_syncing && _browse.SelectedIndex >= 0) + { + _browseSelected = _browse.SelectedIndex; + BuildBrowseDetail(); + } + }; + AutomationProperties.SetName(_browse, "The package index"); + + InstalledTab = new TabItem { Header = "Installed", Content = MasterDetail(_installed, _detail), FontSize = 17 }; + BrowseTab = new TabItem { Header = "Browse", Content = _browseBody, FontSize = 17 }; + foreach (var tab in new[] { InstalledTab, BrowseTab }) + { + // The header's size only: the page under it keeps the window's own. + if (tab.Content is Control content) + { + content.SetValue(global::Avalonia.Controls.Documents.TextElement.FontSizeProperty, 14d); + } + } + _tabs = new TabControl { ItemsSource = new[] { InstalledTab, BrowseTab } }; + _tabs.SelectionChanged += (_, _) => + { + if (!_syncing && ReferenceEquals(_tabs.SelectedItem, BrowseTab)) + { + BuildBrowse(); + } + }; + Children.Add(_tabs); + + SetRow(_status, 1); + Children.Add(_status); + + _reviewLayer = new Border + { + Background = new SolidColorBrush(Color.FromArgb(0x99, 0, 0, 0)), + IsVisible = false, + }; + SetRowSpan(_reviewLayer, 2); + Children.Add(_reviewLayer); + + Refresh(); + } + + /// The Installed tab. + public TabItem InstalledTab { get; } + + /// The Browse tab. + public TabItem BrowseTab { get; } + + /// Whether the Browse tab is in front. + public bool Browsing => ReferenceEquals(_tabs.SelectedItem, BrowseTab); + + /// The ids of the fields drawn — the switch, the row's fields, then the detail's — for a test. + public IReadOnlyList ShownFields { get; private set; } = []; + + /// The installed packages listed, each with its switch, for a test. + public IReadOnlyList<(PackageItem Item, ToggleSwitch Switch)> Rows => _rows; + + /// What each detail field says now, by id, for a test. + public IReadOnlyDictionary Values => _values.ToDictionary(v => v.Key, v => v.Value.Text ?? string.Empty, StringComparer.Ordinal); + + /// The remove button of the selected package, for a test. + public Button? RemoveButton { get; private set; } + + /// The copy-its-sets button of the selected package, for a test. + public Button? CopyButton { get; private set; } + + /// The button that fetches the index, while it has not been fetched, for a test. + public Button? FetchButton { get; private set; } + + /// The selected index entry's install button, for a test. + public Button? InstallButton { get; private set; } + + /// The review on show, for a test; null when none is. + public PackageReviewModel? ShownReview => _shownReview; + + /// The review's lines as drawn, in order (headings, then each row's label and value), for a test. + public IReadOnlyList ReviewLines { get; private set; } = []; + + /// The review's install button, for a test. + public Button? AcceptButton { get; private set; } + + /// The review's cancel button, for a test. + public Button? CancelButton { get; private set; } + + /// Catches up with what the client published: the installed list, the index, the review, the status. + public void Refresh() + { + BuildInstalled(); + if (_manager.BrowseRequests != _manager.BrowseRequestsSeen) + { + // The player asked for the index (here, or ⌃P ▸ Browse packages): the list it arrives in comes forward. + _manager.BrowseRequestsSeen = _manager.BrowseRequests; + _syncing = true; + _tabs.SelectedItem = BrowseTab; + _syncing = false; + BuildBrowse(); + } + else if (!ReferenceEquals(_manager.BrowseModel, _shownBrowse) || _manager.Fetching != _shownFetching) + { + BuildBrowse(); + } + + if (!ReferenceEquals(_manager.Review, _shownReview)) + { + BuildReview(); + } + + _status.Text = _manager.Status ?? string.Empty; + _status.IsVisible = _manager.Status is not null; + } + + // ── installed ──────────────────────────────────────────────────────────────────────────────── + + private Grid MasterDetail(Control list, Control detail) + { + var grid = new Grid { ColumnDefinitions = new ColumnDefinitions("260,*"), Margin = new Thickness(0, 10, 0, 0) }; + grid.Children.Add(new Border + { + Child = list, + BorderThickness = new Thickness(1), + BorderBrush = Hairline, + CornerRadius = new CornerRadius(6), + Margin = new Thickness(0, 0, 14, 0), + }); + var scroller = new ScrollViewer { Content = detail, HorizontalScrollBarVisibility = ScrollBarVisibility.Disabled }; + SetColumn(scroller, 1); + grid.Children.Add(scroller); + return grid; + } + + private IBrush Hairline => new SolidColorBrush(_dark ? Color.Parse("#46464e") : Color.Parse("#c8c8d0")); + + private IBrush Warning => new SolidColorBrush(_dark ? Color.Parse("#ffb454") : Color.Parse("#a4410e")); + + private void BuildInstalled() + { + var items = _manager.Items; + _syncing = true; + try + { + _rows.Clear(); + var rows = new List(); + foreach (var item in items) + { + var toggle = new ToggleSwitch + { + IsChecked = _manager.IsEnabled(item), + OnContent = null, + OffContent = null, + MinWidth = 0, + VerticalAlignment = VerticalAlignment.Center, + }; + AutomationProperties.SetName(toggle, $"{item.Package.Manifest.Name} on"); + ToolTip.SetTip(toggle, _declaration.Action(PackageCollection.Toggle).Help); + var captured = item; + toggle.IsCheckedChanged += (_, _) => + { + if (!_syncing && toggle.IsChecked is bool on) + { + _manager.SetEnabled(captured, on); + } + }; + _rows.Add((item, toggle)); + + var words = new StackPanel { Spacing = 1, VerticalAlignment = VerticalAlignment.Center }; + words.Children.Add(new TextBlock { Text = Text("name", item), FontSize = 14, TextTrimming = TextTrimming.CharacterEllipsis }); + var tail = string.Join(" · ", _declaration.RowFields.Skip(1).Select(id => Text(id, item))); + words.Children.Add(new TextBlock { Text = tail, FontSize = 12, Opacity = 0.7, TextTrimming = TextTrimming.CharacterEllipsis }); + if (item.Update is { } newer) + { + words.Children.Add(new TextBlock { Text = $"update {newer} available", FontSize = 12, Foreground = _accent }); + } + + var row = new Grid { ColumnDefinitions = new ColumnDefinitions("Auto,*") }; + row.Children.Add(toggle); + SetColumn(words, 1); + words.Margin = new Thickness(6, 0, 0, 0); + row.Children.Add(words); + rows.Add(new ListBoxItem { Content = row, Tag = item.Id, Padding = new Thickness(8, 6) }); + } + + _installed.ItemsSource = rows; + if (items.Count > 0 && (_selected is null || items.All(i => i.Id != _selected))) + { + _selected = items[0].Id; + } + + _installed.SelectedItem = rows.FirstOrDefault(r => Equals(r.Tag, _selected)); + } + finally + { + _syncing = false; + } + + BuildDetail(); + } + + private string Text(string id, PackageItem item) => + _declaration.Field(id) is InfoField info ? _manager.Text(info, item) : string.Empty; + + private void BuildDetail() + { + _detail.Children.Clear(); + _values.Clear(); + RemoveButton = null; + CopyButton = null; + var item = _manager.Items.FirstOrDefault(i => i.Id == _selected); + if (item is null) + { + ShownFields = []; + _detail.Children.Add(new TextBlock + { + Text = "No package is installed. Browse the index, or use ⌃P ▸ Install package… with a file or an https link.", + TextWrapping = TextWrapping.Wrap, + Opacity = 0.75, + Margin = new Thickness(0, 8, 0, 8), + }); + _detail.Children.Add(BrowseDoor()); + return; + } + + var shown = new List { _declaration.EnabledField }; + shown.AddRange(_declaration.RowFields); + _detail.Children.Add(new TextBlock { Text = Text("name", item), FontSize = 20, FontWeight = FontWeight.SemiBold }); + var subtitle = string.Join(" · ", _declaration.RowFields.Skip(1).Select(id => Text(id, item))); + _detail.Children.Add(new TextBlock { Text = subtitle, Opacity = 0.7, Margin = new Thickness(0, 0, 0, 6) }); + + string? group = null; + foreach (var field in _declaration.DetailFields.Where(_visible)) + { + if (field.Group is { } heading && heading != group) + { + group = heading; + _detail.Children.Add(new TextBlock + { + Text = heading, + FontSize = 15, + FontWeight = FontWeight.SemiBold, + Margin = new Thickness(0, 14, 0, 4), + Foreground = _accent, + }); + } + + var row = new Grid { ColumnDefinitions = new ColumnDefinitions("120,*"), Margin = new Thickness(0, 3) }; + var label = new TextBlock { Text = Capitalise(field.Label), Opacity = 0.75 }; + if (field.Help is { } help) + { + ToolTip.SetTip(label, Capitalise(help)); + } + + var value = new TextBlock { Text = Text(field.Id, item), TextWrapping = TextWrapping.Wrap }; + if (field.Id == "update" && item.Update is not null) + { + value.Foreground = _accent; + } + + AutomationProperties.SetName(value, field.Label); + _values[field.Id] = value; + row.Children.Add(label); + SetColumn(value, 1); + row.Children.Add(value); + _detail.Children.Add(row); + shown.Add(field.Id); + } + + ShownFields = shown; + + var actions = new WrapPanel { Orientation = Orientation.Horizontal, Margin = new Thickness(0, 18, 0, 0) }; + var copy = ActionButton(PackageCollection.CopySets, "Copy sets to edit"); + copy.IsEnabled = item.Package.Sets.Count > 0; + copy.Click += (_, _) => _manager.CopySets(item); + CopyButton = copy; + actions.Children.Add(copy); + + var remove = ActionButton(PackageCollection.Remove, _confirmRemove ? $"Remove {item.Package.Manifest.Name} and its files" : "Remove…"); + if (_confirmRemove) + { + remove.Foreground = Warning; + } + + remove.Click += (_, _) => + { + if (!_confirmRemove) + { + // The cell screen's Del, Del: the first press asks. + _confirmRemove = true; + BuildDetail(); + return; + } + + _confirmRemove = false; + _manager.Remove(item); + }; + RemoveButton = remove; + actions.Children.Add(remove); + actions.Children.Add(BrowseDoor()); + _detail.Children.Add(actions); + if (_confirmRemove) + { + _detail.Children.Add(new TextBlock + { + Text = "Click again to remove it; its sets stop applying and its folder is deleted.", + Foreground = Warning, + Margin = new Thickness(0, 6, 0, 0), + TextWrapping = TextWrapping.Wrap, + }); + } + } + + private Button BrowseDoor() + { + var browse = ActionButton(PackageCollection.Browse, "Browse the index"); + browse.Click += (_, _) => + { + _tabs.SelectedItem = BrowseTab; + }; + return browse; + } + + private Button ActionButton(string action, string text) + { + var button = new Button { Content = text, Margin = new Thickness(0, 0, 8, 6), Padding = new Thickness(12, 5) }; + var declared = _declaration.Action(action); + ToolTip.SetTip(button, $"{Capitalise(declared.Help)} ({declared.Key} on the cell screen)"); + AutomationProperties.SetName(button, text); + return button; + } + + // ── browse ─────────────────────────────────────────────────────────────────────────────────── + + private void BuildBrowse() + { + _shownBrowse = _manager.BrowseModel; + _shownFetching = _manager.Fetching; + FetchButton = null; + InstallButton = null; + if (_manager.BrowseModel is not { } model) + { + var empty = new StackPanel { Spacing = 10, Margin = new Thickness(4, 24, 4, 0), MaxWidth = 520, HorizontalAlignment = HorizontalAlignment.Left }; + empty.Children.Add(new TextBlock { Text = "The package index", FontSize = 18, FontWeight = FontWeight.SemiBold }); + empty.Children.Add(new TextBlock + { + Text = "Rule sets, scripts and sounds other players have shared, this game's first. The index is fetched only when you ask, over https; every package is checked against it before you see its review.", + TextWrapping = TextWrapping.Wrap, + Opacity = 0.8, + }); + if (_manager.Fetching) + { + empty.Children.Add(new StackPanel + { + Orientation = Orientation.Horizontal, + Spacing = 10, + Children = { new ProgressBar { IsIndeterminate = true, Width = 120 }, new TextBlock { Text = "Fetching the index…", VerticalAlignment = VerticalAlignment.Center } }, + }); + } + else + { + var fetch = new Button { Content = "Fetch the index", Padding = new Thickness(14, 6), Classes = { "accent" } }; + AutomationProperties.SetName(fetch, "Fetch the package index"); + fetch.Click += (_, _) => _manager.Browse(); + FetchButton = fetch; + empty.Children.Add(fetch); + } + + _browseBody.Content = empty; + return; + } + + var head = new StackPanel { Spacing = 2, Margin = new Thickness(0, 10, 0, 0) }; + head.Children.Add(new TextBlock + { + Text = PackageCollection.Of(model.Rows.Count, "package") + (model.World is { } world ? $" · {world}'s first" : string.Empty), + Opacity = 0.75, + }); + if (model.Dropped > 0) + { + head.Children.Add(new TextBlock + { + Text = model.Dropped == 1 ? "1 entry in the index breaks its rules and is not listed" : $"{model.Dropped.ToString(CultureInfo.InvariantCulture)} entries in the index break its rules and are not listed", + Foreground = Warning, + }); + } + + _syncing = true; + var rows = new List(); + foreach (var row in model.Rows) + { + var words = new StackPanel { Spacing = 1 }; + var title = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 8 }; + title.Children.Add(new TextBlock { Text = row.Entry.Name, FontSize = 14 }); + if (row.ForWorld) + { + title.Children.Add(Chip(model.World ?? "this game", _accent)); + } + + if (row.State != PackageBrowseState.New) + { + title.Children.Add(Chip(row.State == PackageBrowseState.Update ? "update" : "installed", row.State == PackageBrowseState.Update ? _accent : Hairline)); + } + + words.Children.Add(title); + words.Children.Add(new TextBlock + { + Text = $"{row.Entry.Version} · {string.Join(", ", row.Entry.Games)}" + (row.StateText.Length == 0 ? string.Empty : $" · {row.StateText}"), + FontSize = 12, + Opacity = 0.7, + TextTrimming = TextTrimming.CharacterEllipsis, + }); + rows.Add(new ListBoxItem { Content = words, Padding = new Thickness(8, 6) }); + } + + _browse.ItemsSource = rows; + _browseSelected = Math.Clamp(_browseSelected, 0, Math.Max(0, rows.Count - 1)); + _browse.SelectedIndex = rows.Count == 0 ? -1 : _browseSelected; + _syncing = false; + + var dock = new DockPanel { LastChildFill = true }; + DockPanel.SetDock(head, Dock.Top); + dock.Children.Add(head); + dock.Children.Add(MasterDetail(_browse, _browseDetail)); + _browseBody.Content = dock; + BuildBrowseDetail(); + } + + private Border Chip(string text, IBrush brush) => new() + { + Child = new TextBlock { Text = text, FontSize = 11, Foreground = brush }, + BorderBrush = brush, + BorderThickness = new Thickness(1), + CornerRadius = new CornerRadius(8), + Padding = new Thickness(6, 0), + VerticalAlignment = VerticalAlignment.Center, + }; + + private void BuildBrowseDetail() + { + _browseDetail.Children.Clear(); + InstallButton = null; + if (_manager.BrowseModel is not { Rows.Count: > 0 } model) + { + _browseDetail.Children.Add(new TextBlock { Text = "The index lists nothing.", Opacity = 0.75 }); + return; + } + + var row = model.Rows[Math.Clamp(_browseSelected, 0, model.Rows.Count - 1)]; + var entry = row.Entry; + _browseDetail.Children.Add(new TextBlock { Text = entry.Name, FontSize = 20, FontWeight = FontWeight.SemiBold }); + _browseDetail.Children.Add(new TextBlock + { + Text = entry.Version + (entry.Author is { } author ? $" · by {author}" : string.Empty), + Opacity = 0.7, + }); + if (!string.IsNullOrWhiteSpace(entry.Description)) + { + _browseDetail.Children.Add(new TextBlock { Text = entry.Description, TextWrapping = TextWrapping.Wrap }); + } + + _browseDetail.Children.Add(Pair("Games", string.Join(", ", entry.Games))); + _browseDetail.Children.Add(Pair("From", entry.Url)); + if (row.InstalledVersion is { } installed) + { + _browseDetail.Children.Add(Pair("Installed", installed)); + } + + var install = new Button + { + Content = row.State switch + { + PackageBrowseState.Update => $"Review update to {entry.Version}…", + PackageBrowseState.Installed => "Review and reinstall…", + _ => "Review and install…", + }, + Padding = new Thickness(14, 6), + Margin = new Thickness(0, 12, 0, 0), + Classes = { "accent" }, + }; + ToolTip.SetTip(install, "Downloads it, checks it against the index's SHA-256, and shows what it adds — nothing is installed until you agree"); + install.Click += (_, _) => _manager.Install(row); + InstallButton = install; + _browseDetail.Children.Add(install); + } + + private static Grid Pair(string label, string value) + { + var grid = new Grid { ColumnDefinitions = new ColumnDefinitions("120,*") }; + grid.Children.Add(new TextBlock { Text = label, Opacity = 0.75 }); + var text = new TextBlock { Text = value, TextWrapping = TextWrapping.Wrap }; + SetColumn(text, 1); + grid.Children.Add(text); + return grid; + } + + // ── review ─────────────────────────────────────────────────────────────────────────────────── + + private void BuildReview() + { + _shownReview = _manager.Review; + AcceptButton = null; + CancelButton = null; + if (_manager.Review is not { } review) + { + _reviewLayer.IsVisible = false; + _reviewLayer.Child = null; + ReviewLines = []; + return; + } + + var lines = new List(); + var header = new StackPanel { Spacing = 2, Margin = new Thickness(0, 0, 0, 4) }; + header.Children.Add(new TextBlock { Text = review.Title, FontSize = 13, Opacity = 0.7 }); + header.Children.Add(new TextBlock + { + Text = $"{review.Name} {review.Version}", + FontSize = 20, + FontWeight = FontWeight.SemiBold, + TextWrapping = TextWrapping.Wrap, + }); + var byline = string.Join(" · ", new[] + { + review.Author is { } author ? $"by {author}" : null, + review.Replaces is { } replaces ? $"replaces version {replaces}, and its sets with it" : null, + }.Where(t => t is not null)); + if (byline.Length > 0) + { + header.Children.Add(new TextBlock { Text = byline, Opacity = 0.75, TextWrapping = TextWrapping.Wrap }); + } + + var card = new StackPanel { Spacing = 4 }; + if (review.Description is { } description) + { + card.Children.Add(new TextBlock { Text = description, TextWrapping = TextWrapping.Wrap }); + } + + foreach (var section in review.Sections) + { + lines.Add(section.Heading); + var acts = section.Heading == PackageReviewModel.ActsHeading; + var box = new StackPanel { Spacing = 3 }; + box.Children.Add(new TextBlock + { + Text = Capitalise(section.Heading.ToLowerInvariant()), + FontWeight = FontWeight.SemiBold, + FontSize = 15, + Foreground = acts && review.Acts ? Warning : _accent, + Margin = new Thickness(0, 0, 0, 2), + }); + foreach (var row in section.Rows) + { + lines.Add(row.Label.Length == 0 ? row.Value : $"{row.Label}: {row.Value}"); + var ink = row.Tone switch + { + PackageReviewTone.Warning => Warning, + _ => null, + }; + var value = new TextBlock + { + Text = row.Value, + TextWrapping = TextWrapping.Wrap, + FontWeight = row.Tone == PackageReviewTone.Warning ? FontWeight.SemiBold : FontWeight.Normal, + Opacity = row.Tone == PackageReviewTone.Quiet ? 0.7 : 1, + }; + if (ink is not null) + { + value.Foreground = ink; + } + + if (row.Label.Length == 0) + { + box.Children.Add(value); + continue; + } + + var grid = new Grid { ColumnDefinitions = new ColumnDefinitions("110,*") }; + grid.Children.Add(new TextBlock { Text = Capitalise(row.Label), Opacity = 0.75 }); + SetColumn(value, 1); + grid.Children.Add(value); + box.Children.Add(grid); + } + + card.Children.Add(new Border + { + Child = box, + Padding = new Thickness(12, 10), + Margin = new Thickness(0, 8, 0, 0), + CornerRadius = new CornerRadius(6), + BorderThickness = new Thickness(acts && review.Acts ? 1 : 0), + BorderBrush = Warning, + Background = new SolidColorBrush(_dark ? Color.Parse("#2a2a30") : Color.Parse("#f3f3f6")), + }); + } + + var footer = new DockPanel { Margin = new Thickness(0, 12, 0, 0) }; + var consent = new TextBlock + { + Text = Capitalise(PackageReviewModel.Consent) + ".", + Opacity = 0.75, + VerticalAlignment = VerticalAlignment.Center, + TextWrapping = TextWrapping.Wrap, + }; + var accept = new Button { Content = review.Replaces is null ? "Install" : "Update", Padding = new Thickness(18, 6), Classes = { "accent" } }; + AutomationProperties.SetName(accept, "Install the package"); + accept.Click += (_, _) => _manager.Accept(); + var cancel = new Button { Content = "Cancel", Padding = new Thickness(18, 6) }; + cancel.Click += (_, _) => _manager.Cancel(); + AcceptButton = accept; + CancelButton = cancel; + var buttons = new StackPanel + { + Orientation = Orientation.Horizontal, + Spacing = 8, + Margin = new Thickness(12, 0, 0, 0), + Children = { cancel, accept }, + }; + DockPanel.SetDock(buttons, Dock.Right); + footer.Children.Add(buttons); + footer.Children.Add(consent); + + // The title and the buttons stay put; only the facts between them scroll, so Install is always in reach. + var layout = new DockPanel { LastChildFill = true }; + DockPanel.SetDock(header, Dock.Top); + DockPanel.SetDock(footer, Dock.Bottom); + layout.Children.Add(header); + layout.Children.Add(footer); + layout.Children.Add(new ScrollViewer { Content = card, HorizontalScrollBarVisibility = ScrollBarVisibility.Disabled }); + + ReviewLines = lines; + _reviewLayer.Child = new Border + { + Child = layout, + Background = new SolidColorBrush(_dark ? Color.Parse("#202024") : Colors.White), + CornerRadius = new CornerRadius(8), + Padding = new Thickness(22, 16), + MaxWidth = 620, + Margin = new Thickness(16), + HorizontalAlignment = HorizontalAlignment.Center, + VerticalAlignment = VerticalAlignment.Center, + BoxShadow = BoxShadows.Parse("0 8 32 0 #66000000"), + }; + _reviewLayer.IsVisible = true; + } + + private static string Capitalise(string text) => + text.Length == 0 ? text : char.ToUpper(text[0], CultureInfo.InvariantCulture) + text[1..]; +} diff --git a/src/SharpMUTerm.Avalonia/SettingsWindow.cs b/src/SharpMUTerm.Avalonia/SettingsWindow.cs index 4957ba0b..8ce7edf8 100644 --- a/src/SharpMUTerm.Avalonia/SettingsWindow.cs +++ b/src/SharpMUTerm.Avalonia/SettingsWindow.cs @@ -79,6 +79,11 @@ public SettingsWindow(SettingsForm form) { editor.Height = ListEditorHeight(); } + + if (PackagePage is { } packages) + { + packages.Height = ListEditorHeight(); + } }; var dock = new DockPanel { LastChildFill = true }; @@ -93,6 +98,10 @@ public SettingsWindow(SettingsForm form) { _clock.Stop(); _form.Changed -= OnChanged; + if (_form.Packages is { } packages) + { + packages.Changed -= OnPackagesChanged; + } }; KeyDown += OnKey; @@ -111,6 +120,9 @@ public SettingsWindow(SettingsForm form) /// The height a list editor takes: the page's viewport less the title above it. private double ListEditorHeight() => Math.Max(360, _scroller.Bounds.Height - 96); + /// F10's package manager page, or null on any other page. + internal PackagePageView? PackagePage { get; private set; } + /// The master-detail editor a list section (F2, F3, F4, F6) is drawn as, or null on any other page. internal ListEditorView? ListEditor { get; private set; } @@ -143,8 +155,17 @@ public SettingsWindow(SettingsForm form) public void Load(SettingsForm form) { _form.Changed -= OnChanged; + if (_form.Packages is { } before) + { + before.Changed -= OnPackagesChanged; + } + _form = form; _form.Changed += OnChanged; + if (_form.Packages is { } after) + { + after.Changed += OnPackagesChanged; + } RequestedThemeVariant = form.IsDark ? ThemeVariant.Dark : ThemeVariant.Light; _shown = null; _matches = _form.Search(_search.Text); @@ -266,6 +287,7 @@ private void BuildPage() _themeCards.Clear(); SubjectPicker = null; ListEditor = null; + PackagePage = null; ScreenDoor = null; MeterGrid = null; _meterRows = -1; @@ -281,6 +303,29 @@ private void BuildPage() _page.Children.Add(new TextBlock { Text = $"{key} in the client · changes apply as you make them", Opacity = 0.7, Margin = new Thickness(0, 0, 0, 6) }); } + if (section.Packages is not null) + { + if (_form.Packages is not { } manager) + { + _page.Children.Add(new TextBlock { Text = "This client offers no packages.", Opacity = 0.7, Margin = new Thickness(0, 16, 0, 0) }); + ShownFields = []; + return; + } + + var packages = new PackagePageView( + manager, + f => !Searching || _matches.Any(m => ReferenceEquals(m.Field, f)), + Accent, + _form.IsDark) + { + Height = ListEditorHeight(), + }; + PackagePage = packages; + _page.Children.Add(packages); + ShownFields = packages.ShownFields; + return; + } + if (section.Collection is not null) { var editor = new ListEditorView( @@ -850,6 +895,16 @@ private void Tick() /// Raised on the client's thread once a change has landed; the page catches up on this one. private void OnChanged() => Dispatcher.UIThread.Post(Refresh); + /// Raised on the client's thread when the packages moved; F10's page catches up on this one. + private void OnPackagesChanged() => Dispatcher.UIThread.Post(() => + { + if (PackagePage is { } page) + { + page.Refresh(); + ShownFields = page.ShownFields; + } + }); + /// Re-reads every value and indicator on the page. A meter added or removed rebuilds the page, whose rows moved. internal void Refresh() { diff --git a/src/SharpMUTerm.Client/Contributions/Descriptors.cs b/src/SharpMUTerm.Client/Contributions/Descriptors.cs index 6988cb6a..45cc1c89 100644 --- a/src/SharpMUTerm.Client/Contributions/Descriptors.cs +++ b/src/SharpMUTerm.Client/Contributions/Descriptors.cs @@ -66,6 +66,14 @@ public sealed class SettingsSectionContribution : IContribution /// its item fields like any other. /// public SettingsCollection? Collection { get; init; } + + /// + /// For F10: the installed packages as a list, each package's fields as ordinary s over + /// bindings (the item is a ), and the actions a package row + /// offers. Null for every other section. Both hosts draw F10 from it — the cells as their list screen, the window + /// as its package manager page. + /// + public PackageCollection? Packages { get; init; } } /// @@ -89,6 +97,16 @@ public abstract record SettingsField(string Id, string Label, string? Help = nul public string? Keywords { get; init; } } +/// +/// A value a surface shows and nobody edits — a package's version, its games, what it adds. says +/// it for the item a surface has selected. +/// +public sealed record InfoField(string Id, string Label, string? Help = null) : SettingsField(Id, Label, Help) +{ + /// The text shown for target's item. + public required Func Read { get; init; } +} + /// A tick box. public sealed record BoolField(string Id, string Label, string? Help = null) : SettingsField(Id, Label, Help); diff --git a/src/SharpMUTerm.Client/Packages/PackageManager.cs b/src/SharpMUTerm.Client/Packages/PackageManager.cs new file mode 100644 index 00000000..3f494f5a --- /dev/null +++ b/src/SharpMUTerm.Client/Packages/PackageManager.cs @@ -0,0 +1,200 @@ +using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Client.Settings; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Packages; + +namespace SharpMUTerm.Client.Packages; + +/// +/// What the client does when a host's package page asks: the same methods the cell F10 keys and the cell browse and +/// review call, so there is one way to switch a package, one way to remove it and one consent path for an install. +/// Every call arrives on the client's thread. +/// +public interface IPackageHost +{ + /// Switches a package on or off, and saves. + void SetEnabled(string id, bool on); + + /// Removes a package and its files, and saves. + void Remove(string id); + + /// Copies a package's sets into the player's own, and saves. + void CopySets(string id); + + /// Fetches the package index — the only time it is fetched — and publishes it. + void Browse(); + + /// Fetches the archive an index entry names, checks it against the entry and publishes its review. + void Install(PackageIndexEntry entry); + + /// Installs what described, if it is still the review waiting. + void Accept(PackageReviewModel review); + + /// Drops without writing anything. + void Cancel(PackageReviewModel review); +} + +/// +/// F10 as a host's native page reads it: the declared packages over the live configuration, the index once the player +/// has asked for it, the review waiting for consent and the last thing said. The client publishes into it on its own +/// thread; a host reads it on its own, and every value it reads is a model replaced whole, never edited. Every gesture +/// goes back through , so the window never installs, removes or switches anything itself. +/// +public sealed class PackageManager +{ + private readonly AppConfiguration _config; + private readonly IPackageHost _host; + + /// The live configuration (its installed packages and which are off). + /// F10's declaration. + /// The client's side. + public PackageManager(AppConfiguration config, PackageCollection declaration, IPackageHost host) + { + ArgumentNullException.ThrowIfNull(config); + ArgumentNullException.ThrowIfNull(declaration); + ArgumentNullException.ThrowIfNull(host); + _config = config; + Declaration = declaration; + _host = host; + } + + /// F10's declaration: the fields and actions both hosts draw. + public PackageCollection Declaration { get; } + + /// The live configuration, for a binding to read through. + public AppConfiguration Configuration => _config; + + /// The installed packages now, each with what the index said of it. + public IReadOnlyList Items => PackageCollection.Items(_config, Index); + + /// The index, once fetched this run; null before the player first browses. + public PackageIndex? Index { get; private set; } + + /// The index as the browse list shows it, or null before it has arrived. + public PackageBrowseModel? BrowseModel { get; private set; } + + /// + /// How many times the player has asked for the index (here or by ⌃P ▸ Browse packages). A host compares it with + /// to bring its browse list forward once per ask. + /// + public int BrowseRequests { get; private set; } + + /// The a host has answered by showing its browse list; the host's to write. + public int BrowseRequestsSeen { get; set; } + + /// Whether the index is being fetched. + public bool Fetching { get; private set; } + + /// The review waiting for consent, or null. + public PackageReviewModel? Review { get; private set; } + + /// The last thing the client said about packages (installed, removed, refused), or null. + public string? Status { get; private set; } + + /// Raised on the client's thread after anything here has changed. + public event Action? Changed; + + /// Whether the package is on. + public bool IsEnabled(PackageItem item) + { + ArgumentNullException.ThrowIfNull(item); + return PackageCollection.IsEnabled(_config, item.Id); + } + + /// What says for . + public string Text(InfoField field, PackageItem item) + { + ArgumentNullException.ThrowIfNull(field); + return field.Read(new SettingTarget(_config, Item: item)); + } + + // ── gestures, handed to the client ─────────────────────────────────────────────────────────── + + /// Switches on or off. + public void SetEnabled(PackageItem item, bool on) + { + ArgumentNullException.ThrowIfNull(item); + _host.SetEnabled(item.Id, on); + } + + /// Removes . + public void Remove(PackageItem item) + { + ArgumentNullException.ThrowIfNull(item); + _host.Remove(item.Id); + } + + /// Copies 's sets into the player's own. + public void CopySets(PackageItem item) + { + ArgumentNullException.ThrowIfNull(item); + _host.CopySets(item.Id); + } + + /// Fetches the index. Nothing fetches it before this is called. + public void Browse() => _host.Browse(); + + /// Fetches and checks the package names, and opens its review. + public void Install(PackageBrowseRow row) + { + ArgumentNullException.ThrowIfNull(row); + _host.Install(row.Entry); + } + + /// Installs the package under review: the consent. + public void Accept() + { + if (Review is { } review) + { + _host.Accept(review); + } + } + + /// Drops the review; nothing is written. + public void Cancel() + { + if (Review is { } review) + { + _host.Cancel(review); + } + } + + // ── what the client publishes, on its own thread ───────────────────────────────────────────── + + /// Says the index is on its way. + public void PublishFetching() + { + Fetching = true; + BrowseRequests++; + Changed?.Invoke(); + } + + /// Publishes the index and the browse list built from it. + public void PublishIndex(PackageIndex index, PackageBrowseModel model) + { + ArgumentNullException.ThrowIfNull(index); + ArgumentNullException.ThrowIfNull(model); + Index = index; + BrowseModel = model; + Fetching = false; + Changed?.Invoke(); + } + + /// Publishes a review waiting for consent, or null for none. + public void PublishReview(PackageReviewModel? review) + { + Review = review; + Changed?.Invoke(); + } + + /// Publishes what the client said. + public void PublishStatus(string? status) + { + Status = status; + Fetching = false; + Changed?.Invoke(); + } + + /// Raises : the installed list or which are on moved. + public void NotifyChanged() => Changed?.Invoke(); +} diff --git a/src/SharpMUTerm.Client/Packages/PackageModels.cs b/src/SharpMUTerm.Client/Packages/PackageModels.cs new file mode 100644 index 00000000..475c26ed --- /dev/null +++ b/src/SharpMUTerm.Client/Packages/PackageModels.cs @@ -0,0 +1,181 @@ +using System.Globalization; +using SharpMUTerm.Client.Settings; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Packages; + +namespace SharpMUTerm.Client.Packages; + +/// How a review row is drawn: as plain information, as a warning, or as a quiet aside. +public enum PackageReviewTone +{ + /// A plain row. + Plain, + + /// Something that can act as the player: drawn in the warning ink. + Warning, + + /// An aside, in the label ink. + Quiet, +} + +/// One row of a review: a label and its value, or — with no label — a sentence. +/// The label (scripts), or empty for a sentence row. +/// What it says. +/// How it is drawn. +public sealed record PackageReviewRow(string Label, string Value, PackageReviewTone Tone = PackageReviewTone.Plain); + +/// A heading and its rows. +public sealed record PackageReviewSection(string Heading, IReadOnlyList Rows); + +/// +/// What the review says before a package is installed — the consent step — as one model both hosts draw: the cell +/// review's rows and the window's review card are this, in this order. It leads with what can act as the player (the +/// rules that send commands and the scripts that run), then what else it adds, then who it applies to. +/// +/// Install package or Update package. +/// The package's name. +/// Its version. +/// Its author, or null. +/// The version it replaces, or null for a first install. +/// What it says it does, or null. +/// The sections, in order. +/// Whether anything in it can act as the player. +public sealed record PackageReviewModel( + string Title, + string Name, + string Version, + string? Author, + string? Replaces, + string? Description, + IReadOnlyList Sections, + bool Acts) +{ + /// The first section's heading: what can act as the player. + public const string ActsHeading = "WHAT CAN ACT AS YOU"; + + /// The second: everything else it adds. + public const string AddsHeading = "WHAT ELSE IT ADDS"; + + /// The third: who it applies to. + public const string WhoHeading = "WHO IT APPLIES TO"; + + /// The sentence under the review: nothing is written until it is accepted. + public const string Consent = "nothing is written until you install"; + + /// The review of . + /// The archive, read. + /// The player's characters it would apply to, as Corvid (Aetherfall). + /// The installed version it would replace, or null. + public static PackageReviewModel From(PackageContents contents, IReadOnlyList characters, InstalledPackage? existing) + { + ArgumentNullException.ThrowIfNull(contents); + ArgumentNullException.ThrowIfNull(characters); + var manifest = contents.Manifest; + var review = contents.Review(); + var rules = review.Triggers + review.Aliases + review.Macros + review.Timers; + + var acts = new List + { + review.Sending > 0 + ? new("sending", $"{(review.Sending == 1 ? "1 rule sends" : $"{Count(review.Sending)} rules send")} commands as you", PackageReviewTone.Warning) + : new("sending", "no rule sends a command", PackageReviewTone.Quiet), + new("scripts", review.Scripts.Count == 0 + ? "none" + : string.Join(", ", review.Scripts.Select(s => $"{s.Name} ({PackageCollection.Size(s.Bytes)})"))), + }; + if (review.Scripts.Count > 0) + { + acts.Add(new(string.Empty, "Lua runs in the sandbox, and can send commands as you", PackageReviewTone.Warning)); + } + + var adds = new List + { + new("rule sets", Count(review.Sets)), + new("rules", rules == 0 + ? "none" + : $"{PackageCollection.Of(review.Triggers, "trigger")} · {PackageCollection.Of(review.Aliases, "alias", "aliases")} · " + + $"{PackageCollection.Of(review.Macros, "key")} · {PackageCollection.Of(review.Timers, "timer")}"), + new("media", review.MediaFiles == 0 + ? "none" + : $"{PackageCollection.Of(review.MediaFiles, "file")}, {PackageCollection.Size(review.MediaBytes)}"), + }; + if (review.Ignored.Count > 0) + { + adds.Add(new("left out", $"{PackageCollection.Of(review.Ignored.Count, "file")} outside sets/, scripts/ and media/", PackageReviewTone.Quiet)); + } + + var who = new List + { + new("games", string.Join(", ", manifest.Games)), + new("characters", characters.Count == 0 ? "none of yours, yet" : string.Join(", ", characters)), + }; + + return new PackageReviewModel( + existing is null ? "Install package" : "Update package", + manifest.Name, + manifest.Version, + manifest.Author, + existing?.Manifest.Version, + string.IsNullOrWhiteSpace(manifest.Description) ? null : manifest.Description, + [new(ActsHeading, acts), new(AddsHeading, adds), new(WhoHeading, who)], + review.Sending > 0 || review.Scripts.Count > 0); + } + + private static string Count(int n) => n.ToString(CultureInfo.InvariantCulture); +} + +/// Where an index entry stands against what is installed. +public enum PackageBrowseState +{ + /// Not installed. + New, + + /// Installed at the version the index lists. + Installed, + + /// Installed at another version: the index offers an update. + Update, +} + +/// One package the index lists, as both hosts' browse lists draw it. +/// The index's entry. +/// Whether it is for the focused window's world (a * package does not count). +/// Where it stands against what is installed. +/// The version installed, or null. +public sealed record PackageBrowseRow(PackageIndexEntry Entry, bool ForWorld, PackageBrowseState State, string? InstalledVersion) +{ + /// What a row says after its version: installed, installed 1.1.0, update, or nothing. + public string StateText => State switch + { + PackageBrowseState.Installed => "installed", + PackageBrowseState.Update => $"installed {InstalledVersion}, update", + _ => string.Empty, + }; +} + +/// +/// The package index as both hosts list it: the focused window's world's packages first, then the rest by name, each +/// with where it stands against what is installed; and how many entries the index broke its rules on. +/// +/// The focused window's world's name, or null. +/// Entries the index listed that were not kept. +/// The rows, in order. +public sealed record PackageBrowseModel(string? World, int Dropped, IReadOnlyList Rows) +{ + /// The index over what is installed, sorted for . + public static PackageBrowseModel From(PackageIndex index, IReadOnlyList installed, WorldDefinition? world) + { + ArgumentNullException.ThrowIfNull(index); + ArgumentNullException.ThrowIfNull(installed); + var rows = index.For(world?.Host, world?.Port ?? 0).Select(entry => + { + var have = installed.FirstOrDefault(p => p.Id == entry.Id); + var forWorld = world is not null && entry.Games.Any(g => g != "*" && PackageManifest.Matches(g, world.Host, world.Port)); + var state = have is null ? PackageBrowseState.New + : have.Manifest.Version == entry.Version ? PackageBrowseState.Installed + : PackageBrowseState.Update; + return new PackageBrowseRow(entry, forWorld, state, have?.Manifest.Version); + }).ToList(); + return new PackageBrowseModel(world?.Name, index.Dropped, rows); + } +} diff --git a/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs b/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs index c5053f78..00598bb5 100644 --- a/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs +++ b/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs @@ -373,7 +373,7 @@ public static partial class BuiltInSettings Text, Input, Character, - Listed("packages", "Packages", "F10", 90), + Packages, ]; private static IReadOnlyList? _all; @@ -388,9 +388,6 @@ public static void Register(SettingsSectionList sections) } } - private static SettingsSectionContribution Listed(string id, string title, string key, int order) => - new() { Id = id, Title = title, Key = key, Order = order }; - private static BoolField Flag( string id, string label, diff --git a/src/SharpMUTerm.Client/Settings/PackageCollection.cs b/src/SharpMUTerm.Client/Settings/PackageCollection.cs new file mode 100644 index 00000000..ba7359d4 --- /dev/null +++ b/src/SharpMUTerm.Client/Settings/PackageCollection.cs @@ -0,0 +1,247 @@ +using System.Globalization; +using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Packages; + +namespace SharpMUTerm.Client.Settings; + +/// +/// One installed package as F10 lists it: the package, and what the package index said about it the last time the +/// player opened it — null when the index has not been fetched this run, which is the usual case, because the index +/// is fetched only when the player asks. +/// +/// The installed package. +/// The index's entry for the same id, or null. +public sealed record PackageItem(InstalledPackage Package, PackageIndexEntry? Listed) +{ + /// The package's id. + public string Id => Package.Id; + + /// The newer version the index offers, or null when it offers none (or has not been read). + public string? Update => Listed is { } entry && entry.Version != Package.Manifest.Version ? entry.Version : null; +} + +/// Something a package row offers besides its fields: on/off, copy its sets, remove it, browse the index. +/// A stable id (…). +/// What it is called, after its key on the cell screen (copy sets to yours). +/// The cell screen's key for it (Space, c, Del, b). +/// One line saying what it does. +public sealed record PackageAction(string Id, string Label, string Key, string Help); + +/// +/// F10 declared: the installed packages, each package's fields — whether it is on, its version and games, what it +/// adds (sets, scripts, media), whether the index offers an update, who it applies to — and the actions a row offers. +/// The cell screen draws its rows and its key line from this, and the window draws its package manager page from it, +/// so the two show the same fields in the same order. +/// +/// The only thing a package field writes is , and it replaces +/// that list rather than editing it, the reads-cross-threads rule every list section keeps. Installing and removing +/// change the package store, which is the client's; they are actions, not fields. +/// +/// +public sealed class PackageCollection +{ + /// The on/off action. + public const string Toggle = "toggle"; + + /// The copy-its-sets-to-edit action. + public const string CopySets = "copy"; + + /// The remove action. + public const string Remove = "remove"; + + /// The browse-the-index action. + public const string Browse = "browse"; + + /// What one item is called. + public required string Noun { get; init; } + + /// What several are called. + public required string Plural { get; init; } + + /// Every field of a package, in the order both hosts show them. + public required IReadOnlyList Fields { get; init; } + + /// The actions a package row offers, in the order the cell screen's key line names them. + public required IReadOnlyList Actions { get; init; } + + /// The id of the field that switches a package on, which a list shows as each row's check box. + public string EnabledField { get; init; } = "enabled"; + + /// The fields a list row carries beside its check box: the name, then what is said after it. + public IReadOnlyList RowFields { get; init; } = ["name", "version", "games"]; + + /// A field by id. + public SettingsField Field(string id) => + Fields.FirstOrDefault(f => string.Equals(f.Id, id, StringComparison.Ordinal)) + ?? throw new InvalidOperationException($"The {Plural} declare no field '{id}'."); + + /// An action by id. + public PackageAction Action(string id) => + Actions.FirstOrDefault(a => string.Equals(a.Id, id, StringComparison.Ordinal)) + ?? throw new InvalidOperationException($"The {Plural} declare no action '{id}'."); + + /// The fields a package's detail shows: every field but the check box and the row's own. + public IEnumerable DetailFields => + Fields.Where(f => f.Id != EnabledField && !RowFields.Contains(f.Id, StringComparer.Ordinal)); + + /// The installed packages, by name, each with what lists for it. + public static IReadOnlyList Items(AppConfiguration config, PackageIndex? index) + { + ArgumentNullException.ThrowIfNull(config); + return config.Packages + .OrderBy(p => p.Manifest.Name, StringComparer.OrdinalIgnoreCase) + .Select(p => new PackageItem(p, index?.Entries.FirstOrDefault(e => e.Id == p.Id))) + .ToList(); + } + + /// Whether the package is on. + public static bool IsEnabled(AppConfiguration config, string id) + { + ArgumentNullException.ThrowIfNull(config); + return !config.DisabledPackages.Contains(id, StringComparer.Ordinal); + } + + /// + /// Switches the package on or off by replacing ; + /// false when it was already so. + /// + public static bool SetEnabled(AppConfiguration config, string id, bool on) + { + ArgumentNullException.ThrowIfNull(config); + ArgumentNullException.ThrowIfNull(id); + if (IsEnabled(config, id) == on) + { + return false; + } + + config.DisabledPackages = on + ? config.DisabledPackages.Where(d => !string.Equals(d, id, StringComparison.Ordinal)).ToList() + : [.. config.DisabledPackages, id]; + return true; + } + + /// The characters a package applies to: everyone on a world it is for, as Corvid (Aetherfall). + public static IReadOnlyList CharactersFor(AppConfiguration config, PackageManifest manifest) + { + ArgumentNullException.ThrowIfNull(config); + ArgumentNullException.ThrowIfNull(manifest); + return config.Worlds.ToArray() + .Where(w => manifest.IsFor(w.Host, w.Port)) + .SelectMany(w => w.Characters.ToArray().Select(c => $"{c.Name} ({w.Name})")) + .ToList(); + } + + /// 1 trigger, 3 aliases. + public static string Of(int n, string one, string? many = null) => + n == 1 ? $"1 {one}" : $"{n.ToString(CultureInfo.InvariantCulture)} {many ?? one + "s"}"; + + /// A size as people read it. + public static string Size(long bytes) => bytes switch + { + < 1024 => $"{bytes.ToString(CultureInfo.InvariantCulture)} B", + < 1024 * 1024 => (bytes / 1024.0).ToString("0.#", CultureInfo.InvariantCulture) + " KB", + _ => (bytes / (1024.0 * 1024)).ToString("0.#", CultureInfo.InvariantCulture) + " MB", + }; +} + +/// F10's declaration. +public static partial class BuiltInSettings +{ + /// The heading over what a package is. + public const string PackageGroup = "Package"; + + /// The heading over what a package adds. + public const string ContributesGroup = "What it adds"; + + /// The heading over who a package applies to and whether it is current. + public const string ReachGroup = "Who it applies to"; + + /// F10: the installed packages. + public static SettingsSectionContribution Packages { get; } = new() + { + Id = "packages", + Title = "Packages", + Key = "F10", + Order = 90, + Scope = SettingScope.Item, + Packages = new PackageCollection + { + Noun = "package", + Plural = "packages", + Fields = + [ + new BoolField("enabled", "enabled", "whether its sets, scripts and sounds are used") + { + Group = PackageGroup, + Keywords = "on off disable switch", + Binding = SettingBinding.ForItem( + (c, p) => PackageCollection.IsEnabled(c, p.Id), + (c, p, v) => PackageCollection.SetEnabled(c, p.Id, v), + FreshPackage, + v => v ? "on" : "off"), + }, + Info("name", "name", PackageGroup, p => p.Package.Manifest.Name, "what the package is called"), + Info("version", "version", PackageGroup, p => p.Package.Manifest.Version, "the version installed"), + Info("games", "games", PackageGroup, p => string.Join(", ", p.Package.Manifest.Games), + "the games it is for: host[:port], *.host, or * for any", "host world server"), + Info("author", "by", PackageGroup, p => p.Package.Manifest.Author ?? "—", "who made it", "author"), + Info("description", "about", PackageGroup, p => p.Package.Manifest.Description ?? "—", "what it says it does", "description"), + Info("sets", "sets", ContributesGroup, Sets, + "its trigger sets, read-only on F2–F6; c copies them to yours to edit", "trigger alias timer rule"), + Info("scripts", "scripts", ContributesGroup, + p => p.Package.Scripts.Count == 0 ? "none" : string.Join(", ", p.Package.Scripts), + "its Lua scripts, which run in the sandbox and can send commands as you", "lua"), + Info("media", "media", ContributesGroup, + p => p.Package.Media.Count == 0 ? "none" + : $"{PackageCollection.Of(p.Package.Media.Count, "file")}, {PackageCollection.Size(p.Package.MediaBytes)}", + "its sounds", "sound music audio"), + Info("update", "update", ReachGroup, + p => p.Update is { } newer ? $"{newer} in the index" + : p.Listed is not null ? "up to date" : "not checked — the index has not been opened", + "whether the package index offers a newer version", "upgrade new version index"), + Info("characters", "characters", ReachGroup, Characters, "the characters it applies to", "who world"), + ], + Actions = + [ + new(PackageCollection.Toggle, "on/off", "Space", "switch the package on or off"), + new(PackageCollection.CopySets, "copy sets to yours", "c", "copy its sets into yours, where F2–F6 can edit them"), + new(PackageCollection.Remove, "remove", "Del", "remove the package and its files"), + new(PackageCollection.Browse, "browse", "b", "browse the package index"), + ], + }, + }; + + private static PackageItem FreshPackage() => + new(new InstalledPackage(new PackageManifest { Id = "package", Name = "package", Version = "0" }, []), null); + + private static string Sets(AppConfiguration config, PackageItem item) + { + var sets = item.Package.Sets; + if (sets.Count == 0) + { + return "none"; + } + + var rules = sets.Sum(s => s.Triggers.Count + s.Aliases.Count + s.Macros.Count + s.Timers.Count); + return $"{string.Join(", ", sets.Select(s => s.Name))} · {PackageCollection.Of(rules, "rule")}"; + } + + private static string Characters(AppConfiguration config, PackageItem item) + { + var who = PackageCollection.CharactersFor(config, item.Package.Manifest); + return who.Count == 0 ? "none" : string.Join(", ", who); + } + + private static InfoField Info(string id, string label, string group, Func read, string help, string? keywords = null) => + Info(id, label, group, (_, p) => read(p), help, keywords); + + private static InfoField Info( + string id, string label, string group, Func read, string help, string? keywords = null) => + new(id, label, help) + { + Group = group, + Keywords = keywords, + Read = t => t.Item is PackageItem item ? read(t.Config, item) : string.Empty, + }; +} diff --git a/src/SharpMUTerm.Client/Settings/SettingsForm.cs b/src/SharpMUTerm.Client/Settings/SettingsForm.cs index 9f845f97..f4334a45 100644 --- a/src/SharpMUTerm.Client/Settings/SettingsForm.cs +++ b/src/SharpMUTerm.Client/Settings/SettingsForm.cs @@ -100,6 +100,12 @@ public SettingsForm( /// Every section, in order. public IReadOnlyList Sections { get; } + /// + /// F10's page: the installed packages, the index once asked for, and the review waiting for consent — or null when + /// the client offers none, and the page says so. + /// + public Packages.PackageManager? Packages { get; init; } + /// The id of the section shown first. public string Initial { get; } @@ -186,7 +192,7 @@ public void SetTheme(ThemeField field, string name) public static bool IsDeclared(SettingsSectionContribution section) { ArgumentNullException.ThrowIfNull(section); - return section.Fields.Count > 0 || section.Collection is not null; + return section.Fields.Count > 0 || section.Collection is not null || section.Packages is not null; } /// A section by id, or null. diff --git a/src/SharpMUTerm.Client/Settings/SettingsSearch.cs b/src/SharpMUTerm.Client/Settings/SettingsSearch.cs index 33b1e590..9c164dac 100644 --- a/src/SharpMUTerm.Client/Settings/SettingsSearch.cs +++ b/src/SharpMUTerm.Client/Settings/SettingsSearch.cs @@ -78,7 +78,9 @@ public static IReadOnlyDictionary CountBySection(IEnumerable Searchable(SettingsSectionContribution section) { ArgumentNullException.ThrowIfNull(section); - return section.Collection is { } collection ? section.Fields.Concat(collection.Fields) : section.Fields; + return section.Collection is { } collection ? section.Fields.Concat(collection.Fields) + : section.Packages is { } packages ? section.Fields.Concat(packages.Fields) + : section.Fields; } private static bool Contains(string? text, string query) => diff --git a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs index 1f7ce1d7..aaa669f0 100644 --- a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs +++ b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs @@ -252,7 +252,7 @@ public static class SurfaceCatalog [SurfaceHosts.Window] = SurfaceDrawing.Native, }, "SharpMUTerm.Tui.OptionsScreenRenderer.FromSection", - ["SharpMUTerm.Avalonia.SettingsWindow", "SharpMUTerm.Avalonia.ThemeCardView", "SharpMUTerm.Avalonia.ListEditorView"]), + ["SharpMUTerm.Avalonia.SettingsWindow", "SharpMUTerm.Avalonia.ThemeCardView", "SharpMUTerm.Avalonia.ListEditorView", "SharpMUTerm.Avalonia.PackagePageView"]), new( LayoutsMenu, typeof(MenuModel), diff --git a/src/SharpMUTerm.Core/Packages/PackageStore.cs b/src/SharpMUTerm.Core/Packages/PackageStore.cs index c5345dfd..17f2b07f 100644 --- a/src/SharpMUTerm.Core/Packages/PackageStore.cs +++ b/src/SharpMUTerm.Core/Packages/PackageStore.cs @@ -9,6 +9,15 @@ namespace SharpMUTerm.Core.Packages; public sealed record InstalledPackage(PackageManifest Manifest, IReadOnlyList Sets) { public string Id => Manifest.Id; + + /// Its scripts, as paths under its scripts/ folder, in order. + public IReadOnlyList Scripts { get; init; } = []; + + /// Its media files, as paths under its media/ folder, in order. + public IReadOnlyList Media { get; init; } = []; + + /// The bytes its media files take. + public long MediaBytes { get; init; } } /// @@ -97,7 +106,14 @@ public void Load() } } - _installed[manifest.Id] = new InstalledPackage(manifest, Bind(manifest.Id, sets)); + var (scripts, _) = Listed(Path.Combine(folder, "scripts")); + var (media, mediaBytes) = Listed(Path.Combine(folder, "media")); + _installed[manifest.Id] = new InstalledPackage(manifest, Bind(manifest.Id, sets)) + { + Scripts = scripts, + Media = media, + MediaBytes = mediaBytes, + }; } catch (Exception ex) when (ex is IOException or UnauthorizedAccessException or JsonException) { @@ -167,7 +183,12 @@ public void Load() } } - _installed[id] = new InstalledPackage(contents.Manifest, Bind(id, contents.Sets)); + _installed[id] = new InstalledPackage(contents.Manifest, Bind(id, contents.Sets)) + { + Scripts = contents.Scripts.Keys.Order(StringComparer.Ordinal).ToList(), + Media = contents.Media.Keys.Order(StringComparer.Ordinal).ToList(), + MediaBytes = contents.Media.Values.Sum(v => (long)v.Length), + }; return null; } @@ -239,6 +260,22 @@ private static List Bind(string id, IEnumerable sets) => return copy; }).ToList(); + /// The files under as relative paths with /, and their total size. + private static (List Files, long Bytes) Listed(string folder) + { + if (!Directory.Exists(folder)) + { + return ([], 0); + } + + var files = Directory.EnumerateFiles(folder, "*", SearchOption.AllDirectories) + .Select(f => new FileInfo(f)) + .ToList(); + return ( + files.Select(f => Path.GetRelativePath(folder, f.FullName).Replace(Path.DirectorySeparatorChar, '/')).Order(StringComparer.Ordinal).ToList(), + files.Sum(f => f.Length)); + } + private static void Write(string root, string relative, byte[] bytes) { var path = Path.Combine(root, relative); diff --git a/src/SharpMUTerm.Tui/PackageScreen.cs b/src/SharpMUTerm.Tui/PackageScreen.cs index 19817c6a..b68f2272 100644 --- a/src/SharpMUTerm.Tui/PackageScreen.cs +++ b/src/SharpMUTerm.Tui/PackageScreen.cs @@ -1,84 +1,88 @@ using System.Globalization; -using SharpMUTerm.Core.Packages; +using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Client.Packages; +using SharpMUTerm.Client.Settings; +using SharpMUTerm.Core.Configuration; using static SharpMUTerm.Tui.MarkupText; namespace SharpMUTerm.Tui; /// -/// What the two package surfaces say, as markup rows: the review a player reads before anything is installed, -/// and the list of what is installed. Pure, so a test reads the words the player would. +/// What the package surfaces say, as markup rows: the review a player reads before anything is installed, the list +/// of what is installed and the index. Each is drawn from a Client model or F10's declaration — the same ones the +/// window draws — and is pure, so a test reads the words the player would. /// internal static class PackageScreen { /// - /// The review. It is the consent step, so it leads with what can act as the player: the rules that send - /// commands and the scripts that run, then who it applies to and how much it writes. + /// The review, drawn from — the model the window's review card draws, so the two + /// say the same facts in the same order. It is the consent step, so it leads with what can act as the player: the + /// rules that send commands and the scripts that run, then what else it adds and who it applies to. /// - internal static List Review(PackageContents contents, IReadOnlyList characters, InstalledPackage? existing, int width) + internal static List Review(PackageReviewModel model, int width) { - var manifest = contents.Manifest; - var review = contents.Review(); var lines = new List { - $"[bold {ScreenPalette.Accent}]{Escape(Elide(manifest.Name, width))}[/] [{ScreenPalette.Label}]{Escape(manifest.Version)}" - + (manifest.Author is { } author ? $" · by {Escape(Elide(author, 40))}" : string.Empty) + "[/]", + $"[bold {ScreenPalette.Accent}]{Escape(Elide(model.Name, width))}[/] [{ScreenPalette.Label}]{Escape(model.Version)}" + + (model.Author is { } author ? $" · by {Escape(Elide(author, 40))}" : string.Empty) + "[/]", }; - if (existing is not null) + if (model.Replaces is { } replaces) { - lines.Add($"[{ScreenPalette.Label}]replaces version {Escape(existing.Manifest.Version)}, and its sets with it[/]"); + lines.Add($"[{ScreenPalette.Label}]replaces version {Escape(replaces)}, and its sets with it[/]"); } - if (!string.IsNullOrWhiteSpace(manifest.Description)) + if (model.Description is { } description) { - lines.Add($"[{ScreenPalette.Value}]{Escape(Elide(manifest.Description, width))}[/]"); + lines.Add($"[{ScreenPalette.Value}]{Escape(Elide(description, width))}[/]"); } - lines.Add(string.Empty); - lines.Add($"[bold {ScreenPalette.Accent}]WHAT IT ADDS[/]"); - lines.Add(Row("rule sets", Count(review.Sets))); - lines.Add(Row("rules", $"{Of(review.Triggers, "trigger")} · {Of(review.Aliases, "alias", "aliases")} · {Of(review.Macros, "key")} · {Of(review.Timers, "timer")}")); - lines.Add(review.Sending > 0 - ? $" [bold {ScreenPalette.Warn}]{(review.Sending == 1 ? "1 of them sends" : $"{Count(review.Sending)} of them send")} commands as you[/]" - : $" [{ScreenPalette.Label}]none of them sends a command[/]"); - lines.Add(Row("scripts", review.Scripts.Count == 0 - ? "none" - : string.Join(", ", review.Scripts.Select(s => $"{s.Name} ({Size(s.Bytes)})")))); - if (review.Scripts.Count > 0) - { - lines.Add($" [bold {ScreenPalette.Warn}]Lua runs in the sandbox, and can send commands as you[/]"); - } - - lines.Add(Row("media", review.MediaFiles == 0 ? "none" : $"{Of(review.MediaFiles, "file")}, {Size(review.MediaBytes)}")); - if (review.Ignored.Count > 0) + foreach (var section in model.Sections) { - lines.Add(Row("left out", $"{Of(review.Ignored.Count, "file")} outside sets/, scripts/ and media/")); + lines.Add(string.Empty); + lines.Add($"[bold {ScreenPalette.Accent}]{Escape(section.Heading)}[/]"); + foreach (var row in section.Rows) + { + lines.Add(ReviewRow(row, width)); + } } - lines.Add(string.Empty); - lines.Add($"[bold {ScreenPalette.Accent}]WHO IT APPLIES TO[/]"); - lines.Add(Row("games", string.Join(", ", manifest.Games))); - lines.Add(Row("characters", characters.Count == 0 ? "none of yours, yet" : string.Join(", ", characters))); lines.Add(string.Empty); lines.Add($"[{ScreenPalette.Label}]⏎ install · Esc cancel — nothing is written until you press ⏎[/]"); return lines; + } - string Row(string label, string value) => - $" [{ScreenPalette.Label}]{label.PadRight(11)}[/][{ScreenPalette.Value}]{Escape(Elide(value, Math.Max(10, width - 14)))}[/]"; + private static string ReviewRow(PackageReviewRow row, int width) + { + var ink = row.Tone switch + { + PackageReviewTone.Warning => $"bold {ScreenPalette.Warn}", + PackageReviewTone.Quiet => ScreenPalette.Label, + _ => ScreenPalette.Value, + }; + return row.Label.Length == 0 + ? $" [{ink}]{Escape(Elide(row.Value, Math.Max(10, width - 4)))}[/]" + : $" [{ScreenPalette.Label}]{row.Label.PadRight(11)}[/][{ink}]{Escape(Elide(row.Value, Math.Max(10, width - 14)))}[/]"; } - /// The installed packages, the selected one's detail, and the keys. + /// + /// The installed packages, the selected one's detail, and the keys — all drawn from F10's declaration: the key line + /// is its actions, a row is its check box and row fields, the detail is every other field under its label. + /// + /// When given, receives the ids of the fields drawn, in order — what a test compares with the window's. internal static List List( - IReadOnlyList packages, - IReadOnlyCollection disabled, + PackageCollection declaration, + AppConfiguration config, + IReadOnlyList packages, int selected, bool confirmingRemove, - Func> characters, - int width) + int width, + List? drawn = null) { + var keys = string.Join(" · ", declaration.Actions.Select(a => $"{a.Key} {a.Label}")); var lines = new List { - $"[{ScreenPalette.Label}]{Count(packages.Count)} installed · ↑↓ select · Space on/off · c copy sets to yours · Del remove · b browse · Esc close[/]", + $"[{ScreenPalette.Label}]{Count(packages.Count)} installed · ↑↓ select · {Escape(keys)} · Esc close[/]", string.Empty, }; @@ -88,55 +92,58 @@ internal static List List( return lines; } + string Read(string id, PackageItem item) => + declaration.Field(id) is InfoField info ? info.Read(new SettingTarget(config, Item: item)) : string.Empty; + + var enabled = (SettingBinding)declaration.Field(declaration.EnabledField).Binding!; + var name = declaration.RowFields[0]; + var after = declaration.RowFields.Skip(1).ToList(); for (var i = 0; i < packages.Count; i++) { var package = packages[i]; - var on = !disabled.Contains(package.Id); + var on = enabled.Get(new SettingTarget(config, Item: package)); var marker = i == selected ? $"[bold {ScreenPalette.Accent}]▸[/]" : " "; var box = on ? "[[x]]" : "[[ ]]"; - lines.Add($"{marker} {box} [{(i == selected ? "bold " : string.Empty)}{ScreenPalette.Value}]{Escape(Elide(package.Manifest.Name, 30))}[/]" - + $" [{ScreenPalette.Label}]{Escape(package.Manifest.Version)} · {Escape(Elide(string.Join(", ", package.Manifest.Games), Math.Max(10, width - 50)))}[/]"); + var tail = string.Join(" · ", after.Select(id => Read(id, package))); + lines.Add($"{marker} {box} [{(i == selected ? "bold " : string.Empty)}{ScreenPalette.Value}]{Escape(Elide(Read(name, package), 30))}[/]" + + $" [{ScreenPalette.Label}]{Escape(Elide(tail, Math.Max(10, width - 40)))}[/]"); } + drawn?.Add(declaration.EnabledField); + drawn?.AddRange(declaration.RowFields); var current = packages[Math.Clamp(selected, 0, packages.Count - 1)]; lines.Add(string.Empty); - lines.Add($"[bold {ScreenPalette.Accent}]{Escape(Elide(current.Manifest.Name, width - 4))}[/]"); - if (!string.IsNullOrWhiteSpace(current.Manifest.Description)) + lines.Add($"[bold {ScreenPalette.Accent}]{Escape(Elide(Read(name, current), width - 4))}[/]"); + foreach (var field in declaration.DetailFields) { - lines.Add($" [{ScreenPalette.Value}]{Escape(Elide(current.Manifest.Description, width - 4))}[/]"); + drawn?.Add(field.Id); + lines.Add($" [{ScreenPalette.Label}]{field.Label.PadRight(11)}[/]" + + $"[{ScreenPalette.Value}]{Escape(Elide(Read(field.Id, current), Math.Max(10, width - 14)))}[/]"); } - lines.Add($" [{ScreenPalette.Label}]sets[/] [{ScreenPalette.Value}]{Escape(Elide(string.Join(", ", current.Sets.Select(s => s.Name)), width - 14))}[/]"); - var who = characters(current); - lines.Add($" [{ScreenPalette.Label}]characters[/] [{ScreenPalette.Value}]{Escape(Elide(who.Count == 0 ? "none" : string.Join(", ", who), width - 14))}[/]"); if (confirmingRemove) { lines.Add(string.Empty); - lines.Add($"[bold {ScreenPalette.Warn}]Remove {Escape(current.Manifest.Name)} and its files? Del again removes it, any other key keeps it.[/]"); + lines.Add($"[bold {ScreenPalette.Warn}]Remove {Escape(Read(name, current))} and its files? Del again removes it, any other key keeps it.[/]"); } return lines; } - /// The index's packages, the focused world's first, with what is installed beside each. - internal static List Browse( - IReadOnlyList entries, - IReadOnlyList installed, - int selected, - string? world, - int dropped, - int width) + /// The index's packages, the focused world's first, with what is installed beside each: the browse model drawn. + internal static List Browse(PackageBrowseModel model, int selected, int width) { + var entries = model.Rows; var lines = new List { $"[{ScreenPalette.Label}]{Of(entries.Count, "package")}" - + (world is null ? string.Empty : $" · {Escape(Elide(world, 30))}'s first") + + (model.World is null ? string.Empty : $" · {Escape(Elide(model.World, 30))}'s first") + " · ↑↓ select · ⏎ review · Esc close[/]", }; - if (dropped > 0) + if (model.Dropped > 0) { - lines.Add($"[{ScreenPalette.Warn}]{(dropped == 1 ? "1 entry in the index breaks its rules and is" : $"{Count(dropped)} entries in the index break its rules and are")} not listed[/]"); + lines.Add($"[{ScreenPalette.Warn}]{(model.Dropped == 1 ? "1 entry in the index breaks its rules and is" : $"{Count(model.Dropped)} entries in the index break its rules and are")} not listed[/]"); } lines.Add(string.Empty); @@ -148,17 +155,15 @@ internal static List Browse( for (var i = 0; i < entries.Count; i++) { - var entry = entries[i]; - var have = installed.FirstOrDefault(p => p.Id == entry.Id); - var state = have is null ? string.Empty - : have.Manifest.Version == entry.Version ? " · installed" - : $" · installed {Escape(have.Manifest.Version)}, update"; + var row = entries[i]; + var entry = row.Entry; + var state = row.StateText.Length == 0 ? string.Empty : " · " + Escape(row.StateText); var marker = i == selected ? $"[bold {ScreenPalette.Accent}]▸[/]" : " "; lines.Add($"{marker} [{(i == selected ? "bold " : string.Empty)}{ScreenPalette.Value}]{Escape(Elide(entry.Name, 30))}[/]" + $" [{ScreenPalette.Label}]{Escape(entry.Version)} · {Escape(Elide(string.Join(", ", entry.Games), Math.Max(10, width - 60)))}{state}[/]"); } - var current = entries[Math.Clamp(selected, 0, entries.Count - 1)]; + var current = entries[Math.Clamp(selected, 0, entries.Count - 1)].Entry; lines.Add(string.Empty); lines.Add($"[bold {ScreenPalette.Accent}]{Escape(Elide(current.Name, width - 4))}[/]" + (current.Author is { } author ? $" [{ScreenPalette.Label}]by {Escape(Elide(author, 40))}[/]" : string.Empty)); @@ -176,13 +181,6 @@ internal static string Of(int n, string one, string? many = null) => internal static string Count(int n) => n.ToString(CultureInfo.InvariantCulture); - internal static string Size(long bytes) => bytes switch - { - < 1024 => $"{bytes} B", - < 1024 * 1024 => $"{bytes / 1024.0:0.#} KB", - _ => $"{bytes / (1024.0 * 1024):0.#} MB", - }; - private static string Elide(string text, int width) => text.Length <= width ? text : width <= 1 ? "…" : text[..(width - 1)] + "…"; } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Packages.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Packages.cs index 570cf5e2..0f67fd3a 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Packages.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Packages.cs @@ -1,7 +1,9 @@ using System.IO.Compression; using System.Net.Http; +using System.Security.Cryptography; using System.Text; -using System.Text.Json; +using SharpMUTerm.Client.Packages; +using SharpMUTerm.Client.Settings; using SharpMUTerm.Core.Configuration; using SharpMUTerm.Core.Diagnostics; using SharpMUTerm.Core.Packages; @@ -9,8 +11,10 @@ namespace SharpMUTerm.Tui; /// -/// Packages: installing one from a file or an https link through the review, and the Packages screen (F10) -/// that lists, switches off, copies from and removes them. +/// Packages: installing one from a file, an https link or the index through the review, and F10 that lists, switches +/// off, copies from and removes them — as cell screens in a terminal and as the settings window's package page where +/// the host has one. Both surfaces call the same methods here: , +/// , , and one consent path, . /// internal sealed partial class SharpMUTermApp { @@ -25,6 +29,14 @@ internal sealed partial class SharpMUTermApp private int _packageSelected; private bool _confirmRemove; + /// The index as last fetched this run, or null: it is fetched only when the player browses. + private PackageIndex? _packageIndex; + + /// The archive under review and what its review says, until it is installed or dropped. + private (PackageContents Contents, PackageReviewModel Model)? _pendingPackage; + + private PackageManager? _packageManager; + /// How an https package is downloaded; a test supplies one, the client uses . internal Func>? PackageFetch { get; set; } @@ -32,6 +44,21 @@ internal sealed partial class SharpMUTermApp internal PackageStore Packages => _packages; + /// F10's declaration, from the registry. + private PackageCollection PackageDeclaration => Section("packages").Packages ?? BuiltInSettings.Packages.Packages!; + + /// + /// F10 as the window's package page reads it — one per app, so the index fetched and a review waiting outlive the + /// settings window being closed and opened again. + /// + internal PackageManager PackageManager => _packageManager ??= new PackageManager(_config, PackageDeclaration, new PackageHostCalls(this)); + + /// Whether packages are shown in the host's own settings window rather than as cell screens. + private bool NativePackages => Host.NativeSettings is not null; + + /// The review waiting for consent, for a test. + internal PackageReviewModel? PendingPackageReview => _pendingPackage?.Model; + /// Reads the installed packages and hands their sets and media to the rest of the client. private void LoadPackages() { @@ -56,6 +83,13 @@ private void SyncPackages() _packageMedia.Add(folder); } } + + if (_packageIndex is not null) + { + _packageManager?.PublishIndex(_packageIndex, PackageBrowseModel.From(_packageIndex, _packages.Installed, FocusedWorld())); + } + + _packageManager?.NotifyChanged(); } /// /package opens the Packages screen; /package install <file or https link> installs one. @@ -82,6 +116,13 @@ private void PackageCommand(string argument) RefuseCommand("/package, /package browse, or /package install "); } + /// Says why a package step did not happen: on the status row, and on the window's package page. + private void PackageRefused(string reason) + { + RefuseCommand(reason); + _packageManager?.PublishStatus(reason); + } + /// Reads a package from a path or an https link and opens its review. Nothing is written here. internal void InstallPackage(string source) { @@ -138,41 +179,54 @@ internal void InstallPackage(string source) } /// - /// Opens the review for an archive, or says why it is not a package. From an index, the archive must be - /// the one names — its SHA-256, id and version — before anything is shown. + /// Opens the review for an archive, or says why it is not a package. From an index, the archive must be the one + /// names — its SHA-256, id and version — before anything is shown. The review is one + /// model () whichever host draws it, and nothing is written until + /// . /// internal void ReviewPackage(byte[] archive, PackageIndexEntry? listed = null) { if (listed?.Verify(archive, inside: null) is { } mismatch) { - RefuseCommand($"not installed: {mismatch}"); + PackageRefused($"not installed: {mismatch}"); return; } var (contents, problem) = PackageArchive.Read(archive); if (contents is null) { - RefuseCommand($"not installed: {problem}"); + PackageRefused($"not installed: {problem}"); return; } if (listed?.Verify(archive, contents.Manifest) is { } different) { - RefuseCommand($"not installed: {different}"); + PackageRefused($"not installed: {different}"); return; } - if (AnyOverlayOpen && !_packageView.IsOpen) + if (!NativePackages && AnyOverlayOpen && !_packageView.IsOpen) { RefuseCommand($"close {OpenOverlayName()} first"); return; } - var existing = _packages.Find(contents.Manifest.Id); + var model = PackageReviewModel.From( + contents, + PackageCollection.CharactersFor(_config, contents.Manifest), + _packages.Find(contents.Manifest.Id)); + _pendingPackage = (contents, model); + if (NativePackages) + { + PackageManager.PublishReview(model); + TryOpenNativeSettings(Section("packages")); + return; + } + _packageView.Open( "review", - existing is null ? "Install package" : "Update package", - width => PackageScreen.Review(contents, CharactersFor(contents.Manifest), existing, width), + model.Title, + width => PackageScreen.Review(model, width), key => { if (key.Key != ConsoleKey.Enter) @@ -180,22 +234,50 @@ internal void ReviewPackage(byte[] archive, PackageIndexEntry? listed = null) return true; } - if (_packages.Install(contents) is { } failed) - { - RefuseCommand($"not installed: {failed}"); - return false; - } - - SyncPackages(); - SaveConfiguration(); - Notice( - $"Installed {contents.Manifest.Name} {contents.Manifest.Version} · F10 lists your packages", - MessageSeverity.Info, - key: "package"); + AcceptPackage(model); return false; }); } + /// + /// The consent: installs the package described — only while it is still the review + /// waiting — and saves. Both hosts' install buttons end here, and nothing else writes a package. + /// + internal bool AcceptPackage(PackageReviewModel review) + { + if (_pendingPackage is not { } pending || !ReferenceEquals(pending.Model, review)) + { + PackageRefused("that review is no longer open"); + return false; + } + + _pendingPackage = null; + _packageManager?.PublishReview(null); + var manifest = pending.Contents.Manifest; + if (_packages.Install(pending.Contents) is { } failed) + { + PackageRefused($"not installed: {failed}"); + return false; + } + + SyncPackages(); + SaveConfiguration(); + var said = $"Installed {manifest.Name} {manifest.Version} · F10 lists your packages"; + Notice(said, MessageSeverity.Info, key: "package"); + _packageManager?.PublishStatus(said); + return true; + } + + /// Drops the review without writing anything. + internal void CancelPackage(PackageReviewModel review) + { + if (_pendingPackage is { } pending && ReferenceEquals(pending.Model, review)) + { + _pendingPackage = null; + _packageManager?.PublishReview(null); + } + } + /// /// Downloads off the UI thread and hands the bytes back on it, or says why not. /// @@ -221,7 +303,7 @@ private void Fetch(Uri uri, string what, Action then) { if (bytes is null) { - RefuseCommand($"{what} not fetched: {problem}"); + PackageRefused($"{what} not fetched: {problem}"); return; } @@ -232,33 +314,41 @@ private void Fetch(Uri uri, string what, Action then) /// /// Browse packages: fetches the index — only now, never at start — and lists it with the focused world's - /// packages first. ⏎ fetches one, checks it against the index's SHA-256 and opens the review. + /// packages first. In a host with a settings window the list is the package page's Browse tab; otherwise the + /// cell list, where ⏎ fetches one, checks it against the index's SHA-256 and opens the review. /// internal void BrowsePackages() { - if (ComposerIsInTheWay("the packages") || (AnyOverlayOpen && !_packageView.IsOpen && Refuse($"close {OpenOverlayName()} first"))) + if (!NativePackages + && (ComposerIsInTheWay("the packages") || (AnyOverlayOpen && !_packageView.IsOpen && Refuse($"close {OpenOverlayName()} first")))) { return; } if (!Uri.TryCreate(_config.PackageIndexUrl, UriKind.Absolute, out var uri) || uri.Scheme != Uri.UriSchemeHttps) { - RefuseCommand("the package index is not an https link (packageIndexUrl in config.json)"); + PackageRefused("the package index is not an https link (packageIndexUrl in config.json)"); return; } + if (NativePackages) + { + PackageManager.PublishFetching(); + TryOpenNativeSettings(Section("packages")); + } + Fetch(uri, "package index", bytes => { if (bytes.Length > PackageIndex.MaxIndexBytes) { - RefuseCommand("the package index is too large"); + PackageRefused("the package index is too large"); return; } - var (index, problem) = PackageIndex.Parse(System.Text.Encoding.UTF8.GetString(bytes)); + var (index, problem) = PackageIndex.Parse(Encoding.UTF8.GetString(bytes)); if (index is null) { - RefuseCommand($"package index not read: {problem}"); + PackageRefused($"package index not read: {problem}"); return; } @@ -266,6 +356,10 @@ internal void BrowsePackages() }); } + /// Fetches the archive an index entry names and opens its review once it is the archive the entry names. + internal void InstallFromIndex(PackageIndexEntry entry) => + Fetch(new Uri(entry.Url), "package", bytes => ReviewPackage(bytes, entry)); + /// /// The world of the focused window: its session's, else its recorded owner's — so a disconnected /// character's window still names its game. Never _active. @@ -283,15 +377,23 @@ internal void BrowsePackages() : _config.Worlds.FirstOrDefault(w => w.Characters.Any(c => string.Equals($"{w.Name}.{c.Name}", owner, StringComparison.Ordinal))); } + /// The index arrived: kept for the run (so F10 can say which packages have updates), then listed. private void ShowIndex(PackageIndex index) { - var world = FocusedWorld(); - var entries = index.For(world?.Host, world?.Port ?? 0); + _packageIndex = index; + var model = PackageBrowseModel.From(index, _packages.Installed, FocusedWorld()); + if (NativePackages) + { + PackageManager.PublishIndex(index, model); + return; + } + + var entries = model.Rows; _packageSelected = 0; _packageView.Open( "browse", "Browse packages", - width => PackageScreen.Browse(entries, _packages.Installed, _packageSelected, world?.Name, index.Dropped, width), + width => PackageScreen.Browse(model, _packageSelected, width), key => { switch (key.Key) @@ -303,8 +405,7 @@ private void ShowIndex(PackageIndex index) _packageSelected = Math.Min(Math.Max(0, entries.Count - 1), _packageSelected + 1); return true; case ConsoleKey.Enter when entries.Count > 0: - var entry = entries[Math.Clamp(_packageSelected, 0, entries.Count - 1)]; - Fetch(new Uri(entry.Url), "package", bytes => ReviewPackage(bytes, entry)); + InstallFromIndex(entries[Math.Clamp(_packageSelected, 0, entries.Count - 1)].Entry); return false; default: return true; @@ -312,9 +413,18 @@ private void ShowIndex(PackageIndex index) }); } - /// The Packages screen, or closes it. + /// The installed packages as F10 lists them, each with what the index said of it this run. + private IReadOnlyList PackageItems() => PackageCollection.Items(_config, _packageIndex); + + /// The Packages screen — the settings window's package page where the host has one — or closes it. internal void ShowPackages() { + if (NativePackages) + { + TryOpenNativeSettings(Section("packages")); + return; + } + if (_packageView.IsOpen) { _packageView.Close(); @@ -330,12 +440,19 @@ internal void ShowPackages() _confirmRemove = false; _packageView.Open( "list", - "Packages", - width => PackageScreen.List( - _packages.Installed, _config.DisabledPackages, _packageSelected, _confirmRemove, p => CharactersFor(p.Manifest), width), + SectionTitle("packages"), + width => PackageScreen.List(PackageDeclaration, _config, PackageItems(), _packageSelected, _confirmRemove, width), OnPackageKey); } + /// The ids of the fields the cell F10 draws, in order, for a test to hold against the window's. + internal IReadOnlyList CellPackageFields() + { + var drawn = new List(); + PackageScreen.List(PackageDeclaration, _config, PackageItems(), _packageSelected, false, 100, drawn); + return drawn; + } + private bool Refuse(string reason) { RefuseCommand(reason); @@ -344,7 +461,7 @@ private bool Refuse(string reason) private bool OnPackageKey(ConsoleKeyInfo key) { - var installed = _packages.Installed; + var installed = PackageItems(); var confirming = _confirmRemove; _confirmRemove = false; if (key.Key == ConsoleKey.B) @@ -368,28 +485,14 @@ private bool OnPackageKey(ConsoleKeyInfo key) _packageSelected = Math.Min(installed.Count - 1, _packageSelected + 1); break; case ConsoleKey.Spacebar: - if (!_config.DisabledPackages.Remove(current.Id)) - { - _config.DisabledPackages.Add(current.Id); - } - - SyncPackages(); - SaveConfiguration(); + SetPackageEnabled(current.Id, !PackageCollection.IsEnabled(_config, current.Id)); break; case ConsoleKey.C: - CopyPackageSets(current); + CopyPackageSets(current.Id); break; case ConsoleKey.Delete or ConsoleKey.Backspace when confirming: - if (_packages.Remove(current.Id) is { } problem) - { - RefuseCommand(problem); - } - - _config.DisabledPackages.Remove(current.Id); + RemovePackage(current.Id); _packageSelected = Math.Max(0, Math.Min(_packageSelected, _packages.Installed.Count - 1)); - SyncPackages(); - SaveConfiguration(); - Notice($"Removed {current.Manifest.Name}.", MessageSeverity.Info, key: "package"); break; case ConsoleKey.Delete or ConsoleKey.Backspace: _confirmRemove = true; @@ -401,39 +504,81 @@ private bool OnPackageKey(ConsoleKeyInfo key) return true; } + /// Switches a package on or off and saves once — F10's Space and the window's check box. + internal void SetPackageEnabled(string id, bool on) + { + if (_packages.Find(id) is null || !PackageCollection.SetEnabled(_config, id, on)) + { + return; + } + + SyncPackages(); + SaveConfiguration(); + } + + /// Removes a package and its folder and saves — F10's Del Del and the window's Remove. + internal void RemovePackage(string id) + { + if (_packages.Find(id) is not { } package) + { + PackageRefused($"no package '{id}' is installed"); + return; + } + + if (_packages.Remove(id) is { } problem) + { + PackageRefused(problem); + } + + PackageCollection.SetEnabled(_config, id, on: true); + SyncPackages(); + SaveConfiguration(); + var said = $"Removed {package.Manifest.Name}."; + Notice(said, MessageSeverity.Info, key: "package"); + _packageManager?.PublishStatus(said); + } + /// /// Copies a package's sets into the player's own, where F2–F6 can edit them and an update will not /// replace them. A name already taken gets (copy). /// - private void CopyPackageSets(InstalledPackage package) + internal void CopyPackageSets(string id) { - foreach (var set in package.Sets) + if (_packages.Find(id) is not { } package) { - var copy = JsonSerializer.Deserialize( - JsonSerializer.SerializeToUtf8Bytes(set, ConfigurationStore.SerializerOptions), ConfigurationStore.SerializerOptions)!; - var name = set.Name; - for (var n = 1; _config.TriggerSets.Any(s => string.Equals(s.Name, name, StringComparison.OrdinalIgnoreCase)); n++) - { - name = n == 1 ? $"{set.Name} (copy)" : $"{set.Name} (copy {n})"; - } + PackageRefused($"no package '{id}' is installed"); + return; + } - copy.Name = name; - _config.TriggerSets.Add(copy); + foreach (var set in package.Sets) + { + SettingsCollection.CopyToEdit(_config, set); } SaveConfiguration(); - Notice( - $"Copied {package.Sets.Count} set(s) to yours; assign them on F5, and switch the package off (Space) to use only your copy.", - MessageSeverity.Info, - key: "package"); + var said = $"Copied {package.Sets.Count} set(s) to yours; assign them on F5, and switch the package off (Space) to use only your copy."; + Notice(said, MessageSeverity.Info, key: "package"); + _packageManager?.PublishStatus(said); + _packageManager?.NotifyChanged(); } - /// The characters a package would apply to: everyone on a world it is for. - private IReadOnlyList CharactersFor(PackageManifest manifest) => - _config.Worlds - .Where(w => manifest.IsFor(w.Host, w.Port)) - .SelectMany(w => w.Characters.Select(c => $"{c.Name} ({w.Name})")) - .ToList(); + /// The window's package page's gestures, each run on the client's thread. + private sealed class PackageHostCalls(SharpMUTermApp app) : IPackageHost + { + public void SetEnabled(string id, bool on) => app.OnUiThread(() => app.SetPackageEnabled(id, on)); + + public void Remove(string id) => app.OnUiThread(() => app.RemovePackage(id)); + + public void CopySets(string id) => app.OnUiThread(() => app.CopyPackageSets(id)); + + public void Browse() => app.OnUiThread(app.BrowsePackages); + + public void Install(PackageIndexEntry entry) => app.OnUiThread(() => app.InstallFromIndex(entry)); + + public void Accept(PackageReviewModel review) => app.OnUiThread(() => app.AcceptPackage(review)); + + public void Cancel(PackageReviewModel review) => app.OnUiThread(() => app.CancelPackage(review)); + } /// /// The snapshot's packages, built as archives and read through like any @@ -479,8 +624,61 @@ internal static byte[] DemoPackage(string id, string name, string version, strin """, "Health warnings, a tells window and the status gauges."); + private static readonly byte[] DemoColours = DemoPackage( + "mush.colours", + "MUSH colour names", + "0.3.1", + "\"*\"", + """{"name":"MUSH colours","triggers":[{"name":"pages","pattern":"^From afar","actions":{"spawnTarget":"Pages"}}]}""", + "Highlights pages and channel names on any game."); + + private static readonly byte[] DemoGrapevine = DemoPackage( + "grapevine.channels", "Grapevine channels", "2.0.0", "\"grapevine.haus\"", + """{"name":"Grapevine channels","triggers":[{"name":"gossip","pattern":"^\\[gossip\\]","actions":{"spawnTarget":"Gossip"}}]}""", + "Puts each Grapevine channel in a window of its own."); + + private static readonly byte[] DemoMapper = DemoPackage( + "aetherfall.mapper", "Aetherfall mapper rooms", "0.9.0", "\"aetherfall.mux\"", + """{"name":"Aetherfall mapper","triggers":[{"name":"exits","pattern":"^Obvious exits:","actions":{}}]}""", + "Reads room names and exits for the map."); + + /// The demo's index: four packages, the files it names served by , and one broken entry. + private static string DemoIndex() => $$""" + {"packages":[ + {"id":"mush.colours","name":"MUSH colour names","version":"0.3.1","games":["*"], + "description":"Highlights pages and channel names on any game.", + "url":"https://packages.example/mush-colours-0.3.1.zip","sha256":"{{Sha(DemoColours)}}"}, + {"id":"grapevine.channels","name":"Grapevine channels","version":"2.0.0","games":["grapevine.haus"], + "description":"Puts each Grapevine channel in a window of its own.", + "url":"https://packages.example/grapevine-channels-2.0.0.zip","sha256":"{{Sha(DemoGrapevine)}}"}, + {"id":"aetherfall.basics","name":"Aetherfall basics","version":"1.2.0","author":"the Aetherfall builders", + "games":["aetherfall.mux:4201"],"description":"Health warnings, a tells window and the status gauges.", + "url":"https://packages.example/aetherfall-basics-1.2.0.zip","sha256":"{{Sha(DemoBasics)}}"}, + {"id":"aetherfall.mapper","name":"Aetherfall mapper rooms","version":"0.9.0","games":["aetherfall.mux"], + "description":"Reads room names and exits for the map.", + "url":"https://packages.example/aetherfall-mapper-0.9.0.zip","sha256":"{{Sha(DemoMapper)}}"}, + {"id":"bad","name":"Bad","version":"1","games":["*"],"url":"http://x","sha256":"x"}]} + """; + + private static string Sha(byte[] bytes) => Convert.ToHexStringLower(SHA256.HashData(bytes)); + + /// + /// The demo's network: the index and the four archives it names, from memory. Only the demo scene sets it, so a + /// window demo can browse and install for real without a byte leaving the machine. + /// + private static Task DemoFetch(Uri uri, CancellationToken token) => Task.FromResult(uri.AbsolutePath switch + { + var p when p.EndsWith("index.json", StringComparison.Ordinal) => Encoding.UTF8.GetBytes(DemoIndex()), + "/mush-colours-0.3.1.zip" => DemoColours, + "/grapevine-channels-2.0.0.zip" => DemoGrapevine, + "/aetherfall-basics-1.2.0.zip" => DemoBasics, + "/aetherfall-mapper-0.9.0.zip" => DemoMapper, + _ => null, + }); + private void LoadDemoPackages(string view) { + PackageFetch ??= DemoFetch; if (view == "package-review") { ReviewPackage(DemoBasics); @@ -493,33 +691,18 @@ private void LoadDemoPackages(string view) _packages.Install(PackageArchive.Read(DemoPackage( "aetherfall.basics", "Aetherfall basics", "1.1.0", "\"aetherfall.mux:4201\"", """{"name":"Aetherfall basics"}""", "")).Contents!); SyncPackages(); - var hash = new string('0', 64); - var (index, _) = PackageIndex.Parse($$""" - {"packages":[ - {"id":"mush.colours","name":"MUSH colour names","version":"0.3.1","games":["*"], - "description":"Highlights pages and channel names on any game.", - "url":"https://packages.example/mush-colours-0.3.1.zip","sha256":"{{hash}}"}, - {"id":"grapevine.channels","name":"Grapevine channels","version":"2.0.0","games":["grapevine.haus"], - "url":"https://packages.example/grapevine-channels-2.0.0.zip","sha256":"{{hash}}"}, - {"id":"aetherfall.basics","name":"Aetherfall basics","version":"1.2.0","author":"the Aetherfall builders", - "games":["aetherfall.mux:4201"],"description":"Health warnings, a tells window and the status gauges.", - "url":"https://packages.example/aetherfall-basics-1.2.0.zip","sha256":"{{hash}}"}, - {"id":"aetherfall.mapper","name":"Aetherfall mapper rooms","version":"0.9.0","games":["aetherfall.mux"], - "url":"https://packages.example/aetherfall-mapper-0.9.0.zip","sha256":"{{hash}}"}, - {"id":"bad","name":"Bad","version":"1","games":["*"],"url":"http://x","sha256":"x"}]} - """); - ShowIndex(index!); + if (NativePackages) + { + PackageManager.PublishFetching(); + TryOpenNativeSettings(Section("packages")); + } + + ShowIndex(PackageIndex.Parse(DemoIndex()).Index!); return; } _packages.Install(PackageArchive.Read(DemoBasics).Contents!); - _packages.Install(PackageArchive.Read(DemoPackage( - "mush.colours", - "MUSH colour names", - "0.3.1", - "\"*\"", - """{"name":"MUSH colours","triggers":[{"name":"pages","pattern":"^From afar","actions":{"spawnTarget":"Pages"}}]}""", - "Highlights pages and channel names on any game.")).Contents!); + _packages.Install(PackageArchive.Read(DemoColours).Contents!); _config.DisabledPackages.Add("mush.colours"); SyncPackages(); ShowPackages(); diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Settings.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Settings.cs index 480b8e65..170ce1a0 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Settings.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Settings.cs @@ -57,7 +57,7 @@ private SettingsSearchHost SettingsSearchHost() => /// private bool GoToSetting(SettingsMatch match, bool native) { - if (string.Equals(match.Section.Id, "packages", StringComparison.Ordinal)) + if (string.Equals(match.Section.Id, "packages", StringComparison.Ordinal) && !(native && NativePackages)) { _settings.CloseAll(); ShowPackages(); @@ -101,15 +101,19 @@ private bool GoToSetting(SettingsMatch match, bool native) /// private void OpenSettingsScreen(ConsoleKey key, Func open) { - var name = key.ToString(); - var section = _contributions.SettingsSections.Ordered - .FirstOrDefault(s => string.Equals(s.Key, name, StringComparison.Ordinal)); - if (!TryOpenNativeSettings(section)) + if (!TryOpenNativeSettings(SectionForKey(key))) { _settings.Toggle(key, open); } } + /// The declared section a settings screen's F-key opens, or null. + private SettingsSectionContribution? SectionForKey(ConsoleKey key) + { + var name = key.ToString(); + return _contributions.SettingsSections.Ordered.FirstOrDefault(s => string.Equals(s.Key, name, StringComparison.Ordinal)); + } + /// /// Shows in the host's settings window, closing any cell screen first; false when the /// host has none (the terminal, the snapshot, the tests) or the section declares no fields, which keep their @@ -178,7 +182,10 @@ internal SettingsForm NativeSettingsForm(string initial, object? item = null) world, character, ListContext(), - item); + item) + { + Packages = PackageManager, + }; return form; } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index cc05b185..db3eabe4 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -2221,6 +2221,15 @@ public string RenderSnapshot(string? view = null) var screenView = editing ? view![..^EditViewSuffix.Length] : view; if (screenView is not null && SettingsView(screenView) is { } screen) { + // A host with its own settings window (the desktop's demo) shows a screen's --view there, the way its + // F-key would; an -edit view drives cell keys, so it stays a cell screen. The snapshot and the parity + // harness attach no settings window, so their frames are the cells as before. + if (!editing && TryOpenNativeSettings(SectionForKey(screen.Key))) + { + SyncInputWidth(); + return RenderFrame(); + } + _settings.OpenForSnapshot(screen.Key, screen.Open()); if (editing) { diff --git a/tests/SharpMUTerm.Avalonia.Tests/PackagePageTests.cs b/tests/SharpMUTerm.Avalonia.Tests/PackagePageTests.cs new file mode 100644 index 00000000..dc9ddb4c --- /dev/null +++ b/tests/SharpMUTerm.Avalonia.Tests/PackagePageTests.cs @@ -0,0 +1,224 @@ +using System.IO.Compression; +using System.Text; +using Avalonia.Controls; +using Avalonia.Interactivity; +using Avalonia.Threading; +using SharpMUTerm.Client.Packages; +using SharpMUTerm.Client.Settings; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Packages; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Avalonia.Tests; + +/// +/// F10 in the settings window (): the declared fields — the same the cell screen draws — +/// every gesture handed to the client and none performed here, the index fetched only from the Browse tab, and the +/// review drawn from the model the cell review draws, with Install the only way to consent. +/// +public class PackagePageTests +{ + private static PackageContents Contents() + { + using var buffer = new MemoryStream(); + using (var zip = new ZipArchive(buffer, ZipArchiveMode.Create, leaveOpen: true)) + { + foreach (var (name, text) in new[] + { + ("package.json", """{"id":"aether.basics","name":"Aether basics","version":"1.0.0","author":"builders","description":"Warnings.","games":["aetherfall.example:4000"]}"""), + ("sets/basics.json", """{"name":"Basics","triggers":[{"name":"hp","pattern":"^HP low","actions":{"sendResponse":"quaff"}}]}"""), + ("scripts/basics.lua", "x = 1"), + }) + { + using var stream = zip.CreateEntry(name).Open(); + stream.Write(Encoding.UTF8.GetBytes(text)); + } + } + + return PackageArchive.Read(buffer.ToArray()).Contents!; + } + + private sealed class Calls : IPackageHost + { + public List Log { get; } = []; + + public void SetEnabled(string id, bool on) => Log.Add($"enable {id} {on}"); + + public void Remove(string id) => Log.Add($"remove {id}"); + + public void CopySets(string id) => Log.Add($"copy {id}"); + + public void Browse() => Log.Add("browse"); + + public void Install(PackageIndexEntry entry) => Log.Add($"install {entry.Id}"); + + public void Accept(PackageReviewModel review) => Log.Add($"accept {review.Name}"); + + public void Cancel(PackageReviewModel review) => Log.Add($"cancel {review.Name}"); + } + + private sealed class Harness + { + public Harness() + { + Config.Worlds.Add(new WorldDefinition + { + Name = "Aetherfall", + Host = "aetherfall.example", + Port = 4000, + Characters = { new CharacterDefinition { Name = "Corvid" } }, + }); + var store = new PackageStore(); + store.Install(Contents()); + Config.Packages = store.Installed; + Manager = new PackageManager(Config, BuiltInSettings.Packages.Packages!, Calls); + } + + public AppConfiguration Config { get; } = new(); + + public Calls Calls { get; } = new(); + + public PackageManager Manager { get; } + + public SettingsForm Form() => new( + BuiltInSettings.All, + Config, + change => change(), + _ => { }, + "packages", + isDark: true) + { + Packages = Manager, + }; + } + + private static void Click(Button button) + { + button.RaiseEvent(new RoutedEventArgs(Button.ClickEvent)); + Dispatcher.UIThread.RunJobs(); + } + + [Test] + public async Task ThePageDrawsTheDeclaredFieldsTheCellScreenDraws() + { + var harness = new Harness(); + var (shown, values) = await Run(harness, window => (window.ShownFields.ToArray(), window.PackagePage!.Values)); + var cells = new List(); + PackageScreen.List( + BuiltInSettings.Packages.Packages!, harness.Config, PackageCollection.Items(harness.Config, null), 0, false, 100, cells); + + await Assert.That(shown).IsEquivalentTo(cells, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(shown).IsEquivalentTo(BuiltInSettings.Packages.Packages!.Fields.Select(f => f.Id), TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(values["scripts"]).IsEqualTo("basics.lua"); + await Assert.That(values["characters"]).IsEqualTo("Corvid (Aetherfall)"); + } + + [Test] + public async Task TheSwitchCopyAndRemoveAreHandedToTheClient() + { + var harness = new Harness(); + var (afterOneRemove, log) = await Run(harness, window => + { + var page = window.PackagePage!; + page.Rows.Single().Switch.IsChecked = false; + Dispatcher.UIThread.RunJobs(); + Click(page.CopyButton!); + Click(page.RemoveButton!); + var asked = harness.Calls.Log.Count(l => l.StartsWith("remove", StringComparison.Ordinal)); + Click(page.RemoveButton!); + return (asked, harness.Calls.Log.ToArray()); + }); + + await Assert.That(afterOneRemove).IsEqualTo(0).Because("the first press asks, as Del does on the cell screen"); + await Assert.That(log).IsEquivalentTo(new[] { "enable aether.basics False", "copy aether.basics", "remove aether.basics" }, + TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(harness.Config.DisabledPackages).IsEmpty().Because("the page writes nothing itself"); + } + + [Test] + public async Task TheIndexIsFetchedOnlyFromTheBrowseTab() + { + var harness = new Harness(); + var (before, fetch, after) = await Run(harness, window => + { + var page = window.PackagePage!; + var opened = harness.Calls.Log.ToArray(); + page.BrowseTab.IsSelected = true; + Dispatcher.UIThread.RunJobs(); + var button = page.FetchButton is not null; + Click(page.FetchButton!); + return (opened, button, harness.Calls.Log.ToArray()); + }); + + await Assert.That(before).IsEmpty(); + await Assert.That(fetch).IsTrue(); + await Assert.That(after).IsEquivalentTo(new[] { "browse" }); + } + + [Test] + public async Task TheBrowseListComesForwardWhenTheIndexIsAskedForAndInstallIsHandedToTheClient() + { + var harness = new Harness(); + var (browsing, rows, log) = await Run(harness, window => + { + var page = window.PackagePage!; + var (index, _) = PackageIndex.Parse($$""" + {"packages":[{"id":"aether.basics","name":"Aether basics","version":"1.1.0","games":["aetherfall.example"], + "url":"https://p.example/a.zip","sha256":"{{new string('a', 64)}}"}]} + """); + harness.Manager.PublishFetching(); + harness.Manager.PublishIndex(index!, PackageBrowseModel.From(index!, harness.Config.Packages, harness.Config.Worlds[0])); + page.Refresh(); + Dispatcher.UIThread.RunJobs(); + Click(page.InstallButton!); + return (page.Browsing, harness.Manager.Items.Single().Update, harness.Calls.Log.ToArray()); + }); + + await Assert.That(browsing).IsTrue(); + await Assert.That(rows).IsEqualTo("1.1.0"); + await Assert.That(log).IsEquivalentTo(new[] { "install aether.basics" }); + } + + [Test] + public async Task TheReviewIsTheModelsRowsAndInstallIsTheConsent() + { + var harness = new Harness(); + var model = PackageReviewModel.From(Contents(), ["Corvid (Aetherfall)"], harness.Config.Packages.Single()); + var (lines, shown, log, gone) = await Run(harness, window => + { + var page = window.PackagePage!; + harness.Manager.PublishReview(model); + page.Refresh(); + var drawn = page.ReviewLines.ToArray(); + var on = page.ShownReview; + Click(page.AcceptButton!); + var calls = harness.Calls.Log.ToArray(); + harness.Manager.PublishReview(null); + page.Refresh(); + return (drawn, on, calls, page.ShownReview is null); + }); + + var expected = model.Sections.SelectMany(s => new[] { s.Heading }.Concat(s.Rows.Select(r => r.Label.Length == 0 ? r.Value : $"{r.Label}: {r.Value}"))); + await Assert.That(lines).IsEquivalentTo(expected, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(lines[0]).IsEqualTo(PackageReviewModel.ActsHeading); + await Assert.That(ReferenceEquals(shown, model)).IsTrue(); + await Assert.That(log).IsEquivalentTo(new[] { "accept Aether basics" }); + await Assert.That(gone).IsTrue(); + } + + private static Task Run(Harness harness, Func body) => + TerminalViewTests.Session.Dispatch(() => + { + var window = new SettingsWindow(harness.Form()); + window.Show(); + Dispatcher.UIThread.RunJobs(); + try + { + return body(window); + } + finally + { + window.Close(); + } + }, CancellationToken.None); +} diff --git a/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowTests.cs b/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowTests.cs index f4bf0a9a..649cb3a5 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowTests.cs @@ -24,11 +24,14 @@ private sealed class Harness public List Opened { get; } = []; + /// The sections the form lists; every built-in one is declared now, so a test adds one that is not. + public IReadOnlyList Sections { get; init; } = BuiltInSettings.All; + public SettingsForm Form(string initial = "text") { SettingsForm? form = null; form = new SettingsForm( - BuiltInSettings.All, + Sections, Config, change => { @@ -147,16 +150,19 @@ public async Task TheMeterTableHasARowPerMeterAndReadsNow() [Test] public async Task AnUndeclaredSectionOpensItsOwnScreen() { - var harness = new Harness(); + var harness = new Harness + { + Sections = [.. BuiltInSettings.All, new SettingsSectionContribution { Id = "elsewhere", Title = "Elsewhere", Key = "F11", Order = 95 }], + }; var shown = await Run(harness, "text", window => { - var item = window.SectionList.Items.OfType().Single(i => Equals(i.Tag, "packages")); + var item = window.SectionList.Items.OfType().Single(i => Equals(i.Tag, "elsewhere")); window.SectionList.SelectedItem = item; Dispatcher.UIThread.RunJobs(); return window.ShownSection; }); - await Assert.That(harness.Opened).IsEquivalentTo(new[] { "packages" }); + await Assert.That(harness.Opened).IsEquivalentTo(new[] { "elsewhere" }); await Assert.That(shown).IsEqualTo("text"); } diff --git a/tests/SharpMUTerm.Client.Tests/PackageSettingsTests.cs b/tests/SharpMUTerm.Client.Tests/PackageSettingsTests.cs new file mode 100644 index 00000000..4a19f487 --- /dev/null +++ b/tests/SharpMUTerm.Client.Tests/PackageSettingsTests.cs @@ -0,0 +1,242 @@ +using System.IO.Compression; +using System.Text; +using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Client.Packages; +using SharpMUTerm.Client.Settings; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Packages; + +namespace SharpMUTerm.Client.Tests; + +/// +/// F10 declared: the packages as a list section with its fields and actions, the one binding it writes +/// (DisabledPackages, replaced), the review model both hosts draw, the browse model, and the manager the window +/// reads — which fetches nothing on its own and hands every gesture to the client. +/// +public class PackageSettingsTests +{ + private static PackageContents Contents(string id, string name, string version, string games, string set, bool script) + { + using var buffer = new MemoryStream(); + using (var zip = new ZipArchive(buffer, ZipArchiveMode.Create, leaveOpen: true)) + { + var entries = new List<(string, string)> + { + ("package.json", $$"""{"id":"{{id}}","name":"{{name}}","version":"{{version}}","games":[{{games}}]}"""), + ("sets/main.json", set), + }; + if (script) + { + entries.Add(("scripts/main.lua", "x = 1")); + } + + foreach (var (entry, text) in entries) + { + using var stream = zip.CreateEntry(entry).Open(); + stream.Write(Encoding.UTF8.GetBytes(text)); + } + } + + return PackageArchive.Read(buffer.ToArray()).Contents!; + } + + private const string SendingSet = """ + {"name":"Basics","triggers":[{"name":"hp","pattern":"^HP low","actions":{"sendResponse":"quaff"}}]} + """; + + private static (AppConfiguration Config, PackageStore Store) Installed() + { + var config = new AppConfiguration(); + config.Worlds.Add(new WorldDefinition + { + Name = "Aetherfall", + Host = "aetherfall.example", + Port = 4000, + Characters = { new CharacterDefinition { Name = "Corvid" } }, + }); + var store = new PackageStore(); + store.Install(Contents("aether.basics", "Aether basics", "1.0.0", "\"aetherfall.example:4000\"", SendingSet, script: true)); + config.Packages = store.Installed; + return (config, store); + } + + private sealed class Calls : IPackageHost + { + public List Log { get; } = []; + + public void SetEnabled(string id, bool on) => Log.Add($"enable {id} {on}"); + + public void Remove(string id) => Log.Add($"remove {id}"); + + public void CopySets(string id) => Log.Add($"copy {id}"); + + public void Browse() => Log.Add("browse"); + + public void Install(PackageIndexEntry entry) => Log.Add($"install {entry.Id}"); + + public void Accept(PackageReviewModel review) => Log.Add($"accept {review.Name}"); + + public void Cancel(PackageReviewModel review) => Log.Add($"cancel {review.Name}"); + } + + [Test] + public async Task F10IsDeclaredAsAListOfPackagesWithItsFieldsAndActions() + { + var section = BuiltInSettings.Packages; + var packages = section.Packages!; + + await Assert.That(BuiltInSettings.All).Contains(section); + await Assert.That(SettingsForm.IsDeclared(section)).IsTrue(); + await Assert.That(section.Key).IsEqualTo("F10"); + await Assert.That(section.Scope).IsEqualTo(SettingScope.Item); + await Assert.That(packages.Fields.Select(f => f.Id)).IsEquivalentTo( + new[] { "enabled", "name", "version", "games", "author", "description", "sets", "scripts", "media", "update", "characters" }); + await Assert.That(packages.Actions.Select(a => a.Id)).IsEquivalentTo( + new[] { PackageCollection.Toggle, PackageCollection.CopySets, PackageCollection.Remove, PackageCollection.Browse }); + await Assert.That(packages.Fields.All(f => f.Group is not null)).IsTrue(); + } + + [Test] + public async Task TheSearchFindsAPackagesFields() + { + var matches = SettingsSearch.Find(BuiltInSettings.All, "lua"); + + await Assert.That(matches.Any(m => m.Section.Id == "packages" && m.Field?.Id == "scripts")).IsTrue(); + } + + [Test] + public async Task TheFieldsSayWhatThePackageIsAndAdds() + { + var (config, _) = Installed(); + var item = PackageCollection.Items(config, null).Single(); + var packages = BuiltInSettings.Packages.Packages!; + string Read(string id) => ((InfoField)packages.Field(id)).Read(new SettingTarget(config, Item: item)); + + await Assert.That(Read("version")).IsEqualTo("1.0.0"); + await Assert.That(Read("games")).IsEqualTo("aetherfall.example:4000"); + await Assert.That(Read("sets")).IsEqualTo("Basics · 1 rule"); + await Assert.That(Read("scripts")).IsEqualTo("main.lua"); + await Assert.That(Read("media")).IsEqualTo("none"); + await Assert.That(Read("characters")).IsEqualTo("Corvid (Aetherfall)"); + await Assert.That(Read("update")).Contains("not checked"); + } + + [Test] + public async Task AnIndexWithANewerVersionIsAnUpdate() + { + var (config, _) = Installed(); + var (index, _) = PackageIndex.Parse($$""" + {"packages":[{"id":"aether.basics","name":"Aether basics","version":"1.1.0","games":["*"], + "url":"https://p.example/a.zip","sha256":"{{new string('a', 64)}}"}]} + """); + + var item = PackageCollection.Items(config, index).Single(); + + await Assert.That(item.Update).IsEqualTo("1.1.0"); + await Assert.That(((InfoField)BuiltInSettings.Packages.Packages!.Field("update")).Read(new SettingTarget(config, Item: item))) + .IsEqualTo("1.1.0 in the index"); + } + + [Test] + public async Task SwitchingAPackageOffReplacesTheListAndItsSetsStopApplying() + { + var (config, _) = Installed(); + var character = config.Worlds[0].Characters[0]; + var item = PackageCollection.Items(config, null).Single(); + var enabled = (SettingBinding)BuiltInSettings.Packages.Packages!.Field("enabled").Binding!; + var before = config.DisabledPackages; + await Assert.That(config.ResolveTriggerSets(character, config.Worlds[0]).Select(s => s.Name)).Contains("Basics"); + + enabled.Set(new SettingTarget(config, Item: item), false); + + await Assert.That(ReferenceEquals(before, config.DisabledPackages)).IsFalse().Because("lists are replaced, never edited"); + await Assert.That(config.DisabledPackages).Contains("aether.basics"); + await Assert.That(config.ResolveTriggerSets(character, config.Worlds[0]).Select(s => s.Name)).DoesNotContain("Basics"); + await Assert.That(PackageCollection.SetEnabled(config, "aether.basics", false)).IsFalse().Because("already off"); + } + + [Test] + public async Task TheReviewLeadsWithWhatCanActAsThePlayer() + { + var contents = Contents("aether.basics", "Aether basics", "1.0.0", "\"*\"", SendingSet, script: true); + + var review = PackageReviewModel.From(contents, ["Corvid (Aetherfall)"], existing: null); + + await Assert.That(review.Title).IsEqualTo("Install package"); + await Assert.That(review.Acts).IsTrue(); + await Assert.That(review.Sections.Select(s => s.Heading)).IsEquivalentTo( + new[] { PackageReviewModel.ActsHeading, PackageReviewModel.AddsHeading, PackageReviewModel.WhoHeading }); + var acts = review.Sections[0].Rows; + await Assert.That(acts[0].Value).IsEqualTo("1 rule sends commands as you"); + await Assert.That(acts[0].Tone).IsEqualTo(PackageReviewTone.Warning); + await Assert.That(acts[1].Value).Contains("main.lua"); + await Assert.That(acts[2].Tone).IsEqualTo(PackageReviewTone.Warning); + } + + [Test] + public async Task AQuietPackageSaysNothingActsAsThePlayerAndAnUpdateNamesWhatItReplaces() + { + var (config, store) = Installed(); + var contents = Contents("aether.basics", "Aether basics", "2.0.0", "\"*\"", """{"name":"Quiet","triggers":[{"name":"x","pattern":"^x"}]}""", script: false); + + var review = PackageReviewModel.From(contents, [], store.Find("aether.basics")); + + await Assert.That(review.Acts).IsFalse(); + await Assert.That(review.Title).IsEqualTo("Update package"); + await Assert.That(review.Replaces).IsEqualTo("1.0.0"); + await Assert.That(review.Sections[0].Rows[0].Tone).IsEqualTo(PackageReviewTone.Quiet); + await Assert.That(review.Sections[2].Rows[1].Value).IsEqualTo("none of yours, yet"); + _ = config; + } + + [Test] + public async Task TheBrowseListPutsTheWorldsOwnFirstAndSaysWhatIsInstalled() + { + var (config, store) = Installed(); + var hash = new string('a', 64); + var (index, _) = PackageIndex.Parse($$""" + {"packages":[ + {"id":"any.thing","name":"Any thing","version":"1.0.0","games":["*"],"url":"https://p.example/1.zip","sha256":"{{hash}}"}, + {"id":"aether.basics","name":"Aether basics","version":"1.1.0","games":["aetherfall.example"],"url":"https://p.example/2.zip","sha256":"{{hash}}"}, + {"id":"bad","name":"Bad","version":"1","games":["*"],"url":"http://x","sha256":"x"}]} + """); + + var model = PackageBrowseModel.From(index!, store.Installed, config.Worlds[0]); + + await Assert.That(model.World).IsEqualTo("Aetherfall"); + await Assert.That(model.Dropped).IsEqualTo(1); + await Assert.That(model.Rows.Select(r => r.Entry.Id)).IsEquivalentTo(new[] { "aether.basics", "any.thing" }); + await Assert.That(model.Rows[0].ForWorld).IsTrue(); + await Assert.That(model.Rows[0].State).IsEqualTo(PackageBrowseState.Update); + await Assert.That(model.Rows[0].StateText).IsEqualTo("installed 1.0.0, update"); + await Assert.That(model.Rows[1].ForWorld).IsFalse().Because("a * package is not the world's own"); + } + + [Test] + public async Task TheManagerFetchesNothingByItselfAndHandsEveryGestureToTheClient() + { + var (config, _) = Installed(); + var calls = new Calls(); + var manager = new PackageManager(config, BuiltInSettings.Packages.Packages!, calls); + var item = manager.Items.Single(); + + await Assert.That(calls.Log).IsEmpty(); + await Assert.That(manager.Index).IsNull(); + manager.Accept(); // nothing to accept + await Assert.That(calls.Log).IsEmpty(); + + manager.SetEnabled(item, false); + manager.CopySets(item); + manager.Remove(item); + manager.Browse(); + var review = PackageReviewModel.From(Contents("x", "X", "1.0.0", "\"*\"", SendingSet, false), [], null); + manager.PublishReview(review); + manager.Accept(); + manager.Cancel(); + + await Assert.That(calls.Log).IsEquivalentTo(new[] + { + "enable aether.basics False", "copy aether.basics", "remove aether.basics", "browse", "accept X", "cancel X", + }); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/NativePackagesTests.cs b/tests/SharpMUTerm.Tui.Tests/NativePackagesTests.cs new file mode 100644 index 00000000..793cd1ff --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/NativePackagesTests.cs @@ -0,0 +1,407 @@ +using System.IO.Compression; +using System.Security.Cryptography; +using System.Text; +using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Packages; +using SharpMUTerm.Client.Settings; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Packages; +using SharpMUTerm.Graphics; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// F10 from its declaration in both hosts: the cell screen draws the declared fields, a host with a settings window +/// opens its package page instead, switching and removing save once through the same methods either way, the review +/// is one model with nothing written before it is accepted, the index is fetched only when asked and an archive that is +/// not the one listed never reaches the review; and a settings --view goes to the window when one is attached. +/// +[NotInParallel] +public class NativePackagesTests +{ + private static readonly TerminalCapabilities Caps = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private const string Manifest = """ + {"id":"aether.basics","name":"Aether basics","version":"1.0.0","games":["aetherfall.example:4000"]} + """; + + private const string Set = """ + {"name":"Basics","triggers":[{"name":"hp","pattern":"^HP low","actions":{"sendResponse":"quaff"}}]} + """; + + private static byte[] Archive() + { + using var buffer = new MemoryStream(); + using (var zip = new ZipArchive(buffer, ZipArchiveMode.Create, leaveOpen: true)) + { + foreach (var (name, text) in new[] { ("package.json", Manifest), ("sets/basics.json", Set), ("scripts/basics.lua", "x = 1"), ("media/bell.ogg", "OggS") }) + { + using var stream = zip.CreateEntry(name).Open(); + stream.Write(Encoding.UTF8.GetBytes(text)); + } + } + + return buffer.ToArray(); + } + + private sealed class Presenter : INativeSettings + { + public List Shown { get; } = []; + + public void Show(SettingsForm form) => Shown.Add(form); + + public void Close() + { + } + } + + private sealed class Rig : IAsyncDisposable + { + public required SharpMUTermApp App { get; init; } + + public required AppConfiguration Config { get; init; } + + public required string Root { get; init; } + + public required Presenter Native { get; init; } + + public int Saves { get; set; } + + public int Fetches; + + public CharacterDefinition Character => Config.Worlds[0].Characters[0]; + + public bool Applies => Config.ResolveTriggerSets(Character, Config.Worlds[0]).Any(s => s.Name == "Basics"); + + public async ValueTask DisposeAsync() + { + await App.DisposeAsync(); + Directory.Delete(Root, recursive: true); + } + } + + private static Rig Open(bool native, string? sha = null) + { + Console.SetIn(TextReader.Null); + var root = Directory.CreateTempSubdirectory("sharpmuterm-nativepkg-").FullName; + var config = new AppConfiguration(); + config.Worlds.Add(new WorldDefinition + { + Name = "Aetherfall", + Host = "aetherfall.example", + Port = 4000, + Characters = { new CharacterDefinition { Name = "Corvid", Logging = new LoggingSettings() } }, + }); + + var presenter = new Presenter(); + Rig? rig = null; + var host = ClientHost.ForHarness(Caps, new HeadlessConsoleDriver(120, 32), null, null, null) with + { + NativeSettings = native ? presenter : null, + }; + var app = new SharpMUTermApp(config, host, save: _ => rig!.Saves++, packages: new PackageStore(Path.Combine(root, "packages"))); + rig = new Rig { App = app, Config = config, Root = root, Native = presenter }; + var archive = Archive(); + app.PackageFetch = (uri, _) => + { + Interlocked.Increment(ref rig!.Fetches); + return Task.FromResult(uri.AbsolutePath.EndsWith("index.json", StringComparison.Ordinal) + ? Encoding.UTF8.GetBytes(Index(archive, sha)) + : archive); + }; + return rig; + } + + private static string Index(byte[] archive, string? sha) => $$""" + {"packages":[ + {"id":"aether.basics","name":"Aether basics","version":"1.0.0","games":["aetherfall.example:4000"], + "url":"https://packages.example/basics.zip", + "sha256":"{{sha ?? Convert.ToHexStringLower(SHA256.HashData(archive))}}"}]} + """; + + private static async Task Until(Func condition) + { + for (var i = 0; i < 300 && !condition(); i++) + { + await Task.Delay(10); + } + } + + private static ConsoleKeyInfo Key(ConsoleKey key, char ch = '\0') => new(ch, key, false, false, false); + + private static IReadOnlyList Flatten(PackageReviewModel model) => + new[] { model.Title, model.Name, model.Version, model.Author ?? string.Empty, model.Replaces ?? string.Empty, model.Description ?? string.Empty } + .Concat(model.Sections.SelectMany(s => new[] { s.Heading }.Concat(s.Rows.Select(r => $"{r.Label}|{r.Value}|{r.Tone}")))) + .ToList(); + + private static void Install(Rig rig) + { + rig.App.ReviewPackage(Archive()); + if (rig.App.PackageView.IsOpen) + { + rig.App.PackageView.SimulateKey(Key(ConsoleKey.Enter, '\r')); + } + else + { + rig.App.AcceptPackage(rig.App.PendingPackageReview!); + } + } + + [Test] + public async Task TheCellScreenDrawsEveryDeclaredField() + { + await using var rig = Open(native: false); + Install(rig); + + var drawn = rig.App.CellPackageFields(); + + await Assert.That(drawn).IsEquivalentTo(BuiltInSettings.Packages.Packages!.Fields.Select(f => f.Id), TUnit.Assertions.Enums.CollectionOrdering.Matching); + } + + [Test] + public async Task F10OpensTheWindowsPackagePageAndNoCellScreen() + { + await using var rig = Open(native: true); + + rig.App.SimulateKey(Key(ConsoleKey.F10)); + + var form = rig.Native.Shown.Single(); + await Assert.That(form.Initial).IsEqualTo("packages"); + await Assert.That(form.Packages).IsNotNull(); + await Assert.That(rig.App.PackageView.IsOpen).IsFalse(); + } + + [Test] + public async Task SwitchingOffInTheWindowSavesOnceAndTheSetsStopApplying() + { + await using var rig = Open(native: true); + Install(rig); + var saves = rig.Saves; + var manager = rig.App.PackageManager; + await Assert.That(rig.Applies).IsTrue(); + + manager.SetEnabled(manager.Items.Single(), false); + + await Assert.That(rig.Saves - saves).IsEqualTo(1); + await Assert.That(rig.Applies).IsFalse(); + + manager.SetEnabled(manager.Items.Single(), true); + await Assert.That(rig.Saves - saves).IsEqualTo(2); + await Assert.That(rig.Applies).IsTrue(); + } + + [Test] + public async Task SwitchingOffOnTheCellScreenSavesOnceAndTheSetsStopApplying() + { + await using var rig = Open(native: false); + Install(rig); + rig.App.ShowPackages(); + var saves = rig.Saves; + + rig.App.PackageView.SimulateKey(Key(ConsoleKey.Spacebar, ' ')); + + await Assert.That(rig.Saves - saves).IsEqualTo(1); + await Assert.That(rig.Applies).IsFalse(); + } + + [Test] + public async Task RemovingInTheWindowDeletesThePackageAndItsFolder() + { + await using var rig = Open(native: true); + Install(rig); + await Assert.That(Directory.Exists(Path.Combine(rig.Root, "packages", "aether.basics"))).IsTrue(); + var manager = rig.App.PackageManager; + var changes = 0; + manager.Changed += () => changes++; + + manager.Remove(manager.Items.Single()); + + await Assert.That(rig.App.Packages.Installed).IsEmpty(); + await Assert.That(manager.Items).IsEmpty(); + await Assert.That(Directory.Exists(Path.Combine(rig.Root, "packages", "aether.basics"))).IsFalse(); + await Assert.That(rig.Applies).IsFalse(); + await Assert.That(manager.Status).Contains("Removed Aether basics"); + await Assert.That(changes).IsGreaterThan(0); + } + + [Test] + public async Task CopyInTheWindowMakesTheSetsThePlayersOwn() + { + await using var rig = Open(native: true); + Install(rig); + + rig.App.PackageManager.CopySets(rig.App.PackageManager.Items.Single()); + + await Assert.That(rig.Config.TriggerSets.Single(s => s.Name == "Basics").Triggers.Single().Name).IsEqualTo("hp"); + } + + [Test] + public async Task TheReviewIsOneModelInBothHostsAndNothingIsWrittenBeforeItIsAccepted() + { + await using var cells = Open(native: false); + await using var window = Open(native: true); + + cells.App.ReviewPackage(Archive()); + window.App.ReviewPackage(Archive()); + + var cellModel = cells.App.PendingPackageReview!; + var nativeModel = window.App.PackageManager.Review!; + await Assert.That(Flatten(nativeModel)).IsEquivalentTo(Flatten(cellModel), TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(nativeModel.Sections[0].Heading).IsEqualTo(PackageReviewModel.ActsHeading); + + // The cell review draws the model's rows, in its order. + var text = string.Join("\n", cells.App.PackageView.Lines.Select(MarkupText.Plain)); + var at = -1; + foreach (var row in cellModel.Sections.SelectMany(s => s.Rows)) + { + var next = text.IndexOf(row.Value, at + 1, StringComparison.Ordinal); + await Assert.That(next).IsGreaterThan(at); + at = next; + } + + // The window opened on its package page, and nothing is on disk yet. + await Assert.That(window.Native.Shown.Single().Initial).IsEqualTo("packages"); + await Assert.That(window.App.Packages.Installed).IsEmpty(); + await Assert.That(Directory.Exists(Path.Combine(window.Root, "packages"))).IsFalse(); + await Assert.That(window.Saves).IsEqualTo(0); + + window.App.PackageManager.Accept(); + + await Assert.That(window.App.PackageManager.Review).IsNull(); + await Assert.That(window.App.Packages.Installed.Single().Id).IsEqualTo("aether.basics"); + await Assert.That(File.Exists(Path.Combine(window.Root, "packages", "aether.basics", "package.json"))).IsTrue(); + await Assert.That(window.Applies).IsTrue(); + } + + [Test] + public async Task CancellingTheReviewInTheWindowWritesNothing() + { + await using var rig = Open(native: true); + rig.App.ReviewPackage(Archive()); + + rig.App.PackageManager.Cancel(); + + await Assert.That(rig.App.PackageManager.Review).IsNull(); + await Assert.That(rig.App.Packages.Installed).IsEmpty(); + await Assert.That(Directory.Exists(Path.Combine(rig.Root, "packages"))).IsFalse(); + } + + [Test] + public async Task AStaleReviewCannotBeAccepted() + { + await using var rig = Open(native: true); + rig.App.ReviewPackage(Archive()); + var first = rig.App.PendingPackageReview!; + rig.App.CancelPackage(first); + + await Assert.That(rig.App.AcceptPackage(first)).IsFalse(); + await Assert.That(rig.App.Packages.Installed).IsEmpty(); + } + + [Test] + public async Task TheIndexIsNeverFetchedAtStartOrWhenThePageOpens() + { + await using var rig = Open(native: true); + Install(rig); + + rig.App.SimulateKey(Key(ConsoleKey.F10)); + await Assert.That(rig.Native.Shown.Last().Initial).IsEqualTo("packages"); + _ = rig.Native.Shown.Last().Packages!.Items; + await Task.Delay(50); + + await Assert.That(rig.Fetches).IsEqualTo(0); + await Assert.That(rig.App.PackageManager.Index).IsNull(); + await Assert.That(rig.App.PackageManager.BrowseModel).IsNull(); + + rig.App.PackageManager.Browse(); + await Until(() => rig.App.PackageManager.BrowseModel is not null); + + await Assert.That(rig.Fetches).IsEqualTo(1); + await Assert.That(rig.App.PackageManager.BrowseModel!.Rows.Single().State).IsEqualTo(PackageBrowseState.Installed); + await Assert.That(rig.App.PackageManager.BrowseRequests).IsEqualTo(1); + } + + [Test] + public async Task InstallingFromTheWindowsBrowseListReviewsAVerifiedPackage() + { + await using var rig = Open(native: true); + var manager = rig.App.PackageManager; + manager.Browse(); + await Until(() => manager.BrowseModel is not null); + + manager.Install(manager.BrowseModel!.Rows.Single()); + await Until(() => manager.Review is not null); + + await Assert.That(manager.Review!.Name).IsEqualTo("Aether basics"); + await Assert.That(rig.App.Packages.Installed).IsEmpty(); + } + + [Test] + public async Task AnArchiveWhoseHashDiffersNeverReachesTheWindowsReview() + { + await using var rig = Open(native: true, sha: new string('c', 64)); + var manager = rig.App.PackageManager; + manager.Browse(); + await Until(() => manager.BrowseModel is not null); + + manager.Install(manager.BrowseModel!.Rows.Single()); + await Until(() => manager.Status?.Contains("SHA-256", StringComparison.Ordinal) == true); + + await Assert.That(manager.Review).IsNull(); + await Assert.That(rig.App.PendingPackageReview).IsNull(); + await Assert.That(manager.Status).Contains("does not match the index's SHA-256"); + await Assert.That(rig.App.Packages.Installed).IsEmpty(); + } + + [Test] + public async Task ASettingsViewGoesToTheWindowWhenOneIsAttached() + { + Console.SetIn(TextReader.Null); + var presenter = new Presenter(); + var host = ClientHost.Headless(new HeadlessConsoleDriver(120, 32), Caps) with { NativeSettings = presenter }; + await using var app = new SharpMUTermApp(DemoScene.Build(), host); + + app.RenderSnapshot("keypad"); + + await Assert.That(presenter.Shown.Single().Initial).IsEqualTo("keypad"); + await Assert.That(app.SettingsOpenKey).IsNull(); + } + + [Test] + public async Task ASettingsViewIsTheCellScreenWithNoWindow() + { + Console.SetIn(TextReader.Null); + await using var app = new SharpMUTermApp(DemoScene.Build(), ClientHost.Headless(new HeadlessConsoleDriver(120, 32), Caps)); + + app.RenderSnapshot("keypad"); + + await Assert.That(app.SettingsOpenKey).IsEqualTo(ConsoleKey.F4); + } + + [Test] + public async Task ThePackagesViewsGoToTheWindowWhenOneIsAttached() + { + foreach (var view in new[] { "packages", "package-review", "package-browse" }) + { + Console.SetIn(TextReader.Null); + var presenter = new Presenter(); + var host = ClientHost.Headless(new HeadlessConsoleDriver(120, 32), Caps) with { NativeSettings = presenter }; + await using var app = new SharpMUTermApp(DemoScene.Build(), host); + + app.RenderSnapshot(view); + + await Assert.That(presenter.Shown.Last().Initial).IsEqualTo("packages"); + await Assert.That(app.PackageView.IsOpen).IsFalse(); + if (view == "package-review") + { + await Assert.That(app.PackageManager.Review).IsNotNull(); + } + + if (view == "package-browse") + { + await Assert.That(app.PackageManager.BrowseModel!.Rows.Count).IsEqualTo(4); + } + } + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/PackagesAppTests.cs b/tests/SharpMUTerm.Tui.Tests/PackagesAppTests.cs index 9fb9261f..223eb8f6 100644 --- a/tests/SharpMUTerm.Tui.Tests/PackagesAppTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/PackagesAppTests.cs @@ -98,7 +98,7 @@ public async Task TheReviewSaysWhatTheArchiveAddsAndInstallsNothingUntilEnter() await Assert.That(rig.App.PackageView.Mode).IsEqualTo("review"); var text = string.Join("\n", rig.App.PackageView.Lines.Select(MarkupText.Plain)); - await Assert.That(text).Contains("1 of them sends commands as you"); + await Assert.That(text).Contains("1 rule sends commands as you"); await Assert.That(text).Contains("basics.lua"); await Assert.That(text).Contains("Corvid (Aetherfall)"); await Assert.That(rig.App.Packages.Installed).IsEmpty(); From 8f96ec205936f3b547a40fd8d8b87e583fc28474 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 09:10:46 +0000 Subject: [PATCH 033/113] Open telnet:// links, keep passwords in the OS store, title the window, expose output to screen readers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - telnet:// and telnets:// links connect through the same reader as /connect (ConnectEndpoint, TelnetLink), matched on the endpoint, never sending anything; credentials, paths, queries, control characters and bad ports are refused. --open-link drops every other argument. A second launch hands its link to the running client over a Unix domain socket (LinkHandoff). The .desktop file declares the schemes and the Inno Setup script registers them as an unchecked per-user task. - Character passwords go to Windows Credential Manager, the Secret Service (secret-tool) or the macOS Keychain (CredentialStores, in Hosting/), with secrets.json behind them (CredentialVault). Existing entries migrate at load; an unreachable store keeps every reference through a save. Only the live entry points make a vault. - The window and the terminal are titled Character@World — SharpMUTerm from the header's model (WindowTitle, ClientHost.Title: Window.Title, or OSC 2 with the title stack pushed and popped). - The window's output view has an automation peer: a read-only document holding the front window's newest lines (IAnnouncer.Reading, TerminalViewAutomationPeer). Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 11 + CLAUDE.md | 53 ++- docs/PACKAGING.md | 27 ++ packaging/linux/sharpmuterm.desktop | 6 +- packaging/windows/sharpmuterm.iss | 14 + .../AvaloniaConsoleDriver.cs | 27 ++ src/SharpMUTerm.Avalonia/ClientLaunch.cs | 9 +- src/SharpMUTerm.Avalonia/MainWindow.cs | 5 +- src/SharpMUTerm.Avalonia/Program.cs | 9 + src/SharpMUTerm.Avalonia/TerminalView.cs | 7 + .../TerminalViewAutomationPeer.cs | 65 ++++ src/SharpMUTerm.Avalonia/WindowAnnouncer.cs | 24 ++ src/SharpMUTerm.Avalonia/WindowHost.cs | 3 + src/SharpMUTerm.Client/Chrome/WindowTitle.cs | 62 ++++ .../Accessibility/IAnnouncer.cs | 14 + .../Configuration/ConfigurationStore.cs | 31 +- .../Configuration/ConnectEndpoint.cs | 73 ++++ .../Configuration/CredentialVault.cs | 210 +++++++++++ .../Configuration/ICredentialStore.cs | 40 ++ .../Configuration/SecretsStore.cs | 7 +- src/SharpMUTerm.Core/Links/TelnetLink.cs | 149 ++++++++ src/SharpMUTerm.Tui/ClientUsage.cs | 31 +- src/SharpMUTerm.Tui/Hosting/ClientHost.cs | 10 + .../Hosting/CredentialStores.cs | 347 ++++++++++++++++++ src/SharpMUTerm.Tui/Hosting/LinkHandoff.cs | 222 +++++++++++ src/SharpMUTerm.Tui/Hosting/TerminalTitle.cs | 54 +++ src/SharpMUTerm.Tui/Program.cs | 61 ++- .../SharpMUTermApp.Announce.cs | 44 ++- src/SharpMUTerm.Tui/SharpMUTermApp.Connect.cs | 155 ++++---- src/SharpMUTerm.Tui/SharpMUTermApp.Title.cs | 45 +++ src/SharpMUTerm.Tui/SharpMUTermApp.cs | 11 +- .../OutputAutomationTests.cs | 81 ++++ .../WindowTitleTests.cs | 45 +++ .../Configuration/CredentialVaultTests.cs | 275 ++++++++++++++ .../Links/TelnetLinkTests.cs | 122 ++++++ .../TelnetLinkClientTests.cs | 248 +++++++++++++ 36 files changed, 2499 insertions(+), 98 deletions(-) create mode 100644 src/SharpMUTerm.Avalonia/TerminalViewAutomationPeer.cs create mode 100644 src/SharpMUTerm.Client/Chrome/WindowTitle.cs create mode 100644 src/SharpMUTerm.Core/Configuration/ConnectEndpoint.cs create mode 100644 src/SharpMUTerm.Core/Configuration/CredentialVault.cs create mode 100644 src/SharpMUTerm.Core/Configuration/ICredentialStore.cs create mode 100644 src/SharpMUTerm.Core/Links/TelnetLink.cs create mode 100644 src/SharpMUTerm.Tui/Hosting/CredentialStores.cs create mode 100644 src/SharpMUTerm.Tui/Hosting/LinkHandoff.cs create mode 100644 src/SharpMUTerm.Tui/Hosting/TerminalTitle.cs create mode 100644 src/SharpMUTerm.Tui/SharpMUTermApp.Title.cs create mode 100644 tests/SharpMUTerm.Avalonia.Tests/OutputAutomationTests.cs create mode 100644 tests/SharpMUTerm.Client.Tests/WindowTitleTests.cs create mode 100644 tests/SharpMUTerm.Core.Tests/Configuration/CredentialVaultTests.cs create mode 100644 tests/SharpMUTerm.Core.Tests/Links/TelnetLinkTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/TelnetLinkClientTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 063f7b42..def4aefd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,17 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- `telnet://` and `telnets://` links open the client: it adds the world (or dials the one you already have for that + address) and connects, and never logs in or sends anything a link names. Links with a user name, a password or + anything after the address are refused, and say why. If SharpMUTerm is already running the link opens there. The + Windows installer has an option to register the links, and the Linux desktop file declares them. +- Character passwords are kept in the system's credential store — Windows Credential Manager, the Secret Service + keyring on Linux, the Keychain on macOS — when there is one, and moved there from `secrets.json` the first time. + Without one, `secrets.json` works as before. +- The window's title, and the terminal's, say who is in front: `Character@World — SharpMUTerm`. The terminal's own + title comes back when you quit. +- Desktop window: a screen reader that moves to the output finds a read-only document holding the newest lines of the + window in front, alongside the lines it already hears as they arrive. - Triggers, aliases, key bindings and timers (F2, F3, F4, F6) open in the desktop window's settings as a list beside the selected item's fields: tick a box to switch one on or off, add, copy, delete or move it up and down, and watch the trigger's live test mark the matching lines as you type its pattern. A package's sets are shown diff --git a/CLAUDE.md b/CLAUDE.md index 763a96aa..c5f0a65a 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -1268,7 +1268,7 @@ one `SharpMUTermApp`; a host is only the place it runs. What differs between hos (`src/SharpMUTerm.Tui/Hosting/`): driver, capabilities, clipboard, URL opener, focus reporting, keys (`HostKeys`: the newline chord, and the chords the host keeps for itself), whether there is a main loop, the Sixel cell size, and what it does with the pointer (`IPointerPresenter`, null for none), whether it draws the declared settings natively (`INativeSettings`, null for the cell screens), and whether it -draws ⌃P natively (`INativePalette`, null for the cell popup), whether it draws the composer with its own editor (`INativeComposer`, null for cells), and which chrome it draws itself beside the cells (`HostChrome`: the header and the rail, which the client then leaves out of the grid). Built by `ClientHost.Terminal`, `ClientHost.Headless`/`Snapshot` and +draws ⌃P natively (`INativePalette`, null for the cell popup), whether it draws the composer with its own editor (`INativeComposer`, null for cells), where the title for what is in front goes (`IWindowTitle`: the window's title bar, the terminal's OSC 2, null headless), and which chrome it draws itself beside the cells (`HostChrome`: the header and the rail, which the client then leaves out of the grid). Built by `ClientHost.Terminal`, `ClientHost.Headless`/`Snapshot` and `WindowHost.Create` (Avalonia). Four things keep a feature from landing in one host only: - **Every `ClientHost` and `HostKeys` member is `required`**, so a member added there does not compile until @@ -2615,8 +2615,55 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] framework is handed `TextReader.Null`, and the pump is started from the loop (`RunLive`'s `ready`), because a key raised before `Run()` has no listener and is lost. The window (`WindowAnnouncer`) uses two hidden live regions: output is polite and notices are assertive, posted to Avalonia's thread. This was built against the - API and has not been tried with NVDA or Orca. Not done: no speech engine of our own, and no per-line - automation peer on `TerminalView`. + API and has not been tried with NVDA or Orca. Not done: no speech engine of our own. + - **The window's output view has an automation peer** (`TerminalViewAutomationPeer`): a read-only `Document` named + `SharpMUTerm output: `, whose Value pattern holds the front window's newest 50 lines, oldest first. Fed by + `IAnnouncer.Reading` (a default-implemented member, so `--plain` ignores it), said on `Activate` and on every line + landing in the front window, quiet or not — read from `PaneLine.Plain`, so chrome rows are left out and it is the + text ⌃F searches. A change raises the Value property's change. Avalonia 12 has no text pattern (`ITextProvider`), + so this is a value, not a caret-navigable text range. Pinned through Avalonia's headless peers + (`OutputAutomationTests`); **not tried with NVDA, Narrator, VoiceOver or Orca.** +- **`telnet://` and `telnets://` links connect, and do nothing else** (`TelnetLink`, `ConnectEndpoint`, Core; + `SharpMUTermApp.OpenLink`; `LinkHandoff`, `ClientOptions.NarrowToLink`, Tui). A link is server text. Decisions not to + relitigate: + - **One reader with `/connect`** (`ConnectEndpoint.Parse`): a link reaches no host `/connect host port` would refuse. + Default ports are telnet's 23 and telnets' 992, not `/connect`'s 4000. Refused, not tidied: user information + (it would be a login the link chose), any path/query/fragment past a lone `/`, any control character, space, + non-ASCII, `%` or `\`, a port not 1–65535 in plain digits, an unbracketed IPv6 address, over 512 characters. + - **Matched on the endpoint, never a name.** A world already configured for the same host, port and TLS is dialled; + otherwise one is added with **no character**, so nothing logs in. An existing world logs in as its own + configuration says — that is the player's world, not the link's choice. + - **`--open-link ` drops every other argument** before anything reads them. Windows builds the handler's + command line by pasting the link into quotes, and a link holding a quote could add `--render-png` and write a file. + - **A second launch hands its link to the first** over a Unix domain socket (`$XDG_RUNTIME_DIR/sharpmuterm/links.sock`, + else beside `config.json`; `0600`), one line, acknowledged with `ok`, and exits. The receiver re-reads it through + `OpenLink(string)`. Nobody listening, or a stale socket: the launch runs its own client and listens. Only the live + entry point listens (`RunLive`); the window's `Program` and the terminal's hand off before building anything. + Verified between two `--plain` clients and two windows under Xvfb on Linux; Windows' AF_UNIX path is untried. + - **Registration is the package's, never the program's** — the `.desktop` file's `MimeType=` and an unchecked Inno + Setup task (`HKA\Software\Classes\telnet[s]`). See `docs/PACKAGING.md`. +- **Passwords go to the OS credential store, with `secrets.json` behind it** (`ICredentialStore`, `CredentialVault`, + Core; `CredentialStores` in `Hosting/`). The `passwordRef` GUID is unchanged and is the key in both places. + - **One vault per run, from the live entry points only** (`Program.LiveVault`, `ClientLaunch`): a snapshot, a test + and the demo window never make one, so no test reads or writes a real keychain — `CredentialVaultTests` uses a fake. + `ConfigurationStore.Load/Save` without a vault are `secrets.json` alone, exactly as before. + - **The vault remembers what the store holds**, so a save that changed nothing spawns no `secret-tool` (saves happen + on every committed edit). A store that does not answer (`CredentialLookup.Unavailable`: no Secret Service over ssh) + **keeps the reference through a save** — otherwise the first save of such a run would forget every password. + - Migration is at load: a `secrets.json` entry the store accepts is moved and the file rewritten without it; one it + refuses stays. A changed password the store refuses goes to the file under a **new** reference, because the store, + read first, would otherwise win with the old one. + - Windows: `CredWriteW/CredReadW/CredDeleteW`, generic credentials `SharpMUTerm/` (built, never run). Linux: + `secret-tool` with `application=sharpmuterm ref=`, password on stdin (exercised against gnome-keyring on a + private D-Bus). macOS: `security`, the write through `security -i` on stdin so the password is not on a command + line (built, never run). Each call is bounded at 30 s so an unanswered unlock prompt does not hold the start. +- **The title says who is in front** (`WindowTitle`, Client; `SharpMUTermApp.Title.cs`; `ClientHost.Title`). + `Character@World — SharpMUTerm`, worked out from the header's own `HeaderModel` whenever the header is built, so the + two cannot disagree (a command-line world that is not in the configuration names no world in either). Nothing is + written before `Run` (`StartTitle`). The terminal (`TerminalTitle`) pushes the title stack (`CSI 22;2t`), writes + OSC 2 through the `?1004` raw write, and pops it after the loop; the window sets `Window.Title`. Control + characters are stripped twice (names, then the sequence). Not a surface in `SurfaceCatalog`: nothing draws it in + cells and it hands nothing back. - **Discord presence is a host member and a per-world opt-in** (`ClientHost.Presence`, a lazy `Func?`; `GamePresence`/`DiscordIpc`, Core; F5 ▸ `discord`, off by default). The world asks for `External.Discord 1`. `WorldSession.GamePresence` folds `Info` (application id: digits only) and `Status` diff --git a/docs/PACKAGING.md b/docs/PACKAGING.md index 627c2166..6c0c77b5 100644 --- a/docs/PACKAGING.md +++ b/docs/PACKAGING.md @@ -56,6 +56,33 @@ dotnet publish src/SharpMUTerm.Avalonia -p:PublishProfile=linux-x64 -o out/linux Both use `packaging/icons/sharpmuterm.png` / `.ico`; the `.ico` is also each executable's Windows icon. +### `telnet://` links + +Both packages can make `telnet://` and `telnets://` links open the window. The program never registers itself; +the package does, and only where the player agreed to it: + +- **Linux** — `sharpmuterm.desktop` declares `MimeType=x-scheme-handler/telnet;x-scheme-handler/telnets;` and runs + `sharpmuterm-window --open-link %U`. It takes effect once the desktop integrates the AppImage (AppImageLauncher, + appimaged), or by hand: copy the desktop file to `~/.local/share/applications/`, point its `Exec=` at the AppImage, + and run `xdg-mime default sharpmuterm.desktop x-scheme-handler/telnet x-scheme-handler/telnets`. +- **Windows** — the installer's *Open telnet:// and telnets:// links in SharpMUTerm* task (unchecked by default) + writes `Software\Classes\telnet` and `…\telnets` under `HKA` (the current user in the default per-user install) + with `"…\sharpmuterm-window.exe" --open-link "%1"`. Uninstalling removes both keys. + +`--open-link` is why the handler can be trusted with a link: with it on the command line, the client reads the one +argument after it and drops every other (`ClientOptions.NarrowToLink`), so a link holding a quote cannot add +arguments of its own. The link itself is read as server text (`TelnetLink`): host, port and TLS only — no user +name or password, no path, no command. A running client is handed the link over a socket in +`$XDG_RUNTIME_DIR/sharpmuterm/` (or beside `config.json`), and the new launch exits. + +### Passwords + +Character passwords go to the system's credential store when there is one that answers: Windows Credential Manager +(built in), the Secret Service through libsecret's `secret-tool` on Linux (`libsecret-tools` on Debian and Ubuntu, +`libsecret` on Fedora and Arch — recommend it, do not require it), and the login Keychain through `security` on +macOS. Without one, or for a password it refuses, they stay in `secrets.json` beside `config.json`, as before. +Existing `secrets.json` entries move into the store the first time the client starts with one. + ## CI / releases `.github/workflows/release.yml` runs on `v*` tags (and manual dispatch). For `linux-x64` and `win-x64` it diff --git a/packaging/linux/sharpmuterm.desktop b/packaging/linux/sharpmuterm.desktop index 3893a62e..5aa262f7 100644 --- a/packaging/linux/sharpmuterm.desktop +++ b/packaging/linux/sharpmuterm.desktop @@ -3,9 +3,13 @@ Type=Application Name=SharpMUTerm GenericName=MU* Client Comment=A MUSH, MUCK and MUD client -Exec=sharpmuterm-window %U +Exec=sharpmuterm-window --open-link %U Icon=sharpmuterm Terminal=false Categories=Game;RolePlaying; Keywords=MUD;MUSH;MUCK;MU*;telnet; StartupWMClass=sharpmuterm-window +# telnet:// and telnets:// links open the client. Registered only when the desktop integrates the AppImage +# (AppImageLauncher, appimaged, or `xdg-mime default sharpmuterm.desktop x-scheme-handler/telnet`); the program never +# registers itself. +MimeType=x-scheme-handler/telnet;x-scheme-handler/telnets; diff --git a/packaging/windows/sharpmuterm.iss b/packaging/windows/sharpmuterm.iss index a29c3d75..a97a52c3 100644 --- a/packaging/windows/sharpmuterm.iss +++ b/packaging/windows/sharpmuterm.iss @@ -45,6 +45,7 @@ WizardStyle=modern [Tasks] Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked Name: "addtopath"; Description: "Add the install folder to PATH, so sharpmuterm runs from any terminal"; GroupDescription: "Terminal:" +Name: "telnetlinks"; Description: "Open telnet:// and telnets:// links in SharpMUTerm"; GroupDescription: "Links:"; Flags: unchecked [Files] Source: "{#PublishDir}\sharpmuterm-window.exe"; DestDir: "{app}"; Flags: ignoreversion @@ -55,6 +56,19 @@ Source: "..\..\LICENSE"; DestDir: "{app}"; DestName: "LICENSE.txt"; Flags: ignor Name: "{autoprograms}\SharpMUTerm"; Filename: "{app}\sharpmuterm-window.exe" Name: "{autodesktop}\SharpMUTerm"; Filename: "{app}\sharpmuterm-window.exe"; Tasks: desktopicon +; telnet:// and telnets:// links, for this user (HKA is HKCU in the default per-user install). Only with the task above; +; the program never registers itself. --open-link makes the client read the link and nothing else, so a link holding a +; quote cannot add arguments of its own to the command line Windows builds from this template. +[Registry] +Root: HKA; Subkey: "Software\Classes\telnet"; ValueType: string; ValueName: ""; ValueData: "URL:Telnet Protocol"; Flags: uninsdeletekey; Tasks: telnetlinks +Root: HKA; Subkey: "Software\Classes\telnet"; ValueType: string; ValueName: "URL Protocol"; ValueData: ""; Tasks: telnetlinks +Root: HKA; Subkey: "Software\Classes\telnet\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: """{app}\sharpmuterm-window.exe"",0"; Tasks: telnetlinks +Root: HKA; Subkey: "Software\Classes\telnet\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\sharpmuterm-window.exe"" --open-link ""%1"""; Tasks: telnetlinks +Root: HKA; Subkey: "Software\Classes\telnets"; ValueType: string; ValueName: ""; ValueData: "URL:Telnet over TLS Protocol"; Flags: uninsdeletekey; Tasks: telnetlinks +Root: HKA; Subkey: "Software\Classes\telnets"; ValueType: string; ValueName: "URL Protocol"; ValueData: ""; Tasks: telnetlinks +Root: HKA; Subkey: "Software\Classes\telnets\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: """{app}\sharpmuterm-window.exe"",0"; Tasks: telnetlinks +Root: HKA; Subkey: "Software\Classes\telnets\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\sharpmuterm-window.exe"" --open-link ""%1"""; Tasks: telnetlinks + [Run] Filename: "{app}\sharpmuterm-window.exe"; Description: "{cm:LaunchProgram,SharpMUTerm}"; Flags: nowait postinstall skipifsilent diff --git a/src/SharpMUTerm.Avalonia/AvaloniaConsoleDriver.cs b/src/SharpMUTerm.Avalonia/AvaloniaConsoleDriver.cs index e67b927d..9bdc13cd 100644 --- a/src/SharpMUTerm.Avalonia/AvaloniaConsoleDriver.cs +++ b/src/SharpMUTerm.Avalonia/AvaloniaConsoleDriver.cs @@ -79,6 +79,9 @@ public AvaloniaConsoleDriver(int columns, int rows) /// The window's native F1, drawn over the cells in the main window (). public ComposerPresenter Composer { get; } = new(); + /// The window's title for what is in front, which the main window shows (). + public WindowTitleBar TitleBar { get; } = new(); + public bool IsRunning { get; private set; } // ── IConsoleDriver: output ──────────────────────────────────────────────────────────────── @@ -165,3 +168,27 @@ public void Resize(int columns, int rows) public void Dispose() => Pictures.Dispose(); } + +/// +/// The window's half of : the client hands it Character@World — SharpMUTerm on its own +/// thread, and the main window, which subscribes, puts it on the title bar and the taskbar entry on Avalonia's. +/// +internal sealed class WindowTitleBar : IWindowTitle +{ + /// The last title, or null before the client has said one. + public string? Current { get; private set; } + + /// Raised on the client's thread with each new title. + public event Action? Changed; + + public void Show(string title) + { + Current = title; + Changed?.Invoke(title); + } + + /// A window's title goes with the window; there is nothing to give back. + public void Restore() + { + } +} diff --git a/src/SharpMUTerm.Avalonia/ClientLaunch.cs b/src/SharpMUTerm.Avalonia/ClientLaunch.cs index edfed745..e1047361 100644 --- a/src/SharpMUTerm.Avalonia/ClientLaunch.cs +++ b/src/SharpMUTerm.Avalonia/ClientLaunch.cs @@ -15,6 +15,10 @@ namespace SharpMUTerm.Avalonia; /// internal static class ClientLaunch { + // The live client's passwords: the OS credential store first, secrets.json behind it. Made by the live load and + // handed to the live run, whose saves need what the load learned; the demo has none and touches neither. + private static CredentialVault? _vault; + public static AppConfiguration LoadConfiguration(WindowOptions options, List notices) { if (options.Demo) @@ -26,7 +30,8 @@ public static AppConfiguration LoadConfiguration(WindowOptions options, ListRuns the client on until it quits; blocks the calling thread. @@ -38,7 +43,7 @@ public static int Run(WindowOptions options, AppConfiguration config, IReadOnlyL return app.Run([]); } - return Tui.Program.RunLive(options.ClientArgs, config, notices, WindowHost.Create(driver, clipboard, options.Chrome)); + return Tui.Program.RunLive(options.ClientArgs, config, notices, WindowHost.Create(driver, clipboard, options.Chrome), vault: _vault); } /// The demo client, with its --view scene laid out and not yet running. diff --git a/src/SharpMUTerm.Avalonia/MainWindow.cs b/src/SharpMUTerm.Avalonia/MainWindow.cs index 1822306e..83d67c16 100644 --- a/src/SharpMUTerm.Avalonia/MainWindow.cs +++ b/src/SharpMUTerm.Avalonia/MainWindow.cs @@ -39,7 +39,10 @@ public MainWindow(WindowOptions options, IClassicDesktopStyleApplicationLifetime _driver = new AvaloniaConsoleDriver(options.Columns, options.Rows); _view = new TerminalView(_driver, foreground, background, options.FontPoints * 96f / 72f, options.FontFamily); - Title = "SharpMUTerm"; + Title = SharpMUTerm.Client.Chrome.WindowTitle.Product; + + // Character@World — SharpMUTerm for what is in front, from the client's own header (WindowTitle). + _driver.TitleBar.Changed += title => Dispatcher.UIThread.Post(() => Title = title); _driver.Settings.Owner = this; // The window's own pop-ups (tooltips, the right-click menu) follow the client's theme: a light menu diff --git a/src/SharpMUTerm.Avalonia/Program.cs b/src/SharpMUTerm.Avalonia/Program.cs index 751ffb87..057231a3 100644 --- a/src/SharpMUTerm.Avalonia/Program.cs +++ b/src/SharpMUTerm.Avalonia/Program.cs @@ -8,6 +8,8 @@ internal static class Program [STAThread] private static int Main(string[] args) { + // A desktop link handler's launch: the link and nothing else (ClientOptions.NarrowToLink says why). + args = Tui.ClientOptions.NarrowToLink(args); // A window has no stdin to read, and the framework reads a redirected one as piped input, behind a modal // "Reading input" dialog that stays up for as long as the pipe is open. Launched from anything that // leaves stdin a pipe, the client would open on that dialog. The terminal snapshot does the same. @@ -26,6 +28,13 @@ private static int Main(string[] args) return RenderPng.Run(options); } + // A telnet:// link (the desktop runs `sharpmuterm-window %U` when one is clicked) goes to the client already + // running, when there is one, before any window of this launch is shown. Otherwise this launch follows it. + if (!options.Demo && Tui.Program.LinkArgument(options.ClientArgs) is { } link && Tui.LinkHandoff.TrySend(link)) + { + return 0; + } + App.Options = options; return BuildAvaloniaApp().StartWithClassicDesktopLifetime(options.ClientArgs); } diff --git a/src/SharpMUTerm.Avalonia/TerminalView.cs b/src/SharpMUTerm.Avalonia/TerminalView.cs index 49c139b7..b71ad19c 100644 --- a/src/SharpMUTerm.Avalonia/TerminalView.cs +++ b/src/SharpMUTerm.Avalonia/TerminalView.cs @@ -93,6 +93,13 @@ public TerminalView(AvaloniaConsoleDriver driver, SKColor foreground, SKColor ba pointer.MenuRequested += (_, items) => Dispatcher.UIThread.Post(() => OpenMenu(items)); } + /// + /// A screen reader finds the window in front's newest lines here, as a read-only document + /// (), rather than an unnamed picture of cells. + /// + protected override global::Avalonia.Automation.Peers.AutomationPeer OnCreateAutomationPeer() => + new TerminalViewAutomationPeer(this, _driver.Announcer); + /// The cell size in logical units, for placing a native view over cells (). internal Size CellExtent => CellSize; diff --git a/src/SharpMUTerm.Avalonia/TerminalViewAutomationPeer.cs b/src/SharpMUTerm.Avalonia/TerminalViewAutomationPeer.cs new file mode 100644 index 00000000..7e79ba31 --- /dev/null +++ b/src/SharpMUTerm.Avalonia/TerminalViewAutomationPeer.cs @@ -0,0 +1,65 @@ +using Avalonia.Automation; +using Avalonia.Automation.Peers; +using Avalonia.Automation.Provider; +using Avalonia.Threading; + +namespace SharpMUTerm.Avalonia; + +/// +/// What a screen reader finds when it reaches the cells: a read-only document named after the window in front, whose +/// value is that window's newest lines as plain text, oldest first (). The cells +/// themselves are a picture to the platform's accessibility API — a paints with Skia and +/// has no text elements — so without this a reader moving to the output found an unnamed graphic. +/// +/// It sits beside the two live regions, not in place of them: those speak each line as it arrives, this is the text a +/// reader can go back over at its own pace (UI Automation's Value pattern on Windows, AT-SPI's text on Linux). A change +/// to it raises the Value property's change, posted to Avalonia's thread, so a reader watching the view hears that it +/// changed without being read every line twice. +/// +/// +internal sealed class TerminalViewAutomationPeer : ControlAutomationPeer, IValueProvider +{ + private readonly WindowAnnouncer _announcer; + private string _value; + + public TerminalViewAutomationPeer(TerminalView owner, WindowAnnouncer announcer) + : base(owner) + { + _announcer = announcer; + _value = Text(announcer.Front); + announcer.ReadingChanged += () => Dispatcher.UIThread.Post(Refresh); + } + + /// The name a reader announces for the view: the window in front, after the product. + internal static string NameFor(string? window) => + string.IsNullOrEmpty(window) ? "SharpMUTerm output" : $"SharpMUTerm output: {window}"; + + public bool IsReadOnly => true; + + public string? Value => _value; + + /// The output is the game's; a reader may read it, never write it. + public void SetValue(string? value) => throw new InvalidOperationException("The output is read-only."); + + protected override AutomationControlType GetAutomationControlTypeCore() => AutomationControlType.Document; + + protected override string GetClassNameCore() => "SharpMUTermOutput"; + + protected override string? GetNameCore() => NameFor(_announcer.Front.Window); + + protected override bool IsContentElementCore() => true; + + protected override bool IsControlElementCore() => true; + + private void Refresh() + { + var old = _value; + _value = Text(_announcer.Front); + if (old != _value) + { + RaisePropertyChangedEvent(ValuePatternIdentifiers.ValueProperty, old, _value); + } + } + + private static string Text((string? Window, IReadOnlyList Lines) front) => string.Join('\n', front.Lines); +} diff --git a/src/SharpMUTerm.Avalonia/WindowAnnouncer.cs b/src/SharpMUTerm.Avalonia/WindowAnnouncer.cs index 1cb84ccf..206e4585 100644 --- a/src/SharpMUTerm.Avalonia/WindowAnnouncer.cs +++ b/src/SharpMUTerm.Avalonia/WindowAnnouncer.cs @@ -18,6 +18,30 @@ internal sealed class WindowAnnouncer : IAnnouncer { private TextBlock? _output; private TextBlock? _notices; + private Tuple> _front = Tuple.Create>(null, []); + + /// + /// The window in front and its newest lines, as the client last said them (): the + /// text the output view's automation peer exposes (). Safe from any thread: + /// the pair is swapped whole. + /// + public (string? Window, IReadOnlyList Lines) Front + { + get + { + var front = Volatile.Read(ref _front); + return (front.Item1, front.Item2); + } + } + + /// Raised on the client's thread when changes. + public event Action? ReadingChanged; + + public void Reading(string window, IReadOnlyList lines) + { + Volatile.Write(ref _front, Tuple.Create>(window, lines.ToArray())); + ReadingChanged?.Invoke(); + } /// The two regions, built once for the window that shows them. public IReadOnlyList Regions() diff --git a/src/SharpMUTerm.Avalonia/WindowHost.cs b/src/SharpMUTerm.Avalonia/WindowHost.cs index 5d379300..5310bf71 100644 --- a/src/SharpMUTerm.Avalonia/WindowHost.cs +++ b/src/SharpMUTerm.Avalonia/WindowHost.cs @@ -78,5 +78,8 @@ internal static class WindowHost // F1 and the docked composer are a native editor: a proportional or monospace face, IME, native selection and // a real underline under a misspelling. The draft, the send and the keys stay the client's. NativeComposer = driver.Composer, + + // The title bar and the taskbar entry say who is in front: Character@World — SharpMUTerm. + Title = driver.TitleBar, }; } diff --git a/src/SharpMUTerm.Client/Chrome/WindowTitle.cs b/src/SharpMUTerm.Client/Chrome/WindowTitle.cs new file mode 100644 index 00000000..9826bab9 --- /dev/null +++ b/src/SharpMUTerm.Client/Chrome/WindowTitle.cs @@ -0,0 +1,62 @@ +using System.Text; + +namespace SharpMUTerm.Client.Chrome; + +/// +/// The title the window — the desktop window's title bar and taskbar entry, or the terminal's tab — wears for what is +/// in front: Character@World — SharpMUTerm. One function, read off the same the +/// header band is drawn from, so the title and the header cannot name different characters. +/// +/// The names are the player's configuration, but a world a telnet:// link added is named after the link's host, +/// so they are cleaned like any outside text: control characters are dropped (a title is written into an escape +/// sequence in a terminal, where a BEL or ESC would end it early) and each part is bounded. +/// +/// +public static class WindowTitle +{ + /// The product name every title ends with, and the whole title when nothing is in front. + public const string Product = "SharpMUTerm"; + + /// The longest a character or world name runs in a title before it is cut with an ellipsis. + public const int MaxPart = 48; + + /// The title for what the header says is in front. + public static string For(HeaderModel header) => For(header.Character?.Name, header.World?.Name); + + /// + /// Character@World — SharpMUTerm; World — SharpMUTerm for a world with no character in front; and + /// SharpMUTerm alone when nothing is. + /// + public static string For(string? character, string? world) + { + var who = Clean(character); + var where = Clean(world); + return (who, where) switch + { + ({ Length: > 0 }, { Length: > 0 }) => $"{who}@{where} — {Product}", + ({ Length: > 0 }, _) => $"{who} — {Product}", + (_, { Length: > 0 }) => $"{where} — {Product}", + _ => Product, + }; + } + + private static string Clean(string? text) + { + if (string.IsNullOrWhiteSpace(text)) + { + return string.Empty; + } + + var clean = new StringBuilder(Math.Min(text.Length, MaxPart + 1)); + foreach (var c in text) + { + if (!char.IsControl(c) && char.GetUnicodeCategory(c) is not (System.Globalization.UnicodeCategory.LineSeparator or System.Globalization.UnicodeCategory.ParagraphSeparator)) + { + clean.Append(c); + } + } + + var result = clean.ToString().Trim(); + return result.Length > MaxPart ? result[..(MaxPart - 1)] + "…" : result; + } +} diff --git a/src/SharpMUTerm.Core/Accessibility/IAnnouncer.cs b/src/SharpMUTerm.Core/Accessibility/IAnnouncer.cs index 8240e067..beef9807 100644 --- a/src/SharpMUTerm.Core/Accessibility/IAnnouncer.cs +++ b/src/SharpMUTerm.Core/Accessibility/IAnnouncer.cs @@ -20,4 +20,18 @@ public enum AnnouncementKind public interface IAnnouncer { void Announce(string text, AnnouncementKind kind); + + /// + /// The window in front and its most recent lines, oldest first, as plain text: what a screen reader finds when it + /// asks the output view for its text, rather than what it is told as lines arrive. Said when the window in front + /// changes and when a line lands in it. A host with nothing to expose ignores it (the default). + /// + /// The window's title. + /// Its newest lines, at most ; chrome rows (bars) left out. + void Reading(string window, IReadOnlyList lines) + { + } + + /// How many of the front window's lines carries. + public const int ReadingLines = 50; } diff --git a/src/SharpMUTerm.Core/Configuration/ConfigurationStore.cs b/src/SharpMUTerm.Core/Configuration/ConfigurationStore.cs index 2768b50f..994a5c13 100644 --- a/src/SharpMUTerm.Core/Configuration/ConfigurationStore.cs +++ b/src/SharpMUTerm.Core/Configuration/ConfigurationStore.cs @@ -73,7 +73,13 @@ public static string DefaultPath /// permission problem on every settings edit would be trained away in a day. /// /// - public static AppConfiguration Load(string path, Action? report = null) + /// The configuration file. + /// Called with anything worth one line in the diagnostics log. + /// + /// Where the passwords are: the OS credential store first and then the file (), or + /// null for the file alone. The same vault is handed to every save after this load. + /// + public static AppConfiguration Load(string path, Action? report = null, CredentialVault? vault = null) { ArgumentException.ThrowIfNullOrEmpty(path); if (!File.Exists(path)) @@ -82,7 +88,21 @@ public static AppConfiguration Load(string path, Action? report = null) } var configuration = Deserialize(File.ReadAllText(path)); - ApplySecrets(configuration, SecretsStore.Read(SecretsStore.PathFor(path)), report); + var secretsPath = SecretsStore.PathFor(path); + var read = SecretsStore.Read(secretsPath); + if (vault is null) + { + ApplySecrets(configuration, read, report); + } + else + { + vault.Load(configuration, read, secretsPath, report); + if (read.Problem is { } problem) + { + report?.Invoke(problem); + } + } + return configuration; } @@ -142,14 +162,17 @@ public static string Serialize(AppConfiguration configuration) /// transaction; this is the ordering whose partial state costs less. /// /// - public static void Save(string path, AppConfiguration configuration) + /// The configuration file. + /// What to write. + /// The vault the configuration was loaded through, or null for the file alone. + public static void Save(string path, AppConfiguration configuration, CredentialVault? vault = null) { ArgumentException.ThrowIfNullOrEmpty(path); ArgumentNullException.ThrowIfNull(configuration); var full = Path.GetFullPath(path); Directory.CreateDirectory(Path.GetDirectoryName(full)!); - var secrets = ReconcileSecrets(configuration); + var secrets = vault is null ? ReconcileSecrets(configuration) : vault.Reconcile(configuration); SecretsStore.Write(SecretsStore.PathFor(full), secrets); File.WriteAllText(full, Serialize(configuration)); } diff --git a/src/SharpMUTerm.Core/Configuration/ConnectEndpoint.cs b/src/SharpMUTerm.Core/Configuration/ConnectEndpoint.cs new file mode 100644 index 00000000..bec75abc --- /dev/null +++ b/src/SharpMUTerm.Core/Configuration/ConnectEndpoint.cs @@ -0,0 +1,73 @@ +using System.Globalization; + +namespace SharpMUTerm.Core.Configuration; + +/// +/// Reads a host and port the way /connect takes them: host port, host:port, or a bare host. A +/// bracketed IPv6 address keeps its colons. One reader for every way in — the command line's /connect, the +/// welcome's form and a telnet:// link () — so none of them can reach a host the +/// others would refuse. +/// +public static class ConnectEndpoint +{ + /// The port a host given without one is dialled on, the same default as the command line's. + public const int DefaultPort = 4000; + + /// + /// The host and port in , or null when they are not one host with at most one port, so a + /// mistyped world name is refused rather than saved as a world that dials a host called "my world". + /// + /// One or two words. + /// The port when the words name none. + public static (string Host, int Port)? Parse(IReadOnlyList words, int defaultPort = DefaultPort) + { + if (words.Count is 0 or > 2) + { + return null; + } + + var host = words[0]; + var port = defaultPort; + + // An opening bracket is an IPv6 address, and is closed at the end or just before a port. + if (host.StartsWith('[') && host.IndexOf(']') is var end + && (end < 0 || host.IndexOf(']', end + 1) >= 0 || (end + 1 < host.Length && host[end + 1] != ':'))) + { + return null; + } + + if (words.Count == 2) + { + if (!TryPort(words[1], out port)) + { + return null; + } + } + else if (host.StartsWith('[') && host.IndexOf("]:", StringComparison.Ordinal) is var close and > 0) + { + if (!TryPort(host[(close + 2)..], out port)) + { + return null; + } + + host = host[..(close + 1)]; + } + else if (host.Count(c => c == ':') == 1) + { + var colon = host.IndexOf(':'); + if (!TryPort(host[(colon + 1)..], out port)) + { + return null; + } + + host = host[..colon]; + } + + host = host.Trim('[', ']'); + return host.Length == 0 || Uri.CheckHostName(host) == UriHostNameType.Unknown ? null : (host, port); + } + + /// A port: digits only (no sign, no spaces), 1 to 65535. + public static bool TryPort(string text, out int port) => + int.TryParse(text, NumberStyles.None, CultureInfo.InvariantCulture, out port) && port is > 0 and <= 65535; +} diff --git a/src/SharpMUTerm.Core/Configuration/CredentialVault.cs b/src/SharpMUTerm.Core/Configuration/CredentialVault.cs new file mode 100644 index 00000000..ee8f5234 --- /dev/null +++ b/src/SharpMUTerm.Core/Configuration/CredentialVault.cs @@ -0,0 +1,210 @@ +namespace SharpMUTerm.Core.Configuration; + +/// +/// Where character passwords are kept: the OS credential store when the machine has one that answers, and +/// secrets.json () for any password the store would not take. The configuration still +/// carries only , the same GUID in both places, so a password moves +/// between them without config.json changing. +/// +/// One vault per run, handed to +/// and every after it, because it +/// remembers what the run has learned: which references the store holds and with what (so a save that changed nothing +/// writes nothing to the store — saves happen on every committed settings edit, and a store write can be a process), +/// and which references the store could not be asked about. +/// +/// +/// A password the store could not be asked about is not a password the player removed. A Linux session with no +/// Secret Service running (over ssh, say) loads every stored character with no password. The reference is kept, and a +/// save keeps it, so the next run with a store reads the password again. Without that, the first save of such a run +/// would forget every reference and with it every password. +/// +/// +/// Moving in. A password found in secrets.json while the store answers is written to the store at load, +/// and the file is rewritten without it once the store has it. A password the store refuses stays in the file. +/// +/// +/// A vault with no store is secrets.json alone, exactly the behaviour from before there was a store; that is +/// what a test, a snapshot and a machine with no store use. +/// +/// +public sealed class CredentialVault +{ + private readonly object _gate = new(); + private readonly Dictionary _inStore = []; + private readonly HashSet _unresolved = []; + + /// The machine's store, or null for secrets.json alone. + public CredentialVault(ICredentialStore? store) => Store = store; + + /// The OS store, or null. + public ICredentialStore? Store { get; } + + /// The references whose password is in the store, for the tests. + internal IReadOnlyCollection InStore + { + get + { + lock (_gate) + { + return [.. _inStore.Keys]; + } + } + } + + /// + /// Fills in each character's password: from the store first, then from the file. Moves what the file holds into + /// the store when the store takes it, and rewrites the file without it. + /// + internal void Load(AppConfiguration configuration, SecretsStore.ReadResult file, string secretsPath, Action? report) + { + lock (_gate) + { + var migrated = new HashSet(); + var unreachable = 0; + foreach (var character in configuration.Worlds.SelectMany(w => w.Characters)) + { + character.Password = null; + if (character.PasswordRef is not { } id) + { + continue; + } + + var lookup = CredentialLookup.Missing; + if (Store is not null) + { + lookup = Store.TryRead(id, out var stored); + if (lookup == CredentialLookup.Found && !string.IsNullOrEmpty(stored)) + { + character.Password = stored; + _inStore[id] = stored; + continue; + } + } + + if (file.Secrets.TryGetValue(id, out var password)) + { + character.Password = password; + if (Store is not null && lookup == CredentialLookup.Missing && file.Readable && Store.Write(id, password)) + { + _inStore[id] = password; + migrated.Add(id); + } + + continue; + } + + if (lookup == CredentialLookup.Unavailable) + { + _unresolved.Add(id); + unreachable++; + } + } + + if (migrated.Count > 0) + { + var kept = file.Secrets.Where(entry => !migrated.Contains(entry.Key)).ToDictionary(e => e.Key, e => e.Value); + try + { + SecretsStore.Write(secretsPath, kept); + } + catch (Exception e) when (e is IOException or UnauthorizedAccessException) + { + // Both places hold the password now; the store is read first, and the next save prunes the file. + } + + report?.Invoke($"moved {migrated.Count} password{(migrated.Count == 1 ? "" : "s")} from {SecretsStore.FileName} into {Store!.Name}"); + } + + if (unreachable > 0) + { + report?.Invoke( + $"{Store!.Name} could not be reached, so {unreachable} character{(unreachable == 1 ? " starts" : "s start")} " + + "with no password this run; they are kept and read again next time"); + } + } + } + + /// + /// Brings every reference into line with the password its character holds, writes to the store what changed, and + /// hands back what secrets.json must hold: the passwords the store did not take. + /// + /// It mutates the configuration it is given, as the save always has: the GUID has to outlive the call, or + /// every save would mint a new one and orphan the last. + /// + /// + internal Dictionary Reconcile(AppConfiguration configuration) + { + lock (_gate) + { + var file = new Dictionary(); + var referenced = new HashSet(); + foreach (var character in configuration.Worlds.SelectMany(w => w.Characters)) + { + if (string.IsNullOrEmpty(character.Password)) + { + // A password the store could not be asked about this run is kept, reference and all. + if (character.PasswordRef is { } kept && _unresolved.Contains(kept) && referenced.Add(kept)) + { + continue; + } + + // No password, no reference. A GUID pointing at nothing would say "this character has a stored + // password" to anyone reading the config, and it would keep a row alive. + character.PasswordRef = null; + continue; + } + + // Two characters on one row — a hand-edited config, or one copied between machines — would mean + // editing one password silently changed the other. Give this one a row of its own. + var id = character.PasswordRef ?? Guid.NewGuid(); + if (!referenced.Add(id)) + { + id = Guid.NewGuid(); + referenced.Add(id); + } + + _unresolved.Remove(id); + if (Store is not null) + { + if (_inStore.TryGetValue(id, out var known) && known == character.Password) + { + character.PasswordRef = id; + continue; + } + + if (Store.Write(id, character.Password)) + { + _inStore[id] = character.Password; + character.PasswordRef = id; + continue; + } + + // The store holds an older password under this reference and refused the new one. Read first, it + // would win over the file, so the new password goes to the file under a reference of its own. + if (_inStore.Remove(id)) + { + Store.Delete(id); + referenced.Remove(id); + id = Guid.NewGuid(); + referenced.Add(id); + } + } + + file[id] = character.Password; + character.PasswordRef = id; + } + + // What the store holds for a character that is gone, or whose password moved to the file, goes too. + foreach (var stale in _inStore.Keys.Where(id => !referenced.Contains(id) || file.ContainsKey(id)).ToList()) + { + if (Store?.Delete(stale) ?? true) + { + _inStore.Remove(stale); + } + } + + _unresolved.IntersectWith(referenced); + return file; + } + } +} diff --git a/src/SharpMUTerm.Core/Configuration/ICredentialStore.cs b/src/SharpMUTerm.Core/Configuration/ICredentialStore.cs new file mode 100644 index 00000000..30d1069c --- /dev/null +++ b/src/SharpMUTerm.Core/Configuration/ICredentialStore.cs @@ -0,0 +1,40 @@ +namespace SharpMUTerm.Core.Configuration; + +/// What a read from an OS credential store found. +public enum CredentialLookup +{ + /// The store has a password under that reference. + Found, + + /// The store answered, and has nothing under that reference. + Missing, + + /// The store could not be asked: no service, locked and not unlocked, timed out, or failed. + Unavailable, +} + +/// +/// An operating system's credential store — Windows Credential Manager, the Secret Service (libsecret) on Linux, the +/// macOS Keychain — keyed by a character's . The implementations are the +/// hosts' (SharpMUTerm.Tui/Hosting), because which store a machine has is a host fact; this side only says what +/// the configuration needs from one, so the reconciling in can be tested against a fake. +/// +/// Every member must answer rather than throw, and must not block for long: a store that cannot be reached is +/// and a write that fails is false, and the caller falls back to +/// secrets.json () for that password. +/// +/// +public interface ICredentialStore +{ + /// What the store is called, for a message: Windows Credential Manager. + string Name { get; } + + /// Reads the password stored under . + CredentialLookup TryRead(Guid id, out string? password); + + /// Stores under , replacing any. False when it was not stored. + bool Write(Guid id, string password); + + /// Removes what is stored under . True when nothing is left there, removed or never present. + bool Delete(Guid id); +} diff --git a/src/SharpMUTerm.Core/Configuration/SecretsStore.cs b/src/SharpMUTerm.Core/Configuration/SecretsStore.cs index ed758395..a53c942e 100644 --- a/src/SharpMUTerm.Core/Configuration/SecretsStore.cs +++ b/src/SharpMUTerm.Core/Configuration/SecretsStore.cs @@ -22,9 +22,10 @@ namespace SharpMUTerm.Core.Configuration; /// read them. What the split buys is that accidental disclosure and deliberate sharing stop being the same /// action — which is the failure that actually happens to people. What the file mode buys is that "anyone /// who can read the file" is one account. Reversible obfuscation would buy neither and would cost a -/// permanent migration burden plus a field that looks protected and is not. An OS credential store -/// (DPAPI/Keychain/libsecret) is the thing that would make these secrets at rest; it remains a legitimate -/// future option and nothing here claims it exists. +/// permanent migration burden plus a field that looks protected and is not. An OS credential store is the +/// thing that makes these secrets at rest, and the live client uses one where the machine has it +/// (); this file is what holds a password when there is none, or when the store +/// refuses it. /// /// /// Everything degrades to "no password". A missing file, an unparseable one, a key that is not a diff --git a/src/SharpMUTerm.Core/Links/TelnetLink.cs b/src/SharpMUTerm.Core/Links/TelnetLink.cs new file mode 100644 index 00000000..88ff20fa --- /dev/null +++ b/src/SharpMUTerm.Core/Links/TelnetLink.cs @@ -0,0 +1,149 @@ +using SharpMUTerm.Core.Configuration; + +namespace SharpMUTerm.Core.Links; + +/// +/// A telnet:// or telnets:// link, read into the one thing it may ask for: a connection to a host and +/// port, over TLS for telnets. +/// +/// A link is server text. It arrives from a web page, a chat message, another program: anybody can write one, +/// and the desktop hands it to this client when it is clicked. So it is read strictly and can do exactly what +/// /connect host port can (the host and port go through , the same reader) +/// and nothing more. It never names a world, a character or a command, and it never sends anything: a world it adds +/// has no character, so nothing logs in. +/// +/// Refused rather than tidied, each for a reason: +/// +/// User information (telnet://user:password@host). RFC 4248 allows it; this client would have to +/// send it as a login, which is a command the link would be choosing. +/// A path, query or fragment beyond a lone /. A telnet URL has nothing to say there, and text that +/// means nothing to a reader is somewhere for a payload to ride. +/// Any control character, space, non-ASCII character or percent-escape, anywhere. A CR or LF in a host +/// would be a second line on any wire it reached, and an escape is a second reading of the same bytes. +/// A port that is not 1–65535 in plain digits, and an unbracketed IPv6 address (its colons would be read +/// as a port). +/// +/// +/// The host, without brackets. +/// The port. +/// Whether the link was telnets://. +public sealed record TelnetLink(string Host, int Port, bool Tls) +{ + /// The plain scheme. + public const string Scheme = "telnet"; + + /// The TLS scheme. + public const string SecureScheme = "telnets"; + + /// Telnet's registered port, for a telnet:// link that names none. + public const int DefaultPort = 23; + + /// Telnet-over-TLS's registered port, for a telnets:// link that names none. + public const int DefaultSecurePort = 992; + + /// The longest link read at all; anything longer is refused before it is looked at. + public const int MaxLength = 512; + + /// Whether is meant as a link: it starts with one of the two schemes. + public static bool LooksLikeLink(string? text) => + text is not null + && (text.StartsWith(Scheme + "://", StringComparison.OrdinalIgnoreCase) + || text.StartsWith(SecureScheme + "://", StringComparison.OrdinalIgnoreCase)); + + /// Reads , or says in a few words why it was refused. + public static TelnetLink? TryParse(string? text, out string? refusal) + { + refusal = Refuse(text, out var link); + return link; + } + + /// Reads , or null when it is not a link this client will follow. + public static TelnetLink? TryParse(string? text) => TryParse(text, out _); + + private static string? Refuse(string? text, out TelnetLink? link) + { + link = null; + if (string.IsNullOrEmpty(text)) + { + return "the link is empty"; + } + + if (text.Length > MaxLength) + { + return "the link is too long"; + } + + foreach (var c in text) + { + if (c <= ' ' || c > '~') + { + return "the link holds a space, a line break or another character a link cannot hold"; + } + } + + bool tls; + string rest; + if (text.StartsWith(SecureScheme + "://", StringComparison.OrdinalIgnoreCase)) + { + tls = true; + rest = text[(SecureScheme.Length + 3)..]; + } + else if (text.StartsWith(Scheme + "://", StringComparison.OrdinalIgnoreCase)) + { + tls = false; + rest = text[(Scheme.Length + 3)..]; + } + else + { + return "only telnet:// and telnets:// links are followed"; + } + + var end = rest.IndexOfAny(['/', '?', '#']); + var authority = end < 0 ? rest : rest[..end]; + var tail = end < 0 ? string.Empty : rest[end..]; + if (tail.Length > 0 && tail != "/") + { + return "the link has a path, query or fragment; a telnet link names only a host and port"; + } + + if (authority.Contains('@')) + { + return "the link carries a user name or password, which this client will not send"; + } + + if (authority.Contains('%') || authority.Contains('\\')) + { + return "the link's host is escaped"; + } + + if (authority.Length == 0) + { + return "the link names no host"; + } + + if (!authority.StartsWith('[') && authority.Count(c => c == ':') > 1) + { + return "an IPv6 address in a link must be in brackets"; + } + + if (authority.EndsWith(':')) + { + return "the link's port is empty"; + } + + var defaultPort = tls ? DefaultSecurePort : DefaultPort; + if (ConnectEndpoint.Parse([authority], defaultPort) is not { } endpoint) + { + return "the link's host or port is not valid (a port is 1 to 65535)"; + } + + link = new TelnetLink(endpoint.Host, endpoint.Port, tls); + return null; + } + + /// The host as /connect takes it: an IPv6 address in brackets. + public string HostForCommand => Host.Contains(':') ? $"[{Host}]" : Host; + + /// The link back as text, for a message: telnets://host:992. + public override string ToString() => $"{(Tls ? SecureScheme : Scheme)}://{HostForCommand}:{Port}"; +} diff --git a/src/SharpMUTerm.Tui/ClientUsage.cs b/src/SharpMUTerm.Tui/ClientUsage.cs index 1577bc43..9c450d5b 100644 --- a/src/SharpMUTerm.Tui/ClientUsage.cs +++ b/src/SharpMUTerm.Tui/ClientUsage.cs @@ -23,12 +23,35 @@ internal static class ClientOptions new("--tls", "Connect over TLS."), new("--insecure", "Accept invalid TLS certificates."), new("--name ", "Display name for the world."), + new("telnet://host[:port]", "A telnet:// or telnets:// link: connect to it as '/connect host port' would.", + "A client already running is handed the link instead, and this launch exits."), + new(OpenLink + " ", "What a desktop runs when a link is clicked: the link, and nothing else on the", + "command line is read."), ]; + /// + /// The flag the desktop's link handlers pass the link after (sharpmuterm-window --open-link %U on Linux, + /// "…sharpmuterm-window.exe" --open-link "%1" on Windows). + /// + public const string OpenLink = "--open-link"; + + /// + /// With on the command line, only the argument after it — every other argument is dropped, + /// before anything reads them. A link is text from a web page, and a Windows handler builds a command line by + /// pasting it into quotes: a link holding a quote could close them and add arguments of its own + /// (--render-png writes a file). Whatever it adds lands after the link, and is thrown away here. With no + /// , the arguments are returned as they were. + /// + public static string[] NarrowToLink(string[] args) + { + var at = Array.IndexOf(args, OpenLink); + return at < 0 ? args : at + 1 < args.Length ? [args[at + 1]] : []; + } + /// The options that take a value, so their value is never mistaken for the host. public static IReadOnlySet TakingValues { get; } = new HashSet(StringComparer.Ordinal) { - "--name", "--size", "--view", "--out", "--theme", "--transparency", "--font", "--font-size", "--render-png", + "--name", "--size", "--view", "--out", "--theme", "--transparency", "--font", "--font-size", "--render-png", OpenLink, }; /// The arguments that are not an option or an option's value: the host, then the port. @@ -119,8 +142,10 @@ public static void Write(TextWriter usage, UsageLauncher launcher, HostKeys keys // Named because it is the file a user has to know about to look after it — and because "where did my // password go" should be answerable without reading the source. Config is safe to share; this is not. - usage.WriteLine($"Secrets: {SecretsStore.PathFor(ConfigurationStore.DefaultPath)}" - + " — character passwords, plain text, owner-only. Not the file to paste."); + usage.WriteLine("Passwords: the system's credential store (Windows Credential Manager, the Secret Service"); + usage.WriteLine("keyring, the macOS Keychain) where there is one that answers; otherwise, and for any it refuses,"); + usage.WriteLine($" {SecretsStore.PathFor(ConfigurationStore.DefaultPath)}" + + " — plain text, owner-only. Not the file to paste."); // Named for the same reason: it is a file this client creates in the user's own directory, and // "what is this and can I delete it" should be answerable from the help page. It can: it is a diff --git a/src/SharpMUTerm.Tui/Hosting/ClientHost.cs b/src/SharpMUTerm.Tui/Hosting/ClientHost.cs index dd7195f9..2155f61a 100644 --- a/src/SharpMUTerm.Tui/Hosting/ClientHost.cs +++ b/src/SharpMUTerm.Tui/Hosting/ClientHost.cs @@ -119,6 +119,13 @@ internal sealed record ClientHost /// public required INativeComposer? NativeComposer { get; init; } + /// + /// Where the title for what is in front goes (Character@World — SharpMUTerm, + /// ): the desktop window's title bar, or the terminal's own + /// title through OSC 2. Null in the snapshot, the tests and --plain, which have no title to set. + /// + public required IWindowTitle? Title { get; init; } + /// /// Whether the terminal driver's input path can decode a focus report. Not on Windows: the Windows branch of /// NetConsoleDriver is a Console.ReadKey loop with its own reassembly, and an ESC [ I @@ -160,6 +167,7 @@ public static ClientHost Terminal(TerminalCapabilities capabilities) Chrome = HostChrome.None, NativePalette = null, NativeComposer = null, + Title = new TerminalTitle(driver), }; /// @@ -186,6 +194,7 @@ public static ClientHost Terminal(TerminalCapabilities capabilities) Chrome = HostChrome.None, NativePalette = null, NativeComposer = null, + Title = null, }; /// @@ -234,6 +243,7 @@ internal static ClientHost HarnessTerminal( FocusReporting = focusReporting ?? PlatformDecodesFocusReports, Audio = null, // a test never makes a noise Presence = null, // nor talks to Discord + Title = null, // nor retitles the terminal running the suite }; } diff --git a/src/SharpMUTerm.Tui/Hosting/CredentialStores.cs b/src/SharpMUTerm.Tui/Hosting/CredentialStores.cs new file mode 100644 index 00000000..9b29d772 --- /dev/null +++ b/src/SharpMUTerm.Tui/Hosting/CredentialStores.cs @@ -0,0 +1,347 @@ +using System.ComponentModel; +using System.Diagnostics; +using System.Runtime.InteropServices; +using System.Runtime.Versioning; +using System.Text; +using SharpMUTerm.Core.Configuration; + +namespace SharpMUTerm.Tui; + +/// +/// Which OS credential store this machine has, for . In Hosting/ because it asks +/// which platform it is on, and that question is a host's. Only the live entry points (Program, the window) +/// call ; a snapshot, a test and the parity harness never do, so none of them reads or +/// writes a real keychain. +/// +internal static class CredentialStores +{ + /// + /// The store this machine offers: Windows Credential Manager, the Secret Service through secret-tool on + /// Linux and the BSDs, the login Keychain through security on macOS. Null when there is none to try — then + /// secrets.json holds every password, as it always did. A store that is present but does not answer (no + /// Secret Service in an ssh session) is still returned; its reads say + /// and the vault falls back per password. + /// + public static ICredentialStore? ForThisMachine() + { + if (OperatingSystem.IsWindows()) + { + return new WindowsCredentialStore(); + } + + if (OperatingSystem.IsMacOS()) + { + return ProgramRunner.Find("security") is { } security ? new MacKeychainStore(security) : null; + } + + return ProgramRunner.Find("secret-tool") is { } secretTool ? new SecretToolStore(secretTool) : null; + } + + /// The name an entry is stored under, the same on every platform: SharpMUTerm/<guid>. + internal static string TargetFor(Guid id) => $"SharpMUTerm/{id:D}"; +} + +/// +/// Windows Credential Manager, through CredWriteW/CredReadW/CredDeleteW: a generic credential per +/// password, named SharpMUTerm/<guid>, kept for the local machine's user (not roamed). Built here, never +/// run by a test; nobody has run it on Windows yet. +/// +[SupportedOSPlatform("windows")] +internal sealed class WindowsCredentialStore : ICredentialStore +{ + private const int CredTypeGeneric = 1; + private const int CredPersistLocalMachine = 2; + private const int ErrorNotFound = 1168; + + public string Name => "Windows Credential Manager"; + + public CredentialLookup TryRead(Guid id, out string? password) + { + password = null; + try + { + if (!CredRead(CredentialStores.TargetFor(id), CredTypeGeneric, 0, out var handle)) + { + return Marshal.GetLastWin32Error() == ErrorNotFound ? CredentialLookup.Missing : CredentialLookup.Unavailable; + } + + try + { + var credential = Marshal.PtrToStructure(handle); + if (credential.CredentialBlobSize > 0 && credential.CredentialBlob != IntPtr.Zero) + { + password = Marshal.PtrToStringUni(credential.CredentialBlob, (int)credential.CredentialBlobSize / 2); + } + + return string.IsNullOrEmpty(password) ? CredentialLookup.Missing : CredentialLookup.Found; + } + finally + { + CredFree(handle); + } + } + catch (Exception e) when (e is DllNotFoundException or EntryPointNotFoundException or Win32Exception) + { + return CredentialLookup.Unavailable; + } + } + + public bool Write(Guid id, string password) + { + var blob = Marshal.StringToCoTaskMemUni(password); + try + { + var credential = new Credential + { + Type = CredTypeGeneric, + TargetName = CredentialStores.TargetFor(id), + Comment = "A character password saved by SharpMUTerm", + CredentialBlobSize = (uint)(password.Length * 2), + CredentialBlob = blob, + Persist = CredPersistLocalMachine, + UserName = Environment.UserName, + }; + return CredWrite(ref credential, 0); + } + catch (Exception e) when (e is DllNotFoundException or EntryPointNotFoundException or Win32Exception) + { + return false; + } + finally + { + Marshal.ZeroFreeCoTaskMemUnicode(blob); + } + } + + public bool Delete(Guid id) + { + try + { + return CredDelete(CredentialStores.TargetFor(id), CredTypeGeneric, 0) || Marshal.GetLastWin32Error() == ErrorNotFound; + } + catch (Exception e) when (e is DllNotFoundException or EntryPointNotFoundException or Win32Exception) + { + return false; + } + } + + [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)] + private struct Credential + { + public int Flags; + public int Type; + public string TargetName; + public string? Comment; + public long LastWritten; + public uint CredentialBlobSize; + public IntPtr CredentialBlob; + public int Persist; + public int AttributeCount; + public IntPtr Attributes; + public string? TargetAlias; + public string? UserName; + } + + [DllImport("advapi32.dll", EntryPoint = "CredReadW", CharSet = CharSet.Unicode, SetLastError = true)] + private static extern bool CredRead(string target, int type, int flags, out IntPtr credential); + + [DllImport("advapi32.dll", EntryPoint = "CredWriteW", CharSet = CharSet.Unicode, SetLastError = true)] + private static extern bool CredWrite(ref Credential credential, int flags); + + [DllImport("advapi32.dll", EntryPoint = "CredDeleteW", CharSet = CharSet.Unicode, SetLastError = true)] + private static extern bool CredDelete(string target, int type, int flags); + + [DllImport("advapi32.dll", SetLastError = true)] + private static extern void CredFree(IntPtr buffer); +} + +/// +/// The freedesktop Secret Service (GNOME Keyring, KWallet, KeePassXC) through libsecret's secret-tool, with the +/// attributes application=sharpmuterm and ref=<guid>. The password goes over the tool's stdin and +/// comes back on its stdout, never on a command line. Exercised against a gnome-keyring daemon on a private D-Bus. +/// +/// secret-tool lookup exits 1 with nothing on stderr when there is no such item, and exits 1 with a message +/// when there is no service ("Cannot autolaunch D-Bus…"): the second is . +/// A locked collection may put up its unlock prompt; the wait is bounded, and a prompt left unanswered reads as +/// unavailable, so the client starts. +/// +/// +internal sealed class SecretToolStore(string executable) : ICredentialStore +{ + private const string Application = "sharpmuterm"; + + public string Name => "the Secret Service keyring"; + + public CredentialLookup TryRead(Guid id, out string? password) + { + password = null; + var result = ProgramRunner.Run(executable, ["lookup", "application", Application, "ref", id.ToString("D")], null); + if (result is null) + { + return CredentialLookup.Unavailable; + } + + if (result.Value.ExitCode == 0) + { + password = result.Value.Output; + return string.IsNullOrEmpty(password) ? CredentialLookup.Missing : CredentialLookup.Found; + } + + return result.Value.ExitCode == 1 && string.IsNullOrWhiteSpace(result.Value.Error) + ? CredentialLookup.Missing + : CredentialLookup.Unavailable; + } + + public bool Write(Guid id, string password) => + ProgramRunner.Run( + executable, + ["store", "--label", $"SharpMUTerm character password ({id:D})", "application", Application, "ref", id.ToString("D")], + password) is { ExitCode: 0 }; + + public bool Delete(Guid id) + { + var result = ProgramRunner.Run(executable, ["clear", "application", Application, "ref", id.ToString("D")], null); + + // `clear` exits 1 with nothing to say when there was nothing to clear. + return result is { ExitCode: 0 } || result is { ExitCode: 1, Error: var error } && string.IsNullOrWhiteSpace(error); + } +} + +/// +/// The macOS login Keychain, through security: a generic password per character, service SharpMUTerm, +/// account the GUID. The write goes through security -i reading its command from stdin, so the password is never +/// on a command line where ps would show it. Built here, never run: nobody has tried it on a Mac. +/// +internal sealed class MacKeychainStore(string executable) : ICredentialStore +{ + private const string Service = "SharpMUTerm"; + private const int ItemNotFound = 44; + + public string Name => "the macOS Keychain"; + + public CredentialLookup TryRead(Guid id, out string? password) + { + password = null; + var result = ProgramRunner.Run(executable, ["find-generic-password", "-s", Service, "-a", id.ToString("D"), "-w"], null); + if (result is null) + { + return CredentialLookup.Unavailable; + } + + if (result.Value.ExitCode == ItemNotFound) + { + return CredentialLookup.Missing; + } + + if (result.Value.ExitCode != 0) + { + return CredentialLookup.Unavailable; + } + + // `-w` prints the password and a newline. + password = result.Value.Output.EndsWith('\n') ? result.Value.Output[..^1] : result.Value.Output; + return string.IsNullOrEmpty(password) ? CredentialLookup.Missing : CredentialLookup.Found; + } + + public bool Write(Guid id, string password) + { + // security -i reads one command per line, with double-quoted words and backslash escapes; a password holding a + // line break cannot be said that way, and goes to the file instead. + if (password.Contains('\n') || password.Contains('\r')) + { + return false; + } + + var quoted = password.Replace("\\", "\\\\", StringComparison.Ordinal).Replace("\"", "\\\"", StringComparison.Ordinal); + var command = $"add-generic-password -U -s {Service} -a {id:D} -l \"SharpMUTerm character password\" -w \"{quoted}\"\n"; + return ProgramRunner.Run(executable, ["-i"], command) is { ExitCode: 0, Error: var error } && string.IsNullOrWhiteSpace(error); + } + + public bool Delete(Guid id) + { + var result = ProgramRunner.Run(executable, ["delete-generic-password", "-s", Service, "-a", id.ToString("D")], null); + return result is { ExitCode: 0 or ItemNotFound }; + } +} + +/// Runs a credential tool with its arguments as a list (never a shell string), a bounded wait, and stdin. +internal static class ProgramRunner +{ + /// + /// How long a store may take. Long enough to answer an unlock prompt the store puts up; short enough that a store + /// nobody answers does not hold the client's start for ever. + /// + public static readonly TimeSpan Patience = TimeSpan.FromSeconds(30); + + /// The full path of on PATH, or null. + public static string? Find(string name) + { + foreach (var folder in (Environment.GetEnvironmentVariable("PATH") ?? string.Empty).Split(Path.PathSeparator)) + { + if (folder.Length > 0 && Path.Combine(folder, name) is var candidate && File.Exists(candidate)) + { + return candidate; + } + } + + return null; + } + + /// Exit code, stdout and stderr; null when the program could not be started or did not finish in time. + public static (int ExitCode, string Output, string Error)? Run(string executable, IReadOnlyList arguments, string? input) + { + var start = new ProcessStartInfo(executable) + { + RedirectStandardInput = true, + RedirectStandardOutput = true, + RedirectStandardError = true, + UseShellExecute = false, + CreateNoWindow = true, + StandardOutputEncoding = Encoding.UTF8, + StandardErrorEncoding = Encoding.UTF8, + StandardInputEncoding = new UTF8Encoding(false), + }; + foreach (var argument in arguments) + { + start.ArgumentList.Add(argument); + } + + try + { + using var process = Process.Start(start); + if (process is null) + { + return null; + } + + var output = process.StandardOutput.ReadToEndAsync(); + var error = process.StandardError.ReadToEndAsync(); + using (var stdin = process.StandardInput) + { + if (input is not null) + { + stdin.Write(input); + } + } + + if (!process.WaitForExit(Patience)) + { + try + { + process.Kill(entireProcessTree: true); + } + catch (Exception e) when (e is InvalidOperationException or Win32Exception) + { + } + + return null; + } + + return (process.ExitCode, output.GetAwaiter().GetResult(), error.GetAwaiter().GetResult()); + } + catch (Exception e) when (e is Win32Exception or InvalidOperationException or IOException) + { + return null; + } + } +} diff --git a/src/SharpMUTerm.Tui/Hosting/LinkHandoff.cs b/src/SharpMUTerm.Tui/Hosting/LinkHandoff.cs new file mode 100644 index 00000000..4d53505f --- /dev/null +++ b/src/SharpMUTerm.Tui/Hosting/LinkHandoff.cs @@ -0,0 +1,222 @@ +using System.Net.Sockets; +using System.Text; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Links; + +namespace SharpMUTerm.Tui; + +/// +/// Hands a telnet:// link to a client that is already running, so a click in a browser opens a window in the +/// client the player has open rather than a second one beside it. A launch that finds nobody listening runs as a +/// client of its own and listens from then on, so the second instance always works; this only saves it. +/// +/// The channel is a Unix domain socket (Windows 10 and later have them too) in a folder only the user can reach: +/// $XDG_RUNTIME_DIR/sharpmuterm where there is one, else the folder config.json is in. The socket file +/// is made owner-only as well. What crosses it is one line holding the link, at most +/// bytes, and the receiver reads it as the untrusted text it is +/// ( runs it through again): whoever writes to +/// the socket can do what clicking a link does, and nothing more. +/// +/// +/// A socket file nobody answers on is a client that ended without removing it; it is deleted and taken over. The +/// running client answers ok once it has the link, so a sender never exits on a link nobody took. +/// +/// +internal sealed class LinkHandoff : IDisposable +{ + private const string Acknowledgement = "ok"; + private static readonly TimeSpan Patience = TimeSpan.FromSeconds(2); + + private readonly Socket _listener; + private readonly string _path; + private readonly CancellationTokenSource _stop = new(); + + private LinkHandoff(Socket listener, string path) + { + _listener = listener; + _path = path; + } + + /// Where the socket is: in the user's runtime folder, else beside the configuration. + public static string SocketPath() + { + var runtime = Environment.GetEnvironmentVariable("XDG_RUNTIME_DIR"); + var folder = !OperatingSystem.IsWindows() && !string.IsNullOrEmpty(runtime) && Directory.Exists(runtime) + ? Path.Combine(runtime, "sharpmuterm") + : Path.GetDirectoryName(ConfigurationStore.DefaultPath)!; + return Path.Combine(folder, "links.sock"); + } + + /// + /// Gives to a running client. True once that client has said it has it; false when no + /// client is listening, or it did not answer, and this launch should run the link itself. + /// + public static bool TrySend(string link, string? path = null) + { + path ??= SocketPath(); + if (!File.Exists(path) || link.Length > TelnetLink.MaxLength || link.Contains('\n')) + { + return false; + } + + try + { + using var socket = new Socket(AddressFamily.Unix, SocketType.Stream, ProtocolType.Unspecified); + socket.ReceiveTimeout = (int)Patience.TotalMilliseconds; + socket.SendTimeout = (int)Patience.TotalMilliseconds; + socket.Connect(new UnixDomainSocketEndPoint(path)); + socket.Send(Encoding.ASCII.GetBytes(link + "\n")); + var reply = new byte[8]; + var read = socket.Receive(reply); + return Encoding.ASCII.GetString(reply, 0, read).StartsWith(Acknowledgement, StringComparison.Ordinal); + } + catch (Exception e) when (e is SocketException or IOException or ObjectDisposedException or ArgumentException) + { + return false; + } + } + + /// + /// Starts listening for links from later launches, raising on a pool thread with each + /// line as it arrived (unparsed). Null when another client is already listening, or the socket cannot be made — + /// later launches then run their links themselves. + /// + public static LinkHandoff? Listen(Action received, string? path = null) + { + path ??= SocketPath(); + try + { + var folder = Path.GetDirectoryName(path)!; + if (OperatingSystem.IsWindows()) + { + Directory.CreateDirectory(folder); + } + else + { + Directory.CreateDirectory(folder, UnixFileMode.UserRead | UnixFileMode.UserWrite | UnixFileMode.UserExecute); + } + + if (File.Exists(path)) + { + if (Answers(path)) + { + return null; + } + + File.Delete(path); + } + + var listener = new Socket(AddressFamily.Unix, SocketType.Stream, ProtocolType.Unspecified); + listener.Bind(new UnixDomainSocketEndPoint(path)); + if (!OperatingSystem.IsWindows()) + { + File.SetUnixFileMode(path, UnixFileMode.UserRead | UnixFileMode.UserWrite); + } + + listener.Listen(4); + var handoff = new LinkHandoff(listener, path); + _ = Task.Run(() => handoff.AcceptAsync(received)); + return handoff; + } + catch (Exception e) when (e is SocketException or IOException or UnauthorizedAccessException or PlatformNotSupportedException or ArgumentException) + { + return null; + } + } + + private static bool Answers(string path) + { + try + { + using var probe = new Socket(AddressFamily.Unix, SocketType.Stream, ProtocolType.Unspecified); + probe.Connect(new UnixDomainSocketEndPoint(path)); + return true; + } + catch (SocketException) + { + return false; + } + } + + private async Task AcceptAsync(Action received) + { + while (!_stop.IsCancellationRequested) + { + Socket connection; + try + { + connection = await _listener.AcceptAsync(_stop.Token); + } + catch (Exception e) when (e is OperationCanceledException or ObjectDisposedException or SocketException) + { + return; + } + + _ = Task.Run(async () => + { + using (connection) + { + if (await ReadLineAsync(connection) is { } line) + { + received(line); + try + { + await connection.SendAsync(Encoding.ASCII.GetBytes(Acknowledgement + "\n")); + } + catch (Exception e) when (e is SocketException or ObjectDisposedException) + { + // The sender gave up waiting; the link is taken all the same. + } + } + } + }); + } + } + + /// One line, bounded in length and in time; null for anything else. + private async Task ReadLineAsync(Socket connection) + { + using var timeout = CancellationTokenSource.CreateLinkedTokenSource(_stop.Token); + timeout.CancelAfter(Patience); + var buffer = new byte[TelnetLink.MaxLength + 2]; + var filled = 0; + try + { + while (filled < buffer.Length) + { + var read = await connection.ReceiveAsync(buffer.AsMemory(filled), timeout.Token); + if (read == 0) + { + break; + } + + var newline = Array.IndexOf(buffer, (byte)'\n', filled, read); + filled += read; + if (newline >= 0) + { + return Encoding.ASCII.GetString(buffer, 0, newline); + } + } + } + catch (Exception e) when (e is OperationCanceledException or SocketException or ObjectDisposedException) + { + } + + return null; + } + + public void Dispose() + { + _stop.Cancel(); + _listener.Dispose(); + try + { + File.Delete(_path); + } + catch (Exception e) when (e is IOException or UnauthorizedAccessException) + { + } + + _stop.Dispose(); + } +} diff --git a/src/SharpMUTerm.Tui/Hosting/TerminalTitle.cs b/src/SharpMUTerm.Tui/Hosting/TerminalTitle.cs new file mode 100644 index 00000000..d9100470 --- /dev/null +++ b/src/SharpMUTerm.Tui/Hosting/TerminalTitle.cs @@ -0,0 +1,54 @@ +using SharpConsoleUI.Drivers; + +namespace SharpMUTerm.Tui; + +/// Where the client's title goes (), as a host shows it. +internal interface IWindowTitle +{ + /// Shows . Called on the client's thread, only when the title changed. + void Show(string title); + + /// Gives the title back to whatever had it before the client: called once, as the client's loop ends. + void Restore(); +} + +/// +/// The terminal's title (its window or tab), set with OSC 2 (ESC ] 2 ; title ST), which every terminal this +/// client runs in implements. Written through the driver's one raw write that is serialised against frame painting, +/// the path uses for ?1004. +/// +/// Before the first title the terminal is asked to keep the one it had (xterm's title stack, CSI 22 ; 2 t), and +/// on the way out to put it back (CSI 23 ; 2 t), so the shell's own title returns when the client quits. +/// kitty, foot, WezTerm, xterm and VTE honour the stack; a terminal that does not ignores the request, and keeps the +/// client's last title until the shell sets its own. +/// +/// +internal sealed class TerminalTitle(IConsoleDriver driver) : IWindowTitle +{ + private const string PushTitle = "\u001b[22;2t"; + private const string PopTitle = "\u001b[23;2t"; + private bool _pushed; + + public void Show(string title) + { + var prefix = _pushed ? string.Empty : PushTitle; + _pushed = true; + driver.WriteClipboardOsc52($"{prefix}{Sequence(title)}"); + } + + public void Restore() + { + if (_pushed) + { + _pushed = false; + driver.WriteClipboardOsc52(PopTitle); + } + } + + /// The OSC 2 for , with every control character taken out so nothing ends it early. + internal static string Sequence(string title) + { + var clean = new string(title.Where(c => !char.IsControl(c)).ToArray()); + return $"\u001b]2;{clean}\u001b\\"; + } +} diff --git a/src/SharpMUTerm.Tui/Program.cs b/src/SharpMUTerm.Tui/Program.cs index 655baf21..eda9ac30 100644 --- a/src/SharpMUTerm.Tui/Program.cs +++ b/src/SharpMUTerm.Tui/Program.cs @@ -2,6 +2,7 @@ using SharpMUTerm.Core.Theming; using Microsoft.Extensions.Logging; using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Links; using SharpMUTerm.Core.Mapping; using SharpMUTerm.Core.Media; using SharpMUTerm.Core.Packages; @@ -16,6 +17,8 @@ internal static class Program { private static int Main(string[] args) { + // A desktop link handler's launch: the link and nothing else (ClientOptions.NarrowToLink says why). + args = ClientOptions.NarrowToLink(args); if (args.Contains("--help") || args.Contains("-h")) { PrintUsage(); @@ -27,11 +30,22 @@ private static int Main(string[] args) return WindowHandoff.Run(args, Console.Error); } + // A telnet:// link a desktop launched us with goes to the client already running, when there is one; this + // launch then has nothing left to do. Not for a snapshot, which never talks to a running client. + var snapshot = args.Contains("--snapshot"); + if (!snapshot && LinkArgument(args) is { } link && LinkHandoff.TrySend(link)) + { + return 0; + } + // Anything the load wants to say about the secrets file is collected here and logged once diagnostics // exist — the pipeline is built further down, and this runs before it. It is deliberately a list that // is drained exactly once: a secrets problem is a startup fact, not a recurring notice. + // A snapshot reads passwords from secrets.json alone: it never asks the OS credential store, which can put + // up an unlock prompt and is nothing a rendered frame needs. var loadNotices = new List(); - var config = LoadConfiguration(loadNotices.Add); + var vault = snapshot ? null : LiveVault(); + var config = LoadConfiguration(loadNotices.Add, vault); var capabilities = DetectCapabilities(config); // Headless snapshot: render one demo frame to ANSI (for docs images / CI golden files) and @@ -106,10 +120,10 @@ private static int Main(string[] args) var stdout = Console.Out; Console.SetIn(TextReader.Null); var plain = PlainHost.Create(capabilities, stdout); - return RunLive(args, config, loadNotices, plain, app => PlainHost.PumpInput(stdin, (HeadlessConsoleDriver)plain.Driver, app)); + return RunLive(args, config, loadNotices, plain, app => PlainHost.PumpInput(stdin, (HeadlessConsoleDriver)plain.Driver, app), vault); } - return RunLive(args, config, loadNotices, ClientHost.Terminal(capabilities)); + return RunLive(args, config, loadNotices, ClientHost.Terminal(capabilities), vault: vault); } /// @@ -123,7 +137,8 @@ internal static int RunLive( AppConfiguration config, IReadOnlyList loadNotices, ClientHost host, - Action? ready = null) + Action? ready = null, + CredentialVault? vault = null) { // What this launch connects: the command line's host if one was typed, else whatever is marked // `at start` on F5, else nothing at all. The precedence lives in Core (StartupConnections) so it @@ -201,7 +216,7 @@ internal static int RunLive( config, host, diagnostics: diagnostics, - save: saved => ConfigurationStore.Save(ConfigurationStore.DefaultPath, saved), + save: saved => ConfigurationStore.Save(ConfigurationStore.DefaultPath, saved, vault), logRoot: logRoot, restore: restore, mssp: mssp, @@ -213,6 +228,16 @@ internal static int RunLive( spelling: () => OpenDictionary(loadLogger), autoLayout: true); ready?.Invoke(liveApp); + + // A telnet:// link on the command line is followed once the loop runs, the way /connect host port would be; + // links later launches hand over (LinkHandoff) are followed the same way, as they arrive. Both are read as the + // untrusted text they are by OpenLink. + if (LinkArgument(args) is { } link) + { + liveApp.OnUiThread(() => liveApp.OpenLink(link)); + } + + using var links = LinkHandoff.Listen(text => liveApp.OnUiThread(() => liveApp.OpenLink(text))); int exitCode; try { @@ -235,7 +260,7 @@ internal static int RunLive( try { config.LastSession = liveApp.CaptureSession(); - ConfigurationStore.Save(ConfigurationStore.DefaultPath, config); + ConfigurationStore.Save(ConfigurationStore.DefaultPath, config, vault); } catch { @@ -265,11 +290,16 @@ private static (int Width, int Height) ParseSize(string[] args) /// Loads the configuration, collecting anything the store wants reported into /// for the caller to log once diagnostics exist. /// - internal static AppConfiguration LoadConfiguration(Action report) + /// Collects anything worth a line in the diagnostics log. + /// + /// Where the passwords are kept (), or null for secrets.json alone. The same vault + /// goes to , whose saves need what this load learned. + /// + internal static AppConfiguration LoadConfiguration(Action report, CredentialVault? vault = null) { try { - return ConfigurationStore.Load(ConfigurationStore.DefaultPath, report); + return ConfigurationStore.Load(ConfigurationStore.DefaultPath, report, vault); } catch { @@ -301,7 +331,7 @@ internal static TerminalCapabilities DetectCapabilities(AppConfiguration config) /// private static WorldDefinition? CommandLineWorld(string[] args) { - var positional = ClientOptions.Positional(args); + var positional = ClientOptions.Positional(args).Where(word => !TelnetLink.LooksLikeLink(word)).ToArray(); if (positional.Length >= 1) { var host = positional[0]; @@ -319,6 +349,19 @@ internal static TerminalCapabilities DetectCapabilities(AppConfiguration config) return null; } + /// + /// The telnet:// or telnets:// link on the command line — what a desktop passes when a link is + /// clicked (sharpmuterm-window %U) — unread; reads it. + /// + internal static string? LinkArgument(string[] args) => + ClientOptions.Positional(args).FirstOrDefault(TelnetLink.LooksLikeLink); + + /// + /// The live client's password vault: the OS credential store this machine has (), + /// with secrets.json behind it. Only the live entry points make one. + /// + internal static CredentialVault LiveVault() => new(CredentialStores.ForThisMachine()); + internal static string? GetOption(string[] args, string name) { var index = Array.IndexOf(args, name); diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Announce.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Announce.cs index 785349ab..a83e7883 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Announce.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Announce.cs @@ -17,10 +17,51 @@ internal sealed partial class SharpMUTermApp private void AnnounceLine(string windowId, string text) { - if (Host.Announcer is { } announcer && !_quietWindows.Contains(windowId) && text.Trim().Length > 0) + if (Host.Announcer is not { } announcer) + { + return; + } + + if (!_quietWindows.Contains(windowId) && text.Trim().Length > 0) { announcer.Announce(text, AnnouncementKind.Output); } + + // A quiet window is not spoken as lines arrive, but a reader that asks the output view for its text still + // gets the window in front, quiet or not. + if (windowId == ActiveWindowId()) + { + PublishReading(windowId); + } + } + + /// + /// Hands the host the window in front and its newest lines (), which the window + /// exposes as its output view's text for a screen reader to read at its own pace. Plain text from the pane's own + /// buffer, so it is what ⌃F searches: chrome rows carry none and are left out. + /// + private void PublishReading(string windowId) + { + if (Host.Announcer is not { } announcer) + { + return; + } + + var lines = new List(IAnnouncer.ReadingLines); + if (_lines.TryGetValue(windowId, out var buffer)) + { + for (var i = buffer.Count - 1; i >= 0 && lines.Count < IAnnouncer.ReadingLines; i--) + { + if (buffer[i].Plain is { Length: > 0 } plain) + { + lines.Add(plain); + } + } + + lines.Reverse(); + } + + announcer.Reading(WindowTitle(windowId), lines); } private void AnnounceNotice(string text) => Host.Announcer?.Announce(text, AnnouncementKind.Notice); @@ -30,6 +71,7 @@ private void AnnounceFocus(string windowId) if (Host.Announcer is { } announcer) { announcer.Announce(WindowTitle(windowId), AnnouncementKind.Focus); + PublishReading(windowId); } } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Connect.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Connect.cs index 445c76a2..739caff5 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Connect.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Connect.cs @@ -1,5 +1,6 @@ using SharpMUTerm.Core.Configuration; using SharpMUTerm.Core.Diagnostics; +using SharpMUTerm.Core.Links; using SharpMUTerm.Core.Session; using static SharpMUTerm.Tui.MarkupText; @@ -10,11 +11,15 @@ namespace SharpMUTerm.Tui; /// is read as a host (and port), saved as a new world and dialled. It exists because --plain has no /// settings screens a screen reader can use, so a first run there had no way to add a world at all, and it is /// the quickest way in everywhere else too. +/// +/// A telnet:// link () ends in the same place, through the same reader, so a link can do +/// nothing /connect cannot. +/// /// internal sealed partial class SharpMUTermApp { /// The port a host given without one is dialled on, the same default as the command line's. - internal const int DefaultConnectPort = 4000; + internal const int DefaultConnectPort = ConnectEndpoint.DefaultPort; /// What /connect with nothing after it says. internal const string ConnectUsage = "/connect , or /connect [port] [tls] to add one"; @@ -43,35 +48,87 @@ private void ConnectCommand(string windowId, string arguments, Action string.Equals(known.Name, string.Join(' ', words), StringComparison.OrdinalIgnoreCase)); - if (world is null) + if (world is not null) { - if (ParseEndpoint(words) is not { } endpoint) - { - RefuseCommand($"no world called {Snippet(string.Join(' ', words))}, and that is not a host — {ConnectUsage}"); - return; - } + DialWorld(world); + return; + } - world = new WorldDefinition - { - Name = UniqueWorldName(endpoint.Host), - Host = endpoint.Host, - Port = endpoint.Port, - UseTls = tls, - }; - - // A configuration's first world takes the layout the welcome was left at, whether it came from - // the welcome's form or from a /connect typed under it. - if (_config.Worlds.Count == 0) - { - ApplyWelcomeLayout(world); - } + if (ParseEndpoint(words) is not { } endpoint) + { + RefuseCommand($"no world called {Snippet(string.Join(' ', words))}, and that is not a host — {ConnectUsage}"); + return; + } + + ConnectToEndpoint(endpoint.Host, endpoint.Port, tls, shape); + } - shape?.Invoke(world); - _config.Worlds.Add(world); - SaveConfiguration(); - Notice($"added {world.Name} ({world.Host}:{world.Port}) — F5 edits it", MessageSeverity.Info, "F5"); + /// + /// Follows a telnet:// or telnets:// link: the link from the command line a desktop launched the + /// client with, or one a second launch handed to this one. The link is server text, read by + /// ; all it can do is what /connect host port does. A world already configured for + /// the same host, port and TLS is dialled rather than added again — matched on the endpoint and never on a name, + /// so a link cannot reach a world by naming it. Nothing is sent: a world a link adds has no character, and an + /// existing world logs in only as its own configuration says. + /// + internal void OpenLink(string text) + { + if (TelnetLink.TryParse(text, out var refusal) is not { } link) + { + RefuseCommand($"not following that link: {refusal}"); + return; + } + + OpenLink(link); + } + + /// + internal void OpenLink(TelnetLink link) + { + var world = _config.Worlds.FirstOrDefault(known => + string.Equals(known.Host, link.Host, StringComparison.OrdinalIgnoreCase) + && known.Port == link.Port + && known.UseTls == link.Tls); + if (world is not null) + { + DialWorld(world); + return; } + ConnectToEndpoint(link.Host, link.Port, link.Tls); + } + + /// + /// Adds a world for and dials it: what /connect host port does once the words are + /// read, and all a telnet:// link can do. + /// + private void ConnectToEndpoint(string host, int port, bool tls, Action? shape = null) + { + var world = new WorldDefinition + { + Name = UniqueWorldName(host), + Host = host, + Port = port, + UseTls = tls, + }; + + // A configuration's first world takes the layout the welcome was left at, whether it came from + // the welcome's form or from a /connect typed under it. + if (_config.Worlds.Count == 0) + { + ApplyWelcomeLayout(world); + } + + shape?.Invoke(world); + _config.Worlds.Add(world); + SaveConfiguration(); + Notice($"added {world.Name} ({world.Host}:{world.Port}) — F5 edits it", MessageSeverity.Info, "F5"); + DialWorld(world); + } + + /// Opens 's first character (or the world alone), brings it forward and dials it. + private void DialWorld(WorldDefinition world) + { var character = world.Characters.FirstOrDefault(); var key = character is null ? world.Name : $"{world.Name}.{character.Name}"; var session = _sessions.Find(key); @@ -96,52 +153,10 @@ private static bool IsTlsWord(string word) => || word.Equals("--tls", StringComparison.OrdinalIgnoreCase); /// - /// Reads host port, host:port or a bare host. A bracketed IPv6 address keeps its colons. Null - /// when the words are not one host with at most one port, so a mistyped world name is refused rather than - /// saved as a world that dials a host called "my world". + /// Reads host port, host:port or a bare host (, the one reader + /// /connect, the welcome and a telnet:// link share). /// - internal static (string Host, int Port)? ParseEndpoint(IReadOnlyList words) - { - if (words.Count is 0 or > 2) - { - return null; - } - - var host = words[0]; - var port = DefaultConnectPort; - if (words.Count == 2) - { - if (!TryPort(words[1], out port)) - { - return null; - } - } - else if (host.StartsWith('[') && host.IndexOf("]:", StringComparison.Ordinal) is var close and > 0) - { - if (!TryPort(host[(close + 2)..], out port)) - { - return null; - } - - host = host[..(close + 1)]; - } - else if (host.Count(c => c == ':') == 1) - { - var colon = host.IndexOf(':'); - if (!TryPort(host[(colon + 1)..], out port)) - { - return null; - } - - host = host[..colon]; - } - - host = host.Trim('[', ']'); - return Uri.CheckHostName(host) == UriHostNameType.Unknown ? null : (host, port); - } - - private static bool TryPort(string text, out int port) => - int.TryParse(text, out port) && port is > 0 and <= 65535; + internal static (string Host, int Port)? ParseEndpoint(IReadOnlyList words) => ConnectEndpoint.Parse(words); /// A world name not already taken: the host, then the host with a number after it. private string UniqueWorldName(string host) diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Title.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Title.cs new file mode 100644 index 00000000..49fb5dbc --- /dev/null +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Title.cs @@ -0,0 +1,45 @@ +using SharpMUTerm.Client.Chrome; + +namespace SharpMUTerm.Tui; + +/// +/// The window's title: Character@World — SharpMUTerm for what is in front (), handed +/// to the host's — the desktop window's title bar, the terminal's OSC 2. Worked out +/// whenever the header is, from the header's own model, so the title and the header always name the same character; +/// the header is rebuilt on every activation, connect and disconnect. +/// +internal sealed partial class SharpMUTermApp +{ + private string? _shownTitle; + + // Nothing is written to the host before Run: a terminal is not ours to write to until the loop has it. + private bool _titleLive; + + /// What was last handed to the host, for the tests; null before the first header. + internal string? ShownTitle => _shownTitle; + + private void PublishTitle(HeaderModel header) + { + var title = SharpMUTerm.Client.Chrome.WindowTitle.For(header); + if (title == _shownTitle) + { + return; + } + + _shownTitle = title; + if (_titleLive) + { + Host.Title?.Show(title); + } + } + + /// Called by : from now on the title goes to the host, starting with the one already worked out. + internal void StartTitle() + { + _titleLive = true; + if (_shownTitle is { } title) + { + Host.Title?.Show(title); + } + } +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index cc05b185..12229613 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -1067,11 +1067,15 @@ public int Run(IReadOnlyList startup) // Here and not in the constructor: this is the one method that means "there is a live terminal // in front of this app", and asking a terminal to report focus is a write to it. _focus.Start(); + StartTitle(); var exitCode = _system.Run(); // The colours are kitty's, not this window's: left set, they would go on drawing the shell's own // output translucent wherever it happens to use one of them. ResetTransparentColours(); + + // The terminal's own title goes back to the shell's, as the colours do. + Host.Title?.Restore(); return exitCode; } @@ -13534,7 +13538,12 @@ private void RefreshHeader() /// The design header row: the brand affordance on the left, the active world (with its accent) /// in the middle, and connection/graphics/palette hints on the right. /// - private string HeaderMarkup() => HeaderMarkup(BuildHeaderModel()); + private string HeaderMarkup() + { + var model = BuildHeaderModel(); + PublishTitle(model); + return HeaderMarkup(model); + } /// /// The header as a view-model (): what the band says, with no presentation. The cell diff --git a/tests/SharpMUTerm.Avalonia.Tests/OutputAutomationTests.cs b/tests/SharpMUTerm.Avalonia.Tests/OutputAutomationTests.cs new file mode 100644 index 00000000..41084050 --- /dev/null +++ b/tests/SharpMUTerm.Avalonia.Tests/OutputAutomationTests.cs @@ -0,0 +1,81 @@ +using Avalonia.Automation; +using Avalonia.Automation.Peers; +using Avalonia.Automation.Provider; +using Avalonia.Threading; +using SkiaSharp; +using Window = Avalonia.Controls.Window; + +namespace SharpMUTerm.Avalonia.Tests; + +/// +/// What the platform's accessibility API finds on the cells, read through Avalonia's own automation peers in a +/// headless window. Not tried with NVDA, Narrator, VoiceOver or Orca: this proves what the peer says, not what a +/// screen reader then does with it. +/// +public class OutputAutomationTests +{ + [Test] + public async Task TheOutputViewIsAReadOnlyDocumentHoldingTheFrontWindowsLines() + { + var seen = await TerminalViewTests.Session.Dispatch(() => + { + var driver = new AvaloniaConsoleDriver(10, 4); + var view = new TerminalView(driver, SKColors.White, SKColors.Black, 16, null); + var window = new Window { Content = view, Width = 200, Height = 100 }; + window.Show(); + try + { + var peer = ControlAutomationPeer.CreatePeerForElement(view); + var before = (peer.GetName(), peer.GetProvider()?.Value); + + var changes = new List(); + peer.PropertyChanged += (_, e) => changes.Add(e.Property); + driver.Announcer.Reading("Ann", ["You are in the plaza.", "Bea arrives."]); + Dispatcher.UIThread.RunJobs(); + + var value = peer.GetProvider()!; + var threw = false; + try + { + value.SetValue("typed into the output"); + } + catch (InvalidOperationException) + { + threw = true; + } + + return (Before: before, Name: peer.GetName(), Type: peer.GetAutomationControlType(), value.IsReadOnly, + value.Value, Changed: changes.Contains(ValuePatternIdentifiers.ValueProperty), Threw: threw, + Content: peer.IsContentElement()); + } + finally + { + window.Close(); + driver.Dispose(); + } + }, CancellationToken.None); + + await Assert.That(seen.Before.Item1).IsEqualTo("SharpMUTerm output"); + await Assert.That(seen.Before.Item2).IsEqualTo(string.Empty); + await Assert.That(seen.Name).IsEqualTo("SharpMUTerm output: Ann"); + await Assert.That(seen.Type).IsEqualTo(AutomationControlType.Document); + await Assert.That(seen.IsReadOnly).IsTrue(); + await Assert.That(seen.Value).IsEqualTo("You are in the plaza.\nBea arrives."); + await Assert.That(seen.Changed).IsTrue(); + await Assert.That(seen.Threw).IsTrue(); + await Assert.That(seen.Content).IsTrue(); + } + + [Test] + public async Task TheWindowTitleBarCarriesWhatTheClientSaid() + { + var bar = new WindowTitleBar(); + var heard = new List(); + bar.Changed += heard.Add; + + bar.Show("Ann@Mush — SharpMUTerm"); + + await Assert.That(bar.Current).IsEqualTo("Ann@Mush — SharpMUTerm"); + await Assert.That(heard).IsEquivalentTo(new[] { "Ann@Mush — SharpMUTerm" }); + } +} diff --git a/tests/SharpMUTerm.Client.Tests/WindowTitleTests.cs b/tests/SharpMUTerm.Client.Tests/WindowTitleTests.cs new file mode 100644 index 00000000..16744534 --- /dev/null +++ b/tests/SharpMUTerm.Client.Tests/WindowTitleTests.cs @@ -0,0 +1,45 @@ +using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Text; + +namespace SharpMUTerm.Client.Tests; + +/// The one title both hosts show for what is in front: Character@World — SharpMUTerm. +public class WindowTitleTests +{ + [Test] + [Arguments("Corvid", "Aetherfall", "Corvid@Aetherfall — SharpMUTerm")] + [Arguments(null, "Aetherfall", "Aetherfall — SharpMUTerm")] + [Arguments("", "Aetherfall", "Aetherfall — SharpMUTerm")] + [Arguments(null, null, "SharpMUTerm")] + [Arguments(" ", " ", "SharpMUTerm")] + public async Task TheTitleNamesWhoIsInFrontAndWhere(string? character, string? world, string expected) => + await Assert.That(WindowTitle.For(character, world)).IsEqualTo(expected); + + [Test] + public async Task TheTitleIsReadOffTheHeadersOwnModel() + { + var header = HeaderModel.Empty with + { + World = new HeaderWorld("Aetherfall", TerminalColor.Default), + Character = new HeaderCharacter("Corvid", "Aetherfall.Corvid", CharacterPresence.Online, "aetherfall.mux", 4201, false, "x"), + }; + + await Assert.That(WindowTitle.For(header)).IsEqualTo("Corvid@Aetherfall — SharpMUTerm"); + await Assert.That(WindowTitle.For(HeaderModel.Empty)).IsEqualTo(WindowTitle.Product); + } + + /// A title is written into an escape sequence in a terminal, where a BEL or ESC would end it early. + [Test] + public async Task ControlCharactersAreDroppedAndLongNamesAreCut() + { + var title = WindowTitle.For("Cor\u0007vid\u001b]2;x", "evil\r\nworld"); + + await Assert.That(title).IsEqualTo("Corvid]2;x@evilworld — SharpMUTerm"); + await Assert.That(title.Any(char.IsControl)).IsFalse(); + + var longName = new string('n', 200); + var cut = WindowTitle.For(longName, "w"); + await Assert.That(cut).StartsWith(new string('n', WindowTitle.MaxPart - 1) + "…@w"); + } +} diff --git a/tests/SharpMUTerm.Core.Tests/Configuration/CredentialVaultTests.cs b/tests/SharpMUTerm.Core.Tests/Configuration/CredentialVaultTests.cs new file mode 100644 index 00000000..fa82cf5a --- /dev/null +++ b/tests/SharpMUTerm.Core.Tests/Configuration/CredentialVaultTests.cs @@ -0,0 +1,275 @@ +using SharpMUTerm.Core.Configuration; + +namespace SharpMUTerm.Core.Tests.Configuration; + +/// +/// Passwords in the OS credential store with secrets.json behind it. Every test uses : +/// nothing here reaches a real keychain, and the files are in a throwaway folder. +/// +public class CredentialVaultTests +{ + /// A credential store in memory that can be told to stop answering or to refuse writes. + internal sealed class FakeStore : ICredentialStore + { + public Dictionary Items { get; } = []; + + public bool Reachable { get; set; } = true; + + public bool RefusesWrites { get; set; } + + public int Writes { get; private set; } + + public string Name => "the fake store"; + + public CredentialLookup TryRead(Guid id, out string? password) + { + password = null; + if (!Reachable) + { + return CredentialLookup.Unavailable; + } + + return Items.TryGetValue(id, out password) ? CredentialLookup.Found : CredentialLookup.Missing; + } + + public bool Write(Guid id, string password) + { + Writes++; + if (!Reachable || RefusesWrites) + { + return false; + } + + Items[id] = password; + return true; + } + + public bool Delete(Guid id) + { + if (!Reachable) + { + return false; + } + + Items.Remove(id); + return true; + } + } + + private sealed class TempRoot : IDisposable + { + public TempRoot() + { + Directory = Path.Combine(Path.GetTempPath(), $"smuterm-vault-{Guid.NewGuid():N}"); + System.IO.Directory.CreateDirectory(Directory); + } + + public string Directory { get; } + + public string ConfigPath => Path.Combine(Directory, "SharpMUTerm", "config.json"); + + public string SecretsPath => Path.Combine(Directory, "SharpMUTerm", SecretsStore.FileName); + + public void Dispose() + { + try + { + System.IO.Directory.Delete(Directory, recursive: true); + } + catch (Exception) + { + } + } + } + + private static AppConfiguration WithPasswords(params string?[] passwords) + { + var world = new WorldDefinition { Name = "Aetherfall", Host = "aetherfall.mux", Port = 4201 }; + for (var i = 0; i < passwords.Length; i++) + { + world.Characters.Add(new CharacterDefinition { Name = $"Corvid{i}", Password = passwords[i] }); + } + + var config = new AppConfiguration(); + config.Worlds.Add(world); + return config; + } + + private static CharacterDefinition First(AppConfiguration config) => config.Worlds[0].Characters[0]; + + [Test] + public async Task WithAStoreThePasswordGoesToItAndNotToTheFile() + { + using var temp = new TempRoot(); + var store = new FakeStore(); + var config = WithPasswords("hunter2"); + + ConfigurationStore.Save(temp.ConfigPath, config, new CredentialVault(store)); + + var id = First(config).PasswordRef!.Value; + await Assert.That(store.Items[id]).IsEqualTo("hunter2"); + await Assert.That(File.Exists(temp.SecretsPath)).IsFalse(); + await Assert.That(File.ReadAllText(temp.ConfigPath)).DoesNotContain("hunter2"); + + var reloaded = ConfigurationStore.Load(temp.ConfigPath, vault: new CredentialVault(store)); + await Assert.That(First(reloaded).Password).IsEqualTo("hunter2"); + await Assert.That(First(reloaded).PasswordRef).IsEqualTo(id); + } + + [Test] + public async Task ASaveThatChangedNothingWritesNothingToTheStore() + { + using var temp = new TempRoot(); + var store = new FakeStore(); + var vault = new CredentialVault(store); + var config = WithPasswords("hunter2", "swordfish"); + + ConfigurationStore.Save(temp.ConfigPath, config, vault); + var afterFirst = store.Writes; + ConfigurationStore.Save(temp.ConfigPath, config, vault); + ConfigurationStore.Save(temp.ConfigPath, config, vault); + + await Assert.That(afterFirst).IsEqualTo(2); + await Assert.That(store.Writes).IsEqualTo(2); + } + + [Test] + public async Task SecretsJsonEntriesMoveIntoTheStoreAtLoad() + { + using var temp = new TempRoot(); + var config = WithPasswords("hunter2", "swordfish"); + ConfigurationStore.Save(temp.ConfigPath, config); // the old way: secrets.json + await Assert.That(File.Exists(temp.SecretsPath)).IsTrue(); + + var store = new FakeStore(); + var notes = new List(); + var loaded = ConfigurationStore.Load(temp.ConfigPath, notes.Add, new CredentialVault(store)); + + await Assert.That(loaded.Worlds[0].Characters.Select(c => c.Password ?? "")).IsEquivalentTo(new[] { "hunter2", "swordfish" }); + await Assert.That(store.Items.Values).IsEquivalentTo(new[] { "hunter2", "swordfish" }); + await Assert.That(File.Exists(temp.SecretsPath)).IsFalse(); + await Assert.That(notes.Single()).Contains("moved 2 passwords"); + } + + [Test] + public async Task APasswordTheStoreRefusesStaysInTheFile() + { + using var temp = new TempRoot(); + ConfigurationStore.Save(temp.ConfigPath, WithPasswords("hunter2")); + var store = new FakeStore { RefusesWrites = true }; + + var loaded = ConfigurationStore.Load(temp.ConfigPath, vault: new CredentialVault(store)); + + await Assert.That(First(loaded).Password).IsEqualTo("hunter2"); + await Assert.That(SecretsStore.Read(temp.SecretsPath).Secrets.Values.Single()).IsEqualTo("hunter2"); + } + + [Test] + public async Task WithNoStoreReachableThePasswordGoesToTheFile() + { + using var temp = new TempRoot(); + var store = new FakeStore { Reachable = false }; + var config = WithPasswords("hunter2"); + + ConfigurationStore.Save(temp.ConfigPath, config, new CredentialVault(store)); + + await Assert.That(store.Items).IsEmpty(); + await Assert.That(SecretsStore.Read(temp.SecretsPath).Secrets[First(config).PasswordRef!.Value]).IsEqualTo("hunter2"); + } + + /// + /// The headless-Linux case: the passwords are in a keyring this run cannot reach. The characters start with no + /// password — and the first save must not forget the references, or the next run with a keyring finds nothing. + /// + [Test] + public async Task AStoreThatCannotBeReachedKeepsEveryReferenceThroughASave() + { + using var temp = new TempRoot(); + var store = new FakeStore(); + var config = WithPasswords("hunter2"); + ConfigurationStore.Save(temp.ConfigPath, config, new CredentialVault(store)); + var id = First(config).PasswordRef!.Value; + + store.Reachable = false; + var notes = new List(); + var offline = new CredentialVault(store); + var loaded = ConfigurationStore.Load(temp.ConfigPath, notes.Add, offline); + await Assert.That(First(loaded).Password).IsNull(); + await Assert.That(notes.Single()).Contains("could not be reached"); + + ConfigurationStore.Save(temp.ConfigPath, loaded, offline); + await Assert.That(First(loaded).PasswordRef).IsEqualTo(id); + + store.Reachable = true; + var back = ConfigurationStore.Load(temp.ConfigPath, vault: new CredentialVault(store)); + await Assert.That(First(back).Password).IsEqualTo("hunter2"); + } + + [Test] + public async Task ClearingAPasswordOrDeletingACharacterRemovesItFromTheStore() + { + using var temp = new TempRoot(); + var store = new FakeStore(); + var vault = new CredentialVault(store); + var config = WithPasswords("hunter2", "swordfish"); + ConfigurationStore.Save(temp.ConfigPath, config, vault); + await Assert.That(store.Items.Count).IsEqualTo(2); + + First(config).Password = null; + config.Worlds[0].Characters.RemoveAt(1); + ConfigurationStore.Save(temp.ConfigPath, config, vault); + + await Assert.That(store.Items).IsEmpty(); + await Assert.That(First(config).PasswordRef).IsNull(); + } + + [Test] + public async Task ADeletedCharacterFromAnEarlierRunIsRemovedFromTheStore() + { + using var temp = new TempRoot(); + var store = new FakeStore(); + ConfigurationStore.Save(temp.ConfigPath, WithPasswords("hunter2"), new CredentialVault(store)); + + var vault = new CredentialVault(store); + var loaded = ConfigurationStore.Load(temp.ConfigPath, vault: vault); + loaded.Worlds[0].Characters.Clear(); + ConfigurationStore.Save(temp.ConfigPath, loaded, vault); + + await Assert.That(store.Items).IsEmpty(); + } + + /// + /// A changed password the store refuses goes to the file — under a new reference, because the store, read first, + /// still holds the old one under the old reference and would win. + /// + [Test] + public async Task AChangedPasswordTheStoreRefusesIsNotShadowedByTheOldOne() + { + using var temp = new TempRoot(); + var store = new FakeStore(); + var vault = new CredentialVault(store); + var config = WithPasswords("old"); + ConfigurationStore.Save(temp.ConfigPath, config, vault); + + store.RefusesWrites = true; + First(config).Password = "new"; + ConfigurationStore.Save(temp.ConfigPath, config, vault); + + var reloaded = ConfigurationStore.Load(temp.ConfigPath, vault: new CredentialVault(store)); + await Assert.That(First(reloaded).Password).IsEqualTo("new"); + await Assert.That(store.Items.Values).DoesNotContain("old"); + } + + [Test] + public async Task AVaultWithNoStoreIsSecretsJsonAlone() + { + using var temp = new TempRoot(); + var config = WithPasswords("hunter2"); + + ConfigurationStore.Save(temp.ConfigPath, config, new CredentialVault(null)); + var reloaded = ConfigurationStore.Load(temp.ConfigPath, vault: new CredentialVault(null)); + + await Assert.That(SecretsStore.Read(temp.SecretsPath).Secrets.Values.Single()).IsEqualTo("hunter2"); + await Assert.That(First(reloaded).Password).IsEqualTo("hunter2"); + } +} diff --git a/tests/SharpMUTerm.Core.Tests/Links/TelnetLinkTests.cs b/tests/SharpMUTerm.Core.Tests/Links/TelnetLinkTests.cs new file mode 100644 index 00000000..2ac2781b --- /dev/null +++ b/tests/SharpMUTerm.Core.Tests/Links/TelnetLinkTests.cs @@ -0,0 +1,122 @@ +using SharpMUTerm.Core.Links; + +namespace SharpMUTerm.Core.Tests.Links; + +/// +/// telnet:// links are text anybody can write and the desktop hands this client on a click, so the reader is +/// held to what /connect host port can do: a host, a port, TLS for telnets, and nothing else. +/// +public class TelnetLinkTests +{ + [Test] + [Arguments("telnet://mud.example.org:4201", "mud.example.org", 4201, false)] + [Arguments("telnet://mud.example.org:4201/", "mud.example.org", 4201, false)] + [Arguments("TELNET://Mud.Example.org:4201", "Mud.Example.org", 4201, false)] + [Arguments("telnet://mud.example.org", "mud.example.org", 23, false)] + [Arguments("telnets://mud.example.org", "mud.example.org", 992, true)] + [Arguments("telnets://mud.example.org:6666", "mud.example.org", 6666, true)] + [Arguments("telnet://192.0.2.7:4000", "192.0.2.7", 4000, false)] + [Arguments("telnet://[2001:db8::1]:4000", "2001:db8::1", 4000, false)] + [Arguments("telnet://[::1]", "::1", 23, false)] + public async Task AWellFormedLinkIsAHostAPortAndWhetherItIsTls(string text, string host, int port, bool tls) + { + var link = TelnetLink.TryParse(text, out var refusal); + + await Assert.That(refusal).IsNull(); + await Assert.That(link).IsEqualTo(new TelnetLink(host, port, tls)); + } + + [Test] + [Arguments("telnet://mud.example.org:0")] + [Arguments("telnet://mud.example.org:65536")] + [Arguments("telnet://mud.example.org:99999999999")] + [Arguments("telnet://mud.example.org:-23")] + [Arguments("telnet://mud.example.org:+23")] + [Arguments("telnet://mud.example.org:23a")] + [Arguments("telnet://mud.example.org:")] + public async Task APortOutOfRangeOrNotPlainDigitsIsRefused(string text) => + await Assert.That(TelnetLink.TryParse(text)).IsNull(); + + [Test] + [Arguments("telnet://wizard:hunter2@mud.example.org:4201")] + [Arguments("telnet://wizard@mud.example.org")] + [Arguments("telnet://@mud.example.org")] + [Arguments("telnet://mud.example.org:4201@evil.example")] + public async Task EmbeddedCredentialsAreRefusedRatherThanSentOrDropped(string text) + { + var link = TelnetLink.TryParse(text, out var refusal); + + await Assert.That(link).IsNull(); + await Assert.That(refusal).Contains("user name or password"); + } + + [Test] + [Arguments("telnet://mud.example.org:4201/say hello")] + [Arguments("telnet://mud.example.org:4201/connect%20wizard%20pw")] + [Arguments("telnet://mud.example.org:4201/?cmd=@shutdown")] + [Arguments("telnet://mud.example.org:4201?cmd=quit")] + [Arguments("telnet://mud.example.org:4201#frag")] + [Arguments("telnet://mud.example.org:4201//")] + [Arguments("telnet://mud.example.org/path")] + public async Task APathQueryOrFragmentIsRefused(string text) => + await Assert.That(TelnetLink.TryParse(text)).IsNull(); + + [Test] + [Arguments("telnet://mud.example.org:4201\r\n@shutdown")] + [Arguments("telnet://mud.example.org\r\n")] + [Arguments("telnet://mud.example.org\n:4201")] + [Arguments("telnet://mud.example.org:4201\u0000")] + [Arguments("telnet://mud.example.org\u001b]2;owned\u0007")] + [Arguments("telnet://mud example.org")] + [Arguments(" telnet://mud.example.org")] + [Arguments("telnet://mud.example.org\t")] + [Arguments("telnet://mud%2Eexample.org")] + [Arguments("telnet://mud.example.org%0d%0a")] + [Arguments("telnet://mud\\example.org")] + [Arguments("telnet://müd.example.org")] + public async Task ControlCharactersSpacesEscapesAndNonAsciiAreRefused(string text) => + await Assert.That(TelnetLink.TryParse(text)).IsNull(); + + [Test] + [Arguments("")] + [Arguments("telnet://")] + [Arguments("telnet:///")] + [Arguments("telnet:mud.example.org")] + [Arguments("http://mud.example.org")] + [Arguments("ssh://mud.example.org")] + [Arguments("telnet://2001:db8::1")] + [Arguments("telnet://[2001:db8::1")] + [Arguments("telnet://[]:23")] + [Arguments("telnet://mud..example")] + [Arguments("telnet://a:b:c")] + public async Task AnythingElseIsRefused(string text) => + await Assert.That(TelnetLink.TryParse(text)).IsNull(); + + [Test] + public async Task AnOverlongLinkIsRefusedBeforeItIsRead() + { + var text = "telnet://" + new string('a', TelnetLink.MaxLength) + ".example"; + + var link = TelnetLink.TryParse(text, out var refusal); + + await Assert.That(link).IsNull(); + await Assert.That(refusal).Contains("too long"); + } + + [Test] + public async Task AnIpv6HostIsBracketedAgainForTheCommand() + { + var link = TelnetLink.TryParse("telnets://[2001:db8::1]:992")!; + + await Assert.That(link.HostForCommand).IsEqualTo("[2001:db8::1]"); + await Assert.That(link.ToString()).IsEqualTo("telnets://[2001:db8::1]:992"); + } + + [Test] + [Arguments("telnet://x", true)] + [Arguments("TelNetS://x", true)] + [Arguments("mud.example.org", false)] + [Arguments("--tls", false)] + public async Task OnlyTheTwoSchemesLookLikeALink(string text, bool expected) => + await Assert.That(TelnetLink.LooksLikeLink(text)).IsEqualTo(expected); +} diff --git a/tests/SharpMUTerm.Tui.Tests/TelnetLinkClientTests.cs b/tests/SharpMUTerm.Tui.Tests/TelnetLinkClientTests.cs new file mode 100644 index 00000000..2f3e3fef --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/TelnetLinkClientTests.cs @@ -0,0 +1,248 @@ +using SharpConsoleUI.Drivers; +using SharpMUTerm.Core.Accessibility; +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Session; +using SharpMUTerm.Graphics; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// A telnet:// link in the client: it connects, as /connect host port does, and it never sends. Plus the +/// two other things a desktop expects of the client — the window title and the screen reader's text — and the hand-off +/// that gives a second launch's link to the first. +/// +[NotInParallel] +public class TelnetLinkClientTests +{ + private static readonly TerminalCapabilities Headless = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private static (SharpMUTermApp App, RecordingTelnetSession Wire, AppConfiguration Config) Open( + Action? configure = null, IAnnouncer? announcer = null, IWindowTitle? title = null) + { + Console.SetIn(TextReader.Null); + var config = new AppConfiguration(); + configure?.Invoke(config); + var wire = new RecordingTelnetSession(); + var host = ClientHost.ForHarness(Headless, new HeadlessConsoleDriver(120, 32), null, null, null) with + { + Announcer = announcer, + Title = title, + }; + var app = new SharpMUTermApp(config, host); + app.TelnetFactory = _ => wire; + return (app, wire, config); + } + + [Test] + public async Task ALinkAddsAWorldWithNoCharacterAndDialsItSendingNothing() + { + var (app, wire, config) = Open(); + await using var _app = app; + + app.OpenLink("telnets://mud.example.org:6666/"); + await app.LastCommand; + + var world = config.Worlds.Single(); + await Assert.That(world.Host).IsEqualTo("mud.example.org"); + await Assert.That(world.Port).IsEqualTo(6666); + await Assert.That(world.UseTls).IsTrue(); + await Assert.That(world.Characters).IsEmpty(); + await Assert.That(app.FindSession("mud.example.org")!.State).IsEqualTo(ConnectionState.Connected); + await Assert.That(wire.Lines).IsEmpty(); + } + + [Test] + public async Task ALinkToAConfiguredEndpointDialsThatWorldAndAddsNone() + { + var (app, _, config) = Open(c => c.Worlds.Add(new WorldDefinition { Name = "Home", Host = "mud.example.org", Port = 4201 })); + await using var _app = app; + + app.OpenLink("telnet://MUD.example.org:4201"); + await app.LastCommand; + + await Assert.That(config.Worlds.Count).IsEqualTo(1); + await Assert.That(app.FindSession("Home")!.State).IsEqualTo(ConnectionState.Connected); + } + + /// A link is matched on its endpoint, never on a name: one naming a world reaches nothing of it. + [Test] + public async Task ALinkCannotReachAWorldByNamingIt() + { + var (app, _, config) = Open(c => c.Worlds.Add(new WorldDefinition { Name = "Home", Host = "home.example.org", Port = 4201 })); + await using var _app = app; + + app.OpenLink("telnet://Home"); + await app.LastCommand; + + await Assert.That(config.Worlds.Count).IsEqualTo(2); + await Assert.That(config.Worlds[1].Host).IsEqualTo("Home"); + await Assert.That(app.FindSession("Home 2")).IsNotNull(); + } + + [Test] + [Arguments("telnet://wizard:pw@mud.example.org")] + [Arguments("telnet://mud.example.org:70000")] + [Arguments("telnet://mud.example.org:4201/@shutdown")] + [Arguments("telnet://mud.example.org\r\n@shutdown")] + [Arguments("javascript:alert(1)")] + public async Task AHostileLinkAddsNothingDialsNothingAndSaysWhy(string text) + { + var (app, wire, config) = Open(); + await using var _app = app; + + app.OpenLink(text); + + await Assert.That(config.Worlds).IsEmpty(); + await Assert.That(wire.ConnectAttempts).IsEqualTo(0); + await Assert.That(app.Messages.Entries.Any(m => m.Text.Contains("not following that link"))).IsTrue(); + } + + [Test] + public async Task TheLinkOnTheCommandLineIsFoundAndIsNotReadAsAHost() + { + string[] args = ["--name", "telnet://not-this", "telnet://mud.example.org:23", "--tls"]; + + await Assert.That(Program.LinkArgument(args)).IsEqualTo("telnet://mud.example.org:23"); + await Assert.That(Program.LinkArgument(["mud.example.org", "4201"])).IsNull(); + } + + /// + /// A Windows link handler pastes the link into a quoted command line; a link holding a quote can close it and add + /// arguments. With --open-link, everything but the argument after it is dropped before anything reads it. + /// + [Test] + public async Task ALinkHandlersLaunchReadsTheLinkAndNothingElse() + { + string[] injected = ["--open-link", "telnet://mud.example.org", "--render-png", "C:\\evil.png", "--demo-config"]; + + await Assert.That(ClientOptions.NarrowToLink(injected)).IsEquivalentTo(new[] { "telnet://mud.example.org" }); + await Assert.That(ClientOptions.NarrowToLink(["--open-link"])).IsEmpty(); + await Assert.That(ClientOptions.NarrowToLink(["mud.example.org", "4201"])).IsEquivalentTo(new[] { "mud.example.org", "4201" }); + } + + private sealed class Titles : IWindowTitle + { + public List Shown { get; } = []; + + public void Show(string title) => Shown.Add(title); + + public void Restore() => Shown.Add(""); + } + + [Test] + public async Task TheTitleFollowsTheWindowInFrontAndReachesTheHostOnlyOnceTheLoopRuns() + { + var titles = new Titles(); + var (app, _, _) = Open( + c => + { + var world = new WorldDefinition { Name = "Mush", Host = "mush.example", Port = 4201 }; + world.Characters.Add(new CharacterDefinition { Name = "Ann" }); + world.Characters.Add(new CharacterDefinition { Name = "Bea" }); + c.Worlds.Add(world); + }, + title: titles); + await using var _app = app; + + // Worked out from the first header, but not written anywhere until the loop runs. + await Assert.That(app.ShownTitle).IsNotNull(); + await Assert.That(titles.Shown).IsEmpty(); + + app.StartTitle(); + app.DispatchCommand(CommandIds.Character("Mush.Ann")); + await Assert.That(app.ShownTitle).IsEqualTo("Ann@Mush — SharpMUTerm"); + + app.DispatchCommand(CommandIds.Character("Mush.Bea")); + await Assert.That(app.ShownTitle).IsEqualTo("Bea@Mush — SharpMUTerm"); + await Assert.That(titles.Shown.Count).IsGreaterThanOrEqualTo(3); + await Assert.That(titles.Shown[^2..]).IsEquivalentTo(new[] { "Ann@Mush — SharpMUTerm", "Bea@Mush — SharpMUTerm" }); + } + + [Test] + public async Task TheTerminalsTitleSequenceCannotBeEndedEarly() + { + var sequence = TerminalTitle.Sequence("Ann\u0007@\u001b\\Mush"); + + await Assert.That(sequence).IsEqualTo("\u001b]2;Ann@\\Mush\u001b\\"); + } + + private sealed class Reader : IAnnouncer + { + public (string Window, IReadOnlyList Lines)? Last { get; private set; } + + public void Announce(string text, AnnouncementKind kind) + { + } + + public void Reading(string window, IReadOnlyList lines) => Last = (window, lines); + } + + [Test] + public async Task TheReaderIsGivenTheWindowInFrontAndItsNewestLines() + { + var reader = new Reader(); + var (app, wire, _) = Open( + c => + { + var world = new WorldDefinition { Name = "Mush", Host = "mush.example", Port = 4201 }; + world.Characters.Add(new CharacterDefinition { Name = "Ann" }); + c.Worlds.Add(world); + }, + announcer: reader); + await using var _app = app; + app.DispatchCommand(CommandIds.Character("Mush.Ann")); + await app.FindSession("Mush.Ann")!.ConnectAsync(); + + for (var i = 0; i < IAnnouncer.ReadingLines + 5; i++) + { + wire.Receive($"line {i}"); + } + + app.RenderNextFrame(); + + var (window, lines) = reader.Last!.Value; + await Assert.That(window).IsEqualTo("Ann"); + await Assert.That(lines.Count).IsEqualTo(IAnnouncer.ReadingLines); + await Assert.That(lines[^1]).IsEqualTo($"line {IAnnouncer.ReadingLines + 4}"); + await Assert.That(lines[0]).IsEqualTo("line 5"); + } + + [Test] + public async Task ASecondLaunchHandsItsLinkToTheFirst() + { + var path = Path.Combine(Path.GetTempPath(), $"smt-{Guid.NewGuid():N}"[..16] + ".sock"); + var received = new TaskCompletionSource(); + using (var listener = LinkHandoff.Listen(received.SetResult, path)) + { + await Assert.That(listener).IsNotNull(); + + // A second listener on the same socket stands down: one client takes the links. + await Assert.That(LinkHandoff.Listen(_ => { }, path)).IsNull(); + + await Assert.That(LinkHandoff.TrySend("telnet://mud.example.org:4201", path)).IsTrue(); + await Assert.That(await received.Task.WaitAsync(TimeSpan.FromSeconds(5))).IsEqualTo("telnet://mud.example.org:4201"); + } + + // Nobody listening: the launch runs the link itself. + await Assert.That(LinkHandoff.TrySend("telnet://mud.example.org:4201", path)).IsFalse(); + await Assert.That(LinkHandoff.TrySend("telnet://x\ny", path)).IsFalse(); + } + + [Test] + public async Task AStaleSocketFileIsTakenOver() + { + var path = Path.Combine(Path.GetTempPath(), $"smt-{Guid.NewGuid():N}"[..16] + ".sock"); + await File.WriteAllTextAsync(path, string.Empty); + try + { + using var listener = LinkHandoff.Listen(_ => { }, path); + await Assert.That(listener).IsNotNull(); + } + finally + { + File.Delete(path); + } + } +} From 546544e53a3617ab9243cd66cd4511998567bb34 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 09:12:12 +0000 Subject: [PATCH 034/113] feat(window): native quit prompt, search, history, layouts and welcome In the desktop window the quit prompt, Ctrl+F, Ctrl+R, the Alt+M layouts list and the first-run welcome are native modals over the window, drawn from the Client model the cell modal draws and ending every gesture in the cell key's method. One host member, ClientHost.NativeModals (INativeModals), covers all five: the presenter owns stacking, focus return and theme. The quit prompt is never refused and always ends in front, so closing the window while F1 is open no longer hides the prompt under the composer. The terminal is unchanged. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 4 + CLAUDE.md | 41 +- .../AvaloniaConsoleDriver.cs | 6 + src/SharpMUTerm.Avalonia/ComposerView.cs | 4 +- src/SharpMUTerm.Avalonia/HistoryView.cs | 196 +++++++++ src/SharpMUTerm.Avalonia/LayoutsView.cs | 410 ++++++++++++++++++ src/SharpMUTerm.Avalonia/MainWindow.cs | 4 + src/SharpMUTerm.Avalonia/ModalOverlay.cs | 227 ++++++++++ src/SharpMUTerm.Avalonia/ModalParts.cs | 209 +++++++++ src/SharpMUTerm.Avalonia/ModalPresenter.cs | 206 +++++++++ src/SharpMUTerm.Avalonia/QuitView.cs | 151 +++++++ src/SharpMUTerm.Avalonia/SearchView.cs | 310 +++++++++++++ src/SharpMUTerm.Avalonia/WelcomeView.cs | 344 +++++++++++++++ src/SharpMUTerm.Avalonia/WindowHost.cs | 3 + src/SharpMUTerm.Client/Modals/HistoryModel.cs | 67 +++ src/SharpMUTerm.Client/Modals/LayoutsModel.cs | 108 +++++ src/SharpMUTerm.Client/Modals/ModalSession.cs | 126 ++++++ src/SharpMUTerm.Client/Modals/QuitModel.cs | 109 +++++ src/SharpMUTerm.Client/Modals/SearchModel.cs | 107 +++++ src/SharpMUTerm.Client/Modals/WelcomeModel.cs | 160 +++++++ .../Surfaces/SurfaceCatalog.cs | 93 ++++ src/SharpMUTerm.Tui/HistorySearchPrompt.cs | 22 +- src/SharpMUTerm.Tui/HistorySurface.cs | 15 +- src/SharpMUTerm.Tui/Hosting/ClientHost.cs | 12 + src/SharpMUTerm.Tui/Hosting/INativeModals.cs | 35 ++ .../Pointer/SharpMUTermApp.Surfaces.cs | 5 + src/SharpMUTerm.Tui/QuitOverlay.cs | 13 +- src/SharpMUTerm.Tui/QuitPrompt.cs | 72 +-- src/SharpMUTerm.Tui/SearchPrompt.cs | 60 +-- src/SharpMUTerm.Tui/SearchSurface.cs | 134 +++--- src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs | 243 ++++++++--- .../SharpMUTermApp.NativeModals.cs | 285 ++++++++++++ src/SharpMUTerm.Tui/SharpMUTermApp.Welcome.cs | 70 ++- src/SharpMUTerm.Tui/SharpMUTermApp.cs | 105 +++-- src/SharpMUTerm.Tui/WelcomeSurface.cs | 135 +++--- .../NativeModalTests.cs | 232 ++++++++++ .../SurfaceParityTests.cs | 279 +++++++++++- .../SurfaceCatalogTests.cs | 3 +- .../HistorySearchEndToEndTests.cs | 1 + .../NativeModalRoutingTests.cs | 222 ++++++++++ .../SharpMUTerm.Tui.Tests/QuitPromptTests.cs | 17 +- .../SearchEndToEndTests.cs | 1 + .../SearchPromptTests.cs | 1 + .../SpawnWindowIdUpgradeTests.cs | 1 + tests/SharpMUTerm.Tui.Tests/WelcomeTests.cs | 1 + 45 files changed, 4473 insertions(+), 376 deletions(-) create mode 100644 src/SharpMUTerm.Avalonia/HistoryView.cs create mode 100644 src/SharpMUTerm.Avalonia/LayoutsView.cs create mode 100644 src/SharpMUTerm.Avalonia/ModalOverlay.cs create mode 100644 src/SharpMUTerm.Avalonia/ModalParts.cs create mode 100644 src/SharpMUTerm.Avalonia/ModalPresenter.cs create mode 100644 src/SharpMUTerm.Avalonia/QuitView.cs create mode 100644 src/SharpMUTerm.Avalonia/SearchView.cs create mode 100644 src/SharpMUTerm.Avalonia/WelcomeView.cs create mode 100644 src/SharpMUTerm.Client/Modals/HistoryModel.cs create mode 100644 src/SharpMUTerm.Client/Modals/LayoutsModel.cs create mode 100644 src/SharpMUTerm.Client/Modals/ModalSession.cs create mode 100644 src/SharpMUTerm.Client/Modals/QuitModel.cs create mode 100644 src/SharpMUTerm.Client/Modals/SearchModel.cs create mode 100644 src/SharpMUTerm.Client/Modals/WelcomeModel.cs create mode 100644 src/SharpMUTerm.Tui/Hosting/INativeModals.cs create mode 100644 src/SharpMUTerm.Tui/SharpMUTermApp.NativeModals.cs create mode 100644 tests/SharpMUTerm.Avalonia.Tests/NativeModalTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/NativeModalRoutingTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 063f7b42..421d12fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- Desktop window: the quit prompt, search (Ctrl+F), history search (Ctrl+R), the layouts list (Alt+M) and the + first-run welcome are native dialogs in the window's light or dark look, worked from the keyboard exactly as in the + terminal. The quit prompt always comes up in front of whatever is open — closing the window while writing a post + no longer hides it behind the composer — and Stay takes you back to what you were doing. - Triggers, aliases, key bindings and timers (F2, F3, F4, F6) open in the desktop window's settings as a list beside the selected item's fields: tick a box to switch one on or off, add, copy, delete or move it up and down, and watch the trigger's live test mark the matching lines as you type its pattern. A package's sets are shown diff --git a/CLAUDE.md b/CLAUDE.md index 763a96aa..54be9043 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -1268,7 +1268,7 @@ one `SharpMUTermApp`; a host is only the place it runs. What differs between hos (`src/SharpMUTerm.Tui/Hosting/`): driver, capabilities, clipboard, URL opener, focus reporting, keys (`HostKeys`: the newline chord, and the chords the host keeps for itself), whether there is a main loop, the Sixel cell size, and what it does with the pointer (`IPointerPresenter`, null for none), whether it draws the declared settings natively (`INativeSettings`, null for the cell screens), and whether it -draws ⌃P natively (`INativePalette`, null for the cell popup), whether it draws the composer with its own editor (`INativeComposer`, null for cells), and which chrome it draws itself beside the cells (`HostChrome`: the header and the rail, which the client then leaves out of the grid). Built by `ClientHost.Terminal`, `ClientHost.Headless`/`Snapshot` and +draws ⌃P natively (`INativePalette`, null for the cell popup), whether it draws the composer with its own editor (`INativeComposer`, null for cells), whether it draws the quit prompt, ⌃F, ⌃R, ⌥M and the welcome itself (`INativeModals`, null for cells), and which chrome it draws itself beside the cells (`HostChrome`: the header and the rail, which the client then leaves out of the grid). Built by `ClientHost.Terminal`, `ClientHost.Headless`/`Snapshot` and `WindowHost.Create` (Avalonia). Four things keep a feature from landing in one host only: - **Every `ClientHost` and `HostKeys` member is `required`**, so a member added there does not compile until @@ -1816,7 +1816,9 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] panels are not published, so F1 is never under a docked editor. - **F1 is an overlay over the cell area, under the desktop layer**, so the native header and sidebar stay (inert, as under a modal) and a toast is still seen over it. ⌥⏎ is the window's (it maximises); ⏎, ⌃⏎ and ⇧⏎ are newlines. - ⌃Q in F1 closes it first and then asks to quit, so the cell quit prompt is never hidden under it. + ⌃Q in F1 goes to the client and leaves F1 open: the native quit prompt is drawn in front of it, and Stay comes back + to the post. (A host with the native F1 but no native modals closes F1 first, keeping the draft, so the cell prompt + is not hidden — `ToggleQuit`.) - **The misspelling is a real wavy line**, drawn by a layer over the editor (`ComposerView.MarkLayer`) from the editor's own text layout (`TextLayout.HitTestTextRange`), so it follows wrapping and scrolling. The right-click menu offers WeCantSpell's suggestions (`SpellChecker.Suggest`, six at most), Add to dictionary, the editor's edits and the @@ -1830,6 +1832,41 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] - Screenshots from a real window under Xvfb, driven with XTest (`ux-wave7/composer-*.png`). `--demo-config` in the window opens the installed dictionary read-only. Not done: no per-character face choice saved, no find bar, and the window's ⌥W adds to the run's dictionary in the demo only (a live client writes `user-words.txt` as F1 does). +- **In the window, the quit prompt, ⌃F, ⌃R, ⌥M and the welcome are native modals** (`ClientHost.NativeModals` → + `INativeModals`; Client `Modals/`: `ModalSession`, `QuitModel`/`QuitSession`, `SearchModel`/`SearchSession`, + `HistoryModel`/`HistorySession`, `LayoutsModel`/`LayoutsSession`, `WelcomeModel`/`WelcomeSession`; Avalonia + `ModalPresenter` on the driver, `ModalOverlay`, `QuitView`, `SearchView`, `HistoryView`, `LayoutsView`, `WelcomeView`, + `ModalParts`; `SharpMUTermApp.NativeModals.cs`). Decisions not to relitigate: + - **One host member for five modals**, not five. What they share is the hard part — stacking (the quit prompt in + front of everything), giving the keyboard back, the theme — and one presenter decides it once. A session per modal + carries its model and the gestures; `Available` is false until the main window attaches it, so `--render-png`, the + parity harness and every test without a window get the cells. + - **The model is the cell modal's.** `QuitPrompt.Render(QuitModel)`, `SearchPrompt.Render(SearchModel)`, + `HistorySearchPrompt.Render(HistoryModel, …)`, `LayoutsListLines(LayoutsModel)` and `WelcomeSurface.Render(WelcomeModel)` + draw the same records the views draw. ⌃F's hits come from one function (`SearchModelFor`, which the cell surface + asks too); ⌃R's rows are `HistoryModel.View` (= `HistorySearch.Match`) in both. + - **Every gesture ends in the cell key's method**: Y → `Quit`; ⏎ on a hit → `GoToSearchHit(model, index)`; ⏎ in ⌃R → + `InsertHistoryEntry`; every ⌥M key and button → `RunLayoutsVerb`, which returns the `LayoutActionResult` both lists + show as their status; the welcome's choices → `RunWelcomeAction`, and its form → `WelcomeSurface.Submit(form)` → + `ConnectFromWelcome` → `ConnectCommand`. The views read keys through the pure prompts' `Interpret`, so a key means + the same in both hosts; ⌥M's ↑↓ stop at the ends as the cell list does. + - **The quit prompt is never refused and always ends in front.** `ModalPresenter` adds it last, moves it back to the + end when anything is added to the root after it (⌃P, F1, a toast), activates the main window over the settings + window, and opens any other modal under it. ⌃Q from inside another modal is forwarded to the client, which opens + the prompt over it; Stay returns to what was open. The client funnels are `ToggleQuit`, `ToggleSearch`, + `ToggleHistorySearch`, `ShowLayouts`, `ShowWelcome`; each closes its own native modal on its chord. + - **Fluent scoped to the card** (the palette's rule), in the client's dark or light variant (`ModalColours.Dark`/ + `Light`, the palette's colours and accent). A press on the scrim is Esc (the quit prompt: Stay). Focus goes back to + what had it when the modal opened if it is still on screen, else to the cells, whose pin puts it on the command line. + - **Parity**: `HostParityTests` has no presenter attached, so it compares the cell modals. `SurfaceParityTests` + holds the native side: the session's model equals the cell modal's for `quit`, `search`, `search-regex`, + `search-all`, `history-search` (and the filtered rows), `layouts`, `welcome` and `welcome-connect`; and quit Y/N, + search ⏎ / ⌥A / ⌥E, history ⏎, layouts apply / save as new / rename / delete, and the welcome's connect and + layout+settings end in the same `Outcome` as the cell keys. `NativeModalRoutingTests` (Tui) and `NativeModalTests` + (Avalonia, headless) drive the routing, the stacking and the views. The `search*` and `history-search` snapshot + views open the native surface when there is one (that is how the window's screenshots are taken). + - Screenshots from a real window under Xvfb, driven with XTest (`ux-wave8/modals-*.png`). Not done: the native ⌃R + filters in its own box, so the `history-search-filter` view shows its list unfiltered in the window. - **Settings screens have no `IPasteTarget` and cannot easily have one.** They are markup rebuilt wholesale every key, with the edited field a buffer in `SettingsSession`. `SettingsOverlay` listens at `IConsoleDriver.Paste` instead. That can't double-fire *only* because no control on diff --git a/src/SharpMUTerm.Avalonia/AvaloniaConsoleDriver.cs b/src/SharpMUTerm.Avalonia/AvaloniaConsoleDriver.cs index e67b927d..1b3a60e4 100644 --- a/src/SharpMUTerm.Avalonia/AvaloniaConsoleDriver.cs +++ b/src/SharpMUTerm.Avalonia/AvaloniaConsoleDriver.cs @@ -79,6 +79,12 @@ public AvaloniaConsoleDriver(int columns, int rows) /// The window's native F1, drawn over the cells in the main window (). public ComposerPresenter Composer { get; } = new(); + /// + /// The window's native quit prompt, ⌃F, ⌃R, ⌥M and welcome, drawn over everything in the main window, the quit prompt + /// always in front (). + /// + public ModalPresenter Modals { get; } = new(); + public bool IsRunning { get; private set; } // ── IConsoleDriver: output ──────────────────────────────────────────────────────────────── diff --git a/src/SharpMUTerm.Avalonia/ComposerView.cs b/src/SharpMUTerm.Avalonia/ComposerView.cs index a51c59ec..1de23852 100644 --- a/src/SharpMUTerm.Avalonia/ComposerView.cs +++ b/src/SharpMUTerm.Avalonia/ComposerView.cs @@ -452,7 +452,8 @@ private void OnEditorKeyDown(object? sender, KeyEventArgs e) if (_fullScreen) { - // F1 again closes it, as the cell window's F1 does; ⌃Q closes it first so the quit prompt is not under it. + // F1 again closes it, as the cell window's F1 does. ⌃Q goes to the client and leaves F1 open: the quit prompt + // is drawn in front of it (ModalPresenter), so Stay comes back to the post. if (e.Key == Key.F1 && mods == KeyModifiers.None) { e.Handled = true; @@ -461,7 +462,6 @@ private void OnEditorKeyDown(object? sender, KeyEventArgs e) else if (e.Key == Key.Q && mods == KeyModifiers.Control && mapped is { } quit) { e.Handled = true; - session.Close(text); _view.Driver.RaiseKey(quit); } diff --git a/src/SharpMUTerm.Avalonia/HistoryView.cs b/src/SharpMUTerm.Avalonia/HistoryView.cs new file mode 100644 index 00000000..eaa76b79 --- /dev/null +++ b/src/SharpMUTerm.Avalonia/HistoryView.cs @@ -0,0 +1,196 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Input; +using Avalonia.Interactivity; +using Avalonia.Media; +using SharpMUTerm.Client.Modals; +using SharpMUTerm.Core.Input; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Avalonia; + +/// +/// The window's ⌃R: whose list it is, a filter box, and the command line's history newest first with the match +/// marked. The list is the client's snapshot () filtered by the same function the cells use +/// (), so a query lists the same rows; ⏎ places the entry on the command line and +/// sends nothing. The keys that are not typing are read by the cells' rules (). +/// +internal sealed class HistoryView : DockPanel, IModalView +{ + private readonly HistorySession _session; + private readonly ModalColours _colours; + private readonly Action _done; + private readonly TextBox _box; + private readonly TextBlock _count; + private readonly StackPanel _list; + private readonly List _rows = []; + private IReadOnlyList _matches = []; + private int _selected; + + public HistoryView(HistorySession session, ModalColours colours, Action done) + { + _session = session; + _colours = colours; + _done = done; + var model = session.Model; + + _box = ModalParts.SearchBox("Filter the history…", "Filter the history"); + SetDock(_box, Dock.Top); + Children.Add(_box); + + var header = new DockPanel { Margin = new Thickness(20, 0, 20, 6) }; + var whose = new TextBlock { Text = model.BarLabel, FontSize = 12.5, Foreground = colours.Brush(colours.Dim) }; + _count = new TextBlock { FontSize = 12.5, Foreground = colours.Brush(colours.Dim), HorizontalAlignment = global::Avalonia.Layout.HorizontalAlignment.Right }; + SetDock(whose, Dock.Left); + header.Children.Add(whose); + header.Children.Add(_count); + SetDock(header, Dock.Top); + Children.Add(header); + + var footer = ModalParts.Footer("↑↓ pick · Enter places it on the command line · Esc cancel", colours); + SetDock(footer, Dock.Bottom); + Children.Add(footer); + + var (frame, list, _) = ModalParts.List(colours); + _list = list; + frame.MinHeight = 120; + Children.Add(frame); + + _box.TextChanged += (_, _) => + { + _selected = 0; + Draw(); + }; + AddHandler(KeyDownEvent, OnKey, RoutingStrategies.Tunnel); + Draw(); + } + + public string Title => "Command history"; + + public double PreferredWidth => 680; + + public bool Centred => false; + + /// The rows listed now, for a test. + public IReadOnlyList Matches => _matches; + + /// The row ⏎ places. + public int Selected => _selected; + + /// The filter box, for a test. + public TextBox Box => _box; + + public void FocusFirst() => _box.Focus(); + + public void Detach() + { + } + + /// ⏎ on listed row . + public void Insert(int row) + { + if (row >= 0 && row < _matches.Count) + { + _session.Insert(_matches[row].Index); + _done(); + } + } + + private void Draw() + { + var model = _session.Model; + _matches = model.View(_box.Text ?? string.Empty); + _count.Text = model.CountText(_matches.Count); + _list.Children.Clear(); + _rows.Clear(); + _selected = _matches.Count == 0 ? 0 : Math.Clamp(_selected, 0, _matches.Count - 1); + if (_matches.Count == 0) + { + _list.Children.Add(new TextBlock + { + Text = model.Entries.Count == 0 ? HistoryModel.NothingEntered : HistoryModel.NoMatches, + Foreground = _colours.Brush(_colours.Dim), + Margin = new Thickness(12, 10), + TextWrapping = TextWrapping.Wrap, + }); + return; + } + + var mono = new FontFamily($"{CellFonts.BundledFamily}, DejaVu Sans Mono, Consolas, Menlo, monospace"); + for (var i = 0; i < _matches.Count; i++) + { + var match = _matches[i]; + var index = i; + var text = new TextBlock + { + Foreground = _colours.Brush(_colours.Text), + FontFamily = mono, + FontSize = 13, + TextTrimming = TextTrimming.CharacterEllipsis, + }; + text.Inlines = ModalParts.Marked(match.Text, match.MatchStart, match.MatchLength, _colours); + var row = ModalParts.Row(text, match.Text, () => Select(index), () => Insert(index)); + _rows.Add(row); + _list.Children.Add(row); + } + + Highlight(); + } + + private void Select(int index) + { + if (index != _selected) + { + _selected = index; + Highlight(); + } + } + + private void Highlight() + { + for (var i = 0; i < _rows.Count; i++) + { + _rows[i].Background = i == _selected ? _colours.Brush(_colours.Selected) : Brushes.Transparent; + } + + if (_selected < _rows.Count) + { + _rows[_selected].BringIntoView(); + } + } + + private void OnKey(object? sender, KeyEventArgs e) + { + if (ModalParts.Console(e) is not { } key) + { + return; + } + + var bare = key.Modifiers == 0; + if (bare && key.Key is not (ConsoleKey.UpArrow or ConsoleKey.DownArrow or ConsoleKey.Enter or ConsoleKey.Escape)) + { + return; + } + + var decision = HistorySearchPrompt.Interpret(key, _box.Text ?? string.Empty, _selected, _matches.Count); + if (!bare && decision.Action == HistoryAction.None) + { + return; + } + + e.Handled = true; + switch (decision.Action) + { + case HistoryAction.Insert: + Insert(_selected); + break; + case HistoryAction.Cancel: + _session.Dismiss(); + _done(); + break; + case HistoryAction.Redraw: + Select(decision.Selected); + break; + } + } +} diff --git a/src/SharpMUTerm.Avalonia/LayoutsView.cs b/src/SharpMUTerm.Avalonia/LayoutsView.cs new file mode 100644 index 00000000..351b75f5 --- /dev/null +++ b/src/SharpMUTerm.Avalonia/LayoutsView.cs @@ -0,0 +1,410 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Input; +using Avalonia.Interactivity; +using Avalonia.Layout; +using Avalonia.Media; +using Avalonia.Threading; +using SharpMUTerm.Client.Modals; + +namespace SharpMUTerm.Avalonia; + +/// +/// The window's ⌥M: the character's layouts, BUILT IN then YOURS, with what each is in use for, and a row of buttons +/// for what can be done to the one pointed at. Every button and key is a the client runs +/// through the method the cell list's key runs, and what it said comes back as the list's status. The keys are the +/// cell list's: ⏎ apply, S save changes, N save as new, W use for the world, C use for this character, R rename and D +/// delete (a layout of the player's own only), ↑↓ move, Esc closes. +/// +internal sealed class LayoutsView : DockPanel, IModalView +{ + private readonly LayoutsSession _session; + private readonly ModalColours _colours; + private readonly Action _done; + private readonly StackPanel _list; + private readonly TextBlock _status; + private readonly WrapPanel _buttons; + private readonly TextBox _rename; + private readonly List _rows = []; + private readonly List _rowIndex = []; + private LayoutsModel _model; + private int _selected; + private bool _renaming; + private bool _confirming; + + public LayoutsView(LayoutsSession session, ModalColours colours, Action done) + { + _session = session; + _colours = colours; + _done = done; + _model = session.Model; + _selected = _model.Selected; + + var heading = ModalParts.Heading("Layouts", colours); + SetDock(heading, Dock.Top); + Children.Add(heading); + var whose = ModalParts.Dim($"How {_model.Subject}'s panes are arranged. Applying one never closes a window.", colours); + SetDock(whose, Dock.Top); + Children.Add(whose); + + _rename = new TextBox + { + Margin = new Thickness(14, 4, 14, 4), + Padding = new Thickness(10, 6), + CornerRadius = new CornerRadius(7), + IsVisible = false, + PlaceholderText = "New name", + }; + global::Avalonia.Automation.AutomationProperties.SetName(_rename, "New name"); + + var footer = ModalParts.Footer("↑↓ pick · Enter apply · Esc close", colours); + SetDock(footer, Dock.Bottom); + Children.Add(footer); + + _buttons = new WrapPanel { Margin = new Thickness(14, 8, 14, 0), HorizontalAlignment = HorizontalAlignment.Right }; + SetDock(_buttons, Dock.Bottom); + Children.Add(_buttons); + + _status = ModalParts.Dim(string.Empty, colours, new Thickness(20, 8, 20, 0)); + SetDock(_status, Dock.Bottom); + Children.Add(_status); + + SetDock(_rename, Dock.Bottom); + Children.Add(_rename); + + var (frame, list, _) = ModalParts.List(colours); + _list = list; + Children.Add(frame); + + AddHandler(KeyDownEvent, OnKey, RoutingStrategies.Tunnel); + _session.Changed += OnChanged; + Draw(); + } + + public string Title => "Layouts"; + + public double PreferredWidth => 640; + + public bool Centred => false; + + /// The model drawn now, for a test. + public LayoutsModel Model => _model; + + /// The row pointed at. + public int Selected => _selected; + + /// The buttons offered now, by label, for a test. + public IReadOnlyList Compose, + + /// + /// A modal's gesture — a query typed, a toggle flipped, a row chosen, an answer given — handed back through the + /// modal's session (ModalSession). + /// + Modal, } /// @@ -152,6 +159,34 @@ public static class SurfaceCatalog /// F1, the full-screen composer: a cell modal in a terminal, the window's native editor in its place. public const string Compose = "compose"; + /// The ⌃Q confirmation: a cell modal in a terminal, a native prompt in the window. + public const string Quit = "quit"; + + /// ⌃F, the search over the pane buffers. + public const string Search = "search"; + + /// ⌃R, the armed command line's history. + public const string History = "history"; + + /// ⌥M, the layouts list. + public const string Layouts = "layouts"; + + /// The first-run welcome and its connect form. + public const string Welcome = "welcome"; + + /// The modals the window draws with its own controls in place of the cell modal (ClientHost.NativeModals). + public static IReadOnlyList Modals { get; } = [Quit, Search, History, Layouts, Welcome]; + + /// A cell modal in a terminal; the window's own modal in its place. + private static readonly IReadOnlyDictionary NativeModal = new Dictionary + { + [SurfaceHosts.Terminal] = SurfaceDrawing.Cells, + [SurfaceHosts.Window] = SurfaceDrawing.Native, + }; + + /// The window's overlay every native modal is drawn in, and the view of one. + private static string[] ModalViews(string view) => ["SharpMUTerm.Avalonia.ModalOverlay", "SharpMUTerm.Avalonia." + view]; + /// /// The header and the rail: cells in a terminal; in the window (HostChrome.HeaderAndRail) native views /// beside the cells, which then leave them out. @@ -333,6 +368,64 @@ public static class SurfaceCatalog CellsUnderNative, "SharpMUTerm.Tui.Panels.DockedComposer.Render", ["SharpMUTerm.Avalonia.ComposerView", "SharpMUTerm.Avalonia.ComposerEditor"]), + new( + Quit, + typeof(QuitModel), + [ + // y: the client's quit. n, Esc and ⌃Q again: the prompt closes and nothing else happens. + new(SurfaceActionKind.Modal, "quit", "Quit"), + new(SurfaceActionKind.Modal, "stay", "QuitPromptClosed"), + ], + NativeModal, + "SharpMUTerm.Tui.QuitPrompt.Render", + ModalViews("QuitView")), + new( + Search, + typeof(SearchModel), + [ + // Typing, ⌥E and ⌥A re-run the search over the pane buffers; ⏎ goes to the row through the one path to a hit. + new(SurfaceActionKind.Modal, "query", "SearchModelFor"), + new(SurfaceActionKind.Modal, "go", "GoToSearchHit"), + ], + NativeModal, + "SharpMUTerm.Tui.SearchPrompt.Render", + ModalViews("SearchView")), + new( + History, + typeof(HistoryModel), + [new(SurfaceActionKind.Modal, "insert", "InsertHistoryEntry")], + NativeModal, + "SharpMUTerm.Tui.HistorySearchPrompt.Render", + ModalViews("HistoryView")), + new( + Layouts, + typeof(LayoutsModel), + [ + new(SurfaceActionKind.Modal, nameof(LayoutVerb.Apply), "RunLayoutsVerb"), + new(SurfaceActionKind.Modal, nameof(LayoutVerb.SaveChanges), "RunLayoutsVerb"), + new(SurfaceActionKind.Modal, nameof(LayoutVerb.SaveAsNew), "RunLayoutsVerb"), + new(SurfaceActionKind.Modal, nameof(LayoutVerb.UseForWorld), "RunLayoutsVerb"), + new(SurfaceActionKind.Modal, nameof(LayoutVerb.UseForCharacter), "RunLayoutsVerb"), + new(SurfaceActionKind.Modal, nameof(LayoutVerb.Rename), "RunLayoutsVerb"), + new(SurfaceActionKind.Modal, nameof(LayoutVerb.Delete), "RunLayoutsVerb"), + ], + NativeModal, + "SharpMUTerm.Tui.SharpMUTermApp.LayoutsListLines", + ModalViews("LayoutsView")), + new( + Welcome, + typeof(WelcomeModel), + [ + // Browse and Open settings close it and open what they name; Connect opens the form. + new(SurfaceActionKind.Modal, "choose", "RunWelcomeAction"), + new(SurfaceActionKind.Modal, "layout", "SetWelcomeLayout"), + + // The form goes through /connect's own path (ConnectCommand), so it can add nothing the command line cannot. + new(SurfaceActionKind.Modal, "connect", "ConnectFromWelcome"), + ], + NativeModal, + "SharpMUTerm.Tui.WelcomeSurface.Render", + ModalViews("WelcomeView")), ]; /// The surface with , or null. diff --git a/src/SharpMUTerm.Tui/HistorySearchPrompt.cs b/src/SharpMUTerm.Tui/HistorySearchPrompt.cs index 92794fe4..a3ed692f 100644 --- a/src/SharpMUTerm.Tui/HistorySearchPrompt.cs +++ b/src/SharpMUTerm.Tui/HistorySearchPrompt.cs @@ -1,3 +1,4 @@ +using SharpMUTerm.Client.Modals; using SharpMUTerm.Core.Input; using static SharpMUTerm.Tui.MarkupText; using static SharpMUTerm.Tui.ScreenPalette; @@ -133,6 +134,23 @@ internal static HistoryDecision Interpret(ConsoleKeyInfo key, string query, int private static int Step(int selected, int delta, int count) => count == 0 ? -1 : ((selected + delta) % count + count) % count; + /// + /// The surface over — the cells of the model the window's native history draws too — + /// listing , which are for . + /// + internal static List Render( + HistoryModel model, + IReadOnlyList matches, + string query, + int selected, + int width = 0, + int listRows = 0, + int first = 0) + { + ArgumentNullException.ThrowIfNull(model); + return Render(matches, query, selected, model.Entries.Count, model.BarLabel, width, listRows, first); + } + /// /// The whole surface as markup lines: the query line, the rows newest-first with the pointed-at one /// filled, and the keys. is the surface's content width when known, which @@ -173,11 +191,11 @@ internal static List Render( var body = new List(); if (total == 0) { - body.Add($"[{Muted}] nothing has been entered on this command line yet[/]"); + body.Add($"[{Muted}] {HistoryModel.NothingEntered}[/]"); } else if (matches.Count == 0) { - body.Add($"[{Muted}] no matches — ⌫ widens the filter[/]"); + body.Add($"[{Muted}] {HistoryModel.NoMatches}[/]"); } var top = Math.Clamp(first, 0, Math.Max(0, matches.Count - 1)); diff --git a/src/SharpMUTerm.Tui/HistorySurface.cs b/src/SharpMUTerm.Tui/HistorySurface.cs index c0c3caeb..c1736979 100644 --- a/src/SharpMUTerm.Tui/HistorySurface.cs +++ b/src/SharpMUTerm.Tui/HistorySurface.cs @@ -1,6 +1,7 @@ using SharpConsoleUI; using SharpConsoleUI.Builders; using SharpConsoleUI.Controls; +using SharpMUTerm.Client.Modals; using SharpMUTerm.Core.Input; namespace SharpMUTerm.Tui; @@ -46,6 +47,7 @@ internal sealed class HistorySurface private readonly Func> _entries; private readonly Func _label; private readonly Action _insert; + private readonly Action? _closed; private Window? _window; private MarkupControl? _body; @@ -71,8 +73,10 @@ public HistorySurface( ConsoleWindowSystem system, Func> entries, Func label, - Action insert) + Action insert, + Action? closed = null) { + _closed = closed; _system = system; _entries = entries; _label = label; @@ -83,7 +87,13 @@ public HistorySurface( /// What the surface is currently showing, for a headless test to read back. internal IReadOnlyList Lines => HistorySearchPrompt.Render( - _matches, _query, _selected, _snapshot.Count, _barLabel, _contentWidth - 1, _listRows, _first); + Snapshot, _matches, _query, _selected, _contentWidth - 1, _listRows, _first); + + /// The history and whose it is, as captured when the surface opened. + private HistoryModel Snapshot => new(_snapshot, _barLabel); + + /// The model the open surface is drawn from, or null while it is closed. + internal HistoryModel? Model => _window is null ? null : Snapshot; /// The filter as typed so far. internal string Query => _query; @@ -242,5 +252,6 @@ private void Reset() { _window = null; _body = null; + _closed?.Invoke(); } } diff --git a/src/SharpMUTerm.Tui/Hosting/ClientHost.cs b/src/SharpMUTerm.Tui/Hosting/ClientHost.cs index dd7195f9..8e545d3f 100644 --- a/src/SharpMUTerm.Tui/Hosting/ClientHost.cs +++ b/src/SharpMUTerm.Tui/Hosting/ClientHost.cs @@ -105,6 +105,8 @@ internal sealed record ClientHost /// the terminal, the snapshot and the tests, so their frames are the ones they always were. /// public required HostChrome Chrome { get; init; } + + /// /// Draws ⌃P with the host's own controls, or null for a host whose palette is the cell popup. Every way in (⌃P, /// the header, the pointer menu's More commands…) goes through one funnel that asks this first. Null in /// the terminal, the snapshot, the tests and the parity harness, so every cell frame is unchanged. @@ -119,6 +121,14 @@ internal sealed record ClientHost /// public required INativeComposer? NativeComposer { get; init; } + /// + /// Draws the client's modals — the quit prompt, ⌃F search, ⌃R history, the ⌥M layouts list and the first-run welcome — + /// with the host's own controls, or null for a host whose modals are cell windows. One member for all five, because + /// their stacking (the quit prompt always in front), focus and theme are the host's to get right once. Null in the + /// terminal, the snapshot, the tests and the parity harness, so every cell frame is unchanged. + /// + public required INativeModals? NativeModals { get; init; } + /// /// Whether the terminal driver's input path can decode a focus report. Not on Windows: the Windows branch of /// NetConsoleDriver is a Console.ReadKey loop with its own reassembly, and an ESC [ I @@ -160,6 +170,7 @@ public static ClientHost Terminal(TerminalCapabilities capabilities) Chrome = HostChrome.None, NativePalette = null, NativeComposer = null, + NativeModals = null, }; /// @@ -186,6 +197,7 @@ public static ClientHost Terminal(TerminalCapabilities capabilities) Chrome = HostChrome.None, NativePalette = null, NativeComposer = null, + NativeModals = null, }; /// diff --git a/src/SharpMUTerm.Tui/Hosting/INativeModals.cs b/src/SharpMUTerm.Tui/Hosting/INativeModals.cs new file mode 100644 index 00000000..67863def --- /dev/null +++ b/src/SharpMUTerm.Tui/Hosting/INativeModals.cs @@ -0,0 +1,35 @@ +using SharpMUTerm.Client.Modals; + +namespace SharpMUTerm.Tui; + +/// +/// A host that draws the client's modals with its own controls (the desktop window's native modals) instead of cell +/// windows: the quit prompt, ⌃F search, ⌃R history, the ⌥M layouts list and the first-run welcome. The client hands it +/// a built on the client's thread — one of , +/// , , or +/// — and the host draws its model and hands every gesture back through it. +/// +/// One member for five modals, because what they share is exactly what a host must get right once: where a +/// modal is drawn (over the cells, the native panels and the chrome), what is in front when two are open (the quit +/// prompt, always), where the keyboard goes when one closes, and which theme it wears. Five interfaces would be five +/// places to get the stacking wrong. +/// +/// +internal interface INativeModals +{ + /// + /// Whether the host has somewhere to draw a modal now. False for a host built without a window (the window's + /// --render-png, the parity harness, a test), which then gets the cell modals. Read on the client's thread. + /// + bool Available { get; } + + /// + /// Shows . A session that is (the quit prompt) is + /// drawn over everything, including another modal, which stays open under it; any other replaces the modal open. + /// Called on the client's thread; the host marshals. + /// + void Show(ModalSession session); + + /// Closes if it is shown, saying nothing back. Called on the client's thread. + void Close(ModalSession session); +} diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Surfaces.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Surfaces.cs index 4ff89cf5..4ba87a0d 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Surfaces.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Surfaces.cs @@ -28,6 +28,11 @@ private T Drawing(string surface, string key, T model) surface == SurfaceCatalog.Palette ? (_palette.IsOpen ? _palette.View : null) : surface == SurfaceCatalog.Prefix ? (_prefixPanel.IsOpen ? _prefixPanel.Drawn : null) : surface == SurfaceCatalog.Compose ? (_composer.IsOpen ? _composer.Model : null) + : surface == SurfaceCatalog.Quit ? _quit.Model + : surface == SurfaceCatalog.Search ? _search.Model + : surface == SurfaceCatalog.History ? _historySearch.Model + : surface == SurfaceCatalog.Layouts ? (_layoutsView.IsOpen && _layoutsView.Mode == "layouts" && LayoutsKey() is { } key2 ? LayoutsModelFor(key2) : null) + : surface == SurfaceCatalog.Welcome ? (_welcomeView.IsOpen ? _welcome?.Model : null) : _drawnModels.TryGetValue((surface, key), out var model) ? model : null; /// A click on a header link, as the header's own handler receives it. diff --git a/src/SharpMUTerm.Tui/QuitOverlay.cs b/src/SharpMUTerm.Tui/QuitOverlay.cs index f8c8eeaa..ac11b860 100644 --- a/src/SharpMUTerm.Tui/QuitOverlay.cs +++ b/src/SharpMUTerm.Tui/QuitOverlay.cs @@ -1,6 +1,7 @@ using SharpConsoleUI; using SharpConsoleUI.Builders; using SharpConsoleUI.Controls; +using SharpMUTerm.Client.Modals; using static SharpMUTerm.Tui.MarkupText; namespace SharpMUTerm.Tui; @@ -22,12 +23,13 @@ internal sealed class QuitOverlay private const int MinimumWidth = 34; private readonly ConsoleWindowSystem _system; - private readonly Func _facts; + private readonly Func _facts; private readonly Action _quit; + private readonly Action? _closed; private Window? _window; private MarkupControl? _body; - private QuitFacts _current = QuitFacts.Nothing; + private QuitModel _current = QuitModel.Nothing; private QuitChoice _selected = QuitChoice.Stay; /// @@ -35,8 +37,9 @@ internal sealed class QuitOverlay /// about is the state their keystroke arrived in. is what a confirmed answer /// runs; the overlay never ends the loop itself. /// - public QuitOverlay(ConsoleWindowSystem system, Func facts, Action quit) + public QuitOverlay(ConsoleWindowSystem system, Func facts, Action quit, Action? closed = null) { + _closed = closed; _system = system; _facts = facts; _quit = quit; @@ -44,6 +47,9 @@ public QuitOverlay(ConsoleWindowSystem system, Func facts, Action qui public bool IsOpen => _window is not null; + /// The model the open prompt was drawn from, or null while it is closed. + internal QuitModel? Model => _window is null ? null : _current; + /// What the prompt is currently showing, for a headless test to read back. internal IReadOnlyList Lines => QuitPrompt.Render(_current, _selected); @@ -152,5 +158,6 @@ private void Reset() { _window = null; _body = null; + _closed?.Invoke(); } } diff --git a/src/SharpMUTerm.Tui/QuitPrompt.cs b/src/SharpMUTerm.Tui/QuitPrompt.cs index d9f6b28f..ad36895b 100644 --- a/src/SharpMUTerm.Tui/QuitPrompt.cs +++ b/src/SharpMUTerm.Tui/QuitPrompt.cs @@ -1,3 +1,4 @@ +using SharpMUTerm.Client.Modals; using static SharpMUTerm.Tui.MarkupText; using static SharpMUTerm.Tui.ScreenPalette; @@ -32,39 +33,6 @@ internal enum QuitAction /// The answer to one keystroke: what to do, and which button is pointed at afterwards. internal readonly record struct QuitDecision(QuitAction Action, QuitChoice Selection); -/// -/// What a quit would end, as of the keystroke that asked. The app gathers it (only the app can see -/// sessions, windows and the open settings screen) and the prompt only renders it, so "what the -/// question says, given N connections and M drafts" is answerable without a terminal. -/// -/// -/// The connections a quit drops, by world.character (a world's own name for an anonymous one) — -/// the same list and the same unit the header's fraction counts, from the app's single derivation. It -/// used to be distinct world names, so two characters logged in on one world were announced as -/// "1 world connected" while the user was looking at two, and the one thing this prompt exists to do is -/// be trustworthy about what is at stake. -/// -/// -/// How many unsent lines there are, counted per command line rather than per window: the second bar -/// holds a line of its own, and a window counted once would hide it. -/// -/// The windows those drafts are sitting in, by title. -/// -/// An open settings screen used to be a fact here, carrying how many edits it held that were never -/// saved. It no longer is: a screen writes each change out as it is committed -/// (), so there is no such thing as an unsaved edit to warn about, and a -/// consequence line that could never be reached is worse than one fact fewer. -/// -internal readonly record struct QuitFacts( - IReadOnlyList ConnectedCharacters, - int Drafts, - IReadOnlyList DraftWindows) -{ - /// A client holding nothing: nothing connected and nothing typed. - internal static QuitFacts Nothing { get; } = - new(Array.Empty(), 0, Array.Empty()); -} - /// /// The quit confirmation, minus the window: what a keystroke means to it, and what it says. Pure, for /// the same reason is — the rules of a modal are exactly the part that a @@ -86,9 +54,6 @@ internal readonly record struct QuitFacts( /// internal static class QuitPrompt { - /// How many names a consequence line spells out before it starts counting instead. - private const int MaxNames = 3; - /// /// What one keystroke does, and where it leaves the pointer. y/n answer outright /// whatever is pointed at, Esc is the way out of every modal state in this client and stays here @@ -151,34 +116,16 @@ internal static QuitDecision Interpret(ConsoleKeyInfo key, QuitChoice selected) } /// - /// What quitting now would cost, one plain sentence per fact, and empty when it would cost nothing. - /// A bare "are you sure?" is a ritual; this client knows what it is holding, so the question names it - /// and becomes answerable. + /// What quitting now would cost, one plain sentence per fact (, which the + /// window's native prompt says too), and empty when it would cost nothing. /// - internal static IReadOnlyList Consequences(QuitFacts facts) - { - var lines = new List(); - - if (facts.ConnectedCharacters.Count > 0) - { - var n = facts.ConnectedCharacters.Count; - lines.Add($"{n} character{Plural(n)} connected — {Names(facts.ConnectedCharacters)}"); - } - - if (facts.Drafts > 0) - { - var where = facts.DraftWindows.Count > 0 ? $" — {Names(facts.DraftWindows)}" : string.Empty; - lines.Add($"{facts.Drafts} unsent draft{Plural(facts.Drafts)}{where}"); - } - - return lines; - } + internal static IReadOnlyList Consequences(QuitModel facts) => facts.Consequences; /// /// The whole surface as markup lines: the question, what it would cost, the two buttons with the /// pointed-at one filled, and the keys that answer it. /// - internal static List Render(QuitFacts facts, QuitChoice selected) + internal static List Render(QuitModel facts, QuitChoice selected) { var lines = new List { $"[bold {Value}]Quit SharpMUTerm?[/]", string.Empty }; @@ -187,7 +134,7 @@ internal static List Render(QuitFacts facts, QuitChoice selected) { // Still worth saying: "nothing is connected and nothing is unsent" is the answer to the // question the prompt just asked, and it is the state in which y is safe without reading on. - lines.Add($"[{Muted}]Nothing is connected and nothing is unsent.[/]"); + lines.Add($"[{Muted}]{QuitModel.NothingAtStake}[/]"); } else { @@ -216,11 +163,4 @@ private static string Chip(string label, bool chosen) => ? $"[{Ink} on {Accent}] ▸ {Escape(label)} [/]" : $"[{Label} on {EditBg}] {Escape(label)} [/]"; - private static string Plural(int count) => count == 1 ? string.Empty : "s"; - - /// Names, capped: past a few they stop identifying anything and only cost the line's width. - private static string Names(IReadOnlyList names) => - names.Count <= MaxNames - ? string.Join(", ", names) - : $"{string.Join(", ", names.Take(MaxNames))} +{names.Count - MaxNames} more"; } diff --git a/src/SharpMUTerm.Tui/SearchPrompt.cs b/src/SharpMUTerm.Tui/SearchPrompt.cs index 63cc7a99..68f3d991 100644 --- a/src/SharpMUTerm.Tui/SearchPrompt.cs +++ b/src/SharpMUTerm.Tui/SearchPrompt.cs @@ -1,3 +1,4 @@ +using SharpMUTerm.Client.Modals; using static SharpMUTerm.Tui.MarkupText; using static SharpMUTerm.Tui.ScreenPalette; @@ -23,13 +24,6 @@ internal enum SearchAction internal readonly record struct SearchDecision( SearchAction Action, string Query, int Selected, bool Regex, bool AllWindows); -/// -/// One row of results: which window the line is in, where it sits in that window's buffer, and where the -/// query landed inside it. -/// -internal readonly record struct SearchRow( - string WindowId, string WindowLabel, int LineIndex, string Text, int MatchStart, int MatchLength); - /// /// The search surface (⌃F), minus the window: what a keystroke means to it, and what it says. Pure, for /// the same reason is — the rules and the wording are exactly the part @@ -182,6 +176,23 @@ internal static List Render( { ArgumentNullException.ThrowIfNull(rows); ArgumentNullException.ThrowIfNull(query); + return Render(new SearchModel(query, regex, all, scope, held, error, rows), selected, width, listRows, first); + } + + /// + /// The surface for — the cells of the model the window's native search draws too. + /// + /// The query, the toggles, the bound and the matches. + /// Which row the pointer is on. + /// The surface's content width, when known. + /// How many rows the list area holds; zero means "as many as there are". + /// Which match is drawn at the top of the list area. + internal static List Render(SearchModel model, int selected, int width = 0, int listRows = 0, int first = 0) + { + ArgumentNullException.ThrowIfNull(model); + var rows = model.Rows; + var query = model.Query; + var all = model.AllWindows; var labelWidth = all ? Math.Min(MaxLabelWidth, rows.Select(r => r.WindowLabel.Length).DefaultIfEmpty(0).Max()) @@ -190,22 +201,14 @@ internal static List Render( var lines = new List { - SpreadLR($"[{Label}]search[/] {QueryMarkup(query)}", $"[{Label}]{Escape(State(regex, all, scope))}[/]", width), - SpreadLR(string.Empty, $"[{Label}]{Escape(Counted(rows.Count, error, held))}[/]", width), + SpreadLR($"[{Label}]search[/] {QueryMarkup(query)}", $"[{Label}]{Escape(model.StateText)}[/]", width), + SpreadLR(string.Empty, $"[{Label}]{Escape(model.CountText)}[/]", width), }; var body = new List(); - if (error is not null) + if (model.EmptyText is { } empty) { - body.Add($"[{Muted}] {Escape(error)}[/]"); - } - else if (query.Length == 0) - { - body.Add($"[{Muted}] type to search {Escape(all ? "every window" : scope)}[/]"); - } - else if (rows.Count == 0) - { - body.Add($"[{Muted}] no matches — ⌫ widens the query[/]"); + body.Add($"[{Muted}] {Escape(empty)}[/]"); } var top = Math.Clamp(first, 0, Math.Max(0, rows.Count - 1)); @@ -241,25 +244,6 @@ internal static int Scroll(int first, int selected, int count, int listRows) return Math.Clamp(top, 0, count - listRows); } - /// - /// The two toggles and what they currently mean, in words rather than in glyphs: the surface has to - /// be able to say which way they are set, because both change what a query finds and neither - /// is visible in the results themselves. - /// - private static string State(bool regex, bool all, string scope) => - $"{(regex ? "regex" : "text")} · {(all ? "every window" : scope)}"; - - /// - /// How many lines matched out of how many were looked at. The second figure is the bound this search - /// actually had — the pane buffer, not a session's whole history — and it is on the frame so a reader - /// who cannot find an old line can see why rather than concluding the search is broken. - /// - private static string Counted(int shown, string? error, int held) - { - var searched = $"{held:n0} line{(held == 1 ? string.Empty : "s")} held"; - return error is not null ? searched : $"{shown} found · {searched}"; - } - /// /// The query, with the accent block caret after it — the same caret the settings screens draw on an /// open field, so this reads as something being typed into. diff --git a/src/SharpMUTerm.Tui/SearchSurface.cs b/src/SharpMUTerm.Tui/SearchSurface.cs index fbf71c7f..0a2e8cf9 100644 --- a/src/SharpMUTerm.Tui/SearchSurface.cs +++ b/src/SharpMUTerm.Tui/SearchSurface.cs @@ -1,6 +1,7 @@ using SharpConsoleUI; using SharpConsoleUI.Builders; using SharpConsoleUI.Controls; +using SharpMUTerm.Client.Modals; using SharpMUTerm.Core.Text; namespace SharpMUTerm.Tui; @@ -44,55 +45,90 @@ internal sealed class SearchSurface private const int ChromeRows = 4; private readonly ConsoleWindowSystem _system; - private readonly Func> _corpus; - private readonly Action _go; + private readonly Func _search; + private readonly Action _go; + private readonly Action? _closed; private Window? _window; private MarkupControl? _body; - private IReadOnlyList _rows = Array.Empty(); - private string _query = string.Empty; - private string? _error; - private string _scope = string.Empty; - private bool _regex; - private bool _all; - private int _held; + private SearchModel _model = Empty; private int _selected = -1; private int _contentWidth; private int _listRows; private int _first; + /// A search that has not been typed yet. + private static readonly SearchModel Empty = new(string.Empty, false, false, string.Empty, 0, null, []); + /// - /// is asked for the windows to search — all of them, or just the focused - /// one — and is read afresh on every keystroke. is handed the chosen row, the - /// query, and its ordinal out of the total, which is what the bar above the landed line says. + /// runs the search for a query and the two toggles, reading the windows + /// afresh — the client's SearchModelFor, which the window's native search calls too. + /// is handed the model and the chosen row's index in it, which is everything the + /// bar above the landed line says. /// public SearchSurface( ConsoleWindowSystem system, - Func> corpus, - Action go) + Func search, + Action go, + Action? closed = null) { _system = system; - _corpus = corpus; + _search = search; _go = go; + _closed = closed; + } + + /// + /// The search for over : every window's matches in + /// buffer order, or none and the reason when the pattern does not parse. The one place a search is run, + /// for the cell surface and the window's native one alike. + /// + internal static SearchModel Compute(IReadOnlyList windows, string query, bool regex, bool all) + { + var scope = windows.Count == 1 ? windows[0].Label : "the focused window"; + var held = windows.Sum(w => w.Lines.Count); + + var rows = new List(); + string? error = null; + foreach (var window in windows) + { + var result = OutputSearch.Match(window.Lines, query, regex); + if (result.Error is not null) + { + // One bad pattern is bad for every window, so it is reported once and the list is empty + // — a result set holding whatever the earlier windows managed would be a search that + // half-worked without saying which half. + error = result.Error; + rows.Clear(); + break; + } + + rows.AddRange(result.Matches.Select(m => + new SearchRow(window.WindowId, window.Label, m.LineIndex, m.Text, m.MatchStart, m.MatchLength))); + } + + return new SearchModel(query, regex, all, scope, held, error, rows); } public bool IsOpen => _window is not null; /// What the surface is currently showing, for a headless test to read back. - internal IReadOnlyList Lines => SearchPrompt.Render( - _rows, _query, _error, _regex, _all, _scope, _held, _selected, _contentWidth - 1, _listRows, _first); + internal IReadOnlyList Lines => SearchPrompt.Render(_model, _selected, _contentWidth - 1, _listRows, _first); + + /// The model the surface is drawn from now, or null while it is closed. + internal SearchModel? Model => _window is null ? null : _model; /// The query as typed so far. - internal string Query => _query; + internal string Query => _model.Query; /// The rows currently listed, in buffer order — what ↑↓ walk and ⏎ picks from. - internal IReadOnlyList Rows => _rows; + internal IReadOnlyList Rows => _model.Rows; /// Whether the query is being read as a pattern. - internal bool Regex => _regex; + internal bool Regex => _model.Regex; /// Whether every window is being searched rather than the focused one. - internal bool AllWindows => _all; + internal bool AllWindows => _model.AllWindows; /// Opens the surface, or closes it when ⌃F arrives a second time. public void Toggle() @@ -127,13 +163,10 @@ public void SimulateTyping(string text) private void Open() { - _query = string.Empty; - _error = null; - _regex = false; - _all = false; + _model = Empty; _selected = -1; _first = 0; - Refilter(_query, -1); + Refilter(string.Empty, false, false, -1); var desktop = _system.DesktopDimensions; @@ -178,7 +211,7 @@ private void OnKey(object? sender, KeyPressedEventArgs e) return; } - var decision = SearchPrompt.Interpret(e.KeyInfo, _query, _selected, _rows.Count, _regex, _all); + var decision = SearchPrompt.Interpret(e.KeyInfo, _model.Query, _selected, _model.Rows.Count, _model.Regex, _model.AllWindows); e.Handled = true; switch (decision.Action) @@ -186,12 +219,10 @@ private void OnKey(object? sender, KeyPressedEventArgs e) case SearchAction.Go: // Closed first: the reader is about to be looking at the pane this row is in, and a modal // still painted over it would hide the thing they asked to see. - var row = _rows[_selected]; - var ordinal = _selected + 1; - var total = _rows.Count; - var query = _query; + var model = _model; + var index = _selected; Close(); - _go(row, query, ordinal, total); + _go(model, index); break; case SearchAction.Cancel: @@ -199,9 +230,7 @@ private void OnKey(object? sender, KeyPressedEventArgs e) break; case SearchAction.Redraw: - _regex = decision.Regex; - _all = decision.AllWindows; - Refilter(decision.Query, decision.Selected); + Refilter(decision.Query, decision.Regex, decision.AllWindows, decision.Selected); Paint(); _window.Invalidate(redrawAll: true); break; @@ -216,37 +245,11 @@ private void OnKey(object? sender, KeyPressedEventArgs e) /// Re-reads the corpus and re-runs the search. The pointer is clamped to what the query actually /// matched: a narrowing must not leave ⏎ aimed past the end of the list. /// - private void Refilter(string query, int selected) + private void Refilter(string query, bool regex, bool all, int selected) { - _query = query; - - var windows = _corpus(_all); - _scope = windows.Count == 1 ? windows[0].Label : "the focused window"; - _held = windows.Sum(w => w.Lines.Count); - - var rows = new List(); - string? error = null; - foreach (var window in windows) - { - var result = OutputSearch.Match(window.Lines, query, _regex); - if (result.Error is not null) - { - // One bad pattern is bad for every window, so it is reported once and the list is empty - // — a result set holding whatever the earlier windows managed would be a search that - // half-worked without saying which half. - error = result.Error; - rows.Clear(); - break; - } - - rows.AddRange(result.Matches.Select(m => - new SearchRow(window.WindowId, window.Label, m.LineIndex, m.Text, m.MatchStart, m.MatchLength))); - } - - _error = error; - _rows = rows; - _selected = _rows.Count == 0 ? -1 : Math.Clamp(selected, 0, _rows.Count - 1); - _first = SearchPrompt.Scroll(_first, _selected, _rows.Count, _listRows); + _model = _search(query, regex, all); + _selected = _model.Rows.Count == 0 ? -1 : Math.Clamp(selected, 0, _model.Rows.Count - 1); + _first = SearchPrompt.Scroll(_first, _selected, _model.Rows.Count, _listRows); } private void Paint() => _body?.SetContent(new List(Lines)); @@ -263,5 +266,6 @@ private void Reset() { _window = null; _body = null; + _closed?.Invoke(); } } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs index d9d21a1a..eb8b25aa 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs @@ -1,5 +1,7 @@ using SharpMUTerm.Client.Chrome; using SharpMUTerm.Client.Commands; +using SharpMUTerm.Client.Modals; +using SharpMUTerm.Client.Surfaces; using SharpMUTerm.Core.Configuration; using SharpMUTerm.Core.Diagnostics; using SharpMUTerm.Core.Layouts; @@ -453,7 +455,8 @@ internal void AcceptLayoutSuggestion(WorldSession session) ?? (_sessions.Sessions.Count == 0 ? _demoActiveKey ?? DemoScene.ActiveSessionKey : null); /// Whether the ⌥M list is up. - internal bool LayoutsOpen => _layoutsView.IsOpen && _layoutsView.Mode == "layouts"; + internal bool LayoutsOpen => + (_layoutsView.IsOpen && _layoutsView.Mode == "layouts") || NativeModalOf(SurfaceCatalog.Layouts) is not null; /// What the ⌥M list shows, for a test. internal IReadOnlyList LayoutsLines => _layoutsView.Lines; @@ -464,6 +467,12 @@ internal void AcceptLayoutSuggestion(WorldSession session) /// ⌥M and ⌃P ▸ Layouts: the list of layouts for the focused character, or closes it. private void ShowLayouts() { + if (NativeModalOf(SurfaceCatalog.Layouts) is { } native) + { + CloseNativeModal(native); + return; + } + if (LayoutsOpen) { _layoutsView.Close(); @@ -489,6 +498,11 @@ private void ShowLayouts() _layoutsStatus = null; _layoutsRenaming = null; _layoutsConfirmingDelete = false; + if (TryOpenNativeLayouts(key)) + { + return; + } + _layoutsView.Open( "layouts", $"Layouts · {Snippet(key)}", @@ -519,30 +533,18 @@ private bool LayoutsEscape() } /// A key while a name is being typed: letters build it, ⏎ keeps it, ⌫ takes a letter back. - private bool LayoutsRenameKey(LayoutDefinition selected, ConsoleKeyInfo k) + private bool LayoutsRenameKey(string key, LayoutDefinition selected, ConsoleKeyInfo k) { var typed = _layoutsRenaming ?? string.Empty; switch (k.Key) { case ConsoleKey.Enter: - var name = typed.Trim(); - if (name.Length == 0) + var result = RunLayoutsVerb(key, LayoutVerb.Rename, selected.Id, typed); + if (result.Done) { - _layoutsStatus = "a layout needs a name — type one, or Esc keeps the old"; - return true; + _layoutsRenaming = null; } - if (!Layouts.Rename(selected.Id, name)) - { - _layoutsStatus = Layouts.IsNameTaken(name, selected.Id) - ? $"a layout is already called {name}" - : $"{selected.Name} cannot be renamed"; - return true; - } - - PersistConfiguration(); - _layoutsRenaming = null; - _layoutsStatus = $"renamed to {name}"; return true; case ConsoleKey.Backspace: _layoutsRenaming = typed.Length == 0 ? typed : typed[..^1]; @@ -569,25 +571,7 @@ private bool LayoutsDeleteAnswer(string key, LayoutDefinition selected, ConsoleK return true; } - if (!Layouts.Delete(selected.Id)) - { - _layoutsStatus = $"{selected.Name} cannot be deleted"; - return true; - } - - // The panes stay as they are; with the layout they were drawn from gone, they are the player's own now. - if (_liveLayout is { } live && live.LayoutId == selected.Id) - { - _liveLayout = null; - } - - PersistConfiguration(); - _layoutsSelected = Math.Clamp(_layoutsSelected, 0, Layouts.All.Count - 1); - var (world, character) = LayoutOwner(key); - var named = character?.Layout == selected.Id || world?.Layout == selected.Id; - _layoutsStatus = named - ? $"deleted {selected.Name} — this character falls back to the next layout" - : $"deleted {selected.Name}"; + RunLayoutsVerb(key, LayoutVerb.Delete, selected.Id, null); return true; } @@ -596,10 +580,9 @@ private bool LayoutsKeyPressed(string key, ConsoleKeyInfo k) var all = Layouts.All; _layoutsSelected = Math.Clamp(_layoutsSelected, 0, all.Count - 1); var selected = all[_layoutsSelected]; - var (world, character) = LayoutOwner(key); if (_layoutsRenaming is not null) { - return LayoutsRenameKey(selected, k); + return LayoutsRenameKey(key, selected, k); } if (_layoutsConfirmingDelete) @@ -617,19 +600,13 @@ private bool LayoutsKeyPressed(string key, ConsoleKeyInfo k) _layoutsSelected = Math.Min(all.Count - 1, _layoutsSelected + 1); return true; case ConsoleKey.Enter: - if (!ApplyLayout(key, selected)) - { - RefuseCommand($"no window to arrange for {Snippet(key)} — switch to the character first"); - return false; - } - - Notice($"{selected.Name} layout applied — c keeps it for this character, w for the world", MessageSeverity.Info, "⌥M"); + RunLayoutsVerb(key, LayoutVerb.Apply, selected.Id, null); return false; case ConsoleKey.S when k.Modifiers == 0: - _layoutsStatus = SaveLayoutChanges(key, selected, world, character).Status; + RunLayoutsVerb(key, LayoutVerb.SaveChanges, selected.Id, null); return true; case ConsoleKey.N when k.Modifiers == 0: - _layoutsStatus = SaveLayoutAsNew(key, selected).Status; + RunLayoutsVerb(key, LayoutVerb.SaveAsNew, selected.Id, null); return true; case ConsoleKey.R when k.Modifiers == 0: if (selected.IsBuiltIn) @@ -650,16 +627,119 @@ private bool LayoutsKeyPressed(string key, ConsoleKeyInfo k) _layoutsConfirmingDelete = true; return true; case ConsoleKey.W when k.Modifiers == 0: - _layoutsStatus = UseLayoutForWorld(key, selected, world).Status; + RunLayoutsVerb(key, LayoutVerb.UseForWorld, selected.Id, null); return true; case ConsoleKey.C when k.Modifiers == 0: - _layoutsStatus = UseLayoutForCharacter(key, selected, character).Status; + RunLayoutsVerb(key, LayoutVerb.UseForCharacter, selected.Id, null); return true; default: return true; } } + /// + /// What the ⌥M list does to a layout, from either list: the cell list's keys and the window's native list's + /// buttons both end here, so the two leave the client in the same state and say the same words. The result is the + /// list's status line; the pointer follows a layout a save created. Apply says what it did in a notice (the list + /// closes behind it) and refuses out loud with no window to arrange. + /// + private LayoutActionResult RunLayoutsVerb(string key, LayoutVerb verb, string layoutId, string? name) + { + var all = Layouts.All; + var index = all.ToList().FindIndex(l => l.Id == layoutId); + if (index < 0) + { + var gone = new LayoutActionResult(false, $"there is no layout {Snippet(layoutId)}"); + _layoutsStatus = gone.Status; + return gone; + } + + _layoutsSelected = index; + var selected = all[index]; + var (world, character) = LayoutOwner(key); + var result = verb switch + { + LayoutVerb.Apply => ApplyFromList(key, selected), + LayoutVerb.SaveChanges => SaveLayoutChanges(key, selected, world, character), + LayoutVerb.SaveAsNew => SaveLayoutAsNew(key, selected), + LayoutVerb.UseForWorld => UseLayoutForWorld(key, selected, world), + LayoutVerb.UseForCharacter => UseLayoutForCharacter(key, selected, character), + LayoutVerb.Rename => RenameLayout(selected, name ?? string.Empty), + LayoutVerb.Delete => DeleteLayout(key, selected), + _ => new LayoutActionResult(false, $"{verb} is not something the list does"), + }; + _layoutsStatus = result.Status; + return result; + } + + /// ⏎: the panes are arranged by now, and a notice says so. + private LayoutActionResult ApplyFromList(string key, LayoutDefinition selected) + { + if (!ApplyLayout(key, selected)) + { + var refused = $"no window to arrange for {Snippet(key)} — switch to the character first"; + RefuseCommand(refused); + return new(false, refused); + } + + var said = $"{selected.Name} layout applied — c keeps it for this character, w for the world"; + Notice(said, MessageSeverity.Info, "⌥M"); + return new(true, said); + } + + /// r then ⏎: a layout of the player's own takes as its name. + private LayoutActionResult RenameLayout(LayoutDefinition selected, string typed) + { + var name = typed.Trim(); + if (selected.IsBuiltIn) + { + return new(false, $"{selected.Name} is built in — n saves a copy you can rename"); + } + + if (name.Length == 0) + { + return new(false, "a layout needs a name — type one, or Esc keeps the old"); + } + + if (name.Length > LayoutNameMaxLength) + { + name = name[..LayoutNameMaxLength]; + } + + if (!Layouts.Rename(selected.Id, name)) + { + return new(false, Layouts.IsNameTaken(name, selected.Id) + ? $"a layout is already called {name}" + : $"{selected.Name} cannot be renamed"); + } + + PersistConfiguration(); + return new(true, $"renamed to {name}"); + } + + /// d then y: a layout of the player's own is deleted, and the panes it drew become theirs. + private LayoutActionResult DeleteLayout(string key, LayoutDefinition selected) + { + if (!Layouts.Delete(selected.Id)) + { + return new(false, selected.IsBuiltIn ? $"{selected.Name} is built in and cannot be deleted" : $"{selected.Name} cannot be deleted"); + } + + // The panes stay as they are; with the layout they were drawn from gone, they are the player's own now. + if (_liveLayout is { } live && live.LayoutId == selected.Id) + { + _liveLayout = null; + } + + PersistConfiguration(); + _layoutsSelected = Math.Clamp(_layoutsSelected, 0, Layouts.All.Count - 1); + var (world, character) = LayoutOwner(key); + var named = character?.Layout == selected.Id || world?.Layout == selected.Id; + return new(true, named + ? $"deleted {selected.Name} — this character falls back to the next layout" + : $"deleted {selected.Name}"); + } + /// After w or c: applies the layout now resolves to, if the panes show another. private void ReapplyIfResolvedChanged(string key) { @@ -780,8 +860,8 @@ private void AdoptArrangementAs(string key, LayoutDefinition layout) _ => string.Join(", ", layout.KnownPlacements.Where(p => p.TabOf is null).Select(p => PanelTitle(p.PanelId).ToLowerInvariant())), }; - /// The ⌥M list for at a width. - internal List LayoutsListLines(string key, int width) + /// The ⌥M list's model for : every layout, which is pointed at, and what was last said. + internal LayoutsModel LayoutsModelFor(string key) { var (world, _) = LayoutOwner(key); var inUse = _liveLayout is { } live && string.Equals(live.SessionKey, key, StringComparison.Ordinal) @@ -789,32 +869,52 @@ internal List LayoutsListLines(string key, int width) : ResolveLayout(key).Layout.Id; var worldDefault = world?.Layout ?? world?.AcceptedLayoutSuggestion; var all = Layouts.All; - var nameColumn = Math.Clamp(all.Max(l => Snippet(l.Name).Length) + 2, 12, 24); + var rows = all + .Select(l => new LayoutRow(l.Id, Snippet(l.Name), LayoutDescription(l), l.IsBuiltIn, l.Id == inUse, l.Id == worldDefault)) + .ToArray(); + return new LayoutsModel( + key, + rows, + Math.Clamp(_layoutsSelected, 0, Math.Max(0, rows.Length - 1)), + _layoutsStatus, + _layoutsRenaming, + _layoutsConfirmingDelete); + } + + /// The ⌥M list for at a width, drawn from its model. + internal List LayoutsListLines(string key, int width) => + LayoutsListLines(Drawing(SurfaceCatalog.Layouts, string.Empty, LayoutsModelFor(key)), width); + + /// The ⌥M list at a width: the cells of the model the window's native list draws too. + internal static List LayoutsListLines(LayoutsModel model, int width) + { + var rows = model.Rows; + var nameColumn = Math.Clamp(rows.Select(l => l.Name.Length).DefaultIfEmpty(0).Max() + 2, 12, 24); var lines = new List(); - void Row(int index, LayoutDefinition layout) + void Row(int index, LayoutRow layout) { - var selected = index == _layoutsSelected; + var selected = index == model.Selected; var mark = selected ? $"[bold {ScreenPalette.Accent}]▸[/]" : " "; - var renaming = selected && _layoutsRenaming is not null; - var name = renaming ? _layoutsRenaming! + "▏" : Snippet(layout.Name); + var renaming = selected && model.Renaming is not null; + var name = renaming ? model.Renaming! + "▏" : layout.Name; name = renaming ? (name.Length > nameColumn - 1 ? "…" + name[^(nameColumn - 2)..] : name) : (name.Length > nameColumn - 1 ? name[..(nameColumn - 2)] + "…" : name); var tags = new List(); - if (layout.Id == inUse) + if (layout.InUse) { tags.Add("● in use"); } - if (layout.Id == worldDefault) + if (layout.WorldDefault) { tags.Add("● world default"); } var tag = tags.Count == 0 ? string.Empty : string.Join(" ", tags); var room = Math.Max(0, width - 2 - nameColumn - tag.Length - 1); - var description = LayoutDescription(layout); + var description = layout.Description; description = description.Length > room ? (room > 1 ? description[..(room - 1)] + "…" : string.Empty) : description; lines.Add( $"{mark} [{(selected ? "bold " : string.Empty)}{ScreenPalette.Value}]{Escape(name.PadRight(nameColumn))}[/]" @@ -823,19 +923,19 @@ void Row(int index, LayoutDefinition layout) } lines.Add($"[{ScreenPalette.Label}]built in[/]"); - for (var i = 0; i < all.Count && all[i].IsBuiltIn; i++) + for (var i = 0; i < rows.Count && rows[i].BuiltIn; i++) { - Row(i, all[i]); + Row(i, rows[i]); } lines.Add(string.Empty); lines.Add($"[{ScreenPalette.Label}]yours[/]"); var own = 0; - for (var i = 0; i < all.Count; i++) + for (var i = 0; i < rows.Count; i++) { - if (!all[i].IsBuiltIn) + if (!rows[i].BuiltIn) { - Row(i, all[i]); + Row(i, rows[i]); own++; } } @@ -846,15 +946,16 @@ void Row(int index, LayoutDefinition layout) } string Key(string chord, string what) => $"[{ScreenPalette.Accent}]{chord}[/] [{ScreenPalette.Label}]{what}[/]"; - var current = all[Math.Clamp(_layoutsSelected, 0, all.Count - 1)]; - var statusLine = _layoutsStatus is { } status ? $"[{ScreenPalette.Value}]{Escape(status)}[/]" : string.Empty; + var current = model.Current; + var currentName = current?.Name ?? string.Empty; + var statusLine = model.Status is { } status ? $"[{ScreenPalette.Value}]{Escape(status)}[/]" : string.Empty; // Every row below is always present, blank when it has nothing to say, so the modal (sized once, when it // opens) never has a line pushed off its bottom by a status or a question. lines.Add(string.Empty); - if (_layoutsRenaming is not null) + if (model.Renaming is not null) { - lines.Add($"[{ScreenPalette.Label}]type a new name for[/] [{ScreenPalette.Value}]{Escape(Snippet(current.Name))}[/]"); + lines.Add($"[{ScreenPalette.Label}]type a new name for[/] [{ScreenPalette.Value}]{Escape(currentName)}[/]"); lines.Add(string.Empty); lines.Add(string.Empty); lines.Add(statusLine); @@ -863,9 +964,9 @@ void Row(int index, LayoutDefinition layout) return lines; } - if (_layoutsConfirmingDelete) + if (model.ConfirmingDelete) { - lines.Add($"[{ScreenPalette.Value}]delete {Escape(Snippet(current.Name))}?[/] [{ScreenPalette.Label}]it cannot be brought back[/]"); + lines.Add($"[{ScreenPalette.Value}]delete {Escape(currentName)}?[/] [{ScreenPalette.Label}]it cannot be brought back[/]"); lines.Add(string.Empty); lines.Add(string.Empty); lines.Add(string.Empty); @@ -878,7 +979,7 @@ void Row(int index, LayoutDefinition layout) lines.Add($"{Key("w", "use for world")} {Key("c", "use for this character")}"); // r and d are named only over a layout of the player's own: on a built-in neither does anything but say so. - lines.Add(current.IsBuiltIn ? string.Empty : $"{Key("r", "rename")} {Key("d", "delete")}"); + lines.Add(current is null || current.BuiltIn ? string.Empty : $"{Key("r", "rename")} {Key("d", "delete")}"); lines.Add(statusLine); lines.Add(string.Empty); lines.Add($"[{ScreenPalette.Label}]↑↓ pick [[Esc]] Close [[⏎]] Apply[/]"); diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.NativeModals.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.NativeModals.cs new file mode 100644 index 00000000..bdb1730a --- /dev/null +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.NativeModals.cs @@ -0,0 +1,285 @@ +using SharpMUTerm.Client.Modals; +using SharpMUTerm.Client.Surfaces; + +namespace SharpMUTerm.Tui; + +/// +/// The client's modals in a host that draws them with its own controls (): the +/// quit prompt, ⌃F search, ⌃R history, the ⌥M layouts list and the first-run welcome. Each has one funnel every way in +/// goes through (, , , +/// , ), and the funnel asks the host first. A host without one — the +/// terminal, the snapshot, the tests, the parity harness — gets the cell modal, unchanged. +/// +/// The model is the cell modal's. Each session carries the Client model the cell modal draws (the quit facts, +/// the search results, the history, the layout rows, the welcome's state), and every gesture comes back to the client +/// method the cell modal's key ends in: , , +/// , , . +/// +/// +/// The quit prompt is always in front. It can be asked for from anywhere — ⌃Q from any modal, the window's close +/// button while F1 is open — and is never refused: it opens over an open modal, which stays under it, and in the +/// window the host keeps it the topmost thing drawn. With a host that has no native modals the cell prompt is a +/// framework modal window, and anything the host draws over the cells would hide it, so the host's F1 and ⌃P are +/// closed first (F1 keeping its draft). +/// +/// +internal sealed partial class SharpMUTermApp +{ + /// The native quit prompt, or null while none is open. + private QuitSession? _nativeQuit; + + /// The native search, history, layouts list or welcome, or null while none is open. + private ModalSession? _nativeModal; + + /// The host's modals, when it has somewhere to draw them; null for cells. + private INativeModals? NativeModalsHost => Host.NativeModals is { Available: true } native ? native : null; + + /// Whether a native modal is open, the quit prompt included. + private bool NativeModalOpen => _nativeQuit is not null || _nativeModal is not null; + + /// The native modal open under the quit prompt, for the tests; null for none. + internal ModalSession? NativeModal => _nativeModal; + + /// The native quit prompt, for the tests; null for none. + internal QuitSession? NativeQuit => _nativeQuit; + + /// The native search's session while one is open, for the tests. + internal SearchSession? NativeSearch => _nativeModal as SearchSession; + + /// The native history's session while one is open, for the tests. + internal HistorySession? NativeHistory => _nativeModal as HistorySession; + + /// The native layouts list's session while one is open, for the tests. + internal LayoutsSession? NativeLayouts => _nativeModal as LayoutsSession; + + /// The native welcome's session while one is open, for the tests. + internal WelcomeSession? NativeWelcome => _nativeModal as WelcomeSession; + + /// What the native modal open is called in a refusal, or null with none. + private string? NativeModalName => _nativeQuit is not null ? "the quit prompt" : _nativeModal?.Surface switch + { + SurfaceCatalog.Search => "the search surface", + SurfaceCatalog.History => "the history search", + SurfaceCatalog.Layouts => "the layouts", + SurfaceCatalog.Welcome => "the welcome", + null => null, + _ => "what is open", + }; + + // ── the quit prompt ───────────────────────────────────────────────────────────────────────── + + /// + /// ⌃Q, and the window's close button (which sends it): opens the quit prompt, or dismisses it when it is up — the + /// toggle explains. Never refused, whatever is open. + /// + private void ToggleQuit() + { + if (_nativeQuit is { } open) + { + CloseNativeModal(open); + return; + } + + if (_quit.IsOpen) + { + _quit.Toggle(); + return; + } + + if (NativeModalsHost is { } native) + { + QuitSession? session = null; + session = new QuitSession( + QuitFactsNow(), + ThemeIsDark(), + () => OnUiThread(Quit), + () => OnUiThread(() => NativeModalClosed(session!))); + _nativeQuit = session; + native.Show(session); + return; + } + + // The cell prompt is a framework window drawn in the cells. Anything the host draws over the cells would hide + // it, so the host's F1 (keeping its draft, which the prompt then counts) and ⌃P go first. + if (_nativeCompose is not null) + { + CloseComposer(); + } + + CloseNativePalette(); + _quit.Toggle(); + } + + /// The quit prompt closed without quitting, in either host: n, Esc, ⌃Q again. + private void QuitPromptClosed() => _header.SetContent(new List { HeaderMarkup() }); + + // ── ⌃F, ⌃R, ⌥M and the welcome ────────────────────────────────────────────────────────────── + + /// + /// The search for over the windows ⌃F looks in now — the one function both the cell + /// surface and the native one ask, so the two list the same rows. + /// + internal SearchModel SearchModelFor(string query, bool regex, bool all) => + SearchSurface.Compute(SearchableWindows(all), query, regex, all); + + /// Opens ⌃F in the host's controls; false when the host has none. + private bool TryOpenNativeSearch() + { + if (NativeModalsHost is not { } native) + { + return false; + } + + SearchSession? session = null; + session = new SearchSession( + SearchModelFor(string.Empty, false, false), + ThemeIsDark(), + (query, regex, all) => OnUiThread(() => + { + if (ReferenceEquals(_nativeModal, session)) + { + session!.Publish(SearchModelFor(query, regex, all)); + } + }), + (model, index) => OnUiThread(() => GoToSearchHit(model, index)), + () => OnUiThread(() => NativeModalClosed(session!))); + ShowNativeModal(native, session); + return true; + } + + /// Opens ⌃R in the host's controls; false when the host has none. + private bool TryOpenNativeHistory() + { + if (NativeModalsHost is not { } native) + { + return false; + } + + HistorySession? session = null; + session = new HistorySession( + new HistoryModel(HistoryFor(BarKind(ActiveBar())).Entries.ToArray(), HistoryBarLabel()), + ThemeIsDark(), + index => OnUiThread(() => InsertHistoryEntry(index)), + () => OnUiThread(() => NativeModalClosed(session!))); + ShowNativeModal(native, session); + return true; + } + + /// Opens ⌥M for in the host's controls; false when the host has none. + private bool TryOpenNativeLayouts(string key) + { + if (NativeModalsHost is not { } native) + { + return false; + } + + LayoutsSession? session = null; + session = new LayoutsSession( + LayoutsModelFor(key), + ThemeIsDark(), + (verb, id, name) => OnUiThread(() => + { + RunLayoutsVerb(key, verb, id, name); + if (ReferenceEquals(_nativeModal, session)) + { + session!.Publish(LayoutsModelFor(key)); + } + }), + () => OnUiThread(() => NativeModalClosed(session!))); + ShowNativeModal(native, session); + return true; + } + + /// Opens the welcome over in the host's controls; false when the host has none. + private bool TryOpenNativeWelcome(WelcomeSurface welcome) + { + if (NativeModalsHost is not { } native) + { + return false; + } + + WelcomeSession? session = null; + void Republish() + { + if (ReferenceEquals(_nativeModal, session)) + { + session!.Publish(welcome.Model); + } + } + + session = new WelcomeSession( + welcome.Model, + ThemeIsDark(), + choice => OnUiThread(() => + { + if (ReferenceEquals(_nativeModal, session) && RunWelcomeAction(welcome, welcome.Choose(choice))) + { + Republish(); + } + }), + layout => OnUiThread(() => + { + SetWelcomeLayout(welcome, layout); + Republish(); + }), + form => OnUiThread(() => + { + if (ReferenceEquals(_nativeModal, session) + && RunWelcomeAction(welcome, welcome.Submit(form, words => ParseEndpoint(words)))) + { + Republish(); + } + }), + () => OnUiThread(() => + { + welcome.Back(); + Republish(); + }), + () => OnUiThread(() => NativeModalClosed(session!))); + ShowNativeModal(native, session); + return true; + } + + private void ShowNativeModal(INativeModals native, ModalSession session) + { + if (_nativeModal is { } previous) + { + previous.End(); + } + + _nativeModal = session; + native.Show(session); + } + + /// Closes a native modal the client is done with, running nothing. + private void CloseNativeModal(ModalSession session) + { + session.End(); + Host.NativeModals?.Close(session); + NativeModalClosed(session); + } + + /// A native modal has closed, however it did; a session an earlier opening left behind is ignored. + private void NativeModalClosed(ModalSession session) + { + if (ReferenceEquals(_nativeQuit, session)) + { + _nativeQuit = null; + QuitPromptClosed(); + } + else if (ReferenceEquals(_nativeModal, session)) + { + _nativeModal = null; + if (session is WelcomeSession && _welcome is { } welcome) + { + _welcomeLayout = welcome.Layout; + } + + _header.SetContent(new List { HeaderMarkup() }); + } + } + + /// The native modal of , if that is the one open. + private ModalSession? NativeModalOf(string surface) => + _nativeModal is { } open && open.Surface == surface ? open : null; +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Welcome.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Welcome.cs index f1ffa912..f14e5533 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Welcome.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Welcome.cs @@ -1,3 +1,4 @@ +using SharpMUTerm.Client.Modals; using SharpMUTerm.Core.Configuration; using SharpMUTerm.Core.Diagnostics; using SharpMUTerm.Core.Session; @@ -38,7 +39,7 @@ internal sealed partial class SharpMUTermApp private string? _tourWindow; /// Whether the welcome surface is up, for the tests. - internal bool WelcomeIsOpen => _welcomeView.IsOpen; + internal bool WelcomeIsOpen => _welcomeView.IsOpen || NativeModalOf(Client.Surfaces.SurfaceCatalog.Welcome) is not null; /// What the welcome shows now, for the tests. internal IReadOnlyList WelcomeLines => _welcomeView.Lines; @@ -47,7 +48,28 @@ internal sealed partial class SharpMUTermApp internal WelcomeSurface? Welcome => _welcome; /// Feeds a key to the welcome surface the way the window's own handler would. - internal void SimulateWelcomeKey(ConsoleKeyInfo key) => _welcomeView.SimulateKey(key); + internal void SimulateWelcomeKey(ConsoleKeyInfo key) + { + // The native welcome takes the same keys through the same surface, and says what they did by republishing. + if (NativeWelcome is { } native && _welcome is { } welcome) + { + var stays = key.Key == ConsoleKey.Escape + ? welcome.Back() + : RunWelcomeAction(welcome, welcome.Interpret(key, words => ParseEndpoint(words))); + if (stays) + { + native.Publish(welcome.Model); + } + else if (key.Key == ConsoleKey.Escape) + { + CloseNativeModal(native); + } + + return; + } + + _welcomeView.SimulateKey(key); + } /// Why the package index cannot be browsed, or null when it can be asked for. private string? PackageIndexProblem() => @@ -79,18 +101,21 @@ internal void ShowWelcome() // Already up: left as it is, form and all. Asking again (a second /welcome, or the startup pass a live // loop runs after a scene was laid out) must not throw away what the player has typed. - if (_welcomeView.IsOpen && _welcome is not null) + if (WelcomeIsOpen && _welcome is not null) { return; } - if (ComposerIsInTheWay("the welcome") || (AnyOverlayOpen && !_welcomeView.IsOpen && Refuse($"close {OpenOverlayName()} first"))) + if (ComposerIsInTheWay("the welcome") || (AnyOverlayOpen && Refuse($"close {OpenOverlayName()} first"))) { return; } _welcome = new WelcomeSurface(problem) { Layout = _welcomeLayout }; - OpenWelcomeView(); + if (!TryOpenNativeWelcome(_welcome)) + { + OpenWelcomeView(); + } } private void OpenWelcomeView() @@ -108,19 +133,26 @@ private void OpenWelcomeView() }); } - private bool WelcomeKey(WelcomeSurface welcome, ConsoleKeyInfo key) + private bool WelcomeKey(WelcomeSurface welcome, ConsoleKeyInfo key) => + RunWelcomeAction(welcome, welcome.Interpret(key, words => ParseEndpoint(words))); + + /// + /// What the welcome asked for, from either host: the cell surface's key and the native welcome's click both end + /// here. Browse and Open settings close it and open what they name; Connect closes it and dials the form through + /// /connect's path. Anything else keeps it open, which is the return value. + /// + private bool RunWelcomeAction(WelcomeSurface welcome, WelcomeAction action) { - var action = welcome.Interpret(key, words => ParseEndpoint(words)); _welcomeLayout = welcome.Layout; switch (action) { case WelcomeAction.Browse: - _welcomeView.Close(); + CloseWelcome(); BrowsePackages(); return false; case WelcomeAction.Settings: - _welcomeView.Close(); + CloseWelcome(); if (!ComposerIsInTheWay("a settings screen")) { _settings.Toggle(ConsoleKey.F5, WorldsScreen); @@ -129,7 +161,7 @@ private bool WelcomeKey(WelcomeSurface welcome, ConsoleKeyInfo key) return false; case WelcomeAction.Connect when welcome.Request is { } request: - _welcomeView.Close(); + CloseWelcome(); ConnectFromWelcome(request); return false; @@ -138,6 +170,24 @@ private bool WelcomeKey(WelcomeSurface welcome, ConsoleKeyInfo key) } } + /// A layout chip: the welcome's starting layout, for the run. + private void SetWelcomeLayout(WelcomeSurface welcome, WelcomeLayout layout) + { + welcome.Layout = layout; + _welcomeLayout = layout; + } + + /// Closes the welcome in whichever host it is open. + private void CloseWelcome() + { + if (NativeModalOf(Client.Surfaces.SurfaceCatalog.Welcome) is { } native) + { + CloseNativeModal(native); + } + + _welcomeView.Close(); + } + /// The form's answer, through /connect's own path, with the character the form named. private void ConnectFromWelcome(WelcomeConnect request) { diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index cc05b185..1aab0312 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -1,6 +1,7 @@ using System.Text; using Microsoft.Extensions.Logging; using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Client.Modals; using SharpMUTerm.Client.Palette; using SharpMUTerm.Client.Surfaces; using SharpMUTerm.Core.Commands; @@ -934,7 +935,7 @@ public SharpMUTermApp( _welcomeView = new ListOverlay(_system, _screens); _composer.Send += (_, result) => SendComposed(result); _composer.Closed += (_, result) => KeepComposeDraft(result); - _quit = new QuitOverlay(_system, QuitFactsNow, Quit); + _quit = new QuitOverlay(_system, QuitFactsNow, Quit, QuitPromptClosed); // The ⌃B which-key panel. Its facts are read at the moment it opens, so it explains the workspace // the user is actually looking at, and the key that ends it goes back through the very consumer a @@ -949,7 +950,7 @@ public SharpMUTermApp( HistoryBarLabel, InsertHistoryEntry); - _search = new SearchSurface(_system, SearchableWindows, GoToSearchHit); + _search = new SearchSurface(_system, SearchModelFor, GoToSearchHit); _window.OnResize += (_, _) => { @@ -1652,27 +1653,38 @@ public string RenderSnapshot(string? view = null) AppendWindowLine(DemoScene.ChatWindowId, MarkupText.Escape(" Ana: the goblin room is bugged")); SettleScroll(); - OpenSearchForSnapshot(); - if (string.Equals(view, "search-all", StringComparison.OrdinalIgnoreCase)) + // In a host that draws ⌃F itself, the same query through the native surface's session (the window's + // screenshots); the parity harness and the terminal have none and take the cell path below. + if (!string.Equals(view, "search-landed", StringComparison.OrdinalIgnoreCase) && TryOpenNativeSearch()) { - SimulateSearchKey(new ConsoleKeyInfo('\0', ConsoleKey.A, false, true, false)); - } - - if (string.Equals(view, "search-regex", StringComparison.OrdinalIgnoreCase)) - { - SimulateSearchKey(new ConsoleKeyInfo('\0', ConsoleKey.E, false, true, false)); - SimulateSearchTyping(@"gobl\w+ (corpse|for)"); + var all = string.Equals(view, "search-all", StringComparison.OrdinalIgnoreCase); + var regex = string.Equals(view, "search-regex", StringComparison.OrdinalIgnoreCase); + NativeSearch!.Search(regex ? @"gobl\w+ (corpse|for)" : "goblin", regex, all); } else { - SimulateSearchTyping("goblin"); - } + OpenSearchForSnapshot(); + if (string.Equals(view, "search-all", StringComparison.OrdinalIgnoreCase)) + { + SimulateSearchKey(new ConsoleKeyInfo('\0', ConsoleKey.A, false, true, false)); + } - if (string.Equals(view, "search-landed", StringComparison.OrdinalIgnoreCase)) - { - SimulateSearchKey(new ConsoleKeyInfo('\0', ConsoleKey.DownArrow, false, false, false)); - SimulateSearchKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false)); - SettleScroll(); + if (string.Equals(view, "search-regex", StringComparison.OrdinalIgnoreCase)) + { + SimulateSearchKey(new ConsoleKeyInfo('\0', ConsoleKey.E, false, true, false)); + SimulateSearchTyping(@"gobl\w+ (corpse|for)"); + } + else + { + SimulateSearchTyping("goblin"); + } + + if (string.Equals(view, "search-landed", StringComparison.OrdinalIgnoreCase)) + { + SimulateSearchKey(new ConsoleKeyInfo('\0', ConsoleKey.DownArrow, false, false, false)); + SimulateSearchKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false)); + SettleScroll(); + } } ReArmWholeFrame(); @@ -1763,10 +1775,14 @@ public string RenderSnapshot(string? view = null) // seeded here on purpose: the frame is where "the password is not in the list" is visible. HistoryFor(InputBar.Primary).Add("connect Corvid hunter2"); - _historySearch.OpenForSnapshot(); - if (view.EndsWith("-filter", StringComparison.OrdinalIgnoreCase)) + // A host that draws ⌃R itself filters in its own box, so only the list is handed over there. + if (!TryOpenNativeHistory()) { - _historySearch.SimulateTyping("north"); + _historySearch.OpenForSnapshot(); + if (view.EndsWith("-filter", StringComparison.OrdinalIgnoreCase)) + { + _historySearch.SimulateTyping("north"); + } } } @@ -4751,9 +4767,13 @@ private bool RemoveAwayBar(string windowId) /// a search bar was on screen, which is a defect nobody would connect to search. /// /// - private void GoToSearchHit(SearchRow row, string query, int ordinal, int total) + private void GoToSearchHit(SearchModel model, int index) => + GoToSearchHit(model.Rows[index], model.Query, model.Regex, model.AllWindows, index + 1, model.Rows.Count); + + /// Goes to , the th of hits for a search. + private void GoToSearchHit(SearchRow row, string query, bool regex, bool all, int ordinal, int total) { - _lastSearch = (query, _search.Regex, _search.AllWindows); + _lastSearch = (query, regex, all); var previous = RemoveSearchBar(); if (previous is { } cleared && !string.Equals(cleared, row.WindowId, StringComparison.Ordinal)) @@ -4841,7 +4861,7 @@ private void NextSearchHit() next = current >= 0 ? (current + 1) % rows.Count : 0; } - GoToSearchHit(rows[next], last.Query, next + 1, rows.Count); + GoToSearchHit(rows[next], last.Query, last.Regex, last.All, next + 1, rows.Count); } /// @@ -5439,12 +5459,21 @@ private void ToggleHistorySearch() return; } + if (NativeModalOf(SurfaceCatalog.History) is { } open) + { + CloseNativeModal(open); + return; + } + if (AnyOverlayOpen || _moveMode) { return; } - _historySearch.Toggle(); + if (!TryOpenNativeHistory()) + { + _historySearch.Toggle(); + } } /// @@ -5454,7 +5483,7 @@ private void ToggleHistorySearch() /// how the framework happens to dispatch, and the next surface may not be modal. /// private bool AnyOverlayOpen => - PaletteIsOpen || _settings.IsOpen || _quit.IsOpen || _messageLog.IsOpen || _historySearch.IsOpen + PaletteIsOpen || _settings.IsOpen || _quit.IsOpen || NativeModalOpen || _messageLog.IsOpen || _historySearch.IsOpen || _prefixPanel.IsOpen || ComposerOpen || _search.IsOpen || _gameData.IsOpen || _packageView.IsOpen || _sendMenu.IsOpen || _layoutsView.IsOpen || _welcomeView.IsOpen; @@ -5475,6 +5504,12 @@ private void ToggleSearch() return; } + if (NativeModalOf(SurfaceCatalog.Search) is { } open) + { + CloseNativeModal(open); + return; + } + if (ComposerOpen) { RefuseCommand("close the composer first — search cannot open over it"); @@ -5486,7 +5521,10 @@ private void ToggleSearch() return; } - _search.Toggle(); + if (!TryOpenNativeSearch()) + { + _search.Toggle(); + } } /// @@ -5568,6 +5606,7 @@ private string OpenOverlayName() => _settings.IsOpen ? "the settings screen" : PaletteIsOpen ? "the command surface" : _quit.IsOpen ? "the quit prompt" + : NativeModalName is { } native ? native : _messageLog.IsOpen ? "the client messages" : _gameData.IsOpen ? "the game data" : _packageView.IsOpen ? "the packages" @@ -7101,7 +7140,7 @@ private void RegisterFocusReportTab() // ⌃Q asks first. A second ⌃Q dismisses the question rather than answering it — the same // toggle every other surface in this client is on, and the only reading under which a held // or twice-fumbled chord cannot quit on its own. See QuitPrompt. - ConsoleKey.Q => () => { _quit.Toggle(); return true; }, + ConsoleKey.Q => () => { ToggleQuit(); return true; }, // Next window. ⌃Tab used to be listed here as a second spelling "where the terminal reports // it"; no terminal does — it writes 0x09, which is a bare Tab — so the arm was dead and the // claim behind it was telling F4 a chord was taken that cannot arrive. ⌃N is the chord. @@ -7141,7 +7180,7 @@ private void Quit() /// holding an OOC line is exactly the draft a per-window count would hide. /// /// - private QuitFacts QuitFactsNow() + private QuitModel QuitFactsNow() { var activeId = ActiveWindowId(); var holding = _workspace.Windows.Where(w => w.HasUnsentInput).ToList(); @@ -7164,7 +7203,7 @@ private QuitFacts QuitFactsNow() // — 3 unsaved edits", which was true while closing a screen could throw its edits away; now every // committed value is already written to disk when it is committed, so the count is always zero and a // line that could never appear is a line to delete rather than to leave hanging. - return new QuitFacts(ConnectedCharacters(), drafts, holding.Select(w => w.Title).ToList()); + return new QuitModel(ConnectedCharacters(), drafts, holding.Select(w => w.Title).ToList()); } /// @@ -11699,7 +11738,7 @@ private bool RouteToInput(ConsoleKeyInfo key) internal string StatusMarkup => _statusBar.Text; /// Whether the ⌃Q confirmation is up. - internal bool QuitPromptOpen => _quit.IsOpen; + internal bool QuitPromptOpen => _quit.IsOpen || _nativeQuit is not null; /// What the ⌃Q confirmation is asking — the rendered markup, for a headless test to read. internal IReadOnlyList QuitPromptLines => _quit.Lines; @@ -11724,7 +11763,7 @@ private bool RouteToInput(ConsoleKeyInfo key) internal void SimulateReviewKey(ConsoleKeyInfo key) => _settings.Review.SimulateKey(key); /// Whether the ⌃R history surface is up. - internal bool HistorySearchOpen => _historySearch.IsOpen; + internal bool HistorySearchOpen => _historySearch.IsOpen || NativeModalOf(SurfaceCatalog.History) is not null; /// What the ⌃R surface is showing — the rendered markup, for a headless test to read. internal IReadOnlyList HistorySearchLines => _historySearch.Lines; @@ -11744,7 +11783,7 @@ private bool RouteToInput(ConsoleKeyInfo key) internal void SimulateHistorySearchKey(ConsoleKeyInfo key) => _historySearch.SimulateKey(key); /// Whether the ⌃F search surface is up. - internal bool SearchIsOpen => _search.IsOpen; + internal bool SearchIsOpen => _search.IsOpen || NativeModalOf(SurfaceCatalog.Search) is not null; /// What the search surface is currently listing — what ↑↓ walk and ⏎ picks from. internal IReadOnlyList SearchRows => _search.Rows; diff --git a/src/SharpMUTerm.Tui/WelcomeSurface.cs b/src/SharpMUTerm.Tui/WelcomeSurface.cs index 5a735d9d..39c92e08 100644 --- a/src/SharpMUTerm.Tui/WelcomeSurface.cs +++ b/src/SharpMUTerm.Tui/WelcomeSurface.cs @@ -1,43 +1,9 @@ +using SharpMUTerm.Client.Modals; using SharpMUTerm.Core.Layouts; using static SharpMUTerm.Tui.MarkupText; namespace SharpMUTerm.Tui; -/// What the welcome's menu offers, in the order it lists them. -internal enum WelcomeChoice -{ - /// The small form: host, port, TLS, a character name. - Connect, - - /// The package index browser, fetched only now. - Browse, - - /// F5, to add a world by hand. - Settings, -} - -/// -/// The starting layout a first world is given. sets nothing, so the client's own -/// suggestion () still applies when it first connects; the other two are the -/// player's choice outright and are written to WorldDefinition.Layout. -/// -internal enum WelcomeLayout -{ - Suggested, - Roleplay, - Combat, -} - -/// The connect form's rows, top to bottom. -internal enum WelcomeField -{ - Host, - Port, - Tls, - Character, - Password, -} - /// What a key on the welcome asks the app to do. internal enum WelcomeAction { @@ -71,16 +37,14 @@ internal sealed record WelcomeConnect(string Host, int Port, bool Tls, string? C internal sealed class WelcomeSurface { /// The example the surface names, a host nobody owns (RFC 2606). - internal const string ExampleCommand = "/connect mud.example.org 4201 tls"; + internal const string ExampleCommand = WelcomeModel.ExampleCommand; /// The width the surface asks for; the overlay narrows it on a small terminal. internal const int PreferredWidth = 66; - /// The longest host the form takes: a DNS name's limit. - private const int MaxHost = 253; + private const int MaxHost = WelcomeModel.MaxHost; - /// A character name long enough for any game's. - private const int MaxCharacter = 40; + private const int MaxCharacter = WelcomeModel.MaxCharacter; private readonly string? _indexProblem; @@ -112,6 +76,37 @@ internal sealed class WelcomeSurface /// The checked form, once ⏎ has accepted it. public WelcomeConnect? Request { get; private set; } + /// Everything the surface says now: what the cells draw and the window's native welcome draws. + public WelcomeModel Model => + new(InForm, Selected, Layout, Field, Host, Port, Tls, Character, PasswordLater, Problem, _indexProblem); + + /// + /// A menu choice made outright — the native welcome's click, or ⏎ on the cell menu once the pointer is on it. The + /// cell menu's own rules: Connect opens the form, Browse with no index says so in place. + /// + public WelcomeAction Choose(WelcomeChoice choice) + { + Selected = choice; + Problem = null; + return MenuKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false)); + } + + /// + /// The native form's Connect: the fields as typed, held to the cell form's limits, then checked as ⏎ checks them. + /// + public WelcomeAction Submit(WelcomeForm form, Func, (string Host, int Port)?> parse) + { + ArgumentNullException.ThrowIfNull(form); + InForm = true; + Host = new string(form.Host.Trim().Where(c => !char.IsWhiteSpace(c) && !char.IsControl(c)).Take(MaxHost).ToArray()); + Port = new string(form.Port.Trim().Where(char.IsAsciiDigit).Take(5).ToArray()); + Tls = form.Tls; + Character = new string(form.Character.Where(c => !char.IsControl(c)).Take(MaxCharacter).ToArray()).TrimStart(); + PasswordLater = form.PasswordLater; + Problem = null; + return Submit(parse); + } + /// The built-in layout id names, or null for the suggestion. public string? LayoutId => LayoutIdOf(Layout); @@ -313,17 +308,21 @@ private static string Pad(string markup, int width) => /// either — the form's footer sits where the menu's does, and nothing has to be closed and reopened to switch, /// which a window running its own loop does not do in the order a headless one does. /// - public List Render(int width) + public List Render(int width) => Render(Model, width); + + /// The surface for at a width — the cells of the model the window's native welcome draws. + public static List Render(WelcomeModel model, int width) { - if (!InForm) + ArgumentNullException.ThrowIfNull(model); + if (!model.InForm) { - return RenderMenu(width); + return RenderMenu(model, width); } - var form = RenderForm(width); + var form = RenderForm(model, width); var footer = form[^1]; form.RemoveAt(form.Count - 1); - var height = RenderMenu(width).Count; + var height = RenderMenu(model, width).Count; while (form.Count < height - 1) { form.Add(string.Empty); @@ -333,7 +332,7 @@ public List Render(int width) return form; } - private List RenderMenu(int width) + private static List RenderMenu(WelcomeModel model, int width) { var lines = new List { @@ -344,28 +343,21 @@ private List RenderMenu(int width) foreach (var choice in Enum.GetValues()) { - var selected = choice == Selected; - var (title, detail) = choice switch - { - WelcomeChoice.Connect => ("Connect to a host", "type a host and port"), - WelcomeChoice.Browse => ("Browse games", _indexProblem is null ? "from the package index" : "no package index set"), - _ => ("Open settings", "F5, add a world by hand"), - }; + var selected = choice == model.Selected; + var (title, detail) = model.Describe(choice); var marker = selected ? $"[bold {ScreenPalette.Accent}]▸[/]" : " "; lines.Add($"{marker} {Pad(Value(title, selected), 20)} {Label(detail)}"); } - lines.Add(Problem is null ? string.Empty : $" [{ScreenPalette.Caution}]{Escape(Problem)}[/]"); + lines.Add(model.Problem is null ? string.Empty : $" [{ScreenPalette.Caution}]{Escape(model.Problem)}[/]"); lines.Add(Label("Or type it on the command line below:")); lines.Add(" " + Value(ExampleCommand)); lines.Add(string.Empty); - lines.Add(Label(Layout == WelcomeLayout.Suggested - ? "Starting layout, picked from what the game sends:" - : "Starting layout, whatever the game sends:")); + lines.Add(Label(model.LayoutHeading)); var chips = string.Join(" ", Enum.GetValues().Select(layout => { - var name = layout == WelcomeLayout.Suggested ? "suggested" : layout.ToString(); - return layout == Layout + var name = WelcomeModel.LayoutName(layout); + return layout == model.Layout ? $"[bold {ScreenPalette.Ink} on {ScreenPalette.Accent}] {Escape(name)} [/]" : $"[{ScreenPalette.Value}] {Escape(name)} [/]"; })); @@ -376,7 +368,7 @@ private List RenderMenu(int width) return lines; } - private List RenderForm(int width) + private static List RenderForm(WelcomeModel model, int width) { var lines = new List { @@ -386,25 +378,24 @@ private List RenderForm(int width) }; var boxWidth = Math.Clamp(width - 16, 12, 44); - lines.Add(Row(WelcomeField.Host, "host", Box(Host, boxWidth, Field == WelcomeField.Host, "mud.example.org"))); - lines.Add(Row(WelcomeField.Port, "port", Box(Port, 7, Field == WelcomeField.Port, null))); - lines.Add(Row(WelcomeField.Tls, "TLS", Toggle(Tls, "on, encrypted", "off"))); - lines.Add(Row(WelcomeField.Character, "character", Box(Character, boxWidth, Field == WelcomeField.Character, "optional, the name you log in as"))); - lines.Add(Row(WelcomeField.Password, "password", Toggle(PasswordLater, "save it on F5 after connecting", "type it at the login prompt"))); + var field = model.Field; + lines.Add(Row(field, WelcomeField.Host, "host", Box(model.Host, boxWidth, field == WelcomeField.Host, "mud.example.org"))); + lines.Add(Row(field, WelcomeField.Port, "port", Box(model.Port, 7, field == WelcomeField.Port, null))); + lines.Add(Row(field, WelcomeField.Tls, "TLS", Toggle(model.Tls, "on, encrypted", "off"))); + lines.Add(Row(field, WelcomeField.Character, "character", Box(model.Character, boxWidth, field == WelcomeField.Character, "optional, the name you log in as"))); + lines.Add(Row(field, WelcomeField.Password, "password", Toggle(model.PasswordLater, "save it on F5 after connecting", "type it at the login prompt"))); lines.Add(string.Empty); - lines.Add(Problem is null - ? Label(Layout == WelcomeLayout.Suggested - ? "Layout: suggested from what the game sends." - : $"Layout: {Layout}.") - : $"[{ScreenPalette.Caution}]{Escape(Problem)}[/]"); + lines.Add(model.Problem is null + ? Label(model.FormLayoutLine) + : $"[{ScreenPalette.Caution}]{Escape(model.Problem)}[/]"); lines.Add(string.Empty); lines.Add(Footer(width, "↑↓ field · Space toggle", "Esc back · ⏎ connect")); return lines; } - private string Row(WelcomeField field, string label, string value) + private static string Row(WelcomeField current, WelcomeField field, string label, string value) { - var selected = Field == field; + var selected = current == field; var marker = selected ? $"[bold {ScreenPalette.Accent}]▸[/]" : " "; return $"{marker} {Pad(selected ? Value(label, bold: true) : Label(label), 11)} {value}"; } diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativeModalTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativeModalTests.cs new file mode 100644 index 00000000..4381048d --- /dev/null +++ b/tests/SharpMUTerm.Avalonia.Tests/NativeModalTests.cs @@ -0,0 +1,232 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Headless; +using Avalonia.Input; +using Avalonia.Interactivity; +using SharpMUTerm.Client.Modals; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Theming; +using SharpMUTerm.Tui; +using SkiaSharp; +using Window = Avalonia.Controls.Window; + +namespace SharpMUTerm.Avalonia.Tests; + +/// +/// The window's native modals (), driven from the real client in the window host: each opens +/// as an overlay over everything with its first control focused and no cell modal under it; the quit prompt stays the +/// last child of the root whatever is added after it, F1 included; keys mean what they mean in cells; Esc gives the +/// keyboard back; and the card follows the client's dark or light theme. +/// +[NotInParallel] +public class NativeModalTests +{ + private sealed record Rig(Window Window, Panel Root, TerminalView View, SharpMUTermApp App, AvaloniaConsoleDriver Driver); + + private static readonly ConsoleKeyInfo CtrlQ = new('\x11', ConsoleKey.Q, false, false, true); + private static readonly ConsoleKeyInfo CtrlF = new('\x06', ConsoleKey.F, false, false, true); + + private static Task Run(Func body, string theme = "Dark") => + TerminalViewTests.Session.Dispatch(() => + { + var driver = new AvaloniaConsoleDriver(120, 34); + var view = new TerminalView(driver, SKColors.White, new SKColor(0x1e, 0x1e, 0x24), 14, null); + var root = new Panel(); + root.Children.Add(view); + var layer = new DesktopLayer(view, HostChrome.HeaderAndRail); + root.Children.Add(layer); + driver.Composer.Attach(root, layer, view, () => view.Focus()); + driver.Palette.Attach(root, () => view.Focus()); + var window = new Window { Content = root, Width = 1000, Height = 700 }; + driver.Modals.Attach(window, root, () => view.Focus(), driver.RaiseKey); + window.Show(); + view.Focus(); + var config = DemoScene.Build(); + config.ThemeName = theme; + config.Theme = ThemeLibrary.Get(theme); + var app = new SharpMUTermApp(config, WindowHost.Create(driver, clipboard: null) with + { + Audio = null, + Presence = null, + Announcer = null, + NativeSettings = null, + RunsInline = true, + }); + driver.KeyPressed += (_, key) => app.SimulateKey(key); + try + { + DesktopLayerTests.Drain(); + return body(new Rig(window, root, view, app, driver)); + } + finally + { + app.DisposeAsync().AsTask().GetAwaiter().GetResult(); + window.Close(); + driver.Dispose(); + } + }, CancellationToken.None); + + private static void Press(Control target, Key key, KeyModifiers modifiers = KeyModifiers.None) + { + target.RaiseEvent(new KeyEventArgs { RoutedEvent = InputElement.KeyDownEvent, Key = key, KeyModifiers = modifiers, Source = target }); + DesktopLayerTests.Drain(); + } + + private static void Key(Rig rig, ConsoleKeyInfo key) + { + rig.App.SimulateKey(key); + DesktopLayerTests.Drain(); + } + + [Test] + public async Task CtrlFOpensTheNativeSearchOverEverythingWithTheBoxFocused() + { + var (focused, cellOpen, onTop, colours) = await Run(rig => + { + Key(rig, CtrlF); + var overlay = rig.Driver.Modals.Modal!; + var view = (SearchView)overlay.View; + return (view.Box.IsFocused, rig.App.DrawnModel(Client.Surfaces.SurfaceCatalog.Search) is not null, + ReferenceEquals(rig.Root.Children[^1], overlay), overlay.Colours); + }); + + await Assert.That(focused).IsTrue(); + await Assert.That(cellOpen).IsFalse().Because("no cell search under the native one"); + await Assert.That(onTop).IsTrue().Because("nothing native draws over it"); + await Assert.That(colours).IsEqualTo(ModalColours.Dark).Because("the demo's theme is Dark"); + } + + [Test] + public async Task TheCardFollowsALightTheme() + { + var colours = await Run(rig => + { + Key(rig, CtrlQ); + return rig.Driver.Modals.Quit!.Colours; + }, theme: "Light"); + + await Assert.That(colours).IsEqualTo(ModalColours.Light); + } + + [Test] + public async Task TypingSearchesThroughTheClientAndEnterLandsAndGivesTheKeyboardBack() + { + var (rows, expected, bar, closed, viewFocused) = await Run(rig => + { + rig.App.RenderSnapshot(null); + rig.View.Focus(); + Key(rig, CtrlF); + var view = (SearchView)rig.Driver.Modals.Modal!.View; + view.Box.Text = "the"; + DesktopLayerTests.Drain(); + var drawn = view.Model.Rows.ToArray(); + var model = rig.App.SearchModelFor("the", false, false).Rows.ToArray(); + Press(view.Box, global::Avalonia.Input.Key.Enter); + return (drawn, model, rig.App.SearchBarIndex(rig.App.ActiveWindowId()), rig.Driver.Modals.Modal is null, rig.View.IsFocused); + }); + + await Assert.That(rows).IsNotEmpty(); + await Assert.That(rows).IsEquivalentTo(expected, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(bar).IsNotNull().Because("⏎ went to the hit through the client's path"); + await Assert.That(closed).IsTrue(); + await Assert.That(viewFocused).IsTrue().Because("the keyboard goes back to the cells, and so to the command line"); + } + + [Test] + public async Task AltEAndAltATogglesAreTheCellSurfacesKeys() + { + var (regex, all) = await Run(rig => + { + Key(rig, CtrlF); + var view = (SearchView)rig.Driver.Modals.Modal!.View; + Press(view.Box, global::Avalonia.Input.Key.E, KeyModifiers.Alt); + Press(view.Box, global::Avalonia.Input.Key.A, KeyModifiers.Alt); + return (view.Model.Regex, view.Model.AllWindows); + }); + + await Assert.That(regex).IsTrue(); + await Assert.That(all).IsTrue(); + } + + [Test] + public async Task EscClosesAndGivesTheKeyboardBack() + { + var (open, focused) = await Run(rig => + { + Key(rig, CtrlF); + Press(((SearchView)rig.Driver.Modals.Modal!.View).Box, global::Avalonia.Input.Key.Escape); + return (rig.App.SearchIsOpen, rig.View.IsFocused); + }); + + await Assert.That(open).IsFalse(); + await Assert.That(focused).IsTrue(); + } + + [Test] + public async Task TheQuitPromptStaysInFrontOfAnythingAddedAfterIt() + { + var (afterSearch, afterAdd, searchUnder) = await Run(rig => + { + Key(rig, CtrlF); + Key(rig, CtrlQ); + var quit = rig.Driver.Modals.Quit!; + var first = ReferenceEquals(rig.Root.Children[^1], quit); + + // Something native added later (a toast, ⌃P, F1) goes under the prompt. + rig.Root.Children.Add(new Border()); + DesktopLayerTests.Drain(); + var second = ReferenceEquals(rig.Root.Children[^1], quit); + var under = rig.Root.Children.IndexOf(rig.Driver.Modals.Modal!) < rig.Root.Children.IndexOf(quit); + return (first, second, under); + }); + + await Assert.That(afterSearch).IsTrue(); + await Assert.That(afterAdd).IsTrue().Because("the prompt is moved back to the end"); + await Assert.That(searchUnder).IsTrue(); + } + + /// + /// The known bug: the window's close button (⌃Q) while F1 is open left the cell prompt under the composer. Now the + /// prompt is native and in front, F1 stays open under it, and Stay (N) goes back to the post. + /// + [Test] + public async Task CtrlQOverTheNativeComposerPutsThePromptInFrontAndStayReturnsToThePost() + { + var (composerOpen, quitOnTop, quitFocused, afterStay, cellPrompt) = await Run(rig => + { + Key(rig, new ConsoleKeyInfo('\0', ConsoleKey.F1, false, false, false)); + var composer = rig.Driver.Composer.Overlay; + Key(rig, CtrlQ); + var quit = rig.Driver.Modals.Quit!; + var onTop = ReferenceEquals(rig.Root.Children[^1], quit); + var view = (QuitView)quit.View; + var focused = view.StayButton.IsFocused; + var cell = rig.App.DrawnModel(Client.Surfaces.SurfaceCatalog.Quit) is not null; + Press(view.StayButton, global::Avalonia.Input.Key.N); + return (composer is not null && rig.Root.Children.Contains(composer), onTop, focused, rig.App.NativeComposerIsOpen, cell); + }); + + await Assert.That(composerOpen).IsTrue(); + await Assert.That(quitOnTop).IsTrue(); + await Assert.That(quitFocused).IsTrue().Because("Stay is chosen and has the keyboard"); + await Assert.That(afterStay).IsTrue().Because("Stay goes back to F1"); + await Assert.That(cellPrompt).IsFalse().Because("no cell prompt is drawn under the native composer"); + } + + [Test] + public async Task YInTheNativePromptQuitsAndTabMovesTheChoice() + { + var (afterTab, exited) = await Run(rig => + { + Key(rig, CtrlQ); + var view = (QuitView)rig.Driver.Modals.Quit!.View; + Press(view.StayButton, global::Avalonia.Input.Key.Tab); + var selected = view.Selected; + Press(view.QuitButton, global::Avalonia.Input.Key.Y); + return (selected, rig.App.ExitRequested); + }); + + await Assert.That(afterTab).IsEqualTo(QuitChoice.Quit); + await Assert.That(exited).IsTrue(); + } +} diff --git a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs index 8803726e..bde59a53 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs @@ -4,6 +4,7 @@ using SharpMUTerm.Client.Chrome; using SharpMUTerm.Client.Commands; using SharpMUTerm.Client.Composer; +using SharpMUTerm.Client.Modals; using SharpMUTerm.Client.Palette; using SharpMUTerm.Client.Panels; using SharpMUTerm.Client.Settings; @@ -241,6 +242,54 @@ await Assert.That(Rows(palette.Session!.View(query))).IsEquivalentTo(Rows(drawn! covered.Add(PanelIds.Composer); } + // The modals: the session the window was handed carries the model the cell modal drew for the same scene — the + // quit prompt's facts (connections and a draft), ⌃F's hits in each of its toggles, ⌃R's list, ⌥M's rows and the + // welcome's menu and filled-in form. + foreach (var (surface, view) in new[] + { + (SurfaceCatalog.Quit, "quit"), + (SurfaceCatalog.Search, "search"), + (SurfaceCatalog.Search, "search-regex"), + (SurfaceCatalog.Search, "search-all"), + (SurfaceCatalog.History, "history-search"), + (SurfaceCatalog.Layouts, "layouts"), + (SurfaceCatalog.Welcome, "welcome"), + (SurfaceCatalog.Welcome, "welcome-connect"), + }) + { + using var nativeDriver = new AvaloniaConsoleDriver(140, 36); + var modals = new FakeModals(); + await using var native = App(nativeDriver, DemoScene.Build(), modals: modals); + native.RenderSnapshot(view); + + using var cellDriver = new AvaloniaConsoleDriver(140, 36); + await using var cells = App(cellDriver, DemoScene.Build()); + cells.RenderSnapshot(view); + + var session = modals.Open(surface); + await Assert.That(session).IsNotNull().Because($"{view}: opened in the window's controls"); + var drawn = cells.DrawnModel(surface); + await Assert.That(drawn).IsNotNull().Because($"{view}: the cell modal is open in the cell client"); + await Assert.That(drawn).IsEqualTo(ModelOf(session!)).Because(view); + covered.Add(surface); + } + + // ⌃R filtered: the native list's rows for a query are the cell list's rows for it. + { + using var nativeDriver = new AvaloniaConsoleDriver(140, 36); + var modals = new FakeModals(); + await using var native = App(nativeDriver, DemoScene.Build(), modals: modals); + native.RenderSnapshot("history-search"); + + using var cellDriver = new AvaloniaConsoleDriver(140, 36); + await using var cells = App(cellDriver, DemoScene.Build()); + cells.RenderSnapshot("history-search-filter"); + + var rows = ((HistorySession)modals.Open(SurfaceCatalog.History)!).Model.View("north").Select(m => m.Text).ToArray(); + await Assert.That(rows).IsNotEmpty(); + await Assert.That(rows).IsEquivalentTo(cells.HistorySearchRows, TUnit.Assertions.Enums.CollectionOrdering.Matching); + } + var drawnNatively = SurfaceCatalog.All.Where(s => s.On(SurfaceHosts.Window).HasFlag(SurfaceDrawing.Native)).Select(s => s.Id); await Assert.That(covered).IsEquivalentTo(drawnNatively).Because("every surface the window draws natively has its model compared here"); } @@ -416,6 +465,150 @@ await Same("notice: action", "layout-combat", probed.Add(PanelIds.Composer); } + // The quit prompt: Y quits and N stays, from the window's buttons and from the cell prompt's keys. + await SameModal("quit: yes", "quit", + (app, m) => ((QuitSession)m.Open(SurfaceCatalog.Quit)!).Answer(true), + app => app.SimulateQuitKey(new ConsoleKeyInfo('y', ConsoleKey.Y, false, false, false))); + await SameModal("quit: no", "quit", + (app, m) => ((QuitSession)m.Open(SurfaceCatalog.Quit)!).Answer(false), + app => app.SimulateQuitKey(new ConsoleKeyInfo('n', ConsoleKey.N, false, false, false))); + probed.Add(SurfaceCatalog.Quit); + + // ⌃F: ⏎ on the second hit lands on the same line; ⌥A widens and ⌥E reads a pattern, then ⏎ on the last hit. + await SameModal("search: go", "search", + (app, m) => ((SearchSession)m.Open(SurfaceCatalog.Search)!).Go(1), + app => + { + app.SimulateSearchKey(new ConsoleKeyInfo('\0', ConsoleKey.DownArrow, false, false, false)); + app.SimulateSearchKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false)); + }); + await SameModal("search: every window", "search", + (app, m) => + { + var search = (SearchSession)m.Open(SurfaceCatalog.Search)!; + search.Search(search.Model.Query, regex: false, allWindows: true); + search.Go(search.Model.Rows.Count - 1); + }, + app => + { + app.SimulateSearchKey(new ConsoleKeyInfo('\0', ConsoleKey.A, false, true, false)); + app.SimulateSearchKey(new ConsoleKeyInfo('\0', ConsoleKey.UpArrow, false, false, false)); + app.SimulateSearchKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false)); + }); + await SameModal("search: regex", "search", + (app, m) => + { + var search = (SearchSession)m.Open(SurfaceCatalog.Search)!; + search.Search("gob+lin c", regex: true, allWindows: false); + search.Go(0); + }, + app => + { + app.SimulateSearchKey(new ConsoleKeyInfo('\0', ConsoleKey.E, false, true, false)); + foreach (var _ in "goblin") + { + app.SimulateSearchKey(new ConsoleKeyInfo('\b', ConsoleKey.Backspace, false, false, false)); + } + + app.SimulateSearchTyping("gob+lin c"); + app.SimulateSearchKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false)); + }); + probed.Add(SurfaceCatalog.Search); + + // ⌃R: ⏎ on the first row for "north" places the same text on the command line, and sends nothing. + await SameModal("history: insert", "history-search", + (app, m) => + { + var history = (HistorySession)m.Open(SurfaceCatalog.History)!; + history.Insert(history.Model.View("north")[0].Index); + }, + app => + { + app.SimulateHistorySearchTyping("north"); + app.SimulateHistorySearchKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false)); + }); + probed.Add(SurfaceCatalog.History); + + // ⌥M: apply Roleplay, save as new, rename the copy and delete it — each through the one verb method, so the + // status, the library and the panes agree. + await SameModal("layouts: apply", "layouts", + (app, m) => + { + var layouts = (LayoutsSession)m.Open(SurfaceCatalog.Layouts)!; + layouts.Run(LayoutVerb.Apply, BuiltInLayouts.RoleplayId); + }, + app => LayoutsKeysTo(app, BuiltInLayouts.RoleplayId, new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false))); + await SameModal("layouts: save as new", "layouts", + (app, m) => + { + var layouts = (LayoutsSession)m.Open(SurfaceCatalog.Layouts)!; + layouts.Run(LayoutVerb.SaveAsNew, BuiltInLayouts.CombatId); + }, + app => LayoutsKeysTo(app, BuiltInLayouts.CombatId, new ConsoleKeyInfo('n', ConsoleKey.N, false, false, false))); + await SameModal("layouts: rename", "layouts", + (app, m) => + { + var layouts = (LayoutsSession)m.Open(SurfaceCatalog.Layouts)!; + layouts.Run(LayoutVerb.SaveAsNew, BuiltInLayouts.CombatId); + layouts.Run(LayoutVerb.Rename, layouts.Model.Current!.Id, "Raid night"); + }, + app => + { + LayoutsKeysTo(app, BuiltInLayouts.CombatId, new ConsoleKeyInfo('n', ConsoleKey.N, false, false, false)); + app.SimulateLayoutsKey(new ConsoleKeyInfo('r', ConsoleKey.R, false, false, false)); + for (var i = 0; i < 40; i++) + { + app.SimulateLayoutsKey(new ConsoleKeyInfo('\b', ConsoleKey.Backspace, false, false, false)); + } + + foreach (var c in "Raid night") + { + app.SimulateLayoutsKey(new ConsoleKeyInfo(c, ConsoleKey.NoName, false, false, false)); + } + + app.SimulateLayoutsKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false)); + }); + await SameModal("layouts: delete", "layouts", + (app, m) => + { + var layouts = (LayoutsSession)m.Open(SurfaceCatalog.Layouts)!; + layouts.Run(LayoutVerb.SaveAsNew, BuiltInLayouts.CombatId); + layouts.Run(LayoutVerb.Delete, layouts.Model.Current!.Id); + }, + app => + { + LayoutsKeysTo(app, BuiltInLayouts.CombatId, new ConsoleKeyInfo('n', ConsoleKey.N, false, false, false)); + app.SimulateLayoutsKey(new ConsoleKeyInfo('d', ConsoleKey.D, false, false, false)); + app.SimulateLayoutsKey(new ConsoleKeyInfo('y', ConsoleKey.Y, false, false, false)); + }); + probed.Add(SurfaceCatalog.Layouts); + + // The welcome: the form filled in, then Connect in the window and ⏎ in the cells — through /connect's path, to + // the same world and character, connected. + await SameModal("welcome: connect", "welcome-connect", + (app, m) => + { + var welcome = (WelcomeSession)m.Open(SurfaceCatalog.Welcome)!; + var form = welcome.Model; + welcome.Connect(new WelcomeForm(form.Host, form.Port, form.Tls, form.Character, form.PasswordLater)); + }, + app => app.SimulateWelcomeKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false))); + await SameModal("welcome: layout and browse", "welcome", + (app, m) => + { + var welcome = (WelcomeSession)m.Open(SurfaceCatalog.Welcome)!; + welcome.SetLayout(WelcomeLayout.Combat); + welcome.Choose(WelcomeChoice.Settings); + }, + app => + { + app.SimulateWelcomeKey(new ConsoleKeyInfo('\0', ConsoleKey.LeftArrow, false, false, false)); + app.SimulateWelcomeKey(new ConsoleKeyInfo('\0', ConsoleKey.DownArrow, false, false, false)); + app.SimulateWelcomeKey(new ConsoleKeyInfo('\0', ConsoleKey.DownArrow, false, false, false)); + app.SimulateWelcomeKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false)); + }); + probed.Add(SurfaceCatalog.Welcome); + var acting = SurfaceCatalog.All.Where(s => s.HasNative && s.Actions.Count > 0).Select(s => s.Id); await Assert.That(probed).IsEquivalentTo(acting).Because("every native surface with actions has a probe here"); } @@ -565,9 +758,67 @@ private static async Task Same( await Assert.That(Outcome(a)).IsEqualTo(Outcome(b)).Because(probe); } + /// + /// A modal probe: two clients on the same view, one handed native modals and one drawing them in cells; the + /// native gesture on one, the cell keys on the other, and the client's state after each the same. + /// + private static async Task SameModal( + string probe, string view, Action native, Action cells) + { + using var nativeDriver = new AvaloniaConsoleDriver(140, 36); + var modals = new FakeModals(); + await using var a = App(nativeDriver, DemoScene.Build(), modals: modals); + a.TelnetFactory = _ => new SharpMUTerm.Tui.Tests.RecordingTelnetSession(); + a.RenderSnapshot(view); + var before = Outcome(a); + native(a, modals); + + using var cellDriver = new AvaloniaConsoleDriver(140, 36); + await using var b = App(cellDriver, DemoScene.Build()); + b.TelnetFactory = _ => new SharpMUTerm.Tui.Tests.RecordingTelnetSession(); + b.RenderSnapshot(view); + cells(b); + + await Assert.That(Outcome(a)).IsNotEqualTo(before).Because($"{probe}: the native action did something"); + await Assert.That(Outcome(a)).IsEqualTo(Outcome(b)).Because(probe); + } + + /// Moves the cell ⌥M list's pointer to with ↑↓, then presses . + private static void LayoutsKeysTo(SharpMUTermApp app, string layoutId, ConsoleKeyInfo key) + { + var model = app.LayoutsModelFor(DemoScene.ActiveSessionKey); + var target = model.Rows.ToList().FindIndex(r => r.Id == layoutId); + var step = target > model.Selected + ? new ConsoleKeyInfo('\0', ConsoleKey.DownArrow, false, false, false) + : new ConsoleKeyInfo('\0', ConsoleKey.UpArrow, false, false, false); + for (var i = 0; i < Math.Abs(target - model.Selected); i++) + { + app.SimulateLayoutsKey(step); + } + + app.SimulateLayoutsKey(key); + } + + private static object ModelOf(ModalSession session) => session switch + { + QuitSession quit => quit.Model, + SearchSession search => search.Model, + HistorySession history => history.Model, + LayoutsSession layouts => layouts.Model, + WelcomeSession welcome => welcome.Model, + _ => throw new ArgumentException(session.GetType().Name), + }; + /// Everything a surface's action can change, read off the client. private static string Outcome(SharpMUTermApp app) => string.Join( " | ", + "quit=" + app.QuitPromptOpen, + "exit=" + app.ExitRequested, + "search=" + app.SearchIsOpen + "@" + app.SearchBarIndex(app.ActiveWindowId()), + "history=" + app.HistorySearchOpen, + "layouts=" + app.LayoutsOpen + " " + Layouts(app), + "worlds=" + string.Join(",", app.Configuration.Worlds.Select(w => $"{w.Name}:{w.Host}:{w.Port}:{w.UseTls}:{w.Layout}:{string.Join("+", w.Characters.Select(c => c.Name))}")), + "sessions=" + string.Join(",", app.Configuration.Worlds.SelectMany(w => w.Characters.Select(c => $"{w.Name}.{c.Name}")).Select(k => k + ":" + app.FindSession(k)?.State)), "input=" + app.PrimaryInputText, "window=" + app.ActiveWindowId(), "panes=" + app.PaneIds.Count, @@ -581,6 +832,12 @@ private static string Outcome(SharpMUTermApp app) => string.Join( "notice=" + app.LastNotice, "recent=" + string.Join(",", app.RecentCommandIds)); + private static string Layouts(SharpMUTermApp app) + { + var model = app.LayoutsModelFor(DemoScene.ActiveSessionKey); + return $"{model.Status} [{string.Join(",", model.Rows.Select(r => r.Name + (r.InUse ? "*" : string.Empty) + (r.WorldDefault ? "^" : string.Empty)))}]"; + } + private static PanelOverlay Panel(AvaloniaConsoleDriver driver, string id) => driver.Pointer.Panels.First(p => p.PanelId == id); @@ -654,7 +911,8 @@ private static SharpMUTermApp App( INativePalette? palette = null, Action? save = null, HostKeys? keys = null, - INativeComposer? composer = null) => + INativeComposer? composer = null, + INativeModals? modals = null) => new(config, WindowHost.Create(driver, clipboard: null) with { Capabilities = WindowOptions.Capabilities, @@ -666,6 +924,7 @@ private static SharpMUTermApp App( NativePalette = palette, Keys = keys ?? WindowHost.Keys, NativeComposer = composer, + NativeModals = modals, }, save: save); /// A window editor that only records the session it was handed, so the client's side can be driven. @@ -689,6 +948,24 @@ private sealed class FakeSettings : INativeSettings public void Close() => Form = null; } + /// Native modals that only record the sessions they were handed, so the client's side can be driven. + private sealed class FakeModals : INativeModals + { + public List Shown { get; } = []; + + public List Closed { get; } = []; + + public bool Available => true; + + /// The session of shown last and not closed since, or null. + public ModalSession? Open(string surface) => + Shown.LastOrDefault(s => s.Surface == surface && !Closed.Contains(s) && !s.IsEnded); + + public void Show(ModalSession session) => Shown.Add(session); + + public void Close(ModalSession session) => Closed.Add(session); + } + private sealed class FakePalette : INativePalette { public PaletteSession? Session { get; private set; } diff --git a/tests/SharpMUTerm.Client.Tests/SurfaceCatalogTests.cs b/tests/SharpMUTerm.Client.Tests/SurfaceCatalogTests.cs index 98f9c273..c85c9a0f 100644 --- a/tests/SharpMUTerm.Client.Tests/SurfaceCatalogTests.cs +++ b/tests/SharpMUTerm.Client.Tests/SurfaceCatalogTests.cs @@ -72,7 +72,8 @@ public async Task PanelSurfacesAreKnownPanels() { var panels = SurfaceCatalog.All.Where(s => s.Id is not (SurfaceCatalog.Header or SurfaceCatalog.Sidebar or SurfaceCatalog.Settings or SurfaceCatalog.LayoutsMenu or SurfaceCatalog.Palette - or SurfaceCatalog.Prefix or SurfaceCatalog.RailStrip or SurfaceCatalog.Notice or SurfaceCatalog.Compose)); + or SurfaceCatalog.Prefix or SurfaceCatalog.RailStrip or SurfaceCatalog.Notice or SurfaceCatalog.Compose) + && !SurfaceCatalog.Modals.Contains(s.Id)); foreach (var surface in panels) { await Assert.That(PanelIds.Known).Contains(surface.Id); diff --git a/tests/SharpMUTerm.Tui.Tests/HistorySearchEndToEndTests.cs b/tests/SharpMUTerm.Tui.Tests/HistorySearchEndToEndTests.cs index 704f680b..fb511653 100644 --- a/tests/SharpMUTerm.Tui.Tests/HistorySearchEndToEndTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/HistorySearchEndToEndTests.cs @@ -1,3 +1,4 @@ +using SharpMUTerm.Client.Modals; using System.Collections.Concurrent; using SharpConsoleUI.Drivers; using SharpMUTerm.Core.Configuration; diff --git a/tests/SharpMUTerm.Tui.Tests/NativeModalRoutingTests.cs b/tests/SharpMUTerm.Tui.Tests/NativeModalRoutingTests.cs new file mode 100644 index 00000000..8cce79c2 --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/NativeModalRoutingTests.cs @@ -0,0 +1,222 @@ +using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Composer; +using SharpMUTerm.Client.Modals; +using SharpMUTerm.Client.Surfaces; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Graphics; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// The quit prompt, ⌃F, ⌃R and ⌥M in a host that draws them itself (): each +/// funnel asks the host first, the cell modal is not opened under it, and a host whose modals are not attached gets +/// the cells. The quit prompt is never refused and always ends up in front: over a native modal or the native F1 it +/// opens beside them and N leaves them as they were; with no native modals the host's F1 is closed first, keeping its +/// draft, so the cell prompt is not drawn under it. +/// +/// Serialised: rendering a frame redirects the process-global Console.Out. +[NotInParallel] +public class NativeModalRoutingTests +{ + private static readonly TerminalCapabilities Headless = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private static ConsoleKeyInfo Key(ConsoleKey key, ConsoleModifiers modifiers = 0, char c = '\0') => + new(c, key, modifiers.HasFlag(ConsoleModifiers.Shift), + modifiers.HasFlag(ConsoleModifiers.Alt), modifiers.HasFlag(ConsoleModifiers.Control)); + + private static readonly ConsoleKeyInfo CtrlQ = new('\x11', ConsoleKey.Q, false, false, true); + + private sealed class FakeModals(bool available = true) : INativeModals + { + public bool Available { get; } = available; + + public List Shown { get; } = []; + + public List Closed { get; } = []; + + public void Show(ModalSession session) => Shown.Add(session); + + public void Close(ModalSession session) => Closed.Add(session); + } + + private sealed class FakeComposer : INativeComposer + { + public bool Available => true; + + public List Opened { get; } = []; + + public int Closed { get; private set; } + + public void Open(ComposerSession session, PanelInk ink) => Opened.Add(session); + + public void Close() => Closed++; + } + + private static async Task<(SharpMUTermApp App, FakeModals? Modals, FakeComposer? Composer)> Connected( + FakeModals? modals, FakeComposer? composer = null) + { + Console.SetIn(TextReader.Null); + var config = new AppConfiguration(); + var world = new WorldDefinition { Name = "Quiet", Host = "quiet.example.org", Port = 4000 }; + world.Characters.Add(new CharacterDefinition { Name = "Ann", Logging = new LoggingSettings() }); + config.Worlds.Add(world); + var host = ClientHost.ForHarness(Headless, new HeadlessConsoleDriver(120, 32), null, null, null) with + { + NativeModals = modals, + NativeComposer = composer, + }; + var app = new SharpMUTermApp(config, host); + app.TelnetFactory = _ => new RecordingTelnetSession(); + await app.BindWorldWithoutConnecting(world).ConnectAsync(); + app.RenderNextFrame(); + return (app, modals, composer); + } + + [Test] + public async Task EachModalOpensInTheHostsControlsAndNotInCells() + { + var (app, modals, _) = await Connected(new FakeModals()); + await using var _ = app; + + foreach (var (chord, surface) in new[] + { + (Key(ConsoleKey.F, ConsoleModifiers.Control, '\x06'), SurfaceCatalog.Search), + (Key(ConsoleKey.R, ConsoleModifiers.Control, '\x12'), SurfaceCatalog.History), + (Key(ConsoleKey.M, ConsoleModifiers.Alt, 'm'), SurfaceCatalog.Layouts), + }) + { + app.SimulateKey(chord); + await Assert.That(modals!.Shown[^1].Surface).IsEqualTo(surface); + await Assert.That(app.DrawnModel(surface)).IsNull().Because($"{surface}: no cell modal under the native one"); + + // The chord again closes it, as it closes the cell modal. + app.SimulateKey(chord); + await Assert.That(modals.Closed).Contains(modals.Shown[^1]).Because($"{surface}: the chord closes it"); + await Assert.That(modals.Shown[^1].IsEnded).IsTrue(); + } + + await Assert.That(app.SearchIsOpen || app.HistorySearchOpen || app.LayoutsOpen).IsFalse(); + } + + [Test] + public async Task AHostWhoseModalsAreNotAttachedGetsTheCells() + { + var (app, modals, _) = await Connected(new FakeModals(available: false)); + await using var _ = app; + + app.SimulateKey(Key(ConsoleKey.F, ConsoleModifiers.Control, '\x06')); + await Assert.That(modals!.Shown).IsEmpty(); + await Assert.That(app.DrawnModel(SurfaceCatalog.Search)).IsNotNull().Because("the cell search is open"); + } + + [Test] + public async Task EscInTheHostClosesTheModalAndRunsNothing() + { + var (app, modals, _) = await Connected(new FakeModals()); + await using var _ = app; + + app.SimulateKey(Key(ConsoleKey.F, ConsoleModifiers.Control, '\x06')); + var search = (SearchSession)modals!.Shown.Single(); + search.Dismiss(); + + await Assert.That(app.SearchIsOpen).IsFalse(); + search.Go(0); + await Assert.That(app.SearchBarIndex(app.ActiveWindowId())).IsNull().Because("a late gesture on a closed session does nothing"); + } + + [Test] + public async Task TheQuitPromptOpensOverANativeModalAndStayLeavesItOpen() + { + var (app, modals, _) = await Connected(new FakeModals()); + await using var _ = app; + + app.SimulateKey(Key(ConsoleKey.F, ConsoleModifiers.Control, '\x06')); + var search = modals!.Shown.Single(); + + app.SimulateKey(CtrlQ); + var quit = modals.Shown.OfType().Single(); + await Assert.That(quit.AlwaysInFront).IsTrue(); + await Assert.That(quit.Model.ConnectedCharacters).IsEquivalentTo(new[] { "Quiet.Ann" }); + await Assert.That(search.IsEnded).IsFalse().Because("the search stays under the prompt"); + + quit.Answer(false); + await Assert.That(app.QuitPromptOpen).IsFalse(); + await Assert.That(app.SearchIsOpen).IsTrue().Because("Stay goes back to the search"); + await Assert.That(app.ExitRequested).IsFalse(); + } + + [Test] + public async Task CtrlQAgainClosesTheNativePrompt() + { + var (app, modals, _) = await Connected(new FakeModals()); + await using var _ = app; + + app.SimulateKey(CtrlQ); + var quit = modals!.Shown.OfType().Single(); + app.SimulateKey(CtrlQ); + + await Assert.That(modals.Closed).Contains(quit); + await Assert.That(app.QuitPromptOpen).IsFalse(); + await Assert.That(app.ExitRequested).IsFalse(); + } + + [Test] + public async Task YesInTheNativePromptQuits() + { + var (app, modals, _) = await Connected(new FakeModals()); + await using var _ = app; + + app.SimulateKey(CtrlQ); + modals!.Shown.OfType().Single().Answer(true); + + await Assert.That(app.ExitRequested).IsTrue(); + } + + /// + /// Closing the window while the native F1 is open: the window sends ⌃Q. With native modals the prompt opens in front + /// of F1, which stays open under it, and Stay goes back to the post. + /// + [Test] + public async Task TheQuitPromptOpensInFrontOfTheNativeComposerWhichStaysOpen() + { + var (app, modals, composer) = await Connected(new FakeModals(), new FakeComposer()); + await using var _ = app; + + app.SimulateKey(Key(ConsoleKey.F1)); + composer!.Opened.Single().Edited("half a post"); + app.SimulateKey(CtrlQ); + + var quit = modals!.Shown.OfType().Single(); + await Assert.That(app.NativeComposerIsOpen).IsTrue().Because("F1 is not closed to make room for the prompt"); + await Assert.That(composer.Closed).IsEqualTo(0); + + quit.Answer(false); + await Assert.That(app.NativeComposerIsOpen).IsTrue(); + await Assert.That(app.NativeComposerSession!.Model.Body).IsEqualTo("half a post"); + } + + /// + /// The known bug: with a host that draws F1 but not the modals, the cell prompt is a framework window in the cells, + /// and F1 drawn over the cells would hide it. F1 is closed first, keeping its draft, and the prompt counts it. + /// + [Test] + public async Task WithNoNativeModalsTheNativeComposerClosesSoTheCellPromptIsInFront() + { + var (app, _, composer) = await Connected(modals: null, new FakeComposer()); + await using var _ = app; + + app.SimulateKey(Key(ConsoleKey.F1)); + composer!.Opened.Single().Edited("half a post"); + app.SimulateKey(CtrlQ); + + await Assert.That(app.NativeComposerIsOpen).IsFalse().Because("nothing native is left over the cell prompt"); + await Assert.That(composer.Closed).IsGreaterThanOrEqualTo(1); + await Assert.That(app.QuitPromptOpen).IsTrue(); + await Assert.That(string.Join("\n", app.QuitPromptLines)).Contains("draft"); + + app.SimulateQuitKey(Key(ConsoleKey.N, 0, 'n')); + app.SimulateKey(Key(ConsoleKey.F1)); + await Assert.That(composer.Opened[^1].Model.Body).IsEqualTo("half a post").Because("the draft was kept"); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/QuitPromptTests.cs b/tests/SharpMUTerm.Tui.Tests/QuitPromptTests.cs index b6f25625..51be67fb 100644 --- a/tests/SharpMUTerm.Tui.Tests/QuitPromptTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/QuitPromptTests.cs @@ -1,3 +1,4 @@ +using SharpMUTerm.Client.Modals; using SharpMUTerm.Tui; namespace SharpMUTerm.Tui.Tests; @@ -23,7 +24,7 @@ private static ConsoleKeyInfo Chord(ConsoleKey key, bool ctrl = false, bool alt /// over two live characters. The unit is the character, matching the header's fraction — see /// SharpMUTermApp.ConnectedCharacters. /// - private static QuitFacts Busy() => new( + private static QuitModel Busy() => new( new[] { "Aetherfall.Corvid", "Aetherfall.Rookery" }, 2, new[] { "main", "Chat" }); @@ -138,9 +139,9 @@ public async Task EverythingElseIsSwallowed(ConsoleKey key, bool ctrl, bool alt) [Test] public async Task WithNothingAtStakeItSaysSo() { - await Assert.That(QuitPrompt.Consequences(QuitFacts.Nothing)).IsEmpty(); + await Assert.That(QuitPrompt.Consequences(QuitModel.Nothing)).IsEmpty(); - var rendered = string.Join("\n", QuitPrompt.Render(QuitFacts.Nothing, QuitChoice.Stay)); + var rendered = string.Join("\n", QuitPrompt.Render(QuitModel.Nothing, QuitChoice.Stay)); await Assert.That(rendered).Contains("Nothing is connected and nothing is unsent."); } @@ -162,7 +163,7 @@ public async Task ItNamesTheConnectionsAndTheDrafts() [Test] public async Task OneOfEachReadsAsOne() { - var facts = new QuitFacts(new[] { "Aetherfall.Corvid" }, 1, new[] { "main" }); + var facts = new QuitModel(new[] { "Aetherfall.Corvid" }, 1, new[] { "main" }); await Assert.That(QuitPrompt.Consequences(facts)).IsEquivalentTo(new[] { @@ -177,7 +178,7 @@ await Assert.That(QuitPrompt.Consequences(facts)).IsEquivalentTo(new[] [Test] public async Task ALongListIsCappedAndCounted() { - var facts = QuitFacts.Nothing with { ConnectedCharacters = new[] { "A", "B", "C", "D", "E" } }; + var facts = QuitModel.Nothing with { ConnectedCharacters = new[] { "A", "B", "C", "D", "E" } }; await Assert.That(QuitPrompt.Consequences(facts)[0]).IsEqualTo("5 characters connected — A, B, C +2 more"); } @@ -192,8 +193,8 @@ public async Task ALongListIsCappedAndCounted() [Test] public async Task AnOpenScreenIsNotAConsequence() { - await Assert.That(QuitPrompt.Consequences(QuitFacts.Nothing)).IsEmpty(); - await Assert.That(typeof(QuitFacts).GetProperty("UnsavedEdits")).IsNull(); + await Assert.That(QuitPrompt.Consequences(QuitModel.Nothing)).IsEmpty(); + await Assert.That(typeof(QuitModel).GetProperty("UnsavedEdits")).IsNull(); } /// @@ -218,7 +219,7 @@ public async Task TheDefaultIsVisiblyStay() [Test] public async Task TheButtonsCarryTheirKeys() { - var rendered = string.Join("\n", QuitPrompt.Render(QuitFacts.Nothing, QuitChoice.Stay)); + var rendered = string.Join("\n", QuitPrompt.Render(QuitModel.Nothing, QuitChoice.Stay)); await Assert.That(rendered).Contains("Quit y"); await Assert.That(rendered).Contains("Stay n"); diff --git a/tests/SharpMUTerm.Tui.Tests/SearchEndToEndTests.cs b/tests/SharpMUTerm.Tui.Tests/SearchEndToEndTests.cs index a975a991..07cab306 100644 --- a/tests/SharpMUTerm.Tui.Tests/SearchEndToEndTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/SearchEndToEndTests.cs @@ -1,3 +1,4 @@ +using SharpMUTerm.Client.Modals; using SharpConsoleUI.Drivers; using SharpMUTerm.Core.Session; using SharpMUTerm.Graphics; diff --git a/tests/SharpMUTerm.Tui.Tests/SearchPromptTests.cs b/tests/SharpMUTerm.Tui.Tests/SearchPromptTests.cs index ca4321a3..f65aae51 100644 --- a/tests/SharpMUTerm.Tui.Tests/SearchPromptTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/SearchPromptTests.cs @@ -1,3 +1,4 @@ +using SharpMUTerm.Client.Modals; using SharpMUTerm.Tui; namespace SharpMUTerm.Tui.Tests; diff --git a/tests/SharpMUTerm.Tui.Tests/SpawnWindowIdUpgradeTests.cs b/tests/SharpMUTerm.Tui.Tests/SpawnWindowIdUpgradeTests.cs index da311b40..7a991887 100644 --- a/tests/SharpMUTerm.Tui.Tests/SpawnWindowIdUpgradeTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/SpawnWindowIdUpgradeTests.cs @@ -1,3 +1,4 @@ +using SharpMUTerm.Client.Modals; using SharpConsoleUI.Drivers; using SharpMUTerm.Core.Commands; using SharpMUTerm.Core.Configuration; diff --git a/tests/SharpMUTerm.Tui.Tests/WelcomeTests.cs b/tests/SharpMUTerm.Tui.Tests/WelcomeTests.cs index 38d4b072..e06fe74d 100644 --- a/tests/SharpMUTerm.Tui.Tests/WelcomeTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/WelcomeTests.cs @@ -1,3 +1,4 @@ +using SharpMUTerm.Client.Modals; using SharpConsoleUI.Drivers; using SharpMUTerm.Core.Accessibility; using SharpMUTerm.Core.Configuration; From c14aa5cfe05f5510c398d39b9bac5bdb1fd89020 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 10:00:25 +0000 Subject: [PATCH 035/113] feat(window): pop native panels out into floating windows The map, vitals, who-here and the quick bar can be popped out of their pane into a window of their own in the desktop host: from a button on the docked native view, the pane's right-click menu, or Ctrl+P (panel:popout:), and docked back from the floating window's Dock button, by closing it, or panel:dock:. - Floating is host-neutral: WorkspaceWindow.Floating (FloatingBounds, screen pixels) is saved with the workspace and PanelPlacement.Floating with a layout (LayoutCapture). The fold never reads it, so the terminal keeps the panel in its region and the flag survives for the next host that can float. - Host fact: ClientHost.FloatingPanels (IFloatingPanels?, required; null in the terminal and headless). Ctrl+P families, the pane menu entry and the docked overlay's PopOut callback exist only where it is set; the surface catalog declares both actions OnlyOn: Window with the Ctrl+P id as the cell route. - The pane a panel leaves goes back through the workspace operations: with the live layout owning the panes it is re-applied without the panel, so pane rectangles and NAWS equal a layout that never placed it. - The floating window draws the panel's own native view from the same overlay and callbacks (OverlayFor), follows the character's plane and theme ink, never takes focus on opening, forwards keys and text to the command line, and docks when closed. Remembered places are clamped to the screens present. - PaneOutputRects no longer throws when called before the main window exists, so resuming a workspace with a panel or map pane no longer fails at startup. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 8 + CLAUDE.md | 41 +- .../AvaloniaConsoleDriver.cs | 3 + src/SharpMUTerm.Avalonia/DesktopLayer.cs | 39 ++ src/SharpMUTerm.Avalonia/FloatingPanels.cs | 569 ++++++++++++++++++ src/SharpMUTerm.Avalonia/MainWindow.cs | 4 + src/SharpMUTerm.Avalonia/MapCanvas.cs | 12 + src/SharpMUTerm.Avalonia/QuickBarButtons.cs | 12 + src/SharpMUTerm.Avalonia/TerminalView.cs | 15 + src/SharpMUTerm.Avalonia/WhoHereList.cs | 12 + src/SharpMUTerm.Avalonia/WindowHost.cs | 3 + .../Commands/BuiltInCommands.cs | 28 + .../Panels/FloatingPanelModel.cs | 48 ++ .../Surfaces/SurfaceCatalog.cs | 56 +- .../Commands/CommandCatalog.cs | 14 +- src/SharpMUTerm.Core/Layouts/LayoutCapture.cs | 42 +- .../Layouts/LayoutDefinition.cs | 11 + src/SharpMUTerm.Core/Layouts/LayoutFold.cs | 6 + .../Workspace/FloatingBounds.cs | 77 +++ .../Workspace/WorkspaceState.cs | 9 + .../Workspace/WorkspaceWindow.cs | 8 + src/SharpMUTerm.Tui/Hosting/ClientHost.cs | 13 + src/SharpMUTerm.Tui/Pointer/PointerTarget.cs | 8 +- .../Pointer/SharpMUTermApp.Desktop.cs | 108 ++-- .../Pointer/SharpMUTermApp.Floating.cs | 473 +++++++++++++++ .../Pointer/SharpMUTermApp.Pointer.cs | 15 + src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs | 28 +- src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs | 6 +- src/SharpMUTerm.Tui/SharpMUTermApp.cs | 36 +- .../FloatingPanelTests.cs | 372 ++++++++++++ .../SurfaceParityTests.cs | 39 ++ .../SurfaceCatalogTests.cs | 36 +- .../Layouts/FloatingPanelLayoutTests.cs | 131 ++++ 33 files changed, 2217 insertions(+), 65 deletions(-) create mode 100644 src/SharpMUTerm.Avalonia/FloatingPanels.cs create mode 100644 src/SharpMUTerm.Client/Panels/FloatingPanelModel.cs create mode 100644 src/SharpMUTerm.Core/Workspace/FloatingBounds.cs create mode 100644 src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Floating.cs create mode 100644 tests/SharpMUTerm.Avalonia.Tests/FloatingPanelTests.cs create mode 100644 tests/SharpMUTerm.Core.Tests/Layouts/FloatingPanelLayoutTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 95bc530b..c5ccc7fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,12 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- Desktop window: the map, vitals, who is here and the quick bar can be popped out into windows of their own — from + the button in the panel's corner, the pane's right-click menu, or Ctrl+P ▸ Pop out. The output takes the room back, + the floating window works exactly like the panel did, typing in it still goes to the command line, and closing it + (or Dock) puts the panel back in its place. Where each one floats is remembered with your layout and brought back on + screen if a monitor has gone. The terminal keeps every panel in its pane. + - Desktop window: the quit prompt, search (Ctrl+F), history search (Ctrl+R), the layouts list (Alt+M) and the first-run welcome are native dialogs in the window's light or dark look, worked from the keyboard exactly as in the terminal. The quit prompt always comes up in front of whatever is open — closing the window while writing a post @@ -281,6 +287,8 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Fixed +- Starting the client with a saved workspace whose panes held a panel (vitals, who is here, the quick bar, the + composer) or the map no longer fails before the first frame. - Desktop window: the Keys screen (F4) and the quick bar now describe the window's keys rather than a terminal's. Ctrl+digit, Ctrl+Shift+letter, Ctrl+Tab and Alt+O are shown as working keys you can bind, and Alt+Enter is marked as taken because it maximises the window. diff --git a/CLAUDE.md b/CLAUDE.md index 6f73d997..4efe95bb 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -1262,6 +1262,45 @@ fallbacks) for inline images/maps. re-asserted on every layout change, and releasing there disarmed the composer the moment its pane was built. ⌥⏎ arrives as Esc then Enter, so an Enter within 50 ms of the releasing Esc re-arms and inserts a newline (`TryComposerAltEnter`). `DockedComposerTests` covers each of these. +- **The window can pop a native panel out into a window of its own** (map, vitals, who-here, quick bar; + `SharpMUTermApp.Floating.cs`, Avalonia `FloatingPanels.cs`: `FloatingPanelPresenter`, `FloatingPanelWindow`, + `PopOutButton`; Core `FloatingBounds`; Client `PanelFloatCommands`, `FloatingPanelModel`; ⌃P `panel:popout:` + and `panel:dock:`; the `floating-panel` surface). Three ways out — the button in the docked view's top-right + corner, the pane's right-click menu, ⌃P — and three ways back: the floating window's Dock, closing it, ⌃P. Decisions: + - **Floating is a fact about the panel's *window*** (`WorkspaceWindow.Floating`, screen pixels; `Unplaced` = the host + picks), so it is saved with the workspace, and a layout says the same per panel (`PanelPlacement.Floating`, + captured by `LayoutCapture` from `FloatingPanelsOf`). **The fold never reads it**: region, order and size stay the + place it docks back to, and a host that cannot float folds the layout exactly as if it said nothing. + - **The host fact is `ClientHost.FloatingPanels` (`IFloatingPanels?`, required, null in the terminal and headless)**, + not `HostChrome`. `HostChrome` says which chrome a host draws *instead of cells*; floating is a channel the client + publishes to (models out, moves and docks back), the `IPointerPresenter`/`INativeModals` shape, and a null member + is the one "this host cannot" every other optional channel already uses. `CanFloatPanels` reads it; ⌃P's families + list nothing without it (`CommandContext.Floats` null), the pane menu adds no entry, a docked overlay carries no + `PopOut`, and `PopOutPanel` refuses out loud. The catalog's actions say `OnlyOn: Window` with `CellsVia` the ⌃P id. + - **The pane goes through the workspace's own operations, and no cell is spent.** While the live layout owns the + panes, a pop out or a dock re-applies it (`RearrangeLiveLayout` → `ApplyLayout(adoptFloating: false)`) with the + floating window withheld (`DockedWindows`), so the panes are exactly the layout without that panel — the rectangles, + and so NAWS, are equal (`APoppedOutPanelLeavesThePanesALayoutWithoutItWouldHave`). Otherwise `RemoveWindow`/`AddWindow` + (back into the pane it left). An explicit apply takes the layout's floating state (`AdoptFloating`); a re-fold keeps + what is floating now. `OpenPanel`/`ShowMap` dock a floating panel: asking for it in a pane means the pane. + - **A floating panel is published like a docked one, from the same function** (`OverlayFor(…, docked: false)`): the + same model and the same callbacks, so a walk, a look or a quick key from the floating window runs the same method + on the panel's own character. Its control is made if it never had a pane (`EnsureFloatingControl`), and a redraw of + it republishes (`PanelView.Refreshed`, `RenderMap` → `NoteFloatingContent`), since no frame paints for it. + - **Resumed by either host**: `SettleRestoredFloating` takes a floating window out of its pane where the host floats, + and puts one back in a pane where it cannot, keeping the flag for the next host that can. A floating window has no + rail row (it would read `closed`). + - **The window**: owned by the main window, `ShowActivated = false`, not in the taskbar; first placed beside the main + window (left when the right has no room), later where the player left it, **clamped to the screens there are now** + (`FloatingBounds.ClampTo`: unchanged when wholly on a screen, else the screen holding most of it or the nearest, shrunk + to fit). Moves are reported after 300 ms of quiet. Every key and every typed character goes to `TerminalView`'s + handlers, so typing lands on the command line. Its plane is the character's pane tint on the theme, its ink the + theme's text. Closing it docks; the client closing it (a dock, the main window going) docks nothing. + - **Fixed on the way**: `PaneOutputRects` called before the main window existed threw, so a resumed workspace holding + any panel or map pane threw in the constructor; it now answers "nothing arranged yet". + - **Not done**: one floating window per panel window, not per panel kind across characters; no snapping or + always-on-top choice; the composer does not float; positions on a mixed-DPI desktop are assumed to be in the main + window's scaling. ## One client, several hosts — and how they are kept the same @@ -1270,7 +1309,7 @@ one `SharpMUTermApp`; a host is only the place it runs. What differs between hos (`src/SharpMUTerm.Tui/Hosting/`): driver, capabilities, clipboard, URL opener, focus reporting, keys (`HostKeys`: the newline chord, and the chords the host keeps for itself), whether there is a main loop, the Sixel cell size, and what it does with the pointer (`IPointerPresenter`, null for none), whether it draws the declared settings natively (`INativeSettings`, null for the cell screens), and whether it -draws ⌃P natively (`INativePalette`, null for the cell popup), whether it draws the composer with its own editor (`INativeComposer`, null for cells), whether it draws the quit prompt, ⌃F, ⌃R, ⌥M and the welcome itself (`INativeModals`, null for cells), where the title for what is in front goes (`IWindowTitle`: the window's title bar, the terminal's OSC 2, null headless), and which chrome it draws itself beside the cells (`HostChrome`: the header and the rail, which the client then leaves out of the grid). Built by `ClientHost.Terminal`, `ClientHost.Headless`/`Snapshot` and +draws ⌃P natively (`INativePalette`, null for the cell popup), whether it draws the composer with its own editor (`INativeComposer`, null for cells), whether it draws the quit prompt, ⌃F, ⌃R, ⌥M and the welcome itself (`INativeModals`, null for cells), where the title for what is in front goes (`IWindowTitle`: the window's title bar, the terminal's OSC 2, null headless), whether it can pop a panel out into a window of its own (`IFloatingPanels`, null for none), and which chrome it draws itself beside the cells (`HostChrome`: the header and the rail, which the client then leaves out of the grid). Built by `ClientHost.Terminal`, `ClientHost.Headless`/`Snapshot` and `WindowHost.Create` (Avalonia). Four things keep a feature from landing in one host only: - **Every `ClientHost` and `HostKeys` member is `required`**, so a member added there does not compile until diff --git a/src/SharpMUTerm.Avalonia/AvaloniaConsoleDriver.cs b/src/SharpMUTerm.Avalonia/AvaloniaConsoleDriver.cs index 4587defa..0fd07b1f 100644 --- a/src/SharpMUTerm.Avalonia/AvaloniaConsoleDriver.cs +++ b/src/SharpMUTerm.Avalonia/AvaloniaConsoleDriver.cs @@ -85,6 +85,9 @@ public AvaloniaConsoleDriver(int columns, int rows) /// public ModalPresenter Modals { get; } = new(); + /// The panels popped out into windows of their own (). + public FloatingPanelPresenter Floating { get; } = new(); + /// The window's title for what is in front, which the main window shows (). public WindowTitleBar TitleBar { get; } = new(); diff --git a/src/SharpMUTerm.Avalonia/DesktopLayer.cs b/src/SharpMUTerm.Avalonia/DesktopLayer.cs index e384b6ed..7d076aaa 100644 --- a/src/SharpMUTerm.Avalonia/DesktopLayer.cs +++ b/src/SharpMUTerm.Avalonia/DesktopLayer.cs @@ -42,6 +42,7 @@ internal sealed class DesktopLayer : Canvas private readonly Dictionary _buttons = new(StringComparer.Ordinal); private readonly Dictionary _gauges = new(StringComparer.Ordinal); private readonly Dictionary _maps = new(StringComparer.Ordinal); + private readonly Dictionary _popOuts = new(StringComparer.Ordinal); private readonly NativeHeader _header; private readonly NativeSidebar _sidebar; private readonly Dictionary _whoHere = new(StringComparer.Ordinal); @@ -123,6 +124,9 @@ protected override void OnSizeChanged(SizeChangedEventArgs e) /// The native maps by window id. Internal for tests. internal IReadOnlyDictionary Maps => _maps; + /// The pop-out buttons, by the panel window each pops out. Internal for tests. + internal IReadOnlyDictionary PopOuts => _popOuts; + /// The native header. Internal for tests. internal NativeHeader Header => _header; @@ -330,6 +334,41 @@ private void SyncPanels(ScreenFrame frame, Size cell) frame, cell, (composer, panel, plane) => composer.Show(panel.Composer!, panel.ComposerSession!, panel.Ink, plane, text)); + SyncPopOuts(frame, cell); + } + + /// + /// A pop-out button in the top right corner of every docked panel the client says can float, above the panel's + /// own view and below the toasts. A panel that cannot float (or a host that cannot) publishes no callback, and + /// gets no button. + /// + private void SyncPopOuts(ScreenFrame frame, Size cell) + { + var wanted = _pointer.Panels.Where(p => p.PopOut is not null && p.Rect.Width > 0 && p.Rect.Height > 0).ToList(); + foreach (var stale in _popOuts.Keys.Where(id => wanted.All(p => p.WindowId != id)).ToList()) + { + Children.Remove(_popOuts[stale]); + _popOuts.Remove(stale); + } + + var origin = CellOrigin; + foreach (var panel in wanted) + { + if (!_popOuts.TryGetValue(panel.WindowId, out var button)) + { + button = new PopOutButton(); + _popOuts[panel.WindowId] = button; + Children.Insert(Math.Max(0, Children.IndexOf(_toasts)), button); + } + + var size = Math.Clamp(cell.Height - 2, 12, 18); + var rect = panel.Rect; + button.Width = size; + button.Height = size; + SetLeft(button, origin.X + ((rect.X + rect.Width) * cell.Width) - size - 3); + SetTop(button, origin.Y + (rect.Y * cell.Height) + 2); + button.Show(panel, Colour(_view.Renderer.DefaultForeground)); + } } /// diff --git a/src/SharpMUTerm.Avalonia/FloatingPanels.cs b/src/SharpMUTerm.Avalonia/FloatingPanels.cs new file mode 100644 index 00000000..707f6e1e --- /dev/null +++ b/src/SharpMUTerm.Avalonia/FloatingPanels.cs @@ -0,0 +1,569 @@ +using Avalonia; +using Avalonia.Automation; +using Avalonia.Controls; +using Avalonia.Controls.Primitives; +using Avalonia.Input; +using Avalonia.Layout; +using Avalonia.Media; +using Avalonia.Threading; +using SharpMUTerm.Client.Panels; +using SharpMUTerm.Core.Layouts; +using SharpMUTerm.Core.Workspaces; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Avalonia; + +/// +/// The window host's : one per panel the client says is +/// popped out, owned by the main window, opened where it was left (clamped to the screens there are now) or beside the +/// main window, and closed when the client docks it. The client calls in on its own thread; everything here is posted +/// to the window's. +/// +internal sealed class FloatingPanelPresenter : IFloatingPanels +{ + private readonly Dictionary _windows = new(StringComparer.Ordinal); + private IReadOnlyList _panels = Array.Empty(); + private Window? _owner; + private TerminalView? _view; + private bool _attached; + + /// What the client last said is floating; any thread. + public IReadOnlyList Panels => Volatile.Read(ref _panels); + + /// The open floating windows by panel window id. Window's thread; internal for tests. + internal IReadOnlyDictionary Windows => _windows; + + /// + /// The screens' working areas in screen pixels, which a remembered place is clamped to. The owner's screens by + /// default; a test hands in its own. + /// + internal Func>? Screens { get; set; } + + /// Raised on the client's thread when changes. + public event Action? Changed; + + /// Where the windows belong and whose cells their keys go to. On the window's thread. + public void Attach(Window? owner, TerminalView view) + { + _owner = owner; + _view = view; + _attached = true; + Sync(); + } + + /// The main window is going: every floating window closes with it and docks nothing. + public void Detach() + { + _attached = false; + foreach (var window in _windows.Values.ToList()) + { + window.CloseForClient(); + } + + _windows.Clear(); + } + + public void Show(IReadOnlyList panels) + { + Volatile.Write(ref _panels, panels); + Changed?.Invoke(); + if (_attached) + { + Dispatcher.UIThread.Post(Sync); + } + } + + /// Opens, updates and closes windows to match what the client last said. On the window's thread. + internal void Sync() + { + if (!_attached || _view is null) + { + return; + } + + var panels = Panels; + foreach (var gone in _windows.Keys.Where(id => panels.All(p => p.Model.WindowId != id)).ToList()) + { + _windows[gone].CloseForClient(); + _windows.Remove(gone); + } + + foreach (var panel in panels) + { + if (_windows.TryGetValue(panel.Model.WindowId, out var open)) + { + open.Update(panel, _view.CellExtent.Height); + if (panel.Model.Bounds.IsPlaced && !open.IsAt(panel.Model.Bounds)) + { + open.Place(Clamp(panel.Model.Bounds), Scaling()); + } + + continue; + } + + var window = new FloatingPanelWindow(panel, _view); + window.Update(panel, _view.CellExtent.Height); + var bounds = panel.Model.Bounds.IsPlaced ? panel.Model.Bounds : BesideOwner(panel.Model.PanelId); + window.Place(Clamp(bounds), Scaling()); + window.Closed += (_, _) => + { + if (_windows.TryGetValue(panel.Model.WindowId, out var known) && ReferenceEquals(known, window)) + { + _windows.Remove(panel.Model.WindowId); + } + }; + _windows[panel.Model.WindowId] = window; + + // Opened without taking the keyboard: the player was typing on the command line, and still is. + if (_owner is { IsVisible: true } owner) + { + window.Show(owner); + } + else + { + window.Show(); + } + + window.ReportPlace(); + } + } + + private double Scaling() => _owner?.DesktopScaling is > 0 and var scale ? scale : 1; + + /// Clamped to the screens a person can see now (a monitor unplugged since is not one of them). + private FloatingBounds Clamp(FloatingBounds bounds) => bounds.ClampTo(Screens?.Invoke() ?? OwnerScreens()); + + private IReadOnlyList OwnerScreens() => + _owner?.Screens.All.Select(s => new FloatingBounds(s.WorkingArea.X, s.WorkingArea.Y, s.WorkingArea.Width, s.WorkingArea.Height)).ToList() + ?? (IReadOnlyList)Array.Empty(); + + /// A first place for a panel: just right of the main window, top-aligned, sized for what it shows. + private FloatingBounds BesideOwner(string panelId) + { + var scale = Scaling(); + var (width, height) = panelId switch + { + PanelIds.Map => (460.0, 460.0), + PanelIds.Vitals => (300.0, 250.0), + PanelIds.WhoHere => (280.0, 380.0), + PanelIds.QuickBar => (560.0, 76.0), + _ => (360.0, 300.0), + }; + + var x = 80.0; + var y = 80.0; + if (_owner is { } owner) + { + // Right of the main window; left of it when the right has no room on the screen and the left has, else + // right anyway and the clamp brings it back over the main window's edge. + var offset = _windows.Count * 28; + var left = owner.Position.X; + var right = owner.Position.X + (owner.Bounds.Width * scale); + x = right + 8 + offset; + y = owner.Position.Y + offset; + var screens = Screens?.Invoke() ?? OwnerScreens(); + var screen = screens.FirstOrDefault(s => left >= s.X && left < s.X + s.Width) ?? screens.FirstOrDefault(); + if (screen is not null && x + (width * scale) > screen.X + screen.Width && left - 8 - (width * scale) - offset >= screen.X) + { + x = left - 8 - (width * scale) - offset; + } + } + + return new FloatingBounds(x, y, width * scale, height * scale); + } +} + +/// +/// A panel popped out into a window of its own: the panel's own native view (the map, the vitals gauges, who is here, +/// the quick bar), drawn from the same model and with the same actions as when it is docked, under a slim bar saying +/// whose it is with a way back. It never takes the keyboard on opening, and a key pressed while it is in front goes to +/// the command line, so the player keeps typing. Closing it docks the panel back. +/// +internal sealed class FloatingPanelWindow : Window +{ + private const double BarHeight = 26; + + private readonly TerminalView _view; + private readonly Control _content; + private readonly TextBlock _title; + private readonly FrameButton _dock; + private readonly Border _bar; + private readonly DispatcherTimer _report; + private bool _closingForClient; + private bool _placing; + + public FloatingPanelWindow(FloatingPanel panel, TerminalView view) + { + _view = view; + Panel = panel; + ShowActivated = false; + ShowInTaskbar = false; + CanResize = true; + MinWidth = 160; + MinHeight = 56; + WindowStartupLocation = WindowStartupLocation.Manual; + + _content = panel.Model.PanelId switch + { + PanelIds.Map => new MapCanvas(view) { RightClick = ShowOwnMenu }, + PanelIds.Vitals => new VitalsGauges(), + PanelIds.WhoHere => new WhoHereList(view) { RightClick = ShowOwnMenu }, + PanelIds.QuickBar => new QuickBarButtons(view) { RightClick = ShowOwnMenu }, + _ => new Border(), + }; + _content.Focusable = false; + + _title = new TextBlock { VerticalAlignment = VerticalAlignment.Center, FontSize = 12, Margin = new Thickness(10, 0, 0, 0) }; + _dock = new FrameButton("Dock") { Width = 52, Height = 20, Margin = new Thickness(0, 0, 6, 0), VerticalAlignment = VerticalAlignment.Center }; + _dock.Click += () => Panel.Dock(); + AutomationProperties.SetName(_dock, "Dock back into the layout"); + ToolTip.SetTip(_dock, "Dock back into its place in the layout"); + + var bar = new DockPanel { Height = BarHeight, LastChildFill = true }; + DockPanel.SetDock(_dock, Dock.Right); + bar.Children.Add(_dock); + bar.Children.Add(_title); + _bar = new Border { Child = bar }; + + var root = new DockPanel { LastChildFill = true }; + DockPanel.SetDock(_bar, Dock.Top); + root.Children.Add(_bar); + root.Children.Add(_content); + Content = root; + + _report = new DispatcherTimer { Interval = TimeSpan.FromMilliseconds(300) }; + _report.Tick += (_, _) => + { + _report.Stop(); + ReportPlace(); + }; + PositionChanged += (_, _) => Moved(); + Resized += (_, _) => Moved(); + Closing += (_, _) => + { + // The player closed it: the panel goes back to its place, never away. + if (!_closingForClient) + { + Panel.Dock(); + } + }; + + // A right click anywhere the panel's own view does not answer (the vitals gauges take no input) is the window's menu. + PointerPressed += (_, e) => + { + if (e.GetCurrentPoint(this).Properties.IsRightButtonPressed) + { + e.Handled = true; + ShowOwnMenu(e.GetPosition(this)); + } + }; + } + + /// What it is showing. + public FloatingPanel Panel { get; private set; } + + /// The panel's own native view inside it. Internal for tests. + internal Control PanelView => _content; + + /// The Dock button. Internal for tests. + internal FrameButton DockButton => _dock; + + /// The last menu the window opened. Internal for tests. + internal ContextMenu? OpenedMenu { get; private set; } + + /// Shows : its title, the client's colours, and the panel's model and actions. + public void Update(FloatingPanel panel, double cellHeight) + { + Panel = panel; + Title = panel.Model.WindowTitle; + var plane = Parse(panel.Plane, Colors.Black); + var text = Parse(panel.Text, Colors.White); + Background = new SolidColorBrush(plane); + _bar.Background = new SolidColorBrush(Shade(plane, text, 0.08)); + _title.Foreground = new SolidColorBrush(Color.FromArgb(0xD0, text.R, text.G, text.B)); + _title.Text = panel.Model.WindowTitle; + _dock.Ink = text; + _dock.Plane = plane; + + var content = panel.Content; + switch (_content) + { + case MapCanvas map when content.Map is { } model: + map.Show(model, content.Ink, plane, text, content.WalkTo); + break; + case VitalsGauges gauges when content.Vitals is { } vitals: + gauges.Show(vitals, content.Ink, plane, text, cellHeight); + break; + case WhoHereList list when content.WhoHere is { } who: + list.Show(who, content.Ink, plane, text, cellHeight, content.Pick); + break; + case QuickBarButtons bar when content.QuickBar is { } quick: + bar.Show(quick, content.Ink, plane, text, cellHeight, content.Pick, content.Dispatch); + break; + } + } + + /// Puts the window at (screen pixels), without reporting it back as a move. + public void Place(FloatingBounds bounds, double scaling) + { + _placing = true; + try + { + Position = new PixelPoint((int)Math.Round(bounds.X), (int)Math.Round(bounds.Y)); + Width = Math.Max(MinWidth, bounds.Width / scaling); + Height = Math.Max(MinHeight, bounds.Height / scaling); + } + finally + { + _placing = false; + } + } + + /// Where the window is now, in screen pixels. + public FloatingBounds CurrentBounds() + { + var scaling = DesktopScaling > 0 ? DesktopScaling : 1; + var size = ClientSize.Width > 0 ? ClientSize : new Size(Width, Height); + return new FloatingBounds(Position.X, Position.Y, Math.Round(size.Width * scaling), Math.Round(size.Height * scaling)); + } + + /// Whether the window is already at , give or take a pixel. + public bool IsAt(FloatingBounds bounds) + { + var now = CurrentBounds(); + return Math.Abs(now.X - bounds.X) <= 1 && Math.Abs(now.Y - bounds.Y) <= 1 + && Math.Abs(now.Width - bounds.Width) <= 2 && Math.Abs(now.Height - bounds.Height) <= 2; + } + + /// Tells the client where the window is, so the workspace and a saved layout remember it. + public void ReportPlace() => Panel.Moved(CurrentBounds()); + + /// Closed because the client docked the panel (or the main window went): docks nothing. + public void CloseForClient() + { + _closingForClient = true; + _report.Stop(); + Close(); + } + + private void Moved() + { + if (_placing || _closingForClient) + { + return; + } + + _report.Stop(); + _report.Start(); + } + + // Every key goes to the command line, the window's own chords included, as if the cells had it. + protected override void OnKeyDown(KeyEventArgs e) + { + base.OnKeyDown(e); + if (!e.Handled) + { + _view.HandleKeyDown(e); + } + } + + protected override void OnTextInput(TextInputEventArgs e) + { + base.OnTextInput(e); + if (!e.Handled) + { + _view.HandleTextInput(e); + } + } + + /// The window's own menu: the way back, since there is no pane under it for the client's. + private void ShowOwnMenu(Point at) + { + var items = new List + { + new($"Dock {Panel.Model.Title} back", null, () => Panel.Dock()), + }; + var menu = NativeMenu.Build(items, PlacementMode.Pointer, this); + OpenedMenu = menu; + menu.Open(this); + } + + private static Color Parse(string hex, Color fallback) => Color.TryParse(hex, out var colour) ? colour : fallback; + + /// moved a little toward : the bar a step off the panel. + private static Color Shade(Color plane, Color ink, double by) => Color.FromRgb( + (byte)(plane.R + ((ink.R - plane.R) * by)), + (byte)(plane.G + ((ink.G - plane.G) * by)), + (byte)(plane.B + ((ink.B - plane.B) * by))); + + /// A small drawn text button, in the window's colours rather than a theme's; never takes the keyboard. + internal sealed class FrameButton : Control + { + private readonly string _label; + private bool _pressed; + + public FrameButton(string label) + { + _label = label; + Focusable = false; + Cursor = new Cursor(StandardCursorType.Hand); + } + + public Color Ink { get; set; } = Colors.White; + + public Color Plane { get; set; } = Colors.Black; + + /// Raised on a left click. + public event Action? Click; + + /// Clicks it, as a left press and release would. Internal for tests. + internal void PerformClick() => Click?.Invoke(); + + protected override void OnPointerEntered(PointerEventArgs e) + { + base.OnPointerEntered(e); + InvalidateVisual(); + } + + protected override void OnPointerExited(PointerEventArgs e) + { + base.OnPointerExited(e); + InvalidateVisual(); + } + + protected override void OnPointerPressed(PointerPressedEventArgs e) + { + base.OnPointerPressed(e); + _pressed = e.GetCurrentPoint(this).Properties.IsLeftButtonPressed; + e.Handled = true; + InvalidateVisual(); + } + + protected override void OnPointerReleased(PointerReleasedEventArgs e) + { + base.OnPointerReleased(e); + e.Handled = true; + var click = _pressed && e.InitialPressMouseButton == MouseButton.Left && new Rect(Bounds.Size).Contains(e.GetPosition(this)); + _pressed = false; + InvalidateVisual(); + if (click) + { + Click?.Invoke(); + } + } + + public override void Render(DrawingContext context) + { + var bounds = new Rect(Bounds.Size); + var plate = (byte)(_pressed ? 0x55 : IsPointerOver ? 0x38 : 0x1c); + context.DrawRectangle(new SolidColorBrush(Color.FromArgb(plate, Ink.R, Ink.G, Ink.B)), null, bounds, 4, 4); + var text = new FormattedText( + _label, + System.Globalization.CultureInfo.InvariantCulture, + FlowDirection.LeftToRight, + Typeface.Default, + 11.5, + new SolidColorBrush(Color.FromArgb(0xE8, Ink.R, Ink.G, Ink.B))); + context.DrawText(text, new Point(Math.Round((bounds.Width - text.Width) / 2), Math.Round((bounds.Height - text.Height) / 2))); + } + } +} + +/// +/// The small button over a docked native panel's top-right corner that pops it out into a window of its own — only +/// where the window can float that panel (the client hands a callback). Drawn, never focused; its presses are the +/// window's and never reach the cells under it. +/// +internal sealed class PopOutButton : Control +{ + private bool _pressed; + + public PopOutButton() + { + Focusable = false; + Cursor = new Cursor(StandardCursorType.Hand); + AutomationProperties.SetName(this, "Pop out into its own window"); + ToolTip.SetTip(this, "Pop out into its own window"); + } + + /// The panel it pops out, as the client last published it. + public PanelOverlay? Panel { get; private set; } + + public Color Ink { get; set; } = Colors.White; + + /// Shows the button for , in . + public void Show(PanelOverlay panel, Color ink) + { + Panel = panel; + if (Ink != ink) + { + Ink = ink; + InvalidateVisual(); + } + } + + /// Clicks it, as a left press and release would. Internal for tests. + internal void PerformClick() => Panel?.PopOut?.Invoke(); + + protected override void OnPointerEntered(PointerEventArgs e) + { + base.OnPointerEntered(e); + InvalidateVisual(); + } + + protected override void OnPointerExited(PointerEventArgs e) + { + base.OnPointerExited(e); + InvalidateVisual(); + } + + protected override void OnPointerPressed(PointerPressedEventArgs e) + { + base.OnPointerPressed(e); + _pressed = e.GetCurrentPoint(this).Properties.IsLeftButtonPressed; + e.Handled = true; + InvalidateVisual(); + } + + protected override void OnPointerReleased(PointerReleasedEventArgs e) + { + base.OnPointerReleased(e); + e.Handled = true; + var click = _pressed && e.InitialPressMouseButton == MouseButton.Left && new Rect(Bounds.Size).Contains(e.GetPosition(this)); + _pressed = false; + InvalidateVisual(); + if (click) + { + PerformClick(); + } + } + + protected override void OnPointerWheelChanged(PointerWheelEventArgs e) + { + base.OnPointerWheelChanged(e); + e.Handled = true; + } + + public override void Render(DrawingContext context) + { + var bounds = new Rect(Bounds.Size); + var plate = (byte)(_pressed ? 0x60 : IsPointerOver ? 0x40 : 0x18); + context.DrawRectangle(new SolidColorBrush(Color.FromArgb(plate, Ink.R, Ink.G, Ink.B)), null, bounds, 3, 3); + + // A frame with an arrow leaving its corner: out into a window of its own. + var alpha = (byte)(IsPointerOver ? 0xF0 : 0xA8); + var pen = new Pen(new SolidColorBrush(Color.FromArgb(alpha, Ink.R, Ink.G, Ink.B)), 1.2); + var side = Math.Min(bounds.Width, bounds.Height); + var inset = Math.Round(side * 0.24) + 0.5; + var box = new Rect(inset, inset + 1, side - (2 * inset) - 1, side - (2 * inset) - 1); + var gap = box.Width * 0.45; + context.DrawLine(pen, new Point(box.Right - gap, box.Top), new Point(box.Left, box.Top)); + context.DrawLine(pen, new Point(box.Left, box.Top), new Point(box.Left, box.Bottom)); + context.DrawLine(pen, new Point(box.Left, box.Bottom), new Point(box.Right, box.Bottom)); + context.DrawLine(pen, new Point(box.Right, box.Bottom), new Point(box.Right, box.Top + gap)); + var tip = new Point(box.Right + 1, box.Top - 1); + context.DrawLine(pen, new Point(box.Left + (box.Width * 0.45), box.Bottom - (box.Height * 0.45)), tip); + context.DrawLine(pen, tip, new Point(tip.X - (box.Width * 0.38), tip.Y)); + context.DrawLine(pen, tip, new Point(tip.X, tip.Y + (box.Height * 0.38))); + } +} diff --git a/src/SharpMUTerm.Avalonia/MainWindow.cs b/src/SharpMUTerm.Avalonia/MainWindow.cs index 107f7c6d..252618df 100644 --- a/src/SharpMUTerm.Avalonia/MainWindow.cs +++ b/src/SharpMUTerm.Avalonia/MainWindow.cs @@ -82,6 +82,10 @@ public MainWindow(WindowOptions options, IClassicDesktopStyleApplicationLifetime // The modals, over everything; the quit prompt is kept the last child whatever is added after it, and brings // this window forward. ⌃Q from any other modal goes to the client, which opens the prompt over it. _driver.Modals.Attach(this, root, () => layer.FocusArmedComposer(), key => _driver.RaiseKey(key)); + + // Panels popped out into windows of their own, owned by this one so they stay above it and go with it. + _driver.Floating.Attach(this, _view); + Closed += (_, _) => _driver.Floating.Detach(); Content = root; AutomationProperties.SetName(_view, "SharpMUTerm"); diff --git a/src/SharpMUTerm.Avalonia/MapCanvas.cs b/src/SharpMUTerm.Avalonia/MapCanvas.cs index 9d2787f5..b81e6a6c 100644 --- a/src/SharpMUTerm.Avalonia/MapCanvas.cs +++ b/src/SharpMUTerm.Avalonia/MapCanvas.cs @@ -28,6 +28,12 @@ internal sealed class MapCanvas : Control private const double MinZoom = 0.35, MaxZoom = 3, DragThreshold = 4; private readonly TerminalView _view; + + /// + /// What a right click does instead of reaching the cell under it: set in a floating panel's window, which has no + /// cell under it, to open that window's own menu. Null over a pane, where the client's menu for the pane opens. + /// + internal Action? RightClick { get; set; } private MapViewModel _model = new(null, 0, [], [], null); private PanelInk _ink = new("#5fafff", "#ffaf5f", "#6a6a72"); private Color _plane = Colors.Black; @@ -104,6 +110,12 @@ protected override void OnPointerPressed(PointerPressedEventArgs e) e.Handled = true; if (point.Properties.IsRightButtonPressed) { + if (RightClick is { } own) + { + own(e.GetPosition(this)); + return; + } + _view.ForwardRightClick(e.GetPosition(_view), e.KeyModifiers); return; } diff --git a/src/SharpMUTerm.Avalonia/QuickBarButtons.cs b/src/SharpMUTerm.Avalonia/QuickBarButtons.cs index de494bcb..f2d8f794 100644 --- a/src/SharpMUTerm.Avalonia/QuickBarButtons.cs +++ b/src/SharpMUTerm.Avalonia/QuickBarButtons.cs @@ -46,6 +46,12 @@ internal enum SlotKind private const double Gap = 6, PadX = 8; private readonly TerminalView _view; + + /// + /// What a right click does instead of reaching the cell under it: set in a floating panel's window, which has no + /// cell under it, to open that window's own menu. Null over a pane, where the client's menu for the pane opens. + /// + internal Action? RightClick { get; set; } private readonly List _slots = []; private QuickBarModel _model = QuickBarModel.Empty; private PanelInk _ink = new("#5fafff", "#ff5f5f", "#3a3a40"); @@ -242,6 +248,12 @@ protected override void OnPointerPressed(PointerPressedEventArgs e) var point = e.GetCurrentPoint(this); if (point.Properties.IsRightButtonPressed) { + if (RightClick is { } own) + { + own(e.GetPosition(this)); + return; + } + _view.ForwardRightClick(e.GetPosition(_view), e.KeyModifiers); return; } diff --git a/src/SharpMUTerm.Avalonia/TerminalView.cs b/src/SharpMUTerm.Avalonia/TerminalView.cs index b71ad19c..fe9bfda6 100644 --- a/src/SharpMUTerm.Avalonia/TerminalView.cs +++ b/src/SharpMUTerm.Avalonia/TerminalView.cs @@ -208,6 +208,15 @@ private void OnFrameReady() protected override void OnKeyDown(KeyEventArgs e) { base.OnKeyDown(e); + HandleKeyDown(e); + } + + /// + /// A key, as the cells take it: the window's own chords first, then the client. Also how a key pressed in another of + /// the window's windows (a floating panel) reaches the command line, so the player keeps typing. + /// + internal void HandleKeyDown(KeyEventArgs e) + { _swallowText = null; var mapped = KeyMapper.FromKeyDown(e.Key, e.KeyModifiers); @@ -241,6 +250,12 @@ protected override void OnKeyDown(KeyEventArgs e) protected override void OnTextInput(TextInputEventArgs e) { base.OnTextInput(e); + HandleTextInput(e); + } + + /// Typed text, as the cells take it; also what a floating panel's window forwards. + internal void HandleTextInput(TextInputEventArgs e) + { foreach (var key in KeyMapper.FromText(e.Text)) { if (_swallowText is { } swallowed && char.ToLowerInvariant(swallowed) == char.ToLowerInvariant(key.KeyChar)) diff --git a/src/SharpMUTerm.Avalonia/WhoHereList.cs b/src/SharpMUTerm.Avalonia/WhoHereList.cs index bc910ebe..71ce2cb1 100644 --- a/src/SharpMUTerm.Avalonia/WhoHereList.cs +++ b/src/SharpMUTerm.Avalonia/WhoHereList.cs @@ -24,6 +24,12 @@ namespace SharpMUTerm.Avalonia; internal sealed class WhoHereList : Control { private readonly TerminalView _view; + + /// + /// What a right click does instead of reaching the cell under it: set in a floating panel's window, which has no + /// cell under it, to open that window's own menu. Null over a pane, where the client's menu for the pane opens. + /// + internal Action? RightClick { get; set; } private readonly List<(int Index, Rect Rect)> _rows = []; private WhoHereModel _model = WhoHereModel.Unknown; private PanelInk _ink = new("#5fafff", "#ff5f5f", "#3a3a40"); @@ -188,6 +194,12 @@ protected override void OnPointerPressed(PointerPressedEventArgs e) var point = e.GetCurrentPoint(this); if (point.Properties.IsRightButtonPressed) { + if (RightClick is { } own) + { + own(e.GetPosition(this)); + return; + } + _view.ForwardRightClick(e.GetPosition(_view), e.KeyModifiers); return; } diff --git a/src/SharpMUTerm.Avalonia/WindowHost.cs b/src/SharpMUTerm.Avalonia/WindowHost.cs index 480795ba..ba3b418e 100644 --- a/src/SharpMUTerm.Avalonia/WindowHost.cs +++ b/src/SharpMUTerm.Avalonia/WindowHost.cs @@ -83,5 +83,8 @@ internal static class WindowHost NativeModals = driver.Modals, // The title bar and the taskbar entry say who is in front: Character@World — SharpMUTerm. Title = driver.TitleBar, + + // A panel popped out is a window of its own, owned by the main one, for a second monitor. + FloatingPanels = driver.Floating, }; } diff --git a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs index b19863ae..2cf52d0d 100644 --- a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs +++ b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs @@ -130,6 +130,12 @@ void Family(string id, string prefix, Func c.State.Walking); // Game sound, for this run. The levels and the off switch are F7's; this is the quick one. @@ -415,6 +421,28 @@ private static IEnumerable Panes(ICommandContext context) } } + private static IEnumerable PopOuts(ICommandContext context) => + (context.State.Floats ?? []).Where(f => !f.Floating).Select(f => + new CommandItem( + CommandGroup.Layout, + $"Pop out {f.Title}", + Client.Panels.PanelFloatCommands.PopOut(f.WindowId), + $"{f.Character} · in a window of its own") + { + Detail = $"{f.Character} · in a window of its own", + }); + + private static IEnumerable Docks(ICommandContext context) => + (context.State.Floats ?? []).Where(f => f.Floating).Select(f => + new CommandItem( + CommandGroup.Layout, + $"Dock {f.Title} back", + Client.Panels.PanelFloatCommands.Dock(f.WindowId), + $"{f.Character} · into its place in the layout") + { + Detail = $"{f.Character} · into its place in the layout", + }); + private static IEnumerable Screens(ICommandContext context) => context.Settings.Select(screen => new CommandItem(CommandGroup.Settings, $"Open {screen.Title}", screen.Id, screen.Shortcut) diff --git a/src/SharpMUTerm.Client/Panels/FloatingPanelModel.cs b/src/SharpMUTerm.Client/Panels/FloatingPanelModel.cs new file mode 100644 index 00000000..8d025823 --- /dev/null +++ b/src/SharpMUTerm.Client/Panels/FloatingPanelModel.cs @@ -0,0 +1,48 @@ +using SharpMUTerm.Core.Layouts; +using SharpMUTerm.Core.Workspaces; + +namespace SharpMUTerm.Client.Panels; + +/// +/// The commands that pop a panel out into a window of its own and dock it back, and which panels can. Offered only by +/// a host that can float a panel (the desktop window); in a terminal a floating panel is simply in its region. +/// +public static class PanelFloatCommands +{ + /// The prefix of panel:popout:<window id>. + public const string PopOutPrefix = "panel:popout:"; + + /// The prefix of panel:dock:<window id>. + public const string DockPrefix = "panel:dock:"; + + /// The panels drawn natively from a model of their own, and so drawable in a window apart from the cells. + public static IReadOnlySet Floatable { get; } = new HashSet(StringComparer.Ordinal) + { + PanelIds.Map, PanelIds.Vitals, PanelIds.WhoHere, PanelIds.QuickBar, + }; + + /// Pops the panel drawn in out into a window of its own. + public static string PopOut(string windowId) => PopOutPrefix + windowId; + + /// Docks the floating panel in back into its region. + public static string Dock(string windowId) => DockPrefix + windowId; +} + +/// +/// One panel popped out into a window of its own: which panel, whose, and where its window sits. What the window shows +/// inside is the panel's own model (, , …), the same one its cells +/// draw when it is docked; this is the frame around it. +/// +/// The panel's window in the workspace, out of the pane tree while it floats. +/// Which panel (). +/// What it is called (Map). +/// Whose it is; its actions run on this character's session. +/// Where its window sits, in screen pixels; until placed. +public sealed record FloatingPanelModel(string WindowId, string PanelId, string Title, string Character, FloatingBounds Bounds) +{ + /// The command that docks it back, as the window's close and its Dock button run it. + public string DockCommand => PanelFloatCommands.Dock(WindowId); + + /// The window's title: the panel, then whose. + public string WindowTitle => $"{Title} — {Character}"; +} diff --git a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs index 072acac8..3d6938bb 100644 --- a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs +++ b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs @@ -68,7 +68,13 @@ public enum SurfaceActionKind /// this names where the cells offer the same thing: another surface's id, or a command id (a key, a ⌃P entry). A /// native view may add a door; it may not add a room. /// -public sealed record SurfaceAction(SurfaceActionKind Kind, string Name, string Reaches, string? CellsVia = null); +/// +/// Null when every host that draws the surface offers the action. Otherwise the one host () +/// that can do it at all — popping a panel out into a window of its own is the window's, since a terminal has nowhere +/// to put a second window — and must then name the command that reaches it from the cells +/// on that host. +/// +public sealed record SurfaceAction(SurfaceActionKind Kind, string Name, string Reaches, string? CellsVia = null, string? OnlyOn = null); /// The hosts a surface is declared for, by ClientHost.Name. public static class SurfaceHosts @@ -174,6 +180,22 @@ public static class SurfaceCatalog /// The first-run welcome and its connect form. public const string Welcome = "welcome"; + /// + /// A panel popped out into a window of its own (the desktop window only; a terminal keeps every panel in its + /// region). The frame around the panel's own native view: its title, whose it is, and the way back. + /// + public const string FloatingPanel = "floating-panel"; + + /// + /// Pop the panel out into a window of its own: the window's alone, offered by a button on the panel's native view, + /// the pane's right-click menu and ⌃P (panel:popout:<window>), all ending in one client method. + /// + private static readonly SurfaceAction PopOut = new( + SurfaceActionKind.Command, PanelFloatCommands.PopOutPrefix, "PopOutPanel", CellsVia: PanelFloatCommands.PopOutPrefix, OnlyOn: SurfaceHosts.Window); + + /// The window's views of a panel: its own view, and the pop-out button over it. + private static string[] PanelViews(string view) => ["SharpMUTerm.Avalonia." + view, "SharpMUTerm.Avalonia.PopOutButton"]; + /// The modals the window draws with its own controls in place of the cell modal (ClientHost.NativeModals). public static IReadOnlyList Modals { get; } = [Quit, Search, History, Layouts, Welcome]; @@ -247,34 +269,35 @@ public static class SurfaceCatalog new( PanelIds.Vitals, typeof(VitalsModel), - [], + [PopOut], CellsUnderNative, "SharpMUTerm.Tui.Panels.VitalsStripRenderer.Render", - ["SharpMUTerm.Avalonia.VitalsGauges"]), + PanelViews("VitalsGauges")), new( PanelIds.Map, typeof(MapViewModel), - [new(SurfaceActionKind.Walk, "room", "WalkFromMap")], + [new(SurfaceActionKind.Walk, "room", "WalkFromMap"), PopOut], CellsUnderNative, "SharpMUTerm.Tui.MapRenderer.Render", - ["SharpMUTerm.Avalonia.MapCanvas"]), + PanelViews("MapCanvas")), new( PanelIds.WhoHere, typeof(WhoHereModel), - [new(SurfaceActionKind.Pick, "row", "OfferLook")], + [new(SurfaceActionKind.Pick, "row", "OfferLook"), PopOut], CellsUnderNative, "SharpMUTerm.Tui.Panels.WhoHereRenderer.Render", - ["SharpMUTerm.Avalonia.WhoHereList"]), + PanelViews("WhoHereList")), new( PanelIds.QuickBar, typeof(QuickBarModel), [ new(SurfaceActionKind.Pick, "item", "RunQuickMacro"), new(SurfaceActionKind.Command, QuickBarModel.EditCommand, "DispatchCommand"), + PopOut, ], CellsUnderNative, "SharpMUTerm.Tui.Panels.QuickBarRenderer.Render", - ["SharpMUTerm.Avalonia.QuickBarButtons"]), + PanelViews("QuickBarButtons")), new( Settings, typeof(SettingsSectionContribution), @@ -426,6 +449,23 @@ public static class SurfaceCatalog NativeModal, "SharpMUTerm.Tui.WelcomeSurface.Render", ModalViews("WelcomeView")), + new( + FloatingPanel, + typeof(FloatingPanelModel), + [ + // Its Dock button and closing the window both dock it back; the cells' way is the ⌃P entry, offered + // only where the host can float a panel at all. + new(SurfaceActionKind.Command, PanelFloatCommands.DockPrefix, "DockPanel", CellsVia: PanelFloatCommands.DockPrefix, OnlyOn: SurfaceHosts.Window), + ], + new Dictionary + { + // A terminal has nowhere to put a second window: a floating panel is drawn in its region there, as cells. + [SurfaceHosts.Terminal] = SurfaceDrawing.None, + [SurfaceHosts.Window] = SurfaceDrawing.Native, + }, + null, + ["SharpMUTerm.Avalonia.FloatingPanelWindow"], + KeyboardPath: PanelFloatCommands.DockPrefix), ]; /// The surface with , or null. diff --git a/src/SharpMUTerm.Core/Commands/CommandCatalog.cs b/src/SharpMUTerm.Core/Commands/CommandCatalog.cs index 768d1fa8..1cba2e48 100644 --- a/src/SharpMUTerm.Core/Commands/CommandCatalog.cs +++ b/src/SharpMUTerm.Core/Commands/CommandCatalog.cs @@ -49,6 +49,10 @@ public sealed record CharacterRef( /// How many F4 bindings share a chord with the client or with each other, so Key clashes (N) is offered /// only when there is one to show. /// +/// +/// Null where the host cannot float a panel in a window of its own (the terminal), so nothing is offered; otherwise +/// every panel that can pop out, docked or floating, so Pop out … and Dock … back name real windows. +/// public sealed record CommandContext( bool LoggingOn = false, bool Zoomed = false, @@ -62,7 +66,15 @@ public sealed record CommandContext( bool? Sound = null, bool? Announced = null, bool OutputSelected = false, - int KeyClashes = 0); + int KeyClashes = 0, + IReadOnlyList? Floats = null); + +/// A panel window that can pop out into a window of its own, for the command surface's entries. +/// The panel's window (map:World.Char, panel:vitals:World.Char). +/// What the panel is called (Map, Vitals). +/// Whose panel it is, as the entry's detail. +/// Whether it is popped out now: offered to dock back, else to pop out. +public sealed record PanelFloatRef(string WindowId, string Title, string Character, bool Floating); /// /// A configuration screen the command surface can open: what it calls itself, the id the host diff --git a/src/SharpMUTerm.Core/Layouts/LayoutCapture.cs b/src/SharpMUTerm.Core/Layouts/LayoutCapture.cs index 81901b26..88d16366 100644 --- a/src/SharpMUTerm.Core/Layouts/LayoutCapture.cs +++ b/src/SharpMUTerm.Core/Layouts/LayoutCapture.cs @@ -17,6 +17,14 @@ public sealed record CapturedLayout( /// and not a terminal's size. Panels the previous layout placed that are not on screen now (a map on a session /// that has recorded no room yet) keep their old placement, so saving from a quiet session does not lose them. /// +/// +/// Floating panels. A host that can float panels passes where each popped-out panel's window is +/// (floating): each is captured with set and the region, order and size it +/// had before (the side column for a panel the previous layout did not place), which is where it docks back to; every +/// panel in a pane is captured docked. A host that cannot float passes null, and a panel it shows in a pane keeps the +/// the previous layout gave it — the terminal draws a floating panel in its +/// region, and saving there must not undo the window's choice. +/// /// public static class LayoutCapture { @@ -27,7 +35,11 @@ public static class LayoutCapture /// window that belongs to no panel of this session (another character's, the web view). Null when no pane holds /// the output, since a layout is arranged around it. /// - public static CapturedLayout? Capture(LayoutNode root, Func panelOf, LayoutDefinition? previous = null) + public static CapturedLayout? Capture( + LayoutNode root, + Func panelOf, + LayoutDefinition? previous = null, + IReadOnlyDictionary? floating = null) { ArgumentNullException.ThrowIfNull(root); ArgumentNullException.ThrowIfNull(panelOf); @@ -57,6 +69,9 @@ LayoutRegion RegionOf(PaneRect r) => : r.Y >= m.Y + m.Height ? LayoutRegion.Bottom : LayoutRegion.Main; + // Shown in a pane: docked, where the host floats; whatever the previous layout said, where it cannot. + FloatingBounds? KeptFloating(string panel) => floating is null ? previous?.PlacementOf(panel)?.Floating : null; + var placements = new List(); foreach (var group in panes.GroupBy(p => RegionOf(p.Rect))) { @@ -74,6 +89,7 @@ LayoutRegion RegionOf(PaneRect r) => Region = group.Key, Order = order, Size = Math.Round(Math.Max(1, size) / 100.0, 2), + Floating = KeptFloating(host), }); placements.AddRange(panels.Skip(1).Select(tab => new PanelPlacement { @@ -81,14 +97,36 @@ LayoutRegion RegionOf(PaneRect r) => Region = group.Key, Order = order, TabOf = host, + Floating = KeptFloating(tab), })); order++; } } + // Floating: where it docks back to is where it was, or the side column for a panel the layout never placed. + foreach (var (panel, bounds) in (floating ?? new Dictionary()).Where(f => PanelIds.IsKnown(f.Key))) + { + if (!seen.Add(panel)) + { + continue; // in a pane as well: the pane wins, the host is mid-way through docking it + } + + var before = previous?.PlacementOf(panel); + placements.Add(new PanelPlacement + { + PanelId = panel, + Region = before?.Region ?? LayoutRegion.Side, + Order = before?.Order ?? placements.Count, + Size = before?.Size ?? 1, + Floating = bounds, + }); + } + if (previous is not null) { - placements.AddRange(previous.KnownPlacements.Where(p => !seen.Contains(p.PanelId))); + // Not on screen and not floating: where the host floats, it is docked now (the host passed every float). + placements.AddRange(previous.KnownPlacements.Where(p => !seen.Contains(p.PanelId)) + .Select(p => floating is null ? p : p with { Floating = null })); } return new CapturedLayout(placements, Shares(panes.Select(p => (p.Rect, RegionOf(p.Rect))).ToList(), m)); diff --git a/src/SharpMUTerm.Core/Layouts/LayoutDefinition.cs b/src/SharpMUTerm.Core/Layouts/LayoutDefinition.cs index 70043ac3..39e6c742 100644 --- a/src/SharpMUTerm.Core/Layouts/LayoutDefinition.cs +++ b/src/SharpMUTerm.Core/Layouts/LayoutDefinition.cs @@ -1,4 +1,5 @@ using System.Text.Json.Serialization; +using SharpMUTerm.Core.Workspaces; namespace SharpMUTerm.Core.Layouts; @@ -47,6 +48,16 @@ public sealed record PanelPlacement /// (unknown, collapsed, or without data yet), this one takes a pane of its own in its own region. /// public string? TabOf { get; init; } + + /// + /// Non-null when the panel is popped out into a window of its own, with where that window sits + /// ( when no place was remembered). Host-neutral, and read only by a host + /// that can float a panel. ignores it and places the panel in its + /// as always, so a host that cannot float (the terminal) draws a floating panel in its region; + /// a host that can withholds the panel's windows from that pane and draws them in a window of their own instead. + /// The region, order and size are therefore kept for a floating panel too: they are where it docks back to. + /// + public FloatingBounds? Floating { get; init; } } /// diff --git a/src/SharpMUTerm.Core/Layouts/LayoutFold.cs b/src/SharpMUTerm.Core/Layouts/LayoutFold.cs index b6c8df6b..c70ca4fb 100644 --- a/src/SharpMUTerm.Core/Layouts/LayoutFold.cs +++ b/src/SharpMUTerm.Core/Layouts/LayoutFold.cs @@ -29,6 +29,12 @@ public sealed record LayoutFoldResult( /// A tab joins its host's pane only when the host has a pane of its own (is drawn and is not itself a tab); /// otherwise it takes a pane in its own region. One level, so there are no chains or cycles to resolve. /// +/// +/// is not read here. A floating panel is folded into its region like any +/// other, which is exactly what a host that cannot float draws. A host that can float withholds that panel's windows +/// when it realises the fold ( drops a pane left with no window), so the panes it draws +/// are the layout without that panel, and docking it back is the same fold with the windows returned. +/// /// public static class LayoutFold { diff --git a/src/SharpMUTerm.Core/Workspace/FloatingBounds.cs b/src/SharpMUTerm.Core/Workspace/FloatingBounds.cs new file mode 100644 index 00000000..4f32f803 --- /dev/null +++ b/src/SharpMUTerm.Core/Workspace/FloatingBounds.cs @@ -0,0 +1,77 @@ +using System.Text.Json.Serialization; + +namespace SharpMUTerm.Core.Workspaces; + +/// +/// Where a popped-out panel's own window sits on the desktop, in screen pixels: its left and top edge, and its width +/// and height. Host-neutral data: a host that can float a panel in a window of its own (the desktop window) puts it +/// here; a host that cannot (the terminal) reads a floating panel as placed in its region and ignores this, so the +/// same workspace and the same layout serve both. +/// +/// (no size) means "popped out, nowhere chosen yet": the host picks a place beside its main +/// window the first time it shows the panel and reports where it put it. +/// +/// +/// The left edge, in screen pixels (may be negative on a screen left of the primary one). +/// The top edge, in screen pixels. +/// The width, in screen pixels; zero or less is . +/// The height, in screen pixels; zero or less is . +public sealed record FloatingBounds(double X, double Y, double Width, double Height) +{ + /// Popped out with no place chosen yet. + public static FloatingBounds Unplaced { get; } = new(0, 0, 0, 0); + + /// How much of a window must stay on a screen, each way, for it to count as reachable there. + public const double MinimumVisible = 48; + + /// Whether a place has been chosen (a size on both axes). + [JsonIgnore] + public bool IsPlaced => Width > 0 && Height > 0; + + private double Right => X + Width; + + private double Bottom => Y + Height; + + /// + /// These bounds moved and shrunk onto the screens a person can see, given each screen's working area in the same + /// pixels. A window remembered on a monitor that has since been unplugged, or a size larger than the screen it is + /// now on, would otherwise open somewhere nobody can reach to close it. The screen the window overlaps most is the + /// one it is kept on (the nearest, by centre, when it overlaps none); it is shrunk to fit that screen's working area + /// and then moved the least distance that puts all of it inside. Bounds already wholly on a screen come back + /// unchanged; and an empty screen list come back as they are. + /// + public FloatingBounds ClampTo(IReadOnlyList screens) + { + ArgumentNullException.ThrowIfNull(screens); + var usable = screens.Where(s => s.IsPlaced).ToList(); + if (!IsPlaced || usable.Count == 0) + { + return this; + } + + if (usable.Any(s => X >= s.X && Y >= s.Y && Right <= s.Right && Bottom <= s.Bottom)) + { + return this; + } + + double Overlap(FloatingBounds s) => + Math.Max(0, Math.Min(Right, s.Right) - Math.Max(X, s.X)) * Math.Max(0, Math.Min(Bottom, s.Bottom) - Math.Max(Y, s.Y)); + + double Distance(FloatingBounds s) + { + var dx = (X + (Width / 2)) - (s.X + (s.Width / 2)); + var dy = (Y + (Height / 2)) - (s.Y + (s.Height / 2)); + return (dx * dx) + (dy * dy); + } + + var screen = usable.Max(Overlap) > 0 + ? usable.OrderByDescending(Overlap).First() + : usable.OrderBy(Distance).First(); + + var width = Math.Min(Width, screen.Width); + var height = Math.Min(Height, screen.Height); + var x = Math.Clamp(X, screen.X, screen.Right - width); + var y = Math.Clamp(Y, screen.Y, screen.Bottom - height); + return new FloatingBounds(x, y, width, height); + } +} diff --git a/src/SharpMUTerm.Core/Workspace/WorkspaceState.cs b/src/SharpMUTerm.Core/Workspace/WorkspaceState.cs index eb8bba04..8dc09462 100644 --- a/src/SharpMUTerm.Core/Workspace/WorkspaceState.cs +++ b/src/SharpMUTerm.Core/Workspace/WorkspaceState.cs @@ -20,6 +20,13 @@ public sealed class WorkspaceWindowState /// /// public int Sequence { get; set; } = WorkspaceWindow.Unsequenced; + + /// + /// Where the window floats when it is a panel popped out into a window of its own + /// (); null for a window in the pane tree. Absent in a file written before + /// panels could float, which reads as not floating. + /// + public FloatingBounds? Floating { get; set; } } /// @@ -86,6 +93,7 @@ public static WorkspaceState Capture(Workspace workspace) SessionKey = w.SessionKey, OwnerLabel = w.OwnerLabel, Sequence = w.Sequence, + Floating = w.Floating, }).ToList(), Root = CaptureNode(workspace.Layout.Root), FocusedPaneId = workspace.Layout.FocusedPaneId, @@ -101,6 +109,7 @@ public Workspace Restore() { OwnerLabel = w.OwnerLabel, Sequence = w.Sequence, + Floating = w.Floating, }); var layout = new WorkspaceLayout(BuildNode(Root), FocusedPaneId, ZoomedPaneId); diff --git a/src/SharpMUTerm.Core/Workspace/WorkspaceWindow.cs b/src/SharpMUTerm.Core/Workspace/WorkspaceWindow.cs index 362e3d8c..7b359577 100644 --- a/src/SharpMUTerm.Core/Workspace/WorkspaceWindow.cs +++ b/src/SharpMUTerm.Core/Workspace/WorkspaceWindow.cs @@ -99,4 +99,12 @@ public WorkspaceWindow(string id, string title, WindowKind kind = WindowKind.Mai /// pane stays visibly tied to its character. Null for a character's own main window. /// public string? OwnerLabel { get; set; } + + /// + /// Non-null while this window is a panel popped out into a window of its own, with where that window sits + /// ( before a host has placed it). Host-neutral: a host that floats panels + /// keeps such a window out of the pane tree and draws it apart; a host that cannot keeps it in a pane like any + /// other and leaves this alone, so a workspace saved by either host means the same thing to the other. + /// + public FloatingBounds? Floating { get; set; } } diff --git a/src/SharpMUTerm.Tui/Hosting/ClientHost.cs b/src/SharpMUTerm.Tui/Hosting/ClientHost.cs index 65dbffbe..8396649d 100644 --- a/src/SharpMUTerm.Tui/Hosting/ClientHost.cs +++ b/src/SharpMUTerm.Tui/Hosting/ClientHost.cs @@ -136,6 +136,17 @@ internal sealed record ClientHost /// public required IWindowTitle? Title { get; init; } + /// + /// Draws panels popped out into windows of their own — the map on a second monitor, vitals floating beside the + /// game — or null for a host that cannot put a panel anywhere but its pane (the terminal, the snapshot, the tests, + /// --plain). One member is both the fact and the channel: a flag beside a presenter could say "can + /// float" with nothing to float into. Where it is null the pop-out commands are not offered (⌃P lists none, the pane + /// menu has no entry, no native view carries the button) and a floating panel, from a layout or a workspace another + /// host saved, is drawn in its region as cells. It is not part of : that says which of the + /// client's own rows and columns the host draws beside the cells, while a floating panel leaves the cells entirely. + /// + public required IFloatingPanels? FloatingPanels { get; init; } + /// /// Whether the terminal driver's input path can decode a focus report. Not on Windows: the Windows branch of /// NetConsoleDriver is a Console.ReadKey loop with its own reassembly, and an ESC [ I @@ -179,6 +190,7 @@ public static ClientHost Terminal(TerminalCapabilities capabilities) NativeComposer = null, NativeModals = null, Title = new TerminalTitle(driver), + FloatingPanels = null, }; /// @@ -207,6 +219,7 @@ public static ClientHost Terminal(TerminalCapabilities capabilities) NativeComposer = null, NativeModals = null, Title = null, + FloatingPanels = null, }; /// diff --git a/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs b/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs index a01cce55..d36c1e55 100644 --- a/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs +++ b/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs @@ -202,6 +202,11 @@ void Notice(NoticeOverlay notice) /// For the docked composer, the way a native editor's text and keys go back to the client: one instance for as long as /// the panel lives, so an overlay compares equal from frame to frame. /// +/// +/// Pops the panel out into a window of its own (PopOutPanel, what ⌃P's panel:popout: entry runs), for a +/// host that can float a panel (); null elsewhere, and for a panel that cannot +/// float. Safe to call from any thread; one instance per window. +/// internal sealed record PanelOverlay( string PanelId, string WindowId, @@ -215,7 +220,8 @@ internal sealed record PanelOverlay( Action? Pick = null, Action? Dispatch = null, SharpMUTerm.Client.Composer.ComposerModel? Composer = null, - SharpMUTerm.Client.Composer.ComposerSession? ComposerSession = null); + SharpMUTerm.Client.Composer.ComposerSession? ComposerSession = null, + Action? PopOut = null); /// A panel's colours as #rrggbb: a bar or fill, the warning, and the empty part of a bar. internal sealed record PanelInk(string Bar, string Low, string Track); diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Desktop.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Desktop.cs index d7990f80..f51c7a82 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Desktop.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Desktop.cs @@ -206,62 +206,79 @@ private void PublishPanels() var covered = _system.ModalStateService.HasModals || _nativeCompose is not null; foreach (var (paneId, rect) in !covered ? PaneOutputRects() : new Dictionary()) { - if (_workspace.Layout.FindPane(paneId) is not { ActiveTab: { } windowId }) + if (_workspace.Layout.FindPane(paneId) is { ActiveTab: { } windowId } && OverlayFor(windowId, rect, docked: true) is { } overlay) { - continue; + overlays.Add(overlay); } + } - if (IsMapWindow(windowId)) - { - if (MapViewFor(windowId) is { } view) - { - var walker = _mapWalkers.TryGetValue(windowId, out var known) - ? known - : _mapWalkers[windowId] = room => OnUiThread(() => WalkFromMap(windowId, room)); - overlays.Add(new PanelOverlay( - PanelIds.Map, windowId, rect, new PanelInk(_ink.Accent, _ink.Draft, _ink.Lift(new Rgb(0x6a, 0x6a, 0x72))), null, view, walker)); - } - - continue; - } + if (overlays.SequenceEqual(_panelOverlays)) + { + return; + } - if (!TerminalPanels.TryParseWindowId(windowId, out var panelId, out var key)) - { - continue; - } + _panelOverlays = overlays; + _pointer.Panels(overlays); + } - if (panelId == PanelIds.Vitals) - { - var ink = VitalsInk(); - overlays.Add(new PanelOverlay(panelId, windowId, rect, new PanelInk(ink.Bar, ink.Low, ink.Empty), ReadVitals(key))); - } - else if (panelId == PanelIds.WhoHere) - { - overlays.Add(new PanelOverlay( - panelId, windowId, rect, PanelListInk(), null, WhoHere: ReadWhoHere(key), Pick: PickerFor(windowId, key))); - } - else if (panelId == PanelIds.QuickBar) - { - overlays.Add(new PanelOverlay( - panelId, windowId, rect, PanelListInk(), null, QuickBar: QuickBarEntries(key), Pick: PickerFor(windowId, key), - Dispatch: _panelDispatch ??= id => OnUiThread(() => DispatchCommand(id)))); - } - else if (panelId == PanelIds.Composer && NativeComposerHost is not null - && _dockedComposers.TryGetValue(windowId, out var docked) && docked.Model is { } composer) + /// + /// What a host is told about the panel drawn in : its model, its colours and its actions, + /// over (a pane's output rectangle, or empty for a panel floating in a window of its own). + /// Null for a window that is no native panel, or one with nothing to draw yet. One function for a docked panel and a + /// floating one, so the two are handed the same model and the same callbacks. A docked panel that can float also + /// carries its pop-out callback, where the host can float one. + /// + private PanelOverlay? OverlayFor(string windowId, Core.Workspaces.PaneRect rect, bool docked) + { + var popOut = docked ? PopOuterFor(windowId) : null; + if (IsMapWindow(windowId)) + { + if (MapViewFor(windowId) is not { } view) { - // Only to a host with its own editor: the cells stay underneath it, and the editor is kept to them. - overlays.Add(new PanelOverlay( - panelId, windowId, rect, ComposerInk(), null, Composer: composer, ComposerSession: DockedSessionFor(docked))); + return null; } + + var walker = _mapWalkers.TryGetValue(windowId, out var known) + ? known + : _mapWalkers[windowId] = room => OnUiThread(() => WalkFromMap(windowId, room)); + return new PanelOverlay( + PanelIds.Map, windowId, rect, new PanelInk(_ink.Accent, _ink.Draft, _ink.Lift(new Rgb(0x6a, 0x6a, 0x72))), null, view, walker, + PopOut: popOut); } - if (overlays.SequenceEqual(_panelOverlays)) + if (!TerminalPanels.TryParseWindowId(windowId, out var panelId, out var key)) { - return; + return null; } - _panelOverlays = overlays; - _pointer.Panels(overlays); + if (panelId == PanelIds.Vitals) + { + var ink = VitalsInk(); + return new PanelOverlay(panelId, windowId, rect, new PanelInk(ink.Bar, ink.Low, ink.Empty), ReadVitals(key), PopOut: popOut); + } + + if (panelId == PanelIds.WhoHere) + { + return new PanelOverlay( + panelId, windowId, rect, PanelListInk(), null, WhoHere: ReadWhoHere(key), Pick: PickerFor(windowId, key), PopOut: popOut); + } + + if (panelId == PanelIds.QuickBar) + { + return new PanelOverlay( + panelId, windowId, rect, PanelListInk(), null, QuickBar: QuickBarEntries(key), Pick: PickerFor(windowId, key), + Dispatch: _panelDispatch ??= id => OnUiThread(() => DispatchCommand(id)), PopOut: popOut); + } + + if (docked && panelId == PanelIds.Composer && NativeComposerHost is not null + && _dockedComposers.TryGetValue(windowId, out var docked2) && docked2.Model is { } composer) + { + // Only to a host with its own editor: the cells stay underneath it, and the editor is kept to them. + return new PanelOverlay( + panelId, windowId, rect, ComposerInk(), null, Composer: composer, ComposerSession: DockedSessionFor(docked2)); + } + + return null; } /// The list panels' colours: the accent their cells draw an active dot and a key in, and the warning. @@ -278,7 +295,8 @@ private Action PickerFor(string windowId, string sessionKey) => private void PickFromPanel(string windowId, string sessionKey, int index) { - var published = _panelOverlays.FirstOrDefault(p => p.WindowId == windowId); + var published = _panelOverlays.FirstOrDefault(p => p.WindowId == windowId) + ?? _floatingPublished.FirstOrDefault(f => f.Content.WindowId == windowId)?.Content; if (published?.WhoHere is { } who && index >= 0 && index < who.Rows.Count) { OfferLook(windowId, sessionKey, who.Rows[index].Name); diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Floating.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Floating.cs new file mode 100644 index 00000000..695c1501 --- /dev/null +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Floating.cs @@ -0,0 +1,473 @@ +using SharpMUTerm.Client.Panels; +using SharpMUTerm.Client.Surfaces; +using SharpMUTerm.Core.Diagnostics; +using SharpMUTerm.Core.Layouts; +using SharpMUTerm.Core.Workspaces; +using static SharpMUTerm.Tui.MarkupText; + +namespace SharpMUTerm.Tui; + +/// +/// The host's half of a floating panel: it draws each panel the client says is popped out in a window of its own, and +/// hands back where the player put it and when they closed it. A member of , null for a host +/// that cannot float a panel. Called on the client's thread; a host that draws on another thread marshals itself. +/// +internal interface IFloatingPanels +{ + /// + /// Every panel popped out now, whenever one appears, goes, moves or changes what it shows. A panel missing from the + /// list is docked (or its character is gone): its window closes without docking anything. + /// + void Show(IReadOnlyList panels); +} + +/// One panel in a window of its own, for . +/// The window: which panel, whose, and where it sits (the floating-panel surface's model). +/// +/// What the panel shows and does, exactly as a docked one is handed it (, with an empty +/// rectangle): the same model its cells draw and the same callbacks, so a walk, a look or a quick key from the floating +/// window runs the same client method on the panel's own character. +/// +/// The panel's plane, #rrggbb: its character's pane colour on the client's theme. +/// The theme's text colour, #rrggbb. +/// Where the player moved or sized the window to, in screen pixels. Any thread; one instance. +/// Docks the panel back (what closing the window does). Any thread; one instance. +internal sealed record FloatingPanel( + FloatingPanelModel Model, + PanelOverlay Content, + string Plane, + string Text, + Action Moved, + Action Dock); + +/// +/// Panels popped out into windows of their own: the map on a second monitor, vitals floating beside the game. +/// +/// Floating is a fact about the panel's window (), so it is saved with the +/// workspace and means the same to every host: a host that can float () keeps +/// such a window out of the pane tree and draws it apart; a host that cannot keeps it in a pane and leaves the flag for +/// the next host that can. A layout says the same thing per panel (). +/// +/// +/// The pane it leaves goes back into the layout, through the workspace's own operations. While the live layout +/// still owns the panes, popping out re-realises it with the panel's windows withheld, so the panes are exactly the +/// layout without that panel — the same rectangles, and so the same NAWS, as a layout that never placed it. Otherwise +/// the window is removed from its pane (), which prunes a pane it emptied. +/// Docking is the same re-realisation with the windows returned, or the window put back in the pane it left. +/// +/// +internal sealed partial class SharpMUTermApp +{ + /// A floating panel named by a layout whose window does not exist yet (a map before its first room). + private readonly record struct PendingFloat(string SessionKey, string PanelId, FloatingBounds Bounds); + + private readonly Dictionary _floatPending = new(StringComparer.Ordinal); + + /// Where each panel window last floated, so popping it out again puts it back there. + private readonly Dictionary _floatRemembered = new(StringComparer.Ordinal); + + /// The pane each floating window left, for a dock with no live layout to put it back by. + private readonly Dictionary _floatOrigin = new(StringComparer.Ordinal); + + private readonly Dictionary _popOuters = new(StringComparer.Ordinal); + private readonly Dictionary _dockers = new(StringComparer.Ordinal); + private readonly Dictionary> _movers = new(StringComparer.Ordinal); + + private IReadOnlyList _floatingPublished = Array.Empty(); + private bool _publishingFloating; + + /// Whether this host can put a panel in a window of its own. + internal bool CanFloatPanels => Host.FloatingPanels is not null; + + /// What the floating host was last told. Internal for tests. + internal IReadOnlyList FloatingPublished => _floatingPublished; + + /// The panel a window draws, when it is one that can float; else null. + private static string? FloatablePanelOf(string windowId) + { + if (IsMapWindow(windowId)) + { + return PanelIds.Map; + } + + return TerminalPanels.TryParseWindowId(windowId, out var panel, out _) && PanelFloatCommands.Floatable.Contains(panel) + ? panel + : null; + } + + /// The window that draws a floatable panel for a character, or null for a panel that cannot float. + private static string? FloatWindowId(string panelId, string sessionKey) => + panelId == PanelIds.Map ? MapWindowId(sessionKey) + : PanelFloatCommands.Floatable.Contains(panelId) ? TerminalPanels.WindowId(panelId, sessionKey) + : null; + + /// Whether a window is popped out here: floating, and in a host that floats. Internal for tests. + internal bool IsFloating(string windowId) => CanFloatPanels && _workspace.FindWindow(windowId)?.Floating is not null; + + /// A docked panel's pop-out callback, where this host can float it; one instance per window. + private Action? PopOuterFor(string windowId) + { + if (!CanFloatPanels || FloatablePanelOf(windowId) is null) + { + return null; + } + + return _popOuters.TryGetValue(windowId, out var known) + ? known + : _popOuters[windowId] = () => OnUiThread(() => PopOutPanel(windowId)); + } + + /// Who a character is, for a window title and a ⌃P detail. + private string CharacterLabel(string sessionKey) => + FindSession(sessionKey)?.Character?.Name ?? FindCharacter(sessionKey)?.Character.Name ?? Snippet(sessionKey); + + /// Every panel window that can pop out or dock back, for ⌃P; null where this host cannot float. + private IReadOnlyList? FloatRefs() + { + if (!CanFloatPanels) + { + return null; + } + + return _workspace.Windows + .Where(w => w.SessionKey is not null && FloatablePanelOf(w.Id) is not null + && (w.Floating is not null || _workspace.Layout.FindWindow(w.Id) is not null)) + .OrderBy(w => w.Sequence) + .Select(w => new Core.Commands.PanelFloatRef( + w.Id, PanelTitle(FloatablePanelOf(w.Id)!), CharacterLabel(w.SessionKey!), w.Floating is not null)) + .ToList(); + } + + /// + /// Pops the panel drawn in out into a window of its own: the button on its native view, + /// its pane's right-click menu and ⌃P's panel:popout: all end here. Refused where the host cannot float, for a + /// window that is no floatable panel, and for the last window the panes hold. Internal so a test drives it as the + /// window does. + /// + internal bool PopOutPanel(string windowId) + { + if (!CanFloatPanels) + { + RefuseCommand("this client draws every panel in its pane — pop out is the desktop window's"); + return false; + } + + if (FloatablePanelOf(windowId) is not { } panelId || _workspace.FindWindow(windowId) is not { SessionKey: { } key } window) + { + RefuseCommand($"{Snippet(windowId)} is not a panel that can pop out"); + return false; + } + + if (window.Floating is not null) + { + RefuseCommand($"{PanelTitle(panelId)} is already in a window of its own"); + return false; + } + + if (_workspace.Layout.Root.Panes().Sum(p => p.Tabs.Count) <= 1) + { + RefuseCommand($"{PanelTitle(panelId)} is the only window here — it has nowhere to leave from"); + return false; + } + + var focus = ActiveWindowId(); + if (_workspace.Layout.FindWindow(windowId) is { } pane) + { + _floatOrigin[windowId] = pane.Id; + } + + window.Floating = _floatRemembered.GetValueOrDefault(windowId) + ?? LiveLayoutPlacement(key, panelId)?.Floating + ?? FloatingBounds.Unplaced; + if (!RearrangeLiveLayout(key, focus == windowId ? null : focus)) + { + _workspace.Layout.RemoveWindow(windowId); + RebuildPaneArea(); + Activate(focus != windowId && _workspace.Layout.FindWindow(focus) is not null ? focus : OutputWindowOf(key) ?? ActiveWindowId()); + } + + RefreshRail(); + PublishFloating(); + Notice($"{PanelTitle(panelId)} is in a window of its own — close it to dock it back", MessageSeverity.Info, "⌃P"); + return true; + } + + /// + /// Docks a floating panel back into its region — the floating window's Dock button, closing that window, and ⌃P's + /// panel:dock: all end here. With the live layout still owning the panes it is re-realised with the panel's + /// windows returned, so the panel is back exactly where the layout places it; otherwise it goes back into the pane it + /// left, or the focused one. Internal so a test drives it as the window does. + /// + internal bool DockPanel(string windowId) + { + if (_workspace.FindWindow(windowId) is not { Floating: { } bounds, SessionKey: { } key } window) + { + RefuseCommand($"{Snippet(windowId)} is not in a window of its own"); + return false; + } + + if (bounds.IsPlaced) + { + _floatRemembered[windowId] = bounds; + } + + window.Floating = null; + _floatPending.Remove(windowId); + if (!RearrangeLiveLayout(key, ActiveWindowId()) || _workspace.Layout.FindWindow(windowId) is null) + { + var origin = _floatOrigin.GetValueOrDefault(windowId); + _workspace.Layout.AddWindow(windowId, origin is not null && _workspace.Layout.FindPane(origin) is not null ? origin : null); + RebuildPaneArea(); + } + + _floatOrigin.Remove(windowId); + RefreshRail(); + PublishFloating(); + Notice($"{PanelTitle(FloatablePanelOf(windowId) ?? windowId)} docked back", MessageSeverity.Info, "⌃P"); + return true; + } + + /// The player moved or sized a floating panel's window. Remembered on the window, so the workspace and a saved layout keep it. + private void MoveFloatingPanel(string windowId, FloatingBounds bounds) + { + if (!bounds.IsPlaced || _workspace.FindWindow(windowId) is not { Floating: not null } window || window.Floating == bounds) + { + return; + } + + window.Floating = bounds; + _floatRemembered[windowId] = bounds; + PublishFloating(); + } + + /// A floating panel window moved, as the host reports it. Internal so a test drives it as the window does. + internal void SimulateFloatingMoved(string windowId, FloatingBounds bounds) => MoveFloatingPanel(windowId, bounds); + + /// The live layout's placement of a panel, when 's layout owns the panes. + private PanelPlacement? LiveLayoutPlacement(string key, string panelId) => + _liveLayout is { } live && string.Equals(live.SessionKey, key, StringComparison.Ordinal) + ? Layouts.Find(live.LayoutId)?.PlacementOf(panelId) + : null; + + /// + /// Re-realises the live layout after a panel popped out or docked, when it is 's and the panes + /// are still its own; false when there is none to follow (the player has rearranged the panes, or no layout applies). + /// + private bool RearrangeLiveLayout(string key, string? focus) + { + if (_liveLayout is not { } live + || !string.Equals(live.SessionKey, key, StringComparison.Ordinal) + || _workspace.Layout.ZoomedPaneId is not null + || !string.Equals(LayoutRealiser.TreeShape(_workspace.Layout.Root), live.TreeShape, StringComparison.Ordinal) + || Layouts.Find(live.LayoutId) is not { } layout) + { + return false; + } + + return ApplyLayout(key, layout, focus, adoptFloating: false); + } + + /// + /// The windows that draw in panes, for the realiser: , less a + /// panel window that floats here — taken out of whatever pane it was put in on the way, so the pane it held is + /// dropped and its split collapsed. + /// + private IReadOnlyList DockedWindows(string key, string panel) + { + var windows = PanelWindows(key, panel); + if (!CanFloatPanels || FloatWindowId(panel, key) is not { } floatId || !windows.Contains(floatId)) + { + return windows; + } + + var window = _workspace.FindWindow(floatId); + if (window is not null && _floatPending.Remove(floatId, out var pending)) + { + window.Floating = pending.Bounds; + } + + if (window?.Floating is null) + { + return windows; + } + + _workspace.Layout.RemoveWindow(floatId); + return windows.Where(w => w != floatId).ToList(); + } + + /// Whether a window is kept out of the panes because it floats here. + private bool FloatsHere(string windowId) => CanFloatPanels && _workspace.FindWindow(windowId)?.Floating is not null; + + /// + /// An explicit apply takes the layout's floating panels as they are saved: each it floats floats (at its saved place + /// when it has one), each it places docked is docked. Panels the layout does not place keep what they have. + /// + private void AdoptFloating(string key, LayoutDefinition layout) + { + foreach (var placement in layout.KnownPlacements) + { + if (FloatWindowId(placement.PanelId, key) is not { } id) + { + continue; + } + + var window = _workspace.FindWindow(id); + if (placement.Floating is { } bounds) + { + if (window is null) + { + _floatPending[id] = new PendingFloat(key, placement.PanelId, bounds); + } + else + { + window.Floating = bounds.IsPlaced ? bounds : window.Floating ?? _floatRemembered.GetValueOrDefault(id) ?? bounds; + } + } + else + { + _floatPending.Remove(id); + if (window?.Floating is { } was) + { + if (was.IsPlaced) + { + _floatRemembered[id] = was; + } + + window.Floating = null; + } + } + } + } + + /// A character's floating panels, by panel id, with where each sits: what "save changes" captures. + private Dictionary FloatingPanelsOf(string key) + { + var floating = new Dictionary(StringComparer.Ordinal); + foreach (var window in _workspace.Windows) + { + if (window.Floating is { } bounds && string.Equals(window.SessionKey, key, StringComparison.Ordinal) + && FloatablePanelOf(window.Id) is { } panel) + { + floating[panel] = bounds; + } + } + + foreach (var pending in _floatPending.Values.Where(p => string.Equals(p.SessionKey, key, StringComparison.Ordinal))) + { + floating.TryAdd(pending.PanelId, pending.Bounds); + } + + return floating; + } + + /// + /// A workspace resumed from the last run, by either host: where this host floats, a floating window comes out of the + /// pane a host that cannot float kept it in; where it cannot, a floating window no pane holds is put back in one, and + /// keeps its flag for the next host that can. + /// + private void SettleRestoredFloating() + { + foreach (var window in _workspace.Windows.Where(w => w.Floating is not null).OrderBy(w => w.Sequence).ToList()) + { + if (FloatablePanelOf(window.Id) is null) + { + window.Floating = null; + continue; + } + + var placed = _workspace.Layout.FindWindow(window.Id) is not null; + if (CanFloatPanels && placed && _workspace.Layout.Root.Panes().Sum(p => p.Tabs.Count) > 1) + { + _workspace.Layout.RemoveWindow(window.Id); + } + else if (!CanFloatPanels && !placed) + { + _workspace.Layout.AddWindow(window.Id, activate: false); + } + } + } + + /// + /// Tells the floating host which panels are popped out and what each shows, when any of that changed: on the frame + /// (' reason), when a panel's content is redrawn, and after a pop-out or a dock. + /// + private void PublishFloating() + { + if (Host.FloatingPanels is not { } host || _publishingFloating) + { + return; + } + + _publishingFloating = true; + try + { + var panels = new List(); + foreach (var window in _workspace.Windows.Where(w => w.Floating is not null && w.SessionKey is not null).OrderBy(w => w.Sequence).ToList()) + { + if (FloatablePanelOf(window.Id) is not { } panelId) + { + continue; + } + + var key = window.SessionKey!; + EnsureFloatingControl(window.Id, panelId, key); + if (OverlayFor(window.Id, default, docked: false) is not { } content) + { + continue; + } + + var id = window.Id; + var model = Drawing( + SurfaceCatalog.FloatingPanel, id, new FloatingPanelModel(id, panelId, PanelTitle(panelId), CharacterLabel(key), window.Floating!)); + panels.Add(new FloatingPanel( + model, + content, + WorkspacePalette.Tint(_theme, TintOf(key)).ToHex(), + Hex(_theme.Resolve(Core.Text.TerminalColor.Default, isBackground: false)), + _movers.TryGetValue(id, out var mover) ? mover : _movers[id] = bounds => OnUiThread(() => MoveFloatingPanel(id, bounds)), + _dockers.TryGetValue(id, out var docker) ? docker : _dockers[id] = () => OnUiThread(() => DockPanel(id)))); + } + + if (panels.SequenceEqual(_floatingPublished)) + { + return; + } + + _floatingPublished = panels; + host.Show(panels); + } + finally + { + _publishingFloating = false; + } + } + + /// + /// A floating panel's content is drawn from the same control its pane would hold, which redraws it as its data + /// changes; one that has never been in a pane (a layout that floats it from the start) has its control made here. + /// + private void EnsureFloatingControl(string windowId, string panelId, string key) + { + if (panelId == PanelIds.Map) + { + if (!_mapControls.ContainsKey(windowId)) + { + MapControlFor(windowId); + RenderMap(windowId); + } + + return; + } + + Panels.GetOrCreate(new TerminalPanelContext(panelId, key, FindSession(key), windowId)); + } + + /// A panel's content changed: a floating one is told, since no frame may be painted for it. + private void NoteFloatingContent(string windowId) + { + if (CanFloatPanels && _workspace.FindWindow(windowId)?.Floating is not null) + { + PublishFloating(); + } + } +} diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs index c76b56c9..bbf438e0 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs @@ -574,6 +574,7 @@ internal IReadOnlyList PointerMenu(System.Drawing.Point point) } AddCommands(items, "layout:next-tab", null, "layout:split-right", "layout:split-down", "layout:zoom", "layout:unzoom", "layout:close"); + AddPopOut(items); break; case PointerKind.Link: @@ -595,6 +596,7 @@ internal IReadOnlyList PointerMenu(System.Drawing.Point point) "term:copy", "term:trigger-from-selection", null, "layout:split-right", "layout:split-down", "layout:zoom", "layout:unzoom", "layout:close", null, "term:freeze", "term:unfreeze", "term:scroll-live", "term:clear", "term:timestamps-on", "term:timestamps-off"); + AddPopOut(items); break; case PointerKind.CommandLine: @@ -670,6 +672,19 @@ private void AddLinkItems(List items, PointerTarget target) } } + /// + /// The focused pane's front window, popped out into a window of its own — when it is a panel that can float and the + /// host can float it (the entry is ⌃P's, which lists it only then), after a rule. + /// + private void AddPopOut(List items) + { + var front = ActiveWindowId(); + if (FloatablePanelOf(front) is not null) + { + AddCommands(items, null, SharpMUTerm.Client.Panels.PanelFloatCommands.PopOut(front)); + } + } + /// Adds the ⌃P entries with these ids that the surface lists right now, in this order; null is a rule. private void AddCommands(List items, params string?[] ids) { diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs index eb8b25aa..59445535 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs @@ -157,6 +157,12 @@ private string EnsurePanelWindow(string panelId, string key) return null; } + // Asked for in a pane: a panel floating in a window of its own docks back first. + if (IsFloating(TerminalPanels.WindowId(panelId, sessionKey))) + { + DockPanel(TerminalPanels.WindowId(panelId, sessionKey)); + } + var id = EnsurePanelWindow(panelId, sessionKey); RebuildPaneArea(); return id; @@ -250,18 +256,30 @@ internal ResolvedLayout ResolveLayout(string key) /// other window kept, the session's own window focused — or , when a re-fold must /// not move the reader. False when the session has no window to arrange around. /// - internal bool ApplyLayout(string key, LayoutDefinition layout, string? focusWindow = null) + /// + /// Whether the layout's floating panels are taken as saved (): true for an explicit apply, + /// false for a re-fold, a pop-out or a dock, which keep the panels floating as they are now. + /// + internal bool ApplyLayout(string key, LayoutDefinition layout, string? focusWindow = null, bool adoptFloating = true) { if (OutputWindowOf(key) is not { } output) { return false; } + if (CanFloatPanels && adoptFloating) + { + AdoptFloating(key, layout); + } + + // A floating panel is folded into its region like any other; its windows are withheld here (DockedWindows) and + // never kept, so the pane it would have had is dropped and the panes are the layout without it. var fold = LayoutFold.Fold(layout, LayoutAvailability(key)); var keep = _workspace.Layout.Root.Panes() .SelectMany(p => p.Tabs.Select(t => (t, (string?)p.Id))) + .Where(k => !FloatsHere(k.t)) .ToList(); - if (LayoutRealiser.Realise(layout, fold, panel => PanelWindows(key, panel), output, keep) is not { } realised) + if (LayoutRealiser.Realise(layout, fold, panel => DockedWindows(key, panel), output, keep) is not { } realised) { return false; } @@ -273,6 +291,7 @@ internal bool ApplyLayout(string key, LayoutDefinition layout, string? focusWind var focus = focusWindow is not null && _workspace.Layout.FindWindow(focusWindow) is not null ? focusWindow : output; Activate(focus); RefreshRail(); + PublishFloating(); return true; } @@ -338,7 +357,7 @@ internal void RefoldLayout() return; } - ApplyLayout(live.SessionKey, layout, ActiveWindowId()); + ApplyLayout(live.SessionKey, layout, ActiveWindowId(), adoptFloating: false); } /// @@ -756,7 +775,8 @@ private void ReapplyIfResolvedChanged(string key) /// The current arrangement, read back as 's placements. private CapturedLayout? CaptureArrangement(string key, LayoutDefinition? previous) => - LayoutCapture.Capture(_workspace.Layout.Root, window => PanelOf(key, window), previous); + LayoutCapture.Capture( + _workspace.Layout.Root, window => PanelOf(key, window), previous, CanFloatPanels ? FloatingPanelsOf(key) : null); /// What one of the list's actions did: whether it did it, and the line that says so. private readonly record struct LayoutActionResult(bool Done, string Status); diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs index 99d4bcee..7d9828f2 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs @@ -596,6 +596,9 @@ private sealed class PanelView(string windowId, MarkupControl control, Func? Click { get; set; } + /// Told after every redraw, so a panel floating in a window of its own is republished with it. + internal Action? Refreshed { get; init; } + internal List Markup { get; private set; } = []; internal void Refresh() @@ -603,6 +606,7 @@ internal void Refresh() Size = box(WindowId); Markup = render(Size.Width, Size.Height); Control.SetContent(Markup.ToList()); + Refreshed?.Invoke(WindowId); } } @@ -613,7 +617,7 @@ private PanelView NewPanelView(TerminalPanelContext context, Func view.Click?.Invoke(e.Url); _panelViews[context.WindowId] = view; view.Refresh(); diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 103ff25a..944756b1 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -788,6 +788,7 @@ public SharpMUTermApp( // otherwise start with a single main window. Real startup and the demo share this path. _workspace = ResumeOrNew(config); NoteRestoredOwners(); + SettleRestoredFloating(); RegisterTerminalPanels(); AnnounceHeaderActions(); @@ -1013,6 +1014,7 @@ public SharpMUTermApp( DrawSixelOverlay(buffer); PublishScrollbars(); PublishPanels(); + PublishFloating(); PublishChrome(); SyncMapSizes(); SyncPanelSizes(); @@ -8100,6 +8102,13 @@ private IReadOnlyList BuildRailWindows( continue; } + // Nor is a panel popped out into a window of its own: it is not in a pane to go to (it would read + // "closed"), and its own window is on screen with the way back on it. + if (FloatsHere(window.Id)) + { + continue; + } + windows.Add(new RailWindow( RailWindowLabel(window, mine), window.Id, @@ -8276,7 +8285,8 @@ private CommandContext CommandState() Sound: CanPlaySound ? !_muted : null, Announced: Host.Announcer is null ? null : IsAnnounced(ActiveWindowId()), OutputSelected: HasOutputSelection, - KeyClashes: KeyClashes.Count(Host.Keys, Macros())); + KeyClashes: KeyClashes.Count(Host.Keys, Macros()), + Floats: FloatRefs()); } /// @@ -8547,6 +8557,17 @@ private bool RunBuiltInCommand(string id) return true; } + // Before the panels' own prefix, which they share: panel:popout: and panel:dock:. + if (id.StartsWith(SharpMUTerm.Client.Panels.PanelFloatCommands.PopOutPrefix, StringComparison.Ordinal)) + { + return PopOutPanel(id[SharpMUTerm.Client.Panels.PanelFloatCommands.PopOutPrefix.Length..]); + } + + if (id.StartsWith(SharpMUTerm.Client.Panels.PanelFloatCommands.DockPrefix, StringComparison.Ordinal)) + { + return DockPanel(id[SharpMUTerm.Client.Panels.PanelFloatCommands.DockPrefix.Length..]); + } + if (id.StartsWith(PanelCommandPrefix, StringComparison.Ordinal)) { ShowPanel(id[PanelCommandPrefix.Length..]); @@ -8997,6 +9018,10 @@ private void ShowMap() _workspace.OpenWindow(windowId, "Map", WindowKind.Auxiliary, key); RebuildPaneArea(); } + else if (IsFloating(windowId)) + { + DockPanel(windowId); // asked for in a pane: a map in a window of its own docks back + } Activate(windowId); RenderMap(windowId); @@ -9080,6 +9105,7 @@ private void RenderMap(string windowId) var lines = MapRenderer.Render(view, map.Map, width, height, ink); _mapMarkup[windowId] = lines; control.SetContent(lines.ToList()); + NoteFloatingContent(windowId); } /// What a map window was last drawn as, for a test to read. @@ -12559,6 +12585,14 @@ internal IReadOnlyDictionary PaneWindows() internal IReadOnlyDictionary PaneOutputRects() { var rects = new Dictionary(StringComparer.Ordinal); + + // A resumed workspace builds its panel and map panes in the constructor, before the main window exists to + // measure them in: nothing is arranged yet, and each falls back to its default box until the first frame. + if (_window is null) + { + return rects; + } + foreach (var (paneId, tabs, rect) in RealisedPanes()) { var margin = tabs.Margin; diff --git a/tests/SharpMUTerm.Avalonia.Tests/FloatingPanelTests.cs b/tests/SharpMUTerm.Avalonia.Tests/FloatingPanelTests.cs new file mode 100644 index 00000000..f64ec633 --- /dev/null +++ b/tests/SharpMUTerm.Avalonia.Tests/FloatingPanelTests.cs @@ -0,0 +1,372 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Headless; +using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Commands; +using SharpMUTerm.Client.Panels; +using SharpMUTerm.Core.Layouts; +using SharpMUTerm.Core.Workspaces; +using SharpMUTerm.Tui; +using SharpMUTerm.Tui.Panels; +using SkiaSharp; +using Window = Avalonia.Controls.Window; + +namespace SharpMUTerm.Avalonia.Tests; + +/// +/// Panels popped out into windows of their own (, the client's +/// SharpMUTermApp.Floating.cs): the pane a panel leaves goes back into the layout and costs no cell, the +/// floating window runs the same client methods as the docked view, a remembered place is clamped to the screens there +/// are, the window never takes the keyboard and hands keys to the command line, and a host that cannot float keeps the +/// panel in its region. +/// +public class FloatingPanelTests +{ + private static readonly SKColor Back = new(0x10, 0x20, 0x30); + + // ── The client's half ──────────────────────────────────────────────────────────────────────── + + [Test] + public async Task PoppingOutTakesThePanelOutOfThePanesAndDockingPutsItBack() + { + using var driver = new AvaloniaConsoleDriver(140, 36); + await using var app = DesktopLayerTests.InlineWindowApp(driver); + app.RenderSnapshot("layout-combat"); + var vitals = Panel(driver, PanelIds.Vitals).WindowId; + var before = Rects(app); + await Assert.That(Panel(driver, PanelIds.Vitals).PopOut is not null).IsTrue().Because("the window can float vitals, so its view offers it"); + + await Assert.That(app.PopOutPanel(vitals)).IsTrue(); + app.RenderWholeFrame(); + await Assert.That(app.IsFloating(vitals)).IsTrue(); + await Assert.That(Tabs(app)).DoesNotContain(vitals).Because("no pane holds a floating panel"); + await Assert.That(driver.Floating.Panels.Select(p => p.Model.WindowId)).IsEquivalentTo(new[] { vitals }); + await Assert.That(driver.Floating.Panels[0].Model.Title).IsEqualTo("Vitals"); + await Assert.That(driver.Pointer.Panels.Any(p => p.WindowId == vitals)).IsFalse().Because("nothing is drawn over a pane it left"); + await Assert.That(app.PopOutPanel(vitals)).IsFalse().Because("it is already out"); + + // ⌃P offers the way back, and not the way out, while it floats. + var catalog = app.BuildCatalog().Select(i => i.Id).ToArray(); + await Assert.That(catalog).Contains(PanelFloatCommands.Dock(vitals)); + await Assert.That(catalog).DoesNotContain(PanelFloatCommands.PopOut(vitals)); + + await Assert.That(app.DispatchCommand(PanelFloatCommands.Dock(vitals))).IsTrue(); + app.RenderWholeFrame(); + await Assert.That(app.IsFloating(vitals)).IsFalse(); + await Assert.That(driver.Floating.Panels).IsEmpty(); + await Assert.That(Rects(app)).IsEquivalentTo(before).Because("docking back puts the panel exactly where the layout places it"); + await Assert.That(app.BuildCatalog().Select(i => i.Id)).Contains(PanelFloatCommands.PopOut(vitals)); + } + + [Test] + public async Task APoppedOutPanelLeavesThePanesALayoutWithoutItWouldHave() + { + using var floatingDriver = new AvaloniaConsoleDriver(140, 36); + await using var floated = DesktopLayerTests.InlineWindowApp(floatingDriver); + floated.RenderSnapshot("layout-combat"); + var vitals = Panel(floatingDriver, PanelIds.Vitals).WindowId; + await Assert.That(floated.PopOutPanel(vitals)).IsTrue(); + floated.RenderWholeFrame(); + + // The same scene, with the vitals window closed and Combat applied less its vitals placement. + using var plainDriver = new AvaloniaConsoleDriver(140, 36); + await using var plain = DesktopLayerTests.InlineWindowApp(plainDriver); + plain.RenderSnapshot("layout-combat"); + plain.SimulateWindowChange(vitals); + await Assert.That(plain.DispatchCommand("layout:close")).IsTrue(); + var without = BuiltInLayouts.Combat with + { + Placements = BuiltInLayouts.Combat.Placements.Where(p => p.PanelId != PanelIds.Vitals).ToList(), + }; + await Assert.That(plain.ApplyLayout(DemoScene.ActiveSessionKey, without)).IsTrue(); + plain.RenderWholeFrame(); + + await Assert.That(Rects(floated)).IsEquivalentTo(Rects(plain)).Because("no cell is spent on a panel that floats"); + + // NAWS is the session window's pane rectangle (ReportPaneSizes): the same in both. + var output = Rects(plain).Keys.Single(k => !k.StartsWith("panel:", StringComparison.Ordinal) && !k.StartsWith("map:", StringComparison.Ordinal) && Rects(plain)[k].Width > 60); + await Assert.That(Rects(floated)[output]).IsEqualTo(Rects(plain)[output]); + } + + [Test] + public async Task TheFloatingPanelRunsTheSameClientMethodsAsTheDockedOne() + { + // The map: a room walked to from the floating window and the same room's cell link in a docked map. + using var aDriver = new AvaloniaConsoleDriver(140, 36); + await using var a = DesktopLayerTests.InlineWindowApp(aDriver); + a.RenderSnapshot("layout-combat"); + var map = Panel(aDriver, PanelIds.Map); + var room = map.Map!.Rooms.First(r => !r.Current && r.Id != map.Map.AnchorId).Id; + await Assert.That(a.PopOutPanel(map.WindowId)).IsTrue(); + var floatingMap = aDriver.Floating.Panels.Single().Content; + await Assert.That(floatingMap.WalkTo).IsSameReferenceAs(map.WalkTo).Because("one walk callback per window, docked or floating"); + floatingMap.WalkTo!(room); + + using var bDriver = new AvaloniaConsoleDriver(140, 36); + await using var b = DesktopLayerTests.InlineWindowApp(bDriver); + b.RenderSnapshot("layout-combat"); + b.SimulateMapClick(map.WindowId, MapRenderer.LinkPrefix + room); + await Assert.That(a.WalkState).IsNotEqualTo(string.Empty); + await Assert.That(a.WalkState).IsEqualTo(b.WalkState); + + // The quick bar: its first key, from the floating window and from the docked cells. + var quick = Panel(aDriver, PanelIds.QuickBar); + await Assert.That(a.PopOutPanel(quick.WindowId)).IsTrue(); + var floatingQuick = aDriver.Floating.Panels.Single(p => p.Model.PanelId == PanelIds.QuickBar).Content; + await Assert.That(floatingQuick.QuickBar).IsEqualTo(quick.QuickBar); + floatingQuick.Pick!(0); + b.SimulatePanelClick(quick.WindowId, QuickBarRenderer.LinkPrefix + "0"); + // The demo has no session, so both end in the same refusal, on the panel's own character. + await Assert.That(a.LastNotice).IsNotNull(); + await Assert.That(a.LastNotice).IsEqualTo(b.LastNotice); + await Assert.That(a.LastQuickMacro).IsEqualTo(b.LastQuickMacro); + } + + [Test] + public async Task APopOutIsOfferedOnThePanesMenuAndRemembersWhereItWasMoved() + { + using var driver = new AvaloniaConsoleDriver(140, 36); + await using var app = DesktopLayerTests.InlineWindowApp(driver); + app.RenderSnapshot("layout-combat"); + var map = Panel(driver, PanelIds.Map); + app.SimulateWindowChange(map.WindowId); + var at = new System.Drawing.Point(map.Rect.X + (map.Rect.Width / 2), map.Rect.Y + (map.Rect.Height / 2)); + var entry = app.PointerMenu(at).SingleOrDefault(i => i.Label.StartsWith("Pop out", StringComparison.Ordinal)); + await Assert.That(entry).IsNotNull().Because("the pane's menu offers the pop out"); + entry!.Run(); + await Assert.That(app.IsFloating(map.WindowId)).IsTrue(); + + // Where the player puts it is remembered on the window (and so the workspace), and by "save changes". + var moved = new FloatingBounds(1200, 90, 420, 400); + driver.Floating.Panels.Single().Moved(moved); + await Assert.That(driver.Floating.Panels.Single().Model.Bounds).IsEqualTo(moved); + var saved = app.CaptureSession().Windows.Single(w => w.Id == map.WindowId); + await Assert.That(saved.Floating).IsEqualTo(moved); + await Assert.That(app.DispatchCommand(LayoutCommands.SaveAsNew)).IsTrue(); + var layout = app.Layouts.All.Single(l => !l.IsBuiltIn); + await Assert.That(layout.PlacementOf(PanelIds.Map)!.Floating).IsEqualTo(moved); + + // Docked and popped out again, it goes back where it was. + await Assert.That(app.DockPanel(map.WindowId)).IsTrue(); + await Assert.That(app.PopOutPanel(map.WindowId)).IsTrue(); + await Assert.That(driver.Floating.Panels.Single().Model.Bounds).IsEqualTo(moved); + + // Applying the saved layout floats it at its saved place; applying Combat docks it. + await Assert.That(app.DispatchCommand(LayoutCommands.Apply(BuiltInLayouts.CombatId))).IsTrue(); + await Assert.That(app.IsFloating(map.WindowId)).IsFalse(); + await Assert.That(app.DispatchCommand(LayoutCommands.Apply(layout.Id))).IsTrue(); + await Assert.That(app.IsFloating(map.WindowId)).IsTrue(); + await Assert.That(driver.Floating.Panels.Single().Model.Bounds).IsEqualTo(moved); + } + + // ── A host that cannot float ───────────────────────────────────────────────────────────────── + + [Test] + public async Task TheTerminalKeepsAFloatingPanelInItsRegionAndOffersNoPopOut() + { + // A workspace saved by the window with vitals floating, resumed by the terminal. + using var driver = new AvaloniaConsoleDriver(140, 36); + await using var window = DesktopLayerTests.InlineWindowApp(driver); + window.RenderSnapshot("layout-combat"); + var vitals = Panel(driver, PanelIds.Vitals).WindowId; + await Assert.That(window.PopOutPanel(vitals)).IsTrue(); + var state = window.CaptureSession(); + await Assert.That(state.Windows.Single(w => w.Id == vitals).Floating).IsNotNull(); + + var config = DemoScene.Build(); + config.LastSession = state; + using var headless = new HeadlessConsoleDriver(140, 36); + await using var terminal = new SharpMUTermApp(config, ClientHost.Headless(headless, WindowOptions.Capabilities)); + terminal.RenderWholeFrame(); + + await Assert.That(terminal.CanFloatPanels).IsFalse(); + await Assert.That(Tabs(terminal)).Contains(vitals).Because("the terminal draws every panel in its pane"); + await Assert.That(terminal.IsFloating(vitals)).IsFalse(); + await Assert.That(terminal.CaptureSession().Windows.Single(w => w.Id == vitals).Floating).IsNotNull() + .Because("the flag is kept for the next host that can float"); + await Assert.That(terminal.BuildCatalog().Any(i => i.Id.StartsWith(PanelFloatCommands.PopOutPrefix, StringComparison.Ordinal) + || i.Id.StartsWith(PanelFloatCommands.DockPrefix, StringComparison.Ordinal))).IsFalse(); + await Assert.That(terminal.DispatchCommand(PanelFloatCommands.PopOut(vitals))).IsFalse(); + + // A layout that floats a panel is folded the same as one that does not, in the terminal. + using var other = new HeadlessConsoleDriver(140, 36); + await using var plain = new SharpMUTermApp(DemoScene.Build(), ClientHost.Headless(other, WindowOptions.Capabilities)); + plain.RenderSnapshot("layout-combat"); + var floats = BuiltInLayouts.Combat with + { + Placements = BuiltInLayouts.Combat.Placements + .Select(p => p.PanelId == PanelIds.Vitals ? p with { Floating = new FloatingBounds(10, 10, 300, 200) } : p).ToList(), + }; + var rects = Rects(plain); + await Assert.That(plain.ApplyLayout(DemoScene.ActiveSessionKey, floats)).IsTrue(); + plain.RenderWholeFrame(); + await Assert.That(Rects(plain)).IsEquivalentTo(rects); + + // And the window's own workspace, resumed by the window, floats it again and keeps it out of the panes. + var again = DemoScene.Build(); + again.LastSession = state; + using var windowDriver = new AvaloniaConsoleDriver(140, 36); + await using var resumed = new SharpMUTermApp(again, DesktopLayerTests.InlineHost(windowDriver)); + resumed.RenderWholeFrame(); + await Assert.That(resumed.IsFloating(vitals)).IsTrue(); + await Assert.That(Tabs(resumed)).DoesNotContain(vitals); + } + + // ── The window's half ──────────────────────────────────────────────────────────────────────── + + [Test] + public async Task ARememberedPlaceIsClampedToTheScreensThereAreNow() + { + var (position, reported, activated) = await Session.Dispatch(() => + { + var driver = new AvaloniaConsoleDriver(40, 10); + var view = new TerminalView(driver, SKColors.White, Back, 16, null); + var presenter = driver.Floating; + presenter.Screens = () => [new FloatingBounds(0, 0, 1920, 1080)]; + presenter.Attach(owner: null, view); + var reported = new List(); + + // Left on a second monitor, to the right of this one, that is no longer plugged in. + presenter.Show([Floating(PanelIds.Vitals, new FloatingBounds(2500, 300, 400, 200), reported.Add, () => { })]); + DesktopLayerTests.Drain(); + var window = presenter.Windows.Values.Single(); + var result = (window.Position, reported.ToList(), window.ShowActivated); + presenter.Detach(); + driver.Dispose(); + return result; + }, CancellationToken.None); + + await Assert.That(position).IsEqualTo(new PixelPoint(1520, 300)); + await Assert.That(reported.Last()).IsEqualTo(new FloatingBounds(1520, 300, 400, 200)).Because("the clamped place is the one remembered"); + await Assert.That(activated).IsFalse().Because("a floating window never takes the keyboard on opening"); + } + + [Test] + public async Task ClosingTheWindowDocksThePanelAndTheClientClosingItDocksNothing() + { + var (docksOnClose, docksOnClientClose, closed) = await Session.Dispatch(() => + { + var driver = new AvaloniaConsoleDriver(40, 10); + var view = new TerminalView(driver, SKColors.White, Back, 16, null); + var presenter = driver.Floating; + presenter.Screens = () => [new FloatingBounds(0, 0, 1920, 1080)]; + presenter.Attach(owner: null, view); + var docks = 0; + var map = Floating(PanelIds.Map, new FloatingBounds(100, 100, 400, 400), _ => { }, () => docks++); + var vitals = Floating(PanelIds.Vitals, new FloatingBounds(600, 100, 300, 200), _ => { }, () => docks++); + presenter.Show([map, vitals]); + DesktopLayerTests.Drain(); + + // The player closes the map's window. + presenter.Windows[map.Model.WindowId].Close(); + DesktopLayerTests.Drain(); + var onClose = docks; + + // The client docks vitals: its window closes without docking it a second time. + presenter.Show([]); + DesktopLayerTests.Drain(); + var result = (onClose, docks - onClose, presenter.Windows.Count); + presenter.Detach(); + driver.Dispose(); + return result; + }, CancellationToken.None); + + await Assert.That(docksOnClose).IsEqualTo(1); + await Assert.That(docksOnClientClose).IsEqualTo(0); + await Assert.That(closed).IsEqualTo(0); + } + + [Test] + public async Task ThePopOutButtonTheFloatingViewAndTheKeysGoThroughTheClient() + { + var result = await Session.Dispatch(() => + { + var driver = new AvaloniaConsoleDriver(140, 36); + var view = new TerminalView(driver, SKColors.White, Back, 16, null); + var layer = new DesktopLayer(view, HostChrome.HeaderAndRail); + var root = new Panel(); + root.Children.Add(view); + root.Children.Add(layer); + var owner = new Window { Content = root, Width = 1300, Height = 760 }; + owner.Show(); + view.Focus(); + driver.Floating.Screens = () => [new FloatingBounds(0, 0, 3840, 2160)]; + driver.Floating.Attach(owner, view); + + var app = DesktopLayerTests.InlineWindowApp(driver); + driver.KeyPressed += (_, key) => app.SimulateKey(key); + try + { + app.RenderSnapshot("layout-combat"); + DesktopLayerTests.Drain(); + var vitals = driver.Pointer.Panels.First(p => p.PanelId == PanelIds.Vitals).WindowId; + var hadButton = layer.PopOuts.ContainsKey(vitals); + + layer.PopOuts[vitals].PerformClick(); + DesktopLayerTests.Drain(); + app.RenderWholeFrame(); + DesktopLayerTests.Drain(); + var floating = driver.Floating.Windows.GetValueOrDefault(vitals); + var content = floating?.PanelView.GetType().Name; + var buttonGone = !layer.PopOuts.ContainsKey(vitals); + var focusKept = view.IsFocused; + + // Typing while the floating window is in front lands on the command line. + floating!.KeyTextInput("n"); + DesktopLayerTests.Drain(); + var typed = app.PrimaryInputText; + + // Closing it docks the panel back. + floating!.Close(); + DesktopLayerTests.Drain(); + app.RenderWholeFrame(); + DesktopLayerTests.Drain(); + return (hadButton, content, buttonGone, focusKept, typed, app.IsFloating(vitals), layer.PopOuts.ContainsKey(vitals), driver.Floating.Windows.Count); + } + finally + { + driver.Floating.Detach(); + app.DisposeAsync().AsTask().GetAwaiter().GetResult(); + owner.Close(); + driver.Dispose(); + } + }, CancellationToken.None); + + await Assert.That(result.hadButton).IsTrue().Because("a docked vitals strip carries the pop-out button"); + await Assert.That(result.content).IsEqualTo(nameof(VitalsGauges)).Because("the floating window draws the panel's own native view"); + await Assert.That(result.buttonGone).IsTrue(); + await Assert.That(result.focusKept).IsTrue().Because("the command line keeps the keyboard"); + await Assert.That(result.typed).EndsWith("n"); + await Assert.That(result.Item6).IsFalse().Because("closing the floating window docks the panel"); + await Assert.That(result.Item7).IsTrue().Because("docked, it offers the pop out again"); + await Assert.That(result.Item8).IsEqualTo(0); + } + + // ── helpers ────────────────────────────────────────────────────────────────────────────────── + + private static PanelOverlay Panel(AvaloniaConsoleDriver driver, string id) => + driver.Pointer.Panels.First(p => p.PanelId == id); + + /// Each pane's output rectangle by the window in front of it, so two clients' pane ids need not agree. + private static Dictionary Rects(SharpMUTermApp app) + { + var windows = app.PaneWindows(); + return app.PaneOutputRects().ToDictionary(r => windows.GetValueOrDefault(r.Key) ?? r.Key, r => r.Value, StringComparer.Ordinal); + } + + private static List Tabs(SharpMUTermApp app) => Flatten(app.CaptureSession().Root).SelectMany(p => p.Tabs).ToList(); + + private static List Flatten(LayoutNodeState node) => + node.Children is { Count: > 0 } children ? children.SelectMany(Flatten).ToList() : [node]; + + private static FloatingPanel Floating(string panelId, FloatingBounds bounds, Action moved, Action dock) + { + var windowId = panelId == PanelIds.Map ? "map:demo" : $"panel:{panelId}:demo"; + var vitals = new VitalsModel([new VitalsMeter("hp", "412", "500", true, 412 / 500.0, false)], null); + var content = new PanelOverlay(panelId, windowId, default, new PanelInk("#3ccf6a", "#ff5555", "#333338"), panelId == PanelIds.Vitals ? vitals : null); + return new FloatingPanel( + new FloatingPanelModel(windowId, panelId, panelId, "Corvid", bounds), content, "#202024", "#e0e0e0", moved, dock); + } + + private static HeadlessUnitTestSession Session => TerminalViewTests.Session; +} diff --git a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs index bde59a53..40802fce 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs @@ -290,6 +290,20 @@ await Assert.That(Rows(palette.Session!.View(query))).IsEquivalentTo(Rows(drawn! await Assert.That(rows).IsEquivalentTo(cells.HistorySearchRows, TUnit.Assertions.Enums.CollectionOrdering.Matching); } + // A floating panel: the window it is drawn in is handed the model the client recorded for it, and the panel + // inside is the model the docked strip's cells were drawn from. + { + using var driver = new AvaloniaConsoleDriver(140, 36); + await using var app = App(driver, DemoScene.Build()); + app.RenderSnapshot("layout-combat"); + var vitals = Panel(driver, PanelIds.Vitals); + await Assert.That(app.DispatchCommand(PanelFloatCommands.PopOut(vitals.WindowId))).IsTrue(); + var floating = driver.Floating.Panels.Single(); + await Assert.That(app.DrawnModel(SurfaceCatalog.FloatingPanel, vitals.WindowId)).IsEqualTo((object)floating.Model).Because("floating-panel"); + await Assert.That(floating.Content.Vitals).IsEqualTo(app.ReadVitals(DemoScene.ActiveSessionKey)).Because("floating-panel: the panel inside"); + covered.Add(SurfaceCatalog.FloatingPanel); + } + var drawnNatively = SurfaceCatalog.All.Where(s => s.On(SurfaceHosts.Window).HasFlag(SurfaceDrawing.Native)).Select(s => s.Id); await Assert.That(covered).IsEquivalentTo(drawnNatively).Because("every surface the window draws natively has its model compared here"); } @@ -351,8 +365,32 @@ await Same("rail-strip: fold", "layout-combat", await Same("map: walk", "layout-combat", (app, d) => Panel(d, PanelIds.Map).WalkTo!(OtherRoom(Panel(d, PanelIds.Map).Map!)), (app, d) => app.SimulateMapClick(Panel(d, PanelIds.Map).WindowId, MapRenderer.LinkPrefix + OtherRoom(Panel(d, PanelIds.Map).Map!))); + await Same("map: pop out", "layout-combat", + (app, d) => Panel(d, PanelIds.Map).PopOut!(), + (app, d) => app.DispatchCommand(PanelFloatCommands.PopOut(Panel(d, PanelIds.Map).WindowId))); probed.Add(PanelIds.Map); + // Vitals: the pop-out button, and ⌃P's entry for the same window. + await Same("vitals: pop out", "layout-combat", + (app, d) => Panel(d, PanelIds.Vitals).PopOut!(), + (app, d) => app.DispatchCommand(PanelFloatCommands.PopOut(Panel(d, PanelIds.Vitals).WindowId))); + probed.Add(PanelIds.Vitals); + + // A floating panel: its window's Dock (and closing it), and ⌃P's dock entry. + await Same("floating-panel: dock", "layout-combat", + (app, d) => + { + Panel(d, PanelIds.Vitals).PopOut!(); + d.Floating.Panels.Single().Dock(); + }, + (app, d) => + { + var id = Panel(d, PanelIds.Vitals).WindowId; + app.DispatchCommand(PanelFloatCommands.PopOut(id)); + app.DispatchCommand(PanelFloatCommands.Dock(id)); + }); + probed.Add(SurfaceCatalog.FloatingPanel); + // Who is here: the first row. await Same("who-here: pick", "layout-roleplay", (app, d) => Panel(d, PanelIds.WhoHere).Pick!(0), @@ -829,6 +867,7 @@ private static string Outcome(SharpMUTermApp app) => string.Join( "quick=" + app.LastQuickMacro, "walk=" + app.WalkState, "rail=" + (app.BuildChromeOverlay().Sidebar.Collapsed ? "folded" : "open"), + "floating=" + string.Join(",", app.FloatingPublished.Select(f => f.Model.WindowId)), "notice=" + app.LastNotice, "recent=" + string.Join(",", app.RecentCommandIds)); diff --git a/tests/SharpMUTerm.Client.Tests/SurfaceCatalogTests.cs b/tests/SharpMUTerm.Client.Tests/SurfaceCatalogTests.cs index c85c9a0f..14ccb389 100644 --- a/tests/SharpMUTerm.Client.Tests/SurfaceCatalogTests.cs +++ b/tests/SharpMUTerm.Client.Tests/SurfaceCatalogTests.cs @@ -72,7 +72,8 @@ public async Task PanelSurfacesAreKnownPanels() { var panels = SurfaceCatalog.All.Where(s => s.Id is not (SurfaceCatalog.Header or SurfaceCatalog.Sidebar or SurfaceCatalog.Settings or SurfaceCatalog.LayoutsMenu or SurfaceCatalog.Palette - or SurfaceCatalog.Prefix or SurfaceCatalog.RailStrip or SurfaceCatalog.Notice or SurfaceCatalog.Compose) + or SurfaceCatalog.Prefix or SurfaceCatalog.RailStrip or SurfaceCatalog.Notice or SurfaceCatalog.Compose + or SurfaceCatalog.FloatingPanel) && !SurfaceCatalog.Modals.Contains(s.Id)); foreach (var surface in panels) { @@ -99,4 +100,37 @@ public async Task ANativeOnlyActionNamesWhereTheCellsOfferIt() } } } + + /// + /// An action only one host can do (a panel popped out into a window of its own) is declared for that host, which + /// draws the surface natively, and names the command that reaches it from the cells there. + /// + [Test] + public async Task AHostOnlyActionNamesItsHostAndItsCellRoute() + { + var hostOnly = SurfaceCatalog.All.SelectMany(s => s.Actions.Where(a => a.OnlyOn is not null).Select(a => (Surface: s, Action: a))).ToList(); + await Assert.That(hostOnly).IsNotEmpty(); + foreach (var (surface, action) in hostOnly) + { + await Assert.That(SurfaceHosts.All).Contains(action.OnlyOn!).Because($"{surface.Id}: {action.Name}"); + await Assert.That(surface.On(action.OnlyOn!).HasFlag(SurfaceDrawing.Native)).IsTrue().Because($"{surface.Id}: {action.Name}"); + await Assert.That(action.CellsVia).IsNotNull().Because($"{surface.Id}: {action.Name}"); + await Assert.That(action.CellsVia!).Contains(":").Because("the cell route is a command, a ⌃P entry"); + } + } + + /// Every panel the window draws natively from a model can pop out, and only the window offers it. + [Test] + public async Task EveryFloatablePanelDeclaresPopOutForTheWindowOnly() + { + foreach (var panel in SharpMUTerm.Client.Panels.PanelFloatCommands.Floatable) + { + var surface = SurfaceCatalog.Find(panel)!; + var popOut = surface.Actions.SingleOrDefault(a => a.Name == SharpMUTerm.Client.Panels.PanelFloatCommands.PopOutPrefix); + await Assert.That(popOut).IsNotNull().Because(panel); + await Assert.That(popOut!.OnlyOn).IsEqualTo(SurfaceHosts.Window).Because(panel); + } + + await Assert.That(SurfaceCatalog.Find(SurfaceCatalog.FloatingPanel)!.On(SurfaceHosts.Terminal)).IsEqualTo(SurfaceDrawing.None); + } } diff --git a/tests/SharpMUTerm.Core.Tests/Layouts/FloatingPanelLayoutTests.cs b/tests/SharpMUTerm.Core.Tests/Layouts/FloatingPanelLayoutTests.cs new file mode 100644 index 00000000..58a3d635 --- /dev/null +++ b/tests/SharpMUTerm.Core.Tests/Layouts/FloatingPanelLayoutTests.cs @@ -0,0 +1,131 @@ +using System.Text.Json; +using SharpMUTerm.Core.Layouts; +using SharpMUTerm.Core.Workspaces; + +namespace SharpMUTerm.Core.Tests.Layouts; + +/// +/// The host-neutral half of a floating panel: (and its clamp to the screens there are), +/// carried through a saved workspace, +/// captured into a layout, and a fold that does not read it, so a host that cannot float keeps the panel in its region. +/// +public class FloatingPanelLayoutTests +{ + private static readonly FloatingBounds Left = new(0, 0, 1920, 1080); + private static readonly FloatingBounds Right = new(1920, 0, 2560, 1440); + + // ── Clamping ───────────────────────────────────────────────────────────────────────────────── + + [Test] + public async Task BoundsWhollyOnAScreenAreLeftAlone() + { + var onSecond = new FloatingBounds(2400, 200, 500, 400); + await Assert.That(onSecond.ClampTo([Left, Right])).IsEqualTo(onSecond); + } + + [Test] + public async Task BoundsOnAScreenThatIsGoneComeBackOnTheNearestOne() + { + var onSecond = new FloatingBounds(2400, 200, 500, 400); + await Assert.That(onSecond.ClampTo([Left])).IsEqualTo(new FloatingBounds(1420, 200, 500, 400)); + + var aboveEverything = new FloatingBounds(-900, -700, 300, 200); + await Assert.That(aboveEverything.ClampTo([Left])).IsEqualTo(new FloatingBounds(0, 0, 300, 200)); + } + + [Test] + public async Task BoundsAcrossTwoScreensGoToTheOneHoldingMostOfThem() + { + var straddling = new FloatingBounds(1800, 100, 400, 300); + await Assert.That(straddling.ClampTo([Left, Right])).IsEqualTo(new FloatingBounds(1920, 100, 400, 300)); + } + + [Test] + public async Task BoundsLargerThanTheScreenAreShrunkToIt() + { + var huge = new FloatingBounds(100, 100, 4000, 3000); + await Assert.That(huge.ClampTo([Left])).IsEqualTo(Left); + } + + [Test] + public async Task UnplacedBoundsAndNoScreensChangeNothing() + { + await Assert.That(FloatingBounds.Unplaced.ClampTo([Left])).IsEqualTo(FloatingBounds.Unplaced); + var somewhere = new FloatingBounds(5000, 5000, 300, 200); + await Assert.That(somewhere.ClampTo([])).IsEqualTo(somewhere); + } + + // ── The workspace and the layout carry it ─────────────────────────────────────────────────── + + [Test] + public async Task AFloatingWindowSurvivesASavedWorkspace() + { + var workspace = new Workspace("main", "Main"); + workspace.OpenWindow("map:W.C", "Map", WindowKind.Auxiliary, "W.C"); + workspace.FindWindow("map:W.C")!.Floating = new FloatingBounds(1200, 80, 460, 460); + + var json = JsonSerializer.Serialize(WorkspaceState.Capture(workspace)); + var restored = JsonSerializer.Deserialize(json)!.Restore(); + + await Assert.That(restored.FindWindow("map:W.C")!.Floating).IsEqualTo(new FloatingBounds(1200, 80, 460, 460)); + await Assert.That(restored.FindWindow("main")!.Floating).IsNull(); + await Assert.That(json).DoesNotContain("IsPlaced"); + } + + [Test] + public async Task CapturingAFloatingPanelKeepsItsRegionAndSaysWhereItFloats() + { + var fold = LayoutFold.Fold(BuiltInLayouts.Combat, new PanelAvailability(RoomsRecorded: 3, MeterValueArrived: true, SpawnWindows: 0)); + var map = new FloatingBounds(1200, 80, 460, 460); + + // The map floats, so the realiser was handed no window for it and its pane is gone. + var realised = LayoutRealiser.Realise( + BuiltInLayouts.Combat, + fold, + panel => panel switch { PanelIds.Output => ["main"], PanelIds.Vitals => ["panel:vitals:W.C"], _ => [] }, + "main")!; + string? PanelOf(string window) => window switch { "main" => PanelIds.Output, "panel:vitals:W.C" => PanelIds.Vitals, _ => null }; + + var captured = LayoutCapture.Capture( + realised.Root, PanelOf, BuiltInLayouts.Combat, new Dictionary { [PanelIds.Map] = map })!; + var placement = captured.Placements.Single(p => p.PanelId == PanelIds.Map); + await Assert.That(placement.Floating).IsEqualTo(map); + await Assert.That(placement.Region).IsEqualTo(BuiltInLayouts.Combat.PlacementOf(PanelIds.Map)!.Region) + .Because("docking back returns it to the region it was taken from"); + await Assert.That(captured.Placements.Single(p => p.PanelId == PanelIds.Vitals).Floating).IsNull(); + + // A host that cannot float captures with no floating list, and keeps what the layout already said. + var floats = BuiltInLayouts.Combat with + { + Placements = BuiltInLayouts.Combat.Placements.Select(p => p.PanelId == PanelIds.Map ? p with { Floating = map } : p).ToList(), + }; + var terminal = LayoutCapture.Capture(realised.Root, PanelOf, floats)!; + await Assert.That(terminal.Placements.Single(p => p.PanelId == PanelIds.Map).Floating).IsEqualTo(map); + } + + [Test] + public async Task TheFoldDoesNotReadFloating() + { + var availability = new PanelAvailability(RoomsRecorded: 3, MeterValueArrived: true, SpawnWindows: 2); + var floats = BuiltInLayouts.Combat with + { + Placements = BuiltInLayouts.Combat.Placements + .Select(p => p with { Floating = new FloatingBounds(10, 10, 300, 200) }).ToList(), + }; + + var plain = LayoutFold.Fold(BuiltInLayouts.Combat, availability); + var floating = LayoutFold.Fold(floats, availability); + await Assert.That(LayoutRealiser.FoldShape(floating)).IsEqualTo(LayoutRealiser.FoldShape(plain)); + } + + [Test] + public async Task AFloatingPlacementRoundTripsThroughJson() + { + var placement = new PanelPlacement { PanelId = PanelIds.Vitals, Region = LayoutRegion.TopStrip, Floating = new FloatingBounds(5, 6, 300, 120) }; + var json = JsonSerializer.Serialize(placement); + await Assert.That(JsonSerializer.Deserialize(json)).IsEqualTo(placement); + + var docked = new PanelPlacement { PanelId = PanelIds.Vitals }; + await Assert.That(JsonSerializer.Deserialize(JsonSerializer.Serialize(docked))!.Floating).IsNull(); + } +} From f79f690f16fdfc174b2aeca427e1c9d51bd5e03f Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 10:03:20 +0000 Subject: [PATCH 036/113] Fix ten two-host papercuts, plus settings focus and one key spelling - Startup runs once: the window's welcome demo no longer raises its notice twice. - The window's history-search-filter view opens native Ctrl+R with its query typed. - search-landed lands through the native search in the window. - A hovered toast freezes the stack so it keeps its place; toasts stack clear of the map legend. - F10 fits 80x24: ListOverlay sizes from measured wrapped rows, confirm rows always emitted. - Every native surface spells keys in words (NativeKeys.Words, Enter for the return glyph), with a runtime and source scan (NativeKeySpellingTests). - The settings window takes the keyboard on open and returns it on close. - The composer face is saved per character through PersistConfiguration. - List editors remember their selection per section for the run. - The command line goes idle while Alt+C sidebar navigation holds the keys. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 13 + CLAUDE.md | 47 ++- src/SharpMUTerm.Avalonia/ComposerView.cs | 36 ++- src/SharpMUTerm.Avalonia/DesktopLayer.cs | 14 +- src/SharpMUTerm.Avalonia/HistoryView.cs | 2 + src/SharpMUTerm.Avalonia/LayoutsView.cs | 2 +- src/SharpMUTerm.Avalonia/ListEditorView.cs | 50 +++- src/SharpMUTerm.Avalonia/MainWindow.cs | 3 + src/SharpMUTerm.Avalonia/MapCanvas.cs | 31 +- src/SharpMUTerm.Avalonia/ModalParts.cs | 12 +- src/SharpMUTerm.Avalonia/NativeChrome.cs | 16 +- src/SharpMUTerm.Avalonia/NativeKeys.cs | 31 ++ src/SharpMUTerm.Avalonia/NativeMenu.cs | 6 +- src/SharpMUTerm.Avalonia/NoticeToasts.cs | 150 ++++++++-- src/SharpMUTerm.Avalonia/PackagePageView.cs | 10 +- src/SharpMUTerm.Avalonia/PaletteOverlay.cs | 8 +- src/SharpMUTerm.Avalonia/QuickBarButtons.cs | 6 +- src/SharpMUTerm.Avalonia/QuitView.cs | 2 +- src/SharpMUTerm.Avalonia/SearchView.cs | 6 +- src/SharpMUTerm.Avalonia/SettingsPresenter.cs | 6 +- src/SharpMUTerm.Avalonia/SettingsWindow.cs | 30 +- src/SharpMUTerm.Avalonia/WelcomeView.cs | 6 +- .../Composer/ComposerSession.cs | 21 ++ src/SharpMUTerm.Client/Modals/HistoryModel.cs | 6 + .../Settings/SettingsForm.cs | 20 ++ .../Configuration/CharacterDefinition.cs | 8 + src/SharpMUTerm.Tui/ListOverlay.cs | 21 +- src/SharpMUTerm.Tui/PackageScreen.cs | 11 +- .../SharpMUTermApp.NativeComposer.cs | 29 ++ .../SharpMUTermApp.NativeModals.cs | 9 +- src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs | 8 +- .../SharpMUTermApp.RailKeys.cs | 4 + .../SharpMUTermApp.Settings.cs | 7 + src/SharpMUTerm.Tui/SharpMUTermApp.cs | 34 ++- .../ListEditorTests.cs | 38 +++ .../NativeComposerTests.cs | 6 +- .../NativeKeySpellingTests.cs | 276 ++++++++++++++++++ .../NativeModalTests.cs | 21 ++ .../NativePaletteTests.cs | 4 +- .../NoticeToastTests.cs | 81 +++++ .../SettingsWindowTests.cs | 53 ++++ .../SurfaceParityTests.cs | 32 +- .../NativeComposerRoutingTests.cs | 41 +++ .../PackageScreenFitTests.cs | 37 +++ tests/SharpMUTerm.Tui.Tests/RailKeysTests.cs | 15 + tests/SharpMUTerm.Tui.Tests/WelcomeTests.cs | 19 ++ 46 files changed, 1160 insertions(+), 128 deletions(-) create mode 100644 src/SharpMUTerm.Avalonia/NativeKeys.cs create mode 100644 tests/SharpMUTerm.Avalonia.Tests/NativeKeySpellingTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/PackageScreenFitTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 95bc530b..f87fafc6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -281,6 +281,19 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Fixed +- Desktop window: the "no world configured" notice at first start shows once, not as two identical toasts. +- Desktop window: a notice you point at stays where it is while the others fade, and notices no longer cover the + map's legend. +- Desktop window: every key is written in words everywhere in the window — the menus, notices, Ctrl+P, the composer, + dialogs and settings now all say Ctrl+P, Alt+M and Enter rather than mixing them with ⌃P, ⌥M and ⏎. +- Desktop window: the settings window takes the keyboard when it opens, so you can type in its search straight away, + and gives it back to the command line when it closes. +- Desktop window: the composer's proportional or monospace font is remembered for each character, and kept after a + restart. +- Desktop window: the trigger, alias, timer and key lists in settings remember which item you had selected when you + switch section or reopen the window. +- Packages (F10) fit an 80×24 terminal: the list no longer scrolls to hide its last rows or the close key. +- While Alt+C has the keyboard in the sidebar, the command line is drawn idle, since Enter goes to the sidebar row. - Desktop window: the Keys screen (F4) and the quick bar now describe the window's keys rather than a terminal's. Ctrl+digit, Ctrl+Shift+letter, Ctrl+Tab and Alt+O are shown as working keys you can bind, and Alt+Enter is marked as taken because it maximises the window. diff --git a/CLAUDE.md b/CLAUDE.md index 6f73d997..80c4a8a7 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -199,6 +199,10 @@ fallbacks) for inline images/maps. - One folder per package (`packages//`, beside `config.json`), swapped in through a `.id.new` staging folder; a snapshot's store has no folder and writes nothing. F10 is claimed (`opens Packages`); GNOME Terminal may take it for its menu, so ⌃P ▸ *Packages* is the way in that always works. + - **A `ListOverlay` is as tall as its lines *wrapped*** (`ListOverlay.Rows`, measured by the framework's own + `MarkupControl.MeasureDOM` at the modal's inner width), not as its line count: F10's header wraps at 80 columns, + and counting lines made the modal a row short, so it scrolled its close key out of sight at 80×24. F10 always + emits its two confirm rows (blank when idle), so the modal sized once at open still fits a confirmation. - **The index** (`PackageIndex`; ⌃P ▸ *Browse packages*, `b` on F10) is `{"packages":[…]}`, each entry a manifest plus an https `url` and a `sha256`, at `AppConfiguration.PackageIndexUrl`. **It is fetched only when the player opens it, never at start.** An entry that breaks a rule is dropped and counted, not @@ -627,7 +631,9 @@ fallbacks) for inline images/maps. in that order and then dials them **concurrently**: focus is taken by the first before any packet leaves, so several auto-connects always land you in the same place, and a black-holed host cannot hold the other worlds' windows hostage. `ConnectAtStartup` is *not* `AutoLogin` — one opens the socket, the - other sends the connect line once one is open, and either is useful alone. + other sends the connect line once one is open, and either is useful alone. **`StartAsync` runs once per app** + (`_startupRan`): the window's demo lays out a scene that may itself start up (the welcome does) before `Run` schedules + startup, and running it twice said every startup notice twice — two identical toasts. - **A client with no worlds opens on a welcome, and the first connect of a new configuration leaves a key tour** (`WelcomeSurface`, `SharpMUTermApp.Welcome.cs`; `/welcome`, ⌃P ▸ *Welcome* / *Key tour*). The welcome is a `ListOverlay` over a pure model (the `QuitPrompt` split): *Connect to a host* (a form: host, port 4000, TLS, an @@ -1168,7 +1174,9 @@ fallbacks) for inline images/maps. the armed band padded to the rail's widest row (no cell spent; inks re-held to the floor on the band, `RailRenderer.OnBand`); the native sidebar draws an accent ring and scrolls the row into view. ⌥C because it is `ESC c` (one Alt chord in a terminal), C names CONNECTIONS, and nothing claimed it — not `AppShortcuts`, the - bar's table, nor the window's `HostKeys.Reserved`. + bar's table, nor the window's `HostKeys.Reserved`. **While the sidebar holds the keys both command lines wear the + idle band** (`SyncComposerBands` reads `_railCursor`, and `UpdateInputChrome` repaints the prompt to match): ⏎ goes + to a row, not to the game. The window's command line is cells, so it follows with nothing of its own. - **A right click on a sidebar row opens the client's menu for that row** (`SidebarRowMenu`, `RunSidebarMenuEntry`; `ChromeOverlay.RowMenu`/`RunRowMenu`; the cell rail's pointer menu reads the same method). Entries are registry commands with their keys (switch, connect/disconnect, edit in F5/F9, go to, close, clear), each offered only if @@ -1324,6 +1332,10 @@ draws ⌃P natively (`INativePalette`, null for the cell popup), whether it draw the window's, a press beside the stack goes to the cells. The stack is bottom-right inside the cell area, ending above the row the pane area ends at (`NoticeOverlay.AboveRow`), newest at the bottom, four at most. It fades after `NoticeModel.Duration`, held while hovered (plus a 2 s grace). Right click dismisses. + **While the pointer is on a toast the stack is frozen** (`NoticeToasts.Frozen`): every toast keeps its place as the + ones around it fade, so the card under the pointer never slides out from under it; a toast arriving meanwhile + stacks above, and the freeze ends when the pointer leaves or the window resizes. **The stack is lifted clear of + the map's legend** (`NoticeToasts.Avoid`, from `MapCanvas.LegendRect`), which sits in the same corner. - **An action is a registry command the client offered**: a click runs `NoticeOverlay.Run` → `RunNoticeAction`, which refuses a command no recent notice carried, then `DispatchCommand`. The cells' way to the same door is ⌃P (`CellsVia: term:messages`). Three notices carry one so far: the layout suggestion @@ -1758,7 +1770,12 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] title and scrolls in its two halves. A package's set is drawn read-only with *Copy to edit*. F2's pattern field has the live test under it, re-run on every keystroke, each matching line with the match marked. The trigger builder opens it on the rule it made (`TryOpenNativeSettings(section, item)`); with no window it opens the cell - F2 as before. + F2 as before. **Each list keeps its selection for the run** (`SettingsForm.Selections`, the app's + `_listSelections`, by section id; never saved): switching section and back, or closing and reopening the window, + lands on the item last chosen while it still exists. An item the form was opened on wins. + - **The window takes the keyboard when it opens and gives it back when it closes** (`SettingsWindow.FocusFirst` + on `Opened` and when an open window is reused; `SettingsPresenter.Refocus` → `DesktopLayer.FocusArmedComposer` + after `Owner.Activate()`), as a cell screen does. - **F10 is a package manager page** (`PackagePageView`, Avalonia; Client `PackageCollection`, `PackageManager`, `PackageReviewModel`, `PackageBrowseModel`; `SharpMUTermApp.Packages.cs`). F10 is declared as a list of installed packages (`SettingsSectionContribution.Packages`): one `BoolField` (`enabled`, whose binding replaces @@ -1803,8 +1820,8 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] native chrome. A scrim covers the rest; a press on it closes. Closing gives the keyboard back to `TerminalView`, which is the client's command line by the focus pin. Fluent is applied to the card alone (`ThemeVariantScope`), in the client's variant. - - **Keys are words** (`KeyGlyphs.Words`, as the native chrome does): the UI font draws `Ctrl+⏎` better than `⌃⏎`, - and the window's catalog already carries the window's newline. A sequence (`⌃B |`) is one chip per key. + - **Keys are words** (`NativeKeys.Words`, the rule every native surface follows — see below). A sequence (`⌃B |`) + is one chip per key. - **Hover selects on movement only** (`PointerMoved`, not `PointerEntered`), so the row that opens under a resting pointer is not chosen. ↑↓ wrap as in the cells; PgUp/PgDn stop at the ends. - Screenshots from a real window under Xvfb, driven with XTest (`ux-wave5/native-palette-*.png`). @@ -1853,8 +1870,12 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] native session puts the same command on a `RecordingTelnetSession` as the cell keys do, as typed and literal, one line and several paragraphs. `NativeComposerRoutingTests` (Tui) and `NativeComposerTests` (Avalonia, headless) drive the routing and the editor. + - **The face is the character's** (`CharacterDefinition.ComposerProportional`, false by default with no migration): + the right-click menu's choice goes `ComposerSession.ChooseFace` → `ChooseComposerFace`, which saves through + `PersistConfiguration` (a view preference; `SaveConfiguration` would re-periodise timers), and each composer reads + it live (`ComposerCallbacks.Proportional`), so F1 and the docked panel of one character agree. - Screenshots from a real window under Xvfb, driven with XTest (`ux-wave7/composer-*.png`). `--demo-config` in the - window opens the installed dictionary read-only. Not done: no per-character face choice saved, no find bar, and + window opens the installed dictionary read-only. Not done: no find bar, and the window's ⌥W adds to the run's dictionary in the demo only (a live client writes `user-words.txt` as F1 does). - **In the window, the quit prompt, ⌃F, ⌃R, ⌥M and the welcome are native modals** (`ClientHost.NativeModals` → `INativeModals`; Client `Modals/`: `ModalSession`, `QuitModel`/`QuitSession`, `SearchModel`/`SearchSession`, @@ -1888,9 +1909,17 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] search ⏎ / ⌥A / ⌥E, history ⏎, layouts apply / save as new / rename / delete, and the welcome's connect and layout+settings end in the same `Outcome` as the cell keys. `NativeModalRoutingTests` (Tui) and `NativeModalTests` (Avalonia, headless) drive the routing, the stacking and the views. The `search*` and `history-search` snapshot - views open the native surface when there is one (that is how the window's screenshots are taken). - - Screenshots from a real window under Xvfb, driven with XTest (`ux-wave8/modals-*.png`). Not done: the native ⌃R - filters in its own box, so the `history-search-filter` view shows its list unfiltered in the window. + views open the native surface when there is one (that is how the window's screenshots are taken): + `history-search-filter` opens ⌃R with its query typed (`HistorySession.InitialQuery`), and `search-landed` lands + through the native search's own close and `GoToSearchHit`, so the cells it leaves match the terminal's. + - Screenshots from a real window under Xvfb, driven with XTest (`ux-wave8/modals-*.png`). +- **Every native surface spells a key in words** (`NativeKeys.Words`, Avalonia: `KeyGlyphs.Words` plus `⏎` → `Enter`): + `Ctrl+P`, `Alt+M`, `Ctrl+B b`, never `⌃P`/`⌥M`/`⏎`. The client writes keys in glyphs because the cells draw them + well; whatever it hands a native view — menu keys, a toast's chip and text, palette details and chips, the + composer's key row, modal footers and sentences, settings help, tooltips — goes through `Words` on the way to the + screen. `NativeKeySpellingTests` reads every native surface at run time and scans the Avalonia sources for a glyph + literal outside `NativeKeys`. **The cells keep their glyphs**, the window's cell status row included: parity + compares cells, so that row says `⌥9` beside a toast saying `Alt+9`. - **Settings screens have no `IPasteTarget` and cannot easily have one.** They are markup rebuilt wholesale every key, with the edited field a buffer in `SettingsSession`. `SettingsOverlay` listens at `IConsoleDriver.Paste` instead. That can't double-fire *only* because no control on diff --git a/src/SharpMUTerm.Avalonia/ComposerView.cs b/src/SharpMUTerm.Avalonia/ComposerView.cs index 1de23852..322669d8 100644 --- a/src/SharpMUTerm.Avalonia/ComposerView.cs +++ b/src/SharpMUTerm.Avalonia/ComposerView.cs @@ -109,14 +109,19 @@ public ComposerView(TerminalView view, bool fullScreen) } /// - /// Whether the editors write in the UI's proportional face rather than the cells' monospace one. For the run, for - /// every composer the window draws; chosen from the editor's right-click menu. + /// Whether this editor writes in the UI's proportional face rather than the cells' monospace one: its character's + /// choice, kept in the configuration (CharacterDefinition.ComposerProportional) and chosen from the editor's + /// right-click menu. Until the session says (and with no session) it is the last face chosen in this window, so a + /// choice shows at once rather than when the client has stored it. /// - internal static bool Proportional { get; set; } + internal bool Proportional => _faceChosen ?? _session?.Proportional ?? false; - /// Raised when the face changes, so every composer on screen follows. + /// Raised when a face is chosen, so every composer on screen re-reads its own. internal static event Action? FaceChanged; + // The face just chosen here, until the client has it; cleared when any face changes. + private bool? _faceChosen; + /// The editor. Internal for tests. internal ComposerEditor Editor => _editor; @@ -171,6 +176,10 @@ public void Show(ComposerModel model, ComposerSession session, PanelInk ink, Col _session = session; _applied = -1; _armed = null; + + // Another character's composer, or the same one opened again: its face is the session's. + _faceChosen = null; + ApplyFont(); } var coloursChanged = ink != _ink || plane != _plane || text != _text; @@ -320,12 +329,12 @@ private void Label(ComposerModel model) var item = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 5, Margin = new Thickness(0, 1, 14, 1) }; if (key.Key.Length > 0) { - item.Children.Add(Chip(key.Key, Accent, ui - 1.5)); + item.Children.Add(Chip(NativeKeys.Words(key.Key), Accent, ui - 1.5)); } item.Children.Add(new TextBlock { - Text = narrow && key.Short is { } brief ? brief : key.Label, + Text = NativeKeys.Words(narrow && key.Short is { } brief ? brief : key.Label), FontSize = ui - 1, Foreground = new SolidColorBrush(Dim), VerticalAlignment = VerticalAlignment.Center, @@ -563,11 +572,7 @@ internal ContextMenu OpenMenu(int offset) items.Add(Item("Paste", _editor.Paste, enabled: _editor.CanPaste)); items.Add(Item("Select all", _editor.SelectAll)); items.Add(new Separator()); - items.Add(Item(Proportional ? "Monospace font" : "Proportional font", () => - { - Proportional = !Proportional; - FaceChanged?.Invoke(); - })); + items.Add(Item(Proportional ? "Monospace font" : "Proportional font", () => ChooseFace(!Proportional))); var menu = new ContextMenu { ItemsSource = items }; menu.Closed += (_, _) => _editor.Focus(); @@ -576,6 +581,15 @@ internal ContextMenu OpenMenu(int offset) return menu; } + /// The menu's face entry: the character keeps it (through the session), and every composer re-reads its own. + internal void ChooseFace(bool proportional) + { + _faceChosen = proportional; + _session?.ChooseFace(proportional); + FaceChanged?.Invoke(); + ApplyFont(); + } + private static MenuItem Item(string header, Action act, bool enabled = true, bool bold = false) { var item = new MenuItem { Header = header, IsEnabled = enabled }; diff --git a/src/SharpMUTerm.Avalonia/DesktopLayer.cs b/src/SharpMUTerm.Avalonia/DesktopLayer.cs index e384b6ed..04b88ae0 100644 --- a/src/SharpMUTerm.Avalonia/DesktopLayer.cs +++ b/src/SharpMUTerm.Avalonia/DesktopLayer.cs @@ -177,6 +177,18 @@ private void SyncToasts(ScreenFrame frame, Size cell) _toasts.Height = Math.Max(0, frame.Height * cell.Height); var above = _noticeAboveRow > 0 && _noticeAboveRow < frame.Height ? _noticeAboveRow : Math.Max(0, frame.Height - 2); _toasts.Bottom = above * cell.Height; + + // The native maps' legends, in the toasts' coordinates: a toast is stacked clear of one rather than over it. + var avoid = new List(); + foreach (var map in _maps.Values) + { + if (map.LegendRect(new Size(map.Width, map.Height)) is { } legend) + { + avoid.Add(legend.Translate(new Vector(GetLeft(map) - origin.X, GetTop(map) - origin.Y))); + } + } + + _toasts.Avoid = avoid; } /// The notice toasts. Internal for tests. @@ -244,7 +256,7 @@ private void SyncButtons(ScreenFrame frame, Size cell) button = new HeaderButton(action.Id); button.Click += () => OpenMenu(action, button); AutomationProperties.SetName(button, action.Label); - ToolTip.SetTip(button, action.Hint is { } hint ? $"{action.Label} ({hint})" : action.Label); + ToolTip.SetTip(button, NativeKeys.Words(action.Hint is { } hint ? $"{action.Label} ({hint})" : action.Label)); _buttons[action.Id] = button; Children.Add(button); } diff --git a/src/SharpMUTerm.Avalonia/HistoryView.cs b/src/SharpMUTerm.Avalonia/HistoryView.cs index eaa76b79..f762441c 100644 --- a/src/SharpMUTerm.Avalonia/HistoryView.cs +++ b/src/SharpMUTerm.Avalonia/HistoryView.cs @@ -56,6 +56,8 @@ public HistoryView(HistorySession session, ModalColours colours, Action done) frame.MinHeight = 120; Children.Add(frame); + _box.Text = session.InitialQuery; + _box.CaretIndex = session.InitialQuery.Length; _box.TextChanged += (_, _) => { _selected = 0; diff --git a/src/SharpMUTerm.Avalonia/LayoutsView.cs b/src/SharpMUTerm.Avalonia/LayoutsView.cs index 351b75f5..68b95a42 100644 --- a/src/SharpMUTerm.Avalonia/LayoutsView.cs +++ b/src/SharpMUTerm.Avalonia/LayoutsView.cs @@ -164,7 +164,7 @@ private void Draw() _status.Text = _confirming && _model.Current is { } doomed ? $"Delete {doomed.Name}? Y deletes, any other key keeps it." - : _model.Status ?? string.Empty; + : NativeKeys.Words(_model.Status); _status.Foreground = _colours.Brush(_confirming ? _colours.Warn : _colours.Dim); _status.IsVisible = _status.Text.Length > 0; _rename.IsVisible = _renaming; diff --git a/src/SharpMUTerm.Avalonia/ListEditorView.cs b/src/SharpMUTerm.Avalonia/ListEditorView.cs index 5c26deba..a26866c3 100644 --- a/src/SharpMUTerm.Avalonia/ListEditorView.cs +++ b/src/SharpMUTerm.Avalonia/ListEditorView.cs @@ -96,9 +96,15 @@ public ListEditorView(SettingsForm form, SettingsSectionContribution section, Fu SetColumn(scroller, 1); Children.Add(scroller); - if (_form.Item is not { } chosen || !_collection.IsItem(chosen)) + // The item this section had selected last (switched away from, or the window closed) wins over the first — + // unless the form opened on an item of this list (the trigger builder's new rule). + if (_form.Item is not { } chosen || !_collection.IsItem(chosen) || FindGroup(chosen) is null) { - _form.Select(FirstItem()); + Select(_form.Recall(_section.Id) is { } kept && _collection.IsItem(kept) && FindGroup(kept) is not null ? kept : FirstItem()); + } + else + { + _form.Remember(_section.Id, chosen); } BuildList(); @@ -144,7 +150,7 @@ public ListEditorView(SettingsForm form, SettingsSectionContribution section, Fu /// Selects and shows its fields. public void Choose(object? item) { - _form.Select(item); + Select(item); SelectRow(item); BuildDetail(); } @@ -155,7 +161,12 @@ public void Refresh() if (_form.Item is { } item && FindGroup(item) is null) { // The selected item went (deleted, or moved by another surface): take the first there is. - _form.Select(FirstItem()); + Select(FirstItem()); + } + else + { + // An add or a duplicate selected its new item through the form. + _form.Remember(_section.Id, _form.Item); } BuildList(); @@ -188,11 +199,18 @@ public void Refresh() private static Button ToolButton(string text, string tip) { var button = new Button { Content = text, Padding = new Thickness(8, 3), MinWidth = 32, HorizontalContentAlignment = HorizontalAlignment.Center }; - ToolTip.SetTip(button, tip); + ToolTip.SetTip(button, NativeKeys.Words(tip)); AutomationProperties.SetName(button, tip); return button; } + // Every selection goes through here, so the section remembers it for the run. + private void Select(object? item) + { + _form.Select(item); + _form.Remember(_section.Id, item); + } + private object? FirstItem() => _form.Groups(_section).SelectMany(g => g.Items).FirstOrDefault(); private SettingsItemGroup? FindGroup(object item) => @@ -286,7 +304,7 @@ private ListBoxItem ItemRow(SettingsItemGroup group, object item) var words = new StackPanel { VerticalAlignment = VerticalAlignment.Center }; var title = _collection.TitleOf(item); - words.Children.Add(new TextBlock { Text = title.Length == 0 ? "(unnamed)" : title, TextTrimming = TextTrimming.CharacterEllipsis }); + words.Children.Add(new TextBlock { Text = title.Length == 0 ? "(unnamed)" : NativeKeys.Words(title), TextTrimming = TextTrimming.CharacterEllipsis }); if (_collection.DetailOf(item) is { Length: > 0 } detail) { words.Children.Add(new TextBlock @@ -329,7 +347,7 @@ private void OnRowChosen() return; } - _form.Select(item); + Select(item); BuildDetail(); } @@ -422,7 +440,7 @@ private void BuildDetail() } var title = _collection.TitleOf(item); - _detail.Children.Add(new TextBlock { Text = title.Length == 0 ? "(unnamed)" : title, FontSize = 18, FontWeight = FontWeight.SemiBold, TextTrimming = TextTrimming.CharacterEllipsis }); + _detail.Children.Add(new TextBlock { Text = title.Length == 0 ? "(unnamed)" : NativeKeys.Words(title), FontSize = 18, FontWeight = FontWeight.SemiBold, TextTrimming = TextTrimming.CharacterEllipsis }); if (group.ReadOnly) { var banner = new DockPanel { LastChildFill = true, Margin = new Thickness(0, 6, 0, 4) }; @@ -498,11 +516,11 @@ private static Grid Row(SettingsField field, Control control) { var grid = new Grid { ColumnDefinitions = new ColumnDefinitions("118,*"), Margin = new Thickness(0, 3), MinHeight = 34 }; var words = new StackPanel { VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(0, 0, 12, 0) }; - words.Children.Add(new TextBlock { Text = Capitalise(field.Label), FontSize = 13, TextWrapping = TextWrapping.Wrap }); + words.Children.Add(new TextBlock { Text = NativeKeys.Words(Capitalise(field.Label)), FontSize = 13, TextWrapping = TextWrapping.Wrap }); if (field.Help is { } help) { - ToolTip.SetTip(words, Capitalise(help)); - ToolTip.SetTip(control, Capitalise(help)); + ToolTip.SetTip(words, NativeKeys.Words(Capitalise(help))); + ToolTip.SetTip(control, NativeKeys.Words(Capitalise(help))); } grid.Children.Add(words); @@ -766,7 +784,7 @@ void Commit() } else { - ToolTip.SetTip(control, text.Help); + ToolTip.SetTip(control, NativeKeys.Words(text.Help)); } } @@ -811,15 +829,15 @@ void Commit() /// private Control KeyCapture(KeyField field, SettingBinding chord) { - var button = new Button { Content = _form.Get(chord), MinWidth = 160, HorizontalAlignment = HorizontalAlignment.Left, HorizontalContentAlignment = HorizontalAlignment.Left }; + var button = new Button { Content = NativeKeys.Words(_form.Get(chord)), MinWidth = 160, HorizontalAlignment = HorizontalAlignment.Left, HorizontalContentAlignment = HorizontalAlignment.Left }; var note = new TextBlock { FontSize = 11, Opacity = 0.75, TextWrapping = TextWrapping.Wrap, Margin = new Thickness(0, 2, 0, 0) }; var capturing = false; void Show() { - button.Content = capturing ? "Press a key… (Esc cancels)" : _form.Get(chord); + button.Content = capturing ? "Press a key… (Esc cancels)" : NativeKeys.Words(_form.Get(chord)); if (!capturing) { - note.Text = _form.Context.KeyProblem(_form.Get(chord)) is { } problem ? $"▲ {problem}" : string.Empty; + note.Text = _form.Context.KeyProblem(_form.Get(chord)) is { } problem ? $"▲ {NativeKeys.Words(problem)}" : string.Empty; } } @@ -858,7 +876,7 @@ void Show() Show(); if (refused is not null) { - note.Text = $"{descriptor}: {refused}"; + note.Text = NativeKeys.Words($"{descriptor}: {refused}"); } }; Show(); diff --git a/src/SharpMUTerm.Avalonia/MainWindow.cs b/src/SharpMUTerm.Avalonia/MainWindow.cs index 107f7c6d..b88fae4b 100644 --- a/src/SharpMUTerm.Avalonia/MainWindow.cs +++ b/src/SharpMUTerm.Avalonia/MainWindow.cs @@ -76,6 +76,9 @@ public MainWindow(WindowOptions options, IClassicDesktopStyleApplicationLifetime // armed docked composer if there is one, else to the cells. _driver.Composer.Attach(root, layer, _view, () => layer.FocusArmedComposer()); + // The settings window takes the keyboard when it opens and hands it back here when it closes. + _driver.Settings.Refocus = () => layer.FocusArmedComposer(); + // ⌃P, over everything above; it is added last when it opens, and gives the keyboard back to the cells. _driver.Palette.Attach(root, () => layer.FocusArmedComposer()); diff --git a/src/SharpMUTerm.Avalonia/MapCanvas.cs b/src/SharpMUTerm.Avalonia/MapCanvas.cs index 9d2787f5..b9277e6b 100644 --- a/src/SharpMUTerm.Avalonia/MapCanvas.cs +++ b/src/SharpMUTerm.Avalonia/MapCanvas.cs @@ -389,19 +389,36 @@ private void DrawName(DrawingContext context, string name, Point centre, double /// The legend, in the bottom-left corner on a plate: you, the stairs, a walk, and each area in its colour. Drawn only /// where it fits, and it never takes the pointer from a room under it (the canvas hit-tests rooms only). /// - private void DrawLegend(DrawingContext context, Rect bounds) + private const double LegendSize = 11, LegendRow = 16, LegendPad = 8, LegendSwatch = 9; + + /// + /// Where the legend's plate is drawn in a canvas of , in the canvas's coordinates; null when + /// none is drawn (no rooms, or it would not fit). The window keeps its toasts off it (). + /// + internal Rect? LegendRect(Size size) { + if (_model.Rooms.Count == 0) + { + return null; + } + var entries = LegendEntries(); - const double size = 11, row = 16, pad = 8, swatch = 9; - var widest = entries.Max(e => PanelText.Measure(e.Label, size, bold: false)); - var width = pad + swatch + 6 + widest + pad; - var height = (pad * 2) + (entries.Count * row) - (row - size - 3); - if (width > bounds.Width * 0.6 || height > bounds.Height * 0.6) + var widest = entries.Max(e => PanelText.Measure(e.Label, LegendSize, bold: false)); + var width = LegendPad + LegendSwatch + 6 + widest + LegendPad; + var height = (LegendPad * 2) + (entries.Count * LegendRow) - (LegendRow - LegendSize - 3); + return width > size.Width * 0.6 || height > size.Height * 0.6 ? null : new Rect(10, size.Height - height - 10, width, height); + } + + private void DrawLegend(DrawingContext context, Rect bounds) + { + if (LegendRect(bounds.Size) is not { } plate) { return; } - var plate = new Rect(10, bounds.Height - height - 10, width, height); + var entries = LegendEntries(); + const double size = LegendSize, row = LegendRow, pad = LegendPad, swatch = LegendSwatch; + var widest = entries.Max(e => PanelText.Measure(e.Label, size, bold: false)); context.DrawRectangle(new SolidColorBrush(Color.FromArgb(0xE6, _plane.R, _plane.G, _plane.B)), new Pen(new SolidColorBrush(Faded(0.25)), 1), plate, 5, 5); var y = plate.Y + pad; foreach (var (label, colour) in entries) diff --git a/src/SharpMUTerm.Avalonia/ModalParts.cs b/src/SharpMUTerm.Avalonia/ModalParts.cs index ff4f2827..84373e40 100644 --- a/src/SharpMUTerm.Avalonia/ModalParts.cs +++ b/src/SharpMUTerm.Avalonia/ModalParts.cs @@ -13,7 +13,7 @@ internal static class ModalParts /// The modal's title line. public static TextBlock Heading(string text, ModalColours colours) => new() { - Text = text, + Text = NativeKeys.Words(text), FontSize = 18, FontWeight = FontWeight.SemiBold, Foreground = colours.Brush(colours.Text), @@ -24,7 +24,7 @@ internal static class ModalParts /// A quiet line: a count, a scope, an explanation. public static TextBlock Dim(string text, ModalColours colours, Thickness? margin = null) => new() { - Text = text, + Text = NativeKeys.Words(text), FontSize = 12.5, Foreground = colours.Brush(colours.Dim), Margin = margin ?? new Thickness(20, 0, 20, 6), @@ -34,7 +34,7 @@ internal static class ModalParts /// The keys the modal answers, right-aligned under it, in the window's words. public static TextBlock Footer(string text, ModalColours colours) => new() { - Text = text, + Text = NativeKeys.Words(text), FontSize = 11.5, Foreground = colours.Brush(colours.Dim), Margin = new Thickness(20, 8, 20, 12), @@ -149,19 +149,19 @@ public static InlineCollection Marked(string text, int start, int length, ModalC Padding = new Thickness(6, 0), Margin = new Thickness(6, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center, - Child = new TextBlock { Text = key, FontSize = 11.5, Foreground = colours.Brush(colours.KeyInk) }, + Child = new TextBlock { Text = NativeKeys.Words(key), FontSize = 11.5, Foreground = colours.Brush(colours.KeyInk) }, }; /// A button whose label is followed by the key that presses it. public static Button Button(string label, string? key, ModalColours colours, Action click, bool accent = false) { var content = new StackPanel { Orientation = Orientation.Horizontal, VerticalAlignment = VerticalAlignment.Center }; - content.Children.Add(new TextBlock { Text = label, VerticalAlignment = VerticalAlignment.Center }); + content.Children.Add(new TextBlock { Text = NativeKeys.Words(label), VerticalAlignment = VerticalAlignment.Center }); if (key is not null) { content.Children.Add(new TextBlock { - Text = key, + Text = NativeKeys.Words(key), FontSize = 11.5, Opacity = 0.7, Margin = new Thickness(8, 0, 0, 0), diff --git a/src/SharpMUTerm.Avalonia/NativeChrome.cs b/src/SharpMUTerm.Avalonia/NativeChrome.cs index e7bcaa49..91c0154c 100644 --- a/src/SharpMUTerm.Avalonia/NativeChrome.cs +++ b/src/SharpMUTerm.Avalonia/NativeChrome.cs @@ -63,6 +63,12 @@ public void Show(ChromeOverlay? overlay, Color plane, Color ink) if (overlay is not null && !double.IsNaN(Width) && !double.IsNaN(Height)) { Layout(overlay, _hits); + + // Every tooltip in the window's words, whatever the client's model said it in. + for (var i = 0; i < _hits.Count; i++) + { + _hits[i] = _hits[i] with { Tip = NativeKeys.Words(_hits[i].Tip) }; + } } InvalidateVisual(); @@ -415,12 +421,12 @@ private void LayoutPrefix(HeaderPrefix prefix, double start, double right, doubl _prefix = new Rect(start, plateTop, Math.Min(lead, Math.Max(0, right - start)), plateHeight); hits.Add((_prefix, string.Empty, $"{KeyGlyphs.Words(HeaderPrefix.Chord)} is armed: the next key acts on the workspace. {prefix.Exit}.")); - var exitWidth = Measure(prefix.Exit, size - 1) + 8; + var exitWidth = Measure(NativeKeys.Words(prefix.Exit), size - 1) + 8; var x = _prefix.Right + 12; var limit = right - exitWidth - 12; foreach (var key in prefix.Keys) { - var width = Measure(key.Keys, size, bold: true) + 16; + var width = Measure(NativeKeys.Words(key.Keys), size, bold: true) + 16; if (x + width > limit) { break; @@ -552,12 +558,12 @@ private void DrawPrefix(DrawingContext context, HeaderPrefix prefix, ChromeOverl { var colour = key.Available ? Ink : Faint(0x60); context.DrawRectangle(new SolidColorBrush(Raised(key.Available ? 0.12 : 0.04)), new Pen(new SolidColorBrush(Faint(key.Available ? (byte)0x40 : (byte)0x20)), 1), area.Deflate(0.5), 5, 5); - Text(context, key.Keys, area.X + 8, middle, size, colour, bold: true); + Text(context, NativeKeys.Words(key.Keys), area.X + 8, middle, size, colour, bold: true); } if (_exit.Width > 0) { - Text(context, prefix.Exit, _exit.Right, middle, size - 1, Dim, alignRight: true); + Text(context, NativeKeys.Words(prefix.Exit), _exit.Right, middle, size - 1, Dim, alignRight: true); } } } @@ -587,7 +593,7 @@ internal sealed class NativeSidebar(TerminalView view) : NativeChromeView(view) internal const string AddGameText = "+ Add a game or connect"; /// The fold button's tooltip, open and folded. - internal const string FoldTip = "Fold the sidebar (⌃B b)", UnfoldTip = "Open the sidebar (⌃B b)"; + internal const string FoldTip = "Fold the sidebar (Ctrl+B b)", UnfoldTip = "Open the sidebar (Ctrl+B b)"; /// One drawn row: what it is, where, and its node. internal sealed record Row(RailRowKind Kind, Rect Area, RailWorld World, RailCharacter? Character = null, RailWindow? Window = null); diff --git a/src/SharpMUTerm.Avalonia/NativeKeys.cs b/src/SharpMUTerm.Avalonia/NativeKeys.cs new file mode 100644 index 00000000..e2e8fba6 --- /dev/null +++ b/src/SharpMUTerm.Avalonia/NativeKeys.cs @@ -0,0 +1,31 @@ +using SharpMUTerm.Client.Palette; + +namespace SharpMUTerm.Avalonia; + +/// +/// How every native surface in the window spells a key: in words (Alt+2, Ctrl+W, Ctrl+B b), the way a +/// desktop application labels one, never the terminal's glyphs (⌥2, ⌃W). The client writes its keys and its +/// sentences about keys in glyphs, because the terminal draws them in a cell font where they read well; the window draws +/// in a UI font, where they read smaller than the words around them, and a menu saying ⌥2 beside a sidebar saying +/// Alt+2 reads as two different modifiers. So whatever the client hands a native view to show — a menu's keys, a +/// notice and its key chip, a palette entry's detail, the composer's key row, a modal's sentences, a tooltip — passes +/// through on its way to the screen. NativeKeySpellingTests scans the native surfaces for a +/// glyph that got through. The cells keep their glyphs. +/// +internal static class NativeKeys +{ + /// The key glyphs the window never shows: the three modifiers and the Enter key. + internal static readonly char[] Glyphs = ['⌃', '⌥', '⇧', '⏎']; + + /// + /// with every key glyph spelt as a word — ⌃⏎ is Ctrl+Enter, as the modal footers + /// and the window's own chords (HostChord's words) say it; null is empty. + /// + public static string Words(string? text) => + string.IsNullOrEmpty(text) || text.IndexOfAny(Glyphs) < 0 + ? text ?? string.Empty + : KeyGlyphs.Words(text).Replace("⏎", "Enter", StringComparison.Ordinal); + + /// Whether still holds a modifier glyph. + public static bool HasGlyph(string? text) => text is not null && text.IndexOfAny(Glyphs) >= 0; +} diff --git a/src/SharpMUTerm.Avalonia/NativeMenu.cs b/src/SharpMUTerm.Avalonia/NativeMenu.cs index e541dc15..4fec29b2 100644 --- a/src/SharpMUTerm.Avalonia/NativeMenu.cs +++ b/src/SharpMUTerm.Avalonia/NativeMenu.cs @@ -65,16 +65,16 @@ private static ContextMenu Build( return menu; } - /// An entry's label with its key after it, the keys lined up in a column of their own. + /// An entry's label with its key after it, the keys lined up in a column of their own, both in the window's words. private static Control Header(string label, string? hint) { var grid = new Grid(); grid.ColumnDefinitions.Add(new ColumnDefinition(GridLength.Auto) { SharedSizeGroup = "label" }); grid.ColumnDefinitions.Add(new ColumnDefinition(GridLength.Auto) { SharedSizeGroup = "hint" }); - grid.Children.Add(new TextBlock { Text = label, VerticalAlignment = VerticalAlignment.Center }); + grid.Children.Add(new TextBlock { Text = NativeKeys.Words(label), VerticalAlignment = VerticalAlignment.Center }); if (hint is { } key) { - var text = new TextBlock { Text = key, Opacity = 0.6, Margin = new Thickness(28, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center }; + var text = new TextBlock { Text = NativeKeys.Words(key), Opacity = 0.6, Margin = new Thickness(28, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center }; Grid.SetColumn(text, 1); grid.Children.Add(text); } diff --git a/src/SharpMUTerm.Avalonia/NoticeToasts.cs b/src/SharpMUTerm.Avalonia/NoticeToasts.cs index 2b1f0fc8..8adbc0fb 100644 --- a/src/SharpMUTerm.Avalonia/NoticeToasts.cs +++ b/src/SharpMUTerm.Avalonia/NoticeToasts.cs @@ -18,7 +18,11 @@ namespace SharpMUTerm.Avalonia; /// message log stays the history: a toast fades after and is not kept. /// /// Input. Only a toast is hit: the control paints nothing between its toasts, and Avalonia hits only what was -/// painted, so everywhere else in the control the pointer goes through to the cells. While the pointer is over a toast it stays, and for a moment after it leaves. A left click on +/// painted, so everywhere else in the control the pointer goes through to the cells. While the pointer is over a toast it stays, and for a moment after it leaves. +/// And while the pointer is over any toast the stack does not move: every toast keeps the place it had when the pointer +/// arrived (), so an older one fading out leaves a gap instead of letting the stack fall and carry the +/// hovered toast out from under the pointer; a notice arriving meanwhile goes above the stack. The stack closes up once +/// the pointer leaves. A left click on /// a toast with an action runs it — through , the registry, never a command the window /// built — and a click without one, or a right click, dismisses it. Nothing here is focusable, so a toast never takes /// the keyboard from the command line. @@ -42,6 +46,11 @@ internal sealed class NoticeToasts : Control private readonly DispatcherTimer _timer; private Point? _pointer; + // Where each toast was when the pointer came onto the stack, and the bounds that was measured in; null while the + // pointer is off it. While set, the stack holds still under the pointer. + private Dictionary? _frozen; + private Rect _frozenBounds; + public NoticeToasts() { Focusable = false; @@ -57,6 +66,28 @@ public NoticeToasts() /// The bottom of the stack, in this control's coordinates: just above the pane area's last row. internal double Bottom { get; set; } + /// + /// What a toast must not cover, in this control's coordinates — the native map's legend. A toast that would land on + /// one is lifted to sit above it, and the rest of the stack goes up with it. + /// + internal IReadOnlyList Avoid + { + get => _avoid; + set + { + if (!_avoid.SequenceEqual(value)) + { + _avoid = value; + InvalidateVisual(); + } + } + } + + private IReadOnlyList _avoid = []; + + /// Whether the stack is holding still because the pointer is over a toast. Internal for tests. + internal bool Frozen => _frozen is not null; + /// Shows a notice the client said. A toast for the same notice (by sequence) is not shown twice. public void Show(NoticeOverlay overlay) { @@ -67,9 +98,11 @@ public void Show(NoticeOverlay overlay) } _toasts.Add(new Toast(overlay, _clock.Elapsed)); + var hovered = HoveredToast(); while (_toasts.Count > MaxShown) { - _toasts.RemoveAt(0); + // The oldest goes, unless the pointer is on it: then the next oldest. + _toasts.Remove(_toasts.First(t => t != hovered)); } _timer.Start(); @@ -109,12 +142,24 @@ internal void Advance(TimeSpan by) Tick(); } + /// The words each toast draws — its key chip, its text and its action — oldest first. Internal for tests. + internal IReadOnlyList DrawnText() => + Layout().SelectMany(l => new[] { ChipText(l.Toast), BodyText(l.Toast), ActionText(l.Toast) }).OfType().ToList(); + + // What a toast says, in the window's words (NativeKeys): the key chip, the text, the action line. + private static string? ChipText(Toast toast) => toast.Overlay.Notice.Key is { } key ? NativeKeys.Words(key) : null; + + private static string BodyText(Toast toast) => NativeKeys.Words(toast.Overlay.Notice.Text); + + private static string? ActionText(Toast toast) => toast.Overlay.Notice.Action is { } a ? $"{NativeKeys.Words(a.Label)} ›" : null; + /// Where each toast is drawn, oldest first, in this control's coordinates. Internal for tests. internal IReadOnlyList Rects() => Layout().Select(l => l.Rect).ToList(); private void Tick() { var now = _clock.Elapsed; + SyncFreeze(); var hovered = HoveredToast(); foreach (var toast in _toasts) { @@ -150,12 +195,40 @@ private static double FadeOf(Toast toast, TimeSpan now) private Toast? HoveredToast() => _pointer is { } at ? Layout().LastOrDefault(l => l.Rect.Contains(at)).Toast : null; + /// + /// Freezes the stack where it is when the pointer comes onto a toast, and lets it close up when the pointer leaves + /// every toast (or the control is resized, which re-measures everything anyway). + /// + private void SyncFreeze() + { + if (_frozen is not null && (_pointer is null || _frozenBounds != Bounds || HoveredToast() is null)) + { + _frozen = null; + InvalidateVisual(); + } + + if (_frozen is null && _pointer is { } at) + { + var placed = Layout(); + if (placed.Any(l => l.Rect.Contains(at))) + { + _frozen = placed.ToDictionary(l => l.Toast); + _frozenBounds = Bounds; + } + } + } + // ── Layout ─────────────────────────────────────────────────────────────────────────────── private readonly record struct Placed(Toast Toast, Rect Rect, FormattedText Text, FormattedText? Chip, FormattedText? Action); private List Layout() { + if (_frozen is not null) + { + return FrozenLayout(_frozen); + } + var placed = new List(); var width = Math.Min(CardWidth, Bounds.Width - (2 * Inset)); if (width < 120 || _toasts.Count == 0) @@ -164,33 +237,74 @@ private List Layout() } var bottom = (Bottom > 0 ? Math.Min(Bottom, Bounds.Height) : Bounds.Height) - Gap; - var x = Bounds.Width - Inset - width; // Newest at the bottom: lay out from the newest upwards, then hand them back oldest first. for (var i = _toasts.Count - 1; i >= 0; i--) { - var toast = _toasts[i]; - var palette = toast.Overlay.Palette; - var ink = PanelText.Parse(palette.Text); - var inner = width - EdgeWidth - (2 * Padding); - var chip = toast.Overlay.Notice.Key is { } key ? Format(key, ChipSize, PanelText.Parse(palette.Edge(toast.Overlay.Notice.Severity)), bold: true, inner) : null; - var textWidth = inner - (chip is null ? 0 : chip.Width + 8); - var text = Format(toast.Overlay.Notice.Text, TextSize, ink, bold: false, Math.Max(40, textWidth), lines: 3); - var action = toast.Overlay.Notice.Action is { } a ? Format($"{a.Label} ›", ChipSize, PanelText.Parse(palette.Edge(toast.Overlay.Notice.Severity)), bold: true, inner) : null; - var height = (2 * Padding) + text.Height + (action is null ? 0 : action.Height + 6); - var top = bottom - height; - if (top < Inset) + var one = Measure(_toasts[i], width, bottom); + while (one is { } landed && _avoid.FirstOrDefault(a => a.Intersects(landed.Rect.Inflate(Gap / 2))) is { Height: > 0 } obstacle) + { + one = Measure(_toasts[i], width, obstacle.Top - Gap); + } + + if (one is null) { break; } - placed.Insert(0, new Placed(toast, new Rect(x, top, width, height), text, chip, action)); - bottom = top - Gap; + placed.Insert(0, one.Value); + bottom = one.Value.Rect.Top - Gap; } return placed; } + /// + /// The stack while the pointer is on it: every toast that was there keeps its place (a gap where one has gone), and a + /// toast that has arrived since is stacked above the topmost, newest nearest the stack, while there is room. + /// + private List FrozenLayout(Dictionary frozen) + { + var kept = _toasts.Where(frozen.ContainsKey).Select(t => frozen[t]).ToList(); + var arrived = _toasts.Where(t => !frozen.ContainsKey(t)).ToList(); + if (arrived.Count == 0) + { + return kept; + } + + var top = frozen.Values.Min(p => p.Rect.Top) - Gap; + var above = new List(); + for (var i = arrived.Count - 1; i >= 0; i--) + { + if (Measure(arrived[i], frozen.Values.First().Rect.Width, top) is not { } placed) + { + break; + } + + above.Insert(0, placed); + top = placed.Rect.Top - Gap; + } + + // Oldest first, as the open layout hands them back: everything above the frozen block is newer than it. + return [.. kept, .. above]; + } + + /// One toast placed with its bottom at , or null when it would not fit below the inset. + private Placed? Measure(Toast toast, double width, double bottom) + { + var x = Bounds.Width - Inset - width; + var palette = toast.Overlay.Palette; + var ink = PanelText.Parse(palette.Text); + var inner = width - EdgeWidth - (2 * Padding); + var chip = ChipText(toast) is { } key ? Format(key, ChipSize, PanelText.Parse(palette.Edge(toast.Overlay.Notice.Severity)), bold: true, inner) : null; + var textWidth = inner - (chip is null ? 0 : chip.Width + 8); + var text = Format(BodyText(toast), TextSize, ink, bold: false, Math.Max(40, textWidth), lines: 3); + var action = ActionText(toast) is { } a ? Format(a, ChipSize, PanelText.Parse(palette.Edge(toast.Overlay.Notice.Severity)), bold: true, inner) : null; + var height = (2 * Padding) + text.Height + (action is null ? 0 : action.Height + 6); + var top = bottom - height; + return top < Inset ? null : new Placed(toast, new Rect(x, top, width, height), text, chip, action); + } + private static FormattedText Format(string text, double size, Color colour, bool bold, double maxWidth, int lines = 1) => new(text, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, new Typeface(FontFamily.Default, FontStyle.Normal, bold ? FontWeight.SemiBold : FontWeight.Normal), size, new SolidColorBrush(colour)) @@ -208,9 +322,10 @@ protected override void OnPointerMoved(PointerEventArgs e) { base.OnPointerMoved(e); _pointer = e.GetPosition(this); + SyncFreeze(); var over = HoveredToast(); Cursor = new Cursor(over?.Overlay.Notice.Action is not null ? StandardCursorType.Hand : StandardCursorType.Arrow); - ToolTip.SetTip(this, over?.Overlay.Notice.Action is { } action ? $"{action.Label} — click" : over is null ? null : "Click to dismiss"); + ToolTip.SetTip(this, over?.Overlay.Notice.Action is { } action ? $"{NativeKeys.Words(action.Label)} — click" : over is null ? null : "Click to dismiss"); e.Handled = true; Tick(); } @@ -219,6 +334,7 @@ protected override void OnPointerExited(PointerEventArgs e) { base.OnPointerExited(e); _pointer = null; + SyncFreeze(); ToolTip.SetTip(this, null); } diff --git a/src/SharpMUTerm.Avalonia/PackagePageView.cs b/src/SharpMUTerm.Avalonia/PackagePageView.cs index f504b23f..6ea88a2f 100644 --- a/src/SharpMUTerm.Avalonia/PackagePageView.cs +++ b/src/SharpMUTerm.Avalonia/PackagePageView.cs @@ -176,7 +176,7 @@ public void Refresh() BuildReview(); } - _status.Text = _manager.Status ?? string.Empty; + _status.Text = NativeKeys.Words(_manager.Status); _status.IsVisible = _manager.Status is not null; } @@ -222,7 +222,7 @@ private void BuildInstalled() VerticalAlignment = VerticalAlignment.Center, }; AutomationProperties.SetName(toggle, $"{item.Package.Manifest.Name} on"); - ToolTip.SetTip(toggle, _declaration.Action(PackageCollection.Toggle).Help); + ToolTip.SetTip(toggle, NativeKeys.Words(_declaration.Action(PackageCollection.Toggle).Help)); var captured = item; toggle.IsCheckedChanged += (_, _) => { @@ -281,7 +281,7 @@ private void BuildDetail() ShownFields = []; _detail.Children.Add(new TextBlock { - Text = "No package is installed. Browse the index, or use ⌃P ▸ Install package… with a file or an https link.", + Text = "No package is installed. Browse the index, or use Ctrl+P ▸ Install package… with a file or an https link.", TextWrapping = TextWrapping.Wrap, Opacity = 0.75, Margin = new Thickness(0, 8, 0, 8), @@ -316,7 +316,7 @@ private void BuildDetail() var label = new TextBlock { Text = Capitalise(field.Label), Opacity = 0.75 }; if (field.Help is { } help) { - ToolTip.SetTip(label, Capitalise(help)); + ToolTip.SetTip(label, NativeKeys.Words(Capitalise(help))); } var value = new TextBlock { Text = Text(field.Id, item), TextWrapping = TextWrapping.Wrap }; @@ -392,7 +392,7 @@ private Button ActionButton(string action, string text) { var button = new Button { Content = text, Margin = new Thickness(0, 0, 8, 6), Padding = new Thickness(12, 5) }; var declared = _declaration.Action(action); - ToolTip.SetTip(button, $"{Capitalise(declared.Help)} ({declared.Key} on the cell screen)"); + ToolTip.SetTip(button, NativeKeys.Words($"{Capitalise(declared.Help)} ({declared.Key} on the cell screen)")); AutomationProperties.SetName(button, text); return button; } diff --git a/src/SharpMUTerm.Avalonia/PaletteOverlay.cs b/src/SharpMUTerm.Avalonia/PaletteOverlay.cs index 0f674b7a..80e9180e 100644 --- a/src/SharpMUTerm.Avalonia/PaletteOverlay.cs +++ b/src/SharpMUTerm.Avalonia/PaletteOverlay.cs @@ -17,7 +17,7 @@ namespace SharpMUTerm.Avalonia; /// The window's ⌃P: a rounded card near the top of the window over a faint scrim, with a search box that has the /// keyboard, the status line the cell palette leads with, and the rows of — group /// headers, each entry's title with the matched characters in the accent, its detail dimmed, and its key in a -/// right-aligned column in the host's words (). ↑↓ and PgUp/PgDn walk the entries, +/// right-aligned column in the host's words (). ↑↓ and PgUp/PgDn walk the entries, /// ⏎ runs the selected one, Esc (or ⌃P, or a click outside the card) closes. The pointer selects what it hovers /// and runs what it clicks. /// @@ -82,7 +82,7 @@ public PaletteOverlay(PaletteSession session, Action remove) var footer = new TextBlock { - Text = "↑↓ move ⏎ run Esc close", + Text = "↑↓ move Enter run Esc close", FontSize = 11.5, Foreground = new SolidColorBrush(_colours.Dim), Margin = new Thickness(20, 6, 20, 10), @@ -237,7 +237,7 @@ private void Refresh(bool resetSelection) break; case PaletteEntry entry: _rowTexts.Add(entry.Item.Title); - var key = entry.Key is null ? null : KeyGlyphs.Words(entry.Key); + var key = entry.Key is null ? null : NativeKeys.Words(entry.Key); _keyTexts.Add(key); var drawn = EntryRow(entry, key, _entryRows.Count); _entryRows.Add(drawn); @@ -283,7 +283,7 @@ private Border EntryRow(PaletteEntry entry, string? key, int index) { var words = new TextBlock { - Text = detail, + Text = NativeKeys.Words(detail), FontSize = 12.5, Foreground = new SolidColorBrush(_colours.Dim), Margin = new Thickness(12, 0, 0, 0), diff --git a/src/SharpMUTerm.Avalonia/QuickBarButtons.cs b/src/SharpMUTerm.Avalonia/QuickBarButtons.cs index de494bcb..507b8efa 100644 --- a/src/SharpMUTerm.Avalonia/QuickBarButtons.cs +++ b/src/SharpMUTerm.Avalonia/QuickBarButtons.cs @@ -119,7 +119,7 @@ private double ItemWidth(QuickBarItem item) { var size = FontSize; var title = Math.Min(MaxTitleWidth, PanelText.Measure(Trim(item), size, false)); - return PadX + PanelText.Measure(item.Key, size, true) + 5 + title + PadX; + return PadX + PanelText.Measure(NativeKeys.Words(item.Key), size, true) + 5 + title + PadX; } private double MoreWidth(int hidden) => PadX + PanelText.Measure($"+{hidden.ToString(CultureInfo.InvariantCulture)}", FontSize, true) + PadX; @@ -214,7 +214,7 @@ private void Hover(Slot? slot) private string? Tip(Slot slot) => slot.Kind switch { - SlotKind.Item when slot.Index < _model.Items.Count => $"{_model.Items[slot.Index].Title} ({_model.Items[slot.Index].Key})", + SlotKind.Item when slot.Index < _model.Items.Count => $"{_model.Items[slot.Index].Title} ({NativeKeys.Words(_model.Items[slot.Index].Key)})", SlotKind.More => $"{slot.Index.ToString(CultureInfo.InvariantCulture)} more", SlotKind.Edit => "Edit the keys (F4)", _ => null, @@ -339,7 +339,7 @@ public override void Render(DrawingContext context) var keyInk = item.Fires ? accent : dim; var titleInk = item.Fires ? _text : dim; var x = rect.Left + PadX; - x += PanelText.Draw(context, item.Key, x, middle, size, keyInk, true, rect.Width) + 5; + x += PanelText.Draw(context, NativeKeys.Words(item.Key), x, middle, size, keyInk, true, rect.Width) + 5; PanelText.Draw(context, Trim(item), x, middle, size, titleInk, false, rect.Right - PadX - x + 0.5); break; } diff --git a/src/SharpMUTerm.Avalonia/QuitView.cs b/src/SharpMUTerm.Avalonia/QuitView.cs index 00210887..1e255fde 100644 --- a/src/SharpMUTerm.Avalonia/QuitView.cs +++ b/src/SharpMUTerm.Avalonia/QuitView.cs @@ -50,7 +50,7 @@ public QuitView(QuitSession session, ModalColours colours, Action done) var dot = new TextBlock { Text = "●", Foreground = colours.Brush(colours.Accent), Margin = new Thickness(0, 0, 10, 0), FontSize = 11, VerticalAlignment = VerticalAlignment.Center }; SetDock(dot, Dock.Left); line.Children.Add(dot); - line.Children.Add(new TextBlock { Text = consequence, Foreground = colours.Brush(colours.Text), TextWrapping = TextWrapping.Wrap, FontSize = 14 }); + line.Children.Add(new TextBlock { Text = NativeKeys.Words(consequence), Foreground = colours.Brush(colours.Text), TextWrapping = TextWrapping.Wrap, FontSize = 14 }); facts.Children.Add(line); } diff --git a/src/SharpMUTerm.Avalonia/SearchView.cs b/src/SharpMUTerm.Avalonia/SearchView.cs index 48b2af3e..13915b8a 100644 --- a/src/SharpMUTerm.Avalonia/SearchView.cs +++ b/src/SharpMUTerm.Avalonia/SearchView.cs @@ -132,8 +132,8 @@ public void Go(int index) private ToggleButton Toggle(string label, string key, bool on) { var content = new StackPanel { Orientation = Orientation.Horizontal }; - content.Children.Add(new TextBlock { Text = label, VerticalAlignment = VerticalAlignment.Center }); - content.Children.Add(new TextBlock { Text = key, FontSize = 11, Opacity = 0.7, Margin = new Thickness(6, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center }); + content.Children.Add(new TextBlock { Text = NativeKeys.Words(label), VerticalAlignment = VerticalAlignment.Center }); + content.Children.Add(new TextBlock { Text = NativeKeys.Words(key), FontSize = 11, Opacity = 0.7, Margin = new Thickness(6, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center }); var toggle = new ToggleButton { Content = content, @@ -184,7 +184,7 @@ private void Draw() _syncing = false; } - _state.Text = _model.StateText; + _state.Text = NativeKeys.Words(_model.StateText); _count.Text = _model.CountText; _list.Children.Clear(); _rows.Clear(); diff --git a/src/SharpMUTerm.Avalonia/SettingsPresenter.cs b/src/SharpMUTerm.Avalonia/SettingsPresenter.cs index 1d6a01c0..57d73173 100644 --- a/src/SharpMUTerm.Avalonia/SettingsPresenter.cs +++ b/src/SharpMUTerm.Avalonia/SettingsPresenter.cs @@ -16,6 +16,9 @@ internal sealed class SettingsPresenter : INativeSettings /// The window the settings window belongs to, set once the main window exists. public Window? Owner { get; set; } + /// Gives the keyboard back to the client's command line (or an armed docked composer) once the window closes. + public Action? Refocus { get; set; } + /// The open settings window, for a test; read on the window's thread. public SettingsWindow? Window => _window; @@ -29,7 +32,7 @@ internal SettingsWindow ShowNow(SettingsForm form) if (_window is { } open) { open.Load(form); - open.Activate(); + open.FocusFirst(); return open; } @@ -43,6 +46,7 @@ internal SettingsWindow ShowNow(SettingsForm form) // The keyboard goes back to the client, as it does when a cell screen closes. Owner?.Activate(); + Refocus?.Invoke(); }; _window = window; if (Owner is { IsVisible: true } owner) diff --git a/src/SharpMUTerm.Avalonia/SettingsWindow.cs b/src/SharpMUTerm.Avalonia/SettingsWindow.cs index 8ce7edf8..a0050f79 100644 --- a/src/SharpMUTerm.Avalonia/SettingsWindow.cs +++ b/src/SharpMUTerm.Avalonia/SettingsWindow.cs @@ -93,7 +93,11 @@ public SettingsWindow(SettingsForm form) Content = dock; _clock = new DispatcherTimer(TimeSpan.FromSeconds(1), DispatcherPriority.Background, (_, _) => Tick()); - Opened += (_, _) => _clock.Start(); + Opened += (_, _) => + { + _clock.Start(); + FocusFirst(); + }; Closed += (_, _) => { _clock.Stop(); @@ -108,6 +112,18 @@ public SettingsWindow(SettingsForm form) Load(form); } + /// + /// Takes the keyboard: the window comes forward and the search box has focus, as the palette's does. Without it a + /// window manager that does not activate a new window (or none, under Xvfb) left the keys in the main window, where + /// the focus pin put them on the command line — so what the player typed into "the settings" went into a line ⏎ + /// would send to the game. + /// + public void FocusFirst() + { + Activate(); + _search.Focus(); + } + /// The section on the right, by id. public string? ShownSection => _shown; @@ -461,10 +477,10 @@ private StackPanel ThemePicker(ThemeField field) { var outer = new StackPanel { Spacing = 6, Margin = new Thickness(0, 4, 0, 4) }; var words = new StackPanel { Spacing = 1 }; - words.Children.Add(new TextBlock { Text = Capitalise(field.Label), FontSize = 14 }); + words.Children.Add(new TextBlock { Text = NativeKeys.Words(Capitalise(field.Label)), FontSize = 14 }); if (field.Help is { } help) { - words.Children.Add(new TextBlock { Text = Capitalise(help), FontSize = 12, Opacity = 0.72, TextWrapping = TextWrapping.Wrap }); + words.Children.Add(new TextBlock { Text = NativeKeys.Words(Capitalise(help)), FontSize = 12, Opacity = 0.72, TextWrapping = TextWrapping.Wrap }); } outer.Children.Add(words); @@ -510,10 +526,10 @@ private Grid FieldRow(SettingsField field) var grid = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto,Auto"), Margin = new Thickness(0, 4), MinHeight = 44 }; var words = new StackPanel { VerticalAlignment = VerticalAlignment.Center, Spacing = 1, Margin = new Thickness(0, 0, 16, 0) }; - words.Children.Add(new TextBlock { Text = Capitalise(field.Label), FontSize = 14, TextWrapping = TextWrapping.Wrap }); + words.Children.Add(new TextBlock { Text = NativeKeys.Words(Capitalise(field.Label)), FontSize = 14, TextWrapping = TextWrapping.Wrap }); if (field.Help is { } help) { - words.Children.Add(new TextBlock { Text = Capitalise(help), FontSize = 12, Opacity = 0.72, TextWrapping = TextWrapping.Wrap }); + words.Children.Add(new TextBlock { Text = NativeKeys.Words(Capitalise(help)), FontSize = 12, Opacity = 0.72, TextWrapping = TextWrapping.Wrap }); } grid.Children.Add(words); @@ -711,10 +727,10 @@ private StackPanel MeterTable(ListField field) var top = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto") }; var words = new StackPanel { Spacing = 1 }; - words.Children.Add(new TextBlock { Text = Capitalise(field.Label), FontSize = 14 }); + words.Children.Add(new TextBlock { Text = NativeKeys.Words(Capitalise(field.Label)), FontSize = 14 }); if (field.Help is { } help) { - words.Children.Add(new TextBlock { Text = Capitalise(help), FontSize = 12, Opacity = 0.72, TextWrapping = TextWrapping.Wrap }); + words.Children.Add(new TextBlock { Text = NativeKeys.Words(Capitalise(help)), FontSize = 12, Opacity = 0.72, TextWrapping = TextWrapping.Wrap }); } top.Children.Add(words); diff --git a/src/SharpMUTerm.Avalonia/WelcomeView.cs b/src/SharpMUTerm.Avalonia/WelcomeView.cs index 72248144..f3016d15 100644 --- a/src/SharpMUTerm.Avalonia/WelcomeView.cs +++ b/src/SharpMUTerm.Avalonia/WelcomeView.cs @@ -165,8 +165,8 @@ private void DrawMenu() var index = i; var (title, detail) = _model.Describe(choice); var words = new StackPanel(); - words.Children.Add(new TextBlock { Text = title, FontSize = 14.5, FontWeight = FontWeight.Medium, Foreground = _colours.Brush(_colours.Text) }); - words.Children.Add(new TextBlock { Text = detail, FontSize = 12, Foreground = _colours.Brush(_colours.Dim) }); + words.Children.Add(new TextBlock { Text = NativeKeys.Words(title), FontSize = 14.5, FontWeight = FontWeight.Medium, Foreground = _colours.Brush(_colours.Text) }); + words.Children.Add(new TextBlock { Text = NativeKeys.Words(detail), FontSize = 12, Foreground = _colours.Brush(_colours.Dim) }); var row = ModalParts.Row(words, title, () => SelectChoice(index), () => Choose(choice)); row.Padding = new Thickness(12, 8); _choiceRows.Add(row); @@ -268,7 +268,7 @@ private void DrawProblem() { if (_body.Children.OfType().FirstOrDefault(t => t.Name == "Problem") is { } problem) { - problem.Text = _model.Problem ?? string.Empty; + problem.Text = NativeKeys.Words(_model.Problem); problem.IsVisible = _model.Problem is not null; } } diff --git a/src/SharpMUTerm.Client/Composer/ComposerSession.cs b/src/SharpMUTerm.Client/Composer/ComposerSession.cs index 42c4755e..f5868763 100644 --- a/src/SharpMUTerm.Client/Composer/ComposerSession.cs +++ b/src/SharpMUTerm.Client/Composer/ComposerSession.cs @@ -29,6 +29,15 @@ public sealed record ComposerCallbacks /// Esc (or F1) in F1: the window closes, with the buffer to keep. public Action? Closed { get; init; } + + /// + /// Whether the composer's character writes in a proportional face — read by the host on its own thread, so it reads + /// the character's saved choice live and every composer of that character follows a change. Null: monospace. + /// + public Func? Proportional { get; init; } + + /// The editor's menu chose a face (true for proportional), for the character to keep. + public Action? ChooseFace { get; init; } } /// @@ -144,6 +153,18 @@ public void Arm() } } + /// Whether this composer's character writes in a proportional face; false (monospace) with nobody to ask. + public bool Proportional => _callbacks.Proportional?.Invoke() ?? false; + + /// The host's: the editor's menu chose a face. + public void ChooseFace(bool proportional) + { + if (!IsEnded) + { + _callbacks.ChooseFace?.Invoke(proportional); + } + } + /// The host's: F1 closing by Esc, with the buffer. public void Close(string body) => Pass(_callbacks.Closed, Normalise(body)); diff --git a/src/SharpMUTerm.Client/Modals/HistoryModel.cs b/src/SharpMUTerm.Client/Modals/HistoryModel.cs index d4b5d6a7..5890b810 100644 --- a/src/SharpMUTerm.Client/Modals/HistoryModel.cs +++ b/src/SharpMUTerm.Client/Modals/HistoryModel.cs @@ -56,6 +56,12 @@ public HistorySession(HistoryModel model, bool isDark, Action insert, Actio public override string Surface => "history"; + /// + /// What the filter box opens with typed in; empty for nothing. The history-search-filter view hands its query + /// here, as menu-fuzzy hands its query to the palette, so the window's frame is filtered as the cells' is. + /// + public string InitialQuery { get; init; } = string.Empty; + /// The host's: ⏎ on the entry at in . public void Insert(int entryIndex) { diff --git a/src/SharpMUTerm.Client/Settings/SettingsForm.cs b/src/SharpMUTerm.Client/Settings/SettingsForm.cs index f4334a45..8296e85e 100644 --- a/src/SharpMUTerm.Client/Settings/SettingsForm.cs +++ b/src/SharpMUTerm.Client/Settings/SettingsForm.cs @@ -308,6 +308,26 @@ public void Reset(SettingsField field) /// Edits 's fields from now on (null for none). public void Select(object? item) => _item = item; + /// + /// The item each list section last had selected, by section id, for the run: the host's, so it outlives this form + /// and a list opened again (or a section switched back to) lands where it was left. Null keeps nothing. Read and + /// written on the window's thread only. + /// + public IDictionary? Selections { get; init; } + + /// The item last had selected, or null. + public object? Recall(string sectionId) => + Selections is { } kept && kept.TryGetValue(sectionId, out var item) ? item : null; + + /// Keeps as 's selection for the run. + public void Remember(string sectionId, object? item) + { + if (Selections is { } kept && item is not null) + { + kept[sectionId] = item; + } + } + /// /// 's items, by set: the player's own sets in order, then every installed package's sets, /// read-only. Each set's items are a snapshot of its list now. diff --git a/src/SharpMUTerm.Core/Configuration/CharacterDefinition.cs b/src/SharpMUTerm.Core/Configuration/CharacterDefinition.cs index 2cd142e0..11c08262 100644 --- a/src/SharpMUTerm.Core/Configuration/CharacterDefinition.cs +++ b/src/SharpMUTerm.Core/Configuration/CharacterDefinition.cs @@ -143,6 +143,13 @@ public sealed class CharacterDefinition /// public string? Layout { get; set; } + /// + /// Whether this character's posts are written in a proportional face in the window's native composer, rather than + /// the cells' monospace one (the editor's right-click menu). The window's presentation only: the terminal's composer + /// is cells and has one face. False — monospace — by default, so no migration marks anybody. + /// + public bool ComposerProportional { get; set; } + /// Logging is configured per character. public LoggingSettings Logging { get; set; } = new(); @@ -187,6 +194,7 @@ public sealed class CharacterDefinition TriggerSets = new List(TriggerSets), Tint = Tint, Layout = Layout, + ComposerProportional = ComposerProportional, Logging = new LoggingSettings { Format = Logging.Format, diff --git a/src/SharpMUTerm.Tui/ListOverlay.cs b/src/SharpMUTerm.Tui/ListOverlay.cs index ef463426..f5feef89 100644 --- a/src/SharpMUTerm.Tui/ListOverlay.cs +++ b/src/SharpMUTerm.Tui/ListOverlay.cs @@ -1,6 +1,7 @@ using SharpConsoleUI; using SharpConsoleUI.Builders; using SharpConsoleUI.Controls; +using SharpConsoleUI.Layout; using SharpMUTerm.Core.Packages; namespace SharpMUTerm.Tui; @@ -68,7 +69,7 @@ public void Open( var widest = Math.Clamp(desktop.Width - 8, 44, 110); var outer = width is { } asked ? Math.Clamp(asked + 4, 24, widest) : widest; var lines = render(outer - 4); - var height = Math.Clamp(lines.Count + 2, 8, Math.Max(8, desktop.Height - 2)); + var height = Math.Clamp(Rows(lines, outer - 3) + 2, 8, Math.Max(8, desktop.Height - 2)); _content = new MarkupControl(_scheme.Lines(lines, ScreenPalette.MenuBg)); // Centered() after WithSize(), for CommandPalette's reason. @@ -102,6 +103,24 @@ public void Open( Mode = mode; } + /// + /// The rows take at , wrapped the way the window's control will wrap + /// them — measured by the framework, never counted. A line wider than the window (F10's key line at 80 columns) is + /// two rows, and sizing the modal by the line count left the last row of F10's detail under its bottom edge. One + /// column narrower than the content, so a scroll bar's column cannot add a row the measure missed. + /// + internal static int Rows(IReadOnlyList lines, int width) + { + if (lines.Count == 0) + { + return 0; + } + + var probe = new MarkupControl(lines.ToList()); + width = Math.Max(1, width); + return Math.Max(lines.Count, probe.MeasureDOM(new LayoutConstraints(width, width, 0, int.MaxValue)).Height); + } + public void Repaint() { if (_render is not null && _content is not null) diff --git a/src/SharpMUTerm.Tui/PackageScreen.cs b/src/SharpMUTerm.Tui/PackageScreen.cs index b68f2272..ce6ee8b8 100644 --- a/src/SharpMUTerm.Tui/PackageScreen.cs +++ b/src/SharpMUTerm.Tui/PackageScreen.cs @@ -121,11 +121,12 @@ string Read(string id, PackageItem item) => + $"[{ScreenPalette.Value}]{Escape(Elide(Read(field.Id, current), Math.Max(10, width - 14)))}[/]"); } - if (confirmingRemove) - { - lines.Add(string.Empty); - lines.Add($"[bold {ScreenPalette.Warn}]Remove {Escape(Read(name, current))} and its files? Del again removes it, any other key keeps it.[/]"); - } + // The question's rows are always there, blank until Del asks it: the modal is sized once, when it opens, and a + // question added later would land under its bottom edge. Elided to one row for the same reason. + lines.Add(string.Empty); + lines.Add(confirmingRemove + ? $"[bold {ScreenPalette.Warn}]{Escape(Elide($"Remove {Read(name, current)} and its files? Del again removes it, any other key keeps it.", width))}[/]" + : string.Empty); return lines; } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.NativeComposer.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.NativeComposer.cs index 56f32614..706e3499 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.NativeComposer.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.NativeComposer.cs @@ -110,6 +110,8 @@ private void OpenComposer(string target, string draft, ComposeEscaping escaping, } }), AddWord = word => OnUiThread(() => AddComposerWord(word)), + Proportional = ComposerFaceOf(ComposeDraftKey(ActiveWindowId())), + ChooseFace = ChooseComposerFace(ComposeDraftKey(ActiveWindowId())), Closed = body => OnUiThread(() => { if (ReferenceEquals(_nativeCompose, open)) @@ -125,6 +127,31 @@ private void OpenComposer(string target, string draft, ComposeEscaping escaping, PublishHostChrome(); } + /// + /// The face a character's native composer writes in, read on the host's thread: the character's saved choice + /// (), looked up afresh each time so a change made in one of its + /// composers reaches the other. A composer that belongs to nobody writes in monospace. + /// + private Func ComposerFaceOf(string? sessionKey) + { + var character = sessionKey is null ? null : CharacterFor(sessionKey); + return () => character?.ComposerProportional ?? false; + } + + /// + /// Keeps a face chosen in a character's native composer as that character's, on disk. Through + /// — a view preference, which must not go through SaveConfiguration, whose + /// automation reload re-periodises every running timer. + /// + private Action ChooseComposerFace(string? sessionKey) => proportional => OnUiThread(() => + { + if (sessionKey is not null && CharacterFor(sessionKey) is { } character && character.ComposerProportional != proportional) + { + character.ComposerProportional = proportional; + PersistConfiguration(); + } + }); + /// /// A host editor's colours: the accent its title and keys wear, and the settings screens' warning for the line under /// a misspelling — the colour the cell editor marks the word in. @@ -242,6 +269,8 @@ private ComposerSession DockedSessionFor(DockedComposer composer) } }), Arm = () => OnUiThread(() => ArmComposer(composer)), + Proportional = ComposerFaceOf(composer.SessionKey), + ChooseFace = ChooseComposerFace(composer.SessionKey), }); _dockedSessions[composer.WindowId] = session; return session; diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.NativeModals.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.NativeModals.cs index bdb1730a..e5e6e6b0 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.NativeModals.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.NativeModals.cs @@ -147,8 +147,8 @@ private bool TryOpenNativeSearch() return true; } - /// Opens ⌃R in the host's controls; false when the host has none. - private bool TryOpenNativeHistory() + /// Opens ⌃R in the host's controls, typed into its filter; false when the host has none. + private bool TryOpenNativeHistory(string query = "") { if (NativeModalsHost is not { } native) { @@ -160,7 +160,10 @@ private bool TryOpenNativeHistory() new HistoryModel(HistoryFor(BarKind(ActiveBar())).Entries.ToArray(), HistoryBarLabel()), ThemeIsDark(), index => OnUiThread(() => InsertHistoryEntry(index)), - () => OnUiThread(() => NativeModalClosed(session!))); + () => OnUiThread(() => NativeModalClosed(session!))) + { + InitialQuery = query, + }; ShowNativeModal(native, session); return true; } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs index 99d4bcee..7673d611 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs @@ -357,7 +357,8 @@ private void SyncDockedComposers(string? sessionKey) /// /// Paints who holds the keyboard: the armed composer's header marker, and both command lines idle while a - /// composer has it — ⏎ there inserts a line, it does not send. + /// composer has it — ⏎ there inserts a line, it does not send — or while ⌥C has put the keys on the sidebar, where ⏎ + /// goes to a row. Cells in both hosts, so the window's command line follows with nothing of its own. /// private void SyncComposerBands() { @@ -375,8 +376,9 @@ private void SyncComposerBands() composer.Armed = ReferenceEquals(composer, armed); } - _input.Armed = armed is null && ReferenceEquals(_armed, _input); - _second.Armed = armed is null && ReferenceEquals(_armed, _second); + var barHolds = armed is null && _railCursor is null; + _input.Armed = barHolds && ReferenceEquals(_armed, _input); + _second.Armed = barHolds && ReferenceEquals(_armed, _second); SyncStatusMode(); // the composer's keys on the status row, or the pane's again } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.RailKeys.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.RailKeys.cs index 6b5d1f12..9cec4dc2 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.RailKeys.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.RailKeys.cs @@ -68,6 +68,8 @@ private void ToggleRailKeys() ?? rows[0]; _railCursor = SidebarModel.KeyOf(start); RefreshRail(); + SyncComposerBands(); // the command line goes idle: ⏎ goes to a row now, not to the game + UpdateInputChrome(); // and its prompt with it, which is painted to match the band Notice("sidebar: ↑↓ walk · ⏎ goes · Esc returns", MessageSeverity.Info, "⌥C"); } @@ -81,6 +83,8 @@ private void LeaveRailKeys() _railCursor = null; RefreshRail(); + SyncComposerBands(); + UpdateInputChrome(); } /// diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Settings.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Settings.cs index 170ce1a0..7c490e18 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Settings.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Settings.cs @@ -152,6 +152,12 @@ private bool TryOpenNativeSettings(SettingsSectionContribution? section, object? /// meter table reads the game data of the window focused when the form opened (), /// captured here because the store is thread-safe and the focus is not. /// + /// + /// Each native list section's last selected item, by section id, for the run — never saved (which rule was being + /// looked at is not configuration). Touched only on the window's thread, through the form. + /// + private readonly Dictionary _listSelections = new(StringComparer.Ordinal); + internal SettingsForm NativeSettingsForm(string initial, object? item = null) { var edits = new ScreenEdits(SaveConfiguration); @@ -185,6 +191,7 @@ internal SettingsForm NativeSettingsForm(string initial, object? item = null) item) { Packages = PackageManager, + Selections = _listSelections, }; return form; } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 103ff25a..0bed1259 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -1659,11 +1659,20 @@ public string RenderSnapshot(string? view = null) // In a host that draws ⌃F itself, the same query through the native surface's session (the window's // screenshots); the parity harness and the terminal have none and take the cell path below. - if (!string.Equals(view, "search-landed", StringComparison.OrdinalIgnoreCase) && TryOpenNativeSearch()) + // `search-landed` goes there too: ↓ then ⏎ on the native list is the second hit's row handed to + // GoToSearchHit, the method the cell ⏎ ends in, so the frame left behind is the cells' landing. + if (TryOpenNativeSearch()) { var all = string.Equals(view, "search-all", StringComparison.OrdinalIgnoreCase); var regex = string.Equals(view, "search-regex", StringComparison.OrdinalIgnoreCase); NativeSearch!.Search(regex ? @"gobl\w+ (corpse|for)" : "goblin", regex, all); + if (string.Equals(view, "search-landed", StringComparison.OrdinalIgnoreCase) && NativeSearch is { } landing && landing.Model.Rows.Count > 0) + { + var hits = landing.Model; + CloseNativeModal(landing); + GoToSearchHit(hits, Math.Min(1, hits.Rows.Count - 1)); + SettleScroll(); + } } else { @@ -1779,13 +1788,15 @@ public string RenderSnapshot(string? view = null) // seeded here on purpose: the frame is where "the password is not in the list" is visible. HistoryFor(InputBar.Primary).Add("connect Corvid hunter2"); - // A host that draws ⌃R itself filters in its own box, so only the list is handed over there. - if (!TryOpenNativeHistory()) + // A host that draws ⌃R itself filters in its own box, so there the query is handed over as the box's + // opening text — `menu-fuzzy`'s way with the native palette — and the frame is filtered in both hosts. + var filter = view.EndsWith("-filter", StringComparison.OrdinalIgnoreCase) ? "north" : string.Empty; + if (!TryOpenNativeHistory(filter)) { _historySearch.OpenForSnapshot(); - if (view.EndsWith("-filter", StringComparison.OrdinalIgnoreCase)) + if (filter.Length > 0) { - _historySearch.SimulateTyping("north"); + _historySearch.SimulateTyping(filter); } } } @@ -2752,6 +2763,16 @@ internal async Task StartAsync(IReadOnlyList startup) { ArgumentNullException.ThrowIfNull(startup); + // A launch has one startup pass. The window's demo lays its scene out on the loop's first tick and the + // welcome scene runs this pass itself, and then Run schedules its own — which raised the empty + // configuration's notice twice, two identical toasts stacked in the window. The second is the one ignored. + if (_startupRan) + { + return; + } + + _startupRan = true; + if (startup.Count == 0) { // Two different states, and telling them apart is the whole value of the message: nothing @@ -2800,6 +2821,9 @@ internal async Task StartAsync(IReadOnlyList startup) /// the welcome leaves behind when it is closed, so it names the welcome's way back as well as the two ways /// in; and it is short enough for an 80-column status row, which a longer one wrapped onto a second row. /// + /// Set by the first ; a launch runs its startup pass once. + private bool _startupRan; + internal const string NoWorldsNotice = "No world configured · /connect · F5 adds one · /welcome"; diff --git a/tests/SharpMUTerm.Avalonia.Tests/ListEditorTests.cs b/tests/SharpMUTerm.Avalonia.Tests/ListEditorTests.cs index de37fbab..c4662808 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/ListEditorTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/ListEditorTests.cs @@ -186,6 +186,44 @@ public async Task AFormOpenedOnARuleSelectsIt() await Assert.That(row).IsSameReferenceAs(tell); } + [Test] + public async Task AListKeepsItsSelectionAcrossASectionSwitchAndAReopen() + { + var harness = new Harness(); + harness.Config.TriggerSets[0].Aliases.Add(new Alias { Name = "n", Pattern = "n" }); + var kept = new Dictionary(StringComparer.Ordinal); + var tell = harness.Own.Triggers[1]; + var (afterSwitch, afterReopen) = await TerminalViewTests.Session.Dispatch(() => + { + static void Pick(SettingsWindow window, string id) + { + window.SectionList.SelectedItem = window.SectionList.Items.OfType().First(i => Equals(i.Tag, id)); + Dispatcher.UIThread.RunJobs(); + } + + var form = new SettingsForm(BuiltInSettings.All, harness.Config, c => c(), _ => { }, "triggers", isDark: true) { Selections = kept }; + var window = new SettingsWindow(form); + window.Show(); + Dispatcher.UIThread.RunJobs(); + window.ListEditor!.Choose(tell); + Pick(window, "aliases"); + Pick(window, "triggers"); + var switched = window.ListEditor!.SelectedItem; + window.Close(); + + // A new window, on a new form, as F2 opens one: the run's memory brings it back to the same rule. + var again = new SettingsWindow(new SettingsForm(BuiltInSettings.All, harness.Config, c => c(), _ => { }, "triggers", isDark: true) { Selections = kept }); + again.Show(); + Dispatcher.UIThread.RunJobs(); + var reopened = again.ListEditor!.SelectedItem; + again.Close(); + return (switched, reopened); + }, CancellationToken.None); + + await Assert.That(afterSwitch).IsSameReferenceAs(tell); + await Assert.That(afterReopen).IsSameReferenceAs(tell); + } + [Test] public async Task TheSearchFindsAnItemFieldAndShowsOnlyIt() { diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativeComposerTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativeComposerTests.cs index 0f3dedda..ce708831 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/NativeComposerTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/NativeComposerTests.cs @@ -126,7 +126,7 @@ public async Task F1OpensTheNativeEditorFocusedOverTheCellsAndNotTheCellModal() await Assert.That(focused).IsTrue(); await Assert.That(cellOpen).IsFalse(); await Assert.That(header).Contains("COMPOSE").And.Contains("to Ann").And.Contains("as typed").And.Contains("no dictionary"); - await Assert.That(footer).Contains("⌃S send").And.Contains("⌥L escaping").And.Contains("Esc close (keeps the draft)"); + await Assert.That(footer).Contains("Ctrl+S send").And.Contains("Alt+L escaping").And.Contains("Esc close (keeps the draft)"); await Assert.That(below).IsTrue().Because("under the layer, so a toast is drawn over it"); await Assert.That(margin).IsTrue().Because("over the cells, clear of the native header and sidebar"); } @@ -291,7 +291,7 @@ public async Task AMooEditOpensNativelyAndCtrlSSavesItsLines() }); await Assert.That(header).Contains("EDIT").And.Contains("Test:look").And.DoesNotContain("as typed"); - await Assert.That(footer).Contains("⌃S save").And.DoesNotContain("⌥L"); + await Assert.That(footer).Contains("Ctrl+S save").And.DoesNotContain("Alt+L"); await Assert.That(saved).IsEquivalentTo(new[] { "player:tell(\"Hi.\");", "return 1;", "// 100% [sure]; done" }); await Assert.That(sent).IsEmpty(); } @@ -321,7 +321,7 @@ public async Task TheDockedEditorLiesOverItsPaneAndTakesTheKeyboardWhenArmed() await Assert.That(armed).IsTrue(); await Assert.That(focused).IsTrue(); await Assert.That(header).Contains("COMPOSE").And.Contains("to Ann"); - await Assert.That(footer).Contains("⌃S").And.Contains("Esc"); + await Assert.That(footer).Contains("Ctrl+S").And.Contains("Esc"); await Assert.That(width).IsGreaterThan(0); } diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativeKeySpellingTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativeKeySpellingTests.cs new file mode 100644 index 00000000..2c506e76 --- /dev/null +++ b/tests/SharpMUTerm.Avalonia.Tests/NativeKeySpellingTests.cs @@ -0,0 +1,276 @@ +using System.Text.RegularExpressions; +using Avalonia; +using Avalonia.Controls; +using Avalonia.Controls.Documents; +using Avalonia.Controls.Primitives; +using Avalonia.LogicalTree; +using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Core.Diagnostics; +using SharpMUTerm.Tui; +using SkiaSharp; +using Window = Avalonia.Controls.Window; + +namespace SharpMUTerm.Avalonia.Tests; + +/// +/// The window spells a key one way on every native surface — in words (Alt+2, Ctrl+W), through +/// — while the terminal keeps its glyphs. A menu saying ⌥2 beside a sidebar saying +/// Alt+2 was the report. Each native surface is opened over the demo in a real window and every word it shows — +/// text, key chips, buttons, menu entries, tooltips, a toast — is scanned for a modifier glyph; and the window's own +/// source holds none in a string. +/// +[NotInParallel] +public class NativeKeySpellingTests +{ + private sealed record Rig(Window Window, Panel Root, TerminalView View, DesktopLayer Layer, SharpMUTermApp App, AvaloniaConsoleDriver Driver); + + private static Task Run(Func body) => + TerminalViewTests.Session.Dispatch(() => + { + var driver = new AvaloniaConsoleDriver(120, 34); + var view = new TerminalView(driver, SKColors.White, new SKColor(0x1e, 0x1e, 0x24), 14, null); + var root = new Panel(); + root.Children.Add(view); + var layer = new DesktopLayer(view, HostChrome.HeaderAndRail); + root.Children.Add(layer); + driver.Composer.Attach(root, layer, view, () => view.Focus()); + driver.Palette.Attach(root, () => view.Focus()); + var window = new Window { Content = root, Width = 1200, Height = 760 }; + driver.Modals.Attach(window, root, () => view.Focus(), driver.RaiseKey); + window.Show(); + view.Focus(); + var app = new SharpMUTermApp(DemoScene.Build(), WindowHost.Create(driver, clipboard: null) with + { + Audio = null, + Presence = null, + Announcer = null, + NativeSettings = null, + RunsInline = true, + }); + driver.KeyPressed += (_, key) => app.SimulateKey(key); + try + { + app.RenderSnapshot(null); + DesktopLayerTests.Drain(); + return body(new Rig(window, root, view, layer, app, driver)); + } + finally + { + app.DisposeAsync().AsTask().GetAwaiter().GetResult(); + window.Close(); + driver.Dispose(); + } + }, CancellationToken.None); + + private static void Key(Rig rig, ConsoleKeyInfo key) + { + rig.App.SimulateKey(key); + DesktopLayerTests.Drain(); + } + + private static ConsoleKeyInfo Ctrl(char letter, ConsoleKey key) => new((char)(letter - 'a' + 1), key, false, false, true); + + /// Every word a native view shows: text (and its runs), string content, headers and tooltips. + internal static IEnumerable Words(ILogical root) + { + foreach (var node in root.GetLogicalDescendants().Prepend(root)) + { + if (node is TextBlock block) + { + if (block.Text is { Length: > 0 } text) + { + yield return text; + } + + if (block.Inlines is { } inlines) + { + yield return string.Concat(inlines.OfType().Select(r => r.Text)); + } + } + + if (node is ContentControl { Content: string content }) + { + yield return content; + } + + if (node is HeaderedItemsControl { Header: string header }) + { + yield return header; + } + + if (node is Control control && ToolTip.GetTip(control) is string tip) + { + yield return tip; + } + } + } + + private static List Glyphed(string surface, IEnumerable words) => + words.Where(NativeKeys.HasGlyph).Select(w => $"{surface}: {w}").ToList(); + + [Test] + public async Task NoNativeSurfaceSpellsAKeyInGlyphs() + { + var (found, scanned) = await Run(rig => + { + var found = new List(); + var scanned = new List(); + + // The right-click menu over the output: the client's entries with their keys (⌥2, ⌃W in the cells). + var menu = NativeMenu.Build(rig.App.PointerMenu(new System.Drawing.Point(40, 8)), PlacementMode.Pointer, rig.View); + var menuWords = Words(menu).ToList(); + found.AddRange(Glyphed("menu", menuWords)); + scanned.Add($"menu:{menuWords.Count}"); + if (!menuWords.Any(w => w.Contains("Ctrl+", StringComparison.Ordinal) || w.Contains("Alt+", StringComparison.Ordinal))) + { + found.Add("menu: no key in words either — " + string.Join(" | ", menuWords)); + } + + // The header's Layouts menu. + var layouts = NativeMenu.Build(rig.App.LayoutsMenu(), _ => { }, PlacementMode.Bottom, rig.View); + found.AddRange(Glyphed("layouts menu", Words(layouts))); + + // A toast whose text, key chip and action all name keys. + rig.App.SimulateNotice("⌃P ▸ Layouts, or ⌥M", MessageSeverity.Warning, "⌥M", new NoticeAction("layout:layouts", "Open ⌥M")); + DesktopLayerTests.Drain(); + rig.Driver.Flush(); + DesktopLayerTests.Drain(); + var toast = rig.Layer.Toasts.DrawnText(); + found.AddRange(Glyphed("toast", toast)); + scanned.Add($"toast:{toast.Count}"); + if (!toast.Contains("Alt+M")) + { + found.Add("toast: the key chip is not Alt+M — " + string.Join(" | ", toast)); + } + + // The native header and sidebar: their tooltips, and the armed ⌃B keymap. + found.AddRange(Glyphed("header", rig.Layer.Header.Hits.Select(h => h.Tip))); + found.AddRange(Glyphed("sidebar", rig.Layer.Sidebar.Hits.Select(h => h.Tip))); + Key(rig, Ctrl('b', ConsoleKey.B)); + found.AddRange(Glyphed("prefix", rig.Layer.Header.Hits.Select(h => h.Tip))); + Key(rig, new ConsoleKeyInfo('\x1b', ConsoleKey.Escape, false, false, false)); + + // ⌃P: every row's title, detail and key chips. + Key(rig, Ctrl('p', ConsoleKey.P)); + if (rig.Driver.Palette.Overlay is { } palette) + { + var words = Words(palette).ToList(); + found.AddRange(Glyphed("palette", words)); + scanned.Add($"palette:{words.Count}"); + Key(rig, Ctrl('p', ConsoleKey.P)); + } + else + { + found.Add("palette: did not open natively"); + } + + // F1: the composer's key row. + Key(rig, new ConsoleKeyInfo('\0', ConsoleKey.F1, false, false, false)); + if (rig.Driver.Composer.Overlay is { } composer) + { + var words = Words(composer).ToList(); + found.AddRange(Glyphed("composer", words)); + scanned.Add($"composer:{words.Count}"); + Key(rig, new ConsoleKeyInfo('\0', ConsoleKey.F1, false, false, false)); + } + else + { + found.Add("composer: did not open natively"); + } + + // The modals: ⌃F, ⌃R, ⌥M, and the quit prompt. + foreach (var (name, key) in new[] + { + ("search", Ctrl('f', ConsoleKey.F)), + ("history", Ctrl('r', ConsoleKey.R)), + ("layouts", new ConsoleKeyInfo('m', ConsoleKey.M, false, true, false)), + ("quit", Ctrl('q', ConsoleKey.Q)), + }) + { + Key(rig, key); + if ((rig.Driver.Modals.Quit ?? rig.Driver.Modals.Modal) is { } modal) + { + var words = Words(modal).ToList(); + found.AddRange(Glyphed(name, words)); + scanned.Add($"{name}:{words.Count}"); + Key(rig, new ConsoleKeyInfo('\x1b', ConsoleKey.Escape, false, false, false)); + if ((rig.Driver.Modals.Quit ?? rig.Driver.Modals.Modal) is { } still) + { + still.Session.Dismiss(); + rig.Driver.Modals.Close(still.Session); + DesktopLayerTests.Drain(); + } + } + else + { + found.Add($"{name}: did not open natively"); + } + } + + return (found, scanned); + }); + + await Assert.That(found).IsEmpty().Because(string.Join("\n", found)); + await Assert.That(scanned.Count).IsGreaterThanOrEqualTo(7).Because("every surface was opened and read: " + string.Join(", ", scanned)); + } + + /// The window's own strings — a footer, a tooltip, an empty state — name keys in words too. + [Test] + public async Task TheWindowsOwnStringsSpellKeysInWords() + { + var root = Path.Combine(RepositoryRoot(), "src", "SharpMUTerm.Avalonia"); + var literal = new Regex("\"(?:[^\"\\\\]|\\\\.)*\"", RegexOptions.Compiled); + var offenders = new List(); + foreach (var file in Directory.EnumerateFiles(root, "*.cs", SearchOption.TopDirectoryOnly)) + { + var lines = File.ReadAllLines(file); + for (var i = 0; i < lines.Length; i++) + { + var line = lines[i].Trim(); + if (line.StartsWith("//", StringComparison.Ordinal)) + { + continue; + } + + // The list of glyphs names them, and the host contract carries the chords' glyph spellings for the + // client's cells (the palette's rows reach the window through NativeKeys like everything else). + if (Path.GetFileName(file) is "NativeKeys.cs" or "WindowHost.cs") + { + continue; + } + + foreach (Match match in literal.Matches(line)) + { + if (NativeKeys.HasGlyph(match.Value)) + { + offenders.Add($"{Path.GetFileName(file)}:{i + 1}: {match.Value}"); + } + } + } + } + + await Assert.That(offenders).IsEmpty().Because(string.Join("\n", offenders)); + } + + [Test] + public async Task WordsSpellsEveryModifierAndLeavesTheRestAlone() + { + await Assert.That(NativeKeys.Words("⌥2 · ⌃W · ⌥⇧→ · ⌃B b")).IsEqualTo("Alt+2 · Ctrl+W · Alt+Shift+→ · Ctrl+B b"); + await Assert.That(NativeKeys.Words("F4 edits keys")).IsEqualTo("F4 edits keys"); + await Assert.That(NativeKeys.Words("⌃⏎ newline · ⏎ goes")).IsEqualTo("Ctrl+Enter newline · Enter goes"); + await Assert.That(NativeKeys.Words(null)).IsEqualTo(string.Empty); + } + + private static string RepositoryRoot() + { + for (var dir = new DirectoryInfo(AppContext.BaseDirectory); dir is not null; dir = dir.Parent) + { + if (File.Exists(Path.Combine(dir.FullName, "SharpMUTerm.slnx"))) + { + return dir.FullName; + } + } + + throw new InvalidOperationException("SharpMUTerm.slnx not found above " + AppContext.BaseDirectory); + } +} diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativeModalTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativeModalTests.cs index 4381048d..4dc5cb68 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/NativeModalTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/NativeModalTests.cs @@ -96,6 +96,27 @@ public async Task CtrlFOpensTheNativeSearchOverEverythingWithTheBoxFocused() await Assert.That(colours).IsEqualTo(ModalColours.Dark).Because("the demo's theme is Dark"); } + /// + /// The history-search-filter view opens the native ⌃R with its query in the box, so the window's frame lists + /// the filtered rows the cells list — not the whole history. + /// + [Test] + public async Task TheHistoryFilterViewOpensTheNativeListFiltered() + { + var (text, rows, all) = await Run(rig => + { + rig.App.RenderSnapshot("history-search-filter"); + DesktopLayerTests.Drain(); + var view = (HistoryView)rig.Driver.Modals.Modal!.View; + return (view.Box.Text, view.Matches.Select(m => m.Text).ToArray(), ((HistorySession)rig.App.NativeHistory!).Model.Entries.Count); + }); + + await Assert.That(text).IsEqualTo("north"); + await Assert.That(rows).IsNotEmpty(); + await Assert.That(rows.Length).IsLessThan(all).Because("the list is filtered, not the whole history"); + await Assert.That(rows.All(r => r.Contains("north", StringComparison.OrdinalIgnoreCase))).IsTrue(); + } + [Test] public async Task TheCardFollowsALightTheme() { diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativePaletteTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativePaletteTests.cs index 58d0f3de..00b3fc17 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/NativePaletteTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/NativePaletteTests.cs @@ -222,8 +222,8 @@ public async Task TheKeyColumnIsInTheWindowsKeys() return (index < 0 ? null : overlay.KeyTexts[index], overlay.KeyTexts.Where(k => k is not null).ToArray()); }); - await Assert.That(newline).IsEqualTo("Ctrl+⏎"); - await Assert.That(any).DoesNotContain("Alt+⏎"); + await Assert.That(newline).IsEqualTo("Ctrl+Enter"); + await Assert.That(any).DoesNotContain("Alt+Enter"); await Assert.That(any.Any(k => k!.Contains('⌃') || k.Contains('⌥'))).IsFalse().Because("the window's UI font reads keys in words"); } diff --git a/tests/SharpMUTerm.Avalonia.Tests/NoticeToastTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NoticeToastTests.cs index 457f0cd2..4d965023 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/NoticeToastTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/NoticeToastTests.cs @@ -96,6 +96,87 @@ public async Task AToastFadesAfterItsTimeButStaysWhileHovered() await Assert.That(gone).IsEqualTo(0); } + /// + /// A hovered toast is held past its time, so the newer toasts under it fade first. The stack used to close up as they + /// went and carry the hovered toast out from under the pointer; it now holds still while the pointer is on it, and a + /// notice arriving meanwhile goes above it. Once the pointer leaves, the stack closes up. + /// + [Test] + public async Task AHoveredToastKeepsItsPlaceWhileTheToastsUnderItFade() + { + var (before, during, frozen, shown, arrivedAbove, after, closedUp) = await Run((window, view, layer, driver) => + { + var notices = (IPointerPresenter)driver.Pointer; + notices.Notice(Overlay(1, "first", null, _ => { })); + notices.Notice(Overlay(2, "second", null, _ => { })); + Drain(); + window.UpdateLayout(); + var toasts = layer.Toasts; + var before = toasts.Rects()[0]; + window.MouseMove(toasts.TranslatePoint(before.Center, window)!.Value); + + // The newer toast's time and fade run out while the pointer holds the older one. + toasts.Advance(NoticeModel.Duration + NoticeToasts.FadeTime + TimeSpan.FromSeconds(1)); + var shown = toasts.Shown.Select(n => n.Sequence).ToList(); + var during = toasts.Rects()[0]; + var frozen = toasts.Frozen; + + notices.Notice(Overlay(3, "third", null, _ => { })); + Drain(); + var rects = toasts.Rects(); + var arrivedAbove = rects.Count == 2 && rects[0] == during && rects[1].Bottom < during.Top; + + // The pointer leaves: the stack closes up again. + window.MouseMove(toasts.TranslatePoint(new Point(2, 2), window)!.Value); + var after = toasts.Rects(); + return (before, during, frozen, shown, arrivedAbove, after, !toasts.Frozen); + }, columns: 80, rows: 16); + + await Assert.That(shown).IsEquivalentTo(new long[] { 1 }).Because("the toast under the hovered one has gone"); + await Assert.That(frozen).IsTrue(); + await Assert.That(during).IsEqualTo(before).Because("the hovered toast stays under the pointer"); + await Assert.That(arrivedAbove).IsTrue().Because("a notice arriving while the stack is held goes above it"); + await Assert.That(closedUp).IsTrue(); + await Assert.That(after[^1].Bottom).IsGreaterThan(before.Bottom).Because("off the stack, it closes up to the bottom"); + } + + /// + /// In the combat layout the map sits right of the output, down to the command line, and its legend is in its bottom-left + /// corner — under the toasts' column. A toast is stacked above the legend rather than over it. + /// + [Test] + public async Task AToastIsStackedClearOfTheMapsLegend() + { + var (legend, rects) = await Run((window, view, layer, driver) => + { + var model = new MapViewModel( + "Town", + 0, + [ + new MapViewRoom(1, "Plaza", 0, 0, Current: true, Ahead: false, Locked: false), + new MapViewRoom(2, "North Road", 0, -1, Current: false, Ahead: false, Locked: false), + ], + [new MapViewExit(1, 2)], + null); + var notices = (IPointerPresenter)driver.Pointer; + notices.Panels( + [new PanelOverlay(PanelIds.Map, "map:demo", new PaneRect(44, 1, 36, 17), new PanelInk("#33ccff", "#ffaa33", "#555555"), null, model, _ => { })]); + notices.Notice(Overlay(1, "Using the Combat layout: the game sends vitals.", new NoticeAction("layout:layouts", "Change layout"), _ => { }, aboveRow: 18)); + Drain(); + window.UpdateLayout(); + driver.Flush(); + Drain(); + var canvas = layer.Maps.Values.Single(); + var plate = canvas.LegendRect(canvas.Bounds.Size)!.Value; + var topLeft = canvas.TranslatePoint(plate.TopLeft, layer.Toasts)!.Value; + return (new Rect(topLeft, plate.Size), layer.Toasts.Rects()); + }, columns: 80, rows: 20); + + await Assert.That(rects).IsNotEmpty(); + await Assert.That(rects.Any(r => r.Intersects(legend))).IsFalse().Because("no toast covers the map's legend"); + await Assert.That(rects[^1].Bottom).IsLessThanOrEqualTo(legend.Top).Because("the stack sits above the legend"); + } + [Test] public async Task TheNativeMapDrawsItsAreasInTheModelsColours() { diff --git a/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowTests.cs b/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowTests.cs index 649cb3a5..4b7de06f 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowTests.cs @@ -304,6 +304,59 @@ public async Task F7InTheWindowHostOpensTheSettingsWindow() await Assert.That(section.SettingsOpenKey).IsNull().Because("no cell screen opens under it"); } + /// + /// F7 in the window takes the keyboard: the settings window's search box has focus, so typing goes there and not + /// into the command line behind it, where ⏎ would send it. Closing gives the keyboard back to the cells. + /// + [Test] + public async Task TheSettingsWindowTakesTheKeyboardAndGivesItBack() + { + var (searchFocused, typed, line, viewFocused) = await Session.Dispatch(() => + { + using var driver = new AvaloniaConsoleDriver(120, 34); + var view = new TerminalView(driver, SkiaSharp.SKColors.White, new SkiaSharp.SKColor(0x1e, 0x1e, 0x24), 14, null); + var main = new Window { Content = view, Width = 1000, Height = 700 }; + driver.Settings.Owner = main; + driver.Settings.Refocus = () => view.Focus(); + main.Show(); + view.Focus(); + var app = new SharpMUTermApp(DemoScene.Build(), WindowHost.Create(driver, clipboard: null) with + { + Capabilities = WindowOptions.Capabilities, + Audio = null, + Presence = null, + Announcer = null, + RunsInline = true, + }); + driver.KeyPressed += (_, key) => app.SimulateKey(key); + try + { + var before = app.ArmedInputText; + app.SimulateKey(new ConsoleKeyInfo('\0', ConsoleKey.F7, false, false, false)); + Dispatcher.UIThread.RunJobs(); + var window = driver.Settings.Window!; + var focused = window.SearchBox.IsFocused; + window.KeyTextInput("theme"); + Dispatcher.UIThread.RunJobs(); + var typed = window.SearchBox.Text; + var line = app.ArmedInputText == before ? string.Empty : app.ArmedInputText; + window.Close(); + Dispatcher.UIThread.RunJobs(); + return (focused, typed, line, view.IsFocused); + } + finally + { + app.DisposeAsync().AsTask().GetAwaiter().GetResult(); + main.Close(); + } + }, CancellationToken.None); + + await Assert.That(searchFocused).IsTrue(); + await Assert.That(typed).IsEqualTo("theme").Because("what is typed after F7 goes into the settings window"); + await Assert.That(line).IsEmpty().Because("nothing reached the command line behind it"); + await Assert.That(viewFocused).IsTrue().Because("closing gives the keyboard back to the cells, and so the command line"); + } + private static Task Run(Harness harness, string initial, Func body) => Session.Dispatch(() => { diff --git a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs index bde59a53..d5471ae7 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs @@ -274,18 +274,20 @@ await Assert.That(Rows(palette.Session!.View(query))).IsEquivalentTo(Rows(drawn! covered.Add(surface); } - // ⌃R filtered: the native list's rows for a query are the cell list's rows for it. + // ⌃R filtered: the view hands its query to the native box, and the native list's rows for it are the cell list's. { using var nativeDriver = new AvaloniaConsoleDriver(140, 36); var modals = new FakeModals(); await using var native = App(nativeDriver, DemoScene.Build(), modals: modals); - native.RenderSnapshot("history-search"); + native.RenderSnapshot("history-search-filter"); using var cellDriver = new AvaloniaConsoleDriver(140, 36); await using var cells = App(cellDriver, DemoScene.Build()); cells.RenderSnapshot("history-search-filter"); - var rows = ((HistorySession)modals.Open(SurfaceCatalog.History)!).Model.View("north").Select(m => m.Text).ToArray(); + var history = (HistorySession)modals.Open(SurfaceCatalog.History)!; + await Assert.That(history.InitialQuery).IsEqualTo("north").Because("the filter view types its query into the native box"); + var rows = history.Model.View(history.InitialQuery).Select(m => m.Text).ToArray(); await Assert.That(rows).IsNotEmpty(); await Assert.That(rows).IsEquivalentTo(cells.HistorySearchRows, TUnit.Assertions.Enums.CollectionOrdering.Matching); } @@ -294,6 +296,30 @@ await Assert.That(Rows(palette.Session!.View(query))).IsEquivalentTo(Rows(drawn! await Assert.That(covered).IsEquivalentTo(drawnNatively).Because("every surface the window draws natively has its model compared here"); } + /// + /// search-landed goes through the window's native ⌃F: the query is searched there, and ⏎ on the second row + /// ends in the cell ⏎'s method, so the native search has closed and the bar sits where the cell landing puts it. + /// + [Test] + public async Task TheLandedSearchViewLandsThroughTheNativeSearchWhereTheCellsLand() + { + using var nativeDriver = new AvaloniaConsoleDriver(140, 36); + var modals = new FakeModals(); + await using var native = App(nativeDriver, DemoScene.Build(), modals: modals); + native.RenderSnapshot("search-landed"); + + using var cellDriver = new AvaloniaConsoleDriver(140, 36); + await using var cells = App(cellDriver, DemoScene.Build()); + cells.RenderSnapshot("search-landed"); + + await Assert.That(modals.Shown.Any(s => s.Surface == SurfaceCatalog.Search)).IsTrue().Because("the search ran in the window's controls"); + await Assert.That(modals.Open(SurfaceCatalog.Search)).IsNull().Because("⏎ closed it"); + await Assert.That(native.SearchIsOpen).IsFalse().Because("no cell search was opened either"); + var bar = native.SearchBarIndex(native.ActiveWindowId()); + await Assert.That(bar).IsNotNull(); + await Assert.That(bar).IsEqualTo(cells.SearchBarIndex(cells.ActiveWindowId())); + } + private static string[] Rows(PaletteView view) => view.Rows.Select(r => r is PaletteHeader h ? "# " + h.Label : ((PaletteEntry)r).Item.Id + " " + ((PaletteEntry)r).Item.Key).ToArray(); diff --git a/tests/SharpMUTerm.Tui.Tests/NativeComposerRoutingTests.cs b/tests/SharpMUTerm.Tui.Tests/NativeComposerRoutingTests.cs index 23e1d779..092acc8f 100644 --- a/tests/SharpMUTerm.Tui.Tests/NativeComposerRoutingTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/NativeComposerRoutingTests.cs @@ -110,6 +110,47 @@ private static async Task SentThroughTheCells(string draft, bool literal // ── F1 ─────────────────────────────────────────────────────────────────────────────────── + /// + /// The window's editor writes in monospace or a proportional face, chosen from its menu. The choice is the + /// character's and is kept on disk through the write-only save (PersistConfiguration) — not the settings + /// funnel, which would re-periodise the timers — so F1 opened again, or next run, writes in the same face. + /// + [Test] + public async Task TheComposersFaceIsTheCharactersAndIsSaved() + { + Console.SetIn(TextReader.Null); + var config = new AppConfiguration(); + var world = new WorldDefinition { Name = "Quiet", Host = "quiet.example.org", Port = 4000 }; + var ann = new CharacterDefinition { Name = "Ann", Logging = new LoggingSettings() }; + world.Characters.Add(ann); + config.Worlds.Add(world); + var fake = new FakeComposer(); + var saved = new List(); + var host = ClientHost.ForHarness(Headless, new HeadlessConsoleDriver(120, 32), null, null, null) with { NativeComposer = fake }; + await using var app = new SharpMUTermApp(config, host, save: c => saved.Add(c.Worlds[0].Characters[0].ComposerProportional)); + app.TelnetFactory = _ => new RecordingTelnetSession(); + var session = app.BindWorldWithoutConnecting(world); + await session.ConnectAsync(); + app.RenderNextFrame(); + + app.SimulateKey(Key(ConsoleKey.F1)); + var first = fake.Last!; + await Assert.That(first.Proportional).IsFalse().Because("monospace by default"); + + first.ChooseFace(true); + await Assert.That(ann.ComposerProportional).IsTrue(); + await Assert.That(saved).IsEquivalentTo(new[] { true }).Because("saved once, with the choice in it"); + await Assert.That(first.Proportional).IsTrue(); + + first.Close(string.Empty); + app.SimulateKey(Key(ConsoleKey.F1)); + await Assert.That(fake.Last).IsNotSameReferenceAs(first); + await Assert.That(fake.Last!.Proportional).IsTrue().Because("F1 opened again writes in the character's face"); + + fake.Last.ChooseFace(true); + await Assert.That(saved.Count).IsEqualTo(1).Because("choosing the face it already has writes nothing"); + } + [Test] public async Task F1OpensTheHostsEditorAndNotTheCellModal() { diff --git a/tests/SharpMUTerm.Tui.Tests/PackageScreenFitTests.cs b/tests/SharpMUTerm.Tui.Tests/PackageScreenFitTests.cs new file mode 100644 index 00000000..16a77dec --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/PackageScreenFitTests.cs @@ -0,0 +1,37 @@ +using SharpConsoleUI.Drivers; +using SharpMUTerm.Graphics; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// F10 at the smallest terminal this client supports. Its key line is wider than the modal at 80 columns and wraps to a +/// second row; the modal used to be sized by its line count, so the last detail row sat under its bottom edge. +/// +[NotInParallel] +public class PackageScreenFitTests +{ + private static readonly TerminalCapabilities Headless = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + [Test] + public async Task ThePackagesListFitsItsModalAt80By24() + { + Console.SetIn(TextReader.Null); + await using var app = new SharpMUTermApp(DemoScene.Build(), Headless, new HeadlessConsoleDriver(80, 24)); + var rows = FrameGrid.Decode(app.RenderSnapshot("packages"), 80, 24); + var text = string.Join("\n", rows); + + await Assert.That(text).Contains("Packages"); + await Assert.That(text).Contains("characters").Because("the last detail row is on screen, inside the modal"); + await Assert.That(text).Contains("Esc close").Because("the wrapped key line is whole"); + await Assert.That(text).DoesNotContain("░").Because("nothing scrolls: the modal is as tall as what it holds"); + } + + [Test] + public async Task TheRowsAreMeasuredWrappedNotCounted() + { + var lines = new List { new string('x', 50), "short" }; + await Assert.That(ListOverlay.Rows(lines, 30)).IsEqualTo(3); + await Assert.That(ListOverlay.Rows(lines, 60)).IsEqualTo(2); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/RailKeysTests.cs b/tests/SharpMUTerm.Tui.Tests/RailKeysTests.cs index b6f09dca..940468e8 100644 --- a/tests/SharpMUTerm.Tui.Tests/RailKeysTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/RailKeysTests.cs @@ -48,6 +48,21 @@ public async Task AltCPutsTheCursorOnTheWindowInFrontAndAltCTakesItOff() await Assert.That(app.BuildChromeOverlay().Sidebar.Cursor).IsNull(); } + /// While the sidebar holds the keys the command line is drawn idle — ⏎ goes to a row, not to the game. + [Test] + public async Task TheCommandLineIsIdleWhileTheSidebarHoldsTheKeys() + { + await using var app = await App(); + var (armed, idle) = app.InputBandColors; + await Assert.That(app.PrimaryBandColor).IsEqualTo(armed); + + app.SimulateKey(AltC); + await Assert.That(app.PrimaryBandColor).IsEqualTo(idle); + + app.SimulateKey(Key(ConsoleKey.Escape)); + await Assert.That(app.PrimaryBandColor).IsEqualTo(armed).Because("handing the keys back arms the bar again"); + } + [Test] public async Task TheArrowsWalkTheRowsAClickWouldReachAndStopAtTheEnds() { diff --git a/tests/SharpMUTerm.Tui.Tests/WelcomeTests.cs b/tests/SharpMUTerm.Tui.Tests/WelcomeTests.cs index e06fe74d..5bc5587f 100644 --- a/tests/SharpMUTerm.Tui.Tests/WelcomeTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/WelcomeTests.cs @@ -90,6 +90,25 @@ public async Task AClientWithNoWorldsOpensOnTheWelcomeAndKeepsTheNotice() await Assert.That(run.App.StatusMarkup).Contains("No world configured"); } + /// + /// The window's demo lays the welcome scene out (which runs the startup pass) and then its loop's + /// Run schedules the startup pass again. That raised the notice twice — two identical toasts in the + /// window. A launch has one startup pass. + /// + [Test] + public async Task TheWelcomeSceneThenTheLoopsStartupRaiseTheNoticeOnce() + { + Console.SetIn(TextReader.Null); + await using var app = new SharpMUTermApp(DemoScene.Build(), ClientHost.ForHarness(Headless, new HeadlessConsoleDriver(120, 32), null, null, null)); + + app.RenderSnapshot("welcome"); + app.ScheduleStartup([]); + + var raised = app.Messages.Entries.Count(e => e.Text.Contains("No world configured", StringComparison.Ordinal)); + await Assert.That(raised).IsEqualTo(1); + await Assert.That(app.WelcomeIsOpen).IsTrue(); + } + [Test] public async Task AClientWithWorldsDoesNotOpenIt() { From 4b0866532b468fd2a93ccb3814f00149835643c1 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 10:49:55 +0000 Subject: [PATCH 037/113] feat(ui): one design language for the window, themed terminal popups NativeTokens (Avalonia) derives the window's planes, inks, radii and type ramp from the client's theme the way ScreenTheme does, with every ink held to 4.5:1. Settings, list editor, package page, theme cards, menus, palette and modals read it; Fluent's blue is gone. A test forbids literal font sizes and colours outside the token file. The settings window gets the palette's modal frame (title bar, close, Esc, scrim) and docks to the right half when the trigger builder opens it. Light themes: header fills deepened under light ink (4.5:1), muted header text and the low-vitals cue held to the floor, in both hosts. The terminal popups (Ctrl+P, quit, search, history, prefix panel, game data, message log) follow ScreenTheme. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 8 + CLAUDE.md | 27 +- src/SharpMUTerm.Avalonia/ComposerView.cs | 2 +- src/SharpMUTerm.Avalonia/FloatingPanels.cs | 2 +- src/SharpMUTerm.Avalonia/HistoryView.cs | 10 +- src/SharpMUTerm.Avalonia/LayoutsView.cs | 16 +- src/SharpMUTerm.Avalonia/ListEditorView.cs | 45 +-- src/SharpMUTerm.Avalonia/ModalOverlay.cs | 86 +---- src/SharpMUTerm.Avalonia/ModalParts.cs | 38 +-- src/SharpMUTerm.Avalonia/NativeChrome.cs | 8 +- src/SharpMUTerm.Avalonia/NativeMenu.cs | 18 +- src/SharpMUTerm.Avalonia/NativeTokens.cs | 306 ++++++++++++++++++ src/SharpMUTerm.Avalonia/PackagePageView.cs | 75 +++-- src/SharpMUTerm.Avalonia/PaletteOverlay.cs | 60 +--- src/SharpMUTerm.Avalonia/QuitView.cs | 8 +- src/SharpMUTerm.Avalonia/SearchView.cs | 14 +- src/SharpMUTerm.Avalonia/SettingsPresenter.cs | 65 ++++ src/SharpMUTerm.Avalonia/SettingsWindow.cs | 153 ++++++--- src/SharpMUTerm.Avalonia/TerminalView.cs | 4 +- src/SharpMUTerm.Avalonia/ThemeCardView.cs | 26 +- src/SharpMUTerm.Avalonia/WelcomeView.cs | 14 +- src/SharpMUTerm.Client/Modals/ModalSession.cs | 6 + .../Palette/PaletteSession.cs | 3 + .../Settings/SettingsForm.cs | 12 + src/SharpMUTerm.Tui/CommandPalette.cs | 24 +- src/SharpMUTerm.Tui/GameDataOverlay.cs | 13 +- src/SharpMUTerm.Tui/HistorySurface.cs | 11 +- src/SharpMUTerm.Tui/MessageLogOverlay.cs | 13 +- .../Pointer/SharpMUTermApp.Chrome.cs | 15 +- src/SharpMUTerm.Tui/PrefixOverlay.cs | 11 +- src/SharpMUTerm.Tui/QuitOverlay.cs | 13 +- src/SharpMUTerm.Tui/SearchSurface.cs | 11 +- .../SharpMUTermApp.NativeModals.cs | 21 +- .../SharpMUTermApp.NativePalette.cs | 5 +- src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs | 5 +- .../SharpMUTermApp.Settings.cs | 2 + src/SharpMUTerm.Tui/SharpMUTermApp.Theme.cs | 20 ++ src/SharpMUTerm.Tui/SharpMUTermApp.cs | 42 +-- src/SharpMUTerm.Tui/WorkspacePalette.cs | 60 ++++ .../NativeModalTests.cs | 4 +- .../NativeTokenTests.cs | 211 ++++++++++++ 41 files changed, 1142 insertions(+), 345 deletions(-) create mode 100644 src/SharpMUTerm.Avalonia/NativeTokens.cs create mode 100644 tests/SharpMUTerm.Avalonia.Tests/NativeTokenTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b4db941..83a20205 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -266,6 +266,14 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Changed +- Desktop window: one look across settings, menus, the command palette and every prompt — the client's own teal + instead of a stock blue, one set of text sizes and corner radii, and every colour readable on Dark, Light and + Solarized Dark. The settings panel now has a title bar with a close button, dims the window behind it, and when + opened from "Make a trigger from the selection" sits on the right half so the line you picked stays visible. +- Light themes: the header's coloured segments are deeper, with light text that is easy to read, and the low + vitals warning is a readable dark orange instead of a pale yellow — in the terminal and the window. +- The terminal's command palette, quit prompt, search, history, Ctrl+B panel, game data and message log now + follow the theme instead of staying dark on Light. - Panes stacked one above the other no longer have an empty row between them when the lower pane shows its tabs: the tab row is the boundary, and the panes get the row back. Drag the empty part of that tab row to resize, or double-click it to even the panes out. The vitals and quick-bar strips sit flush against their diff --git a/CLAUDE.md b/CLAUDE.md index 63dc629b..d3a0fc78 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -912,9 +912,15 @@ fallbacks) for inline images/maps. that happens to be `#00f5b7`); a foreground that is no role (a world's accent) is held to the floor on the plane it lands on, except on Dark, which stays as it was. - A bordered modal's title, border and unstyled text are the framework's cyan and `#eeeeee`, 1.4:1 on a - light backdrop; `ScreenTheme.Frame` recolours them off Dark. **Not themed**: the workspace popups that do - not sit on a settings screen (⌃P, quit, ⌃B panel, search, game data, message log, history) still paint - `ScreenPalette.MenuBg` raw. They pass the floor on Light and look dark; same recipe when someone wants it. + light backdrop; `ScreenTheme.Frame` recolours them off Dark. **The workspace popups follow it too** (⌃P, quit, ⌃B panel, + search, game data, message log, history): each has a `Scheme` the app sets in `SchemePopups()` (on + `ApplyTheme`), paints its plane with `Scheme.Colour(MenuBg)`, its lines with `Scheme.Lines` and its frame + with `Scheme.Frame`; ⌃P's prompt well takes `EditBg` off Dark. Dark is byte for byte unchanged. + - **The header's fills are derived per theme** (`WorkspacePalette.HeaderFill`/`HeaderInk`/`HeaderMuted`): on a + light theme a segment's fill is deepened until light ink clears 4.5:1 on it, and the muted right cluster is + held to 4.5:1 on the status plane; a dark theme's fills are as they were. The native header reads the same + inks through `ChromePalette.BrandInk`/`HeaderMuted`. The low-vitals cue is `WorkspacePalette.Low`: the notice + ink on dark, a deep orange held to 4.5:1 on light, in the status row, the vitals strip and the gauges. - **A trigger's `route` says three things, and the third is "nothing"** (`TriggerActions.MainWindow`, Core; F2's `route` list). `SpawnTarget = null` has always meant *this rule adds no destination — the line follows whatever the other matched rules decided*, which is exactly what a highlight rule wants. @@ -1952,6 +1958,21 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] `history-search-filter` opens ⌃R with its query typed (`HistorySession.InitialQuery`), and `search-landed` lands through the native search's own close and `GoToSearchHit`, so the cells it leaves match the terminal's. - Screenshots from a real window under Xvfb, driven with XTest (`ux-wave8/modals-*.png`). +- **The window has one design language: `NativeTokens`** (Avalonia). Planes (card, raised, selected, scrim), edge + and rule, inks (text, dim, header, accent, warn, notice, accent and key inks), radii `RadiusS/M/L` 4/8/12 and + the type ramp `Small/Body/Title/Heading` 11/12/14/18 (`Miniature` 9 only for a theme card's preview). Derived + from the client's `Theme` the `ScreenTheme` way: a canonical Dark (`#1e1e25` card) and Light (white) set, the + theme background's hue shift added, every ink held to `TextFloor` 4.5:1 on each plane it is drawn on; the + accent is the client's teal, never Fluent's blue. `Apply` sets the Fluent keys on a scope and `ApplySimple` + the Simple theme's (menus). The settings window, list editor, package page, theme cards, menus, palette and + modals all read it; sessions carry the theme (`ModalSession.Theme`, `PaletteSession.Theme`, + `SettingsForm.Theme`). `NativeTokenTests.NoViewWritesALiteralFontSizeOrColour` fails on a literal + `FontSize =` number or `Color.Parse("#` anywhere in the window's assembly outside `NativeTokens.cs`; widen its + allow-list only with a reason. A quiet line is the `Dim` ink, never an opacity (an opacity is not floor-checked). + - **The settings window is the palette's modal**: undecorated with its own title bar (title, ✕, Esc, drag to + move), the tokens' card and edge, and a scrim over the main window (`SettingsPresenter.Scrim`; a press on it + closes). Opened from the trigger builder (`SettingsForm.BesideOutput`) it is docked to the main window's right + half with no scrim, so the line the rule came from stays in view. Still a separate OS window, not an overlay. - **Every native surface spells a key in words** (`NativeKeys.Words`, Avalonia: `KeyGlyphs.Words` plus `⏎` → `Enter`): `Ctrl+P`, `Alt+M`, `Ctrl+B b`, never `⌃P`/`⌥M`/`⏎`. The client writes keys in glyphs because the cells draw them well; whatever it hands a native view — menu keys, a toast's chip and text, palette details and chips, the diff --git a/src/SharpMUTerm.Avalonia/ComposerView.cs b/src/SharpMUTerm.Avalonia/ComposerView.cs index 322669d8..a019729b 100644 --- a/src/SharpMUTerm.Avalonia/ComposerView.cs +++ b/src/SharpMUTerm.Avalonia/ComposerView.cs @@ -353,7 +353,7 @@ private void Label(ComposerModel model) Background = new SolidColorBrush(Mix(_plane, ink, 0.14)), BorderBrush = new SolidColorBrush(Mix(_plane, ink, 0.32)), BorderThickness = new Thickness(1), - CornerRadius = new CornerRadius(4), + CornerRadius = new CornerRadius(NativeTokens.RadiusS), Padding = new Thickness(6, 0, 6, 1), VerticalAlignment = VerticalAlignment.Center, Child = new TextBlock { Text = words, FontSize = Math.Max(9, size), Foreground = new SolidColorBrush(ink) }, diff --git a/src/SharpMUTerm.Avalonia/FloatingPanels.cs b/src/SharpMUTerm.Avalonia/FloatingPanels.cs index 707f6e1e..e031c84e 100644 --- a/src/SharpMUTerm.Avalonia/FloatingPanels.cs +++ b/src/SharpMUTerm.Avalonia/FloatingPanels.cs @@ -213,7 +213,7 @@ public FloatingPanelWindow(FloatingPanel panel, TerminalView view) }; _content.Focusable = false; - _title = new TextBlock { VerticalAlignment = VerticalAlignment.Center, FontSize = 12, Margin = new Thickness(10, 0, 0, 0) }; + _title = new TextBlock { VerticalAlignment = VerticalAlignment.Center, FontSize = NativeTokens.Body, Margin = new Thickness(10, 0, 0, 0) }; _dock = new FrameButton("Dock") { Width = 52, Height = 20, Margin = new Thickness(0, 0, 6, 0), VerticalAlignment = VerticalAlignment.Center }; _dock.Click += () => Panel.Dock(); AutomationProperties.SetName(_dock, "Dock back into the layout"); diff --git a/src/SharpMUTerm.Avalonia/HistoryView.cs b/src/SharpMUTerm.Avalonia/HistoryView.cs index f762441c..eb8e2ba7 100644 --- a/src/SharpMUTerm.Avalonia/HistoryView.cs +++ b/src/SharpMUTerm.Avalonia/HistoryView.cs @@ -18,7 +18,7 @@ namespace SharpMUTerm.Avalonia; internal sealed class HistoryView : DockPanel, IModalView { private readonly HistorySession _session; - private readonly ModalColours _colours; + private readonly NativeTokens _colours; private readonly Action _done; private readonly TextBox _box; private readonly TextBlock _count; @@ -27,7 +27,7 @@ internal sealed class HistoryView : DockPanel, IModalView private IReadOnlyList _matches = []; private int _selected; - public HistoryView(HistorySession session, ModalColours colours, Action done) + public HistoryView(HistorySession session, NativeTokens colours, Action done) { _session = session; _colours = colours; @@ -39,8 +39,8 @@ public HistoryView(HistorySession session, ModalColours colours, Action done) Children.Add(_box); var header = new DockPanel { Margin = new Thickness(20, 0, 20, 6) }; - var whose = new TextBlock { Text = model.BarLabel, FontSize = 12.5, Foreground = colours.Brush(colours.Dim) }; - _count = new TextBlock { FontSize = 12.5, Foreground = colours.Brush(colours.Dim), HorizontalAlignment = global::Avalonia.Layout.HorizontalAlignment.Right }; + var whose = new TextBlock { Text = model.BarLabel, FontSize = NativeTokens.Body, Foreground = colours.Brush(colours.Dim) }; + _count = new TextBlock { FontSize = NativeTokens.Body, Foreground = colours.Brush(colours.Dim), HorizontalAlignment = global::Avalonia.Layout.HorizontalAlignment.Right }; SetDock(whose, Dock.Left); header.Children.Add(whose); header.Children.Add(_count); @@ -127,7 +127,7 @@ private void Draw() { Foreground = _colours.Brush(_colours.Text), FontFamily = mono, - FontSize = 13, + FontSize = NativeTokens.Title, TextTrimming = TextTrimming.CharacterEllipsis, }; text.Inlines = ModalParts.Marked(match.Text, match.MatchStart, match.MatchLength, _colours); diff --git a/src/SharpMUTerm.Avalonia/LayoutsView.cs b/src/SharpMUTerm.Avalonia/LayoutsView.cs index 68b95a42..ffa400cd 100644 --- a/src/SharpMUTerm.Avalonia/LayoutsView.cs +++ b/src/SharpMUTerm.Avalonia/LayoutsView.cs @@ -19,7 +19,7 @@ namespace SharpMUTerm.Avalonia; internal sealed class LayoutsView : DockPanel, IModalView { private readonly LayoutsSession _session; - private readonly ModalColours _colours; + private readonly NativeTokens _colours; private readonly Action _done; private readonly StackPanel _list; private readonly TextBlock _status; @@ -32,7 +32,7 @@ internal sealed class LayoutsView : DockPanel, IModalView private bool _renaming; private bool _confirming; - public LayoutsView(LayoutsSession session, ModalColours colours, Action done) + public LayoutsView(LayoutsSession session, NativeTokens colours, Action done) { _session = session; _colours = colours; @@ -51,13 +51,13 @@ public LayoutsView(LayoutsSession session, ModalColours colours, Action done) { Margin = new Thickness(14, 4, 14, 4), Padding = new Thickness(10, 6), - CornerRadius = new CornerRadius(7), + CornerRadius = new CornerRadius(NativeTokens.RadiusM), IsVisible = false, PlaceholderText = "New name", }; global::Avalonia.Automation.AutomationProperties.SetName(_rename, "New name"); - var footer = ModalParts.Footer("↑↓ pick · Enter apply · Esc close", colours); + var footer = ModalParts.Footer("↑↓ pick · Esc close", colours); SetDock(footer, Dock.Bottom); Children.Add(footer); @@ -190,11 +190,11 @@ private void AddRow(int index) SetDock(tags, Dock.Right); line.Children.Add(tags); var words = new StackPanel(); - words.Children.Add(new TextBlock { Text = layout.Name, FontSize = 14, FontWeight = FontWeight.Medium, Foreground = _colours.Brush(_colours.Text) }); + words.Children.Add(new TextBlock { Text = layout.Name, FontSize = NativeTokens.Title, FontWeight = FontWeight.Medium, Foreground = _colours.Brush(_colours.Text) }); words.Children.Add(new TextBlock { Text = layout.Description, - FontSize = 12, + FontSize = NativeTokens.Body, Foreground = _colours.Brush(_colours.Dim), TextTrimming = TextTrimming.CharacterEllipsis, }); @@ -212,9 +212,9 @@ private void AddRow(int index) private Border Chip(string text) => new() { Background = _colours.Brush(_colours.Selected), - CornerRadius = new CornerRadius(9), + CornerRadius = new CornerRadius(NativeTokens.RadiusM), Padding = new Thickness(8, 1), - Child = new TextBlock { Text = text, FontSize = 11, Foreground = _colours.Brush(_colours.Accent) }, + Child = new TextBlock { Text = text, FontSize = NativeTokens.Small, Foreground = _colours.Brush(_colours.Accent) }, }; private void DrawButtons() diff --git a/src/SharpMUTerm.Avalonia/ListEditorView.cs b/src/SharpMUTerm.Avalonia/ListEditorView.cs index a26866c3..e0250950 100644 --- a/src/SharpMUTerm.Avalonia/ListEditorView.cs +++ b/src/SharpMUTerm.Avalonia/ListEditorView.cs @@ -34,6 +34,7 @@ internal sealed class ListEditorView : Grid private readonly SettingsCollection _collection; private readonly Func _visible; private readonly IBrush _accent; + private readonly NativeTokens _tokens; private readonly ListBox _list; private readonly StackPanel _detail; private readonly List _refreshers = []; @@ -45,13 +46,14 @@ internal sealed class ListEditorView : Grid private bool _syncing; private bool _choosing; - public ListEditorView(SettingsForm form, SettingsSectionContribution section, Func visible, IBrush accent) + public ListEditorView(SettingsForm form, SettingsSectionContribution section, Func visible, NativeTokens tokens) { _form = form; _section = section; _collection = section.Collection!; _visible = visible; - _accent = accent; + _tokens = tokens; + _accent = tokens.Brush(tokens.Accent); ColumnDefinitions = new ColumnDefinitions("292,*"); Margin = new Thickness(0, 10, 0, 0); @@ -87,7 +89,7 @@ public ListEditorView(SettingsForm form, SettingsSectionContribution section, Fu Child = _list, BorderThickness = new Thickness(1), BorderBrush = Hairline, - CornerRadius = new CornerRadius(6), + CornerRadius = new CornerRadius(NativeTokens.RadiusM), }); Children.Add(left); @@ -194,7 +196,10 @@ public void Refresh() // ── the list ───────────────────────────────────────────────────────────────────────────────── - private IBrush Hairline => new SolidColorBrush(_form.IsDark ? Color.Parse("#46464e") : Color.Parse("#c8c8d0")); + private IBrush Hairline => _tokens.Brush(_tokens.Edge); + + /// A quiet line's ink, held to the floor (an opacity would not be). + private IBrush DimInk => _tokens.Brush(_tokens.Dim); private static Button ToolButton(string text, string tip) { @@ -229,7 +234,7 @@ private void BuildList() { items.Add(new ListBoxItem { - Content = new TextBlock { Text = $"no {_collection.Plural}", Opacity = 0.6, FontStyle = FontStyle.Italic }, + Content = new TextBlock { Text = $"no {_collection.Plural}", Foreground = DimInk, FontStyle = FontStyle.Italic }, IsEnabled = false, Padding = new Thickness(30, 2), }); @@ -245,7 +250,7 @@ private void BuildList() { items.Add(new ListBoxItem { - Content = new TextBlock { Text = "No trigger set yet — make one on F5.", Opacity = 0.7, TextWrapping = TextWrapping.Wrap }, + Content = new TextBlock { Text = "No trigger set yet — make one on F5.", Foreground = DimInk, TextWrapping = TextWrapping.Wrap }, IsEnabled = false, }); } @@ -262,7 +267,7 @@ private ListBoxItem GroupHeader(SettingsItemGroup group) var row = new DockPanel { LastChildFill = true }; if (group.ReadOnly) { - var copy = new Button { Content = "Copy to edit", Padding = new Thickness(8, 1), FontSize = 11, VerticalAlignment = VerticalAlignment.Center }; + var copy = new Button { Content = "Copy to edit", Padding = new Thickness(8, 1), FontSize = NativeTokens.Small, VerticalAlignment = VerticalAlignment.Center }; ToolTip.SetTip(copy, "A package's set is replaced when the package updates; copy it into your own sets to change it"); AutomationProperties.SetName(copy, $"Copy {group.Set.Name} to edit"); var set = group.Set; @@ -273,10 +278,10 @@ private ListBoxItem GroupHeader(SettingsItemGroup group) } var words = new StackPanel { VerticalAlignment = VerticalAlignment.Center }; - words.Children.Add(new TextBlock { Text = group.Label, FontWeight = FontWeight.SemiBold, FontSize = 12, Foreground = _accent, TextTrimming = TextTrimming.CharacterEllipsis }); + words.Children.Add(new TextBlock { Text = group.Label.ToUpperInvariant(), FontWeight = FontWeight.SemiBold, FontSize = NativeTokens.Small, LetterSpacing = 0.8, Foreground = _tokens.Brush(_tokens.Header), TextTrimming = TextTrimming.CharacterEllipsis }); if (group.ReadOnly) { - words.Children.Add(new TextBlock { Text = "package · read-only", FontSize = 11, Opacity = 0.65 }); + words.Children.Add(new TextBlock { Text = "package · read-only", FontSize = NativeTokens.Small, Foreground = DimInk }); } row.Children.Add(words); @@ -310,7 +315,7 @@ private ListBoxItem ItemRow(SettingsItemGroup group, object item) words.Children.Add(new TextBlock { Text = detail, - FontSize = 11, + FontSize = NativeTokens.Small, Opacity = 0.65, FontFamily = Mono, TextTrimming = TextTrimming.CharacterEllipsis, @@ -440,7 +445,7 @@ private void BuildDetail() } var title = _collection.TitleOf(item); - _detail.Children.Add(new TextBlock { Text = title.Length == 0 ? "(unnamed)" : NativeKeys.Words(title), FontSize = 18, FontWeight = FontWeight.SemiBold, TextTrimming = TextTrimming.CharacterEllipsis }); + _detail.Children.Add(new TextBlock { Text = title.Length == 0 ? "(unnamed)" : NativeKeys.Words(title), FontSize = NativeTokens.Heading, FontWeight = FontWeight.SemiBold, TextTrimming = TextTrimming.CharacterEllipsis }); if (group.ReadOnly) { var banner = new DockPanel { LastChildFill = true, Margin = new Thickness(0, 6, 0, 4) }; @@ -461,7 +466,7 @@ private void BuildDetail() } else { - _detail.Children.Add(new TextBlock { Text = $"in {group.Label}", Opacity = 0.65, Margin = new Thickness(0, 0, 0, 4) }); + _detail.Children.Add(new TextBlock { Text = $"in {group.Label}", Foreground = DimInk, Margin = new Thickness(0, 0, 0, 4) }); } var shown = new List(); @@ -485,7 +490,7 @@ private void BuildDetail() if (field.Group is { } g && !string.Equals(g, heading, StringComparison.Ordinal)) { heading = g; - _detail.Children.Add(new TextBlock { Text = g, FontSize = 14, FontWeight = FontWeight.SemiBold, Foreground = _accent, Margin = new Thickness(0, 14, 0, 2) }); + _detail.Children.Add(new TextBlock { Text = g.ToUpperInvariant(), FontSize = NativeTokens.Small, FontWeight = FontWeight.SemiBold, LetterSpacing = 0.8, Foreground = _tokens.Brush(_tokens.Header), Margin = new Thickness(0, 16, 0, 4) }); } var control = ControlFor(field); @@ -501,7 +506,7 @@ private void BuildDetail() Child = _preview, BorderThickness = new Thickness(1), BorderBrush = Hairline, - CornerRadius = new CornerRadius(6), + CornerRadius = new CornerRadius(NativeTokens.RadiusM), Padding = new Thickness(10, 6), Margin = new Thickness(0, 2, 0, 6), }); @@ -516,7 +521,7 @@ private static Grid Row(SettingsField field, Control control) { var grid = new Grid { ColumnDefinitions = new ColumnDefinitions("118,*"), Margin = new Thickness(0, 3), MinHeight = 34 }; var words = new StackPanel { VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(0, 0, 12, 0) }; - words.Children.Add(new TextBlock { Text = NativeKeys.Words(Capitalise(field.Label)), FontSize = 13, TextWrapping = TextWrapping.Wrap }); + words.Children.Add(new TextBlock { Text = NativeKeys.Words(Capitalise(field.Label)), FontSize = NativeTokens.Title, TextWrapping = TextWrapping.Wrap }); if (field.Help is { } help) { ToolTip.SetTip(words, NativeKeys.Words(Capitalise(help))); @@ -540,7 +545,7 @@ private void ShowPreview(string? typed) return; } - var summary = new TextBlock { FontSize = 12, FontWeight = FontWeight.SemiBold, TextWrapping = TextWrapping.Wrap }; + var summary = new TextBlock { FontSize = NativeTokens.Body, FontWeight = FontWeight.SemiBold, TextWrapping = TextWrapping.Wrap }; if (result.Problem is { } problem) { summary.Text = $"Live test: {problem}"; @@ -561,7 +566,7 @@ private void ShowPreview(string? typed) _preview.Children.Add(summary); foreach (var sample in result.Samples) { - var line = new TextBlock { FontFamily = Mono, FontSize = 12, TextTrimming = TextTrimming.CharacterEllipsis }; + var line = new TextBlock { FontFamily = Mono, FontSize = NativeTokens.Body, TextTrimming = TextTrimming.CharacterEllipsis }; var text = sample.Text; var start = Math.Clamp(sample.MatchStart, 0, text.Length); var length = Math.Clamp(sample.MatchLength, 0, text.Length - start); @@ -719,7 +724,7 @@ void Pick() => combo.SelectedItem = names.FirstOrDefault(n => return TextControl(text); default: - return new TextBlock { Text = "set on its own screen", Opacity = 0.7 }; + return new TextBlock { Text = "set on its own screen", Foreground = DimInk }; } } @@ -830,7 +835,7 @@ void Commit() private Control KeyCapture(KeyField field, SettingBinding chord) { var button = new Button { Content = NativeKeys.Words(_form.Get(chord)), MinWidth = 160, HorizontalAlignment = HorizontalAlignment.Left, HorizontalContentAlignment = HorizontalAlignment.Left }; - var note = new TextBlock { FontSize = 11, Opacity = 0.75, TextWrapping = TextWrapping.Wrap, Margin = new Thickness(0, 2, 0, 0) }; + var note = new TextBlock { FontSize = NativeTokens.Small, Foreground = DimInk, TextWrapping = TextWrapping.Wrap, Margin = new Thickness(0, 2, 0, 0) }; var capturing = false; void Show() { @@ -895,7 +900,7 @@ private static StackPanel Swatch(string name) { Width = 14, Height = 14, - CornerRadius = new CornerRadius(3), + CornerRadius = new CornerRadius(NativeTokens.RadiusS), Background = hex is null ? Brushes.Transparent : new SolidColorBrush(Color.Parse(hex)), BorderBrush = Brushes.Gray, BorderThickness = new Thickness(hex is null ? 1 : 0), diff --git a/src/SharpMUTerm.Avalonia/ModalOverlay.cs b/src/SharpMUTerm.Avalonia/ModalOverlay.cs index 5ae99ff3..18a4c005 100644 --- a/src/SharpMUTerm.Avalonia/ModalOverlay.cs +++ b/src/SharpMUTerm.Avalonia/ModalOverlay.cs @@ -34,7 +34,7 @@ public ModalOverlay(ModalSession session, Action remove, Action remove, Action remove, ActionThe colours the card is drawn in: the client's variant. - public ModalColours Colours { get; } + public NativeTokens Colours { get; } /// The view inside the card, for a test. public Control View => (Control)_view; @@ -147,81 +147,3 @@ internal interface IModalView /// Stops listening to the session. void Detach(); } - -/// -/// The native modals' colours, one set per variant — the palette's card, with the client's accent for a match, the -/// pointed-at row and the default button. hands Fluent the same accent, so its own accent buttons -/// and focus rings wear it too, with an ink on it that is legible in both variants. -/// -internal sealed record ModalColours( - Color Scrim, - Color Card, - Color Edge, - Color Rule, - Color Text, - Color Dim, - Color Header, - Color Selected, - Color Accent, - Color AccentInk, - Color KeyFill, - Color KeyInk, - Color Warn) -{ - public static ModalColours Dark { get; } = new( - Color.FromArgb(0x59, 0, 0, 0), - Color.Parse("#1e1e25"), - Color.Parse("#3a3a46"), - Color.Parse("#2c2c36"), - Color.Parse("#ececf1"), - Color.Parse("#9a9aab"), - Color.Parse("#80808f"), - Color.Parse("#22403a"), - Color.Parse("#00f5b7"), - Color.Parse("#06231b"), - Color.Parse("#2a2a34"), - Color.Parse("#cfcfdb"), - Color.Parse("#ffb454")); - - public static ModalColours Light { get; } = new( - Color.FromArgb(0x33, 0, 0, 0), - Color.Parse("#ffffff"), - Color.Parse("#d4d4dd"), - Color.Parse("#e6e6ec"), - Color.Parse("#1d1d24"), - Color.Parse("#626270"), - Color.Parse("#7a7a88"), - Color.Parse("#d5efe7"), - Color.Parse("#007a63"), - Color.Parse("#ffffff"), - Color.Parse("#f1f1f5"), - Color.Parse("#40404c"), - Color.Parse("#a34a00")); - - /// Fluent's accent, in the client's colour, for the card's scope. - public void Apply(IResourceDictionary resources) - { - foreach (var key in new[] - { - "SystemAccentColor", "SystemAccentColorDark1", "SystemAccentColorDark2", "SystemAccentColorDark3", - "SystemAccentColorLight1", "SystemAccentColorLight2", "SystemAccentColorLight3", - }) - { - resources[key] = Accent; - } - - var ink = new SolidColorBrush(AccentInk); - foreach (var key in new[] - { - "AccentButtonForeground", "AccentButtonForegroundPointerOver", "AccentButtonForegroundPressed", - "ToggleButtonForegroundChecked", "ToggleButtonForegroundCheckedPointerOver", "ToggleButtonForegroundCheckedPressed", - "CheckBoxCheckGlyphForegroundChecked", "CheckBoxCheckGlyphForegroundCheckedPointerOver", - "CheckBoxCheckGlyphForegroundCheckedPressed", - }) - { - resources[key] = ink; - } - } - - public SolidColorBrush Brush(Color colour) => new(colour); -} diff --git a/src/SharpMUTerm.Avalonia/ModalParts.cs b/src/SharpMUTerm.Avalonia/ModalParts.cs index 84373e40..b523c738 100644 --- a/src/SharpMUTerm.Avalonia/ModalParts.cs +++ b/src/SharpMUTerm.Avalonia/ModalParts.cs @@ -11,10 +11,10 @@ namespace SharpMUTerm.Avalonia; internal static class ModalParts { /// The modal's title line. - public static TextBlock Heading(string text, ModalColours colours) => new() + public static TextBlock Heading(string text, NativeTokens colours) => new() { Text = NativeKeys.Words(text), - FontSize = 18, + FontSize = NativeTokens.Heading, FontWeight = FontWeight.SemiBold, Foreground = colours.Brush(colours.Text), Margin = new Thickness(20, 16, 20, 4), @@ -22,20 +22,20 @@ internal static class ModalParts }; /// A quiet line: a count, a scope, an explanation. - public static TextBlock Dim(string text, ModalColours colours, Thickness? margin = null) => new() + public static TextBlock Dim(string text, NativeTokens colours, Thickness? margin = null) => new() { Text = NativeKeys.Words(text), - FontSize = 12.5, + FontSize = NativeTokens.Body, Foreground = colours.Brush(colours.Dim), Margin = margin ?? new Thickness(20, 0, 20, 6), TextWrapping = TextWrapping.Wrap, }; /// The keys the modal answers, right-aligned under it, in the window's words. - public static TextBlock Footer(string text, ModalColours colours) => new() + public static TextBlock Footer(string text, NativeTokens colours) => new() { Text = NativeKeys.Words(text), - FontSize = 11.5, + FontSize = NativeTokens.Small, Foreground = colours.Brush(colours.Dim), Margin = new Thickness(20, 8, 20, 12), HorizontalAlignment = HorizontalAlignment.Right, @@ -43,10 +43,10 @@ internal static class ModalParts }; /// A group header in a list (BUILT IN, YOURS), the palette's. - public static TextBlock GroupHeader(string text, ModalColours colours, bool first) => new() + public static TextBlock GroupHeader(string text, NativeTokens colours, bool first) => new() { Text = text.ToUpperInvariant(), - FontSize = 11, + FontSize = NativeTokens.Small, FontWeight = FontWeight.SemiBold, LetterSpacing = 0.8, Foreground = colours.Brush(colours.Header), @@ -59,17 +59,17 @@ public static TextBox SearchBox(string placeholder, string name) var box = new TextBox { PlaceholderText = placeholder, - FontSize = 15, + FontSize = NativeTokens.Title, Margin = new Thickness(14, 14, 14, 6), Padding = new Thickness(12, 8), - CornerRadius = new CornerRadius(8), + CornerRadius = new CornerRadius(NativeTokens.RadiusM), }; global::Avalonia.Automation.AutomationProperties.SetName(box, name); return box; } /// A list of rows that scrolls, ruled above and below. - public static (Border Frame, StackPanel List, ScrollViewer Scroller) List(ModalColours colours) + public static (Border Frame, StackPanel List, ScrollViewer Scroller) List(NativeTokens colours) { var list = new StackPanel { Margin = new Thickness(8, 4, 8, 4) }; var scroller = new ScrollViewer @@ -92,7 +92,7 @@ public static Border Row(Control content, string name, Action select, Action cho { var row = new Border { - CornerRadius = new CornerRadius(7), + CornerRadius = new CornerRadius(NativeTokens.RadiusM), Padding = new Thickness(12, 6), Background = Brushes.Transparent, Child = content, @@ -116,7 +116,7 @@ public static Border Row(Control content, string name, Action select, Action cho /// with the run at marked in the accent and bold — where a query /// matched, as the cells mark it. /// - public static InlineCollection Marked(string text, int start, int length, ModalColours colours) + public static InlineCollection Marked(string text, int start, int length, NativeTokens colours) { var inlines = new InlineCollection(); if (start < 0 || length <= 0 || start + length > text.Length) @@ -140,20 +140,20 @@ public static InlineCollection Marked(string text, int start, int length, ModalC } /// A key chip, as the palette draws a key. - public static Border Key(string key, ModalColours colours) => new() + public static Border Key(string key, NativeTokens colours) => new() { Background = colours.Brush(colours.KeyFill), BorderBrush = colours.Brush(colours.Edge), BorderThickness = new Thickness(1), - CornerRadius = new CornerRadius(5), + CornerRadius = new CornerRadius(NativeTokens.RadiusS), Padding = new Thickness(6, 0), Margin = new Thickness(6, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center, - Child = new TextBlock { Text = NativeKeys.Words(key), FontSize = 11.5, Foreground = colours.Brush(colours.KeyInk) }, + Child = new TextBlock { Text = NativeKeys.Words(key), FontSize = NativeTokens.Small, Foreground = colours.Brush(colours.KeyInk) }, }; /// A button whose label is followed by the key that presses it. - public static Button Button(string label, string? key, ModalColours colours, Action click, bool accent = false) + public static Button Button(string label, string? key, NativeTokens colours, Action click, bool accent = false) { var content = new StackPanel { Orientation = Orientation.Horizontal, VerticalAlignment = VerticalAlignment.Center }; content.Children.Add(new TextBlock { Text = NativeKeys.Words(label), VerticalAlignment = VerticalAlignment.Center }); @@ -162,7 +162,7 @@ public static Button Button(string label, string? key, ModalColours colours, Act content.Children.Add(new TextBlock { Text = NativeKeys.Words(key), - FontSize = 11.5, + FontSize = NativeTokens.Small, Opacity = 0.7, Margin = new Thickness(8, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center, @@ -173,7 +173,7 @@ public static Button Button(string label, string? key, ModalColours colours, Act { Content = content, Padding = new Thickness(14, 6), - CornerRadius = new CornerRadius(7), + CornerRadius = new CornerRadius(NativeTokens.RadiusM), }; if (accent) { diff --git a/src/SharpMUTerm.Avalonia/NativeChrome.cs b/src/SharpMUTerm.Avalonia/NativeChrome.cs index 91c0154c..d7220f2d 100644 --- a/src/SharpMUTerm.Avalonia/NativeChrome.cs +++ b/src/SharpMUTerm.Avalonia/NativeChrome.cs @@ -188,7 +188,7 @@ protected override void OnPointerWheelChanged(PointerWheelEventArgs e) // ── Drawing ──────────────────────────────────────────────────────────────────────────────── /// The UI font size the chrome's text is set in. - protected const double FontSize = 13; + protected const double FontSize = NativeTokens.Body + 1; protected Color Dim => Color.FromArgb(0xA8, Ink.R, Ink.G, Ink.B); @@ -474,7 +474,7 @@ public override void Render(DrawingContext context) } context.DrawRectangle(new SolidColorBrush(brand), null, _brand, radius, radius); - var brandInk = On(brand, Colors.Black); + var brandInk = Parse(overlay.Palette.BrandInk); var menu = new Pen(new SolidColorBrush(brandInk), 1.6, lineCap: PenLineCap.Round); var mx = _brand.X + 12; foreach (var dy in new[] { -4.0, 0, 4 }) @@ -491,7 +491,7 @@ public override void Render(DrawingContext context) if (_counts.Width > 0) { - Text(context, CountsText(model), _counts.X, middle, size - 1, Dim); + Text(context, CountsText(model), _counts.X, middle, size - 1, Parse(overlay.Palette.HeaderMuted)); } if (model.Prefix is { } prefix) @@ -512,7 +512,7 @@ public override void Render(DrawingContext context) x += nameWidth + 10; if (_pill.Right - 12 - x > 12) { - Text(context, character.Detail(world.Name), x, middle, size - 1, Dim, maxWidth: _pill.Right - 12 - x); + Text(context, character.Detail(world.Name), x, middle, size - 1, Parse(overlay.Palette.HeaderMuted), maxWidth: _pill.Right - 12 - x); } } diff --git a/src/SharpMUTerm.Avalonia/NativeMenu.cs b/src/SharpMUTerm.Avalonia/NativeMenu.cs index 4fec29b2..b85cfafc 100644 --- a/src/SharpMUTerm.Avalonia/NativeMenu.cs +++ b/src/SharpMUTerm.Avalonia/NativeMenu.cs @@ -40,7 +40,21 @@ public static ContextMenu Build(MenuModel model, Action dispatch, Placem private static ContextMenu Build( IEnumerable<(string Label, string? Hint, bool Enabled, bool Checked, Action Run)?> items, PlacementMode placement, Control target) { - var menu = new ContextMenu { Placement = placement, PlacementTarget = target }; + // The palette's card: the client's planes, ink and highlight, a rounded edge — not Simple's grey square. + var tokens = NativeTokens.For(null, target.ActualThemeVariant != global::Avalonia.Styling.ThemeVariant.Light); + var menu = new ContextMenu + { + Placement = placement, + PlacementTarget = target, + Background = tokens.Brush(tokens.Card), + Foreground = tokens.Brush(tokens.Text), + BorderBrush = tokens.Brush(tokens.Edge), + BorderThickness = new Thickness(1), + CornerRadius = new CornerRadius(NativeTokens.RadiusM), + Padding = new Thickness(4), + FontSize = NativeTokens.Body, + }; + tokens.ApplySimple(menu.Resources); Grid.SetIsSharedSizeScope(menu, true); foreach (var item in items) { @@ -74,7 +88,7 @@ private static Control Header(string label, string? hint) grid.Children.Add(new TextBlock { Text = NativeKeys.Words(label), VerticalAlignment = VerticalAlignment.Center }); if (hint is { } key) { - var text = new TextBlock { Text = NativeKeys.Words(key), Opacity = 0.6, Margin = new Thickness(28, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center }; + var text = new TextBlock { Text = NativeKeys.Words(key), Opacity = 0.7, Margin = new Thickness(28, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center }; Grid.SetColumn(text, 1); grid.Children.Add(text); } diff --git a/src/SharpMUTerm.Avalonia/NativeTokens.cs b/src/SharpMUTerm.Avalonia/NativeTokens.cs new file mode 100644 index 00000000..d2e7dd81 --- /dev/null +++ b/src/SharpMUTerm.Avalonia/NativeTokens.cs @@ -0,0 +1,306 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Media; +using SharpMUTerm.Core.Text; +using SharpMUTerm.Core.Theming; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Avalonia; + +/// +/// The window's one design language: every native surface — the palette, the modals, the welcome, the settings +/// window and its list editors, the packages page, the right-click menu, the composer — takes its planes, inks, +/// corner radii and type sizes from here, so they read as one application rather than as the waves they were built in. +/// +/// Derived from the client's theme the way is. Two canonical sets, one per side of +/// mid-grey (the palette's card as it was drawn before there were tokens), are laid onto the theme: its background's +/// hue shift is added to every plane (so Solarized Dark gets teal cards, not the Dark theme's grey ones), and then every +/// ink is held to on every plane it is drawn on. The Dark and Light themes resolve to the +/// canonical sets exactly. The accent is the client's own (, the cells' teal), moved +/// only as far as the floor asks; the warning and the notice are the cells' amber hues, likewise. +/// +/// +/// The only literal colours and sizes in the window's views are here; NativeTokenLiteralTests fails on a +/// FontSize = 12 or a Color.Parse("#…") anywhere else in the assembly, apart from the few it lists with +/// their reasons. +/// +/// +internal sealed record NativeTokens( + bool IsDark, + Color Scrim, + Color Card, + Color Edge, + Color Rule, + Color Text, + Color Dim, + Color Header, + Color Selected, + Color Accent, + Color AccentInk, + Color KeyFill, + Color KeyInk, + Color Warn, + Color Notice) +{ + // ── the scales ────────────────────────────────────────────────────────────────────────────── + + /// The type ramp: captions and keys. + public const double Small = 11; + + /// The type ramp: body text, help, rows. + public const double Body = 12; + + /// The type ramp: a field's label, a list item's name, a search box. + public const double Title = 14; + + /// The type ramp: a surface's or a page's heading. + public const double Heading = 18; + + /// + /// Not on the ramp: the theme cards' miniature of the cells (F7), which is a picture of a terminal at a quarter of + /// its size rather than text to read. + /// + public const double Miniature = 9; + + /// Corner radius of a key cap, a chip, a check. + public const double RadiusS = 4; + + /// Corner radius of a row, an input, a button, a card inside a page. + public const double RadiusM = 8; + + /// Corner radius of a surface: the palette, a modal, the settings frame. + public const double RadiusL = 12; + + /// The floor every ink is held to on every plane it is drawn on: WCAG AA for body text. + public const double TextFloor = 4.5; + + /// The shadow a surface casts on what it floats over. + public static BoxShadows Shadow { get; } = new(new BoxShadow + { + OffsetY = 16, + Blur = 40, + Color = Color.FromArgb(0x66, 0, 0, 0), + }); + + /// The raised plane an input, a key cap or a hovered row sits on. + public Color Raised => KeyFill; + + /// The Dark theme's tokens: the canonical dark set. + public static NativeTokens Dark => DarkTokens.Value; + + /// The Light theme's tokens: the canonical light set. + public static NativeTokens Light => LightTokens.Value; + + // Lazy, because a static initialiser here would run before the canonical sets below are assigned. + private static readonly Lazy DarkTokens = new(() => For(ThemeLibrary.Dark())); + private static readonly Lazy LightTokens = new(() => For(ThemeLibrary.Light())); + + /// The tokens for a theme, or for the built-in theme of the variant when the host was told no theme. + public static NativeTokens For(Theme? theme, bool isDark) => + theme is not null ? For(theme) : isDark ? Dark : Light; + + /// The tokens for . + public static NativeTokens For(Theme theme) + { + ArgumentNullException.ThrowIfNull(theme); + var light = Contrast.RelativeLuminance(theme.Background) >= 0.18; + var canon = light ? LightCanon : DarkCanon; + var reference = light ? new Rgb(0xfa, 0xfa, 0xfa) : new Rgb(0x1e, 0x1e, 0x1e); + var shift = (theme.Background.R - reference.R, theme.Background.G - reference.G, theme.Background.B - reference.B); + + var card = Shift(canon.Card, shift); + var edge = Shift(canon.Edge, shift); + var rule = Shift(canon.Rule, shift); + var selected = Shift(canon.Selected, shift); + var keyFill = Shift(canon.KeyFill, shift); + Rgb[] planes = [card, selected, keyFill]; + + var accent = Held(ChromeInk.BaseAccent, planes); + var accentInk = Contrast.Legible( + Contrast.RelativeLuminance(accent) < 0.18 ? new Rgb(0xff, 0xff, 0xff) : canon.AccentInk, accent, TextFloor); + + return new NativeTokens( + !light, + canon.Scrim, + Colour(card), + Colour(edge), + Colour(rule), + Colour(Held(canon.Text, planes)), + Colour(Held(canon.Dim, planes)), + Colour(Held(canon.Header, planes)), + Colour(selected), + Colour(accent), + Colour(accentInk), + Colour(keyFill), + Colour(Held(canon.KeyInk, [keyFill])), + Colour(Held(canon.Warn, planes)), + Colour(Held(ChromeInk.BaseNotice, planes))); + } + + /// A brush of . + public SolidColorBrush Brush(Color colour) => new(colour); + + /// + /// drawn as a quiet fill behind text in it (a chip, a tag): the colour at low alpha over + /// the card, which keeps it the colour's tag on either variant. + /// + public SolidColorBrush Tint(Color colour) => new(Color.FromArgb(0x2a, colour.R, colour.G, colour.B)); + + /// + /// Hands Fluent the tokens, for a scope (the palette's card, a modal's, the settings window): the accent for its own + /// accent buttons, checks, toggles and focus rings, with an ink on it that is legible in both variants, and the + /// tokens' planes for its inputs, buttons, lists and menus — so a Fluent control inside a surface wears the surface's + /// language and not Fluent's blue on black. + /// + public void Apply(IResourceDictionary resources) + { + ArgumentNullException.ThrowIfNull(resources); + foreach (var key in new[] + { + "SystemAccentColor", "SystemAccentColorDark1", "SystemAccentColorDark2", "SystemAccentColorDark3", + "SystemAccentColorLight1", "SystemAccentColorLight2", "SystemAccentColorLight3", + }) + { + resources[key] = Accent; + } + + void Set(SolidColorBrush brush, params string[] keys) + { + foreach (var key in keys) + { + resources[key] = brush; + } + } + + Set(new SolidColorBrush(AccentInk), + "AccentButtonForeground", "AccentButtonForegroundPointerOver", "AccentButtonForegroundPressed", + "ToggleButtonForegroundChecked", "ToggleButtonForegroundCheckedPointerOver", "ToggleButtonForegroundCheckedPressed", + "CheckBoxCheckGlyphForegroundChecked", "CheckBoxCheckGlyphForegroundCheckedPointerOver", + "CheckBoxCheckGlyphForegroundCheckedPressed", "ToggleSwitchKnobFillOn", "ToggleSwitchKnobFillOnPointerOver", + "ToggleSwitchKnobFillOnPressed"); + Set(Brush(Accent), + "TextControlBorderBrushFocused", "ToggleSwitchFillOn", "ToggleSwitchFillOnPointerOver", "ToggleSwitchFillOnPressed", + "CheckBoxCheckBackgroundFillChecked", "CheckBoxCheckBackgroundFillCheckedPointerOver", + "CheckBoxCheckBackgroundStrokeChecked", "CheckBoxCheckBackgroundStrokeCheckedPointerOver", + "SliderThumbBackground", "SliderTrackValueFill"); + Set(Brush(Raised), + "TextControlBackground", "TextControlBackgroundPointerOver", "TextControlBackgroundFocused", + "ButtonBackground", "ComboBoxBackground", "ComboBoxBackgroundPointerOver", "ComboBoxBackgroundFocused", + "RepeatButtonBackground", "ToggleSwitchFillOff", "ToggleSwitchFillOffPointerOver"); + Set(Brush(Selected), + "ButtonBackgroundPointerOver", "ButtonBackgroundPressed", "ComboBoxBackgroundPressed", + "RepeatButtonBackgroundPointerOver", "ListBoxItemBackgroundPointerOver", "ComboBoxItemBackgroundPointerOver", + "ListBoxItemBackgroundSelected", "ListBoxItemBackgroundSelectedPointerOver", "ListBoxItemBackgroundSelectedPressed", + "ComboBoxItemBackgroundSelected", "ComboBoxItemBackgroundSelectedPointerOver", "MenuFlyoutItemBackgroundPointerOver", + "TabItemHeaderBackgroundSelected"); + Set(Brush(Edge), + "TextControlBorderBrush", "TextControlBorderBrushPointerOver", "ButtonBorderBrush", "ButtonBorderBrushPointerOver", + "ComboBoxBorderBrush", "ComboBoxBorderBrushPointerOver", "RepeatButtonBorderBrush", "ToggleSwitchStrokeOff", + "ToggleSwitchStrokeOffPointerOver", "CheckBoxCheckBackgroundStrokeUnchecked", + "CheckBoxCheckBackgroundStrokeUncheckedPointerOver", "ComboBoxDropDownBorderBrush", "MenuFlyoutPresenterBorderBrush"); + Set(Brush(Card), "ComboBoxDropDownBackground", "MenuFlyoutPresenterBackground", "FlyoutPresenterBackground"); + Set(Brush(Text), + "TextControlForeground", "TextControlForegroundPointerOver", "TextControlForegroundFocused", "ButtonForeground", + "ButtonForegroundPointerOver", "ButtonForegroundPressed", "ComboBoxForeground", "ListBoxItemForeground", + "ListBoxItemForegroundSelected", "ListBoxItemForegroundPointerOver", "ComboBoxItemForeground", + "ComboBoxItemForegroundSelected", "TabItemHeaderForegroundSelected", "TabItemHeaderForegroundSelectedPointerOver", + "ToggleSwitchKnobFillOff", "ToggleSwitchContentForeground", "CheckBoxForegroundUnchecked", "CheckBoxForegroundChecked"); + Set(Brush(Dim), + "TextControlPlaceholderForeground", "TextControlPlaceholderForegroundPointerOver", + "TextControlPlaceholderForegroundFocused", "TabItemHeaderForegroundUnselected", + "TabItemHeaderForegroundUnselectedPointerOver"); + Set(Brush(Accent), "TabItemHeaderSelectedPipeFill"); + resources["ControlCornerRadius"] = new CornerRadius(RadiusM); + resources["OverlayCornerRadius"] = new CornerRadius(RadiusM); + } + + /// + /// Hands the Simple theme the tokens, for a control drawn in it rather than in Fluent (the right-click and header + /// menus): its background, ink, borders and highlight, so a menu wears the palette's card and not Simple's grey. + /// + public void ApplySimple(IResourceDictionary resources) + { + ArgumentNullException.ThrowIfNull(resources); + resources["ThemeBackgroundColor"] = Card; + resources["ThemeBackgroundBrush"] = Brush(Card); + resources["ThemeForegroundColor"] = Text; + resources["ThemeForegroundBrush"] = Brush(Text); + resources["ThemeForegroundLowBrush"] = Brush(Dim); + foreach (var key in new[] { "ThemeBorderLowBrush", "ThemeBorderMidBrush", "ThemeBorderHighBrush" }) + { + resources[key] = Brush(Edge); + } + + foreach (var key in new[] + { + "ThemeControlLowBrush", "ThemeControlMidBrush", "ThemeControlHighlightLowBrush", "ThemeControlHighlightMidBrush", + "ThemeControlHighlightHighBrush", "ThemeAccentBrush3", "ThemeAccentBrush4", + }) + { + resources[key] = Brush(Selected); + } + + resources["ThemeAccentBrush"] = Brush(Accent); + resources["ThemeAccentBrush2"] = Brush(Accent); + resources["HighlightBrush"] = Brush(Selected); + resources["HighlightForegroundBrush"] = Brush(Text); + } + + // ── the canonical sets ────────────────────────────────────────────────────────────────────── + + /// One side of mid-grey's set, before a theme is laid onto it. + private sealed record Canon( + Color Scrim, Rgb Card, Rgb Edge, Rgb Rule, Rgb Text, Rgb Dim, Rgb Header, Rgb Selected, Rgb AccentInk, Rgb KeyFill, + Rgb KeyInk, Rgb Warn); + + /// The palette's dark card, as it was drawn before there were tokens. + private static readonly Canon DarkCanon = new( + Color.FromArgb(0x59, 0, 0, 0), + new Rgb(0x1e, 0x1e, 0x25), + new Rgb(0x3a, 0x3a, 0x46), + new Rgb(0x2c, 0x2c, 0x36), + new Rgb(0xec, 0xec, 0xf1), + new Rgb(0x9a, 0x9a, 0xab), + new Rgb(0x80, 0x80, 0x8f), + new Rgb(0x22, 0x40, 0x3a), + new Rgb(0x06, 0x23, 0x1b), + new Rgb(0x2a, 0x2a, 0x34), + new Rgb(0xcf, 0xcf, 0xdb), + new Rgb(0xff, 0xb4, 0x54)); + + /// The palette's light card. + private static readonly Canon LightCanon = new( + Color.FromArgb(0x33, 0, 0, 0), + new Rgb(0xff, 0xff, 0xff), + new Rgb(0xd4, 0xd4, 0xdd), + new Rgb(0xe6, 0xe6, 0xec), + new Rgb(0x1d, 0x1d, 0x24), + new Rgb(0x62, 0x62, 0x70), + new Rgb(0x6a, 0x6a, 0x78), + new Rgb(0xd5, 0xef, 0xe7), + new Rgb(0xff, 0xff, 0xff), + new Rgb(0xf1, 0xf1, 0xf5), + new Rgb(0x40, 0x40, 0x4c), + new Rgb(0xa3, 0x4a, 0x00)); + + /// An ink moved, if it must be, until it clears on every plane given. + private static Rgb Held(Rgb ink, IReadOnlyList planes) + { + for (var pass = 0; pass < 2; pass++) + { + foreach (var plane in planes) + { + ink = Contrast.Legible(ink, plane, TextFloor); + } + } + + return ink; + } + + private static Rgb Shift(Rgb rgb, (int R, int G, int B) d) => + new(Channel(rgb.R + d.R), Channel(rgb.G + d.G), Channel(rgb.B + d.B)); + + private static byte Channel(int value) => (byte)Math.Clamp(value, 0, 255); + + private static Color Colour(Rgb rgb) => Color.FromRgb(rgb.R, rgb.G, rgb.B); +} diff --git a/src/SharpMUTerm.Avalonia/PackagePageView.cs b/src/SharpMUTerm.Avalonia/PackagePageView.cs index 6ea88a2f..235fa095 100644 --- a/src/SharpMUTerm.Avalonia/PackagePageView.cs +++ b/src/SharpMUTerm.Avalonia/PackagePageView.cs @@ -29,6 +29,7 @@ internal sealed class PackagePageView : Grid private readonly Func _visible; private readonly IBrush _accent; private readonly bool _dark; + private readonly NativeTokens _tokens; private readonly TabControl _tabs; private readonly ListBox _installed = new() { Background = Brushes.Transparent }; private readonly StackPanel _detail = new() { Spacing = 2, Margin = new Thickness(4, 0, 4, 16) }; @@ -36,7 +37,7 @@ internal sealed class PackagePageView : Grid private readonly StackPanel _browseDetail = new() { Spacing = 6, Margin = new Thickness(4, 0, 4, 16) }; private readonly ContentControl _browseBody = new(); private readonly Border _reviewLayer; - private readonly TextBlock _status = new() { Opacity = 0.8, TextWrapping = TextWrapping.Wrap, Margin = new Thickness(0, 8, 0, 0) }; + private readonly TextBlock _status = new() { TextWrapping = TextWrapping.Wrap, Margin = new Thickness(0, 8, 0, 0) }; private readonly Dictionary _values = new(StringComparer.Ordinal); private readonly List<(PackageItem Item, ToggleSwitch Switch)> _rows = []; private string? _selected; @@ -47,13 +48,14 @@ internal sealed class PackagePageView : Grid private bool _shownFetching; private PackageReviewModel? _shownReview; - public PackagePageView(PackageManager manager, Func visible, IBrush accent, bool dark) + public PackagePageView(PackageManager manager, Func visible, NativeTokens tokens) { _manager = manager; _declaration = manager.Declaration; _visible = visible; - _accent = accent; - _dark = dark; + _tokens = tokens; + _accent = tokens.Brush(tokens.Accent); + _dark = tokens.IsDark; RowDefinitions = new RowDefinitions("*,Auto"); Margin = new Thickness(0, 6, 0, 0); @@ -77,8 +79,8 @@ public PackagePageView(PackageManager manager, Func visible }; AutomationProperties.SetName(_browse, "The package index"); - InstalledTab = new TabItem { Header = "Installed", Content = MasterDetail(_installed, _detail), FontSize = 17 }; - BrowseTab = new TabItem { Header = "Browse", Content = _browseBody, FontSize = 17 }; + InstalledTab = new TabItem { Header = "Installed", Content = MasterDetail(_installed, _detail), FontSize = NativeTokens.Title }; + BrowseTab = new TabItem { Header = "Browse", Content = _browseBody, FontSize = NativeTokens.Title }; foreach (var tab in new[] { InstalledTab, BrowseTab }) { // The header's size only: the page under it keeps the window's own. @@ -102,7 +104,7 @@ public PackagePageView(PackageManager manager, Func visible _reviewLayer = new Border { - Background = new SolidColorBrush(Color.FromArgb(0x99, 0, 0, 0)), + Background = _tokens.Brush(_tokens.Scrim), IsVisible = false, }; SetRowSpan(_reviewLayer, 2); @@ -190,7 +192,7 @@ private Grid MasterDetail(Control list, Control detail) Child = list, BorderThickness = new Thickness(1), BorderBrush = Hairline, - CornerRadius = new CornerRadius(6), + CornerRadius = new CornerRadius(NativeTokens.RadiusM), Margin = new Thickness(0, 0, 14, 0), }); var scroller = new ScrollViewer { Content = detail, HorizontalScrollBarVisibility = ScrollBarVisibility.Disabled }; @@ -199,9 +201,12 @@ private Grid MasterDetail(Control list, Control detail) return grid; } - private IBrush Hairline => new SolidColorBrush(_dark ? Color.Parse("#46464e") : Color.Parse("#c8c8d0")); + private IBrush Hairline => _tokens.Brush(_tokens.Edge); - private IBrush Warning => new SolidColorBrush(_dark ? Color.Parse("#ffb454") : Color.Parse("#a4410e")); + /// A quiet line's ink, held to the floor (an opacity would not be). + private IBrush DimInk => _tokens.Brush(_tokens.Dim); + + private IBrush Warning => _tokens.Brush(_tokens.Warn); private void BuildInstalled() { @@ -234,12 +239,12 @@ private void BuildInstalled() _rows.Add((item, toggle)); var words = new StackPanel { Spacing = 1, VerticalAlignment = VerticalAlignment.Center }; - words.Children.Add(new TextBlock { Text = Text("name", item), FontSize = 14, TextTrimming = TextTrimming.CharacterEllipsis }); + words.Children.Add(new TextBlock { Text = Text("name", item), FontSize = NativeTokens.Title, TextTrimming = TextTrimming.CharacterEllipsis }); var tail = string.Join(" · ", _declaration.RowFields.Skip(1).Select(id => Text(id, item))); - words.Children.Add(new TextBlock { Text = tail, FontSize = 12, Opacity = 0.7, TextTrimming = TextTrimming.CharacterEllipsis }); + words.Children.Add(new TextBlock { Text = tail, FontSize = NativeTokens.Body, Foreground = DimInk, TextTrimming = TextTrimming.CharacterEllipsis }); if (item.Update is { } newer) { - words.Children.Add(new TextBlock { Text = $"update {newer} available", FontSize = 12, Foreground = _accent }); + words.Children.Add(new TextBlock { Text = $"update {newer} available", FontSize = NativeTokens.Body, Foreground = _accent }); } var row = new Grid { ColumnDefinitions = new ColumnDefinitions("Auto,*") }; @@ -292,9 +297,9 @@ private void BuildDetail() var shown = new List { _declaration.EnabledField }; shown.AddRange(_declaration.RowFields); - _detail.Children.Add(new TextBlock { Text = Text("name", item), FontSize = 20, FontWeight = FontWeight.SemiBold }); + _detail.Children.Add(new TextBlock { Text = Text("name", item), FontSize = NativeTokens.Heading, FontWeight = FontWeight.SemiBold }); var subtitle = string.Join(" · ", _declaration.RowFields.Skip(1).Select(id => Text(id, item))); - _detail.Children.Add(new TextBlock { Text = subtitle, Opacity = 0.7, Margin = new Thickness(0, 0, 0, 6) }); + _detail.Children.Add(new TextBlock { Text = subtitle, Foreground = DimInk, Margin = new Thickness(0, 0, 0, 6) }); string? group = null; foreach (var field in _declaration.DetailFields.Where(_visible)) @@ -305,7 +310,7 @@ private void BuildDetail() _detail.Children.Add(new TextBlock { Text = heading, - FontSize = 15, + FontSize = NativeTokens.Title, FontWeight = FontWeight.SemiBold, Margin = new Thickness(0, 14, 0, 4), Foreground = _accent, @@ -313,7 +318,7 @@ private void BuildDetail() } var row = new Grid { ColumnDefinitions = new ColumnDefinitions("120,*"), Margin = new Thickness(0, 3) }; - var label = new TextBlock { Text = Capitalise(field.Label), Opacity = 0.75 }; + var label = new TextBlock { Text = Capitalise(field.Label), Foreground = DimInk }; if (field.Help is { } help) { ToolTip.SetTip(label, NativeKeys.Words(Capitalise(help))); @@ -408,7 +413,7 @@ private void BuildBrowse() if (_manager.BrowseModel is not { } model) { var empty = new StackPanel { Spacing = 10, Margin = new Thickness(4, 24, 4, 0), MaxWidth = 520, HorizontalAlignment = HorizontalAlignment.Left }; - empty.Children.Add(new TextBlock { Text = "The package index", FontSize = 18, FontWeight = FontWeight.SemiBold }); + empty.Children.Add(new TextBlock { Text = "The package index", FontSize = NativeTokens.Heading, FontWeight = FontWeight.SemiBold }); empty.Children.Add(new TextBlock { Text = "Rule sets, scripts and sounds other players have shared, this game's first. The index is fetched only when you ask, over https; every package is checked against it before you see its review.", @@ -458,7 +463,7 @@ private void BuildBrowse() { var words = new StackPanel { Spacing = 1 }; var title = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 8 }; - title.Children.Add(new TextBlock { Text = row.Entry.Name, FontSize = 14 }); + title.Children.Add(new TextBlock { Text = row.Entry.Name, FontSize = NativeTokens.Title }); if (row.ForWorld) { title.Children.Add(Chip(model.World ?? "this game", _accent)); @@ -473,7 +478,7 @@ private void BuildBrowse() words.Children.Add(new TextBlock { Text = $"{row.Entry.Version} · {string.Join(", ", row.Entry.Games)}" + (row.StateText.Length == 0 ? string.Empty : $" · {row.StateText}"), - FontSize = 12, + FontSize = NativeTokens.Body, Opacity = 0.7, TextTrimming = TextTrimming.CharacterEllipsis, }); @@ -495,10 +500,10 @@ private void BuildBrowse() private Border Chip(string text, IBrush brush) => new() { - Child = new TextBlock { Text = text, FontSize = 11, Foreground = brush }, + Child = new TextBlock { Text = text, FontSize = NativeTokens.Small, Foreground = brush }, BorderBrush = brush, BorderThickness = new Thickness(1), - CornerRadius = new CornerRadius(8), + CornerRadius = new CornerRadius(NativeTokens.RadiusM), Padding = new Thickness(6, 0), VerticalAlignment = VerticalAlignment.Center, }; @@ -509,13 +514,13 @@ private void BuildBrowseDetail() InstallButton = null; if (_manager.BrowseModel is not { Rows.Count: > 0 } model) { - _browseDetail.Children.Add(new TextBlock { Text = "The index lists nothing.", Opacity = 0.75 }); + _browseDetail.Children.Add(new TextBlock { Text = "The index lists nothing.", Foreground = DimInk }); return; } var row = model.Rows[Math.Clamp(_browseSelected, 0, model.Rows.Count - 1)]; var entry = row.Entry; - _browseDetail.Children.Add(new TextBlock { Text = entry.Name, FontSize = 20, FontWeight = FontWeight.SemiBold }); + _browseDetail.Children.Add(new TextBlock { Text = entry.Name, FontSize = NativeTokens.Heading, FontWeight = FontWeight.SemiBold }); _browseDetail.Children.Add(new TextBlock { Text = entry.Version + (entry.Author is { } author ? $" · by {author}" : string.Empty), @@ -551,10 +556,10 @@ private void BuildBrowseDetail() _browseDetail.Children.Add(install); } - private static Grid Pair(string label, string value) + private Grid Pair(string label, string value) { var grid = new Grid { ColumnDefinitions = new ColumnDefinitions("120,*") }; - grid.Children.Add(new TextBlock { Text = label, Opacity = 0.75 }); + grid.Children.Add(new TextBlock { Text = label, Foreground = DimInk }); var text = new TextBlock { Text = value, TextWrapping = TextWrapping.Wrap }; SetColumn(text, 1); grid.Children.Add(text); @@ -578,11 +583,11 @@ private void BuildReview() var lines = new List(); var header = new StackPanel { Spacing = 2, Margin = new Thickness(0, 0, 0, 4) }; - header.Children.Add(new TextBlock { Text = review.Title, FontSize = 13, Opacity = 0.7 }); + header.Children.Add(new TextBlock { Text = review.Title, FontSize = NativeTokens.Title, Foreground = DimInk }); header.Children.Add(new TextBlock { Text = $"{review.Name} {review.Version}", - FontSize = 20, + FontSize = NativeTokens.Heading, FontWeight = FontWeight.SemiBold, TextWrapping = TextWrapping.Wrap, }); @@ -593,7 +598,7 @@ private void BuildReview() }.Where(t => t is not null)); if (byline.Length > 0) { - header.Children.Add(new TextBlock { Text = byline, Opacity = 0.75, TextWrapping = TextWrapping.Wrap }); + header.Children.Add(new TextBlock { Text = byline, Foreground = DimInk, TextWrapping = TextWrapping.Wrap }); } var card = new StackPanel { Spacing = 4 }; @@ -611,7 +616,7 @@ private void BuildReview() { Text = Capitalise(section.Heading.ToLowerInvariant()), FontWeight = FontWeight.SemiBold, - FontSize = 15, + FontSize = NativeTokens.Title, Foreground = acts && review.Acts ? Warning : _accent, Margin = new Thickness(0, 0, 0, 2), }); @@ -642,7 +647,7 @@ private void BuildReview() } var grid = new Grid { ColumnDefinitions = new ColumnDefinitions("110,*") }; - grid.Children.Add(new TextBlock { Text = Capitalise(row.Label), Opacity = 0.75 }); + grid.Children.Add(new TextBlock { Text = Capitalise(row.Label), Foreground = DimInk }); SetColumn(value, 1); grid.Children.Add(value); box.Children.Add(grid); @@ -653,10 +658,10 @@ private void BuildReview() Child = box, Padding = new Thickness(12, 10), Margin = new Thickness(0, 8, 0, 0), - CornerRadius = new CornerRadius(6), + CornerRadius = new CornerRadius(NativeTokens.RadiusM), BorderThickness = new Thickness(acts && review.Acts ? 1 : 0), BorderBrush = Warning, - Background = new SolidColorBrush(_dark ? Color.Parse("#2a2a30") : Color.Parse("#f3f3f6")), + Background = _tokens.Brush(_tokens.Raised), }); } @@ -698,8 +703,8 @@ private void BuildReview() _reviewLayer.Child = new Border { Child = layout, - Background = new SolidColorBrush(_dark ? Color.Parse("#202024") : Colors.White), - CornerRadius = new CornerRadius(8), + Background = _tokens.Brush(_tokens.Card), + CornerRadius = new CornerRadius(NativeTokens.RadiusM), Padding = new Thickness(22, 16), MaxWidth = 620, Margin = new Thickness(16), diff --git a/src/SharpMUTerm.Avalonia/PaletteOverlay.cs b/src/SharpMUTerm.Avalonia/PaletteOverlay.cs index 80e9180e..925992c9 100644 --- a/src/SharpMUTerm.Avalonia/PaletteOverlay.cs +++ b/src/SharpMUTerm.Avalonia/PaletteOverlay.cs @@ -35,7 +35,7 @@ internal sealed class PaletteOverlay : Panel private readonly PaletteSession _session; private readonly Action _remove; - private readonly Colours _colours; + private readonly NativeTokens _colours; private readonly Border _card; private readonly TextBox _search; private readonly TextBlock _status; @@ -53,7 +53,7 @@ public PaletteOverlay(PaletteSession session, Action remove) { _session = session; _remove = remove; - _colours = session.IsDark ? Colours.Dark : Colours.Light; + _colours = NativeTokens.For(session.Theme, session.IsDark); _view = session.View(string.Empty); Background = new SolidColorBrush(_colours.Scrim); @@ -63,10 +63,10 @@ public PaletteOverlay(PaletteSession session, Action remove) _search = new TextBox { PlaceholderText = "Type a command, a character, a window or a setting", - FontSize = 16, + FontSize = NativeTokens.Title, Margin = new Thickness(14, 14, 14, 6), Padding = new Thickness(12, 9), - CornerRadius = new CornerRadius(8), + CornerRadius = new CornerRadius(NativeTokens.RadiusM), }; AutomationProperties.SetName(_search, "Search commands"); _search.TextChanged += (_, _) => Refresh(resetSelection: true); @@ -74,7 +74,7 @@ public PaletteOverlay(PaletteSession session, Action remove) _status = new TextBlock { - FontSize = 12, + FontSize = NativeTokens.Body, Foreground = new SolidColorBrush(_colours.Dim), Margin = new Thickness(20, 0, 20, 6), }; @@ -83,7 +83,7 @@ public PaletteOverlay(PaletteSession session, Action remove) var footer = new TextBlock { Text = "↑↓ move Enter run Esc close", - FontSize = 11.5, + FontSize = NativeTokens.Small, Foreground = new SolidColorBrush(_colours.Dim), Margin = new Thickness(20, 6, 20, 10), HorizontalAlignment = HorizontalAlignment.Right, @@ -114,8 +114,8 @@ public PaletteOverlay(PaletteSession session, Action remove) Background = new SolidColorBrush(_colours.Card), BorderBrush = new SolidColorBrush(_colours.Edge), BorderThickness = new Thickness(1), - CornerRadius = new CornerRadius(12), - BoxShadow = BoxShadows.Parse("0 16 40 0 #66000000"), + CornerRadius = new CornerRadius(NativeTokens.RadiusL), + BoxShadow = NativeTokens.Shadow, ClipToBounds = true, Child = dock, }; @@ -131,6 +131,7 @@ public PaletteOverlay(PaletteSession session, Action remove) Child = _card, }; scope.Styles.Add(new FluentTheme()); + _colours.Apply(scope.Resources); Children.Add(scope); AddHandler(KeyDownEvent, OnKey, RoutingStrategies.Tunnel); @@ -228,7 +229,7 @@ private void Refresh(bool resetSelection) _list.Children.Add(new TextBlock { Text = header.Label, - FontSize = 11, + FontSize = NativeTokens.Small, FontWeight = FontWeight.SemiBold, LetterSpacing = 0.8, Foreground = new SolidColorBrush(_colours.Header), @@ -271,7 +272,7 @@ private Border EntryRow(PaletteEntry entry, string? key, int index) { var title = new TextBlock { - FontSize = 14, + FontSize = NativeTokens.Title, Foreground = new SolidColorBrush(_colours.Text), VerticalAlignment = VerticalAlignment.Center, TextTrimming = TextTrimming.CharacterEllipsis, @@ -284,7 +285,7 @@ private Border EntryRow(PaletteEntry entry, string? key, int index) var words = new TextBlock { Text = NativeKeys.Words(detail), - FontSize = 12.5, + FontSize = NativeTokens.Body, Foreground = new SolidColorBrush(_colours.Dim), Margin = new Thickness(12, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center, @@ -312,10 +313,10 @@ private Border EntryRow(PaletteEntry entry, string? key, int index) Background = new SolidColorBrush(_colours.KeyFill), BorderBrush = new SolidColorBrush(_colours.Edge), BorderThickness = new Thickness(1), - CornerRadius = new CornerRadius(5), + CornerRadius = new CornerRadius(NativeTokens.RadiusS), Padding = new Thickness(7, 1), VerticalAlignment = VerticalAlignment.Center, - Child = new TextBlock { Text = part, FontSize = 12, Foreground = new SolidColorBrush(_colours.KeyInk) }, + Child = new TextBlock { Text = part, FontSize = NativeTokens.Body, Foreground = new SolidColorBrush(_colours.KeyInk) }, }); } @@ -325,7 +326,7 @@ private Border EntryRow(PaletteEntry entry, string? key, int index) var row = new Border { - CornerRadius = new CornerRadius(7), + CornerRadius = new CornerRadius(NativeTokens.RadiusM), Padding = new Thickness(12, 7), Background = Brushes.Transparent, Child = grid, @@ -459,35 +460,4 @@ private void OnScrimPressed(object? sender, PointerPressedEventArgs e) Dismiss(); } } - - /// The card's colours, one set per variant: the client's accent marks a match, as in the cells. - private sealed record Colours( - Color Scrim, Color Card, Color Edge, Color Rule, Color Text, Color Dim, Color Header, Color Selected, Color Accent, Color KeyFill, Color KeyInk) - { - public static Colours Dark { get; } = new( - Color.FromArgb(0x59, 0, 0, 0), - Color.Parse("#1e1e25"), - Color.Parse("#3a3a46"), - Color.Parse("#2c2c36"), - Color.Parse("#ececf1"), - Color.Parse("#9a9aab"), - Color.Parse("#80808f"), - Color.Parse("#22403a"), - Color.Parse("#00f5b7"), - Color.Parse("#2a2a34"), - Color.Parse("#cfcfdb")); - - public static Colours Light { get; } = new( - Color.FromArgb(0x33, 0, 0, 0), - Color.Parse("#ffffff"), - Color.Parse("#d4d4dd"), - Color.Parse("#e6e6ec"), - Color.Parse("#1d1d24"), - Color.Parse("#626270"), - Color.Parse("#7a7a88"), - Color.Parse("#d5efe7"), - Color.Parse("#007a63"), - Color.Parse("#f1f1f5"), - Color.Parse("#40404c")); - } } diff --git a/src/SharpMUTerm.Avalonia/QuitView.cs b/src/SharpMUTerm.Avalonia/QuitView.cs index 1e255fde..5b962847 100644 --- a/src/SharpMUTerm.Avalonia/QuitView.cs +++ b/src/SharpMUTerm.Avalonia/QuitView.cs @@ -19,14 +19,14 @@ namespace SharpMUTerm.Avalonia; internal sealed class QuitView : DockPanel, IModalView { private readonly QuitSession _session; - private readonly ModalColours _colours; + private readonly NativeTokens _colours; private readonly Action _done; private readonly Button _quit; private readonly Button _stay; private readonly TextBlock _footer; private QuitChoice _selected = QuitChoice.Stay; - public QuitView(QuitSession session, ModalColours colours, Action done) + public QuitView(QuitSession session, NativeTokens colours, Action done) { _session = session; _colours = colours; @@ -47,10 +47,10 @@ public QuitView(QuitSession session, ModalColours colours, Action done) foreach (var consequence in model.Consequences) { var line = new DockPanel(); - var dot = new TextBlock { Text = "●", Foreground = colours.Brush(colours.Accent), Margin = new Thickness(0, 0, 10, 0), FontSize = 11, VerticalAlignment = VerticalAlignment.Center }; + var dot = new TextBlock { Text = "●", Foreground = colours.Brush(colours.Accent), Margin = new Thickness(0, 0, 10, 0), FontSize = NativeTokens.Small, VerticalAlignment = VerticalAlignment.Center }; SetDock(dot, Dock.Left); line.Children.Add(dot); - line.Children.Add(new TextBlock { Text = NativeKeys.Words(consequence), Foreground = colours.Brush(colours.Text), TextWrapping = TextWrapping.Wrap, FontSize = 14 }); + line.Children.Add(new TextBlock { Text = NativeKeys.Words(consequence), Foreground = colours.Brush(colours.Text), TextWrapping = TextWrapping.Wrap, FontSize = NativeTokens.Title }); facts.Children.Add(line); } diff --git a/src/SharpMUTerm.Avalonia/SearchView.cs b/src/SharpMUTerm.Avalonia/SearchView.cs index 13915b8a..8bf90e32 100644 --- a/src/SharpMUTerm.Avalonia/SearchView.cs +++ b/src/SharpMUTerm.Avalonia/SearchView.cs @@ -20,7 +20,7 @@ namespace SharpMUTerm.Avalonia; internal sealed class SearchView : DockPanel, IModalView { private readonly SearchSession _session; - private readonly ModalColours _colours; + private readonly NativeTokens _colours; private readonly Action _done; private readonly TextBox _box; private readonly ToggleButton _regex; @@ -34,7 +34,7 @@ internal sealed class SearchView : DockPanel, IModalView private int _selected; private bool _syncing; - public SearchView(SearchSession session, ModalColours colours, Action done) + public SearchView(SearchSession session, NativeTokens colours, Action done) { _session = session; _colours = colours; @@ -56,7 +56,7 @@ public SearchView(SearchSession session, ModalColours colours, Action done) toggles.Children.Add(switches); _count = new TextBlock { - FontSize = 12.5, + FontSize = NativeTokens.Body, Foreground = colours.Brush(colours.Dim), HorizontalAlignment = HorizontalAlignment.Right, VerticalAlignment = VerticalAlignment.Center, @@ -133,13 +133,13 @@ private ToggleButton Toggle(string label, string key, bool on) { var content = new StackPanel { Orientation = Orientation.Horizontal }; content.Children.Add(new TextBlock { Text = NativeKeys.Words(label), VerticalAlignment = VerticalAlignment.Center }); - content.Children.Add(new TextBlock { Text = NativeKeys.Words(key), FontSize = 11, Opacity = 0.7, Margin = new Thickness(6, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center }); + content.Children.Add(new TextBlock { Text = NativeKeys.Words(key), FontSize = NativeTokens.Small, Opacity = 0.7, Margin = new Thickness(6, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center }); var toggle = new ToggleButton { Content = content, IsChecked = on, Padding = new Thickness(10, 4), - CornerRadius = new CornerRadius(6), + CornerRadius = new CornerRadius(NativeTokens.RadiusM), Focusable = false, }; global::Avalonia.Automation.AutomationProperties.SetName(toggle, label); @@ -214,7 +214,7 @@ private void Draw() Width = 130, TextTrimming = TextTrimming.CharacterEllipsis, Foreground = _colours.Brush(_colours.Header), - FontSize = 12.5, + FontSize = NativeTokens.Body, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(0, 0, 10, 0), }; @@ -226,7 +226,7 @@ private void Draw() { Foreground = _colours.Brush(_colours.Text), FontFamily = new FontFamily($"{CellFonts.BundledFamily}, DejaVu Sans Mono, Consolas, Menlo, monospace"), - FontSize = 13, + FontSize = NativeTokens.Title, TextTrimming = TextTrimming.CharacterEllipsis, VerticalAlignment = VerticalAlignment.Center, }; diff --git a/src/SharpMUTerm.Avalonia/SettingsPresenter.cs b/src/SharpMUTerm.Avalonia/SettingsPresenter.cs index 57d73173..7304ed9f 100644 --- a/src/SharpMUTerm.Avalonia/SettingsPresenter.cs +++ b/src/SharpMUTerm.Avalonia/SettingsPresenter.cs @@ -1,4 +1,7 @@ +using Avalonia; using Avalonia.Controls; +using Avalonia.Input; +using Avalonia.Media; using Avalonia.Threading; using SharpMUTerm.Client.Settings; using SharpMUTerm.Tui; @@ -8,10 +11,17 @@ namespace SharpMUTerm.Avalonia; /// /// The window host's : one at a time, owned by the main /// window. The client calls in on its own thread, so everything here is posted to the window's. +/// +/// It is drawn as the palette's modal: its own frame, Esc and a close button to leave, and the main window under a +/// scrim (a press on it closes the settings, as a press on the palette's scrim does). Opened from the trigger builder +/// () it is docked to the right half of the main window instead, with no scrim, +/// so the line the rule was made from stays in view beside the rule's live test. +/// /// internal sealed class SettingsPresenter : INativeSettings { private SettingsWindow? _window; + private Border? _scrim; /// The window the settings window belongs to, set once the main window exists. public Window? Owner { get; set; } @@ -32,16 +42,19 @@ internal SettingsWindow ShowNow(SettingsForm form) if (_window is { } open) { open.Load(form); + Place(open, form); open.FocusFirst(); return open; } var window = new SettingsWindow(form); + Place(window, form); window.Closed += (_, _) => { if (ReferenceEquals(_window, window)) { _window = null; + Unveil(); } // The keyboard goes back to the client, as it does when a cell screen closes. @@ -60,4 +73,56 @@ internal SettingsWindow ShowNow(SettingsForm form) return window; } + + /// The scrim over the main window while the settings are open, for a test; null when there is none. + internal Border? Scrim => _scrim; + + /// + /// Centres over the main window under a scrim, or — opened beside the output — docks it to + /// the main window's right half with none. + /// + private void Place(SettingsWindow window, SettingsForm form) + { + if (Owner is not { IsVisible: true } owner) + { + return; + } + + if (form.BesideOutput) + { + Unveil(); + var scale = owner.RenderScaling; + var size = owner.ClientSize; + window.WindowStartupLocation = WindowStartupLocation.Manual; + window.Width = Math.Max(window.MinWidth, size.Width / 2); + window.Height = Math.Max(window.MinHeight, size.Height); + window.Position = new PixelPoint( + owner.Position.X + (int)Math.Round((size.Width - window.Width) * scale), + owner.Position.Y); + return; + } + + if (_scrim is null && owner.Content is Panel root) + { + var tokens = window.Tokens; + _scrim = new Border { Background = tokens.Brush(tokens.Scrim), Focusable = false }; + _scrim.PointerPressed += (_, e) => + { + e.Handled = true; + _window?.Close(); + }; + root.Children.Add(_scrim); + } + } + + /// Takes the scrim off the main window. + private void Unveil() + { + if (_scrim is { Parent: Panel root } scrim) + { + root.Children.Remove(scrim); + } + + _scrim = null; + } } diff --git a/src/SharpMUTerm.Avalonia/SettingsWindow.cs b/src/SharpMUTerm.Avalonia/SettingsWindow.cs index a0050f79..c1978367 100644 --- a/src/SharpMUTerm.Avalonia/SettingsWindow.cs +++ b/src/SharpMUTerm.Avalonia/SettingsWindow.cs @@ -41,7 +41,10 @@ internal sealed class SettingsWindow : Window private readonly Dictionary _badges = new(StringComparer.Ordinal); private readonly List<(StatusMeter Meter, TextBlock Now)> _meterNow = []; private readonly List _themeCards = []; + private readonly Border _frame; + private readonly TextBlock _title; private SettingsForm _form; + private NativeTokens _tokens; private IReadOnlyList _matches = []; private string? _shown; private bool _syncing; @@ -51,15 +54,59 @@ internal sealed class SettingsWindow : Window public SettingsWindow(SettingsForm form) { _form = form; + _tokens = TokensFor(form); Title = "Settings"; Width = 960; Height = 680; MinWidth = 640; MinHeight = 420; WindowStartupLocation = WindowStartupLocation.CenterOwner; + + // The palette's frame, not the platform's: the window draws its own title, close button and edge, so it reads + // as one of the client's surfaces (and looks the same under every window manager, or none). + WindowDecorations = WindowDecorations.None; Styles.Add(new FluentTheme()); - _search = new TextBox { PlaceholderText = "Search settings", Margin = new Thickness(16, 14, 16, 10) }; + _title = new TextBlock + { + Text = "Settings", + FontSize = NativeTokens.Title, + FontWeight = FontWeight.SemiBold, + VerticalAlignment = VerticalAlignment.Center, + Margin = new Thickness(16, 0, 0, 0), + }; + CloseButton = new Button + { + Content = "✕", + Padding = new Thickness(10, 4), + Margin = new Thickness(0, 0, 8, 0), + VerticalAlignment = VerticalAlignment.Center, + Background = Brushes.Transparent, + BorderThickness = new Thickness(0), + }; + AutomationProperties.SetName(CloseButton, "Close settings"); + ToolTip.SetTip(CloseButton, "Close (Esc)"); + CloseButton.Click += (_, _) => Close(); + var bar = new DockPanel { Height = 40, LastChildFill = true, Background = Brushes.Transparent }; + DockPanel.SetDock(CloseButton, Dock.Right); + bar.Children.Add(CloseButton); + bar.Children.Add(_title); + bar.PointerPressed += (_, e) => + { + if (e.GetCurrentPoint(bar).Properties.IsLeftButtonPressed && !ReferenceEquals(e.Source, CloseButton)) + { + BeginMoveDrag(e); + } + }; + DockPanel.SetDock(bar, Dock.Top); + + _search = new TextBox + { + PlaceholderText = "Search settings", + Margin = new Thickness(16, 4, 16, 10), + FontSize = NativeTokens.Title, + Padding = new Thickness(12, 7), + }; AutomationProperties.SetName(_search, "Search settings"); _search.TextChanged += (_, _) => OnQuery(); DockPanel.SetDock(_search, Dock.Top); @@ -87,10 +134,12 @@ public SettingsWindow(SettingsForm form) }; var dock = new DockPanel { LastChildFill = true }; + dock.Children.Add(bar); dock.Children.Add(_search); dock.Children.Add(_sections); dock.Children.Add(_scroller); - Content = dock; + _frame = new Border { BorderThickness = new Thickness(1), Child = dock }; + Content = _frame; _clock = new DispatcherTimer(TimeSpan.FromSeconds(1), DispatcherPriority.Background, (_, _) => Tick()); Opened += (_, _) => @@ -127,6 +176,27 @@ public void FocusFirst() /// The section on the right, by id. public string? ShownSection => _shown; + /// The frame's close button, for a test. + public Button CloseButton { get; } + + /// The tokens the window is drawn in now: the client's theme, followed when one is picked here. + public NativeTokens Tokens => _tokens; + + private static NativeTokens TokensFor(SettingsForm form) => NativeTokens.For(form.Theme?.Invoke(), form.IsDark); + + /// Wears : the variant, the planes, Fluent's resources and the frame. + private void ApplyTokens(NativeTokens tokens) + { + _tokens = tokens; + RequestedThemeVariant = tokens.IsDark ? ThemeVariant.Dark : ThemeVariant.Light; + tokens.Apply(Resources); + Background = tokens.Brush(tokens.Card); + Foreground = tokens.Brush(tokens.Text); + _frame.BorderBrush = tokens.Brush(tokens.Edge); + _title.Foreground = tokens.Brush(tokens.Text); + CloseButton.Foreground = tokens.Brush(tokens.Dim); + } + /// The ids of the fields drawn on the right, in order, for a test. public IReadOnlyList ShownFields { get; private set; } = []; @@ -182,7 +252,7 @@ public void Load(SettingsForm form) { after.Changed += OnPackagesChanged; } - RequestedThemeVariant = form.IsDark ? ThemeVariant.Dark : ThemeVariant.Light; + ApplyTokens(TokensFor(form)); _shown = null; _matches = _form.Search(_search.Text); BuildSectionList(); @@ -202,7 +272,7 @@ private void BuildSectionList() foreach (var section in _form.Sections) { var title = new TextBlock { Text = section.Title, VerticalAlignment = VerticalAlignment.Center, TextTrimming = TextTrimming.CharacterEllipsis }; - var badge = new TextBlock { Opacity = 0.7, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(8, 0, 0, 0) }; + var badge = new TextBlock { Foreground = DimInk, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(8, 0, 0, 0) }; _badges[section.Id] = badge; var row = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto") }; row.Children.Add(title); @@ -313,17 +383,17 @@ private void BuildPage() return; } - _page.Children.Add(new TextBlock { Text = section.Title, FontSize = 24, FontWeight = FontWeight.SemiBold, Margin = new Thickness(0, 0, 0, 2) }); + _page.Children.Add(new TextBlock { Text = section.Title, FontSize = NativeTokens.Heading, FontWeight = FontWeight.SemiBold, Margin = new Thickness(0, 0, 0, 2) }); if (section.Key is { } key) { - _page.Children.Add(new TextBlock { Text = $"{key} in the client · changes apply as you make them", Opacity = 0.7, Margin = new Thickness(0, 0, 0, 6) }); + _page.Children.Add(new TextBlock { Text = $"{key} in the client · changes apply as you make them", Foreground = DimInk, Margin = new Thickness(0, 0, 0, 6) }); } if (section.Packages is not null) { if (_form.Packages is not { } manager) { - _page.Children.Add(new TextBlock { Text = "This client offers no packages.", Opacity = 0.7, Margin = new Thickness(0, 16, 0, 0) }); + _page.Children.Add(new TextBlock { Text = "This client offers no packages.", Foreground = DimInk, Margin = new Thickness(0, 16, 0, 0) }); ShownFields = []; return; } @@ -331,8 +401,7 @@ private void BuildPage() var packages = new PackagePageView( manager, f => !Searching || _matches.Any(m => ReferenceEquals(m.Field, f)), - Accent, - _form.IsDark) + _tokens) { Height = ListEditorHeight(), }; @@ -348,7 +417,7 @@ private void BuildPage() _form, section, f => !Searching || _matches.Any(m => ReferenceEquals(m.Field, f)), - Accent) + _tokens) { Height = ListEditorHeight(), Margin = new Thickness(0, 8, 0, 0), @@ -390,7 +459,7 @@ private void BuildPage() : section.Fields.ToList(); if (visible.Count == 0) { - _page.Children.Add(new TextBlock { Text = "No setting here matches the search.", Opacity = 0.7, Margin = new Thickness(0, 16, 0, 0) }); + _page.Children.Add(new TextBlock { Text = "No setting here matches the search.", Foreground = DimInk, Margin = new Thickness(0, 16, 0, 0) }); } string? group = null; @@ -401,11 +470,12 @@ private void BuildPage() group = heading; _page.Children.Add(new TextBlock { - Text = heading, - FontSize = 15, + Text = heading.ToUpperInvariant(), + FontSize = NativeTokens.Small, FontWeight = FontWeight.SemiBold, - Margin = new Thickness(0, 18, 0, 4), - Foreground = Accent, + LetterSpacing = 0.8, + Margin = new Thickness(0, 20, 0, 6), + Foreground = _tokens.Brush(_tokens.Header), }); } @@ -432,7 +502,7 @@ private StackPanel SubjectRow(SettingsSectionContribution section) var noun = section.Scope == SettingScope.World ? "world" : "character"; if (subjects.Count == 0) { - row.Children.Add(new TextBlock { Text = $"There is no {noun} yet.", VerticalAlignment = VerticalAlignment.Center, Opacity = 0.8 }); + row.Children.Add(new TextBlock { Text = $"There is no {noun} yet.", VerticalAlignment = VerticalAlignment.Center, Foreground = DimInk }); } else { @@ -477,10 +547,10 @@ private StackPanel ThemePicker(ThemeField field) { var outer = new StackPanel { Spacing = 6, Margin = new Thickness(0, 4, 0, 4) }; var words = new StackPanel { Spacing = 1 }; - words.Children.Add(new TextBlock { Text = NativeKeys.Words(Capitalise(field.Label)), FontSize = 14 }); + words.Children.Add(new TextBlock { Text = NativeKeys.Words(Capitalise(field.Label)), FontSize = NativeTokens.Title }); if (field.Help is { } help) { - words.Children.Add(new TextBlock { Text = NativeKeys.Words(Capitalise(help)), FontSize = 12, Opacity = 0.72, TextWrapping = TextWrapping.Wrap }); + words.Children.Add(new TextBlock { Text = NativeKeys.Words(Capitalise(help)), FontSize = NativeTokens.Body, Foreground = DimInk, TextWrapping = TextWrapping.Wrap }); } outer.Children.Add(words); @@ -489,7 +559,7 @@ private StackPanel ThemePicker(ThemeField field) var inUse = CurrentTheme(field); foreach (var card in _form.Themes()) { - var view = new ThemeCardView(card, string.Equals(card.Name, inUse, StringComparison.OrdinalIgnoreCase), _form.IsDark); + var view = new ThemeCardView(card, string.Equals(card.Name, inUse, StringComparison.OrdinalIgnoreCase), _tokens); view.Click += (_, _) => { if (!string.Equals(card.Name, CurrentTheme(field), StringComparison.OrdinalIgnoreCase)) @@ -507,7 +577,7 @@ private StackPanel ThemePicker(ThemeField field) var now = CurrentTheme(field); foreach (var view in _themeCards) { - view.SetInUse(string.Equals(view.Card.Name, now, StringComparison.OrdinalIgnoreCase), _form.IsDark); + view.SetInUse(string.Equals(view.Card.Name, now, StringComparison.OrdinalIgnoreCase), _tokens); } }); outer.Children.Add(wrap); @@ -517,8 +587,11 @@ private StackPanel ThemePicker(ThemeField field) private string? CurrentTheme(ThemeField field) => field.Binding is SettingBinding binding ? _form.Get(binding) : null; - /// The accent the changed dot and headings wear: Fluent's own, for the theme variant. - private SolidColorBrush Accent => new(_form.IsDark ? Color.Parse("#60cdff") : Color.Parse("#005fb8")); + /// The accent the changed dot wears: the client's, as every native surface's. + private SolidColorBrush Accent => _tokens.Brush(_tokens.Accent); + + /// A quiet line's ink, held to the floor (an opacity would not be). + private SolidColorBrush DimInk => _tokens.Brush(_tokens.Dim); /// One field: label and help on the left, its control, then the changed dot and the reset. private Grid FieldRow(SettingsField field) @@ -526,10 +599,10 @@ private Grid FieldRow(SettingsField field) var grid = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto,Auto"), Margin = new Thickness(0, 4), MinHeight = 44 }; var words = new StackPanel { VerticalAlignment = VerticalAlignment.Center, Spacing = 1, Margin = new Thickness(0, 0, 16, 0) }; - words.Children.Add(new TextBlock { Text = NativeKeys.Words(Capitalise(field.Label)), FontSize = 14, TextWrapping = TextWrapping.Wrap }); + words.Children.Add(new TextBlock { Text = NativeKeys.Words(Capitalise(field.Label)), FontSize = NativeTokens.Title, TextWrapping = TextWrapping.Wrap }); if (field.Help is { } help) { - words.Children.Add(new TextBlock { Text = NativeKeys.Words(Capitalise(help)), FontSize = 12, Opacity = 0.72, TextWrapping = TextWrapping.Wrap }); + words.Children.Add(new TextBlock { Text = NativeKeys.Words(Capitalise(help)), FontSize = NativeTokens.Body, Foreground = DimInk, TextWrapping = TextWrapping.Wrap }); } grid.Children.Add(words); @@ -703,7 +776,7 @@ void Commit() } default: - return new TextBlock { Text = "set on its own screen", Opacity = 0.7 }; + return new TextBlock { Text = "set on its own screen", Foreground = DimInk }; } } @@ -712,7 +785,7 @@ private static StackPanel Swatch(string name) var panel = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 8, Tag = name }; if (Color.TryParse(name, out var colour)) { - panel.Children.Add(new Border { Width = 14, Height = 14, CornerRadius = new CornerRadius(3), Background = new SolidColorBrush(colour) }); + panel.Children.Add(new Border { Width = 14, Height = 14, CornerRadius = new CornerRadius(NativeTokens.RadiusS), Background = new SolidColorBrush(colour) }); } panel.Children.Add(new TextBlock { Text = name }); @@ -727,10 +800,10 @@ private StackPanel MeterTable(ListField field) var top = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto") }; var words = new StackPanel { Spacing = 1 }; - words.Children.Add(new TextBlock { Text = NativeKeys.Words(Capitalise(field.Label)), FontSize = 14 }); + words.Children.Add(new TextBlock { Text = NativeKeys.Words(Capitalise(field.Label)), FontSize = NativeTokens.Title }); if (field.Help is { } help) { - words.Children.Add(new TextBlock { Text = NativeKeys.Words(Capitalise(help)), FontSize = 12, Opacity = 0.72, TextWrapping = TextWrapping.Wrap }); + words.Children.Add(new TextBlock { Text = NativeKeys.Words(Capitalise(help)), FontSize = NativeTokens.Body, Foreground = DimInk, TextWrapping = TextWrapping.Wrap }); } top.Children.Add(words); @@ -749,7 +822,7 @@ private StackPanel MeterTable(ListField field) grid.RowDefinitions.Add(new RowDefinition(GridLength.Auto)); for (var c = 0; c < headings.Length; c++) { - var heading = new TextBlock { Text = headings[c], FontSize = 12, FontWeight = FontWeight.SemiBold, Opacity = 0.78 }; + var heading = new TextBlock { Text = headings[c], FontSize = NativeTokens.Body, FontWeight = FontWeight.SemiBold, Foreground = DimInk }; Grid.SetColumn(heading, c); grid.Children.Add(heading); } @@ -814,17 +887,17 @@ private StackPanel MeterTable(ListField field) // What this connection has received, to pick a path from: a click puts it in the path box last used. var box = new StackPanel { Spacing = 2 }; - box.Children.Add(new TextBlock { Text = "Received on this connection", FontSize = 12, FontWeight = FontWeight.SemiBold, Opacity = 0.78, Margin = new Thickness(0, 2, 0, 2) }); + box.Children.Add(new TextBlock { Text = "Received on this connection", FontSize = NativeTokens.Body, FontWeight = FontWeight.SemiBold, Foreground = DimInk, Margin = new Thickness(0, 2, 0, 2) }); if (received.Count == 0) { - box.Children.Add(new TextBlock { Text = "Nothing yet — a meter shows once its value arrives.", FontSize = 12, Opacity = 0.72 }); + box.Children.Add(new TextBlock { Text = "Nothing yet — a meter shows once its value arrives.", FontSize = NativeTokens.Body, Foreground = DimInk }); } foreach (var item in received.Take(40)) { var line = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto") }; - line.Children.Add(new TextBlock { Text = item.Path, FontFamily = FontFamily.Parse("monospace"), FontSize = 12 }); - var v = new TextBlock { Text = item.Value, FontSize = 12, Opacity = 0.72, Margin = new Thickness(16, 0, 0, 0) }; + line.Children.Add(new TextBlock { Text = item.Path, FontFamily = FontFamily.Parse("monospace"), FontSize = NativeTokens.Body }); + var v = new TextBlock { Text = item.Value, FontSize = NativeTokens.Body, Foreground = DimInk, Margin = new Thickness(16, 0, 0, 0) }; Grid.SetColumn(v, 1); line.Children.Add(v); var pick = new Button @@ -851,8 +924,8 @@ private StackPanel MeterTable(ListField field) { Child = box, BorderThickness = new Thickness(1), - BorderBrush = new SolidColorBrush(_form.IsDark ? Color.Parse("#46464e") : Color.Parse("#c8c8d0")), - CornerRadius = new CornerRadius(6), + BorderBrush = _tokens.Brush(_tokens.Edge), + CornerRadius = new CornerRadius(NativeTokens.RadiusM), Padding = new Thickness(10, 6, 10, 8), Margin = new Thickness(0, 4, 0, 0), }); @@ -924,9 +997,13 @@ private void OnPackagesChanged() => Dispatcher.UIThread.Post(() => /// Re-reads every value and indicator on the page. A meter added or removed rebuilds the page, whose rows moved. internal void Refresh() { - var variant = _form.IsDark ? ThemeVariant.Dark : ThemeVariant.Light; - var flipped = RequestedThemeVariant != variant; - RequestedThemeVariant = variant; + var tokens = TokensFor(_form); + var flipped = tokens != _tokens; + if (flipped) + { + ApplyTokens(tokens); + } + if (flipped || (_meterRows >= 0 && _form.Section(_shown ?? string.Empty)?.Fields.OfType().FirstOrDefault() is { } meters diff --git a/src/SharpMUTerm.Avalonia/TerminalView.cs b/src/SharpMUTerm.Avalonia/TerminalView.cs index fe9bfda6..1114961a 100644 --- a/src/SharpMUTerm.Avalonia/TerminalView.cs +++ b/src/SharpMUTerm.Avalonia/TerminalView.cs @@ -63,7 +63,7 @@ public TerminalView(AvaloniaConsoleDriver driver, SKColor foreground, SKColor ba _driver.FrameReady += OnFrameReady; _repeat = new DispatcherTimer(TimeSpan.FromMilliseconds(100), DispatcherPriority.Input, (_, _) => RepeatPress()); - _tipText = new TextBlock { Foreground = Brush(foreground), FontSize = 12, MaxWidth = 420, TextWrapping = TextWrapping.Wrap }; + _tipText = new TextBlock { Foreground = Brush(foreground), FontSize = NativeTokens.Body, MaxWidth = 420, TextWrapping = TextWrapping.Wrap }; _tip = new Popup { PlacementTarget = this, @@ -75,7 +75,7 @@ public TerminalView(AvaloniaConsoleDriver driver, SKColor foreground, SKColor ba Background = Brush(Mix(background, foreground, 0.12f)), BorderBrush = Brush(Mix(background, foreground, 0.35f)), BorderThickness = new Thickness(1), - CornerRadius = new CornerRadius(3), + CornerRadius = new CornerRadius(NativeTokens.RadiusS), Padding = new Thickness(7, 4), Child = _tipText, }, diff --git a/src/SharpMUTerm.Avalonia/ThemeCardView.cs b/src/SharpMUTerm.Avalonia/ThemeCardView.cs index b122db5a..b8dc3162 100644 --- a/src/SharpMUTerm.Avalonia/ThemeCardView.cs +++ b/src/SharpMUTerm.Avalonia/ThemeCardView.cs @@ -20,7 +20,7 @@ internal sealed class ThemeCardView : Button private readonly Border _frame; private readonly TextBlock _state; - public ThemeCardView(ThemeCard card, bool inUse, bool windowIsDark) + public ThemeCardView(ThemeCard card, bool inUse, NativeTokens tokens) { ArgumentNullException.ThrowIfNull(card); Card = card; @@ -33,8 +33,8 @@ public ThemeCardView(ThemeCard card, bool inUse, bool windowIsDark) AutomationProperties.SetName(this, $"Use the {card.Name} theme"); ToolTip.SetTip(this, $"Use {card.Name}"); - var name = new TextBlock { Text = card.Name, FontSize = 14, FontWeight = FontWeight.SemiBold }; - _state = new TextBlock { FontSize = 12, Opacity = 0.72 }; + var name = new TextBlock { Text = card.Name, FontSize = NativeTokens.Title, FontWeight = FontWeight.SemiBold }; + _state = new TextBlock { FontSize = NativeTokens.Body }; var words = new StackPanel { Margin = new Thickness(10, 8, 10, 8), Spacing = 1 }; words.Children.Add(name); words.Children.Add(_state); @@ -46,13 +46,12 @@ public ThemeCardView(ThemeCard card, bool inUse, bool windowIsDark) _frame = new Border { Child = body, - CornerRadius = new CornerRadius(8), + CornerRadius = new CornerRadius(NativeTokens.RadiusM), ClipToBounds = true, BorderThickness = new Thickness(2), - Background = new SolidColorBrush(windowIsDark ? Color.Parse("#2b2b30") : Color.Parse("#f3f3f5")), }; Content = _frame; - SetInUse(inUse, windowIsDark); + SetInUse(inUse, tokens); } /// The theme this card shows. @@ -62,14 +61,15 @@ public ThemeCardView(ThemeCard card, bool inUse, bool windowIsDark) public bool InUse { get; private set; } /// Marks the card as the theme in use, or not. - public void SetInUse(bool inUse, bool windowIsDark) + public void SetInUse(bool inUse, NativeTokens tokens) { + ArgumentNullException.ThrowIfNull(tokens); + _frame.Background = tokens.Brush(tokens.Raised); + _state.Foreground = tokens.Brush(tokens.Dim); InUse = inUse; var kind = $"{(Card.IsDark ? "dark" : "light")} · {(Card.IsCustom ? "your own" : "built in")}"; _state.Text = inUse ? $"In use · {kind}" : kind; - _frame.BorderBrush = inUse - ? new SolidColorBrush(windowIsDark ? Color.Parse("#60cdff") : Color.Parse("#005fb8")) - : new SolidColorBrush(windowIsDark ? Color.Parse("#46464e") : Color.Parse("#c8c8d0")); + _frame.BorderBrush = tokens.Brush(inUse ? tokens.Accent : tokens.Edge); } private static readonly FontFamily Mono = FontFamily.Parse("monospace"); @@ -89,7 +89,7 @@ private static Border Preview(ThemePreview preview) } var line = preview.CommandLine; - var command = new TextBlock { FontFamily = Mono, FontSize = 9, Padding = new Thickness(4, 2), TextTrimming = TextTrimming.CharacterEllipsis }; + var command = new TextBlock { FontFamily = Mono, FontSize = NativeTokens.Miniature, Padding = new Thickness(4, 2), TextTrimming = TextTrimming.CharacterEllipsis }; command.Inlines!.Add(new Run(line.Prompt + " ") { Foreground = Brush(line.PromptInk), FontWeight = FontWeight.Bold }); command.Inlines.Add(new Run(line.Text) { Foreground = Brush(line.Ink) }); @@ -105,7 +105,7 @@ private static Border Pane(PreviewPane pane) var tabs = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 1 }; foreach (var tab in pane.Tabs) { - var title = new TextBlock { FontFamily = Mono, FontSize = 9, Padding = new Thickness(3, 1) }; + var title = new TextBlock { FontFamily = Mono, FontSize = NativeTokens.Miniature, Padding = new Thickness(3, 1) }; title.Inlines!.Add(new Run(tab.Title) { Foreground = Brush(tab.Ink), FontWeight = tab.Selected ? FontWeight.Bold : FontWeight.Normal }); if (tab.Badge is { } badge) { @@ -118,7 +118,7 @@ private static Border Pane(PreviewPane pane) var lines = new StackPanel { Margin = new Thickness(4, 3, 4, 4) }; foreach (var runs in pane.Lines) { - var text = new TextBlock { FontFamily = Mono, FontSize = 9, TextTrimming = TextTrimming.CharacterEllipsis }; + var text = new TextBlock { FontFamily = Mono, FontSize = NativeTokens.Miniature, TextTrimming = TextTrimming.CharacterEllipsis }; foreach (var run in runs) { text.Inlines!.Add(new Run(run.Text) { Foreground = Brush(run.Ink), FontWeight = run.Bold ? FontWeight.Bold : FontWeight.Normal }); diff --git a/src/SharpMUTerm.Avalonia/WelcomeView.cs b/src/SharpMUTerm.Avalonia/WelcomeView.cs index f3016d15..24f9ad08 100644 --- a/src/SharpMUTerm.Avalonia/WelcomeView.cs +++ b/src/SharpMUTerm.Avalonia/WelcomeView.cs @@ -22,7 +22,7 @@ internal sealed class WelcomeView : DockPanel, IModalView private static readonly WelcomeLayout[] Layouts = [WelcomeLayout.Suggested, WelcomeLayout.Roleplay, WelcomeLayout.Combat]; private readonly WelcomeSession _session; - private readonly ModalColours _colours; + private readonly NativeTokens _colours; private readonly Action _done; private readonly StackPanel _body = new(); private readonly TextBlock _footer; @@ -37,7 +37,7 @@ internal sealed class WelcomeView : DockPanel, IModalView private CheckBox? _passwordLater; private bool _drawnInForm; - public WelcomeView(WelcomeSession session, ModalColours colours, Action done) + public WelcomeView(WelcomeSession session, NativeTokens colours, Action done) { _session = session; _colours = colours; @@ -165,8 +165,8 @@ private void DrawMenu() var index = i; var (title, detail) = _model.Describe(choice); var words = new StackPanel(); - words.Children.Add(new TextBlock { Text = NativeKeys.Words(title), FontSize = 14.5, FontWeight = FontWeight.Medium, Foreground = _colours.Brush(_colours.Text) }); - words.Children.Add(new TextBlock { Text = NativeKeys.Words(detail), FontSize = 12, Foreground = _colours.Brush(_colours.Dim) }); + words.Children.Add(new TextBlock { Text = NativeKeys.Words(title), FontSize = NativeTokens.Title, FontWeight = FontWeight.Medium, Foreground = _colours.Brush(_colours.Text) }); + words.Children.Add(new TextBlock { Text = NativeKeys.Words(detail), FontSize = NativeTokens.Body, Foreground = _colours.Brush(_colours.Dim) }); var row = ModalParts.Row(words, title, () => SelectChoice(index), () => Choose(choice)); row.Padding = new Thickness(12, 8); _choiceRows.Add(row); @@ -175,7 +175,7 @@ private void DrawMenu() _body.Children.Add(list); - var example = new TextBlock { Margin = new Thickness(22, 6, 22, 0), FontSize = 12.5, Foreground = _colours.Brush(_colours.Dim), TextWrapping = TextWrapping.Wrap }; + var example = new TextBlock { Margin = new Thickness(22, 6, 22, 0), FontSize = NativeTokens.Body, Foreground = _colours.Brush(_colours.Dim), TextWrapping = TextWrapping.Wrap }; example.Inlines!.Add(new global::Avalonia.Controls.Documents.Run("Or type on the command line: ")); example.Inlines.Add(new global::Avalonia.Controls.Documents.Run(WelcomeModel.ExampleCommand) { @@ -221,7 +221,7 @@ TextBlock Label(string text, int row) TextBox Field(string name, string text, string placeholder, int row, int max) { - var box = new TextBox { Text = text, PlaceholderText = placeholder, MaxLength = max, Margin = new Thickness(0, 4), Padding = new Thickness(10, 6), CornerRadius = new CornerRadius(7) }; + var box = new TextBox { Text = text, PlaceholderText = placeholder, MaxLength = max, Margin = new Thickness(0, 4), Padding = new Thickness(10, 6), CornerRadius = new CornerRadius(NativeTokens.RadiusM) }; global::Avalonia.Automation.AutomationProperties.SetName(box, name); Grid.SetRow(box, row); Grid.SetColumn(box, 1); @@ -260,7 +260,7 @@ CheckBox Check(string text, bool on, int row) buttons.Children.Add(back); buttons.Children.Add(connect); _body.Children.Add(buttons); - _footer.Text = "Tab moves · Enter connects · Esc back"; + _footer.Text = "Tab moves between the fields"; DrawProblem(); } diff --git a/src/SharpMUTerm.Client/Modals/ModalSession.cs b/src/SharpMUTerm.Client/Modals/ModalSession.cs index 6ed18f43..fda5509a 100644 --- a/src/SharpMUTerm.Client/Modals/ModalSession.cs +++ b/src/SharpMUTerm.Client/Modals/ModalSession.cs @@ -28,6 +28,12 @@ protected ModalSession(bool isDark, Action closed) /// Whether the client's theme is a dark one. public bool IsDark { get; } + /// + /// A copy of the client's theme when the modal opened, so the host can derive its colours from it as the cells do; + /// null leaves the host the built-in theme of 's variant. + /// + public Core.Theming.Theme? Theme { get; init; } + /// The surface this is (SurfaceCatalog's id). public abstract string Surface { get; } diff --git a/src/SharpMUTerm.Client/Palette/PaletteSession.cs b/src/SharpMUTerm.Client/Palette/PaletteSession.cs index 664128bd..13a3b682 100644 --- a/src/SharpMUTerm.Client/Palette/PaletteSession.cs +++ b/src/SharpMUTerm.Client/Palette/PaletteSession.cs @@ -66,6 +66,9 @@ public PaletteSession( /// Whether the client's theme is a dark one. public bool IsDark { get; } + /// A copy of the client's theme when the palette opened, for the host's colours; null for the variant's built-in. + public Core.Theming.Theme? Theme { get; init; } + /// How many entries the catalog held when the palette opened. public int Total => _catalog.Count; diff --git a/src/SharpMUTerm.Client/Settings/SettingsForm.cs b/src/SharpMUTerm.Client/Settings/SettingsForm.cs index 8296e85e..f7e16590 100644 --- a/src/SharpMUTerm.Client/Settings/SettingsForm.cs +++ b/src/SharpMUTerm.Client/Settings/SettingsForm.cs @@ -112,6 +112,18 @@ public SettingsForm( /// Whether the client's theme is dark — now, so a theme picked here is followed. public bool IsDark => _isDark(); + /// + /// The client's theme now — a copy, read from the host's thread — so the host derives its colours from it as the + /// cells do and follows a theme picked here; null leaves the host the built-in theme of 's variant. + /// + public Func? Theme { get; init; } + + /// + /// Whether the form was opened on an item made from what is on screen (the trigger builder's new rule), so the host + /// should leave the output it was made from in view rather than cover it. + /// + public bool BesideOutput { get; init; } + /// /// Every world (for ) or every character (for ) /// a scoped section can be edited for, in configuration order; empty for an app-wide section. diff --git a/src/SharpMUTerm.Tui/CommandPalette.cs b/src/SharpMUTerm.Tui/CommandPalette.cs index 6bfcab80..92ca51b2 100644 --- a/src/SharpMUTerm.Tui/CommandPalette.cs +++ b/src/SharpMUTerm.Tui/CommandPalette.cs @@ -23,6 +23,12 @@ internal sealed class CommandPalette private readonly Func> _suggested; private Window? _window; + + /// + /// The settings screens' palette for the active theme, so this popup follows Light and Solarized as they do + /// (): its plane, frame and markup are resolved through it. Set by the app on a theme change. + /// + internal ScreenTheme Scheme { get; set; } = ScreenTheme.Dark; private PromptControl? _search; private MarkupControl? _results; private PaletteView _view = Empty; @@ -84,7 +90,18 @@ public void Toggle() private void Open() { _selected = 0; - _search = Controls.Prompt("›").Build(); + var prompt = Controls.Prompt("›"); + if (!Scheme.IsIdentity) + { + // Off Dark the framework's own dark-grey well would be a dark island on the themed surface. + prompt = prompt + .WithInputBackgroundColor(Scheme.Colour(ScreenPalette.EditBg)) + .WithInputFocusedBackgroundColor(Scheme.Colour(ScreenPalette.EditBg)) + .WithInputForegroundColor(Scheme.Colour(ScreenPalette.Value)) + .WithInputFocusedForegroundColor(Scheme.Colour(ScreenPalette.Value)); + } + + _search = prompt.Build(); _search.InputChanged += (_, query) => Refresh(query); _search.Entered += (_, _) => Commit(); @@ -113,7 +130,7 @@ private void Open() .WithTitle("Command surface") .AsModal() .WithBorderStyle(BorderStyle.Single) - .WithBackgroundColor(new Color(ScreenPalette.MenuBg)) + .WithBackgroundColor(Scheme.Colour(ScreenPalette.MenuBg)) .HideTitleButtons() .Resizable(false) .WithSize(width, height) @@ -122,6 +139,7 @@ private void Open() .AddControl(_results) .OnClosed((_, _) => Reset()) .Build(); + Scheme.Frame(_window); _window.PreviewKeyPressed += OnKey; _system.AddWindow(_window); @@ -143,7 +161,7 @@ private void Refresh(string query) } private void Paint() => - _results?.SetContent(CommandSurfaceRenderer.Render(_view, _selected, _context(), _contentWidth)); + _results?.SetContent(Scheme.Lines(CommandSurfaceRenderer.Render(_view, _selected, _context(), _contentWidth), ScreenPalette.MenuBg)); private void Move(int delta) { diff --git a/src/SharpMUTerm.Tui/GameDataOverlay.cs b/src/SharpMUTerm.Tui/GameDataOverlay.cs index 6b3df9e4..006d1a6d 100644 --- a/src/SharpMUTerm.Tui/GameDataOverlay.cs +++ b/src/SharpMUTerm.Tui/GameDataOverlay.cs @@ -22,6 +22,12 @@ internal sealed class GameDataOverlay private readonly TimeProvider _time; private Window? _window; + + /// + /// The settings screens' palette for the active theme, so this popup follows Light and Solarized as they do + /// (): its plane, frame and markup are resolved through it. Set by the app on a theme change. + /// + internal ScreenTheme Scheme { get; set; } = ScreenTheme.Dark; private MarkupControl? _content; private IReadOnlyList _entries = []; private string _owner = string.Empty; @@ -51,14 +57,14 @@ public void Toggle(GameDataStore data, string owner) var desktop = _system.DesktopDimensions; var width = Math.Max(44, desktop.Width - 8); var height = Math.Max(10, desktop.Height - 4); - _content = new MarkupControl(Lines(width - 3, height - 2)); + _content = new MarkupControl(Scheme.Lines(Lines(width - 3, height - 2), ScreenPalette.MenuBg)); // Centered() after WithSize(), for CommandPalette's reason. _window = new WindowBuilder(_system) .WithTitle("Game data") .AsModal() .WithBorderStyle(BorderStyle.Single) - .WithBackgroundColor(new Color(ScreenPalette.MenuBg)) + .WithBackgroundColor(Scheme.Colour(ScreenPalette.MenuBg)) .HideTitleButtons() .Resizable(false) .WithSize(width, height) @@ -66,6 +72,7 @@ public void Toggle(GameDataStore data, string owner) .AddControl(_content) .OnClosed((_, _) => Reset()) .Build(); + Scheme.Frame(_window); _window.PreviewKeyPressed += OnKey; _system.AddWindow(_window); @@ -137,7 +144,7 @@ private void Repaint() { if (_window is { } window) { - _content?.SetContent(Lines(Math.Max(20, window.Width - 3), Math.Max(6, window.Height - 2))); + _content?.SetContent(Scheme.Lines(Lines(Math.Max(20, window.Width - 3), Math.Max(6, window.Height - 2)), ScreenPalette.MenuBg)); } } diff --git a/src/SharpMUTerm.Tui/HistorySurface.cs b/src/SharpMUTerm.Tui/HistorySurface.cs index c1736979..129fa1ed 100644 --- a/src/SharpMUTerm.Tui/HistorySurface.cs +++ b/src/SharpMUTerm.Tui/HistorySurface.cs @@ -50,6 +50,12 @@ internal sealed class HistorySurface private readonly Action? _closed; private Window? _window; + + /// + /// The settings screens' palette for the active theme, so this popup follows Light and Solarized as they do + /// (): its plane, frame and markup are resolved through it. Set by the app on a theme change. + /// + internal ScreenTheme Scheme { get; set; } = ScreenTheme.Dark; private MarkupControl? _body; private IReadOnlyList _snapshot = Array.Empty(); private IReadOnlyList _matches = Array.Empty(); @@ -176,7 +182,7 @@ private void Open() .WithTitle("Command history") .AsModal() .WithBorderStyle(BorderStyle.Single) - .WithBackgroundColor(new Color(ScreenPalette.MenuBg)) + .WithBackgroundColor(Scheme.Colour(ScreenPalette.MenuBg)) .HideTitleButtons() .Resizable(false) .WithSize(width, height) @@ -184,6 +190,7 @@ private void Open() .AddControl(_body) .OnClosed((_, _) => Reset()) .Build(); + Scheme.Frame(_window); _window.PreviewKeyPressed += OnKey; _system.AddWindow(_window); @@ -238,7 +245,7 @@ private void Refilter(string query, int selected) _first = HistorySearchPrompt.Scroll(_first, _selected, _matches.Count, _listRows); } - private void Paint() => _body?.SetContent(new List(Lines)); + private void Paint() => _body?.SetContent(Scheme.Lines(Lines, ScreenPalette.MenuBg)); private void Close() { diff --git a/src/SharpMUTerm.Tui/MessageLogOverlay.cs b/src/SharpMUTerm.Tui/MessageLogOverlay.cs index a4a90cc7..10289014 100644 --- a/src/SharpMUTerm.Tui/MessageLogOverlay.cs +++ b/src/SharpMUTerm.Tui/MessageLogOverlay.cs @@ -31,6 +31,12 @@ internal sealed class MessageLogOverlay private readonly ClientDiagnostics _diagnostics; private Window? _window; + + /// + /// The settings screens' palette for the active theme, so this popup follows Light and Solarized as they do + /// (): its plane, frame and markup are resolved through it. Set by the app on a theme change. + /// + internal ScreenTheme Scheme { get; set; } = ScreenTheme.Dark; private MarkupControl? _content; public MessageLogOverlay(ConsoleWindowSystem system, ClientDiagnostics diagnostics) @@ -55,7 +61,7 @@ public void Toggle() var width = Math.Clamp(ClientMessageRenderer.MaxWidth(entries) + 3, 44, Math.Max(44, desktop.Width - 6)); var height = Math.Clamp(entries.Count + 4, 8, Math.Max(8, desktop.Height - 2)); - _content = new MarkupControl(Lines(width - 3)); + _content = new MarkupControl(Scheme.Lines(Lines(width - 3), ScreenPalette.MenuBg)); // Centered() after WithSize(): the builder reads the bounds set so far and falls back to 80x25, // so centring first places the window as if it were that size (see CommandPalette). @@ -63,7 +69,7 @@ public void Toggle() .WithTitle("Client messages") .AsModal() .WithBorderStyle(BorderStyle.Single) - .WithBackgroundColor(new Color(ScreenPalette.MenuBg)) + .WithBackgroundColor(Scheme.Colour(ScreenPalette.MenuBg)) .HideTitleButtons() .Resizable(false) .WithSize(width, height) @@ -71,6 +77,7 @@ public void Toggle() .AddControl(_content) .OnClosed((_, _) => Reset()) .Build(); + Scheme.Frame(_window); _window.PreviewKeyPressed += OnKey; _system.AddWindow(_window); @@ -95,7 +102,7 @@ internal void StepLevel(int delta) var index = Array.IndexOf(Levels, _diagnostics.MinimumLevel); index = index < 0 ? Array.IndexOf(Levels, LogLevel.Information) : index; _diagnostics.MinimumLevel = Levels[Math.Clamp(index + delta, 0, Levels.Length - 1)]; - _content?.SetContent(Lines(_window is { } window ? Math.Max(20, window.Width - 3) : 80)); + _content?.SetContent(Scheme.Lines(Lines(_window is { } window ? Math.Max(20, window.Width - 3) : 80), ScreenPalette.MenuBg)); } private static string Level(LogLevel level) => level.ToString().ToLowerInvariant(); diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Chrome.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Chrome.cs index b6a2e0e4..1b6b908f 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Chrome.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Chrome.cs @@ -82,7 +82,11 @@ internal ChromeOverlay BuildChromeOverlay() _ink.Notice, Hex(_theme.StatusBackground), Hex(WorkspacePalette.Backdrop(_theme)), - Hex(_theme.Resolve(Core.Text.TerminalColor.Default, isBackground: false))); + Hex(_theme.Resolve(Core.Text.TerminalColor.Default, isBackground: false))) + { + BrandInk = WorkspacePalette.HeaderInk(_theme, ParseHex(brand)).ToHex(), + HeaderMuted = WorkspacePalette.HeaderMuted(_theme).ToHex(), + }; return new ChromeOverlay( Host.Chrome, @@ -214,4 +218,11 @@ internal sealed record ChromePalette( string Notice, string HeaderPlane, string RailPlane, - string Ink); + string Ink) +{ + /// The ink on , held to the header's floor — light on a light theme's deep fill. + public string BrandInk { get; init; } = "#000000"; + + /// The header's quiet text (counts, a pill's detail, the search hint), held to the header's floor on its band. + public string HeaderMuted { get; init; } = "#808080"; +} diff --git a/src/SharpMUTerm.Tui/PrefixOverlay.cs b/src/SharpMUTerm.Tui/PrefixOverlay.cs index 00eeec1a..f66d7cb2 100644 --- a/src/SharpMUTerm.Tui/PrefixOverlay.cs +++ b/src/SharpMUTerm.Tui/PrefixOverlay.cs @@ -40,6 +40,12 @@ internal sealed class PrefixOverlay private readonly Action _run; private Window? _window; + + /// + /// The settings screens' palette for the active theme, so this popup follows Light and Solarized as they do + /// (): its plane, frame and markup are resolved through it. Set by the app on a theme change. + /// + internal ScreenTheme Scheme { get; set; } = ScreenTheme.Dark; private PrefixFacts _current = PrefixFacts.Fresh; /// @@ -99,14 +105,15 @@ public void Open() .WithTitle("⌃B — pane commands") .AsModal() .WithBorderStyle(BorderStyle.Single) - .WithBackgroundColor(new Color(ScreenPalette.MenuBg)) + .WithBackgroundColor(Scheme.Colour(ScreenPalette.MenuBg)) .HideTitleButtons() .Resizable(false) .WithSize(width, height) .Centered() - .AddControl(new MarkupControl(new List(lines))) + .AddControl(new MarkupControl(Scheme.Lines(lines, ScreenPalette.MenuBg))) .OnClosed((_, _) => Reset()) .Build(); + Scheme.Frame(_window); _window.PreviewKeyPressed += OnKey; _system.AddWindow(_window); diff --git a/src/SharpMUTerm.Tui/QuitOverlay.cs b/src/SharpMUTerm.Tui/QuitOverlay.cs index ac11b860..4f5ae4b6 100644 --- a/src/SharpMUTerm.Tui/QuitOverlay.cs +++ b/src/SharpMUTerm.Tui/QuitOverlay.cs @@ -28,6 +28,12 @@ internal sealed class QuitOverlay private readonly Action? _closed; private Window? _window; + + /// + /// The settings screens' palette for the active theme, so this popup follows Light and Solarized as they do + /// (): its plane, frame and markup are resolved through it. Set by the app on a theme change. + /// + internal ScreenTheme Scheme { get; set; } = ScreenTheme.Dark; private MarkupControl? _body; private QuitModel _current = QuitModel.Nothing; private QuitChoice _selected = QuitChoice.Stay; @@ -85,7 +91,7 @@ private void Open() _selected = QuitChoice.Stay; var lines = QuitPrompt.Render(_current, _selected); - _body = new MarkupControl(new List(lines)); + _body = new MarkupControl(Scheme.Lines(lines, ScreenPalette.MenuBg)); // Hug the content: the question is as tall as it has things to say. Centred *after* WithSize, // because the builder reads the bounds set so far and falls back to 80x25 otherwise. @@ -98,7 +104,7 @@ private void Open() .WithTitle("Quit") .AsModal() .WithBorderStyle(BorderStyle.Single) - .WithBackgroundColor(new Color(ScreenPalette.MenuBg)) + .WithBackgroundColor(Scheme.Colour(ScreenPalette.MenuBg)) .HideTitleButtons() .Resizable(false) .WithSize(width, height) @@ -106,6 +112,7 @@ private void Open() .AddControl(_body) .OnClosed((_, _) => Reset()) .Build(); + Scheme.Frame(_window); _window.PreviewKeyPressed += OnKey; _system.AddWindow(_window); @@ -136,7 +143,7 @@ private void OnKey(object? sender, KeyPressedEventArgs e) break; case QuitAction.Redraw: - _body?.SetContent(new List(QuitPrompt.Render(_current, _selected))); + _body?.SetContent(Scheme.Lines(QuitPrompt.Render(_current, _selected), ScreenPalette.MenuBg)); _window.Invalidate(redrawAll: true); break; diff --git a/src/SharpMUTerm.Tui/SearchSurface.cs b/src/SharpMUTerm.Tui/SearchSurface.cs index 0a2e8cf9..5b54d370 100644 --- a/src/SharpMUTerm.Tui/SearchSurface.cs +++ b/src/SharpMUTerm.Tui/SearchSurface.cs @@ -50,6 +50,12 @@ internal sealed class SearchSurface private readonly Action? _closed; private Window? _window; + + /// + /// The settings screens' palette for the active theme, so this popup follows Light and Solarized as they do + /// (): its plane, frame and markup are resolved through it. Set by the app on a theme change. + /// + internal ScreenTheme Scheme { get; set; } = ScreenTheme.Dark; private MarkupControl? _body; private SearchModel _model = Empty; private int _selected = -1; @@ -190,7 +196,7 @@ private void Open() .WithTitle("Search output") .AsModal() .WithBorderStyle(BorderStyle.Single) - .WithBackgroundColor(new Color(ScreenPalette.MenuBg)) + .WithBackgroundColor(Scheme.Colour(ScreenPalette.MenuBg)) .HideTitleButtons() .Resizable(false) .WithSize(width, height) @@ -198,6 +204,7 @@ private void Open() .AddControl(_body) .OnClosed((_, _) => Reset()) .Build(); + Scheme.Frame(_window); _window.PreviewKeyPressed += OnKey; _system.AddWindow(_window); @@ -252,7 +259,7 @@ private void Refilter(string query, bool regex, bool all, int selected) _first = SearchPrompt.Scroll(_first, _selected, _model.Rows.Count, _listRows); } - private void Paint() => _body?.SetContent(new List(Lines)); + private void Paint() => _body?.SetContent(Scheme.Lines(Lines, ScreenPalette.MenuBg)); private void Close() { diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.NativeModals.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.NativeModals.cs index e5e6e6b0..58f69dcb 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.NativeModals.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.NativeModals.cs @@ -93,7 +93,10 @@ private void ToggleQuit() QuitFactsNow(), ThemeIsDark(), () => OnUiThread(Quit), - () => OnUiThread(() => NativeModalClosed(session!))); + () => OnUiThread(() => NativeModalClosed(session!))) + { + Theme = _theme.Clone(), + }; _nativeQuit = session; native.Show(session); return; @@ -142,7 +145,10 @@ private bool TryOpenNativeSearch() } }), (model, index) => OnUiThread(() => GoToSearchHit(model, index)), - () => OnUiThread(() => NativeModalClosed(session!))); + () => OnUiThread(() => NativeModalClosed(session!))) + { + Theme = _theme.Clone(), + }; ShowNativeModal(native, session); return true; } @@ -162,6 +168,7 @@ private bool TryOpenNativeHistory(string query = "") index => OnUiThread(() => InsertHistoryEntry(index)), () => OnUiThread(() => NativeModalClosed(session!))) { + Theme = _theme.Clone(), InitialQuery = query, }; ShowNativeModal(native, session); @@ -188,7 +195,10 @@ private bool TryOpenNativeLayouts(string key) session!.Publish(LayoutsModelFor(key)); } }), - () => OnUiThread(() => NativeModalClosed(session!))); + () => OnUiThread(() => NativeModalClosed(session!))) + { + Theme = _theme.Clone(), + }; ShowNativeModal(native, session); return true; } @@ -238,7 +248,10 @@ void Republish() welcome.Back(); Republish(); }), - () => OnUiThread(() => NativeModalClosed(session!))); + () => OnUiThread(() => NativeModalClosed(session!))) + { + Theme = _theme.Clone(), + }; ShowNativeModal(native, session); return true; } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.NativePalette.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.NativePalette.cs index abb9e151..6d3d5a6f 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.NativePalette.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.NativePalette.cs @@ -74,7 +74,10 @@ private bool TryOpenNativePalette() ThemeIsDark(), _openingQuery ?? string.Empty, id => OnUiThread(() => RunFromPalette(id)), - () => OnUiThread(() => NativePaletteClosed(session!))); + () => OnUiThread(() => NativePaletteClosed(session!))) + { + Theme = _theme.Clone(), + }; _nativePaletteSession = session; native.Show(session); return true; diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs index a3790853..760a2ca4 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs @@ -213,7 +213,10 @@ private IWindowControl NewVitalsPanel(TerminalPanelContext context) /// meaning, so they are lifted like text; the empty part of a bar is a grey that still reads as a track. /// private VitalsStripRenderer.Ink VitalsInk() => - new(_ink.Accent, _ink.Notice, _ink.Lift(new Rgb(0x6a, 0x6a, 0x72))); + new(_ink.Accent, LowInk(_ink.Plane), _ink.Lift(new Rgb(0x6a, 0x6a, 0x72))); + + /// The low cue's ink on (), as markup. + private string LowInk(Rgb plane) => WorkspacePalette.Low(_theme, ParseHex(_ink.Notice), plane).ToHex(); // --- Quick bar -------------------------------------------------------------------------------------------- diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Settings.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Settings.cs index 7c490e18..101dd054 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Settings.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Settings.cs @@ -192,6 +192,8 @@ internal SettingsForm NativeSettingsForm(string initial, object? item = null) { Packages = PackageManager, Selections = _listSelections, + Theme = () => _theme.Clone(), + BesideOutput = item is not null, }; return form; } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Theme.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Theme.cs index e7ba65b0..51c57933 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Theme.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Theme.cs @@ -49,6 +49,23 @@ private void ApplyThemeIfChanged() } } + /// + /// Hands the workspace popups — ⌃P, the quit prompt, ⌃F, ⌃R, the ⌃B panel, the game data and the message log — the + /// settings screens' palette for the active theme (), so they follow Light and Solarized + /// as the settings screens do rather than painting the Dark theme's navy over a light workspace. Each resolves its + /// plane, frame and markup through it the next time it opens. + /// + private void SchemePopups() + { + _palette.Scheme = _screens; + _quit.Scheme = _screens; + _search.Scheme = _screens; + _historySearch.Scheme = _screens; + _prefixPanel.Scheme = _screens; + _gameData.Scheme = _screens; + _messageLog.Scheme = _screens; + } + /// /// Re-derives everything the client paints from . The caller () /// goes on to repaint the header, the rail, the pane planes, the bars and the backdrop, which all read @@ -69,9 +86,12 @@ private void ApplyTheme(Theme theme) _sendMenu.Scheme = _screens; _layoutsView.Scheme = _screens; _welcomeView.Scheme = _screens; + SchemePopups(); _header.BackgroundColor = ToColor(theme.StatusBackground); _header.FocusedLinkForegroundColor = ToColor(theme.Resolve(TerminalColor.Default, isBackground: true)); + var brand = AccentPalette[2]; + _header.FocusedLinkBackgroundColor = ToColor(WorkspacePalette.HeaderFill(theme, new Rgb(brand.R, brand.G, brand.B))); _window.ForegroundColor = ToColor(theme.Resolve(TerminalColor.Default, isBackground: false)); foreach (var control in _panes.Values) { diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 56cc8777..e979cbf0 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -838,7 +838,7 @@ public SharpMUTermApp( _header.BackgroundColor = ToColor(_theme.StatusBackground); // the menu bar is a distinct chrome band // Keep the clickable brand button on-brand (violet) instead of the driver's default link highlight. var brand = AccentPalette[2]; - _header.FocusedLinkBackgroundColor = ToColor(new Rgb(brand.R, brand.G, brand.B)); + _header.FocusedLinkBackgroundColor = ToColor(WorkspacePalette.HeaderFill(_theme, new Rgb(brand.R, brand.G, brand.B))); _header.FocusedLinkForegroundColor = ToColor(_theme.Resolve(TerminalColor.Default, isBackground: true)); // A host that draws the header (the window) gets no header row at all: hidden, a sticky band takes no row, @@ -952,6 +952,7 @@ public SharpMUTermApp( InsertHistoryEntry); _search = new SearchSurface(_system, SearchModelFor, GoToSearchHit); + SchemePopups(); _window.OnResize += (_, _) => { @@ -8015,19 +8016,16 @@ private string AccentHex(TerminalColor accent) => /// A world's accent as a fill — the header ribbon's segments. Deliberately not lifted: /// a fill is identity, the same reasoning the pane tints are built on, and holding one to a floor /// against a plane it covers rather than sits on would flatten the ribbon's own hues to a row of - /// near-identical pastels. What has to clear the floor is the text on it, which is . + /// near-identical pastels. What has to clear the floor is the text on it, which is . + /// A light theme deepens it () so its ink can be light. /// private string FillHex(TerminalColor accent) => - accent.Kind == TerminalColorKind.Rgb - ? new Rgb(accent.R, accent.G, accent.B).ToHex() - : _ink.Accent; + WorkspacePalette.HeaderFill( + _theme, + accent.Kind == TerminalColorKind.Rgb ? new Rgb(accent.R, accent.G, accent.B) : ParseHex(_ink.Accent)).ToHex(); - /// - /// Text on a known fill, held to the floor against that fill rather than against any plane — - /// the ribbon's segment labels and the ● that wears the world's colour on the character chip. - /// - private static string Ink(string inkHex, string fillHex) => - ChromeInk.On(ParseHex(inkHex), ParseHex(fillHex)); + /// The ink on a header segment's , held to the header's floor. + private string SegmentInk(string fillHex) => WorkspacePalette.HeaderInk(_theme, ParseHex(fillHex)).ToHex(); /// A #rrggbb markup colour back as a colour. private static Rgb ParseHex(string hex) => new( @@ -13704,7 +13702,6 @@ private string HeaderMarkup(HeaderModel model) // The menu affordance opens the command surface (caret flips to ▾ while it's open). The whole // identity cluster is a powerline ribbon — menu ▸ world ▸ character — flowing accent colours. var caret = model.MenuOpen ? "▾" : Glyphs.Menu; - var dark = Hex(_theme.Resolve(TerminalColor.Default, isBackground: true)); var headerBg = Hex(_theme.StatusBackground); // The dim chrome the character segment sits on. Derived rather than the literal #3f4859 it was: // the header is painted on the theme's own chrome band, and a fixed dark chip under a *light* @@ -13720,14 +13717,14 @@ private string HeaderMarkup(HeaderModel model) // legible is the text *on* it, so each segment's ink is measured against the fill it lands on. var brandBg = FillHex(AccentPalette[2]); // violet var sb = new System.Text.StringBuilder(); - sb.Append($"[link={HeaderModel.PaletteTarget}][bold {Ink(dark, brandBg)} on {brandBg}] {caret} muterm [/][/]"); + sb.Append($"[link={HeaderModel.PaletteTarget}][bold {SegmentInk(brandBg)} on {brandBg}] {caret} muterm [/][/]"); var tail = brandBg; if (model.World is { } active) { var worldAccent = FillHex(active.Accent); sb.Append($"[{tail} on {worldAccent}]{Glyphs.PowerRight}[/]"); - sb.Append($"[bold {Ink(dark, worldAccent)} on {worldAccent}] {Escape(active.Name)} [/]"); + sb.Append($"[bold {SegmentInk(worldAccent)} on {worldAccent}] {Escape(active.Name)} [/]"); tail = worldAccent; if (model.Character?.Name is { } name) { @@ -13736,7 +13733,7 @@ private string HeaderMarkup(HeaderModel model) // The ● wears the world's colour and is *text* here rather than a fill, so it is the one // place on this row the accent has to clear the floor — against the chip, which is the // plane it actually lands on. - sb.Append($"[{Ink(worldAccent, chip)} on {chip}] ● {Escape(name)} [/]"); + sb.Append($"[{Contrast.Legible(ParseHex(worldAccent), chipRgb, WorkspacePalette.HeaderTextFloor).ToHex()} on {chip}] ● {Escape(name)} [/]"); tail = chip; } } @@ -13765,17 +13762,20 @@ private string HeaderMarkup(HeaderModel model) // graphics readout, which took the 80-column layout to precisely 80 cells; dropping that (see // below) gave the width back. InputAreaLayoutTests.TheFirstFrameFitsTheTerminalItIsOn(80) is the // test that says so, and anything added here has to keep it passing. + // The quiet half of the row is held to the header's floor on its band rather than left to the framework's + // fixed [dim] grey, which is 3.4:1 on Dark's band and less on Light's. + var muted = WorkspacePalette.HeaderMuted(_theme).ToHex(); var conn = model.HasWorlds ? $"{model.ConnectedText} " : string.Empty; var log = model.Log == LogFormat.None - ? $"[dim]{Glyphs.Log} {model.LogText}[/]" - : $"[{_ink.Accent}]{Glyphs.Log}[/] [dim]{model.LogText}[/]"; + ? $"[{muted}]{Glyphs.Log} {model.LogText}[/]" + : $"[{Contrast.Legible(ParseHex(_ink.Accent), _theme.StatusBackground, WorkspacePalette.HeaderTextFloor).ToHex()}]{Glyphs.Log}[/] [{muted}]{model.LogText}[/]"; // No graphics readout here. Which protocol the probe settled on is decided once at startup and // never changes, so a permanent cell of chrome spends the row's scarcest resource on a fact that // cannot become news — and it was already said twice elsewhere: the session prints // "*** SharpMUTerm — theme '…', graphics: …" when it opens, and the not-connected status line // repeats it. A startup fact belongs where startup facts are read, not in the row that has to // fit an identity ribbon and a live count at eighty columns. - var right = $"[dim]{conn}[/]{log} "; + var right = $"[{muted}]{conn}[/]{log} "; // Right-align the status cluster to the far edge so the menu bar spans the whole console. var gap = Math.Max(3, HeaderWidth() - MarkupWidth(leftBar) - MarkupWidth(right)); @@ -13970,7 +13970,7 @@ private string StatusBarMarkup(string character, string state) _statusMetersHidden = VitalsStripShowing(); var meters = _statusMetersHidden ? string.Empty - : StatusMeterRenderer.Render(StatusMeters(), StatusData(), $"{_ink.Notice}"); + : StatusMeterRenderer.Render(StatusMeters(), StatusData(), LowInk(_theme.StatusBackground)); var right = new List(); @@ -14037,7 +14037,7 @@ private string StatusBarMarkup(string character, string state) // either of those two cells, and they used to be the thing that lost — at 80 columns a world // publishing HP showed none of it. var compactMeters = meters.Length > 0 - ? StatusMeterRenderer.Render(StatusMeters(), StatusData(), $"{_ink.Notice}", compact: true) + ? StatusMeterRenderer.Render(StatusMeters(), StatusData(), LowInk(_theme.StatusBackground), compact: true) : string.Empty; var meterCost = compactMeters.Length > 0 ? 3 + MarkupWidth(compactMeters) + MeterSlack : 0; foreach (var droppable in new[] { encodingCell, paletteCell }) @@ -14072,7 +14072,7 @@ private string StatusBarMarkup(string character, string state) && MarkupWidth(left) + 3 + MarkupWidth(meters) + MarkupWidth(rightBar) + MinStatusGap + MeterSlack > HeaderWidth()) { // Too narrow for value/max: the share alone, in a field just as fixed. - meters = StatusMeterRenderer.Render(StatusMeters(), StatusData(), $"{_ink.Notice}", compact: true); + meters = StatusMeterRenderer.Render(StatusMeters(), StatusData(), LowInk(_theme.StatusBackground), compact: true); } if (meters.Length > 0 diff --git a/src/SharpMUTerm.Tui/WorkspacePalette.cs b/src/SharpMUTerm.Tui/WorkspacePalette.cs index 614d95bf..b05b1814 100644 --- a/src/SharpMUTerm.Tui/WorkspacePalette.cs +++ b/src/SharpMUTerm.Tui/WorkspacePalette.cs @@ -293,6 +293,66 @@ internal static Rgb HeaderChip(Theme theme) return Mix(theme.StatusBackground, theme.Foreground, ChipLift); } + /// + /// The floor the header's text is held to — WCAG AA for body text. The header is the one row every frame carries, + /// and its segment labels are names a reader looks for, not de-emphasis; (3:1) is for + /// the workspace's own chrome and left Light's ribbon at exactly 3.01:1. + /// + internal const double HeaderTextFloor = 4.5; + + /// + /// A header ribbon segment's fill for . A dark theme keeps the segment's own neon (the + /// identity the ribbon exists to show, inked in the dark background). A light theme gets a deep fill of the + /// same hue — darkened until the theme's own light background reads on it at — and is + /// inked light, because Dark's neon with ink driven down to the floor read washed out. Both hosts read it: the cell + /// header and the native one (ChromePalette.Brand). + /// + internal static Rgb HeaderFill(Theme theme, Rgb fill) + { + ArgumentNullException.ThrowIfNull(theme); + return Contrast.RelativeLuminance(theme.Background) < LightPlaneLuminance + ? fill + : Contrast.Legible(fill, theme.Background, HeaderTextFloor); + } + + /// + /// The ink on a header segment's fill: the theme's own background (dark on a dark theme's neon, light on a light + /// theme's deep fill), held to against the fill it lands on. + /// + internal static Rgb HeaderInk(Theme theme, Rgb fill) + { + ArgumentNullException.ThrowIfNull(theme); + return Contrast.Legible(theme.Background, fill, HeaderTextFloor); + } + + /// The header's quiet text (the counts, the log state), held to on its band. + internal static Rgb HeaderMuted(Theme theme) + { + ArgumentNullException.ThrowIfNull(theme); + return Contrast.Legible(Mix(theme.StatusBackground, theme.StatusForeground, MutedLean), theme.StatusBackground, HeaderTextFloor); + } + + /// + /// The low cue on a meter (a vital below StatusMeterRenderer.LowShare): its bar, its value and its low + /// mark, in both hosts. A dark theme keeps the client's notice amber (), which reads as a + /// warning on a dark plane. A light theme gets a deep orange held to on + /// : the amber pushed down to a light plane's floor turns olive, and the cue then read as a + /// grey word over an olive bar — no warning at all (UX audit #29). + /// + internal static Rgb Low(Theme theme, Rgb notice, Rgb plane) + { + ArgumentNullException.ThrowIfNull(theme); + return Contrast.RelativeLuminance(theme.Background) < LightPlaneLuminance + ? notice + : Contrast.Legible(LowBase, plane, HeaderTextFloor); + } + + /// The light themes' low cue before the plane has said how deep it must be: a warm, saturated orange. + private static readonly Rgb LowBase = new(0xe8, 0x59, 0x0c); + + /// How far the header's quiet text leans from its band toward its ink before the floor is applied. + private const double MutedLean = 0.55; + /// /// How far the header chip is lifted toward the theme's ink: enough that the wedge between the two /// reads as a shape, no further, since this is a background for a name and not a highlight. diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativeModalTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativeModalTests.cs index 4dc5cb68..9ab00c43 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/NativeModalTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/NativeModalTests.cs @@ -93,7 +93,7 @@ public async Task CtrlFOpensTheNativeSearchOverEverythingWithTheBoxFocused() await Assert.That(focused).IsTrue(); await Assert.That(cellOpen).IsFalse().Because("no cell search under the native one"); await Assert.That(onTop).IsTrue().Because("nothing native draws over it"); - await Assert.That(colours).IsEqualTo(ModalColours.Dark).Because("the demo's theme is Dark"); + await Assert.That(colours).IsEqualTo(NativeTokens.Dark).Because("the demo's theme is Dark"); } /// @@ -126,7 +126,7 @@ public async Task TheCardFollowsALightTheme() return rig.Driver.Modals.Quit!.Colours; }, theme: "Light"); - await Assert.That(colours).IsEqualTo(ModalColours.Light); + await Assert.That(colours).IsEqualTo(NativeTokens.Light); } [Test] diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativeTokenTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativeTokenTests.cs new file mode 100644 index 00000000..265ce032 --- /dev/null +++ b/tests/SharpMUTerm.Avalonia.Tests/NativeTokenTests.cs @@ -0,0 +1,211 @@ +using System.Text.RegularExpressions; +using Avalonia; +using Avalonia.Controls; +using Avalonia.Headless; +using Avalonia.Media; +using Avalonia.Threading; +using SharpMUTerm.Client.Settings; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Text; +using SharpMUTerm.Core.Theming; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Avalonia.Tests; + +/// +/// The window has one design language (): its planes, inks, radii and type sizes come from one +/// place, derived from the client's theme, and every ink clears the text floor on the planes it is drawn on. The audit +/// that asked for it counted 15 font sizes, 8 radii and 33 literal colours across the window's views, and a Fluent blue +/// settings window beside a teal palette. +/// +[NotInParallel] +public class NativeTokenTests +{ + /// + /// Files allowed a literal size or colour, and why. Nothing else in the window's assembly may write one: a new view + /// takes its sizes from the ramp and its colours from the tokens, or it is a second design language again. + /// + private static readonly Dictionary Allowed = new(StringComparer.Ordinal) + { + ["NativeTokens.cs"] = "the tokens themselves", + }; + + [Test] + public async Task NoViewWritesALiteralFontSizeOrColour() + { + var root = Path.Combine(RepositoryRoot(), "src", "SharpMUTerm.Avalonia"); + var size = new Regex(@"\bFontSize\s*=\s*[0-9]", RegexOptions.Compiled); + var colour = new Regex("Color\\.Parse\\(\"#", RegexOptions.Compiled); + var offenders = new List(); + foreach (var file in Directory.EnumerateFiles(root, "*.cs", SearchOption.TopDirectoryOnly)) + { + if (Allowed.ContainsKey(Path.GetFileName(file))) + { + continue; + } + + var lines = File.ReadAllLines(file); + for (var i = 0; i < lines.Length; i++) + { + var line = lines[i].Trim(); + if (line.StartsWith("//", StringComparison.Ordinal)) + { + continue; + } + + if (size.IsMatch(line) || colour.IsMatch(line)) + { + offenders.Add($"{Path.GetFileName(file)}:{i + 1}: {line}"); + } + } + } + + await Assert.That(offenders).IsEmpty().Because(string.Join("\n", offenders)); + } + + [Test] + public async Task TheDarkAndLightThemesResolveToThePalettesOwnCards() + { + await Assert.That(NativeTokens.Dark.Card).IsEqualTo(Color.Parse("#1e1e25")); + await Assert.That(NativeTokens.Dark.Accent).IsEqualTo(Color.Parse("#00f5b7")).Because("the client's own teal, already legible on a dark card"); + await Assert.That(NativeTokens.Light.Card).IsEqualTo(Colors.White); + await Assert.That(NativeTokens.Dark.IsDark).IsTrue(); + await Assert.That(NativeTokens.Light.IsDark).IsFalse(); + } + + [Test] + public async Task SolarizedGetsItsOwnHueNotTheDarkThemesGrey() + { + var solarized = NativeTokens.For(ThemeLibrary.SolarizedDark()); + await Assert.That(solarized.Card).IsNotEqualTo(NativeTokens.Dark.Card); + await Assert.That(solarized.Card.B).IsGreaterThan(solarized.Card.R).Because("Solarized's background is a blue-green"); + } + + [Test] + [Arguments("Dark")] + [Arguments("Light")] + [Arguments("Solarized Dark")] + public async Task EveryInkClearsTheTextFloorOnEveryPlaneItIsDrawnOn(string name) + { + var tokens = NativeTokens.For(ThemeLibrary.Get(name)); + Color[] planes = [tokens.Card, tokens.Selected, tokens.Raised]; + var misses = new List(); + foreach (var (ink, label) in new[] + { + (tokens.Text, "text"), (tokens.Dim, "dim"), (tokens.Header, "header"), (tokens.Accent, "accent"), + (tokens.Warn, "warn"), (tokens.Notice, "notice"), + }) + { + foreach (var plane in planes) + { + var ratio = Contrast.Ratio(Rgb(ink), Rgb(plane)); + if (ratio < NativeTokens.TextFloor) + { + misses.Add($"{label} {ink} on {plane}: {ratio:0.00}"); + } + } + } + + misses.AddRange(Contrast.Ratio(Rgb(tokens.AccentInk), Rgb(tokens.Accent)) < NativeTokens.TextFloor ? ["accent ink"] : []); + misses.AddRange(Contrast.Ratio(Rgb(tokens.KeyInk), Rgb(tokens.KeyFill)) < NativeTokens.TextFloor ? ["key ink"] : []); + await Assert.That(misses).IsEmpty().Because(string.Join("\n", misses)); + } + + /// + /// The settings window wears the tokens: its plane is the palette's card and Fluent's accent is the client's, not + /// Fluent's own blue (#60cdff/#005fb8) — and it follows a Light theme the same way. + /// + [Test] + [Arguments("Dark")] + [Arguments("Light")] + public async Task TheSettingsWindowWearsTheTokens(string name) + { + var theme = ThemeLibrary.Get(name); + var (background, accent, close) = await TerminalViewTests.Session.Dispatch(() => + { + var config = new AppConfiguration(); + var form = new SettingsForm(BuiltInSettings.All, config, c => c(), _ => { }, "text", isDark: name != "Light") + { + Theme = () => theme, + }; + var window = new SettingsWindow(form); + window.Show(); + Dispatcher.UIThread.RunJobs(); + try + { + return (((ISolidColorBrush)window.Background!).Color, (Color)window.Resources["SystemAccentColor"]!, window.CloseButton.IsVisible); + } + finally + { + window.Close(); + } + }, CancellationToken.None); + + var tokens = NativeTokens.For(theme); + await Assert.That(background).IsEqualTo(tokens.Card); + await Assert.That(accent).IsEqualTo(tokens.Accent); + await Assert.That(close).IsTrue().Because("the frame has its own close button"); + } + + /// + /// The settings window is a modal over the main window: a scrim lies over it while it is open (a press on it closes + /// the settings) and goes with it. Opened beside the output — the trigger builder — it is docked to the main window's + /// right half with no scrim, so the line the rule was made from stays in view. + /// + [Test] + public async Task TheSettingsAreAModalUnlessTheyOpenBesideTheOutput() + { + var (veiled, unveiled, besideScrim, left, width, mainWidth) = await TerminalViewTests.Session.Dispatch(() => + { + var presenter = new SettingsPresenter(); + var root = new Panel(); + var main = new Window { Content = root, Width = 1400, Height = 700 }; + presenter.Owner = main; + main.Show(); + var config = new AppConfiguration(); + try + { + var window = presenter.ShowNow(new SettingsForm(BuiltInSettings.All, config, c => c(), _ => { }, "text", isDark: true)); + Dispatcher.UIThread.RunJobs(); + var veiled = presenter.Scrim is { } scrim && root.Children.Contains(scrim); + window.Close(); + Dispatcher.UIThread.RunJobs(); + var unveiled = presenter.Scrim is null && root.Children.Count == 0; + + var beside = presenter.ShowNow(new SettingsForm(BuiltInSettings.All, config, c => c(), _ => { }, "triggers", isDark: true) + { + BesideOutput = true, + }); + Dispatcher.UIThread.RunJobs(); + var result = (veiled, unveiled, presenter.Scrim is not null, beside.Position.X - main.Position.X, beside.Width, main.ClientSize.Width); + beside.Close(); + return result; + } + finally + { + main.Close(); + } + }, CancellationToken.None); + + await Assert.That(veiled).IsTrue().Because("the main window is under a scrim while the settings are open"); + await Assert.That(unveiled).IsTrue().Because("the scrim goes with the settings"); + await Assert.That(besideScrim).IsFalse().Because("beside the output nothing covers the output"); + await Assert.That(width).IsEqualTo(mainWidth / 2).Because("docked to the right half"); + await Assert.That((double)left).IsEqualTo(mainWidth / 2).Within(1); + } + + private static Rgb Rgb(Color colour) => new(colour.R, colour.G, colour.B); + + private static string RepositoryRoot() + { + for (var dir = new DirectoryInfo(AppContext.BaseDirectory); dir is not null; dir = dir.Parent) + { + if (File.Exists(Path.Combine(dir.FullName, "SharpMUTerm.slnx"))) + { + return dir.FullName; + } + } + + throw new InvalidOperationException("SharpMUTerm.slnx not found above " + AppContext.BaseDirectory); + } +} From 9b5942524ee876a7377571025a0541bbeb21133b Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 10:55:45 +0000 Subject: [PATCH 038/113] UX wave 10: bars fit their pane, one name per character, palette, F4, welcome MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Away/activity/search/restore bars are sized to the pane (BarRule), elide the label first, and redraw in place on resize (SyncChromeBarWidths). - PaneLine.Plain comes from the line's spans, so anchored patterns match highlighted lines in Ctrl+F and F2's live test. - CharacterNames / DisplayName: "Corvid · Aetherfall" on every surface. - Ctrl+F footer drop ladder; the surface fits 80 columns. - Command palette naming, OUTPUT group, strict short-word fuzzy matching. - F4 and quick bar keys in glyphs; F4 footer ladder. - Window delivers numpad keys (HostKeys.DeliversNumpad, KeyMapper). - Collapsed rail world marks and two-letter initials. - Welcome copy in WelcomeModel, shared by both hosts; editable route combo. - Reconnect hints name the key; F1 names an offline window's owner. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 21 +++ CLAUDE.md | 29 +++- src/SharpMUTerm.Avalonia/KeyMapper.cs | 5 + src/SharpMUTerm.Avalonia/ListEditorView.cs | 26 ++- src/SharpMUTerm.Avalonia/NativeChrome.cs | 4 +- src/SharpMUTerm.Avalonia/PaletteOverlay.cs | 2 +- src/SharpMUTerm.Avalonia/TerminalView.cs | 4 +- src/SharpMUTerm.Avalonia/WelcomeView.cs | 35 ++-- src/SharpMUTerm.Avalonia/WindowHost.cs | 3 + .../Chrome/CharacterNames.cs | 71 ++++++++ .../Commands/BuiltInCommands.cs | 6 +- src/SharpMUTerm.Client/Modals/LayoutsModel.cs | 2 +- src/SharpMUTerm.Client/Modals/WelcomeModel.cs | 59 ++++++- .../Palette/CommandPaletteModel.cs | 2 +- src/SharpMUTerm.Client/Palette/FuzzyMatch.cs | 66 ++++--- .../Settings/PackageCollection.cs | 4 +- src/SharpMUTerm.Tui/AwayBarRenderer.cs | 18 +- src/SharpMUTerm.Tui/BarRule.cs | 49 ++++++ src/SharpMUTerm.Tui/CommandPalette.cs | 2 +- src/SharpMUTerm.Tui/Hosting/HostKeys.cs | 9 + src/SharpMUTerm.Tui/KeypadScreenRenderer.cs | 29 +++- src/SharpMUTerm.Tui/MacroKeys.cs | 7 +- src/SharpMUTerm.Tui/MarkupText.cs | 19 ++ src/SharpMUTerm.Tui/PaneLine.cs | 4 +- src/SharpMUTerm.Tui/RailRenderer.cs | 38 +++- src/SharpMUTerm.Tui/RestoreBarRenderer.cs | 9 +- src/SharpMUTerm.Tui/SearchBarRenderer.cs | 13 +- src/SharpMUTerm.Tui/SearchPrompt.cs | 20 ++- src/SharpMUTerm.Tui/SearchSurface.cs | 7 +- .../SharpMUTermApp.ChromeBars.cs | 57 ++++++ .../SharpMUTermApp.Contributions.cs | 14 ++ src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs | 6 +- src/SharpMUTerm.Tui/SharpMUTermApp.Names.cs | 27 +++ .../SharpMUTermApp.NativePalette.cs | 2 +- src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs | 2 +- .../SharpMUTermApp.SendGroup.cs | 4 +- .../SharpMUTermApp.TriggerBuilder.cs | 2 +- src/SharpMUTerm.Tui/SharpMUTermApp.cs | 49 +++--- src/SharpMUTerm.Tui/WelcomeSurface.cs | 35 ++-- .../PackagePageTests.cs | 4 +- .../SurfaceParityTests.cs | 14 +- .../CharacterNamesTests.cs | 35 ++++ .../CommandPaletteModelTests.cs | 40 ++++- .../PackageSettingsTests.cs | 4 +- .../ClientHostContractTests.cs | 1 + .../ConnectionKeysTests.cs | 2 +- .../KeypadScreenRendererTests.cs | 6 +- .../MacroKeyCaptureTests.cs | 2 +- .../NativeModalRoutingTests.cs | 2 +- .../SharpMUTerm.Tui.Tests/PackagesAppTests.cs | 2 +- .../PaletteDiscoverabilityTests.cs | 2 +- .../PaneActivationTests.cs | 4 +- .../RailRendererTests.cs | 2 +- .../SessionStateAccountingTests.cs | 4 +- .../SharpMUTerm.Tui.Tests/SurfaceCellTests.cs | 2 +- tests/SharpMUTerm.Tui.Tests/WaveTenTests.cs | 163 ++++++++++++++++++ tests/SharpMUTerm.Tui.Tests/WelcomeTests.cs | 2 +- 57 files changed, 861 insertions(+), 191 deletions(-) create mode 100644 src/SharpMUTerm.Client/Chrome/CharacterNames.cs create mode 100644 src/SharpMUTerm.Tui/BarRule.cs create mode 100644 src/SharpMUTerm.Tui/SharpMUTermApp.ChromeBars.cs create mode 100644 src/SharpMUTerm.Tui/SharpMUTermApp.Names.cs create mode 100644 tests/SharpMUTerm.Client.Tests/CharacterNamesTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/WaveTenTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b4db941..94b5a707 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -266,6 +266,19 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Changed +- A character is named the same way everywhere — `Corvid · Aetherfall` — in the quit prompt, the command palette, + the layouts list, Packages and the client's messages, instead of `Aetherfall.Corvid` in some places and + `Corvid (Aetherfall)` in others. +- The command palette is called that everywhere, its output commands are grouped under OUTPUT, and a short word + you type (four letters or fewer) now matches only at the start of words, so `layo` finds the layout commands + rather than unrelated entries that happen to contain those letters. +- The keypad screen (F4) and the quick bar show keys as `⌃F1`, `⌥M` like every other surface. +- The welcome says *world* throughout, labels every field of its connect form, and the desktop window's version + matches the terminal's word for word. +- The folded sidebar marks each world with a coloured bar and gives two characters with the same initial two + letters each, so they can be told apart. +- Desktop window: a trigger's route on F2 is a drop-down listing every window, and still takes a new name typed in. +- "Offline" notices and messages that tell you how to reconnect name the key (`⌥R`) as well as the palette entry. - Panes stacked one above the other no longer have an empty row between them when the lower pane shows its tabs: the tab row is the boundary, and the panes get the row back. Drag the empty part of that tab row to resize, or double-click it to even the panes out. The vitals and quick-bar strips sit flush against their @@ -287,6 +300,14 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Fixed +- The away, new-activity, search and restore bars fit the pane they are in: their rule runs to the pane's edge, + never past it, and the words shorten before the rule does in a narrow pane. They redraw when the pane is resized. +- Search (Ctrl+F) fits an 80-column terminal: its key hints shorten instead of pushing the window wider than the + screen. +- A trigger pattern anchored at the start of the line (`^\[public\]`) now finds lines in search and in F2's live + test that a highlight rule has marked, as it already did in the game. +- Desktop window: number-pad keys bound on F4 fire, and F4 no longer marks them as keys that never arrive. +- F1 opened from an offline character's window names that character instead of no one. - Starting the client with a saved workspace whose panes held a panel (vitals, who is here, the quick bar, the composer) or the map no longer fails before the first frame. - Desktop window: the "no world configured" notice at first start shows once, not as two identical toasts. diff --git a/CLAUDE.md b/CLAUDE.md index 63dc629b..ec7e816f 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -227,11 +227,14 @@ fallbacks) for inline images/maps. `CharacterCycle`. - **⌃P's ranking and grouping are the Client's, so both hosts list the same rows** (`CommandPaletteModel`, `FuzzyMatch`, `RecentCommands`, `KeyGlyphs` in `Client/Palette`; the Tui only draws, `CommandSurfaceRenderer`). - Core's `CommandMatcher` is gone. Decisions not to relitigate: + Core's `CommandMatcher` is gone. The surface is called *Command palette* everywhere (title, the native header's + search box, its automation name), and the group of output commands is `OUTPUT`. Decisions not to relitigate: - **Matching is subsequence, word by word, in order**, scored per character: +1 matched, +8 at a word start, +6 straight after the previous match, +4 on the first character, −1 per skipped character (−4 at most per gap), +20 when the title starts with the whole query. Each word is aligned by dynamic programming, - falling back to the leftmost alignment so anything that is a subsequence matches. A title match always + falling back to the earliest-ending alignment. **A query word of `FuzzyMatch.StrictLength` (4) letters or + fewer must start at a word start and continue in runs or at word starts** (`layo` no longer finds "Clear + window, say you"); a longer word may match as any subsequence. A title match always lists above a match on the detail, the key or the group's name; ties keep catalog order. Groups keep their headers but are ordered by their best entry, so the best match is the first row. - **An empty query lists RECENT, then SUGGESTED, then the groups**, each entry once. SUGGESTED is read off @@ -310,6 +313,8 @@ fallbacks) for inline images/maps. mid-word cannot split a match and `#ff0000` cannot find every red line (`UrlDetector`'s rule, one layer down) — and it is computed once at append, because the surface refilters over every line of every window on every keystroke. Chrome rows carry none, so a search cannot find its own bars. + It is the line's span text (`StyledLine.Text`), not the stripped markup: the `▌ ` a highlight rule draws + is markup only, so `^\[public\]` matches in ⌃F and in F2's live test as it does in the engine. - **Case is ignored in both modes**, matching `HistorySearch`; `(?-i)` is the way back, which is why there is no third toggle. An invalid pattern is a *state* (a regex is unparseable most of the time it is being typed), and there is a match timeout, because this runs on the UI thread per keystroke. @@ -327,6 +332,10 @@ fallbacks) for inline images/maps. - **Two kinds of client chrome now live in the line buffers**, so `InsertChromeRow`/`RemoveChromeRow` are the one place that fixes up everything indexing into one — the freeze point, the pending boundary, the activity bar and the search bar move together or none of them do. + - **A bar's rule is sized to its pane** (`BarRule.Fit`): each bar's `Bar` closure reads `BarWidth(windowId)` (the + viewport width) when drawn, the label elides before the rule shrinks, and `SyncChromeBarWidths` (on + `PostBufferPaint`) redraws a window's bars in place when its width moves. Width 0 (not arranged) draws 48 cells. + ⌃F's footer is a drop ladder (`SearchPrompt.HintLadder`), so the surface fits from 44 columns. - **The demo scene loads with `_watching` off.** It pours a spawn window's whole history in before the first frame, and every line would otherwise count as missed — so any frame that later made such a window visible carried an activity bar reporting the client's own setup as news. @@ -640,6 +649,8 @@ fallbacks) for inline images/maps. optional character, a password reminder), *Browse games* (`BrowsePackages`, so the index is still fetched only when asked; with no https `PackageIndexUrl` it says so on the row instead), *Open settings* (F5), the `/connect` example, and a starting layout. Decisions not to relitigate: + - **Its words live on `WelcomeModel`** (headings, intro, field labels, key rows), so both hosts say the same thing; + the client calls a game a *world* on every surface of it. - **The form goes through `ConnectCommand`**, with a `shape` callback that adds the character — so it can do nothing `/connect` cannot. Esc on the form goes back to the menu; on the menu it closes, leaving `NoWorldsNotice` (short enough for an 80-column row, and it names `/welcome`), and nothing reopens it that @@ -733,7 +744,7 @@ fallbacks) for inline images/maps. - **Drafts are per character and in memory only**, for the life of the run. Not on disk deliberately: a post is a few minutes' work, and a file would be a fourth thing this client writes, a purge entry, a `--help` line and somebody's unsent post in their home directory. Keyed by the *window's* owner, never - `_active`; a window belonging to no connection keeps none. **`Close()` raises `Closed`, which is what + `_active`; a window belonging to no connection keeps none. The header names that owner even while it is offline. **`Close()` raises `Closed`, which is what stores the draft, so a send must close first and forget after** — the other order posts the text and hands it straight back next time the window opens. - **F1 is claimed in `MacroKeys.AppShortcuts` but is not a settings screen**, so `ShortcutAction` answers @@ -1152,6 +1163,8 @@ fallbacks) for inline images/maps. settings screens and F1 size to the driver's screen, which is the cell area, so they fit and centre there. - **Folded, the sidebar is a 48 px strip**: the unfold chevron, an accent mark per world, a disc with the initial per character (filled while connected, an unread dot), "+" at the foot; names in tooltips. + The cell rail's folded strip marks each world with an accent `▌` row and gives characters two letters where two + share an initial (`RailRenderer.CollapsedWorldMark`, `InitialLength`). - **Input**: every press, release and wheel over the native views is the window's (`NativeChromeView`); a right press does nothing (there is no cell under it to forward to), and nothing is focusable. A left press on empty header space calls `TerminalView.WindowGestureFromChrome`: edge band resizes, the rest moves the window, @@ -1405,6 +1418,13 @@ an optional PATH entry so `sharpmuterm` runs from any terminal. delivers a modified key as itself (the window: ⌃digit, ⌃⇧letter, ⌃Tab and ⌥O fire) or as the terminal's bytes; a chord in `HostKeys.Reserved` or the host's newline is *Taken* with the host's own reason (the window's ⌥⏎ maximises). `SurfaceCellTests.F4TellsTheTerminalsTruth` and `SurfaceParityTests.F4TellsTheWindowsTruth` pin each. +`HostKeys.DeliversNumpad` (true in the window, whose `KeyMapper` maps `NumPad0–9`) makes a `Num…` binding fire there; +the terminal still says *no numpad key ever arrives*. F4 and the quick bar print keys through `KeyGlyphs.Normalize`. + +**A character is named one way on every surface: `Corvid · Aetherfall`** (Client `CharacterNames`; Tui +`DisplayName(sessionKey)`, open sessions first, then the configuration, so a dotted world still splits). The quit +prompt, ⌃P's *acting on*, ⌥M, F10, refusals and notices read it; the dotted session key is an address and is never +shown. Not changed: tab titles (`Corvid - Chat`) and the prompt's `Corvid@Aetherfall`. ## Building and testing @@ -1807,7 +1827,8 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] sets and their items on the left (an enable check box per item, `+ Add`/`Copy`/`Delete`/`↑`/`↓` over it, ⌥↑/⌥↓, Delete and Space on the list), the item's declared fields on the right, grouped. It fills the page below the title and scrolls in its two halves. A package's set is drawn read-only with *Copy to edit*. F2's pattern field - has the live test under it, re-run on every keystroke, each matching line with the match marked. The trigger + has the live test under it, re-run on every keystroke, each matching line with the match marked. A text field + with suggestions (F2's route) is an editable `ComboBox` listing them all, so the windows are seen without typing. The trigger builder opens it on the rule it made (`TryOpenNativeSettings(section, item)`); with no window it opens the cell F2 as before. **Each list keeps its selection for the run** (`SettingsForm.Selections`, the app's `_listSelections`, by section id; never saved): switching section and back, or closing and reopening the window, diff --git a/src/SharpMUTerm.Avalonia/KeyMapper.cs b/src/SharpMUTerm.Avalonia/KeyMapper.cs index 05af5605..8889267b 100644 --- a/src/SharpMUTerm.Avalonia/KeyMapper.cs +++ b/src/SharpMUTerm.Avalonia/KeyMapper.cs @@ -50,6 +50,11 @@ internal static class KeyMapper case Key.Insert: return Make('\x1b', ConsoleKey.Insert); case Key.Delete: return Make('\x1b', ConsoleKey.Delete); case >= Key.F1 and <= Key.F24: return Make('\0', ConsoleKey.F1 + (key - Key.F1)); + + // The numpad as itself, so a Num7 binding fires (HostKeys.DeliversNumpad). It carries its digit, so an + // unbound numpad key still types one; the TextInput that follows is swallowed (TerminalView). + case >= Key.NumPad0 and <= Key.NumPad9: + return Make((char)('0' + (key - Key.NumPad0)), ConsoleKey.NumPad0 + (key - Key.NumPad0)); } // Ctrl together with Alt is AltGr on a European layout: the character it types is TextInput's. diff --git a/src/SharpMUTerm.Avalonia/ListEditorView.cs b/src/SharpMUTerm.Avalonia/ListEditorView.cs index a26866c3..993128da 100644 --- a/src/SharpMUTerm.Avalonia/ListEditorView.cs +++ b/src/SharpMUTerm.Avalonia/ListEditorView.cs @@ -727,16 +727,19 @@ private Control TextControl(TextField text) { var suggestions = _form.Suggestions(text); TextBox? box = null; - AutoCompleteBox? auto = null; + ComboBox? auto = null; if (suggestions.Count > 0) { - auto = new AutoCompleteBox + // An editable combo box: the cell screen offers these as a list ((none), main, the windows), so the reserved + // words have to be visible here too, not only reachable by typing; anything else can still be typed. + auto = new ComboBox { - Text = _form.Text(text), + IsEditable = true, ItemsSource = suggestions, - FilterMode = AutoCompleteFilterMode.ContainsOrdinal, - MinimumPrefixLength = 0, + Text = _form.Text(text), + HorizontalAlignment = HorizontalAlignment.Stretch, }; + AutomationProperties.SetName(auto, text.Label); } else { @@ -789,6 +792,19 @@ void Commit() } control.LostFocus += (_, _) => Commit(); + if (auto is not null) + { + // A pick from the list commits as ⏎ would; typing commits on ⏎ or leaving the box. + auto.SelectionChanged += (_, _) => + { + if (!_syncing && auto.SelectedItem is string picked) + { + auto.Text = picked; + Commit(); + } + }; + } + control.KeyDown += (_, e) => { if (e.Key == Key.Enter && (text.Rule != TextRule.Lines || e.KeyModifiers == KeyModifiers.Control)) diff --git a/src/SharpMUTerm.Avalonia/NativeChrome.cs b/src/SharpMUTerm.Avalonia/NativeChrome.cs index 91c0154c..37402e01 100644 --- a/src/SharpMUTerm.Avalonia/NativeChrome.cs +++ b/src/SharpMUTerm.Avalonia/NativeChrome.cs @@ -341,7 +341,7 @@ protected static void Chevron(DrawingContext context, Rect area, bool left, Colo internal sealed class NativeHeader(TerminalView view) : NativeChromeView(view) { /// What the search box says. ⌃P lists commands, characters and windows, and settings screens. - internal const string SearchText = "Search commands, windows, settings"; + internal const string SearchText = "Command palette"; /// The prefix's leading word, beside its chord. internal const string PrefixWord = "awaiting a pane key"; @@ -590,7 +590,7 @@ private void DrawPrefix(DrawingContext context, HeaderPrefix prefix, ChromeOverl internal sealed class NativeSidebar(TerminalView view) : NativeChromeView(view) { /// What the button at the foot says. - internal const string AddGameText = "+ Add a game or connect"; + internal const string AddGameText = "+ Add a world or connect"; /// The fold button's tooltip, open and folded. internal const string FoldTip = "Fold the sidebar (Ctrl+B b)", UnfoldTip = "Open the sidebar (Ctrl+B b)"; diff --git a/src/SharpMUTerm.Avalonia/PaletteOverlay.cs b/src/SharpMUTerm.Avalonia/PaletteOverlay.cs index 80e9180e..c791e997 100644 --- a/src/SharpMUTerm.Avalonia/PaletteOverlay.cs +++ b/src/SharpMUTerm.Avalonia/PaletteOverlay.cs @@ -68,7 +68,7 @@ public PaletteOverlay(PaletteSession session, Action remove) Padding = new Thickness(12, 9), CornerRadius = new CornerRadius(8), }; - AutomationProperties.SetName(_search, "Search commands"); + AutomationProperties.SetName(_search, "Command palette"); _search.TextChanged += (_, _) => Refresh(resetSelection: true); DockPanel.SetDock(_search, Dock.Top); diff --git a/src/SharpMUTerm.Avalonia/TerminalView.cs b/src/SharpMUTerm.Avalonia/TerminalView.cs index fe9bfda6..7586d402 100644 --- a/src/SharpMUTerm.Avalonia/TerminalView.cs +++ b/src/SharpMUTerm.Avalonia/TerminalView.cs @@ -239,7 +239,9 @@ internal void HandleKeyDown(KeyEventArgs e) if (mapped is { } key) { // An Alt chord can be followed by a TextInput for the same letter on some platforms. - _swallowText = key.Modifiers.HasFlag(ConsoleModifiers.Alt) && !key.Modifiers.HasFlag(ConsoleModifiers.Control) + // So is a numpad digit, which KeyMapper has already sent with its digit. + _swallowText = (key.Modifiers.HasFlag(ConsoleModifiers.Alt) && !key.Modifiers.HasFlag(ConsoleModifiers.Control)) + || key.Key is >= ConsoleKey.NumPad0 and <= ConsoleKey.NumPad9 ? key.KeyChar : null; _driver.RaiseKey(key); diff --git a/src/SharpMUTerm.Avalonia/WelcomeView.cs b/src/SharpMUTerm.Avalonia/WelcomeView.cs index f3016d15..5daf7332 100644 --- a/src/SharpMUTerm.Avalonia/WelcomeView.cs +++ b/src/SharpMUTerm.Avalonia/WelcomeView.cs @@ -26,6 +26,7 @@ internal sealed class WelcomeView : DockPanel, IModalView private readonly Action _done; private readonly StackPanel _body = new(); private readonly TextBlock _footer; + private readonly TextBlock _heading; private readonly List _choiceRows = []; private readonly List -/// Whose layouts these are: the character's session key. +/// Whose layouts these are, named for a person (). /// The layouts, built-ins first, in the library's order. /// Which row is pointed at. /// What the last action said, or null. diff --git a/src/SharpMUTerm.Client/Modals/WelcomeModel.cs b/src/SharpMUTerm.Client/Modals/WelcomeModel.cs index 27a7f8d0..efe7c7d3 100644 --- a/src/SharpMUTerm.Client/Modals/WelcomeModel.cs +++ b/src/SharpMUTerm.Client/Modals/WelcomeModel.cs @@ -61,11 +61,66 @@ public sealed record WelcomeModel( /// A character name long enough for any game's. public const int MaxCharacter = 40; + // The welcome's words, said once here so both hosts say the same thing in the same case. One noun, "world": + // it is what F5, the rail and every other surface call a place you connect to. + + /// The welcome's heading. + public const string Heading = "Welcome to SharpMUTerm"; + + /// The line under the heading on the menu. + public const string Intro = "No worlds yet. Pick a way in — you can add more at any time."; + + /// What leads the example command. + public const string ExampleLead = "Or type it on the command line:"; + + /// The line under the layout chips. + public const string LayoutNote = "Saved per world · ⌥M changes it later"; + + /// The form's heading. + public const string FormHeading = "Connect to a world"; + + /// The line under the form's heading. + public const string FormIntro = "Saved as a world, so you can come back to it."; + + /// The TLS row's words when on; the window's check box carries these words. + public const string TlsOn = "On, encrypted"; + + /// The TLS row's words when off. + public const string TlsOff = "Off"; + + /// The password row's words when on (no password now); the window's check box carries these words. + public const string PasswordOn = "Set it on F5 after connecting"; + + /// The password row's words when off. + public const string PasswordOff = "Type it at the login prompt"; + + /// The host box's placeholder. + public const string HostPlaceholder = "mud.example.org"; + + /// The character box's placeholder. + public const string CharacterPlaceholder = "Optional, the name you log in as"; + + /// The menu's keys: what moves (left) and what acts (right). The window joins the two. + public static (string Left, string Right) MenuKeys => ("↑↓ pick · ←→ layout", "⏎ choose · Esc closes"); + + /// The form's keys that act, in both hosts (how a host moves between fields is its own). + public const string FormKeys = "⏎ connect · Esc back"; + + /// A form row's label, as both hosts write it. + public static string FieldLabel(WelcomeField field) => field switch + { + WelcomeField.Host => "Host", + WelcomeField.Port => "Port", + WelcomeField.Tls => "TLS", + WelcomeField.Character => "Character", + _ => "Password", + }; + /// A choice's title and the words beside it. public (string Title, string Detail) Describe(WelcomeChoice choice) => choice switch { - WelcomeChoice.Connect => ("Connect to a host", "type a host and port"), - WelcomeChoice.Browse => ("Browse games", IndexProblem is null ? "from the package index" : "no package index set"), + WelcomeChoice.Connect => ("Connect to a world", "Type a host and port"), + WelcomeChoice.Browse => ("Browse worlds", IndexProblem is null ? "From the package index" : "No package index set"), _ => ("Open settings", "F5, add a world by hand"), }; diff --git a/src/SharpMUTerm.Client/Palette/CommandPaletteModel.cs b/src/SharpMUTerm.Client/Palette/CommandPaletteModel.cs index 385b209e..079396dc 100644 --- a/src/SharpMUTerm.Client/Palette/CommandPaletteModel.cs +++ b/src/SharpMUTerm.Client/Palette/CommandPaletteModel.cs @@ -92,7 +92,7 @@ public static class CommandPaletteModel { CommandGroup.GoTo => "GO TO", CommandGroup.World => "WORLD", - CommandGroup.Terminal => "TERMINAL", + CommandGroup.Terminal => "OUTPUT", CommandGroup.Layout => "LAYOUT", CommandGroup.Settings => "SETTINGS", _ => group.ToString().ToUpperInvariant(), diff --git a/src/SharpMUTerm.Client/Palette/FuzzyMatch.cs b/src/SharpMUTerm.Client/Palette/FuzzyMatch.cs index a8e898a0..87eb004c 100644 --- a/src/SharpMUTerm.Client/Palette/FuzzyMatch.cs +++ b/src/SharpMUTerm.Client/Palette/FuzzyMatch.cs @@ -21,7 +21,15 @@ public sealed record FuzzyResult(int Score, IReadOnlyList Positions); /// /// Each word is aligned by dynamic programming over every place its characters could land, so the best /// alignment is found rather than the leftmost; if aligning the words one by one leaves a later word nowhere -/// to go, the leftmost alignment of all of them is scored instead, so anything that is a subsequence matches. +/// to go, the earliest-ending alignment of each word in turn is scored instead. +/// +/// +/// A short word may not scatter. A query word of letters or fewer matches only +/// where each of its letters begins a word of the text or follows the one before it: trig finds +/// Make a trigger… and fp still finds Freeze pane, but trig no longer finds +/// Stop reading this window aloud (a t, r, i and g spread over four words) or Start logging. A few +/// letters is a prefix or an acronym; scattered across a title they match nearly everything. A longer word keeps the +/// plain subsequence rule, where scattered letters are rare enough to mean something (tstamp). /// /// public static class FuzzyMatch @@ -47,6 +55,9 @@ public static class FuzzyMatch /// Added when the text starts with the whole query, spaces and all. public const int WholePrefix = 20; + /// A query word this long or shorter matches only at word starts and runs (see the class remarks). + public const int StrictLength = 4; + /// /// Matches against , or returns null when it is not a /// subsequence of it. An empty or blank query matches everything with a score of zero. @@ -69,7 +80,7 @@ public static class FuzzyMatch var aligned = true; foreach (var word in words) { - var best = AlignWord(word.ToLowerInvariant(), lower, text, from); + var best = AlignWord(word.ToLowerInvariant(), lower, text, from, word.Length <= StrictLength, earliest: false); if (best is null) { aligned = false; @@ -83,27 +94,23 @@ public static class FuzzyMatch if (!aligned) { - // A word aligned for its own best score can leave the next one nowhere to go; the leftmost - // alignment of every word in turn finds a match whenever there is one. + // A word aligned for its own best score can leave the next one nowhere to go; the earliest-ending + // alignment of every word in turn leaves each later word the most room, so it finds a match whenever + // there is one. positions.Clear(); score = 0; from = 0; foreach (var word in words) { - var start = positions.Count; - foreach (var c in word.ToLowerInvariant()) + var early = AlignWord(word.ToLowerInvariant(), lower, text, from, word.Length <= StrictLength, earliest: true); + if (early is null) { - var at = lower.IndexOf(c, from); - if (at < 0) - { - return null; - } - - positions.Add(at); - from = at + 1; + return null; } - score += ScoreRun(text, positions, start); + score += early.Value.Score; + positions.AddRange(early.Value.Positions); + from = early.Value.Positions[^1] + 1; } } @@ -138,22 +145,7 @@ private static int Link(int previous, int next) => // Scored against the original text, so a capital inside a word (camelCase) counts as a word start. // ToLowerInvariant maps char for char, so an index in the lowered text is the same index here. - private static int ScoreRun(string text, List positions, int start) - { - var score = 0; - for (var i = start; i < positions.Count; i++) - { - score += CharScore(text, positions[i]); - if (i > start) - { - score += Link(positions[i - 1], positions[i]); - } - } - - return score; - } - - private static (int Score, int[] Positions)? AlignWord(string word, string text, string original, int from) + private static (int Score, int[] Positions)? AlignWord(string word, string text, string original, int from, bool strict, bool earliest) { var m = word.Length; var n = text.Length; @@ -176,7 +168,7 @@ private static (int Score, int[] Positions)? AlignWord(string word, string text, for (var j = from; j < n; j++) { - if (text[j] == word[0]) + if (text[j] == word[0] && (!strict || IsWordStart(original, j))) { best[0, j] = CharScore(original, j); back[0, j] = -1; @@ -192,11 +184,12 @@ private static (int Score, int[] Positions)? AlignWord(string word, string text, continue; } + var wordStart = IsWordStart(original, j); var top = none; var arg = -1; for (var k = from + i - 1; k < j; k++) { - if (best[i - 1, k] == none) + if (best[i - 1, k] == none || (strict && !wordStart && k != j - 1)) { continue; } @@ -221,11 +214,16 @@ private static (int Score, int[] Positions)? AlignWord(string word, string text, var score = none; for (var j = from; j < n; j++) { - // Strictly greater, so the earliest of equal endings wins and later words keep the most room. + // Strictly greater, so the earliest of equal endings wins and later words keep the most room; asked for + // the earliest outright, the first ending at all. if (best[m - 1, j] != none && best[m - 1, j] > score) { score = best[m - 1, j]; end = j; + if (earliest) + { + break; + } } } diff --git a/src/SharpMUTerm.Client/Settings/PackageCollection.cs b/src/SharpMUTerm.Client/Settings/PackageCollection.cs index ba7359d4..572586c1 100644 --- a/src/SharpMUTerm.Client/Settings/PackageCollection.cs +++ b/src/SharpMUTerm.Client/Settings/PackageCollection.cs @@ -121,14 +121,14 @@ public static bool SetEnabled(AppConfiguration config, string id, bool on) return true; } - /// The characters a package applies to: everyone on a world it is for, as Corvid (Aetherfall). + /// The characters a package applies to: everyone on a world it is for, as Corvid · Aetherfall. public static IReadOnlyList CharactersFor(AppConfiguration config, PackageManifest manifest) { ArgumentNullException.ThrowIfNull(config); ArgumentNullException.ThrowIfNull(manifest); return config.Worlds.ToArray() .Where(w => manifest.IsFor(w.Host, w.Port)) - .SelectMany(w => w.Characters.ToArray().Select(c => $"{c.Name} ({w.Name})")) + .SelectMany(w => w.Characters.ToArray().Select(c => Chrome.CharacterNames.Display(w.Name, c.Name))) .ToList(); } diff --git a/src/SharpMUTerm.Tui/AwayBarRenderer.cs b/src/SharpMUTerm.Tui/AwayBarRenderer.cs index a8aa9431..dd36e13d 100644 --- a/src/SharpMUTerm.Tui/AwayBarRenderer.cs +++ b/src/SharpMUTerm.Tui/AwayBarRenderer.cs @@ -22,9 +22,6 @@ namespace SharpMUTerm.Tui; /// internal static class AwayBarRenderer { - /// How long the trailing rule is. The same 48 cells the freeze and restore bars draw. - private const int RuleCells = 48; - /// The label, kept as a constant so a test can look for the exact words a reader will see. internal const string Label = "AWAY"; @@ -38,9 +35,10 @@ internal static class AwayBarRenderer /// /// The bar for lines that arrived over an absence of , - /// on an already-resolved #rrggbb accent. + /// on an already-resolved #rrggbb accent, sized to a pane cells wide + /// (; 0 = not arranged yet). /// - public static string Bar(int lines, TimeSpan away, string accentHex) + public static string Bar(int lines, TimeSpan away, string accentHex, int width = 0) { ArgumentException.ThrowIfNullOrEmpty(accentHex); @@ -49,9 +47,9 @@ public static string Bar(int lines, TimeSpan away, string accentHex) // scrolling is in front of me. The duration is "how far behind am I" — five minutes is a // conversation you can still join, two hours is a different evening. var count = lines == 1 ? "1 line" : $"{lines} lines"; - var rule = new string('─', RuleCells); + var (text, rule) = BarRule.Fit(Label.Length + 4, $"{count} since you left · {Duration(away)}", width); return $"[{accentHex}]{Glyphs.Away} {Label}[/] " - + $"[dim]{MarkupText.Escape($"{count} since you left · {Duration(away)}")} {rule}[/]"; + + $"[dim]{MarkupText.Escape(text)} {BarRule.Rule(rule)}[/]"; } /// @@ -64,14 +62,14 @@ public static string Bar(int lines, TimeSpan away, string accentHex) /// is watching, so a duration on it would be timing the output rather than the absence. /// /// - public static string Missed(int lines, string accentHex) + public static string Missed(int lines, string accentHex, int width = 0) { ArgumentException.ThrowIfNullOrEmpty(accentHex); var count = lines == 1 ? "1 line" : $"{lines} lines"; - var rule = new string('─', RuleCells); + var (text, rule) = BarRule.Fit(MissedLabel.Length + 4, $"{count} since you were here", width); return $"[{accentHex}]{Glyphs.Away} {MissedLabel}[/] " - + $"[dim]{MarkupText.Escape($"{count} since you were here")} {rule}[/]"; + + $"[dim]{MarkupText.Escape(text)} {BarRule.Rule(rule)}[/]"; } /// diff --git a/src/SharpMUTerm.Tui/BarRule.cs b/src/SharpMUTerm.Tui/BarRule.cs new file mode 100644 index 00000000..bad8995a --- /dev/null +++ b/src/SharpMUTerm.Tui/BarRule.cs @@ -0,0 +1,49 @@ +namespace SharpMUTerm.Tui; + +/// +/// How a boundary bar (restore, away, activity, search) fits its pane: the trailing rule runs to the pane's edge, +/// and the words are elided before the bar is allowed to wrap. A wrapped bar is three rows — label, rule, blank — +/// where the pane can afford one, which is how the old fixed 48-cell rule broke every pane narrower than about 85 +/// cells (80×24 included) and stopped short in every wider one. already sized +/// itself this way. +/// +internal static class BarRule +{ + /// The rule when the pane's width is not known yet (nothing arranged), as every bar drew it before. + internal const int Fallback = 48; + + /// The shortest rule kept before the words give way, so the bar still reads as a divider. + internal const int Minimum = 3; + + /// + /// The words and the rule length for a bar whose fixed parts take cells (label, + /// glyphs, the spaces between), with the part that may be elided, in a pane + /// cells wide. Width 0 means not arranged yet: the text is whole and the rule is + /// . + /// + public static (string Text, int Rule) Fit(int fixedCells, string text, int width) + { + ArgumentNullException.ThrowIfNull(text); + if (width <= 0) + { + return (text, Fallback); + } + + var room = width - fixedCells; + if (text.Length + Minimum <= room) + { + return (text, room - text.Length); + } + + // Not enough for the words and a short rule: the words give way first, down to nothing, and the rule keeps + // what is left (possibly none) — never a cell past the edge. + var keep = Math.Max(0, room - Minimum); + var elided = keep <= 0 ? string.Empty + : keep >= text.Length ? text + : text[..Math.Max(0, keep - 1)].TrimEnd() + "…"; + return (elided, Math.Max(0, room - elided.Length)); + } + + /// A run of rule characters. + public static string Rule(int cells) => new('─', Math.Max(0, cells)); +} diff --git a/src/SharpMUTerm.Tui/CommandPalette.cs b/src/SharpMUTerm.Tui/CommandPalette.cs index 6bfcab80..a5cf48a0 100644 --- a/src/SharpMUTerm.Tui/CommandPalette.cs +++ b/src/SharpMUTerm.Tui/CommandPalette.cs @@ -110,7 +110,7 @@ private void Open() // centring first placed the surface as if it were that size — which only became visible once // the catalog grew tall enough for the misplacement to push its bottom border off-screen. _window = new WindowBuilder(_system) - .WithTitle("Command surface") + .WithTitle("Command palette") .AsModal() .WithBorderStyle(BorderStyle.Single) .WithBackgroundColor(new Color(ScreenPalette.MenuBg)) diff --git a/src/SharpMUTerm.Tui/Hosting/HostKeys.cs b/src/SharpMUTerm.Tui/Hosting/HostKeys.cs index 70b4c04c..9fb92b6f 100644 --- a/src/SharpMUTerm.Tui/Hosting/HostKeys.cs +++ b/src/SharpMUTerm.Tui/Hosting/HostKeys.cs @@ -36,6 +36,14 @@ internal sealed record HostKeys /// public required bool ReportsChordsWhole { get; init; } + /// + /// Whether a numpad digit reaches the client as itself (Num7) rather than as the main row's 7. A + /// window reads the physical key; a terminal is never put in application-keypad mode, so its numpad types digits + /// and a Num binding never fires there. The numpad is the combat player's walking keys, which is why F4 + /// says which it is per host. + /// + public required bool DeliversNumpad { get; init; } + public bool Reserves(ConsoleKeyInfo key) => Reserved.Any(r => r.Chord.Matches(key)); /// The reserved chord a descriptor names, or null. @@ -62,5 +70,6 @@ private static bool Same(HostChord chord, MacroKeyParts parts) => Newline = new HostChord(ConsoleKey.Enter, ConsoleModifiers.Alt, "Alt+⏎", "Alt+Enter"), Reserved = [], ReportsChordsWhole = false, + DeliversNumpad = false, }; } diff --git a/src/SharpMUTerm.Tui/KeypadScreenRenderer.cs b/src/SharpMUTerm.Tui/KeypadScreenRenderer.cs index 040124ac..e4a4e22f 100644 --- a/src/SharpMUTerm.Tui/KeypadScreenRenderer.cs +++ b/src/SharpMUTerm.Tui/KeypadScreenRenderer.cs @@ -1,3 +1,4 @@ +using SharpMUTerm.Client.Palette; using SharpMUTerm.Client.Settings; using System.Globalization; using SharpMUTerm.Core.Automation; @@ -402,12 +403,20 @@ internal static string FooterLine( // the whole one, for the binding the cursor is actually on. var verdict = MacroKeys.Verdict(keys, macros[at].Key); var clash = KeyClashes.For(keys, macros[at], macros); - context = ScreenChrome.Context( - ScreenChrome.Position("binding", at, macros.Count), - Escape(Identify(macros[at])), - clash is { } c - ? (c.BindingRuns ? "△ " : "▲ ") + Escape(c.Reason) - : verdict.Fires ? null : "▲ " + Escape(verdict.Reason)); + var position = ScreenChrome.Position("binding", at, macros.Count); + var name = Escape(Identify(macros[at])); + var reason = clash is { } c + ? (c.BindingRuns ? "△ " : "▲ ") + Escape(c.Reason) + : verdict.Fires ? null : "▲ " + Escape(verdict.Reason); + + // A drop-order ladder, the status row's rule (FocusHints): every footer opens with the cursor's position, + // and the reason is what this one is for, so the name the cursor row already shows goes first; only then + // is the line elided. + var actionsWidth = VisibleLength(ScreenChrome.Actions(focus: focus)); + context = FirstFitting( + width <= 0 ? int.MaxValue : width - actionsWidth - 2, + ScreenChrome.Context(position, name, reason), + ScreenChrome.Context(position, reason ?? name)); } var actions = ScreenChrome.Actions(focus: focus); @@ -559,11 +568,13 @@ private static string Hotkey( // A clash is marked inside the key's own well, where the ▲ already goes, so it costs the row no // cell: △ in amber for a binding that runs and hides something (a client key, or a later binding), // ▲ for one that never runs. The footer says which side wins for the row the cursor is on. + // Spelt as every other surface spells a key (⌃F1, not Ctrl+F1); the binding keeps its stored form. + var shown = Escape(KeyGlyphs.Normalize(macro.Key)); var chord = clash is { BindingRuns: true } - ? $"[{Caution}]△ {Escape(macro.Key)}[/]" + ? $"[{Caution}]△ {shown}[/]" : verdict.Fires && clash is null - ? $"[bold]{Escape(macro.Key)}[/]" - : $"[{Muted}]▲ {Escape(macro.Key)}[/]"; + ? $"[bold]{shown}[/]" + : $"[{Muted}]▲ {shown}[/]"; var bound = ScreenChrome.Field(PadVisible(chord, KeyColumnWidth), key); // A binding that has never been named still gets its well — the name is editable whether or not diff --git a/src/SharpMUTerm.Tui/MacroKeys.cs b/src/SharpMUTerm.Tui/MacroKeys.cs index ea6b38cb..d6aef8b0 100644 --- a/src/SharpMUTerm.Tui/MacroKeys.cs +++ b/src/SharpMUTerm.Tui/MacroKeys.cs @@ -347,9 +347,10 @@ internal static MacroKeyVerdict Verdict(HostKeys keys, string? descriptor) if (parts.Key.Length == 4 && parts.Key.StartsWith("Num", StringComparison.Ordinal) && char.IsAsciiDigit(parts.Key[3])) { - // No DECKPAM is ever sent and no application-keypad SS3 is decoded, so the numpad either - // reports as the main row's digits or is dropped. Either way this descriptor never arrives. - return Never("no numpad key ever arrives"); + // A window reads the physical key (HostKeys.DeliversNumpad). A terminal is sent no DECKPAM and no + // application-keypad SS3 is decoded, so its numpad either reports as the main row's digits or is + // dropped. Either way this descriptor never arrives there. + return keys.DeliversNumpad ? new MacroKeyVerdict(MacroKeyDelivery.Fires) : Never("no numpad key ever arrives"); } if (parts.Ctrl && parts.Alt) diff --git a/src/SharpMUTerm.Tui/MarkupText.cs b/src/SharpMUTerm.Tui/MarkupText.cs index 4da7a380..603a39c6 100644 --- a/src/SharpMUTerm.Tui/MarkupText.cs +++ b/src/SharpMUTerm.Tui/MarkupText.cs @@ -56,6 +56,25 @@ internal static string PadVisible(string markup, int width) return visible >= width ? markup : markup + new string(' ', width - visible); } + /// + /// The first of (longest first) whose visible length fits , + /// else the last: a footer's drop-order ladder, so a narrow bar gives up whole parts in a chosen order rather + /// than being cut off mid-word at its end. + /// + internal static string FirstFitting(int room, params string[] candidates) + { + ArgumentNullException.ThrowIfNull(candidates); + foreach (var candidate in candidates) + { + if (VisibleLength(candidate) <= room) + { + return candidate; + } + } + + return candidates.Length == 0 ? string.Empty : candidates[^1]; + } + /// /// Lays a left- and right-hand fragment on one line, right-aligning the right to /// . A non-positive width means "width unknown" (the unit-test path), which diff --git a/src/SharpMUTerm.Tui/PaneLine.cs b/src/SharpMUTerm.Tui/PaneLine.cs index bf47639c..8ec2be2d 100644 --- a/src/SharpMUTerm.Tui/PaneLine.cs +++ b/src/SharpMUTerm.Tui/PaneLine.cs @@ -33,7 +33,9 @@ namespace SharpMUTerm.Tui; /// The line's own Spectre-style markup, with no gutter attached. /// When the line arrived, pre-formatted for the gutter, or null for no gutter. /// -/// The text the markup puts on the screen () — what ⌃F searches. +/// The text the line says — what ⌃F searches and F2's live test matches. A world's line is its spans' text +/// (), never the composed markup, which carries the client's decoration (the +/// trigger left rule ▌ ); any other row is the text its markup puts on the screen (). /// /// Held rather than derived, because the search surface refilters on every keystroke over every line of /// every window: stripping thousands of lines eight times while somebody types a word is the difference diff --git a/src/SharpMUTerm.Tui/RailRenderer.cs b/src/SharpMUTerm.Tui/RailRenderer.cs index 60788df6..1207ca46 100644 --- a/src/SharpMUTerm.Tui/RailRenderer.cs +++ b/src/SharpMUTerm.Tui/RailRenderer.cs @@ -1,3 +1,4 @@ +using System.Text; using SharpConsoleUI.Parsing; using SharpMUTerm.Client.Chrome; using SharpMUTerm.Core.Text; @@ -140,25 +141,31 @@ private static string Fit(RailRow row, int maxWidth, Func rende } /// - /// Renders the collapsed rail (⌃B b): a ~6-col strip of per-world accent separators and, under + /// Renders the collapsed rail (⌃B b): a ~6-col strip of per-world accent marks and, under /// each, its characters as a status dot + initial + unread count. Both stay clickable — an initial /// is the only handle a collapsed rail offers. + /// + /// A world is a solid ▌ in its accent, the bar the window's folded sidebar draws (a ▚ read as a + /// glyph glitch at one cell). Characters show one letter, or two for every character once two of them share a + /// first letter (): Ro and Ri rather than two Rs nobody can tell + /// apart. The length is the whole strip's, so every row keeps one width and it changes only when the set of + /// characters does. + /// /// public static List RenderCollapsed(IReadOnlyList rows, ChromeInk? ink = null) { var voice = ink ?? ChromeInk.Default; var lines = new List(); + var letters = InitialLength(rows.Where(r => r.Kind == RailRowKind.Character).Select(r => r.Label)); foreach (var row in rows) { switch (row.Kind) { case RailRowKind.World: - lines.Add(Link(row, $"[{Accent(row, voice)}]▚[/]")); + lines.Add(Link(row, $"[{Accent(row, voice)}]{CollapsedWorldMark}[/]")); break; case RailRowKind.Character: - var initial = row.Label.Length > 0 - ? Escape(row.Label.EnumerateRunes().First().ToString()) - : "?"; + var initial = Escape(Initials(row.Label, letters)); var dot = row.Connected ? "●" : "○"; var name = row.Active ? $"[bold]{initial}[/]" : initial; @@ -172,6 +179,27 @@ public static List RenderCollapsed(IReadOnlyList rows, ChromeIn return lines; } + /// The collapsed strip's mark for a world: a solid bar in the world's accent. + internal const string CollapsedWorldMark = "▌"; + + /// + /// How many letters the collapsed strip gives each character: 1, or 2 once two names share a first letter + /// (case ignored). Two at most — the strip is a handle, and past two letters the tooltip and the open rail say it. + /// + internal static int InitialLength(IEnumerable names) + { + var firsts = names.Select(n => Initials(n, 1).ToUpperInvariant()).ToList(); + return firsts.Count == firsts.Distinct(StringComparer.Ordinal).Count() ? 1 : 2; + } + + /// The first letters of a name, padded so every row is as wide; ? for none. + internal static string Initials(string name, int letters) + { + var runes = name.EnumerateRunes().Where(r => !Rune.IsWhiteSpace(r)).Take(letters).Select(r => r.ToString()).ToList(); + var text = runes.Count == 0 ? "?" : string.Concat(runes); + return text.PadRight(letters); + } + /// /// A character row: its chord, the active marker, the connected dot, the name and its unread total. /// diff --git a/src/SharpMUTerm.Tui/RestoreBarRenderer.cs b/src/SharpMUTerm.Tui/RestoreBarRenderer.cs index eaf73f71..e4337b97 100644 --- a/src/SharpMUTerm.Tui/RestoreBarRenderer.cs +++ b/src/SharpMUTerm.Tui/RestoreBarRenderer.cs @@ -23,9 +23,6 @@ namespace SharpMUTerm.Tui; /// internal static class RestoreBarRenderer { - /// How long the trailing rule is. The same 48 cells the freeze bar draws, for the same reason. - private const int RuleCells = 48; - /// The label, kept as a constant so a test can look for the exact words a reader will see. internal const string Label = "RESTORED"; @@ -33,7 +30,7 @@ internal static class RestoreBarRenderer /// The bar for lines last written at , on an /// already-resolved #rrggbb accent. /// - public static string Bar(int lines, DateTimeOffset when, string accentHex) + public static string Bar(int lines, DateTimeOffset when, string accentHex, int width = 0) { ArgumentException.ThrowIfNullOrEmpty(accentHex); @@ -43,8 +40,8 @@ public static string Bar(int lines, DateTimeOffset when, string accentHex) // a different game). Local time in the same 24-hour form the timestamp gutter uses. var count = lines == 1 ? "1 line" : $"{lines} lines"; var stamp = when.ToLocalTime().ToString("d MMM HH:mm", CultureInfo.CurrentCulture); - var rule = new string('─', RuleCells); + var (text, rule) = BarRule.Fit(Label.Length + 4, $"{count} from the previous session · {stamp}", width); return $"[{accentHex}]{Glyphs.Restored} {Label}[/] " - + $"[dim]{MarkupText.Escape($"{count} from the previous session · {stamp}")} {rule}[/]"; + + $"[dim]{MarkupText.Escape(text)} {BarRule.Rule(rule)}[/]"; } } diff --git a/src/SharpMUTerm.Tui/SearchBarRenderer.cs b/src/SharpMUTerm.Tui/SearchBarRenderer.cs index ffae1975..caf4e65d 100644 --- a/src/SharpMUTerm.Tui/SearchBarRenderer.cs +++ b/src/SharpMUTerm.Tui/SearchBarRenderer.cs @@ -19,9 +19,6 @@ namespace SharpMUTerm.Tui; /// internal static class SearchBarRenderer { - /// How long the trailing rule is. The same 48 cells the other three bars draw. - private const int RuleCells = 48; - /// The chord the bar names, and the only one it can: see MacroKeys for why ⌥⇧G is not here. internal const string NextChord = "⌥G next"; @@ -29,15 +26,17 @@ internal static class SearchBarRenderer /// The bar for hit of for /// , on an already-resolved #rrggbb accent. /// - public static string Bar(string query, int ordinal, int total, string accentHex) + public static string Bar(string query, int ordinal, int total, string accentHex, int width = 0) { ArgumentNullException.ThrowIfNull(query); ArgumentException.ThrowIfNullOrEmpty(accentHex); // The ordinal is what makes ⌥G legible: without it the bar moves and nothing says whether you // are getting closer to the end of the results or going round in circles. - var counted = MarkupText.Escape($"{query} ({ordinal} of {total})"); - var rule = new string('─', RuleCells); - return $"[{accentHex}]{Glyphs.Search} {counted}[/] [dim]{rule} {NextChord}[/]"; + // The query gives way before the count and the chord: they are what make the bar usable, the query is + // what the reader just typed. + var counted = $" ({ordinal} of {total})"; + var (text, rule) = BarRule.Fit(2 + counted.Length + 2 + NextChord.Length, query, width); + return $"[{accentHex}]{Glyphs.Search} {MarkupText.Escape(text + counted)}[/] [dim]{BarRule.Rule(rule)} {NextChord}[/]"; } } diff --git a/src/SharpMUTerm.Tui/SearchPrompt.cs b/src/SharpMUTerm.Tui/SearchPrompt.cs index 68f3d991..bcf5097f 100644 --- a/src/SharpMUTerm.Tui/SearchPrompt.cs +++ b/src/SharpMUTerm.Tui/SearchPrompt.cs @@ -57,6 +57,24 @@ internal static class SearchPrompt internal const string Hints = "type to search · ↑↓ pick · ⏎ go · ⌥E regex · ⌥A all windows · Esc cancel · ⌃F closes"; + /// + /// The footer's drop-order ladder, longest first: the status row's rule (FocusHints). + /// is 84 cells and an 80-column surface holds 74, where it used to be cut to a bare ⌃F. The prose goes + /// first, then the words after the toggles' keys, then Esc (⌃F also closes); every rung still names each key + /// that does something different. + /// + internal static readonly string[] HintLadder = + [ + Hints, + "↑↓ pick · ⏎ go · ⌥E regex · ⌥A all windows · Esc cancel · ⌃F closes", + "↑↓ pick · ⏎ go · ⌥E regex · ⌥A all · Esc cancel · ⌃F closes", + "↑↓ · ⏎ go · ⌥E regex · ⌥A all · Esc · ⌃F", + ]; + + /// The longest rung of that fits (all of it when unknown). + internal static string HintsFor(int width) => + width <= 0 ? Hints : FirstFitting(width, HintLadder); + /// The longest an entry is drawn before it is elided, when no width is supplied. private const int DefaultEntryWidth = 72; @@ -225,7 +243,7 @@ internal static List Render(SearchModel model, int selected, int width = lines.AddRange(body); lines.Add(string.Empty); - lines.Add($"[{Label}]{Hints}[/]"); + lines.Add($"[{Label}]{Escape(HintsFor(width))}[/]"); return lines; } diff --git a/src/SharpMUTerm.Tui/SearchSurface.cs b/src/SharpMUTerm.Tui/SearchSurface.cs index 0a2e8cf9..6d8130f7 100644 --- a/src/SharpMUTerm.Tui/SearchSurface.cs +++ b/src/SharpMUTerm.Tui/SearchSurface.cs @@ -32,11 +32,10 @@ namespace SharpMUTerm.Tui; internal sealed class SearchSurface { /// - /// The narrowest the surface goes. Set by the footer: a surface too narrow for its own key hints - /// would wrap them onto a second row and push the list up. Checked by test against - /// rather than trusted. + /// The narrowest the surface goes. Set by the footer's shortest rung (): a + /// surface too narrow for it would wrap the keys onto a second row and push the list up. /// - internal const int MinimumWidth = 78; + internal const int MinimumWidth = 44; /// /// The rows the surface spends on something other than results: the query line, the count line, the diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.ChromeBars.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.ChromeBars.cs new file mode 100644 index 00000000..1c6ebe24 --- /dev/null +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.ChromeBars.cs @@ -0,0 +1,57 @@ +namespace SharpMUTerm.Tui; + +/// +/// The boundary bars in a pane's buffer (restore, away, activity, search) are as wide as the pane +/// (). Each keeps the function that draws it (), and that function +/// reads the pane's width when it runs, so a resize redraws the bars in place — no index moves. +/// +internal sealed partial class SharpMUTermApp +{ + /// The width each window's bars were last drawn at; a change redraws them. + private readonly Dictionary _chromeBarWidths = new(StringComparer.Ordinal); + + /// + /// The cells a bar in may take: its viewport's width, or 0 while the window has no + /// arranged pane (the bar then draws its fallback rule, and is redrawn once the pane is laid out). + /// + internal int BarWidth(string windowId) => + _paneScrolls.GetValueOrDefault(windowId) is { ViewportWidth: > 0 } panel ? panel.ViewportWidth : 0; + + /// + /// Redraws the bars of every window whose pane width moved since they were drawn. Rides PostBufferPaint, + /// where viewport metrics are fresh; it converges, because the next frame finds the width unchanged. + /// + private void SyncChromeBarWidths() + { + var accent = (string?)null; + foreach (var (windowId, buffer) in _lines) + { + var width = BarWidth(windowId); + if (width <= 0 || _chromeBarWidths.GetValueOrDefault(windowId) == width) + { + continue; + } + + _chromeBarWidths[windowId] = width; + var changed = false; + for (var i = 0; i < buffer.Count; i++) + { + if (buffer[i].Bar is { } bar) + { + accent ??= FrozenAccentHex(); + var markup = bar(accent); + if (!string.Equals(markup, buffer[i].Markup, StringComparison.Ordinal)) + { + buffer[i] = buffer[i] with { Markup = markup }; + changed = true; + } + } + } + + if (changed) + { + RepaintPane(windowId, keepSelection: true); + } + } + } +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Contributions.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Contributions.cs index bd8753c7..18bdc601 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Contributions.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Contributions.cs @@ -95,6 +95,20 @@ internal bool DispatchCommand(string id) private HostKeyGlyphs HostKeyGlyphs() => new(Host.Keys.Newline.Glyph); + /// + /// The key a registered command answers to on this host, spelt the way every surface spells keys + /// (), or null when it has none. A notice that names a key reads it here rather + /// than spelling it in its own text, so the key it names is the one that runs the command. + /// + internal string? CommandKey(string id) => + _contributions.Commands.Resolve(id) is SingleCommand { Key: { } key } + ? KeyGlyphs.Normalize(key.Resolve(HostKeyGlyphs())) + : null; + + /// How the status row says what reconnects: ⌥R (⌃P ▸ Reconnect). + private string ReconnectHint() => + CommandKey("world:reconnect") is { } key ? $"{key} (⌃P ▸ Reconnect)" : "⌃P ▸ Reconnect"; + private sealed class AppCommandContext(SharpMUTermApp app) : ICommandContext { private CommandContext? _state; diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs index 59445535..78d54701 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs @@ -524,7 +524,7 @@ private void ShowLayouts() _layoutsView.Open( "layouts", - $"Layouts · {Snippet(key)}", + $"Layouts · {Snippet(DisplayName(key))}", width => LayoutsListLines(key, width), k => LayoutsKeyPressed(key, k), width: 64, @@ -696,7 +696,7 @@ private LayoutActionResult ApplyFromList(string key, LayoutDefinition selected) { if (!ApplyLayout(key, selected)) { - var refused = $"no window to arrange for {Snippet(key)} — switch to the character first"; + var refused = $"no window to arrange for {Snippet(DisplayName(key))} — switch to the character first"; RefuseCommand(refused); return new(false, refused); } @@ -893,7 +893,7 @@ internal LayoutsModel LayoutsModelFor(string key) .Select(l => new LayoutRow(l.Id, Snippet(l.Name), LayoutDescription(l), l.IsBuiltIn, l.Id == inUse, l.Id == worldDefault)) .ToArray(); return new LayoutsModel( - key, + DisplayName(key), rows, Math.Clamp(_layoutsSelected, 0, Math.Max(0, rows.Length - 1)), _layoutsStatus, diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Names.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Names.cs new file mode 100644 index 00000000..d4f3b630 --- /dev/null +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Names.cs @@ -0,0 +1,27 @@ +using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Core.Commands; + +namespace SharpMUTerm.Tui; + +internal sealed partial class SharpMUTermApp +{ + /// + /// A session key named for a person (): Corvid · Aetherfall. An open session + /// answers first, so a world dialled from the command line that is not in the configuration is still named; + /// then the configuration. The dotted key is an address and is never shown. + /// + internal string DisplayName(string sessionKey) + { + var open = _sessions.Sessions + .Select(s => new CharacterRef(s.World.Name, s.Character?.Name ?? string.Empty, s.SessionKey, s.IsConnected)); + foreach (var session in open) + { + if (string.Equals(session.SessionKey, sessionKey, StringComparison.Ordinal)) + { + return CharacterNames.Display(session); + } + } + + return CharacterNames.ForKey(sessionKey, _config); + } +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.NativePalette.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.NativePalette.cs index abb9e151..4cf82c51 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.NativePalette.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.NativePalette.cs @@ -70,7 +70,7 @@ private bool TryOpenNativePalette() BuildCatalog(), _recentCommands.Ids, SuggestedCommandIds, - _active?.SessionKey, + _active is { } acting ? DisplayName(acting.SessionKey) : null, ThemeIsDark(), _openingQuery ?? string.Empty, id => OnUiThread(() => RunFromPalette(id)), diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs index a3790853..4d133133 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs @@ -269,7 +269,7 @@ private void RunQuickMacro(string sessionKey, string descriptor) { if (FindSession(sessionKey) is not { } session) { - RefuseCommand($"{Snippet(sessionKey)} has no open session — ⌃P ▸ Switch to it opens one"); + RefuseCommand($"{Snippet(DisplayName(sessionKey))} has no open session — ⌃P ▸ Switch to it opens one"); return; } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.SendGroup.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.SendGroup.cs index e450fabb..1a54911c 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.SendGroup.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.SendGroup.cs @@ -24,12 +24,12 @@ private bool DispatchGroupCommand(string id) var key = id[CommandIds.GroupTogglePrefix.Length..]; if (_sessions.Find(key) is null && !_sendGroup.Contains(key)) { - RefuseCommand($"{key} is not open"); + RefuseCommand($"{DisplayName(key)} is not open"); return true; } Notice( - _sendGroup.Toggle(key) ? $"{key} is in the send group" : $"{key} has left the send group", + _sendGroup.Toggle(key) ? $"{DisplayName(key)} is in the send group" : $"{DisplayName(key)} has left the send group", MessageSeverity.Info); RefreshRail(); return true; diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.TriggerBuilder.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.TriggerBuilder.cs index 9b6741bd..ba38e195 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.TriggerBuilder.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.TriggerBuilder.cs @@ -166,7 +166,7 @@ private void StageTriggerBuilder() /// are left out, so a test cannot match the client's own bars. takes the /// newest of it. /// - private IReadOnlyList TriggerTestLines() + internal IReadOnlyList TriggerTestLines() { var focused = ActiveWindowId(); var windows = SearchableWindows(all: true); diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 56cc8777..64a3b067 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -921,7 +921,7 @@ public SharpMUTermApp( _palette = new CommandPalette( _system, BuildCatalog, - () => _active?.SessionKey, + () => _active is { } acting ? DisplayName(acting.SessionKey) : null, id => DispatchCommand(id), _recentCommands, () => CommandPaletteModel.Suggested(CommandState())); @@ -1019,6 +1019,7 @@ public SharpMUTermApp( SyncMapSizes(); SyncPanelSizes(); SyncScrollSplitBars(); + SyncChromeBarWidths(); SyncStatusMode(); }; @@ -1876,11 +1877,10 @@ public string RenderSnapshot(string? view = null) RefusePrefix(PrefixPanel.NoSplitRefusal); RefuseCommand("nothing to reconnect — pick a character first (⌃P ▸ Switch to …)"); Notice( - "switched to Corvid · offline — Alt+R (⌃P ▸ Reconnect) connects it", + $"switched to Corvid · offline — {ReconnectHint()} connects it", MessageSeverity.Info, - "⌃P", - new NoticeAction("world:reconnect", "Reconnect")); - Notice("could not connect to aetherfall.mux:4201 — no route to host", MessageSeverity.Error, "⌃P"); + action: new NoticeAction("world:reconnect", "Reconnect")); + Notice("could not connect to aetherfall.mux:4201 — no route to host", MessageSeverity.Error); _messageLog.Toggle(); } @@ -2590,8 +2590,8 @@ private void RestorePreviousSession() var written = window.LastWritten; AppendWindowLine( windowId, - RestoreBarRenderer.Bar(restored, written, FrozenAccentHex()), - bar: accent => RestoreBarRenderer.Bar(restored, written, accent)); + RestoreBarRenderer.Bar(restored, written, FrozenAccentHex(), BarWidth(windowId)), + bar: accent => RestoreBarRenderer.Bar(restored, written, accent, BarWidth(windowId))); restoredWindows++; restoredLines += window.Lines.Count; @@ -3315,7 +3315,7 @@ private void SwitchToCharacter(string sessionKey) { if (FindCharacter(sessionKey) is not { } found) { - Notice($"no character called {sessionKey} is configured — F5 adds one", key: "⌃P"); + Notice($"no character called {Snippet(DisplayName(sessionKey))} is configured — F5 adds one"); return; } @@ -3335,12 +3335,11 @@ private void SwitchToCharacter(string sessionKey) var state = session.IsConnected ? "connected" - : "offline — Alt+R (⌃P ▸ Reconnect) connects it"; + : $"offline — {ReconnectHint()} connects it"; Notice( $"switched to {SessionTitle(session)} · {state}", MessageSeverity.Info, - "⌃P", - session.IsConnected ? null : new NoticeAction("world:reconnect", "Reconnect")); + action: session.IsConnected ? null : new NoticeAction("world:reconnect", "Reconnect")); } /// @@ -3449,8 +3448,10 @@ private void AppendWindowLine( } // The plain text is computed here, once, and not on demand: ⌃F refilters on every keystroke over - // every line of every window (see PaneLine.Plain). - buffer.Add(new PaneLine(markup, stamp, MarkupText.Plain(markup), imageAnchor, pictures, source, bar)); + // every line of every window (see PaneLine.Plain). A world's line is read from its spans, not from the + // markup: the markup carries the client's own decoration (a highlight's `▌ ` left rule), and a search or a + // trigger's live test that saw it would miss `^[public]` on the very line that rule highlighted. + buffer.Add(new PaneLine(markup, stamp, source?.Text ?? MarkupText.Plain(markup), imageAnchor, pictures, source, bar)); // Cap what the pane holds, and trim its control with it. The control re-parses every line it @@ -3886,7 +3887,7 @@ private void MarkWhereTheReaderLeft(TimeSpan away) continue; } - InsertChromeRow(windowId, at, ink => AwayBarRenderer.Bar(missed, away, ink)); + InsertChromeRow(windowId, at, ink => AwayBarRenderer.Bar(missed, away, ink, BarWidth(windowId))); var mark = new AwayMark { Index = at, DrawnAfter = _focus.InputCount, DrawnAt = _time.GetUtcNow() }; _awayMarks[windowId] = mark; @@ -3958,7 +3959,7 @@ private void MarkMissedLines(bool reveal) } var count = buffer.Count - at; - InsertChromeRow(windowId, at, accent => AwayBarRenderer.Missed(count, accent)); + InsertChromeRow(windowId, at, accent => AwayBarRenderer.Missed(count, accent, BarWidth(windowId))); var mark = new AwayMark { @@ -4836,7 +4837,8 @@ private void GoToSearchHit(SearchRow row, string query, bool regex, bool all, in } var at = Math.Clamp(row.LineIndex, 0, buffer.Count); - InsertChromeRow(row.WindowId, at, accent => SearchBarRenderer.Bar(query, ordinal, total, accent)); + var searchWindow = row.WindowId; + InsertChromeRow(row.WindowId, at, accent => SearchBarRenderer.Bar(query, ordinal, total, accent, BarWidth(searchWindow))); _searchMark = (row.WindowId, at); RepaintPane(row.WindowId); @@ -5211,8 +5213,15 @@ private void ToggleComposer() ? kept : new ComposeResult(string.Empty, ComposeEscaping.AsTyped); + // The target is resolved the way the docked composer's is (DescribeDocked): the session's title, else the + // window's owner by name, with nothing sendable. "no connection" is left for a window that belongs to nobody. + var target = session is not null + ? SessionTitle(session) + : _workspace.FindWindow(windowId)?.SessionKey is { Length: > 0 } owner + ? FindCharacter(owner)?.Character.Name ?? string.Empty + : string.Empty; OpenComposer( - session is null ? string.Empty : SessionTitle(session), + target, draft.Body, draft.Escaping, canSend: session is not null, @@ -5328,7 +5337,7 @@ private string NothingToSendTo(string windowId) var window = _workspace.FindWindow(windowId); if (window?.SessionKey is { Length: > 0 } owner) { - return $"{owner} has no open session — ⌃P ▸ Switch to it opens one; nothing was sent"; + return $"{Snippet(DisplayName(owner))} has no open session — ⌃P ▸ Switch to it opens one; nothing was sent"; } // Through Snippet: a window's title can be a world's own text (the web view is titled from the @@ -7242,7 +7251,7 @@ private QuitModel QuitFactsNow() // — 3 unsaved edits", which was true while closing a screen could throw its edits away; now every // committed value is already written to disk when it is committed, so the count is always zero and a // line that could never appear is a line to delete rather than to leave hanging. - return new QuitModel(ConnectedCharacters(), drafts, holding.Select(w => w.Title).ToList()); + return new QuitModel(ConnectedCharacters().Select(DisplayName).ToList(), drafts, holding.Select(w => w.Title).ToList()); } /// @@ -12992,7 +13001,7 @@ private void AdoptSessionOf(string windowId) // the page it loaded — and the status row is not a place to paste an unbounded string from the wire. Notice( owner is { Length: > 0 } - ? $"{owner} has no open session — ⌃P ▸ Switch to it opens one; ⏎ sends nowhere from this pane" + ? $"{Snippet(DisplayName(owner))} has no open session — ⌃P ▸ Switch to it opens one; ⏎ sends nowhere from this pane" : $"{Snippet(_workspace.FindWindow(windowId)?.Title ?? windowId)} belongs to no connection — " + "⏎ sends nowhere from this pane"); } diff --git a/src/SharpMUTerm.Tui/WelcomeSurface.cs b/src/SharpMUTerm.Tui/WelcomeSurface.cs index 39c92e08..accf42b8 100644 --- a/src/SharpMUTerm.Tui/WelcomeSurface.cs +++ b/src/SharpMUTerm.Tui/WelcomeSurface.cs @@ -336,8 +336,8 @@ private static List RenderMenu(WelcomeModel model, int width) { var lines = new List { - Accent("Welcome to SharpMUTerm"), - Label("No games yet. Pick one of these to start."), + Accent(WelcomeModel.Heading), + Label(WelcomeModel.Intro), string.Empty, }; @@ -350,7 +350,7 @@ private static List RenderMenu(WelcomeModel model, int width) } lines.Add(model.Problem is null ? string.Empty : $" [{ScreenPalette.Caution}]{Escape(model.Problem)}[/]"); - lines.Add(Label("Or type it on the command line below:")); + lines.Add(Label(WelcomeModel.ExampleLead)); lines.Add(" " + Value(ExampleCommand)); lines.Add(string.Empty); lines.Add(Label(model.LayoutHeading)); @@ -362,9 +362,9 @@ private static List RenderMenu(WelcomeModel model, int width) : $"[{ScreenPalette.Value}] {Escape(name)} [/]"; })); lines.Add(" " + chips); - lines.Add(" " + Label("saved per world · ⌥M changes it later")); + lines.Add(" " + Label(WelcomeModel.LayoutNote)); lines.Add(string.Empty); - lines.Add(Footer(width, "↑↓ select · ←→ layout", "Esc close · ⏎ choose")); + lines.Add(Footer(width, WelcomeModel.MenuKeys.Left, WelcomeModel.MenuKeys.Right)); return lines; } @@ -372,29 +372,30 @@ private static List RenderForm(WelcomeModel model, int width) { var lines = new List { - Accent("Connect to a host"), - Label("Saved as a world, so you can come back to it."), + Accent(WelcomeModel.FormHeading), + Label(WelcomeModel.FormIntro), string.Empty, }; var boxWidth = Math.Clamp(width - 16, 12, 44); var field = model.Field; - lines.Add(Row(field, WelcomeField.Host, "host", Box(model.Host, boxWidth, field == WelcomeField.Host, "mud.example.org"))); - lines.Add(Row(field, WelcomeField.Port, "port", Box(model.Port, 7, field == WelcomeField.Port, null))); - lines.Add(Row(field, WelcomeField.Tls, "TLS", Toggle(model.Tls, "on, encrypted", "off"))); - lines.Add(Row(field, WelcomeField.Character, "character", Box(model.Character, boxWidth, field == WelcomeField.Character, "optional, the name you log in as"))); - lines.Add(Row(field, WelcomeField.Password, "password", Toggle(model.PasswordLater, "save it on F5 after connecting", "type it at the login prompt"))); + lines.Add(Row(field, WelcomeField.Host, Box(model.Host, boxWidth, field == WelcomeField.Host, WelcomeModel.HostPlaceholder))); + lines.Add(Row(field, WelcomeField.Port, Box(model.Port, 7, field == WelcomeField.Port, null))); + lines.Add(Row(field, WelcomeField.Tls, Toggle(model.Tls, WelcomeModel.TlsOn, WelcomeModel.TlsOff))); + lines.Add(Row(field, WelcomeField.Character, Box(model.Character, boxWidth, field == WelcomeField.Character, WelcomeModel.CharacterPlaceholder))); + lines.Add(Row(field, WelcomeField.Password, Toggle(model.PasswordLater, WelcomeModel.PasswordOn, WelcomeModel.PasswordOff))); lines.Add(string.Empty); lines.Add(model.Problem is null ? Label(model.FormLayoutLine) : $"[{ScreenPalette.Caution}]{Escape(model.Problem)}[/]"); lines.Add(string.Empty); - lines.Add(Footer(width, "↑↓ field · Space toggle", "Esc back · ⏎ connect")); + lines.Add(Footer(width, "↑↓ field · Space toggle", WelcomeModel.FormKeys)); return lines; } - private static string Row(WelcomeField current, WelcomeField field, string label, string value) + private static string Row(WelcomeField current, WelcomeField field, string value) { + var label = WelcomeModel.FieldLabel(field); var selected = current == field; var marker = selected ? $"[bold {ScreenPalette.Accent}]▸[/]" : " "; return $"{marker} {Pad(selected ? Value(label, bold: true) : Label(label), 11)} {value}"; @@ -426,11 +427,11 @@ private static string Footer(int width, string left, string right) /// public static IReadOnlyList PlainLines(WelcomeLayout layout, string? indexProblem) => [ - "Welcome to SharpMUTerm. No games yet.", + "Welcome to SharpMUTerm. No worlds yet.", "To connect, type /connect, a host and a port, and tls for an encrypted connection: " + ExampleCommand, indexProblem is null - ? "To browse games from the package index, type /package browse" - : "Browsing games is not available: " + indexProblem, + ? "To browse worlds from the package index, type /package browse" + : "Browsing worlds is not available: " + indexProblem, "Starting layout: " + (layout == WelcomeLayout.Suggested ? "suggested from what the game sends" : layout.ToString()) + ". Type /welcome layout roleplay, combat or suggested to change it.", "Type /welcome to hear this again.", diff --git a/tests/SharpMUTerm.Avalonia.Tests/PackagePageTests.cs b/tests/SharpMUTerm.Avalonia.Tests/PackagePageTests.cs index dc9ddb4c..8c9855d4 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/PackagePageTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/PackagePageTests.cs @@ -110,7 +110,7 @@ public async Task ThePageDrawsTheDeclaredFieldsTheCellScreenDraws() await Assert.That(shown).IsEquivalentTo(cells, TUnit.Assertions.Enums.CollectionOrdering.Matching); await Assert.That(shown).IsEquivalentTo(BuiltInSettings.Packages.Packages!.Fields.Select(f => f.Id), TUnit.Assertions.Enums.CollectionOrdering.Matching); await Assert.That(values["scripts"]).IsEqualTo("basics.lua"); - await Assert.That(values["characters"]).IsEqualTo("Corvid (Aetherfall)"); + await Assert.That(values["characters"]).IsEqualTo("Corvid · Aetherfall"); } [Test] @@ -183,7 +183,7 @@ public async Task TheBrowseListComesForwardWhenTheIndexIsAskedForAndInstallIsHan public async Task TheReviewIsTheModelsRowsAndInstallIsTheConsent() { var harness = new Harness(); - var model = PackageReviewModel.From(Contents(), ["Corvid (Aetherfall)"], harness.Config.Packages.Single()); + var model = PackageReviewModel.From(Contents(), ["Corvid · Aetherfall"], harness.Config.Packages.Single()); var (lines, shown, log, gone) = await Run(harness, window => { var page = window.PackagePage!; diff --git a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs index d4462cd5..28ae8aab 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs @@ -943,8 +943,18 @@ public async Task F4TellsTheWindowsTruth() await Assert.That(app.SimulateKey(key!.Value)).IsEqualTo("score"); var hotkeys = string.Join('\n', KeypadScreenRenderer.HotkeysColumn(app.Host.Keys, config.TriggerSets.SelectMany(s => s.Macros).ToList())); - await Assert.That(hotkeys).Contains("Ctrl+3"); - await Assert.That(hotkeys).DoesNotContain("▲ Ctrl+3"); + await Assert.That(hotkeys).Contains("⌃3"); + await Assert.That(hotkeys).DoesNotContain("▲ ⌃3"); + + // The numpad is a key the window delivers: F4 marks no numpad binding dead, and Num7 reaches its macro. + await Assert.That(MacroKeys.Verdict(WindowHost.Keys, "Num7").Fires).IsTrue(); + await Assert.That(hotkeys).DoesNotContain("▲ Num7"); + var numpad = KeyMapper.FromKeyDown(Key.NumPad7, KeyModifiers.None); + await Assert.That(numpad).IsNotNull(); + await Assert.That(numpad!.Value.Key).IsEqualTo(ConsoleKey.NumPad7); + await Assert.That(numpad.Value.KeyChar).IsEqualTo('7'); + var walk = config.TriggerSets.SelectMany(s => s.Macros).First(m => m.Key == "Num7").Command; + await Assert.That(app.SimulateKey(numpad.Value)).IsEqualTo(walk); } /// The quick bar reads the host's keys: a chord the host keeps for itself is drawn as one that does not fire. diff --git a/tests/SharpMUTerm.Client.Tests/CharacterNamesTests.cs b/tests/SharpMUTerm.Client.Tests/CharacterNamesTests.cs new file mode 100644 index 00000000..bdc1e17a --- /dev/null +++ b/tests/SharpMUTerm.Client.Tests/CharacterNamesTests.cs @@ -0,0 +1,35 @@ +using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Core.Configuration; + +namespace SharpMUTerm.Client.Tests; + +/// One name for a character on every surface, and never the dotted session key. +public class CharacterNamesTests +{ + [Test] + public async Task ACharacterIsNamedCharacterThenWorld() + { + await Assert.That(CharacterNames.Display("Aetherfall", "Corvid")).IsEqualTo("Corvid · Aetherfall"); + await Assert.That(CharacterNames.Display("Aetherfall", null)).IsEqualTo("Aetherfall"); + } + + [Test] + public async Task ASessionKeyIsResolvedAgainstTheConfigurationSoADottedWorldStillSplits() + { + var config = new AppConfiguration(); + var world = new WorldDefinition { Name = "mud.example.org", Host = "mud.example.org", Port = 23 }; + world.Characters.Add(new CharacterDefinition { Name = "Ann" }); + config.Worlds.Add(world); + + await Assert.That(CharacterNames.ForKey("mud.example.org.Ann", config)).IsEqualTo("Ann · mud.example.org"); + await Assert.That(CharacterNames.ForKey("mud.example.org", config)).IsEqualTo("mud.example.org"); + } + + [Test] + public async Task AKeyNothingNamesIsSplitWhereAKeyIsJoined() + { + await Assert.That(CharacterNames.ForKey("Quiet.Cal", (IEnumerable?)null)).IsEqualTo("Cal · Quiet"); + await Assert.That(CharacterNames.ForKey("Quiet", (IEnumerable?)null)).IsEqualTo("Quiet"); + } +} diff --git a/tests/SharpMUTerm.Client.Tests/CommandPaletteModelTests.cs b/tests/SharpMUTerm.Client.Tests/CommandPaletteModelTests.cs index 474add0f..7f53fadb 100644 --- a/tests/SharpMUTerm.Client.Tests/CommandPaletteModelTests.cs +++ b/tests/SharpMUTerm.Client.Tests/CommandPaletteModelTests.cs @@ -12,10 +12,31 @@ public class FuzzyMatchTests public async Task AQueryMatchesWhenItIsASubsequence_IgnoringCase() { await Assert.That(FuzzyMatch.Match("SPLIT", "Split right")).IsNotNull(); - await Assert.That(FuzzyMatch.Match("lgg", "Start logging")).IsNotNull(); + await Assert.That(FuzzyMatch.Match("loggng", "Start logging")).IsNotNull(); await Assert.That(FuzzyMatch.Match("zzz", "Start logging")).IsNull(); } + /// A short word may not scatter its letters across a title: the reported noise for trig. + [Test] + public async Task AShortWordMatchesOnlyAtWordStartsAndRuns() + { + await Assert.That(FuzzyMatch.Match("trig", "Make a trigger from the selection")).IsNotNull(); + await Assert.That(FuzzyMatch.Match("trig", "Stop reading this window aloud")).IsNull(); + await Assert.That(FuzzyMatch.Match("trig", "Start logging")).IsNull(); + await Assert.That(FuzzyMatch.Match("lgg", "Start logging")).IsNull(); + + // Acronyms are word starts, so they still match. + await Assert.That(FuzzyMatch.Match("fp", "Freeze pane")).IsNotNull(); + await Assert.That(FuzzyMatch.Match("sl", "Start logging")).IsNotNull(); + } + + /// A longer word keeps the subsequence rule, where scattered letters are rare enough to mean something. + [Test] + public async Task ALongerWordMayStillScatter() + { + await Assert.That(FuzzyMatch.Match("tstamp", "Show timestamps")).IsNotNull(); + } + [Test] public async Task WordsAreMatchedInOrder_EachAfterTheLast() { @@ -28,17 +49,20 @@ public async Task WordsAreMatchedInOrder_EachAfterTheLast() [Test] public async Task AWholePrefixBeatsAScatteredMatch() { - var prefix = FuzzyMatch.Match("lay", "Layouts")!; - var scattered = FuzzyMatch.Match("lay", "Clear window, say")!; + var prefix = FuzzyMatch.Match("layou", "Layouts")!; + var scattered = FuzzyMatch.Match("layou", "Clear window, say you")!; await Assert.That(prefix.Score).IsGreaterThan(scattered.Score); + + // And a short query cannot scatter at all. + await Assert.That(FuzzyMatch.Match("lay", "Clear window, say")).IsNull(); } [Test] public async Task WordStartsBeatTheMiddleOfAWord() { // f…p at two word starts, against an f and a p buried in words. - var starts = FuzzyMatch.Match("fp", "Freeze pane")!; - var buried = FuzzyMatch.Match("fp", "Self-help")!; + var starts = FuzzyMatch.Match("frzpn", "Freeze pane")!; + var buried = FuzzyMatch.Match("frzpn", "Fur-zip ink")!; await Assert.That(starts.Score).IsGreaterThan(buried.Score); } @@ -74,7 +98,7 @@ public class CommandPaletteModelTests public async Task AnEmptyQueryListsEveryGroupInItsFixedOrder() { var view = CommandPaletteModel.Build("", Items); - await Assert.That(Headers(view)).IsEquivalentTo(new[] { "GO TO", "TERMINAL", "LAYOUT" }, CollectionOrdering.Matching); + await Assert.That(Headers(view)).IsEquivalentTo(new[] { "GO TO", "OUTPUT", "LAYOUT" }, CollectionOrdering.Matching); await Assert.That(view.Entries.Count).IsEqualTo(Items.Length); await Assert.That(view.Total).IsEqualTo(Items.Length); } @@ -100,10 +124,10 @@ await Assert.That(first.TitleMatches) [Test] public async Task TheBestGroupComesFirst_EvenWhenItIsNotTheFirstGroup() { - // "log" is a title prefix only in TERMINAL; GO TO's entry does not match at all. + // "log" is a title prefix only in OUTPUT; GO TO's entry does not match at all. var view = CommandPaletteModel.Build("log", Items); await Assert.That(view.Entries[0].Item.Id).IsEqualTo("term:log-on"); - await Assert.That(Headers(view).First()).IsEqualTo("TERMINAL"); + await Assert.That(Headers(view).First()).IsEqualTo("OUTPUT"); } [Test] diff --git a/tests/SharpMUTerm.Client.Tests/PackageSettingsTests.cs b/tests/SharpMUTerm.Client.Tests/PackageSettingsTests.cs index 4a19f487..417c39f9 100644 --- a/tests/SharpMUTerm.Client.Tests/PackageSettingsTests.cs +++ b/tests/SharpMUTerm.Client.Tests/PackageSettingsTests.cs @@ -117,7 +117,7 @@ public async Task TheFieldsSayWhatThePackageIsAndAdds() await Assert.That(Read("sets")).IsEqualTo("Basics · 1 rule"); await Assert.That(Read("scripts")).IsEqualTo("main.lua"); await Assert.That(Read("media")).IsEqualTo("none"); - await Assert.That(Read("characters")).IsEqualTo("Corvid (Aetherfall)"); + await Assert.That(Read("characters")).IsEqualTo("Corvid · Aetherfall"); await Assert.That(Read("update")).Contains("not checked"); } @@ -160,7 +160,7 @@ public async Task TheReviewLeadsWithWhatCanActAsThePlayer() { var contents = Contents("aether.basics", "Aether basics", "1.0.0", "\"*\"", SendingSet, script: true); - var review = PackageReviewModel.From(contents, ["Corvid (Aetherfall)"], existing: null); + var review = PackageReviewModel.From(contents, ["Corvid · Aetherfall"], existing: null); await Assert.That(review.Title).IsEqualTo("Install package"); await Assert.That(review.Acts).IsTrue(); diff --git a/tests/SharpMUTerm.Tui.Tests/ClientHostContractTests.cs b/tests/SharpMUTerm.Tui.Tests/ClientHostContractTests.cs index 96636e2e..7c913819 100644 --- a/tests/SharpMUTerm.Tui.Tests/ClientHostContractTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/ClientHostContractTests.cs @@ -66,6 +66,7 @@ public async Task TheCatalogNamesTheHostsNewlineChord() Newline = new HostChord(ConsoleKey.Enter, ConsoleModifiers.Control, "Ctrl+⏎", "Ctrl+Enter"), Reserved = [], ReportsChordsWhole = false, + DeliversNumpad = false, }; await using var app = new SharpMUTermApp(DemoScene.Build(), ClientHost.Headless(driver, Caps) with { Keys = keys }); diff --git a/tests/SharpMUTerm.Tui.Tests/ConnectionKeysTests.cs b/tests/SharpMUTerm.Tui.Tests/ConnectionKeysTests.cs index 01eae0f8..4d0c912f 100644 --- a/tests/SharpMUTerm.Tui.Tests/ConnectionKeysTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/ConnectionKeysTests.cs @@ -386,7 +386,7 @@ public async Task SwitchingToAnOfflineCharacterNamesTheChord() app.DispatchCommand($"char:{Corvid}"); - await Assert.That(app.StatusMarkup).Contains("Alt+R"); + await Assert.That(app.StatusMarkup).Contains("⌥R"); await Assert.That(app.StatusMarkup).Contains("Reconnect"); // the surface is still named too } } diff --git a/tests/SharpMUTerm.Tui.Tests/KeypadScreenRendererTests.cs b/tests/SharpMUTerm.Tui.Tests/KeypadScreenRendererTests.cs index 6f7ff135..fc14b41f 100644 --- a/tests/SharpMUTerm.Tui.Tests/KeypadScreenRendererTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/KeypadScreenRendererTests.cs @@ -76,7 +76,7 @@ public async Task Render_UnboundNumpadCellShowsPlaceholder() public async Task Render_HotkeyListShowsCtrlF1BindingCommandAndEnabledTick() { var lines = KeypadScreenRenderer.Render(HostKeys.Terminal, Scene()); - var row = lines.Single(l => l.Contains("Ctrl+F1")); + var row = lines.Single(l => l.Contains("⌃F1")); await Assert.That(row).Contains("ping"); await Assert.That(row).Contains("✓"); } @@ -85,7 +85,7 @@ public async Task Render_HotkeyListShowsCtrlF1BindingCommandAndEnabledTick() public async Task Render_DisabledHotkeyShowsDimMarker() { var lines = KeypadScreenRenderer.Render(HostKeys.Terminal, Scene()); - var row = lines.Single(l => l.Contains("Ctrl+F2")); + var row = lines.Single(l => l.Contains("⌃F2")); await Assert.That(row).Contains("who"); await Assert.That(row).Contains("[dim]·[/]"); } @@ -114,7 +114,7 @@ public async Task Render_EscapesMarkupBracketsInCommand() new Macro { Name = "Weird", Key = "Ctrl+F9", Enabled = true, Command = "say [hi]" }, }; var lines = KeypadScreenRenderer.Render(HostKeys.Terminal, macros); - var row = lines.Single(l => l.Contains("Ctrl+F9")); + var row = lines.Single(l => l.Contains("⌃F9")); await Assert.That(row).Contains("say [[hi]]"); } } diff --git a/tests/SharpMUTerm.Tui.Tests/MacroKeyCaptureTests.cs b/tests/SharpMUTerm.Tui.Tests/MacroKeyCaptureTests.cs index 923296b6..6f0ed8c7 100644 --- a/tests/SharpMUTerm.Tui.Tests/MacroKeyCaptureTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/MacroKeyCaptureTests.cs @@ -159,7 +159,7 @@ public async Task ABindingThatCannotFireIsMarkedOnItsRowAndExplainedInTheFooter( await Assert.That(dead).Contains("▲"); await Assert.That(dead).Contains(ScreenPalette.Muted); - var live = rows.Single(l => l.Contains("Ctrl+F1", StringComparison.Ordinal)); + var live = rows.Single(l => l.Contains("⌃F1", StringComparison.Ordinal)); await Assert.That(live).DoesNotContain("▲"); await Assert.That(rows[0]).Contains("HOTKEYS"); diff --git a/tests/SharpMUTerm.Tui.Tests/NativeModalRoutingTests.cs b/tests/SharpMUTerm.Tui.Tests/NativeModalRoutingTests.cs index 8cce79c2..23a4e496 100644 --- a/tests/SharpMUTerm.Tui.Tests/NativeModalRoutingTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/NativeModalRoutingTests.cs @@ -137,7 +137,7 @@ public async Task TheQuitPromptOpensOverANativeModalAndStayLeavesItOpen() app.SimulateKey(CtrlQ); var quit = modals.Shown.OfType().Single(); await Assert.That(quit.AlwaysInFront).IsTrue(); - await Assert.That(quit.Model.ConnectedCharacters).IsEquivalentTo(new[] { "Quiet.Ann" }); + await Assert.That(quit.Model.ConnectedCharacters).IsEquivalentTo(new[] { "Ann · Quiet" }); await Assert.That(search.IsEnded).IsFalse().Because("the search stays under the prompt"); quit.Answer(false); diff --git a/tests/SharpMUTerm.Tui.Tests/PackagesAppTests.cs b/tests/SharpMUTerm.Tui.Tests/PackagesAppTests.cs index 223eb8f6..175ac4c6 100644 --- a/tests/SharpMUTerm.Tui.Tests/PackagesAppTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/PackagesAppTests.cs @@ -100,7 +100,7 @@ public async Task TheReviewSaysWhatTheArchiveAddsAndInstallsNothingUntilEnter() var text = string.Join("\n", rig.App.PackageView.Lines.Select(MarkupText.Plain)); await Assert.That(text).Contains("1 rule sends commands as you"); await Assert.That(text).Contains("basics.lua"); - await Assert.That(text).Contains("Corvid (Aetherfall)"); + await Assert.That(text).Contains("Corvid · Aetherfall"); await Assert.That(rig.App.Packages.Installed).IsEmpty(); await Assert.That(Directory.Exists(Path.Combine(rig.Root, "packages"))).IsFalse(); diff --git a/tests/SharpMUTerm.Tui.Tests/PaletteDiscoverabilityTests.cs b/tests/SharpMUTerm.Tui.Tests/PaletteDiscoverabilityTests.cs index ec4d5da1..31e8128b 100644 --- a/tests/SharpMUTerm.Tui.Tests/PaletteDiscoverabilityTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/PaletteDiscoverabilityTests.cs @@ -82,7 +82,7 @@ public async Task KeyClashesAreCountedOnThePalette_AndOpenTheKeypadScreen() await Assert.That(app.DispatchCommand("settings:key-clashes")).IsTrue(); await Assert.That(app.Settings.IsOpen).IsTrue(); var frame = Text(app.RenderWholeFrame()); - await Assert.That(frame).Contains("△ Ctrl+C"); + await Assert.That(frame).Contains("△ ⌃C"); await Assert.That(frame).Contains("hide a client key"); } } diff --git a/tests/SharpMUTerm.Tui.Tests/PaneActivationTests.cs b/tests/SharpMUTerm.Tui.Tests/PaneActivationTests.cs index 47cf8c00..11a69046 100644 --- a/tests/SharpMUTerm.Tui.Tests/PaneActivationTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/PaneActivationTests.cs @@ -244,7 +244,7 @@ public async Task TypingInAPaneWithNoSession_ReachesNoWorldAtAll() Send(one.App, "look"); await Assert.That(one.Ann.Lines).IsEmpty(); - await Assert.That(one.App.StatusMarkup).Contains("Quiet.Cal"); + await Assert.That(one.App.StatusMarkup).Contains("Cal · Quiet"); await Assert.That(one.App.StatusMarkup).Contains("nothing was sent"); } @@ -355,7 +355,7 @@ public async Task AWindowWhoseOwnerHasNoSession_RefusesAndNamesWhatWouldOpenIt() await Assert.That(ClickTab(app, "char:Quiet.Cal")).IsTrue(); await Assert.That(app.ActiveSessionKey).IsEqualTo("Quiet.Ann"); // refused, not redirected - await Assert.That(app.StatusMarkup).Contains("Quiet.Cal"); + await Assert.That(app.StatusMarkup).Contains("Cal · Quiet"); await Assert.That(app.StatusMarkup).Contains("no open session"); } diff --git a/tests/SharpMUTerm.Tui.Tests/RailRendererTests.cs b/tests/SharpMUTerm.Tui.Tests/RailRendererTests.cs index 93d26113..3b1b6be7 100644 --- a/tests/SharpMUTerm.Tui.Tests/RailRendererTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/RailRendererTests.cs @@ -85,7 +85,7 @@ public async Task RenderCollapsed_ShowsWorldSeparatorsAndCharacterInitials() { var lines = RailRenderer.RenderCollapsed(Scene()); // Two world separators (▚), and Corvid's initial with a connected dot + unread count. - await Assert.That(lines.Count(l => l.Contains("▚"))).IsEqualTo(2); + await Assert.That(lines.Count(l => l.Contains(RailRenderer.CollapsedWorldMark))).IsEqualTo(2); await Assert.That(lines.Any(l => l.Contains("●") && l.Contains("C") && l.Contains("5"))).IsTrue(); await Assert.That(lines.Any(l => l.Contains("○") && l.Contains("R"))).IsTrue(); } diff --git a/tests/SharpMUTerm.Tui.Tests/SessionStateAccountingTests.cs b/tests/SharpMUTerm.Tui.Tests/SessionStateAccountingTests.cs index c5c8b914..4b061b3b 100644 --- a/tests/SharpMUTerm.Tui.Tests/SessionStateAccountingTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/SessionStateAccountingTests.cs @@ -248,8 +248,8 @@ public async Task TheQuitPromptCountsEveryConnectionRatherThanEveryWorld() var prompt = string.Join("\n", wired.App.QuitPromptLines); await Assert.That(prompt).Contains("2 characters connected"); - await Assert.That(prompt).Contains("Convergence.Mannaz"); - await Assert.That(prompt).Contains("Convergence.Riko"); + await Assert.That(prompt).Contains("Mannaz · Convergence"); + await Assert.That(prompt).Contains("Riko · Convergence"); await Assert.That(prompt).DoesNotContain("1 world connected"); } diff --git a/tests/SharpMUTerm.Tui.Tests/SurfaceCellTests.cs b/tests/SharpMUTerm.Tui.Tests/SurfaceCellTests.cs index d9044013..37f6bd2c 100644 --- a/tests/SharpMUTerm.Tui.Tests/SurfaceCellTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/SurfaceCellTests.cs @@ -103,6 +103,6 @@ public async Task F4TellsTheTerminalsTruth() await Assert.That(app.SimulateKey(new ConsoleKeyInfo('3', ConsoleKey.D3, false, false, true))).IsNull(); var hotkeys = string.Join('\n', KeypadScreenRenderer.HotkeysColumn(keys, config.TriggerSets.SelectMany(s => s.Macros).ToList())); - await Assert.That(hotkeys).Contains("▲ Ctrl+3"); + await Assert.That(hotkeys).Contains("▲ ⌃3"); } } diff --git a/tests/SharpMUTerm.Tui.Tests/WaveTenTests.cs b/tests/SharpMUTerm.Tui.Tests/WaveTenTests.cs new file mode 100644 index 00000000..aea76586 --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/WaveTenTests.cs @@ -0,0 +1,163 @@ +using System.Text.RegularExpressions; +using SharpConsoleUI.Drivers; +using SharpMUTerm.Core.Automation; +using SharpMUTerm.Core.Workspaces; +using SharpMUTerm.Graphics; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// The pins for the ux-wave9 audit's findings this wave closed: boundary bars as wide as their pane (#3), a pane +/// line's plain text read from its spans (#9), F4's keys in glyphs (#13), the numpad in the window (#19), the +/// collapsed rail's initials and world mark (#17) and the ⌃F and F4 footers' drop-order ladders (#23). +/// +[NotInParallel] +public class WaveTenTests +{ + private static readonly TerminalCapabilities Headless = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private static SharpMUTermApp Demo(int width, int height, string? view = null) + { + Console.SetIn(TextReader.Null); + var config = DemoScene.Build(); + config.ScrollbackSpill.Enabled = false; + var app = new SharpMUTermApp(config, Headless, new HeadlessConsoleDriver(width, height)); + app.RenderSnapshot(view); + return app; + } + + // ── #3: the bars fill their pane ─────────────────────────────────────────────────────────────── + + [Test] + [Arguments(30)] + [Arguments(72)] + [Arguments(140)] + public async Task EveryBoundaryBarIsExactlyAsWideAsItsPane(int width) + { + string[] bars = + [ + AwayBarRenderer.Bar(37, TimeSpan.FromMinutes(12), "#c678dd", width), + AwayBarRenderer.Missed(3, "#c678dd", width), + SearchBarRenderer.Bar("goblin", 2, 3, "#c678dd", width), + RestoreBarRenderer.Bar(500, DateTimeOffset.Now, "#c678dd", width), + ]; + + foreach (var bar in bars) + { + await Assert.That(MarkupText.VisibleLength(bar)).IsEqualTo(width).Because(bar); + } + } + + [Test] + public async Task ANarrowPaneElidesTheWordsBeforeTheBarCouldWrap() + { + var bar = AwayBarRenderer.Bar(37, TimeSpan.FromMinutes(12), "#c678dd", 24); + await Assert.That(MarkupText.VisibleLength(bar)).IsEqualTo(24); + await Assert.That(bar).Contains("…"); + await Assert.That(bar).Contains(AwayBarRenderer.Label); + } + + [Test] + public async Task AnUnarrangedPaneKeepsTheOldRule() + { + var bar = AwayBarRenderer.Missed(3, "#c678dd"); + await Assert.That(bar).Contains(new string('─', BarRule.Fallback)); + } + + /// The live bar is drawn at the pane's viewport width, and redrawn when that width changes. + [Test] + public async Task TheActivityBarSpansThePaneAt80Columns() + { + await using var app = Demo(80, 24, "activity-bar"); + var row = app.PaneLines("main").Single(l => l.Contains(AwayBarRenderer.MissedLabel, StringComparison.Ordinal)); + var width = app.BarWidth("main"); + await Assert.That(width).IsGreaterThan(0); + await Assert.That(MarkupText.VisibleLength(row)).IsEqualTo(width); + } + + // ── #9: plain text is the line's own ─────────────────────────────────────────────────────────── + + [Test] + public async Task AHighlightedLineStillMatchesItsOwnAnchoredPattern() + { + await using var app = Demo(120, 32); + var lines = app.TriggerTestLines(); + await Assert.That(lines.Any(l => Regex.IsMatch(l, @"^\[public\] (.+)$"))).IsTrue(); + await Assert.That(lines.Any(l => l.Contains('▌', StringComparison.Ordinal))).IsFalse(); + } + + [Test] + public async Task SearchResultsShowNoRuleGlyph() + { + await using var app = Demo(120, 32); + var model = app.SearchModelFor("Rivane: to the crypt", regex: false, all: true); + await Assert.That(model.Rows.Count).IsGreaterThan(0); + foreach (var row in model.Rows) + { + await Assert.That(row.Text).DoesNotContain("▌"); + } + } + + // ── #13 / #19: F4's keys ──────────────────────────────────────────────────────────────────────── + + [Test] + public async Task F4SpellsABindingsKeyInGlyphs() + { + var macros = new List { new() { Name = "score", Key = "Ctrl+F1", Command = "score", Enabled = true } }; + var lines = KeypadScreenRenderer.HotkeysColumn(HostKeys.Terminal, macros); + await Assert.That(lines.Any(l => l.Contains("⌃F1", StringComparison.Ordinal))).IsTrue(); + await Assert.That(lines.Any(l => l.Contains("Ctrl+F1", StringComparison.Ordinal))).IsFalse(); + } + + [Test] + public async Task ANumpadKeyFiresOnlyOnAHostThatDeliversIt() + { + var window = HostKeys.Terminal with { ReportsChordsWhole = true, DeliversNumpad = true }; + await Assert.That(MacroKeys.Verdict(HostKeys.Terminal, "Num7").Fires).IsFalse(); + await Assert.That(MacroKeys.Verdict(window, "Num7").Fires).IsTrue(); + } + + // ── #17: the collapsed rail ───────────────────────────────────────────────────────────────────── + + [Test] + public async Task TheCollapsedRailGivesTwoLettersOnlyWhenTwoNamesShareOne() + { + await Assert.That(RailRenderer.InitialLength(["Corvid", "Rivane", "Thorn"])).IsEqualTo(1); + await Assert.That(RailRenderer.InitialLength(["Corvid", "Rivane", "Riko"])).IsEqualTo(2); + await Assert.That(RailRenderer.Initials("Riko", 2)).IsEqualTo("Ri"); + await Assert.That(RailRenderer.Initials("R", 2)).IsEqualTo("R "); + } + + [Test] + public async Task TwoSameInitialCharactersCanBeToldApartOnTheCollapsedRail() + { + var rows = new List + { + new(RailRowKind.World, 0, "Aetherfall", Target: "rail:w"), + new(RailRowKind.Character, 1, "Rivane", Target: "rail:a"), + new(RailRowKind.Character, 1, "Riko", Target: "rail:b"), + }; + var lines = RailRenderer.RenderCollapsed(rows); + var text = lines.Select(MarkupText.Plain).ToList(); + await Assert.That(text.Any(l => l.Contains("Ri", StringComparison.Ordinal) && l.Contains("○", StringComparison.Ordinal))).IsTrue(); + await Assert.That(text[0]).Contains(RailRenderer.CollapsedWorldMark); + await Assert.That(text[1].Length).IsEqualTo(text[2].Length); + await Assert.That(string.Join("\n", text)).DoesNotContain("▚"); + } + + // ── #23: footers do not clip at 80 ────────────────────────────────────────────────────────────── + + [Test] + public async Task TheSearchFooterFitsAnEightyColumnSurfaceWholeKeysAndAll() + { + var footer = SearchPrompt.HintsFor(74); + await Assert.That(footer.Length).IsLessThanOrEqualTo(74); + await Assert.That(footer).EndsWith("⌃F closes"); + foreach (var key in new[] { "↑↓", "⏎", "⌥E", "⌥A", "Esc", "⌃F" }) + { + await Assert.That(SearchPrompt.HintsFor(SearchSurface.MinimumWidth)).Contains(key); + } + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/WelcomeTests.cs b/tests/SharpMUTerm.Tui.Tests/WelcomeTests.cs index 5bc5587f..03ea255c 100644 --- a/tests/SharpMUTerm.Tui.Tests/WelcomeTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/WelcomeTests.cs @@ -85,7 +85,7 @@ public async Task AClientWithNoWorldsOpensOnTheWelcomeAndKeepsTheNotice() await Assert.That(run.App.WelcomeIsOpen).IsTrue(); var text = string.Join('\n', run.App.WelcomeLines.Select(MarkupText.Plain)); - await Assert.That(text).Contains("Connect to a host").And.Contains("Browse games").And.Contains("Open settings"); + await Assert.That(text).Contains("Connect to a world").And.Contains("Browse worlds").And.Contains("Open settings"); await Assert.That(text).Contains(WelcomeSurface.ExampleCommand); await Assert.That(run.App.StatusMarkup).Contains("No world configured"); } From f2eca9108c471e922b9075d1e649c77da1e20fe1 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 10:59:03 +0000 Subject: [PATCH 039/113] Notices, status row, toasts, tab overflow, one-row input, composer length MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Notices: a notice repeated while still on the row is said once; the status row is elided to its width in both hosts so it never wraps. - Window toasts avoid native quick bars and docked composers and are hidden while settings, Ctrl+P, a native modal or the quit prompt is open. - Join wraps: a pane narrower than the server's learnt wrap column gets a once-per-world notice with a "Join wraps" action (world:join-wraps:); never switched on by default. - Tab overflow chip "+N ▾" painted over a strip's clipped last cells, listing hidden tabs: native menu in the window, cell list in a terminal. Declared as SurfaceCatalog.TabOverflow. - InputSettings.Rows defaults to 1. - Composer: "N chars" (as sent) in F1 and the docked panel in both hosts; Alt+P toggles an "as sent" preview in F1, cells and native. New compose-preview view. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 12 + CLAUDE.md | 29 ++- src/SharpMUTerm.Avalonia/ComposerView.cs | 77 ++++++- src/SharpMUTerm.Avalonia/DesktopLayer.cs | 18 ++ src/SharpMUTerm.Avalonia/MainWindow.cs | 4 + src/SharpMUTerm.Avalonia/TerminalView.cs | 6 +- src/SharpMUTerm.Avalonia/WindowPointer.cs | 12 + .../Commands/BuiltInCommands.cs | 7 + .../Composer/ComposerModel.cs | 37 ++- .../Composer/ComposerSession.cs | 12 + .../Surfaces/SurfaceCatalog.cs | 17 ++ .../Configuration/PreferenceSettings.cs | 7 +- src/SharpMUTerm.Core/Session/WorldSession.cs | 13 ++ src/SharpMUTerm.Core/Text/ServerWrapJoiner.cs | 7 +- src/SharpMUTerm.Tui/ComposeOverlay.cs | 134 ++++++++++- src/SharpMUTerm.Tui/Panels/DockedComposer.cs | 9 +- src/SharpMUTerm.Tui/Pointer/PointerTarget.cs | 12 + .../Pointer/SharpMUTermApp.Pointer.cs | 7 + .../SharpMUTermApp.JoinWraps.cs | 66 ++++++ .../SharpMUTermApp.NativeComposer.cs | 11 +- .../SharpMUTermApp.TabOverflow.cs | 214 ++++++++++++++++++ src/SharpMUTerm.Tui/SharpMUTermApp.cs | 38 +++- src/SharpMUTerm.Tui/SnapshotViews.cs | 2 +- .../NativeComposerTests.cs | 24 ++ .../NoticeToastTests.cs | 40 ++++ .../SurfaceParityTests.cs | 40 +++- .../SurfaceCatalogTests.cs | 2 +- .../ComposerLengthTests.cs | 85 +++++++ .../InputAreaLayoutTests.cs | 7 +- .../NativeComposerRoutingTests.cs | 2 +- tests/SharpMUTerm.Tui.Tests/NoticeFitTests.cs | 120 ++++++++++ .../SharpMUTerm.Tui.Tests/ScreenModelTests.cs | 2 +- .../SharpMUTerm.Tui.Tests/TabOverflowTests.cs | 109 +++++++++ 33 files changed, 1146 insertions(+), 36 deletions(-) create mode 100644 src/SharpMUTerm.Tui/SharpMUTermApp.JoinWraps.cs create mode 100644 src/SharpMUTerm.Tui/SharpMUTermApp.TabOverflow.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/ComposerLengthTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/NoticeFitTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/TabOverflowTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b4db941..b2136fca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,13 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- A tab strip too narrow for its tabs now says how many it could not draw (`+3 ▾` at its right edge); click it to + list them and go to one — a menu in the desktop window, a short list in a terminal. +- The composer shows how many characters the post will be once escaped and joined, and Alt+P shows exactly what will + be sent (both in the terminal and in the desktop window). +- When a pane is narrower than the line width a game wraps at, the client says so once and offers to turn on + "join wraps" for that world. + - Desktop window: the map, vitals, who is here and the quick bar can be popped out into windows of their own — from the button in the panel's corner, the pane's right-click menu, or Ctrl+P ▸ Pop out. The output takes the room back, the floating window works exactly like the panel did, typing in it still goes to the command line, and closing it @@ -266,6 +273,11 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Changed +- The command line starts as one row and grows as you type; a height you set before is kept. +- The status row no longer wraps onto a second row when a message is long; it is shortened to fit. +- The same message said twice in a row is shown once. In the desktop window, notification cards no longer cover the + quick bar or the composer, and are hidden while settings, Ctrl+P or a dialog is open. + - Panes stacked one above the other no longer have an empty row between them when the lower pane shows its tabs: the tab row is the boundary, and the panes get the row back. Drag the empty part of that tab row to resize, or double-click it to even the panes out. The vitals and quick-bar strips sit flush against their diff --git a/CLAUDE.md b/CLAUDE.md index 63dc629b..a82e0129 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -550,7 +550,11 @@ fallbacks) for inline images/maps. - **Below 100 columns the layout is narrow** (`SharpMUTermApp.Narrow.cs`; `NarrowColumns`, `ShortRows`; `NarrowLayoutTests`). The rail folds itself to its strip, and below 100 columns *or* 30 rows an empty command line is one row (`SyncInputHeights`: `MinRows` becomes `InputSettings.MinRows`; it still grows to `MaxRows` as it wraps). - At 80×24 that is a 72-column pane instead of 60 and two more output rows. Decisions not to relitigate: + At 80×24 that is a 72-column pane instead of 60 and two more output rows. **`InputSettings.Rows` now defaults to 1 + too**, so a fresh client's command line is one row everywhere and grows as it wraps; a saved value is kept. + **The window's native sidebar folds by the same rule** (verified under Xvfb at `--size 60x24` and on a live resize): at + `--size 80x24` the window is ~102 columns wide with its sidebar, so it stays open and the pane is the 80 columns the + rule protects. Decisions not to relitigate: - **100 because of the server's wrap width**: the open rail, divider and spacer cost ~20 columns, so 100 still leaves the pane 80; below it a world's 80-column text orphans a word on every other row. 30 rows because above it the output keeps 24 rows with a three-row bar. Height never folds the rail. @@ -1383,6 +1387,29 @@ draws ⌃P natively (`INativePalette`, null for the cell popup), whether it draw (the default voice of `Notice`). Edge colours are the accent, `ScreenPalette.Warn` and the notice ink, held to 4.5:1 on the status plane because they also ink the key chip and the action line. - The message log (⌃P ▸ *Show client messages*) stays the history; a toast keeps nothing. + - **A notice said again while it is still on the row is said once** (`Notice` compares text, key, severity and action + with `_noticeShown`): the timer restarts, nothing is logged, announced or published twice. That was the audit's + "notices show twice" — the row-plus-toast pair is the design above, the repeat was not. + - **The row is elided to its width in both hosts** (`FitStatusRow` in `PaintStatus`), so no notice can wrap it + (`NoticeFitTests`, 80×24 down to 40×12). + - **Toasts stay off what is being used and are hidden under a modal.** Besides the map's legend, `SyncToasts` avoids the + native quick bars and docked composers; `DesktopLayer.ToastsHidden` (set by `MainWindow`: settings window, ⌃P, a + native modal or the quit prompt) hides the stack rather than leaving it clipped under a window. F1 keeps them (it + sits under the layer). The toast keeps its clock while hidden. +- **A pane narrower than its server's wrap is told about join wraps, once per world per run** (`SuggestJoinWraps`, + `SharpMUTermApp.JoinWraps.cs`; `WorldSession.ServerWrapColumn`, now learnt whether or not the world joins). Checked on + every pane-size report; the notice's action is `world:join-wraps:`. **Suggested, never on by default**: a false + join is invisible and worse than a missed one, and whether a world's output is prose is the player's call. +- **A strip that cannot draw every tab shows `+N ▾` at its right edge** (`SharpMUTermApp.TabOverflow.cs`; + `SurfaceCatalog.TabOverflow`, a `MenuModel`). Hidden tabs are read off `FrameworkHitTests.TabAt` over the strip just + painted, and the chip is painted after the frame over the strip's own last (clipped) cells, so no cell, pane or NAWS + moves. A click opens a native menu in the window (`IPointerPresenter.ShowMenu(cell, MenuModel, dispatch)`) and a cell + list (`_sendMenu`, digits) in a terminal; each entry is `win:` through `RunTabOverflowEntry`, which refuses what + the list did not offer. The keyboard's way to a hidden tab is ⌃P *Go to …* or ⌃N. +- **The composer says how long the post is as sent, and ⌥P shows it** (`ComposerModel.Characters`/`SentLength`, the + escaped and `%r`-joined command; a MOO edit counts its text). F1 and the docked panel carry the `N chars` cell in both + hosts; ⌥P toggles an *as sent* band under F1 (`ComposeOverlay.Preview`, run-wide, shared with the native editor via + `ComposerSession.TogglePreview`; not for a MOO edit). The `compose-preview` view. - **Every surface that names a key is read once per host** (`EverySurfaceNamesThisHostsKeys`): ⌃P and `--help` must name the host's newline and none of the chords the host keeps (`HostKeys.Reserved`, which `TerminalView` acts on, so the window's chords and the list are one). The help page is one writer diff --git a/src/SharpMUTerm.Avalonia/ComposerView.cs b/src/SharpMUTerm.Avalonia/ComposerView.cs index 322669d8..5414d506 100644 --- a/src/SharpMUTerm.Avalonia/ComposerView.cs +++ b/src/SharpMUTerm.Avalonia/ComposerView.cs @@ -41,6 +41,10 @@ internal sealed class ComposerView : Border private readonly TextBlock _title; private readonly TextBlock _target; private readonly StackPanel _chips; + private readonly TextBlock _count; + private readonly Border _preview; + private readonly TextBlock _previewHeading; + private readonly TextBlock _previewText; private readonly Border _footer; private readonly WrapPanel _keys; private readonly Border _rule; @@ -78,10 +82,13 @@ public ComposerView(TerminalView view, bool fullScreen) _title = new TextBlock { FontWeight = FontWeight.Bold, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(0, 0, 10, 0) }; _target = new TextBlock { VerticalAlignment = VerticalAlignment.Center, TextTrimming = TextTrimming.CharacterEllipsis }; _chips = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 6, VerticalAlignment = VerticalAlignment.Center }; + _count = new TextBlock { VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(10, 0, 0, 0) }; var headerRow = new DockPanel { LastChildFill = true }; DockPanel.SetDock(_title, Dock.Left); + DockPanel.SetDock(_count, Dock.Right); DockPanel.SetDock(_chips, Dock.Right); headerRow.Children.Add(_title); + headerRow.Children.Add(_count); headerRow.Children.Add(_chips); headerRow.Children.Add(_target); _header = new Border { Child = headerRow, Padding = fullScreen ? new Thickness(22, 10) : new Thickness(12, 3, 8, 3) }; @@ -89,6 +96,17 @@ public ComposerView(TerminalView view, bool fullScreen) _keys = new WrapPanel { Orientation = Orientation.Horizontal, VerticalAlignment = VerticalAlignment.Center }; _footer = new Border { Child = _keys, Padding = fullScreen ? new Thickness(22, 8) : new Thickness(12, 2, 8, 3) }; + // F1's as-sent preview (⌥P): the one command ⌃S sends, in the editor's face, under the editor. + _previewHeading = new TextBlock { Text = "AS SENT", FontWeight = FontWeight.Bold, Margin = new Thickness(0, 0, 0, 4) }; + _previewText = new TextBlock { TextWrapping = TextWrapping.Wrap, MaxLines = 4, TextTrimming = TextTrimming.CharacterEllipsis }; + _preview = new Border + { + Child = new StackPanel { Children = { _previewHeading, _previewText } }, + Padding = new Thickness(22, 8), + IsVisible = false, + }; + AutomationProperties.SetName(_preview, "As sent"); + // The armed rule down the docked editor's left edge: the cell composer's ▌ marker, in the accent. _rule = new Border { Width = 3, HorizontalAlignment = HorizontalAlignment.Left }; @@ -97,12 +115,14 @@ public ComposerView(TerminalView view, bool fullScreen) body.Children.Add(_marks); body.Children.Add(_rule); - var grid = new Grid { RowDefinitions = new RowDefinitions("Auto,*,Auto") }; + var grid = new Grid { RowDefinitions = new RowDefinitions("Auto,*,Auto,Auto") }; Grid.SetRow(_header, 0); Grid.SetRow(body, 1); - Grid.SetRow(_footer, 2); + Grid.SetRow(_preview, 2); + Grid.SetRow(_footer, 3); grid.Children.Add(_header); grid.Children.Add(body); + grid.Children.Add(_preview); grid.Children.Add(_footer); Child = grid; ApplyFont(); @@ -132,7 +152,7 @@ public ComposerView(TerminalView view, bool fullScreen) internal ComposerSession? Session => _session; /// The header's words, joined, for a test. - internal string HeaderText => string.Join(" ", new[] { _title.Text, _target.Text } + internal string HeaderText => string.Join(" ", new[] { _title.Text, _target.Text, _count.Text } .Concat(_chips.Children.OfType().Select(b => (b.Child as TextBlock)?.Text)).Where(t => !string.IsNullOrEmpty(t))); /// The key row's words, joined, for a test. @@ -242,8 +262,14 @@ public void Show(ComposerModel model, ComposerSession session, PanelInk ink, Col } } + /// The header's length cell as drawn. Internal for tests. + internal string CountText => _count.Text ?? string.Empty; + + /// The as-sent preview's command, or null while it is hidden. Internal for tests. + internal string? PreviewText => _preview.IsVisible ? _previewText.Text : null; + private static bool SameChrome(ComposerModel a, ComposerModel b) => - a.Target == b.Target && a.Escaping == b.Escaping && a.Edit == b.Edit && a.Dictionary == b.Dictionary + a.Preview == b.Preview && a.Target == b.Target && a.Escaping == b.Escaping && a.Edit == b.Edit && a.Dictionary == b.Dictionary && a.CanSend == b.CanSend && a.Armed == b.Armed && a.Keys.SequenceEqual(b.Keys) && a.Verb == b.Verb; // ── drawing ────────────────────────────────────────────────────────────────────────────── @@ -274,6 +300,12 @@ private void Paint() _editor.MarkColour = Warn; _title.Foreground = new SolidColorBrush(Accent); _target.Foreground = new SolidColorBrush(_text); + _count.Foreground = new SolidColorBrush(Dim); + _preview.Background = new SolidColorBrush(Band); + _preview.BorderBrush = _header.BorderBrush; + _preview.BorderThickness = new Thickness(0, 1, 0, 0); + _previewHeading.Foreground = new SolidColorBrush(Accent); + _previewText.Foreground = new SolidColorBrush(_text); _marks.InvalidateVisual(); } @@ -283,6 +315,10 @@ private void ApplyFont() var ui = Math.Clamp(cell * 0.72, 11, 15); _title.FontSize = ui; _target.FontSize = ui; + _count.FontSize = ui - 1; + _previewHeading.FontSize = ui - 1.5; + _previewText.FontSize = Math.Clamp(cell * 0.72, 11, 16); + _previewText.FontFamily = new FontFamily($"{_view.Renderer.Fonts.FamilyName}, {CellFonts.BundledFamily}, DejaVu Sans Mono, Liberation Mono, Consolas, Menlo, monospace"); _editor.FontSize = Proportional ? Math.Clamp(cell * 0.86, 12, 19) : Math.Clamp(cell * 0.8, 11, 18); _editor.FontFamily = Proportional ? FontFamily.Default @@ -322,6 +358,9 @@ private void Label(ComposerModel model) } } + _preview.IsVisible = _fullScreen && model.Preview && model.Edit is null; + SyncLength(); + _keys.Children.Clear(); var narrow = !_fullScreen && Bounds.Width is > 0 and < 560; foreach (var key in model.Keys) @@ -370,8 +409,29 @@ protected override void OnSizeChanged(SizeChangedEventArgs e) // ── text ───────────────────────────────────────────────────────────────────────────────── + /// + /// The length cell and the preview, from the editor's own text: the model catches up with typing a moment later, and + /// a count that lagged a keystroke would read as wrong. Counted by , the cells' rule. + /// + private void SyncLength() + { + if (_model is not { } model) + { + return; + } + + var text = _editor.Text ?? string.Empty; + _count.Text = ComposerModel.CharactersLabel(ComposerModel.SentLength(text, model.Escaping, model.Edit is not null)); + if (_preview.IsVisible) + { + var command = ComposeMessage.Build(text.Replace("\r\n", "\n", StringComparison.Ordinal), model.Escaping); + _previewText.Text = command ?? "nothing yet"; + } + } + private void OnTextChanged() { + SyncLength(); var text = _editor.Text ?? string.Empty; if (_session is { } session) { @@ -424,6 +484,15 @@ private void OnEditorKeyDown(object? sender, KeyEventArgs e) session.ToggleEscaping(); return; + case (Key.P, KeyModifiers.Alt): + e.Handled = true; + if (_fullScreen) + { + session.TogglePreview(); + } + + return; + case (Key.W, KeyModifiers.Alt): e.Handled = true; if (session.CanAddWords && ComposerMarks.WordAt(text, _editor.CaretIndex) is { } word) diff --git a/src/SharpMUTerm.Avalonia/DesktopLayer.cs b/src/SharpMUTerm.Avalonia/DesktopLayer.cs index 5855ff4a..be0d0b8d 100644 --- a/src/SharpMUTerm.Avalonia/DesktopLayer.cs +++ b/src/SharpMUTerm.Avalonia/DesktopLayer.cs @@ -192,9 +192,27 @@ private void SyncToasts(ScreenFrame frame, Size cell) } } + // The native quick bars and docked composers too: a quick bar's keys and the post being typed are what a toast must + // never sit on, so a toast is lifted above them as it is above a legend. + foreach (var view in _quickBars.Values.Cast().Concat(_composers.Values)) + { + if (view.IsVisible && view.Width > 0 && view.Height > 0) + { + avoid.Add(new Rect(GetLeft(view) - origin.X, GetTop(view) - origin.Y, view.Width, view.Height)); + } + } + _toasts.Avoid = avoid; + + // Hidden, not stacked under it, while something modal is in front: a settings window is a window of its own and a + // toast under it showed as a clipped fragment past its edge, and ⌃P and the modals have a scrim the toast would sit + // on. The status row still says the notice, and the toast keeps its clock, so it is gone when its time is. + _toasts.IsVisible = !(ToastsHidden?.Invoke() ?? false) && _pointer.Chrome is not { Interactive: false }; } + /// Whether something modal the window draws is in front, which hides the toasts. Set by the main window. + internal Func? ToastsHidden { get; set; } + /// The notice toasts. Internal for tests. internal NoticeToasts Toasts => _toasts; diff --git a/src/SharpMUTerm.Avalonia/MainWindow.cs b/src/SharpMUTerm.Avalonia/MainWindow.cs index 883cce30..37b02263 100644 --- a/src/SharpMUTerm.Avalonia/MainWindow.cs +++ b/src/SharpMUTerm.Avalonia/MainWindow.cs @@ -86,6 +86,10 @@ public MainWindow(WindowOptions options, IClassicDesktopStyleApplicationLifetime // this window forward. ⌃Q from any other modal goes to the client, which opens the prompt over it. _driver.Modals.Attach(this, root, () => layer.FocusArmedComposer(), key => _driver.RaiseKey(key)); + // No toast while settings, ⌃P or a modal is in front of the cells (F1 keeps them: it sits under the layer). + layer.ToastsHidden = () => _driver.Settings.Window is not null || _driver.Palette.Overlay is not null + || _driver.Modals.Modal is not null || _driver.Modals.Quit is not null; + // Panels popped out into windows of their own, owned by this one so they stay above it and go with it. _driver.Floating.Attach(this, _view); Closed += (_, _) => _driver.Floating.Detach(); diff --git a/src/SharpMUTerm.Avalonia/TerminalView.cs b/src/SharpMUTerm.Avalonia/TerminalView.cs index fe9bfda6..588f0364 100644 --- a/src/SharpMUTerm.Avalonia/TerminalView.cs +++ b/src/SharpMUTerm.Avalonia/TerminalView.cs @@ -91,6 +91,7 @@ public TerminalView(AvaloniaConsoleDriver driver, SKColor foreground, SKColor ba InvalidateVisual(); }); pointer.MenuRequested += (_, items) => Dispatcher.UIThread.Post(() => OpenMenu(items)); + pointer.ModelMenuRequested += (_, menu, dispatch) => Dispatcher.UIThread.Post(() => OpenMenu(NativeMenu.Build(menu, dispatch, PlacementMode.Pointer, this))); } /// @@ -579,10 +580,11 @@ private void CloseTip() } /// The client's right-click menu, as a native one. Each entry runs on the client's thread by itself. - private void OpenMenu(IReadOnlyList items) + private void OpenMenu(IReadOnlyList items) => OpenMenu(NativeMenu.Build(items, PlacementMode.Pointer, this)); + + private void OpenMenu(ContextMenu menu) { CloseTip(); - var menu = NativeMenu.Build(items, PlacementMode.Pointer, this); menu.Closed += (_, _) => Focus(); OpenedMenu = menu; menu.Open(this); diff --git a/src/SharpMUTerm.Avalonia/WindowPointer.cs b/src/SharpMUTerm.Avalonia/WindowPointer.cs index 5ee7ab6b..4a3e1b33 100644 --- a/src/SharpMUTerm.Avalonia/WindowPointer.cs +++ b/src/SharpMUTerm.Avalonia/WindowPointer.cs @@ -56,6 +56,18 @@ public void Hover(PointerTarget target) public void ShowMenu(System.Drawing.Point cell, IReadOnlyList items) => MenuRequested?.Invoke(cell, items); + /// Raised on the client's thread when a menu the client built as data (the tab overflow list) is asked for. + public event Action>? ModelMenuRequested; + + /// The last menu-as-data the client asked for, with its way back. Internal for tests. + internal (SharpMUTerm.Client.Commands.MenuModel Menu, Action Dispatch)? LastModelMenu { get; private set; } + + public void ShowMenu(System.Drawing.Point cell, SharpMUTerm.Client.Commands.MenuModel menu, Action dispatch) + { + LastModelMenu = (menu, dispatch); + ModelMenuRequested?.Invoke(cell, menu, dispatch); + } + public bool DrawsMenus => true; private int _windowColumns; diff --git a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs index 2cf52d0d..09ccf3aa 100644 --- a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs +++ b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs @@ -20,6 +20,12 @@ public static class BuiltInCommands /// The command that moves the keyboard into the connection sidebar (⌥C). public const string RailKeysCommand = "layout:rail-keys"; + /// + /// Turns F5's join wraps on for the world named after the prefix: the action of the notice that says a pane is + /// narrower than the server's wrap column. Lists nothing on ⌃P (F5 is the setting's home). + /// + public const string JoinWrapsPrefix = "world:join-wraps:"; + /// /// Registers every built-in command. does the work for an id and returns false when /// it did not do what the label promised; it is called for every id these contributions handle, offered or not. @@ -71,6 +77,7 @@ void Family(string id, string prefix, Func []); Add("world:reload-scripts", CommandGroup.World, "Reload scripts", detail: "re-reads this character's Lua files", when: c => c.State.ScriptsOn); diff --git a/src/SharpMUTerm.Client/Composer/ComposerModel.cs b/src/SharpMUTerm.Client/Composer/ComposerModel.cs index b1a556d3..ab08cebb 100644 --- a/src/SharpMUTerm.Client/Composer/ComposerModel.cs +++ b/src/SharpMUTerm.Client/Composer/ComposerModel.cs @@ -72,6 +72,30 @@ public sealed record ComposerModel( /// What ⌃S sends for this draft: , or null for nothing (or an edit). public string? Command => Edit is null ? ComposeMessage.Build(Body, Escaping) : null; + /// + /// Whether F1 shows the post as it will be sent (⌥P) — the %r-joined, escaped command — under the editor. The + /// client's toggle for the run, never saved; always false for the docked panel and a MOO edit. + /// + public bool Preview { get; init; } + + /// The header's length cell for this draft: . + public int Characters => SentLength(Body, Escaping, Edit is not null); + + /// + /// How long a draft is as the game will get it: the length of 's command, with its + /// %r breaks and its escapes, because that is what a board's length limit counts. A MOO edit is saved as its + /// lines, so it counts its text. A host editor that holds text the model has not caught up with asks this directly. + /// + public static int SentLength(string body, ComposeEscaping escaping, bool edit) + { + ArgumentNullException.ThrowIfNull(body); + body = body.Replace("\r\n", "\n", StringComparison.Ordinal); + return edit ? body.TrimEnd('\n').Length : ComposeMessage.Build(body, escaping)?.Length ?? 0; + } + + /// The length cell's words: 1 char, 240 chars. + public static string CharactersLabel(int count) => count == 1 ? "1 char" : $"{count:N0} chars"; + /// /// The verb the post starts with — +pose, say — for the docked header, so a reader can see what the /// buffer will be sent as without reading it. Empty for an empty buffer. @@ -93,7 +117,8 @@ public static ComposerModel Create( SpellChecker? spelling, bool canSend, bool armed, - long revision) + long revision, + bool preview = false) { ArgumentNullException.ThrowIfNull(target); ArgumentNullException.ThrowIfNull(body); @@ -110,11 +135,15 @@ public static ComposerModel Create( armed, revision, ComposerMarks.For(body, checker), - KeysFor(place, edit is not null, checker is not null, canSend, armed)); + KeysFor(place, edit is not null, checker is not null, canSend, armed, preview)) + { + Preview = preview && place == ComposerPlace.FullScreen && edit is null, + }; } /// The key row for a composer in this state. - public static IReadOnlyList KeysFor(ComposerPlace place, bool edit, bool dictionary, bool canSend, bool armed) + /// Whether F1's as-sent preview is showing, which names what ⌥P does next. + public static IReadOnlyList KeysFor(ComposerPlace place, bool edit, bool dictionary, bool canSend, bool armed, bool preview = false) { if (place == ComposerPlace.Docked) { @@ -153,6 +182,7 @@ public static IReadOnlyList KeysFor(ComposerPlace place, bool edit, keys.Add(new("⌥W", "add word")); } + keys.Add(new("⌥P", preview ? "hide as sent" : "as sent")); keys.Add(new("Esc", "close (keeps the draft)")); return keys; } @@ -179,6 +209,7 @@ other is not null && CanSend == other.CanSend && Armed == other.Armed && Revision == other.Revision + && Preview == other.Preview && Marks.SequenceEqual(other.Marks) && Keys.SequenceEqual(other.Keys); diff --git a/src/SharpMUTerm.Client/Composer/ComposerSession.cs b/src/SharpMUTerm.Client/Composer/ComposerSession.cs index f5868763..f0f9f9c3 100644 --- a/src/SharpMUTerm.Client/Composer/ComposerSession.cs +++ b/src/SharpMUTerm.Client/Composer/ComposerSession.cs @@ -18,6 +18,9 @@ public sealed record ComposerCallbacks /// ⌥L. public Action? ToggleEscaping { get; init; } + /// ⌥P: F1's as-sent preview on or off. Null for a composer with none (the docked panel). + public Action? TogglePreview { get; init; } + /// ⌥W, or the menu's Add to dictionary, with the word. public Action? AddWord { get; init; } @@ -127,6 +130,15 @@ public void ToggleEscaping() } /// The host's: ⌥W on . + /// ⌥P: shows or hides the post as it will be sent. Nothing for a MOO edit, or a session the client ended. + public void TogglePreview() + { + if (Model.Edit is null && !IsEnded) + { + _callbacks.TogglePreview?.Invoke(); + } + } + public void AddWord(string word) { if (CanAddWords && !string.IsNullOrWhiteSpace(word)) diff --git a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs index 3d6938bb..2bf3de40 100644 --- a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs +++ b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs @@ -180,6 +180,12 @@ public static class SurfaceCatalog /// The first-run welcome and its connect form. public const string Welcome = "welcome"; + /// + /// The +3 ▾ chip a tab strip carries when its tabs do not fit even at their floors, and the list of the tabs + /// past its edges it opens: a cell list in a terminal, a native menu in the window (the chip itself is cells in both). + /// + public const string TabOverflow = "tab-overflow"; + /// /// A panel popped out into a window of its own (the desktop window only; a terminal keeps every panel in its /// region). The frame around the panel's own native view: its title, whose it is, and the way back. @@ -449,6 +455,17 @@ public static class SurfaceCatalog NativeModal, "SharpMUTerm.Tui.WelcomeSurface.Render", ModalViews("WelcomeView")), + new( + TabOverflow, + typeof(MenuModel), + [ + // Each entry is a hidden tab's window, run through the registry (win:, the ⌃P "Go to …" entry), and + // refused if the chip did not offer it. + new(SurfaceActionKind.Command, SharpMUTerm.Core.Commands.CommandIds.WindowPrefix, "RunTabOverflowEntry"), + ], + CellsUnderNative, + "SharpMUTerm.Tui.SharpMUTermApp.TabOverflowLines", + ["SharpMUTerm.Avalonia.NativeMenu"]), new( FloatingPanel, typeof(FloatingPanelModel), diff --git a/src/SharpMUTerm.Core/Configuration/PreferenceSettings.cs b/src/SharpMUTerm.Core/Configuration/PreferenceSettings.cs index 258f9da3..4c7df969 100644 --- a/src/SharpMUTerm.Core/Configuration/PreferenceSettings.cs +++ b/src/SharpMUTerm.Core/Configuration/PreferenceSettings.cs @@ -217,10 +217,11 @@ public sealed class InputSettings public bool ExcludeCredentials { get; set; } = true; /// - /// How many lines tall the command line is before anything is typed into it. Three by default, so - /// a wrapped line has somewhere to wrap to without the input resizing on the first keystroke. + /// How many lines tall the command line is before anything is typed into it. One by default: the bar + /// grows a row at a time as a line wraps (up to ), so the rows it would hold empty at + /// rest go to the output instead. A configuration that saved another value keeps it. /// - public int Rows { get; set; } = 3; + public int Rows { get; set; } = 1; /// /// The most lines the command line grows to as it wraps. Past this it scrolls inside itself rather diff --git a/src/SharpMUTerm.Core/Session/WorldSession.cs b/src/SharpMUTerm.Core/Session/WorldSession.cs index ab0f9499..6f50a638 100644 --- a/src/SharpMUTerm.Core/Session/WorldSession.cs +++ b/src/SharpMUTerm.Core/Session/WorldSession.cs @@ -603,6 +603,7 @@ public async Task ConnectAsync(CancellationToken cancellationToken = default) // timer still pending checks it is releasing for this joiner before it does anything. _reflowRelease?.Dispose(); _wrapJoiner = new ServerWrapJoiner(); + _serverWrapColumn = 0; // Re-read with the parser, so an F5 change to the world's emoji switches reaches the next connection. _emoji = NewEmoji(World.Emoji); @@ -696,6 +697,14 @@ private void OnOutputReceived(object? sender, TelnetOutputEventArgs e) /// private ServerWrapJoiner _wrapJoiner = new(); + /// + /// The column this connection's server wraps its text at, as has learnt it + /// (whether or not this world joins), or null while it is unknown. Written on the read loop, read on any thread. + /// + public int? ServerWrapColumn => Volatile.Read(ref _serverWrapColumn) is > 0 and var column ? column : null; + + private int _serverWrapColumn; + /// /// Serialises the read loop (output, a parser swap, the disconnect) against the timer that releases a held /// line (). Nothing on the UI thread or in a script takes it, so it cannot close a @@ -723,6 +732,8 @@ private void Reflow(StyledLine line) if (!World.JoinWrappedLines) { ReleaseHeldLine(); + _wrapJoiner.Observe(line); + _serverWrapColumn = _wrapJoiner.WrapColumn ?? 0; ProcessOutputLine(line); return; } @@ -732,6 +743,8 @@ private void Reflow(StyledLine line) ProcessOutputLine(ready); } + _serverWrapColumn = _wrapJoiner.WrapColumn ?? 0; + if (_wrapJoiner.Holding) { CancelReflowHold(); diff --git a/src/SharpMUTerm.Core/Text/ServerWrapJoiner.cs b/src/SharpMUTerm.Core/Text/ServerWrapJoiner.cs index 881b50e9..ebd600eb 100644 --- a/src/SharpMUTerm.Core/Text/ServerWrapJoiner.cs +++ b/src/SharpMUTerm.Core/Text/ServerWrapJoiner.cs @@ -211,8 +211,11 @@ public static StyledLine Join(StyledLine previous, StyledLine next) return new StyledLine(spans, previous.RuleColor, previous.IsPrompt); } - /// Records a line's length towards the wrap column. Blank lines say nothing about it. - private void Observe(StyledLine line) + /// + /// Records a line's length towards the wrap column. Blank lines say nothing about it. does this + /// itself; a session that is not joining calls it alone, so the wrap column is known before the player turns joining on. + /// + public void Observe(StyledLine line) { var length = line.Text.TrimEnd().Length; if (length == 0 || line.IsPrompt) diff --git a/src/SharpMUTerm.Tui/ComposeOverlay.cs b/src/SharpMUTerm.Tui/ComposeOverlay.cs index 3f2c94a3..2a0b872e 100644 --- a/src/SharpMUTerm.Tui/ComposeOverlay.cs +++ b/src/SharpMUTerm.Tui/ComposeOverlay.cs @@ -54,6 +54,8 @@ internal sealed class ComposeOverlay private readonly Func? _openSpelling; private SpellChecker? _spelling; private bool _spellingOpened; + private MarkupControl? _headerBand; + private MarkupControl? _previewBand; /// The window system the composer opens in. /// @@ -114,14 +116,23 @@ internal ComposeOverlay(ConsoleWindowSystem system, Func? spellin /// What the window draws, as the shared model a native composer draws: the target, the buffer as it stands, the /// mode, the edit, the dictionary and its marks, and the key row. /// - internal ComposerModel Model => ModelFor(_target, Body, _escaping, _edit, Spelling, _canSend); + internal ComposerModel Model => ModelFor(_target, Body, _escaping, _edit, Spelling, _canSend, Preview); + + /// + /// Whether F1 shows the post as it will be sent (⌥P), under the editor. One fact for the run in both hosts — the + /// native F1 reads and flips this same property — and never saved: it is a way of looking, not a setting. + /// + internal bool Preview { get; set; } + + /// How many rows the as-sent preview takes when it is showing: a heading row and the command under it. + internal const int PreviewRows = 4; /// /// F1's model for a draft, in either host: the cell window builds its own from this, and a native F1 is opened on /// it, so the two say the same thing for the same draft. Revision 1: F1 opens on a draft and nothing replaces it /// while it is open. /// - internal static ComposerModel ModelFor(string target, string body, ComposeEscaping escaping, MooEdit? edit, SpellChecker? spelling, bool canSend) => + internal static ComposerModel ModelFor(string target, string body, ComposeEscaping escaping, MooEdit? edit, SpellChecker? spelling, bool canSend, bool preview = false) => ComposerModel.Create( ComposerPlace.FullScreen, target, @@ -131,7 +142,8 @@ internal static ComposerModel ModelFor(string target, string body, ComposeEscapi spelling, canSend, armed: true, - revision: 1); + revision: 1, + preview: preview); /// /// Opens the composer on , or closes it when it is already open — the same @@ -206,15 +218,22 @@ internal void Toggle(string target, string draft, ComposeEscaping escaping, bool } _editor.SetContent(draft); + _editor.ContentChanged += (_, _) => RefreshBands(); FitEditor(); - _window = new WindowBuilder(_system) + var builder = new WindowBuilder(_system) .AsModal() .Maximized() .Frameless() .WithColors(_scheme.Colour(ScreenPalette.PanelFg), _scheme.Colour(ScreenPalette.PanelBg)) .AddControl(HeaderBand()) - .AddControl(_editor) + .AddControl(_editor); + if (Model.Preview) + { + builder.AddControl(PreviewBand()); + } + + _window = builder .AddControl(FooterBand()) .OnClosed((_, _) => Reset()) .Build(); @@ -249,8 +268,28 @@ internal void SimulateTyping(string text) } _editor.SetContent(_editor.GetContent() + text); + RefreshBands(); + } + + /// + /// Re-says what changes as the post is typed — the header's length cell and the as-sent preview — without touching + /// the editor, so the caret and the undo stack stay where they were. + /// + private void RefreshBands() + { + if (_window is null) + { + return; + } + + var model = Model; + _headerBand?.SetContent(new List { _scheme.Paint(Render(model, Width).Header, ScreenPalette.HeaderBg) }); + _previewBand?.SetContent(_scheme.Lines(PreviewLines(model, Width), ScreenPalette.FooterBg)); } + /// The screen's width in cells, which the header and the preview are laid out to. + private int Width => _system.ConsoleDriver.ScreenSize.Width; + private void OnKey(object? sender, KeyPressedEventArgs e) { if (_window is null) @@ -292,6 +331,17 @@ private void OnKey(object? sender, KeyPressedEventArgs e) return; } + // ⌥P shows the post as it will be sent, and hides it again. Alt by the same rule; P for preview, and nothing in + // MacroKeys.AppShortcuts, the bar's table or a host's reserved chords takes it. A MOO edit is sent as its lines, + // which the editor already shows, so it has no preview. + if (alt && key.Key == ConsoleKey.P && _edit is null) + { + e.Handled = true; + Preview = !Preview; + Redraw(); + return; + } + if (key.Key == ConsoleKey.Escape && !ctrl && !alt) { e.Handled = true; @@ -367,7 +417,17 @@ private void Redraw() window.ClearControls(); window.AddControl(HeaderBand()); window.AddControl(_editor); + if (Model.Preview) + { + window.AddControl(PreviewBand()); + } + else + { + _previewBand = null; + } + window.AddControl(FooterBand()); + FitEditor(); window.Invalidate(redrawAll: true); window.FocusManager.SetFocus(_editor, FocusReason.Programmatic); } @@ -380,11 +440,59 @@ private void Redraw() /// private MarkupControl HeaderBand() { - var band = ScreenChrome.Band(Render(Model).Header, ScreenPalette.HeaderBg, _scheme); + var band = ScreenChrome.Band(Render(Model, Width).Header, ScreenPalette.HeaderBg, _scheme); band.StickyPosition = StickyPosition.Top; + _headerBand = band; + return band; + } + + /// The as-sent preview, pinned above the footer: rows on the footer's plane. + private MarkupControl PreviewBand() + { + var band = ScreenChrome.Panel(PreviewLines(Model, Width), _scheme, ScreenPalette.FooterBg); + band.BackgroundColor = _scheme.Colour(ScreenPalette.FooterBg); + band.HorizontalAlignment = HorizontalAlignment.Stretch; + band.StickyPosition = StickyPosition.Bottom; + _previewBand = band; return band; } + /// + /// The preview's rows for : a heading, then the command ⌃S would send, cut into rows of + /// characters — hard, not at words, because this shows the exact characters the game gets + /// and a wrap at a space would hide one — ending in … when it runs past the rows there are. Always + /// rows, so typing never moves the editor. + /// + internal static IReadOnlyList PreviewLines(ComposerModel model, int width) + { + width = Math.Max(10, width); + var command = model.Command ?? string.Empty; + var lines = new List + { + $"[{ScreenPalette.Accent}]AS SENT[/][{ScreenPalette.Label}] the one command ⌃S sends · ⌥P hides this[/]", + }; + var rows = PreviewRows - 1; + for (var row = 0; row < rows; row++) + { + var start = row * width; + if (start >= command.Length) + { + lines.Add(row == 0 && command.Length == 0 ? $"[{ScreenPalette.Muted}]nothing yet[/]" : string.Empty); + continue; + } + + var piece = command.Substring(start, Math.Min(width, command.Length - start)); + if (row == rows - 1 && start + width < command.Length) + { + piece = piece[..^1] + "…"; + } + + lines.Add($"[{ScreenPalette.Value}]{Escape(piece)}[/]"); + } + + return lines; + } + private MarkupControl FooterBand() { var band = ScreenChrome.Band(Render(Model).Footer, ScreenPalette.FooterBg, _scheme); @@ -399,7 +507,12 @@ private MarkupControl FooterBand() /// rule as the settings screens: every key printed here works, and none that works is hidden. There is /// deliberately no ⌃F find — the control has a find API but no chord bound to it. /// - internal static (string Header, string Footer) Render(ComposerModel model) + /// What to draw. + /// + /// The row's width in cells: the length cell is set at its right edge and the rest gives way before it. Zero puts the + /// length cell on the end, for a caller with no screen. + /// + internal static (string Header, string Footer) Render(ComposerModel model, int width = 0) { var target = model.Target.Length == 0 ? $"[{ScreenPalette.Warn}]no connection[/]" @@ -426,6 +539,9 @@ internal static (string Header, string Footer) Render(ComposerModel model) + $"[{ScreenPalette.Label}] · spelling [/]{spelling}"; } + var length = $"[{ScreenPalette.Value}]{ComposerModel.CharactersLabel(model.Characters)}[/] "; + header = width > 0 ? SpreadLR(header, length, width) : $"{header}[{ScreenPalette.Label}] · [/]{length}"; + var footer = string.Join( $"[{ScreenPalette.Label}] · [/]", model.Keys.Select(k => $"[{ScreenPalette.Accent}]{Escape(k.Key)}[/][{ScreenPalette.Label}] {Escape(k.Label)}[/]")); @@ -450,7 +566,7 @@ private void FitEditor() return; } - _editor.ViewportHeight = Math.Max(1, _system.ConsoleDriver.ScreenSize.Height - ChromeRows); + _editor.ViewportHeight = Math.Max(1, _system.ConsoleDriver.ScreenSize.Height - ChromeRows - (Model.Preview ? PreviewRows : 0)); } /// The header and footer bands, which the editor's height is whatever is left over from. @@ -476,5 +592,7 @@ private void Reset() _window = null; _editor = null; _edit = null; + _headerBand = null; + _previewBand = null; } } diff --git a/src/SharpMUTerm.Tui/Panels/DockedComposer.cs b/src/SharpMUTerm.Tui/Panels/DockedComposer.cs index d7e0d9c7..abdc54ca 100644 --- a/src/SharpMUTerm.Tui/Panels/DockedComposer.cs +++ b/src/SharpMUTerm.Tui/Panels/DockedComposer.cs @@ -262,9 +262,16 @@ internal void Render(ComposerModel model) var verb = model.Verb; var mode = model.Escaping == ComposeEscaping.Literal ? $"[{_accent}]literal[/]" : "[dim]as typed[/]"; var marker = model.Armed ? $"[{_accent}]▌[/]" : " "; + var title = $"{marker}[bold {_accent}]COMPOSE[/]" + (verb.Length > 0 ? $" {Escape(verb)}" : string.Empty) + $" {mode}"; + + // The length cell at the right edge, as F1 has it; the title gives way first, and a pane too narrow for both + // keeps the title. + var length = $"[dim]{ComposerModel.CharactersLabel(model.Characters)}[/] "; _header.SetContent(new List { - $"{marker}[bold {_accent}]COMPOSE[/]" + (verb.Length > 0 ? $" {Escape(verb)}" : string.Empty) + $" {mode}", + _width <= 0 ? $"{title} {length}" + : _width >= VisibleLength(title) + VisibleLength(length) + 2 ? SpreadLR(title, length, _width) + : ElideVisible(title, _width), }); var footer = KeyRow(model.Keys, shortForm: false); diff --git a/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs b/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs index d36c1e55..890121c2 100644 --- a/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs +++ b/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs @@ -115,6 +115,18 @@ internal interface IPointerPresenter /// A right-click asked for a menu at a cell. An empty list is never passed. void ShowMenu(System.Drawing.Point cell, IReadOnlyList items); + /// + /// A menu the client built as data () asked for at a cell: the tab strip's + /// overflow list. A choice is handed back as the entry's command through , never run by the + /// host. A host that draws the plain kind only draws it as that (the default). + /// + void ShowMenu(System.Drawing.Point cell, SharpMUTerm.Client.Commands.MenuModel menu, Action dispatch) => + ShowMenu(cell, menu.Entries + .Select(e => e.IsSeparator + ? PointerMenuItem.Separator + : new PointerMenuItem(e.Label, e.Key, () => { if (e.Command is { } command) dispatch(command); }, e.Enabled, e.Checked)) + .ToList()); + /// /// Whether draws anything. Where it does not, the client opens its own chooser for /// the one menu a server can ask for, an MXP <SEND> with several commands. diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs index bbf438e0..e3bc86c8 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs @@ -224,6 +224,13 @@ private void OnPointerFrame(List flags, System.Drawing.Point point) return; } + // The tab strip's +N ▾ chip lists the tabs past its edges; it is painted over the strip's last cells. + if (pressed && !dragged && TabOverflowAt(point) is { } overflowing) + { + OpenTabOverflow(overflowing, point); + return; + } + if (flags.Contains(MouseFlags.Button1DoubleClicked) && DividerAt(point) is { } evened) { if (PaneResize.Even(evened.Split)) diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.JoinWraps.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.JoinWraps.cs new file mode 100644 index 00000000..6cf3d79d --- /dev/null +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.JoinWraps.cs @@ -0,0 +1,66 @@ +using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Client.Commands; +using SharpMUTerm.Core.Diagnostics; +using SharpMUTerm.Core.Session; + +namespace SharpMUTerm.Tui; + +/// +/// A pane narrower than the server's wrap column: every hard-wrapped row of a room description then wraps a second time +/// and leaves a stray word on a row of its own. That is what a layout's side panels, a split or a narrow window do to an +/// 80-column server. The client says so once per world per run, with an action that turns F5's join wraps on. +/// +/// Suggested, never switched on for the player. A false join is worse than a missed one (see +/// ): it runs two lines the server meant apart into one, and nothing on screen +/// says it happened. Whether a world's output is the prose the joiner is safe on is the player's to judge, so the client +/// names the cause and the one-click fix and leaves the setting where it is. +/// +/// +internal sealed partial class SharpMUTermApp +{ + /// The worlds this run has already been told about, by name. + private readonly HashSet _joinWrapsSuggested = new(StringComparer.OrdinalIgnoreCase); + + /// + /// Says, once per world, that 's pane is narrower than its server wraps — when the wrap + /// column is known, the world does not join wraps, and the pane is at least a few columns short of it. Called with + /// each pane width the client reports to the server. + /// + private void SuggestJoinWraps(WorldSession session, int paneWidth) + { + if (session.World.JoinWrappedLines + || session.ServerWrapColumn is not { } column + || paneWidth <= 0 + || paneWidth >= column - 2 + || _joinWrapsSuggested.Contains(session.World.Name)) + { + return; + } + + _joinWrapsSuggested.Add(session.World.Name); + Notice( + $"{Snippet(session.World.Name)} wraps at {column} and this pane is {paneWidth} wide · join wraps re-flows it (F5)", + MessageSeverity.Info, + action: new NoticeAction(BuiltInCommands.JoinWrapsPrefix + session.World.Name, "Join wraps")); + } + + /// world:join-wraps:<world>: turns F5's join wraps on for that world, from the next line. + private bool JoinWrapsFor(string worldName) + { + var world = _config.Worlds.FirstOrDefault(w => string.Equals(w.Name, worldName, StringComparison.OrdinalIgnoreCase)); + if (world is null) + { + RefuseCommand($"there is no world {Snippet(worldName)}"); + return true; + } + + if (!world.JoinWrappedLines) + { + world.JoinWrappedLines = true; + SaveConfiguration(); + } + + Notice($"{Snippet(world.Name)} joins its wrapped lines from the next line · F5 ▸ join wraps", MessageSeverity.Info); + return true; + } +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.NativeComposer.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.NativeComposer.cs index 706e3499..4536af72 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.NativeComposer.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.NativeComposer.cs @@ -109,6 +109,15 @@ private void OpenComposer(string target, string draft, ComposeEscaping escaping, open.Session.Publish(NativeComposeModel(open)); } }), + TogglePreview = () => OnUiThread(() => + { + if (ReferenceEquals(_nativeCompose, open) && open.Edit is null) + { + // The cell window's fact, so F1 opens the same way in either host for the rest of the run. + _composer.Preview = !_composer.Preview; + open.Session.Publish(NativeComposeModel(open)); + } + }), AddWord = word => OnUiThread(() => AddComposerWord(word)), Proportional = ComposerFaceOf(ComposeDraftKey(ActiveWindowId())), ChooseFace = ChooseComposerFace(ComposeDraftKey(ActiveWindowId())), @@ -160,7 +169,7 @@ private Action ChooseComposerFace(string? sessionKey) => proportional => O /// The native F1's model for what it holds now; the cell window's for the same draft. private ComposerModel NativeComposeModel(NativeCompose open) => - ComposeOverlay.ModelFor(open.Target, open.Body, open.Escaping, open.Edit, open.Edit is null ? ComposerSpelling() : null, open.CanSend); + ComposeOverlay.ModelFor(open.Target, open.Body, open.Escaping, open.Edit, open.Edit is null ? ComposerSpelling() : null, open.CanSend, _composer.Preview); /// /// Closes F1, in whichever host it is open, keeping its buffer as the character's draft (or MOO edit) exactly as the diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.TabOverflow.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.TabOverflow.cs new file mode 100644 index 00000000..553ab6e4 --- /dev/null +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.TabOverflow.cs @@ -0,0 +1,214 @@ +using SharpConsoleUI.Controls; +using SharpMUTerm.Client.Commands; +using SharpMUTerm.Client.Surfaces; +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Core.Text; +using SharpMUTerm.Core.Workspaces; +using static SharpMUTerm.Tui.MarkupText; + +namespace SharpMUTerm.Tui; + +/// +/// The tab strip's overflow chip (). Past its floors a strip cannot draw every +/// tab (): the framework scrolls it so the tab in front shows, and the rest are simply not +/// there. The chip says how many are missing — +3 ▾ at the strip's right edge — and a click on it lists them: +/// a cell list in a terminal, a native menu in the window. Choosing one goes to that window through the registry +/// (win:<id>, the ⌃P "Go to …" entry, which is also the keyboard's way to every hidden tab). +/// +/// No cell is spent. The chip is painted after the frame over the strip's own last cells, which are the clipped +/// end of a tab the framework could not finish drawing anyway; the strip, the pane and NAWS do not move. Which tabs are +/// hidden is read off the framework's own hit test of the strip it just painted (), +/// so the chip never disagrees with what is on screen. +/// +/// +internal sealed partial class SharpMUTermApp +{ + /// Each overflowing strip's list and where its chip is, in desktop cells; rebuilt every frame. + private readonly Dictionary _tabOverflow = new(StringComparer.Ordinal); + + /// The commands the last overflow list offered, so a choice can be checked against them. + private MenuModel? _tabOverflowOffered; + + /// The chip for a list: +3 ▾. + internal static string TabOverflowChip(MenuModel menu) => $"+{menu.Entries.Count} ▾"; + + /// Each overflowing pane's list of hidden tabs, by pane id. Internal for tests. + internal IReadOnlyDictionary TabOverflowMenus => + _tabOverflow.ToDictionary(p => p.Key, p => p.Value.Menu, StringComparer.Ordinal); + + /// Where a pane's chip is, in desktop cells, or null when its strip fits. Internal for tests. + internal PaneRect? TabOverflowChipAt(string paneId) => _tabOverflow.TryGetValue(paneId, out var o) ? o.Chip : null; + + /// + /// Finds the strips that drew fewer tabs than they hold, records each one's list of hidden tabs as drawn, and paints + /// its chip over the strip's last cells. On every frame, after the paint, beside the header dividers. + /// + private void PaintTabOverflow(SharpConsoleUI.Layout.CharacterBuffer buffer) + { + _tabOverflow.Clear(); + foreach (var (paneId, tabs, _) in RealisedPanes()) + { + if (!tabs.ShowTabHeader || tabs.TabCount < 2 || BoundsOf(tabs) is not { Width: > 0 } strip + || HiddenTabs(tabs, strip.Width) is not { Count: > 0 } hidden) + { + continue; + } + + var menu = Drawing(SurfaceCatalog.TabOverflow, paneId, new MenuModel(hidden)); + var chip = TabOverflowChip(menu); + if (chip.Length + 4 > strip.Width) + { + continue; + } + + var at = new PaneRect(strip.X + strip.Width - chip.Length - 1, strip.Y, chip.Length + 1, 1); + _tabOverflow[paneId] = (menu, at); + + var top = _window.Top + _system.DesktopUpperLeft.Y; + var by = at.Y - top; + var bx = at.X - _window.Left; + if (by < 0 || by >= buffer.Height || bx < 0 || bx + at.Width > buffer.Width) + { + continue; + } + + var plane = buffer.GetCell(bx, by).Background; + var planeRgb = new Rgb(plane.R, plane.G, plane.B); + var ink = TryParseRgb(_ink.Accent, out var accent) ? Contrast.Legible(accent, planeRgb) : new Rgb(0xee, 0xee, 0xee); + buffer.WriteString(bx, by, " " + chip, ToColor(ink), plane); + } + } + + /// + /// The tabs of a strip that the framework's hit test finds nowhere along it, as menu entries in strip order: each + /// says the window's name and dispatches win:<id>. Null when every tab was drawn, or the hit test answers + /// nothing at all (a framework that renamed it), which must not read as every tab hidden. + /// + private List? HiddenTabs(TabControl tabs, int width) + { + var seen = new HashSet(); + for (var x = 0; x < width; x++) + { + if (FrameworkHitTests.TabAt(tabs, x) is var index and >= 0) + { + seen.Add(index); + } + } + + if (seen.Count == 0 || seen.Count >= tabs.TabCount) + { + return null; + } + + var hidden = new List(); + var pages = tabs.TabPages; + for (var i = 0; i < pages.Count; i++) + { + if (!seen.Contains(i) && pages[i].Tag is string id && _workspace.FindWindow(id) is { } window) + { + var unread = window.Unread > 0 ? $" ({UnreadBadge.Format(window.Unread)})" : string.Empty; + hidden.Add(new MenuEntry(Snippet(TabTitles.Name(window)) + unread, null, CommandIds.Window(id))); + } + } + + return hidden; + } + + /// The overflowing strip whose chip is under , or null. + private string? TabOverflowAt(System.Drawing.Point point) => + _tabOverflow.FirstOrDefault(p => Contains(p.Value.Chip, point)).Key; + + /// + /// Opens a pane's list of hidden tabs at : the host's native menu where it draws menus, else + /// a cell list. Both hand the chosen entry's command to . Internal for tests, which + /// pass to open the cell list in a host that draws menus. + /// + internal bool OpenTabOverflow(string paneId, System.Drawing.Point? point = null, bool cells = false) + { + if (!_tabOverflow.TryGetValue(paneId, out var overflow) || AnyOverlayOpen) + { + return false; + } + + var menu = overflow.Menu; + _tabOverflowOffered = menu; + var at = point ?? new System.Drawing.Point(overflow.Chip.X, overflow.Chip.Y); + if (!cells && _pointer is { DrawsMenus: true } pointer) + { + pointer.ShowMenu(at, menu, command => OnUiThread(() => RunTabOverflowEntry(command))); + return true; + } + + _tabOverflowSelected = 0; + _sendMenu.Open( + "tabs", + $"{menu.Entries.Count} more tabs", + width => TabOverflowLines(menu, _tabOverflowSelected, width), + key => + { + switch (key.Key) + { + case ConsoleKey.UpArrow: + _tabOverflowSelected = Math.Max(0, _tabOverflowSelected - 1); + return true; + case ConsoleKey.DownArrow: + _tabOverflowSelected = Math.Min(menu.Entries.Count - 1, _tabOverflowSelected + 1); + return true; + case ConsoleKey.Enter when menu.Entries[_tabOverflowSelected].Command is { } chosen: + _sendMenu.Close(); + RunTabOverflowEntry(chosen); + return false; + case >= ConsoleKey.D1 and <= ConsoleKey.D9 when key.Key - ConsoleKey.D1 < menu.Entries.Count + && menu.Entries[key.Key - ConsoleKey.D1].Command is { } picked: + _sendMenu.Close(); + RunTabOverflowEntry(picked); + return false; + default: + return true; + } + }, + width: TabOverflowLines(menu, 0, int.MaxValue).Max(VisibleLength)); + return true; + } + + private int _tabOverflowSelected; + + /// + /// The cell list of hidden tabs: a digit and a name per tab, the selected one marked, and the keys. The cell renderer + /// of the overflow surface, drawn from the same the window's menu is. + /// + internal static List TabOverflowLines(MenuModel menu, int selected, int width) + { + ArgumentNullException.ThrowIfNull(menu); + var lines = new List(); + for (var i = 0; i < menu.Entries.Count; i++) + { + var key = i < 9 ? $"{i + 1}" : " "; + var mark = i == selected ? $"[bold {ScreenPalette.Accent}]▸[/]" : " "; + var weight = i == selected ? "bold " : string.Empty; + lines.Add($"{mark} [{ScreenPalette.Label}]{key}[/] [{weight}{ScreenPalette.Value}]{Escape(menu.Entries[i].Label)}[/]"); + } + + lines.Add(string.Empty); + lines.Add($"[{ScreenPalette.Label}]↑↓ select · ⏎ or a digit goes there · Esc cancels[/]"); + return lines; + } + + /// The cell list for a menu with nothing selected; for the surface tests. + internal static List TabOverflowLines(MenuModel menu) => TabOverflowLines(menu, 0, int.MaxValue); + + /// + /// A hidden tab chosen from the overflow list, in either host: the window it names comes forward through the + /// registry, as its ⌃P entry would bring it. A command the last list did not offer is refused. Internal for tests. + /// + internal bool RunTabOverflowEntry(string command) + { + if (_tabOverflowOffered is not { } offered || !offered.Commands().Contains(command, StringComparer.Ordinal)) + { + RefuseCommand($"the tab list did not offer {Snippet(command)}"); + return false; + } + + return DispatchCommand(command); + } +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 56cc8777..37ef6889 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -1011,6 +1011,7 @@ public SharpMUTermApp( SyncTabStripWidths(); SyncTransparentColours(); PaintHeaderDividers(buffer); + PaintTabOverflow(buffer); DrawSixelOverlay(buffer); PublishScrollbars(); PublishPanels(); @@ -1219,15 +1220,20 @@ public string RenderSnapshot(string? view = null) // live writer by ComposeWindowTests, which asserts that a real session's composer header reads // what SessionTitle produces. The body is prose with a '%' and brackets in it on purpose — it is // the text whose two renderings differ. + // + // compose-preview is the literal post with ⌥P's as-sent band under it, which shows the escapes and %r joins the + // header's length cell is counting. if (string.Equals(view, "compose", StringComparison.OrdinalIgnoreCase) || - string.Equals(view, "compose-literal", StringComparison.OrdinalIgnoreCase)) + string.Equals(view, "compose-literal", StringComparison.OrdinalIgnoreCase) || + string.Equals(view, "compose-preview", StringComparison.OrdinalIgnoreCase)) { + _composer.Preview = string.Equals(view, "compose-preview", StringComparison.OrdinalIgnoreCase); OpenComposer( DemoScene.MainCharacterName, "+bbpost 12=The Long Winter\n\nThe caravan reached the pass at dusk, 100% frozen and\n" + "short two horses. [Nobody] said what everyone was thinking.\n\n" + " -- Corvid, scribe", - string.Equals(view, "compose-literal", StringComparison.OrdinalIgnoreCase) + !string.Equals(view, "compose", StringComparison.OrdinalIgnoreCase) ? ComposeEscaping.Literal : ComposeEscaping.AsTyped, canSend: true); @@ -8581,6 +8587,11 @@ private bool RunBuiltInCommand(string id) return true; } + if (id.StartsWith(SharpMUTerm.Client.Commands.BuiltInCommands.JoinWrapsPrefix, StringComparison.Ordinal)) + { + return JoinWrapsFor(id[SharpMUTerm.Client.Commands.BuiltInCommands.JoinWrapsPrefix.Length..]); + } + // Before the panels' own prefix, which they share: panel:popout: and panel:dock:. if (id.StartsWith(SharpMUTerm.Client.Panels.PanelFloatCommands.PopOutPrefix, StringComparison.Ordinal)) { @@ -13268,6 +13279,7 @@ private void ReportPaneSizes() } OfferWindowSize(session, (Math.Max(1, rect.Width), Math.Max(1, rect.Height)), now); + SuggestJoinWraps(session, rect.Width); } ArmSizeFlush(now); @@ -13448,10 +13460,19 @@ private async Task AnnounceWindowSizeAsync(WorldSession session, int width, int /// private void PaintStatus(string markup) { - _statusBar.SetContent(new List { markup }); + _statusBar.SetContent(new List { FitStatusRow(markup, HeaderWidth()) }); SyncInputHeights(_second.Visible); } + /// + /// The status row's markup cut to cells, ending in …. The row is one row in every + /// host: a notice is a sentence, and a window narrower than it wrapped the row onto a second line and took that row + /// off the command line (the D1 lesson, live in the window). Everything the resting row lays out already fits; this is + /// the floor under the notices and anything else that does not measure itself. Internal for tests. + /// + internal static string FitStatusRow(string markup, int width) => + width > 0 && MarkupWidth(markup) > width ? ElideVisible(markup, width) : markup; + /// /// Sets what the status row says at rest: the connection identity, a mode prompt, the /// not-connected line. Remembered as well as painted, so a laid over the top of @@ -13497,6 +13518,7 @@ private void SetStatus(string markup, bool displace = false) /// The transient message currently laid over the resting row, or null when there is none. private string? _notice; + private NoticeModel? _noticeShown; private ITimer? _noticeTimer; /// @@ -13533,6 +13555,15 @@ private void SetStatus(string markup, bool displace = false) /// private void Notice(string text, MessageSeverity severity = MessageSeverity.Warning, string? key = null, NoticeAction? action = null) { + // The same notice raised again while it is still up is one notice: it keeps the row for another few seconds and + // is not said, toasted or announced a second time. Two identical toasts stacked in the window were the report. + if (_notice is not null && _noticeShown is { } shown && shown.Text == text && shown.Key == key + && shown.Severity == NoticeSeverityOf(severity) && shown.Action == action) + { + _noticeTimer?.Change(NoticeDuration, Timeout.InfiniteTimeSpan); + return; + } + // Through the logger, not straight into the buffer: the client's own messages and the telnet // stack's diagnostics then share one ordered history (and one rolling file), which is the point // of there being a pipeline at all. @@ -13554,6 +13585,7 @@ private void Notice(string text, MessageSeverity severity = MessageSeverity.Warn var markup = NoticeMarkup(model); _notice = markup; + _noticeShown = model; PaintStatus(markup); PublishNotice(model); _noticeTimer ??= _time.CreateTimer( diff --git a/src/SharpMUTerm.Tui/SnapshotViews.cs b/src/SharpMUTerm.Tui/SnapshotViews.cs index f07a8b45..03f453ef 100644 --- a/src/SharpMUTerm.Tui/SnapshotViews.cs +++ b/src/SharpMUTerm.Tui/SnapshotViews.cs @@ -20,7 +20,7 @@ internal static class SnapshotViews "history", "history-search", "history-search-filter", "draft", "draft2", "menu", "menu-split", "menu-fuzzy", "menu-recent", "messages", "notices", "quit", "connections", "characters", "tint", "tint-input", "tint-input-moved", "tint-tabs", - "compose", "compose-literal", "moo-edit", "mssp", "mssp-none", "mssp-never", "web", + "compose", "compose-literal", "compose-preview", "moo-edit", "mssp", "mssp-none", "mssp-never", "web", "rail-long", "scrollback", "scrollback-up", "scrollback-split", "reflow", "links", "away", "away-scrollback", "search", "search-regex", "search-all", "search-landed", "activity-bar", "mxp-image", "mxp-figure", "input-selection", "selection", "trigger-builder", diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativeComposerTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativeComposerTests.cs index ce708831..be38b3b6 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/NativeComposerTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/NativeComposerTests.cs @@ -167,6 +167,30 @@ public async Task AltLFlipsTheHeadersModeFromTheClientsModel() await Assert.That(header).Contains("literal"); } + [Test] + public async Task TheHeaderCountsThePostAsSentAndAltPShowsIt() + { + var (count, previewShown, preview, hidden) = await Run(rig => + { + var overlay = OpenF1(rig); + Type(overlay.Composer.Editor, "+post one"); + var count = overlay.Composer.CountText; + Press(overlay.Composer.Editor, Key.P, KeyModifiers.Alt); + Drain(); + var reopened = rig.Driver.Composer.Overlay!; + var shown = reopened.Composer.PreviewText is { Length: > 0 } && rig.App.Composer.Preview; + var text = reopened.Composer.PreviewText; + Press(reopened.Composer.Editor, Key.P, KeyModifiers.Alt); + Drain(); + return (count, shown, text, !rig.App.Composer.Preview); + }); + + await Assert.That(count).IsEqualTo(ComposerModel.CharactersLabel("+post one".Length)); + await Assert.That(previewShown).IsTrue(); + await Assert.That(preview).Contains("+post one"); + await Assert.That(hidden).IsTrue().Because("⌥P again hides it"); + } + [Test] public async Task EscKeepsTheDraftForTheNextF1() { diff --git a/tests/SharpMUTerm.Avalonia.Tests/NoticeToastTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NoticeToastTests.cs index 4d965023..08046f7d 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/NoticeToastTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/NoticeToastTests.cs @@ -140,6 +140,46 @@ public async Task AHoveredToastKeepsItsPlaceWhileTheToastsUnderItFade() await Assert.That(after[^1].Bottom).IsGreaterThan(before.Bottom).Because("off the stack, it closes up to the bottom"); } + /// + /// A native quick bar across the bottom of the pane area: a toast is lifted above its keys, as above a legend. And + /// while something modal is in front the toasts are hidden rather than left under it. + /// + [Test] + public async Task AToastStaysOffTheQuickBarAndHidesWhileAModalIsInFront() + { + var (bar, rects, hiddenUnderModal, backAfter) = await Run((window, view, layer, driver) => + { + var model = new QuickBarModel([new QuickBarItem("F1", "F1", "look", Fires: true)]); + var notices = (IPointerPresenter)driver.Pointer; + notices.Panels( + [new PanelOverlay(PanelIds.QuickBar, "panel:quick-bar:demo", new PaneRect(0, 16, 80, 2), new PanelInk("#33ccff", "#ffaa33", "#555555"), null, QuickBar: model, Pick: _ => { })]); + notices.Notice(Overlay(1, "Using the Combat layout: the game sends vitals.", null, _ => { }, aboveRow: 18)); + Drain(); + window.UpdateLayout(); + driver.Flush(); + Drain(); + var buttons = layer.QuickBars.Values.Single(); + var topLeft = buttons.TranslatePoint(new Point(0, 0), layer.Toasts)!.Value; + var bar = new Rect(topLeft, buttons.Bounds.Size); + var rects = layer.Toasts.Rects(); + + var modal = true; + layer.ToastsHidden = () => modal; + driver.Flush(); + Drain(); + var hidden = !layer.Toasts.IsVisible; + modal = false; + driver.Flush(); + Drain(); + return (bar, rects, hidden, layer.Toasts.IsVisible); + }, columns: 80, rows: 20); + + await Assert.That(rects).IsNotEmpty(); + await Assert.That(rects.Any(r => r.Intersects(bar))).IsFalse().Because("no toast covers a quick bar key"); + await Assert.That(hiddenUnderModal).IsTrue().Because("a toast is never left under a settings window, ⌃P or a modal"); + await Assert.That(backAfter).IsTrue(); + } + /// /// In the combat layout the map sits right of the output, down to the command line, and its legend is in its bottom-left /// corner — under the toasts' column. A toast is stacked above the legend rather than over it. diff --git a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs index d4462cd5..b40d65fc 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs @@ -205,7 +205,7 @@ await Assert.That(Rows(palette.Session!.View(query))).IsEquivalentTo(Rows(drawn! // F1: the window's editor is handed the model the cell window draws for the same draft, in each mode and for a // MOO edit. Two clients, one with the window's editor and one without, opened on the same scene. - foreach (var view in new[] { "compose", "compose-literal", "moo-edit" }) + foreach (var view in new[] { "compose", "compose-literal", "compose-preview", "moo-edit" }) { using var nativeDriver = new AvaloniaConsoleDriver(140, 36); var composer = new FakeComposer(); @@ -306,6 +306,19 @@ await Assert.That(Rows(palette.Session!.View(query))).IsEquivalentTo(Rows(drawn! covered.Add(SurfaceCatalog.FloatingPanel); } + // The tab overflow chip: the menu the window opens is the list the cells recorded for that strip in the same frame. + { + using var driver = new AvaloniaConsoleDriver(56, 20); + await using var app = App(driver, DemoScene.Build()); + app.RenderSnapshot("tabs-many"); + var (paneId, recorded) = app.TabOverflowMenus.Single(); + await Assert.That(app.OpenTabOverflow(paneId)).IsTrue(); + await Assert.That(driver.Pointer.LastModelMenu).IsNotNull().Because("tab-overflow: the window opens a native menu"); + await Assert.That((object)driver.Pointer.LastModelMenu!.Value.Menu).IsEqualTo(app.DrawnModel(SurfaceCatalog.TabOverflow, paneId)).Because("tab-overflow"); + await Assert.That(recorded.Entries).IsNotEmpty(); + covered.Add(SurfaceCatalog.TabOverflow); + } + var drawnNatively = SurfaceCatalog.All.Where(s => s.On(SurfaceHosts.Window).HasFlag(SurfaceDrawing.Native)).Select(s => s.Id); await Assert.That(covered).IsEquivalentTo(drawnNatively).Because("every surface the window draws natively has its model compared here"); } @@ -674,6 +687,31 @@ await SameModal("welcome: layout and browse", "welcome", probed.Add(SurfaceCatalog.Welcome); var acting = SurfaceCatalog.All.Where(s => s.HasNative && s.Actions.Count > 0).Select(s => s.Id); + // The tab overflow chip: an entry chosen from the window's menu and the same digit in the cell list bring the same + // hidden tab forward. + { + using var nativeDriver = new AvaloniaConsoleDriver(56, 20); + await using var a = App(nativeDriver, DemoScene.Build()); + a.RenderSnapshot("tabs-many"); + var before = Outcome(a); + var (pane, _) = a.TabOverflowMenus.Single(); + a.OpenTabOverflow(pane); + var (menu, dispatch) = nativeDriver.Pointer.LastModelMenu!.Value; + dispatch(menu.Entries[0].Command!); + + using var cellDriver = new AvaloniaConsoleDriver(56, 20); + await using var b = App(cellDriver, DemoScene.Build()); + b.RenderSnapshot("tabs-many"); + b.OpenTabOverflow(b.TabOverflowMenus.Single().Key, cells: true); + b.SendMenu.SimulateKey(new ConsoleKeyInfo('1', ConsoleKey.D1, false, false, false)); + + await Assert.That(Outcome(a)).IsNotEqualTo(before).Because("tab-overflow: the native choice did something"); + await Assert.That(Outcome(a)).IsEqualTo(Outcome(b)).Because("tab-overflow"); + await Assert.That(a.ActiveWindowId()).IsEqualTo(b.ActiveWindowId()); + } + + probed.Add(SurfaceCatalog.TabOverflow); + await Assert.That(probed).IsEquivalentTo(acting).Because("every native surface with actions has a probe here"); } diff --git a/tests/SharpMUTerm.Client.Tests/SurfaceCatalogTests.cs b/tests/SharpMUTerm.Client.Tests/SurfaceCatalogTests.cs index 14ccb389..0f1e4f44 100644 --- a/tests/SharpMUTerm.Client.Tests/SurfaceCatalogTests.cs +++ b/tests/SharpMUTerm.Client.Tests/SurfaceCatalogTests.cs @@ -73,7 +73,7 @@ public async Task PanelSurfacesAreKnownPanels() var panels = SurfaceCatalog.All.Where(s => s.Id is not (SurfaceCatalog.Header or SurfaceCatalog.Sidebar or SurfaceCatalog.Settings or SurfaceCatalog.LayoutsMenu or SurfaceCatalog.Palette or SurfaceCatalog.Prefix or SurfaceCatalog.RailStrip or SurfaceCatalog.Notice or SurfaceCatalog.Compose - or SurfaceCatalog.FloatingPanel) + or SurfaceCatalog.FloatingPanel or SurfaceCatalog.TabOverflow) && !SurfaceCatalog.Modals.Contains(s.Id)); foreach (var surface in panels) { diff --git a/tests/SharpMUTerm.Tui.Tests/ComposerLengthTests.cs b/tests/SharpMUTerm.Tui.Tests/ComposerLengthTests.cs new file mode 100644 index 00000000..85b425dc --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/ComposerLengthTests.cs @@ -0,0 +1,85 @@ +using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Composer; +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Graphics; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// The composer says how long the post is as it will be sent, and ⌥P shows it as sent: escapes and %r joins +/// included, because that is what a MUSH's buffer limit counts. +/// +[NotInParallel] +public class ComposerLengthTests +{ + private static readonly TerminalCapabilities Caps = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private static ConsoleKeyInfo AltP => new('\0', ConsoleKey.P, false, true, false); + + private static async Task Connected() + { + Console.SetIn(TextReader.Null); + var config = new AppConfiguration(); + var world = new WorldDefinition { Name = "Quiet", Host = "quiet.example.org", Port = 4000 }; + world.Characters.Add(new CharacterDefinition { Name = "Ann", Logging = new LoggingSettings() }); + config.Worlds.Add(world); + var app = new SharpMUTermApp(config, ClientHost.Headless(new HeadlessConsoleDriver(120, 32), Caps)); + app.TelnetFactory = _ => new RecordingTelnetSession(); + await app.BindWorldWithoutConnecting(world).ConnectAsync(); + app.RenderNextFrame(); + return app; + } + + [Test] + public async Task TheCountIsOfWhatWillBeSent() + { + await Assert.That(ComposerModel.SentLength("+post a\nb", ComposeEscaping.AsTyped, edit: false)) + .IsEqualTo(ComposeMessage.Build("+post a\nb", ComposeEscaping.AsTyped)!.Length); + await Assert.That(ComposerModel.SentLength("50% [x]", ComposeEscaping.Literal, edit: false)) + .IsGreaterThan("50% [x]".Length).Because("literal escapes are characters the game receives"); + await Assert.That(ComposerModel.SentLength("line\n", ComposeEscaping.Literal, edit: true)).IsEqualTo(4); + await Assert.That(ComposerModel.CharactersLabel(1)).IsEqualTo("1 char"); + await Assert.That(ComposerModel.CharactersLabel(1234)).IsEqualTo("1,234 chars"); + } + + [Test] + public async Task F1sHeaderCountsThePostAsItIsTyped() + { + var app = await Connected(); + app.SimulateKey(new ConsoleKeyInfo('\0', ConsoleKey.F1, false, false, false)); + app.Composer.SimulateTyping("+post hello"); + + await Assert.That(app.Composer.HeaderMarkup).Contains(ComposerModel.CharactersLabel(app.Composer.Model.Characters)); + await Assert.That(app.Composer.Model.Characters).IsEqualTo("+post hello".Length); + } + + [Test] + public async Task AltPShowsThePostAsSentAndAgainHidesIt() + { + var app = await Connected(); + app.SimulateKey(new ConsoleKeyInfo('\0', ConsoleKey.F1, false, false, false)); + app.Composer.SimulateTyping("+post one\n\ntwo"); + + await Assert.That(app.Composer.SimulateKey(AltP)).IsTrue(); + await Assert.That(app.Composer.Model.Preview).IsTrue(); + await Assert.That(app.Composer.Model.Keys.Select(k => k.Label)).Contains("hide as sent"); + var preview = ComposeOverlay.PreviewLines(app.Composer.Model, 120).Select(MarkupText.Plain).ToList(); + await Assert.That(string.Join("\n", preview)).Contains("+post one%r%rtwo"); + await Assert.That(app.RenderWholeFrame()).Contains("AS SENT"); + + app.Composer.SimulateKey(AltP); + await Assert.That(app.Composer.Model.Preview).IsFalse(); + } + + [Test] + public async Task AMooEditHasNoPreview() + { + var model = ComposerModel.Create( + ComposerPlace.FullScreen, "Ann", "x", ComposeEscaping.AsTyped, new ComposerEdit("name", "moo-code"), + spelling: null, canSend: true, armed: true, revision: 0, preview: true); + + await Assert.That(model.Preview).IsFalse(); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/InputAreaLayoutTests.cs b/tests/SharpMUTerm.Tui.Tests/InputAreaLayoutTests.cs index 438af39d..c442fbc3 100644 --- a/tests/SharpMUTerm.Tui.Tests/InputAreaLayoutTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/InputAreaLayoutTests.cs @@ -27,7 +27,7 @@ namespace SharpMUTerm.Tui.Tests; [NotInParallel] public class InputAreaLayoutTests { - private const int DefaultRows = 3; // InputSettings.Rows — one bar's height before anything wraps + private const int DefaultRows = 1; // InputSettings.Rows — one bar's height before anything wraps private const int MaxRows = 8; // InputSettings.MaxRows — the most it grows to as it wraps private static readonly TerminalCapabilities Headless = @@ -182,8 +182,9 @@ await Assert.That(RowsPainted(frame.Ansi, width, height, frame.IdleBand)) .IsEqualTo(frame.Rows.Primary); await Assert.That(RowsPainted(frame.Ansi, width, height, frame.ArmedBand)) .IsEqualTo(frame.Rows.Second); - await Assert.That(frame.Rows.Primary).IsEqualTo(DefaultRows); - await Assert.That(frame.Rows.Second).IsEqualTo(DefaultRows); + // Each bar holds a draft, which may wrap past the one-row default; the bands still match the rows given. + await Assert.That(frame.Rows.Primary).IsGreaterThanOrEqualTo(DefaultRows); + await Assert.That(frame.Rows.Second).IsGreaterThanOrEqualTo(DefaultRows); } /// diff --git a/tests/SharpMUTerm.Tui.Tests/NativeComposerRoutingTests.cs b/tests/SharpMUTerm.Tui.Tests/NativeComposerRoutingTests.cs index 092acc8f..91169eea 100644 --- a/tests/SharpMUTerm.Tui.Tests/NativeComposerRoutingTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/NativeComposerRoutingTests.cs @@ -167,7 +167,7 @@ public async Task F1OpensTheHostsEditorAndNotTheCellModal() await Assert.That(model.Place).IsEqualTo(ComposerPlace.FullScreen); await Assert.That(model.Target).IsEqualTo("Ann"); await Assert.That(model.CanSend).IsTrue(); - await Assert.That(model.Keys.Select(k => k.Key)).IsEquivalentTo(new[] { "⌃S", "⌥L", "Esc" }); + await Assert.That(model.Keys.Select(k => k.Key)).IsEquivalentTo(new[] { "⌃S", "⌥L", "⌥P", "Esc" }); } [Test] diff --git a/tests/SharpMUTerm.Tui.Tests/NoticeFitTests.cs b/tests/SharpMUTerm.Tui.Tests/NoticeFitTests.cs new file mode 100644 index 00000000..b8918770 --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/NoticeFitTests.cs @@ -0,0 +1,120 @@ +using SharpConsoleUI.Drivers; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Diagnostics; +using SharpMUTerm.Graphics; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// The status row never wraps, whatever a notice says and however narrow the screen; a notice said again while it is +/// still on the row is not said twice; and a pane narrower than its server's wrap column is told about join wraps once. +/// +[NotInParallel] +public class NoticeFitTests +{ + private static readonly TerminalCapabilities Caps = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private static SharpMUTermApp App(int width, int height) + { + Console.SetIn(TextReader.Null); + return new SharpMUTermApp(DemoScene.Build(), ClientHost.Headless(new HeadlessConsoleDriver(width, height), Caps)); + } + + [Test] + [Arguments(80, 24)] + [Arguments(60, 20)] + [Arguments(40, 12)] + public async Task ALongNoticeIsElidedToTheRowAndTheRowStaysOneRow(int width, int height) + { + var app = App(width, height); + app.RenderSnapshot(); + var before = app.LaidOutRows; + + app.SimulateNotice( + string.Concat(Enumerable.Repeat("a notice far longer than any status row can hold ", 4)), + MessageSeverity.Warning, "⌃B", null); + app.RenderNextFrame(); + + await Assert.That(SharpMUTermApp.MarkupWidth(app.StatusMarkup)).IsLessThanOrEqualTo(width); + await Assert.That(app.LaidOutRows.Status).IsEqualTo(1); + await Assert.That(app.LaidOutRows.Workspace).IsEqualTo(before.Workspace).Because("a wrapped row takes a row off the panes"); + } + + [Test] + public async Task FitStatusRowLeavesARowThatFitsAlone() + { + await Assert.That(SharpMUTermApp.FitStatusRow("[dim]short[/]", 80)).IsEqualTo("[dim]short[/]"); + await Assert.That(SharpMUTermApp.MarkupWidth(SharpMUTermApp.FitStatusRow("[dim]" + new string('x', 100) + "[/]", 80))) + .IsLessThanOrEqualTo(80); + } + + [Test] + public async Task TheSameNoticeTwiceIsSaidOnce() + { + var app = App(120, 34); + var before = app.Messages.Entries.Count; + + app.SimulateNotice("Painting in Dark, output on screen included.", MessageSeverity.Info, "theme", null); + app.SimulateNotice("Painting in Dark, output on screen included.", MessageSeverity.Info, "theme", null); + + await Assert.That(app.Messages.Entries.Count).IsEqualTo(before + 1); + + app.SimulateNotice("something else", MessageSeverity.Info, null, null); + app.SimulateNotice("Painting in Dark, output on screen included.", MessageSeverity.Info, "theme", null); + await Assert.That(app.Messages.Entries.Count).IsEqualTo(before + 3).Because("a notice after another one is news again"); + } + + [Test] + public async Task APaneNarrowerThanTheServersWrapIsToldAboutJoinWrapsOnce() + { + Console.SetIn(TextReader.Null); + var config = new AppConfiguration(); + var world = new WorldDefinition { Name = "Quiet", Host = "quiet.example.org", Port = 4000 }; + world.Characters.Add(new CharacterDefinition { Name = "Ann", Logging = new LoggingSettings() }); + config.Worlds.Add(world); + var app = new SharpMUTermApp(config, ClientHost.Headless(new HeadlessConsoleDriver(60, 24), Caps)); + var telnet = new RecordingTelnetSession(); + app.TelnetFactory = _ => telnet; + await app.BindWorldWithoutConnecting(world).ConnectAsync(); + app.RenderNextFrame(); + + for (var i = 0; i < 12; i++) + { + telnet.Receive("The plaza opens out under a white sky, its flagstones worn smooth by years of trade " + i); + } + + app.RenderNextFrame(); + app.RenderNextFrame(); + + var notices = app.Messages.Entries.Where(e => e.Text.Contains("join wraps", StringComparison.Ordinal)).ToList(); + await Assert.That(notices.Count).IsEqualTo(1); + await Assert.That(world.JoinWrappedLines).IsFalse().Because("it is suggested, never switched on for the player"); + + await Assert.That(app.DispatchCommand("world:join-wraps:Quiet")).IsTrue(); + await Assert.That(world.JoinWrappedLines).IsTrue(); + } + + [Test] + public async Task AWidePaneIsToldNothing() + { + Console.SetIn(TextReader.Null); + var config = new AppConfiguration(); + var world = new WorldDefinition { Name = "Quiet", Host = "quiet.example.org", Port = 4000 }; + world.Characters.Add(new CharacterDefinition { Name = "Ann", Logging = new LoggingSettings() }); + config.Worlds.Add(world); + var app = new SharpMUTermApp(config, ClientHost.Headless(new HeadlessConsoleDriver(160, 40), Caps)); + var telnet = new RecordingTelnetSession(); + app.TelnetFactory = _ => telnet; + await app.BindWorldWithoutConnecting(world).ConnectAsync(); + + for (var i = 0; i < 12; i++) + { + telnet.Receive("The plaza opens out under a white sky, its flagstones worn smooth by years of trade " + i); + } + + app.RenderNextFrame(); + + await Assert.That(app.Messages.Entries.Any(e => e.Text.Contains("join wraps", StringComparison.Ordinal))).IsFalse(); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/ScreenModelTests.cs b/tests/SharpMUTerm.Tui.Tests/ScreenModelTests.cs index 8b52b543..c7e33c65 100644 --- a/tests/SharpMUTerm.Tui.Tests/ScreenModelTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/ScreenModelTests.cs @@ -488,7 +488,7 @@ public async Task Options_CommandLineHeightsRefuseValuesTheBarCannotHonour() await Assert.That(edits.Apply(height, "0")).IsNotNull(); await Assert.That(edits.Apply(height, "21")).IsNotNull(); - await Assert.That(input.Rows).IsEqualTo(3); + await Assert.That(input.Rows).IsEqualTo(1); } /// diff --git a/tests/SharpMUTerm.Tui.Tests/TabOverflowTests.cs b/tests/SharpMUTerm.Tui.Tests/TabOverflowTests.cs new file mode 100644 index 00000000..a28b039b --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/TabOverflowTests.cs @@ -0,0 +1,109 @@ +using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Surfaces; +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Graphics; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// The tab strip's overflow chip: past its floors a strip cannot draw every tab, and the chip at its right edge says +/// how many are missing and lists them. Read off a real 80×24 frame of the tabs-many view, where the Chat pane +/// holds more captures than it can draw. +/// +[NotInParallel] +public class TabOverflowTests +{ + private static readonly TerminalCapabilities Caps = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private static (SharpMUTermApp App, string Frame) Crowded(int width = 80, int height = 24) + { + Console.SetIn(TextReader.Null); + var app = new SharpMUTermApp(DemoScene.Build(), ClientHost.Headless(new HeadlessConsoleDriver(width, height), Caps)); + var frame = app.RenderSnapshot("tabs-many"); + return (app, frame); + } + + [Test] + public async Task AStripThatCannotDrawEveryTabCarriesAChipCountingTheRest() + { + var (app, frame) = Crowded(); + + var (paneId, menu) = app.TabOverflowMenus.Single(); + await Assert.That(menu.Entries.Count).IsGreaterThan(0); + await Assert.That(FrameText(frame)).Contains(SharpMUTermApp.TabOverflowChip(menu)); + await Assert.That(menu.Entries.All(e => e.Command!.StartsWith(CommandIds.WindowPrefix, StringComparison.Ordinal))).IsTrue(); + await Assert.That(app.DrawnModel(SurfaceCatalog.TabOverflow, paneId)).IsEqualTo(menu) + .Because("the list the window's menu is handed is the one the cells recorded"); + } + + [Test] + public async Task TheChipSpendsNoCellAndMovesNoPane() + { + Console.SetIn(TextReader.Null); + var plain = new SharpMUTermApp(DemoScene.Build(), ClientHost.Headless(new HeadlessConsoleDriver(80, 24), Caps)); + plain.RenderSnapshot("tabs-many"); + var (app, _) = Crowded(); + + await Assert.That(app.PaneOutputRects()).IsEquivalentTo(plain.PaneOutputRects()); + var (paneId, _) = app.TabOverflowMenus.Single(); + var chip = app.TabOverflowChipAt(paneId)!.Value; + var strip = app.PaneOutputRects()[paneId]; + await Assert.That(chip.X + chip.Width).IsLessThanOrEqualTo(strip.X + strip.Width) + .Because("the chip is painted over the strip's own last cells"); + } + + [Test] + public async Task AWideStripHasNoChip() + { + var (app, _) = Crowded(200, 40); + + await Assert.That(app.TabOverflowMenus.Count).IsEqualTo(0); + } + + [Test] + public async Task InATerminalTheChipOpensACellListAndADigitGoesToThatTab() + { + var (app, _) = Crowded(); + var (paneId, menu) = app.TabOverflowMenus.Single(); + var target = menu.Entries[0].Command![CommandIds.WindowPrefix.Length..]; + + await Assert.That(app.OpenTabOverflow(paneId)).IsTrue(); + await Assert.That(app.SendMenu.IsOpen).IsTrue(); + await Assert.That(string.Join("\n", app.SendMenu.Lines.Select(MarkupText.Plain))).Contains(menu.Entries[0].Label); + + app.SendMenu.SimulateKey(new ConsoleKeyInfo('1', ConsoleKey.D1, false, false, false)); + + await Assert.That(app.SendMenu.IsOpen).IsFalse(); + await Assert.That(app.ActiveWindowId()).IsEqualTo(target); + } + + [Test] + public async Task ACommandTheListDidNotOfferIsRefused() + { + var (app, _) = Crowded(); + var (paneId, _) = app.TabOverflowMenus.Single(); + app.OpenTabOverflow(paneId); + app.SendMenu.Close(); + + await Assert.That(app.RunTabOverflowEntry("term:quit")).IsFalse(); + } + + [Test] + public async Task TheCellListNamesEachHiddenTabWithADigit() + { + var menu = new SharpMUTerm.Client.Commands.MenuModel([ + new("Chat", null, "win:a"), + new("Ooc (3)", null, "win:b"), + ]); + + var lines = SharpMUTermApp.TabOverflowLines(menu).Select(MarkupText.Plain).ToList(); + + await Assert.That(lines[0]).Contains("1 Chat"); + await Assert.That(lines[1]).Contains("2 Ooc (3)"); + await Assert.That(SharpMUTermApp.TabOverflowChip(menu)).IsEqualTo("+2 ▾"); + } + + private static string FrameText(string ansi) => + System.Text.RegularExpressions.Regex.Replace(ansi, @"\x1b\[[0-9;?]*[A-Za-z]", string.Empty); +} From f3f55e61973bd19c43ecc3f681d83f28d35a6bb4 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 11:36:17 +0000 Subject: [PATCH 040/113] Settings resize, toasts, one name spelling, chip click, notice sources MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Settings window: edge resize bands (WindowChrome.WithResizeBands, as the borderless main window does) under its own frame; the centred size is kept for the run (SettingsPresenter.RememberedSize), docked-right is not. - Opening or closing the settings window re-syncs the desktop layer, so toasts hide and return at once rather than on the next frame. - One spelling of a name: prompt "Corvid · Aetherfall ›", window title "Corvid · Aetherfall — SharpMUTerm", tab owner prefix "Corvid · Chat" (CharacterNames.Window; StatusFormatter.NameSeparator). - Native palette placeholder starts with "Command palette" (CommandPalette.Title shared with the header search box). - A press on a tab strip's +N chip is struck from the driver's frame before the framework sees it, so the tab drawn under the chip is not selected or closed; pinned in both hosts. - Notices from packages, map and sound carry a Source label ("Sound:" on the row, a caption on a toast), not a word in the key chip. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 9 ++ CLAUDE.md | 24 ++- src/SharpMUTerm.Avalonia/MainWindow.cs | 5 + src/SharpMUTerm.Avalonia/NativeChrome.cs | 2 +- src/SharpMUTerm.Avalonia/NoticeToasts.cs | 28 +++- src/SharpMUTerm.Avalonia/PaletteOverlay.cs | 8 +- src/SharpMUTerm.Avalonia/SettingsPresenter.cs | 46 ++++++ src/SharpMUTerm.Avalonia/SettingsWindow.cs | 12 +- src/SharpMUTerm.Avalonia/WindowChrome.cs | 59 ++++++++ .../Chrome/CharacterNames.cs | 12 +- src/SharpMUTerm.Client/Chrome/NoticeModel.cs | 20 ++- src/SharpMUTerm.Client/Chrome/WindowTitle.cs | 6 +- src/SharpMUTerm.Core/Text/StatusFormatter.cs | 11 +- src/SharpMUTerm.Tui/CommandPalette.cs | 5 +- .../Pointer/SharpMUTermApp.Notices.cs | 8 +- .../SharpMUTermApp.Packages.cs | 8 +- src/SharpMUTerm.Tui/SharpMUTermApp.Sound.cs | 4 +- .../SharpMUTermApp.TabOverflow.cs | 103 +++++++++++++ src/SharpMUTerm.Tui/SharpMUTermApp.cs | 22 ++- src/SharpMUTerm.Tui/TabStripFit.cs | 2 +- src/SharpMUTerm.Tui/TabTitles.cs | 9 +- .../NativePaletteTests.cs | 10 ++ .../NoticeToastTests.cs | 18 +++ .../OutputAutomationTests.cs | 6 +- .../SettingsWindowFrameTests.cs | 141 ++++++++++++++++++ .../SurfaceParityTests.cs | 3 +- .../TabOverflowWindowTests.cs | 33 ++++ .../WindowTitleTests.cs | 26 +++- .../Text/StatusLineTests.cs | 2 +- .../NoticeAndMapSurfaceTests.cs | 37 +++++ .../SharpMUTerm.Tui.Tests/TabOverflowTests.cs | 30 ++++ .../SharpMUTerm.Tui.Tests/TabStripFitTests.cs | 16 +- tests/SharpMUTerm.Tui.Tests/TabTitlesTests.cs | 6 +- .../TelnetLinkClientTests.cs | 6 +- 34 files changed, 667 insertions(+), 70 deletions(-) create mode 100644 tests/SharpMUTerm.Avalonia.Tests/SettingsWindowFrameTests.cs create mode 100644 tests/SharpMUTerm.Avalonia.Tests/TabOverflowWindowTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 733c386b..6e6d19e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -273,6 +273,11 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Changed +- A character is named one way everywhere: the command line's prompt, the window title and tab titles now read + `Corvid · Aetherfall` and `Corvid · Chat` instead of `Corvid@Aetherfall` and `Corvid - Chat`. +- Messages from packages, the map and sound name where they came from as a label ("Sound: muted.") rather than in the + place a shortcut key is shown. The desktop palette's empty search box now starts with "Command palette". + - Desktop window: one look across settings, menus, the command palette and every prompt — the client's own teal instead of a stock blue, one set of text sizes and corner radii, and every colour readable on Dark, Light and Solarized Dark. The settings panel now has a title bar with a close button, dims the window behind it, and when @@ -320,6 +325,10 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Fixed +- Desktop window: the settings window can be resized again from any edge, and opens at the size you last left it + for the rest of the session. Notification cards disappear as soon as it opens rather than showing beside it. +- Clicking a tab strip's `+N ▾` no longer also selects (or closes) the tab drawn underneath it. + - The away, new-activity, search and restore bars fit the pane they are in: their rule runs to the pane's edge, never past it, and the words shorten before the rule does in a narrow pane. They redraw when the pane is resized. - Search (Ctrl+F) fits an 80-column terminal: its key hints shorten instead of pushing the window wider than the diff --git a/CLAUDE.md b/CLAUDE.md index e83bc392..effc90f5 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -1382,7 +1382,9 @@ draws ⌃P natively (`INativePalette`, null for the cell popup), whether it draw it in `SurfaceCatalog.All`, and add its model and action probes to `SurfaceParityTests`, whose coverage guards fail until you do. - **A notice is a model, drawn as the status row's text in both hosts and as a toast in the window** - (`NoticeModel`/`NoticeSeverity`/`NoticeAction`, Client `Chrome/`; `SharpMUTermApp.Notices.cs`; `NoticeToasts`, + (`NoticeModel`/`NoticeSeverity`/`NoticeAction`, Client `Chrome/`; a notice carries a chord `Key` *or* a `Source` + label from `NoticeModel.Sources` — Packages, Map, Sound — drawn `Sound:` on the row and as a caption on a toast, never + in the key chip; a lowercase word passed as `key:` is a test failure; `SharpMUTermApp.Notices.cs`; `NoticeToasts`, Avalonia; surface `notice`, `CellsUnderNative`; the `notices` view). `Notice(...)` builds one model per call (`Drawing`), draws the row from it with the same markup as before (`NoticeMarkup`; terminal frames are byte-identical) and publishes it through `IPointerPresenter.Notice`. Decisions not to relitigate: @@ -1424,7 +1426,11 @@ draws ⌃P natively (`INativePalette`, null for the cell popup), whether it draw painted, and the chip is painted after the frame over the strip's own last (clipped) cells, so no cell, pane or NAWS moves. A click opens a native menu in the window (`IPointerPresenter.ShowMenu(cell, MenuModel, dispatch)`) and a cell list (`_sendMenu`, digits) in a terminal; each entry is `win:` through `RunTabOverflowEntry`, which refuses what - the list did not offer. The keyboard's way to a hidden tab is ⌃P *Go to …* or ⌃N. + the list did not offer. The keyboard's way to a hidden tab is ⌃P *Go to …* or ⌃N. **A press on the chip is taken + away from the framework** (`TakesTabOverflowPress`, in `OnDriverMouseEvent` on the input thread): the chip can sit + over the tail of a tab the framework drew, name or `×`, and the framework (subscribed later, inside `Run()`) would + select or close it on the same click. The button flags are struck from the shared list, leaving a movement; the chip + rects are a snapshot array published per frame. Both hosts go through that handler (`AClickOnTheChipDoesNotAlso…`). - **The composer says how long the post is as sent, and ⌥P shows it** (`ComposerModel.Characters`/`SentLength`, the escaped and `%r`-joined command; a MOO edit counts its text). F1 and the docked panel carry the `N chars` cell in both hosts; ⌥P toggles an *as sent* band under F1 (`ComposeOverlay.Preview`, run-wide, shared with the native editor via @@ -1457,7 +1463,9 @@ the terminal still says *no numpad key ever arrives*. F4 and the quick bar print **A character is named one way on every surface: `Corvid · Aetherfall`** (Client `CharacterNames`; Tui `DisplayName(sessionKey)`, open sessions first, then the configuration, so a dotted world still splits). The quit prompt, ⌃P's *acting on*, ⌥M, F10, refusals and notices read it; the dotted session key is an address and is never -shown. Not changed: tab titles (`Corvid - Chat`) and the prompt's `Corvid@Aetherfall`. +shown. The prompt (`Corvid · Aetherfall ›`, `StatusFormatter.NameSeparator`, which `CharacterNames.Separator` reads), +the window title (`Corvid · Aetherfall — SharpMUTerm`) and a tab's owner prefix (`Corvid · Chat`, +`CharacterNames.Window`) use the same spelling; there is no `@` or ` - ` left (`WindowTitleTests`). ## Building and testing @@ -1525,7 +1533,7 @@ python3 tools/ansi_frame_to_image.py frame.ansi frame.html # or .svg `menu-fuzzy` (`trig sel` typed into ⌃P after a real drag, so the trigger builder's entry is offered — the frame showing a two-word fuzzy match highlighted), `menu-recent` (⌃P opened empty after two commands ran through the palette's own path, `RunFromPalette` — RECENT at the top, newest first, listed once), - `messages`, `notices` (two notices with a refusal between them, the first carrying an action — the window shows them as toasts over the same cells), `quit`, `connections` (**two connections on one world** — the one view where the header's + `messages`, `notices` (two notices with a refusal and a `Sound` source notice between them, the first carrying an action — the window shows them as toasts over the same cells), `quit`, `connections` (**two connections on one world** — the one view where the header's fraction, the rail's dots and the quit prompt's count are all visible together and all have to agree; every other view has at most one character connected per world, which is what hid a header dividing connections by *worlds* and a quit prompt reducing them to distinct world names), `characters` (**two @@ -1827,6 +1835,12 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] `SettingsPresenter` on the driver; `OpenSettingsScreen`/`TryOpenNativeSettings` in `SharpMUTermApp.Settings.cs`). The terminal, the snapshot, the tests and the parity harness pass null, so their cells do not change. Decisions not to relitigate: + - **The frame is the window's own** (`WindowDecorations.None`: title, ✕, Esc, drag the title to move), **so is the + resize border**: `WindowChrome.WithResizeBands` lays a 5 px band along each edge that begins `BeginResizeDrag`, the + main window's rule. The size the player leaves the centred window at is reused for the run + (`SettingsPresenter.RememberedSize`, never saved); docked beside the output (trigger builder) is not remembered. + Opening or closing it calls `OpenedOrClosed` → `DesktopLayer.Sync`, so toasts hide and return at once (another OS + window paints no frame here). Under Xvfb with no window manager `BeginResizeDrag` does nothing; untried under a WM. - **Every way in goes through `OpenSettingsScreen`**: the F-key, ⌃P's `screen:` entries and the cell search's ⏎ (`GoToSetting`). A section with fields goes native and any open cell screen is closed first. A section with none is a cell screen as before. In the window's list it carries `↗`, and choosing it calls @@ -2308,7 +2322,7 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] draw it in *and* the strip has keyboard focus (which it never has here: focus is pinned to the armed command line). Measured: five captures in a split pane drew two tabs and half of a third. - **The owner prefix goes first, and goes for the whole strip.** A pane full of one character's - captures repeats `Corvid - ` on every tab; it is the cheapest thing there is to lose and the most + captures repeats `Corvid · ` on every tab; it is the cheapest thing there is to lose and the most there is of it, and what it said is still said twice over — by the chip the tab is painted on, and by the `⌁` a window belonging to another character wears. Dropping it alone is often the whole fix. - **Then names share by water-filling, not in proportion.** A cap is lowered until the strip fits and diff --git a/src/SharpMUTerm.Avalonia/MainWindow.cs b/src/SharpMUTerm.Avalonia/MainWindow.cs index 37b02263..bed2c5bf 100644 --- a/src/SharpMUTerm.Avalonia/MainWindow.cs +++ b/src/SharpMUTerm.Avalonia/MainWindow.cs @@ -90,6 +90,11 @@ public MainWindow(WindowOptions options, IClassicDesktopStyleApplicationLifetime layer.ToastsHidden = () => _driver.Settings.Window is not null || _driver.Palette.Overlay is not null || _driver.Modals.Modal is not null || _driver.Modals.Quit is not null; + // The settings window is a window of its own, so opening or closing it paints no frame here: re-check at once, or + // a toast already up stays beside it (seen under Xvfb, where nothing stacks the windows) and one hidden under it + // stays hidden after it closes. + _driver.Settings.OpenedOrClosed = layer.Sync; + // Panels popped out into windows of their own, owned by this one so they stay above it and go with it. _driver.Floating.Attach(this, _view); Closed += (_, _) => _driver.Floating.Detach(); diff --git a/src/SharpMUTerm.Avalonia/NativeChrome.cs b/src/SharpMUTerm.Avalonia/NativeChrome.cs index 54666bbb..0c55c4ac 100644 --- a/src/SharpMUTerm.Avalonia/NativeChrome.cs +++ b/src/SharpMUTerm.Avalonia/NativeChrome.cs @@ -341,7 +341,7 @@ protected static void Chevron(DrawingContext context, Rect area, bool left, Colo internal sealed class NativeHeader(TerminalView view) : NativeChromeView(view) { /// What the search box says. ⌃P lists commands, characters and windows, and settings screens. - internal const string SearchText = "Command palette"; + internal const string SearchText = CommandPalette.Title; /// The prefix's leading word, beside its chord. internal const string PrefixWord = "awaiting a pane key"; diff --git a/src/SharpMUTerm.Avalonia/NoticeToasts.cs b/src/SharpMUTerm.Avalonia/NoticeToasts.cs index 8adbc0fb..f83f45b8 100644 --- a/src/SharpMUTerm.Avalonia/NoticeToasts.cs +++ b/src/SharpMUTerm.Avalonia/NoticeToasts.cs @@ -144,10 +144,18 @@ internal void Advance(TimeSpan by) /// The words each toast draws — its key chip, its text and its action — oldest first. Internal for tests. internal IReadOnlyList DrawnText() => - Layout().SelectMany(l => new[] { ChipText(l.Toast), BodyText(l.Toast), ActionText(l.Toast) }).OfType().ToList(); + Layout().SelectMany(l => new[] { SourceText(l.Toast), ChipText(l.Toast), BodyText(l.Toast), ActionText(l.Toast) }).OfType().ToList(); + + /// Whether each toast's label is a key chip (true) or a source caption (false), oldest first; null for none. Internal for tests. + internal IReadOnlyList LabelIsChip() => + Layout().Select(l => l.Toast.Overlay.Notice.Source is not null ? false : l.Toast.Overlay.Notice.Key is not null ? true : (bool?)null).ToList(); + + // A source (Packages, Map, Sound) is a caption over the text, never a chip: in a chip a word reads as a key to press. + private static string? SourceText(Toast toast) => toast.Overlay.Notice.Source; // What a toast says, in the window's words (NativeKeys): the key chip, the text, the action line. - private static string? ChipText(Toast toast) => toast.Overlay.Notice.Key is { } key ? NativeKeys.Words(key) : null; + private static string? ChipText(Toast toast) => + toast.Overlay.Notice.Source is null && toast.Overlay.Notice.Key is { } key ? NativeKeys.Words(key) : null; private static string BodyText(Toast toast) => NativeKeys.Words(toast.Overlay.Notice.Text); @@ -220,7 +228,7 @@ private void SyncFreeze() // ── Layout ─────────────────────────────────────────────────────────────────────────────── - private readonly record struct Placed(Toast Toast, Rect Rect, FormattedText Text, FormattedText? Chip, FormattedText? Action); + private readonly record struct Placed(Toast Toast, Rect Rect, FormattedText Text, FormattedText? Chip, FormattedText? Action, FormattedText? Source = null); private List Layout() { @@ -300,9 +308,10 @@ private List FrozenLayout(Dictionary frozen) var textWidth = inner - (chip is null ? 0 : chip.Width + 8); var text = Format(BodyText(toast), TextSize, ink, bold: false, Math.Max(40, textWidth), lines: 3); var action = ActionText(toast) is { } a ? Format(a, ChipSize, PanelText.Parse(palette.Edge(toast.Overlay.Notice.Severity)), bold: true, inner) : null; - var height = (2 * Padding) + text.Height + (action is null ? 0 : action.Height + 6); + var source = SourceText(toast) is { } said ? Format(said.ToUpperInvariant(), ChipSize - 1, PanelText.Parse(palette.Edge(toast.Overlay.Notice.Severity)), bold: true, inner) : null; + var height = (2 * Padding) + text.Height + (action is null ? 0 : action.Height + 6) + (source is null ? 0 : source.Height + 2); var top = bottom - height; - return top < Inset ? null : new Placed(toast, new Rect(x, top, width, height), text, chip, action); + return top < Inset ? null : new Placed(toast, new Rect(x, top, width, height), text, chip, action, source); } private static FormattedText Format(string text, double size, Color colour, bool bold, double maxWidth, int lines = 1) => @@ -381,7 +390,7 @@ public override void Render(DrawingContext context) { var now = _clock.Elapsed; var hovered = HoveredToast(); - foreach (var (toast, rect, text, chip, action) in Layout()) + foreach (var (toast, rect, text, chip, action, source) in Layout()) { var palette = toast.Overlay.Palette; var plane = PanelText.Parse(palette.Plane); @@ -404,6 +413,13 @@ public override void Render(DrawingContext context) var x = rect.X + EdgeWidth + Padding; var y = rect.Y + Padding; + if (source is not null) + { + // The part of the client that spoke, as a small caption above the text: a label, not a key. + context.DrawText(source, new Point(x, y)); + y += source.Height + 2; + } + if (chip is not null) { var chipRect = new Rect(x - 3, y + 1, chip.Width + 6, chip.Height); diff --git a/src/SharpMUTerm.Avalonia/PaletteOverlay.cs b/src/SharpMUTerm.Avalonia/PaletteOverlay.cs index dc074bc9..4b039bb0 100644 --- a/src/SharpMUTerm.Avalonia/PaletteOverlay.cs +++ b/src/SharpMUTerm.Avalonia/PaletteOverlay.cs @@ -49,6 +49,12 @@ internal sealed class PaletteOverlay : Panel /// What to list, and where a choice goes. /// Takes the overlay out of the window and gives the keyboard back to the cells. + /// + /// What the empty search box says: the surface's name first, as the cell popup's title and the header's search box + /// say it, then what can be typed. + /// + internal const string Placeholder = NativeHeader.SearchText + " — type a command, a character, a window or a setting"; + public PaletteOverlay(PaletteSession session, Action remove) { _session = session; @@ -62,7 +68,7 @@ public PaletteOverlay(PaletteSession session, Action remove) _search = new TextBox { - PlaceholderText = "Type a command, a character, a window or a setting", + PlaceholderText = Placeholder, FontSize = NativeTokens.Title, Margin = new Thickness(14, 14, 14, 6), Padding = new Thickness(12, 9), diff --git a/src/SharpMUTerm.Avalonia/SettingsPresenter.cs b/src/SharpMUTerm.Avalonia/SettingsPresenter.cs index 7304ed9f..2b85090d 100644 --- a/src/SharpMUTerm.Avalonia/SettingsPresenter.cs +++ b/src/SharpMUTerm.Avalonia/SettingsPresenter.cs @@ -23,6 +23,15 @@ internal sealed class SettingsPresenter : INativeSettings private SettingsWindow? _window; private Border? _scrim; + /// Whether the open window is docked beside the output (its size is then the main window's half, not the player's). + private bool _docked; + + /// The size the player last left the centred window at, kept for the run (never saved); null until they resize it. + internal Size? RememberedSize { get; private set; } + + /// Called on the window's thread once the settings window has opened or closed, so the main window can re-hide or show what sits under it. + public Action? OpenedOrClosed { get; set; } + /// The window the settings window belongs to, set once the main window exists. public Window? Owner { get; set; } @@ -48,13 +57,30 @@ internal SettingsWindow ShowNow(SettingsForm form) } var window = new SettingsWindow(form); + if (RememberedSize is { } remembered) + { + window.Width = remembered.Width; + window.Height = remembered.Height; + } + Place(window, form); + + // The size the player resizes the centred window to is the size it opens at next time, for the run. + window.Resized += (_, e) => + { + if (ReferenceEquals(_window, window) && !_docked && window.WindowState == WindowState.Normal + && e.ClientSize.Width > 0 && e.ClientSize.Height > 0) + { + RememberedSize = e.ClientSize; + } + }; window.Closed += (_, _) => { if (ReferenceEquals(_window, window)) { _window = null; Unveil(); + OpenedOrClosed?.Invoke(); } // The keyboard goes back to the client, as it does when a cell screen closes. @@ -71,6 +97,7 @@ internal SettingsWindow ShowNow(SettingsForm form) window.Show(); } + OpenedOrClosed?.Invoke(); return window; } @@ -90,6 +117,7 @@ private void Place(SettingsWindow window, SettingsForm form) if (form.BesideOutput) { + _docked = true; Unveil(); var scale = owner.RenderScaling; var size = owner.ClientSize; @@ -102,6 +130,24 @@ private void Place(SettingsWindow window, SettingsForm form) return; } + // Back from docked beside the output (or first opened): the player's size, centred over the main window. + if (_docked || window.WindowStartupLocation == WindowStartupLocation.CenterOwner) + { + var wasDocked = _docked; + _docked = false; + var size = RememberedSize ?? new Size(SettingsWindow.DefaultWidth, SettingsWindow.DefaultHeight); + window.Width = Math.Max(window.MinWidth, size.Width); + window.Height = Math.Max(window.MinHeight, size.Height); + if (wasDocked) + { + var scale = owner.RenderScaling; + var client = owner.ClientSize; + window.Position = new PixelPoint( + owner.Position.X + (int)Math.Round(Math.Max(0, client.Width - window.Width) / 2 * scale), + owner.Position.Y + (int)Math.Round(Math.Max(0, client.Height - window.Height) / 2 * scale)); + } + } + if (_scrim is null && owner.Content is Panel root) { var tokens = window.Tokens; diff --git a/src/SharpMUTerm.Avalonia/SettingsWindow.cs b/src/SharpMUTerm.Avalonia/SettingsWindow.cs index c1978367..26ab7eb1 100644 --- a/src/SharpMUTerm.Avalonia/SettingsWindow.cs +++ b/src/SharpMUTerm.Avalonia/SettingsWindow.cs @@ -51,13 +51,16 @@ internal sealed class SettingsWindow : Window private bool _choosing; private int _meterRows = -1; + /// The size the window first opens at, before the player resizes it. + internal const double DefaultWidth = 960, DefaultHeight = 680; + public SettingsWindow(SettingsForm form) { _form = form; _tokens = TokensFor(form); Title = "Settings"; - Width = 960; - Height = 680; + Width = DefaultWidth; + Height = DefaultHeight; MinWidth = 640; MinHeight = 420; WindowStartupLocation = WindowStartupLocation.CenterOwner; @@ -139,7 +142,10 @@ public SettingsWindow(SettingsForm form) dock.Children.Add(_sections); dock.Children.Add(_scroller); _frame = new Border { BorderThickness = new Thickness(1), Child = dock }; - Content = _frame; + + // The frame is ours, so the resize border is too: a band along each edge, as the borderless main window has. + CanResize = true; + Content = WindowChrome.WithResizeBands(this, _frame); _clock = new DispatcherTimer(TimeSpan.FromSeconds(1), DispatcherPriority.Background, (_, _) => Tick()); Opened += (_, _) => diff --git a/src/SharpMUTerm.Avalonia/WindowChrome.cs b/src/SharpMUTerm.Avalonia/WindowChrome.cs index 44f6f797..1db369b6 100644 --- a/src/SharpMUTerm.Avalonia/WindowChrome.cs +++ b/src/SharpMUTerm.Avalonia/WindowChrome.cs @@ -1,6 +1,8 @@ using Avalonia; using Avalonia.Controls; using Avalonia.Input; +using Avalonia.Layout; +using Avalonia.Media; namespace SharpMUTerm.Avalonia; @@ -56,4 +58,61 @@ public static bool IsMoveHandle(ScreenFrame frame, System.Drawing.Point cell) => WindowEdge.SouthWest => StandardCursorType.BottomLeftCorner, _ => StandardCursorType.BottomRightCorner, }; + + /// + /// with a resize band along each edge of , for a window that draws + /// its own frame () and so gets no border to resize by from the platform. Each band + /// is wide, transparent, lies over the content's edge, shows the edge's cursor and begins the + /// platform's resize on a left press — what does for the main window. The corners are the + /// two bands' overlap, read off the press position, so a corner resizes both ways. Nothing happens while the window + /// is maximised, or cannot be resized. + /// + public static Panel WithResizeBands(Window window, Control content) + { + ArgumentNullException.ThrowIfNull(window); + ArgumentNullException.ThrowIfNull(content); + var panel = new Panel(); + panel.Children.Add(content); + foreach (var (horizontal, vertical, width, height) in new (HorizontalAlignment, VerticalAlignment, double, double)[] + { + (HorizontalAlignment.Stretch, VerticalAlignment.Top, double.NaN, EdgeBand), + (HorizontalAlignment.Stretch, VerticalAlignment.Bottom, double.NaN, EdgeBand), + (HorizontalAlignment.Left, VerticalAlignment.Stretch, EdgeBand, double.NaN), + (HorizontalAlignment.Right, VerticalAlignment.Stretch, EdgeBand, double.NaN), + }) + { + var band = new Border + { + Background = Brushes.Transparent, + HorizontalAlignment = horizontal, + VerticalAlignment = vertical, + Width = width, + Height = height, + Focusable = false, + Tag = ResizeBandTag, + }; + band.PointerMoved += (_, e) => + { + var edge = BandEdge(window, e); + band.Cursor = edge is { } at ? new Cursor(CursorFor(at)) : Cursor.Default; + }; + band.PointerPressed += (_, e) => + { + if (e.GetCurrentPoint(window).Properties.IsLeftButtonPressed && BandEdge(window, e) is { } edge) + { + e.Handled = true; + window.BeginResizeDrag(edge, e); + } + }; + panel.Children.Add(band); + } + + return panel; + } + + /// The each band of carries, so a test can find them. + internal const string ResizeBandTag = "resize-band"; + + private static WindowEdge? BandEdge(Window window, PointerEventArgs e) => + window is { WindowState: WindowState.Normal, CanResize: true } ? EdgeAt(e.GetPosition(window), window.ClientSize) : null; } diff --git a/src/SharpMUTerm.Client/Chrome/CharacterNames.cs b/src/SharpMUTerm.Client/Chrome/CharacterNames.cs index 6bd54741..25b48dfd 100644 --- a/src/SharpMUTerm.Client/Chrome/CharacterNames.cs +++ b/src/SharpMUTerm.Client/Chrome/CharacterNames.cs @@ -11,7 +11,17 @@ namespace SharpMUTerm.Client.Chrome; public static class CharacterNames { /// What goes between the character and the world. - public const string Separator = " · "; + public const string Separator = Core.Text.StatusFormatter.NameSeparator; + + /// + /// A window's name with the character it belongs to ahead of it — Corvid · Chat, the tab title of a window + /// that is not the character's own — in the same spelling as the character's name. The window alone without an owner. + /// + public static string Window(string? owner, string title) + { + ArgumentNullException.ThrowIfNull(title); + return string.IsNullOrEmpty(owner) ? title : owner + Separator + title; + } /// Corvid · Aetherfall; the world alone when there is no character. public static string Display(string world, string? character) diff --git a/src/SharpMUTerm.Client/Chrome/NoticeModel.cs b/src/SharpMUTerm.Client/Chrome/NoticeModel.cs index e557033a..f5355827 100644 --- a/src/SharpMUTerm.Client/Chrome/NoticeModel.cs +++ b/src/SharpMUTerm.Client/Chrome/NoticeModel.cs @@ -30,8 +30,26 @@ public sealed record NoticeAction(string Command, string Label); /// A command the notice offers, or null. Only the window can offer it as a click. /// When it was said, on the client's clock. /// Counts the run's notices, so two that say the same thing are still two. -public sealed record NoticeModel(string Text, NoticeSeverity Severity, string? Key, NoticeAction? Action, DateTimeOffset At, long Sequence) +/// +/// What part of the client spoke when it is not a key (Packages, Map, Sound): a label, drawn as one — +/// Sound: on the status row, a plain caption on a toast — never in the key chip, where a word read as a chord to +/// press. A notice carries a or a source, not both. +/// +public sealed record NoticeModel(string Text, NoticeSeverity Severity, string? Key, NoticeAction? Action, DateTimeOffset At, long Sequence, string? Source = null) { + /// The source labels in use, so every notice of one part of the client names it the same way. + public static class Sources + { + /// Package installs, the index, removals. + public const string Packages = "Packages"; + + /// The map and a speedwalk. + public const string Map = "Map"; + + /// Game sound and mute. + public const string Sound = "Sound"; + } + /// How long a notice holds the status row, and how long a toast stays before it fades. public static readonly TimeSpan Duration = TimeSpan.FromSeconds(6); } diff --git a/src/SharpMUTerm.Client/Chrome/WindowTitle.cs b/src/SharpMUTerm.Client/Chrome/WindowTitle.cs index 9826bab9..52bab03e 100644 --- a/src/SharpMUTerm.Client/Chrome/WindowTitle.cs +++ b/src/SharpMUTerm.Client/Chrome/WindowTitle.cs @@ -4,7 +4,7 @@ namespace SharpMUTerm.Client.Chrome; /// /// The title the window — the desktop window's title bar and taskbar entry, or the terminal's tab — wears for what is -/// in front: Character@World — SharpMUTerm. One function, read off the same the +/// in front: Character · World — SharpMUTerm, the character named by 's rule. One function, read off the same the /// header band is drawn from, so the title and the header cannot name different characters. /// /// The names are the player's configuration, but a world a telnet:// link added is named after the link's host, @@ -24,7 +24,7 @@ public static class WindowTitle public static string For(HeaderModel header) => For(header.Character?.Name, header.World?.Name); /// - /// Character@World — SharpMUTerm; World — SharpMUTerm for a world with no character in front; and + /// Character · World — SharpMUTerm; World — SharpMUTerm for a world with no character in front; and /// SharpMUTerm alone when nothing is. /// public static string For(string? character, string? world) @@ -33,7 +33,7 @@ public static string For(string? character, string? world) var where = Clean(world); return (who, where) switch { - ({ Length: > 0 }, { Length: > 0 }) => $"{who}@{where} — {Product}", + ({ Length: > 0 }, { Length: > 0 }) => $"{CharacterNames.Display(where, who)} — {Product}", ({ Length: > 0 }, _) => $"{who} — {Product}", (_, { Length: > 0 }) => $"{where} — {Product}", _ => Product, diff --git a/src/SharpMUTerm.Core/Text/StatusFormatter.cs b/src/SharpMUTerm.Core/Text/StatusFormatter.cs index ebeb45b4..de0b81f8 100644 --- a/src/SharpMUTerm.Core/Text/StatusFormatter.cs +++ b/src/SharpMUTerm.Core/Text/StatusFormatter.cs @@ -7,7 +7,14 @@ namespace SharpMUTerm.Core.Text; /// public static class StatusFormatter { - /// The prompt label, e.g. Corvid@aetherfall ›. Falls back gracefully when disconnected. + /// + /// What goes between the character and the world: the client's one spelling of a character's name, + /// Corvid · Aetherfall (SharpMUTerm.Client.Chrome.CharacterNames, which Core cannot reference — a + /// Client test holds the two together). + /// + public const string NameSeparator = " · "; + + /// The prompt label, e.g. Corvid · Aetherfall ›. Falls back gracefully when disconnected. public static string CharacterPrompt(string? character, string? world) { if (string.IsNullOrEmpty(character)) @@ -15,6 +22,6 @@ public static string CharacterPrompt(string? character, string? world) return "› "; } - return string.IsNullOrEmpty(world) ? $"{character} › " : $"{character}@{world} › "; + return string.IsNullOrEmpty(world) ? $"{character} › " : $"{character}{NameSeparator}{world} › "; } } diff --git a/src/SharpMUTerm.Tui/CommandPalette.cs b/src/SharpMUTerm.Tui/CommandPalette.cs index ed812bb5..1bb1478e 100644 --- a/src/SharpMUTerm.Tui/CommandPalette.cs +++ b/src/SharpMUTerm.Tui/CommandPalette.cs @@ -15,6 +15,9 @@ namespace SharpMUTerm.Tui; /// internal sealed class CommandPalette { + /// The surface's name: the popup's title here, and what the window's header search box and native palette say. + internal const string Title = "Command palette"; + private readonly ConsoleWindowSystem _system; private readonly Func> _catalog; private readonly Func _context; @@ -127,7 +130,7 @@ private void Open() // centring first placed the surface as if it were that size — which only became visible once // the catalog grew tall enough for the misplacement to push its bottom border off-screen. _window = new WindowBuilder(_system) - .WithTitle("Command palette") + .WithTitle(Title) .AsModal() .WithBorderStyle(BorderStyle.Single) .WithBackgroundColor(Scheme.Colour(ScreenPalette.MenuBg)) diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Notices.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Notices.cs index 16d17960..032988b4 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Notices.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Notices.cs @@ -50,7 +50,9 @@ internal string NoticeMarkup(NoticeModel notice) var body = notice.Severity == NoticeSeverity.Warning ? $"[{ScreenPalette.Warn}]{Escape(notice.Text)}[/]" : $"[dim]{Escape(notice.Text)}[/]"; - return notice.Key is null ? body : $"[{_ink.Notice}]{Escape(notice.Key)}[/] {body}"; + // A source is a label (Sound:), a key a chord chip (⌃P): two shapes, so a word is never read as a key to press. + return notice.Source is { } source ? $"[{_ink.Notice}]{Escape(source)}:[/] {body}" + : notice.Key is null ? body : $"[{_ink.Notice}]{Escape(notice.Key)}[/] {body}"; } /// Hands a notice to a host that draws notices natively; nothing for one that does not. @@ -141,8 +143,8 @@ private static bool TryParseRgb(string hex, out Rgb rgb) internal NoticeModel? LastNoticeModel => DrawnModel(SurfaceCatalog.Notice) as NoticeModel; /// Says a notice through the real , as a test needs one with an action. - internal void SimulateNotice(string text, MessageSeverity severity, string? key, NoticeAction? action) => - Notice(text, severity, key, action); + internal void SimulateNotice(string text, MessageSeverity severity, string? key, NoticeAction? action, string? source = null) => + Notice(text, severity, key, action, source); } /// diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Packages.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Packages.cs index 0f67fd3a..dda4127f 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Packages.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Packages.cs @@ -263,7 +263,7 @@ internal bool AcceptPackage(PackageReviewModel review) SyncPackages(); SaveConfiguration(); var said = $"Installed {manifest.Name} {manifest.Version} · F10 lists your packages"; - Notice(said, MessageSeverity.Info, key: "package"); + Notice(said, MessageSeverity.Info, source: SharpMUTerm.Client.Chrome.NoticeModel.Sources.Packages); _packageManager?.PublishStatus(said); return true; } @@ -283,7 +283,7 @@ internal void CancelPackage(PackageReviewModel review) /// private void Fetch(Uri uri, string what, Action then) { - Notice($"Fetching {Snippet(uri.Host)}…", MessageSeverity.Info, key: "package"); + Notice($"Fetching {Snippet(uri.Host)}…", MessageSeverity.Info, source: SharpMUTerm.Client.Chrome.NoticeModel.Sources.Packages); var fetch = PackageFetch ?? DownloadPackageAsync; _ = Task.Run(async () => { @@ -534,7 +534,7 @@ internal void RemovePackage(string id) SyncPackages(); SaveConfiguration(); var said = $"Removed {package.Manifest.Name}."; - Notice(said, MessageSeverity.Info, key: "package"); + Notice(said, MessageSeverity.Info, source: SharpMUTerm.Client.Chrome.NoticeModel.Sources.Packages); _packageManager?.PublishStatus(said); } @@ -557,7 +557,7 @@ internal void CopyPackageSets(string id) SaveConfiguration(); var said = $"Copied {package.Sets.Count} set(s) to yours; assign them on F5, and switch the package off (Space) to use only your copy."; - Notice(said, MessageSeverity.Info, key: "package"); + Notice(said, MessageSeverity.Info, source: SharpMUTerm.Client.Chrome.NoticeModel.Sources.Packages); _packageManager?.PublishStatus(said); _packageManager?.NotifyChanged(); } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Sound.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Sound.cs index 870ae6b4..00ce192f 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Sound.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Sound.cs @@ -103,7 +103,7 @@ private void OnMedia(WorldSession session, MediaCommand command) _audio = Host.Audio?.Invoke(); if (CanPlaySound && _audio is null) { - Notice("No sound device could be opened; game sound is captions only.", MessageSeverity.Info, key: "sound"); + Notice("no device could be opened; game sound is captions only.", MessageSeverity.Info, source: SharpMUTerm.Client.Chrome.NoticeModel.Sources.Sound); } } @@ -137,7 +137,7 @@ private void SetMuted(bool muted) { _muted = muted; ApplySoundMix(); - Notice(muted ? "Sound muted." : "Sound on.", MessageSeverity.Info, key: "sound"); + Notice(muted ? "muted." : "on.", MessageSeverity.Info, source: SharpMUTerm.Client.Chrome.NoticeModel.Sources.Sound); RefreshStatusBar(); } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.TabOverflow.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.TabOverflow.cs index 553ab6e4..15234794 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.TabOverflow.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.TabOverflow.cs @@ -1,4 +1,6 @@ using SharpConsoleUI.Controls; +using SharpConsoleUI.Drivers; +using SharpConsoleUI.Events; using SharpMUTerm.Client.Commands; using SharpMUTerm.Client.Surfaces; using SharpMUTerm.Core.Commands; @@ -44,6 +46,107 @@ internal sealed partial class SharpMUTermApp /// its chip over the strip's last cells. On every frame, after the paint, beside the header dividers. /// private void PaintTabOverflow(SharpConsoleUI.Layout.CharacterBuffer buffer) + { + try + { + PaintTabOverflowChips(buffer); + } + finally + { + // Published whole, for the driver's input thread (TakesTabOverflowPress), which must not read the dictionary + // this frame is rebuilding. + _tabOverflowChips = [.. _tabOverflow.Values.Select(o => o.Chip)]; + } + } + + /// Where every chip is, in desktop cells, as the last frame painted them; replaced whole, read on the input thread. + private volatile PaneRect[] _tabOverflowChips = []; + + /// + /// Takes a left-button frame on a chip away from the framework, on the driver's input thread before the framework's + /// own handler sees the same list (it subscribes inside Run(), after this client). The chip is painted over the + /// strip's last cells, which can be the tail of a tab the framework did draw — its name or its × — so + /// left alone the click that opens the list also selected (or closed) that tab under it. The button flags are struck + /// out of the frame, which leaves the framework a pointer movement; this client's own pointer path has its own copy and + /// still opens the list. Both hosts deliver mouse frames through this one handler, so both are covered. Internal for tests. + /// + internal bool TakesTabOverflowPress(List flags, System.Drawing.Point point) + { + var chips = _tabOverflowChips; + if (chips.Length == 0 || !chips.Any(c => Contains(c, point))) + { + return false; + } + + var removed = flags.RemoveAll(f => f is MouseFlags.Button1Pressed or MouseFlags.Button1Released + or MouseFlags.Button1Clicked or MouseFlags.Button1DoubleClicked or MouseFlags.Button1TripleClicked + or MouseFlags.Button1Dragged); + if (removed > 0 && flags.Count == 0) + { + flags.Add(MouseFlags.ReportMousePosition); + } + + return removed > 0; + } + + /// + /// The frame a press on a pane's chip leaves for the framework, delivered to that pane's tab strip at every cell of the + /// chip, as the framework would deliver it: true when any of them moved the strip's selection or asked to close a tab. + /// Internal for tests, for 's reason (the framework's mouse path runs only inside + /// Run()). + /// + internal bool AChipClickReachesTheTabUnderIt(string paneId, bool filtered) + { + TabControl? tabs; + lock (_paneTabsLock) + { + tabs = _paneTabs.GetValueOrDefault(paneId); + } + + if (tabs is null || TabOverflowChipAt(paneId) is not { } chip) + { + return false; + } + + var before = tabs.ActiveTabIndex; + var closed = false; + void OnClose(object? sender, TabEventArgs e) => closed = true; + tabs.TabCloseRequested += OnClose; + try + { + for (var x = chip.X; x < chip.X + chip.Width; x++) + { + var point = new System.Drawing.Point(x, chip.Y); + foreach (var frame in new[] { new List { MouseFlags.Button1Pressed }, [MouseFlags.Button1Released, MouseFlags.Button1Clicked] }) + { + if (filtered) + { + TakesTabOverflowPress(frame, point); + } + + var local = new System.Drawing.Point(tabs.ActualWidth - (chip.X + chip.Width - x), 0); + tabs.ProcessMouseEvent(new MouseEventArgs(frame, local, point, point, _window)); + } + + if (tabs.ActiveTabIndex != before || closed) + { + return true; + } + } + + return false; + } + finally + { + tabs.TabCloseRequested -= OnClose; + if (tabs.ActiveTabIndex != before) + { + tabs.ActiveTabIndex = before; + } + } + } + + private void PaintTabOverflowChips(SharpConsoleUI.Layout.CharacterBuffer buffer) { _tabOverflow.Clear(); foreach (var (paneId, tabs, _) in RealisedPanes()) diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 6c896f39..9098b75e 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -1902,6 +1902,7 @@ public string RenderSnapshot(string? view = null) "⌥M", new NoticeAction(Client.Commands.LayoutCommands.Manage, "Change layout")); RefusePrefix(PrefixPanel.NoSplitRefusal); + Notice("muted.", MessageSeverity.Info, source: SharpMUTerm.Client.Chrome.NoticeModel.Sources.Sound); Notice("could not connect to aetherfall.mux:4201 — no route to host", MessageSeverity.Error, "⌃P"); } @@ -6746,7 +6747,7 @@ private void RefreshStatusRow() } /// - /// Refreshes the input region: each bar's character-bound prompt (Corvid@Aetherfall ›) and + /// Refreshes the input region: each bar's character-bound prompt (Corvid · Aetherfall ›) and /// the status bar (which carries the live character count now that the gutter is gone). The armed /// bar's prompt is the bright one and ends in ›; the other is dimmed and ends in ·, /// so which line ⏎ will send is readable without hunting for the caret. @@ -9114,7 +9115,7 @@ private void WalkFromMap(string windowId, long room) if (map.WalkTo(room) is { } problem) { - Notice($"Cannot walk there: {problem}.", key: "map"); + Notice($"cannot walk there: {problem}.", source: NoticeModel.Sources.Map); } } @@ -9192,7 +9193,7 @@ private void OnWalkChanged(WorldSession session, string? reason) RenderMap(MapWindowId(session.SessionKey)); if (reason is not null) { - Notice($"Walk {reason}.", MessageSeverity.Info, key: "map"); + Notice($"walk {reason}.", MessageSeverity.Info, source: NoticeModel.Sources.Map); } } @@ -12445,6 +12446,13 @@ private void OnDriverMouseEvent(object sender, List flags, System.Dr var frame = flags.ToList(); OnUiThread(() => OnPointerFrame(frame, point)); + // A press on a tab strip's +N ▾ chip opens its list and nothing else: the framework, which reads this same list + // after us, is left a pointer movement rather than a click on the tab under the chip. + if (TakesTabOverflowPress(flags, point)) + { + return; + } + // Overlays own the whole screen while they're up; a drag underneath them would target panes // the user can't even see. if (AnyOverlayOpen || _moveMode) @@ -13560,11 +13568,11 @@ private void SetStatus(string markup, bool displace = false) /// A command the notice offers. The status row never draws it (a terminal cell is not a button, and the text /// already names the key); a host that draws notices natively offers it as a click (). /// - private void Notice(string text, MessageSeverity severity = MessageSeverity.Warning, string? key = null, NoticeAction? action = null) + private void Notice(string text, MessageSeverity severity = MessageSeverity.Warning, string? key = null, NoticeAction? action = null, string? source = null) { // The same notice raised again while it is still up is one notice: it keeps the row for another few seconds and // is not said, toasted or announced a second time. Two identical toasts stacked in the window were the report. - if (_notice is not null && _noticeShown is { } shown && shown.Text == text && shown.Key == key + if (_notice is not null && _noticeShown is { } shown && shown.Text == text && shown.Key == key && shown.Source == source && shown.Severity == NoticeSeverityOf(severity) && shown.Action == action) { _noticeTimer?.Change(NoticeDuration, Timeout.InfiniteTimeSpan); @@ -13582,13 +13590,13 @@ private void Notice(string text, MessageSeverity severity = MessageSeverity.Warn _ => LogLevel.Information, }, "{Notice:l}", // :l renders the string literally; the default quotes it, and a quoted sentence reads as data - key is null ? text : $"{key} {text}"); + source is not null ? $"{source}: {text}" : key is null ? text : $"{key} {text}"); AnnounceNotice(text); var model = Drawing( SurfaceCatalog.Notice, string.Empty, - new NoticeModel(text, NoticeSeverityOf(severity), key, action, _time.GetUtcNow(), ++_noticeSequence)); + new NoticeModel(text, NoticeSeverityOf(severity), source is null ? key : null, action, _time.GetUtcNow(), ++_noticeSequence, source)); var markup = NoticeMarkup(model); _notice = markup; diff --git a/src/SharpMUTerm.Tui/TabStripFit.cs b/src/SharpMUTerm.Tui/TabStripFit.cs index 778c9a1c..aa0c1cd6 100644 --- a/src/SharpMUTerm.Tui/TabStripFit.cs +++ b/src/SharpMUTerm.Tui/TabStripFit.cs @@ -33,7 +33,7 @@ namespace SharpMUTerm.Tui; /// /// /// The owner prefix goes first, and goes for everybody. A pane full of one character's captures -/// repeats Corvid - on every tab, which is the cheapest thing in the strip to lose and the most +/// repeats Corvid · on every tab, which is the cheapest thing in the strip to lose and the most /// there is of it — dropping it is what turns eight tabs that do not fit into eight tabs that nearly do. /// It is dropped across the whole strip rather than per tab, so the tabs stay comparable, and what it /// said is still said twice over: by the chip the tab is painted on, and by the ⌁ a window diff --git a/src/SharpMUTerm.Tui/TabTitles.cs b/src/SharpMUTerm.Tui/TabTitles.cs index e7840200..fa6de88f 100644 --- a/src/SharpMUTerm.Tui/TabTitles.cs +++ b/src/SharpMUTerm.Tui/TabTitles.cs @@ -115,11 +115,10 @@ public static string Name(WorkspaceWindow window) { ArgumentNullException.ThrowIfNull(window); - var owner = window.Kind != WindowKind.Main && !string.IsNullOrEmpty(window.OwnerLabel) - ? window.OwnerLabel + " - " - : string.Empty; - - return owner + window.Title; + // The owner ahead of the title in the client's one spelling of a name (Corvid · Chat), not a dash of its own. + return window.Kind != WindowKind.Main + ? SharpMUTerm.Client.Chrome.CharacterNames.Window(window.OwnerLabel, window.Title) + : window.Title; } /// diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativePaletteTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativePaletteTests.cs index 00b3fc17..b11bedc2 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/NativePaletteTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/NativePaletteTests.cs @@ -92,6 +92,16 @@ public async Task CtrlPOpensTheNativePaletteWithTheSearchFocusedAndNoCellPopup() await Assert.That(onTop).IsTrue().Because("nothing native draws over it: it is the root panel's last child"); } + /// The empty search box names the surface as the cell popup's title and the header's search box do. + [Test] + public async Task TheSearchBoxSaysCommandPaletteAsTheCellTitleDoes() + { + var placeholder = await Run(rig => Open(rig).SearchBox.PlaceholderText); + + await Assert.That(placeholder).StartsWith(CommandPalette.Title); + await Assert.That(NativeHeader.SearchText).IsEqualTo(CommandPalette.Title); + } + [Test] public async Task ThePaletteCentresOverTheWholeWindowAndClearsTheNativeHeader() { diff --git a/tests/SharpMUTerm.Avalonia.Tests/NoticeToastTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NoticeToastTests.cs index 08046f7d..c1ccea22 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/NoticeToastTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/NoticeToastTests.cs @@ -24,6 +24,24 @@ public class NoticeToastTests private static NoticeOverlay Overlay(long sequence, string text, NoticeAction? action, Action run, int aboveRow = 8) => new(new NoticeModel(text, NoticeSeverity.Info, "⌥M", action, DateTimeOffset.UnixEpoch, sequence), aboveRow, Palette, run); + /// A notice's source is a caption on the toast, not a key chip: a word in a chip reads as a key to press. + [Test] + public async Task ASourceIsACaptionAndAKeyIsAChip() + { + var (labels, words) = await Run((window, view, layer, driver) => + { + var notices = (IPointerPresenter)driver.Pointer; + notices.Notice(new NoticeOverlay(new NoticeModel("muted.", NoticeSeverity.Info, null, null, DateTimeOffset.UnixEpoch, 1, NoticeModel.Sources.Sound), 8, Palette, _ => { })); + notices.Notice(Overlay(2, "nothing to split", null, _ => { })); + Drain(); + return (layer.Toasts.LabelIsChip(), layer.Toasts.DrawnText()); + }, columns: 80, rows: 20); + + await Assert.That(labels).IsEquivalentTo(new bool?[] { false, true }); + await Assert.That(words).Contains("Sound"); + await Assert.That(words).Contains("Alt+M"); + } + [Test] public async Task AToastStacksAboveTheCommandLineAndAClickRunsItsActionWithoutTakingFocus() { diff --git a/tests/SharpMUTerm.Avalonia.Tests/OutputAutomationTests.cs b/tests/SharpMUTerm.Avalonia.Tests/OutputAutomationTests.cs index 41084050..f4eebb2c 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/OutputAutomationTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/OutputAutomationTests.cs @@ -73,9 +73,9 @@ public async Task TheWindowTitleBarCarriesWhatTheClientSaid() var heard = new List(); bar.Changed += heard.Add; - bar.Show("Ann@Mush — SharpMUTerm"); + bar.Show("Ann · Mush — SharpMUTerm"); - await Assert.That(bar.Current).IsEqualTo("Ann@Mush — SharpMUTerm"); - await Assert.That(heard).IsEquivalentTo(new[] { "Ann@Mush — SharpMUTerm" }); + await Assert.That(bar.Current).IsEqualTo("Ann · Mush — SharpMUTerm"); + await Assert.That(heard).IsEquivalentTo(new[] { "Ann · Mush — SharpMUTerm" }); } } diff --git a/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowFrameTests.cs b/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowFrameTests.cs new file mode 100644 index 00000000..54a6e741 --- /dev/null +++ b/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowFrameTests.cs @@ -0,0 +1,141 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Headless; +using Avalonia.Input; +using Avalonia.Threading; +using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Client.Settings; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Tui; +using static SharpMUTerm.Avalonia.Tests.DesktopLayerTests; + +namespace SharpMUTerm.Avalonia.Tests; + +/// +/// The settings window draws its own frame (title, ✕, Esc, drag to move), so it gets no resize border from the platform: +/// it carries its own bands along each edge, as the borderless main window does, and the size the player leaves it at is +/// the size it opens at for the rest of the run. And it is a window of its own, so opening or closing it re-checks the +/// main window's toasts at once. +/// +[NotInParallel] +public class SettingsWindowFrameTests +{ + private static SettingsForm Form(AppConfiguration config, string section = "text", bool beside = false) => + new(BuiltInSettings.All, config, c => c(), _ => { }, section, isDark: true) { BesideOutput = beside }; + + [Test] + public async Task TheFramelessSettingsWindowHasAResizeBandAlongEveryEdge() + { + var (resizable, bands, cursors) = await TerminalViewTests.Session.Dispatch(() => + { + var presenter = new SettingsPresenter(); + var main = new Window { Content = new Panel(), Width = 1400, Height = 900 }; + presenter.Owner = main; + main.Show(); + try + { + var window = presenter.ShowNow(Form(new AppConfiguration())); + Dispatcher.UIThread.RunJobs(); + window.UpdateLayout(); + var size = window.ClientSize; + var bands = window.GetVisualDescendantsOf().Count(b => Equals(b.Tag, WindowChrome.ResizeBandTag)); + + // What lies under each edge is a band, so a press there resizes rather than reaching the page. + var cursors = new[] + { + new Point(size.Width / 2, 1), new Point(size.Width / 2, size.Height - 1), + new Point(1, size.Height / 2), new Point(size.Width - 1, size.Height / 2), + }.Select(p => window.InputHitTest(p) is Border { Tag: WindowChrome.ResizeBandTag }).ToArray(); + window.Close(); + return (window.CanResize, bands, cursors); + } + finally + { + main.Close(); + } + }, CancellationToken.None); + + await Assert.That(resizable).IsTrue(); + await Assert.That(bands).IsEqualTo(4); + await Assert.That(cursors.All(c => c)).IsTrue().Because("every edge is a resize band"); + await Assert.That(WindowChrome.EdgeAt(new Point(1, 1), new Size(800, 600))).IsEqualTo(WindowEdge.NorthWest); + } + + [Test] + public async Task TheSizeThePlayerLeavesItAtIsTheSizeItReopensAtButDockingBesideTheOutputIsNotRemembered() + { + var (reopened, afterDock, remembered) = await TerminalViewTests.Session.Dispatch(() => + { + var presenter = new SettingsPresenter(); + var main = new Window { Content = new Panel(), Width = 1400, Height = 900 }; + presenter.Owner = main; + main.Show(); + var config = new AppConfiguration(); + try + { + var window = presenter.ShowNow(Form(config)); + Dispatcher.UIThread.RunJobs(); + window.Width = 1100; + window.Height = 720; + Dispatcher.UIThread.RunJobs(); + window.UpdateLayout(); + window.Close(); + Dispatcher.UIThread.RunJobs(); + + var again = presenter.ShowNow(Form(config)); + Dispatcher.UIThread.RunJobs(); + var reopened = new Size(again.Width, again.Height); + again.Close(); + Dispatcher.UIThread.RunJobs(); + + var beside = presenter.ShowNow(Form(config, "triggers", beside: true)); + Dispatcher.UIThread.RunJobs(); + beside.Close(); + Dispatcher.UIThread.RunJobs(); + var after = presenter.ShowNow(Form(config)); + Dispatcher.UIThread.RunJobs(); + var afterDock = new Size(after.Width, after.Height); + after.Close(); + return (reopened, afterDock, presenter.RememberedSize); + } + finally + { + main.Close(); + } + }, CancellationToken.None); + + await Assert.That(reopened).IsEqualTo(new Size(1100, 720)); + await Assert.That(afterDock).IsEqualTo(new Size(1100, 720)).Because("docked beside the output is the main window's half, not the player's size"); + await Assert.That(remembered).IsEqualTo(new Size(1100, 720)); + } + + /// + /// A toast up when the settings window opens goes at once, and comes back when it closes — without waiting for the + /// client to paint a frame, which opening another window does not cause. + /// + [Test] + public async Task ToastsHideTheMomentTheSettingsWindowOpensAndReturnWhenItCloses() + { + var (before, whileOpen, after) = await Run((window, view, layer, driver) => + { + driver.Settings.Owner = window; + layer.ToastsHidden = () => driver.Settings.Window is not null; + driver.Settings.OpenedOrClosed = layer.Sync; + var palette = new NoticePalette("#333344", "#e0e0e0", "#5fafff", "#ff6b6b", "#ffaf5f"); + ((IPointerPresenter)driver.Pointer).Notice(new NoticeOverlay( + new NoticeModel("saved", NoticeSeverity.Info, null, null, DateTimeOffset.UnixEpoch, 1), 8, palette, _ => { })); + Drain(); + var before = layer.Toasts.IsVisible; + var settings = driver.Settings.ShowNow(Form(new AppConfiguration())); + Drain(); + var whileOpen = layer.Toasts.IsVisible; + settings.Close(); + Drain(); + return (before, whileOpen, layer.Toasts.IsVisible); + }, columns: 80, rows: 20); + + await Assert.That(before).IsTrue(); + await Assert.That(whileOpen).IsFalse().Because("nothing of a toast shows beside the settings window"); + await Assert.That(after).IsTrue(); + } +} diff --git a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs index 4636e3f1..c3eeb2dd 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs @@ -196,7 +196,8 @@ await Assert.That(Rows(palette.Session!.View(query))).IsEquivalentTo(Rows(drawn! await using var app = App(driver, DemoScene.Build()); app.RenderSnapshot("notices"); var said = driver.Pointer.Notices; - await Assert.That(said.Count).IsEqualTo(3); + await Assert.That(said.Count).IsEqualTo(4); + await Assert.That(said.Count(n => n.Notice.Source is not null)).IsEqualTo(1).Because("one is a source label, not a key"); await Assert.That((object)said[^1].Notice).IsEqualTo(app.DrawnModel(SurfaceCatalog.Notice)).Because("notice"); await Assert.That(app.NoticeMarkup(said[^1].Notice)).IsEqualTo(app.LastNotice); await Assert.That(said[0].Notice.Action).IsNotNull().Because("the first offers its action"); diff --git a/tests/SharpMUTerm.Avalonia.Tests/TabOverflowWindowTests.cs b/tests/SharpMUTerm.Avalonia.Tests/TabOverflowWindowTests.cs new file mode 100644 index 00000000..caf554da --- /dev/null +++ b/tests/SharpMUTerm.Avalonia.Tests/TabOverflowWindowTests.cs @@ -0,0 +1,33 @@ +using SharpConsoleUI.Drivers; +using static SharpMUTerm.Avalonia.Tests.DesktopLayerTests; + +namespace SharpMUTerm.Avalonia.Tests; + +/// +/// The tab strip's +N ▾ chip in the window: a click on it reaches the client through the same driver handler a +/// terminal's does, and what the framework — subscribed after the client, as it is inside Run() — sees of the same +/// frame carries no button, so the tab drawn under the chip is neither selected nor closed. +/// +[NotInParallel] +public class TabOverflowWindowTests +{ + [Test] + public async Task InTheWindowAClickOnTheChipLeavesTheFrameworkNoClick() + { + using var driver = new AvaloniaConsoleDriver(56, 20); + await using var app = InlineWindowApp(driver); + app.RenderSnapshot("tabs-many"); + var (paneId, _) = app.TabOverflowMenus.Single(); + var chip = app.TabOverflowChipAt(paneId)!.Value; + + // Stands where the framework stands: a later subscriber to the driver's mouse stream. + var frameworkSaw = new List(); + driver.MouseEvent += (_, flags, _) => frameworkSaw.AddRange(flags); + var at = new System.Drawing.Point(chip.X + 1, chip.Y); + driver.RaiseMouse([MouseFlags.Button1Pressed], at); + driver.RaiseMouse([MouseFlags.Button1Released, MouseFlags.Button1Clicked], at); + + await Assert.That(frameworkSaw.Any(f => f.ToString().StartsWith("Button1", StringComparison.Ordinal))).IsFalse(); + await Assert.That(app.AChipClickReachesTheTabUnderIt(paneId, filtered: true)).IsFalse(); + } +} diff --git a/tests/SharpMUTerm.Client.Tests/WindowTitleTests.cs b/tests/SharpMUTerm.Client.Tests/WindowTitleTests.cs index 16744534..f4feee4b 100644 --- a/tests/SharpMUTerm.Client.Tests/WindowTitleTests.cs +++ b/tests/SharpMUTerm.Client.Tests/WindowTitleTests.cs @@ -4,11 +4,11 @@ namespace SharpMUTerm.Client.Tests; -/// The one title both hosts show for what is in front: Character@World — SharpMUTerm. +/// The one title both hosts show for what is in front: Character · World — SharpMUTerm. public class WindowTitleTests { [Test] - [Arguments("Corvid", "Aetherfall", "Corvid@Aetherfall — SharpMUTerm")] + [Arguments("Corvid", "Aetherfall", "Corvid · Aetherfall — SharpMUTerm")] [Arguments(null, "Aetherfall", "Aetherfall — SharpMUTerm")] [Arguments("", "Aetherfall", "Aetherfall — SharpMUTerm")] [Arguments(null, null, "SharpMUTerm")] @@ -25,7 +25,7 @@ public async Task TheTitleIsReadOffTheHeadersOwnModel() Character = new HeaderCharacter("Corvid", "Aetherfall.Corvid", CharacterPresence.Online, "aetherfall.mux", 4201, false, "x"), }; - await Assert.That(WindowTitle.For(header)).IsEqualTo("Corvid@Aetherfall — SharpMUTerm"); + await Assert.That(WindowTitle.For(header)).IsEqualTo("Corvid · Aetherfall — SharpMUTerm"); await Assert.That(WindowTitle.For(HeaderModel.Empty)).IsEqualTo(WindowTitle.Product); } @@ -35,11 +35,27 @@ public async Task ControlCharactersAreDroppedAndLongNamesAreCut() { var title = WindowTitle.For("Cor\u0007vid\u001b]2;x", "evil\r\nworld"); - await Assert.That(title).IsEqualTo("Corvid]2;x@evilworld — SharpMUTerm"); + await Assert.That(title).IsEqualTo("Corvid]2;x · evilworld — SharpMUTerm"); await Assert.That(title.Any(char.IsControl)).IsFalse(); var longName = new string('n', 200); var cut = WindowTitle.For(longName, "w"); - await Assert.That(cut).StartsWith(new string('n', WindowTitle.MaxPart - 1) + "…@w"); + await Assert.That(cut).StartsWith(new string('n', WindowTitle.MaxPart - 1) + "… · w"); + } + + /// + /// One spelling of a character's name everywhere: the title, the prompt and a tab's owner prefix all read + /// 's, so none of them can drift back to Corvid@Aetherfall or Corvid - Chat. + /// + [Test] + public async Task TheTitleThePromptAndATabsOwnerSpellANameTheSameWay() + { + var name = CharacterNames.Display("Aetherfall", "Corvid"); + + await Assert.That(name).IsEqualTo("Corvid · Aetherfall"); + await Assert.That(WindowTitle.For("Corvid", "Aetherfall")).IsEqualTo(name + " — " + WindowTitle.Product); + await Assert.That(StatusFormatter.CharacterPrompt("Corvid", "Aetherfall")).IsEqualTo(name + " › "); + await Assert.That(CharacterNames.Window("Corvid", "Chat")).IsEqualTo("Corvid" + CharacterNames.Separator + "Chat"); + await Assert.That(CharacterNames.Window(null, "Chat")).IsEqualTo("Chat"); } } diff --git a/tests/SharpMUTerm.Core.Tests/Text/StatusLineTests.cs b/tests/SharpMUTerm.Core.Tests/Text/StatusLineTests.cs index a6581133..426a9113 100644 --- a/tests/SharpMUTerm.Core.Tests/Text/StatusLineTests.cs +++ b/tests/SharpMUTerm.Core.Tests/Text/StatusLineTests.cs @@ -7,7 +7,7 @@ public class StatusLineTests [Test] public async Task CharacterPrompt_BindsToCharacterAtWorld() { - await Assert.That(StatusFormatter.CharacterPrompt("Corvid", "aetherfall")).IsEqualTo("Corvid@aetherfall › "); + await Assert.That(StatusFormatter.CharacterPrompt("Corvid", "aetherfall")).IsEqualTo("Corvid · aetherfall › "); await Assert.That(StatusFormatter.CharacterPrompt(null, null)).IsEqualTo("› "); } } diff --git a/tests/SharpMUTerm.Tui.Tests/NoticeAndMapSurfaceTests.cs b/tests/SharpMUTerm.Tui.Tests/NoticeAndMapSurfaceTests.cs index 0711de0d..14f2f47a 100644 --- a/tests/SharpMUTerm.Tui.Tests/NoticeAndMapSurfaceTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/NoticeAndMapSurfaceTests.cs @@ -53,6 +53,43 @@ public async Task TheStatusRowDrawsANoticeAsItAlwaysHas() await Assert.That(app.LastNotice).IsEqualTo($"{chip}F5[/] [dim]saved [[x]][/]"); } + /// + /// A notice from a part of the client rather than a key (packages, the map, sound) carries a source, drawn as a label + /// — Sound: — and never in the key's place, where a word read as a chord to press. No notice in the client + /// passes a word as its key any more. + /// + [Test] + public async Task ASourceIsALabelNotAChord() + { + await using var app = App(); + app.RenderSnapshot(null); + + app.SimulateNotice("on.", MessageSeverity.Info, null, null, NoticeModel.Sources.Sound); + var model = (NoticeModel?)app.DrawnModel(SurfaceCatalog.Notice); + + await Assert.That(model!.Source).IsEqualTo("Sound"); + await Assert.That(model.Key).IsNull().Because("a source is not a key"); + await Assert.That(app.LastNotice).EndsWith("]Sound:[/] [dim]on.[/]"); + + var words = Directory.GetFiles(SourceRoot(), "*.cs", SearchOption.AllDirectories) + .SelectMany(f => File.ReadAllLines(f).Select(l => (f, l))) + .Where(x => System.Text.RegularExpressions.Regex.IsMatch(x.l, "Notice\\(.*key: \"[a-z]")) + .Select(x => $"{Path.GetFileName(x.f)}: {x.l.Trim()}") + .ToList(); + await Assert.That(words).IsEmpty().Because("a word as a notice's key reads as a chord; it is a source"); + } + + private static string SourceRoot() + { + var dir = new DirectoryInfo(AppContext.BaseDirectory); + while (dir is not null && !File.Exists(Path.Combine(dir.FullName, "SharpMUTerm.slnx"))) + { + dir = dir.Parent; + } + + return Path.Combine(dir!.FullName, "src", "SharpMUTerm.Tui"); + } + /// The model the row was drawn from is recorded as the notice surface's drawn model, sequence and all. [Test] public async Task EachNoticeIsOneModelTheRowIsDrawnFrom() diff --git a/tests/SharpMUTerm.Tui.Tests/TabOverflowTests.cs b/tests/SharpMUTerm.Tui.Tests/TabOverflowTests.cs index a28b039b..df5ba4fc 100644 --- a/tests/SharpMUTerm.Tui.Tests/TabOverflowTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/TabOverflowTests.cs @@ -89,6 +89,36 @@ public async Task ACommandTheListDidNotOfferIsRefused() await Assert.That(app.RunTabOverflowEntry("term:quit")).IsFalse(); } + /// + /// The chip is painted over the strip's last cells, which can be the tail of a tab the framework drew. A press on it + /// opens the list and nothing else: the frame the framework is left (it reads the same list after this client) carries + /// no button, so no tab under the chip is selected or closed. + /// + [Test] + public async Task AClickOnTheChipDoesNotAlsoSelectTheTabUnderIt() + { + var (app, _) = Crowded(); + var (paneId, _) = app.TabOverflowMenus.Single(); + var chip = app.TabOverflowChipAt(paneId)!.Value; + var press = new List { MouseFlags.Button1Pressed }; + var click = new List { MouseFlags.Button1Released, MouseFlags.Button1Clicked }; + var at = new System.Drawing.Point(chip.X + 1, chip.Y); + + await Assert.That(app.AChipClickReachesTheTabUnderIt(paneId, filtered: false)).IsTrue() + .Because("unfiltered, the framework's own click on the chip's cells lands on the tab drawn under it — the defect"); + + await Assert.That(app.TakesTabOverflowPress(press, at)).IsTrue(); + await Assert.That(app.TakesTabOverflowPress(click, at)).IsTrue(); + await Assert.That(press.Concat(click).Any(f => f.ToString().StartsWith("Button1", StringComparison.Ordinal))).IsFalse() + .Because("the framework is left a movement, not a click"); + await Assert.That(app.AChipClickReachesTheTabUnderIt(paneId, filtered: true)).IsFalse() + .Because("no cell of the chip selects or closes the tab drawn under it"); + + var elsewhere = new List { MouseFlags.Button1Pressed }; + await Assert.That(app.TakesTabOverflowPress(elsewhere, new System.Drawing.Point(chip.X - 3, chip.Y))).IsFalse(); + await Assert.That(elsewhere).Contains(MouseFlags.Button1Pressed).Because("a press beside the chip is the strip's as before"); + } + [Test] public async Task TheCellListNamesEachHiddenTabWithADigit() { diff --git a/tests/SharpMUTerm.Tui.Tests/TabStripFitTests.cs b/tests/SharpMUTerm.Tui.Tests/TabStripFitTests.cs index 86bb9aae..d080b7a6 100644 --- a/tests/SharpMUTerm.Tui.Tests/TabStripFitTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/TabStripFitTests.cs @@ -11,13 +11,13 @@ public class TabStripFitTests { /// /// One tab: is what it would draw whole, and the part after the last - /// " - " is its title — the same split TabTitles.Name makes. + /// " · " is its title — the same split TabTitles.Name makes. /// is what the tab spends besides its name; three is the ordinary case (a space either side, and the /// separator that follows it). /// private static TabCost Tab(string name, bool selected = false, int extra = 3) { - var at = name.LastIndexOf(" - ", StringComparison.Ordinal); + var at = name.LastIndexOf(" · ", StringComparison.Ordinal); return new TabCost(name.Length, at >= 0 ? name.Length - at - 3 : name.Length, extra, selected); } @@ -28,7 +28,7 @@ private static IReadOnlyList Budgets(int width, params TabCost[] tabs) => [Test] public async Task AStripThatFitsIsNotElidedAtAll() { - var tabs = new[] { Tab("Corvid - Chat"), Tab("Corvid - Public", selected: true) }; + var tabs = new[] { Tab("Corvid · Chat"), Tab("Corvid · Public", selected: true) }; await Assert.That(Budgets(100, tabs)).IsEquivalentTo(new[] { 13, 15 }); } @@ -40,7 +40,7 @@ public async Task AStripThatFitsIsNotElidedAtAll() [Test] public async Task AnUnarrangedStripElidesNothing() { - var tabs = new[] { Tab("Corvid - Chat"), Tab("Corvid - O-Gatecrashers", selected: true) }; + var tabs = new[] { Tab("Corvid · Chat"), Tab("Corvid · O-Gatecrashers", selected: true) }; await Assert.That(Budgets(0, tabs)).IsEquivalentTo(new[] { 13, 23 }); } @@ -55,9 +55,9 @@ public async Task TheOwnerPrefixGoesBeforeAnyNameIsCut() { var tabs = new[] { - Tab("Corvid - Chat", selected: true), - Tab("Corvid - Public"), - Tab("Corvid - Tells"), + Tab("Corvid · Chat", selected: true), + Tab("Corvid · Public"), + Tab("Corvid · Tells"), }; // 4 + 6 + 5 names, 9 of frame: the titles fit exactly where the prefixed names could not. @@ -132,7 +132,7 @@ public async Task EvenAStripThatCannotFitKeepsTheSelectedTabReadable() [Test] public async Task NoBudgetIsNegativeOrLongerThanTheNameItIsFor() { - var tabs = new[] { Tab("A"), Tab("Corvid - B", selected: true), Tab("Corvid - Announcements") }; + var tabs = new[] { Tab("A"), Tab("Corvid · B", selected: true), Tab("Corvid · Announcements") }; foreach (var width in new[] { 0, 1, 5, 12, 30, 400 }) { diff --git a/tests/SharpMUTerm.Tui.Tests/TabTitlesTests.cs b/tests/SharpMUTerm.Tui.Tests/TabTitlesTests.cs index 25ca6b28..a84275c1 100644 --- a/tests/SharpMUTerm.Tui.Tests/TabTitlesTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/TabTitlesTests.cs @@ -81,7 +81,7 @@ public async Task ATitleWithBracketsIsEscapedRatherThanParsedAsMarkup() var window = new WorkspaceWindow("w1", "[Chat] room", WindowKind.Spawn) { OwnerLabel = "[Corvid]" }; var label = TabTitles.For(window); - await Assert.That(label).IsEqualTo("[[Corvid]] - [[Chat]] room"); + await Assert.That(label).IsEqualTo("[[Corvid]] · [[Chat]] room"); await Assert.That(MarkupParser.StripLength(label)).IsEqualTo("[Corvid] - [Chat] room".Length); } @@ -119,7 +119,7 @@ public async Task TheLabelCarriesNoCloseAffordance() public async Task ChildWindow_WithOwner_PrefixesTheConnectionOwner() { var window = new WorkspaceWindow("w1", "Chat", WindowKind.Spawn) { OwnerLabel = "Corvid" }; - await Assert.That(TabTitles.For(window)).IsEqualTo("Corvid - Chat"); + await Assert.That(TabTitles.For(window)).IsEqualTo("Corvid · Chat"); } [Test] @@ -130,7 +130,7 @@ public async Task ChildWindow_OwnerPrefixPrecedesBadges() chat.OwnerLabel = "Corvid"; ws.SetUnsentInput(chat.Id, true); await Assert.That(TabTitles.For(chat)) - .IsEqualTo($"[{UnreadBadge.TintFor(null)}]Corvid - Chat (1)[/] {Glyphs.Draft}"); + .IsEqualTo($"[{UnreadBadge.TintFor(null)}]Corvid · Chat (1)[/] {Glyphs.Draft}"); } [Test] diff --git a/tests/SharpMUTerm.Tui.Tests/TelnetLinkClientTests.cs b/tests/SharpMUTerm.Tui.Tests/TelnetLinkClientTests.cs index 2f3e3fef..92b6000b 100644 --- a/tests/SharpMUTerm.Tui.Tests/TelnetLinkClientTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/TelnetLinkClientTests.cs @@ -152,12 +152,12 @@ public async Task TheTitleFollowsTheWindowInFrontAndReachesTheHostOnlyOnceTheLoo app.StartTitle(); app.DispatchCommand(CommandIds.Character("Mush.Ann")); - await Assert.That(app.ShownTitle).IsEqualTo("Ann@Mush — SharpMUTerm"); + await Assert.That(app.ShownTitle).IsEqualTo("Ann · Mush — SharpMUTerm"); app.DispatchCommand(CommandIds.Character("Mush.Bea")); - await Assert.That(app.ShownTitle).IsEqualTo("Bea@Mush — SharpMUTerm"); + await Assert.That(app.ShownTitle).IsEqualTo("Bea · Mush — SharpMUTerm"); await Assert.That(titles.Shown.Count).IsGreaterThanOrEqualTo(3); - await Assert.That(titles.Shown[^2..]).IsEquivalentTo(new[] { "Ann@Mush — SharpMUTerm", "Bea@Mush — SharpMUTerm" }); + await Assert.That(titles.Shown[^2..]).IsEquivalentTo(new[] { "Ann · Mush — SharpMUTerm", "Bea · Mush — SharpMUTerm" }); } [Test] From ebd149101d78cc82835320217ae5c27292029e4b Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 11:50:14 +0000 Subject: [PATCH 041/113] Light-theme contrast, composer spelling, and status/panel polish (UX wave 12) - F2 and F4 at 80 columns draw their one column through ScreenChrome.Panel, so Light resolves it (was Dark's wells and inks, 1.05-1.34:1). - Status row: notice inks and every bare [dim] held to 4.5:1 on the backdrop; Light's backdrop (rail, status row) lifted from #b7b7b9 to #e6e6e9. - Command palette's selected row is Ink on Accent (both roles), 5.8:1 on Light. - Window chrome's secondary ink is opaque and held to the 4.5:1 text floor. - Spell check skips command tokens (+ @ & /) and every known name. - Demo: F1/docked composer can send where the header says Corvid is connected, and no "nothing connects at start" notice over that. - Who-here drops idle words before cutting names; the status room cell grows into spare width; the as-sent preview wraps at spaces; the window's docked composer stops saying "click to write" twice. - FrameContrastTests walks 80x24 too and holds the status row and the palette's selected row to 4.5:1; ScreenThemeTests covers 80-column Light settings; NativeTokenTests covers the chrome's secondary ink. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 11 +++ CLAUDE.md | 13 ++- src/SharpMUTerm.Avalonia/ComposerView.cs | 11 ++- src/SharpMUTerm.Avalonia/NativeChrome.cs | 16 +++- .../Composer/ComposerModel.cs | 12 ++- src/SharpMUTerm.Core/Text/SpellChecker.cs | 49 +++++++++++- src/SharpMUTerm.Tui/CommandSurfaceRenderer.cs | 4 +- src/SharpMUTerm.Tui/ComposeOverlay.cs | 49 +++++++++--- src/SharpMUTerm.Tui/KeypadScreenView.cs | 2 +- src/SharpMUTerm.Tui/Panels/WhoHereRenderer.cs | 10 ++- .../Pointer/SharpMUTermApp.Notices.cs | 19 +++-- .../SharpMUTermApp.NativeComposer.cs | 34 +++++++- src/SharpMUTerm.Tui/SharpMUTermApp.cs | 60 +++++++++++--- src/SharpMUTerm.Tui/TriggersScreenView.cs | 2 +- src/SharpMUTerm.Tui/WorkspacePalette.cs | 24 +++++- .../NativeTokenTests.cs | 30 +++++++ .../ComposeSpellingTests.cs | 42 ++++++++++ .../ComposerLengthTests.cs | 22 ++++++ .../FrameContrastTests.cs | 79 +++++++++++++++++-- .../SharpMUTerm.Tui.Tests/LayoutStripTests.cs | 6 +- tests/SharpMUTerm.Tui.Tests/MapWindowTests.cs | 15 ++++ .../NoticeAndMapSurfaceTests.cs | 74 ++++++++++++++++- .../SharpMUTerm.Tui.Tests/ScreenThemeTests.cs | 29 +++++-- .../TerminalPanelTests.cs | 17 ++++ 24 files changed, 572 insertions(+), 58 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 733c386b..a4a3c1d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -320,6 +320,17 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Fixed +- Light theme: the trigger and keypad screens at 80 columns are no longer drawn in the dark theme's colours, error + notices on the status row are readable, the command palette's selected row is readable, and the sidebar and status + row are a light grey rather than a mid-grey that looked disabled. The window's sidebar labels are easier to read too. +- The composer no longer marks the command word (`+bbpost`, `@emit`) or your own character's and the room's names as + misspelt. +- Who is here keeps whole names at 80 columns by dropping the "active" / "idle" words first (the dot still says it). +- The status row's room name uses the space a wide terminal has instead of being cut short. +- The composer's "as sent" preview wraps at spaces instead of in the middle of a word. +- Desktop window: the docked composer no longer says "click to write" twice. +- Demo: the composer and the startup message no longer say nothing is connected while the header says Corvid is. + - The away, new-activity, search and restore bars fit the pane they are in: their rule runs to the pane's edge, never past it, and the words shorten before the rule does in a narrow pane. They redraw when the pane is resized. - Search (Ctrl+F) fits an 80-column terminal: its key hints shorten instead of pushing the window wider than the diff --git a/CLAUDE.md b/CLAUDE.md index e83bc392..1cc2aabe 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -767,7 +767,9 @@ fallbacks) for inline images/maps. `Func` that is null by default, so a test and a snapshot read none and their header says `no dictionary`. A MOO edit is not checked (its buffer is code as often as prose). `%`-codes, a word before `(`, and any word with a digit or an inner capital are skipped. ⌥W appends to - `dictionaries/user-words.txt`. + `dictionaries/user-words.txt`. **A command token is skipped** (one starting `+ @ & /`, up to its first `=`), and so + is **every name the client knows** (`SpellChecker.KnowNames`: configured worlds and characters, each session's + `CompletionIndex.Names()`), refreshed each time F1 opens and held for the run, never written to disk. - **An MXP `` is drawn in the output pane as rows of markup under the line that named it** (`MxpParser.HandleImage` + `MxpImageSource`, Core; `InlineImageHost`/`InlineImageRows`/`InlineImageLayout`, Tui; the `mxp-image` view). The parser emits a `[image: name]` span whose `SpanInteraction.Image` carries @@ -2434,6 +2436,15 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] used to be `#222226`. A light theme is left alone: darkening it makes a grey theme, and its focus step clamps at white either way. The cost is the pane-over-backdrop step, a ratio, which is fewer L* points a range lower (Dark 4.0 → 2.8); `EveryThemeGetsARaisedSurfaceOverARecessedBackdrop` now measures L*. + - **A light theme's backdrop takes a shallower step** (`LightBackdropScale` 0.95, `Backdrop` only — `Recessed`, the + chips' step, is unchanged): the dark ratio off a near-white surface put the rail and status row at mid-grey + `#b7b7b9` (L* 75), which read as disabled. Light's backdrop is `#e6e6e9` now, about 4 L* under the panes. + - **The status row and ⌃P's selected row are small text, held to 4.5:1** (`FrameContrastTests.TheStatusRowAndThe…`). + A notice's inks are held on the backdrop (`NoticeMarkup`, `WorkspacePalette.NoticeMuted`), and every bare `[dim]` + on the row is swapped for that held grey as it is painted (`StatusInk`); ⌃P's band is `Ink on Accent`, both roles, + so a light theme re-inks the pair. The native chrome's secondary ink (`NativeChromeView.SecondaryInk`) is opaque and + held to `NativeTokens.TextFloor`. `FrameContrastTests` also walks 80×24 (F2/F4/search draw one column there, through + `ScreenChrome.Panel` like every other column), and `ScreenThemeTests` checks 80-column Light settings frames. - **F7 ▸ `background transparency (%)` (0, off, by default) is a level only kitty can honour** (`TextSettings.BackgroundTransparency`; `KittyTransparentColours`, `SyncTransparentColours`). A translucent terminal draws translucent only cells on its *default* background (`SGR 49`), at the diff --git a/src/SharpMUTerm.Avalonia/ComposerView.cs b/src/SharpMUTerm.Avalonia/ComposerView.cs index 785abf32..92b7c03a 100644 --- a/src/SharpMUTerm.Avalonia/ComposerView.cs +++ b/src/SharpMUTerm.Avalonia/ComposerView.cs @@ -363,8 +363,17 @@ private void Label(ComposerModel model) _keys.Children.Clear(); var narrow = !_fullScreen && Bounds.Width is > 0 and < 560; + // The idle editor's placeholder says "Click to write a post"; the row's keyless hint saying it again was the + // panel saying one thing twice. + var placeholder = !model.Armed && !_fullScreen; + var placeholderShown = placeholder && model.Body.Length == 0; foreach (var key in model.Keys) { + if (placeholderShown && key.Key.Length == 0 && key.Label == ComposerModel.ClickHint) + { + continue; + } + var item = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 5, Margin = new Thickness(0, 1, 14, 1) }; if (key.Key.Length > 0) { @@ -383,7 +392,7 @@ private void Label(ComposerModel model) // A docked composer too short for its key row keeps the editor and drops the row. _footer.IsVisible = _fullScreen || Bounds.Height is 0 or >= 64; - _editor.PlaceholderText = model.Armed || _fullScreen ? null : "Click to write a post"; + _editor.PlaceholderText = placeholder ? ComposerModel.ClickToWrite : null; _editor.PlaceholderForeground = new SolidColorBrush(Dim); } diff --git a/src/SharpMUTerm.Avalonia/NativeChrome.cs b/src/SharpMUTerm.Avalonia/NativeChrome.cs index 54666bbb..31f3833f 100644 --- a/src/SharpMUTerm.Avalonia/NativeChrome.cs +++ b/src/SharpMUTerm.Avalonia/NativeChrome.cs @@ -190,7 +190,21 @@ protected override void OnPointerWheelChanged(PointerWheelEventArgs e) /// The UI font size the chrome's text is set in. protected const double FontSize = NativeTokens.Body + 1; - protected Color Dim => Color.FromArgb(0xA8, Ink.R, Ink.G, Ink.B); + /// + /// Secondary text (offline, a chord, CONNECTIONS): the ink two thirds of the way from the plane, + /// opaque and held to on it. It is small text; a translucent ink was + /// 3.1–3.4:1 on Light's sidebar. + /// + protected Color Dim => SecondaryInk(Ink, Plane); + + /// for an ink on a plane. Internal for tests. + internal static Color SecondaryInk(Color ink, Color plane) + { + const double share = 0xA8 / 255.0; + byte Mix(byte a, byte b) => (byte)Math.Round((a * share) + (b * (1 - share))); + var mixed = new Rgb(Mix(ink.R, plane.R), Mix(ink.G, plane.G), Mix(ink.B, plane.B)); + return ToColour(Contrast.Legible(mixed, new Rgb(plane.R, plane.G, plane.B), NativeTokens.TextFloor)); + } protected Color Faint(byte alpha) => Color.FromArgb(alpha, Ink.R, Ink.G, Ink.B); diff --git a/src/SharpMUTerm.Client/Composer/ComposerModel.cs b/src/SharpMUTerm.Client/Composer/ComposerModel.cs index ab08cebb..ffa2065a 100644 --- a/src/SharpMUTerm.Client/Composer/ComposerModel.cs +++ b/src/SharpMUTerm.Client/Composer/ComposerModel.cs @@ -141,6 +141,16 @@ public static ComposerModel Create( }; } + /// + /// The window's docked editor placeholder while it does not hold the keyboard. It says what + /// says, so the window leaves that hint out of its key row (the cells draw no placeholder on an idle editor, and + /// keep it). + /// + public const string ClickToWrite = "Click to write a post"; + + /// The docked key row's keyless hint while the editor does not hold the keyboard. + public const string ClickHint = "click here to write"; + /// The key row for a composer in this state. /// Whether F1's as-sent preview is showing, which names what ⌥P does next. public static IReadOnlyList KeysFor(ComposerPlace place, bool edit, bool dictionary, bool canSend, bool armed, bool preview = false) @@ -149,7 +159,7 @@ public static IReadOnlyList KeysFor(ComposerPlace place, bool edit, { if (!armed) { - return [new(string.Empty, "click here to write", "click to write"), new("F1", "full screen", "full")]; + return [new(string.Empty, ClickHint, "click to write"), new("F1", "full screen", "full")]; } var docked = new List { new("⌃S", "send"), new("⌥L", "literal") }; diff --git a/src/SharpMUTerm.Core/Text/SpellChecker.cs b/src/SharpMUTerm.Core/Text/SpellChecker.cs index 4ffb930e..3041c2a1 100644 --- a/src/SharpMUTerm.Core/Text/SpellChecker.cs +++ b/src/SharpMUTerm.Core/Text/SpellChecker.cs @@ -30,6 +30,7 @@ public sealed class SpellChecker { private readonly WordList _words; private readonly HashSet _added = new(StringComparer.OrdinalIgnoreCase); + private HashSet _names = new(StringComparer.OrdinalIgnoreCase); private readonly Dictionary _cache = new(StringComparer.Ordinal); private readonly string? _userWordsPath; @@ -188,9 +189,32 @@ public bool Check(string word) } } + /// + /// The proper names never to mark — the configured characters and worlds, and the names the games have reported + /// (CompletionIndex). Replaced wholesale on every call, held for the run, never written to disk: a name a + /// game reported is not a word the player added. + /// + public void KnowNames(IEnumerable names) + { + ArgumentNullException.ThrowIfNull(names); + var known = new HashSet(StringComparer.OrdinalIgnoreCase); + foreach (var name in names) + { + foreach (var (start, length) in Runs(name)) + { + known.Add(name.Substring(start, length)); + } + } + + lock (_gate) + { + _names = known; + } + } + private bool CheckLocked(string word) { - if (_added.Contains(word)) + if (_added.Contains(word) || _names.Contains(word)) { return true; } @@ -314,7 +338,7 @@ public IReadOnlyList Suggest(string word, int max = 6) } var end = start + length; - if (length < 2 || (end < line.Length && line[end] == '(')) + if (length < 2 || (end < line.Length && line[end] == '(') || InCommandToken(line, start)) { continue; } @@ -329,6 +353,27 @@ public IReadOnlyList Suggest(string word, int max = 6) } } + /// + /// Whether the run at is part of a command word: a whitespace-delimited token that starts + /// with +, @, & or / (+bbpost, @emit, &attr, a switch such as + /// /new), up to its first =. Every board post starts with one, and it is never a word to correct. + /// + private static bool InCommandToken(string line, int start) + { + var tokenStart = start; + while (tokenStart > 0 && !char.IsWhiteSpace(line[tokenStart - 1])) + { + tokenStart--; + } + + if (line[tokenStart] is not ('+' or '@' or '&' or '/')) + { + return false; + } + + return line.IndexOf('=', tokenStart, start - tokenStart) < 0; + } + /// Letters, digits and inner apostrophes, the way a word processor splits a line. private static IEnumerable<(int Start, int Length)> Runs(string line) { diff --git a/src/SharpMUTerm.Tui/CommandSurfaceRenderer.cs b/src/SharpMUTerm.Tui/CommandSurfaceRenderer.cs index b40da605..2136ffdd 100644 --- a/src/SharpMUTerm.Tui/CommandSurfaceRenderer.cs +++ b/src/SharpMUTerm.Tui/CommandSurfaceRenderer.cs @@ -26,8 +26,8 @@ internal static class CommandSurfaceRenderer /// The fewest characters of a detail worth showing; below this it is left out rather than cut to a stub. private const int MinDetail = 4; - /// The selected row's band: dark ink on the accent. - private const string SelectedBand = "#18181c on #00f5b7"; + /// The selected row's band: the popups' selected ink on the accent, both roles, so a light theme re-inks them as a pair. + private const string SelectedBand = ScreenPalette.Ink + " on " + ScreenPalette.Accent; /// A matched character on an unselected row. private static readonly string MatchInk = $"bold {ScreenPalette.Accent}"; diff --git a/src/SharpMUTerm.Tui/ComposeOverlay.cs b/src/SharpMUTerm.Tui/ComposeOverlay.cs index 2a0b872e..c6daa761 100644 --- a/src/SharpMUTerm.Tui/ComposeOverlay.cs +++ b/src/SharpMUTerm.Tui/ComposeOverlay.cs @@ -458,10 +458,10 @@ private MarkupControl PreviewBand() } /// - /// The preview's rows for : a heading, then the command ⌃S would send, cut into rows of - /// characters — hard, not at words, because this shows the exact characters the game gets - /// and a wrap at a space would hide one — ending in … when it runs past the rows there are. Always - /// rows, so typing never moves the editor. + /// The preview's rows for : a heading, then the command ⌃S would send, cut into rows of at + /// most characters at a space () — the space kept at the end of its + /// row, so the rows joined are exactly the characters the game gets — ending in … when it runs past the + /// rows there are. Always rows, so typing never moves the editor. /// internal static IReadOnlyList PreviewLines(ComposerModel model, int width) { @@ -472,19 +472,19 @@ internal static IReadOnlyList PreviewLines(ComposerModel model, int widt $"[{ScreenPalette.Accent}]AS SENT[/][{ScreenPalette.Label}] the one command ⌃S sends · ⌥P hides this[/]", }; var rows = PreviewRows - 1; + var pieces = WrapExact(command, width); for (var row = 0; row < rows; row++) { - var start = row * width; - if (start >= command.Length) + if (row >= pieces.Count) { lines.Add(row == 0 && command.Length == 0 ? $"[{ScreenPalette.Muted}]nothing yet[/]" : string.Empty); continue; } - var piece = command.Substring(start, Math.Min(width, command.Length - start)); - if (row == rows - 1 && start + width < command.Length) + var piece = pieces[row]; + if (row == rows - 1 && pieces.Count > rows) { - piece = piece[..^1] + "…"; + piece = (piece.Length >= width ? piece[..^1] : piece.TrimEnd()) + "…"; } lines.Add($"[{ScreenPalette.Value}]{Escape(piece)}[/]"); @@ -493,6 +493,37 @@ internal static IReadOnlyList PreviewLines(ComposerModel model, int widt return lines; } + /// + /// cut into rows of at most characters, each ending after the last + /// space that fits (a word longer than a row is cut hard). Nothing is dropped or added: the rows joined are + /// , so the preview never hides a space the game will get. + /// + internal static IReadOnlyList WrapExact(string text, int width) + { + ArgumentNullException.ThrowIfNull(text); + width = Math.Max(1, width); + var rows = new List(); + var start = 0; + while (start < text.Length) + { + var length = Math.Min(width, text.Length - start); + if (start + length < text.Length) + { + // Break after the last space inside the row, so the next row starts with a word. + var space = text.LastIndexOf(' ', start + length - 1, length); + if (space > start) + { + length = space - start + 1; + } + } + + rows.Add(text.Substring(start, length)); + start += length; + } + + return rows; + } + private MarkupControl FooterBand() { var band = ScreenChrome.Band(Render(Model).Footer, ScreenPalette.FooterBg, _scheme); diff --git a/src/SharpMUTerm.Tui/KeypadScreenView.cs b/src/SharpMUTerm.Tui/KeypadScreenView.cs index ec9a55da..5fbe0880 100644 --- a/src/SharpMUTerm.Tui/KeypadScreenView.cs +++ b/src/SharpMUTerm.Tui/KeypadScreenView.cs @@ -50,7 +50,7 @@ public static IWindowControl Build( // and keeps the list, which is where every key on this screen acts. var only = KeypadScreenRenderer.HotkeysColumn(keys, macros, focus, sets, selected, width); return ScreenChrome.Single( - header, footer, ScreenChrome.Stretch(new MarkupControl(ScreenChrome.Window(only, rows))), + header, footer, ScreenChrome.Stretch(ScreenChrome.Panel(ScreenChrome.Window(only, rows), scheme)), only.Count, rows); } diff --git a/src/SharpMUTerm.Tui/Panels/WhoHereRenderer.cs b/src/SharpMUTerm.Tui/Panels/WhoHereRenderer.cs index d936b074..35cff02e 100644 --- a/src/SharpMUTerm.Tui/Panels/WhoHereRenderer.cs +++ b/src/SharpMUTerm.Tui/Panels/WhoHereRenderer.cs @@ -33,7 +33,8 @@ internal static class WhoHereRenderer /// /// The panel's rows for a box by cells. Never wider than the - /// box and never taller: a room fuller than the box ends in … and N more. + /// box and never taller: a room fuller than the box ends in … and N more. The idle column is dropped (the + /// dot keeps saying it) before a name would be cut to make room for it. /// internal static List Render(string? room, IReadOnlyList occupants, int width, int height, Ink ink) => Render(WhoHereModel.From(room, occupants), width, height, ink); @@ -65,10 +66,13 @@ internal static List Render(WhoHereModel model, int width, int height, I return lines; } - var showIdle = model.ShowsIdle && width >= IdleWidth + 8; - var nameWidth = width - 2 - (showIdle ? IdleWidth + 1 : 0); var rows = height - 1; var fits = rowsIn.Count <= rows ? rowsIn.Count : Math.Max(0, rows - 1); + + // The idle words go before any name is cut: the dot already says active or idle, and a name is who it is. + var longest = rowsIn.Take(fits).Select(r => r.Display.Length).DefaultIfEmpty(0).Max(); + var showIdle = model.ShowsIdle && width >= IdleWidth + 8 && longest <= width - 2 - (IdleWidth + 1); + var nameWidth = width - 2 - (showIdle ? IdleWidth + 1 : 0); for (var i = 0; i < fits; i++) { lines.Add(Row(rowsIn[i], i, nameWidth, showIdle, ink)); diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Notices.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Notices.cs index 16d17960..784560f6 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Notices.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Notices.cs @@ -41,18 +41,25 @@ internal sealed partial class SharpMUTermApp /// /// The status row's markup for a notice: the key chip in the notice ink, then the text — in the warning red when - /// something failed, otherwise dim. The cell renderer of the notice surface; byte for byte what the row drew - /// before the model existed. + /// something failed, otherwise a muted grey. Every ink is held to 4.5:1 on the backdrop the row is painted on: a + /// failure in the raw red was 1.39:1 on Light, and the framework's fixed [dim] grey 2.4:1. The cell + /// renderer of the notice surface. /// internal string NoticeMarkup(NoticeModel notice) { ArgumentNullException.ThrowIfNull(notice); - var body = notice.Severity == NoticeSeverity.Warning - ? $"[{ScreenPalette.Warn}]{Escape(notice.Text)}[/]" - : $"[dim]{Escape(notice.Text)}[/]"; - return notice.Key is null ? body : $"[{_ink.Notice}]{Escape(notice.Key)}[/] {body}"; + var plane = WorkspacePalette.Backdrop(_theme); + var ink = notice.Severity == NoticeSeverity.Warning + ? HeldOn(ScreenPalette.Warn, plane) + : Hex(WorkspacePalette.NoticeMuted(_theme, plane)); + var body = $"[{ink}]{Escape(notice.Text)}[/]"; + return notice.Key is null ? body : $"[{HeldOn(_ink.Notice, plane)}]{Escape(notice.Key)}[/] {body}"; } + /// A colour held to on : notice text is small text. + private static string HeldOn(string hex, Rgb plane) => + TryParseRgb(hex, out var rgb) ? Hex(Contrast.Legible(rgb, plane, WorkspacePalette.HeaderTextFloor)) : hex; + /// Hands a notice to a host that draws notices natively; nothing for one that does not. private void PublishNotice(NoticeModel notice) { diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.NativeComposer.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.NativeComposer.cs index 4536af72..c79aeeee 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.NativeComposer.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.NativeComposer.cs @@ -63,15 +63,47 @@ internal sealed partial class SharpMUTermApp _composerSpelling = _spelling?.Invoke(); } + _composerSpelling?.KnowNames(SpellingNames()); return _composerSpelling; } + /// + /// The proper names the composer never marks: every configured world and character, and the names each open + /// session's game has reported (). A post that names its writer or + /// the people in the room is not misspelt. + /// + private IEnumerable SpellingNames() + { + foreach (var world in _config.Worlds) + { + yield return world.Name; + foreach (var character in world.Characters) + { + yield return character.Name; + } + } + + foreach (var session in _sessions.Sessions) + { + foreach (var name in session.Completions.Names()) + { + yield return name; + } + } + } + /// /// Opens F1 on a draft: in the host's editor when it has one, else the cell window. Both are given the same draft /// and say the same thing about it (). /// private void OpenComposer(string target, string draft, ComposeEscaping escaping, bool canSend, MooEdit? edit = null) { + // The names a game reports change between openings; the dictionary learns them each time F1 opens. + if (_composerSpellingOpened) + { + ComposerSpelling(); + } + if (NativeComposerHost is not { } native) { _composer.Toggle(target, draft, escaping, canSend, edit); @@ -233,7 +265,7 @@ private ComposerModel DescribeDocked(DockedComposer composer) composer.Escaping, edit: null, composer.Spelling, - canSend: session is not null, + canSend: ComposerCanSend(session, composer.SessionKey), composer.Armed, composer.Revision); Drawing(PanelIds.Composer, composer.WindowId, model); diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 6c896f39..1c6bae73 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -2465,7 +2465,7 @@ void Feed(string windowId, string ansiLine) // server agreed to UTF-8, which the row draws unqualified. A world that pinned an encoding // would read "utf-8 forced" and a server that never negotiated "utf-8 assumed". _demoEncoding = new SessionEncoding(Encoding.UTF8, EncodingSource.Negotiated); - _statusBar.SetContent(new List { StatusBarMarkup("Corvid", "connected") }); + _statusBar.SetContent(new List { StatusInk(StatusBarMarkup("Corvid", "connected")) }); RefreshHeader(); _input.SetAndNotify("say hello there"); RebuildPaneArea(); // realise the Chat spawn tab, then refresh badges @@ -2788,10 +2788,15 @@ internal async Task StartAsync(IReadOnlyList startup) // configured is a client with nothing to do yet, while worlds configured and none marked is // a client doing exactly what it was told. The second is Info for that reason — and neither // carries a key chip, because no surface refused anything; the text names the keys instead. + // The demo scene declares its connections without dialling them (_demoConnectedKeys), so the header and + // the rail already say Corvid is connected: "nothing connects at start" under them contradicted the frame. var empty = _config.Worlds.Count == 0; - Notice( - empty ? NoWorldsNotice : NothingAtStartNotice, - empty ? MessageSeverity.Warning : MessageSeverity.Info); + if (empty || _demoConnectedKeys.Count == 0) + { + Notice( + empty ? NoWorldsNotice : NothingAtStartNotice, + empty ? MessageSeverity.Warning : MessageSeverity.Info); + } // And the first run gets somewhere to start from: the welcome, over the notice it leaves behind // when it is closed. @@ -5231,10 +5236,19 @@ private void ToggleComposer() target, draft.Body, draft.Escaping, - canSend: session is not null, + canSend: ComposerCanSend(session, key), draft.Edit); } + /// + /// Whether a composer for 's window offers a send: it has a session, or — in the demo + /// scene, which opens no sockets — the scene declares that character connected (), + /// so the composer's footer never says "nothing connected" under a header and rail saying the opposite. + /// + private bool ComposerCanSend(WorldSession? session, string? ownerKey) => + session is not null + || (_sessions.Sessions.Count == 0 && ownerKey is not null && _demoConnectedKeys.Contains(ownerKey)); + /// /// Which character a composed post belongs to: the window's own owner, never _active. Null for /// a window that belongs to no connection — the web view — which keeps no draft, because there is @@ -13467,10 +13481,21 @@ private async Task AnnounceWindowSizeAsync(WorldSession session, int width, int /// private void PaintStatus(string markup) { - _statusBar.SetContent(new List { FitStatusRow(markup, HeaderWidth()) }); + _statusBar.SetContent(new List { StatusInk(FitStatusRow(markup, HeaderWidth())) }); SyncInputHeights(_second.Visible); } + /// + /// The status row's quiet text in a grey held to 4.5:1 on the backdrop it is painted on, in place of the framework's + /// fixed [dim] #808080 — 3.4:1 on Light's status plane, and the row is small text a reader looks for + /// (UX audit wave 11, #2 and #7). Only the bare tag is replaced; the cells do not move. + /// + private string StatusInk(string markup) => + BareDim.Replace(markup, $"[{Hex(WorkspacePalette.NoticeMuted(_theme, WorkspacePalette.Backdrop(_theme)))}]"); + + /// A [dim] tag that is a tag, not the escaped text [[dim]]. + private static readonly System.Text.RegularExpressions.Regex BareDim = new(@"(? /// The status row's markup cut to cells, ending in …. The row is one row in every /// host: a notice is a sentence, and a window narrower than it wrapped the row onto a second line and took that row @@ -13947,16 +13972,33 @@ private string[] FocusHints() /// The cells the status row's room field always takes, whatever the room is called. internal const int RoomCellWidth = 28; + /// The most cells the room field grows to on a wide row (). + internal const int RoomCellMaxWidth = 64; + + /// + /// How wide the room field is on this row: , grown into the row's spare cells up to + /// — after the widest focus hint is set aside, so the field never takes a hint's + /// place. A function of the row and never of the room's name, so a walk still moves nothing: at 160 columns the + /// cell read The Grand Plaza · Aetherf… with thirty cells free beside it. + /// + private int RoomCellFor(string left, string rightBar, StatusMode mode) + { + var hints = mode == StatusMode.None ? FocusHints().Select(h => MarkupWidth(h) + 3).DefaultIfEmpty(0).Max() : 0; + var moo = _active?.McpStatus is null ? 0 : MooStatusCellWidth + 3; + var spare = HeaderWidth() - MarkupWidth(left) - 3 - MarkupWidth(rightBar) - MinStatusGap - MeterSlack - hints - moo; + return Math.Clamp(spare, RoomCellWidth, RoomCellMaxWidth); + } + /// The room the active connection's map says the character is in, or null. private (long Id, string Name, string? Area)? StatusRoom() => MapOf(_active?.SessionKey ?? (_sessions.Sessions.Count == 0 ? DemoScene.ActiveSessionKey : null))?.Current; /// ⌂ Room · Area, elided and padded to . The room leads: it is what /// changes, and it is what an elision should keep. - internal static string RoomCell(string name, string? area) + internal static string RoomCell(string name, string? area, int width = RoomCellWidth) { var text = string.IsNullOrWhiteSpace(area) ? name : $"{name} · {area}"; - var room = RoomCellWidth - 2; + var room = Math.Max(RoomCellWidth, width) - 2; if (text.Length > room) { text = text[..(room - 1)] + "…"; @@ -14162,7 +14204,7 @@ bool Fits(string hint, IEnumerable cluster) => // cluster with every room name; a name too long for it is elided, never wrapped. if (StatusRoom() is { } here) { - var cell = RoomCell(here.Name, here.Area); + var cell = RoomCell(here.Name, here.Area, RoomCellFor(left, rightBar, mode)); if (MarkupWidth(left) + 3 + RoomCellWidth + MarkupWidth(rightBar) + MinStatusGap + MeterSlack <= HeaderWidth()) { left = $"{left} {cell}"; diff --git a/src/SharpMUTerm.Tui/TriggersScreenView.cs b/src/SharpMUTerm.Tui/TriggersScreenView.cs index f5404214..15361715 100644 --- a/src/SharpMUTerm.Tui/TriggersScreenView.cs +++ b/src/SharpMUTerm.Tui/TriggersScreenView.cs @@ -47,7 +47,7 @@ public static IWindowControl Build( ? TriggersScreenRenderer.EditorColumn(sets, selectedTrigger, routeTargets, focus, width, body, theme, recent) : TriggersScreenRenderer.RulesColumn(sets, selectedTrigger, focus, width); return ScreenChrome.Single( - header, footer, ScreenChrome.Stretch(new MarkupControl(ScreenChrome.Window(only, body))), + header, footer, ScreenChrome.Stretch(ScreenChrome.Panel(ScreenChrome.Window(only, body), scheme)), only.Count, body); } diff --git a/src/SharpMUTerm.Tui/WorkspacePalette.cs b/src/SharpMUTerm.Tui/WorkspacePalette.cs index b05b1814..7d4a2a13 100644 --- a/src/SharpMUTerm.Tui/WorkspacePalette.cs +++ b/src/SharpMUTerm.Tui/WorkspacePalette.cs @@ -263,8 +263,20 @@ internal static Rgb IdleInk(Theme theme) /// /// The plane everything that is not a pane sits on: the rail, the status line, and the gaps a split /// leaves between panes. + /// + /// A light theme takes a shallower step (): the backdrop's ratio taken off a + /// near-white surface landed at mid-grey (#b7b7b9, L* 75, 21 L* under the panes), and a rail and status + /// row that grey read as disabled. The step on Light is now about 4 L*, Solarized Dark's size. + /// /// - internal static Rgb Backdrop(Theme theme) => Recessed(Surface(theme)); + internal static Rgb Backdrop(Theme theme) + { + var surface = Surface(theme); + return Contrast.RelativeLuminance(surface) < LightPlaneLuminance ? Recessed(surface) : Scale(surface, LightBackdropScale); + } + + /// The backdrop as a fraction of a light theme's surface: about L* 91 under Light's L* 96 panes. + private const double LightBackdropScale = 0.95; /// /// One step behind a plane — the backdrop's step, reused for the chips of a tab strip's unselected @@ -325,6 +337,16 @@ internal static Rgb HeaderInk(Theme theme, Rgb fill) return Contrast.Legible(theme.Background, fill, HeaderTextFloor); } + /// + /// A notice's quiet text on the status row: the framework's [dim] grey, which is fixed and fell to 2.4:1 on + /// Light, replaced by the same grey held to on . + /// + internal static Rgb NoticeMuted(Theme theme, Rgb plane) + { + ArgumentNullException.ThrowIfNull(theme); + return Contrast.Legible(new Rgb(0x80, 0x80, 0x80), plane, HeaderTextFloor); + } + /// The header's quiet text (the counts, the log state), held to on its band. internal static Rgb HeaderMuted(Theme theme) { diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativeTokenTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativeTokenTests.cs index 265ce032..9a577b8d 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/NativeTokenTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/NativeTokenTests.cs @@ -111,6 +111,36 @@ public async Task EveryInkClearsTheTextFloorOnEveryPlaneItIsDrawnOn(string name) await Assert.That(misses).IsEmpty().Because(string.Join("\n", misses)); } + /// + /// The native header's and sidebar's secondary text (offline, Alt+2, CONNECTIONS) is small + /// text, held to on the planes the client hands the chrome — the sidebar's + /// backdrop and the header's status plane. It was the ink at two-thirds alpha, 3.1–3.4:1 on Light's sidebar (UX audit + /// wave 11, #7); and Light's backdrop itself is no longer mid-grey. + /// + [Test] + [Arguments("Dark")] + [Arguments("Light")] + [Arguments("Solarized Dark")] + public async Task TheChromesSecondaryTextIsBodyText(string name) + { + var theme = ThemeLibrary.Get(name); + var ink = theme.Resolve(SharpMUTerm.Core.Text.TerminalColor.Default, isBackground: false); + foreach (var plane in new[] { SharpMUTerm.Tui.WorkspacePalette.Backdrop(theme), theme.StatusBackground }) + { + var dim = SharpMUTerm.Avalonia.NativeChromeView.SecondaryInk( + Color.FromRgb(ink.R, ink.G, ink.B), Color.FromRgb(plane.R, plane.G, plane.B)); + await Assert.That(Contrast.Ratio(Rgb(dim), plane)).IsGreaterThanOrEqualTo(NativeTokens.TextFloor) + .Because($"{name}: {dim} on {plane.ToHex()}"); + } + + if (name == "Light") + { + var backdrop = SharpMUTerm.Tui.WorkspacePalette.Backdrop(theme); + await Assert.That(Contrast.RelativeLuminance(backdrop)).IsGreaterThan(0.7) + .Because($"Light's rail and status plane {backdrop.ToHex()} read as disabled at mid-grey"); + } + } + /// /// The settings window wears the tokens: its plane is the palette's card and Fluent's accent is the client's, not /// Fluent's own blue (#60cdff/#005fb8) — and it follows a Light theme the same way. diff --git a/tests/SharpMUTerm.Tui.Tests/ComposeSpellingTests.cs b/tests/SharpMUTerm.Tui.Tests/ComposeSpellingTests.cs index f8f457d8..c8485dd6 100644 --- a/tests/SharpMUTerm.Tui.Tests/ComposeSpellingTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/ComposeSpellingTests.cs @@ -131,4 +131,46 @@ public async Task AMooEditIsNotSpellChecked() await Assert.That(app.Composer.Spelling).IsNull(); await Assert.That(ForegroundOf(app, "player")).IsNotEqualTo(Warn); } + + /// + /// A command word is not a word to correct: every board post starts with one (+bbpost), so the first two + /// marks of every post were false (UX audit wave 11, #8). A token starting with + @ & / is skipped up to + /// its first =; the text after it is still checked. + /// + [Test] + public async Task ACommandWordIsNeverMarked() + { + var checker = Dictionary(); + + await Assert.That(checker.Misspellings("+bbpost hello")).IsEmpty(); + await Assert.That(checker.Misspellings("@emit/room hello")).IsEmpty(); + await Assert.That(checker.Misspellings("&attr the=hello")).IsEmpty(); + await Assert.That(checker.Misspellings("+bbpost/wrold hello wrold").Count).IsEqualTo(1) + .Because("the switch is the command's; the body after the space is prose"); + await Assert.That(checker.Misspellings("&attr the=wrold").Count).IsEqualTo(1).Because("after = is the value"); + } + + /// + /// Nor is a name the client knows: the writer's own (every configured character and world) and the names the game + /// reported. Corvid was marked under a header naming Corvid. + /// + [Test] + public async Task TheCharactersOwnNameIsNeverMarked() + { + var checker = Dictionary(); + var config = new AppConfiguration(); + var world = new WorldDefinition { Name = "Aetherfall", Host = "a.example", Port = 4201 }; + world.Characters.Add(new CharacterDefinition { Name = "Corvid", Logging = new() }); + config.Worlds.Add(world); + Console.SetIn(TextReader.Null); + var app = new SharpMUTermApp(config, Headless, new HeadlessConsoleDriver(Width, Height), spelling: () => checker); + + app.SimulateKey(Key(ConsoleKey.F1)); + app.Composer.SimulateTyping("hello Corvid of Aetherfall wrold"); + + await Assert.That(ForegroundOf(app, "Corvid")).IsNotEqualTo(Warn); + await Assert.That(ForegroundOf(app, "Aetherfall")).IsNotEqualTo(Warn); + await Assert.That(ForegroundOf(app, "wrold")).IsEqualTo(Warn); + await Assert.That(checker.AddedWords).IsEmpty().Because("a known name is not a word the player added"); + } } diff --git a/tests/SharpMUTerm.Tui.Tests/ComposerLengthTests.cs b/tests/SharpMUTerm.Tui.Tests/ComposerLengthTests.cs index 85b425dc..683c291d 100644 --- a/tests/SharpMUTerm.Tui.Tests/ComposerLengthTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/ComposerLengthTests.cs @@ -82,4 +82,26 @@ public async Task AMooEditHasNoPreview() await Assert.That(model.Preview).IsFalse(); } + + /// + /// The as-sent preview breaks at a space, never mid-word (it read Corv / id), and still shows every + /// character the game gets: the rows joined are the command. + /// + [Test] + [Arguments("+bbpost 12=The Long Winter%r%rThe caravan reached the pass at dusk", 20)] + [Arguments("word", 3)] + [Arguments("a b c", 2)] + [Arguments("", 10)] + public async Task ThePreviewWrapsAtWordsAndKeepsEveryCharacter(string command, int width) + { + var rows = ComposeOverlay.WrapExact(command, width); + + await Assert.That(string.Concat(rows)).IsEqualTo(command); + await Assert.That(rows.All(r => r.Length <= width)).IsTrue(); + // A word is split across rows only where its row had no space to break at. + var splits = Enumerable.Range(0, Math.Max(0, rows.Count - 1)) + .Where(i => rows[i].Length > 0 && rows[i][^1] != ' ' && rows[i + 1][0] != ' ' && rows[i][1..].Contains(' ')) + .ToList(); + await Assert.That(splits).IsEmpty().Because("a row with a space in it breaks after one"); + } } diff --git a/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs b/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs index bbd0c3b4..be64c780 100644 --- a/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs @@ -89,12 +89,77 @@ from theme in ThemeLibrary.Names from view in Views select (theme, view); + /// + /// The views walked again at 80×24, where the layout is a different one: F2, F4 and the settings search draw one + /// column at a time, the rail folds, and the status row is short. The 80-column settings path kept Dark's colours on + /// Light (UX audit wave 11, #1: wells at 1.34:1, F11 at 1.05:1) while every 140-column frame here was green. + /// + private static readonly string[] NarrowViews = + [ + "", "triggers", "triggers-edit", "keypad", "keypad-edit", "settings-search", "aliases", "timers", "worlds", + "menu", "menu-fuzzy", "notices", "compose", "panel-who", "layout-roleplay", "layout-combat", + ]; + + public static IEnumerable<(string Theme, string View)> NarrowCases() => + from theme in ThemeLibrary.Names + from view in NarrowViews + select (theme, view); + [Test] [MethodDataSource(nameof(Cases))] - public async Task NoPaintedTextIsBelowTheLegibilityFloor((string Theme, string View) test) + public async Task NoPaintedTextIsBelowTheLegibilityFloor((string Theme, string View) test) => + await AssertFloor(test.Theme, test.View, Width, Height); + + [Test] + [MethodDataSource(nameof(NarrowCases))] + public async Task NoPaintedTextIsBelowTheLegibilityFloorAt80Columns((string Theme, string View) test) => + await AssertFloor(test.Theme, test.View, 80, 24); + + /// + /// Small text the reader must act on is held to 4.5:1, not 3. The status row (a notice, and an error above + /// all) and the selected row of ⌃P: an error notice was the raw warning red on Light's status plane, 1.39:1, and ⌃P's + /// selected row was grey on deep teal at exactly 3.00:1 — which the 3:1 floor passes. Every theme, both sizes. + /// + [Test] + [MethodDataSource(nameof(BodyTextCases))] + public async Task TheStatusRowAndThePalettesSelectedRowAreBodyText((string Theme, string View, int Width) test) + { + var height = test.Width == Width ? Height : 24; + var frame = Render(test.Theme, test.View, test.Width, height); + var cells = FrameGrid.Cells(frame, test.Width, height); + + // The cells to hold: the last row (the status row), and ⌃P's selected row — the cells on the band its ▸ marker + // is drawn on, in the marker's row (a pane beside the palette is not the palette). + var band = test.View.StartsWith("menu", StringComparison.Ordinal) + ? cells.Where(c => c.Value.Glyph == '▸').Select(c => (c.Key.Row, c.Value.Background)).FirstOrDefault() + : default; + var failures = cells + .Where(c => c.Key.Row == height - 1 || (c.Key.Row == band.Row && band.Background is { } bg && c.Value.Background == bg)) + .Select(c => c.Value) + .Where(c => c.Glyph is not (' ' or '\n' or '\r') && !IsFill(c.Glyph) && c.Glyph is not ('▌' or '▐' or '●' or '○' or '◆' or '◇')) + .Where(c => c.Foreground is { } && c.Background is { }) + .Select(c => (Fg: c.Foreground!.Value, Bg: c.Background!.Value)) + .Distinct() + .Select(p => (p.Fg, p.Bg, Ratio: Contrast.Ratio(p.Fg, p.Bg))) + .Where(t => t.Ratio < 4.5) + .Select(t => $"{t.Ratio:0.00} {t.Fg.ToHex()} on {t.Bg.ToHex()}") + .ToList(); + + await Assert.That(failures).IsEmpty() + .Because($"--theme \"{test.Theme}\" --view {(test.View.Length == 0 ? "(default)" : test.View)} at {test.Width} columns"); + } + + public static IEnumerable<(string Theme, string View, int Width)> BodyTextCases() => + from theme in ThemeLibrary.Names + from view in new[] { "notices", "menu", "menu-fuzzy" } + from width in new[] { 80, Width } + select (theme, view, width); + + private static async Task AssertFloor(string theme, string view, int width, int height) { - var frame = Render(test.Theme, test.View); - var pairs = Pairs(frame); + var frame = Render(theme, view, width, height); + var pairs = Pairs(frame, width, height); + var test = (Theme: theme, View: view); // A walker handed the wrong dimensions, or one that stopped recognising an escape, decodes // nothing — and an audit over nothing passes every assertion below it. That is the failure @@ -158,14 +223,14 @@ ch is '' or '' || ch is >= '\u2500' and <= '\u257f' || ch is '█' or '░' or '▒' or '▓'; - private static string Render(string themeName, string view) + private static string Render(string themeName, string view, int width = Width, int height = Height) { Console.SetIn(TextReader.Null); var config = DemoScene.Build(); config.ThemeName = themeName; config.Theme = ThemeLibrary.Get(themeName); - var app = new SharpMUTermApp(config, Headless, new HeadlessConsoleDriver(Width, Height)); + var app = new SharpMUTermApp(config, Headless, new HeadlessConsoleDriver(width, height)); return app.RenderSnapshot(view.Length == 0 ? null : view); } @@ -179,11 +244,11 @@ private static string Render(string themeName, string view) /// names. /// /// - private static Dictionary<(Rgb Fg, Rgb Bg), int> Pairs(string frame) + private static Dictionary<(Rgb Fg, Rgb Bg), int> Pairs(string frame, int width, int height) { var pairs = new Dictionary<(Rgb, Rgb), int>(); - foreach (var cell in FrameGrid.Cells(frame, Width, Height).Values) + foreach (var cell in FrameGrid.Cells(frame, width, height).Values) { if (cell.Glyph is ' ' or '\n' or '\r' || IsFill(cell.Glyph) || cell.Foreground is not { } ink || cell.Background is not { } plane) diff --git a/tests/SharpMUTerm.Tui.Tests/LayoutStripTests.cs b/tests/SharpMUTerm.Tui.Tests/LayoutStripTests.cs index 49c6da09..fab2698b 100644 --- a/tests/SharpMUTerm.Tui.Tests/LayoutStripTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/LayoutStripTests.cs @@ -70,7 +70,7 @@ public async Task TheStatusRowLeavesOutTheMetersWhileTheVitalsStripShowsThem() app.RenderSnapshot("layout-combat"); await Assert.That(app.VitalsStripShowing()).IsTrue(); - await Assert.That(app.StatusMarkup).DoesNotContain("[dim]hp[/]"); + await Assert.That(app.StatusMarkup).DoesNotContain("]hp[/]"); await Assert.That(app.StatusMarkup).Contains("Corvid"); } @@ -81,7 +81,7 @@ public async Task TheMetersComeBackToTheStatusRowWhenTheStripIsNotOnScreen() app.RenderSnapshot("meters"); await Assert.That(app.VitalsStripShowing()).IsFalse(); - await Assert.That(app.StatusMarkup).Contains("[dim]hp[/]"); + await Assert.That(app.StatusMarkup).Contains("]hp[/]"); } [Test] @@ -93,7 +93,7 @@ public async Task ZoomingAnotherPaneBringsTheMetersBack() app.DispatchCommand("layout:zoom"); await Assert.That(app.VitalsStripShowing()).IsFalse(); - await Assert.That(app.StatusMarkup).Contains("[dim]hp[/]"); + await Assert.That(app.StatusMarkup).Contains("]hp[/]"); } [Test] diff --git a/tests/SharpMUTerm.Tui.Tests/MapWindowTests.cs b/tests/SharpMUTerm.Tui.Tests/MapWindowTests.cs index abf46f1c..925c87b8 100644 --- a/tests/SharpMUTerm.Tui.Tests/MapWindowTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/MapWindowTests.cs @@ -175,4 +175,19 @@ private static void Type(SharpMUTermApp app, string text) app.SimulateKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false)); } + + /// + /// On a wide row the room field grows into the spare cells, so a long name is not cut with thirty cells free beside + /// it; it is still a fixed width for the row, so a walk moves nothing. + /// + [Test] + public async Task TheStatusRoomCellGrowsToTheWidthItIsGiven() + { + var cell = SharpMUTermApp.RoomCell("The Grand Plaza", "Aetherfall Old Town", 48); + + await Assert.That(MarkupText.VisibleLength(cell)).IsEqualTo(48); + await Assert.That(MarkupText.Plain(cell)).Contains("Aetherfall Old Town"); + await Assert.That(MarkupText.VisibleLength(SharpMUTermApp.RoomCell("x", null, 10))).IsEqualTo(SharpMUTermApp.RoomCellWidth) + .Because("never narrower than the reserved field"); + } } diff --git a/tests/SharpMUTerm.Tui.Tests/NoticeAndMapSurfaceTests.cs b/tests/SharpMUTerm.Tui.Tests/NoticeAndMapSurfaceTests.cs index 0711de0d..d6dddf49 100644 --- a/tests/SharpMUTerm.Tui.Tests/NoticeAndMapSurfaceTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/NoticeAndMapSurfaceTests.cs @@ -29,8 +29,8 @@ private static SharpMUTermApp App() // ── notices ────────────────────────────────────────────────────────────────────────────── /// - /// The row reads exactly as before the model: a key chip in the notice ink, the text dim — or in the warning red when - /// something failed — and an action changes nothing on it, since a cell is not a button. + /// The row: a key chip in the notice ink, the text in a muted grey — or in the warning red when something failed — + /// and an action changes nothing on it, since a cell is not a button. On Dark the red is the palette's own. /// [Test] public async Task TheStatusRowDrawsANoticeAsItAlwaysHas() @@ -40,8 +40,9 @@ public async Task TheStatusRowDrawsANoticeAsItAlwaysHas() app.SimulateNotice("nothing to split", MessageSeverity.Warning, "⌃B", null); var plain = app.LastNotice!; - await Assert.That(plain).EndsWith("]⌃B[/] [dim]nothing to split[/]"); + await Assert.That(plain).Contains("]⌃B[/] [#").And.EndsWith("]nothing to split[/]").And.DoesNotContain("[dim]"); var chip = plain[..plain.IndexOf("⌃B", StringComparison.Ordinal)]; + var muted = plain[(plain.IndexOf("⌃B[/] ", StringComparison.Ordinal) + "⌃B[/] ".Length)..plain.IndexOf("nothing", StringComparison.Ordinal)]; app.SimulateNotice("nothing to split", MessageSeverity.Warning, "⌃B", new NoticeAction("layout:layouts", "Change layout")); await Assert.That(app.LastNotice).IsEqualTo(plain).Because("the action is the window's to offer; the row is unchanged"); @@ -50,7 +51,35 @@ public async Task TheStatusRowDrawsANoticeAsItAlwaysHas() await Assert.That(app.LastNotice).IsEqualTo($"[{ScreenPalette.Warn}]no route to host[/]"); app.SimulateNotice("saved [x]", MessageSeverity.Info, "F5", null); - await Assert.That(app.LastNotice).IsEqualTo($"{chip}F5[/] [dim]saved [[x]][/]"); + await Assert.That(app.LastNotice).IsEqualTo($"{chip}F5[/] {muted}saved [[x]][/]"); + } + + /// + /// On Light every ink on the row clears 4.5:1 on the plane it is drawn on: an error in the raw warning red was 1.39:1 + /// on the old mid-grey status plane, and the framework's [dim] 2.4:1 (UX audit wave 11, #2). + /// + [Test] + public async Task OnLightANoticesInksAreBodyText() + { + Console.SetIn(TextReader.Null); + var config = DemoScene.Build(); + config.ThemeName = "Light"; + config.Theme = SharpMUTerm.Core.Theming.ThemeLibrary.Get("Light"); + await using var app = new SharpMUTermApp(config, ClientHost.Headless(new HeadlessConsoleDriver(120, 34), Caps)); + app.RenderSnapshot(null); + var plane = WorkspacePalette.Backdrop(config.Theme); + + foreach (var severity in new[] { MessageSeverity.Error, MessageSeverity.Warning, MessageSeverity.Info }) + { + app.SimulateNotice("no route to host", severity, "⌃P", null); + foreach (System.Text.RegularExpressions.Match hex in System.Text.RegularExpressions.Regex.Matches(app.LastNotice!, "#[0-9a-f]{6}")) + { + var ink = new SharpMUTerm.Core.Text.Rgb( + Convert.ToByte(hex.Value[1..3], 16), Convert.ToByte(hex.Value[3..5], 16), Convert.ToByte(hex.Value[5..7], 16)); + await Assert.That(SharpMUTerm.Core.Text.Contrast.Ratio(ink, plane)).IsGreaterThanOrEqualTo(4.5) + .Because($"{severity}: {hex.Value} on {plane.ToHex()}"); + } + } } /// The model the row was drawn from is recorded as the notice surface's drawn model, sequence and all. @@ -163,4 +192,41 @@ public async Task TheDemoMapIsDrawnFromItsRecordedModel() await Assert.That(markup).Contains($"[{view.AreaColour}]"); await Assert.That(markup).Contains($"[{view.ColourOf("Saltmarsh Docks")}]■[/]"); } + + // ── the demo agrees with itself ────────────────────────────────────────────────────────── + + /// + /// The demo says Corvid is connected — the header, the rail and the quit prompt read , + /// which falls back to the keys the scene declares. F1 in that window has to agree, as it does in a live client where + /// the window's session is connected; it said "send (nothing connected)" (UX audit wave 11, #17). The pin is the + /// header's own answer, not a constant. + /// + [Test] + public async Task TheDemosComposerCanSendWhereTheHeaderSaysItIsConnected() + { + await using var app = App(); + app.RenderSnapshot(null); + + app.SimulateKey(new ConsoleKeyInfo('\0', ConsoleKey.F1, false, false, false)); + + await Assert.That(app.ConnectedCharacters()).Contains(DemoScene.ActiveSessionKey); + await Assert.That(app.Composer.IsOpen).IsTrue(); + await Assert.That(app.Composer.Model.CanSend).IsTrue(); + await Assert.That(app.Composer.Model.Keys.Select(k => k.Label)).DoesNotContain("send (nothing connected)"); + } + + /// + /// Nor does the demo's startup pass say "nothing connects at start" under a header saying a character is connected — + /// the window's demo runs that pass with no startup list. + /// + [Test] + public async Task TheDemosStartupDoesNotSayNothingConnects() + { + await using var app = App(); + app.RenderSnapshot(null); + + await app.StartAsync([]); + + await Assert.That(app.LastNotice ?? string.Empty).DoesNotContain("nothing connects at start"); + } } diff --git a/tests/SharpMUTerm.Tui.Tests/ScreenThemeTests.cs b/tests/SharpMUTerm.Tui.Tests/ScreenThemeTests.cs index d7747a68..710a788b 100644 --- a/tests/SharpMUTerm.Tui.Tests/ScreenThemeTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/ScreenThemeTests.cs @@ -152,21 +152,40 @@ await Assert.That(scheme.Paint($"[{ScreenPalette.Ink} on {ScreenPalette.Accent}] [Arguments("compose")] [Arguments("deletions")] [Arguments("packages")] - public async Task NoLightSettingsFramePaintsADarkPlane(string view) + public async Task NoLightSettingsFramePaintsADarkPlane(string view) => await AssertNoDarkPlane(view, 120, 32); + + /// + /// The same at 80 columns, where F2, F4 and the settings search draw one column at a time + /// (ScreenChrome.Single). That path built its column from the renderer's markup unresolved, so on Light the + /// name and pattern wells kept Dark's #0a0e18 under Dark's ink (UX audit wave 11, #1) while 120 columns was + /// right. + /// + [Test] + [Arguments("triggers")] + [Arguments("triggers-edit")] + [Arguments("keypad")] + [Arguments("keypad-edit")] + [Arguments("settings-search")] + [Arguments("aliases")] + [Arguments("timers")] + [Arguments("worlds")] + public async Task NoLightSettingsFramePaintsADarkPlaneAt80Columns(string view) => await AssertNoDarkPlane(view, 80, 24); + + private static async Task AssertNoDarkPlane(string view, int width, int height) { Console.SetIn(TextReader.Null); var config = DemoScene.Build(); config.ThemeName = "Light"; config.Theme = ThemeLibrary.Get("Light"); var caps = new TerminalCapabilities(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); - var app = new SharpMUTermApp(config, caps, new HeadlessConsoleDriver(120, 32)); + var app = new SharpMUTermApp(config, caps, new HeadlessConsoleDriver(width, height)); var frame = app.RenderSnapshot(view); var dark = Planes.Select(Rgb).ToHashSet(); - var cells = FrameGrid.Cells(frame, 120, 32).Values.ToList(); + var cells = FrameGrid.Cells(frame, width, height).Values.ToList(); var offending = cells.Count(c => c.Background is { } bg && dark.Contains(bg)); - await Assert.That(cells.Count).IsGreaterThan(1000); - await Assert.That(offending).IsEqualTo(0).Because($"--theme Light --view {view}"); + await Assert.That(cells.Count).IsGreaterThan(width * height / 2); + await Assert.That(offending).IsEqualTo(0).Because($"--theme Light --view {view} --size {width}x{height}"); } } diff --git a/tests/SharpMUTerm.Tui.Tests/TerminalPanelTests.cs b/tests/SharpMUTerm.Tui.Tests/TerminalPanelTests.cs index 6e5db705..7ebb1897 100644 --- a/tests/SharpMUTerm.Tui.Tests/TerminalPanelTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/TerminalPanelTests.cs @@ -243,4 +243,21 @@ private static async Task Connected() app.RenderNextFrame(); return new Wired(app, telnet, session); } + + /// + /// The idle words go before a name is cut: at 80 columns who-here cut every name to nine cells to keep + /// active/idle 4m (UX audit wave 11), when the dot already says which. + /// + [Test] + public async Task WhoHereDropsTheIdleColumnBeforeCuttingAName() + { + RoomOccupant[] here = [new("Ashlyn", "Ashlyn the Wanderer", true, 30), new("Bran", "Brannoc", true, 600)]; + + var narrow = WhoHereRenderer.Render("Plaza", here, 22, 6, new WhoHereRenderer.Ink("#00f5b7")).Select(StripMarkup).ToList(); + await Assert.That(narrow[1]).Contains("Ashlyn the Wanderer").And.DoesNotContain("active"); + await Assert.That(narrow.All(r => r.Length <= 22)).IsTrue(); + + var wide = WhoHereRenderer.Render("Plaza", here, 40, 6, new WhoHereRenderer.Ink("#00f5b7")).Select(StripMarkup).ToList(); + await Assert.That(wide[1]).Contains("Ashlyn the Wanderer").And.Contains("active"); + } } From 9ec7b167709bf366a9dffccfec2ec26d6c05b338 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 11:56:19 +0000 Subject: [PATCH 042/113] feat: auto-reconnect, attention alerts and command stacking - F5 reconnect (per world): a dropped connection is dialled again after 5/15/30/60/60 s with a status-row countdown and a notice carrying Stop; the player's own disconnect, quit, or a server close within 10 s of a command (a logout) never reconnects. Alt+R dials at once; Disconnect and Ctrl+P > Stop reconnecting cancel. Core AutoReconnect + WorldSession.LastClose. - Attention: a trigger's "alert" flag, or F5 alert on = name & pages, raises WorldSession.AttentionRequested; the client asks the host (new required ClientHost.Attention / IAttention) only while away, with F7 "alert when away" on, one per 10 s. Window: taskbar flash / osascript / notify-send. Terminal: OSC 99 (kitty, o=unfocused), OSC 777 (WezTerm, Ghostty, foot), else BEL after 30 s idle. The window title counts lines that arrived while behind. - F5 command stacking (off by default): TypedCommands splits a typed line on the world's separator, with \ escapes and #N repeats (bounded at 100), before the alias engine; composer posts, grabs, scripts and macros are never split. - Tests in Core and Tui; reconnect snapshot view; CLAUDE.md and CHANGELOG. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 11 + CLAUDE.md | 31 +- .../AvaloniaConsoleDriver.cs | 3 + src/SharpMUTerm.Avalonia/MainWindow.cs | 11 + src/SharpMUTerm.Avalonia/WindowAttention.cs | 135 +++++++ src/SharpMUTerm.Avalonia/WindowHost.cs | 3 + src/SharpMUTerm.Client/Chrome/WindowTitle.cs | 11 + .../Commands/BuiltInCommands.cs | 7 + .../Settings/BuiltInLists.cs | 3 + .../Settings/BuiltInSettings.cs | 20 + .../Settings/WorldFieldValues.cs | 20 + .../Automation/AttentionMatcher.cs | 113 ++++++ src/SharpMUTerm.Core/Automation/Trigger.cs | 8 + .../Commands/CommandCatalog.cs | 2 + .../Configuration/PreferenceSettings.cs | 7 + .../Configuration/WorldDefinition.cs | 29 ++ src/SharpMUTerm.Core/Input/TypedCommands.cs | 151 ++++++++ src/SharpMUTerm.Core/Session/AutoReconnect.cs | 275 ++++++++++++++ src/SharpMUTerm.Core/Session/WorldSession.cs | 68 +++- src/SharpMUTerm.Tui/Hosting/ClientHost.cs | 10 + .../Hosting/TerminalAttention.cs | 116 ++++++ .../SharpMUTermApp.Attention.cs | 117 ++++++ .../SharpMUTermApp.Reconnect.cs | 176 +++++++++ .../SharpMUTermApp.SendGroup.cs | 2 +- src/SharpMUTerm.Tui/SharpMUTermApp.Title.cs | 17 +- src/SharpMUTerm.Tui/SharpMUTermApp.cs | 39 +- src/SharpMUTerm.Tui/SnapshotViews.cs | 2 +- src/SharpMUTerm.Tui/TriggersScreenRenderer.cs | 6 +- src/SharpMUTerm.Tui/WorldsScreenRenderer.cs | 42 ++- .../ListSettingsTests.cs | 2 +- .../Automation/AttentionTests.cs | 96 +++++ .../Input/TypedCommandsTests.cs | 118 ++++++ .../Session/AutoReconnectTests.cs | 162 ++++++++ .../Session/FakeTelnetSession.cs | 15 + .../AlertsAndReconnectTests.cs | 348 ++++++++++++++++++ .../RecordingTelnetSession.cs | 9 +- .../SharpMUTerm.Tui.Tests/ScreenModelTests.cs | 8 +- .../TriggersScreenEditingTests.cs | 4 +- 38 files changed, 2180 insertions(+), 17 deletions(-) create mode 100644 src/SharpMUTerm.Avalonia/WindowAttention.cs create mode 100644 src/SharpMUTerm.Core/Automation/AttentionMatcher.cs create mode 100644 src/SharpMUTerm.Core/Input/TypedCommands.cs create mode 100644 src/SharpMUTerm.Core/Session/AutoReconnect.cs create mode 100644 src/SharpMUTerm.Tui/Hosting/TerminalAttention.cs create mode 100644 src/SharpMUTerm.Tui/SharpMUTermApp.Attention.cs create mode 100644 src/SharpMUTerm.Tui/SharpMUTermApp.Reconnect.cs create mode 100644 tests/SharpMUTerm.Core.Tests/Automation/AttentionTests.cs create mode 100644 tests/SharpMUTerm.Core.Tests/Input/TypedCommandsTests.cs create mode 100644 tests/SharpMUTerm.Core.Tests/Session/AutoReconnectTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/AlertsAndReconnectTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 733c386b..d0d0f5c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,17 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- A world can reconnect by itself after its connection drops (F5 ▸ reconnect). It waits 5, 15, 30, 60 and 60 + seconds between tries, counts down on the status row, and stops after five; Alt+R dials at once, and Disconnect or + Ctrl+P ▸ Stop reconnecting cancels. Your own Disconnect, quitting, or the game closing right after you typed a + command (a logout) never reconnects. +- The client can tell your desktop when something wants you while you are in another window: tick "alert me when + away" on a trigger, or set F5 ▸ alert on to "name & pages" for a world. The desktop window flashes or shows a + notification; kitty, WezTerm, Ghostty and foot show a notification, other terminals ring the bell. At most one every + ten seconds, and F7 ▸ alert when away turns it all off. While the desktop window is behind another, its title + counts the lines that arrived. +- Command stacking, per world and off by default (F5 ▸ command stacking): `n;e;e` sends three commands and `#3 kill rat` + sends one three times. Only lines typed on the command line are split — never a composer post. - A tab strip too narrow for its tabs now says how many it could not draw (`+3 ▾` at its right edge); click it to list them and go to one — a menu in the desktop window, a short list in a terminal. - The composer shows how many characters the post will be once escaped and joined, and Alt+P shows exactly what will diff --git a/CLAUDE.md b/CLAUDE.md index e83bc392..63c4e51a 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -1340,7 +1340,7 @@ one `SharpMUTermApp`; a host is only the place it runs. What differs between hos (`src/SharpMUTerm.Tui/Hosting/`): driver, capabilities, clipboard, URL opener, focus reporting, keys (`HostKeys`: the newline chord, and the chords the host keeps for itself), whether there is a main loop, the Sixel cell size, and what it does with the pointer (`IPointerPresenter`, null for none), whether it draws the declared settings natively (`INativeSettings`, null for the cell screens), and whether it -draws ⌃P natively (`INativePalette`, null for the cell popup), whether it draws the composer with its own editor (`INativeComposer`, null for cells), whether it draws the quit prompt, ⌃F, ⌃R, ⌥M and the welcome itself (`INativeModals`, null for cells), where the title for what is in front goes (`IWindowTitle`: the window's title bar, the terminal's OSC 2, null headless), whether it can pop a panel out into a window of its own (`IFloatingPanels`, null for none), and which chrome it draws itself beside the cells (`HostChrome`: the header and the rail, which the client then leaves out of the grid). Built by `ClientHost.Terminal`, `ClientHost.Headless`/`Snapshot` and +draws ⌃P natively (`INativePalette`, null for the cell popup), whether it draws the composer with its own editor (`INativeComposer`, null for cells), whether it draws the quit prompt, ⌃F, ⌃R, ⌥M and the welcome itself (`INativeModals`, null for cells), where the title for what is in front goes (`IWindowTitle`: the window's title bar, the terminal's OSC 2, null headless), whether it can pop a panel out into a window of its own (`IFloatingPanels`, null for none), how it asks for attention while the player is elsewhere (`IAttention`, null headless), and which chrome it draws itself beside the cells (`HostChrome`: the header and the rail, which the client then leaves out of the grid). Built by `ClientHost.Terminal`, `ClientHost.Headless`/`Snapshot` and `WindowHost.Create` (Avalonia). Four things keep a feature from landing in one host only: - **Every `ClientHost` and `HostKeys` member is `required`**, so a member added there does not compile until @@ -1610,7 +1610,8 @@ python3 tools/ansi_frame_to_image.py frame.ansi frame.html # or .svg (each panel in a pane of its own over the demo's game data; the composer over who-here, armed, with a draft typed through its real key path), `welcome`/`welcome-connect` (the first-run welcome over an **emptied** configuration and a main window alone — `--demo-config` has worlds, and the welcome never opens over them — and - its connect form filled in by real keys) and `tour` (the key tour row at the end of the demo's main window), plus + its connect form filled in by real keys) `tour` (the key tour row at the end of the demo's main window) and `reconnect` (Corvid dropped, the second try + counting down on the status row), plus the default workspace (no `--view`). Any settings screen also takes a `-edit` suffix, which opens it and drives real keys in so the frame shows a field mid-edit. State toggles: `collapsed`, `prefix`, `timestamps`, @@ -2862,6 +2863,32 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] OSC 2 through the `?1004` raw write, and pops it after the loop; the window sets `Window.Title`. Control characters are stripped twice (names, then the sequence). Not a surface in `SurfaceCatalog`: nothing draws it in cells and it hands nothing back. +- **Attention while the player is elsewhere is a host member** (`ClientHost.Attention` → `IAttention`, `Hosting/`; + Core `AttentionMatcher`, `AttentionThrottle`; `SharpMUTermApp.Attention.cs`). A trigger's `alert` flag, or on a world + with F5 ▸ `alert on` a line naming the character (whole word, not the line's first) or paging/telling/whispering + them (`WorldSession.AttentionRequested`, raised after the line is shown, never for a prompt or a gagged line). The + client asks only with F7 ▸ `alert when away` on, the host not in front, and one per 10 s. The window + (`WindowAttention`, `DesktopAlert`) knows its focus: Windows flashes the taskbar, macOS `osascript`, Linux + `notify-send`, all argv, errors swallowed. A terminal cannot tell focus-out, so `TerminalAttention.Focused` is null: + kitty gets OSC 99 with `o=unfocused` (kitty filters), WezTerm/Ghostty/foot OSC 777, anything else BEL, and those last + two only after 30 s with no input (`AwayAfter`). Text is stripped of control characters and base64'd for OSC 99. + While a host that knows its focus is behind, the title leads with the count of lines that arrived (`(3) …`, + `WindowTitle.WithUnread`). Null in tests, snapshots and the parity harness. +- **A dropped connection is dialled again only where F5 ▸ `reconnect` says so** (`AutoReconnect`, Core, one per + session; `SharpMUTermApp.Reconnect.cs`). `WorldSession.LastClose` says who closed: `Player` (Disconnect, quit, + dispose) never reconnects; `Failed` (an error) does; `Server` (orderly close) does **unless a command was sent in + the 10 s before** (`LogoutWindow`) — that is a `QUIT`, and dialling back would log the player in again. Waits 5, 15, + 30, 60, 60 s, then gives up; a connection that lasted 60 s (`StableAfter`) starts the count over. A dial is + `ConnectAsync`, so auto-login applies exactly as by hand. Each try prints a line and a notice (action: Stop); the + status row reads `reconnecting in 12 s · ⌥R now` (two-digit field) once the notice has gone, ticked by a one-shot + timer re-armed each second. ⌥R dials at once, ⌥D and ⌃P ▸ *Stop reconnecting* (offered only while one waits) cancel. + The `reconnect` view fakes it with the same writers (`ReconnectLine`, `ReconnectState`). +- **Command stacking is per world and off by default** (`WorldDefinition.CommandSeparator`, F5 ▸ `command stacking`: + off, `;`, `|`, `;;`; `TypedCommands`, Core; `WorldSession.SendTypedAsync`). Off because `;` is a MUSH's own + character. Only a line typed on the command line (and the send group) is split: the composer, a grab, a script's + `world.send`, a macro and a raw send never are. `\` before the separator keeps it; pieces are trimmed and empties + dropped; `#N cmd` repeats (1–100) within a piece; a line past 100 commands, or a repeat out of range, sends nothing + and says why. Each piece goes through the alias engine; the typed line is echoed once. - **Discord presence is a host member and a per-world opt-in** (`ClientHost.Presence`, a lazy `Func?`; `GamePresence`/`DiscordIpc`, Core; F5 ▸ `discord`, off by default). The world asks for `External.Discord 1`. `WorldSession.GamePresence` folds `Info` (application id: digits only) and `Status` diff --git a/src/SharpMUTerm.Avalonia/AvaloniaConsoleDriver.cs b/src/SharpMUTerm.Avalonia/AvaloniaConsoleDriver.cs index 0fd07b1f..e89dc5fa 100644 --- a/src/SharpMUTerm.Avalonia/AvaloniaConsoleDriver.cs +++ b/src/SharpMUTerm.Avalonia/AvaloniaConsoleDriver.cs @@ -91,6 +91,9 @@ public AvaloniaConsoleDriver(int columns, int rows) /// The window's title for what is in front, which the main window shows (). public WindowTitleBar TitleBar { get; } = new(); + /// The window's alerts while it is behind another (). + public WindowAttention Attention { get; } = new(); + public bool IsRunning { get; private set; } // ── IConsoleDriver: output ──────────────────────────────────────────────────────────────── diff --git a/src/SharpMUTerm.Avalonia/MainWindow.cs b/src/SharpMUTerm.Avalonia/MainWindow.cs index 37b02263..30908686 100644 --- a/src/SharpMUTerm.Avalonia/MainWindow.cs +++ b/src/SharpMUTerm.Avalonia/MainWindow.cs @@ -43,6 +43,17 @@ public MainWindow(WindowOptions options, IClassicDesktopStyleApplicationLifetime // Character@World — SharpMUTerm for what is in front, from the client's own header (WindowTitle). _driver.TitleBar.Changed += title => Dispatcher.UIThread.Post(() => Title = title); + + // Whether the window is in front decides whether an alert is shown at all, and the title's unread count. + Activated += (_, _) => _driver.Attention.SetFocused(true); + Deactivated += (_, _) => _driver.Attention.SetFocused(false); + _driver.Attention.Requested += request => Dispatcher.UIThread.Post(() => + { + if (!IsActive) + { + DesktopAlert.Show(request, TryGetPlatformHandle()?.Handle); + } + }); _driver.Settings.Owner = this; // The window's own pop-ups (tooltips, the right-click menu) follow the client's theme: a light menu diff --git a/src/SharpMUTerm.Avalonia/WindowAttention.cs b/src/SharpMUTerm.Avalonia/WindowAttention.cs new file mode 100644 index 00000000..b8c12a24 --- /dev/null +++ b/src/SharpMUTerm.Avalonia/WindowAttention.cs @@ -0,0 +1,135 @@ +using System.ComponentModel; +using System.Diagnostics; +using System.Runtime.InteropServices; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Avalonia; + +/// +/// The window's half of . The main window says when it is activated and deactivated +/// (); the client hands a request over on its own thread, and the main window, which +/// subscribes to , puts it on screen on Avalonia's thread — but only while it is not the active +/// window, which is why is true. +/// +internal sealed class WindowAttention : IAttention +{ + private volatile int _focused = -1; + + public bool FiltersByFocus => true; + + public bool? Focused => _focused switch + { + 0 => false, + 1 => true, + _ => null, + }; + + public event Action? FocusChanged; + + /// Raised on the client's thread with each request. + public event Action? Requested; + + public void Request(AttentionRequest request) => Requested?.Invoke(request); + + /// Called by the main window on activation (true) and deactivation (false). + public void SetFocused(bool focused) + { + var value = focused ? 1 : 0; + if (Interlocked.Exchange(ref _focused, value) != value) + { + FocusChanged?.Invoke(focused); + } + } +} + +/// +/// What the desktop does with an alert: a notification, and on Windows the taskbar button's flash. Every way out of +/// the process is a fixed program with the text as separate arguments (), +/// never a shell string, and a missing program is a quiet no-op: an alert is a courtesy, never an error. +/// +/// Linux: notify-send (libnotify, on every desktop that runs a notification daemon). macOS: osascript, +/// the title and body passed as argv to a fixed script. Windows: FlashWindowEx until the window is +/// brought forward — a toast needs an installed AppUserModelID this client does not register. Avalonia has no +/// urgency API of its own, so an X11 window manager's urgency hint is not set. +/// +/// +internal static class DesktopAlert +{ + /// Shows for the window behind (null where there is none). + public static void Show(AttentionRequest request, IntPtr? handle) + { + try + { + if (OperatingSystem.IsWindows()) + { + if (handle is { } hwnd && hwnd != IntPtr.Zero) + { + Flash(hwnd); + } + + return; + } + + if (OperatingSystem.IsMacOS()) + { + Run("osascript", + ["-e", "on run argv", "-e", "display notification (item 2 of argv) with title (item 1 of argv)", "-e", "end run", + request.Title, request.Body]); + return; + } + + Run("notify-send", ["--app-name=SharpMUTerm", "--", request.Title, request.Body]); + } + catch (Exception ex) when (ex is Win32Exception or InvalidOperationException or PlatformNotSupportedException) + { + // No notifier on this machine: the title bar's count still says it. + } + } + + private static void Run(string program, IReadOnlyList arguments) + { + var start = new ProcessStartInfo(program) + { + UseShellExecute = false, + RedirectStandardOutput = true, + RedirectStandardError = true, + CreateNoWindow = true, + }; + foreach (var argument in arguments) + { + start.ArgumentList.Add(argument); + } + + using var process = Process.Start(start); + } + + private static void Flash(IntPtr hwnd) + { + var info = new FlashInfo + { + Size = (uint)Marshal.SizeOf(), + Window = hwnd, + Flags = FlashAll | FlashUntilForeground, + Count = 0, + Timeout = 0, + }; + FlashWindowEx(ref info); + } + + private const uint FlashAll = 3; + private const uint FlashUntilForeground = 12; + + [StructLayout(LayoutKind.Sequential)] + private struct FlashInfo + { + public uint Size; + public IntPtr Window; + public uint Flags; + public uint Count; + public uint Timeout; + } + + [DllImport("user32.dll")] + [return: MarshalAs(UnmanagedType.Bool)] + private static extern bool FlashWindowEx(ref FlashInfo info); +} diff --git a/src/SharpMUTerm.Avalonia/WindowHost.cs b/src/SharpMUTerm.Avalonia/WindowHost.cs index 96afa612..20e83fae 100644 --- a/src/SharpMUTerm.Avalonia/WindowHost.cs +++ b/src/SharpMUTerm.Avalonia/WindowHost.cs @@ -89,5 +89,8 @@ internal static class WindowHost // A panel popped out is a window of its own, owned by the main one, for a second monitor. FloatingPanels = driver.Floating, + + // A page while the window is behind another: a desktop notification and the taskbar's attention state. + Attention = driver.Attention, }; } diff --git a/src/SharpMUTerm.Client/Chrome/WindowTitle.cs b/src/SharpMUTerm.Client/Chrome/WindowTitle.cs index 9826bab9..f4d487b6 100644 --- a/src/SharpMUTerm.Client/Chrome/WindowTitle.cs +++ b/src/SharpMUTerm.Client/Chrome/WindowTitle.cs @@ -40,6 +40,17 @@ public static string For(string? character, string? world) }; } + /// The most a title's unread count says before it reads 99+. + public const int MaxUnread = 99; + + /// + /// led by how many lines arrived while the window was behind another — + /// (3) Corvid@Aetherfall — SharpMUTerm — or the title alone for none. Capped at 99+, so a busy + /// channel does not retitle the window with every line. + /// + public static string WithUnread(string title, int unread) => + unread <= 0 ? title : $"({(unread > MaxUnread ? $"{MaxUnread}+" : unread.ToString(System.Globalization.CultureInfo.InvariantCulture))}) {title}"; + private static string Clean(string? text) { if (string.IsNullOrWhiteSpace(text)) diff --git a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs index 98259241..a0461661 100644 --- a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs +++ b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs @@ -20,6 +20,9 @@ public static class BuiltInCommands /// The command that moves the keyboard into the connection sidebar (⌥C). public const string RailKeysCommand = "layout:rail-keys"; + /// Cancels a dropped connection's waiting reconnect. + public const string StopReconnectCommand = "world:stop-reconnect"; + /// /// Turns F5's join wraps on for the world named after the prefix: the action of the notice that says a pane is /// narrower than the server's wrap column. Lists nothing on ⌃P (F5 is the setting's home). @@ -76,6 +79,10 @@ void Family(string id, string prefix, Func c.State.Reconnecting); Family("world:send-group", CommandIds.GroupPrefix, SendGroup); Family("world:join-wraps", JoinWrapsPrefix, _ => []); Add("world:reload-scripts", CommandGroup.World, "Reload scripts", diff --git a/src/SharpMUTerm.Client/Settings/BuiltInLists.cs b/src/SharpMUTerm.Client/Settings/BuiltInLists.cs index 469ff55c..d3e31228 100644 --- a/src/SharpMUTerm.Client/Settings/BuiltInLists.cs +++ b/src/SharpMUTerm.Client/Settings/BuiltInLists.cs @@ -163,6 +163,9 @@ public static partial class BuiltInSettings }, ItemFlag("gag", "gag line", DeliveryGroup, t => t.Actions.Gag, (t, v) => t.Actions.Gag = v, "keep the line out of its usual window", "hide suppress", () => NewTrigger()), + ItemFlag("alert", "alert me", DeliveryGroup, t => t.Actions.Alert, (t, v) => t.Actions.Alert = v, + "tell the desktop when this matches while you are in another window", "notify notification bell flash", + () => NewTrigger()), ItemText("rewrite", "rewrite", TextRule.Template, ActionsGroup, (_, t) => t.Actions.Rewrite, (_, t, v) => t.Actions.Rewrite = v, diff --git a/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs b/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs index 00598bb5..0ac15685 100644 --- a/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs +++ b/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs @@ -35,6 +35,9 @@ public static partial class BuiltInSettings /// The status row's meters. public const string MetersGroup = "Status row & meters"; + /// Telling the desktop while the player is in another window. + public const string AlertsGroup = "Alerts"; + /// The bar marking where a reader left a window. public const string ActivityGroup = "Activity"; @@ -116,6 +119,11 @@ public static partial class BuiltInSettings c => c.Text.ActivityBarSeconds, (c, v) => c.Text.ActivityBarSeconds = v, "how long the NEW bar stays once you are back; 0 retires it at once", "unread new away"), + Flag("alerts", "alert when away", AlertsGroup, + c => c.Text.AlertWhenAway, (c, v) => c.Text.AlertWhenAway = v, + "tell the desktop when an alert trigger or a page arrives while you are in another window", + "notify notification bell flash urgent page tell mention"), + Flag("split-scrollback", "split the pane when scrolled back", ScrollbackGroup, c => c.Text.SplitScrollback, (c, v) => c.Text.SplitScrollback = v, "keep the newest lines in view below the history you are reading", "live tail history split"), @@ -235,6 +243,10 @@ public static partial class BuiltInSettings (_, w) => w.GmcpLogin ? WorldFieldValues.LoginChoices[1] : WorldFieldValues.LoginChoices[0], (_, w, v) => w.GmcpLogin = v == WorldFieldValues.LoginChoices[1], "log in over GMCP when the server offers it", "char.login password credentials"), + WorldChoice("reconnect", "reconnect", WorldFieldValues.ReconnectChoices, ConnectionGroup, + (_, w) => w.AutoReconnect ? WorldFieldValues.ReconnectChoices[1] : WorldFieldValues.ReconnectChoices[0], + (_, w, v) => w.AutoReconnect = v == WorldFieldValues.ReconnectChoices[1], + "dial again after a dropped connection, 5 s to 60 s apart, five tries", "auto reconnect drop retry"), WorldChoice("discord", "discord", WorldFieldValues.DiscordChoices, ProtocolGroup, (_, w) => w.DiscordPresence ? WorldFieldValues.DiscordChoices[1] : WorldFieldValues.DiscordChoices[0], (_, w, v) => w.DiscordPresence = v == WorldFieldValues.DiscordChoices[1], @@ -247,6 +259,14 @@ public static partial class BuiltInSettings (_, w) => w.JoinWrappedLines ? WorldFieldValues.JoinWrapChoices[1] : WorldFieldValues.JoinWrapChoices[0], (_, w, v) => w.JoinWrappedLines = v == WorldFieldValues.JoinWrapChoices[1], "join lines the server wrapped at its own width", "reflow wrap hard"), + WorldChoice("stacking", "command stacking", WorldFieldValues.SeparatorChoices, WorldTextGroup, + (_, w) => WorldFieldValues.SeparatorName(w.CommandSeparator), + (_, w, v) => w.CommandSeparator = WorldFieldValues.SeparatorOf(v), + "split a typed line on this, and #3 cmd repeats one; off for a MUSH", "separator semicolon repeat speedwalk"), + WorldChoice("alert-on", "alert on", WorldFieldValues.AlertChoices, WorldTextGroup, + (_, w) => w.AlertOnName ? WorldFieldValues.AlertChoices[1] : WorldFieldValues.AlertChoices[0], + (_, w, v) => w.AlertOnName = v == WorldFieldValues.AlertChoices[1], + "tell the desktop when a line names your character or pages you", "notify mention page tell"), WorldText("edit-grab", "edit grab", TextRule.Optional, WorldTextGroup, (_, w) => w.GrabPrefix, (_, w, v) => w.GrabPrefix = v, "a line starting with this goes on the command line instead of the output", "fugueedit mush edit prefix"), diff --git a/src/SharpMUTerm.Client/Settings/WorldFieldValues.cs b/src/SharpMUTerm.Client/Settings/WorldFieldValues.cs index a8fc3051..6547186c 100644 --- a/src/SharpMUTerm.Client/Settings/WorldFieldValues.cs +++ b/src/SharpMUTerm.Client/Settings/WorldFieldValues.cs @@ -83,6 +83,26 @@ public static void SetEmoji(EmojiSettings emoji, string name) /// The words for . public static IReadOnlyList JoinWrapChoices { get; } = ["off", "join"]; + /// The words for . + public static IReadOnlyList ReconnectChoices { get; } = ["off", "after a drop"]; + + /// The words for . + public static IReadOnlyList AlertChoices { get; } = ["off", "name & pages"]; + + /// + /// The words for : off, or the separator itself. A closed list, so a + /// separator is never a letter or a space that would split ordinary text. + /// + public static IReadOnlyList SeparatorChoices { get; } = ["off", ";", "|", ";;"]; + + /// The stacking row's word for . + public static string SeparatorName(string? separator) => + separator is { Length: > 0 } s && SeparatorChoices.Contains(s) ? s : SeparatorChoices[0]; + + /// The separator names, or null for off. + public static string? SeparatorOf(string name) => + name != SeparatorChoices[0] && SeparatorChoices.Contains(name) ? name : null; + /// What a world's layout row says while it names none. public const string WorldLayoutDefault = "(suggested)"; diff --git a/src/SharpMUTerm.Core/Automation/AttentionMatcher.cs b/src/SharpMUTerm.Core/Automation/AttentionMatcher.cs new file mode 100644 index 00000000..14b49d53 --- /dev/null +++ b/src/SharpMUTerm.Core/Automation/AttentionMatcher.cs @@ -0,0 +1,113 @@ +using System.Text.RegularExpressions; + +namespace SharpMUTerm.Core.Automation; + +/// Why a line asked for the player's attention. +public enum AttentionReason +{ + /// A trigger marked alert matched it. + Trigger, + + /// It names the player's character. + Name, + + /// It is a page, a tell or a whisper to the player. + Page, +} + +/// A line that asked for attention, and why. +public sealed class AttentionEventArgs(AttentionReason reason, string text) : EventArgs +{ + public AttentionReason Reason { get; } = reason; + + /// The line as it is shown. + public string Text { get; } = text; +} + +/// +/// The built-in "my name and pages" rule a world opts into (). +/// +/// A page or a tell is read off the shapes the common servers use, anchored at the start of the line: +/// Bob pages: … and From afar, Bob … (PennMUSH, TinyMUX), Bob tells you … (Diku and its +/// family), Bob whispers: … / Bob whispers to you …. A line starting You is the player's own. +/// +/// +/// The name counts as a whole word, case ignored, anywhere but the start of the line: a MUSH shows the +/// player their own pose as Corvid waves., and every one of those would otherwise be an alert. A name shorter +/// than two letters is never matched. The client's own echo and system lines are not output and never reach this. +/// +/// +public static partial class AttentionMatcher +{ + /// Why asks for attention for , or null. + public static AttentionReason? Classify(string line, string? character) + { + ArgumentNullException.ThrowIfNull(line); + if (line.StartsWith("You ", StringComparison.OrdinalIgnoreCase)) + { + return null; + } + + if (PagePattern().IsMatch(line)) + { + return AttentionReason.Page; + } + + if (character is { } name && name.Trim().Length >= 2 && MentionsName(line, name.Trim())) + { + return AttentionReason.Name; + } + + return null; + } + + private static bool MentionsName(string line, string name) + { + for (var at = line.IndexOf(name, 1, StringComparison.OrdinalIgnoreCase); + at > 0; + at = at + 1 < line.Length ? line.IndexOf(name, at + 1, StringComparison.OrdinalIgnoreCase) : -1) + { + var before = line[at - 1]; + var end = at + name.Length; + if (!char.IsLetterOrDigit(before) && before != '_' + && (end >= line.Length || (!char.IsLetterOrDigit(line[end]) && line[end] != '_'))) + { + return true; + } + } + + return false; + } + + [GeneratedRegex( + @"^(?:From afar, \S|\S+ pages(?:[:,]| you\b)|\S+ tells you\b|\S+ whispers(?::| to you\b))", + RegexOptions.IgnoreCase | RegexOptions.CultureInvariant, + matchTimeoutMilliseconds: 100)] + private static partial Regex PagePattern(); +} + +/// +/// At most one alert per , so a channel spamming the player's name, or a trigger matching +/// every line of a fight, flashes the taskbar once rather than for ever. Not thread-safe: the app calls it on its own +/// thread. +/// +public sealed class AttentionThrottle(TimeProvider time) +{ + /// The shortest gap between two alerts. + public static readonly TimeSpan Interval = TimeSpan.FromSeconds(10); + + private DateTimeOffset? _last; + + /// True, and the clock starts again, when an alert may go now. + public bool TryTake() + { + var now = time.GetUtcNow(); + if (_last is { } last && now - last < Interval) + { + return false; + } + + _last = now; + return true; + } +} diff --git a/src/SharpMUTerm.Core/Automation/Trigger.cs b/src/SharpMUTerm.Core/Automation/Trigger.cs index 1042c826..d7ea3288 100644 --- a/src/SharpMUTerm.Core/Automation/Trigger.cs +++ b/src/SharpMUTerm.Core/Automation/Trigger.cs @@ -84,6 +84,13 @@ public sealed class TriggerActions /// public string? ScriptCallback { get; set; } + /// + /// Ask for the player's attention when this rule matches while they are in another window: a desktop + /// notification and a taskbar flash in the window, a notification or a bell in a terminal. Rate-limited and + /// switched off by F7 ▸ alert when away; matched lines that are gagged still alert, since the rule asked. + /// + public bool Alert { get; set; } + /// /// A copy of these actions. Every field is a value or an immutable string, so a member-wise copy /// really is a deep one — but it has to be written out rather than shared, because @@ -100,6 +107,7 @@ public sealed class TriggerActions SendResponse = SendResponse, SpawnTarget = SpawnTarget, ScriptCallback = ScriptCallback, + Alert = Alert, }; } diff --git a/src/SharpMUTerm.Core/Commands/CommandCatalog.cs b/src/SharpMUTerm.Core/Commands/CommandCatalog.cs index 1cba2e48..29f43751 100644 --- a/src/SharpMUTerm.Core/Commands/CommandCatalog.cs +++ b/src/SharpMUTerm.Core/Commands/CommandCatalog.cs @@ -37,6 +37,7 @@ public sealed record CharacterRef( /// Whether this client runs Lua at all, so Reload scripts is offered only where it can do something. /// /// Whether the focused connection is speedwalking, so Stop walking has a walk to stop. +/// Whether a dropped connection is waiting to dial again, so Stop reconnecting has one to stop. /// /// Null where the client cannot play sound, so no mute is offered; otherwise whether sound is playing /// (offer Mute sound) or muted (offer Unmute sound). @@ -63,6 +64,7 @@ public sealed record CommandContext( string NewlineChord = "Alt+⏎", bool ScriptsOn = false, bool Walking = false, + bool Reconnecting = false, bool? Sound = null, bool? Announced = null, bool OutputSelected = false, diff --git a/src/SharpMUTerm.Core/Configuration/PreferenceSettings.cs b/src/SharpMUTerm.Core/Configuration/PreferenceSettings.cs index 4c7df969..cd058ec9 100644 --- a/src/SharpMUTerm.Core/Configuration/PreferenceSettings.cs +++ b/src/SharpMUTerm.Core/Configuration/PreferenceSettings.cs @@ -163,6 +163,13 @@ public sealed class TextSettings /// public bool SplitScrollback { get; set; } = true; + /// + /// Whether a trigger marked alert, or a world's name-and-pages alert, may tell the desktop while the + /// player is in another window (F7 ▸ ALERTS, on by default). Nothing alerts until a trigger or a world asks for + /// it, so on costs nothing; off silences every alert at once, including the window title's unread count. + /// + public bool AlertWhenAway { get; set; } = true; + /// Thirty seconds: long enough to read a screenful, short enough not to become furniture. public const int DefaultActivityBarSeconds = 30; diff --git a/src/SharpMUTerm.Core/Configuration/WorldDefinition.cs b/src/SharpMUTerm.Core/Configuration/WorldDefinition.cs index 8b64c6dc..6e4f9417 100644 --- a/src/SharpMUTerm.Core/Configuration/WorldDefinition.cs +++ b/src/SharpMUTerm.Core/Configuration/WorldDefinition.cs @@ -189,6 +189,32 @@ public sealed class WorldDefinition /// public bool JoinWrappedLines { get; set; } + /// + /// Whether a connection this world dropped is dialled again on its own (F5 ▸ reconnect). Off by default. + /// Only a drop the player did not ask for counts: never after Disconnect, Reconnect or quitting, and never after a + /// server closed the connection within of a command the player + /// sent (a QUIT). The attempts back off () and stop after the + /// last one; a connection must last before the count starts again, + /// so a login the server refuses is not retried for ever. + /// + public bool AutoReconnect { get; set; } + + /// + /// What splits a typed line into several commands (F5 ▸ command stacking), or null for nothing, the + /// default. While it is set, #N command repeats a command too (). Off by + /// default because a MUSH spends both: ; is a semipose and an attribute separator, and #123 cmd is + /// PennMUSH's force shorthand. Applied only to what the player types on the command line, never to a composed + /// post, a grab or a script's world.send. + /// + public string? CommandSeparator { get; set; } + + /// + /// Whether a line naming this world's character, or a page or a tell, asks for attention while the player is in + /// another window (F5 ▸ alert on; ). Off by default. A trigger can + /// ask for the same with its own alert flag on any world. + /// + public bool AlertOnName { get; set; } + /// /// The world's accent colour, used to keep its windows traceable to their owner once they /// scatter across panes. Default resolves to a theme-derived accent. @@ -240,6 +266,9 @@ public sealed class WorldDefinition DownloadMedia = DownloadMedia, GrabPrefix = GrabPrefix, JoinWrappedLines = JoinWrappedLines, + AutoReconnect = AutoReconnect, + CommandSeparator = CommandSeparator, + AlertOnName = AlertOnName, GmcpLogin = GmcpLogin, DiscordPresence = DiscordPresence, Layout = Layout, diff --git a/src/SharpMUTerm.Core/Input/TypedCommands.cs b/src/SharpMUTerm.Core/Input/TypedCommands.cs new file mode 100644 index 00000000..d0f08de6 --- /dev/null +++ b/src/SharpMUTerm.Core/Input/TypedCommands.cs @@ -0,0 +1,151 @@ +using System.Globalization; +using System.Text; + +namespace SharpMUTerm.Core.Input; + +/// +/// What one typed line becomes once a world's command stacking is applied +/// (): the commands to run, in order, or the reason none +/// will run. +/// +/// Each command, before alias expansion. Empty when is set. +/// Why nothing is sent, or null. +public sealed record TypedExpansion(IReadOnlyList Commands, string? Refusal = null); + +/// +/// Command stacking for a typed line: n;e;e is three commands and #3 kill rat is one command three +/// times, the way every MUD client reads them. Applied by WorldSession.SendTypedAsync — what the command line +/// sends — and nowhere else: a composed post, a grab and a script's world.send go out as written. +/// +/// Off unless the world names a separator, and the repeat comes with it, because a MUSH spends both: ; +/// is a semipose and separates attribute actions, and #123 command is PennMUSH's force shorthand. A world with +/// no separator gets the line back untouched. +/// +/// +/// \ before the separator makes it literal (say a\;b says a;b); any other backslash is left +/// alone. Each command is trimmed and empty ones are dropped. A repeat is 1 to , and a line +/// may not come to more than commands: past either bound nothing is sent, because +/// half of a stacked line is a line the player did not type. +/// +/// +public static class TypedCommands +{ + /// The most times #N repeats a command. + public const int MaxRepeat = 100; + + /// The most commands one typed line may come to, repeats included. + public const int MaxCommands = 100; + + /// Splits and repeats by ; null or blank changes nothing. + public static TypedExpansion Expand(string input, string? separator) + { + ArgumentNullException.ThrowIfNull(input); + if (string.IsNullOrWhiteSpace(separator)) + { + return new TypedExpansion([input]); + } + + var pieces = Split(input, separator); + if (pieces.Count == 0) + { + return new TypedExpansion([input]); + } + + var commands = new List(); + foreach (var piece in pieces) + { + if (Repeat(piece) is { } repeat) + { + if (repeat.Count is < 1 or > MaxRepeat) + { + return Refused($"#{repeat.Count} is not a repeat this client sends (1 to {MaxRepeat}) — nothing was sent"); + } + + for (var i = 0; i < repeat.Count; i++) + { + commands.Add(repeat.Command); + } + } + else + { + commands.Add(piece); + } + + if (commands.Count > MaxCommands) + { + return Refused($"that line comes to more than {MaxCommands} commands — nothing was sent"); + } + } + + return new TypedExpansion(commands); + } + + private static TypedExpansion Refused(string why) => new([], why); + + private static List Split(string input, string separator) + { + var pieces = new List(); + var current = new StringBuilder(); + for (var i = 0; i < input.Length; i++) + { + if (input[i] == '\\' && string.CompareOrdinal(input, i + 1, separator, 0, separator.Length) == 0) + { + current.Append(separator); + i += separator.Length; + continue; + } + + if (string.CompareOrdinal(input, i, separator, 0, separator.Length) == 0) + { + Add(pieces, current); + i += separator.Length - 1; + continue; + } + + current.Append(input[i]); + } + + Add(pieces, current); + return pieces; + + static void Add(List pieces, StringBuilder current) + { + var piece = current.ToString().Trim(); + current.Clear(); + if (piece.Length > 0) + { + pieces.Add(piece); + } + } + } + + /// #N command: the count and the command, or null for anything else (# alone, #abc). + private static (int Count, string Command)? Repeat(string piece) + { + if (piece.Length < 3 || piece[0] != '#') + { + return null; + } + + var digits = 1; + while (digits < piece.Length && char.IsAsciiDigit(piece[digits])) + { + digits++; + } + + if (digits == 1 || digits >= piece.Length || !char.IsWhiteSpace(piece[digits])) + { + return null; + } + + var command = piece[digits..].Trim(); + if (command.Length == 0) + { + return null; + } + + // Past int's range is just "too many", which the caller refuses. + var count = digits > 6 ? int.MaxValue : int.Parse(piece.AsSpan(1, digits - 1), CultureInfo.InvariantCulture); + return (count, command); + } +} diff --git a/src/SharpMUTerm.Core/Session/AutoReconnect.cs b/src/SharpMUTerm.Core/Session/AutoReconnect.cs new file mode 100644 index 00000000..c93646ae --- /dev/null +++ b/src/SharpMUTerm.Core/Session/AutoReconnect.cs @@ -0,0 +1,275 @@ +namespace SharpMUTerm.Core.Session; + +/// How a connection ended (). +public enum SessionClose +{ + /// No connection has ended yet. + None, + + /// The player closed it: Disconnect, Reconnect, quitting, closing the session. + Player, + + /// The server closed it in an orderly way. + Server, + + /// It failed: reset, timed out, a keepalive went unanswered. + Failed, +} + +/// What an just did. +public enum ReconnectStep +{ + /// A try is waiting for its time (). + Scheduled, + + /// A try is dialling now. + Dialling, + + /// The connection is back. + Connected, + + /// The last try failed; nothing more will be tried until the player connects. + GaveUp, + + /// The player stopped it, or connected by hand. + Cancelled, +} + +/// +/// Dials a dropped connection again, for a world that asks for it (). +/// One per session; it listens to the session's state and commands and does nothing until a connection ends. +/// +/// A drop is a connection that ended without the player asking. never +/// reconnects. Neither does within of a command the player +/// sent: a server that closes the socket straight after QUIT or @quit is saying goodbye, and dialling it +/// back would log the player in again. A server closing on its own (a reboot, an idle timeout) and every failure do +/// reconnect. That last-command rule errs towards not dialling: a reboot in the seconds after a command is +/// missed, and ⌥R is one key. Mudlet's rule — every close but the player's — dials straight back after a logout. +/// +/// +/// Tries back off and run out (: 5, 15, 30, 60, 60 seconds). A connection has to last +/// before the count starts again, so a server that takes the connection and then refuses the +/// login is tried five times and left alone, rather than for ever. A try that fails to connect counts as one. +/// +/// +/// Runs on whatever thread the session raises on and the clock fires on; is raised outside its +/// lock, and a host marshals it. +/// +/// +public sealed class AutoReconnect : IDisposable +{ + /// The wait before each try, in order; there are as many tries as entries. + public static readonly IReadOnlyList Delays = + [ + TimeSpan.FromSeconds(5), TimeSpan.FromSeconds(15), TimeSpan.FromSeconds(30), TimeSpan.FromSeconds(60), + TimeSpan.FromSeconds(60), + ]; + + /// How long a connection must last before the tries are counted from the first again. + public static readonly TimeSpan StableAfter = TimeSpan.FromSeconds(60); + + /// A server closing this soon after a command the player sent is a logout, not a drop. + public static readonly TimeSpan LogoutWindow = TimeSpan.FromSeconds(10); + + private readonly WorldSession _session; + private readonly TimeProvider _time; + private readonly Func _connect; + private readonly Lock _gate = new(); + private ConnectionState _state; + private DateTimeOffset _connectedAt; + private DateTimeOffset? _lastCommandAt; + private ITimer? _timer; + private int _tries; + private bool _dialling; + private bool _disposed; + + /// The session to watch. + /// The clock the waits are measured on. + /// Dials the session; a failure is the session's to report, and counts as a try. + public AutoReconnect(WorldSession session, TimeProvider time, Func connect) + { + _session = session ?? throw new ArgumentNullException(nameof(session)); + _time = time ?? throw new ArgumentNullException(nameof(time)); + _connect = connect ?? throw new ArgumentNullException(nameof(connect)); + _state = session.State; + session.StateChanged += OnStateChanged; + session.CommandSent += OnCommandSent; + } + + /// Raised with each step; never under the lock. + public event EventHandler? Changed; + + /// When the waiting try dials, or null when none is waiting. + public DateTimeOffset? DueAt { get; private set; } + + /// The try waiting or dialling, from 1; 0 when none is. + public int Try { get; private set; } + + /// Whether a try is waiting or dialling. + public bool IsActive => DueAt is not null || _dialling; + + /// The whole seconds until the waiting try dials, rounded up, or null. + public int? SecondsLeft => + DueAt is { } due ? Math.Max(0, (int)Math.Ceiling((due - _time.GetUtcNow()).TotalSeconds)) : null; + + /// Stops a waiting try and forgets the count. Does nothing when none is waiting. + public void Cancel() + { + bool cancelled; + lock (_gate) + { + cancelled = DueAt is not null || _dialling; + Reset(); + } + + if (cancelled) + { + Changed?.Invoke(this, ReconnectStep.Cancelled); + } + } + + public void Dispose() + { + lock (_gate) + { + _disposed = true; + Reset(); + } + + _session.StateChanged -= OnStateChanged; + _session.CommandSent -= OnCommandSent; + } + + private void Reset() + { + _timer?.Dispose(); + _timer = null; + DueAt = null; + Try = 0; + _tries = 0; + _dialling = false; + } + + private void OnCommandSent(object? sender, string command) + { + lock (_gate) + { + _lastCommandAt = _time.GetUtcNow(); + } + } + + private void OnStateChanged(object? sender, ConnectionStateChangedEventArgs e) + { + ReconnectStep? step = null; + lock (_gate) + { + var was = _state; + _state = e.State; + if (_disposed) + { + return; + } + + var now = _time.GetUtcNow(); + switch (e.State) + { + case ConnectionState.Connected: + _connectedAt = now; + if (_dialling || DueAt is not null) + { + // Back, whether by our try or the player's own connect: nothing waits any more. The count + // is kept until the connection has lasted, so a login the server refuses still runs out. + _timer?.Dispose(); + _timer = null; + DueAt = null; + _dialling = false; + Try = 0; + step = ReconnectStep.Connected; + } + + break; + + case ConnectionState.Disconnected or ConnectionState.Faulted: + var droppedLive = was == ConnectionState.Connected; + var failedTry = _dialling && was == ConnectionState.Connecting; + if (!droppedLive && !failedTry) + { + break; + } + + _dialling = false; + if (droppedLive && now - _connectedAt >= StableAfter) + { + _tries = 0; + } + + if (!_session.World.AutoReconnect || IsGoodbye(now)) + { + Reset(); + break; + } + + step = Schedule(now); + break; + } + } + + if (step is { } raised) + { + Changed?.Invoke(this, raised); + } + } + + private bool IsGoodbye(DateTimeOffset now) => _session.LastClose switch + { + SessionClose.Player => true, + SessionClose.Server => _lastCommandAt is { } at && now - at <= LogoutWindow, + _ => false, + }; + + private ReconnectStep Schedule(DateTimeOffset now) + { + if (_tries >= Delays.Count) + { + Reset(); + return ReconnectStep.GaveUp; + } + + var delay = Delays[_tries]; + _tries++; + Try = _tries; + DueAt = now + delay; + _timer?.Dispose(); + _timer = _time.CreateTimer(_ => Fire(), null, delay, Timeout.InfiniteTimeSpan); + return ReconnectStep.Scheduled; + } + + private void Fire() + { + lock (_gate) + { + if (_disposed || DueAt is null) + { + return; + } + + DueAt = null; + _dialling = true; + } + + Changed?.Invoke(this, ReconnectStep.Dialling); + _ = DialAsync(); + } + + private async Task DialAsync() + { + try + { + await _connect(_session).ConfigureAwait(false); + } + catch (Exception) + { + // The session has printed and logged why; its Faulted state schedules the next try. + } + } +} diff --git a/src/SharpMUTerm.Core/Session/WorldSession.cs b/src/SharpMUTerm.Core/Session/WorldSession.cs index 6f50a638..e05b9ef7 100644 --- a/src/SharpMUTerm.Core/Session/WorldSession.cs +++ b/src/SharpMUTerm.Core/Session/WorldSession.cs @@ -25,6 +25,9 @@ public sealed class WorldSession : IAsyncDisposable private static readonly TextStyle SystemStyle = new(TerminalColor.FromIndex(6), TerminalColor.Default, TextAttributes.Italic); + /// The style of the client's own lines in a session's window (), for a demo that writes one by hand. + public static TextStyle SystemLineStyle => SystemStyle; + private readonly Func _sessionFactory; private ILineParser _parser; private EmojiSubstitutor? _emoji; @@ -608,6 +611,7 @@ public async Task ConnectAsync(CancellationToken cancellationToken = default) // Re-read with the parser, so an F5 change to the world's emoji switches reaches the next connection. _emoji = NewEmoji(World.Emoji); + _closingByPlayer = false; SetState(ConnectionState.Connecting, null); PrintSystem($"*** Connecting to {World.Host}:{World.Port}..."); @@ -940,8 +944,26 @@ private void ProcessOutputLine(StyledLine line, bool isPrompt = false) { Print(shown); } + + // Asked for by a rule (shown or not: the rule said so), or by the world for a line that mentions the + // character or pages them — only a line someone will see, and never a prompt. + var shownSomewhere = result.RouteMain || !result.Suppress || result.SpawnTargets.Count > 0; + var reason = result.Matched.Any(t => t.Actions.Alert) + ? AttentionReason.Trigger + : World.AlertOnName && shownSomewhere && !isPrompt ? AttentionMatcher.Classify(shown.Text, Character?.Name) : null; + if (reason is { } why) + { + AttentionRequested?.Invoke(this, new AttentionEventArgs(why, shown.Text)); + } } + /// + /// Raised on the read loop when a line asks for the player's attention: a trigger marked alert matched, + /// or (with ) the line names the character or pages them. Whether that + /// reaches the desktop — the player away, F7's switch, the rate limit — is the host's to decide. + /// + public event EventHandler? AttentionRequested; + /// /// Marks the plain-text URLs in a line clickable when F7's detect links is on; a no-op /// otherwise. Read here rather than at construction, like the settings around it, so unticking it @@ -967,9 +989,36 @@ private StyledLine ApplyEmoji(StyledLine line) => public async Task SendUserInputAsync(string input, CancellationToken cancellationToken = default) { ArgumentNullException.ThrowIfNull(input); + Echo(input); + await ExpandAndSendAsync(input, cancellationToken).ConfigureAwait(false); + } - var expansion = Aliases.Expand(input); + /// + /// Handles a line the player typed on the command line: the world's command stacking first + /// ( — n;e;e, #3 kill rat), then each command through + /// 's alias expansion. The line is echoed once, as typed. A composed post, a + /// grab and a script go through or instead, so a + /// ; in a post is never a command boundary. + /// + public async Task SendTypedAsync(string input, CancellationToken cancellationToken = default) + { + ArgumentNullException.ThrowIfNull(input); + var stacked = Input.TypedCommands.Expand(input, World.CommandSeparator); + Echo(input); + if (stacked.Refusal is { } refusal) + { + PrintSystem($"*** {refusal}"); + return; + } + foreach (var command in stacked.Commands) + { + await ExpandAndSendAsync(command, cancellationToken).ConfigureAwait(false); + } + } + + private void Echo(string input) + { // Two switches, and both have to be on: the world's (some servers echo for you, some don't) // and F8's app-wide one. The app-wide one is read per line, not captured, so unticking it // stops the echo on the next command rather than the next session. @@ -977,7 +1026,11 @@ public async Task SendUserInputAsync(string input, CancellationToken cancellatio { Print(StyledLine.FromText(input, EchoStyle)); } + } + private async Task ExpandAndSendAsync(string input, CancellationToken cancellationToken) + { + var expansion = Aliases.Expand(input); if (expansion.Matched) { if (expansion.Alias?.ScriptCallback is { Length: > 0 } callback && expansion.Match is { } match) @@ -1354,6 +1407,8 @@ private void OnDisconnected(object? sender, SessionDisconnectedEventArgs e) CancelGmcpLogin(); StopTimers(); ClearPrompt(); + LastClose = _closingByPlayer ? SessionClose.Player : e.IsClean ? SessionClose.Server : SessionClose.Failed; + _closingByPlayer = false; SetState(e.IsClean ? ConnectionState.Disconnected : ConnectionState.Faulted, e.Error); PrintSystem(e.IsClean ? "*** Disconnected." : $"*** Connection lost: {e.Error?.Message}"); } @@ -1388,6 +1443,7 @@ public async Task DisconnectAsync() { if (_telnet is not null) { + _closingByPlayer = true; await SendLeavingAsync().ConfigureAwait(false); await _telnet.DisconnectAsync().ConfigureAwait(false); } @@ -1481,8 +1537,18 @@ private ITelnetSession DefaultSessionFactory(ConnectionOptions options) }); } + /// + /// How the last connection ended, set before the state change that reports it: the player closed it + /// (Disconnect, Reconnect, quitting), the server closed it in an orderly way, or it failed. + /// until a connection has ended. What reads to tell a drop from a goodbye. + /// + public SessionClose LastClose { get; private set; } + + private volatile bool _closingByPlayer; + public async ValueTask DisposeAsync() { + _closingByPlayer = true; StopTimers(); Scheduler.Dispose(); DetachLog(); // flushes what the session logged before closing the file behind it diff --git a/src/SharpMUTerm.Tui/Hosting/ClientHost.cs b/src/SharpMUTerm.Tui/Hosting/ClientHost.cs index 8396649d..3315ce2a 100644 --- a/src/SharpMUTerm.Tui/Hosting/ClientHost.cs +++ b/src/SharpMUTerm.Tui/Hosting/ClientHost.cs @@ -147,6 +147,13 @@ internal sealed record ClientHost /// public required IFloatingPanels? FloatingPanels { get; init; } + /// + /// How the host tells the desktop that a page, a mention or an alert trigger arrived while the player was in another + /// window (): the window's notification and taskbar flash, the terminal's OSC 99, + /// OSC 777 or bell. Null in the snapshot, the tests and --plain, which must never reach a desktop. + /// + public required IAttention? Attention { get; init; } + /// /// Whether the terminal driver's input path can decode a focus report. Not on Windows: the Windows branch of /// NetConsoleDriver is a Console.ReadKey loop with its own reassembly, and an ESC [ I @@ -191,6 +198,7 @@ public static ClientHost Terminal(TerminalCapabilities capabilities) NativeModals = null, Title = new TerminalTitle(driver), FloatingPanels = null, + Attention = new TerminalAttention(driver, TerminalAttention.Detect()), }; /// @@ -220,6 +228,7 @@ public static ClientHost Terminal(TerminalCapabilities capabilities) NativeModals = null, Title = null, FloatingPanels = null, + Attention = null, }; /// @@ -269,6 +278,7 @@ internal static ClientHost HarnessTerminal( Audio = null, // a test never makes a noise Presence = null, // nor talks to Discord Title = null, // nor retitles the terminal running the suite + Attention = null, // nor rings its bell }; } diff --git a/src/SharpMUTerm.Tui/Hosting/TerminalAttention.cs b/src/SharpMUTerm.Tui/Hosting/TerminalAttention.cs new file mode 100644 index 00000000..cc77f072 --- /dev/null +++ b/src/SharpMUTerm.Tui/Hosting/TerminalAttention.cs @@ -0,0 +1,116 @@ +using System.Text; +using SharpConsoleUI.Drivers; + +namespace SharpMUTerm.Tui; + +/// An alert for the desktop: a short title (Corvid@Aetherfall — page) and the line that raised it. +internal sealed record AttentionRequest(string Title, string Body); + +/// +/// How a host tells the desktop that something wants the player while they are in another window +/// (): a notification and a taskbar flash in the window, a notification escape or a +/// bell in a terminal. The client decides whether to ask — a rule or a world asked, F7 allows it, the rate +/// limit has room, the player is not looking — and the host only says it. +/// +internal interface IAttention +{ + /// + /// True when the host itself shows a request only while it is not in front (kitty's o=unfocused, the + /// window's own focus), so the client need not guess at absence from the time since the last key. + /// + bool FiltersByFocus { get; } + + /// Whether the host is in front, as last known; null when it cannot tell (a terminal). + bool? Focused { get; } + + /// Raised, on any thread, when changes. + event Action? FocusChanged; + + /// Says . Called on the client's thread. + void Request(AttentionRequest request); +} + +/// Which escape a terminal shows a notification for. +internal enum TerminalNotify +{ + /// BEL: every terminal; most mark the window urgent while it is not in front. + Bell, + + /// OSC 777 ; notify ; title ; body: foot, WezTerm, Ghostty, urxvt's extension. + Osc777, + + /// OSC 99, kitty's desktop notifications, shown only while the window is not in front. + Osc99, +} + +/// +/// The terminal's way to get attention: kitty's OSC 99 where the terminal is kitty, OSC 777 where it is +/// one of the terminals that read it, else a bell. Written through the driver's one raw write that is serialised +/// against frame painting, the path and use. +/// +/// A terminal cannot tell the client it is in the background (its focus-out report is dropped by the +/// framework's parser, see ), so is null. kitty decides for +/// itself (o=unfocused); for the others the client asks only after a stretch with no input. +/// +/// +internal sealed class TerminalAttention(IConsoleDriver driver, TerminalNotify kind) : IAttention +{ + /// The longest a title or body is written into an escape. + internal const int MaxText = 200; + + private int _sequence; + + public bool FiltersByFocus => kind == TerminalNotify.Osc99; + + public bool? Focused => null; + + public event Action? FocusChanged + { + add { } + remove { } + } + + /// Which escape this terminal reads, from what it says about itself. + public static TerminalNotify Detect() + { + var term = Environment.GetEnvironmentVariable("TERM") ?? string.Empty; + var program = Environment.GetEnvironmentVariable("TERM_PROGRAM") ?? string.Empty; + if (term == "xterm-kitty" || !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("KITTY_WINDOW_ID"))) + { + return TerminalNotify.Osc99; + } + + return program.Equals("WezTerm", StringComparison.OrdinalIgnoreCase) + || program.Equals("ghostty", StringComparison.OrdinalIgnoreCase) + || term.StartsWith("foot", StringComparison.Ordinal) + || term == "xterm-ghostty" + ? TerminalNotify.Osc777 + : TerminalNotify.Bell; + } + + public void Request(AttentionRequest request) => + driver.WriteClipboardOsc52(Sequence(kind, request, ++_sequence)); + + /// The bytes for in 's escape. + internal static string Sequence(TerminalNotify kind, AttentionRequest request, int id) => kind switch + { + // kitty: the title, then the body, under one id; base64 so nothing in a game's line can end the escape early. + TerminalNotify.Osc99 => + $"\u001b]99;i=smt{id}:d=0:o=unfocused:e=1;{Base64(request.Title)}\u001b\\" + + $"\u001b]99;i=smt{id}:d=1:o=unfocused:p=body:e=1;{Base64(request.Body)}\u001b\\", + + // A ';' would start a new field, so it is written as a comma. + TerminalNotify.Osc777 => $"\u001b]777;notify;{Field(request.Title)};{Field(request.Body)}\u001b\\", + _ => "\a", + }; + + private static string Base64(string text) => Convert.ToBase64String(Encoding.UTF8.GetBytes(Clean(text))); + + private static string Field(string text) => Clean(text).Replace(';', ','); + + private static string Clean(string text) + { + var clean = new string(text.Where(c => !char.IsControl(c)).ToArray()).Trim(); + return clean.Length > MaxText ? clean[..(MaxText - 1)] + "…" : clean; + } +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Attention.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Attention.cs new file mode 100644 index 00000000..781d7d96 --- /dev/null +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Attention.cs @@ -0,0 +1,117 @@ +using SharpMUTerm.Core.Automation; +using SharpMUTerm.Core.Session; + +namespace SharpMUTerm.Tui; + +/// +/// Telling the desktop that something wants the player while they are in another window: a trigger marked +/// alert, or — on a world that opts in (F5 ▸ alert on) — a line that names the character or pages them +/// (). The host says it (); the client +/// decides whether to ask: +/// +/// F7 ▸ alert when away is on; +/// the player is not looking: the host says it is not in front, or — where the host cannot tell and does not +/// filter for itself (a terminal other than kitty) — nothing has been typed or clicked for ; +/// the rate limit has room (, one per ten seconds). +/// +/// +/// While a host that knows its focus is behind another window, the title carries a count of the lines that arrived +/// ((3) Corvid@Aetherfall — SharpMUTerm), the passive half of the same cue; it clears when the window comes +/// forward. +/// +/// +internal sealed partial class SharpMUTermApp +{ + /// With no focus to read, how long without input before the player counts as away. + internal static readonly TimeSpan AwayAfter = TimeSpan.FromSeconds(30); + + private AttentionThrottle? _attentionThrottle; + private bool? _hostFocused; + private int _unseenWhileAway; + private DateTimeOffset _lastAttendedAt; + + /// Every request handed to the host, for the tests. + internal List AttentionSent { get; } = []; + + /// How many lines arrived while the host was behind another window. + internal int UnseenWhileAway => _unseenWhileAway; + + /// Called by the constructor: listens to the host's focus. + private void WireAttention() + { + _lastAttendedAt = _time.GetUtcNow(); + if (Host.Attention is not { } attention) + { + return; + } + + _hostFocused = attention.Focused; + attention.FocusChanged += focused => OnUiThread(() => OnHostFocusChanged(focused)); + } + + private void OnHostFocusChanged(bool focused) + { + _hostFocused = focused; + if (focused) + { + _lastAttendedAt = _time.GetUtcNow(); + if (_unseenWhileAway > 0) + { + _unseenWhileAway = 0; + RepublishTitle(); + } + } + } + + /// The player did something: they are here. + private void NoteAttended() => _lastAttendedAt = _time.GetUtcNow(); + + /// A line landed in a pane; counted for the title while the host is behind another window. + private void NoteUnseenLine() + { + if (_hostFocused == false && _config.Text.AlertWhenAway) + { + _unseenWhileAway++; + RepublishTitle(); + } + } + + private void OnAttentionRequested(WorldSession session, AttentionEventArgs e) + { + if (!_config.Text.AlertWhenAway || Host.Attention is not { } host) + { + return; + } + + var focused = host.Focused ?? _hostFocused; + if (focused == true) + { + return; + } + + if (focused is null && !host.FiltersByFocus && _time.GetUtcNow() - _lastAttendedAt < AwayAfter) + { + return; + } + + _attentionThrottle ??= new AttentionThrottle(_time); + if (!_attentionThrottle.TryTake()) + { + return; + } + + var who = SharpMUTerm.Client.Chrome.WindowTitle.For(session.Character?.Name, session.World.Name); + var name = who.EndsWith(" — " + SharpMUTerm.Client.Chrome.WindowTitle.Product, StringComparison.Ordinal) + ? who[..^(SharpMUTerm.Client.Chrome.WindowTitle.Product.Length + 3)] + : who; + var why = e.Reason switch + { + AttentionReason.Page => "page", + AttentionReason.Name => "mentioned you", + _ => "alert", + }; + var request = new AttentionRequest($"{name} — {why}", e.Text); + AttentionSent.Add(request); + host.Request(request); + } +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Reconnect.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Reconnect.cs new file mode 100644 index 00000000..cf6b037d --- /dev/null +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Reconnect.cs @@ -0,0 +1,176 @@ +using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Core.Diagnostics; +using SharpMUTerm.Core.Session; +using SharpMUTerm.Core.Text; + +namespace SharpMUTerm.Tui; + +/// +/// Dialling a dropped connection again, for a world with F5 ▸ reconnect on. The rule — what counts as a drop, +/// the waits, when it gives up — is Core's (, one per session); this is how the client +/// says it: a line in the session's window and a notice for each try (its action stops them), and the status row's +/// state reading reconnecting in 12 s · ⌥R now while one waits, counted down each second. +/// +/// ⌥R while one waits dials at once (the wait is cancelled first); Disconnect or ⌃P ▸ Stop reconnecting cancels +/// it. A dial goes through , so the login is sent exactly as a connect by hand +/// would send it: auto-login if the character has it, nothing if not. +/// +/// +internal sealed partial class SharpMUTermApp +{ + /// Stops the focused connection's waiting reconnect. + internal const string StopReconnectCommand = SharpMUTerm.Client.Commands.BuiltInCommands.StopReconnectCommand; + + private readonly Dictionary _reconnects = []; + private ITimer? _reconnectTicker; + + /// The focused session's reconnect, for the tests and the catalog; null when the session has none. + internal AutoReconnect? ReconnectFor(WorldSession session) => _reconnects.GetValueOrDefault(session); + + private void StartReconnecting(WorldSession session) + { + if (_reconnects.ContainsKey(session)) + { + return; + } + + var auto = new AutoReconnect(session, _time, DialAgainAsync); + auto.Changed += (_, step) => OnUi(() => OnReconnectStep(session, auto, step)); + _reconnects[session] = auto; + } + + private void StopReconnecting(WorldSession session) + { + if (_reconnects.Remove(session, out var auto)) + { + auto.Dispose(); + } + } + + private async Task DialAgainAsync(WorldSession session) + { + await session.ConnectAsync().ConfigureAwait(false); + + // A freshly connected session has never been told a size (ReconnectAsync's reason). + OnUiThread(ReportPaneSizes); + } + + private void OnReconnectStep(WorldSession session, AutoReconnect auto, ReconnectStep step) + { + var title = SessionTitle(session); + switch (step) + { + case ReconnectStep.Scheduled when auto.SecondsLeft is { } seconds: + session.PrintSystem(ReconnectLine(seconds, auto.Try)); + Notice( + $"{title} dropped — reconnecting in {seconds} s · ⌥R now", + MessageSeverity.Info, + "⌥R", + new NoticeAction(StopReconnectCommand, "Stop")); + break; + + case ReconnectStep.GaveUp: + session.PrintSystem($"*** Stopped reconnecting after {AutoReconnect.Delays.Count} tries — ⌥R dials again."); + Notice($"{title} did not come back after {AutoReconnect.Delays.Count} tries — ⌥R dials again", MessageSeverity.Error, "⌥R"); + break; + } + + SyncReconnectTicker(); + UpdateStatus(); + } + + /// A one-second tick while any reconnect waits, so the status row counts down; stopped when none does. + private void SyncReconnectTicker() + { + var waiting = _reconnects.Values.Any(r => r.DueAt is not null); + if (waiting && _reconnectTicker is null) + { + _reconnectTicker = _time.CreateTimer( + _ => OnUiThread(OnReconnectTick), null, TimeSpan.FromSeconds(1), Timeout.InfiniteTimeSpan); + } + else if (!waiting && _reconnectTicker is not null) + { + _reconnectTicker.Dispose(); + _reconnectTicker = null; + } + } + + private void OnReconnectTick() + { + // Re-armed by hand each second rather than periodic, so a tick never queues behind a slow frame. + _reconnectTicker?.Change(TimeSpan.FromSeconds(1), Timeout.InfiniteTimeSpan); + SyncReconnectTicker(); + if (_active is { } session && ReconnectFor(session)?.DueAt is not null) + { + RefreshStatusBar(); + } + } + + /// + /// The status row's state while waits to dial again, or null. The seconds take a + /// two-digit field, so the row does not move as they count down. + /// + private string? ReconnectStatus(WorldSession? session) => + session is not null && ReconnectFor(session)?.SecondsLeft is { } seconds ? ReconnectState(seconds) + : session is null && _sessions.Sessions.Count == 0 && _demoReconnect is { } demo ? ReconnectState(demo) + : null; + + /// The status row's state for a reconnect away; one writer for the live row and the demo's. + internal static string ReconnectState(int seconds) => $"reconnecting in {seconds,2} s · ⌥R now"; + + /// The line a session's window gets when a try is scheduled; one writer for the live session and the demo's. + internal static string ReconnectLine(int seconds, int attempt) => + $"*** Reconnecting in {seconds} s (try {attempt} of {AutoReconnect.Delays.Count}) — ⌥R dials now, ⌃P ▸ Stop reconnecting."; + + /// The demo scene's waiting reconnect, in seconds: the `reconnect` view's, which has no live session to drop. + private int? _demoReconnect; + + /// + /// The `reconnect` view: Corvid's connection dropped and the second try waits twelve seconds. Written with the live + /// path's own writers (, ) because the demo has no session. + /// + private void ShowDemoReconnect() + { + _demoReconnect = 12; + AppendWindowLine(MainWindowId, StyledLine.FromText("*** Connection lost: Connection reset by peer", WorldSession.SystemLineStyle), StampNow()); + AppendWindowLine(MainWindowId, StyledLine.FromText("*** Connecting to aetherfall.mux:4201...", WorldSession.SystemLineStyle), StampNow()); + AppendWindowLine(MainWindowId, StyledLine.FromText("*** Connection failed: Connection refused", WorldSession.SystemLineStyle), StampNow()); + AppendWindowLine(MainWindowId, StyledLine.FromText(ReconnectLine(12, 2), WorldSession.SystemLineStyle), StampNow()); + _statusIdentity = ("Corvid", "aetherfall.mux", 4201, "faulted"); + RefreshStatusBar(); + SettleScroll(); + } + + /// Cancels 's waiting reconnect; true when there was one. + private bool CancelReconnect(WorldSession session) + { + if (ReconnectFor(session) is not { IsActive: true } auto) + { + return false; + } + + auto.Cancel(); + return true; + } + + /// ⌃P ▸ Stop reconnecting, and the notice's action: the focused connection's. + private void StopReconnectCommandRun() + { + if (SendTarget() is { } session && CancelReconnect(session)) + { + session.PrintSystem("*** Stopped reconnecting."); + Notice($"stopped reconnecting {SessionTitle(session)} — ⌥R dials it", MessageSeverity.Info, "⌥R"); + return; + } + + // The notice's action can arrive after focus moved: any one waiting is the one the notice was about. + if (_reconnects.FirstOrDefault(r => r.Value.IsActive) is { Key: { } other } && CancelReconnect(other)) + { + other.PrintSystem("*** Stopped reconnecting."); + Notice($"stopped reconnecting {SessionTitle(other)}", MessageSeverity.Info); + return; + } + + RefuseCommand("nothing is waiting to reconnect"); + } +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.SendGroup.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.SendGroup.cs index 1a54911c..205f0eda 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.SendGroup.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.SendGroup.cs @@ -75,7 +75,7 @@ private void SendToGroup() foreach (var session in reachable) { - _ = session.SendUserInputAsync(command); + _ = session.SendTypedAsync(command); // typed on the command line, so each world stacks it its own way } var kind = BarKind(bar); diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Title.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Title.cs index 49fb5dbc..d72bf52c 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Title.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Title.cs @@ -18,9 +18,24 @@ internal sealed partial class SharpMUTermApp /// What was last handed to the host, for the tests; null before the first header. internal string? ShownTitle => _shownTitle; + // The title for what is in front, before the unread count (SharpMUTermApp.Attention.cs) is put in front of it. + private string? _baseTitle; + private void PublishTitle(HeaderModel header) { - var title = SharpMUTerm.Client.Chrome.WindowTitle.For(header); + _baseTitle = SharpMUTerm.Client.Chrome.WindowTitle.For(header); + RepublishTitle(); + } + + /// Hands the host the title as it stands: the header's, led by the unread count while away. + private void RepublishTitle() + { + if (_baseTitle is not { } baseTitle) + { + return; + } + + var title = SharpMUTerm.Client.Chrome.WindowTitle.WithUnread(baseTitle, _unseenWhileAway); if (title == _shownTitle) { return; diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 6c896f39..ed7918ce 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -832,6 +832,7 @@ public SharpMUTermApp( // these two handlers is UI-thread state. OnUiThread runs inline when it already is one. _focus.Input += at => OnUiThread(() => NoteReaderInput(at)); _focus.Returned += away => OnUiThread(() => MarkWhereTheReaderLeft(away)); + WireAttention(); _header = Controls.Markup(HeaderMarkup()).StickyTop().Build(); _header.LinkClicked += (_, e) => OnChromeLinkClicked(e.Url); @@ -1158,6 +1159,12 @@ public string RenderSnapshot(string? view = null) LoadDemoScene(); _watching = true; + // A dropped connection waiting to dial again: the status row counts down in place of "faulted". + if (string.Equals(view, "reconnect", StringComparison.OrdinalIgnoreCase)) + { + ShowDemoReconnect(); + } + // The key tour row, as the first connect of a new configuration leaves it at the end of the window. if (string.Equals(view, "tour", StringComparison.OrdinalIgnoreCase)) { @@ -3170,6 +3177,7 @@ private void BindSession(WorldSession session, string? windowId = null) NoteSuggestionSignal(session, package); }); session.SpawnLine += (_, e) => OnUi(() => OnSpawnLine(session, e.Target, e.Line)); + session.AttentionRequested += (_, e) => OnUi(() => OnAttentionRequested(session, e)); session.MooEditReceived += (_, edit) => OnUi(() => ReceiveMooEdit(session, edit)); session.EditGrabbed += (_, text) => OnUi(() => ReceiveGrab(session, windowId, text)); session.McpStatusChanged += (_, _) => OnUi(() => @@ -3824,6 +3832,7 @@ private sealed class AwayMark /// private void NoteReaderInput(long at) { + NoteAttended(); foreach (var (windowId, buffer) in _lines) { _awayBoundary[windowId] = _awayPending.GetValueOrDefault(windowId); @@ -4986,6 +4995,7 @@ private void OnLine(WorldSession session, string windowId, StyledLine line) AppendSessionLine(windowId, line, stamp); RecordForRestore(session, windowId, WindowTitle(windowId), line, stamp); AnnounceLine(windowId, line.Text); + NoteUnseenLine(); if (!_workspace.IsCaughtUp(windowId)) { @@ -5046,6 +5056,7 @@ private void OnSpawnLine(WorldSession session, string target, StyledLine line) AppendSessionLine(window.Id, line, stamp); RecordForRestore(session, window.Id, window.Title, line, stamp); AnnounceLine(window.Id, line.Text); + NoteUnseenLine(); // A first-seen destination adds a tab to its pane, so rebuild; otherwise just refresh badges. if (existed) @@ -5150,7 +5161,7 @@ private void OnCommandEntered(InputBar bar, string command) // by the line quietly going to whichever world was active before you navigated. if (SendTarget() is { } target) { - _ = target.SendUserInputAsync(command); + _ = target.SendTypedAsync(command); return; } @@ -8319,6 +8330,7 @@ private CommandContext CommandState() NewlineChord: Host.Keys.Newline.Glyph, ScriptsOn: _scriptsRoot is not null, Walking: SendTarget() is { } walker && _recorders.TryGetValue(walker, out var map) && map.Walk.IsWalking, + Reconnecting: _reconnects.Values.Any(r => r.IsActive), Sound: CanPlaySound ? !_muted : null, Announced: Host.Announcer is null ? null : IsAnnounced(ActiveWindowId()), OutputSelected: HasOutputSelection, @@ -8838,6 +8850,9 @@ private bool RunBuiltInCommand(string id) case "world:disconnect": Disconnect(); break; + case StopReconnectCommand: + StopReconnectCommandRun(); + break; case "world:reload-scripts": ReloadScripts(); break; @@ -8905,6 +8920,7 @@ private void OnSessionAdded(object? sender, WorldSession session) { session.MsdpReports = StatusMeter.MsdpVariables(_config.Text.StatusMeters); WatchPresence(session); + StartReconnecting(session); StartMapping(session); StartSound(session); if (_scriptsRoot is null || _scripts.ContainsKey(session)) @@ -8920,6 +8936,7 @@ private void OnSessionAdded(object? sender, WorldSession session) private void OnSessionRemoved(object? sender, WorldSession session) { StopSound(session); + StopReconnecting(session); _sendGroup.Remove(session.SessionKey); if (_scripts.Remove(session, out var scripts)) { @@ -9422,6 +9439,8 @@ private void Reconnect() return; } + // A try waiting to dial is this key's job done sooner: the wait goes, and the dial is this one. + CancelReconnect(session); LastCommand = ReconnectAsync(session); } @@ -9477,6 +9496,14 @@ private void Disconnect() if (!session.IsConnected) { + // Not connected but waiting to dial again: Disconnect means "stay disconnected". + if (CancelReconnect(session)) + { + session.PrintSystem("*** Stopped reconnecting."); + Notice($"stopped reconnecting {SessionTitle(session)} — ⌥R dials it", MessageSeverity.Info, "⌥R"); + return; + } + RefuseCommand($"{SessionTitle(session)} is not connected"); return; } @@ -11918,6 +11945,7 @@ private bool RouteToInput(ConsoleKeyInfo key) /// private string? HandleWindowKey(KeyPressedEventArgs e) { + NoteAttended(); if (_moveMode) { HandleMoveKey(e); @@ -14004,6 +14032,8 @@ private void SyncStatusMeters() private string StatusBarMarkup(string character, string state) { + // A dropped connection waiting to dial again says when, in place of "faulted" (SharpMUTermApp.Reconnect.cs). + state = ReconnectStatus(_active) ?? state; var accent = ActiveWorld() is { } world ? AccentHex(world.Accent) : _ink.Accent; var left = $"[{accent}]●[/] [bold]{Escape(character)}[/] [dim]{Escape(state)}[/]"; // The vitals strip already draws these meters for this character, larger; the row says them only while it @@ -14211,6 +14241,13 @@ public async ValueTask DisposeAsync() _sizeFlushTimer?.Dispose(); // nothing left to tell a server we are shutting down to _noticeTimer?.Dispose(); // and no row left to put a notice back on _prefixTimer?.Dispose(); // and no window left to float a which-key panel over + _reconnectTicker?.Dispose(); // and no status row left to count down on + foreach (var reconnect in _reconnects.Values) + { + reconnect.Dispose(); // before the sessions, so no try dials a session being closed + } + + _reconnects.Clear(); _webImageCts?.Cancel(); _webImageCts?.Dispose(); _inlineImages.Dispose(); diff --git a/src/SharpMUTerm.Tui/SnapshotViews.cs b/src/SharpMUTerm.Tui/SnapshotViews.cs index 03f453ef..a114d7e1 100644 --- a/src/SharpMUTerm.Tui/SnapshotViews.cs +++ b/src/SharpMUTerm.Tui/SnapshotViews.cs @@ -28,6 +28,6 @@ internal static class SnapshotViews "collapsed", "timestamps", "timestamps-toggled", "theme-switched", "rail-keys", "prompt", "meters", "gamedata", "map", "map-walking", "map-split", "packages", "package-review", "package-browse", "send-menu", "layouts", "layout-combat", "layout-roleplay", "panel-who", "panel-vitals", "panel-quickbar", "panel-composer", - "welcome", "welcome-connect", "tour", + "welcome", "welcome-connect", "tour", "reconnect", ]; } diff --git a/src/SharpMUTerm.Tui/TriggersScreenRenderer.cs b/src/SharpMUTerm.Tui/TriggersScreenRenderer.cs index 527b0ecf..e9d98577 100644 --- a/src/SharpMUTerm.Tui/TriggersScreenRenderer.cs +++ b/src/SharpMUTerm.Tui/TriggersScreenRenderer.cs @@ -117,7 +117,7 @@ internal static class TriggersScreenRenderer ["name", "pattern", "route", "fg", "bg", "attributes", "rewrite", "respond", "script", "set", "match"]; /// The editor pane's check boxes by declared id, in the order the pane draws them. - internal static IReadOnlyList EditorFieldOrder { get; } = ["gag", "stop", "case"]; + internal static IReadOnlyList EditorFieldOrder { get; } = ["gag", "stop", "case", "alert"]; /// /// How many sample rows the live test always draws, matching or not, so the rows under it do not jump @@ -778,13 +778,15 @@ private static List BuildEditor( lines.Add(ActionRow("script", trigger.Actions.ScriptCallback, script)); lines.Add(string.Empty); - // The three rows below are real booleans on the trigger, and are the editor pane's navigable + // The four rows below are real booleans on the trigger, and are the editor pane's navigable // rows in this order. lines.Add(ScreenChrome.Cursor(Checkbox("gag line", trigger.Actions.Gag), cursor.IsOn(1, 0), width)); lines.Add(ScreenChrome.Cursor( Checkbox("stop processing", trigger.StopProcessing), cursor.IsOn(1, 1), width)); lines.Add(ScreenChrome.Cursor( Checkbox("case sensitive", trigger.CaseSensitive), cursor.IsOn(1, 2), width)); + lines.Add(ScreenChrome.Cursor( + Checkbox("alert me when away", trigger.Actions.Alert), cursor.IsOn(1, 3), width)); // Compacted before the dropdown is laid over it, not after: the overlay replaces rows by index, // so dropping a blank underneath it afterwards would slide the list off the field it belongs to. diff --git a/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs b/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs index e4e62262..b4879dda 100644 --- a/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs +++ b/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs @@ -104,6 +104,24 @@ internal static class WorldsScreenRenderer /// , as one of . internal const int JoinWrapsField = 16; + /// , as one of . + internal const int ReconnectField = 17; + + /// , as one of . + internal const int StackingField = 18; + + /// , as one of . + internal const int AlertOnField = 19; + + /// F5's words for . + internal static readonly IReadOnlyList ReconnectChoices = WorldFieldValues.ReconnectChoices; + + /// F5's words for . + internal static readonly IReadOnlyList SeparatorChoices = WorldFieldValues.SeparatorChoices; + + /// F5's words for . + internal static readonly IReadOnlyList AlertChoices = WorldFieldValues.AlertChoices; + /// F5's words for : off shows rows as the server sent them. internal static readonly IReadOnlyList JoinWrapChoices = WorldFieldValues.JoinWrapChoices; @@ -752,7 +770,8 @@ .. SecurityFieldOrder.Select(id => ScreenRow.Of(DeclaredFields.Toggle(DeclaredFi internal static readonly IReadOnlyList WorldFieldOrder = [ "name", "host", "port", "encoding", "keepalive", "gmcp-modules", "content", "emoji", "map-room", "map-exits", - "walk-fail", "sounds", "edit-grab", "gmcp-login", "discord", "layout", "join-wraps", + "walk-fail", "sounds", "edit-grab", "gmcp-login", "discord", "layout", "join-wraps", "reconnect", "stacking", + "alert-on", ]; /// The world's two security checkboxes, drawn in the WORLD block (), by declared id. @@ -1047,6 +1066,27 @@ world.GrabPrefix is { } grab cursor, selectedWorld, JoinWrapsField)), + WorldField("reconnect", Field( + world.AutoReconnect + ? $"[{Value}]{ReconnectChoices[1]} · 5 s to 60 s, five tries[/]" + : $"[{Label}]{ReconnectChoices[0]} · ⌥R dials again[/]", + cursor, + selectedWorld, + ReconnectField)), + WorldField("stacking", Field( + world.CommandSeparator is { } separator + ? $"[{Value}]{Escape(separator)} splits · #3 repeats[/]" + : $"[{Label}]{SeparatorChoices[0]} · lines go as typed[/]", + cursor, + selectedWorld, + StackingField)), + WorldField("alert on", Field( + world.AlertOnName + ? $"[{Value}]{AlertChoices[1]}[/]" + : $"[{Label}]{AlertChoices[0]} · alert triggers only[/]", + cursor, + selectedWorld, + AlertOnField)), string.Empty, $"[{accent}]├ CHARACTERS[/] [{Label}]a character is a connection[/]", }); diff --git a/tests/SharpMUTerm.Client.Tests/ListSettingsTests.cs b/tests/SharpMUTerm.Client.Tests/ListSettingsTests.cs index 4bcebef5..c287cdd9 100644 --- a/tests/SharpMUTerm.Client.Tests/ListSettingsTests.cs +++ b/tests/SharpMUTerm.Client.Tests/ListSettingsTests.cs @@ -53,7 +53,7 @@ public async Task TheListScreensAreDeclaredWithACollection() var triggers = BuiltInSettings.Triggers.Collection!.Fields.Select(f => f.Id).ToList(); await Assert.That(triggers).IsEquivalentTo( - new[] { "enabled", "name", "match", "pattern", "set", "route", "fg", "bg", "attributes", "gag", "rewrite", "respond", "script", "stop", "case" }); + new[] { "enabled", "name", "match", "pattern", "set", "route", "fg", "bg", "attributes", "gag", "alert", "rewrite", "respond", "script", "stop", "case" }); } [Test] diff --git a/tests/SharpMUTerm.Core.Tests/Automation/AttentionTests.cs b/tests/SharpMUTerm.Core.Tests/Automation/AttentionTests.cs new file mode 100644 index 00000000..a91b3f03 --- /dev/null +++ b/tests/SharpMUTerm.Core.Tests/Automation/AttentionTests.cs @@ -0,0 +1,96 @@ +using SharpMUTerm.Core.Automation; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Session; +using SharpMUTerm.Core.Tests.Session; + +namespace SharpMUTerm.Core.Tests.Automation; + +/// Which lines ask for the player's attention: an alert trigger, or a world's name-and-pages rule. +public class AttentionTests +{ + [Test] + [Arguments("Rivane pages: are you around?")] + [Arguments("Rivane pages you, \"hello\"")] + [Arguments("From afar, Rivane waves.")] + [Arguments("Rivane tells you 'meet me at the gate'")] + [Arguments("Rivane whispers: psst")] + [Arguments("Rivane whispers to you, \"psst\"")] + public async Task PagesTellsAndWhispersAreRecognised(string line) => + await Assert.That(AttentionMatcher.Classify(line, "Corvid")).IsEqualTo(AttentionReason.Page); + + [Test] + public async Task TheNameCountsAsAWholeWordAnywhereButTheStart() + { + await Assert.That(AttentionMatcher.Classify("Rivane says, \"corvid, look!\"", "Corvid")).IsEqualTo(AttentionReason.Name); + await Assert.That(AttentionMatcher.Classify("Rivane hands a map to Corvid.", "Corvid")).IsEqualTo(AttentionReason.Name); + + // The player's own pose, as a MUSH shows it back; a longer word containing the name; their own page. + await Assert.That(AttentionMatcher.Classify("Corvid waves.", "Corvid")).IsNull(); + await Assert.That(AttentionMatcher.Classify("The Corvidae nest is empty.", "Corvid")).IsNull(); + await Assert.That(AttentionMatcher.Classify("You paged Rivane with 'hi'.", "Corvid")).IsNull(); + await Assert.That(AttentionMatcher.Classify("A Z appears.", "Z")).IsNull(); + } + + [Test] + public async Task TheThrottleLetsOneAlertThroughPerInterval() + { + var time = new Mapping.ManualTimeProvider(); + var throttle = new AttentionThrottle(time); + + await Assert.That(throttle.TryTake()).IsTrue(); + await Assert.That(throttle.TryTake()).IsFalse(); + time.Advance(AttentionThrottle.Interval); + await Assert.That(throttle.TryTake()).IsTrue(); + } + + private static async Task<(FakeTelnetSession Telnet, List Raised)> Open(bool alertOnName, Trigger? trigger = null) + { + var telnet = new FakeTelnetSession(); + var world = new WorldDefinition { Name = "Aetherfall", Host = "h", Port = 1, AlertOnName = alertOnName }; + var set = new TriggerSet { Name = "s" }; + if (trigger is not null) + { + set.Triggers.Add(trigger); + } + + var session = new WorldSession(world, new CharacterDefinition { Name = "Corvid" }, [set], _ => telnet); + var raised = new List(); + session.AttentionRequested += (_, e) => raised.Add(e); + await session.ConnectAsync(); + return (telnet, raised); + } + + [Test] + public async Task AWorldThatOptsInIsToldOfAMentionAndAPage() + { + var (telnet, raised) = await Open(alertOnName: true); + + telnet.EmitLine("Rivane pages: hi"); + telnet.EmitLine("Rivane nods to Corvid."); + telnet.EmitLine("The fountain bubbles."); + + await Assert.That(raised.Select(e => e.Reason)).IsEquivalentTo([AttentionReason.Page, AttentionReason.Name]); + await Assert.That(raised[0].Text).IsEqualTo("Rivane pages: hi"); + } + + [Test] + public async Task AWorldThatDoesNotOptInIsToldOnlyOfAnAlertTrigger() + { + var trigger = new Trigger { Name = "attack", Pattern = "attacks you", Actions = { Alert = true, Gag = true } }; + var (telnet, raised) = await Open(alertOnName: false, trigger); + + telnet.EmitLine("Rivane pages: hi"); + telnet.EmitLine("A rat attacks you!"); + + await Assert.That(raised.Select(e => e.Reason)).IsEquivalentTo([AttentionReason.Trigger]); + } + + [Test] + public async Task TheAlertFlagIsCopiedWithTheRule() + { + var trigger = new Trigger { Name = "t", Pattern = "x", Actions = { Alert = true } }; + await Assert.That(trigger.Clone().Actions.Alert).IsTrue(); + await Assert.That(new WorldDefinition { AutoReconnect = true, CommandSeparator = ";", AlertOnName = true }.Clone() is + { AutoReconnect: true, CommandSeparator: ";", AlertOnName: true }).IsTrue(); + } +} diff --git a/tests/SharpMUTerm.Core.Tests/Input/TypedCommandsTests.cs b/tests/SharpMUTerm.Core.Tests/Input/TypedCommandsTests.cs new file mode 100644 index 00000000..df75c2e6 --- /dev/null +++ b/tests/SharpMUTerm.Core.Tests/Input/TypedCommandsTests.cs @@ -0,0 +1,118 @@ +using SharpMUTerm.Core.Automation; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Input; +using SharpMUTerm.Core.Session; +using SharpMUTerm.Core.Tests.Session; + +namespace SharpMUTerm.Core.Tests.Input; + +/// Command stacking for typed lines: n;e;e, #3 kill rat, and nothing at all on a world that has none. +public class TypedCommandsTests +{ + [Test] + public async Task WithNoSeparatorALineGoesAsTypedHashAndAll() + { + await Assert.That(TypedCommands.Expand("say a;b", null).Commands).IsEquivalentTo(["say a;b"]); + await Assert.That(TypedCommands.Expand("#123 @set me=x", null).Commands).IsEquivalentTo(["#123 @set me=x"]); + } + + [Test] + public async Task ASeparatorSplitsTrimsAndDropsEmptyCommands() + { + var result = TypedCommands.Expand("n; e ;;e;", ";"); + + await Assert.That(result.Refusal).IsNull(); + await Assert.That(result.Commands).IsEquivalentTo(["n", "e", "e"]); + } + + [Test] + public async Task ABackslashMakesTheSeparatorLiteral() + { + await Assert.That(TypedCommands.Expand(@"say a\;b;look", ";").Commands).IsEquivalentTo(["say a;b", "look"]); + await Assert.That(TypedCommands.Expand(@"say c:\dir", ";").Commands).IsEquivalentTo([@"say c:\dir"]); + } + + [Test] + public async Task AMultiCharacterSeparatorLeavesASingleOneAlone() + { + await Assert.That(TypedCommands.Expand("say a;b;;look", ";;").Commands).IsEquivalentTo(["say a;b", "look"]); + } + + [Test] + public async Task HashNRepeatsACommandWithinEachPiece() + { + await Assert.That(TypedCommands.Expand("#3 kill rat;#2 e", ";").Commands) + .IsEquivalentTo(["kill rat", "kill rat", "kill rat", "e", "e"]); + await Assert.That(TypedCommands.Expand("#abc;#;#5", ";").Commands).IsEquivalentTo(["#abc", "#", "#5"]); + } + + [Test] + public async Task ARepeatOutOfBoundsSendsNothingAtAll() + { + foreach (var line in new[] { "n;#0 e", "n;#101 e", "#99999999999 e" }) + { + var result = TypedCommands.Expand(line, ";"); + await Assert.That(result.Commands).IsEmpty(); + await Assert.That(result.Refusal).IsNotNull(); + } + } + + [Test] + public async Task ALineComingToMoreThanTheCapSendsNothing() + { + var result = TypedCommands.Expand("#100 n;e", ";"); + + await Assert.That(result.Commands).IsEmpty(); + await Assert.That(result.Refusal!).Contains("100"); + await Assert.That(TypedCommands.Expand("#100 n", ";").Commands.Count).IsEqualTo(100); + } + + private static (WorldSession Session, FakeTelnetSession Telnet) Connected(string? separator, params Alias[] aliases) + { + var telnet = new FakeTelnetSession(); + var world = new WorldDefinition { Name = "T", Host = "h", Port = 1, LocalEcho = true, CommandSeparator = separator }; + var set = new TriggerSet { Name = "s", Aliases = [.. aliases] }; + var session = new WorldSession(world, triggerSets: [set], sessionFactory: _ => telnet); + return (session, telnet); + } + + [Test] + public async Task ATypedLineIsStackedThenEachCommandIsAliasExpandedAndEchoedOnce() + { + var (session, telnet) = Connected(";", new Alias { Name = "k", Pattern = "^k (.+)$", Substitution = "kill $1" }); + await session.ConnectAsync(); + var echoed = new List(); + session.LinePrinted += (_, line) => echoed.Add(line.Text); + + await session.SendTypedAsync("#2 k rat;n"); + + await Assert.That(telnet.SentLines).IsEquivalentTo(["kill rat", "kill rat", "n"]); + await Assert.That(echoed).IsEquivalentTo(["#2 k rat;n"]); + } + + [Test] + public async Task APostAndAScriptAreNeverStacked() + { + var (session, telnet) = Connected(";"); + await session.ConnectAsync(); + + await session.SendUserInputAsync("+bbpost 1=Title/one; two"); + await session.SendRawAsync("say x;y"); + + await Assert.That(telnet.SentLines).IsEquivalentTo(["+bbpost 1=Title/one; two", "say x;y"]); + } + + [Test] + public async Task ARefusedLineSaysWhyAndSendsNothing() + { + var (session, telnet) = Connected(";"); + await session.ConnectAsync(); + var printed = new List(); + session.LinePrinted += (_, line) => printed.Add(line.Text); + + await session.SendTypedAsync("#500 n"); + + await Assert.That(telnet.SentLines).IsEmpty(); + await Assert.That(printed[^1]).Contains("nothing was sent"); + } +} diff --git a/tests/SharpMUTerm.Core.Tests/Session/AutoReconnectTests.cs b/tests/SharpMUTerm.Core.Tests/Session/AutoReconnectTests.cs new file mode 100644 index 00000000..17e1b4c9 --- /dev/null +++ b/tests/SharpMUTerm.Core.Tests/Session/AutoReconnectTests.cs @@ -0,0 +1,162 @@ +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Session; +using SharpMUTerm.Core.Tests.Mapping; + +namespace SharpMUTerm.Core.Tests.Session; + +/// Dialling a dropped connection again: what counts as a drop, the waits, and when it stops. +public class AutoReconnectTests +{ + private sealed class Rig + { + public required WorldSession Session { get; init; } + public required AutoReconnect Auto { get; init; } + public required ManualTimeProvider Time { get; init; } + public required List Wires { get; init; } + public List Steps { get; } = []; + public FakeTelnetSession Wire => Wires[^1]; + + /// When set, the next sockets refuse to connect. + public Exception? Refuse { get; set; } + } + + private static async Task Connected(bool autoReconnect = true) + { + var time = new ManualTimeProvider(); + var wires = new List(); + Rig? rig = null; + var world = new WorldDefinition { Name = "Aetherfall", Host = "h", Port = 1, AutoReconnect = autoReconnect }; + var session = new WorldSession(world, sessionFactory: _ => + { + var wire = new FakeTelnetSession { ConnectFault = rig?.Refuse }; + wires.Add(wire); + return wire; + }); + var auto = new AutoReconnect(session, time, s => s.ConnectAsync()); + rig = new Rig { Session = session, Auto = auto, Time = time, Wires = wires }; + auto.Changed += (_, step) => rig.Steps.Add(step); + await session.ConnectAsync(); + return rig; + } + + [Test] + public async Task ADropWaitsFiveSecondsThenDialsAndComesBack() + { + var rig = await Connected(); + + rig.Wire.Drop(new IOException("Connection reset by peer")); + + await Assert.That(rig.Session.LastClose).IsEqualTo(SessionClose.Failed); + await Assert.That(rig.Auto.SecondsLeft).IsEqualTo(5); + await Assert.That(rig.Auto.Try).IsEqualTo(1); + rig.Time.Advance(TimeSpan.FromSeconds(4)); + await Assert.That(rig.Wires.Count).IsEqualTo(1); + + rig.Time.Advance(TimeSpan.FromSeconds(1)); + + await Assert.That(rig.Wires.Count).IsEqualTo(2); + await Assert.That(rig.Session.State).IsEqualTo(ConnectionState.Connected); + await Assert.That(rig.Steps).IsEquivalentTo([ReconnectStep.Scheduled, ReconnectStep.Dialling, ReconnectStep.Connected]); + await Assert.That(rig.Auto.IsActive).IsFalse(); + } + + [Test] + public async Task AServerClosingOnItsOwnIsADropToo() + { + var rig = await Connected(); + + rig.Wire.Drop(); + + await Assert.That(rig.Session.LastClose).IsEqualTo(SessionClose.Server); + await Assert.That(rig.Auto.DueAt).IsNotNull(); + } + + [Test] + public async Task AServerClosingRightAfterACommandIsALogout() + { + var rig = await Connected(); + await rig.Session.SendCommandAsync("QUIT"); + rig.Time.Advance(TimeSpan.FromSeconds(2)); + + rig.Wire.Drop(); + + await Assert.That(rig.Auto.IsActive).IsFalse(); + await Assert.That(rig.Steps).IsEmpty(); + } + + [Test] + public async Task ThePlayersOwnDisconnectNeverReconnects() + { + var rig = await Connected(); + + await rig.Session.DisconnectAsync(); + rig.Time.Advance(TimeSpan.FromMinutes(5)); + + await Assert.That(rig.Session.LastClose).IsEqualTo(SessionClose.Player); + await Assert.That(rig.Wires.Count).IsEqualTo(1); + await Assert.That(rig.Steps).IsEmpty(); + } + + [Test] + public async Task AWorldThatDoesNotAskIsLeftAlone() + { + var rig = await Connected(autoReconnect: false); + + rig.Wire.Drop(new IOException("reset")); + rig.Time.Advance(TimeSpan.FromMinutes(5)); + + await Assert.That(rig.Wires.Count).IsEqualTo(1); + await Assert.That(rig.Steps).IsEmpty(); + } + + [Test] + public async Task FailedTriesBackOffAndRunOut() + { + var rig = await Connected(); + rig.Refuse = new IOException("Connection refused"); + rig.Wire.Drop(new IOException("reset")); + + var waits = new List(); + for (var i = 0; i < AutoReconnect.Delays.Count; i++) + { + waits.Add(rig.Auto.SecondsLeft ?? -1); + rig.Time.Advance(AutoReconnect.Delays[i]); + } + + await Assert.That(waits).IsEquivalentTo([5, 15, 30, 60, 60]); + await Assert.That(rig.Steps[^1]).IsEqualTo(ReconnectStep.GaveUp); + await Assert.That(rig.Auto.IsActive).IsFalse(); + rig.Time.Advance(TimeSpan.FromMinutes(10)); + await Assert.That(rig.Wires.Count).IsEqualTo(1 + AutoReconnect.Delays.Count); + } + + [Test] + public async Task AConnectionThatDropsAgainAtOnceKeepsCountingButOneThatLastedStartsOver() + { + var rig = await Connected(); + rig.Wire.Drop(new IOException("reset")); + rig.Time.Advance(TimeSpan.FromSeconds(5)); + rig.Wire.Drop(new IOException("reset")); // refused login, say: straight back out + + await Assert.That(rig.Auto.SecondsLeft).IsEqualTo(15); + + rig.Time.Advance(TimeSpan.FromSeconds(15)); + rig.Time.Advance(AutoReconnect.StableAfter); + rig.Wire.Drop(new IOException("reset")); + + await Assert.That(rig.Auto.SecondsLeft).IsEqualTo(5); + } + + [Test] + public async Task CancelStopsTheWaitingTry() + { + var rig = await Connected(); + rig.Wire.Drop(new IOException("reset")); + + rig.Auto.Cancel(); + rig.Time.Advance(TimeSpan.FromMinutes(1)); + + await Assert.That(rig.Wires.Count).IsEqualTo(1); + await Assert.That(rig.Steps[^1]).IsEqualTo(ReconnectStep.Cancelled); + } +} diff --git a/tests/SharpMUTerm.Core.Tests/Session/FakeTelnetSession.cs b/tests/SharpMUTerm.Core.Tests/Session/FakeTelnetSession.cs index 1740d4cb..4d129be0 100644 --- a/tests/SharpMUTerm.Core.Tests/Session/FakeTelnetSession.cs +++ b/tests/SharpMUTerm.Core.Tests/Session/FakeTelnetSession.cs @@ -31,12 +31,27 @@ internal sealed class FakeTelnetSession : ITelnetSession public List<(string Package, string Json)> SentGmcp { get; } = new(); + /// When set, the next connect fails with it. + public Exception? ConnectFault { get; set; } + public Task ConnectAsync(CancellationToken cancellationToken = default) { + if (ConnectFault is { } fault) + { + return Task.FromException(fault); + } + IsConnected = true; return Task.CompletedTask; } + /// The server goes away: cleanly (an orderly close) with no error, or failed with one. + public void Drop(Exception? error = null) + { + IsConnected = false; + Disconnected?.Invoke(this, new SessionDisconnectedEventArgs(error)); + } + public ValueTask SendLineAsync(string text, CancellationToken cancellationToken = default) { SentLines.Add(text); diff --git a/tests/SharpMUTerm.Tui.Tests/AlertsAndReconnectTests.cs b/tests/SharpMUTerm.Tui.Tests/AlertsAndReconnectTests.cs new file mode 100644 index 00000000..5c0418ed --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/AlertsAndReconnectTests.cs @@ -0,0 +1,348 @@ +using System.Runtime.CompilerServices; +using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Commands; +using SharpMUTerm.Core.Automation; +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Session; +using SharpMUTerm.Graphics; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// Wave 12's three: a dropped connection dialled again with a countdown on the status row, the desktop told when a +/// line wants the player while they are elsewhere, and typed command stacking reaching the wire per piece. +/// +[NotInParallel] +public class AlertsAndReconnectTests +{ + private static readonly TerminalCapabilities Headless = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private sealed class FakeAttention : IAttention + { + public bool FiltersByFocus { get; init; } + + public bool? Focused { get; set; } + + public event Action? FocusChanged; + + public List Requests { get; } = []; + + public void Request(AttentionRequest request) => Requests.Add(request); + + public void Focus(bool focused) + { + Focused = focused; + FocusChanged?.Invoke(focused); + } + } + + private sealed record Rig( + SharpMUTermApp App, + WorldSession Session, + ManualTimeProvider Time, + List Wires, + FakeAttention Attention, + StrongBox Refuse) + { + public RecordingTelnetSession Wire => Wires[^1]; + } + + private static async Task Open( + bool autoReconnect = true, + string? separator = null, + bool alertOnName = false, + Trigger? trigger = null, + bool? focused = false) + { + Console.SetIn(TextReader.Null); + var config = new AppConfiguration(); + var world = new WorldDefinition + { + Name = "Aetherfall", + Host = "aetherfall.example", + Port = 4201, + AutoReconnect = autoReconnect, + CommandSeparator = separator, + AlertOnName = alertOnName, + }; + world.Characters.Add(new CharacterDefinition { Name = "Corvid", Logging = new() }); + config.Worlds.Add(world); + if (trigger is not null) + { + var set = new TriggerSet { Name = "alerts" }; + set.Triggers.Add(trigger); + config.TriggerSets.Add(set); + world.Characters[0].TriggerSets.Add(set.Name); + } + + var time = new ManualTimeProvider(); + var attention = new FakeAttention { Focused = focused }; + var host = ClientHost.ForHarness(Headless, new HeadlessConsoleDriver(120, 32), null, null, null) with + { + Attention = attention, + }; + var app = new SharpMUTermApp(config, host, time); + var wires = new List(); + var refuse = new StrongBox(); + app.TelnetFactory = _ => + { + var wire = new RecordingTelnetSession { ConnectFault = refuse.Value }; + wires.Add(wire); + return wire; + }; + app.DispatchCommand(CommandIds.Character("Aetherfall.Corvid")); + var session = app.FindSession("Aetherfall.Corvid")!; + await session.ConnectAsync(); + app.RenderNextFrame(); + return new Rig(app, session, time, wires, attention, refuse); + } + + private static string Plain(string markup) => MarkupText.Plain(markup); + + [Test] + public async Task ADropCountsDownOnTheStatusRowAndDialsAgain() + { + var rig = await Open(); + await using var _ = rig.App; + + // The first wait is said by the notice, which carries Stop and covers the row for longer than the wait. + rig.Refuse.Value = new IOException("Connection refused"); + rig.Wire.Drop(new IOException("Connection reset by peer")); + await Assert.That(rig.App.LastNotice).Contains("reconnecting in 5 s"); + await Assert.That(rig.App.BuildCatalog().Select(i => i.Title)).Contains("Stop reconnecting"); + + // That try is refused; the second waits fifteen seconds, and once its notice has gone the row counts it down. + rig.Time.Advance(TimeSpan.FromSeconds(5)); + await Assert.That(rig.Wires.Count).IsEqualTo(2); + rig.Time.Advance(SharpMUTermApp.NoticeDuration); + rig.App.RenderNextFrame(); + await Assert.That(Plain(rig.App.StatusMarkup)).Contains(SharpMUTermApp.ReconnectState(9)); + rig.Time.Advance(TimeSpan.FromSeconds(1)); + rig.App.RenderNextFrame(); + await Assert.That(Plain(rig.App.StatusMarkup)).Contains(SharpMUTermApp.ReconnectState(8)); + + rig.Refuse.Value = null; + rig.Time.Advance(TimeSpan.FromSeconds(8)); + rig.App.RenderNextFrame(); + + await Assert.That(rig.Wires.Count).IsEqualTo(3); + await Assert.That(rig.Session.State).IsEqualTo(ConnectionState.Connected); + await Assert.That(Plain(rig.App.StatusMarkup)).DoesNotContain("reconnecting"); + await Assert.That(rig.App.BuildCatalog().Select(i => i.Title)).DoesNotContain("Stop reconnecting"); + } + + [Test] + public async Task StopReconnectingCancelsTheWait() + { + var rig = await Open(); + await using var _ = rig.App; + rig.Wire.Drop(new IOException("reset")); + + rig.App.DispatchCommand(BuiltInCommands.StopReconnectCommand); + await Assert.That(rig.App.LastNotice).Contains("stopped reconnecting"); + rig.Time.Advance(TimeSpan.FromMinutes(2)); + rig.App.RenderNextFrame(); + + await Assert.That(rig.Wires.Count).IsEqualTo(1); + await Assert.That(Plain(rig.App.StatusMarkup)).DoesNotContain("reconnecting"); + } + + [Test] + public async Task ReconnectWhileWaitingDialsAtOnceAndLeavesNoSecondTry() + { + var rig = await Open(); + await using var _ = rig.App; + rig.Wire.Drop(new IOException("reset")); + + rig.App.DispatchCommand("world:reconnect"); + await Task.Delay(50); + rig.Time.Advance(TimeSpan.FromMinutes(2)); + + await Assert.That(rig.Wires.Count).IsEqualTo(2); + await Assert.That(rig.Session.State).IsEqualTo(ConnectionState.Connected); + } + + [Test] + public async Task DisconnectWhileWaitingCancelsIt() + { + var rig = await Open(); + await using var _ = rig.App; + rig.Wire.Drop(new IOException("reset")); + + rig.App.DispatchCommand("world:disconnect"); + rig.Time.Advance(TimeSpan.FromMinutes(2)); + + await Assert.That(rig.Wires.Count).IsEqualTo(1); + } + + [Test] + public async Task ThePlayersOwnDisconnectIsNeverDialledAgain() + { + var rig = await Open(); + await using var _ = rig.App; + + rig.App.DispatchCommand("world:disconnect"); + rig.Time.Advance(TimeSpan.FromMinutes(2)); + + await Assert.That(rig.Wires.Count).IsEqualTo(1); + await Assert.That(rig.Session.LastClose).IsEqualTo(SessionClose.Player); + } + + [Test] + public async Task AWorldWithReconnectOffIsLeftDown() + { + var rig = await Open(autoReconnect: false); + await using var _ = rig.App; + + rig.Wire.Drop(new IOException("reset")); + rig.Time.Advance(TimeSpan.FromMinutes(2)); + + await Assert.That(rig.Wires.Count).IsEqualTo(1); + await Assert.That(rig.App.BuildCatalog().Select(i => i.Title)).DoesNotContain("Stop reconnecting"); + } + + [Test] + public async Task ThePageReachesTheHostOnlyWhileItIsBehindAnotherWindow() + { + var rig = await Open(alertOnName: true, focused: true); + await using var _ = rig.App; + + rig.Wire.Receive("Rivane pages: are you there?\r\n"); + await Assert.That(rig.Attention.Requests).IsEmpty(); + + rig.Attention.Focus(false); + rig.Wire.Receive("Rivane pages: hello?\r\n"); + + await Assert.That(rig.Attention.Requests.Count).IsEqualTo(1); + await Assert.That(rig.Attention.Requests[0].Title).IsEqualTo("Corvid@Aetherfall — page"); + await Assert.That(rig.Attention.Requests[0].Body).IsEqualTo("Rivane pages: hello?"); + + // One per interval: the next page inside it is not said again. + rig.Wire.Receive("Rivane pages: hello??\r\n"); + await Assert.That(rig.Attention.Requests.Count).IsEqualTo(1); + rig.Time.Advance(AttentionThrottle.Interval); + rig.Wire.Receive("Rivane pages: hello???\r\n"); + await Assert.That(rig.Attention.Requests.Count).IsEqualTo(2); + } + + [Test] + public async Task TheTitleCountsWhatArrivedWhileAwayAndClearsOnReturn() + { + var rig = await Open(focused: true); + await using var _ = rig.App; + rig.App.RenderNextFrame(); + var resting = rig.App.ShownTitle!; + + rig.Attention.Focus(false); + rig.Wire.Receive("The fountain bubbles.\r\nA bird lands.\r\n"); + + await Assert.That(rig.App.ShownTitle).IsEqualTo("(2) " + resting); + + rig.Attention.Focus(true); + await Assert.That(rig.App.ShownTitle).IsEqualTo(resting); + } + + [Test] + public async Task AnAlertTriggerAsksAndF7CanTurnItOff() + { + var trigger = new Trigger { Name = "attack", Pattern = "attacks you", Actions = { Alert = true } }; + var rig = await Open(trigger: trigger); + await using var _ = rig.App; + + rig.Wire.Receive("A rat attacks you!\r\n"); + await Assert.That(rig.Attention.Requests.Select(r => r.Title)).IsEquivalentTo(["Corvid@Aetherfall — alert"]); + + rig.App.Configuration.Text.AlertWhenAway = false; + rig.Time.Advance(AttentionThrottle.Interval); + rig.Wire.Receive("A rat attacks you again!\r\n"); + await Assert.That(rig.Attention.Requests.Count).IsEqualTo(1); + } + + [Test] + public async Task AHostThatCannotTellItsFocusWaitsForTheReaderToBeIdle() + { + var trigger = new Trigger { Name = "attack", Pattern = "attacks you", Actions = { Alert = true } }; + var rig = await Open(trigger: trigger, focused: null); + await using var _ = rig.App; + + rig.App.SimulateKey(new ConsoleKeyInfo('x', ConsoleKey.X, false, false, false)); + rig.Wire.Receive("A rat attacks you!\r\n"); + await Assert.That(rig.Attention.Requests).IsEmpty(); + + rig.Time.Advance(SharpMUTermApp.AwayAfter); + rig.Wire.Receive("A rat attacks you!\r\n"); + await Assert.That(rig.Attention.Requests.Count).IsEqualTo(1); + } + + [Test] + public async Task TheCommandLineStacksOnAWorldWithASeparator() + { + var rig = await Open(separator: ";"); + await using var _ = rig.App; + + foreach (var c in "#2 n;look") + { + rig.App.SimulateKey(new ConsoleKeyInfo(c, ConsoleKey.NoName, false, false, false)); + } + + rig.App.SimulateKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false)); + await Task.Delay(50); + + await Assert.That(rig.Wire.Lines).IsEquivalentTo(["n", "n", "look"]); + } + + [Test] + public async Task WithNoSeparatorTheCommandLineSendsTheLineAsTyped() + { + var rig = await Open(separator: null); + await using var _ = rig.App; + + foreach (var c in "say a;b") + { + rig.App.SimulateKey(new ConsoleKeyInfo(c, ConsoleKey.NoName, false, false, false)); + } + + rig.App.SimulateKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false)); + await Task.Delay(50); + + await Assert.That(rig.Wire.Lines).IsEquivalentTo(["say a;b"]); + } + + [Test] + public void TheTerminalEscapesCannotBeEndedEarlyByAGamesText() + { + var request = new AttentionRequest("Corvid@Aetherfall — page", "x\u001b\\;\u0007y"); + + var kitty = TerminalAttention.Sequence(TerminalNotify.Osc99, request, 1); + var foot = TerminalAttention.Sequence(TerminalNotify.Osc777, request, 1); + + // The only ESC and BEL bytes are the escapes' own. + if (kitty.Count(c => c == '\u001b') != 4 || kitty.Contains('\u0007') || !kitty.Contains("o=unfocused")) + { + throw new InvalidOperationException(kitty); + } + + if (foot.Count(c => c == '\u001b') != 2 || foot.Contains('\u0007') || foot.Split(';').Length != 4) + { + throw new InvalidOperationException(foot); + } + + if (TerminalAttention.Sequence(TerminalNotify.Bell, request, 1) != "\a") + { + throw new InvalidOperationException("bell"); + } + } + + [Test] + public async Task TheDemoViewWritesWithTheLiveWriters() + { + Console.SetIn(TextReader.Null); + var config = DemoScene.Build(); + await using var app = new SharpMUTermApp(config, Headless, new HeadlessConsoleDriver(120, 32)); + app.RenderSnapshot("reconnect"); + + await Assert.That(Plain(app.StatusMarkup)).Contains(SharpMUTermApp.ReconnectState(12)); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/RecordingTelnetSession.cs b/tests/SharpMUTerm.Tui.Tests/RecordingTelnetSession.cs index d7c1b875..88beceae 100644 --- a/tests/SharpMUTerm.Tui.Tests/RecordingTelnetSession.cs +++ b/tests/SharpMUTerm.Tui.Tests/RecordingTelnetSession.cs @@ -24,7 +24,7 @@ internal sealed class RecordingTelnetSession : ITelnetSession /// connection is the case the old fire-and-forget Reconnect swallowed, so the tests need a /// transport that can refuse one. /// - public Exception? ConnectFault { get; init; } + public Exception? ConnectFault { get; set; } /// How many times a connection was asked for, refused ones included. public int ConnectAttempts { get; private set; } @@ -186,6 +186,13 @@ public ValueTask SetWindowSizeAsync(int width, int height) return ValueTask.CompletedTask; } + /// The server goes away on its own: an orderly close with no error, or failed with one. + public void Drop(Exception? error = null) + { + IsConnected = false; + Disconnected?.Invoke(this, new SessionDisconnectedEventArgs(error)); + } + public Task DisconnectAsync() { if (IsConnected) diff --git a/tests/SharpMUTerm.Tui.Tests/ScreenModelTests.cs b/tests/SharpMUTerm.Tui.Tests/ScreenModelTests.cs index c7e33c65..7579773e 100644 --- a/tests/SharpMUTerm.Tui.Tests/ScreenModelTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/ScreenModelTests.cs @@ -65,7 +65,8 @@ public async Task Triggers_HasARuleListAndTheSelectedRulesToggles() // Three checkbox rows: gag and stop-processing, plus case sensitivity — which F3 has always // offered on an alias and F2 arbitrarily did not. It is appended rather than inserted, so the // two rows below still mean what every other assertion here says they mean. - await Assert.That(model.Sizes[1]).IsEqualTo(3); + // A fourth, "alert me when away", is appended the same way. + await Assert.That(model.Sizes[1]).IsEqualTo(4); model.ToggleAt(0, 1)!.Value.Flip(); await Assert.That(sets[0].Triggers[1].Enabled).IsTrue(); @@ -372,9 +373,10 @@ public async Task Options_NavigableRowsSkipSectionHeadersAndSpacers() // meters as a typed line, and 23/13 before SCROLLBACK. // The THEME group on top adds thirteen rows and three stops: its heading and spacer, a row per built-in // theme, and the preview's caption and seven rows, which are drawn and never a stop. - await Assert.That(screen.Rows.Count).IsEqualTo(39); + // ALERTS adds three rows and one stop: its heading, its spacer and `alert when away`. + await Assert.That(screen.Rows.Count).IsEqualTo(42); await Assert.That(model.PaneCount).IsEqualTo(1); - await Assert.That(model.Sizes[0]).IsEqualTo(17); + await Assert.That(model.Sizes[0]).IsEqualTo(18); } /// diff --git a/tests/SharpMUTerm.Tui.Tests/TriggersScreenEditingTests.cs b/tests/SharpMUTerm.Tui.Tests/TriggersScreenEditingTests.cs index 72e81c29..81fb5168 100644 --- a/tests/SharpMUTerm.Tui.Tests/TriggersScreenEditingTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/TriggersScreenEditingTests.cs @@ -76,8 +76,8 @@ await Assert.That(model.FieldAt(0, 0, TriggersScreenRenderer.MatchTypeField)!.Va await Assert.That(model.FieldAt(0, 0, TriggersScreenRenderer.ScriptField)!.Value.Get()).IsEqualTo(string.Empty); // The editor pane holds only checkbox rows — every value it draws is a field on the rule, not a - // cursor stop of its own. It gained the third checkbox (case sensitivity) and nothing else. - await Assert.That(model.Sizes[1]).IsEqualTo(3); + // cursor stop of its own. It gained the third checkbox (case sensitivity) and the fourth (alert). + await Assert.That(model.Sizes[1]).IsEqualTo(4); } [Test] From 95eeaedfc6cb8ab796cb8a7efbce9aaa124435c8 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 11:56:37 +0000 Subject: [PATCH 043/113] test: notice source assertion follows held notice ink --- tests/SharpMUTerm.Tui.Tests/NoticeAndMapSurfaceTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/SharpMUTerm.Tui.Tests/NoticeAndMapSurfaceTests.cs b/tests/SharpMUTerm.Tui.Tests/NoticeAndMapSurfaceTests.cs index 5ae74ad7..92d6d839 100644 --- a/tests/SharpMUTerm.Tui.Tests/NoticeAndMapSurfaceTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/NoticeAndMapSurfaceTests.cs @@ -98,7 +98,7 @@ public async Task ASourceIsALabelNotAChord() await Assert.That(model!.Source).IsEqualTo("Sound"); await Assert.That(model.Key).IsNull().Because("a source is not a key"); - await Assert.That(app.LastNotice).EndsWith("]Sound:[/] [dim]on.[/]"); + await Assert.That(app.LastNotice).Matches(@"\]Sound:\[/\] \[#[0-9a-f]{6}\]on\.\[/\]$"); var words = Directory.GetFiles(SourceRoot(), "*.cs", SearchOption.AllDirectories) .SelectMany(f => File.ReadAllLines(f).Select(l => (f, l))) From 6a4c83940ce9f1096c1a7102a6b5cb7c0b357433 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 12:02:35 +0000 Subject: [PATCH 044/113] Alert titles use the shared name spelling --- src/SharpMUTerm.Client/Chrome/WindowTitle.cs | 2 +- src/SharpMUTerm.Tui/Hosting/TerminalAttention.cs | 2 +- src/SharpMUTerm.Tui/SharpMUTermApp.Attention.cs | 2 +- tests/SharpMUTerm.Tui.Tests/AlertsAndReconnectTests.cs | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/SharpMUTerm.Client/Chrome/WindowTitle.cs b/src/SharpMUTerm.Client/Chrome/WindowTitle.cs index 27bb06d0..6f630131 100644 --- a/src/SharpMUTerm.Client/Chrome/WindowTitle.cs +++ b/src/SharpMUTerm.Client/Chrome/WindowTitle.cs @@ -45,7 +45,7 @@ public static string For(string? character, string? world) /// /// led by how many lines arrived while the window was behind another — - /// (3) Corvid@Aetherfall — SharpMUTerm — or the title alone for none. Capped at 99+, so a busy + /// (3) Corvid · Aetherfall — SharpMUTerm — or the title alone for none. Capped at 99+, so a busy /// channel does not retitle the window with every line. /// public static string WithUnread(string title, int unread) => diff --git a/src/SharpMUTerm.Tui/Hosting/TerminalAttention.cs b/src/SharpMUTerm.Tui/Hosting/TerminalAttention.cs index cc77f072..8ac33a2a 100644 --- a/src/SharpMUTerm.Tui/Hosting/TerminalAttention.cs +++ b/src/SharpMUTerm.Tui/Hosting/TerminalAttention.cs @@ -3,7 +3,7 @@ namespace SharpMUTerm.Tui; -/// An alert for the desktop: a short title (Corvid@Aetherfall — page) and the line that raised it. +/// An alert for the desktop: a short title (Corvid · Aetherfall — page) and the line that raised it. internal sealed record AttentionRequest(string Title, string Body); /// diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Attention.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Attention.cs index 781d7d96..03b4619e 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Attention.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Attention.cs @@ -16,7 +16,7 @@ namespace SharpMUTerm.Tui; /// /// /// While a host that knows its focus is behind another window, the title carries a count of the lines that arrived -/// ((3) Corvid@Aetherfall — SharpMUTerm), the passive half of the same cue; it clears when the window comes +/// ((3) Corvid · Aetherfall — SharpMUTerm), the passive half of the same cue; it clears when the window comes /// forward. /// /// diff --git a/tests/SharpMUTerm.Tui.Tests/AlertsAndReconnectTests.cs b/tests/SharpMUTerm.Tui.Tests/AlertsAndReconnectTests.cs index 5c0418ed..24cfb4f2 100644 --- a/tests/SharpMUTerm.Tui.Tests/AlertsAndReconnectTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/AlertsAndReconnectTests.cs @@ -216,7 +216,7 @@ public async Task ThePageReachesTheHostOnlyWhileItIsBehindAnotherWindow() rig.Wire.Receive("Rivane pages: hello?\r\n"); await Assert.That(rig.Attention.Requests.Count).IsEqualTo(1); - await Assert.That(rig.Attention.Requests[0].Title).IsEqualTo("Corvid@Aetherfall — page"); + await Assert.That(rig.Attention.Requests[0].Title).IsEqualTo("Corvid · Aetherfall — page"); await Assert.That(rig.Attention.Requests[0].Body).IsEqualTo("Rivane pages: hello?"); // One per interval: the next page inside it is not said again. @@ -252,7 +252,7 @@ public async Task AnAlertTriggerAsksAndF7CanTurnItOff() await using var _ = rig.App; rig.Wire.Receive("A rat attacks you!\r\n"); - await Assert.That(rig.Attention.Requests.Select(r => r.Title)).IsEquivalentTo(["Corvid@Aetherfall — alert"]); + await Assert.That(rig.Attention.Requests.Select(r => r.Title)).IsEquivalentTo(["Corvid · Aetherfall — alert"]); rig.App.Configuration.Text.AlertWhenAway = false; rig.Time.Advance(AttentionThrottle.Interval); @@ -313,7 +313,7 @@ public async Task WithNoSeparatorTheCommandLineSendsTheLineAsTyped() [Test] public void TheTerminalEscapesCannotBeEndedEarlyByAGamesText() { - var request = new AttentionRequest("Corvid@Aetherfall — page", "x\u001b\\;\u0007y"); + var request = new AttentionRequest("Corvid · Aetherfall — page", "x\u001b\\;\u0007y"); var kitty = TerminalAttention.Sequence(TerminalNotify.Osc99, request, 1); var foot = TerminalAttention.Sequence(TerminalNotify.Osc777, request, 1); From 967e0f5ce201fa997125e36a24c5387260477f64 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 12:05:33 +0000 Subject: [PATCH 045/113] In-app help, a spelling dictionary on request, and a join-wraps suggestion - /help and Ctrl+P > Help: one Client model (HelpModel) drawn as a cell ListOverlay and as a native modal in the window. It lists how-to pages, the slash commands from SlashCommands.All (the table --help now prints too), every registry key for this host and the host's own chords. It is searchable with one View in both hosts. Enter places a slash command unsent, runs a key's command, or opens a page. Declared in SurfaceCatalog with parity probes. - F1's Alt+W with no dictionary, and Ctrl+P > Get a spelling dictionary, offer LibreOffice's en_US/en_GB. Nothing is fetched until the player says yes. It is https only, capped while streaming and checked against a pinned SHA-256, then written into dictionaries/ beside config.json. The dictionaries root is null by default, so tests and snapshots fetch nothing. Native and cell offers share DictionaryOfferModel. - While a pane is narrower than a world's wrap column, Ctrl+P suggests "Join server wraps for " and F5 marks join wraps as recommended. It is still off by default. - New views: help, help-topic, dictionary-offer, join-wraps, join-wraps-f5. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 8 + CLAUDE.md | 29 +- src/SharpMUTerm.Avalonia/ComposerView.cs | 4 + .../DictionaryOfferView.cs | 121 ++++++ src/SharpMUTerm.Avalonia/HelpView.cs | 348 +++++++++++++++ src/SharpMUTerm.Avalonia/ModalOverlay.cs | 4 +- .../Commands/BuiltInCommands.cs | 32 +- .../Composer/ComposerModel.cs | 9 +- .../Composer/ComposerSession.cs | 15 + src/SharpMUTerm.Client/Help/HelpTopics.cs | 96 +++++ src/SharpMUTerm.Client/Help/SlashCommands.cs | 36 ++ .../Modals/DictionaryOfferModel.cs | 66 +++ src/SharpMUTerm.Client/Modals/HelpModel.cs | 225 ++++++++++ .../Palette/CommandPaletteModel.cs | 8 + .../Surfaces/SurfaceCatalog.cs | 30 +- .../Commands/CommandCatalog.cs | 17 +- .../Text/DictionaryDownload.cs | 205 +++++++++ src/SharpMUTerm.Tui/ClientUsage.cs | 8 + src/SharpMUTerm.Tui/ComposeOverlay.cs | 18 + src/SharpMUTerm.Tui/DictionaryOffer.cs | 32 ++ src/SharpMUTerm.Tui/HelpSurface.cs | 287 +++++++++++++ src/SharpMUTerm.Tui/ListOverlay.cs | 9 +- .../Pointer/SharpMUTermApp.Surfaces.cs | 2 + src/SharpMUTerm.Tui/Program.cs | 8 +- src/SharpMUTerm.Tui/SharpMUTermApp.Help.cs | 402 ++++++++++++++++++ .../SharpMUTermApp.JoinWraps.cs | 42 ++ .../SharpMUTermApp.NativeComposer.cs | 1 + .../SharpMUTermApp.NativeModals.cs | 2 + src/SharpMUTerm.Tui/SharpMUTermApp.Theme.cs | 1 + src/SharpMUTerm.Tui/SharpMUTermApp.cs | 77 +++- src/SharpMUTerm.Tui/SnapshotViews.cs | 2 +- src/SharpMUTerm.Tui/WorldsScreenRenderer.cs | 7 +- src/SharpMUTerm.Tui/WorldsScreenView.cs | 5 +- .../SurfaceParityTests.cs | 54 +++ .../HelpModelTests.cs | 125 ++++++ .../DictionaryDownloadTests.cs | 100 +++++ .../ComposeSpellingTests.cs | 7 +- tests/SharpMUTerm.Tui.Tests/HelpTests.cs | 211 +++++++++ .../NativeComposerRoutingTests.cs | 2 +- 39 files changed, 2626 insertions(+), 29 deletions(-) create mode 100644 src/SharpMUTerm.Avalonia/DictionaryOfferView.cs create mode 100644 src/SharpMUTerm.Avalonia/HelpView.cs create mode 100644 src/SharpMUTerm.Client/Help/HelpTopics.cs create mode 100644 src/SharpMUTerm.Client/Help/SlashCommands.cs create mode 100644 src/SharpMUTerm.Client/Modals/DictionaryOfferModel.cs create mode 100644 src/SharpMUTerm.Client/Modals/HelpModel.cs create mode 100644 src/SharpMUTerm.Core/Text/DictionaryDownload.cs create mode 100644 src/SharpMUTerm.Tui/DictionaryOffer.cs create mode 100644 src/SharpMUTerm.Tui/HelpSurface.cs create mode 100644 src/SharpMUTerm.Tui/SharpMUTermApp.Help.cs create mode 100644 tests/SharpMUTerm.Client.Tests/HelpModelTests.cs create mode 100644 tests/SharpMUTerm.Core.Tests/DictionaryDownloadTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/HelpTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 733c386b..67a1da86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,14 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] be sent (both in the terminal and in the desktop window). - When a pane is narrower than the line width a game wraps at, the client says so once and offers to turn on "join wraps" for that world. +- Help is built in: `/help` (or Ctrl+P ▸ Help) lists the slash commands, every key this client answers to, and short + how-to pages on getting started, reading output, layouts, triggers and the composer. Type to search; Enter on a + slash command puts it on the command line without sending it. +- No spelling dictionary? Alt+W in the composer (or Ctrl+P ▸ Get a spelling dictionary) offers to download an English + one into your settings folder. Nothing is fetched until you say yes, and the file is checked before it is saved — + so spelling now works on Windows too. +- While a pane is narrower than the width a game wraps at, Ctrl+P suggests "Join server wraps for" that world and F5 + marks its "join wraps" setting as recommended. It stays off until you turn it on. - Desktop window: the map, vitals, who is here and the quick bar can be popped out into windows of their own — from the button in the panel's corner, the pane's right-click menu, or Ctrl+P ▸ Pop out. The output takes the room back, diff --git a/CLAUDE.md b/CLAUDE.md index e83bc392..3810220a 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -603,6 +603,11 @@ fallbacks) for inline images/maps. shown out of order and only the last full row of a burst is ever late (a paragraph's last row is short and never held). The read loop and that timer share `_ingestGate`; nothing on the UI thread or in a script takes it, so it cannot close a cycle with the script host's lock. Rebuilt per connection, like the parser. + - **Suggested, never switched on** (`SharpMUTermApp.JoinWraps.cs`). While a pane reported to a server is more than + two columns narrower than its wrap column (`NoteRaggedWraps`, on each NAWS report; `RaggedWrap`, Core), ⌃P lists + *Join server wraps for * under SUGGESTED (`CommandContext.RaggedWraps`) and F5's `join wraps` row reads + `off · recommended · wraps at 78, pane is 60` (the `join-wraps`/`join-wraps-f5` views); the once-per-world notice + stays. Joining, or the pane catching up, clears it. - **Every server's MSSP report is kept, and the INFO screen reads it** (`MsspCache`, Core; `mssp.json` beside `config.json`, keyed by `host:port`; F5 ▸ `i`). Fourth of the `save:`/`logRoot:`/`restore:` family with **one deliberate difference**: the constructor parameter is null by default like the @@ -768,6 +773,14 @@ fallbacks) for inline images/maps. `no dictionary`. A MOO edit is not checked (its buffer is code as often as prose). `%`-codes, a word before `(`, and any word with a digit or an inner capital are skipped. ⌥W appends to `dictionaries/user-words.txt`. + - **With no dictionary, ⌥W offers to download one** (`DictionaryDownload`, Core; `DictionaryOfferModel`, Client; + `DictionaryOffer`/`SharpMUTermApp.Help.cs`, Tui; `DictionaryOfferView`, Avalonia; ⌃P *Get a spelling dictionary…*; + the `dictionary-offer` view). F1 closes (keeping the draft), the offer says what is fetched from where and saved + where, and F1 comes back when it closes. **Only on ⏎**, https only, each file capped at 8 MB while streaming, and + both checked against a **pinned SHA-256** before anything is written (LibreOffice's `en_US`/`en_GB` at tag + `libreoffice-24.8.4.2`; `For(locale)` picks GB for en_GB/IE/AU/NZ/ZA/IN). Written as `.new` and renamed, `.aff` + first. `dictionaries:` is a constructor root of the `save:`/`logRoot:` family, null by default, so a test and a + snapshot fetch nothing and the offer says nothing can be saved. - **An MXP `` is drawn in the output pane as rows of markup under the line that named it** (`MxpParser.HandleImage` + `MxpImageSource`, Core; `InlineImageHost`/`InlineImageRows`/`InlineImageLayout`, Tui; the `mxp-image` view). The parser emits a `[image: name]` span whose `SpanInteraction.Image` carries @@ -1340,7 +1353,7 @@ one `SharpMUTermApp`; a host is only the place it runs. What differs between hos (`src/SharpMUTerm.Tui/Hosting/`): driver, capabilities, clipboard, URL opener, focus reporting, keys (`HostKeys`: the newline chord, and the chords the host keeps for itself), whether there is a main loop, the Sixel cell size, and what it does with the pointer (`IPointerPresenter`, null for none), whether it draws the declared settings natively (`INativeSettings`, null for the cell screens), and whether it -draws ⌃P natively (`INativePalette`, null for the cell popup), whether it draws the composer with its own editor (`INativeComposer`, null for cells), whether it draws the quit prompt, ⌃F, ⌃R, ⌥M and the welcome itself (`INativeModals`, null for cells), where the title for what is in front goes (`IWindowTitle`: the window's title bar, the terminal's OSC 2, null headless), whether it can pop a panel out into a window of its own (`IFloatingPanels`, null for none), and which chrome it draws itself beside the cells (`HostChrome`: the header and the rail, which the client then leaves out of the grid). Built by `ClientHost.Terminal`, `ClientHost.Headless`/`Snapshot` and +draws ⌃P natively (`INativePalette`, null for the cell popup), whether it draws the composer with its own editor (`INativeComposer`, null for cells), whether it draws the quit prompt, ⌃F, ⌃R, ⌥M, the welcome, help and the dictionary offer itself (`INativeModals`, null for cells), where the title for what is in front goes (`IWindowTitle`: the window's title bar, the terminal's OSC 2, null headless), whether it can pop a panel out into a window of its own (`IFloatingPanels`, null for none), and which chrome it draws itself beside the cells (`HostChrome`: the header and the rail, which the client then leaves out of the grid). Built by `ClientHost.Terminal`, `ClientHost.Headless`/`Snapshot` and `WindowHost.Create` (Avalonia). Four things keep a feature from landing in one host only: - **Every `ClientHost` and `HostKeys` member is `required`**, so a member added there does not compile until @@ -1610,7 +1623,10 @@ python3 tools/ansi_frame_to_image.py frame.ansi frame.html # or .svg (each panel in a pane of its own over the demo's game data; the composer over who-here, armed, with a draft typed through its real key path), `welcome`/`welcome-connect` (the first-run welcome over an **emptied** configuration and a main window alone — `--demo-config` has worlds, and the welcome never opens over them — and - its connect form filled in by real keys) and `tour` (the key tour row at the end of the demo's main window), plus + its connect form filled in by real keys), `tour` (the key tour row at the end of the demo's main window), + `help`/`help-topic` (in-app help's list, and its *Reading output* page), `dictionary-offer` (the spelling dictionary + offer, in a run that keeps no folder) and `join-wraps`/`join-wraps-f5` (a ragged world suggested on ⌃P, and + recommended on F5 — the row is under `14 more` below about 50 rows), plus the default workspace (no `--view`). Any settings screen also takes a `-edit` suffix, which opens it and drives real keys in so the frame shows a field mid-edit. State toggles: `collapsed`, `prefix`, `timestamps`, @@ -1970,6 +1986,15 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] - Screenshots from a real window under Xvfb, driven with XTest (`ux-wave7/composer-*.png`). `--demo-config` in the window opens the installed dictionary read-only. Not done: no find bar, and the window's ⌥W adds to the run's dictionary in the demo only (a live client writes `user-words.txt` as F1 does). +- **Help is one Client model drawn by both hosts** (`HelpModel`/`HelpSession`, `SlashCommands`, `HelpTopics`, Client; + `HelpSurface`, Tui; `HelpView`, Avalonia; `/help [words]`, ⌃P ▸ *Help*; surface `help`). Rows: how-to pages, then + the slash commands from **`SlashCommands.All`, the one table `--help` prints too** (`ClientUsage`), then every + registry command with a key for this host (`KeyGlyphs.Normalize`) and the host's own chords (`HostKeys`). The search + is `HelpModel.View` in both hosts (every word, in a row or in a page's text). ⏎ on a slash command **places** it on + the command line (`PlaceGrab`) and sends nothing; on a key it runs the registry command; on a how-to it opens the + page (Esc back). `--plain` says the matching rows instead. Native as an `INativeModals` session like ⌃F. Pages are + `HelpTopic.Lines` joined into `Paragraphs` and wrapped by each host. `HelpTests.EverySlashCommand…` ties the table + to the command line's handlers. - **In the window, the quit prompt, ⌃F, ⌃R, ⌥M and the welcome are native modals** (`ClientHost.NativeModals` → `INativeModals`; Client `Modals/`: `ModalSession`, `QuitModel`/`QuitSession`, `SearchModel`/`SearchSession`, `HistoryModel`/`HistorySession`, `LayoutsModel`/`LayoutsSession`, `WelcomeModel`/`WelcomeSession`; Avalonia diff --git a/src/SharpMUTerm.Avalonia/ComposerView.cs b/src/SharpMUTerm.Avalonia/ComposerView.cs index 785abf32..1c5fd44c 100644 --- a/src/SharpMUTerm.Avalonia/ComposerView.cs +++ b/src/SharpMUTerm.Avalonia/ComposerView.cs @@ -499,6 +499,10 @@ private void OnEditorKeyDown(object? sender, KeyEventArgs e) { session.AddWord(word); } + else if (session.CanGetDictionary) + { + session.GetDictionary(); + } return; diff --git a/src/SharpMUTerm.Avalonia/DictionaryOfferView.cs b/src/SharpMUTerm.Avalonia/DictionaryOfferView.cs new file mode 100644 index 00000000..4da48954 --- /dev/null +++ b/src/SharpMUTerm.Avalonia/DictionaryOfferView.cs @@ -0,0 +1,121 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Input; +using Avalonia.Interactivity; +using Avalonia.Layout; +using Avalonia.Media; +using SharpMUTerm.Client.Modals; + +namespace SharpMUTerm.Avalonia; + +/// +/// The window's offer of a spelling dictionary: the question, what will be fetched from where and saved where (the +/// cells' consent sentences, ), and Download / Not now. Download ends in the +/// client's InstallDictionary, the method the cells' ⏎ ends in; nothing is fetched before it. +/// +internal sealed class DictionaryOfferView : DockPanel, IModalView +{ + private readonly DictionaryOfferSession _session; + private readonly Action _done; + private readonly Button _download; + private readonly Button _later; + + public DictionaryOfferView(DictionaryOfferSession session, NativeTokens colours, Action done) + { + _session = session; + _done = done; + var model = session.Model; + + var heading = ModalParts.Heading(model.Question, colours); + heading.Margin = new Thickness(22, 18, 22, 8); + SetDock(heading, Dock.Top); + Children.Add(heading); + + var facts = new StackPanel { Margin = new Thickness(22, 2, 22, 4), Spacing = 6 }; + foreach (var line in model.Lines) + { + facts.Children.Add(new TextBlock + { + Text = NativeKeys.Words(line), + Foreground = colours.Brush(line.Length == 0 ? colours.Dim : colours.Text), + TextWrapping = TextWrapping.Wrap, + FontSize = NativeTokens.Body, + }); + } + + SetDock(facts, Dock.Top); + Children.Add(facts); + + var footer = ModalParts.Footer(DictionaryOfferModel.Keys, colours); + SetDock(footer, Dock.Bottom); + + _download = ModalParts.Button("Download", "Enter", colours, Accept, accent: true); + _download.IsEnabled = model.Folder is not null && !model.Installed; + _later = ModalParts.Button("Not now", "Esc", colours, Decline); + var buttons = new StackPanel + { + Orientation = Orientation.Horizontal, + HorizontalAlignment = HorizontalAlignment.Right, + Spacing = 10, + Margin = new Thickness(22, 14, 22, 0), + }; + buttons.Children.Add(_download); + buttons.Children.Add(_later); + SetDock(buttons, Dock.Bottom); + Children.Add(footer); + Children.Add(buttons); + Children.Add(new Panel()); + + AddHandler(KeyDownEvent, OnKey, RoutingStrategies.Tunnel); + } + + public string Title => "Spelling dictionary"; + + public double PreferredWidth => 560; + + public bool Centred => true; + + /// The two buttons, for a test. + public Button DownloadButton => _download; + + public Button LaterButton => _later; + + public void FocusFirst() => (_download.IsEnabled ? _download : _later).Focus(); + + public void Detach() + { + } + + /// Download: the session ends and the client fetches and installs. + public void Accept() + { + _session.Accept(); + _done(); + } + + /// Not now: nothing is fetched. + public void Decline() + { + _session.Dismiss(); + _done(); + } + + private void OnKey(object? sender, KeyEventArgs e) + { + if (e.KeyModifiers != KeyModifiers.None) + { + return; + } + + if (e.Key == Key.Escape) + { + e.Handled = true; + Decline(); + } + else if (e.Key == Key.Enter && e.Source is not Button) + { + e.Handled = true; + Accept(); + } + } +} diff --git a/src/SharpMUTerm.Avalonia/HelpView.cs b/src/SharpMUTerm.Avalonia/HelpView.cs new file mode 100644 index 00000000..84f39f5d --- /dev/null +++ b/src/SharpMUTerm.Avalonia/HelpView.cs @@ -0,0 +1,348 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Input; +using Avalonia.Interactivity; +using Avalonia.Layout; +using Avalonia.Media; +using SharpMUTerm.Client.Modals; + +namespace SharpMUTerm.Avalonia; + +/// +/// The window's help: a search box, the rows of under their headings, and a how-to page in place +/// of the list once one is chosen. The rows are for the typed query, the function the cells' +/// help lists, so both hosts list the same rows. ⏎ on a slash command places it on the command line and sends nothing; ⏎ +/// on a key runs the command it names; ⏎ on a how-to opens its page. Every word is the window's (). +/// +internal sealed class HelpView : DockPanel, IModalView +{ + private readonly HelpSession _session; + private readonly NativeTokens _colours; + private readonly Action _done; + private readonly TextBox _box; + private readonly TextBlock _count; + private readonly TextBlock _footer; + private readonly Border _frame; + private readonly StackPanel _list; + private readonly ScrollViewer _page; + private readonly StackPanel _pageText; + private readonly List _rows = []; + private IReadOnlyList _view = []; + private int _selected; + private string _query; + + public HelpView(HelpSession session, NativeTokens colours, Action done) + { + _session = session; + _colours = colours; + _done = done; + + _box = ModalParts.SearchBox("Search help: keys, slash commands, how-tos…", "Search help"); + SetDock(_box, Dock.Top); + Children.Add(_box); + + _count = ModalParts.Dim(string.Empty, colours); + _count.HorizontalAlignment = HorizontalAlignment.Right; + SetDock(_count, Dock.Top); + Children.Add(_count); + + _footer = ModalParts.Footer(string.Empty, colours); + SetDock(_footer, Dock.Bottom); + Children.Add(_footer); + + var panel = new Panel(); + var (frame, list, _) = ModalParts.List(colours); + _frame = frame; + _list = list; + frame.MinHeight = 160; + panel.Children.Add(frame); + + _pageText = new StackPanel { Margin = new Thickness(22, 4, 22, 12), Spacing = 8 }; + _page = new ScrollViewer { Content = _pageText, IsVisible = false, MinHeight = 160 }; + panel.Children.Add(_page); + Children.Add(panel); + + _box.Text = session.InitialQuery; + _box.CaretIndex = session.InitialQuery.Length; + _query = session.InitialQuery; + _box.TextChanged += (_, _) => + { + // Avalonia raises this after the fact, the initial text included; only a query that changed redraws. + var query = _box.Text ?? string.Empty; + if (query == _query) + { + return; + } + + _query = query; + _selected = 0; + ShowList(); + }; + AddHandler(KeyDownEvent, OnKey, RoutingStrategies.Tunnel); + + if (session.Model.Topic(session.InitialTopic) is { } topic) + { + ShowPage(topic); + } + else + { + ShowList(); + } + } + + public string Title => "Help"; + + public double PreferredWidth => 760; + + public bool Centred => false; + + /// The rows listed now, for a test. + public IReadOnlyList Rows => _view; + + /// The row ⏎ acts on. + public int Selected => _selected; + + /// The page showing, or null for the list. + public string? Page { get; private set; } + + /// The search box, for a test. + public TextBox Box => _box; + + public void FocusFirst() => _box.Focus(); + + public void Detach() + { + } + + /// ⏎ on listed row : a how-to opens its page, anything else ends help and acts. + public void Choose(int row) + { + if (row < 0 || row >= _view.Count) + { + return; + } + + var entry = _view[row]; + if (entry.Kind == HelpKind.Topic) + { + if (_session.Model.Topic(entry.Target) is { } topic) + { + ShowPage(topic); + } + + return; + } + + var index = IndexOf(entry); + if (index >= 0 && _session.Choose(index)) + { + _done(); + } + } + + /// Esc: a page goes back to the list; from the list help closes. + public void Back() + { + if (Page is not null) + { + ShowList(); + _box.Focus(); + return; + } + + _session.Dismiss(); + _done(); + } + + private int IndexOf(HelpEntry entry) + { + var entries = _session.Model.Entries; + for (var i = 0; i < entries.Count; i++) + { + if (ReferenceEquals(entries[i], entry)) + { + return i; + } + } + + return -1; + } + + private void ShowPage(HelpTopic topic) + { + Page = topic.Id; + _frame.IsVisible = false; + _page.IsVisible = true; + _box.IsVisible = false; + _count.Text = string.Empty; + _pageText.Children.Clear(); + _pageText.Children.Add(new TextBlock + { + Text = NativeKeys.Words(topic.Title), + FontSize = NativeTokens.Heading, + FontWeight = FontWeight.SemiBold, + Foreground = _colours.Brush(_colours.Text), + TextWrapping = TextWrapping.Wrap, + }); + _pageText.Children.Add(new TextBlock + { + Text = NativeKeys.Words(topic.Summary), + FontSize = NativeTokens.Body, + Foreground = _colours.Brush(_colours.Dim), + TextWrapping = TextWrapping.Wrap, + }); + foreach (var line in topic.Paragraphs) + { + _pageText.Children.Add(new TextBlock + { + Text = NativeKeys.Words(line), + FontSize = NativeTokens.Title, + Foreground = _colours.Brush(_colours.Text), + TextWrapping = TextWrapping.Wrap, + MinHeight = line.Length == 0 ? 4 : 0, + }); + } + + var back = ModalParts.Button("Back to help", "Esc", _colours, Back); + back.HorizontalAlignment = HorizontalAlignment.Left; + back.Margin = new Thickness(0, 10, 0, 0); + _pageText.Children.Add(back); + _page.Offset = default; + _footer.Text = "Up and Down scroll · Esc back to the list"; + } + + private void ShowList() + { + Page = null; + _frame.IsVisible = true; + _page.IsVisible = false; + _box.IsVisible = true; + var model = _session.Model; + _view = model.View(_box.Text ?? string.Empty); + _count.Text = _view.Count == model.Entries.Count ? $"{_view.Count} entries" : $"{_view.Count} of {model.Entries.Count}"; + _footer.Text = "Up and Down pick · Enter opens, places or runs it · Esc closes"; + _list.Children.Clear(); + _rows.Clear(); + _selected = _view.Count == 0 ? 0 : Math.Clamp(_selected, 0, _view.Count - 1); + if (_view.Count == 0) + { + _list.Children.Add(new TextBlock + { + Text = NativeKeys.Words(HelpModel.NoMatches).Replace("⌫", "Backspace", StringComparison.Ordinal), + Foreground = _colours.Brush(_colours.Dim), + Margin = new Thickness(12, 10), + TextWrapping = TextWrapping.Wrap, + }); + return; + } + + string? section = null; + for (var i = 0; i < _view.Count; i++) + { + var entry = _view[i]; + if (entry.Section != section) + { + _list.Children.Add(ModalParts.GroupHeader(entry.Section, _colours, section is null)); + section = entry.Section; + } + + var index = i; + var line = new DockPanel(); + if (entry.Key.Length > 0) + { + var chip = ModalParts.Key(entry.Key, _colours); + chip.Margin = new Thickness(10, 0, 0, 0); + SetDock(chip, Dock.Right); + line.Children.Add(chip); + } + + var title = new TextBlock + { + Text = NativeKeys.Words(entry.Title), + Foreground = _colours.Brush(_colours.Text), + FontSize = NativeTokens.Title, + Width = 240, + Margin = new Thickness(0, 0, 14, 0), + TextTrimming = TextTrimming.CharacterEllipsis, + VerticalAlignment = VerticalAlignment.Center, + }; + SetDock(title, Dock.Left); + line.Children.Add(title); + line.Children.Add(new TextBlock + { + Text = NativeKeys.Words(entry.Detail), + Foreground = _colours.Brush(_colours.Dim), + FontSize = NativeTokens.Body, + TextTrimming = TextTrimming.CharacterEllipsis, + VerticalAlignment = VerticalAlignment.Center, + }); + var row = ModalParts.Row(line, NativeKeys.Words(entry.Title), () => Select(index), () => Choose(index)); + _rows.Add(row); + _list.Children.Add(row); + } + + Highlight(); + } + + private void Select(int index) + { + if (index != _selected) + { + _selected = index; + Highlight(); + } + } + + private void Highlight() + { + for (var i = 0; i < _rows.Count; i++) + { + _rows[i].Background = i == _selected ? _colours.Brush(_colours.Selected) : Brushes.Transparent; + } + + if (_selected < _rows.Count) + { + _rows[_selected].BringIntoView(); + } + } + + private void OnKey(object? sender, KeyEventArgs e) + { + if (e.KeyModifiers != KeyModifiers.None) + { + return; + } + + switch (e.Key) + { + case Key.Escape: + e.Handled = true; + Back(); + return; + case Key.Up when Page is null: + e.Handled = true; + Select(ModalParts.Step(_selected, -1, _view.Count)); + return; + case Key.Down when Page is null: + e.Handled = true; + Select(ModalParts.Step(_selected, 1, _view.Count)); + return; + case Key.Up: + e.Handled = true; + _page.LineUp(); + return; + case Key.Down: + e.Handled = true; + _page.LineDown(); + return; + case Key.Enter when Page is null: + e.Handled = true; + Choose(_selected); + return; + case Key.Back when Page is not null: + e.Handled = true; + Back(); + return; + } + } +} diff --git a/src/SharpMUTerm.Avalonia/ModalOverlay.cs b/src/SharpMUTerm.Avalonia/ModalOverlay.cs index 18a4c005..eed0a7f3 100644 --- a/src/SharpMUTerm.Avalonia/ModalOverlay.cs +++ b/src/SharpMUTerm.Avalonia/ModalOverlay.cs @@ -14,7 +14,7 @@ namespace SharpMUTerm.Avalonia; /// /// One native modal over the window: a faint scrim over everything, and a rounded card holding the modal's view /// (, , , , -/// ). Fluent is applied to the card alone, in the client's variant, with the client's accent; +/// , , ). Fluent is applied to the card alone, in the client's variant, with the client's accent; /// the rest of the window keeps the Simple theme its menus and tooltips were built against — the palette's rule. /// /// A press on the scrim closes the modal (the quit prompt answers it as Stay). ⌃Q in any modal but the prompt goes to @@ -45,6 +45,8 @@ public ModalOverlay(ModalSession session, Action remove, Action new HistoryView(history, Colours, Done), LayoutsSession layouts => new LayoutsView(layouts, Colours, Done), WelcomeSession welcome => new WelcomeView(welcome, Colours, Done), + HelpSession help => new HelpView(help, Colours, Done), + DictionaryOfferSession offer => new DictionaryOfferView(offer, Colours, Done), _ => throw new ArgumentException($"no native view for {session.GetType().Name}", nameof(session)), }; AutomationProperties.SetName(this, _view.Title); diff --git a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs index 98259241..1466910a 100644 --- a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs +++ b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs @@ -17,12 +17,21 @@ namespace SharpMUTerm.Client.Commands; /// public static class BuiltInCommands { + /// Help: keys, slash commands and how-tos (/help). + public const string HelpCommand = "term:help"; + + /// The spelling dictionary offer. + public const string DictionaryCommand = "term:get-dictionary"; + + /// The ⌃P id that joins 's server wraps. + public static string JoinWraps(string world) => JoinWrapsPrefix + world; + /// The command that moves the keyboard into the connection sidebar (⌥C). public const string RailKeysCommand = "layout:rail-keys"; /// /// Turns F5's join wraps on for the world named after the prefix: the action of the notice that says a pane is - /// narrower than the server's wrap column. Lists nothing on ⌃P (F5 is the setting's home). + /// narrower than the server's wrap column, and a ⌃P entry (listed under SUGGESTED) for as long as that is so. /// public const string JoinWrapsPrefix = "world:join-wraps:"; @@ -77,7 +86,7 @@ void Family(string id, string prefix, Func []); + Family("world:join-wraps", JoinWrapsPrefix, JoinWrapsEntries); Add("world:reload-scripts", CommandGroup.World, "Reload scripts", detail: "re-reads this character's Lua files", when: c => c.State.ScriptsOn); @@ -176,6 +185,14 @@ void Family(string id, string prefix, Func c.State.NoDictionary); Add("term:timestamps-off", CommandGroup.Terminal, "Hide timestamps", when: c => c.State.TimestampsOn); Add("term:timestamps-on", CommandGroup.Terminal, "Show timestamps", when: c => !c.State.TimestampsOn); Add("term:input2-off", CommandGroup.Terminal, "Hide second input", "⌃B i", "this window", @@ -365,6 +382,17 @@ private static IEnumerable Windows(ICommandContext context) // The send group: one line to several characters. Offered once two characters are open, since a // group of one is the command line. + /// One Join server wraps for … entry per world whose pane is narrower than its server wraps. + private static IEnumerable JoinWrapsEntries(ICommandContext context) => + (context.State.RaggedWraps ?? []).Select(r => new CommandItem( + CommandGroup.World, + $"Join server wraps for {r.World}", + JoinWraps(r.World), + $"it wraps at {r.Column}, the pane is {r.PaneWidth} wide · F5 ▸ join wraps") + { + Detail = $"it wraps at {r.Column}, the pane is {r.PaneWidth} wide · F5 ▸ join wraps", + }); + private static IEnumerable SendGroup(ICommandContext context) { var characters = context.Characters; diff --git a/src/SharpMUTerm.Client/Composer/ComposerModel.cs b/src/SharpMUTerm.Client/Composer/ComposerModel.cs index ab08cebb..159670fb 100644 --- a/src/SharpMUTerm.Client/Composer/ComposerModel.cs +++ b/src/SharpMUTerm.Client/Composer/ComposerModel.cs @@ -141,6 +141,9 @@ public static ComposerModel Create( }; } + /// What F1's key row calls ⌥W while no dictionary marks the post. + public const string GetDictionary = "get a dictionary"; + /// The key row for a composer in this state. /// Whether F1's as-sent preview is showing, which names what ⌥P does next. public static IReadOnlyList KeysFor(ComposerPlace place, bool edit, bool dictionary, bool canSend, bool armed, bool preview = false) @@ -177,10 +180,8 @@ public static IReadOnlyList KeysFor(ComposerPlace place, bool edit, new("⌃S", canSend ? "send" : "send (nothing connected)"), new("⌥L", "escaping"), }; - if (dictionary) - { - keys.Add(new("⌥W", "add word")); - } + // With no dictionary, ⌥W is the way to one: the offer, never a download on its own. + keys.Add(dictionary ? new("⌥W", "add word") : new("⌥W", GetDictionary)); keys.Add(new("⌥P", preview ? "hide as sent" : "as sent")); keys.Add(new("Esc", "close (keeps the draft)")); diff --git a/src/SharpMUTerm.Client/Composer/ComposerSession.cs b/src/SharpMUTerm.Client/Composer/ComposerSession.cs index f0f9f9c3..7667d212 100644 --- a/src/SharpMUTerm.Client/Composer/ComposerSession.cs +++ b/src/SharpMUTerm.Client/Composer/ComposerSession.cs @@ -24,6 +24,9 @@ public sealed record ComposerCallbacks /// ⌥W, or the menu's Add to dictionary, with the word. public Action? AddWord { get; init; } + /// ⌥W in F1 with no dictionary: the client offers to download one. + public Action? GetDictionary { get; init; } + /// Esc in a docked composer: the keyboard goes back to the command line. public Action? Release { get; init; } @@ -147,6 +150,18 @@ public void AddWord(string word) } } + /// Whether ⌥W here offers a dictionary: F1 writing a post, with none marking it. + public bool CanGetDictionary => Model is { Edit: null, Dictionary: null, Place: ComposerPlace.FullScreen }; + + /// The host's: ⌥W with no dictionary. + public void GetDictionary() + { + if (CanGetDictionary && !IsEnded) + { + _callbacks.GetDictionary?.Invoke(); + } + } + /// The host's: Esc in a docked composer. public void Release() { diff --git a/src/SharpMUTerm.Client/Help/HelpTopics.cs b/src/SharpMUTerm.Client/Help/HelpTopics.cs new file mode 100644 index 00000000..9a3549be --- /dev/null +++ b/src/SharpMUTerm.Client/Help/HelpTopics.cs @@ -0,0 +1,96 @@ +using SharpMUTerm.Client.Modals; + +namespace SharpMUTerm.Client.Help; + +/// +/// The short how-to pages help lists. Plain sentences, keys in glyphs (a window spells them in words on the way to the +/// screen). Each page answers one question a new player asks, and names the key or the screen that does the thing; it +/// does not try to be the manual. +/// +public static class HelpTopics +{ + /// The pages, with (the host's newline chord) where a page names it. + public static IReadOnlyList For(string newline) => + [ + new("getting-started", "Getting started", "connect to a game, and what the screen is", [ + "Connect: type /connect mud.example.org 4000 (add tls for a secure port), or open the welcome", + "with /welcome. F5 keeps worlds and their characters; a character's password and connect line", + "log you in once a connection is open.", + "", + "The screen: output fills the panes, the command line is at the bottom and ⏎ sends what is on", + "it to the character whose pane is focused. The sidebar lists worlds, characters and windows;", + "click a row, or ⌥C to walk it with the keys.", + "", + $"Typing: ↑/↓ recall what you sent, ⌃R searches it, {newline} adds a second line, ⇥ completes a name.", + "", + "Everything else: ⌃P lists every command with its key. Type a few letters to find one.", + "⌃Q quits and says first what a quit would end.", + ]), + new("reading", "Reading output", "scroll back, search, freeze, join a server's wraps", [ + "Scroll: PgUp/PgDn a page, ⇧↑/⇧↓ a line, the wheel. Scrolled back, the pane splits: history on", + "top, the live tail below. End or ⌃End goes back to live output.", + "", + "Search: ⌃F finds text in what the panes hold. ⌥E reads the query as a pattern, ⌥A widens it", + "to every window, ⏎ goes to the line, ⌥G to the next one.", + "", + "Freeze: ⌥F holds a pane still while output keeps arriving under it; ⌥F again thaws it.", + "", + "Ragged lines: a game that wraps its text at 80 columns leaves a stray word on a row of its own", + "in a narrower pane. F5 ▸ join wraps joins those lines back so they wrap to the pane. It is off", + "until you turn it on, because a wrong join runs two lines into one; while a pane is narrower than", + "its game wraps, ⌃P suggests it.", + "", + "Copy: drag across output, then ⌃C.", + ]), + new("layouts", "Layouts", "panes, panels, and saving an arrangement", [ + "⌥M lists the layouts: Roleplay (who is here, a composer), Combat (vitals, a map, a quick bar)", + "and your own. ⏎ applies one; n saves the panes as they are now as a new layout.", + "", + "Panes: ⌃B | splits right, ⌃B - splits down, ⌃B z zooms, ⌃B x closes. ⌃←→↑↓ move between panes,", + "⌃O cycles them, ⌃N cycles a pane's tabs. ⌥⇧ and an arrow make the pane bigger or smaller.", + "Drag a tab onto another pane to move it there; an edge splits.", + "", + "A layout shows a panel only once there is something for it: the map after the first room,", + "vitals after the game sends them. F5 ▸ layout picks one per world.", + ]), + new("triggers", "Triggers", "match a line, then colour it, send it to a window, or reply", [ + "F2 holds the rules. A rule matches a line (contains, a wildcard pattern with *, or a regex),", + "and then does any of: highlight it, route it to a window (Chat, say), gag it, or send a reply.", + "", + "Quickest way: drag across a line of output, then ⌃P ▸ Make a trigger from the selection.", + "F2 opens on a rule for that line with the variable parts as *, and a live test underneath", + "shows which recent lines it would match.", + "", + "Rules live in trigger sets, shared between characters: F5 says which sets a character uses.", + "Aliases (F3) rewrite what you type; macros (F4) put commands on keys; timers (F6) repeat them.", + "/triggers says why a window did or did not open.", + ]), + new("composer", "Composer", "write a long post, check its spelling", [ + "F1 opens a full-screen editor. The whole buffer is one command, verb and all (+bbpost Title=...),", + "and its line breaks are sent as %r. ⌃S sends; Esc closes and keeps the draft for that character.", + "", + "⌥L switches between sending the text as typed and escaping it, so % [ ] and ; arrive as written.", + "⌥P shows the post exactly as it will be sent.", + "", + "Spelling: with a Hunspell dictionary, misspelt words are marked and ⌥W adds the word at the caret", + "to your own list. With none, ⌥W offers to download one (English, from LibreOffice) into the", + "dictionaries folder beside your configuration. Nothing is downloaded until you say so.", + "", + "The Roleplay layout docks a composer under the output that shares F1's draft.", + ]), + new("keys", "Keys", "windows, characters, panes, and the ⌃B keys", [ + "Windows: ⌥1 to ⌥9 go to a numbered window of the character you are on — the numbers are the ones", + "the sidebar prints beside each window.", + "Characters: ⌥J and ⌥K move to the next and previous character you have open.", + "Connection: ⌥R reconnects, ⌥D disconnects. Neither asks.", + "", + "Panes: ⌃B then a key — | split right, - split down, z zoom, o next, 1-9 go to a pane, x close,", + "b fold the sidebar, m move a window, i a second command line. Pause after ⌃B to see them all.", + "", + $"Typing: {newline} newline, ⌥←/→ by word, ⌃Z/⌃Y undo and redo, ⌃A select all, ⌃C copy, ⌃X cut.", + "", + "F4 puts your own commands on keys and says which keys this terminal cannot deliver.", + "Every key below is also an entry on ⌃P.", + ]), + ]; +} diff --git a/src/SharpMUTerm.Client/Help/SlashCommands.cs b/src/SharpMUTerm.Client/Help/SlashCommands.cs new file mode 100644 index 00000000..b0031bad --- /dev/null +++ b/src/SharpMUTerm.Client/Help/SlashCommands.cs @@ -0,0 +1,36 @@ +namespace SharpMUTerm.Client.Help; + +/// One command the command line answers itself rather than sending to the game. +/// What starts it (/connect). +/// The whole form, arguments included (/connect <host> [port] [tls]). +/// What it does, in one line. +/// What help puts on the command line when it is chosen: the name, and a space when it takes words. +public sealed record SlashCommand(string Name, string Usage, string Summary, string Placed); + +/// +/// The one list of slash commands. --help prints it, /help and ⌃P ▸ Help list it, and a +/// test holds it to the command line's own dispatch, so a command added in one place and not the others fails. +/// +public static class SlashCommands +{ + public static IReadOnlyList All { get; } = + [ + new("/help", "/help [words]", "This help: keys, slash commands and short how-tos, searched for the words", "/help "), + new("/connect", "/connect ", "Open a configured world by name", "/connect "), + new("/connect", "/connect [port] [tls]", "Add a world for a host and connect to it (port 4000 by default)", "/connect "), + new("/welcome", "/welcome", "Show the first-run welcome again", "/welcome"), + new("/welcome", "/welcome layout roleplay|combat|suggested", "Choose the starting layout the welcome offers", "/welcome layout "), + new("/package", "/package", "Open the Packages screen (F10)", "/package"), + new("/package", "/package browse", "Browse the package index, this game's packages first", "/package browse"), + new("/package", "/package install ", "Read a package and open its review; nothing is written before Enter", "/package install "), + new("/walk", "/walk ", "Speedwalk to a room on this connection's map, one step at a time", "/walk "), + new("/walk", "/walk stop", "Stop walking", "/walk stop"), + new("/map", "/map lock|unlock [room]", "Keep walks out of a room, or let them through again", "/map lock "), + new("/web", "/web ", "Open a page in the built-in web view", "/web "), + new("/graphics", "/graphics", "Say how pictures are drawn in this terminal, and why", "/graphics"), + new("/triggers", "/triggers", "Say which trigger rules this window's character runs, and why a window did not open", "/triggers"), + ]; + + /// The distinct names, in table order: what the command line dispatches on. + public static IReadOnlyList Names { get; } = All.Select(c => c.Name).Distinct(StringComparer.Ordinal).ToArray(); +} diff --git a/src/SharpMUTerm.Client/Modals/DictionaryOfferModel.cs b/src/SharpMUTerm.Client/Modals/DictionaryOfferModel.cs new file mode 100644 index 00000000..bc309145 --- /dev/null +++ b/src/SharpMUTerm.Client/Modals/DictionaryOfferModel.cs @@ -0,0 +1,66 @@ +namespace SharpMUTerm.Client.Modals; + +/// +/// The spelling dictionary offer: what would be downloaded, from where, under what licence, and where it would go — +/// the consent text, drawn by the cell surface (DictionaryOffer.Render) and by the window's native modal. Nothing +/// is fetched until the player says yes, and the offer exists only because the player asked (F1's ⌥W with no +/// dictionary, ⌃P ▸ Get a spelling dictionary). +/// +/// The dictionary's file name (en_US). +/// What a reader calls it (English (US)). +/// Where it comes from. +/// Its licence. +/// The host the files are fetched from. +/// About how big it is, in words (about 0.6 MB). +/// Where it would be written, or null when this run keeps no dictionaries folder (a test, the demo). +/// Whether that folder already holds a dictionary, which a download would sit beside. +public sealed record DictionaryOfferModel( + string Name, + string Language, + string Origin, + string Licence, + string Host, + string Size, + string? Folder, + bool Installed) +{ + /// The offer's question. + public string Question => $"Download the {Language} spelling dictionary?"; + + /// What the offer says, one sentence per line. + public IReadOnlyList Lines => + [ + $"{Name} — {Origin}, {Size}, fetched over https from {Host} and checked against the file this client expects.", + $"Licence: {Licence}.", + Folder is { } folder + ? $"It is saved in {folder}, and the composer checks spelling with it from then on." + : "This run keeps no dictionaries folder, so nothing can be saved: the live client saves it beside your configuration.", + Installed + ? "That folder already has a dictionary; this one is added beside it." + : "Nothing else is downloaded, and nothing is sent about you.", + ]; + + /// The keys the cell offer answers. + public const string Keys = "⏎ download · Esc not now"; +} + +/// +/// One opening of the dictionary offer in a host's own controls. closes it and starts the +/// download through the client's own method; Esc (or a click outside) closes it and fetches nothing. +/// +public sealed class DictionaryOfferSession : ModalSession +{ + private readonly Action _accept; + + public DictionaryOfferSession(DictionaryOfferModel model, bool isDark, Action accept, Action closed) + : base(model, isDark, closed) + { + ArgumentNullException.ThrowIfNull(accept); + _accept = accept; + } + + public override string Surface => "dictionary"; + + /// The host's: yes, download it. + public void Accept() => CloseThen(_accept); +} diff --git a/src/SharpMUTerm.Client/Modals/HelpModel.cs b/src/SharpMUTerm.Client/Modals/HelpModel.cs new file mode 100644 index 00000000..97dcd793 --- /dev/null +++ b/src/SharpMUTerm.Client/Modals/HelpModel.cs @@ -0,0 +1,225 @@ +using SharpMUTerm.Client.Help; +using SharpMUTerm.Client.Palette; +using SharpMUTerm.Core.Commands; + +namespace SharpMUTerm.Client.Modals; + +/// What a help row is: a how-to page, a slash command, or a key. +public enum HelpKind +{ + /// A short page (); choosing it shows the page. + Topic, + + /// A slash command (); choosing it puts the command on the command line, unsent. + Command, + + /// A key, from the command registry or the host's own keys; choosing one with a command runs it. + Key, +} + +/// One row of help. +/// What choosing it does. +/// The heading it is listed under. +/// What it is called: a page's title, a command's usage, a key's action. +/// The key, in glyphs (⌃P), or empty. +/// A few words more, or empty. +/// A page's id, the text a command places, or the command a key runs (empty for none). +public sealed record HelpEntry(HelpKind Kind, string Section, string Title, string Key, string Detail, string Target); + +/// A short how-to page. +public sealed record HelpTopic(string Id, string Title, string Summary, IReadOnlyList Lines) +{ + public bool Equals(HelpTopic? other) => + other is not null && Id == other.Id && Title == other.Title && Summary == other.Summary && ModelLists.Same(Lines, other.Lines); + + public override int GetHashCode() => HashCode.Combine(Id, Title, Summary, ModelLists.Hash(Lines)); + + /// + /// The page as paragraphs: consecutive lines joined with a space, a blank line between paragraphs kept as an empty + /// one. The lines are broken for reading in source; each host wraps the paragraphs to the width it has. + /// + public IReadOnlyList Paragraphs + { + get + { + var paragraphs = new List(); + var current = new List(); + foreach (var line in Lines) + { + if (line.Length == 0) + { + if (current.Count > 0) + { + paragraphs.Add(string.Join(' ', current)); + current.Clear(); + } + + paragraphs.Add(string.Empty); + continue; + } + + current.Add(line); + } + + if (current.Count > 0) + { + paragraphs.Add(string.Join(' ', current)); + } + + return paragraphs; + } + } +} + +/// +/// Help: the slash commands (from , the table --help prints), every key the command +/// registry names for this host plus the keys the host keeps, and a few short how-to pages. Drawn by the cell surface +/// (HelpSurface.Render) and by the window's native one; both filter it with , so a query lists +/// the same rows. +/// +/// Every row, in the order they are listed. +/// The pages the topic rows open. +public sealed record HelpModel(IReadOnlyList Entries, IReadOnlyList Topics) +{ + /// The heading over the pages. + public const string TopicsSection = "HOW-TO"; + + /// The heading over the slash commands. + public const string CommandsSection = "SLASH COMMANDS"; + + /// The heading over the keys the host keeps for itself and its newline. + public const string HostSection = "KEYS · THIS HOST"; + + /// What the list says when nothing matches. + public const string NoMatches = "nothing matches — ⌫ widens the search"; + + /// + /// The rows for , in list order: every row with each word of the query somewhere in its + /// title, key, detail or heading — or, for a page, in its text. A blank query lists everything. + /// + public IReadOnlyList View(string? query) + { + var words = (query ?? string.Empty).Split(' ', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries); + if (words.Length == 0) + { + return Entries; + } + + return Entries.Where(e => words.All(w => Mentions(e, w))).ToArray(); + } + + /// The page with , or null. + public HelpTopic? Topic(string? id) => Topics.FirstOrDefault(t => t.Id == id); + + private bool Mentions(HelpEntry entry, string word) + { + static bool In(string text, string w) => text.Contains(w, StringComparison.OrdinalIgnoreCase); + if (In(entry.Title, word) || In(entry.Key, word) || In(entry.Detail, word) || In(entry.Section, word)) + { + return true; + } + + return entry.Kind == HelpKind.Topic && Topic(entry.Target) is { } topic && topic.Lines.Any(l => In(l, word)); + } + + /// + /// Help for this host: the pages, the slash commands, every key names (⌃P's entries, so + /// a key is listed as the host spells it), then the host's newline and the chords it keeps. + /// + /// The command registry's entries for this host and state. + /// The host's newline chord, in glyphs (⌥⏎, ⌃⏎). + /// The chords the host keeps for itself, with what each does there. + public static HelpModel Build( + IReadOnlyList catalog, + string newline, + IReadOnlyList<(string Chord, string Action)> hostKeeps) + { + ArgumentNullException.ThrowIfNull(catalog); + ArgumentNullException.ThrowIfNull(hostKeeps); + var topics = HelpTopics.For(KeyGlyphs.Normalize(newline)); + var entries = new List(); + entries.AddRange(topics.Select(t => new HelpEntry(HelpKind.Topic, TopicsSection, t.Title, string.Empty, t.Summary, t.Id))); + entries.AddRange(SlashCommands.All.Select(c => new HelpEntry(HelpKind.Command, CommandsSection, c.Usage, string.Empty, c.Summary, c.Placed))); + + // The registry's keys, by its own groups. Go-to rows are left out: they are per character and per window, and + // the keys page says how those numberings work. + var seen = new HashSet(StringComparer.Ordinal); + foreach (var item in catalog.Where(i => i.Group != CommandGroup.GoTo && !string.IsNullOrWhiteSpace(i.Key))) + { + if (!seen.Add(item.Id)) + { + continue; + } + + entries.Add(new HelpEntry( + HelpKind.Key, + "KEYS · " + CommandPaletteModel.GroupLabel(item.Group), + item.Title, + KeyGlyphs.Normalize(item.Key!), + item.Detail ?? string.Empty, + item.Id)); + } + + entries.Add(new HelpEntry(HelpKind.Key, HostSection, "Insert a newline in the command line", KeyGlyphs.Normalize(newline), string.Empty, string.Empty)); + foreach (var (chord, action) in hostKeeps) + { + entries.Add(new HelpEntry(HelpKind.Key, HostSection, action, KeyGlyphs.Normalize(chord), "kept by this host", string.Empty)); + } + + return new HelpModel(entries, topics); + } + + public bool Equals(HelpModel? other) => + other is not null && ModelLists.Same(Entries, other.Entries) && ModelLists.Same(Topics, other.Topics); + + public override int GetHashCode() => HashCode.Combine(ModelLists.Hash(Entries), ModelLists.Hash(Topics)); +} + +/// +/// One opening of help in a host's own controls. Choosing a page shows it (the host's own business, nothing comes back); +/// choosing a slash command or a key comes back through , after help has closed, to the client +/// method the cell surface's ⏎ ends in. +/// +public sealed class HelpSession : ModalSession +{ + private readonly Action _choose; + + /// What help lists. + /// Whether the client's theme is a dark one. + /// Acts on entry N of , after help has closed. + /// Told help closed. + public HelpSession(HelpModel model, bool isDark, Action choose, Action closed) + : base(model, isDark, closed) + { + ArgumentNullException.ThrowIfNull(choose); + _choose = choose; + } + + public override string Surface => "help"; + + /// What the search box opens with typed in (/help words). + public string InitialQuery { get; init; } = string.Empty; + + /// The page help opens on, or null for the list. + public string? InitialTopic { get; init; } + + /// + /// The host's: ⏎ on entry of . A page is the host's to + /// show and returns false; a command or a key closes help and is acted on (true). A key with no command does nothing. + /// + public bool Choose(int entryIndex) + { + if (entryIndex < 0 || entryIndex >= Model.Entries.Count) + { + return false; + } + + var entry = Model.Entries[entryIndex]; + if (entry.Kind == HelpKind.Topic || entry.Target.Length == 0) + { + return false; + } + + return CloseThen(() => _choose(entryIndex)); + } +} diff --git a/src/SharpMUTerm.Client/Palette/CommandPaletteModel.cs b/src/SharpMUTerm.Client/Palette/CommandPaletteModel.cs index 079396dc..740d054e 100644 --- a/src/SharpMUTerm.Client/Palette/CommandPaletteModel.cs +++ b/src/SharpMUTerm.Client/Palette/CommandPaletteModel.cs @@ -1,3 +1,4 @@ +using SharpMUTerm.Client.Commands; using SharpMUTerm.Core.Commands; namespace SharpMUTerm.Client.Palette; @@ -138,6 +139,13 @@ public static IReadOnlyList Suggested(CommandContext state) ids.Add("settings:key-clashes"); } + // A pane narrower than its game wraps: every hard-wrapped row leaves a stray word. Suggested while it holds, + // rather than said once, because ragged lines are the look of every room until it is fixed. + foreach (var ragged in state.RaggedWraps ?? []) + { + ids.Add(BuiltInCommands.JoinWraps(ragged.World)); + } + return ids; } diff --git a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs index 2bf3de40..c3af479b 100644 --- a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs +++ b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs @@ -180,6 +180,12 @@ public static class SurfaceCatalog /// The first-run welcome and its connect form. public const string Welcome = "welcome"; + /// Help: keys, slash commands and how-to pages (⌃P ▸ Help, /help). + public const string Help = "help"; + + /// The spelling dictionary offer: the consent step before anything is downloaded. + public const string Dictionary = "dictionary"; + /// /// The +3 ▾ chip a tab strip carries when its tabs do not fit even at their floors, and the list of the tabs /// past its edges it opens: a cell list in a terminal, a native menu in the window (the chip itself is cells in both). @@ -203,7 +209,7 @@ public static class SurfaceCatalog private static string[] PanelViews(string view) => ["SharpMUTerm.Avalonia." + view, "SharpMUTerm.Avalonia.PopOutButton"]; /// The modals the window draws with its own controls in place of the cell modal (ClientHost.NativeModals). - public static IReadOnlyList Modals { get; } = [Quit, Search, History, Layouts, Welcome]; + public static IReadOnlyList Modals { get; } = [Quit, Search, History, Layouts, Welcome, Help, Dictionary]; /// A cell modal in a terminal; the window's own modal in its place. private static readonly IReadOnlyDictionary NativeModal = new Dictionary @@ -372,6 +378,9 @@ public static class SurfaceCatalog // Esc: the window closes and the buffer is kept as the character's draft. new(SurfaceActionKind.Compose, "close", "CloseComposer"), new(SurfaceActionKind.Compose, "add word", "AddComposerWord"), + + // ⌥W with no dictionary: F1 closes keeping the draft, and the dictionary offer opens. + new(SurfaceActionKind.Compose, "get dictionary", "OfferDictionary"), ], new Dictionary { @@ -455,6 +464,25 @@ public static class SurfaceCatalog NativeModal, "SharpMUTerm.Tui.WelcomeSurface.Render", ModalViews("WelcomeView")), + new( + Help, + typeof(HelpModel), + [ + // A slash command is put on the command line, never sent; a key runs its registry command. A page is the + // view's own to show and hands nothing back. + new(SurfaceActionKind.Modal, "place", "RunHelpEntry"), + new(SurfaceActionKind.Modal, "run", "RunHelpEntry"), + ], + NativeModal, + "SharpMUTerm.Tui.HelpSurface.Render", + ModalViews("HelpView")), + new( + Dictionary, + typeof(DictionaryOfferModel), + [new(SurfaceActionKind.Modal, "accept", "InstallDictionary")], + NativeModal, + "SharpMUTerm.Tui.DictionaryOffer.Render", + ModalViews("DictionaryOfferView")), new( TabOverflow, typeof(MenuModel), diff --git a/src/SharpMUTerm.Core/Commands/CommandCatalog.cs b/src/SharpMUTerm.Core/Commands/CommandCatalog.cs index 1cba2e48..4336c057 100644 --- a/src/SharpMUTerm.Core/Commands/CommandCatalog.cs +++ b/src/SharpMUTerm.Core/Commands/CommandCatalog.cs @@ -53,6 +53,13 @@ public sealed record CharacterRef( /// Null where the host cannot float a panel in a window of its own (the terminal), so nothing is offered; otherwise /// every panel that can pop out, docked or floating, so Pop out … and Dock … back name real windows. /// +/// +/// The worlds whose connected pane is narrower than the column their server wraps at, and which do not join wraps — so +/// Join server wraps for … is offered (and suggested) only while it would change what the pane shows. +/// +/// +/// Whether the client's own dictionaries folder holds none, so Get a spelling dictionary is offered. +/// public sealed record CommandContext( bool LoggingOn = false, bool Zoomed = false, @@ -67,7 +74,15 @@ public sealed record CommandContext( bool? Announced = null, bool OutputSelected = false, int KeyClashes = 0, - IReadOnlyList? Floats = null); + IReadOnlyList? Floats = null, + IReadOnlyList? RaggedWraps = null, + bool NoDictionary = false); + +/// A world whose pane is narrower than its server's wrap column. +/// The world's name. +/// The column its server wraps at. +/// How wide its pane is. +public sealed record RaggedWrap(string World, int Column, int PaneWidth); /// A panel window that can pop out into a window of its own, for the command surface's entries. /// The panel's window (map:World.Char, panel:vitals:World.Char). diff --git a/src/SharpMUTerm.Core/Text/DictionaryDownload.cs b/src/SharpMUTerm.Core/Text/DictionaryDownload.cs new file mode 100644 index 00000000..9cb35a1e --- /dev/null +++ b/src/SharpMUTerm.Core/Text/DictionaryDownload.cs @@ -0,0 +1,205 @@ +using System.Security.Cryptography; + +namespace SharpMUTerm.Core.Text; + +/// +/// A Hunspell dictionary the client knows how to fetch: two files at pinned https addresses, each with the SHA-256 the +/// bytes must have. The address names a release tag, so what it serves cannot move; the hash is what makes that true. +/// +/// The file name the pair is saved under (en_US), which is also what the composer calls it. +/// What a reader calls it (English (US)). +/// Where it comes from, said in the consent text. +/// Its licence, said in the consent text. +/// The affix file. +/// The affix file's SHA-256, lower-case hex. +/// The word list. +/// The word list's SHA-256, lower-case hex. +/// About how big the two are together, for the consent text. +public sealed record DictionarySource( + string Name, + string Language, + string Origin, + string Licence, + Uri Aff, + string AffSha256, + Uri Dic, + string DicSha256, + long Bytes); + +/// +/// Fetches a spelling dictionary into the client's own dictionaries/ folder, only when the player asks +/// (F1's ⌥W with no dictionary, ⌃P ▸ Get a spelling dictionary). Nothing is bundled and nothing is fetched at +/// start. Windows has no system Hunspell folder, so without this a roleplayer there never has spelling. +/// +/// Server text never meets the disk here, but the network does, so the rules are the package index's: https +/// only, every file capped while it streams (), and the bytes checked against the pinned +/// SHA-256 before anything is written. The pair is written as .new files and renamed, the affix file first, +/// because looks for a .dic with an .aff beside it: a pair half written +/// is never one it opens. +/// +/// +public static class DictionaryDownload +{ + /// The most one file may be. The largest English word list is about 1.2 MB. + public const long MaxFileBytes = 8L * 1024 * 1024; + + private const string Release = "https://raw.githubusercontent.com/LibreOffice/dictionaries/libreoffice-24.8.4.2/en/"; + + private const string LibreOffice = "LibreOffice's dictionaries (release 24.8.4.2)"; + + /// English (US): the default. + public static DictionarySource EnglishUs { get; } = new( + "en_US", + "English (US)", + LibreOffice, + "SCOWL / Hunspell en_US: free to use, copy and change", + new Uri(Release + "en_US.aff"), + "e746c882dd6f303c2c46e7452804b9201115a6942cfeb15f18f8edf774d2e24e", + new Uri(Release + "en_US.dic"), + "f0b1a234bd178bdd01875b2a392a9647f888b8fe879f79c52aae62c2759b3647", + 555_000); + + /// English (GB), for a locale that asks for it. + public static DictionarySource EnglishGb { get; } = new( + "en_GB", + "English (GB)", + LibreOffice, + "Marco A.G. Pinto's en_GB: LGPL / MPL", + new Uri(Release + "en_GB.aff"), + "04755f317851defd8b9f77fd7e5d60f495221fad926d0df346cd9b61b646bfc2", + new Uri(Release + "en_GB.dic"), + "e070c64007d0f6a3423d028a53da099934b5f967dc0ef6d01b631ec2119659d4", + 1_262_000); + + /// Every dictionary this client can fetch. + public static IReadOnlyList Catalog { get; } = [EnglishUs, EnglishGb]; + + /// + /// The one to offer for (en_GB, en-AU): its own if there is one, else the + /// US list — the only languages offered are English for now, and a reader of any other gets the US one named as + /// such rather than nothing. + /// + public static DictionarySource For(string? language) + { + var wanted = (language ?? string.Empty).Replace('-', '_').Split('.')[0].ToUpperInvariant(); + return wanted is "EN_GB" or "EN_IE" or "EN_NZ" or "EN_AU" or "EN_ZA" or "EN_IN" ? EnglishGb : EnglishUs; + } + + /// Whether already holds a dictionary pair, read without opening it. + public static bool Holds(string? folder) + { + if (folder is null) + { + return false; + } + + try + { + return Directory.Exists(folder) + && Directory.GetFiles(folder, "*.dic").Any(d => File.Exists(Path.ChangeExtension(d, ".aff"))); + } + catch (Exception ex) when (ex is IOException or UnauthorizedAccessException) + { + return false; + } + } + + /// + /// Fetches with and writes it into . + /// Returns null when it is installed, or why not. is handed the address and the cap and + /// returns the bytes, or null for a failed or over-long download; is the real one. + /// + public static async Task InstallAsync( + string folder, + DictionarySource source, + Func> fetch, + CancellationToken token = default) + { + ArgumentNullException.ThrowIfNull(folder); + ArgumentNullException.ThrowIfNull(source); + ArgumentNullException.ThrowIfNull(fetch); + + var files = new List<(string Extension, byte[] Bytes)>(); + foreach (var (uri, sha, extension) in new[] { (source.Aff, source.AffSha256, ".aff"), (source.Dic, source.DicSha256, ".dic") }) + { + if (uri.Scheme != Uri.UriSchemeHttps) + { + return $"{uri} is not https"; + } + + byte[]? bytes; + try + { + bytes = await fetch(uri, MaxFileBytes, token).ConfigureAwait(false); + } + catch (Exception ex) when (ex is HttpRequestException or IOException or TaskCanceledException) + { + return $"{source.Name}{extension} was not fetched: {ex.Message}"; + } + + if (bytes is null || bytes.Length > MaxFileBytes) + { + return $"{source.Name}{extension} was not fetched, or was too large"; + } + + if (!string.Equals(Convert.ToHexStringLower(SHA256.HashData(bytes)), sha, StringComparison.Ordinal)) + { + return $"{source.Name}{extension} is not the file this client expects (its SHA-256 differs); nothing was written"; + } + + files.Add((extension, bytes)); + } + + try + { + Directory.CreateDirectory(folder); + foreach (var (extension, bytes) in files) + { + var path = Path.Combine(folder, source.Name + extension); + var staging = path + ".new"; + await File.WriteAllBytesAsync(staging, bytes, token).ConfigureAwait(false); + File.Move(staging, path, overwrite: true); + } + } + catch (Exception ex) when (ex is IOException or UnauthorizedAccessException) + { + return $"{source.Name} could not be written to {folder}: {ex.Message}"; + } + + return null; + } + + private static readonly HttpClient Http = new() { Timeout = TimeSpan.FromSeconds(60) }; + + /// Downloads over https, stopping at bytes. + public static async Task DownloadAsync(Uri uri, long cap, CancellationToken token) + { + ArgumentNullException.ThrowIfNull(uri); + if (uri.Scheme != Uri.UriSchemeHttps) + { + return null; + } + + using var response = await Http.GetAsync(uri, HttpCompletionOption.ResponseHeadersRead, token).ConfigureAwait(false); + if (!response.IsSuccessStatusCode || response.Content.Headers.ContentLength > cap) + { + return null; + } + + await using var stream = await response.Content.ReadAsStreamAsync(token).ConfigureAwait(false); + using var buffer = new MemoryStream(); + var chunk = new byte[81920]; + int read; + while ((read = await stream.ReadAsync(chunk, token).ConfigureAwait(false)) > 0) + { + if (buffer.Length + read > cap) + { + return null; + } + + buffer.Write(chunk, 0, read); + } + + return buffer.ToArray(); + } +} diff --git a/src/SharpMUTerm.Tui/ClientUsage.cs b/src/SharpMUTerm.Tui/ClientUsage.cs index 9c450d5b..17d14365 100644 --- a/src/SharpMUTerm.Tui/ClientUsage.cs +++ b/src/SharpMUTerm.Tui/ClientUsage.cs @@ -159,6 +159,14 @@ public static void Write(TextWriter usage, UsageLauncher launcher, HostKeys keys usage.WriteLine("and the client opens with no connection. A host given here connects instead of them."); usage.WriteLine("'at start' only opens the connection. What is typed once one is open follows from the"); usage.WriteLine("character's saved password and connect line — F5's 'login' row says which."); + // The slash commands, from the one table /help lists too (SlashCommands.All). + usage.WriteLine(); + usage.WriteLine("Slash commands (typed on the command line; /help lists them, the keys and how-tos in the app):"); + foreach (var command in SharpMUTerm.Client.Help.SlashCommands.All) + { + usage.WriteLine($" {command.Usage,-38}{command.Summary}"); + } + usage.WriteLine(); usage.WriteLine("In-app: Up/Down history · Ctrl+N next tab · Ctrl+W close · Ctrl+P palette · Ctrl+Q quit."); usage.WriteLine("Selection: drag across a pane's output to select it, Ctrl+C to copy."); diff --git a/src/SharpMUTerm.Tui/ComposeOverlay.cs b/src/SharpMUTerm.Tui/ComposeOverlay.cs index 2a0b872e..5372d2b5 100644 --- a/src/SharpMUTerm.Tui/ComposeOverlay.cs +++ b/src/SharpMUTerm.Tui/ComposeOverlay.cs @@ -81,6 +81,16 @@ internal ComposeOverlay(ConsoleWindowSystem system, Func? spellin /// internal SpellChecker? Spelling => _edit is null ? _spelling : null; + /// ⌥W in a post with no dictionary: the host offers to download one. + internal event EventHandler? DictionaryWanted; + + /// Forgets the dictionary (or that there was none), so the next opening looks again — after a download. + internal void ForgetSpelling() + { + _spellingOpened = false; + _spelling = null; + } + /// Raised when ⌃S sends. The host decides where it goes and what it does about failure. internal event EventHandler? Send; @@ -331,6 +341,14 @@ private void OnKey(object? sender, KeyPressedEventArgs e) return; } + // ⌥W with no dictionary is the way to one: the host closes this window (keeping the draft) and asks first. + if (alt && key.Key == ConsoleKey.W && _edit is null) + { + e.Handled = true; + DictionaryWanted?.Invoke(this, EventArgs.Empty); + return; + } + // ⌥P shows the post as it will be sent, and hides it again. Alt by the same rule; P for preview, and nothing in // MacroKeys.AppShortcuts, the bar's table or a host's reserved chords takes it. A MOO edit is sent as its lines, // which the editor already shows, so it has no preview. diff --git a/src/SharpMUTerm.Tui/DictionaryOffer.cs b/src/SharpMUTerm.Tui/DictionaryOffer.cs new file mode 100644 index 00000000..f2030aa5 --- /dev/null +++ b/src/SharpMUTerm.Tui/DictionaryOffer.cs @@ -0,0 +1,32 @@ +using SharpMUTerm.Client.Modals; +using static SharpMUTerm.Tui.MarkupText; + +namespace SharpMUTerm.Tui; + +/// +/// The dictionary offer in cells: the question, what would be fetched from where and saved where, and the two keys. +/// Drawn from , the model the window's native offer draws. +/// +internal static class DictionaryOffer +{ + /// The width the offer asks for. + internal const int PreferredWidth = 72; + + internal static List Render(DictionaryOfferModel model, int width) + { + width = Math.Max(30, width); + var lines = new List + { + $"[bold {ScreenPalette.Value}]{Escape(model.Question)}[/]", + string.Empty, + }; + foreach (var sentence in model.Lines) + { + lines.AddRange(HelpSurface.Wrap(sentence, width - 1).Select(l => $"[{ScreenPalette.Label}]{Escape(l)}[/]")); + } + + lines.Add(string.Empty); + lines.Add($"[{ScreenPalette.Accent}]⏎[/] [{ScreenPalette.Value}]download[/] [{ScreenPalette.Accent}]Esc[/] [{ScreenPalette.Label}]not now[/]"); + return lines; + } +} diff --git a/src/SharpMUTerm.Tui/HelpSurface.cs b/src/SharpMUTerm.Tui/HelpSurface.cs new file mode 100644 index 00000000..e232bc3e --- /dev/null +++ b/src/SharpMUTerm.Tui/HelpSurface.cs @@ -0,0 +1,287 @@ +using SharpMUTerm.Client.Modals; +using static SharpMUTerm.Tui.MarkupText; + +namespace SharpMUTerm.Tui; + +/// +/// Help in cells: a search line, the matching rows of under their headings, and a how-to page +/// in place of the list once one is chosen. The state is the reader's (what is typed, which row, which page, how far +/// down it); what it lists is the model's , so the window's native help lists the same rows +/// for the same query. hosts it in a , which is sized once when it +/// opens, so always draws exactly the rows it is given. +/// +internal sealed class HelpSurface +{ + /// The width help asks for; the overlay narrows it on a small terminal. + internal const int PreferredWidth = 96; + + public HelpSurface(HelpModel model, string query = "", string? topic = null) + { + Model = model; + Query = query; + Topic = model.Topic(topic)?.Id; + } + + public HelpModel Model { get; } + + public string Query { get; private set; } + + /// The row selected in the filtered list. + public int Selected { get; private set; } + + /// The page showing, or null for the list. + public string? Topic { get; private set; } + + /// How far down the page is scrolled, in rows. + public int Scroll { get; private set; } + + /// The rows listed for the query. + public IReadOnlyList Rows => Model.View(Query); + + /// The index in of the selected row, or -1. + public int SelectedEntry => IndexOf(Model, Rows, Selected); + + /// Esc: a page goes back to the list (true, help stays open); from the list help closes (false). + public bool Back() + { + if (Topic is null) + { + return false; + } + + Topic = null; + Scroll = 0; + return true; + } + + /// + /// A key. Returns the entry index ⏎ chose when it is a command or a key to act on (help then closes), -1 when help + /// stays open (typing, moving, opening a page). + /// + public int Key(ConsoleKeyInfo key) + { + var rows = Rows; + if (Topic is not null) + { + Scroll = key.Key switch + { + ConsoleKey.UpArrow => Math.Max(0, Scroll - 1), + ConsoleKey.DownArrow => Scroll + 1, + ConsoleKey.PageUp => Math.Max(0, Scroll - 10), + ConsoleKey.PageDown or ConsoleKey.Spacebar => Scroll + 10, + ConsoleKey.Home => 0, + _ => Scroll, + }; + if (key.Key is ConsoleKey.Backspace or ConsoleKey.LeftArrow) + { + Back(); + } + + return -1; + } + + switch (key.Key) + { + case ConsoleKey.UpArrow: + Selected = rows.Count == 0 ? 0 : (Selected - 1 + rows.Count) % rows.Count; + return -1; + case ConsoleKey.DownArrow: + Selected = rows.Count == 0 ? 0 : (Selected + 1) % rows.Count; + return -1; + case ConsoleKey.PageUp: + Selected = Math.Max(0, Selected - 10); + return -1; + case ConsoleKey.PageDown: + Selected = Math.Min(Math.Max(0, rows.Count - 1), Selected + 10); + return -1; + case ConsoleKey.Backspace: + if (Query.Length > 0) + { + Query = Query[..^1]; + Selected = 0; + } + + return -1; + case ConsoleKey.Enter: + if (Selected < rows.Count) + { + var entry = rows[Selected]; + if (entry.Kind == HelpKind.Topic) + { + Topic = entry.Target; + Scroll = 0; + return -1; + } + + return entry.Target.Length == 0 ? -1 : SelectedEntry; + } + + return -1; + } + + if (key.KeyChar >= ' ' && !char.IsControl(key.KeyChar) + && (key.Modifiers & (ConsoleModifiers.Control | ConsoleModifiers.Alt)) == 0 + && Query.Length < 40) + { + Query += key.KeyChar; + Selected = 0; + } + + return -1; + } + + /// What help draws now, in rows of . + public List Render(int width, int rows) => Render(Model, Query, Selected, Topic, Scroll, width, rows); + + /// + /// Help for , with row marked — or page + /// scrolled rows down — in exactly rows. + /// + internal static List Render(HelpModel model, string query, int selected, string? topic, int scroll, int width, int rows) + { + width = Math.Max(30, width); + rows = Math.Max(8, rows); + var lines = new List(); + var body = rows - 3; + if (model.Topic(topic) is { } page) + { + lines.Add($"[{ScreenPalette.Accent}]HELP ▸[/] [bold {ScreenPalette.Value}]{Escape(page.Title)}[/]" + + $"[{ScreenPalette.Label}] · {Escape(page.Summary)}[/]"); + lines.Add(string.Empty); + var text = page.Paragraphs.SelectMany(l => Wrap(l, width - 3)).ToList(); + var top = Math.Clamp(scroll, 0, Math.Max(0, text.Count - body)); + foreach (var line in text.Skip(top).Take(body)) + { + lines.Add($" [{ScreenPalette.Value}]{Escape(line)}[/]"); + } + + Pad(lines, rows - 1); + var more = top + body < text.Count ? "↓ more · " : string.Empty; + lines.Add($"[{ScreenPalette.Label}]{more}↑↓ PgUp PgDn scroll · Esc back to the list[/]"); + return lines; + } + + var view = model.View(query); + var count = view.Count == model.Entries.Count ? $"{view.Count} entries" : $"{view.Count} of {model.Entries.Count}"; + lines.Add(SpreadLR( + $"[{ScreenPalette.Accent}]HELP[/] [{ScreenPalette.Label}]search[/] [{ScreenPalette.Value}]{Escape(query)}▏[/]", + $"[{ScreenPalette.Label}]{count}[/]", + width)); + lines.Add(string.Empty); + + // Each row is a heading (when its section starts) and the entry; the window of rows is chosen so the selected + // entry is on it, then the headings are drawn above the entries they lead. + var drawn = new List<(string Line, int Entry)>(); + var titleWidth = Math.Clamp(view.Count == 0 ? 16 : view.Max(e => e.Title.Length) + 1, 16, Math.Max(16, width * 45 / 100)); + string? section = null; + for (var i = 0; i < view.Count; i++) + { + var entry = view[i]; + if (entry.Section != section) + { + section = entry.Section; + drawn.Add(($"[{ScreenPalette.Muted}]{Escape(section)}[/]", -1)); + } + + drawn.Add((Row(entry, i == selected, width, titleWidth), i)); + } + + if (view.Count == 0) + { + drawn.Add(($" [{ScreenPalette.Label}]{Escape(HelpModel.NoMatches)}[/]", -1)); + } + + var at = Math.Max(0, drawn.FindIndex(d => d.Entry == selected)); + var first = Math.Clamp(at - (body / 2), 0, Math.Max(0, drawn.Count - body)); + var shown = drawn.Skip(first).Take(body).ToList(); + if (shown.Count > 1 && shown[^1].Entry < 0 && first + shown.Count < drawn.Count) + { + // A heading on the last row would lead nothing on screen. + shown.RemoveAt(shown.Count - 1); + } + + lines.AddRange(shown.Select(d => d.Line)); + Pad(lines, rows - 1); + lines.Add($"[{ScreenPalette.Label}]type to search · ↑↓ pick · ⏎ opens, places or runs it · Esc closes[/]"); + return lines; + } + + private static string Row(HelpEntry entry, bool selected, int width, int titleWidth) + { + var mark = selected ? $"[bold {ScreenPalette.Accent}]▸[/]" : " "; + var key = entry.Key.Length == 0 ? string.Empty : entry.Key; + var title = Fit(entry.Title, titleWidth); + var room = Math.Max(0, width - 3 - titleWidth - (key.Length == 0 ? 0 : key.Length + 2)); + var detail = Fit(entry.Detail, room); + var weight = selected ? "bold " : string.Empty; + var left = $"{mark} [{weight}{ScreenPalette.Value}]{Escape(title.PadRight(titleWidth))}[/] [{ScreenPalette.Label}]{Escape(detail)}[/]"; + return key.Length == 0 ? left : SpreadLR(left, $"[{ScreenPalette.Accent}]{Escape(key)}[/]", width); + } + + private static string Fit(string text, int width) => + width <= 0 ? string.Empty : text.Length <= width ? text : width == 1 ? "…" : text[..(width - 1)] + "…"; + + private static void Pad(List lines, int count) + { + while (lines.Count < count) + { + lines.Add(string.Empty); + } + + if (lines.Count > count) + { + lines.RemoveRange(count, lines.Count - count); + } + } + + /// Plain text broken at spaces into rows no wider than ; an empty line stays one. + internal static IEnumerable Wrap(string text, int width) + { + if (text.Length <= width) + { + yield return text; + yield break; + } + + var line = string.Empty; + foreach (var word in text.Split(' ')) + { + if (line.Length > 0 && line.Length + 1 + word.Length > width) + { + yield return line; + line = string.Empty; + } + + line = line.Length == 0 ? word : line + " " + word; + while (line.Length > width) + { + yield return line[..width]; + line = line[width..]; + } + } + + if (line.Length > 0) + { + yield return line; + } + } + + /// The index in 's entries of row of . + internal static int IndexOf(HelpModel model, IReadOnlyList view, int row) + { + if (row < 0 || row >= view.Count) + { + return -1; + } + + for (var i = 0; i < model.Entries.Count; i++) + { + if (ReferenceEquals(model.Entries[i], view[row])) + { + return i; + } + } + + return -1; + } +} diff --git a/src/SharpMUTerm.Tui/ListOverlay.cs b/src/SharpMUTerm.Tui/ListOverlay.cs index f5feef89..2f30858e 100644 --- a/src/SharpMUTerm.Tui/ListOverlay.cs +++ b/src/SharpMUTerm.Tui/ListOverlay.cs @@ -20,6 +20,7 @@ internal sealed class ListOverlay private Func>? _render; private Func? _key; private Func? _escape; + private Action? _closed; private ScreenTheme _scheme; @@ -49,13 +50,15 @@ public ListOverlay(ConsoleWindowSystem system, ScreenTheme? scheme = null) /// Asked first when Esc is pressed: true when the surface took it (to leave a sub-mode of its own — a name being /// typed, a delete awaiting its answer) and stays open; with none, or false, Esc closes. /// + /// Told once when this surface closes, however it does (not when a later one replaces it). public void Open( string mode, string title, Func> render, Func key, int? width = null, - Func? escape = null) + Func? escape = null, + Action? closed = null) { if (_window is not null) { @@ -65,6 +68,7 @@ public void Open( _render = render; _key = key; _escape = escape; + _closed = closed; var desktop = _system.DesktopDimensions; var widest = Math.Clamp(desktop.Width - 8, 44, 110); var outer = width is { } asked ? Math.Clamp(asked + 4, 24, widest) : widest; @@ -89,7 +93,9 @@ public void Open( // A window closed because the next surface replaced it must not clear the next one's state. if (_window == built) { + var closed = _closed; Reset(); + closed?.Invoke(); } }) .Build(); @@ -184,6 +190,7 @@ private void Reset() _render = null; _key = null; _escape = null; + _closed = null; Mode = null; } } diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Surfaces.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Surfaces.cs index 4ba87a0d..c3e5ce81 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Surfaces.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Surfaces.cs @@ -33,6 +33,8 @@ private T Drawing(string surface, string key, T model) : surface == SurfaceCatalog.History ? _historySearch.Model : surface == SurfaceCatalog.Layouts ? (_layoutsView.IsOpen && _layoutsView.Mode == "layouts" && LayoutsKey() is { } key2 ? LayoutsModelFor(key2) : null) : surface == SurfaceCatalog.Welcome ? (_welcomeView.IsOpen ? _welcome?.Model : null) + : surface == SurfaceCatalog.Help ? CellHelp?.Model + : surface == SurfaceCatalog.Dictionary ? (_helpView.IsOpen && _helpView.Mode == "dictionary" ? _dictionaryOffer : null) : _drawnModels.TryGetValue((surface, key), out var model) ? model : null; /// A click on a header link, as the header's own handler receives it. diff --git a/src/SharpMUTerm.Tui/Program.cs b/src/SharpMUTerm.Tui/Program.cs index eda9ac30..dfdc21ef 100644 --- a/src/SharpMUTerm.Tui/Program.cs +++ b/src/SharpMUTerm.Tui/Program.cs @@ -226,7 +226,8 @@ internal static int RunLive( packages: new PackageStore(PackageStore.PathFor(ConfigurationStore.DefaultPath)) { Logger = diagnostics.For("SharpMUTerm.Packages") }, scriptStoreRoot: Path.Combine(Path.GetDirectoryName(ConfigurationStore.DefaultPath)!, "script-data"), spelling: () => OpenDictionary(loadLogger), - autoLayout: true); + autoLayout: true, + dictionaries: DictionariesFolder); ready?.Invoke(liveApp); // A telnet:// link on the command line is followed once the loop runs, the way /connect host port would be; @@ -392,9 +393,12 @@ internal static string UsageText /// The composer's dictionary: dictionaries/ beside config.json first, then the system's, in the /// locale's language. Words added with ⌥W go to dictionaries/user-words.txt. /// + /// The client's own dictionaries folder, beside config.json: where the composer looks first and a download goes. + private static string DictionariesFolder => Path.Combine(Path.GetDirectoryName(ConfigurationStore.DefaultPath)!, "dictionaries"); + private static SpellChecker? OpenDictionary(ILogger logger) { - var own = Path.Combine(Path.GetDirectoryName(ConfigurationStore.DefaultPath)!, "dictionaries"); + var own = DictionariesFolder; var checker = SpellChecker.Find(SpellChecker.SearchFolders(own), SpellChecker.PreferredLanguage(), Path.Combine(own, "user-words.txt")); if (checker is null) { diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Help.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Help.cs new file mode 100644 index 00000000..5794e088 --- /dev/null +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Help.cs @@ -0,0 +1,402 @@ +using SharpMUTerm.Client.Commands; +using SharpMUTerm.Client.Modals; +using SharpMUTerm.Client.Surfaces; +using SharpMUTerm.Core.Accessibility; +using SharpMUTerm.Core.Diagnostics; +using SharpMUTerm.Core.Text; + +namespace SharpMUTerm.Tui; + +/// +/// Help (⌃P ▸ Help, /help [words]) and the spelling dictionary offer (F1's ⌥W with no dictionary, ⌃P ▸ +/// Get a spelling dictionary). Both are one Client model drawn as a cell here and as +/// a native modal in a host that has them (), and every gesture in either ends in +/// one method: and . +/// +/// Help is generated, not written twice. The slash commands are SlashCommands.All, the table --help +/// prints; the keys are the command registry's for this host and state plus ; only the how-to +/// pages are prose. A command chosen in help is put on the command line and never sent; a key chosen runs its command. +/// +/// +/// A dictionary is fetched only when asked, and the offer is the consent. It says what, from where, under what +/// licence and into which folder before anything is downloaded; the files come from a pinned https address and are +/// checked against pinned SHA-256s (). The folder is the caller's +/// (dictionaries:, the save:/logRoot: family): null in a test and a snapshot, which then refuse. +/// +/// +internal sealed partial class SharpMUTermApp +{ + /// The cell help, while it is open; null otherwise. + private HelpSurface? _help; + + /// Help's and the dictionary offer's cell modal. + private readonly ListOverlay _helpView; + + /// The client's own dictionaries/ folder, or null in a run that may write none. + private readonly string? _dictionariesRoot; + + /// The dictionary offer's model while the cell offer is open. + private DictionaryOfferModel? _dictionaryOffer; + + /// Whether F1 was closed to show the offer, so it opens again (with its draft) when the offer closes. + private bool _reopenComposerAfterOffer; + + /// A download is under way. + private bool _dictionaryDownloading; + + /// + /// Fetches one dictionary file, for the tests; null uses . Handed the + /// address and the cap. + /// + internal Func>? DictionaryFetch { get; set; } + + /// The last download, for the tests to await. + internal Task? DictionaryTask { get; private set; } + + /// The dictionary a test fetches in place of the reader's language's pinned one. + internal DictionarySource? DictionaryToFetch { get; set; } + + /// Whether help is open, in cells or natively. + internal bool HelpIsOpen => (_helpView.IsOpen && _helpView.Mode == "help") || NativeModalOf(SurfaceCatalog.Help) is not null; + + /// Whether the dictionary offer is open, in cells or natively. + internal bool DictionaryOfferOpen => + (_helpView.IsOpen && _helpView.Mode == "dictionary") || NativeModalOf(SurfaceCatalog.Dictionary) is not null; + + /// What the cell help or offer shows, for a test. + internal IReadOnlyList HelpLines => _helpView.Lines; + + /// Feeds a key to the cell help or offer. + internal void SimulateHelpKey(ConsoleKeyInfo key) => _helpView.SimulateKey(key); + + /// Types into the cell help's search. + internal void SimulateHelpTyping(string text) + { + foreach (var c in text) + { + SimulateHelpKey(new ConsoleKeyInfo(c, ConsoleKey.NoName, false, false, false)); + } + } + + /// The cell help's state, for a test; null while it is shut. + internal HelpSurface? CellHelp => _helpView.IsOpen && _helpView.Mode == "help" ? _help : null; + + /// The native help's session while one is open, for the tests. + internal HelpSession? NativeHelp => _nativeModal as HelpSession; + + /// The native offer's session while one is open, for the tests. + internal DictionaryOfferSession? NativeDictionaryOffer => _nativeModal as DictionaryOfferSession; + + /// Help for this host and this moment: the registry's keys as ⌃P lists them now. + internal HelpModel HelpModelNow() => HelpModel.Build( + BuildCatalog(), + Host.Keys.Newline.Glyph, + Host.Keys.Reserved.Select(r => (r.Chord.Glyph, r.Action)).ToArray()); + + /// + /// ⌃P ▸ Help and /help: opens help, typed into its search, or closes it. With no + /// screen to read (--plain) the matching rows are said as lines instead, since a modal would take the typing. + /// + private void ShowHelp(string query = "", string? topic = null) + { + if (NativeModalOf(SurfaceCatalog.Help) is { } native) + { + CloseNativeModal(native); + return; + } + + if (HelpIsOpen) + { + _helpView.Close(); + return; + } + + var model = HelpModelNow(); + if (!Host.ScreenIsSeen) + { + SayHelp(model, query); + return; + } + + if (ComposerIsInTheWay("help") || (AnyOverlayOpen && Refuse($"close {OpenOverlayName()} first"))) + { + return; + } + + if (TryOpenNativeHelp(model, query, topic)) + { + return; + } + + var help = new HelpSurface(model, query, topic); + _help = help; + var rows = Math.Clamp(_system.DesktopDimensions.Height - 6, 10, 30); + _helpView.Open( + "help", + "Help", + width => + { + Drawing(SurfaceCatalog.Help, string.Empty, help.Model); + return help.Render(width, rows); + }, + HelpKeyPressed, + width: HelpSurface.PreferredWidth, + escape: () => _help?.Back() == true); + } + + /// A key in the cell help: ⏎ on a command or a key closes help and acts on it. + private bool HelpKeyPressed(ConsoleKeyInfo key) + { + if (_help is not { } help) + { + return false; + } + + var chosen = help.Key(key); + if (chosen < 0) + { + return true; + } + + _helpView.Close(); + RunHelpEntry(help.Model, chosen); + return true; + } + + /// + /// The one place a chosen help row is acted on, from either host: a slash command is put on the command line (the + /// line already there goes into history first, as a grab's does) and never sent; a key runs its registry command. + /// + internal void RunHelpEntry(HelpModel model, int index) + { + if (index < 0 || index >= model.Entries.Count) + { + return; + } + + var entry = model.Entries[index]; + switch (entry.Kind) + { + case HelpKind.Command: + PlaceGrab(ActiveBar(), entry.Target); + UpdateInputChrome(); + break; + case HelpKind.Key when entry.Target.Length > 0: + if (!DispatchCommand(entry.Target)) + { + RefuseCommand($"{Snippet(entry.Title)} is not available here now"); + } + + break; + } + } + + /// Opens help in the host's controls; false when the host has none. + private bool TryOpenNativeHelp(HelpModel model, string query, string? topic) + { + if (NativeModalsHost is not { } native) + { + return false; + } + + HelpSession? session = null; + session = new HelpSession( + model, + ThemeIsDark(), + index => OnUiThread(() => RunHelpEntry(model, index)), + () => OnUiThread(() => NativeModalClosed(session!))) + { + Theme = _theme.Clone(), + InitialQuery = query, + InitialTopic = model.Topic(topic)?.Id, + }; + ShowNativeModal(native, session); + return true; + } + + /// Help said as lines, for a host with no screen to read: the matching rows, or the page they name. + private void SayHelp(HelpModel model, string query) + { + var lines = new List(); + var rows = model.View(query); + if (rows.Count == 1 && rows[0].Kind == HelpKind.Topic && model.Topic(rows[0].Target) is { } page) + { + lines.Add(page.Title); + lines.AddRange(page.Lines.Where(l => l.Length > 0)); + } + else + { + lines.AddRange(rows.Count == 0 + ? [HelpModel.NoMatches] + : rows.Select(r => string.Join(" — ", new[] { r.Key, r.Title, r.Detail }.Where(p => p.Length > 0)))); + } + + foreach (var line in lines) + { + AppendWindowLine(ActiveWindowId(), $"[dim]*** {MarkupText.Escape(line)}[/]"); + Host.Announcer?.Announce(line, AnnouncementKind.Notice); + } + } + + /// /help [words]. + private void HelpCommand(string argument) => ShowHelp(argument.Trim()); + + // ── the spelling dictionary ───────────────────────────────────────────────────────────────── + + /// The client's own dictionaries folder, or null in a run that keeps none (a test, a snapshot). + private string? DictionariesRoot => _dictionariesRoot; + + /// Whether the client's own folder holds no dictionary, so ⌃P offers to get one. + private bool NoOwnDictionary => _dictionariesRoot is not null && !DictionaryDownload.Holds(_dictionariesRoot); + + /// The offer for this locale and this run. + internal DictionaryOfferModel DictionaryOfferNow() + { + var source = DictionaryDownload.For(SpellChecker.PreferredLanguage()); + return new DictionaryOfferModel( + source.Name, + source.Language, + source.Origin, + source.Licence, + source.Dic.Host, + $"about {source.Bytes / 100_000 / 10.0:0.0} MB".Replace(',', '.'), + DictionariesRoot, + DictionaryDownload.Holds(DictionariesRoot)); + } + + /// + /// F1's ⌥W with no dictionary (in either host) and ⌃P ▸ Get a spelling dictionary: F1 closes, keeping its draft, and + /// the offer opens; F1 comes back when the offer closes. Nothing is fetched here. + /// + internal void OfferDictionary() + { + if (DictionaryOfferOpen) + { + return; + } + + if (_dictionaryDownloading) + { + RefuseCommand("a dictionary is already being downloaded"); + return; + } + + if (ComposerOpen) + { + _reopenComposerAfterOffer = true; + CloseComposer(); + } + + if (AnyOverlayOpen && Refuse($"close {OpenOverlayName()} first")) + { + _reopenComposerAfterOffer = false; + return; + } + + var model = DictionaryOfferNow(); + if (NativeModalsHost is { } native) + { + DictionaryOfferSession? session = null; + session = new DictionaryOfferSession( + model, + ThemeIsDark(), + () => OnUiThread(InstallDictionary), + () => OnUiThread(() => + { + NativeModalClosed(session!); + DictionaryOfferClosed(); + })) + { + Theme = _theme.Clone(), + }; + ShowNativeModal(native, session); + return; + } + + _dictionaryOffer = model; + _helpView.Open( + "dictionary", + "Spelling dictionary", + width => DictionaryOffer.Render(Drawing(SurfaceCatalog.Dictionary, string.Empty, model), width), + key => + { + if (key.Key != ConsoleKey.Enter) + { + return true; + } + + _helpView.Close(); + InstallDictionary(); + return true; + }, + width: DictionaryOffer.PreferredWidth, + closed: DictionaryOfferClosed); + } + + /// The offer closed, however it did: F1 comes back if the offer closed it. + private void DictionaryOfferClosed() + { + _dictionaryOffer = null; + if (_reopenComposerAfterOffer) + { + _reopenComposerAfterOffer = false; + ToggleComposer(); + } + } + + /// + /// Yes, from either host's offer: downloads the dictionary into the client's folder off the UI thread, and says + /// when it is in (or why not). The next F1 opens it; an F1 already open is not re-marked. + /// + internal void InstallDictionary() + { + if (DictionariesRoot is not { } root) + { + RefuseCommand("this run keeps no dictionaries folder, so nothing was downloaded"); + return; + } + + if (_dictionaryDownloading) + { + return; + } + + var source = DictionaryToFetch ?? DictionaryDownload.For(SpellChecker.PreferredLanguage()); + var fetch = DictionaryFetch ?? DictionaryDownload.DownloadAsync; + _dictionaryDownloading = true; + Notice($"Downloading the {source.Language} dictionary from {source.Dic.Host}…", MessageSeverity.Info, key: "dictionary"); + DictionaryTask = Task.Run(async () => + { + string? problem; + try + { + problem = await DictionaryDownload.InstallAsync(root, source, fetch).ConfigureAwait(false); + } + catch (Exception ex) when (ex is IOException or UnauthorizedAccessException or InvalidOperationException) + { + problem = ex.Message; + } + + OnUiThread(() => + { + _dictionaryDownloading = false; + if (problem is not null) + { + RefuseCommand(problem); + return; + } + + ForgetComposerSpelling(); + Notice($"{source.Name} is installed · F1 checks spelling with it", MessageSeverity.Info, key: "dictionary"); + }); + }); + } + + /// Drops the dictionary the composer opened (or found missing), so the next F1 looks again. + private void ForgetComposerSpelling() + { + _composerSpellingOpened = false; + _composerSpelling = null; + _composer.ForgetSpelling(); + } +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.JoinWraps.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.JoinWraps.cs index 6cf3d79d..ccd5d75a 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.JoinWraps.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.JoinWraps.cs @@ -1,5 +1,7 @@ using SharpMUTerm.Client.Chrome; using SharpMUTerm.Client.Commands; +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Core.Configuration; using SharpMUTerm.Core.Diagnostics; using SharpMUTerm.Core.Session; @@ -21,6 +23,43 @@ internal sealed partial class SharpMUTermApp /// The worlds this run has already been told about, by name. private readonly HashSet _joinWrapsSuggested = new(StringComparer.OrdinalIgnoreCase); + /// + /// The worlds whose pane is narrower than their server wraps right now, by name: what ⌃P suggests and F5 recommends + /// for as long as it holds. Written by with each pane width reported to a server. + /// + private readonly Dictionary _raggedWraps = new(StringComparer.OrdinalIgnoreCase); + + /// The ragged worlds, for ⌃P; null when there are none. + internal IReadOnlyList? RaggedWraps() => + _raggedWraps.Count == 0 + ? null + : _raggedWraps.Values.Where(r => WorldNamed(r.World) is { JoinWrappedLines: false }).OrderBy(r => r.World, StringComparer.OrdinalIgnoreCase).ToArray(); + + /// What F5 says beside join wraps for : a recommendation while it is ragged. + internal string? JoinWrapsAdvice(WorldDefinition world) => + !world.JoinWrappedLines && _raggedWraps.TryGetValue(world.Name, out var ragged) + ? $"recommended · wraps at {ragged.Column}, pane is {ragged.PaneWidth}" + : null; + + /// + /// Records whether 's pane ( wide) is narrower than the column + /// its server wraps at, by the same rule the notice uses. A pane that has caught up, or a world that joins, clears it. + /// + internal void NoteRaggedWraps(string world, int? column, int paneWidth) + { + if (column is { } wrap && paneWidth > 0 && paneWidth < wrap - 2 && WorldNamed(world) is { JoinWrappedLines: false }) + { + _raggedWraps[world] = new RaggedWrap(world, wrap, paneWidth); + } + else + { + _raggedWraps.Remove(world); + } + } + + private WorldDefinition? WorldNamed(string name) => + _config.Worlds.FirstOrDefault(w => string.Equals(w.Name, name, StringComparison.OrdinalIgnoreCase)); + /// /// Says, once per world, that 's pane is narrower than its server wraps — when the wrap /// column is known, the world does not join wraps, and the pane is at least a few columns short of it. Called with @@ -28,6 +67,7 @@ internal sealed partial class SharpMUTermApp /// private void SuggestJoinWraps(WorldSession session, int paneWidth) { + NoteRaggedWraps(session.World.Name, session.ServerWrapColumn, paneWidth); if (session.World.JoinWrappedLines || session.ServerWrapColumn is not { } column || paneWidth <= 0 @@ -60,6 +100,8 @@ private bool JoinWrapsFor(string worldName) SaveConfiguration(); } + _raggedWraps.Remove(world.Name); + Notice($"{Snippet(world.Name)} joins its wrapped lines from the next line · F5 ▸ join wraps", MessageSeverity.Info); return true; } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.NativeComposer.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.NativeComposer.cs index 4536af72..4b5b5ff8 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.NativeComposer.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.NativeComposer.cs @@ -119,6 +119,7 @@ private void OpenComposer(string target, string draft, ComposeEscaping escaping, } }), AddWord = word => OnUiThread(() => AddComposerWord(word)), + GetDictionary = () => OnUiThread(OfferDictionary), Proportional = ComposerFaceOf(ComposeDraftKey(ActiveWindowId())), ChooseFace = ChooseComposerFace(ComposeDraftKey(ActiveWindowId())), Closed = body => OnUiThread(() => diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.NativeModals.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.NativeModals.cs index 58f69dcb..9f91b082 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.NativeModals.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.NativeModals.cs @@ -62,6 +62,8 @@ internal sealed partial class SharpMUTermApp SurfaceCatalog.History => "the history search", SurfaceCatalog.Layouts => "the layouts", SurfaceCatalog.Welcome => "the welcome", + SurfaceCatalog.Help => "help", + SurfaceCatalog.Dictionary => "the dictionary offer", null => null, _ => "what is open", }; diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Theme.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Theme.cs index 51c57933..b871d4bd 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Theme.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Theme.cs @@ -86,6 +86,7 @@ private void ApplyTheme(Theme theme) _sendMenu.Scheme = _screens; _layoutsView.Scheme = _screens; _welcomeView.Scheme = _screens; + _helpView.Scheme = _screens; SchemePopups(); _header.BackgroundColor = ToColor(theme.StatusBackground); diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 6c896f39..47f78eba 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -689,7 +689,8 @@ public SharpMUTermApp( MediaCache? media = null, PackageStore? packages = null, string? scriptStoreRoot = null, - Func? spelling = null) + Func? spelling = null, + string? dictionaries = null) : this( config, ClientHost.ForHarness(capabilities, driver, focusReporting, openUrl, clipboard), @@ -704,7 +705,8 @@ public SharpMUTermApp( media, packages, scriptStoreRoot, - spelling) + spelling, + dictionaries: dictionaries) { } @@ -727,9 +729,11 @@ public SharpMUTermApp( PackageStore? packages = null, string? scriptStoreRoot = null, Func? spelling = null, - bool autoLayout = false) + bool autoLayout = false, + string? dictionaries = null) { _spelling = spelling; + _dictionariesRoot = string.IsNullOrWhiteSpace(dictionaries) ? null : dictionaries; _autoLayout = autoLayout; var capabilities = host.Capabilities; Host = host; @@ -934,6 +938,8 @@ public SharpMUTermApp( _sendMenu = new ListOverlay(_system, _screens); _layoutsView = new ListOverlay(_system, _screens); _welcomeView = new ListOverlay(_system, _screens); + _helpView = new ListOverlay(_system, _screens); + _composer.DictionaryWanted += (_, _) => OnUiThread(OfferDictionary); _composer.Send += (_, result) => SendComposed(result); _composer.Closed += (_, result) => KeepComposeDraft(result); _quit = new QuitOverlay(_system, QuitFactsNow, Quit, QuitPromptClosed); @@ -1864,6 +1870,46 @@ public string RenderSnapshot(string? view = null) OpenMenu(); } + // Help, opened by the ⌃P entry itself: the list, and a how-to page (the one that names join wraps). + if (string.Equals(view, "help", StringComparison.OrdinalIgnoreCase)) + { + DispatchCommand(SharpMUTerm.Client.Commands.BuiltInCommands.HelpCommand); + } + + if (string.Equals(view, "help-topic", StringComparison.OrdinalIgnoreCase)) + { + ShowHelp(topic: "reading"); + } + + // The spelling dictionary offer, through its ⌃P entry. The demo keeps no dictionaries folder, so the offer says + // nothing can be saved in this run — the text a live client shows names the folder instead. + if (string.Equals(view, "dictionary-offer", StringComparison.OrdinalIgnoreCase)) + { + DispatchCommand(SharpMUTerm.Client.Commands.BuiltInCommands.DictionaryCommand); + } + + // A pane narrower than its game wraps, recorded through the writer the live size report uses: ⌃P suggests + // joining the world's wraps; `join-wraps-f5` is F5 recommending it beside the setting. + if (string.Equals(view, "join-wraps", StringComparison.OrdinalIgnoreCase) + || string.Equals(view, "join-wraps-f5", StringComparison.OrdinalIgnoreCase)) + { + if (_config.Worlds.Count > 0) + { + NoteRaggedWraps(_config.Worlds[0].Name, 78, 60); + } + + if (string.Equals(view, "join-wraps", StringComparison.OrdinalIgnoreCase)) + { + OpenMenu(); + } + else + { + _settings.OpenForSnapshot(ConsoleKey.F5, WorldsScreen()); + SyncInputWidth(); + return RenderFrame(); + } + } + // The ⌃B which-key panel over the demo workspace: what the arming timer opens when no key has // arrived by the time it fires. `prefix` is the terse strip on its own — the first thing an armed // prefix shows — and this is what follows it, so the two views are the whole of the display. The @@ -5070,6 +5116,14 @@ private void OnCommandEntered(InputBar bar, string command) _workspace.SetUnsentInput(windowId, AnyBarHasText()); RefreshTabTitles(); + // `/help [words]` opens help, searched for the words. + if (command.StartsWith("/help", StringComparison.OrdinalIgnoreCase) + && (command.Length == 5 || command[5] == ' ')) + { + HelpCommand(command[5..]); + return; + } + // `/web ` opens the in-TUI web view; everything else goes to the world. if (command.StartsWith("/web ", StringComparison.OrdinalIgnoreCase)) { @@ -5540,7 +5594,7 @@ private void ToggleHistorySearch() private bool AnyOverlayOpen => PaletteIsOpen || _settings.IsOpen || _quit.IsOpen || NativeModalOpen || _messageLog.IsOpen || _historySearch.IsOpen || _prefixPanel.IsOpen || ComposerOpen || _search.IsOpen || _gameData.IsOpen || _packageView.IsOpen || _sendMenu.IsOpen - || _layoutsView.IsOpen || _welcomeView.IsOpen; + || _layoutsView.IsOpen || _welcomeView.IsOpen || _helpView.IsOpen; /// /// Opens the ⌃F search surface, or closes it when the chord arrives again. @@ -5670,6 +5724,7 @@ private string OpenOverlayName() => : _search.IsOpen ? "the search surface" : _prefixPanel.IsOpen ? "the pane keys panel" : _welcomeView.IsOpen ? "the welcome" + : _helpView.IsOpen ? (_helpView.Mode == "dictionary" ? "the dictionary offer" : "help") : "what is open"; /// Whether either bar is holding unsent text — what the ✎ tab marker means. @@ -7660,7 +7715,8 @@ private ScreenBinding WorldsScreen(string fkey, bool onCharacters) session.Selection.SelectionIn(WorldsScreenRenderer.TriggerSetsPane), _system.DesktopDimensions.Height, info: true, - layouts: Layouts.All)); + layouts: Layouts.All, + joinWrapsAdvice: JoinWrapsAdvice)); } /// @@ -8323,7 +8379,9 @@ private CommandContext CommandState() Announced: Host.Announcer is null ? null : IsAnnounced(ActiveWindowId()), OutputSelected: HasOutputSelection, KeyClashes: KeyClashes.Count(Host.Keys, Macros()), - Floats: FloatRefs()); + Floats: FloatRefs(), + RaggedWraps: RaggedWraps(), + NoDictionary: NoOwnDictionary); } /// @@ -8804,6 +8862,12 @@ private bool RunBuiltInCommand(string id) case "term:tour": ToggleKeyTour(); return true; + case SharpMUTerm.Client.Commands.BuiltInCommands.HelpCommand: + ShowHelp(); + return true; + case SharpMUTerm.Client.Commands.BuiltInCommands.DictionaryCommand: + OfferDictionary(); + return true; case "term:package-install": ActiveBar().SetAndNotify("/package install "); return true; @@ -13274,6 +13338,7 @@ private void ReportPaneSizes() if (!session.IsConnected) { _sizeReports.Remove(session); + _raggedWraps.Remove(session.World.Name); continue; } diff --git a/src/SharpMUTerm.Tui/SnapshotViews.cs b/src/SharpMUTerm.Tui/SnapshotViews.cs index 03f453ef..c100d881 100644 --- a/src/SharpMUTerm.Tui/SnapshotViews.cs +++ b/src/SharpMUTerm.Tui/SnapshotViews.cs @@ -28,6 +28,6 @@ internal static class SnapshotViews "collapsed", "timestamps", "timestamps-toggled", "theme-switched", "rail-keys", "prompt", "meters", "gamedata", "map", "map-walking", "map-split", "packages", "package-review", "package-browse", "send-menu", "layouts", "layout-combat", "layout-roleplay", "panel-who", "panel-vitals", "panel-quickbar", "panel-composer", - "welcome", "welcome-connect", "tour", + "welcome", "welcome-connect", "tour", "help", "help-topic", "dictionary-offer", "join-wraps", "join-wraps-f5", ]; } diff --git a/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs b/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs index e4e62262..89636b38 100644 --- a/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs +++ b/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs @@ -942,7 +942,8 @@ internal static List DetailColumn( string accent, ScreenFocus? focus = null, int height = 0, - IReadOnlyList? layouts = null) + IReadOnlyList? layouts = null, + Func? joinWrapsAdvice = null) { var all = layouts ?? BuiltInLayouts.All; var cursor = focus ?? ScreenFocus.None; @@ -1043,7 +1044,9 @@ world.GrabPrefix is { } grab WorldField("join wraps", Field( world.JoinWrappedLines ? $"[{Value}]{JoinWrapChoices[1]} lines the server wrapped[/]" - : $"[{Label}]{JoinWrapChoices[0]} · rows as the server sent them[/]", + : joinWrapsAdvice?.Invoke(world) is { } advice + ? $"[{Label}]{JoinWrapChoices[0]} · [/][{ScreenPalette.Caution}]{Escape(advice)}[/]" + : $"[{Label}]{JoinWrapChoices[0]} · rows as the server sent them[/]", cursor, selectedWorld, JoinWrapsField)), diff --git a/src/SharpMUTerm.Tui/WorldsScreenView.cs b/src/SharpMUTerm.Tui/WorldsScreenView.cs index 7c6c4b3a..fb573b2a 100644 --- a/src/SharpMUTerm.Tui/WorldsScreenView.cs +++ b/src/SharpMUTerm.Tui/WorldsScreenView.cs @@ -29,7 +29,8 @@ public static IWindowControl Build( int selectedSet = 0, int height = 0, bool info = false, - IReadOnlyList? layouts = null) + IReadOnlyList? layouts = null, + Func? joinWrapsAdvice = null) { // Both panes end in button rows, so a raw cursor can point past its list; resolving once here // keeps every block of the screen agreeing on which world and character are selected. @@ -69,7 +70,7 @@ public static IWindowControl Build( WorldsScreenRenderer.WorldsColumn(worlds, selectedWorld, focus, rows, info), scheme)); var detailCol = ScreenChrome.Stretch(ScreenChrome.Panel( WorldsScreenRenderer - .DetailColumn(worlds, triggerSets, selectedWorld, selectedCharacter, accent, focus, rows, layouts), + .DetailColumn(worlds, triggerSets, selectedWorld, selectedCharacter, accent, focus, rows, layouts, joinWrapsAdvice), scheme)); var body = Controls.HorizontalGrid() .WithAlignment(HorizontalAlignment.Stretch) diff --git a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs index 4636e3f1..8e3cbeca 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs @@ -255,6 +255,8 @@ await Assert.That(Rows(palette.Session!.View(query))).IsEquivalentTo(Rows(drawn! (SurfaceCatalog.Layouts, "layouts"), (SurfaceCatalog.Welcome, "welcome"), (SurfaceCatalog.Welcome, "welcome-connect"), + (SurfaceCatalog.Help, "help"), + (SurfaceCatalog.Dictionary, "dictionary-offer"), }) { using var nativeDriver = new AvaloniaConsoleDriver(140, 36); @@ -686,6 +688,30 @@ await SameModal("welcome: layout and browse", "welcome", }); probed.Add(SurfaceCatalog.Welcome); + // Help: a slash command placed on the command line (sent nowhere), and a key's command run — each the entry the + // other host's ⏎ picks, through RunHelpEntry. + await SameModal("help: place a slash command", "help", + (app, m) => + { + var help = (HelpSession)m.Open(SurfaceCatalog.Help)!; + help.Choose(HelpEntryIndex(help.Model, e => e.Kind == HelpKind.Command && e.Title.StartsWith("/connect", StringComparison.Ordinal))); + }, + app => HelpKeysTo(app, e => e.Kind == HelpKind.Command && e.Title.StartsWith("/connect", StringComparison.Ordinal))); + await SameModal("help: run a key", "help", + (app, m) => + { + var help = (HelpSession)m.Open(SurfaceCatalog.Help)!; + help.Choose(HelpEntryIndex(help.Model, e => e.Kind == HelpKind.Key && e.Target == "layout:toggle-rail")); + }, + app => HelpKeysTo(app, e => e.Kind == HelpKind.Key && e.Target == "layout:toggle-rail")); + probed.Add(SurfaceCatalog.Help); + + // The dictionary offer: Download in a client that keeps no dictionaries folder refuses out loud in both. + await SameModal("dictionary: download", "dictionary-offer", + (app, m) => ((DictionaryOfferSession)m.Open(SurfaceCatalog.Dictionary)!).Accept(), + app => app.SimulateHelpKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false))); + probed.Add(SurfaceCatalog.Dictionary); + var acting = SurfaceCatalog.All.Where(s => s.HasNative && s.Actions.Count > 0).Select(s => s.Id); // The tab overflow chip: an entry chosen from the window's menu and the same digit in the cell list bring the same // hidden tab forward. @@ -901,6 +927,31 @@ private static void LayoutsKeysTo(SharpMUTermApp app, string layoutId, ConsoleKe app.SimulateLayoutsKey(key); } + private static int HelpEntryIndex(HelpModel model, Func match) + { + for (var i = 0; i < model.Entries.Count; i++) + { + if (match(model.Entries[i])) + { + return i; + } + } + + throw new InvalidOperationException("no such help entry"); + } + + /// Moves the cell help's pointer down to the entry picks, then presses ⏎. + private static void HelpKeysTo(SharpMUTermApp app, Func match) + { + var target = HelpEntryIndex(app.CellHelp!.Model, match); + for (var i = 0; i < 500 && app.CellHelp!.SelectedEntry != target; i++) + { + app.SimulateHelpKey(new ConsoleKeyInfo('\0', ConsoleKey.DownArrow, false, false, false)); + } + + app.SimulateHelpKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false)); + } + private static object ModelOf(ModalSession session) => session switch { QuitSession quit => quit.Model, @@ -908,6 +959,8 @@ private static void LayoutsKeysTo(SharpMUTermApp app, string layoutId, ConsoleKe HistorySession history => history.Model, LayoutsSession layouts => layouts.Model, WelcomeSession welcome => welcome.Model, + HelpSession help => help.Model, + DictionaryOfferSession offer => offer.Model, _ => throw new ArgumentException(session.GetType().Name), }; @@ -928,6 +981,7 @@ private static string Outcome(SharpMUTermApp app) => string.Join( "screen=" + app.OpenSettingsKey, "layout=" + app.LiveLayoutId, "welcome=" + app.WelcomeIsOpen, + "help=" + app.HelpIsOpen + "/" + app.DictionaryOfferOpen, "quick=" + app.LastQuickMacro, "walk=" + app.WalkState, "rail=" + (app.BuildChromeOverlay().Sidebar.Collapsed ? "folded" : "open"), diff --git a/tests/SharpMUTerm.Client.Tests/HelpModelTests.cs b/tests/SharpMUTerm.Client.Tests/HelpModelTests.cs new file mode 100644 index 00000000..b7ca3289 --- /dev/null +++ b/tests/SharpMUTerm.Client.Tests/HelpModelTests.cs @@ -0,0 +1,125 @@ +using SharpMUTerm.Client.Commands; +using SharpMUTerm.Client.Composer; +using SharpMUTerm.Client.Help; +using SharpMUTerm.Client.Modals; +using SharpMUTerm.Client.Palette; +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Core.Workspaces; + +namespace SharpMUTerm.Client.Tests; + +/// +/// In-app help (), the one table of slash commands it and --help read +/// (), the dictionary offer (), and the ⌃P suggestion to +/// join a world's server wraps. +/// +public class HelpModelTests +{ + private static HelpModel Model() => HelpModel.Build( + BuiltInCommands.Catalog(new Workspace(), Array.Empty(), null, new CommandContext()), + "⌥⏎", + [("⌃Q", "quits")]); + + [Test] + public async Task HelpListsHowTosThenSlashCommandsThenKeys() + { + var model = Model(); + var sections = model.Entries.Select(e => e.Section).Distinct().ToList(); + + await Assert.That(sections[0]).IsEqualTo(HelpModel.TopicsSection); + await Assert.That(sections[1]).IsEqualTo(HelpModel.CommandsSection); + await Assert.That(sections.Skip(2).All(s => s.StartsWith("KEYS", StringComparison.Ordinal))).IsTrue(); + await Assert.That(model.Entries.Count(e => e.Kind == HelpKind.Command)).IsEqualTo(SlashCommands.All.Count); + await Assert.That(model.Topics.Select(t => t.Id)).Contains("getting-started"); + await Assert.That(model.Entries.Any(e => e.Section == HelpModel.HostSection && e.Key == "⌥⏎")).IsTrue() + .Because("the host's newline is named as this host spells it"); + } + + [Test] + public async Task EveryKeyRowIsAKeyTheRegistryOffers() + { + var model = Model(); + var catalog = BuiltInCommands.Catalog(new Workspace(), Array.Empty(), null, new CommandContext()); + foreach (var entry in model.Entries.Where(e => e.Kind == HelpKind.Key && e.Target.Length > 0)) + { + var item = catalog.Single(i => i.Id == entry.Target); + await Assert.That(entry.Key).IsEqualTo(KeyGlyphs.Normalize(item.Key!)).Because(entry.Title); + } + } + + [Test] + public async Task TheSearchNarrowsByEveryWord_AndReadsAHowTosPage() + { + var model = Model(); + var connect = model.View("connect host"); + await Assert.That(connect).IsNotEmpty(); + await Assert.That(connect.Any(e => e.Title.StartsWith("/connect", StringComparison.Ordinal))).IsTrue(); + + // "wraps" is said on the reading page, not in its title: the page is still found. + await Assert.That(model.View("join wraps").Any(e => e.Kind == HelpKind.Topic && e.Target == "reading")).IsTrue(); + await Assert.That(model.View("zzqx")).IsEmpty(); + await Assert.That(model.View(string.Empty).Count).IsEqualTo(model.Entries.Count); + } + + [Test] + public async Task ChoosingAHowToKeepsHelpOpen_AndACommandEndsIt() + { + var model = Model(); + var chosen = new List(); + var closed = 0; + var session = new HelpSession(model, isDark: true, chosen.Add, () => closed++); + var topic = model.Entries.ToList().FindIndex(e => e.Kind == HelpKind.Topic); + var command = model.Entries.ToList().FindIndex(e => e.Kind == HelpKind.Command); + + await Assert.That(session.Choose(topic)).IsFalse(); + await Assert.That(session.IsEnded).IsFalse(); + await Assert.That(session.Choose(command)).IsTrue(); + await Assert.That(chosen).IsEquivalentTo(new[] { command }); + await Assert.That(session.IsEnded).IsTrue(); + } + + [Test] + public async Task TheSlashTableNamesEachCommandOnce_WithAUsageThatStartsWithIt() + { + await Assert.That(SlashCommands.Names.Distinct().Count()).IsEqualTo(SlashCommands.Names.Count); + foreach (var command in SlashCommands.All) + { + await Assert.That(command.Usage.StartsWith(command.Name, StringComparison.Ordinal)).IsTrue().Because(command.Usage); + await Assert.That(command.Summary).IsNotEmpty(); + } + } + + [Test] + public async Task TheDictionaryOfferSaysWhereItFetchesFromAndWhereItSaves() + { + var model = new DictionaryOfferModel("English (US)", "en_US", "LibreOffice", "MIT-like", "raw.githubusercontent.com", "about 0.6 MB", "/home/a/dictionaries", false); + var text = string.Join("\n", model.Lines); + await Assert.That(text).Contains("raw.githubusercontent.com"); + await Assert.That(text).Contains("/home/a/dictionaries"); + + var none = model with { Folder = null }; + await Assert.That(string.Join("\n", none.Lines)).Contains("nothing can be saved"); + } + + [Test] + public async Task F1sKeyRowOffersADictionaryWhenThereIsNone() + { + var keys = ComposerModel.KeysFor(ComposerPlace.FullScreen, false, false, true, armed: true); + await Assert.That(keys.Any(k => k.Key == "⌥W" && k.Label == ComposerModel.GetDictionary)).IsTrue(); + var with = ComposerModel.KeysFor(ComposerPlace.FullScreen, false, true, true, armed: true); + await Assert.That(with.Any(k => k.Key == "⌥W" && k.Label == "add word")).IsTrue(); + } + + [Test] + public async Task ARaggedWorldIsSuggested_AndItsEntryNamesTheWorld() + { + var context = new CommandContext(RaggedWraps: [new RaggedWrap("Aetherfall", 78, 60)]); + var suggested = CommandPaletteModel.Suggested(context); + await Assert.That(suggested).Contains(BuiltInCommands.JoinWraps("Aetherfall")); + + var catalog = BuiltInCommands.Catalog(new Workspace(), Array.Empty(), null, context); + var item = catalog.Single(i => i.Id == BuiltInCommands.JoinWraps("Aetherfall")); + await Assert.That(item.Title).IsEqualTo("Join server wraps for Aetherfall"); + await Assert.That(CommandPaletteModel.Suggested(new CommandContext())).DoesNotContain(BuiltInCommands.JoinWraps("Aetherfall")); + } +} diff --git a/tests/SharpMUTerm.Core.Tests/DictionaryDownloadTests.cs b/tests/SharpMUTerm.Core.Tests/DictionaryDownloadTests.cs new file mode 100644 index 00000000..1d14206a --- /dev/null +++ b/tests/SharpMUTerm.Core.Tests/DictionaryDownloadTests.cs @@ -0,0 +1,100 @@ +using System.Security.Cryptography; +using System.Text; +using SharpMUTerm.Core.Text; + +namespace SharpMUTerm.Core.Tests; + +/// +/// The spelling dictionary fetched when the player asks (): https only, capped, checked +/// against a pinned SHA-256 before anything is written, and found by once it is. +/// +public class DictionaryDownloadTests +{ + private static readonly byte[] Aff = Encoding.UTF8.GetBytes("SET UTF-8\n"); + private static readonly byte[] Dic = Encoding.UTF8.GetBytes("3\nhello\nworld\npose\n"); + + private static string Sha(byte[] bytes) => Convert.ToHexStringLower(SHA256.HashData(bytes)); + + private static DictionarySource Source(string scheme = "https", string? dicSha = null) => new( + "en_TEST", "English (test)", "a test", "public domain", + new Uri($"{scheme}://example.org/en_TEST.aff"), Sha(Aff), + new Uri($"{scheme}://example.org/en_TEST.dic"), dicSha ?? Sha(Dic), + Aff.Length + Dic.Length); + + private static Task Serve(Uri uri, long cap, CancellationToken token) => + Task.FromResult(uri.AbsolutePath.EndsWith(".aff", StringComparison.Ordinal) ? Aff : Dic); + + private static string Folder() => Path.Combine(Path.GetTempPath(), "smt-dict-" + Guid.NewGuid().ToString("N")); + + [Test] + public async Task AFetchedPairIsWrittenAndFoundBySpelling() + { + var folder = Folder(); + try + { + await Assert.That(await DictionaryDownload.InstallAsync(folder, Source(), Serve)).IsNull(); + await Assert.That(DictionaryDownload.Holds(folder)).IsTrue(); + await Assert.That(Directory.GetFiles(folder, "*.new")).IsEmpty(); + var spelling = SpellChecker.Find([folder], "en_TEST", null); + await Assert.That(spelling).IsNotNull(); + await Assert.That(spelling!.Check("hello")).IsTrue(); + } + finally + { + if (Directory.Exists(folder)) + { + Directory.Delete(folder, true); + } + } + } + + [Test] + public async Task BytesThatAreNotThePinnedFileWriteNothing() + { + var folder = Folder(); + var problem = await DictionaryDownload.InstallAsync(folder, Source(dicSha: new string('0', 64)), Serve); + await Assert.That(problem).IsNotNull(); + await Assert.That(problem!).Contains("SHA-256"); + await Assert.That(Directory.Exists(folder)).IsFalse(); + } + + [Test] + public async Task OnlyHttpsIsFetched() + { + var asked = 0; + var problem = await DictionaryDownload.InstallAsync(Folder(), Source("http"), (u, c, t) => + { + asked++; + return Serve(u, c, t); + }); + await Assert.That(problem).IsNotNull(); + await Assert.That(asked).IsEqualTo(0); + } + + [Test] + public async Task ADownloadOverTheCapIsRefused() + { + var folder = Folder(); + var problem = await DictionaryDownload.InstallAsync(folder, Source(), (_, cap, _) => Task.FromResult(new byte[cap + 1])); + await Assert.That(problem).IsNotNull(); + await Assert.That(Directory.Exists(folder)).IsFalse(); + await Assert.That(DictionaryDownload.Holds(null)).IsFalse(); + } + + [Test] + public async Task ThePinnedSourcesAreHttpsAndTheLanguageChoosesOne() + { + foreach (var source in DictionaryDownload.Catalog) + { + await Assert.That(source.Aff.Scheme).IsEqualTo("https"); + await Assert.That(source.Dic.Scheme).IsEqualTo("https"); + await Assert.That(source.AffSha256.Length).IsEqualTo(64); + await Assert.That(source.DicSha256.Length).IsEqualTo(64); + } + + await Assert.That(DictionaryDownload.For("en-GB")).IsEqualTo(DictionaryDownload.EnglishGb); + await Assert.That(DictionaryDownload.For("en_AU.UTF-8")).IsEqualTo(DictionaryDownload.EnglishGb); + await Assert.That(DictionaryDownload.For("fr_FR")).IsEqualTo(DictionaryDownload.EnglishUs); + await Assert.That(DictionaryDownload.For(null)).IsEqualTo(DictionaryDownload.EnglishUs); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/ComposeSpellingTests.cs b/tests/SharpMUTerm.Tui.Tests/ComposeSpellingTests.cs index f8f457d8..326d799c 100644 --- a/tests/SharpMUTerm.Tui.Tests/ComposeSpellingTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/ComposeSpellingTests.cs @@ -84,16 +84,17 @@ public async Task AltWAddsTheWordAtTheCaretAndItIsNoLongerMarked() } [Test] - public async Task WithNoDictionaryTheHeaderSaysSoAndAltWIsNotOffered() + public async Task WithNoDictionaryTheHeaderSaysSoAndAltWOffersToGetOne() { var app = App(() => null); app.SimulateKey(Key(ConsoleKey.F1)); app.Composer.SimulateTyping("wrold"); await Assert.That(app.Composer.HeaderMarkup).Contains("no dictionary"); - await Assert.That(app.Composer.SimulateKey(Key(ConsoleKey.W, ConsoleModifiers.Alt))).IsFalse(); var rows = FrameGrid.Decode(app.RenderWholeFrame(), Width, Height); - await Assert.That(rows.Any(r => r.Contains("⌥W", StringComparison.Ordinal))).IsFalse(); + await Assert.That(rows.Any(r => r.Contains("⌥W", StringComparison.Ordinal) && r.Contains("get a dictionary", StringComparison.Ordinal))).IsTrue(); + await Assert.That(app.Composer.SimulateKey(Key(ConsoleKey.W, ConsoleModifiers.Alt))).IsTrue(); + await Assert.That(app.DictionaryOfferOpen).IsTrue().Because("⌥W with no dictionary offers one, and fetches nothing"); } [Test] diff --git a/tests/SharpMUTerm.Tui.Tests/HelpTests.cs b/tests/SharpMUTerm.Tui.Tests/HelpTests.cs new file mode 100644 index 00000000..54ef0bad --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/HelpTests.cs @@ -0,0 +1,211 @@ +using System.Security.Cryptography; +using System.Text; +using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Commands; +using SharpMUTerm.Client.Help; +using SharpMUTerm.Client.Modals; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Text; +using SharpMUTerm.Graphics; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// In-app help (/help, ⌃P ▸ Help), the spelling dictionary offered from F1 and fetched only when asked, and the +/// ⌃P / F5 suggestion to join a world's server wraps. +/// +[NotInParallel] +public class HelpTests +{ + private static readonly TerminalCapabilities Headless = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private static ConsoleKeyInfo Key(ConsoleKey key, char c = '\0', ConsoleModifiers modifiers = 0) => + new(c, key, modifiers.HasFlag(ConsoleModifiers.Shift), modifiers.HasFlag(ConsoleModifiers.Alt), modifiers.HasFlag(ConsoleModifiers.Control)); + + private static SharpMUTermApp App(string? dictionaries = null) + { + Console.SetIn(TextReader.Null); + return new SharpMUTermApp(new AppConfiguration(), Headless, new HeadlessConsoleDriver(120, 32), dictionaries: dictionaries); + } + + private static void TypeCommand(SharpMUTermApp app, string text) + { + foreach (var c in text) + { + app.SimulateKey(new ConsoleKeyInfo(c, ConsoleKey.NoName, false, false, false)); + } + + app.SimulateKey(Key(ConsoleKey.Enter, '\r')); + } + + [Test] + public async Task SlashHelpOpensHelpWithItsQueryTyped() + { + var app = App(); + TypeCommand(app, "/help connect"); + + await Assert.That(app.HelpIsOpen).IsTrue(); + await Assert.That(app.CellHelp!.Query).IsEqualTo("connect"); + await Assert.That(app.PrimaryInputText).IsEmpty(); + await Assert.That(string.Join("\n", app.HelpLines)).Contains("/connect"); + } + + [Test] + public async Task ThePaletteEntryOpensHelpAndEscClosesIt() + { + var app = App(); + await Assert.That(app.DispatchCommand(BuiltInCommands.HelpCommand)).IsTrue(); + await Assert.That(app.HelpIsOpen).IsTrue(); + + app.SimulateHelpKey(Key(ConsoleKey.Escape, '\x1b')); + await Assert.That(app.HelpIsOpen).IsFalse(); + } + + [Test] + public async Task ChoosingASlashCommandPlacesItOnTheCommandLineAndSendsNothing() + { + var app = App(); + app.DispatchCommand(BuiltInCommands.HelpCommand); + app.SimulateHelpTyping("/walk"); + var help = app.CellHelp!; + while (help.Rows[help.Selected].Kind != HelpKind.Command) + { + app.SimulateHelpKey(Key(ConsoleKey.DownArrow)); + } + + app.SimulateHelpKey(Key(ConsoleKey.Enter, '\r')); + + await Assert.That(app.HelpIsOpen).IsFalse(); + await Assert.That(app.PrimaryInputText).StartsWith("/walk"); + } + + [Test] + public async Task AHowToOpensAsAPageAndEscGoesBackToTheList() + { + var app = App(); + app.DispatchCommand(BuiltInCommands.HelpCommand); + app.SimulateHelpKey(Key(ConsoleKey.Enter, '\r')); + + await Assert.That(app.CellHelp!.Topic).IsEqualTo("getting-started"); + app.SimulateHelpKey(Key(ConsoleKey.Escape, '\x1b')); + await Assert.That(app.HelpIsOpen).IsTrue(); + await Assert.That(app.CellHelp!.Topic).IsNull(); + } + + [Test] + public async Task EveryRenderIsAsTallAsItWasAsked() + { + var model = App().HelpModelNow(); + foreach (var (query, topic) in new[] { ("", (string?)null), ("zzqx", null), ("", "keys"), ("connect", null) }) + { + await Assert.That(HelpSurface.Render(model, query, 0, topic, 0, 80, 18).Count).IsEqualTo(18); + } + } + + [Test] + public async Task EverySlashCommandTheCommandLineAnswersIsInTheTable() + { + var root = AppContext.BaseDirectory; + while (!File.Exists(Path.Combine(root, "SharpMUTerm.slnx"))) + { + root = Path.GetDirectoryName(root)!; + } + + var source = File.ReadAllText(Path.Combine(root, "src", "SharpMUTerm.Tui", "SharpMUTermApp.cs")); + var handled = System.Text.RegularExpressions.Regex.Matches(source, "\"(/[a-z]+)[ \"]") + .Select(m => m.Groups[1].Value) + .Where(n => n is "/help" or "/connect" or "/welcome" or "/package" or "/walk" or "/map" or "/web" or "/graphics" or "/triggers") + .Distinct(); + foreach (var name in handled) + { + await Assert.That(SlashCommands.Names).Contains(name); + } + + await Assert.That(SlashCommands.Names).Contains("/help"); + } + + [Test] + public async Task AltWInAComposerWithNoDictionaryOffersOne_AndF1ComesBackAfter() + { + var app = App(); + app.SimulateKey(Key(ConsoleKey.F1)); + app.Composer.SimulateTyping("a post"); + app.Composer.SimulateKey(Key(ConsoleKey.W, modifiers: ConsoleModifiers.Alt)); + + await Assert.That(app.DictionaryOfferOpen).IsTrue(); + await Assert.That(app.ComposerOpen).IsFalse(); + await Assert.That(string.Join("\n", app.HelpLines)).Contains("nothing can be saved"); + + app.SimulateHelpKey(Key(ConsoleKey.Escape, '\x1b')); + await Assert.That(app.DictionaryOfferOpen).IsFalse(); + await Assert.That(app.ComposerOpen).IsTrue().Because("the offer closed F1 and gives it back"); + } + + [Test] + public async Task WithNoDictionariesFolderNothingIsFetched() + { + var app = App(); + var asked = 0; + app.DictionaryFetch = (_, _, _) => + { + asked++; + return Task.FromResult(null); + }; + app.InstallDictionary(); + + await Assert.That(app.DictionaryTask is null).IsTrue(); + await Assert.That(app.LastNotice!).Contains("no dictionaries folder"); + } + + [Test] + public async Task YesFetchesThePairIntoTheFolderAndSaysSo() + { + var folder = Path.Combine(Path.GetTempPath(), "smt-dict-" + Guid.NewGuid().ToString("N")); + try + { + var aff = Encoding.UTF8.GetBytes("SET UTF-8\n"); + var dic = Encoding.UTF8.GetBytes("2\nhello\nworld\n"); + var app = App(folder); + app.DictionaryToFetch = new DictionarySource( + "en_TEST", "English (test)", "a test", "public domain", + new Uri("https://example.org/en_TEST.aff"), Convert.ToHexStringLower(SHA256.HashData(aff)), + new Uri("https://example.org/en_TEST.dic"), Convert.ToHexStringLower(SHA256.HashData(dic)), + aff.Length + dic.Length); + app.DictionaryFetch = (uri, _, _) => Task.FromResult(uri.AbsolutePath.EndsWith(".aff", StringComparison.Ordinal) ? aff : dic); + + app.DispatchCommand(BuiltInCommands.DictionaryCommand); + await Assert.That(app.DictionaryOfferOpen).IsTrue(); + app.SimulateHelpKey(Key(ConsoleKey.Enter, '\r')); + await (app.DictionaryTask ?? Task.CompletedTask); + + await Assert.That(DictionaryDownload.Holds(folder)).IsTrue(); + await Assert.That(app.LastNotice!).Contains("en_TEST is installed"); + } + finally + { + if (Directory.Exists(folder)) + { + Directory.Delete(folder, true); + } + } + } + + [Test] + public async Task ARaggedWorldIsSuggestedOnThePalette_AndRecommendedOnF5() + { + var config = new AppConfiguration(); + config.Worlds.Add(new WorldDefinition { Name = "Aetherfall", Host = "aether.example.org", Port = 4000 }); + Console.SetIn(TextReader.Null); + var app = new SharpMUTermApp(config, Headless, new HeadlessConsoleDriver(120, 32)); + app.NoteRaggedWraps("Aetherfall", 78, 60); + + await Assert.That(app.RaggedWraps()!.Select(r => r.World)).Contains("Aetherfall"); + await Assert.That(app.JoinWrapsAdvice(config.Worlds[0])).IsEqualTo("recommended · wraps at 78, pane is 60"); + + await Assert.That(app.DispatchCommand(BuiltInCommands.JoinWraps("Aetherfall"))).IsTrue(); + await Assert.That(config.Worlds[0].JoinWrappedLines).IsTrue(); + await Assert.That(app.RaggedWraps() ?? []).IsEmpty().Because("joined, there is nothing left to suggest"); + await Assert.That(app.JoinWrapsAdvice(config.Worlds[0])).IsNull(); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/NativeComposerRoutingTests.cs b/tests/SharpMUTerm.Tui.Tests/NativeComposerRoutingTests.cs index 91169eea..685ae6b4 100644 --- a/tests/SharpMUTerm.Tui.Tests/NativeComposerRoutingTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/NativeComposerRoutingTests.cs @@ -167,7 +167,7 @@ public async Task F1OpensTheHostsEditorAndNotTheCellModal() await Assert.That(model.Place).IsEqualTo(ComposerPlace.FullScreen); await Assert.That(model.Target).IsEqualTo("Ann"); await Assert.That(model.CanSend).IsTrue(); - await Assert.That(model.Keys.Select(k => k.Key)).IsEquivalentTo(new[] { "⌃S", "⌥L", "⌥P", "Esc" }); + await Assert.That(model.Keys.Select(k => k.Key)).IsEquivalentTo(new[] { "⌃S", "⌥L", "⌥W", "⌥P", "Esc" }); } [Test] From bcff583c52708c05ce6a6aabd610be7814ce56d8 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 12:11:56 +0000 Subject: [PATCH 046/113] Dictionary notices carry a Spelling source label, not a key --- src/SharpMUTerm.Client/Chrome/NoticeModel.cs | 3 +++ src/SharpMUTerm.Tui/SharpMUTermApp.Help.cs | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/SharpMUTerm.Client/Chrome/NoticeModel.cs b/src/SharpMUTerm.Client/Chrome/NoticeModel.cs index f5355827..c294c194 100644 --- a/src/SharpMUTerm.Client/Chrome/NoticeModel.cs +++ b/src/SharpMUTerm.Client/Chrome/NoticeModel.cs @@ -48,6 +48,9 @@ public static class Sources /// Game sound and mute. public const string Sound = "Sound"; + + /// Spelling dictionary downloads. + public const string Spelling = "Spelling"; } /// How long a notice holds the status row, and how long a toast stays before it fades. diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Help.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Help.cs index 5794e088..d1f43619 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Help.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Help.cs @@ -364,7 +364,7 @@ internal void InstallDictionary() var source = DictionaryToFetch ?? DictionaryDownload.For(SpellChecker.PreferredLanguage()); var fetch = DictionaryFetch ?? DictionaryDownload.DownloadAsync; _dictionaryDownloading = true; - Notice($"Downloading the {source.Language} dictionary from {source.Dic.Host}…", MessageSeverity.Info, key: "dictionary"); + Notice($"Downloading the {source.Language} dictionary from {source.Dic.Host}…", MessageSeverity.Info, source: SharpMUTerm.Client.Chrome.NoticeModel.Sources.Spelling); DictionaryTask = Task.Run(async () => { string? problem; @@ -387,7 +387,7 @@ internal void InstallDictionary() } ForgetComposerSpelling(); - Notice($"{source.Name} is installed · F1 checks spelling with it", MessageSeverity.Info, key: "dictionary"); + Notice($"{source.Name} is installed · F1 checks spelling with it", MessageSeverity.Info, source: SharpMUTerm.Client.Chrome.NoticeModel.Sources.Spelling); }); }); } From 1fbc6de12451491db83452f0725609aa420ac667 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 12:50:25 +0000 Subject: [PATCH 047/113] feat(import): bring worlds and automation over from MUSHclient, Mudlet and TinTin++ Core/Import reads a MUSHclient .mcl, a Mudlet XML package or profile save, a Mudlet profile folder or .mpackage (read in memory, never extracted) and a TinTin++ script, bounded and tolerant: a rule that cannot be carried over exactly is skipped and listed with its reason, and script code is listed as left out and never run. ImportPlan decides what is new without touching the configuration; the rules go into a new "Imported from " set and nothing existing is overwritten. Passwords are stored only when the player asks. The review (ImportReviewModel) leads with what can act as the player and is drawn by a cell overlay and a native card in the window; nothing is written before Enter. Entry points: /import , Ctrl+P > Import from another client..., and the welcome. The window opens a native file picker (ClientHost.FilePicker, required, null elsewhere). Declared in SurfaceCatalog with parity probes; import-review snapshot view. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 4 + CLAUDE.md | 25 +- .../AvaloniaConsoleDriver.cs | 3 + src/SharpMUTerm.Avalonia/ImportReviewView.cs | 237 ++++++++ src/SharpMUTerm.Avalonia/MainWindow.cs | 1 + src/SharpMUTerm.Avalonia/ModalOverlay.cs | 1 + src/SharpMUTerm.Avalonia/WelcomeView.cs | 2 +- src/SharpMUTerm.Avalonia/WindowFilePicker.cs | 54 ++ src/SharpMUTerm.Avalonia/WindowHost.cs | 3 + src/SharpMUTerm.Client/Chrome/NoticeModel.cs | 3 + .../Commands/BuiltInCommands.cs | 4 + src/SharpMUTerm.Client/Help/SlashCommands.cs | 1 + .../Modals/ImportReviewModel.cs | 208 +++++++ src/SharpMUTerm.Client/Modals/WelcomeModel.cs | 4 + .../Surfaces/SurfaceCatalog.cs | 16 +- src/SharpMUTerm.Core/Import/ClientImport.cs | 103 ++++ src/SharpMUTerm.Core/Import/ImportPlan.cs | 214 +++++++ src/SharpMUTerm.Core/Import/ImportResult.cs | 147 +++++ src/SharpMUTerm.Core/Import/ImportText.cs | 179 ++++++ src/SharpMUTerm.Core/Import/MudletImport.cs | 530 +++++++++++++++++ .../Import/MushclientImport.cs | 347 +++++++++++ src/SharpMUTerm.Core/Import/TinTinImport.cs | 531 +++++++++++++++++ src/SharpMUTerm.Tui/DemoImport.cs | 45 ++ src/SharpMUTerm.Tui/Hosting/ClientHost.cs | 8 + src/SharpMUTerm.Tui/Hosting/IFilePicker.cs | 17 + src/SharpMUTerm.Tui/ImportReview.cs | 108 ++++ .../Pointer/SharpMUTermApp.Surfaces.cs | 1 + src/SharpMUTerm.Tui/SharpMUTermApp.Import.cs | 338 +++++++++++ src/SharpMUTerm.Tui/SharpMUTermApp.Welcome.cs | 5 + src/SharpMUTerm.Tui/SharpMUTermApp.cs | 21 +- src/SharpMUTerm.Tui/SnapshotViews.cs | 2 +- src/SharpMUTerm.Tui/WelcomeSurface.cs | 8 +- .../NativeModalTests.cs | 33 ++ .../SurfaceParityTests.cs | 23 + .../ImportReviewModelTests.cs | 96 ++++ .../Import/ClientImportTests.cs | 540 ++++++++++++++++++ tests/SharpMUTerm.Tui.Tests/ImportTests.cs | 207 +++++++ 37 files changed, 4063 insertions(+), 6 deletions(-) create mode 100644 src/SharpMUTerm.Avalonia/ImportReviewView.cs create mode 100644 src/SharpMUTerm.Avalonia/WindowFilePicker.cs create mode 100644 src/SharpMUTerm.Client/Modals/ImportReviewModel.cs create mode 100644 src/SharpMUTerm.Core/Import/ClientImport.cs create mode 100644 src/SharpMUTerm.Core/Import/ImportPlan.cs create mode 100644 src/SharpMUTerm.Core/Import/ImportResult.cs create mode 100644 src/SharpMUTerm.Core/Import/ImportText.cs create mode 100644 src/SharpMUTerm.Core/Import/MudletImport.cs create mode 100644 src/SharpMUTerm.Core/Import/MushclientImport.cs create mode 100644 src/SharpMUTerm.Core/Import/TinTinImport.cs create mode 100644 src/SharpMUTerm.Tui/DemoImport.cs create mode 100644 src/SharpMUTerm.Tui/Hosting/IFilePicker.cs create mode 100644 src/SharpMUTerm.Tui/ImportReview.cs create mode 100644 src/SharpMUTerm.Tui/SharpMUTermApp.Import.cs create mode 100644 tests/SharpMUTerm.Client.Tests/ImportReviewModelTests.cs create mode 100644 tests/SharpMUTerm.Core.Tests/Import/ClientImportTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/ImportTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 7991b70a..ed3a9eb5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- Import worlds, characters, triggers, aliases, timers and keys from MUSHclient (.mcl), Mudlet (a profile folder, + an XML package or a .mpackage) and TinTin++ with `/import `, Ctrl+P ▸ Import from another client… or the welcome + screen. A review shows what can act as you, what will be added and what was left out (scripts are never imported or + run) before anything is written; nothing you already have is replaced, and passwords are stored only if you say so. - A world can reconnect by itself after its connection drops (F5 ▸ reconnect). It waits 5, 15, 30, 60 and 60 seconds between tries, counts down on the status row, and stops after five; Alt+R dials at once, and Disconnect or Ctrl+P ▸ Stop reconnecting cancels. Your own Disconnect, quitting, or the game closing right after you typed a diff --git a/CLAUDE.md b/CLAUDE.md index f768d53c..bef845b7 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -210,6 +210,29 @@ fallbacks) for inline images/maps. the review opens, so the review is never shown for bytes the index did not name. The focused window's world (its session's, else its owner's, never `_active`) sorts its own packages first; a `*` package does not count as the world's own. The default index repository does not exist yet. +- **Worlds and automation can be imported from MUSHclient, Mudlet and TinTin++** (`Core/Import`: `ClientImport`, + `MushclientImport`, `MudletImport`, `TinTinImport`, `ImportPlan`; Client `ImportReviewModel`/`ImportReviewSession`; + Tui `SharpMUTermApp.Import.cs`, `ImportReview`; Avalonia `ImportReviewView`; `/import `, ⌃P ▸ *Import from another + client…*, the welcome's last row; the `import-review` view). Formats: a MUSHclient `.mcl`, a Mudlet XML package or + profile save, a Mudlet profile folder (newest `current/*.xml` plus its `url`/`port`/`login`/`password` files), a + `.mpackage`/`.zip` (read in memory, never extracted), and a TinTin++ script. Decisions not to relitigate: + - **The file is untrusted text meeting the configuration.** Read by sniffing content, not the extension; XML with no + DTD and no resolver; bounded (16 MiB, 5,000 rules, 100 worlds, 4 KiB a field, 512 zip entries, depth 32). A rule + that cannot be carried over exactly is skipped and listed with its reason (`ImportSkip`), never approximated: script + code (Lua, VBScript, a MUSHclient `script=`, a Mudlet chain or colour trigger, a TinTin `#` command in a body) is + listed as left out and never executed; a rule whose command survives keeps it and lists its script as a `part`. + - **Nothing is written before ⏎, and nothing is overwritten.** `ImportPlan.For` decides on the client's thread what + is new: a world at an existing endpoint gains only characters it lacks, a clashing name gets ` (2)`, and the rules go + into one new set `Imported from ` (suffixed if taken), listed on the *new* characters only. `Apply` re-plans + and refuses if the configuration moved since the review. Saved through `SaveConfiguration`. + - **Passwords are off unless asked.** The review says how many the file holds; `p` (the window's check box) stores + them on the new characters, which the vault then takes. They never appear in a model, a notice or a log. + - **The review is the package review's shape**: `WHAT CAN ACT AS YOU` first, then `WHAT IT ADDS`, then `LEFT OUT (n)`; + one model drawn by `ImportReview.Render` (cells, a `ListOverlay`) and the native card (`SurfaceCatalog.Import`). + - **`ClientHost.FilePicker` (`IFilePicker?`, required)** is the window's native open dialog; null in the terminal and + headless, where ⌃P puts `/import ` on the command line instead. `--plain` answers with `/import yes|no|passwords`. + - Not done: Potato and BeipMU (formats not verified), MUSHclient time-of-day timers and colour-changing triggers, + Mudlet multi-line/colour/chain triggers, TinTin `#regex`/`#if` blocks. - **The shared client shell** (`SharpMUTerm.Client`; `ContributionRegistry`). UI-agnostic, references Core only (`ClientAssemblyTests` fails on a SharpConsoleUI or Avalonia reference). The registry holds six kinds — commands, panels, settings sections (field descriptors only), status cells (reserved width, drop order), @@ -1355,7 +1378,7 @@ one `SharpMUTermApp`; a host is only the place it runs. What differs between hos (`src/SharpMUTerm.Tui/Hosting/`): driver, capabilities, clipboard, URL opener, focus reporting, keys (`HostKeys`: the newline chord, and the chords the host keeps for itself), whether there is a main loop, the Sixel cell size, and what it does with the pointer (`IPointerPresenter`, null for none), whether it draws the declared settings natively (`INativeSettings`, null for the cell screens), and whether it -draws ⌃P natively (`INativePalette`, null for the cell popup), whether it draws the composer with its own editor (`INativeComposer`, null for cells), whether it draws the quit prompt, ⌃F, ⌃R, ⌥M, the welcome, help and the dictionary offer itself (`INativeModals`, null for cells), where the title for what is in front goes (`IWindowTitle`: the window's title bar, the terminal's OSC 2, null headless), whether it can pop a panel out into a window of its own (`IFloatingPanels`, null for none), how it asks for attention while the player is elsewhere (`IAttention`, null headless), and which chrome it draws itself beside the cells (`HostChrome`: the header and the rail, which the client then leaves out of the grid). Built by `ClientHost.Terminal`, `ClientHost.Headless`/`Snapshot` and +draws ⌃P natively (`INativePalette`, null for the cell popup), whether it draws the composer with its own editor (`INativeComposer`, null for cells), whether it draws the quit prompt, ⌃F, ⌃R, ⌥M, the welcome, help and the dictionary offer itself (`INativeModals`, null for cells), where the title for what is in front goes (`IWindowTitle`: the window's title bar, the terminal's OSC 2, null headless), whether it can pop a panel out into a window of its own (`IFloatingPanels`, null for none), whether it has a native file picker (`IFilePicker`, null for none), how it asks for attention while the player is elsewhere (`IAttention`, null headless), and which chrome it draws itself beside the cells (`HostChrome`: the header and the rail, which the client then leaves out of the grid). Built by `ClientHost.Terminal`, `ClientHost.Headless`/`Snapshot` and `WindowHost.Create` (Avalonia). Four things keep a feature from landing in one host only: - **Every `ClientHost` and `HostKeys` member is `required`**, so a member added there does not compile until diff --git a/src/SharpMUTerm.Avalonia/AvaloniaConsoleDriver.cs b/src/SharpMUTerm.Avalonia/AvaloniaConsoleDriver.cs index e89dc5fa..7d03e1a6 100644 --- a/src/SharpMUTerm.Avalonia/AvaloniaConsoleDriver.cs +++ b/src/SharpMUTerm.Avalonia/AvaloniaConsoleDriver.cs @@ -94,6 +94,9 @@ public AvaloniaConsoleDriver(int columns, int rows) /// The window's alerts while it is behind another (). public WindowAttention Attention { get; } = new(); + /// The desktop's file picker, for an import from another client (). + public WindowFilePicker FilePicker { get; } = new(); + public bool IsRunning { get; private set; } // ── IConsoleDriver: output ──────────────────────────────────────────────────────────────── diff --git a/src/SharpMUTerm.Avalonia/ImportReviewView.cs b/src/SharpMUTerm.Avalonia/ImportReviewView.cs new file mode 100644 index 00000000..f6330061 --- /dev/null +++ b/src/SharpMUTerm.Avalonia/ImportReviewView.cs @@ -0,0 +1,237 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Input; +using Avalonia.Interactivity; +using Avalonia.Layout; +using Avalonia.Media; +using Avalonia.Threading; +using SharpMUTerm.Client.Modals; + +namespace SharpMUTerm.Avalonia; + +/// +/// The window's review of an import from another client: what can act as the player, what will be added, what was left +/// out and why (, the model the cells draw), a check box for the passwords the file held, +/// and Import / Cancel. Import ends in the client's AcceptImport, the method the cells' Enter ends in; the check +/// box ends in ToggleImportPasswords, and the client republishes. Nothing is written before Import. +/// +internal sealed class ImportReviewView : DockPanel, IModalView +{ + private readonly ImportReviewSession _session; + private readonly NativeTokens _colours; + private readonly Action _done; + private readonly StackPanel _body = new() { Spacing = 4, Margin = new Thickness(20, 2, 20, 4) }; + private readonly Button _import; + private readonly Button _cancel; + private readonly CheckBox _passwords; + private ImportReviewModel _model; + + public ImportReviewView(ImportReviewSession session, NativeTokens colours, Action done) + { + _session = session; + _colours = colours; + _done = done; + _model = session.Model; + + var heading = ModalParts.Heading(_model.Title, colours); + SetDock(heading, Dock.Top); + Children.Add(heading); + var intro = ModalParts.Dim(_model.Intro, colours); + SetDock(intro, Dock.Top); + Children.Add(intro); + + var footer = ModalParts.Footer(_model.Empty ? "Esc close" : _model.Keys, colours); + SetDock(footer, Dock.Bottom); + + _import = ModalParts.Button("Import", "Enter", colours, Accept, accent: true); + _import.IsEnabled = !_model.Empty; + _cancel = ModalParts.Button("Cancel", "Esc", colours, Decline); + _passwords = new CheckBox + { + Content = "Store the passwords", + IsVisible = _model.Passwords > 0, + IsChecked = _model.StorePasswords, + Foreground = colours.Brush(colours.Text), + FontSize = NativeTokens.Body, + VerticalAlignment = VerticalAlignment.Center, + Focusable = true, + }; + _passwords.IsCheckedChanged += (_, _) => + { + if ((_passwords.IsChecked == true) != _model.StorePasswords) + { + _session.TogglePasswords(); + } + }; + + var buttons = new DockPanel { Margin = new Thickness(20, 12, 20, 0), LastChildFill = false }; + DockPanel.SetDock(_passwords, Dock.Left); + buttons.Children.Add(_passwords); + var right = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 10 }; + right.Children.Add(_import); + right.Children.Add(_cancel); + DockPanel.SetDock(right, Dock.Right); + buttons.Children.Add(right); + SetDock(buttons, Dock.Bottom); + Children.Add(footer); + Children.Add(buttons); + + Children.Add(new ScrollViewer + { + Content = _body, + MaxHeight = 460, + HorizontalScrollBarVisibility = global::Avalonia.Controls.Primitives.ScrollBarVisibility.Disabled, + }); + + Draw(); + _session.Changed += OnChanged; + AddHandler(KeyDownEvent, OnKey, RoutingStrategies.Tunnel); + } + + public string Title => _model.Title; + + public double PreferredWidth => 680; + + public bool Centred => true; + + /// The buttons and the check box, for a test. + public Button ImportButton => _import; + + public Button CancelButton => _cancel; + + public CheckBox PasswordsBox => _passwords; + + /// The text the body shows, for a test. + public IReadOnlyList BodyText => _body.Children.OfType() + .Select(t => t.Inlines is { Count: > 0 } inlines + ? string.Concat(inlines.OfType().Select(r => r.Text)) + : t.Text ?? string.Empty) + .ToArray(); + + public void FocusFirst() => (_import.IsEnabled ? _import : _cancel).Focus(); + + public void Detach() => _session.Changed -= OnChanged; + + /// Import: the session ends and the client writes the import. + public void Accept() + { + if (_model.Empty) + { + return; + } + + _session.Accept(); + _done(); + } + + /// Cancel: nothing is written. + public void Decline() + { + _session.Dismiss(); + _done(); + } + + private void OnChanged(ImportReviewModel model) => Dispatcher.UIThread.Post(() => + { + _model = model; + _passwords.IsChecked = model.StorePasswords; + Draw(); + }); + + private void Draw() + { + _body.Children.Clear(); + if (_model.Empty) + { + _body.Children.Add(Line("There is nothing in it this client can import.", _colours.Dim)); + } + else + { + _body.Children.Add(ModalParts.GroupHeader(ImportReviewModel.ActsHeading, _colours, first: true)); + if (_model.ActsAsYou.Count == 0) + { + _body.Children.Add(Line("Nothing: no rule in it sends a command.", _colours.Dim)); + } + + foreach (var act in _model.ActsAsYou) + { + _body.Children.Add(Line("• " + act, _colours.Text)); + } + + _body.Children.Add(ModalParts.GroupHeader(ImportReviewModel.AddsHeading, _colours, first: false)); + foreach (var row in _model.Adds) + { + _body.Children.Add(Row(row, _colours.Text)); + } + } + + if (_model.LeftOutCount > 0) + { + _body.Children.Add(ModalParts.GroupHeader($"{ImportReviewModel.LeftOutHeading} ({_model.LeftOutCount})", _colours, first: false)); + foreach (var row in _model.LeftOut) + { + _body.Children.Add(Row(row, _colours.Dim)); + } + + if (_model.MoreLeftOut is { } more) + { + _body.Children.Add(Line(more, _colours.Dim)); + } + } + + if (_model.PasswordLine is { } passwords) + { + var line = Line(passwords, _model.StorePasswords ? _colours.Text : _colours.Warn); + line.Margin = new Thickness(12, 12, 12, 0); + _body.Children.Add(line); + } + } + + private TextBlock Line(string text, Color colour) => new() + { + Text = NativeKeys.Words(text), + Foreground = _colours.Brush(colour), + FontSize = NativeTokens.Body, + TextWrapping = TextWrapping.Wrap, + Margin = new Thickness(12, 1, 12, 1), + }; + + private TextBlock Row(ImportReviewRow row, Color detail) + { + var block = new TextBlock + { + FontSize = NativeTokens.Body, + TextWrapping = TextWrapping.Wrap, + Margin = new Thickness(12, 2, 12, 2), + }; + block.Inlines ??= new global::Avalonia.Controls.Documents.InlineCollection(); + block.Inlines.Add(new global::Avalonia.Controls.Documents.Run(row.Kind + " ") { Foreground = _colours.Brush(_colours.Accent) }); + block.Inlines.Add(new global::Avalonia.Controls.Documents.Run(row.Name) { Foreground = _colours.Brush(_colours.Text), FontWeight = FontWeight.SemiBold }); + block.Inlines.Add(new global::Avalonia.Controls.Documents.Run(" " + NativeKeys.Words(row.Detail)) { Foreground = _colours.Brush(detail) }); + return block; + } + + private void OnKey(object? sender, KeyEventArgs e) + { + if (e.KeyModifiers != KeyModifiers.None) + { + return; + } + + if (e.Key == Key.Escape) + { + e.Handled = true; + Decline(); + } + else if (e.Key == Key.Enter && e.Source is not Button and not CheckBox) + { + e.Handled = true; + Accept(); + } + else if (e.Key == Key.P && _model.Passwords > 0) + { + e.Handled = true; + _session.TogglePasswords(); + } + } +} diff --git a/src/SharpMUTerm.Avalonia/MainWindow.cs b/src/SharpMUTerm.Avalonia/MainWindow.cs index 0f07c582..d3200500 100644 --- a/src/SharpMUTerm.Avalonia/MainWindow.cs +++ b/src/SharpMUTerm.Avalonia/MainWindow.cs @@ -108,6 +108,7 @@ public MainWindow(WindowOptions options, IClassicDesktopStyleApplicationLifetime // Panels popped out into windows of their own, owned by this one so they stay above it and go with it. _driver.Floating.Attach(this, _view); + _driver.FilePicker.Attach(this); Closed += (_, _) => _driver.Floating.Detach(); Content = root; AutomationProperties.SetName(_view, "SharpMUTerm"); diff --git a/src/SharpMUTerm.Avalonia/ModalOverlay.cs b/src/SharpMUTerm.Avalonia/ModalOverlay.cs index eed0a7f3..f5d34a9d 100644 --- a/src/SharpMUTerm.Avalonia/ModalOverlay.cs +++ b/src/SharpMUTerm.Avalonia/ModalOverlay.cs @@ -47,6 +47,7 @@ public ModalOverlay(ModalSession session, Action remove, Action new WelcomeView(welcome, Colours, Done), HelpSession help => new HelpView(help, Colours, Done), DictionaryOfferSession offer => new DictionaryOfferView(offer, Colours, Done), + ImportReviewSession import => new ImportReviewView(import, Colours, Done), _ => throw new ArgumentException($"no native view for {session.GetType().Name}", nameof(session)), }; AutomationProperties.SetName(this, _view.Title); diff --git a/src/SharpMUTerm.Avalonia/WelcomeView.cs b/src/SharpMUTerm.Avalonia/WelcomeView.cs index 468468c6..ca321d6b 100644 --- a/src/SharpMUTerm.Avalonia/WelcomeView.cs +++ b/src/SharpMUTerm.Avalonia/WelcomeView.cs @@ -18,7 +18,7 @@ namespace SharpMUTerm.Avalonia; /// internal sealed class WelcomeView : DockPanel, IModalView { - private static readonly WelcomeChoice[] Choices = [WelcomeChoice.Connect, WelcomeChoice.Browse, WelcomeChoice.Settings]; + private static readonly WelcomeChoice[] Choices = [WelcomeChoice.Connect, WelcomeChoice.Browse, WelcomeChoice.Settings, WelcomeChoice.Import]; private static readonly WelcomeLayout[] Layouts = [WelcomeLayout.Suggested, WelcomeLayout.Roleplay, WelcomeLayout.Combat]; private readonly WelcomeSession _session; diff --git a/src/SharpMUTerm.Avalonia/WindowFilePicker.cs b/src/SharpMUTerm.Avalonia/WindowFilePicker.cs new file mode 100644 index 00000000..78a10929 --- /dev/null +++ b/src/SharpMUTerm.Avalonia/WindowFilePicker.cs @@ -0,0 +1,54 @@ +using Avalonia.Controls; +using Avalonia.Platform.Storage; +using Avalonia.Threading; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Avalonia; + +/// +/// The desktop's own file picker, for an import from another client (). It hands the +/// client a local path and nothing else: what the file holds is read, bounded and reviewed by the client, the same as a +/// path typed after /import. Not available until the main window attaches it, so a test, the parity harness and +/// --render-png are told to type a path instead. +/// +internal sealed class WindowFilePicker : IFilePicker +{ + private TopLevel? _owner; + + public bool Available => Volatile.Read(ref _owner) is not null; + + /// The window the picker opens over. + public void Attach(TopLevel owner) => Volatile.Write(ref _owner, owner); + + public void Pick(string title, Action picked) + { + ArgumentNullException.ThrowIfNull(picked); + Dispatcher.UIThread.Post(async () => + { + string? path = null; + try + { + if (_owner?.StorageProvider is { CanOpen: true } storage) + { + var files = await storage.OpenFilePickerAsync(new FilePickerOpenOptions + { + Title = title, + AllowMultiple = false, + FileTypeFilter = + [ + new FilePickerFileType("Client setups") { Patterns = ["*.mcl", "*.xml", "*.mpackage", "*.zip", "*.tin", "*.tt", "*.txt"] }, + FilePickerFileTypes.All, + ], + }); + path = files.Count > 0 ? files[0].TryGetLocalPath() : null; + } + } + catch (InvalidOperationException) + { + path = null; + } + + picked(path); + }); + } +} diff --git a/src/SharpMUTerm.Avalonia/WindowHost.cs b/src/SharpMUTerm.Avalonia/WindowHost.cs index 20e83fae..c3599d79 100644 --- a/src/SharpMUTerm.Avalonia/WindowHost.cs +++ b/src/SharpMUTerm.Avalonia/WindowHost.cs @@ -92,5 +92,8 @@ internal static class WindowHost // A page while the window is behind another: a desktop notification and the taskbar's attention state. Attention = driver.Attention, + + // An import from another client starts at the desktop's own file picker. + FilePicker = driver.FilePicker, }; } diff --git a/src/SharpMUTerm.Client/Chrome/NoticeModel.cs b/src/SharpMUTerm.Client/Chrome/NoticeModel.cs index c294c194..1504b520 100644 --- a/src/SharpMUTerm.Client/Chrome/NoticeModel.cs +++ b/src/SharpMUTerm.Client/Chrome/NoticeModel.cs @@ -51,6 +51,9 @@ public static class Sources /// Spelling dictionary downloads. public const string Spelling = "Spelling"; + + /// Imports from another client. + public const string Import = "Import"; } /// How long a notice holds the status row, and how long a toast stays before it fades. diff --git a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs index 1a539792..ced798e8 100644 --- a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs +++ b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs @@ -20,6 +20,9 @@ public static class BuiltInCommands /// Help: keys, slash commands and how-tos (/help). public const string HelpCommand = "term:help"; + /// Import from another client: a file picker in a host that has one, else /import on the command line. + public const string ImportCommand = "term:import"; + /// The spelling dictionary offer. public const string DictionaryCommand = "term:get-dictionary"; @@ -191,6 +194,7 @@ void Family(string id, string prefix, Func [port] [tls]", "Add a world for a host and connect to it (port 4000 by default)", "/connect "), new("/welcome", "/welcome", "Show the first-run welcome again", "/welcome"), new("/welcome", "/welcome layout roleplay|combat|suggested", "Choose the starting layout the welcome offers", "/welcome layout "), + new("/import", "/import ", "Import worlds, characters and automation from MUSHclient, Mudlet or TinTin++; nothing is written before Enter", "/import "), new("/package", "/package", "Open the Packages screen (F10)", "/package"), new("/package", "/package browse", "Browse the package index, this game's packages first", "/package browse"), new("/package", "/package install ", "Read a package and open its review; nothing is written before Enter", "/package install "), diff --git a/src/SharpMUTerm.Client/Modals/ImportReviewModel.cs b/src/SharpMUTerm.Client/Modals/ImportReviewModel.cs new file mode 100644 index 00000000..1c9df9f3 --- /dev/null +++ b/src/SharpMUTerm.Client/Modals/ImportReviewModel.cs @@ -0,0 +1,208 @@ +using System.Globalization; +using SharpMUTerm.Core.Import; + +namespace SharpMUTerm.Client.Modals; + +/// One line of the import review: what it is, what it is called, and what it says about it. +/// What it is: world, set, or for a left-out entry the kind of rule. +/// Its name. +/// What happens to it, or why it was left out. +public sealed record ImportReviewRow(string Kind, string Name, string Detail); + +/// +/// The import review: what an import from another client would add and what it leaves out, with reasons — the consent +/// step, like the package review (). Drawn by the cell surface +/// (ImportReview.Render) and by the window's native modal; nothing is written until ⏎ (or Import), which ends in +/// the client's AcceptImport. +/// +/// It leads with — the rules that can send commands as the player — because that is what an +/// import can do that a player should know before saying yes. Passwords the file held are named and are not +/// stored unless is switched on here. +/// +/// +public sealed record ImportReviewModel( + string Format, + string Source, + IReadOnlyList Adds, + IReadOnlyList ActsAsYou, + IReadOnlyList LeftOut, + int LeftOutCount, + int Passwords, + bool StorePasswords) +{ + /// How many left-out entries the review lists by name; the rest are counted. + public const int ListedLeftOut = 8; + + /// The heading over the rules that can send commands. + public const string ActsHeading = "WHAT CAN ACT AS YOU"; + + /// The heading over what will be added. + public const string AddsHeading = "WHAT IT ADDS"; + + /// The heading over what was left out. + public const string LeftOutHeading = "LEFT OUT"; + + /// The promise the review makes. + public const string Consent = "Nothing is written until you press Enter, and nothing you already have is replaced."; + + /// The review's title. + public string Title => $"Import from {Format}"; + + /// The line under the title. + public string Intro => $"Read from {Source}. {Consent}"; + + /// The keys the cell review answers. + public string Keys => Passwords > 0 ? "⏎ import · p passwords · Esc cancel" : "⏎ import · Esc cancel"; + + /// What the review says about the passwords the file held, or null when it held none. + public string? PasswordLine => Passwords == 0 + ? null + : StorePasswords + ? $"{Count(Passwords, "password")} will be stored where every password is kept (the system keychain, else secrets.json)." + : $"The file holds {Count(Passwords, "password")}, which will not be stored. Store {(Passwords == 1 ? "it" : "them")}?"; + + /// What the review says when there is nothing to add. + public bool Empty => Adds.Count == 0; + + /// The left-out line for the entries past , or null. + public string? MoreLeftOut => LeftOutCount > LeftOut.Count + ? $"and {(LeftOutCount - LeftOut.Count).ToString(CultureInfo.InvariantCulture)} more" + : null; + + /// The review of . + public static ImportReviewModel From(ImportPlan plan, bool storePasswords = false) + { + ArgumentNullException.ThrowIfNull(plan); + var result = plan.Result; + var adds = new List(); + var listedOn = new List(); + foreach (var world in plan.Worlds) + { + var at = $"{world.Host}:{world.Port.ToString(CultureInfo.InvariantCulture)}"; + string detail; + if (world.Existing) + { + detail = world.NewCharacters.Count == 0 + ? $"already configured ({at}); nothing to add" + : $"already configured ({at}); adds {string.Join(", ", world.NewCharacters)}"; + } + else + { + detail = world.NewCharacters.Count == 0 + ? $"new world, {at}, no character" + : $"new world, {at}, {(world.NewCharacters.Count == 1 ? "character" : "characters")} {string.Join(", ", world.NewCharacters)}"; + } + + if (world.KeptCharacters.Count > 0) + { + detail += $" · keeps your {string.Join(", ", world.KeptCharacters)} as {(world.KeptCharacters.Count == 1 ? "is" : "they are")}"; + } + + adds.Add(new ImportReviewRow("world", world.Name, detail)); + listedOn.AddRange(world.NewCharacters); + } + + if (plan.SetName is { } setName) + { + var rules = string.Join(", ", new[] + { + Count(result.Set.Triggers.Count, "trigger"), + Count(result.Set.Aliases.Count, "alias", "aliases"), + Count(result.Set.Timers.Count, "timer"), + Count(result.Set.Macros.Count, "key"), + }.Where(s => !s.StartsWith("0 ", StringComparison.Ordinal))); + var where = listedOn.Count == 0 + ? "new set, listed on no character yet (F5 lists it on one)" + : $"new set, listed on {string.Join(", ", listedOn)}"; + adds.Add(new ImportReviewRow("set", setName, $"{rules} · {where}")); + } + + var acts = new List(); + var sendingTriggers = result.Set.Triggers.Count(t => !string.IsNullOrEmpty(t.Actions.SendResponse)); + if (sendingTriggers > 0) + { + acts.Add($"{Count(sendingTriggers, "trigger")} {(sendingTriggers == 1 ? "sends" : "send")} a command when a line matches"); + } + + if (result.Set.Aliases.Count > 0) + { + acts.Add($"{Count(result.Set.Aliases.Count, "alias", "aliases")} {(result.Set.Aliases.Count == 1 ? "turns" : "turn")} what you type into other commands"); + } + + if (result.Set.Timers.Count > 0) + { + acts.Add($"{Count(result.Set.Timers.Count, "timer")} {(result.Set.Timers.Count == 1 ? "sends" : "send")} commands on {(result.Set.Timers.Count == 1 ? "its" : "their")} own while connected"); + } + + if (result.Set.Macros.Count > 0) + { + acts.Add($"{Count(result.Set.Macros.Count, "key")} {(result.Set.Macros.Count == 1 ? "sends" : "send")} a command when pressed"); + } + + var leftOut = result.Skipped + .Take(ListedLeftOut) + .Select(s => new ImportReviewRow(s.Kind, s.Name, s.Reason)) + .ToArray(); + return new ImportReviewModel( + ImportFormats.Name(result.Format), + result.Source, + adds, + acts, + leftOut, + result.SkippedCount, + plan.PasswordCount, + storePasswords && plan.PasswordCount > 0); + } + + /// A count and its noun, singular or plural. + public static string Count(int count, string noun, string? plural = null) => + $"{count.ToString(CultureInfo.InvariantCulture)} {(count == 1 ? noun : plural ?? noun + "s")}"; + + public bool Equals(ImportReviewModel? other) => + other is not null + && Format == other.Format + && Source == other.Source + && ModelLists.Same(Adds, other.Adds) + && ModelLists.Same(ActsAsYou, other.ActsAsYou) + && ModelLists.Same(LeftOut, other.LeftOut) + && LeftOutCount == other.LeftOutCount + && Passwords == other.Passwords + && StorePasswords == other.StorePasswords; + + public override int GetHashCode() => + HashCode.Combine(Format, Source, ModelLists.Hash(Adds), ModelLists.Hash(LeftOut), LeftOutCount, Passwords, StorePasswords); +} + +/// +/// One opening of the import review in a host's own controls. closes it and writes the import +/// through the client's own method; asks the client to republish with the passwords +/// stored or not; Esc (or a click outside) closes it and writes nothing. +/// +public sealed class ImportReviewSession : ModalSession +{ + private readonly Action _accept; + private readonly Action _passwords; + + public ImportReviewSession(ImportReviewModel model, bool isDark, Action accept, Action passwords, Action closed) + : base(model, isDark, closed) + { + ArgumentNullException.ThrowIfNull(accept); + ArgumentNullException.ThrowIfNull(passwords); + _accept = accept; + _passwords = passwords; + } + + public override string Surface => "import"; + + /// The host's: import it. + public void Accept() => CloseThen(_accept); + + /// The host's: store the file's passwords, or not. The client republishes the model. + public void TogglePasswords() + { + if (!IsEnded) + { + _passwords(); + } + } +} diff --git a/src/SharpMUTerm.Client/Modals/WelcomeModel.cs b/src/SharpMUTerm.Client/Modals/WelcomeModel.cs index efe7c7d3..5b2a1003 100644 --- a/src/SharpMUTerm.Client/Modals/WelcomeModel.cs +++ b/src/SharpMUTerm.Client/Modals/WelcomeModel.cs @@ -11,6 +11,9 @@ public enum WelcomeChoice /// F5, to add a world by hand. Settings, + + /// Import worlds and automation from another client. + Import, } /// @@ -121,6 +124,7 @@ public sealed record WelcomeModel( { WelcomeChoice.Connect => ("Connect to a world", "Type a host and port"), WelcomeChoice.Browse => ("Browse worlds", IndexProblem is null ? "From the package index" : "No package index set"), + WelcomeChoice.Import => ("Import", "From MUSHclient, Mudlet or TinTin++"), _ => ("Open settings", "F5, add a world by hand"), }; diff --git a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs index c3af479b..5c9377e6 100644 --- a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs +++ b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs @@ -186,6 +186,9 @@ public static class SurfaceCatalog /// The spelling dictionary offer: the consent step before anything is downloaded. public const string Dictionary = "dictionary"; + /// The review of an import from another client: the consent step before anything is written. + public const string Import = "import"; + /// /// The +3 ▾ chip a tab strip carries when its tabs do not fit even at their floors, and the list of the tabs /// past its edges it opens: a cell list in a terminal, a native menu in the window (the chip itself is cells in both). @@ -209,7 +212,7 @@ public static class SurfaceCatalog private static string[] PanelViews(string view) => ["SharpMUTerm.Avalonia." + view, "SharpMUTerm.Avalonia.PopOutButton"]; /// The modals the window draws with its own controls in place of the cell modal (ClientHost.NativeModals). - public static IReadOnlyList Modals { get; } = [Quit, Search, History, Layouts, Welcome, Help, Dictionary]; + public static IReadOnlyList Modals { get; } = [Quit, Search, History, Layouts, Welcome, Help, Dictionary, Import]; /// A cell modal in a terminal; the window's own modal in its place. private static readonly IReadOnlyDictionary NativeModal = new Dictionary @@ -483,6 +486,17 @@ public static class SurfaceCatalog NativeModal, "SharpMUTerm.Tui.DictionaryOffer.Render", ModalViews("DictionaryOfferView")), + new( + Import, + typeof(ImportReviewModel), + [ + // Import writes through the one method the cells' Enter ends in; the passwords toggle republishes. + new(SurfaceActionKind.Modal, "accept", "AcceptImport"), + new(SurfaceActionKind.Modal, "passwords", "ToggleImportPasswords"), + ], + NativeModal, + "SharpMUTerm.Tui.ImportReview.Render", + ModalViews("ImportReviewView")), new( TabOverflow, typeof(MenuModel), diff --git a/src/SharpMUTerm.Core/Import/ClientImport.cs b/src/SharpMUTerm.Core/Import/ClientImport.cs new file mode 100644 index 00000000..265a9fb4 --- /dev/null +++ b/src/SharpMUTerm.Core/Import/ClientImport.cs @@ -0,0 +1,103 @@ +using System.Text; + +namespace SharpMUTerm.Core.Import; + +/// +/// The one way in to the readers: a path (a file, or a Mudlet profile folder) or text already in memory, with the +/// format told apart by what the content is rather than by the file's name. Nothing here writes anything. +/// +public static class ClientImport +{ + /// + /// Reads whatever names: a Mudlet profile folder, a zip (a Mudlet .mpackage), or a + /// MUSHclient, Mudlet or TinTin++ file. The size is checked before a byte is read. + /// + public static (ImportResult? Result, string? Problem) Read(string path) + { + ArgumentNullException.ThrowIfNull(path); + try + { + var full = Path.GetFullPath(path); + if (Directory.Exists(full)) + { + return MudletImport.ReadProfile(full); + } + + var file = new FileInfo(full); + if (!file.Exists) + { + return (null, "there is no file or folder there"); + } + + if (file.Length > ImportLimits.MaxFileBytes) + { + return (null, $"that file is larger than {ImportLimits.MaxFileBytes / (1024 * 1024)} MB, too large to be a client's setup"); + } + + var bytes = File.ReadAllBytes(file.FullName); + if (bytes.Length >= 4 && bytes[0] == 'P' && bytes[1] == 'K' && bytes[2] == 3 && bytes[3] == 4) + { + return MudletImport.ReadZip(bytes, file.Name); + } + + var (result, problem) = Parse(Decode(bytes), file.Name); + if (result is { Format: ImportFormat.Mudlet }) + { + MudletImport.AddProfileWorldFor(file.FullName, result); + } + + return (result, problem); + } + catch (Exception ex) when (ex is IOException or UnauthorizedAccessException or ArgumentException or NotSupportedException or System.Security.SecurityException) + { + return (null, "it could not be read: " + ex.Message); + } + } + + /// Reads text whose format is told by its content. + public static (ImportResult? Result, string? Problem) Parse(string text, string source) + { + ArgumentNullException.ThrowIfNull(text); + ArgumentNullException.ThrowIfNull(source); + if (MudletImport.Recognises(text)) + { + return MudletImport.Parse(text, source); + } + + if (MushclientImport.Recognises(text)) + { + return MushclientImport.Parse(text, source); + } + + if (TinTinImport.Recognises(text)) + { + return TinTinImport.Parse(text, source); + } + + return (null, $"not a setup this client can import (it reads {ImportFormats.Listed})"); + } + + /// UTF-8 unless it says otherwise: a byte-order mark for UTF-16, else Latin-1 when it is not valid UTF-8. + private static string Decode(byte[] bytes) + { + if (bytes.Length >= 2 && bytes[0] == 0xFF && bytes[1] == 0xFE) + { + return Encoding.Unicode.GetString(bytes, 2, bytes.Length - 2); + } + + if (bytes.Length >= 2 && bytes[0] == 0xFE && bytes[1] == 0xFF) + { + return Encoding.BigEndianUnicode.GetString(bytes, 2, bytes.Length - 2); + } + + var offset = bytes.Length >= 3 && bytes[0] == 0xEF && bytes[1] == 0xBB && bytes[2] == 0xBF ? 3 : 0; + try + { + return new UTF8Encoding(false, throwOnInvalidBytes: true).GetString(bytes, offset, bytes.Length - offset); + } + catch (DecoderFallbackException) + { + return Encoding.Latin1.GetString(bytes); + } + } +} diff --git a/src/SharpMUTerm.Core/Import/ImportPlan.cs b/src/SharpMUTerm.Core/Import/ImportPlan.cs new file mode 100644 index 00000000..dac9d209 --- /dev/null +++ b/src/SharpMUTerm.Core/Import/ImportPlan.cs @@ -0,0 +1,214 @@ +using SharpMUTerm.Core.Configuration; + +namespace SharpMUTerm.Core.Import; + +/// One world of an import, as it would land. +/// The name it would have: the file's, or with a suffix when another world already has it. +/// Its host. +/// Its port. +/// Whether a world with this host and port is already configured, so the import only adds characters to it. +/// The characters it would add. +/// The characters the file names that the world already has, which are left as they are. +public sealed record PlannedWorld( + string Name, + string Host, + int Port, + bool Existing, + IReadOnlyList NewCharacters, + IReadOnlyList KeptCharacters) +{ + public bool Equals(PlannedWorld? other) => + other is not null && Name == other.Name && Host == other.Host && Port == other.Port && Existing == other.Existing + && NewCharacters.SequenceEqual(other.NewCharacters) && KeptCharacters.SequenceEqual(other.KeptCharacters); + + public override int GetHashCode() => HashCode.Combine(Name, Host, Port, Existing, NewCharacters.Count, KeptCharacters.Count); +} + +/// +/// What an import would add to a configuration, decided against it before anything is written: nothing is +/// overwritten. The automation becomes a new set named Imported from MUSHclient ((2), (3)… when +/// that name is taken); a world whose host and port are already configured gains only the characters it does not have; +/// any other world whose name is taken gets a suffix. The new set is listed on every character the import adds, and on +/// no character the player already had. +/// +public sealed class ImportPlan +{ + private ImportPlan(ImportResult result, IReadOnlyList worlds, string? setName) + { + Result = result; + Worlds = worlds; + SetName = setName; + } + + /// What the file held. + public ImportResult Result { get; } + + /// The worlds, in the file's order. + public IReadOnlyList Worlds { get; } + + /// The new set's name, or null when the file held no automation. + public string? SetName { get; } + + /// How many characters would be added. + public int NewCharacterCount => Worlds.Sum(w => w.NewCharacters.Count); + + /// How many passwords the file holds for characters this import would add — the only ones it could store. + public int PasswordCount => StorablePasswords().Count(); + + /// Decides names for against . Writes nothing. + public static ImportPlan For(AppConfiguration configuration, ImportResult result) + { + ArgumentNullException.ThrowIfNull(configuration); + ArgumentNullException.ThrowIfNull(result); + var takenWorlds = new HashSet(configuration.Worlds.Select(w => w.Name), StringComparer.OrdinalIgnoreCase); + var worlds = new List(); + foreach (var world in result.Worlds) + { + var existing = configuration.Worlds.FirstOrDefault(w => + string.Equals(w.Host, world.Host, StringComparison.OrdinalIgnoreCase) && w.Port == world.Port); + var names = world.Characters.Select(c => c.Name).Distinct(StringComparer.OrdinalIgnoreCase).ToList(); + if (existing is not null) + { + var have = existing.Characters.Select(c => c.Name).ToHashSet(StringComparer.OrdinalIgnoreCase); + worlds.Add(new PlannedWorld( + existing.Name, + existing.Host, + existing.Port, + Existing: true, + names.Where(n => !have.Contains(n)).ToArray(), + names.Where(have.Contains).ToArray())); + continue; + } + + var name = Unique(world.Name, takenWorlds); + takenWorlds.Add(name); + worlds.Add(new PlannedWorld(name, world.Host, world.Port, Existing: false, names, [])); + } + + string? setName = null; + if (result.RuleCount > 0) + { + var takenSets = new HashSet(configuration.TriggerSets.Select(s => s.Name), StringComparer.OrdinalIgnoreCase); + setName = Unique("Imported from " + ImportFormats.Name(result.Format), takenSets); + } + + return new ImportPlan(result, worlds, setName); + } + + /// Whether two plans would write the same things — so a review shown is the import done. + public bool SameAs(ImportPlan other) => + ReferenceEquals(Result, other.Result) && SetName == other.SetName && Worlds.SequenceEqual(other.Worlds); + + /// + /// Adds what the plan says to , copying every definition so nothing the review + /// holds is shared with the live configuration. A password is set only when , + /// and only on a character this import adds; the caller's save then puts it where every password goes (the OS + /// credential store, else secrets.json), never config.json. + /// + public ImportApplied Apply(AppConfiguration configuration, bool storePasswords) + { + ArgumentNullException.ThrowIfNull(configuration); + if (!SameAs(For(configuration, Result))) + { + throw new InvalidOperationException("the configuration changed since this plan was made"); + } + + if (SetName is { } setName) + { + configuration.TriggerSets.Add(new TriggerSet + { + Name = setName, + Description = $"Imported from {ImportFormats.Name(Result.Format)} ({Result.Source})", + Triggers = Result.Set.Triggers.Select(t => t.Clone()).ToList(), + Aliases = Result.Set.Aliases.Select(a => a.Clone()).ToList(), + Timers = Result.Set.Timers.Select(CloneTimer).ToList(), + Macros = Result.Set.Macros.Select(CloneMacro).ToList(), + }); + } + + var passwords = storePasswords ? StorablePasswords().ToList() : []; + var stored = 0; + for (var i = 0; i < Worlds.Count; i++) + { + var plan = Worlds[i]; + var source = Result.Worlds[i]; + WorldDefinition target; + if (plan.Existing) + { + target = configuration.Worlds.First(w => + string.Equals(w.Host, plan.Host, StringComparison.OrdinalIgnoreCase) && w.Port == plan.Port); + } + else + { + target = new WorldDefinition + { + Name = plan.Name, + Host = source.Host, + Port = source.Port, + UseTls = source.UseTls, + }; + configuration.Worlds.Add(target); + } + + foreach (var name in plan.NewCharacters) + { + var character = new CharacterDefinition { Name = name }; + if (SetName is not null) + { + character.TriggerSets.Add(SetName); + } + + if (passwords.FirstOrDefault(p => p.World == i && string.Equals(p.Character, name, StringComparison.OrdinalIgnoreCase)) is { } password) + { + character.Password = password.Password; + stored++; + } + + target.Characters.Add(character); + } + } + + return new ImportApplied(Worlds.Count(w => !w.Existing), NewCharacterCount, SetName, Result.RuleCount, stored); + } + + private IEnumerable StorablePasswords() => + Result.Passwords.Where(p => p.World >= 0 && p.World < Worlds.Count + && Worlds[p.World].NewCharacters.Contains(p.Character, StringComparer.OrdinalIgnoreCase)); + + private static string Unique(string name, HashSet taken) + { + if (!taken.Contains(name)) + { + return name; + } + + for (var n = 2; ; n++) + { + var candidate = $"{name} ({n})"; + if (!taken.Contains(candidate)) + { + return candidate; + } + } + } + + private static Automation.TimerDefinition CloneTimer(Automation.TimerDefinition timer) => new() + { + Name = timer.Name, + IntervalSeconds = timer.IntervalSeconds, + Command = timer.Command, + OneShot = timer.OneShot, + Enabled = timer.Enabled, + }; + + private static Automation.Macro CloneMacro(Automation.Macro macro) => new() + { + Name = macro.Name, + Key = macro.Key, + Command = macro.Command, + Enabled = macro.Enabled, + }; +} + +/// What an import added. +public sealed record ImportApplied(int Worlds, int Characters, string? SetName, int Rules, int PasswordsStored); diff --git a/src/SharpMUTerm.Core/Import/ImportResult.cs b/src/SharpMUTerm.Core/Import/ImportResult.cs new file mode 100644 index 00000000..989ce20b --- /dev/null +++ b/src/SharpMUTerm.Core/Import/ImportResult.cs @@ -0,0 +1,147 @@ +using SharpMUTerm.Core.Configuration; + +namespace SharpMUTerm.Core.Import; + +/// The other clients a setup can be imported from. +public enum ImportFormat +{ + /// A MUSHclient world file (.mcl, XML). + MushClient, + + /// A Mudlet profile folder, a profile save, or a package or module export (XML, or a zip holding one). + Mudlet, + + /// A TinTin++ script (#session, #action, #alias, #ticker, #gag). + TinTin, +} + +/// Names a format the way a player knows it. +public static class ImportFormats +{ + /// The client's name as its players write it. + public static string Name(ImportFormat format) => format switch + { + ImportFormat.MushClient => "MUSHclient", + ImportFormat.Mudlet => "Mudlet", + _ => "TinTin++", + }; + + /// The formats in the order the surfaces name them. + public static IReadOnlyList All { get; } = [ImportFormat.MushClient, ImportFormat.Mudlet, ImportFormat.TinTin]; + + /// The formats as one phrase: MUSHclient, Mudlet, TinTin++. + public static string Listed => string.Join(", ", All.Select(Name)); +} + +/// +/// The bounds every reader holds an import file to. An import file is untrusted input — written by another program, +/// often copied from a forum post — so every count and every length is capped while it is read, and an entry that +/// breaks a cap is skipped and counted rather than truncated (a truncated command is a different command). +/// +public static class ImportLimits +{ + /// The largest file read: a big Mudlet profile save is a few megabytes. + public const long MaxFileBytes = 16L * 1024 * 1024; + + /// The most triggers, aliases, timers or keys taken from one file, each. + public const int MaxItems = 5000; + + /// The most worlds taken from one file. + public const int MaxWorlds = 100; + + /// The longest pattern or command taken. + public const int MaxText = 4096; + + /// The longest name (of a world, character, rule or host) taken. + public const int MaxName = 128; + + /// The most entries of a zip looked at, and the most of its XML read. + public const int MaxZipEntries = 512; + + /// How many left-out entries are listed by name; the rest are only counted. + public const int MaxListedSkips = 200; + + /// How deep a Mudlet folder may nest before the rest of it is left out. + public const int MaxDepth = 32; +} + +/// Something an import file held that was not imported, and why. +/// What it is: trigger, alias, timer, key, script, world… +/// What it is called in the file, or its pattern when it has no name. +/// Why it was left out, in a few words a player understands. +public sealed record ImportSkip(string Kind, string Name, string Reason); + +/// A password the file held for a character. It is never stored unless the player says so on the review. +/// The index of the world in . +/// The character's name. +/// The password. +public sealed record ImportedPassword(int World, string Character, string Password) +{ + /// Never the password: a record's own ToString would print it into a log. + public override string ToString() => $"{nameof(ImportedPassword)} {{ World = {World}, Character = {Character} }}"; +} + +/// +/// What a reader made of one file: worlds with their characters, one set of automation, what was left out and why, +/// and any passwords — held apart, so nothing stores them by accident. Nothing here has touched the configuration; +/// decides names against it, and only the review's ⏎ writes. +/// +public sealed class ImportResult +{ + public ImportResult(ImportFormat format, string source) + { + ArgumentNullException.ThrowIfNull(source); + Format = format; + Source = source; + } + + /// The client the file came from. + public ImportFormat Format { get; } + + /// The file's name (not its whole path), for the review. + public string Source { get; } + + /// The worlds the file names, each with the characters it names. + public List Worlds { get; } = new(); + + /// The automation read. Its name is decided by the plan (Imported from …). + public TriggerSet Set { get; } = new(); + + /// Passwords the file held, never stored without the player's yes. + public List Passwords { get; } = new(); + + /// What was left out, by name, up to . + public List Skipped { get; } = new(); + + /// How many things were left out, including those past the listed ones. + public int SkippedCount { get; private set; } + + /// Whether there is anything to import at all. + public bool IsEmpty => + Worlds.Count == 0 && Set.Triggers.Count == 0 && Set.Aliases.Count == 0 && Set.Timers.Count == 0 && Set.Macros.Count == 0; + + /// How many rules the set holds. + public int RuleCount => Set.Triggers.Count + Set.Aliases.Count + Set.Timers.Count + Set.Macros.Count; + + /// Records something left out. + public void Skip(string kind, string? name, string reason) + { + SkippedCount++; + if (Skipped.Count < ImportLimits.MaxListedSkips) + { + Skipped.Add(new ImportSkip(kind, ImportText.Name(name) is { Length: > 0 } n ? n : "(unnamed)", reason)); + } + } + + /// Whether another may be added; when not, it is recorded as left out. + internal bool Room(string kind, int count, string? name) + { + if (count < ImportLimits.MaxItems) + { + return true; + } + + Skip(kind, name, $"past the limit of {ImportLimits.MaxItems} {kind}s in one file"); + return false; + } +} diff --git a/src/SharpMUTerm.Core/Import/ImportText.cs b/src/SharpMUTerm.Core/Import/ImportText.cs new file mode 100644 index 00000000..c4680971 --- /dev/null +++ b/src/SharpMUTerm.Core/Import/ImportText.cs @@ -0,0 +1,179 @@ +using System.Globalization; +using System.Text; +using System.Text.RegularExpressions; +using System.Xml; +using System.Xml.Linq; +using SharpMUTerm.Core.Automation; + +namespace SharpMUTerm.Core.Import; + +/// +/// The pieces every reader shares: bounding the text it takes, turning another client's capture references into the +/// $1 this client's engines expand, and reading XML without letting the file reach anything but itself. +/// +internal static class ImportText +{ + /// A name: control characters gone, trimmed, at most long. + public static string Name(string? text) + { + if (string.IsNullOrEmpty(text)) + { + return string.Empty; + } + + var clean = new string(text.Where(c => !char.IsControl(c)).ToArray()).Trim(); + return clean.Length > ImportLimits.MaxName ? clean[..(ImportLimits.MaxName - 1)] + "…" : clean; + } + + /// + /// A pattern or a command: line breaks kept as \n, every other control character dropped. Null when it is + /// longer than — never cut short, because a shorter command is another command. + /// + public static string? Body(string? text) + { + if (string.IsNullOrEmpty(text)) + { + return string.Empty; + } + + var builder = new StringBuilder(text.Length); + foreach (var c in text.Replace("\r\n", "\n", StringComparison.Ordinal).Replace('\r', '\n')) + { + if (c == '\n' || !char.IsControl(c)) + { + builder.Append(c); + } + } + + var body = builder.ToString().Trim('\n'); + return body.Length > ImportLimits.MaxText ? null : body; + } + + /// Text the engines read as a substitution with nothing to substitute: every $ doubled. + public static string Literal(string text) => text.Replace("$", "$$", StringComparison.Ordinal); + + /// + /// A MUSHclient send: %0–%9 become $0–$9, %% is a percent sign, and a $ + /// is doubled so the engine does not read it as a reference. + /// + public static string PercentReferences(string text) + { + var builder = new StringBuilder(text.Length); + for (var i = 0; i < text.Length; i++) + { + var c = text[i]; + if (c == '%' && i + 1 < text.Length && char.IsAsciiDigit(text[i + 1])) + { + builder.Append('$').Append(text[i + 1]); + i++; + } + else if (c == '%' && i + 1 < text.Length && text[i + 1] == '%') + { + builder.Append('%'); + i++; + } + else if (c == '$') + { + builder.Append("$$"); + } + else + { + builder.Append(c); + } + } + + return builder.ToString(); + } + + /// A whole-line wildcard pattern (* tells you *) as an anchored regex, each * a capture. + public static string AnchoredWildcard(string pattern) => "^" + TriggerPatterns.WildcardToRegex(pattern) + "$"; + + /// Literal text as a regex matching exactly the whole line. + public static string ExactLine(string text) => "^" + TriggerPatterns.Literal(text) + "$"; + + /// Whether compiles as a .NET regex. + public static bool Compiles(string pattern) + { + try + { + _ = new Regex(pattern, RegexOptions.None, AutomationDefaults.RegexMatchTimeout); + return true; + } + catch (ArgumentException) + { + return false; + } + } + + /// + /// Reads XML that came from another program: no DTD processed (both MUSHclient and Mudlet files carry a bare + /// DOCTYPE, which is ignored), no entity expanded from outside, nothing resolved, and the size capped. + /// Null when it is not XML. + /// + public static XDocument? Xml(string text) + { + var settings = new XmlReaderSettings + { + DtdProcessing = DtdProcessing.Ignore, + XmlResolver = null, + MaxCharactersFromEntities = 1024, + MaxCharactersInDocument = ImportLimits.MaxFileBytes, + IgnoreComments = true, + IgnoreProcessingInstructions = true, + CheckCharacters = false, + }; + try + { + using var reader = XmlReader.Create(new StringReader(text), settings); + return XDocument.Load(reader, LoadOptions.None); + } + catch (XmlException) + { + return null; + } + } + + /// An attribute's value, or null. + public static string? Attr(XElement element, string name) => element.Attribute(name)?.Value; + + /// Whether a MUSHclient-style flag attribute (y/1/yes) is set. + public static bool Flag(XElement element, string name, bool fallback = false) + { + var value = Attr(element, name); + return value is null + ? fallback + : value.Equals("y", StringComparison.OrdinalIgnoreCase) + || value.Equals("yes", StringComparison.OrdinalIgnoreCase) + || value == "1" + || value.Equals("true", StringComparison.OrdinalIgnoreCase); + } + + /// An attribute read as an integer, or . + public static int Int(XElement element, string name, int fallback = 0) => + int.TryParse(Attr(element, name), NumberStyles.Integer, CultureInfo.InvariantCulture, out var value) ? value : fallback; + + /// An attribute read as a number, or . + public static double Number(XElement element, string name, double fallback = 0) => + double.TryParse(Attr(element, name), NumberStyles.Float, CultureInfo.InvariantCulture, out var value) ? value : fallback; + + /// A child element's text, or null. + public static string? Child(XElement element, string name) => element.Element(name)?.Value; + + /// A port read as one, or null when it is not 1–65535. + public static int? Port(string? text) => + int.TryParse(text?.Trim(), NumberStyles.None, CultureInfo.InvariantCulture, out var port) && port is > 0 and <= 65535 + ? port + : null; + + /// A host as one: no spaces or control characters, at most a DNS name long. Null when it is not one. + public static string? Host(string? text) + { + var host = text?.Trim() ?? string.Empty; + if (host.Length is 0 or > 253 || host.Any(c => char.IsWhiteSpace(c) || char.IsControl(c) || c is '/' or '\\' or '@')) + { + return null; + } + + return host; + } +} diff --git a/src/SharpMUTerm.Core/Import/MudletImport.cs b/src/SharpMUTerm.Core/Import/MudletImport.cs new file mode 100644 index 00000000..0ecbe64c --- /dev/null +++ b/src/SharpMUTerm.Core/Import/MudletImport.cs @@ -0,0 +1,530 @@ +using System.IO.Compression; +using System.Text; +using System.Xml.Linq; +using SharpMUTerm.Core.Automation; +using SharpMUTerm.Core.Configuration; + +namespace SharpMUTerm.Core.Import; + +/// +/// Reads Mudlet's XML (MudletPackage): a profile save from a profile's current/ folder, a package or +/// module export, or a zip (.mpackage) holding one — its triggers, aliases, timers and keys, folders flattened +/// (a rule inside a disabled folder comes in disabled). A profile folder adds its world from the url, +/// port and login files Mudlet keeps beside the saves. +/// +/// Lua is never imported. Mudlet's rules carry two actions, a plain command and a Lua body; the command is kept +/// and the Lua is listed as left out. A rule whose only action is Lua is left out whole — keeping it as a rule that +/// does nothing would put a dead rule in the player's set, and translating Lua is not something an importer should +/// guess at. Scripts, buttons and chains (a trigger that gates the triggers inside it) are listed and left out too. +/// +/// +public static class MudletImport +{ + // Mudlet's trigger pattern kinds (regexCodePropertyList). + private const int Substring = 0; + private const int Perl = 1; + private const int BeginOfLine = 2; + private const int Exact = 3; + + // Qt's key codes and modifiers, which Mudlet stores as numbers. + private const int QtF1 = 0x01000030; + private const int QtShift = 0x02000000; + private const int QtControl = 0x04000000; + private const int QtAlt = 0x08000000; + private const int QtKeypad = 0x20000000; + + /// Whether looks like Mudlet's XML. + public static bool Recognises(string text) => text.Contains("Reads Mudlet's XML , or says why it is not that. + public static (ImportResult? Result, string? Problem) Parse(string text, string source) + { + ArgumentNullException.ThrowIfNull(text); + var result = new ImportResult(ImportFormat.Mudlet, source); + return Read(text, result) is { } problem ? (null, problem) : (result, null); + } + + /// + /// Reads a Mudlet profile folder: the newest save in current/, and the world from the url, port + /// and login files. Its password file, if any, is offered on the review and never stored without a yes. + /// + public static (ImportResult? Result, string? Problem) ReadProfile(string folder) + { + ArgumentNullException.ThrowIfNull(folder); + var directory = new DirectoryInfo(folder); + var result = new ImportResult(ImportFormat.Mudlet, directory.Name); + var current = new DirectoryInfo(Path.Combine(directory.FullName, "current")); + var save = current.Exists + ? current.EnumerateFiles("*.xml").Take(ImportLimits.MaxZipEntries).OrderByDescending(f => f.LastWriteTimeUtc).FirstOrDefault() + : null; + if (save is not null) + { + if (save.Length > ImportLimits.MaxFileBytes) + { + return (null, "the profile's newest save is too large to read"); + } + + if (Read(File.ReadAllText(save.FullName), result) is { } problem) + { + return (null, problem); + } + } + + AddProfileWorld(directory, directory.Name, result); + return result.IsEmpty && save is null + ? (null, "that folder is not a Mudlet profile (it has no current/ saves and no url file)") + : (result, null); + } + + /// Reads the first Mudlet XML in a zip (a .mpackage), extracting nothing to disk. + public static (ImportResult? Result, string? Problem) ReadZip(byte[] bytes, string source) + { + ArgumentNullException.ThrowIfNull(bytes); + try + { + using var zip = new ZipArchive(new MemoryStream(bytes), ZipArchiveMode.Read); + foreach (var entry in zip.Entries.Take(ImportLimits.MaxZipEntries)) + { + if (!entry.FullName.EndsWith(".xml", StringComparison.OrdinalIgnoreCase) || entry.Length > ImportLimits.MaxFileBytes) + { + continue; + } + + var text = ReadBounded(entry); + if (text is not null && Recognises(text)) + { + return Parse(text, source); + } + } + } + catch (InvalidDataException) + { + return (null, "that zip cannot be read"); + } + + return (null, "that zip holds no Mudlet package XML"); + } + + /// + /// When is a save inside a profile's current/ folder, the profile's world is added + /// from the files beside it. + /// + public static void AddProfileWorldFor(string file, ImportResult result) + { + var current = new FileInfo(file).Directory; + if (current is { Name: "current", Parent: { } profile } && File.Exists(Path.Combine(profile.FullName, "url"))) + { + AddProfileWorld(profile, profile.Name, result); + } + } + + private static string? ReadBounded(ZipArchiveEntry entry) + { + using var stream = entry.Open(); + var buffer = new MemoryStream(); + var chunk = new byte[81920]; + int read; + while ((read = stream.Read(chunk, 0, chunk.Length)) > 0) + { + buffer.Write(chunk, 0, read); + if (buffer.Length > ImportLimits.MaxFileBytes) + { + return null; + } + } + + return Encoding.UTF8.GetString(buffer.GetBuffer(), 0, (int)buffer.Length); + } + + private static string? ReadSmallFile(DirectoryInfo folder, string name) + { + var file = new FileInfo(Path.Combine(folder.FullName, name)); + return file.Exists && file.Length <= 1024 ? File.ReadAllText(file.FullName).Trim() : null; + } + + private static void AddProfileWorld(DirectoryInfo profile, string name, ImportResult result) + { + if (result.Worlds.Count > 0) + { + return; + } + + var host = ImportText.Host(ReadSmallFile(profile, "url")); + if (host is null) + { + return; + } + + var world = new WorldDefinition + { + Name = ImportText.Name(name) is { Length: > 0 } n ? n : host, + Host = host, + Port = ImportText.Port(ReadSmallFile(profile, "port")) ?? 23, + UseTls = ReadSmallFile(profile, "ssl_tls_enabled") is "true" or "1", + }; + var login = ImportText.Name(ReadSmallFile(profile, "login")); + if (login.Length > 0) + { + world.Characters.Add(new CharacterDefinition { Name = login }); + if (ReadSmallFile(profile, "password") is { Length: > 0 and <= ImportLimits.MaxName } password) + { + result.Passwords.Add(new ImportedPassword(0, login, password)); + } + } + + result.Worlds.Add(world); + } + + private static string? Read(string text, ImportResult result) + { + if (ImportText.Xml(text) is not { Root: { } root } || root.Name.LocalName != "MudletPackage") + { + return "not a Mudlet package or profile save"; + } + + foreach (var host in root.Elements("HostPackage").Elements("Host").Take(1)) + { + ReadHost(host, result); + } + + foreach (var package in root.Elements("TriggerPackage")) + { + Walk(package, "Trigger", "TriggerGroup", 0, true, result, ReadTrigger); + } + + foreach (var package in root.Elements("AliasPackage")) + { + Walk(package, "Alias", "AliasGroup", 0, true, result, ReadAlias); + } + + foreach (var package in root.Elements("TimerPackage")) + { + Walk(package, "Timer", "TimerGroup", 0, true, result, ReadTimer); + } + + foreach (var package in root.Elements("KeyPackage")) + { + Walk(package, "Key", "KeyGroup", 0, true, result, ReadKey); + } + + foreach (var script in root.Elements("ScriptPackage").Descendants("Script").Take(ImportLimits.MaxItems)) + { + if (!string.IsNullOrWhiteSpace(script.Element("script")?.Value)) + { + result.Skip("script", script.Element("name")?.Value, "Lua scripts are never imported"); + } + } + + foreach (var button in root.Elements("ActionPackage").Descendants("Action").Take(ImportLimits.MaxItems)) + { + result.Skip("button", button.Element("name")?.Value, "buttons are not imported"); + } + + return null; + } + + private static void ReadHost(XElement host, ImportResult result) + { + var url = ImportText.Host(ImportText.Child(host, "url")); + if (url is null) + { + return; + } + + var name = ImportText.Name(ImportText.Child(host, "name")); + var world = new WorldDefinition + { + Name = name.Length > 0 ? name : url, + Host = url, + Port = ImportText.Port(ImportText.Child(host, "port")) ?? 23, + }; + var login = ImportText.Name(ImportText.Child(host, "login")); + if (login.Length > 0) + { + world.Characters.Add(new CharacterDefinition { Name = login }); + } + + result.Worlds.Add(world); + } + + /// + /// Walks a Mudlet package's folders, handing each rule that is not a folder to with whether + /// it and every folder above it are active. A rule that has rules inside it and patterns of its own is a chain, + /// which this client has no equivalent for, so it and everything in it are left out. + /// + private static void Walk( + XElement parent, + string item, + string group, + int depth, + bool active, + ImportResult result, + Action read) + { + foreach (var element in parent.Elements()) + { + var local = element.Name.LocalName; + if (local != item && local != group) + { + continue; + } + + var name = element.Element("name")?.Value; + var on = active && ImportText.Flag(element, "isActive"); + var children = element.Elements().Where(e => e.Name.LocalName == item || e.Name.LocalName == group).ToList(); + var isFolder = ImportText.Flag(element, "isFolder") || local == group; + if (depth >= ImportLimits.MaxDepth) + { + result.Skip(item.ToLowerInvariant(), name, "nested too deeply"); + continue; + } + + if (isFolder && !HasOwnPattern(element)) + { + if (!string.IsNullOrWhiteSpace(element.Element("script")?.Value)) + { + result.Skip("script", name, "a folder's Lua is never imported"); + } + + Walk(element, item, group, depth + 1, on, result, read); + continue; + } + + if (children.Count > 0) + { + var count = element.Descendants().Count(e => e.Name.LocalName == item || e.Name.LocalName == group); + result.Skip(item.ToLowerInvariant(), name, $"it is a chain gating {count} rule{(count == 1 ? string.Empty : "s")} inside it, which this client has no equivalent for"); + continue; + } + + read(element, on, result); + } + } + + private static bool HasOwnPattern(XElement element) => + element.Element("regexCodeList")?.Elements("string").Any(s => s.Value.Length > 0) == true + || !string.IsNullOrEmpty(element.Element("regex")?.Value) + || !string.IsNullOrEmpty(element.Element("time")?.Value?.Trim('0', ':', '.')); + + /// The rule's command, its Lua listed as left out; null (and the rule left out) when Lua is all it does. + private static string? Command(XElement element, string kind, string name, string commandElement, ImportResult result) + { + var command = ImportText.Body(element.Element(commandElement)?.Value); + var lua = !string.IsNullOrWhiteSpace(element.Element("script")?.Value); + if (command is null) + { + result.Skip(kind, name, "its command is too long"); + return null; + } + + if (command.Length == 0) + { + result.Skip(kind, name, lua ? "its action is Lua, which is never imported" : "it does nothing this client can import"); + return null; + } + + if (lua) + { + result.Skip("part", name, "its Lua was left out; its command was kept"); + } + + return command; + } + + private static void ReadTrigger(XElement element, bool active, ImportResult result) + { + var name = ImportText.Name(element.Element("name")?.Value); + if (!result.Room("trigger", result.Set.Triggers.Count, name)) + { + return; + } + + if (ImportText.Flag(element, "isMultiline")) + { + result.Skip("trigger", name, "it matches across several lines"); + return; + } + + var patterns = element.Element("regexCodeList")?.Elements("string").Select(s => s.Value).ToList() ?? []; + var kinds = element.Element("regexCodePropertyList")?.Elements("integer").Select(i => int.TryParse(i.Value, out var k) ? k : -1).ToList() ?? []; + if (patterns.Count == 0) + { + result.Skip("trigger", name, "it has no pattern"); + return; + } + + if (Command(element, "trigger", name, "mCommand", result) is not { } command) + { + return; + } + + var stop = ImportText.Flag(element, "isFilterTrigger"); + for (var i = 0; i < patterns.Count && i < 64; i++) + { + var label = patterns.Count == 1 ? name : $"{name} ({i + 1})"; + var kind = i < kinds.Count ? kinds[i] : Substring; + if (ImportText.Body(patterns[i]) is not { Length: > 0 } raw || raw.Contains('\n')) + { + result.Skip("trigger", label, "its pattern is empty, too long or more than one line"); + continue; + } + + (string Pattern, TriggerMatchType Type)? mapped = kind switch + { + Substring => (raw, TriggerMatchType.Contains), + BeginOfLine => (raw, TriggerMatchType.StartsWith), + Exact => (ImportText.ExactLine(raw), TriggerMatchType.Regex), + Perl when ImportText.Compiles(raw) => (raw, TriggerMatchType.Regex), + _ => null, + }; + if (mapped is not { } m) + { + result.Skip("trigger", label, kind == Perl + ? "its regular expression is not one this client can read" + : "its pattern kind (Lua function, colour, prompt or line spacer) has no equivalent here"); + continue; + } + + if (!result.Room("trigger", result.Set.Triggers.Count, label)) + { + return; + } + + result.Set.Triggers.Add(new Trigger + { + Name = label, + Pattern = m.Pattern, + MatchType = m.Type, + Enabled = active, + CaseSensitive = true, + StopProcessing = stop, + Actions = { SendResponse = ImportText.Literal(command) }, + }); + } + } + + private static void ReadAlias(XElement element, bool active, ImportResult result) + { + var name = ImportText.Name(element.Element("name")?.Value); + if (!result.Room("alias", result.Set.Aliases.Count, name)) + { + return; + } + + var pattern = ImportText.Body(element.Element("regex")?.Value); + if (string.IsNullOrEmpty(pattern) || pattern.Contains('\n') || !ImportText.Compiles(pattern)) + { + result.Skip("alias", name, string.IsNullOrEmpty(pattern) ? "it has no pattern" : "its regular expression is not one this client can read"); + return; + } + + if (Command(element, "alias", name, "command", result) is not { } command) + { + return; + } + + result.Set.Aliases.Add(new Alias + { + Name = name, + Pattern = pattern, + Enabled = active, + CaseSensitive = true, + Substitution = ImportText.Literal(command), + }); + } + + private static void ReadTimer(XElement element, bool active, ImportResult result) + { + var name = ImportText.Name(element.Element("name")?.Value); + if (!result.Room("timer", result.Set.Timers.Count, name)) + { + return; + } + + if (ImportText.Flag(element, "isTempTimer") || ImportText.Flag(element, "isOffsetTimer")) + { + result.Skip("timer", name, "it is a temporary or offset timer"); + return; + } + + var time = element.Element("time")?.Value?.Trim() ?? string.Empty; + if (!TimeSpan.TryParseExact(time, [@"hh\:mm\:ss\.fff", @"hh\:mm\:ss", @"h\:mm\:ss\.fff", @"hh\:mm\:ss\.ff", @"hh\:mm\:ss\.f"], System.Globalization.CultureInfo.InvariantCulture, out var interval) + || interval.TotalSeconds is < 0.1 or > 86400) + { + result.Skip("timer", name, "its interval is not between a tenth of a second and a day"); + return; + } + + if (Command(element, "timer", name, "command", result) is not { } command) + { + return; + } + + result.Set.Timers.Add(new TimerDefinition + { + Name = name, + IntervalSeconds = Math.Round(interval.TotalSeconds, 2), + Command = command, + Enabled = active, + }); + } + + private static void ReadKey(XElement element, bool active, ImportResult result) + { + var name = ImportText.Name(element.Element("name")?.Value); + if (!result.Room("key", result.Set.Macros.Count, name)) + { + return; + } + + var code = int.TryParse(element.Element("keyCode")?.Value, out var c) ? c : 0; + var modifiers = int.TryParse(element.Element("keyModifier")?.Value, out var m) ? m : 0; + if (KeyName(code, modifiers) is not { } descriptor || MacroKey.Canonicalise(descriptor) is not { } key) + { + result.Skip("key", name, "its key has no name here (only function keys, letters, digits and the keypad do)"); + return; + } + + if (Command(element, "key", name, "command", result) is not { } command) + { + return; + } + + if (result.Set.Macros.Any(existing => string.Equals(existing.Key, key, StringComparison.Ordinal))) + { + result.Skip("key", name, $"{key} is already bound by another key in this file"); + return; + } + + result.Set.Macros.Add(new Macro { Name = name.Length > 0 ? name : key, Key = key, Command = command, Enabled = active }); + } + + /// A Qt key code and modifier mask as a descriptor (Ctrl+F2, Num8), or null. + internal static string? KeyName(int code, int modifiers) + { + string? key = code switch + { + >= QtF1 and < QtF1 + 24 => "F" + (code - QtF1 + 1), + >= 'A' and <= 'Z' => ((char)code).ToString(), + >= '0' and <= '9' when (modifiers & QtKeypad) != 0 => "Num" + (char)code, + >= '0' and <= '9' => ((char)code).ToString(), + _ => null, + }; + if (key is null) + { + return null; + } + + var ctrl = (modifiers & QtControl) != 0; + var alt = (modifiers & QtAlt) != 0; + var shift = (modifiers & QtShift) != 0; + + // A bare letter or digit is typing, not a key to bind. + if (key.Length == 1 && !ctrl && !alt) + { + return null; + } + + return MacroKey.Describe(key, ctrl, alt, shift); + } +} diff --git a/src/SharpMUTerm.Core/Import/MushclientImport.cs b/src/SharpMUTerm.Core/Import/MushclientImport.cs new file mode 100644 index 00000000..060165ec --- /dev/null +++ b/src/SharpMUTerm.Core/Import/MushclientImport.cs @@ -0,0 +1,347 @@ +using System.Text.RegularExpressions; +using System.Xml.Linq; +using SharpMUTerm.Core.Automation; +using SharpMUTerm.Core.Configuration; + +namespace SharpMUTerm.Core.Import; + +/// +/// Reads a MUSHclient world file (.mcl, the XML format MUSHclient has written since 3.x): the world's name, +/// host and port, its player, and its triggers, aliases, timers, function-key macros and keypad keys. +/// +/// Only what sends text is imported. A rule whose send_to is the world (0) or the command processor (10) +/// becomes a rule here; one that sends to a script, a variable, the notepad or the output is left out and listed. +/// A script="…" function name, the file's <script> and its plugins are never imported and never +/// run: they are VBScript, Lua, JScript or Python written for MUSHclient's own object model. +/// +/// +/// MUSHclient matches a non-regex pattern against the whole line, each * a wildcard, so such a pattern +/// becomes an anchored regex — or, when it already starts and ends with *, this client's own wildcard kind, +/// which means the same thing. +/// +/// +public static class MushclientImport +{ + private static readonly Regex FunctionKey = new(@"^((Ctrl|Shift|Alt)\+)*F([1-9]|1[0-9]|2[0-4])$", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant); + + /// Whether looks like a MUSHclient world file. + public static bool Recognises(string text) => text.Contains("Reads , or says why it is not a MUSHclient world file. + public static (ImportResult? Result, string? Problem) Parse(string text, string source) + { + ArgumentNullException.ThrowIfNull(text); + if (ImportText.Xml(text) is not { Root: { } root } || !root.Name.LocalName.Equals("muclient", StringComparison.OrdinalIgnoreCase)) + { + return (null, "not a MUSHclient world file (worlds saved before MUSHclient 3 are not XML and cannot be read)"); + } + + var result = new ImportResult(ImportFormat.MushClient, source); + foreach (var world in root.Elements("world")) + { + ReadWorld(world, result); + } + + foreach (var trigger in root.Elements("triggers").Elements("trigger").OrderBy(t => ImportText.Int(t, "sequence", 100))) + { + ReadTrigger(trigger, result); + } + + foreach (var alias in root.Elements("aliases").Elements("alias").OrderBy(a => ImportText.Int(a, "sequence", 100))) + { + ReadAlias(alias, result); + } + + foreach (var timer in root.Elements("timers").Elements("timer")) + { + ReadTimer(timer, result); + } + + foreach (var macro in root.Elements("macros").Elements("macro")) + { + ReadMacro(macro, result); + } + + foreach (var key in root.Elements("keypad").Elements("key")) + { + ReadKeypad(key, result); + } + + foreach (var script in root.Elements("script")) + { + if (!string.IsNullOrWhiteSpace(script.Value)) + { + result.Skip("script", "world script", "script code is never imported"); + } + } + + foreach (var plugin in root.Elements("include").Concat(root.Elements("plugins").Elements())) + { + result.Skip("plugin", ImportText.Attr(plugin, "name") ?? ImportText.Attr(plugin, "plugin"), "plugins are never imported"); + } + + return (result, null); + } + + private static void ReadWorld(XElement element, ImportResult result) + { + var name = ImportText.Name(ImportText.Attr(element, "name")); + if (result.Worlds.Count >= ImportLimits.MaxWorlds) + { + result.Skip("world", name, "past the limit of worlds in one file"); + return; + } + + var host = ImportText.Host(ImportText.Attr(element, "site")); + var port = ImportText.Port(ImportText.Attr(element, "port")) ?? 4000; + if (host is null) + { + result.Skip("world", name, "it names no host"); + return; + } + + var world = new WorldDefinition { Name = name.Length > 0 ? name : host, Host = host, Port = port }; + var player = ImportText.Name(ImportText.Attr(element, "player")); + if (player.Length > 0) + { + world.Characters.Add(new CharacterDefinition { Name = player }); + var password = ImportText.Attr(element, "password"); + if (!string.IsNullOrEmpty(password) && password.Length <= ImportLimits.MaxName) + { + result.Passwords.Add(new ImportedPassword(result.Worlds.Count, player, password)); + } + } + + result.Worlds.Add(world); + } + + /// The command a rule sends, or null (and the rule listed as left out) when it sends somewhere else. + private static string? Send(XElement element, string kind, string name, ImportResult result) + { + var sendTo = ImportText.Int(element, "send_to", 0); + var body = ImportText.Body(ImportText.Child(element, "send")); + if (body is null) + { + result.Skip(kind, name, "its command is too long"); + return null; + } + + if (sendTo is not (0 or 10) && body.Length > 0) + { + result.Skip(kind, name, sendTo is 12 or 14 ? "it sends to a script, which is never imported" : "it sends somewhere other than the world"); + return null; + } + + return ImportText.PercentReferences(body); + } + + private static string? Pattern(XElement element, string kind, string name, ImportResult result, out TriggerMatchType type) + { + type = TriggerMatchType.Regex; + var match = ImportText.Body(ImportText.Attr(element, "match")); + if (string.IsNullOrEmpty(match)) + { + result.Skip(kind, name, match is null ? "its pattern is too long" : "it has no pattern"); + return null; + } + + if (match.Contains('\n')) + { + result.Skip(kind, name, "it matches more than one line"); + return null; + } + + if (ImportText.Flag(element, "regexp")) + { + if (!ImportText.Compiles(match)) + { + result.Skip(kind, name, "its regular expression is not one this client can read"); + return null; + } + + return match; + } + + // A whole-line wildcard. `*text*` already means "anywhere", which is this client's own wildcard kind. + if (kind == "trigger" && match.Length > 2 && match[0] == '*' && match[^1] == '*' && match.Trim('*').Length > 0) + { + type = TriggerMatchType.Wildcard; + return match; + } + + return ImportText.AnchoredWildcard(match); + } + + private static void ReadTrigger(XElement element, ImportResult result) + { + var name = ImportText.Name(ImportText.Attr(element, "name") is { Length: > 0 } n ? n : ImportText.Attr(element, "match")); + if (!result.Room("trigger", result.Set.Triggers.Count, name)) + { + return; + } + + if (ImportText.Flag(element, "multi_line")) + { + result.Skip("trigger", name, "it matches more than one line"); + return; + } + + if (Pattern(element, "trigger", name, result, out var type) is not { } pattern || Send(element, "trigger", name, result) is not { } send) + { + return; + } + + var gag = ImportText.Flag(element, "omit_from_output"); + if (send.Length == 0 && !gag) + { + result.Skip("trigger", name, ImportText.Attr(element, "script") is { Length: > 0 } + ? "it only calls a script function, which is never imported" + : "it does nothing this client can import (colours or sounds only)"); + return; + } + + if (ImportText.Attr(element, "script") is { Length: > 0 } function) + { + result.Skip("part", name, $"its script function {ImportText.Name(function)} was left out"); + } + + result.Set.Triggers.Add(new Trigger + { + Name = name, + Pattern = pattern, + MatchType = type, + Enabled = ImportText.Flag(element, "enabled", fallback: true), + CaseSensitive = !ImportText.Flag(element, "ignore_case"), + StopProcessing = !ImportText.Flag(element, "keep_evaluating"), + Actions = { Gag = gag, SendResponse = send.Length > 0 ? send : null }, + }); + } + + private static void ReadAlias(XElement element, ImportResult result) + { + var name = ImportText.Name(ImportText.Attr(element, "name") is { Length: > 0 } n ? n : ImportText.Attr(element, "match")); + if (!result.Room("alias", result.Set.Aliases.Count, name) + || Pattern(element, "alias", name, result, out _) is not { } pattern + || Send(element, "alias", name, result) is not { } send) + { + return; + } + + if (send.Length == 0) + { + result.Skip("alias", name, "it sends nothing (a script function or nothing at all)"); + return; + } + + result.Set.Aliases.Add(new Alias + { + Name = name, + Pattern = pattern, + Enabled = ImportText.Flag(element, "enabled", fallback: true), + CaseSensitive = !ImportText.Flag(element, "ignore_case"), + Substitution = send, + }); + } + + private static void ReadTimer(XElement element, ImportResult result) + { + var name = ImportText.Name(ImportText.Attr(element, "name") is { Length: > 0 } n ? n : "timer"); + if (!result.Room("timer", result.Set.Timers.Count, name)) + { + return; + } + + if (ImportText.Flag(element, "at_time")) + { + result.Skip("timer", name, "it fires at a time of day, and timers here repeat on an interval"); + return; + } + + var seconds = (ImportText.Number(element, "hour") * 3600) + (ImportText.Number(element, "minute") * 60) + ImportText.Number(element, "second"); + if (seconds is < 0.1 or > 86400 || double.IsNaN(seconds)) + { + result.Skip("timer", name, "its interval is not between a tenth of a second and a day"); + return; + } + + if (Send(element, "timer", name, result) is not { } send) + { + return; + } + + if (send.Length == 0) + { + result.Skip("timer", name, "it sends nothing (a script function or nothing at all)"); + return; + } + + result.Set.Timers.Add(new TimerDefinition + { + Name = name, + IntervalSeconds = Math.Round(seconds, 2), + Command = send.Replace("$$", "$", StringComparison.Ordinal), + OneShot = ImportText.Flag(element, "one_shot"), + Enabled = ImportText.Flag(element, "enabled", fallback: true), + }); + } + + private static void ReadMacro(XElement element, ImportResult result) + { + var name = ImportText.Name(ImportText.Attr(element, "name")); + var body = ImportText.Body(ImportText.Child(element, "send")); + if (string.IsNullOrEmpty(body)) + { + return; + } + + if (!FunctionKey.IsMatch(name) || MacroKey.Canonicalise(name) is not { } key) + { + result.Skip("key", name, "only function-key macros have a key here"); + return; + } + + if (!string.Equals(ImportText.Attr(element, "type"), "send_now", StringComparison.OrdinalIgnoreCase)) + { + result.Skip("key", name, "it puts text on the command line rather than sending it"); + return; + } + + AddMacro(result, name, key, body); + } + + private static void ReadKeypad(XElement element, ImportResult result) + { + var name = ImportText.Name(ImportText.Attr(element, "name")); + var body = ImportText.Body(ImportText.Child(element, "send")); + if (string.IsNullOrEmpty(body)) + { + return; + } + + var ctrl = name.StartsWith("Ctrl+", StringComparison.OrdinalIgnoreCase); + var digit = ctrl ? name[5..] : name; + if (digit.Length != 1 || !char.IsAsciiDigit(digit[0]) || MacroKey.Canonicalise((ctrl ? "Ctrl+" : string.Empty) + "Num" + digit) is not { } key) + { + result.Skip("key", "keypad " + name, "only the keypad's digits have a key here"); + return; + } + + AddMacro(result, "keypad " + name, key, body); + } + + private static void AddMacro(ImportResult result, string name, string key, string body) + { + if (!result.Room("key", result.Set.Macros.Count, name)) + { + return; + } + + if (result.Set.Macros.Any(m => string.Equals(m.Key, key, StringComparison.Ordinal))) + { + result.Skip("key", name, $"{key} is already bound by another key in this file"); + return; + } + + result.Set.Macros.Add(new Macro { Name = name, Key = key, Command = body }); + } +} diff --git a/src/SharpMUTerm.Core/Import/TinTinImport.cs b/src/SharpMUTerm.Core/Import/TinTinImport.cs new file mode 100644 index 00000000..548b29a8 --- /dev/null +++ b/src/SharpMUTerm.Core/Import/TinTinImport.cs @@ -0,0 +1,531 @@ +using System.Globalization; +using System.Text; +using SharpMUTerm.Core.Automation; +using SharpMUTerm.Core.Configuration; + +namespace SharpMUTerm.Core.Import; + +/// +/// Reads a TinTin++ script: #session (a world), #action and #gag (triggers), #alias, and +/// #ticker (a timer), each by its full name or the prefix TinTin accepts (#act, #ali, #ses). +/// Every other # command is counted as left out. +/// +/// A pattern's %1–%99 and %* become captures, %d digits, %w a word, and a +/// leading ^ anchors it as in TinTin; one with TinTin's own {regex} blocks is left out. A command list +/// is split on ; into one command per line, and a list with a # command in it is left out whole: those +/// are TinTin's own statements, which this client does not run. +/// +/// +public static class TinTinImport +{ + private static readonly (string Name, int Shortest)[] Commands = + [ + ("session", 3), + ("action", 2), + ("alias", 3), + ("ticker", 4), + ("gag", 3), + ]; + + /// Whether looks like a TinTin++ script. + public static bool Recognises(string text) => + text.Split('\n').Take(400).Any(line => line.TrimStart().StartsWith('#') + && Command(Word(line.TrimStart()[1..])) is not null); + + /// Reads . + public static (ImportResult? Result, string? Problem) Parse(string text, string source) + { + ArgumentNullException.ThrowIfNull(text); + var result = new ImportResult(ImportFormat.TinTin, source); + var others = new SortedSet(StringComparer.Ordinal); + var otherCount = 0; + foreach (var statement in Statements(text).Take(ImportLimits.MaxItems * 4)) + { + switch (Command(statement.Command)) + { + case "session": + ReadSession(statement.Arguments, result); + break; + case "action": + ReadAction(statement.Arguments, result, gag: false); + break; + case "gag": + ReadAction(statement.Arguments, result, gag: true); + break; + case "alias": + ReadAlias(statement.Arguments, result); + break; + case "ticker": + ReadTicker(statement.Arguments, result); + break; + default: + otherCount++; + if (others.Count < 8 && statement.Command.Length is > 0 and < 20) + { + others.Add("#" + statement.Command.ToLowerInvariant()); + } + + break; + } + } + + if (otherCount > 0) + { + result.Skip( + "command", + $"{otherCount} other TinTin command{(otherCount == 1 ? string.Empty : "s")}", + string.Join(" ", others) + " — TinTin's own statements are not run here"); + } + + return result.IsEmpty && result.SkippedCount == 0 ? (null, "no TinTin++ #session, #action, #alias or #ticker lines in that file") : (result, null); + } + + /// The full command a typed word names (TinTin accepts any prefix down to a minimum), or null. + private static string? Command(string word) + { + var lower = word.ToLowerInvariant(); + foreach (var (name, shortest) in Commands) + { + if (lower.Length >= shortest && name.StartsWith(lower, StringComparison.Ordinal)) + { + return name; + } + } + + return null; + } + + private static string Word(string text) + { + var end = 0; + while (end < text.Length && char.IsAsciiLetter(text[end])) + { + end++; + } + + return text[..end]; + } + + private sealed record Statement(string Command, IReadOnlyList Arguments); + + /// + /// The script's statements: a #word and its arguments, each a {…} group (nested, across lines) or a + /// bare word, up to a newline or ; outside any group. + /// + private static IEnumerable Statements(string text) + { + var i = 0; + while (i < text.Length) + { + // To the start of the next statement: a # at the start of a line or after a ;. + while (i < text.Length && (char.IsWhiteSpace(text[i]) || text[i] == ';')) + { + i++; + } + + if (i >= text.Length) + { + yield break; + } + + if (text[i] != '#') + { + while (i < text.Length && text[i] != '\n') + { + i++; + } + + continue; + } + + i++; + var start = i; + while (i < text.Length && char.IsAsciiLetter(text[i])) + { + i++; + } + + var command = text[start..i]; + var arguments = new List(); + while (i < text.Length && text[i] != '\n' && text[i] != ';' && arguments.Count < 8) + { + if (text[i] is ' ' or '\t' or '\r') + { + i++; + } + else if (text[i] == '{') + { + var depth = 0; + var open = i; + for (; i < text.Length; i++) + { + if (text[i] == '{') + { + depth++; + } + else if (text[i] == '}' && --depth == 0) + { + break; + } + } + + arguments.Add(text[(open + 1)..Math.Min(i, text.Length)]); + i++; + } + else + { + var word = i; + while (i < text.Length && !char.IsWhiteSpace(text[i]) && text[i] != ';') + { + i++; + } + + arguments.Add(text[word..i]); + } + } + + yield return new Statement(command, arguments); + } + } + + private static void ReadSession(IReadOnlyList arguments, ImportResult result) + { + var name = ImportText.Name(arguments.ElementAtOrDefault(0)); + if (result.Worlds.Count >= ImportLimits.MaxWorlds) + { + result.Skip("world", name, "past the limit of worlds in one file"); + return; + } + + var host = ImportText.Host(arguments.ElementAtOrDefault(1)); + var port = ImportText.Port(arguments.ElementAtOrDefault(2)); + if (host is null || port is null) + { + result.Skip("world", name, "it does not name a host and a port"); + return; + } + + if (result.Worlds.Any(w => w.Host == host && w.Port == port)) + { + return; + } + + result.Worlds.Add(new WorldDefinition { Name = name.Length > 0 ? name : host, Host = host, Port = port.Value }); + } + + /// + /// A TinTin pattern as a regex: %1–%99 become named captures (so a command's %2 finds the right + /// one whatever order they appear in), %* an unnamed one, %d/%w typed ones. Null when it uses + /// TinTin's own regex blocks. + /// + internal static string? PatternToRegex(string pattern, bool anchorEnd = false) + { + if (pattern.Contains('{') || pattern.Contains('}')) + { + return null; + } + + var builder = new StringBuilder(); + var i = 0; + if (pattern.StartsWith('^')) + { + builder.Append('^'); + i = 1; + } + + var end = pattern.Length; + var anchored = anchorEnd; + if (end > i && pattern[end - 1] == '$' && (end < 2 || pattern[end - 2] != '\\')) + { + end--; + anchored = true; + } + + var literal = new StringBuilder(); + var seen = new HashSet(); + void Flush() + { + builder.Append(TriggerPatterns.Literal(literal.ToString())); + literal.Clear(); + } + + for (; i < end; i++) + { + var c = pattern[i]; + if (c != '%' || i + 1 >= end) + { + literal.Append(c); + continue; + } + + var next = pattern[i + 1]; + var last = i + 2 >= end; + if (char.IsAsciiDigit(next)) + { + var j = i + 1; + while (j < end && j < i + 3 && char.IsAsciiDigit(pattern[j])) + { + j++; + } + + var number = int.Parse(pattern[(i + 1)..j], CultureInfo.InvariantCulture); + Flush(); + last = j >= end; + var body = last ? ".*" : ".*?"; + builder.Append(seen.Add(number) ? $"(?{body})" : $"\\k"); + i = j - 1; + } + else if (next is '*' or 'd' or 'w' or 's' or 'D' or 'W' or 'S') + { + Flush(); + builder.Append(next switch + { + '*' => last ? "(.*)" : "(.*?)", + 'd' => "([0-9]+)", + 'w' => "([A-Za-z]+)", + 's' => "(\\s+)", + 'D' => "([^0-9]+)", + 'W' => "([^A-Za-z]+)", + _ => "(\\S+)", + }); + i++; + } + else if (next == '%') + { + literal.Append('%'); + i++; + } + else + { + literal.Append(c); + } + } + + Flush(); + if (anchored) + { + builder.Append('$'); + } + + var regex = builder.ToString(); + return ImportText.Compiles(regex) ? regex : null; + } + + /// + /// A TinTin command list as this client's: split on ; outside braces, one per line, %N becoming the + /// matching capture. Null when it holds a # command. + /// + internal static string? CommandsToSubstitution(string commands, Func reference) + { + var parts = new List(); + var current = new StringBuilder(); + var depth = 0; + foreach (var c in commands) + { + if (c == '{') + { + depth++; + } + else if (c == '}') + { + depth = Math.Max(0, depth - 1); + } + + if (c == ';' && depth == 0) + { + parts.Add(current.ToString()); + current.Clear(); + } + else if (c != '\n' && c != '\r') + { + current.Append(c); + } + } + + parts.Add(current.ToString()); + var lines = new List(); + foreach (var part in parts.Select(p => p.Trim()).Where(p => p.Length > 0)) + { + if (part.StartsWith('#')) + { + return null; + } + + var line = new StringBuilder(); + for (var i = 0; i < part.Length; i++) + { + var c = part[i]; + if (c == '%' && i + 1 < part.Length && char.IsAsciiDigit(part[i + 1])) + { + var j = i + 1; + while (j < part.Length && j < i + 3 && char.IsAsciiDigit(part[j])) + { + j++; + } + + line.Append(reference(int.Parse(part[(i + 1)..j], CultureInfo.InvariantCulture))); + i = j - 1; + } + else if (c == '$') + { + line.Append("$$"); + } + else if (c is '{' or '}') + { + // Braces only group in TinTin; they are not text. + } + else + { + line.Append(c); + } + } + + lines.Add(line.ToString()); + } + + return string.Join('\n', lines); + } + + private static void ReadAction(IReadOnlyList arguments, ImportResult result, bool gag) + { + var raw = arguments.ElementAtOrDefault(0) ?? string.Empty; + var name = ImportText.Name(raw); + if (!result.Room("trigger", result.Set.Triggers.Count, name)) + { + return; + } + + if (ImportText.Body(raw) is not { Length: > 0 } pattern || pattern.Contains('\n')) + { + result.Skip("trigger", name, "its pattern is empty, too long or more than one line"); + return; + } + + if (PatternToRegex(pattern) is not { } regex) + { + result.Skip("trigger", name, "it uses TinTin's own regex syntax"); + return; + } + + string? send = null; + if (!gag) + { + var commands = ImportText.Body(arguments.ElementAtOrDefault(1)); + send = commands is null ? null : CommandsToSubstitution(commands, n => n == 0 ? "$0" : $"${{t{n}}}"); + if (send is null) + { + result.Skip("trigger", name, commands is null ? "its commands are too long" : "it runs TinTin commands (#…), which are not run here"); + return; + } + + if (send.Length == 0) + { + result.Skip("trigger", name, "it sends nothing"); + return; + } + + // A reference to a capture the pattern does not have would be sent as the literal text. + for (var n = 1; n < 100; n++) + { + if (send.Contains($"${{t{n}}}", StringComparison.Ordinal) && !regex.Contains($"", StringComparison.Ordinal)) + { + send = send.Replace($"${{t{n}}}", string.Empty, StringComparison.Ordinal); + } + } + } + + result.Set.Triggers.Add(new Trigger + { + Name = (gag ? "gag " : string.Empty) + name, + Pattern = regex, + Enabled = true, + CaseSensitive = true, + StopProcessing = false, + Actions = { Gag = gag, SendResponse = send }, + }); + } + + private static void ReadAlias(IReadOnlyList arguments, ImportResult result) + { + var raw = arguments.ElementAtOrDefault(0) ?? string.Empty; + var name = ImportText.Name(raw); + if (!result.Room("alias", result.Set.Aliases.Count, name)) + { + return; + } + + var commands = ImportText.Body(arguments.ElementAtOrDefault(1)); + if (name.Length == 0 || commands is null) + { + result.Skip("alias", name, name.Length == 0 ? "it has no name" : "its commands are too long"); + return; + } + + string? pattern; + string? substitution; + if (raw.Contains('%')) + { + // The pattern names its own arguments. + pattern = PatternToRegex(raw.StartsWith('^') ? raw : "^" + raw, anchorEnd: true); + substitution = pattern is null ? null : CommandsToSubstitution(commands, n => n == 0 ? "$0" : $"${{t{n}}}"); + } + else if (raw.Any(char.IsWhiteSpace)) + { + pattern = ImportText.ExactLine(raw); + substitution = CommandsToSubstitution(commands, _ => string.Empty); + } + else + { + // A bare word: %0 is everything after it, %1–%3 its first three words. + pattern = "^" + TriggerPatterns.Literal(raw) + + @"(?:\s+(?(?\S+)(?:\s+(?\S+))?(?:\s+(?\S+))?.*))?$"; + substitution = CommandsToSubstitution(commands, n => n <= 3 ? $"${{a{n}}}" : "\u0000"); + if (substitution?.Contains('\u0000') == true) + { + result.Skip("alias", name, "it uses more than three arguments"); + return; + } + } + + if (pattern is null || substitution is null || substitution.Length == 0) + { + result.Skip("alias", name, pattern is null + ? "it uses TinTin's own regex syntax" + : substitution is null ? "it runs TinTin commands (#…), which are not run here" : "it sends nothing"); + return; + } + + result.Set.Aliases.Add(new Alias { Name = name, Pattern = pattern, CaseSensitive = true, Substitution = substitution }); + } + + private static void ReadTicker(IReadOnlyList arguments, ImportResult result) + { + var name = ImportText.Name(arguments.ElementAtOrDefault(0)); + if (!result.Room("timer", result.Set.Timers.Count, name)) + { + return; + } + + var commands = ImportText.Body(arguments.ElementAtOrDefault(1)); + var send = commands is null ? null : CommandsToSubstitution(commands, _ => string.Empty); + if (!double.TryParse(arguments.ElementAtOrDefault(2), NumberStyles.Float, CultureInfo.InvariantCulture, out var seconds) + || seconds is < 0.1 or > 86400) + { + result.Skip("timer", name, "its interval is not between a tenth of a second and a day"); + return; + } + + if (string.IsNullOrEmpty(send)) + { + result.Skip("timer", name, send is null ? "it runs TinTin commands (#…), which are not run here" : "it sends nothing"); + return; + } + + result.Set.Timers.Add(new TimerDefinition + { + Name = name, + IntervalSeconds = seconds, + Command = send.Replace("$$", "$", StringComparison.Ordinal), + }); + } +} diff --git a/src/SharpMUTerm.Tui/DemoImport.cs b/src/SharpMUTerm.Tui/DemoImport.cs new file mode 100644 index 00000000..fb012ba2 --- /dev/null +++ b/src/SharpMUTerm.Tui/DemoImport.cs @@ -0,0 +1,45 @@ +namespace SharpMUTerm.Tui; + +/// +/// A MUSHclient world file the demo's import-review view reads, written for this client (no third-party file): +/// one world with a player and a password, rules that import, and rules that cannot — a script function, a send to a +/// script, a time-of-day timer, a command-line macro and a plugin — so the review shows each of its sections. +/// +internal static class DemoImport +{ + internal const string MushclientName = "Northwind.mcl"; + + internal const string Mushclient = """ + + + + + + page %1=Away, back soon. + eat bread + + emote nods. + UpdateGauge("%1") + + + get %1 + give %1 to Wren + wake + stand + + + look + say midnight + + + score + say + + + north + south + + + + """; +} diff --git a/src/SharpMUTerm.Tui/Hosting/ClientHost.cs b/src/SharpMUTerm.Tui/Hosting/ClientHost.cs index 3315ce2a..35b28501 100644 --- a/src/SharpMUTerm.Tui/Hosting/ClientHost.cs +++ b/src/SharpMUTerm.Tui/Hosting/ClientHost.cs @@ -154,6 +154,12 @@ internal sealed record ClientHost /// public required IAttention? Attention { get; init; } + /// + /// The desktop's file picker, for an import from another client (), or null where there is + /// none: the terminal (a path is typed after /import), the snapshot, the tests and --plain. + /// + public required IFilePicker? FilePicker { get; init; } + /// /// Whether the terminal driver's input path can decode a focus report. Not on Windows: the Windows branch of /// NetConsoleDriver is a Console.ReadKey loop with its own reassembly, and an ESC [ I @@ -199,6 +205,7 @@ public static ClientHost Terminal(TerminalCapabilities capabilities) Title = new TerminalTitle(driver), FloatingPanels = null, Attention = new TerminalAttention(driver, TerminalAttention.Detect()), + FilePicker = null, }; /// @@ -229,6 +236,7 @@ public static ClientHost Terminal(TerminalCapabilities capabilities) Title = null, FloatingPanels = null, Attention = null, + FilePicker = null, }; /// diff --git a/src/SharpMUTerm.Tui/Hosting/IFilePicker.cs b/src/SharpMUTerm.Tui/Hosting/IFilePicker.cs new file mode 100644 index 00000000..a3fb7819 --- /dev/null +++ b/src/SharpMUTerm.Tui/Hosting/IFilePicker.cs @@ -0,0 +1,17 @@ +namespace SharpMUTerm.Tui; + +/// +/// A host that can ask the player for a file with the desktop's own picker (the window). The terminal has none — a +/// path is typed after /import there — and neither have the snapshot, the tests and --plain. +/// +internal interface IFilePicker +{ + /// Whether the picker can be shown now (false until the window that owns it exists). Read on the client's thread. + bool Available { get; } + + /// + /// Shows the picker titled ; is told the local path chosen, or null + /// when the player cancelled, from the host's thread (the client marshals). Called on the client's thread. + /// + void Pick(string title, Action picked); +} diff --git a/src/SharpMUTerm.Tui/ImportReview.cs b/src/SharpMUTerm.Tui/ImportReview.cs new file mode 100644 index 00000000..3537394e --- /dev/null +++ b/src/SharpMUTerm.Tui/ImportReview.cs @@ -0,0 +1,108 @@ +using SharpMUTerm.Client.Modals; +using static SharpMUTerm.Tui.MarkupText; + +namespace SharpMUTerm.Tui; + +/// +/// The import review in cells: what can act as the player, what will be added, what was left out and why, the passwords +/// question, and the keys. Drawn from , the model the window's native review draws. The +/// number of lines does not change when the passwords are switched, so the modal sized when it opened still fits. +/// +internal static class ImportReview +{ + /// The width the review asks for. + internal const int PreferredWidth = 84; + + internal static List Render(ImportReviewModel model, int width) + { + ArgumentNullException.ThrowIfNull(model); + width = Math.Max(30, width); + var lines = new List { $"[bold {ScreenPalette.Value}]{Escape(model.Title)}[/]" }; + lines.AddRange(HelpSurface.Wrap(model.Intro, width - 1).Select(Label)); + + if (model.Empty) + { + lines.Add(string.Empty); + lines.Add(Label("There is nothing in it this client can import.")); + } + else + { + lines.Add(string.Empty); + lines.Add(Heading(ImportReviewModel.ActsHeading)); + if (model.ActsAsYou.Count == 0) + { + lines.Add(" " + Label("nothing: no rule in it sends a command")); + } + + foreach (var act in model.ActsAsYou) + { + lines.AddRange(Indented($"[{ScreenPalette.Caution}]•[/] ", act, width, Value)); + } + + lines.Add(string.Empty); + lines.Add(Heading(ImportReviewModel.AddsHeading)); + foreach (var row in model.Adds) + { + lines.AddRange(Indented($"[{ScreenPalette.Accent}]{Escape(row.Kind.PadRight(5))}[/] [bold {ScreenPalette.Value}]{Escape(Clip(row.Name))}[/] ", row.Detail, width, Label)); + } + } + + if (model.LeftOutCount > 0) + { + lines.Add(string.Empty); + lines.Add(Heading($"{ImportReviewModel.LeftOutHeading} ({model.LeftOutCount})")); + foreach (var row in model.LeftOut) + { + lines.AddRange(Indented($"[{ScreenPalette.Muted}]{Escape(row.Kind.PadRight(7))}[/] {Value(Clip(row.Name))} ", "— " + row.Detail, width, Label)); + } + + if (model.MoreLeftOut is { } more) + { + lines.Add(" " + Label(more)); + } + } + + if (model.PasswordLine is { } passwords) + { + lines.Add(string.Empty); + var mark = model.StorePasswords ? $"[{ScreenPalette.Accent}]●[/] " : $"[{ScreenPalette.Label}]○[/] "; + lines.AddRange(Indented(mark, passwords, width, Value, indent: 0)); + } + + lines.Add(string.Empty); + lines.Add(Keys(model.Empty ? "Esc close" : model.Keys)); + return lines; + } + + private static string Clip(string text) => text.Length > 32 ? text[..31] + "…" : text; + + private static string Heading(string text) => $"[bold {ScreenPalette.Accent}]{Escape(text)}[/]"; + + private static string Label(string text) => $"[{ScreenPalette.Label}]{Escape(text)}[/]"; + + private static string Value(string text) => $"[{ScreenPalette.Value}]{Escape(text)}[/]"; + + /// A lead and text wrapped under it, the continuation rows indented past the lead. + private static IEnumerable Indented(string lead, string text, int width, Func style, int indent = 2) + { + var leadWidth = VisibleLength(lead) + indent; + var room = Math.Max(10, width - leadWidth - 1); + var wrapped = HelpSurface.Wrap(text, room).ToList(); + var pad = new string(' ', indent); + for (var i = 0; i < wrapped.Count; i++) + { + yield return i == 0 + ? pad + lead + style(wrapped[i]) + : new string(' ', leadWidth) + style(wrapped[i]); + } + } + + private static string Keys(string keys) => + string.Join(" ", keys.Split(" · ").Select(part => + { + var space = part.IndexOf(' ', StringComparison.Ordinal); + return space < 0 + ? Label(part) + : $"[{ScreenPalette.Accent}]{Escape(part[..space])}[/] {Label(part[(space + 1)..])}"; + })); +} diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Surfaces.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Surfaces.cs index c3e5ce81..f9ebcfe3 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Surfaces.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Surfaces.cs @@ -35,6 +35,7 @@ private T Drawing(string surface, string key, T model) : surface == SurfaceCatalog.Welcome ? (_welcomeView.IsOpen ? _welcome?.Model : null) : surface == SurfaceCatalog.Help ? CellHelp?.Model : surface == SurfaceCatalog.Dictionary ? (_helpView.IsOpen && _helpView.Mode == "dictionary" ? _dictionaryOffer : null) + : surface == SurfaceCatalog.Import ? (_helpView.IsOpen && _helpView.Mode == "import" ? _pendingImport?.Model : null) : _drawnModels.TryGetValue((surface, key), out var model) ? model : null; /// A click on a header link, as the header's own handler receives it. diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Import.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Import.cs new file mode 100644 index 00000000..b2ed1831 --- /dev/null +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Import.cs @@ -0,0 +1,338 @@ +using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Client.Modals; +using SharpMUTerm.Client.Surfaces; +using SharpMUTerm.Core.Accessibility; +using SharpMUTerm.Core.Diagnostics; +using SharpMUTerm.Core.Import; + +namespace SharpMUTerm.Tui; + +/// +/// Import from another client (/import <path>, ⌃P ▸ Import from another client…, the welcome's +/// Import row): MUSHclient, Mudlet and TinTin++ setups read by Core's bounded readers +/// (), planned against the configuration (), and shown as one review +/// () — a cell modal here, a native one in a host that has them. +/// +/// The review is the consent. Nothing is written until ⏎ (or the window's Import), which both end in +/// . Nothing is overwritten: the automation is a new set, an existing world only gains +/// characters it lacks, and a clashing name gets a suffix. Passwords the file held are stored only if the player +/// switches them on in the review, and then through like every password (the OS +/// credential store, else secrets.json). Script code of every kind is listed as left out and never run. +/// +/// +internal sealed partial class SharpMUTermApp +{ + /// The review waiting for ⏎: the plan, whether its passwords are to be stored, and the model shown. + private (ImportPlan Plan, bool StorePasswords, ImportReviewModel Model)? _pendingImport; + + /// Whether the waiting review was said as lines (--plain), so /import yes may answer it. + private bool _importSaid; + + /// Whether the import review is open, in cells or natively. + internal bool ImportReviewOpen => + (_helpView.IsOpen && _helpView.Mode == "import") || NativeModalOf(SurfaceCatalog.Import) is not null; + + /// The review waiting, for the tests. + internal ImportReviewModel? PendingImport => _pendingImport?.Model; + + /// The native review's session while one is open, for the tests. + internal ImportReviewSession? NativeImportReview => _nativeModal as ImportReviewSession; + + /// + /// /import: with a path, reads it and opens the review; alone, starts an import the way ⌃P does. /import + /// yes, /import no and /import passwords answer a review said as lines, where no modal is drawn. + /// + private void ImportCommand(string argument) + { + var word = argument.Trim(); + if (_importSaid && _pendingImport is not null) + { + switch (word.ToLowerInvariant()) + { + case "yes": + AcceptImport(); + return; + case "no": + _pendingImport = null; + _importSaid = false; + Notice("Import cancelled; nothing was written", MessageSeverity.Info, source: NoticeModel.Sources.Import); + return; + case "passwords": + ToggleImportPasswords(); + return; + } + } + + if (word.Length == 0) + { + StartImport(); + return; + } + + ImportFrom(word); + } + + /// + /// ⌃P ▸ Import and the welcome's row: the desktop's file picker where the host has one, else /import on the + /// command line with a notice saying what path it wants. + /// + internal void StartImport() + { + if (Host.FilePicker is { Available: true } picker) + { + picker.Pick("Import from another client", path => OnUiThread(() => + { + if (path is not null) + { + ImportFrom(path); + } + })); + return; + } + + ActiveBar().SetAndNotify("/import "); + Notice( + $"Type the path to a setup from {ImportFormats.Listed} (a .mcl world, a Mudlet profile folder or save, a TinTin++ script), then Enter", + MessageSeverity.Info, + source: NoticeModel.Sources.Import); + } + + /// Reads and opens its review, or says why it cannot be imported. Writes nothing. + internal void ImportFrom(string path) + { + path = path.Trim().Trim('"', '\''); + if (path.StartsWith('~')) + { + path = Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), path[1..].TrimStart('/', '\\')); + } + + var (result, problem) = ClientImport.Read(path); + if (result is null) + { + ImportRefused($"{Snippet(path)} was not imported: {problem}"); + return; + } + + ReviewImport(result); + } + + /// Opens the review for : one model whichever host draws it. Writes nothing. + internal void ReviewImport(ImportResult result) + { + ArgumentNullException.ThrowIfNull(result); + if (ImportReviewOpen) + { + CloseImportReview(); + } + + if (ComposerIsInTheWay("the import review") || (AnyOverlayOpen && Refuse($"close {OpenOverlayName()} first"))) + { + return; + } + + var plan = ImportPlan.For(_config, result); + var model = ImportReviewModel.From(plan); + _pendingImport = (plan, false, model); + _importSaid = false; + + if (!Host.ScreenIsSeen) + { + SayImport(model); + return; + } + + if (NativeModalsHost is { } native) + { + ImportReviewSession? session = null; + session = new ImportReviewSession( + model, + ThemeIsDark(), + () => OnUiThread(AcceptImport), + () => OnUiThread(ToggleImportPasswords), + () => OnUiThread(() => NativeModalClosed(session!))) + { + Theme = _theme.Clone(), + }; + ShowNativeModal(native, session); + return; + } + + _helpView.Open( + "import", + "Import", + width => ImportReview.Render(Drawing(SurfaceCatalog.Import, string.Empty, _pendingImport?.Model ?? model), width), + key => + { + if (key.Key == ConsoleKey.Enter) + { + // Accepted before the overlay closes, so its closing finds nothing waiting to cancel. + if (!(_pendingImport?.Model.Empty ?? true)) + { + AcceptImport(); + } + + return false; + } + + if (key.Key == ConsoleKey.P && key.Modifiers == 0) + { + ToggleImportPasswords(); + } + + return true; + }, + width: ImportReview.PreferredWidth, + closed: () => _pendingImport = null); + } + + /// + /// The consent, from either host: writes the waiting import and saves. Planned again first; if the configuration + /// changed while the review was open (a world added on F5), the review is shown again rather than writing something + /// the player did not see. + /// + internal void AcceptImport() + { + if (_pendingImport is not { } pending) + { + ImportRefused("no import is waiting for an answer"); + return; + } + + _importSaid = false; + var fresh = ImportPlan.For(_config, pending.Plan.Result); + if (!fresh.SameAs(pending.Plan)) + { + ImportRefused("your setup changed while the review was open; nothing was written — check the review again"); + ReviewImport(pending.Plan.Result); + return; + } + + if (pending.Model.Empty) + { + _pendingImport = null; + ImportRefused("there was nothing to import"); + return; + } + + _pendingImport = null; + var applied = fresh.Apply(_config, pending.StorePasswords); + SaveConfiguration(); + + var parts = new List(); + if (applied.Worlds > 0) + { + parts.Add(ImportReviewModel.Count(applied.Worlds, "world")); + } + + if (applied.Characters > 0) + { + parts.Add(ImportReviewModel.Count(applied.Characters, "character")); + } + + if (applied.SetName is { } set) + { + parts.Add($"{ImportReviewModel.Count(applied.Rules, "rule")} in {set}"); + } + + if (applied.PasswordsStored > 0) + { + parts.Add(ImportReviewModel.Count(applied.PasswordsStored, "password") + " stored"); + } + + Notice( + $"Imported {string.Join(", ", parts)} from {pending.Model.Format} · F5 lists worlds, F2 triggers", + MessageSeverity.Info, + source: NoticeModel.Sources.Import); + } + + /// Switches whether the waiting review stores the file's passwords, and redraws it in whichever host shows it. + internal void ToggleImportPasswords() + { + if (_pendingImport is not { } pending || pending.Plan.PasswordCount == 0) + { + return; + } + + var store = !pending.StorePasswords; + var model = ImportReviewModel.From(pending.Plan, store); + _pendingImport = (pending.Plan, store, model); + if (NativeImportReview is { } native) + { + native.Publish(model); + } + else if (_helpView.IsOpen && _helpView.Mode == "import") + { + _helpView.Repaint(); + } + else if (_importSaid) + { + SayImportLine(model.PasswordLine ?? string.Empty); + } + } + + /// Feeds a key to the cell review, as the window's own handler would. + internal void SimulateImportKey(ConsoleKeyInfo key) => _helpView.SimulateKey(key); + + /// What the cell review shows, for a test. + internal IReadOnlyList ImportReviewLines => _helpView.Mode == "import" ? _helpView.Lines : []; + + private void CloseImportReview() + { + if (NativeModalOf(SurfaceCatalog.Import) is { } native) + { + CloseNativeModal(native); + } + + if (_helpView.IsOpen && _helpView.Mode == "import") + { + _helpView.Close(); + } + } + + private void ImportRefused(string reason) => + Notice(reason, MessageSeverity.Warning, source: NoticeModel.Sources.Import); + + /// The review said as lines, for a host with no screen to read, ending in the commands that answer it. + private void SayImport(ImportReviewModel model) + { + _importSaid = true; + SayImportLine(model.Title + ". " + model.Intro); + foreach (var act in model.ActsAsYou) + { + SayImportLine(ImportReviewModel.ActsHeading.ToLowerInvariant() + ": " + act); + } + + foreach (var row in model.Adds) + { + SayImportLine($"adds {row.Kind} {row.Name}: {row.Detail}"); + } + + foreach (var row in model.LeftOut) + { + SayImportLine($"left out {row.Kind} {row.Name}: {row.Detail}"); + } + + if (model.MoreLeftOut is { } more) + { + SayImportLine("left out " + more); + } + + if (model.PasswordLine is { } passwords) + { + SayImportLine(passwords + " Type /import passwords to switch."); + } + + SayImportLine(model.Empty ? "There is nothing in it to import." : "Type /import yes to import it, or /import no."); + } + + private void SayImportLine(string line) + { + if (line.Length == 0) + { + return; + } + + AppendWindowLine(ActiveWindowId(), $"[dim]*** {MarkupText.Escape(line)}[/]"); + Host.Announcer?.Announce(line, AnnouncementKind.Notice); + } +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Welcome.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Welcome.cs index f14e5533..a74f416e 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Welcome.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Welcome.cs @@ -160,6 +160,11 @@ private bool RunWelcomeAction(WelcomeSurface welcome, WelcomeAction action) return false; + case WelcomeAction.Import: + CloseWelcome(); + StartImport(); + return false; + case WelcomeAction.Connect when welcome.Request is { } request: CloseWelcome(); ConnectFromWelcome(request); diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index aac90e75..adedb1b0 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -1895,6 +1895,14 @@ public string RenderSnapshot(string? view = null) DispatchCommand(SharpMUTerm.Client.Commands.BuiltInCommands.DictionaryCommand); } + // The review of an import from another client, over a MUSHclient world file the demo carries: what can act as + // the player, what it adds, what it leaves out (a script function, a plugin, a time-of-day timer), and the + // password it holds, not stored. + if (string.Equals(view, "import-review", StringComparison.OrdinalIgnoreCase)) + { + ReviewImport(SharpMUTerm.Core.Import.ClientImport.Parse(DemoImport.Mushclient, DemoImport.MushclientName).Result!); + } + // A pane narrower than its game wraps, recorded through the writer the live size report uses: ⌃P suggests // joining the world's wraps; `join-wraps-f5` is F5 recommending it beside the setting. if (string.Equals(view, "join-wraps", StringComparison.OrdinalIgnoreCase) @@ -5164,6 +5172,14 @@ private void OnCommandEntered(InputBar bar, string command) return; } + // `/import ` reads another client's setup and opens its review; nothing is written before ⏎. + if (command.StartsWith("/import", StringComparison.OrdinalIgnoreCase) + && (command.Length == 7 || command[7] == ' ')) + { + ImportCommand(command[7..]); + return; + } + // `/package` opens the Packages screen; `/package install …` reads one for review. if (command.StartsWith("/package", StringComparison.OrdinalIgnoreCase) && (command.Length == 8 || command[8] == ' ')) @@ -5750,7 +5766,7 @@ private string OpenOverlayName() => : _search.IsOpen ? "the search surface" : _prefixPanel.IsOpen ? "the pane keys panel" : _welcomeView.IsOpen ? "the welcome" - : _helpView.IsOpen ? (_helpView.Mode == "dictionary" ? "the dictionary offer" : "help") + : _helpView.IsOpen ? (_helpView.Mode switch { "dictionary" => "the dictionary offer", "import" => "the import review", _ => "help" }) : "what is open"; /// Whether either bar is holding unsent text — what the ✎ tab marker means. @@ -8886,6 +8902,9 @@ private bool RunBuiltInCommand(string id) case "term:welcome": ShowWelcome(); return true; + case SharpMUTerm.Client.Commands.BuiltInCommands.ImportCommand: + StartImport(); + return true; case "term:tour": ToggleKeyTour(); return true; diff --git a/src/SharpMUTerm.Tui/SnapshotViews.cs b/src/SharpMUTerm.Tui/SnapshotViews.cs index 0d3c5a09..ff1eb8bd 100644 --- a/src/SharpMUTerm.Tui/SnapshotViews.cs +++ b/src/SharpMUTerm.Tui/SnapshotViews.cs @@ -28,6 +28,6 @@ internal static class SnapshotViews "collapsed", "timestamps", "timestamps-toggled", "theme-switched", "rail-keys", "prompt", "meters", "gamedata", "map", "map-walking", "map-split", "packages", "package-review", "package-browse", "send-menu", "layouts", "layout-combat", "layout-roleplay", "panel-who", "panel-vitals", "panel-quickbar", "panel-composer", - "welcome", "welcome-connect", "tour", "reconnect", "help", "help-topic", "dictionary-offer", "join-wraps", "join-wraps-f5", + "welcome", "welcome-connect", "tour", "reconnect", "help", "help-topic", "dictionary-offer", "import-review", "join-wraps", "join-wraps-f5", ]; } diff --git a/src/SharpMUTerm.Tui/WelcomeSurface.cs b/src/SharpMUTerm.Tui/WelcomeSurface.cs index accf42b8..a59f6e5b 100644 --- a/src/SharpMUTerm.Tui/WelcomeSurface.cs +++ b/src/SharpMUTerm.Tui/WelcomeSurface.cs @@ -18,6 +18,9 @@ internal enum WelcomeAction /// Close, and open F5. Settings, + + /// Close, and start an import from another client. + Import, } /// What the connect form asks for, read once ⏎ has checked it. @@ -162,7 +165,7 @@ private WelcomeAction MenuKey(ConsoleKeyInfo key) Problem = null; return WelcomeAction.Redraw; case ConsoleKey.DownArrow: - Selected = (WelcomeChoice)Math.Min((int)WelcomeChoice.Settings, (int)Selected + 1); + Selected = (WelcomeChoice)Math.Min((int)WelcomeChoice.Import, (int)Selected + 1); Problem = null; return WelcomeAction.Redraw; case ConsoleKey.LeftArrow: @@ -184,6 +187,8 @@ private WelcomeAction MenuKey(ConsoleKeyInfo key) return WelcomeAction.Redraw; case WelcomeChoice.Browse: return WelcomeAction.Browse; + case WelcomeChoice.Import: + return WelcomeAction.Import; default: return WelcomeAction.Settings; } @@ -432,6 +437,7 @@ public static IReadOnlyList PlainLines(WelcomeLayout layout, string? ind indexProblem is null ? "To browse worlds from the package index, type /package browse" : "Browsing worlds is not available: " + indexProblem, + "To import worlds and automation from MUSHclient, Mudlet or TinTin++, type /import and the path to the file", "Starting layout: " + (layout == WelcomeLayout.Suggested ? "suggested from what the game sends" : layout.ToString()) + ". Type /welcome layout roleplay, combat or suggested to change it.", "Type /welcome to hear this again.", diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativeModalTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativeModalTests.cs index 9ab00c43..3a612c38 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/NativeModalTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/NativeModalTests.cs @@ -250,4 +250,37 @@ public async Task YInTheNativePromptQuitsAndTabMovesTheChoice() await Assert.That(afterTab).IsEqualTo(QuitChoice.Quit); await Assert.That(exited).IsTrue(); } + + /// + /// The import review in the window: the card shows what can act as the player, the check box stores the file's + /// password through the client, and Import writes the world, character and set — nothing before it. + /// + [Test] + public async Task TheImportReviewWritesNothingUntilImport_AndItsCheckBoxStoresThePassword() + { + var (body, boxShown, worldsBefore, stored, worlds, focused) = await Run(rig => + { + rig.App.RenderSnapshot("import-review"); + DesktopLayerTests.Drain(); + var view = (ImportReviewView)rig.Driver.Modals.Modal!.View; + var before = rig.App.Configuration.Worlds.Count; + var body = view.BodyText.ToArray(); + var focused = view.ImportButton.IsFocused; + view.PasswordsBox.IsChecked = true; + DesktopLayerTests.Drain(); + var stored = rig.App.PendingImport!.StorePasswords; + view.ImportButton.RaiseEvent(new RoutedEventArgs(Button.ClickEvent)); + DesktopLayerTests.Drain(); + var wren = rig.App.Configuration.Worlds.SelectMany(w => w.Characters).Single(c => c.Name == "Wren"); + return (body, view.PasswordsBox.IsVisible, before, stored && wren.Password == "not-a-real-one", rig.App.Configuration.Worlds.Count - before, focused); + }); + + await Assert.That(body).Contains(t => t.StartsWith("WHAT CAN ACT AS YOU", StringComparison.OrdinalIgnoreCase)); + await Assert.That(body).Contains(t => t.Contains("Northwind", StringComparison.Ordinal)); + await Assert.That(boxShown).IsTrue(); + await Assert.That(focused).IsTrue(); + await Assert.That(stored).IsTrue(); + await Assert.That(worlds).IsEqualTo(1); + await Assert.That(worldsBefore).IsGreaterThan(0).Because("the demo has worlds of its own, which the import leaves alone"); + } } diff --git a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs index 5fb69eba..49548e4f 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs @@ -258,6 +258,7 @@ await Assert.That(Rows(palette.Session!.View(query))).IsEquivalentTo(Rows(drawn! (SurfaceCatalog.Welcome, "welcome-connect"), (SurfaceCatalog.Help, "help"), (SurfaceCatalog.Dictionary, "dictionary-offer"), + (SurfaceCatalog.Import, "import-review"), }) { using var nativeDriver = new AvaloniaConsoleDriver(140, 36); @@ -713,6 +714,25 @@ await SameModal("dictionary: download", "dictionary-offer", app => app.SimulateHelpKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false))); probed.Add(SurfaceCatalog.Dictionary); + // The import review: Import writes the same world, character and set as the cells' Enter; with the passwords + // switched on first (the window's check box, the cells' p), the password is stored on the character in both. + await SameModal("import: accept", "import-review", + (app, m) => ((ImportReviewSession)m.Open(SurfaceCatalog.Import)!).Accept(), + app => app.SimulateImportKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false))); + await SameModal("import: passwords, then accept", "import-review", + (app, m) => + { + var review = (ImportReviewSession)m.Open(SurfaceCatalog.Import)!; + review.TogglePasswords(); + review.Accept(); + }, + app => + { + app.SimulateImportKey(new ConsoleKeyInfo('p', ConsoleKey.P, false, false, false)); + app.SimulateImportKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false)); + }); + probed.Add(SurfaceCatalog.Import); + var acting = SurfaceCatalog.All.Where(s => s.HasNative && s.Actions.Count > 0).Select(s => s.Id); // The tab overflow chip: an entry chosen from the window's menu and the same digit in the cell list bring the same // hidden tab forward. @@ -962,6 +982,7 @@ private static void HelpKeysTo(SharpMUTermApp app, Func match) WelcomeSession welcome => welcome.Model, HelpSession help => help.Model, DictionaryOfferSession offer => offer.Model, + ImportReviewSession import => import.Model, _ => throw new ArgumentException(session.GetType().Name), }; @@ -983,6 +1004,8 @@ private static string Outcome(SharpMUTermApp app) => string.Join( "layout=" + app.LiveLayoutId, "welcome=" + app.WelcomeIsOpen, "help=" + app.HelpIsOpen + "/" + app.DictionaryOfferOpen, + "import=" + app.ImportReviewOpen + " " + string.Join(",", app.Configuration.TriggerSets.Select(s => s.Name + ":" + s.Triggers.Count)) + + " " + string.Join(",", app.Configuration.Worlds.SelectMany(w => w.Characters).Select(c => c.Name + (c.Password is null ? string.Empty : "*"))), "quick=" + app.LastQuickMacro, "walk=" + app.WalkState, "rail=" + (app.BuildChromeOverlay().Sidebar.Collapsed ? "folded" : "open"), diff --git a/tests/SharpMUTerm.Client.Tests/ImportReviewModelTests.cs b/tests/SharpMUTerm.Client.Tests/ImportReviewModelTests.cs new file mode 100644 index 00000000..36980965 --- /dev/null +++ b/tests/SharpMUTerm.Client.Tests/ImportReviewModelTests.cs @@ -0,0 +1,96 @@ +using SharpMUTerm.Client.Modals; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Import; + +namespace SharpMUTerm.Client.Tests; + +/// +/// The import review (): what it says about an import before anything is written, built +/// from the plan both hosts draw. +/// +public class ImportReviewModelTests +{ + private const string World = """ + + + + page %1=away + + f() + + get %1 + + """; + + private static ImportPlan Plan(AppConfiguration? config = null) => + ImportPlan.For(config ?? new AppConfiguration(), MushclientImport.Parse(World, "Northwind.mcl").Result!); + + [Test] + public async Task TheReviewLeadsWithWhatCanActAsThePlayer_AndSaysWhatItAddsAndLeavesOut() + { + var model = ImportReviewModel.From(Plan()); + + await Assert.That(model.Title).IsEqualTo("Import from MUSHclient"); + await Assert.That(model.Intro).Contains("Northwind.mcl"); + await Assert.That(model.Intro).Contains("Nothing is written until you press Enter"); + await Assert.That(model.ActsAsYou.ToArray()).IsEquivalentTo(new[] + { + "1 trigger sends a command when a line matches", + "1 alias turns what you type into other commands", + }); + await Assert.That(model.Adds.Select(r => r.Kind + ":" + r.Name).ToArray()).IsEquivalentTo(new[] { "world:Northwind", "set:Imported from MUSHclient" }); + await Assert.That(model.Adds[0].Detail).IsEqualTo("new world, northwind.example.org:4201, character Wren"); + await Assert.That(model.Adds[1].Detail).IsEqualTo("2 triggers, 1 alias · new set, listed on Wren"); + await Assert.That(model.LeftOutCount).IsEqualTo(1); + await Assert.That(model.LeftOut.Single().Detail).Contains("script"); + } + + [Test] + public async Task PasswordsAreNamedAndNotStoredUntilSwitchedOn() + { + var plan = Plan(); + var off = ImportReviewModel.From(plan); + var on = ImportReviewModel.From(plan, storePasswords: true); + + await Assert.That(off.Passwords).IsEqualTo(1); + await Assert.That(off.StorePasswords).IsFalse(); + await Assert.That(off.PasswordLine).Contains("will not be stored"); + await Assert.That(on.PasswordLine).Contains("will be stored"); + await Assert.That(off.Keys).Contains("p passwords"); + await Assert.That(off).IsNotEqualTo(on); + await Assert.That(ImportReviewModel.From(plan)).IsEqualTo(off).Because("two reviews of one plan are the same review"); + } + + [Test] + public async Task AKnownWorldSaysItOnlyGainsCharacters() + { + var config = new AppConfiguration + { + Worlds = { new WorldDefinition { Name = "Mine", Host = "northwind.example.org", Port = 4201, Characters = { new CharacterDefinition { Name = "Wren" } } } }, + }; + var model = ImportReviewModel.From(Plan(config)); + + await Assert.That(model.Adds[0].Detail).Contains("already configured"); + await Assert.That(model.Adds[0].Detail).Contains("keeps your Wren as is"); + await Assert.That(model.Adds[1].Detail).Contains("listed on no character yet"); + await Assert.That(model.Passwords).IsEqualTo(0).Because("a password is only ever stored for a character the import adds"); + await Assert.That(model.Keys).DoesNotContain("passwords"); + } + + [Test] + public async Task TheSessionPassesGesturesOnUntilItEnds() + { + var accepted = 0; + var toggled = 0; + var closed = 0; + var session = new ImportReviewSession(ImportReviewModel.From(Plan()), true, () => accepted++, () => toggled++, () => closed++); + + session.TogglePasswords(); + session.Accept(); + session.Accept(); + session.TogglePasswords(); + + await Assert.That((accepted, toggled, closed)).IsEqualTo((1, 1, 1)); + await Assert.That(session.Surface).IsEqualTo(Surfaces.SurfaceCatalog.Import); + } +} diff --git a/tests/SharpMUTerm.Core.Tests/Import/ClientImportTests.cs b/tests/SharpMUTerm.Core.Tests/Import/ClientImportTests.cs new file mode 100644 index 00000000..876f9af5 --- /dev/null +++ b/tests/SharpMUTerm.Core.Tests/Import/ClientImportTests.cs @@ -0,0 +1,540 @@ +using System.IO.Compression; +using System.Text; +using SharpMUTerm.Core.Automation; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Import; + +namespace SharpMUTerm.Core.Tests.Import; + +/// +/// The readers for other clients' setups (, , +/// ), over fixtures written here. What they map, what they leave out and say so, and the +/// bounds an untrusted file is held to. +/// +public class ClientImportTests +{ + private const string Mushclient = """ + + + + + + page %1=Away, back soon. Costs $5. + say I am %1 + + UpdateGauge("%1") + nod + x + + + get %1 + give %1 to Wren + DoScore() + + + look + say midnight + + + score + say + up + + + north + south + up + + + + + """; + + private static ImportResult Read(string text, string source = "fixture") + { + var (result, problem) = ClientImport.Parse(text, source); + if (result is null) + { + throw new InvalidOperationException(problem); + } + + return result; + } + + private static Trigger Named(ImportResult result, string name) => result.Set.Triggers.Single(t => t.Name == name); + + [Test] + public async Task AMushclientWorldBringsItsWorldAndPlayer_AndHoldsThePasswordApart() + { + var result = Read(Mushclient, "Northwind.mcl"); + + await Assert.That(result.Format).IsEqualTo(ImportFormat.MushClient); + var world = result.Worlds.Single(); + await Assert.That(world.Name).IsEqualTo("Northwind"); + await Assert.That(world.Host).IsEqualTo("northwind.example.org"); + await Assert.That(world.Port).IsEqualTo(4201); + await Assert.That(world.Characters.Single().Name).IsEqualTo("Wren"); + await Assert.That(world.Characters.Single().Password).IsNull().Because("a password is never put on a character by the reader"); + await Assert.That(result.Passwords.Single().Password).IsEqualTo("s3cret"); + await Assert.That(result.Passwords.Single().ToString()).DoesNotContain("s3cret"); + } + + [Test] + public async Task AMushclientWildcardMatchesTheWholeLine_AndItsSendTakesTheCapture() + { + var result = Read(Mushclient); + var page = Named(result, "* pages: *"); + + await Assert.That(page.MatchType).IsEqualTo(TriggerMatchType.Wildcard).Because("starting and ending in * already means anywhere"); + await Assert.That(page.CaseSensitive).IsTrue(); + var match = page.Regex.Match("Ann pages: hello"); + await Assert.That(match.Success).IsTrue(); + await Assert.That(match.Result(page.Actions.SendResponse!)).IsEqualTo("page Ann=Away, back soon. Costs $5."); + await Assert.That(page.Regex.IsMatch("Then Ann pages: hello")).IsTrue().Because("* at the start swallows the lead"); + await Assert.That(Named(result, "* pages: *").Regex.IsMatch("nobody paged")).IsFalse(); + } + + [Test] + public async Task AMushclientPatternWithoutStarsAtBothEndsIsAnchored() + { + var result = Read("""eat"""); + var hungry = result.Set.Triggers.Single(); + + await Assert.That(hungry.MatchType).IsEqualTo(TriggerMatchType.Regex); + await Assert.That(hungry.Regex.IsMatch("You are hungry.")).IsTrue(); + await Assert.That(hungry.Regex.IsMatch("You are hungry. Very.")).IsFalse(); + await Assert.That(hungry.Regex.IsMatch("Then You are hungry.")).IsFalse(); + } + + [Test] + public async Task AMushclientRegexKeepsItsFlags_AndRulesKeepTheirOrder() + { + var result = Read(Mushclient); + var hungry = Named(result, "^You are (\\w+)\\.$"); + + await Assert.That(hungry.Enabled).IsFalse(); + await Assert.That(hungry.CaseSensitive).IsFalse(); + await Assert.That(hungry.StopProcessing).IsFalse(); + await Assert.That(hungry.Regex.Match("you are HUNGRY.").Result(hungry.Actions.SendResponse!)).IsEqualTo("say I am HUNGRY"); + await Assert.That(result.Set.Triggers[0].Name).IsEqualTo(hungry.Name).Because("sequence 100 comes before 200"); + } + + [Test] + public async Task AStarredMushclientPatternIsThisClientsWildcard_AndAnOmitIsAGag() + { + var result = Read(Mushclient); + var arrived = Named(result, "*has arrived*"); + + await Assert.That(arrived.MatchType).IsEqualTo(TriggerMatchType.Wildcard); + await Assert.That(arrived.Actions.Gag).IsTrue(); + await Assert.That(arrived.Actions.SendResponse).IsNull(); + await Assert.That(arrived.Regex.IsMatch("Ann has arrived from the north.")).IsTrue(); + } + + [Test] + public async Task ScriptsAndPluginsAreListedAndNeverImported() + { + var result = Read(Mushclient); + + await Assert.That(result.Set.Triggers.Any(t => t.Name.StartsWith("Your health", StringComparison.Ordinal))).IsFalse(); + await Assert.That(result.Set.Triggers.Any(t => t.Actions.ScriptCallback is not null)).IsFalse(); + await Assert.That(result.Set.Aliases.Any(a => a.Name == "sc")).IsFalse(); + await Assert.That(Named(result, "* says *").Actions.SendResponse).IsEqualTo("nod").Because("the send is kept, the script function is not"); + var reasons = result.Skipped.Select(s => $"{s.Kind}:{s.Name}:{s.Reason}").ToArray(); + await Assert.That(reasons).Contains(r => r.StartsWith("trigger:Your health is *:it sends to a script", StringComparison.Ordinal)); + await Assert.That(reasons).Contains(r => r.StartsWith("part:* says *:its script function OnSay", StringComparison.Ordinal)); + await Assert.That(reasons).Contains(r => r.StartsWith("script:", StringComparison.Ordinal)); + await Assert.That(reasons).Contains(r => r.StartsWith("plugin:health_bar.xml", StringComparison.Ordinal)); + await Assert.That(reasons).Contains(r => r.StartsWith("trigger:[unclosed:its regular expression", StringComparison.Ordinal)); + } + + [Test] + public async Task MushclientAliasesTimersAndKeysMapWhereTheyCan() + { + var result = Read(Mushclient); + var alias = result.Set.Aliases.Single(); + + await Assert.That(alias.Regex.Match("gg sword").Result(alias.Substitution)).IsEqualTo("get sword\ngive sword to Wren"); + var timer = result.Set.Timers.Single(); + await Assert.That(timer.Name).IsEqualTo("idle"); + await Assert.That(timer.IntervalSeconds).IsEqualTo(90); + await Assert.That(timer.OneShot).IsTrue(); + await Assert.That(result.Set.Macros.Select(m => $"{m.Key}={m.Command}").ToArray()) + .IsEquivalentTo(new[] { "Ctrl+F2=score", "Num8=north", "Ctrl+Num2=south" }); + var skipped = result.Skipped.Select(s => s.Name).ToArray(); + await Assert.That(skipped).Contains("midnight"); + await Assert.That(skipped).Contains("F3"); + await Assert.That(skipped).Contains("up").Because("a named macro has no key here, and \"up\" is not the arrow"); + await Assert.That(skipped).Contains("keypad +"); + } + + [Test] + public async Task AFileNamingAnOutsideEntityExpandsNothing() + { + var hostile = """ + + ]> + + """; + var (result, _) = ClientImport.Parse(hostile, "x.mcl"); + + await Assert.That(result?.Worlds.SelectMany(w => new[] { w.Name, w.Host }).Any(t => t.Contains("root:", StringComparison.Ordinal)) ?? false).IsFalse(); + } + + [Test] + public async Task SomethingThatIsNoClientsSetupIsRefusedOutLoud() + { + var (result, problem) = ClientImport.Parse("just some notes\nnothing here", "notes.txt"); + + await Assert.That(result).IsNull(); + await Assert.That(problem).Contains("MUSHclient, Mudlet, TinTin++"); + var (old, oldProblem) = MushclientImport.Parse("\u0001\u0002binary muclient", "old.mcl"); + await Assert.That(old).IsNull(); + await Assert.That(oldProblem).Contains("not XML"); + } + + [Test] + public async Task ACommandTooLongIsLeftOut_NeverCutShort() + { + var text = $"""{new string('a', ImportLimits.MaxText + 1)}"""; + var result = Read(text); + + await Assert.That(result.Set.Aliases).IsEmpty(); + await Assert.That(result.Skipped.Single().Reason).Contains("too long"); + } + + [Test] + public async Task PastTheItemLimitRulesAreCountedNotImported() + { + var rules = string.Concat(Enumerable.Range(0, ImportLimits.MaxItems + 3).Select(i => $"""x""")); + var result = Read($"{rules}"); + + await Assert.That(result.Set.Aliases.Count).IsEqualTo(ImportLimits.MaxItems); + await Assert.That(result.SkippedCount).IsEqualTo(3); + } + + [Test] + public async Task ALargeFileIsRefusedBeforeItIsRead() + { + var path = Path.Combine(Path.GetTempPath(), "sharpmuterm-import-" + Guid.NewGuid().ToString("N") + ".mcl"); + try + { + using (var stream = File.Create(path)) + { + stream.SetLength(ImportLimits.MaxFileBytes + 1); + } + + var (result, problem) = ClientImport.Read(path); + await Assert.That(result).IsNull(); + await Assert.That(problem).Contains("too large"); + } + finally + { + File.Delete(path); + } + } + + // ── Mudlet ───────────────────────────────────────────────────────────────────────────────────── + + private const string Mudlet = """ + + + + + + Off folder + + + + + inside off + + wave + waves to you + 0 + + + + kinds + + bow + bowsGreetingsHi.^(\w+) curtsies$ + 0231 + + + lua only + + + ^(\w+) attacks you$ + 1 + + + both + + smile $1 + smiles + 0 + + + chain + + start + begin + 0 + linkxy0 + + + + kkill rat^k$ + + + ticklook + + + scorescore1677726567108864 + padnorth56536870912 + barex650 + + + + """; + + [Test] + public async Task AMudletPackageMapsItsPatternKinds_OneTriggerPerPattern() + { + var result = Read(Mudlet); + + await Assert.That(result.Format).IsEqualTo(ImportFormat.Mudlet); + await Assert.That(Named(result, "kinds (1)").MatchType).IsEqualTo(TriggerMatchType.Contains); + await Assert.That(Named(result, "kinds (2)").MatchType).IsEqualTo(TriggerMatchType.StartsWith); + var exact = Named(result, "kinds (3)"); + await Assert.That(exact.Regex.IsMatch("Hi.")).IsTrue(); + await Assert.That(exact.Regex.IsMatch("Hi!")).IsFalse(); + await Assert.That(exact.Regex.IsMatch("Hi. there")).IsFalse(); + await Assert.That(Named(result, "kinds (4)").MatchType).IsEqualTo(TriggerMatchType.Regex); + } + + [Test] + public async Task AMudletRuleInADisabledFolderComesInDisabled() + { + var result = Read(Mudlet); + + await Assert.That(Named(result, "inside off").Enabled).IsFalse(); + await Assert.That(Named(result, "kinds (1)").Enabled).IsTrue(); + } + + [Test] + public async Task MudletLuaIsNeverImported_AndACommandBesideItIsKept() + { + var result = Read(Mudlet); + + await Assert.That(result.Set.Triggers.Any(t => t.Name == "lua only")).IsFalse(); + var both = Named(result, "both"); + await Assert.That(both.Regex.Match("Ann smiles").Result(both.Actions.SendResponse!)).IsEqualTo("smile $1").Because("Mudlet sends its command as written"); + var reasons = result.Skipped.Select(s => $"{s.Kind}:{s.Name}:{s.Reason}").ToArray(); + await Assert.That(reasons).Contains(r => r.StartsWith("trigger:lua only:its action is Lua", StringComparison.Ordinal)); + await Assert.That(reasons).Contains(r => r.StartsWith("part:both:its Lua was left out", StringComparison.Ordinal)); + await Assert.That(reasons).Contains(r => r.StartsWith("script:helpers", StringComparison.Ordinal)); + await Assert.That(reasons).Contains(r => r.StartsWith("trigger:chain:it is a chain gating 1 rule", StringComparison.Ordinal)); + await Assert.That(result.Set.Triggers.Any(t => t.Name is "chain" or "link")).IsFalse(); + } + + [Test] + public async Task MudletAliasesTimersAndKeysMap() + { + var result = Read(Mudlet); + + await Assert.That(result.Set.Aliases.Single().Regex.IsMatch("k")).IsTrue(); + await Assert.That(result.Set.Timers.Single().IntervalSeconds).IsEqualTo(60.5); + await Assert.That(result.Set.Macros.Select(m => m.Key).ToArray()).IsEquivalentTo(new[] { "Ctrl+F2", "Num8" }); + await Assert.That(result.Skipped.Select(s => s.Name)).Contains("bare").Because("a bare letter is typing, not a key"); + } + + [Test] + public async Task AMudletProfileFolderBringsItsWorldFromTheFilesBesideTheSaves() + { + var folder = Directory.CreateTempSubdirectory("sharpmuterm-mudlet-"); + try + { + var profile = Directory.CreateDirectory(Path.Combine(folder.FullName, "Achaea")); + File.WriteAllText(Path.Combine(profile.FullName, "url"), "achaea.example.com\n"); + File.WriteAllText(Path.Combine(profile.FullName, "port"), "23"); + File.WriteAllText(Path.Combine(profile.FullName, "login"), "Ixia"); + File.WriteAllText(Path.Combine(profile.FullName, "password"), "pw"); + var current = Directory.CreateDirectory(Path.Combine(profile.FullName, "current")); + File.WriteAllText(Path.Combine(current.FullName, "01-01-2024#10-00-00.xml"), Mudlet); + + var (result, problem) = ClientImport.Read(profile.FullName); + + await Assert.That(problem).IsNull(); + var world = result!.Worlds.Single(); + await Assert.That(world.Name).IsEqualTo("Achaea"); + await Assert.That(world.Host).IsEqualTo("achaea.example.com"); + await Assert.That(world.Port).IsEqualTo(23); + await Assert.That(world.Characters.Single().Name).IsEqualTo("Ixia"); + await Assert.That(result.Passwords.Single().Password).IsEqualTo("pw"); + await Assert.That(result.Set.Triggers).IsNotEmpty(); + + var (fromSave, _) = ClientImport.Read(Path.Combine(current.FullName, "01-01-2024#10-00-00.xml")); + await Assert.That(fromSave!.Worlds.Single().Host).IsEqualTo("achaea.example.com").Because("a save inside current/ finds its profile"); + } + finally + { + folder.Delete(recursive: true); + } + } + + [Test] + public async Task AMudletPackageZipIsReadWithoutExtractingAnything() + { + using var buffer = new MemoryStream(); + using (var zip = new ZipArchive(buffer, ZipArchiveMode.Create, leaveOpen: true)) + { + using (var evil = zip.CreateEntry("../../evil.lua").Open()) + { + evil.Write(Encoding.UTF8.GetBytes("os.exit()")); + } + + using var writer = new StreamWriter(zip.CreateEntry("Pack/Pack.xml").Open()); + writer.Write(Mudlet); + } + + var (result, problem) = MudletImport.ReadZip(buffer.ToArray(), "Pack.mpackage"); + + await Assert.That(problem).IsNull(); + await Assert.That(result!.Set.Aliases.Single().Name).IsEqualTo("k"); + } + + // ── TinTin++ ─────────────────────────────────────────────────────────────────────────────────── + + private const string TinTin = """ + #nop A TinTin++ setup, written for this test. + #session {nw} {northwind.example.org} {4201} + #action {%1 tells you '%2'} {reply %2 to %1;smile} + #act {^You are hungry.$} {eat bread} + #action {%1 bonks you} {#showme ouch} + #alias {k} {kill %1;loot %0} + #alias {gt %1 %2} {give %2 to %1} + #ticker {idle} {look} {120} + #gag {^Ann has arrived} + #highlight {red} {danger} + #var hp 100 + """; + + [Test] + public async Task ATinTinScriptBringsItsSessionActionsAliasesTickersAndGags() + { + var result = Read(TinTin, "setup.tin"); + + await Assert.That(result.Format).IsEqualTo(ImportFormat.TinTin); + var world = result.Worlds.Single(); + await Assert.That((world.Name, world.Host, world.Port)).IsEqualTo(("nw", "northwind.example.org", 4201)); + + var tells = result.Set.Triggers.Single(t => t.Name.StartsWith("%1 tells", StringComparison.Ordinal)); + await Assert.That(tells.Regex.Match("Ann tells you 'hello there'").Result(tells.Actions.SendResponse!)).IsEqualTo("reply hello there to Ann\nsmile"); + + var hungry = result.Set.Triggers.Single(t => t.Name.StartsWith("^You are", StringComparison.Ordinal)); + await Assert.That(hungry.Regex.IsMatch("You are hungry.")).IsTrue(); + await Assert.That(hungry.Regex.IsMatch("Then You are hungry.")).IsFalse(); + await Assert.That(hungry.Regex.IsMatch("You are hungryX")).IsFalse(); + + var gag = result.Set.Triggers.Single(t => t.Actions.Gag); + await Assert.That(gag.Regex.IsMatch("Ann has arrived from the west.")).IsTrue(); + + var k = result.Set.Aliases.Single(a => a.Name == "k"); + await Assert.That(k.Regex.Match("k rat now").Result(k.Substitution)).IsEqualTo("kill rat\nloot rat now"); + var give = result.Set.Aliases.Single(a => a.Name.StartsWith("gt", StringComparison.Ordinal)); + await Assert.That(give.Regex.Match("gt Ann sword").Result(give.Substitution)).IsEqualTo("give sword to Ann"); + + await Assert.That(result.Set.Timers.Single().IntervalSeconds).IsEqualTo(120); + } + + [Test] + public async Task TinTinsOwnStatementsAreLeftOut_AndCounted() + { + var result = Read(TinTin); + + await Assert.That(result.Set.Triggers.Any(t => t.Name.Contains("bonks", StringComparison.Ordinal))).IsFalse(); + await Assert.That(result.Skipped.Select(s => s.Reason)).Contains(r => r.Contains("runs TinTin commands", StringComparison.Ordinal)); + var other = result.Skipped.Single(s => s.Kind == "command"); + await Assert.That(other.Name).IsEqualTo("3 other TinTin commands"); + await Assert.That(other.Reason).Contains("#highlight"); + } + + // ── The plan ─────────────────────────────────────────────────────────────────────────────────── + + private static AppConfiguration Existing() => new() + { + Worlds = + { + new WorldDefinition { Name = "Northwind", Host = "other.example.org", Port = 23 }, + new WorldDefinition + { + Name = "Home", + Host = "NORTHWIND.example.org", + Port = 4201, + Characters = { new CharacterDefinition { Name = "wren", ConnectString = "mine" } }, + }, + }, + TriggerSets = { new TriggerSet { Name = "Imported from MUSHclient" } }, + }; + + [Test] + public async Task APlanOverwritesNothing_ASetNameClashGetsASuffix_AndAKnownEndpointOnlyGainsCharacters() + { + var config = Existing(); + var text = Mushclient.Replace("player=\"Wren\"", "player=\"Wren\"", StringComparison.Ordinal); + var result = Read(text); + result.Worlds[0].Characters.Add(new CharacterDefinition { Name = "Ash" }); + var plan = ImportPlan.For(config, result); + + await Assert.That(plan.SetName).IsEqualTo("Imported from MUSHclient (2)"); + var world = plan.Worlds.Single(); + await Assert.That(world.Existing).IsTrue(); + await Assert.That(world.Name).IsEqualTo("Home"); + await Assert.That(world.NewCharacters.ToArray()).IsEquivalentTo(new[] { "Ash" }); + await Assert.That(world.KeptCharacters.ToArray()).IsEquivalentTo(new[] { "Wren" }); + await Assert.That(plan.PasswordCount).IsEqualTo(0).Because("Wren's password is for a character this import does not add"); + + var applied = plan.Apply(config, storePasswords: true); + + await Assert.That(config.TriggerSets.Count).IsEqualTo(2); + await Assert.That(config.TriggerSets[0].Triggers).IsEmpty().Because("the existing set is untouched"); + var home = config.Worlds.Single(w => w.Name == "Home"); + await Assert.That(home.Characters.Single(c => c.Name == "wren").ConnectString).IsEqualTo("mine"); + await Assert.That(home.Characters.Single(c => c.Name == "Ash").TriggerSets.Single()).IsEqualTo("Imported from MUSHclient (2)"); + await Assert.That(home.Characters.Single(c => c.Name == "wren").TriggerSets).IsEmpty(); + await Assert.That(applied.Worlds).IsEqualTo(0); + await Assert.That(applied.Characters).IsEqualTo(1); + } + + [Test] + public async Task ANewWorldWhoseNameIsTakenGetsASuffix_AndItsPasswordIsStoredOnlyWhenAsked() + { + var config = new AppConfiguration { Worlds = { new WorldDefinition { Name = "Northwind", Host = "x.example", Port = 1 } } }; + var result = Read(Mushclient); + + var plan = ImportPlan.For(config, result); + await Assert.That(plan.Worlds.Single().Name).IsEqualTo("Northwind (2)"); + await Assert.That(plan.PasswordCount).IsEqualTo(1); + plan.Apply(config, storePasswords: false); + await Assert.That(config.Worlds[1].Characters.Single().Password).IsNull(); + + var again = new AppConfiguration(); + ImportPlan.For(again, result).Apply(again, storePasswords: true); + await Assert.That(again.Worlds.Single().Characters.Single().Password).IsEqualTo("s3cret"); + await Assert.That(again.TriggerSets.Single().Triggers.Count).IsEqualTo(result.Set.Triggers.Count); + await Assert.That(ReferenceEquals(again.TriggerSets.Single().Triggers[0], result.Set.Triggers[0])).IsFalse().Because("the configuration gets copies"); + } + + [Test] + public async Task APlanMadeBeforeTheConfigurationChangedRefusesToApply() + { + var config = new AppConfiguration(); + var plan = ImportPlan.For(config, Read(Mushclient)); + config.Worlds.Add(new WorldDefinition { Name = "Northwind", Host = "y.example", Port = 2 }); + + await Assert.That(() => plan.Apply(config, storePasswords: false)).Throws(); + await Assert.That(config.TriggerSets).IsEmpty(); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/ImportTests.cs b/tests/SharpMUTerm.Tui.Tests/ImportTests.cs new file mode 100644 index 00000000..3994d811 --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/ImportTests.cs @@ -0,0 +1,207 @@ +using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Commands; +using SharpMUTerm.Client.Modals; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Graphics; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// Import from another client (/import, ⌃P ▸ Import from another client…, the welcome's row): the review opens +/// before anything is written, ⏎ writes, Esc writes nothing, and passwords are stored only when switched on. +/// +[NotInParallel] +public class ImportTests +{ + private static readonly TerminalCapabilities Headless = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private static ConsoleKeyInfo Key(ConsoleKey key, char c = '\0') => new(c, key, false, false, false); + + private static SharpMUTermApp App(AppConfiguration? config = null, IFilePicker? picker = null) + { + Console.SetIn(TextReader.Null); + var host = ClientHost.ForHarness(Headless, new HeadlessConsoleDriver(120, 40), null, null, null) with { FilePicker = picker }; + return new SharpMUTermApp(config ?? new AppConfiguration(), host); + } + + private static void TypeCommand(SharpMUTermApp app, string text) + { + foreach (var c in text) + { + app.SimulateKey(new ConsoleKeyInfo(c, ConsoleKey.NoName, false, false, false)); + } + + app.SimulateKey(Key(ConsoleKey.Enter, '\r')); + } + + private static string Fixture() + { + var path = Path.Combine(Path.GetTempPath(), "sharpmuterm-import-" + Guid.NewGuid().ToString("N") + ".mcl"); + File.WriteAllText(path, DemoImport.Mushclient); + return path; + } + + [Test] + public async Task SlashImportOpensTheReview_AndNothingIsWrittenUntilEnter() + { + var path = Fixture(); + try + { + var app = App(); + TypeCommand(app, "/import " + path); + + await Assert.That(app.ImportReviewOpen).IsTrue(); + await Assert.That(app.Configuration.Worlds).IsEmpty(); + await Assert.That(app.Configuration.TriggerSets).IsEmpty(); + var shown = string.Join("\n", app.ImportReviewLines); + await Assert.That(shown).Contains("WHAT CAN ACT AS YOU"); + await Assert.That(shown).Contains("Northwind"); + await Assert.That(shown).Contains("LEFT OUT"); + + app.SimulateImportKey(Key(ConsoleKey.Enter, '\r')); + + await Assert.That(app.ImportReviewOpen).IsFalse(); + var world = app.Configuration.Worlds.Single(); + await Assert.That(world.Host).IsEqualTo("northwind.example.org"); + var character = world.Characters.Single(); + await Assert.That(character.Name).IsEqualTo("Wren"); + await Assert.That(character.Password).IsNull().Because("the password was not switched on"); + await Assert.That(character.TriggerSets.Single()).IsEqualTo("Imported from MUSHclient"); + await Assert.That(app.Configuration.TriggerSets.Single().Triggers).IsNotEmpty(); + await Assert.That(app.LastNotice).Contains("Imported"); + } + finally + { + File.Delete(path); + } + } + + [Test] + public async Task PStoresThePasswords_AndEscWritesNothing() + { + var path = Fixture(); + try + { + var app = App(); + app.ImportFrom(path); + app.SimulateImportKey(Key(ConsoleKey.Escape, '\u001b')); + + await Assert.That(app.ImportReviewOpen).IsFalse(); + await Assert.That(app.Configuration.Worlds).IsEmpty(); + await Assert.That(app.PendingImport).IsNull(); + + app.ImportFrom(path); + await Assert.That(app.PendingImport!.StorePasswords).IsFalse(); + app.SimulateImportKey(Key(ConsoleKey.P, 'p')); + await Assert.That(app.PendingImport!.StorePasswords).IsTrue(); + await Assert.That(string.Join("\n", app.ImportReviewLines)).Contains("will be stored"); + app.SimulateImportKey(Key(ConsoleKey.Enter, '\r')); + + await Assert.That(app.Configuration.Worlds.Single().Characters.Single().Password).IsEqualTo("not-a-real-one"); + } + finally + { + File.Delete(path); + } + } + + [Test] + public async Task ImportingTwiceAddsASecondSet_AndNoSecondWorld() + { + var path = Fixture(); + try + { + var app = App(); + app.ImportFrom(path); + app.SimulateImportKey(Key(ConsoleKey.Enter, '\r')); + app.ImportFrom(path); + + await Assert.That(app.PendingImport!.Adds[0].Detail).Contains("already configured"); + app.SimulateImportKey(Key(ConsoleKey.Enter, '\r')); + + await Assert.That(app.Configuration.Worlds.Count).IsEqualTo(1); + await Assert.That(app.Configuration.TriggerSets.Select(s => s.Name).ToArray()) + .IsEquivalentTo(new[] { "Imported from MUSHclient", "Imported from MUSHclient (2)" }); + await Assert.That(app.Configuration.Worlds[0].Characters.Single().TriggerSets.Single()).IsEqualTo("Imported from MUSHclient"); + } + finally + { + File.Delete(path); + } + } + + [Test] + public async Task AFileThatIsNoSetupIsRefusedOutLoud() + { + var app = App(); + TypeCommand(app, "/import /nonexistent/nothing-here.mcl"); + + await Assert.That(app.ImportReviewOpen).IsFalse(); + await Assert.That(app.LastNotice).Contains("was not imported"); + } + + [Test] + public async Task ThePaletteEntryAndBareSlashImportAskForAPath_WhereThereIsNoPicker() + { + var app = App(); + await Assert.That(app.DispatchCommand(BuiltInCommands.ImportCommand)).IsTrue(); + await Assert.That(app.PrimaryInputText).IsEqualTo("/import "); + await Assert.That(app.LastNotice).Contains("Type the path"); + + var other = App(); + TypeCommand(other, "/import"); + await Assert.That(other.PrimaryInputText).IsEqualTo("/import "); + } + + [Test] + public async Task AHostWithAPickerOpensTheReviewForThePickedFile() + { + var path = Fixture(); + try + { + var picker = new FakePicker(path); + var app = App(picker: picker); + app.DispatchCommand(BuiltInCommands.ImportCommand); + + await Assert.That(picker.Asked).IsEqualTo(1); + await Assert.That(app.ImportReviewOpen).IsTrue(); + await Assert.That(app.PrimaryInputText).IsEmpty(); + } + finally + { + File.Delete(path); + } + } + + [Test] + public async Task TheWelcomesImportRowStartsAnImport() + { + var app = App(); + app.ShowWelcome(); + await Assert.That(string.Join("\n", app.WelcomeLines)).Contains("Import"); + for (var i = 0; i < 3; i++) + { + app.SimulateWelcomeKey(Key(ConsoleKey.DownArrow)); + } + + await Assert.That(app.Welcome!.Selected).IsEqualTo(WelcomeChoice.Import); + app.SimulateWelcomeKey(Key(ConsoleKey.Enter, '\r')); + + await Assert.That(app.WelcomeIsOpen).IsFalse(); + await Assert.That(app.PrimaryInputText).IsEqualTo("/import "); + } + + private sealed class FakePicker(string path) : IFilePicker + { + public int Asked { get; private set; } + + public bool Available => true; + + public void Pick(string title, Action picked) + { + Asked++; + picked(path); + } + } +} From 8ad3bb389f9238ef5eb259e6095cc46431923421 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 12:57:16 +0000 Subject: [PATCH 048/113] feat(map): name rooms on the terminal map, and edit maps by hand in both hosts The cell map's title is the current room's name, and MapViewModel.Nearby (each exit and the room it leads to) fills a side column beside a wide grid or the rows under a tall one, so both hosts name the same rooms. Map editing, a Mudlet subset: rename, area, lock, weight, add/remove exit (to a room id or the next room walked into), nudge, delete, note and symbol, with undo of the last ten edits. Every edit is a Client MapEdit through ApplyMapEdit -> MapEditing.Apply -> MapRecorder.Edit, on the UI thread under SyncRoot, marked dirty and saved like a recorded room. Cells: Ctrl+P > Edit map, arrow keys and an honest key footer, /map verbs for the edits that need words. Window: a right-click room menu and a native inspector. Declared on the map surface; SurfaceParityTests compares MapDigest after native and cell edits. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 6 + CLAUDE.md | 12 + src/SharpMUTerm.Avalonia/DesktopLayer.cs | 2 +- src/SharpMUTerm.Avalonia/FloatingPanels.cs | 2 +- src/SharpMUTerm.Avalonia/MapCanvas.cs | 142 ++++++- src/SharpMUTerm.Avalonia/MapInspector.cs | 330 +++++++++++++++ .../Commands/BuiltInCommands.cs | 5 + src/SharpMUTerm.Client/Help/SlashCommands.cs | 4 + src/SharpMUTerm.Client/Panels/MapEditing.cs | 394 ++++++++++++++++++ src/SharpMUTerm.Client/Panels/MapViewModel.cs | 131 +++++- .../Surfaces/SurfaceCatalog.cs | 15 +- .../Commands/CommandCatalog.cs | 4 +- src/SharpMUTerm.Core/Mapping/MapModel.cs | 215 ++++++++++ src/SharpMUTerm.Core/Mapping/MapRecorder.cs | 160 +++++++ src/SharpMUTerm.Tui/MapRenderer.cs | 263 +++++++++++- src/SharpMUTerm.Tui/Pointer/PointerTarget.cs | 13 +- .../Pointer/SharpMUTermApp.Desktop.cs | 5 +- src/SharpMUTerm.Tui/SharpMUTermApp.MapEdit.cs | 371 +++++++++++++++++ src/SharpMUTerm.Tui/SharpMUTermApp.cs | 66 ++- src/SharpMUTerm.Tui/SnapshotViews.cs | 2 +- .../SurfaceParityTests.cs | 79 ++++ .../MapEditingTests.cs | 126 ++++++ .../Mapping/MapEditTests.cs | 154 +++++++ .../SharpMUTerm.Tui.Tests/MapEditModeTests.cs | 186 +++++++++ tests/SharpMUTerm.Tui.Tests/MapWindowTests.cs | 2 +- 25 files changed, 2645 insertions(+), 44 deletions(-) create mode 100644 src/SharpMUTerm.Avalonia/MapInspector.cs create mode 100644 src/SharpMUTerm.Client/Panels/MapEditing.cs create mode 100644 src/SharpMUTerm.Tui/SharpMUTermApp.MapEdit.cs create mode 100644 tests/SharpMUTerm.Client.Tests/MapEditingTests.cs create mode 100644 tests/SharpMUTerm.Core.Tests/Mapping/MapEditTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/MapEditModeTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 7991b70a..109c415a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,12 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- The terminal map names the room you are in, and where each of its exits leads when the pane has room. +- Maps can be edited by hand: Ctrl+P ▸ Edit map in the terminal (arrow keys select, Shift+arrows move, r, a, l, w, x, + n, s, Del and u edit), or right-click a room in the desktop window for its menu and inspector. Rename a room, set + its area, lock it, weight it, add or remove an exit (or link one to the next room you walk into), move it, delete it, + or give it a note or a symbol; the last ten edits can be undone. A game that reports rooms over GMCP may overwrite + a room's name, area and exits the next time it describes it. - A world can reconnect by itself after its connection drops (F5 ▸ reconnect). It waits 5, 15, 30, 60 and 60 seconds between tries, counts down on the status row, and stops after five; Alt+R dials at once, and Disconnect or Ctrl+P ▸ Stop reconnecting cancels. Your own Disconnect, quitting, or the game closing right after you typed a diff --git a/CLAUDE.md b/CLAUDE.md index f768d53c..d8a2e736 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -152,6 +152,18 @@ fallbacks) for inline images/maps. read off the UI thread: every such read takes `MapRecorder.SyncRoot`, which the recorder holds while it changes the map and never while it raises `Changed` (a handler can end in the alias engine, which takes the script host's lock). A change a script asks for (`map.walk`, a lock) is posted to the UI thread. + - **The map names rooms, and is edited by hand in both hosts** (`WorldMap.Rename`/`SetArea`/`SetExit`/`Remove`/…, Core; + `MapRecorder.Edit(label, touched, change)`, `LinkNext`, `Undo`; Client `MapEditing`, `MapEdit`; Tui + `SharpMUTermApp.MapEdit.cs`; Avalonia `MapInspector`; the `map-edit` view). The cell title is the current room's name, + and `MapViewModel.Nearby` (each exit and where it leads) fills a side column from 64 cells or the rows under the grid + from 18. Every edit is a `MapEdit` through `ApplyMapEdit` → `MapEditing.Apply` → `MapRecorder.Edit`, on the UI thread + under `SyncRoot`, dirty and saved like a recorded room; undo snapshots the rooms an edit touches (10 deep, areas it + created go too). **Selection is client state per map window and selecting takes the keys** in both hosts (⌃P ▸ Edit + map, a cell click while editing, the canvas's right-click menu or click), so `SurfaceParityTests` compares + `MapDigest()`. Cell keys are `MapEditing.Keys`; the ones that need words put a `/map …` command on the command line + and put back what was being typed once it runs. "Next" on an exit links it to the next room walked into, never its + own. Deleting the room you are in is refused. **On a GMCP world the server's next report of a room overwrites a hand + edit to its name, area, exits and place**; locks, weights, notes and symbols survive. - **Sound** (`Core/Media`: `MediaCommand`, `MediaQueue`, `MediaCache`, `IAudioOutput`). MCMP's `Client.Media.*` is read with TNC.Gmcp's typed records into `MediaCommand`s (`WorldSession.MediaReceived`), and one `MediaQueue` per connection applies the specification's rules — priority halts and refuses lower, diff --git a/src/SharpMUTerm.Avalonia/DesktopLayer.cs b/src/SharpMUTerm.Avalonia/DesktopLayer.cs index be0d0b8d..d7390d06 100644 --- a/src/SharpMUTerm.Avalonia/DesktopLayer.cs +++ b/src/SharpMUTerm.Avalonia/DesktopLayer.cs @@ -340,7 +340,7 @@ private void SyncPanels(ScreenFrame frame, Size cell) () => new MapCanvas(_view), frame, cell, - (map, panel, plane) => map.Show(panel.Map!, panel.Ink, plane, text, panel.WalkTo)); + (map, panel, plane) => map.Show(panel.Map!, panel.Ink, plane, text, panel.WalkTo, panel.SelectRoom, panel.EditMap)); Place( _whoHere, _pointer.Panels.Where(p => p.PanelId == PanelIds.WhoHere && p.WhoHere is not null), diff --git a/src/SharpMUTerm.Avalonia/FloatingPanels.cs b/src/SharpMUTerm.Avalonia/FloatingPanels.cs index e031c84e..57738f29 100644 --- a/src/SharpMUTerm.Avalonia/FloatingPanels.cs +++ b/src/SharpMUTerm.Avalonia/FloatingPanels.cs @@ -289,7 +289,7 @@ public void Update(FloatingPanel panel, double cellHeight) switch (_content) { case MapCanvas map when content.Map is { } model: - map.Show(model, content.Ink, plane, text, content.WalkTo); + map.Show(model, content.Ink, plane, text, content.WalkTo, content.SelectRoom, content.EditMap); break; case VitalsGauges gauges when content.Vitals is { } vitals: gauges.Show(vitals, content.Ink, plane, text, cellHeight); diff --git a/src/SharpMUTerm.Avalonia/MapCanvas.cs b/src/SharpMUTerm.Avalonia/MapCanvas.cs index 26c0e447..61bf78e7 100644 --- a/src/SharpMUTerm.Avalonia/MapCanvas.cs +++ b/src/SharpMUTerm.Avalonia/MapCanvas.cs @@ -3,6 +3,7 @@ using Avalonia.Controls; using Avalonia.Input; using Avalonia.Media; +using SharpMUTerm.Client.Commands; using SharpMUTerm.Client.Panels; using SharpMUTerm.Tui; @@ -19,6 +20,12 @@ namespace SharpMUTerm.Avalonia; /// (), so the pane's menu is the same here as over cells. The view is /// centred on the character and follows them; a pan is an offset from there, and a double-click puts it back. /// +/// +/// Editing. A right click on a room selects it for editing () and opens the +/// client's room menu (); while a room is selected a click selects instead of walking, and the +/// card in the top right corner edits it. Every edit is a handed to the +/// client (), the funnel the cell map's keys end in. +/// /// internal sealed class MapCanvas : Control { @@ -39,6 +46,9 @@ internal sealed class MapCanvas : Control private Color _plane = Colors.Black; private Color _text = Colors.White; private Action? _walkTo; + private Action? _select; + private Action? _edit; + private readonly MapInspector _inspector = new(); private Vector _pan; private Point? _pressAt; private Vector _panAtPress; @@ -51,8 +61,29 @@ public MapCanvas(TerminalView view) ClipToBounds = true; Focusable = false; Cursor = new Cursor(StandardCursorType.Arrow); + VisualChildren.Add(_inspector); + LogicalChildren.Add(_inspector); + } + + protected override Size MeasureOverride(Size availableSize) + { + _inspector.Measure(availableSize); + return default; + } + + protected override Size ArrangeOverride(Size finalSize) + { + // The card arranges itself in the top right corner by its own alignment and margin. + _inspector.Arrange(new Rect(finalSize)); + return finalSize; } + /// The room inspector card. Internal for tests. + internal MapInspector Inspector => _inspector; + + /// The last room menu the canvas opened. Internal for tests. + internal MenuModel? OpenedRoomMenu { get; private set; } + /// The zoom, 1 at pixels between rooms. Internal for tests. internal double Zoom { get; private set; } = 1; @@ -62,9 +93,12 @@ public MapCanvas(TerminalView view) /// What it is showing. Internal for tests. internal MapViewModel Model => _model; - public void Show(MapViewModel model, PanelInk ink, Color plane, Color text, Action? walkTo) + public void Show(MapViewModel model, PanelInk ink, Color plane, Color text, Action? walkTo, Action? select = null, Action? edit = null) { _walkTo = walkTo; + _select = select; + _edit = edit; + _inspector.Show(model, plane, text, edit, select); if (model.Equals(_model) && ink == _ink && plane == _plane && text == _text) { return; @@ -82,12 +116,24 @@ internal Point CentreOf(MapViewRoom room) { var anchor = _model.Current ?? _model.Rooms.FirstOrDefault(); var step = Spacing * Zoom; - var middle = new Point(Bounds.Width / 2, Bounds.Height / 2) + _pan; + var middle = Middle + _pan; return anchor is null ? middle : new Point(middle.X + ((room.X - anchor.X) * step), middle.Y + ((room.Y - anchor.Y) * step)); } + /// The middle of the map's open part: left of the inspector while it is up and the pane is wide enough to spare it. + private Point Middle + { + get + { + var open = _inspector.IsVisible && Bounds.Width > MapInspector.CardWidth * 2 + ? Bounds.Width - MapInspector.CardWidth - 16 + : Bounds.Width; + return new Point(open / 2, Bounds.Height / 2); + } + } + private double RoomSize => Math.Max(5, Spacing * Zoom * 0.56); /// The room under a point, or null. @@ -103,13 +149,27 @@ internal Point CentreOf(MapViewRoom room) // ── Input: the canvas's own, never routed on to the cells (bar the right click) ────────────── + /// Whether a point is on the inspector card, which takes its own input. + private bool OnInspector(Point point) => _inspector.IsVisible && _inspector.Bounds.Contains(point); + protected override void OnPointerPressed(PointerPressedEventArgs e) { base.OnPointerPressed(e); var point = e.GetCurrentPoint(this); + if (OnInspector(point.Position)) + { + return; + } + e.Handled = true; if (point.Properties.IsRightButtonPressed) { + if (_select is not null && RoomAt(point.Position) is { } room) + { + OpenRoomMenu(room); + return; + } + if (RightClick is { } own) { own(e.GetPosition(this)); @@ -141,8 +201,13 @@ protected override void OnPointerPressed(PointerPressedEventArgs e) protected override void OnPointerMoved(PointerEventArgs e) { base.OnPointerMoved(e); - e.Handled = true; var position = e.GetPosition(this); + if (_pressAt is null && OnInspector(position)) + { + return; + } + + e.Handled = true; if (_pressAt is { } from) { var moved = position - from; @@ -163,7 +228,9 @@ protected override void OnPointerMoved(PointerEventArgs e) _hovered = room?.Id; Cursor = new Cursor(room is null ? StandardCursorType.Arrow : StandardCursorType.Hand); // The name is drawn on the canvas beside the room; the tip says only what a click does. - ToolTip.SetTip(this, room is null || room.Current ? null : "Click to walk here"); + ToolTip.SetTip(this, room is null ? null + : _model.Editing && _select is not null ? "Click to edit this room" + : room.Current ? "Right-click to edit this room" : "Click to walk here · right-click to edit"); InvalidateVisual(); } } @@ -182,7 +249,17 @@ protected override void OnPointerReleased(PointerReleasedEventArgs e) _dragging = false; e.Pointer.Capture(null); Cursor = new Cursor(StandardCursorType.Arrow); - if (!wasDrag && e.InitialPressMouseButton == MouseButton.Left && RoomAt(e.GetPosition(this)) is { Current: false } room) + if (wasDrag || e.InitialPressMouseButton != MouseButton.Left || RoomAt(e.GetPosition(this)) is not { } room) + { + return; + } + + // While a room is being edited a click picks the room to edit; otherwise it walks, as it always has. + if (_model.Editing && _select is not null) + { + _select(room.Id); + } + else if (!room.Current) { _walkTo?.Invoke(room.Id); } @@ -191,10 +268,46 @@ protected override void OnPointerReleased(PointerReleasedEventArgs e) protected override void OnPointerWheelChanged(PointerWheelEventArgs e) { base.OnPointerWheelChanged(e); + if (OnInspector(e.GetPosition(this))) + { + return; + } + e.Handled = true; ZoomAbout(e.GetPosition(this), e.Delta.Y); } + /// + /// Selects and opens the client's menu for it: walk there, each edit, undo. An edit that needs + /// words opens the inspector at its field; the rest are handed to the client as they are. + /// + internal void OpenRoomMenu(MapViewRoom room) + { + _select?.Invoke(room.Id); + var model = MapEditing.Menu(room, _model.UndoLabel); + OpenedRoomMenu = model; + var menu = NativeMenu.Build(model, verb => RunMenuVerb(room.Id, verb), global::Avalonia.Controls.PlacementMode.Pointer, this); + menu.Open(this); + } + + /// What a room menu entry does. Internal for tests, which choose an entry the way a click on it would. + internal void RunMenuVerb(long room, string verb) + { + if (verb == MapEditing.WalkVerb) + { + _walkTo?.Invoke(room); + } + else if (MapEditing.TextVerbs.Contains(verb)) + { + // The inspector shows the room once the client has published it selected; the field takes the keyboard then. + global::Avalonia.Threading.Dispatcher.UIThread.Post(() => _inspector.FocusField(verb), global::Avalonia.Threading.DispatcherPriority.Background); + } + else if (MapEditing.EditFor(verb, room) is { } edit) + { + _edit?.Invoke(edit); + } + } + /// Zooms by about , keeping what is under it there. internal void ZoomAbout(Point point, double notches) { @@ -205,7 +318,7 @@ internal void ZoomAbout(Point point, double notches) } // The centre is middle + pan; a point at offset d from it moves to d·ratio, so the pan takes up the difference. - var middle = new Point(Bounds.Width / 2, Bounds.Height / 2); + var middle = Middle; var ratio = next / Zoom; var fromCentre = point - (middle + _pan); _pan = point - middle - (fromCentre * ratio); @@ -313,6 +426,23 @@ public override void Render(DrawingContext context) } DrawStairs(context, room, rect, room.Current ? Contrasting(accent) : _text); + if (room.Symbol is { } symbol && !room.Up && !room.Down) + { + var mark = PanelText.Format(symbol, Math.Max(8, size * 0.5), room.Current ? Contrasting(accent) : _text, bold: true, size); + context.DrawText(mark, new Point(c.X - (mark.Width / 2), c.Y - (mark.Height / 2))); + } + + if (room.Noted) + { + context.DrawEllipse(new SolidColorBrush(path), null, rect.TopRight + new Vector(-size * 0.12, size * 0.12), size * 0.1, size * 0.1); + } + + if (room.Selected) + { + // The room being edited: a ring in the draft colour, outside any halo, so it reads on the current room too. + var ring = new Pen(new SolidColorBrush(path), 2, new DashStyle([2, 1.5], 0)); + context.DrawRectangle(null, ring, rect.Inflate(size * 0.42), radius * 2.2, radius * 2.2); + } if ((names || room.Id == _hovered) && room.Id != _hovered) { diff --git a/src/SharpMUTerm.Avalonia/MapInspector.cs b/src/SharpMUTerm.Avalonia/MapInspector.cs new file mode 100644 index 00000000..556737db --- /dev/null +++ b/src/SharpMUTerm.Avalonia/MapInspector.cs @@ -0,0 +1,330 @@ +using System.Globalization; +using Avalonia; +using Avalonia.Automation; +using Avalonia.Controls; +using Avalonia.Input; +using Avalonia.Layout; +using Avalonia.Media; +using SharpMUTerm.Client.Panels; + +namespace SharpMUTerm.Avalonia; + +/// +/// The window's inspector for the room being edited (): a small card in the map's top +/// right corner with the room's name, area, note, symbol, weight, lock and exits, each edited in place, and nudge, delete, +/// undo and done buttons. It says what the cell map's side column says, from the same model, and every change it makes is +/// a handed to the client (), which checks it and applies it the way +/// a cell key's edit is applied. It never edits the map itself: the fields show what the client published, and an edit the +/// client refuses is simply put back on the next model. +/// +internal sealed class MapInspector : Border +{ + internal const double CardWidth = 272; + + private readonly TextBlock _title = new() { FontWeight = FontWeight.SemiBold, TextTrimming = TextTrimming.CharacterEllipsis }; + private readonly TextBlock _where = new() { Opacity = 0.75 }; + private readonly TextBlock _pending = new() { TextWrapping = TextWrapping.Wrap, IsVisible = false }; + private readonly StackPanel _exits = new() { Spacing = 2 }; + private readonly Button _undo; + private readonly Button _delete; + private MapViewModel _model = new(null, 0, [], [], null); + private Action? _edit; + private Action? _select; + private Color _ink = Colors.White; + + public MapInspector() + { + HorizontalAlignment = HorizontalAlignment.Right; + VerticalAlignment = VerticalAlignment.Top; + Width = CardWidth; + Margin = new Thickness(0, 30, 8, 8); + Padding = new Thickness(10, 8); + CornerRadius = new CornerRadius(NativeTokens.RadiusM); + BorderThickness = new Thickness(1); + IsVisible = false; + AutomationProperties.SetName(this, "Room inspector"); + + NameBox = Field("Name"); + AreaBox = Field("Area"); + NoteBox = Field("Note"); + SymbolBox = Field("Symbol"); + SymbolBox.MaxLength = 1; + WeightBox = Field("Weight"); + ExitBox = Field("Exit"); + ExitBox.PlaceholderText = "direction or command"; + TargetBox = Field("Leads to"); + TargetBox.PlaceholderText = "room number, or next"; + LockBox = new CheckBox { Content = "Locked: no walk goes through it" }; + LockBox.IsCheckedChanged += (_, _) => + { + if (_model.Selected is { } room && LockBox.IsChecked is { } locked && locked != room.Locked) + { + _edit?.Invoke(MapEdit.Lock(room.Id, locked)); + } + }; + + Commit(NameBox, (room, text) => text != room.Name ? MapEdit.Rename(room.Id, text) : null); + Commit(AreaBox, (room, text) => text != (room.Area ?? string.Empty) ? MapEdit.Area(room.Id, text) : null); + Commit(NoteBox, (room, text) => text != (room.Note ?? string.Empty) ? MapEdit.Note(room.Id, text) : null); + Commit(SymbolBox, (room, text) => text != (room.Symbol ?? string.Empty) ? MapEdit.Symbol(room.Id, text) : null); + Commit(WeightBox, (room, text) => + int.TryParse(text, NumberStyles.None, CultureInfo.InvariantCulture, out var weight) && weight != room.Weight ? MapEdit.Weight(room.Id, weight) : null); + + var add = Small("Add exit", AddExit); + TargetBox.KeyDown += (_, e) => + { + if (e.Key == Key.Enter) + { + e.Handled = true; + AddExit(); + } + }; + + _undo = Small("Undo", () => _edit?.Invoke(MapEdit.Undo)); + _delete = Small("Delete room", () => + { + if (_model.Selected is { } room) + { + _edit?.Invoke(MapEdit.Delete(room.Id)); + } + }); + var done = Small("Done", () => _select?.Invoke(null)); + + var nudge = new WrapPanel(); + foreach (var (label, dx, dy, dz) in new[] { ("West", -1, 0, 0), ("North", 0, -1, 0), ("South", 0, 1, 0), ("East", 1, 0, 0), ("Level up", 0, 0, 1), ("Level down", 0, 0, -1) }) + { + nudge.Children.Add(Small(label, () => + { + if (_model.Selected is { } room) + { + _edit?.Invoke(MapEdit.Move(room.Id, dx, dy, dz)); + } + })); + } + + var grid = new Grid { ColumnDefinitions = new ColumnDefinitions("Auto,*"), RowSpacing = 4, ColumnSpacing = 8 }; + var row = 0; + void Row(string label, Control field) + { + grid.RowDefinitions.Add(new RowDefinition(GridLength.Auto)); + var text = new TextBlock { Text = label, VerticalAlignment = VerticalAlignment.Center, Opacity = 0.75 }; + Grid.SetRow(text, row); + Grid.SetRow(field, row); + Grid.SetColumn(field, 1); + grid.Children.Add(text); + grid.Children.Add(field); + row++; + } + + Row("Name", NameBox); + Row("Area", AreaBox); + Row("Note", NoteBox); + Row("Symbol", SymbolBox); + Row("Weight", WeightBox); + + var newExit = new Grid { ColumnDefinitions = new ColumnDefinitions("*,*,Auto"), ColumnSpacing = 4 }; + Grid.SetColumn(TargetBox, 1); + Grid.SetColumn(add, 2); + newExit.Children.Add(ExitBox); + newExit.Children.Add(TargetBox); + newExit.Children.Add(add); + + var buttons = new WrapPanel(); + buttons.Children.Add(_undo); + buttons.Children.Add(_delete); + buttons.Children.Add(done); + + Child = new StackPanel + { + Spacing = 6, + Children = + { + _title, + _where, + grid, + LockBox, + new TextBlock { Text = "Exits", Opacity = 0.75 }, + _exits, + newExit, + _pending, + new TextBlock { Text = "Move", Opacity = 0.75 }, + nudge, + buttons, + }, + }; + + // Nothing pressed on the card reaches the map under it: a press here is never a pan, a walk or a pane menu. + PointerPressed += (_, e) => e.Handled = true; + PointerReleased += (_, e) => e.Handled = true; + PointerWheelChanged += (_, e) => e.Handled = true; + } + + internal TextBox NameBox { get; } + + internal TextBox AreaBox { get; } + + internal TextBox NoteBox { get; } + + internal TextBox SymbolBox { get; } + + internal TextBox WeightBox { get; } + + internal TextBox ExitBox { get; } + + internal TextBox TargetBox { get; } + + internal CheckBox LockBox { get; } + + /// The room it shows, or null. Internal for tests. + internal MapRoomDetails? Room => _model.Selected; + + /// Shows the room the model says is being edited, or hides when none is. + public void Show(MapViewModel model, Color plane, Color text, Action? edit, Action? select) + { + _edit = edit; + _select = select; + var previous = _model.Selected; + _model = model; + IsVisible = model.Selected is not null; + if (model.Selected is not { } room) + { + return; + } + + if (text != _ink || Background is null) + { + _ink = text; + var tokens = NativeTokens.For(null, (0.299 * plane.R) + (0.587 * plane.G) + (0.114 * plane.B) < 140); + Background = tokens.Brush(tokens.Card); + BorderBrush = tokens.Brush(tokens.Edge); + SetValue(global::Avalonia.Controls.Documents.TextElement.ForegroundProperty, tokens.Brush(tokens.Text)); + tokens.ApplySimple(Resources); + } + + _title.Text = $"#{room.Id.ToString(CultureInfo.InvariantCulture)} {room.Name}"; + _where.Text = $"at {room.X.ToString(CultureInfo.InvariantCulture)}, {room.Y.ToString(CultureInfo.InvariantCulture)} · level {room.Z.ToString(CultureInfo.InvariantCulture)}"; + var other = previous?.Id != room.Id; + Put(NameBox, room.Name, other); + Put(AreaBox, room.Area ?? string.Empty, other); + Put(NoteBox, room.Note ?? string.Empty, other); + Put(SymbolBox, room.Symbol ?? string.Empty, other); + Put(WeightBox, room.Weight.ToString(CultureInfo.InvariantCulture), other); + LockBox.IsChecked = room.Locked; + if (other) + { + ExitBox.Text = string.Empty; + TargetBox.Text = string.Empty; + } + + if (!room.Exits.SequenceEqual(previous?.Exits ?? []) || other) + { + _exits.Children.Clear(); + foreach (var exit in room.Exits) + { + var line = new DockPanel(); + var remove = Small("Remove", () => _edit?.Invoke(MapEdit.RemoveExit(room.Id, exit.Exit))); + ToolTip.SetTip(remove, $"Remove the {exit.Exit} exit"); + DockPanel.SetDock(remove, Dock.Right); + line.Children.Add(remove); + line.Children.Add(new TextBlock + { + Text = $"{exit.Exit} {(exit.To is null ? "not walked" : exit.Name ?? "#" + exit.To.Value.ToString(CultureInfo.InvariantCulture))}", + VerticalAlignment = VerticalAlignment.Center, + TextTrimming = TextTrimming.CharacterEllipsis, + }); + _exits.Children.Add(line); + } + } + + _pending.Text = model.Pending ?? string.Empty; + _pending.IsVisible = model.Pending is not null; + _undo.IsEnabled = model.UndoLabel is not null; + ToolTip.SetTip(_undo, model.UndoLabel is { } undo ? $"Undo {undo}" : "Nothing to undo"); + _delete.IsEnabled = model.Current?.Id != room.Id; + } + + /// Puts the keyboard in the field a menu verb names (). + public void FocusField(string verb) + { + var box = verb switch + { + MapEditing.RenameVerb => NameBox, + MapEditing.AreaVerb => AreaBox, + MapEditing.NoteVerb => NoteBox, + MapEditing.SymbolVerb => SymbolBox, + MapEditing.WeightVerb => WeightBox, + MapEditing.ExitVerb => ExitBox, + _ => null, + }; + if (box is not null) + { + box.Focus(); + box.SelectAll(); + } + } + + private void AddExit() + { + if (_model.Selected is not { } room) + { + return; + } + + var exit = ExitBox.Text?.Trim() ?? string.Empty; + var target = TargetBox.Text?.Trim() ?? string.Empty; + MapEdit? edit = target.Equals("next", StringComparison.OrdinalIgnoreCase) + ? MapEdit.LinkNext(room.Id, exit) + : long.TryParse(target, NumberStyles.AllowLeadingSign, CultureInfo.InvariantCulture, out var to) ? MapEdit.AddExit(room.Id, exit, to) : null; + if (edit is not null) + { + _edit?.Invoke(edit); + ExitBox.Text = string.Empty; + TargetBox.Text = string.Empty; + } + } + + /// A field shows the model's value unless the player is typing in it; a room changed always shows its own. + private static void Put(TextBox box, string value, bool force) + { + if (force || !box.IsFocused) + { + box.Text = value; + } + } + + /// Enter, or leaving the field, hands the client the edit the field's text asks for, if it asks for one. + private void Commit(TextBox box, Func make) + { + void Run() + { + if (_model.Selected is { } room && make(room, box.Text?.Trim() ?? string.Empty) is { } edit) + { + _edit?.Invoke(edit); + } + } + + box.KeyDown += (_, e) => + { + if (e.Key == Key.Enter) + { + e.Handled = true; + Run(); + } + }; + box.LostFocus += (_, _) => Run(); + } + + private static TextBox Field(string name) + { + var box = new TextBox { MinHeight = 24, Padding = new Thickness(6, 2), FontSize = NativeTokens.Body, MaxLength = 200 }; + AutomationProperties.SetName(box, name); + return box; + } + + private static Button Small(string label, Action run) + { + var button = new Button { Content = label, Padding = new Thickness(8, 2), Margin = new Thickness(0, 0, 4, 4), FontSize = NativeTokens.Body, Focusable = false }; + button.Click += (_, _) => run(); + return button; + } +} diff --git a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs index 1a539792..2f0d6d9c 100644 --- a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs +++ b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs @@ -147,6 +147,11 @@ void Family(string id, string prefix, Func"); + + // Editing the map: the room you are in selected, the map holding the keys (its footer names them). Listed + // unconditionally beside Show map; it refuses out loud where there is no map. + Add("map:edit", CommandGroup.Terminal, "Edit map", detail: "rename, area, lock, weight, exits, notes · /map rename …"); + Add("map:undo", CommandGroup.Terminal, "Undo map edit", detail: "takes back the last change to the map", when: c => c.State.MapUndo is not null); // The panels a layout places, openable one at a time as tabs: each draws the focused character's own data // and says so when there is none yet, so they are listed unconditionally, like the map. Add("panel:who-here", CommandGroup.Terminal, "Show who is here", detail: "players and creatures in the room · click a name to look"); diff --git a/src/SharpMUTerm.Client/Help/SlashCommands.cs b/src/SharpMUTerm.Client/Help/SlashCommands.cs index b0031bad..aaedf28f 100644 --- a/src/SharpMUTerm.Client/Help/SlashCommands.cs +++ b/src/SharpMUTerm.Client/Help/SlashCommands.cs @@ -26,6 +26,10 @@ public static class SlashCommands new("/walk", "/walk ", "Speedwalk to a room on this connection's map, one step at a time", "/walk "), new("/walk", "/walk stop", "Stop walking", "/walk stop"), new("/map", "/map lock|unlock [room]", "Keep walks out of a room, or let them through again", "/map lock "), + new("/map", "/map edit", "Edit the map: select a room and change it with keys (⌃P ▸ Edit map)", "/map edit"), + new("/map", "/map rename|area|note|symbol|weight …", "Change a room on the map, by its number", "/map rename "), + new("/map", "/map exit · unexit ", "Add or remove an exit by hand", "/map exit "), + new("/map", "/map move [dz] · delete · undo", "Move or delete a room, or undo the last edit", "/map undo"), new("/web", "/web ", "Open a page in the built-in web view", "/web "), new("/graphics", "/graphics", "Say how pictures are drawn in this terminal, and why", "/graphics"), new("/triggers", "/triggers", "Say which trigger rules this window's character runs, and why a window did not open", "/triggers"), diff --git a/src/SharpMUTerm.Client/Panels/MapEditing.cs b/src/SharpMUTerm.Client/Panels/MapEditing.cs new file mode 100644 index 00000000..73c0a87a --- /dev/null +++ b/src/SharpMUTerm.Client/Panels/MapEditing.cs @@ -0,0 +1,394 @@ +using System.Globalization; +using SharpMUTerm.Client.Commands; +using SharpMUTerm.Core.Mapping; + +namespace SharpMUTerm.Client.Panels; + +/// What a map edit does. +public enum MapEditKind +{ + Rename, + Area, + Lock, + Unlock, + Weight, + + /// An exit pointed at a room the map already has. + AddExit, + + /// An exit that will lead to the next room the character walks into. + LinkNext, + RemoveExit, + Move, + Delete, + Note, + Symbol, + + /// The last edit taken back. + Undo, +} + +/// +/// One edit to a map, as both hosts ask for it: the cell map's keys and /map commands parse into one, and the +/// window's room menu and inspector build one. Every edit goes through , so a native +/// gesture and a cell key that ask for the same thing leave the same map. +/// +/// What it does. +/// The room it acts on (ignored by ). +/// A name, an area, a note, a symbol or an exit's direction or command. +/// A weight. +/// The room an added exit leads to. +/// A move's step east. +/// A move's step south. +/// A move's step up. +public sealed record MapEdit(MapEditKind Kind, long Room, string? Text = null, int Number = 0, long? Target = null, int Dx = 0, int Dy = 0, int Dz = 0) +{ + public static MapEdit Rename(long room, string name) => new(MapEditKind.Rename, room, name); + + public static MapEdit Area(long room, string? area) => new(MapEditKind.Area, room, area); + + public static MapEdit Lock(long room, bool locked) => new(locked ? MapEditKind.Lock : MapEditKind.Unlock, room); + + public static MapEdit Weight(long room, int weight) => new(MapEditKind.Weight, room, Number: weight); + + public static MapEdit AddExit(long room, string exit, long to) => new(MapEditKind.AddExit, room, exit, Target: to); + + public static MapEdit LinkNext(long room, string exit) => new(MapEditKind.LinkNext, room, exit); + + public static MapEdit RemoveExit(long room, string exit) => new(MapEditKind.RemoveExit, room, exit); + + public static MapEdit Move(long room, int dx, int dy, int dz = 0) => new(MapEditKind.Move, room, Dx: dx, Dy: dy, Dz: dz); + + public static MapEdit Delete(long room) => new(MapEditKind.Delete, room); + + public static MapEdit Note(long room, string? note) => new(MapEditKind.Note, room, note); + + public static MapEdit Symbol(long room, string? symbol) => new(MapEditKind.Symbol, room, symbol); + + public static MapEdit Undo { get; } = new(MapEditKind.Undo, 0); +} + +/// What an edit did: whether the map changed, and a sentence for the player either way. +public sealed record MapEditResult(bool Done, string Message); + +/// +/// Map editing, for both hosts: applying an edit to a recorder (the one place an edit meets the map), reading +/// /map commands into edits, the keys the cell map answers in edit mode, and the window's room menu. +/// +public static class MapEditing +{ + /// A room menu entry's verbs (). A verb that needs words opens the inspector at that field. + public const string WalkVerb = "walk", RenameVerb = "rename", AreaVerb = "area", NoteVerb = "note", SymbolVerb = "symbol", + WeightVerb = "weight", ExitVerb = "exit", UnexitVerb = "unexit", LockVerb = "lock", UnlockVerb = "unlock", DeleteVerb = "delete", + UndoVerb = "undo"; + + /// The verbs that need words, which a host asks for in its inspector before an edit is made. + public static IReadOnlyList TextVerbs { get; } = [RenameVerb, AreaVerb, NoteVerb, SymbolVerb, WeightVerb, ExitVerb]; + + /// + /// The keys the cell map answers while it holds the keyboard in edit mode, in the order its footer names them. Every + /// one is answered by the cell map's key handler; a test holds the two to each other. + /// + public static IReadOnlyList<(string Key, string Word)> Keys { get; } = + [ + ("←↑→↓", "select"), + ("⇧←↑→↓", "move"), + ("r", "rename"), + ("a", "area"), + ("l", "lock"), + ("w", "weight"), + ("x", "exit"), + ("-", "remove exit"), + ("n", "note"), + ("s", "symbol"), + ("Del", "delete"), + ("u", "undo"), + ("⏎", "walk"), + ("Esc", "done"), + ]; + + /// + /// Applies to 's map: checked first, then made through + /// (under its lock, marked dirty, + /// kept for undo), or and . Call it on the thread + /// that owns the map — the client's UI thread. + /// + public static MapEditResult Apply(MapRecorder recorder, MapEdit edit) + { + ArgumentNullException.ThrowIfNull(recorder); + ArgumentNullException.ThrowIfNull(edit); + if (edit.Kind == MapEditKind.Undo) + { + return recorder.Undo() is { } undone ? new(true, $"undid: {undone}") : new(false, "nothing to undo"); + } + + var map = recorder.Map; + if (map.Room(edit.Room) is not { } room) + { + return new(false, $"no room {edit.Room.ToString(CultureInfo.InvariantCulture)} on the map"); + } + + var name = Snippet(room.Name.Length > 0 ? room.Name : "#" + room.Id.ToString(CultureInfo.InvariantCulture)); + var id = edit.Room; + var text = edit.Text?.Trim() ?? string.Empty; + var exit = WorldMap.ExitKey(text); + switch (edit.Kind) + { + case MapEditKind.Rename when text.Length == 0: + return new(false, "a room needs a name"); + case MapEditKind.Weight when edit.Number < 1 || edit.Number > WorldMap.MaxWeight: + return new(false, $"a weight is 1 to {WorldMap.MaxWeight.ToString(CultureInfo.InvariantCulture)}"); + case MapEditKind.AddExit or MapEditKind.LinkNext or MapEditKind.RemoveExit when exit.Length == 0: + return new(false, "name the exit: a direction (n, ne, up…) or the command that takes it"); + case MapEditKind.AddExit when edit.Target is not { } to || map.Room(to) is null: + return new(false, $"no room {edit.Target?.ToString(CultureInfo.InvariantCulture) ?? "?"} to lead to"); + case MapEditKind.Symbol when text.Length > 1 || (text.Length == 1 && !WorldMap.IsSymbol(text[0])): + return new(false, "a symbol is one printable character"); + case MapEditKind.Delete when recorder.CurrentRoomId == id: + return new(false, "you are in that room — walk out of it first"); + } + + if (edit.Kind == MapEditKind.LinkNext) + { + return recorder.LinkNext(id, exit) + ? new(true, $"the next room you walk into is {exit} from {name}") + : new(false, "that exit is already waiting"); + } + + var touched = edit.Kind == MapEditKind.Delete + ? map.Rooms.Values.Where(r => r.Id == id || r.AllExits().Any(e => e.To == id)).Select(r => r.Id).ToList() + : [id]; + var (label, done) = edit.Kind switch + { + MapEditKind.Rename => ($"rename {name}", $"renamed {name} to {Snippet(text)}"), + MapEditKind.Area => ($"area of {name}", text.Length == 0 ? $"{name} is in no area" : $"{name} is in {Snippet(text)}"), + MapEditKind.Lock => ($"lock {name}", $"{name} is locked: no walk goes through it"), + MapEditKind.Unlock => ($"unlock {name}", $"{name} is unlocked"), + MapEditKind.Weight => ($"weight of {name}", $"{name} weighs {edit.Number.ToString(CultureInfo.InvariantCulture)}"), + MapEditKind.AddExit => ($"exit {exit} from {name}", $"{exit} from {name} leads to room {edit.Target!.Value.ToString(CultureInfo.InvariantCulture)}"), + MapEditKind.RemoveExit => ($"remove exit {exit}", $"{name} has no {exit} exit now"), + MapEditKind.Move => ($"move {name}", $"moved {name}"), + MapEditKind.Delete => ($"delete {name}", $"deleted {name} — undo brings it back"), + MapEditKind.Note => ($"note on {name}", text.Length == 0 ? $"{name} has no note" : $"noted {name}"), + MapEditKind.Symbol => ($"symbol of {name}", text.Length == 0 ? $"{name} has no symbol" : $"{name} is marked {text}"), + _ => (string.Empty, string.Empty), + }; + + var changed = recorder.Edit(label, touched, m => edit.Kind switch + { + MapEditKind.Rename => m.Rename(id, text), + MapEditKind.Area => m.SetArea(id, text), + MapEditKind.Lock => m.SetLocked(id, true), + MapEditKind.Unlock => m.SetLocked(id, false), + MapEditKind.Weight => m.SetWeight(id, edit.Number), + MapEditKind.AddExit => m.SetExit(id, text, edit.Target!.Value), + MapEditKind.RemoveExit => m.RemoveExit(id, text), + MapEditKind.Move => m.Move(id, edit.Dx, edit.Dy, edit.Dz), + MapEditKind.Delete => m.Remove(id), + MapEditKind.Note => m.SetNote(id, text), + MapEditKind.Symbol => m.SetSymbol(id, text), + _ => false, + }); + return changed ? new(true, done) : new(false, $"nothing to change on {name}"); + } + + /// The /map verbs that edit, which reads. + public static IReadOnlyList CommandVerbs { get; } = + ["rename", "area", "lock", "unlock", "weight", "exit", "unexit", "move", "delete", "note", "symbol", "undo"]; + + /// + /// A /map command's words after /map, as an edit: rename 12 The Hall, area 12 Keep, + /// lock|unlock [room], weight 12 5, exit 12 ne 14 (or next: the room walked into next), + /// unexit 12 ne, move 12 1 0 [0], delete 12, note 12 [text], symbol 12 [c], + /// undo. A room is its number; reads a name for lock and unlock (and gives the + /// current room for none). Null edit with a problem when the words are not one of these. + /// + public static (MapEdit? Edit, string? Problem) Parse(string argument, Func resolve) + { + ArgumentNullException.ThrowIfNull(resolve); + var words = (argument ?? string.Empty).Trim(); + var space = words.IndexOf(' '); + var verb = (space < 0 ? words : words[..space]).ToLowerInvariant(); + var rest = space < 0 ? string.Empty : words[(space + 1)..].Trim(); + if (verb == "undo") + { + return (MapEdit.Undo, null); + } + + if (verb is "lock" or "unlock") + { + return resolve(rest.Length == 0 ? null : rest) is { } locked + ? (MapEdit.Lock(locked, verb == "lock"), null) + : (null, "no such room"); + } + + var usage = verb switch + { + "rename" => "/map rename ", + "area" => "/map area [area]", + "weight" => "/map weight <1-1000>", + "exit" => "/map exit ", + "unexit" => "/map unexit ", + "move" => "/map move [dz]", + "delete" => "/map delete ", + "note" => "/map note [text]", + "symbol" => "/map symbol [character]", + _ => null, + }; + if (usage is null) + { + return (null, "use /map lock|unlock [room], rename, area, weight, exit, unexit, move, delete, note, symbol or undo"); + } + + space = rest.IndexOf(' '); + var first = space < 0 ? rest : rest[..space]; + var tail = space < 0 ? string.Empty : rest[(space + 1)..].Trim(); + if (!long.TryParse(first, NumberStyles.AllowLeadingSign, CultureInfo.InvariantCulture, out var room)) + { + return (null, $"use {usage} — a room is its number"); + } + + switch (verb) + { + case "rename": + return tail.Length == 0 ? (null, $"use {usage}") : (MapEdit.Rename(room, tail), null); + case "area": + return (MapEdit.Area(room, tail), null); + case "note": + return (MapEdit.Note(room, tail), null); + case "symbol": + return (MapEdit.Symbol(room, tail), null); + case "delete": + return (MapEdit.Delete(room), null); + case "weight": + return int.TryParse(tail, NumberStyles.None, CultureInfo.InvariantCulture, out var weight) + ? (MapEdit.Weight(room, weight), null) + : (null, $"use {usage}"); + case "unexit": + return tail.Length == 0 ? (null, $"use {usage}") : (MapEdit.RemoveExit(room, tail), null); + case "exit": + { + var last = tail.LastIndexOf(' '); + if (last < 0) + { + return (null, $"use {usage}"); + } + + var exit = tail[..last].Trim(); + var to = tail[(last + 1)..]; + if (to.Equals("next", StringComparison.OrdinalIgnoreCase)) + { + return (MapEdit.LinkNext(room, exit), null); + } + + return long.TryParse(to, NumberStyles.AllowLeadingSign, CultureInfo.InvariantCulture, out var target) + ? (MapEdit.AddExit(room, exit, target), null) + : (null, $"use {usage}"); + } + + case "move": + { + var parts = tail.Split(' ', StringSplitOptions.RemoveEmptyEntries); + var steps = new int[3]; + for (var i = 0; i < parts.Length; i++) + { + if (parts.Length is < 2 or > 3 || !int.TryParse(parts[i], NumberStyles.AllowLeadingSign, CultureInfo.InvariantCulture, out steps[i])) + { + return (null, $"use {usage}"); + } + } + + return parts.Length < 2 ? (null, $"use {usage}") : (MapEdit.Move(room, steps[0], steps[1], steps[2]), null); + } + } + + return (null, $"use {usage}"); + } + + /// + /// The /map command a text edit starts from, put on the command line for the player to finish: the room's + /// number and what it holds now, so ⏎ with nothing changed changes nothing. Null for a verb that needs no words. + /// + public static string? CommandFor(string verb, MapRoomDetails room) + { + ArgumentNullException.ThrowIfNull(room); + var id = room.Id.ToString(CultureInfo.InvariantCulture); + return verb switch + { + RenameVerb => $"/map rename {id} {room.Name}", + AreaVerb => $"/map area {id} {room.Area}", + NoteVerb => $"/map note {id} {room.Note}", + SymbolVerb => $"/map symbol {id} {room.Symbol}", + WeightVerb => $"/map weight {id} {room.Weight.ToString(CultureInfo.InvariantCulture)}", + ExitVerb => $"/map exit {id} ", + UnexitVerb => $"/map unexit {id} ", + _ => null, + }; + } + + /// + /// The menu a right click on a room opens in the window: walk there, the edits that need words (each opens the + /// inspector at its field), lock or unlock, delete, and undo when there is something to undo. Each entry carries the + /// cell map's key for the same edit. + /// + public static MenuModel Menu(MapViewRoom room, string? undo) + { + ArgumentNullException.ThrowIfNull(room); + var here = room.Current; + var entries = new List + { + new($"Walk to {Snippet(room.Name)}", "⏎", here ? null : WalkVerb, Enabled: !here), + MenuEntry.Separator, + new("Rename…", "r", RenameVerb), + new("Set area…", "a", AreaVerb), + new("Note…", "n", NoteVerb), + new("Symbol…", "s", SymbolVerb), + new("Weight…", "w", WeightVerb), + new("Add exit…", "x", ExitVerb), + room.Locked ? new("Unlock", "l", UnlockVerb) : new("Lock", "l", LockVerb), + MenuEntry.Separator, + new("Delete room", "Del", here ? null : DeleteVerb, Enabled: !here), + }; + if (undo is not null) + { + entries.Add(new($"Undo {Snippet(undo)}", "u", UndoVerb)); + } + + return new MenuModel(entries); + } + + /// The edit a menu verb that needs no words makes on , or null for one that does. + public static MapEdit? EditFor(string verb, long room) => verb switch + { + LockVerb => MapEdit.Lock(room, true), + UnlockVerb => MapEdit.Lock(room, false), + DeleteVerb => MapEdit.Delete(room), + UndoVerb => MapEdit.Undo, + _ => null, + }; + + /// + /// The room nearest in a direction on the view's grid ( east, + /// south), or null when there is none that way. A room not in the view starts from the anchor. + /// + public static long? Neighbour(MapViewModel view, long from, int dx, int dy) + { + ArgumentNullException.ThrowIfNull(view); + if (view.Rooms.FirstOrDefault(r => r.Id == from) is not { } start) + { + return view.AnchorId; + } + + // Ahead in the direction asked, no further to the side than ahead; nearest first, a step aside costing two forward. + return view.Rooms + .Where(r => r.Id != from) + .Select(r => (Room: r, Ahead: ((r.X - start.X) * dx) + ((r.Y - start.Y) * dy), Side: Math.Abs(((r.X - start.X) * dy) - ((r.Y - start.Y) * dx)))) + .Where(p => p.Ahead > 0 && p.Side <= p.Ahead) + .OrderBy(p => p.Ahead + (2 * p.Side)) + .ThenBy(p => p.Room.Id) + .Select(p => (long?)p.Room.Id) + .FirstOrDefault(); + } + + private static string Snippet(string text) => text.Length <= 40 ? text : text[..39] + "…"; +} diff --git a/src/SharpMUTerm.Client/Panels/MapViewModel.cs b/src/SharpMUTerm.Client/Panels/MapViewModel.cs index e62bccbd..5f6a0e5a 100644 --- a/src/SharpMUTerm.Client/Panels/MapViewModel.cs +++ b/src/SharpMUTerm.Client/Panels/MapViewModel.cs @@ -16,8 +16,33 @@ namespace SharpMUTerm.Client.Panels; /// The name of another area one of its exits leads into (the first by name), or null. Both views mark the way out in /// that area's colour (). /// +/// Whether it is the room being edited (). +/// The one character the player marked it with, or null. +/// Whether the player wrote a note on it. public sealed record MapViewRoom( - long Id, string Name, int X, int Y, bool Current, bool Ahead, bool Locked, bool Up = false, bool Down = false, string? Elsewhere = null); + long Id, string Name, int X, int Y, bool Current, bool Ahead, bool Locked, bool Up = false, bool Down = false, string? Elsewhere = null, + bool Selected = false, string? Symbol = null, bool Noted = false); + +/// An exit as a view names it: the direction or command, and the room it leads to, or none for a stub. +/// A direction's short command (n, up) or a special exit's command. +/// The room it leads to, or null when nobody has walked it. +/// That room's name, bounded, or null. +public sealed record MapViewExitName(string Exit, long? To, string? Name); + +/// +/// The room being edited, as both hosts' inspectors show it: the cell map's side column or footer line, and the window's +/// inspector panel. +/// +public sealed record MapRoomDetails( + long Id, string Name, string? Area, int X, int Y, int Z, int Weight, bool Locked, string? Symbol, string? Note, IReadOnlyList Exits) +{ + /// Value equality over the exits too, which a record's list member does not give. + public bool Equals(MapRoomDetails? other) => + other is not null && Id == other.Id && Name == other.Name && Area == other.Area && (X, Y, Z) == (other.X, other.Y, other.Z) + && Weight == other.Weight && Locked == other.Locked && Symbol == other.Symbol && Note == other.Note && Exits.SequenceEqual(other.Exits); + + public override int GetHashCode() => HashCode.Combine(Id, Name, Area, X, Y, Z, Weight, Exits.Count); +} /// A drawn exit between two rooms of the view, once per pair. public sealed record MapViewExit(long From, long To); @@ -60,6 +85,24 @@ public sealed record MapViewModel(string? Area, int Level, IReadOnlyListThe room the character is in, or null. public MapViewRoom? Current => Rooms.FirstOrDefault(r => r.Current); + /// + /// The current room's exits with the names of the rooms they lead to, directions first in compass order: what the + /// cell map lists beside the grid when it has the width, so a terminal names the rooms around you as the canvas does. + /// + public IReadOnlyList Nearby { get; init; } = []; + + /// The room being edited, or null when the map is not in edit mode. + public MapRoomDetails? Selected { get; init; } + + /// Whether the map is in edit mode: a room is selected. + public bool Editing => Selected is not null; + + /// An exit waiting for the next room walked into, said as a sentence, or null. + public string? Pending { get; init; } + + /// What an undo would take back, or null when nothing would. + public string? UndoLabel { get; init; } + /// The colour of the area the view draws, or null when that area has no name. public string? AreaColour => Areas.FirstOrDefault(a => a.Drawn)?.Colour; @@ -76,15 +119,32 @@ public sealed record MapViewModel(string? Area, int Level, IReadOnlyListThe rooms a walk under way still goes through. /// What the walk says about itself, or null. /// The area colours for the theme in use ( by default). - public static MapViewModel From(WorldMap map, long? currentRoomId, IEnumerable ahead, string? walking, MapAreaPalette? palette = null) + /// + /// The room being edited, or null. When it is not on the current room's level and area, the view is drawn around it + /// instead, so the room being edited is always drawn. + /// + /// An exit waiting for the next room walked into (). + /// What an undo would take back (). + public static MapViewModel From( + WorldMap map, long? currentRoomId, IEnumerable ahead, string? walking, MapAreaPalette? palette = null, + long? selected = null, (long From, string Exit)? pending = null, string? undo = null) { ArgumentNullException.ThrowIfNull(map); palette ??= MapAreaPalette.Dark; var anchor = currentRoomId is { } id ? map.Room(id) : null; anchor ??= map.Rooms.Values.LastOrDefault(); + var chosen = selected is { } pick ? map.Room(pick) : null; + if (chosen is not null && (anchor is null || chosen.Z != anchor.Z || chosen.AreaId != anchor.AreaId)) + { + anchor = chosen; + } + + var pendingText = pending is { } link && map.Room(link.From) is { } source + ? $"the next room you walk into is {MapDirections.Command(link.Exit)} from {Bounded(source.Name)}" + : null; if (anchor is null) { - return new MapViewModel(null, 0, [], [], walking); + return new MapViewModel(null, 0, [], [], walking) { Pending = pendingText, UndoLabel = undo }; } var path = ahead.ToHashSet(); @@ -103,7 +163,10 @@ public static MapViewModel From(WorldMap map, long? currentRoomId, IEnumerable r.Id).ToHashSet(); var exits = new List(); @@ -140,9 +203,64 @@ public static MapViewModel From(WorldMap map, long? currentRoomId, IEnumerableA room's exits named: directions in compass order, then special exits by command, then stubs. + private static List ExitsOf(WorldMap map, MapRoom room) + { + var named = new List(); + foreach (var direction in MapDirections.All) + { + if (room.Exits.TryGetValue(direction, out var to)) + { + named.Add(new(MapDirections.Command(direction), to, map.Room(to) is { } next ? Bounded(next.Name) : null)); + } + else if (room.Stubs.Contains(direction)) + { + named.Add(new(MapDirections.Command(direction), null, null)); + } + } + + foreach (var (command, to) in room.SpecialExits.OrderBy(e => e.Key, StringComparer.Ordinal)) + { + named.Add(new(Bounded(command), to, map.Room(to) is { } next ? Bounded(next.Name) : null)); + } + + foreach (var stub in room.Stubs.Where(s => !MapDirections.All.Contains(s)).Order(StringComparer.Ordinal)) + { + named.Add(new(Bounded(stub), null, null)); + } + + return named; + } + + private static MapRoomDetails DetailsOf(WorldMap map, MapRoom room) => new( + room.Id, + Bounded(room.Name), + AreaName(map, room.AreaId), + room.X, + room.Y, + room.Z, + room.Weight, + room.Locked, + ValidSymbol(room.Symbol), + room.Note is { } note ? Bounded(note) : null, + ExitsOf(map, room)); + + /// A symbol a view may draw: its first character when that is one a cell can hold, else null. + private static string? ValidSymbol(string? symbol) => + !string.IsNullOrEmpty(symbol) && WorldMap.IsSymbol(symbol[0]) ? symbol[..1] : null; + private static string Bounded(string name) => name.Length <= MaxNameLength ? name : name[..(MaxNameLength - 1)] + "…"; /// An area's name, bounded, or null for none. @@ -190,7 +308,8 @@ private static bool Climbs(WorldMap map, MapRoom room, bool up) /// Value equality over the rooms, exits and areas, which a record's list members do not give. public bool Equals(MapViewModel? other) => other is not null && Area == other.Area && Level == other.Level && Walking == other.Walking && AnchorId == other.AnchorId - && Rooms.SequenceEqual(other.Rooms) && Exits.SequenceEqual(other.Exits) && Areas.SequenceEqual(other.Areas); + && Rooms.SequenceEqual(other.Rooms) && Exits.SequenceEqual(other.Exits) && Areas.SequenceEqual(other.Areas) + && Nearby.SequenceEqual(other.Nearby) && Equals(Selected, other.Selected) && Pending == other.Pending && UndoLabel == other.UndoLabel; public override int GetHashCode() => HashCode.Combine(Area, Level, Walking, Rooms.Count, Exits.Count, Areas.Count); } diff --git a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs index c3af479b..031adef8 100644 --- a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs +++ b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs @@ -41,6 +41,9 @@ public enum SurfaceActionKind /// A room id on the map. Walk, + /// A change to a map (MapEdit), checked and applied by the client. + MapEdit, + /// A change to a declared setting, committed through the client's save funnel. Edit, @@ -288,10 +291,18 @@ public static class SurfaceCatalog new( PanelIds.Map, typeof(MapViewModel), - [new(SurfaceActionKind.Walk, "room", "WalkFromMap"), PopOut], + [ + new(SurfaceActionKind.Walk, "room", "WalkFromMap"), + + // Editing: a room selected (a cell click while editing, the cell arrows; the window's right click or a click + // while editing), and every edit — cell key, /map command, native menu or inspector — through one funnel. + new(SurfaceActionKind.Pick, "select room", "SelectMapRoom"), + new(SurfaceActionKind.MapEdit, "edit", "ApplyMapEdit"), + PopOut, + ], CellsUnderNative, "SharpMUTerm.Tui.MapRenderer.Render", - PanelViews("MapCanvas")), + [.. PanelViews("MapCanvas"), "SharpMUTerm.Avalonia.MapInspector"]), new( PanelIds.WhoHere, typeof(WhoHereModel), diff --git a/src/SharpMUTerm.Core/Commands/CommandCatalog.cs b/src/SharpMUTerm.Core/Commands/CommandCatalog.cs index a657cbdc..16ccc83e 100644 --- a/src/SharpMUTerm.Core/Commands/CommandCatalog.cs +++ b/src/SharpMUTerm.Core/Commands/CommandCatalog.cs @@ -61,6 +61,7 @@ public sealed record CharacterRef( /// /// Whether the client's own dictionaries folder holds none, so Get a spelling dictionary is offered. /// +/// What the focused character's last map edit was, so Undo map edit is offered only with one. public sealed record CommandContext( bool LoggingOn = false, bool Zoomed = false, @@ -78,7 +79,8 @@ public sealed record CommandContext( int KeyClashes = 0, IReadOnlyList? Floats = null, IReadOnlyList? RaggedWraps = null, - bool NoDictionary = false); + bool NoDictionary = false, + string? MapUndo = null); /// A world whose pane is narrower than its server's wrap column. /// The world's name. diff --git a/src/SharpMUTerm.Core/Mapping/MapModel.cs b/src/SharpMUTerm.Core/Mapping/MapModel.cs index 4e3ee74c..02425174 100644 --- a/src/SharpMUTerm.Core/Mapping/MapModel.cs +++ b/src/SharpMUTerm.Core/Mapping/MapModel.cs @@ -56,9 +56,35 @@ public sealed class MapRoom /// The room's colour as #rrggbb, or null for the default. public string? Color { get; set; } + /// The player's own note on the room, or null: kept with the map, never sent anywhere. + public string? Note { get; set; } + /// Anything a script wants to keep on the room. public Dictionary UserData { get; set; } = new(StringComparer.Ordinal); + /// A deep copy, for an edit's undo. + public MapRoom Clone() => new() + { + Id = Id, + Name = Name, + AreaId = AreaId, + X = X, + Y = Y, + Z = Z, + Environment = Environment, + Exits = new(Exits, StringComparer.Ordinal), + SpecialExits = new(SpecialExits, StringComparer.Ordinal), + Stubs = new(Stubs, StringComparer.Ordinal), + Weight = Weight, + ExitWeights = new(ExitWeights, StringComparer.Ordinal), + LockedExits = new(LockedExits, StringComparer.Ordinal), + Locked = Locked, + Symbol = Symbol, + Color = Color, + Note = Note, + UserData = new(UserData, StringComparer.Ordinal), + }; + /// Every exit, direction and special alike, as the command that takes it and where it leads. public IEnumerable<(string Command, string Key, long To)> AllExits() { @@ -118,6 +144,195 @@ public MapArea AreaNamed(string name) return created; } + // ── Edits by hand: each answers whether it changed anything, and changes nothing it refuses ────────── + + /// The longest room name, area name, note or exit command an edit keeps. + public const int MaxEditLength = 200; + + /// The heaviest weight an edit sets. + public const int MaxWeight = 1000; + + /// Renames a room. A blank name is refused. + public bool Rename(long id, string name) + { + var text = Clean(name); + if (Room(id) is not { } room || text.Length == 0 || room.Name == text) + { + return false; + } + + room.Name = text; + return true; + } + + /// Puts a room in the area called , creating it; blank takes it out of every area. + public bool SetArea(long id, string? area) + { + if (Room(id) is not { } room) + { + return false; + } + + var text = Clean(area); + int? next = text.Length == 0 ? null : AreaNamed(text).Id; + if (room.AreaId == next) + { + return false; + } + + room.AreaId = next; + return true; + } + + /// Locks or unlocks a room for paths. + public bool SetLocked(long id, bool locked) + { + if (Room(id) is not { } room || room.Locked == locked) + { + return false; + } + + room.Locked = locked; + return true; + } + + /// Sets the cost of entering a room, 1 to . + public bool SetWeight(long id, int weight) + { + if (Room(id) is not { } room || weight < 1 || weight > MaxWeight || room.Weight == weight) + { + return false; + } + + room.Weight = weight; + return true; + } + + /// + /// Points an exit of room at room : a direction (any spelling + /// reads) goes in , anything else is the command + /// of a special exit. A stub of the same name is linked. Both rooms must exist. + /// + public bool SetExit(long id, string exit, long to) + { + var key = ExitKey(exit); + if (Room(id) is not { } room || Room(to) is null || key.Length == 0) + { + return false; + } + + var exits = MapDirections.All.Contains(key) ? room.Exits : room.SpecialExits; + var changed = !exits.TryGetValue(key, out var was) || was != to; + exits[key] = to; + changed |= room.Stubs.Remove(key); + return changed; + } + + /// Removes an exit of a room, linked or a stub, by direction or command. + public bool RemoveExit(long id, string exit) + { + var key = ExitKey(exit); + if (Room(id) is not { } room || key.Length == 0) + { + return false; + } + + var removed = room.Exits.Remove(key) | room.SpecialExits.Remove(key) | room.Stubs.Remove(key); + room.ExitWeights.Remove(key); + room.LockedExits.Remove(key); + return removed; + } + + /// Moves a room on the grid by a step; up and down are . + public bool Move(long id, int dx, int dy, int dz) + { + if (Room(id) is not { } room || (dx, dy, dz) == (0, 0, 0)) + { + return false; + } + + (room.X, room.Y, room.Z) = (room.X + dx, room.Y + dy, room.Z + dz); + return true; + } + + /// Removes a room and every exit that led to it (those become stubs again, as before anyone walked them). + public bool Remove(long id) + { + if (!Rooms.Remove(id)) + { + return false; + } + + foreach (var other in Rooms.Values) + { + foreach (var key in other.Exits.Where(e => e.Value == id).Select(e => e.Key).ToList()) + { + other.Exits.Remove(key); + other.Stubs.Add(key); + } + + foreach (var key in other.SpecialExits.Where(e => e.Value == id).Select(e => e.Key).ToList()) + { + other.SpecialExits.Remove(key); + other.Stubs.Add(key); + } + } + + return true; + } + + /// Sets a room's note; blank clears it. + public bool SetNote(long id, string? note) + { + var text = Clean(note); + string? next = text.Length == 0 ? null : text; + if (Room(id) is not { } room || room.Note == next) + { + return false; + } + + room.Note = next; + return true; + } + + /// Sets the one character drawn in a room's cell; blank clears it. Only a printable, single-cell character. + public bool SetSymbol(long id, string? symbol) + { + var text = Clean(symbol); + if (Room(id) is not { } room || text.Length > 1 || (text.Length == 1 && !IsSymbol(text[0]))) + { + return false; + } + + string? next = text.Length == 0 ? null : text; + if (room.Symbol == next) + { + return false; + } + + room.Symbol = next; + return true; + } + + /// Whether a character may be a room's symbol: printable, one cell, not markup's brackets. + public static bool IsSymbol(char c) => + !char.IsControl(c) && !char.IsSurrogate(c) && !char.IsWhiteSpace(c) && c is not ('[' or ']') && c < 0x2E80; + + /// An exit's key: a direction's canonical name, else the command as typed, trimmed and bounded. + public static string ExitKey(string? exit) => MapDirections.Normalise(Clean(exit)) ?? Clean(exit); + + /// Text from a player: control characters out, trimmed, bounded to . + private static string Clean(string? text) + { + if (string.IsNullOrWhiteSpace(text)) + { + return string.Empty; + } + + var kept = new string(text.Where(c => !char.IsControl(c)).ToArray()).Trim(); + return kept.Length <= MaxEditLength ? kept : kept[..MaxEditLength]; + } + /// Whether a room other than already sits at this point of this area. public bool IsOccupied(int? areaId, int x, int y, int z, long except) => Rooms.Values.Any(r => r.Id != except && r.AreaId == areaId && r.X == x && r.Y == y && r.Z == z); diff --git a/src/SharpMUTerm.Core/Mapping/MapRecorder.cs b/src/SharpMUTerm.Core/Mapping/MapRecorder.cs index 7ffcc766..fbdf3352 100644 --- a/src/SharpMUTerm.Core/Mapping/MapRecorder.cs +++ b/src/SharpMUTerm.Core/Mapping/MapRecorder.cs @@ -124,6 +124,158 @@ public void Edit(Action change) Changed?.Invoke(this, EventArgs.Empty); } + /// The most edits can take back. + public const int UndoDepth = 10; + + /// What an undo puts back: the rooms an edit touched as they were (null where it made one), the areas, and the pending link. + private sealed record UndoEntry(string Label, IReadOnlyDictionary Rooms, IReadOnlyDictionary Areas, (long From, string Exit)? Pending); + + private readonly LinkedList _undo = new(); + + /// + /// An exit waiting for the next room the character walks into: From's Exit will lead there. Set by + /// ; read by a view to say so. + /// + public (long From, string Exit)? PendingLink { get; private set; } + + /// What would take back, or null when nothing would. + public string? UndoLabel + { + get + { + lock (SyncRoot) + { + return _undo.First?.Value.Label; + } + } + } + + /// How many edits can take back. + public int UndoCount + { + get + { + lock (SyncRoot) + { + return _undo.Count; + } + } + } + + /// + /// A change made by hand that can be undone: the rooms names are copied first, the + /// change is applied under the lock, and when it answers true it is kept for (the last + /// ), the map is marked dirty and redrawn. When it answers false nothing is kept or raised. + /// + public bool Edit(string label, IEnumerable touched, Func change) + { + ArgumentNullException.ThrowIfNull(change); + bool changed; + lock (SyncRoot) + { + var entry = Snapshot(label, touched); + changed = change(Map); + if (changed) + { + Push(entry); + IsDirty = true; + } + } + + if (changed) + { + Changed?.Invoke(this, EventArgs.Empty); + } + + return changed; + } + + /// + /// Arms of room to lead to the next room the character walks into + /// (Mudlet's "the room I go to next"). Undoable like any edit; a second arming replaces the first. + /// + public bool LinkNext(long from, string exit) + { + var key = WorldMap.ExitKey(exit); + if (key.Length == 0) + { + return false; + } + + lock (SyncRoot) + { + if (Map.Room(from) is null || PendingLink == (from, key)) + { + return false; + } + + Push(Snapshot($"wait to link {key}", [])); + PendingLink = (from, key); + } + + Changed?.Invoke(this, EventArgs.Empty); + return true; + } + + /// Takes back the last edit. Returns what it took back, or null when there was nothing to. + public string? Undo() + { + string label; + lock (SyncRoot) + { + if (_undo.First?.Value is not { } entry) + { + return null; + } + + _undo.RemoveFirst(); + foreach (var (id, room) in entry.Rooms) + { + if (room is null) + { + Map.Rooms.Remove(id); + } + else + { + Map.Rooms[id] = room.Clone(); + } + } + + // Areas the edit made go again unless a room has come to use one since; the ones it had are put back. + foreach (var id in Map.Areas.Keys.Where(id => !entry.Areas.ContainsKey(id) && Map.Rooms.Values.All(r => r.AreaId != id)).ToList()) + { + Map.Areas.Remove(id); + } + + foreach (var (id, area) in entry.Areas) + { + Map.Areas[id] = new MapArea { Id = area.Id, Name = area.Name }; + } + + PendingLink = entry.Pending; + IsDirty = true; + label = entry.Label; + } + + Changed?.Invoke(this, EventArgs.Empty); + return label; + } + + private UndoEntry Snapshot(string label, IEnumerable touched) => new( + label, + touched.Distinct().ToDictionary(id => id, id => Map.Room(id)?.Clone()), + Map.Areas.ToDictionary(a => a.Key, a => new MapArea { Id = a.Value.Id, Name = a.Value.Name }), + PendingLink); + + private void Push(UndoEntry entry) + { + _undo.AddFirst(entry); + while (_undo.Count > UndoDepth) + { + _undo.RemoveLast(); + } + } + /// Applies one observation. Public so a test, or a script, can drive the recorder directly. public void Apply(RoomObservation observation) { @@ -194,6 +346,14 @@ private void ApplyCore(RoomObservation observation) Link(previous, walked, room); } + // An exit the player asked to lead to "the next room I go to": this is it, unless it is the room it leaves. + if (PendingLink is { } pending && pending.From != room.Id && Map.Room(pending.From) is not null) + { + Push(Snapshot($"link {pending.Exit}", [pending.From])); + Map.SetExit(pending.From, pending.Exit, room.Id); + PendingLink = null; + } + CurrentRoomId = room.Id; Touch(); } diff --git a/src/SharpMUTerm.Tui/MapRenderer.cs b/src/SharpMUTerm.Tui/MapRenderer.cs index f3c6c25c..c182fd2f 100644 --- a/src/SharpMUTerm.Tui/MapRenderer.cs +++ b/src/SharpMUTerm.Tui/MapRenderer.cs @@ -47,7 +47,16 @@ internal static class MapRenderer /// The inks a map is drawn in. Hexes, already held to the legibility floor by the caller; /// is the pane plane the area colours are held to, or null to draw them as the view gives them. /// - internal readonly record struct Ink(string Title, string Current, string Path, string Locked, Rgb? Plane = null); + internal readonly record struct Ink(string Title, string Current, string Path, string Locked, Rgb? Plane = null, string? Selected = null); + + /// The narrowest map that lists names beside its grid: the current room's exits, or the room being edited. + internal const int SideFromWidth = 64; + + /// The side column's width in a map wide, or 0 for none. + internal static int SideWidth(int width) => width >= SideFromWidth ? Math.Clamp(width / 3, 22, 36) : 0; + + /// The shortest map that lists names under its grid when it has no side column. + internal const int UnderFromHeight = 18; private enum Kind { @@ -58,6 +67,7 @@ private enum Kind Current, Path, Locked, + Selected, } private readonly record struct Cell(char Glyph, Kind Kind, long? Room, string? Colour = null); @@ -91,7 +101,14 @@ internal static List Render( /// areas or colour them differently. Only the exits' geometry (directions, stubs, ways off the level), which the /// view does not carry, is read from . An empty map says so. /// - internal static List Render(MapViewModel view, WorldMap map, int width, int height, Ink ink) + internal static List Render(MapViewModel view, WorldMap map, int width, int height, Ink ink) => + Render(view, map, width, height, ink, keysHeld: true); + + /// + /// The map as draws it, saying in edit mode whether the + /// map holds the keyboard () or has handed a /map command to the command line. + /// + internal static List Render(MapViewModel view, WorldMap map, int width, int height, Ink ink, bool keysHeld) { width = Math.Max(1, width); height = Math.Max(1, height); @@ -107,7 +124,9 @@ internal static List Render(MapViewModel view, WorldMap map, int width, var current = view.Current?.Id; var ahead = view.Rooms.Where(r => r.Ahead).Select(r => r.Id); - var title = new StringBuilder("Map"); + // The room you are in leads the title: the one name a reader wants from a map at a glance, and the one a grid + // of [ ] cannot say. With no current room the map is a map of somewhere else, and says so. + var title = new StringBuilder(view.Current is { } here ? here.Name : "Map"); if (!string.IsNullOrWhiteSpace(view.Area)) { title.Append(" · ").Append(view.Area); @@ -125,16 +144,28 @@ internal static List Render(MapViewModel view, WorldMap map, int width, return lines; } - var legend = height >= LegendMinHeight; - var rows = height - 1 - (legend ? 1 : 0); - var grid = new Cell[rows, width]; + // Names go beside the grid when the map is wide, else under it: in edit mode the room and the keys that edit it, + // otherwise (in a tall pane) what each exit of your room leads to. Edit mode spends the legend's row on them. + var side = SideWidth(width); + var gridWidth = side > 0 ? width - side - 2 : width; + var legend = !view.Editing && height >= LegendMinHeight; + var under = side > 0 ? [] : UnderLines(view, width, height, ink, keysHeld); + var rows = Math.Max(0, height - 1 - (legend ? 1 : 0) - under.Count); + var grid = new Cell[rows, gridWidth]; var ahead_ = ahead.ToHashSet(); var byId = view.Rooms.ToDictionary(r => r.Id); var roomInk = AreaInk(view.AreaColour, ink); - // Rooms are placed so the centre room's middle cell lands in the middle of the box. - var originCol = width / 2 - 1; + // Rooms are placed so the centre room's middle cell lands in the middle of the box — unless the room being + // edited would then fall outside it, when that room is the centre instead. + var originCol = gridWidth / 2 - 1; var originRow = rows / 2; + if (view.Selected is { } picked && map.Room(picked.Id) is { } chosen + && (Math.Abs(chosen.X - centre.X) * CellWidth > originCol - 1 || Math.Abs(chosen.Y - centre.Y) * CellHeight > originRow)) + { + centre = chosen; + } + (int Col, int Row) At(MapRoom room) => (originCol + (room.X - centre.X) * CellWidth, originRow + (room.Y - centre.Y) * CellHeight); @@ -144,7 +175,7 @@ internal static List Render(MapViewModel view, WorldMap map, int width, void Put(int col, int row, char glyph, Kind kind, long? room = null, string? colour = null) { - if (row < 0 || row >= rows || col < 0 || col >= width) + if (row < 0 || row >= rows || col < 0 || col >= gridWidth) { return; } @@ -188,7 +219,8 @@ void Put(int col, int row, char glyph, Kind kind, long? room = null, string? col foreach (var room in level) { var (col, row) = At(room); - var kind = room.Id == current ? Kind.Current + var kind = room.Id == view.Selected?.Id ? Kind.Selected + : room.Id == current ? Kind.Current : room.Locked ? Kind.Locked : ahead_.Contains(room.Id) ? Kind.Path : Kind.Room; @@ -198,14 +230,17 @@ void Put(int col, int row, char glyph, Kind kind, long? room = null, string? col Put(col + 2, row, ']', kind, room.Id, colour); } + var column = side > 0 ? SideLines(view, side, rows + (legend ? 1 : 0), ink, keysHeld) : []; for (var row = 0; row < rows; row++) { - lines.Add(Row(grid, row, width, ink)); + lines.Add(WithSide(Row(grid, row, gridWidth, ink), column, row, gridWidth)); } + lines.AddRange(under); + if (legend) { - lines.Add(Legend(view, width, ink)); + lines.Add(WithSide(Legend(view, gridWidth, ink), column, rows, gridWidth)); } return lines; @@ -341,9 +376,9 @@ private static char Middle(MapRoom room, MapViewRoom? seen, long? current) return '@'; } - if (!string.IsNullOrEmpty(room.Symbol) && !char.IsControl(room.Symbol[0]) && !char.IsSurrogate(room.Symbol[0])) + if (seen?.Symbol is { Length: > 0 } symbol) { - return room.Symbol[0]; + return symbol[0]; } // The stairs are the view's, so the window's marks and these arrows are one answer. @@ -352,6 +387,205 @@ private static char Middle(MapRoom room, MapViewRoom? seen, long? current) return up && down ? '↕' : up ? '↑' : down ? '↓' : ' '; } + /// A grid row with the side column's line for it, the column starting two cells past the grid. + private static string WithSide(string row, IReadOnlyList column, int index, int gridWidth) + { + if (index >= column.Count || column[index].Length == 0) + { + return row; + } + + var pad = Math.Max(0, gridWidth + 2 - MarkupText.VisibleLength(row)); + return row + new string(' ', pad) + column[index]; + } + + /// + /// The side column, beside a wide grid: the room being edited and the keys that edit it, or else where you are and + /// what each exit leads to. Every line is cut to and there are at most . + /// + private static List SideLines(MapViewModel view, int width, int rows, Ink ink, bool keysHeld) + { + var lines = new List(); + if (view.Selected is { } room) + { + lines.AddRange(DetailLines(view, width, ink)); + foreach (var exit in room.Exits.Take(Math.Max(0, rows - lines.Count - MapEditing.Keys.Count - 1))) + { + lines.Add(ExitLine(exit, width)); + } + + lines.Add(string.Empty); + if (!keysHeld) + { + lines.AddRange(KeysLines(width, ink, keysHeld, 3)); + } + else + { + foreach (var (key, word) in MapEditing.Keys.Take(Math.Max(0, rows - lines.Count))) + { + lines.Add(Fit($"[bold {ink.Current}]{MarkupText.Escape(key.PadRight(6))}[/][dim]{word}[/]", width)); + } + } + } + else if (view.Current is { } here) + { + lines.Add(Fit($"[bold {ink.Current}]@[/] [bold]{MarkupText.Escape(Elide(here.Name, width - 2))}[/]", width)); + foreach (var exit in view.Nearby.Take(Math.Max(0, rows - 1))) + { + lines.Add(ExitLine(exit, width)); + } + } + + return lines.Take(rows).ToList(); + } + + /// + /// What goes under a grid with no side column. In edit mode, the room being edited and the keys — a few lines each + /// in a tall pane, one each in a short one. Otherwise, in a tall pane, what each exit of your room leads to. + /// + private static List UnderLines(MapViewModel view, int width, int height, Ink ink, bool keysHeld) + { + if (view.Editing) + { + return height >= UnderFromHeight + ? [string.Empty, .. DetailLines(view, width, ink), .. KeysLines(width, ink, keysHeld, 5)] + : height >= 4 ? [RoomLine(view, width, ink), .. KeysLines(width, ink, keysHeld, 1)] : []; + } + + if (height < UnderFromHeight || view.Nearby.Count == 0) + { + return []; + } + + return [string.Empty, .. view.Nearby.Take(Math.Max(1, height / 4)).Select(e => ExitLine(e, width))]; + } + + /// The room being edited, a fact a line: its number and name, area, place and weight, then its note and a waiting link. + private static List DetailLines(MapViewModel view, int width, Ink ink) + { + var room = view.Selected!; + string Name(string text, int room) => MarkupText.Escape(Elide(text, room)); + var lines = new List + { + Fit($"[bold {ink.Title}]{Name($"#{room.Id.ToString(CultureInfo.InvariantCulture)} {room.Name}", width)}[/]", width), + Fit($"[dim]area [/]{Name(room.Area ?? "—", width - 6)}", width), + Fit( + $"[dim]at [/]{room.X.ToString(CultureInfo.InvariantCulture)}, {room.Y.ToString(CultureInfo.InvariantCulture)} [dim]level[/] {room.Z.ToString(CultureInfo.InvariantCulture)}", + width), + Fit( + $"[dim]weight[/] {room.Weight.ToString(CultureInfo.InvariantCulture)}" + + (room.Locked ? $" [{ink.Locked}]locked[/]" : string.Empty) + + (room.Symbol is { } symbol ? $" [dim]mark[/] {MarkupText.Escape(symbol)}" : string.Empty), + width), + }; + if (room.Note is { } note) + { + lines.Add(Fit($"[dim]note [/]{Name(note, width - 6)}", width)); + } + + if (view.Pending is { } pending) + { + lines.Add(Fit($"[{ink.Path}]{Name(pending, width)}[/]", width)); + } + + return lines; + } + + private static string ExitLine(MapViewExitName exit, int width) + { + var where = exit.To is null + ? "[dim]not walked[/]" + : MarkupText.Escape(Elide(exit.Name ?? "#" + exit.To.Value.ToString(CultureInfo.InvariantCulture), width - 6)); + return Fit($"[dim]{MarkupText.Escape(Elide(exit.Exit, 5).PadRight(5))}[/] {where}", width); + } + + /// Edit mode's room line, under a short grid with no side column: the room being edited, in a line. + private static string RoomLine(MapViewModel view, int width, Ink ink) + { + var room = view.Selected!; + var parts = new List { $"#{room.Id.ToString(CultureInfo.InvariantCulture)} {room.Name}" }; + if (room.Area is { } area) + { + parts.Add(area); + } + + parts.Add($"{room.X.ToString(CultureInfo.InvariantCulture)},{room.Y.ToString(CultureInfo.InvariantCulture)},{room.Z.ToString(CultureInfo.InvariantCulture)}"); + if (room.Weight != 1) + { + parts.Add("weight " + room.Weight.ToString(CultureInfo.InvariantCulture)); + } + + if (room.Locked) + { + parts.Add("locked"); + } + + if (room.Symbol is { } symbol) + { + parts.Add("mark " + symbol); + } + + if (room.Note is { } note) + { + parts.Add("note: " + note); + } + + if (view.Pending is { } pending) + { + parts.Add(pending); + } + + return $"[bold {ink.Title}]{MarkupText.Escape(Elide(string.Join(" · ", parts), width))}[/]"; + } + + /// + /// Edit mode's keys over at most lines, in ' order, with + /// Esc done always the last; while a /map command waits on the command line, how to finish it instead. + /// + internal static List KeysLines(int width, Ink ink, bool keysHeld, int max) + { + if (!keysHeld) + { + return [Fit("[dim]finish the /map command on the command line · ⏎ applies it · ⌃P ▸ Edit map takes the keys back[/]", width)]; + } + + string Item((string Key, string Word) k) => $"[bold {ink.Current}]{MarkupText.Escape(k.Key)}[/] [dim]{k.Word}[/]"; + static int Cost((string Key, string Word) k) => k.Key.Length + 1 + k.Word.Length; + var last = MapEditing.Keys[^1]; + var lines = new List> { new() }; + var used = 0; + foreach (var key in MapEditing.Keys.Take(MapEditing.Keys.Count - 1)) + { + var cost = (lines[^1].Count == 0 ? 0 : 3) + Cost(key); + var reserve = lines.Count == max ? 3 + Cost(last) : 0; + if (used + cost + reserve > width) + { + if (lines.Count == max) + { + break; + } + + lines.Add(new()); + used = 0; + cost = Cost(key); + } + + lines[^1].Add(key); + used += cost; + } + + if (used + 3 + Cost(last) > width && lines.Count < max) + { + lines.Add(new()); + } + + lines[^1].Add(last); + return lines.Select(l => Fit(string.Join(" [dim]·[/] ", l.Select(Item)), width)).ToList(); + } + + private static string Elide(string text, int width) => + width <= 0 ? string.Empty : text.Length <= width ? text : text[..Math.Max(0, width - 1)] + "…"; + private static string Title(string text, int width, Ink ink) { var plain = text.Length > width ? text[..Math.Max(0, width - 1)] + "…" : text; @@ -396,6 +630,7 @@ private static string Row(Cell[,] grid, int row, int width, Ink ink) Kind.Current => $"[bold {ink.Current}]{escaped}[/]", Kind.Path => $"[{ink.Path}]{escaped}[/]", Kind.Locked => $"[{ink.Locked}]{escaped}[/]", + Kind.Selected => $"[{ink.Selected ?? "bold " + ink.Current}]{escaped}[/]", _ => escaped, }; diff --git a/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs b/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs index 890121c2..e2a4f237 100644 --- a/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs +++ b/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs @@ -219,6 +219,15 @@ void Notice(NoticeOverlay notice) /// host that can float a panel (); null elsewhere, and for a panel that cannot /// float. Safe to call from any thread; one instance per window. /// +/// +/// For the map, selects a room for editing (SelectMapRoom), or with null ends editing: what a click on a cell room +/// does while the cell map is in edit mode. Safe to call from any thread; one instance per window. +/// +/// +/// For the map, makes one edit (ApplyMapEdit), the funnel the cell map's keys and /map commands end in. The +/// client checks it; the window only builds a from its inspector. Safe to +/// call from any thread; one instance per window. +/// internal sealed record PanelOverlay( string PanelId, string WindowId, @@ -233,7 +242,9 @@ internal sealed record PanelOverlay( Action? Dispatch = null, SharpMUTerm.Client.Composer.ComposerModel? Composer = null, SharpMUTerm.Client.Composer.ComposerSession? ComposerSession = null, - Action? PopOut = null); + Action? PopOut = null, + Action? SelectRoom = null, + Action? EditMap = null); /// A panel's colours as #rrggbb: a bar or fill, the warning, and the empty part of a bar. internal sealed record PanelInk(string Bar, string Low, string Track); diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Desktop.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Desktop.cs index f51c7a82..2107f9ba 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Desktop.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Desktop.cs @@ -243,7 +243,7 @@ private void PublishPanels() : _mapWalkers[windowId] = room => OnUiThread(() => WalkFromMap(windowId, room)); return new PanelOverlay( PanelIds.Map, windowId, rect, new PanelInk(_ink.Accent, _ink.Draft, _ink.Lift(new Rgb(0x6a, 0x6a, 0x72))), null, view, walker, - PopOut: popOut); + PopOut: popOut, SelectRoom: MapSelectorFor(windowId), EditMap: MapEditorFor(windowId)); } if (!TerminalPanels.TryParseWindowId(windowId, out var panelId, out var key)) @@ -324,8 +324,7 @@ private void PickFromPanel(string windowId, string sessionKey, int index) return cached.Model; } - var walking = map.Walk.IsWalking ? $"walking, {map.Walk.Remaining} to go" : null; - var model = MapViewModel.From(map.Map, map.Recorder.CurrentRoomId, map.Walk.RoomsAhead, walking, MapPalette()); + var model = BuildMapView(windowId, map); _mapViews[windowId] = (revision, model); return model; } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.MapEdit.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.MapEdit.cs new file mode 100644 index 00000000..65409e8d --- /dev/null +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.MapEdit.cs @@ -0,0 +1,371 @@ +using System.Globalization; +using System.Text; +using SharpConsoleUI; +using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Client.Panels; +using SharpMUTerm.Core.Diagnostics; +using SharpMUTerm.Core.Mapping; + +namespace SharpMUTerm.Tui; + +/// +/// Editing a map, in both hosts, from one model and one funnel. A map is in edit mode while a room of it is +/// selected (, per map window): ⌃P ▸ Edit map selects the room you are in, a +/// click on a cell room selects it while editing, and the window selects a room on a right click (its menu) or a click +/// while editing (its inspector). Every edit — a cell key, a /map command, a native menu entry or inspector field — +/// is a that ends in , which runs on the +/// UI thread: under , marked dirty (so it is saved with the recorded rooms), and kept +/// for undo. +/// +/// The keys are the map's while it holds them (), the way ⌥C puts them on the sidebar: client +/// state the main window's key chain reads first, focus never moving. An edit that needs words puts its /map +/// command on the command line, filled with what the room holds now, and hands the keys over until it is sent; any other +/// key the map does not answer ends editing and goes on to the command line. +/// +/// +internal sealed partial class SharpMUTermApp +{ + /// The room being edited, by map window. A window in this is in edit mode. + private readonly Dictionary _mapSelection = new(StringComparer.Ordinal); + + /// The map window that holds the keyboard, or null. + private string? _mapKeys; + + /// The overlay callbacks, one instance per window so an overlay compares equal frame to frame. + private readonly Dictionary> _mapSelectors = new(StringComparer.Ordinal); + + private readonly Dictionary> _mapEditors = new(StringComparer.Ordinal); + + /// What the command line held when a map key put a /map command on it, put back once that command runs. + private string? _mapLentDraft; + + /// Whether a map holds the keys. Internal for tests. + internal bool MapKeysActive => _mapKeys is not null; + + /// The room selected on a map window, or null. Internal for tests. + internal long? MapSelection(string windowId) => _mapSelection.TryGetValue(windowId, out var room) ? room : null; + + /// + /// One map window's model: the recorder's map around the current room, the walk, and the edit state. The cell map and + /// the window's native map are both drawn from what this builds. + /// + private MapViewModel BuildMapView(string windowId, SessionMap map) + { + var walking = map.Walk.IsWalking ? $"walking, {map.Walk.Remaining} to go" : null; + long? selected = _mapSelection.TryGetValue(windowId, out var room) && map.Map.Room(room) is not null ? room : null; + return MapViewModel.From( + map.Map, map.Recorder.CurrentRoomId, map.Walk.RoomsAhead, walking, MapPalette(), selected, map.Recorder.PendingLink, map.Recorder.UndoLabel); + } + + /// + /// ⌃P ▸ Edit map: the focused character's map goes into edit mode on the room you are in (opening the map if no + /// pane shows it) and takes the keys. Again while editing: takes the keys back if a /map command had them, else + /// ends editing. + /// + private void ToggleMapEdit() + { + var key = SendTarget()?.SessionKey ?? _workspace.FindWindow(ActiveWindowId())?.SessionKey; + if (MapOf(key) is not { } map) + { + RefuseCommand("no map here — pick a character first (⌃P ▸ Switch to …)"); + return; + } + + var windowId = MapWindowId(key!); + if (_mapSelection.ContainsKey(windowId)) + { + if (_mapKeys != windowId) + { + _mapKeys = windowId; + RenderMap(windowId); + return; + } + + LeaveMapEdit(windowId); + return; + } + + var start = map.Recorder.CurrentRoomId ?? MapViewModel.From(map.Map, null, [], null).AnchorId; + if (start is null) + { + RefuseCommand("nothing is mapped yet — walk somewhere first"); + return; + } + + if (_workspace.Layout.FindWindow(windowId) is null || IsFloating(windowId)) + { + ShowMap(); + } + + SelectMapRoom(windowId, start); + } + + /// + /// Selects a room on a map window (null ends editing): the one way selection changes, from the cell keys, a cell click + /// while editing and the window's map. Selecting takes the keys. + /// + /// Whose map a map window draws: its recorded owner, else the session key its id names (a map not yet opened). + private string? MapOwner(string windowId) => + _workspace.FindWindow(windowId)?.SessionKey + ?? (windowId.StartsWith(MapWindowPrefix, StringComparison.Ordinal) ? windowId[MapWindowPrefix.Length..] : null); + + internal void SelectMapRoom(string windowId, long? room) + { + if (room is not { } id) + { + LeaveMapEdit(windowId); + return; + } + + if (MapOf(MapOwner(windowId)) is not { } map || map.Map.Room(id) is null) + { + return; + } + + var entering = !_mapSelection.ContainsKey(windowId); + _mapSelection[windowId] = id; + _mapKeys = windowId; + RenderMap(windowId); + if (entering) + { + Notice("map: ←↑→↓ select · r rename · l lock · Del delete · u undo · Esc done", MessageSeverity.Info, "⌃P", source: NoticeModel.Sources.Map); + } + } + + /// Ends editing on a map window: no room selected, and the keys back on the command line. + private void LeaveMapEdit(string windowId) + { + var was = _mapSelection.Remove(windowId); + if (_mapKeys == windowId) + { + _mapKeys = null; + was = true; + } + + if (was) + { + RenderMap(windowId); + } + } + + /// + /// Every map edit ends here, from either host: applied to the window's own character's map on the UI thread + /// (), said in a notice, and redrawn by the recorder's Changed. A selected room an + /// edit took away (a delete, an undo of an added room) moves the selection to the room you are in. Returns what + /// refused it, or null. + /// + internal string? ApplyMapEdit(string windowId, MapEdit edit) + { + if (MapOf(MapOwner(windowId)) is not { } map) + { + Notice("no map here: this window has no connection.", source: NoticeModel.Sources.Map); + return "no map"; + } + + var result = MapEditing.Apply(map.Recorder, edit); + if (_mapSelection.TryGetValue(windowId, out var selected) && map.Map.Room(selected) is null) + { + var next = map.Recorder.CurrentRoomId ?? MapViewModel.From(map.Map, null, [], null).AnchorId; + if (next is { } room) + { + _mapSelection[windowId] = room; + } + else + { + _mapSelection.Remove(windowId); + } + } + + if (_mapSelection.ContainsKey(windowId) && _mapKeys is null) + { + _mapKeys = windowId; // an edit finished from the command line gives the keys back to the map it edits + } + + RenderMap(windowId); + Notice(result.Message + ".", result.Done ? MessageSeverity.Info : MessageSeverity.Warning, source: NoticeModel.Sources.Map); + return result.Done ? null : result.Message; + } + + /// /map with an editing verb: parsed into an edit for the window's own character's map. + private void MapEditCommand(string windowId, SessionMap map, string sessionKey, string argument) + { + var (edit, problem) = MapEditing.Parse(argument, name => (name is null ? map.Recorder.CurrentRoom : map.Find(name))?.Id); + if (edit is null) + { + AppendWindowLine(windowId, $"[dim]*** {MarkupText.Escape(problem ?? "no such edit")}.[/]"); + return; + } + + ApplyMapEdit(MapWindowId(sessionKey), edit); + if (_mapLentDraft is { } draft) + { + _mapLentDraft = null; + ActiveBar().SetAndNotify(draft); // the line being typed when a map key borrowed the command line comes back + } + } + + /// + /// A key while a map holds the keyboard. Returns true for the keys it answers (); any other + /// ends editing and returns false, so the key goes on down the chain to the command line. + /// + private bool TryMapKey(KeyPressedEventArgs e) + { + if (_mapKeys is not { } windowId) + { + return false; + } + + if (!_mapSelection.TryGetValue(windowId, out var room) || MapOf(MapOwner(windowId)) is not { } map) + { + _mapKeys = null; + return false; + } + + var key = e.KeyInfo; + var bare = key.Modifiers == 0; + var shift = key.Modifiers == ConsoleModifiers.Shift; + (int Dx, int Dy)? arrow = key.Key switch + { + ConsoleKey.LeftArrow => (-1, 0), + ConsoleKey.RightArrow => (1, 0), + ConsoleKey.UpArrow => (0, -1), + ConsoleKey.DownArrow => (0, 1), + _ => null, + }; + + if (arrow is { } step && bare) + { + if (MapEditing.Neighbour(BuildMapView(windowId, map), room, step.Dx, step.Dy) is { } next) + { + SelectMapRoom(windowId, next); + } + } + else if (arrow is { } nudge && shift) + { + ApplyMapEdit(windowId, MapEdit.Move(room, nudge.Dx, nudge.Dy)); + } + else if (key.Key == ConsoleKey.Delete && bare) + { + ApplyMapEdit(windowId, MapEdit.Delete(room)); + } + else if (key.Key == ConsoleKey.Escape) + { + LeaveMapEdit(windowId); + } + else if (key.Key == ConsoleKey.Enter && bare) + { + if (map.Recorder.CurrentRoomId != room) + { + WalkFromMap(windowId, room); + } + } + else if (key.Modifiers is (ConsoleModifiers)0 or ConsoleModifiers.Shift && key.KeyChar switch + { + 'l' => Edit(MapEdit.Lock(room, map.Map.Room(room)?.Locked != true)), + 'u' => Edit(MapEdit.Undo), + 'r' => Words(MapEditing.RenameVerb), + 'a' => Words(MapEditing.AreaVerb), + 'w' => Words(MapEditing.WeightVerb), + 'x' => Words(MapEditing.ExitVerb), + '-' => Words(MapEditing.UnexitVerb), + 'n' => Words(MapEditing.NoteVerb), + 's' => Words(MapEditing.SymbolVerb), + _ => false, + }) + { + // answered in the switch + } + else + { + LeaveMapEdit(windowId); + return false; + } + + e.Handled = true; + return true; + + bool Edit(MapEdit edit) + { + ApplyMapEdit(windowId, edit); + return true; + } + + bool Words(string verb) + { + if (BuildMapView(windowId, map).Selected is not { } details || MapEditing.CommandFor(verb, details) is not { } command) + { + return false; + } + + // The command goes on the command line and the keys with it; ⏎ there applies it and gives them back. + _mapKeys = null; + if (ArmedComposer() is not null) + { + ReleaseComposer(); + } + + _mapLentDraft = ActiveBar().Text.Length > 0 ? ActiveBar().Text : null; + PlaceGrab(ActiveBar(), command, MapOwner(windowId)); + RenderMap(windowId); + Notice("finish the /map command on the command line — ⏎ applies it.", MessageSeverity.Info, source: NoticeModel.Sources.Map); + return true; + } + } + + /// Drives a key into the map's key handling as the main window would. Internal for tests. + internal bool SimulateMapKey(ConsoleKeyInfo key) => TryMapKey(new KeyPressedEventArgs(key, false)); + + /// The window's selector callback for a map window: a room selected (null closes the inspector), on the client's thread. + private Action MapSelectorFor(string windowId) => + _mapSelectors.TryGetValue(windowId, out var known) + ? known + : _mapSelectors[windowId] = room => OnUiThread(() => SelectMapRoom(windowId, room)); + + /// The window's edit callback for a map window: every native edit through . + private Action MapEditorFor(string windowId) => + _mapEditors.TryGetValue(windowId, out var known) + ? known + : _mapEditors[windowId] = edit => OnUiThread(() => ApplyMapEdit(windowId, edit)); + + /// + /// Every map this client holds, as text: each room with its name, area, place, weight, lock, symbol, note and exits, + /// the pending link, how many edits can be undone, and what each map window has selected. Two clients that made the + /// same edits read the same. Internal for tests. + /// + internal string MapDigest() + { + var text = new StringBuilder(); + var maps = _recorders.Values.ToList(); + if (_demoMap is not null) + { + maps.Add(_demoMap); + } + + foreach (var map in maps) + { + lock (map.Recorder.SyncRoot) + { + foreach (var room in map.Map.Rooms.Values.OrderBy(r => r.Id)) + { + var area = room.AreaId is { } a && map.Map.Areas.TryGetValue(a, out var named) ? named.Name : "-"; + text.Append(CultureInfo.InvariantCulture, $"{room.Id}:{room.Name}@{area}({room.X},{room.Y},{room.Z})w{room.Weight}") + .Append(room.Locked ? "L" : string.Empty) + .Append(CultureInfo.InvariantCulture, $"[{room.Symbol}|{room.Note}]{{") + .AppendJoin(',', room.AllExits().Select(e => $"{e.Key}>{e.To}").Order(StringComparer.Ordinal)) + .Append('/') + .AppendJoin(',', room.Stubs.Order(StringComparer.Ordinal)) + .Append("} "); + } + } + + text.Append(CultureInfo.InvariantCulture, $"pending={map.Recorder.PendingLink} undo={map.Recorder.UndoCount} "); + } + + foreach (var (window, room) in _mapSelection.OrderBy(p => p.Key, StringComparer.Ordinal)) + { + text.Append(CultureInfo.InvariantCulture, $"selected {window}={room} "); + } + + return text.Append("keys=").Append(_mapKeys).ToString(); + } +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index aac90e75..ac2e8632 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -1962,10 +1962,10 @@ public string RenderSnapshot(string? view = null) // The map window, over the demo's recorded streets: opened through the real ⌃P entry; `map-walking` // starts a walk to the docks through the real `/walk`, so the path ahead is marked; `map-split` puts // the map beside the output, the way it is meant to be read. - if (view?.ToLowerInvariant() is "map" or "map-walking" or "map-split") + if (view?.ToLowerInvariant() is "map" or "map-walking" or "map-split" or "map-edit") { LoadDemoMap(); - var split = string.Equals(view, "map-split", StringComparison.OrdinalIgnoreCase); + var split = view.ToLowerInvariant() is "map-split" or "map-edit"; if (split) { // Split first, so the map opens in front in the right-hand pane, then hand the focus back to @@ -1989,6 +1989,16 @@ public string RenderSnapshot(string? view = null) Activate(MainWindowId); RefreshRail(); } + + // `map-edit`: the real ⌃P ▸ Edit map, → to the market through the map's own keys, a note through `/map note`, + // and l to lock it — so the frame shows the room being edited, its inspector and the keys that edit it. + if (string.Equals(view, "map-edit", StringComparison.OrdinalIgnoreCase)) + { + DispatchCommand("map:edit"); + SimulateMapKey(new ConsoleKeyInfo('\0', ConsoleKey.RightArrow, false, false, false)); + MapCommand(MainWindowId, "map", "note 4210 Spice traders gather here at dawn"); + SimulateMapKey(new ConsoleKeyInfo('l', ConsoleKey.L, false, false, false)); + } } // The Packages screen with two installed (one switched off), the review an install opens with, and @@ -8401,6 +8411,7 @@ private CommandContext CommandState() NewlineChord: Host.Keys.Newline.Glyph, ScriptsOn: _scriptsRoot is not null, Walking: SendTarget() is { } walker && _recorders.TryGetValue(walker, out var map) && map.Walk.IsWalking, + MapUndo: MapOf(SendTarget()?.SessionKey ?? _workspace.FindWindow(ActiveWindowId())?.SessionKey)?.Recorder.UndoLabel, Reconnecting: _reconnects.Values.Any(r => r.IsActive), Sound: CanPlaySound ? !_muted : null, Announced: Host.Announcer is null ? null : IsAnnounced(ActiveWindowId()), @@ -8846,6 +8857,20 @@ private bool RunBuiltInCommand(string id) return true; case "term:map": ShowMap(); + return true; + case "map:edit": + ToggleMapEdit(); + return true; + case "map:undo": + if ((SendTarget()?.SessionKey ?? _workspace.FindWindow(ActiveWindowId())?.SessionKey) is { } undoKey && MapOf(undoKey) is not null) + { + ApplyMapEdit(MapWindowId(undoKey), SharpMUTerm.Client.Panels.MapEdit.Undo); + } + else + { + RefuseCommand("no map here — pick a character first (⌃P ▸ Switch to …)"); + } + return true; case "layout:layouts": ShowLayouts(); @@ -9191,7 +9216,17 @@ private MarkupControl MapControlFor(string windowId) /// private void OnMapLinkClicked(string windowId, string url) { - if (MapRenderer.ParseLink(url) is { } room) + if (MapRenderer.ParseLink(url) is not { } room) + { + return; + } + + // While the map is being edited a click selects the room; otherwise it walks there, as it always has. + if (_mapSelection.ContainsKey(windowId)) + { + SelectMapRoom(windowId, room); + } + else { WalkFromMap(windowId, room); } @@ -9236,11 +9271,10 @@ private void RenderMap(string windowId) // One model per drawing, and the window's native map is handed this same instance (MapViewFor), so the two // cannot disagree about where the character is, which level is shown or whether a walk is under way. - var walking = map.Walk.IsWalking ? $"walking, {map.Walk.Remaining} to go" : null; - var view = Drawing(Core.Layouts.PanelIds.Map, windowId, SharpMUTerm.Client.Panels.MapViewModel.From(map.Map, map.Recorder.CurrentRoomId, map.Walk.RoomsAhead, walking, MapPalette())); + var view = Drawing(Core.Layouts.PanelIds.Map, windowId, BuildMapView(windowId, map)); _mapViews[windowId] = (_mapRevisions[windowId], view); - var ink = new MapRenderer.Ink(_ink.Accent, _ink.Accent, _ink.Notice, _ink.Draft, WorkspacePalette.ReadingPlane(_theme)); - var lines = MapRenderer.Render(view, map.Map, width, height, ink); + var ink = new MapRenderer.Ink(_ink.Accent, _ink.Accent, _ink.Notice, _ink.Draft, WorkspacePalette.ReadingPlane(_theme), "bold " + RailCursorBand()); + var lines = MapRenderer.Render(view, map.Map, width, height, ink, keysHeld: _mapKeys == windowId); _mapMarkup[windowId] = lines; control.SetContent(lines.ToList()); NoteFloatingContent(windowId); @@ -9317,6 +9351,17 @@ private void MapCommand(string windowId, string verb, string argument) problem = map.WalkTo(argument); } } + else if ((WindowSession(windowId)?.SessionKey ?? _workspace.FindWindow(windowId)?.SessionKey) is { } owner + && SharpMUTerm.Client.Panels.MapEditing.CommandVerbs.Contains(argument.Split(' ', 2)[0].ToLowerInvariant())) + { + MapEditCommand(windowId, map, owner, argument); + return; + } + else if (argument.Trim().Equals("edit", StringComparison.OrdinalIgnoreCase)) + { + ToggleMapEdit(); + return; + } else { var parts = argument.Split(' ', 2, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries); @@ -12059,6 +12104,13 @@ private bool RouteToInput(ConsoleKeyInfo key) return null; } + // ⌃P ▸ Edit map put the keys on a map: its arrows and edit keys come first, and anything else ends editing + // and carries on down this chain (SharpMUTermApp.MapEdit.cs). + if (TryMapKey(e)) + { + return null; + } + // A docked composer holding the keyboard takes the keys an editor takes; see HandleComposerKey. if (ArmedComposer() is { } composer) { diff --git a/src/SharpMUTerm.Tui/SnapshotViews.cs b/src/SharpMUTerm.Tui/SnapshotViews.cs index 0d3c5a09..570775ab 100644 --- a/src/SharpMUTerm.Tui/SnapshotViews.cs +++ b/src/SharpMUTerm.Tui/SnapshotViews.cs @@ -25,7 +25,7 @@ internal static class SnapshotViews "search", "search-regex", "search-all", "search-landed", "activity-bar", "mxp-image", "mxp-figure", "input-selection", "selection", "trigger-builder", "prefix", "prefix-panel", "focus", "focus-moved", "tabs", "tabs-many", - "collapsed", "timestamps", "timestamps-toggled", "theme-switched", "rail-keys", "prompt", "meters", "gamedata", "map", "map-walking", "map-split", + "collapsed", "timestamps", "timestamps-toggled", "theme-switched", "rail-keys", "prompt", "meters", "gamedata", "map", "map-walking", "map-split", "map-edit", "packages", "package-review", "package-browse", "send-menu", "layouts", "layout-combat", "layout-roleplay", "panel-who", "panel-vitals", "panel-quickbar", "panel-composer", "welcome", "welcome-connect", "tour", "reconnect", "help", "help-topic", "dictionary-offer", "join-wraps", "join-wraps-f5", diff --git a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs index 5fb69eba..521d586b 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs @@ -410,6 +410,48 @@ await Same("map: walk", "layout-combat", await Same("map: pop out", "layout-combat", (app, d) => Panel(d, PanelIds.Map).PopOut!(), (app, d) => app.DispatchCommand(PanelFloatCommands.PopOut(Panel(d, PanelIds.Map).WindowId))); + + // Map editing: a room selected and edited on the canvas, and the same with the cell map's keys. + await Same("map: select", "layout-combat", + (app, d) => Panel(d, PanelIds.Map).SelectRoom!(OtherRoom(Panel(d, PanelIds.Map).Map!)), + (app, d) => CellSelect(app, d)); + await Same("map: rename", "layout-combat", + (app, d) => NativeEdit(d, room => MapEdit.Rename(room, "Spice Yard")), + (app, d) => + { + CellSelect(app, d); + MapKeys(app, MapKey(ConsoleKey.R, 'r')); + while (app.PrimaryInputText.Count(c => c == ' ') > 3 || !app.PrimaryInputText.EndsWith(' ')) + { + MapKeys(app, MapKey(ConsoleKey.Backspace, '\b')); + } + + TypeLine(app, "Spice Yard"); + }); + await Same("map: lock", "layout-combat", + (app, d) => NativeEdit(d, room => MapEdit.Lock(room, true)), + (app, d) => { CellSelect(app, d); MapKeys(app, MapKey(ConsoleKey.L, 'l')); }); + await Same("map: move", "layout-combat", + (app, d) => NativeEdit(d, room => MapEdit.Move(room, 1, 0)), + (app, d) => { CellSelect(app, d); MapKeys(app, new ConsoleKeyInfo('\0', ConsoleKey.RightArrow, true, false, false)); }); + await Same("map: delete", "layout-combat", + (app, d) => NativeEdit(d, MapEdit.Delete), + (app, d) => { CellSelect(app, d); MapKeys(app, MapKey(ConsoleKey.Delete, '\0')); }); + await Same("map: undo", "layout-combat", + (app, d) => + { + NativeEdit(d, room => MapEdit.Lock(room, true)); + Panel(d, PanelIds.Map).EditMap!(MapEdit.Undo); + }, + (app, d) => { CellSelect(app, d); MapKeys(app, MapKey(ConsoleKey.L, 'l'), MapKey(ConsoleKey.U, 'u')); }); + await Same("map: exit to the next room", "layout-combat", + (app, d) => NativeEdit(d, room => MapEdit.LinkNext(room, "climb")), + (app, d) => + { + CellSelect(app, d); + MapKeys(app, MapKey(ConsoleKey.X, 'x')); + TypeLine(app, "climb next"); + }); probed.Add(PanelIds.Map); // Vitals: the pop-out button, and ⌃P's entry for the same window. @@ -985,6 +1027,7 @@ private static string Outcome(SharpMUTermApp app) => string.Join( "help=" + app.HelpIsOpen + "/" + app.DictionaryOfferOpen, "quick=" + app.LastQuickMacro, "walk=" + app.WalkState, + "map=" + app.MapDigest(), "rail=" + (app.BuildChromeOverlay().Sidebar.Collapsed ? "folded" : "open"), "floating=" + string.Join(",", app.FloatingPublished.Select(f => f.Model.WindowId)), "notice=" + app.LastNotice, @@ -1009,6 +1052,42 @@ private static string OtherWindow(SharpMUTermApp app) private static long OtherRoom(MapViewModel map) => map.Rooms.First(r => !r.Current && r.Id != map.AnchorId).Id; + private static ConsoleKeyInfo MapKey(ConsoleKey key, char c) => new(c, key, false, false, false); + + /// The cell way to select a room: Edit map from the palette, then a click on the room's cell link while editing. + private static void CellSelect(SharpMUTermApp app, AvaloniaConsoleDriver driver) + { + var room = OtherRoom(Panel(driver, PanelIds.Map).Map!); + app.DispatchCommand("map:edit"); + app.SimulateMapClick(Panel(driver, PanelIds.Map).WindowId, MapRenderer.LinkPrefix + room); + } + + /// The native way: the room selected on the canvas, then an edit from its menu or inspector. + private static void NativeEdit(AvaloniaConsoleDriver driver, Func edit) + { + var room = OtherRoom(Panel(driver, PanelIds.Map).Map!); + Panel(driver, PanelIds.Map).SelectRoom!(room); + Panel(driver, PanelIds.Map).EditMap!(edit(room)); + } + + private static void MapKeys(SharpMUTermApp app, params ConsoleKeyInfo[] keys) + { + foreach (var key in keys) + { + app.SimulateKey(key); + } + } + + private static void TypeLine(SharpMUTermApp app, string text) + { + foreach (var c in text) + { + app.SimulateKey(new ConsoleKeyInfo(c, ConsoleKey.NoName, false, false, false)); + } + + app.SimulateKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false)); + } + // ── F4 and the quick bar, per host ────────────────────────────────────────────────────────── /// diff --git a/tests/SharpMUTerm.Client.Tests/MapEditingTests.cs b/tests/SharpMUTerm.Client.Tests/MapEditingTests.cs new file mode 100644 index 00000000..4427e092 --- /dev/null +++ b/tests/SharpMUTerm.Client.Tests/MapEditingTests.cs @@ -0,0 +1,126 @@ +using SharpMUTerm.Client.Panels; +using SharpMUTerm.Core.Mapping; + +namespace SharpMUTerm.Client.Tests; + +/// The one action model both hosts' map edits go through, and what the map view says about rooms. +public class MapEditingTests +{ + private static MapRecorder Recorded() + { + var recorder = new MapRecorder(new WorldMap()); + recorder.Apply(new RoomObservation(1, "Hall", [new ObservedExit("north", 2), new ObservedExit("east", 3)]) with { Area = "Keep" }); + recorder.NoteCommand("n"); + recorder.Apply(new RoomObservation(2, "Gallery", [new ObservedExit("south", 1)]) with { Area = "Keep" }); + recorder.NoteCommand("s"); + recorder.Apply(new RoomObservation(1, "Hall", [new ObservedExit("north", 2), new ObservedExit("east", 3)]) with { Area = "Keep" }); + return recorder; + } + + private static long? Resolve(MapRecorder recorder, string? name) => + name is null ? recorder.CurrentRoomId : recorder.Map.Rooms.Values.FirstOrDefault(r => r.Name.Equals(name, StringComparison.OrdinalIgnoreCase))?.Id; + + [Test] + public async Task EveryCommandVerbParsesIntoItsEdit() + { + var recorder = Recorded(); + (MapEdit? Edit, string? Problem) Parse(string text) => MapEditing.Parse(text, n => Resolve(recorder, n)); + + await Assert.That(Parse("rename 2 Long Gallery").Edit).IsEqualTo(MapEdit.Rename(2, "Long Gallery")); + await Assert.That(Parse("area 2").Edit).IsEqualTo(MapEdit.Area(2, string.Empty)); + await Assert.That(Parse("weight 2 5").Edit).IsEqualTo(MapEdit.Weight(2, 5)); + await Assert.That(Parse("exit 2 climb rope 1").Edit).IsEqualTo(MapEdit.AddExit(2, "climb rope", 1)); + await Assert.That(Parse("exit 2 down next").Edit).IsEqualTo(MapEdit.LinkNext(2, "down")); + await Assert.That(Parse("unexit 2 south").Edit).IsEqualTo(MapEdit.RemoveExit(2, "south")); + await Assert.That(Parse("move 2 1 -1").Edit).IsEqualTo(MapEdit.Move(2, 1, -1)); + await Assert.That(Parse("delete 2").Edit).IsEqualTo(MapEdit.Delete(2)); + await Assert.That(Parse("note 2 a draught").Edit).IsEqualTo(MapEdit.Note(2, "a draught")); + await Assert.That(Parse("symbol 2 $").Edit).IsEqualTo(MapEdit.Symbol(2, "$")); + await Assert.That(Parse("lock gallery").Edit).IsEqualTo(MapEdit.Lock(2, true)); + await Assert.That(Parse("unlock").Edit).IsEqualTo(MapEdit.Lock(1, false)); + await Assert.That(Parse("undo").Edit).IsEqualTo(MapEdit.Undo); + await Assert.That(Parse("rename hall Foo").Problem!).Contains("a room is its number"); + await Assert.That(Parse("weight 2 heavy").Edit).IsNull(); + await Assert.That(Parse("paint 2").Problem!).StartsWith("use /map"); + } + + [Test] + public async Task ApplyAnswersInASentenceAndRefusesWhatItCannotDo() + { + var recorder = Recorded(); + + await Assert.That(MapEditing.Apply(recorder, MapEdit.Rename(2, "Long Gallery"))).IsEqualTo(new MapEditResult(true, "renamed Gallery to Long Gallery")); + await Assert.That(MapEditing.Apply(recorder, MapEdit.Rename(2, "Long Gallery")).Done).IsFalse(); + await Assert.That(MapEditing.Apply(recorder, MapEdit.Weight(2, 0)).Done).IsFalse(); + await Assert.That(MapEditing.Apply(recorder, MapEdit.AddExit(2, "up", 99)).Done).IsFalse(); + await Assert.That(MapEditing.Apply(recorder, MapEdit.Symbol(2, "ab")).Done).IsFalse(); + await Assert.That(MapEditing.Apply(recorder, MapEdit.Delete(1)).Message).Contains("walk out of it first"); + await Assert.That(MapEditing.Apply(recorder, MapEdit.Delete(42)).Done).IsFalse(); + + await Assert.That(MapEditing.Apply(recorder, MapEdit.Delete(2)).Done).IsTrue(); + await Assert.That(recorder.Map.Room(1)!.Stubs).Contains("north"); + await Assert.That(MapEditing.Apply(recorder, MapEdit.Undo).Message).IsEqualTo("undid: delete Long Gallery"); + await Assert.That(recorder.Map.Room(2)!.Name).IsEqualTo("Long Gallery"); + await Assert.That(MapEditing.Apply(recorder, MapEdit.Undo).Done).IsTrue(); + await Assert.That(recorder.Map.Room(2)!.Name).IsEqualTo("Gallery"); + await Assert.That(MapEditing.Apply(recorder, MapEdit.Undo)).IsEqualTo(new MapEditResult(false, "nothing to undo")); + } + + [Test] + public async Task TheViewNamesTheExitsOfTheRoomYouAreInAndTheRoomBeingEdited() + { + var recorder = Recorded(); + recorder.Map.SetNote(2, "draughty"); + + var plain = MapViewModel.From(recorder.Map, 1, [], null); + await Assert.That(plain.Editing).IsFalse(); + await Assert.That(plain.Nearby).Contains(new MapViewExitName("n", 2, "Gallery")); + await Assert.That(plain.Nearby.Any(e => e.Exit == "e" && e.Name is null)).IsTrue(); + + var editing = MapViewModel.From(recorder.Map, 1, [], null, selected: 2, pending: (2, "down"), undo: "rename"); + await Assert.That(editing.Editing).IsTrue(); + await Assert.That(editing.Selected!.Note).IsEqualTo("draughty"); + await Assert.That(editing.Rooms.Single(r => r.Id == 2).Selected).IsTrue(); + await Assert.That(editing.Rooms.Single(r => r.Id == 2).Noted).IsTrue(); + await Assert.That(editing.Pending).IsNotNull(); + await Assert.That(editing).IsEqualTo(MapViewModel.From(recorder.Map, 1, [], null, selected: 2, pending: (2, "down"), undo: "rename")); + await Assert.That(editing).IsNotEqualTo(MapViewModel.From(recorder.Map, 1, [], null, selected: 1, pending: (2, "down"), undo: "rename")); + } + + [Test] + public async Task AnArrowSelectsTheNearestRoomThatWay() + { + var map = new WorldMap(); + map.Add(new MapRoom { Id = 1, Name = "A", X = 0, Y = 0 }); + map.Add(new MapRoom { Id = 2, Name = "B", X = 2, Y = 0 }); + map.Add(new MapRoom { Id = 3, Name = "C", X = 1, Y = 1 }); + map.Add(new MapRoom { Id = 4, Name = "D", X = 0, Y = -3 }); + var view = MapViewModel.From(map, 1, [], null); + + await Assert.That(MapEditing.Neighbour(view, 1, 1, 0)).IsEqualTo(2L); + await Assert.That(MapEditing.Neighbour(view, 1, 0, 1)).IsEqualTo(3L); + await Assert.That(MapEditing.Neighbour(view, 1, 0, -1)).IsEqualTo(4L); + await Assert.That(MapEditing.Neighbour(view, 1, -1, 0)).IsNull(); + } + + [Test] + public async Task TheRoomMenuOffersOnlyWhatCanBeDoneToThatRoom() + { + var here = new MapViewRoom(1, "Hall", 0, 0, true, false, false); + var there = here with { Id = 2, Current = false, Locked = true }; + + var mine = MapEditing.Menu(here, null).Entries; + await Assert.That(mine.First().Enabled).IsFalse().Because("you cannot walk to the room you are in"); + await Assert.That(mine.Single(e => e.Label == "Delete room").Enabled).IsFalse(); + await Assert.That(mine.Any(e => e.Label.StartsWith("Undo", StringComparison.Ordinal))).IsFalse(); + + var theirs = MapEditing.Menu(there, "rename Hall").Entries; + await Assert.That(theirs.Any(e => e.Label == "Unlock")).IsTrue(); + await Assert.That(theirs.Last().Command).IsEqualTo(MapEditing.UndoVerb); + foreach (var entry in theirs.Where(e => e.Command is not null)) + { + var needsWords = MapEditing.TextVerbs.Contains(entry.Command!) || entry.Command == MapEditing.WalkVerb; + await Assert.That(needsWords || MapEditing.EditFor(entry.Command!, 2) is not null).IsTrue().Because(entry.Label); + } + } +} diff --git a/tests/SharpMUTerm.Core.Tests/Mapping/MapEditTests.cs b/tests/SharpMUTerm.Core.Tests/Mapping/MapEditTests.cs new file mode 100644 index 00000000..9e19bf42 --- /dev/null +++ b/tests/SharpMUTerm.Core.Tests/Mapping/MapEditTests.cs @@ -0,0 +1,154 @@ +using SharpMUTerm.Core.Mapping; + +namespace SharpMUTerm.Core.Tests.Mapping; + +/// Edits by hand: the map's own operations, the recorder's undo, and an exit waiting for the next room. +public class MapEditTests +{ + private static RoomObservation Room(long? id, string name, params (string Key, long? To)[] exits) => + new(id, name, exits.Select(e => new ObservedExit(e.Key, e.To)).ToList()); + + private static MapRecorder Recorded() + { + var recorder = new MapRecorder(new WorldMap()); + recorder.Apply(Room(1, "Hall", ("north", 2)) with { Area = "Keep" }); + recorder.NoteCommand("n"); + recorder.Apply(Room(2, "Gallery", ("south", 1)) with { Area = "Keep" }); + recorder.MarkSaved(); + return recorder; + } + + [Test] + public async Task EachEditChangesOnlyWhatItSaysAndRefusesNonsense() + { + var map = Recorded().Map; + + await Assert.That(map.Rename(1, " Great Hall ")).IsTrue(); + await Assert.That(map.Room(1)!.Name).IsEqualTo("Great Hall"); + await Assert.That(map.Rename(1, " ")).IsFalse(); + await Assert.That(map.SetArea(1, "Tower")).IsTrue(); + await Assert.That(map.Areas[map.Room(1)!.AreaId!.Value].Name).IsEqualTo("Tower"); + await Assert.That(map.SetArea(1, "")).IsTrue(); + await Assert.That(map.Room(1)!.AreaId).IsNull(); + await Assert.That(map.SetWeight(1, 0)).IsFalse(); + await Assert.That(map.SetWeight(1, 7)).IsTrue(); + await Assert.That(map.SetExit(1, "ne", 2)).IsTrue(); + await Assert.That(map.Room(1)!.Exits["northeast"]).IsEqualTo(2L); + await Assert.That(map.SetExit(1, "climb rope", 2)).IsTrue(); + await Assert.That(map.Room(1)!.SpecialExits["climb rope"]).IsEqualTo(2L); + await Assert.That(map.SetExit(1, "e", 99)).IsFalse().Because("no room 99"); + await Assert.That(map.RemoveExit(1, "northeast")).IsTrue(); + await Assert.That(map.Move(1, 1, 0, 1)).IsTrue(); + await Assert.That((map.Room(1)!.X, map.Room(1)!.Z)).IsEqualTo((1, 1)); + await Assert.That(map.SetSymbol(1, "$")).IsTrue(); + await Assert.That(map.SetSymbol(1, "[")).IsFalse().Because("a bracket would be markup"); + await Assert.That(map.SetNote(1, "a note\u0007")).IsTrue(); + await Assert.That(map.Room(1)!.Note).IsEqualTo("a note"); + } + + [Test] + public async Task DeletingARoomTurnsTheExitsThatLedThereBackIntoStubs() + { + var map = Recorded().Map; + + await Assert.That(map.Remove(2)).IsTrue(); + await Assert.That(map.Room(2)).IsNull(); + await Assert.That(map.Room(1)!.Exits.ContainsKey("north")).IsFalse(); + await Assert.That(map.Room(1)!.Stubs).Contains("north"); + } + + [Test] + public async Task AnEditIsKeptForUndoMarksTheMapDirtyAndUndoPutsEveryTouchedRoomBack() + { + var recorder = Recorded(); + var changes = 0; + recorder.Changed += (_, _) => changes++; + + await Assert.That(recorder.Edit("delete Gallery", [2, 1], m => m.Remove(2))).IsTrue(); + await Assert.That(recorder.IsDirty).IsTrue(); + await Assert.That(recorder.UndoLabel).IsEqualTo("delete Gallery"); + + await Assert.That(recorder.Undo()).IsEqualTo("delete Gallery"); + await Assert.That(recorder.Map.Room(2)!.Name).IsEqualTo("Gallery"); + await Assert.That(recorder.Map.Room(1)!.Exits["north"]).IsEqualTo(2L); + await Assert.That(recorder.Map.Room(1)!.Stubs).DoesNotContain("north"); + await Assert.That(recorder.Undo()).IsNull(); + await Assert.That(changes).IsEqualTo(2); + } + + [Test] + public async Task AnEditThatChangesNothingIsNotKept() + { + var recorder = Recorded(); + + await Assert.That(recorder.Edit("rename", [1], m => m.Rename(1, "Hall"))).IsFalse(); + await Assert.That(recorder.UndoCount).IsEqualTo(0); + await Assert.That(recorder.IsDirty).IsFalse(); + } + + [Test] + public async Task UndoKeepsTheLastFewEdits() + { + var recorder = Recorded(); + for (var i = 0; i < MapRecorder.UndoDepth + 5; i++) + { + recorder.Edit($"weight {i}", [1], m => m.SetWeight(1, i + 2)); + } + + await Assert.That(recorder.UndoCount).IsEqualTo(MapRecorder.UndoDepth); + } + + [Test] + public async Task UndoingANewAreaTakesTheAreaAwayToo() + { + var recorder = Recorded(); + var areas = recorder.Map.Areas.Count; + + recorder.Edit("area", [1], m => m.SetArea(1, "Crypt")); + await Assert.That(recorder.Map.Areas.Count).IsEqualTo(areas + 1); + recorder.Undo(); + + await Assert.That(recorder.Map.Areas.Count).IsEqualTo(areas); + await Assert.That(recorder.Map.Areas[recorder.Map.Room(1)!.AreaId!.Value].Name).IsEqualTo("Keep"); + } + + /// Mudlet's "the room I go to next": the exit is linked to the next room walked into, and that is undoable too. + [Test] + public async Task AnExitWaitsForTheNextRoomWalkedInto() + { + var recorder = Recorded(); + + await Assert.That(recorder.LinkNext(1, "climb")).IsTrue(); + await Assert.That(recorder.PendingLink).IsEqualTo((1L, "climb")); + recorder.Apply(Room(2, "Gallery", ("south", 1))); // the next room reported, which is not the one the exit leaves + await Assert.That(recorder.Map.Room(1)!.SpecialExits["climb"]).IsEqualTo(2L); + await Assert.That(recorder.PendingLink).IsNull(); + + recorder.Undo(); + await Assert.That(recorder.Map.Room(1)!.SpecialExits.ContainsKey("climb")).IsFalse(); + await Assert.That(recorder.PendingLink).IsEqualTo((1L, "climb")); + } + + [Test] + public async Task AWaitingExitIsNotLinkedToItsOwnRoom() + { + var recorder = Recorded(); + recorder.LinkNext(2, "down"); + + recorder.Apply(Room(2, "Gallery", ("south", 1))); + + await Assert.That(recorder.PendingLink).IsEqualTo((2L, "down")); + await Assert.That(recorder.Map.Room(2)!.Exits.ContainsKey("down")).IsFalse(); + } + + [Test] + public async Task ANoteIsSavedWithTheMap() + { + var map = Recorded().Map; + map.SetNote(1, "the fountain hides a key"); + + var read = MapStore.Deserialize(MapStore.Serialize(map, "x:1")); + + await Assert.That(read.Room(1)!.Note).IsEqualTo("the fountain hides a key"); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/MapEditModeTests.cs b/tests/SharpMUTerm.Tui.Tests/MapEditModeTests.cs new file mode 100644 index 00000000..9dd60173 --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/MapEditModeTests.cs @@ -0,0 +1,186 @@ +using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Panels; +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Graphics; + +namespace SharpMUTerm.Tui.Tests; + +/// The cell map's edit mode: ⌃P ▸ Edit map, the keys it names, and the /map verbs behind the ones that need words. +[NotInParallel] +public class MapEditModeTests +{ + private const string Ann = "Convergence.Ann"; + + private static readonly TerminalCapabilities Headless = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private static string MapId => SharpMUTermApp.MapWindowId(Ann); + + private static async Task<(SharpMUTermApp App, RecordingTelnetSession Wire)> Open() + { + Console.SetIn(TextReader.Null); + var config = new AppConfiguration(); + config.Worlds.Add(new WorldDefinition + { + Name = "Convergence", + Host = "convergence.example", + Port = 4201, + Characters = { new CharacterDefinition { Name = "Ann", Logging = new LoggingSettings() } }, + }); + var wire = new RecordingTelnetSession(); + var app = new SharpMUTermApp(config, Headless, new HeadlessConsoleDriver(160, 32)); + app.TelnetFactory = _ => wire; + app.DispatchCommand(CommandIds.Character(Ann)); + await app.FindSession(Ann)!.ConnectAsync(); + wire.ReceiveGmcp("Room.Info", """{"num":1,"name":"Hall","area":"Keep","exits":{"n":2}}"""); + wire.ReceiveGmcp("Room.Info", """{"num":2,"name":"Gallery","area":"Keep","exits":{"s":1,"e":3}}"""); + wire.ReceiveGmcp("Room.Info", """{"num":3,"name":"Tower","area":"Keep","exits":{"w":2}}"""); + wire.ReceiveGmcp("Room.Info", """{"num":1,"name":"Hall","area":"Keep","exits":{"n":2}}"""); + return (app, wire); + } + + private static ConsoleKeyInfo Key(ConsoleKey key, char c = '\0', bool shift = false) => new(c, key, shift, false, false); + + private static void Type(SharpMUTermApp app, string text) + { + foreach (var c in text) + { + app.SimulateKey(new ConsoleKeyInfo(c, ConsoleKey.NoName, false, false, false)); + } + + app.SimulateKey(Key(ConsoleKey.Enter, '\r')); + } + + private static Core.Mapping.WorldMap MapOf(SharpMUTermApp app) => app.SessionMapFor(app.FindSession(Ann)!)!.Map; + + [Test] + public async Task EditMapSelectsTheRoomYouAreInAndTakesTheKeys() + { + var (app, _) = await Open(); + await using var _app = app; + + await Assert.That(app.DispatchCommand("map:edit")).IsTrue(); + + await Assert.That(app.MapSelection(MapId)).IsEqualTo(1L); + await Assert.That(app.MapKeysActive).IsTrue(); + var plain = app.MapMarkup(MapId).Select(MarkupText.Plain).ToList(); + await Assert.That(plain.Any(l => l.Contains("#1 Hall"))).IsTrue(); + await Assert.That(plain.Any(l => System.Text.RegularExpressions.Regex.IsMatch(l, @"Esc\s+done"))).IsTrue().Because(string.Join("\n", plain)); + } + + [Test] + public async Task ArrowsSelectShiftArrowsMoveAndLAndUAnswer() + { + var (app, wire) = await Open(); + await using var _app = app; + app.DispatchCommand("map:edit"); + var before = wire.Lines.Count; + + app.SimulateKey(Key(ConsoleKey.UpArrow)); + await Assert.That(app.MapSelection(MapId)).IsEqualTo(2L); + var x = MapOf(app).Room(2)!.X; + app.SimulateKey(Key(ConsoleKey.LeftArrow, shift: true)); + await Assert.That(MapOf(app).Room(2)!.X).IsEqualTo(x - 1); + app.SimulateKey(Key(ConsoleKey.L, 'l')); + await Assert.That(MapOf(app).Room(2)!.Locked).IsTrue(); + app.SimulateKey(Key(ConsoleKey.U, 'u')); + await Assert.That(MapOf(app).Room(2)!.Locked).IsFalse(); + await Assert.That(app.SessionMapFor(app.FindSession(Ann)!)!.Recorder.IsDirty).IsTrue(); + await Assert.That(wire.Lines.Count).IsEqualTo(before).Because("editing sends nothing to the game"); + } + + [Test] + public async Task AKeyThatNeedsWordsPutsTheCommandOnTheCommandLineAndEnterAppliesIt() + { + var (app, _) = await Open(); + await using var _app = app; + app.DispatchCommand("map:edit"); + app.SimulateKey(Key(ConsoleKey.UpArrow)); + + app.SimulateKey(Key(ConsoleKey.R, 'r')); + await Assert.That(app.MapKeysActive).IsFalse(); + await Assert.That(app.ArmedInputText).IsEqualTo("/map rename 2 Gallery"); + foreach (var _ in "Gallery") + { + app.SimulateKey(Key(ConsoleKey.Backspace, '\b')); + } + + Type(app, "Long Gallery"); + + await Assert.That(MapOf(app).Room(2)!.Name).IsEqualTo("Long Gallery"); + await Assert.That(app.MapKeysActive).IsTrue().Because("the edit hands the keys back to the map"); + } + + [Test] + public async Task EveryKeyTheFooterNamesIsAnswered() + { + var (app, _) = await Open(); + await using var _app = app; + var keys = new Dictionary + { + ["←↑→↓"] = [Key(ConsoleKey.UpArrow)], + ["⇧←↑→↓"] = [Key(ConsoleKey.RightArrow, shift: true)], + ["r"] = [Key(ConsoleKey.R, 'r')], ["a"] = [Key(ConsoleKey.A, 'a')], ["l"] = [Key(ConsoleKey.L, 'l')], + ["w"] = [Key(ConsoleKey.W, 'w')], ["x"] = [Key(ConsoleKey.X, 'x')], ["-"] = [Key(ConsoleKey.OemMinus, '-')], + ["n"] = [Key(ConsoleKey.N, 'n')], ["s"] = [Key(ConsoleKey.S, 's')], ["Del"] = [Key(ConsoleKey.Delete)], + ["u"] = [Key(ConsoleKey.U, 'u')], ["⏎"] = [Key(ConsoleKey.Enter, '\r')], ["Esc"] = [Key(ConsoleKey.Escape, '\u001b')], + }; + + foreach (var (key, _) in MapEditing.Keys) + { + await Assert.That(keys.ContainsKey(key)).IsTrue().Because($"the test knows {key}"); + app.DispatchCommand("map:edit"); + if (!app.MapKeysActive) + { + app.DispatchCommand("map:edit"); + } + + app.SimulateKey(Key(ConsoleKey.UpArrow)); // off the room you are in, so Del and ⏎ have something to do + await Assert.That(app.SimulateMapKey(keys[key][0])).IsTrue().Because($"{key} is on the footer"); + while (app.ArmedInputText.Length > 0) + { + app.SimulateKey(Key(ConsoleKey.Backspace, '\b')); + } + + if (app.MapSelection(MapId) is not null) + { + app.SelectMapRoom(MapId, null); + } + } + } + + [Test] + public async Task AClickSelectsInEditModeAndWalksOutsideIt() + { + var (app, wire) = await Open(); + await using var _app = app; + app.DispatchCommand("term:map"); + app.DispatchCommand("map:edit"); + var before = wire.Lines.Count; + + app.SimulateMapClick(MapId, "mux:map:3"); + await Assert.That(app.MapSelection(MapId)).IsEqualTo(3L); + await Assert.That(wire.Lines.Count).IsEqualTo(before); + + app.SimulateKey(Key(ConsoleKey.Escape, '\u001b')); + await Assert.That(app.MapSelection(MapId)).IsNull(); + app.SimulateMapClick(MapId, "mux:map:3"); + await Assert.That(wire.Lines.Skip(before)).IsEquivalentTo(new[] { "n" }); + } + + [Test] + public async Task DeletingTheRoomYouAreInIsRefusedAndAnyOtherIsUndoable() + { + var (app, _) = await Open(); + await using var _app = app; + + Type(app, "/map delete 1"); + await Assert.That(MapOf(app).Room(1)).IsNotNull(); + Type(app, "/map delete 3"); + await Assert.That(MapOf(app).Room(3)).IsNull(); + await Assert.That(app.BuildCatalog().Select(i => i.Id)).Contains("map:undo"); + await Assert.That(app.DispatchCommand("map:undo")).IsTrue(); + await Assert.That(MapOf(app).Room(3)!.Name).IsEqualTo("Tower"); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/MapWindowTests.cs b/tests/SharpMUTerm.Tui.Tests/MapWindowTests.cs index 925c87b8..62f946c3 100644 --- a/tests/SharpMUTerm.Tui.Tests/MapWindowTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/MapWindowTests.cs @@ -58,7 +58,7 @@ public async Task ShowMapOpensTheConnectionsMapInFront() await Assert.That(app.WindowOwnerOf(MapId)).IsEqualTo(Ann); await Assert.That(app.ActiveWindowId()).IsEqualTo(MapId); var plain = app.MapMarkup(MapId).Select(MarkupText.Plain).ToList(); - await Assert.That(plain[0]).IsEqualTo("Map · Keep · z 0"); + await Assert.That(plain[0]).IsEqualTo("Hall · Keep · z 0"); await Assert.That(plain.Any(l => l.Contains("[@]"))).IsTrue(); await Assert.That(app.MapMarkup(MapId).Count(l => l.Contains("[link=mux:map:"))).IsGreaterThan(0); } From aa9883f3ed873a112df1adcb505b1df604400918 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 13:00:30 +0000 Subject: [PATCH 049/113] Script console, GMCP channel windows, highlighted names and scene logs - Ctrl+P > Script console: per character, output and errors with file:line, a time- and instruction-limited Lua prompt run through the host's gate, history, a read-only store viewer with delete, and Reload. One Client model drawn as cells and as a native modal; surface script-console with parity probes. - F5 > channels (off/copy/move): Comm.Channel.Text into a spawn window per channel through SpawnLine; move gags the main-window echo. - F5 > names: whole-word highlighted names with HighlightColours, at ingest. - Ctrl+P > Start/Stop scene log: the focused window's poses (or every line) to an HTML or plain file under the log root with a who-was-present header; refused with no log root. F7 > Scene log holds the format and content. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 10 + CLAUDE.md | 25 ++ src/SharpMUTerm.Avalonia/ModalOverlay.cs | 1 + src/SharpMUTerm.Avalonia/ScriptConsoleView.cs | 299 +++++++++++++ .../Commands/BuiltInCommands.cs | 14 + .../Modals/ScriptConsoleModel.cs | 263 +++++++++++ .../Settings/BuiltInSettings.cs | 32 ++ src/SharpMUTerm.Client/Settings/TextRules.cs | 5 + .../Settings/WorldFieldValues.cs | 16 + .../Surfaces/SurfaceCatalog.cs | 17 +- .../Automation/NameHighlights.cs | 164 +++++++ .../Commands/CommandCatalog.cs | 4 +- .../Configuration/AppConfiguration.cs | 13 + .../Configuration/WorldDefinition.cs | 14 + src/SharpMUTerm.Core/Logging/SceneLog.cs | 219 +++++++++ .../Protocols/ChannelCapture.cs | 186 ++++++++ src/SharpMUTerm.Core/Session/WorldSession.cs | 64 ++- src/SharpMUTerm.Scripting/ScriptHost.cs | 151 ++++++- src/SharpMUTerm.Scripting/SessionScripts.cs | 15 +- .../WorldSessionScriptBridge.cs | 9 +- .../Pointer/SharpMUTermApp.Surfaces.cs | 1 + src/SharpMUTerm.Tui/ScriptConsoleSurface.cs | 262 +++++++++++ .../SharpMUTermApp.NativeModals.cs | 1 + .../SharpMUTermApp.SceneLog.cs | 265 +++++++++++ .../SharpMUTermApp.ScriptConsole.cs | 423 ++++++++++++++++++ src/SharpMUTerm.Tui/SharpMUTermApp.cs | 45 +- src/SharpMUTerm.Tui/SnapshotViews.cs | 1 + src/SharpMUTerm.Tui/WorldsScreenRenderer.cs | 28 +- .../SurfaceParityTests.cs | 27 ++ .../Session/ChannelsAndNamesTests.cs | 156 +++++++ .../ConsoleTests.cs | 85 ++++ .../SharpMUTerm.Tui.Tests/ScreenModelTests.cs | 5 +- .../ScriptingWaveTests.cs | 314 +++++++++++++ 33 files changed, 3119 insertions(+), 15 deletions(-) create mode 100644 src/SharpMUTerm.Avalonia/ScriptConsoleView.cs create mode 100644 src/SharpMUTerm.Client/Modals/ScriptConsoleModel.cs create mode 100644 src/SharpMUTerm.Core/Automation/NameHighlights.cs create mode 100644 src/SharpMUTerm.Core/Logging/SceneLog.cs create mode 100644 src/SharpMUTerm.Core/Protocols/ChannelCapture.cs create mode 100644 src/SharpMUTerm.Tui/ScriptConsoleSurface.cs create mode 100644 src/SharpMUTerm.Tui/SharpMUTermApp.SceneLog.cs create mode 100644 src/SharpMUTerm.Tui/SharpMUTermApp.ScriptConsole.cs create mode 100644 tests/SharpMUTerm.Core.Tests/Session/ChannelsAndNamesTests.cs create mode 100644 tests/SharpMUTerm.Scripting.Tests/ConsoleTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/ScriptingWaveTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 7991b70a..261fda36 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,16 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- Ctrl+P ▸ Script console: one per character, it shows what your Lua scripts printed and the errors they raised + (with the file and line), runs a line of Lua as that character (a runaway loop is stopped after half a second), + remembers what you typed, lists the character's `store` keys with Delete, and reloads the scripts. Without a + scripts folder it says what to create. +- F5 ▸ channels puts each GMCP channel (`Comm.Channel.Text`) in a window of its own: `copy` keeps the line in the + main window too, `move` takes it out. Off by default. +- F5 ▸ names highlights the names you list (`Ashlyn, Merrow=red`) in a colour of your choice, as whole words, + wherever they appear. +- Ctrl+P ▸ Start scene log records the window in front to a file of its own under the log folder, HTML or plain text, + poses only or every line (F7 ▸ Scene log), with a header naming who was in the room; Stop scene log closes it. - A world can reconnect by itself after its connection drops (F5 ▸ reconnect). It waits 5, 15, 30, 60 and 60 seconds between tries, counts down on the status row, and stops after five; Alt+R dials at once, and Disconnect or Ctrl+P ▸ Stop reconnecting cancels. Your own Disconnect, quitting, or the game closing right after you typed a diff --git a/CLAUDE.md b/CLAUDE.md index f768d53c..51ec6045 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -2993,6 +2993,31 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] so a late offer cannot log in twice. The on-connect commands go after whichever login was sent. The password goes only to `SendGmcpAsync`; `Char.Login.Result` is printed, bounded to one line. Not done: a server that never negotiates GMCP still costs the five seconds, because `TelnetSession` raises nothing on a refusal. +- **The script console is one per character, and a line runs on the UI thread** (`ScriptHost.EvaluateConsole`, + Scripting; `ScriptConsoleModel`/`ScriptConsoleLog`/`ScriptConsoleSession`, Client; `ScriptConsoleSurface`, + `SharpMUTermApp.ScriptConsole.cs`, Tui; `ScriptConsoleView`, Avalonia; ⌃P `world:script-console`; the `script-console` + view). A line is tried as `return ` first, then as a statement, in a coroutine under the host's `_gate` with an + instruction budget (2,000,000) and a time budget (500 ms), so a loop typed there cannot hang the screen; a Lua function + called *inside* a library call cannot be preempted. Files load under their own chunk name, so an error says + `main.lua:(3,…)`. Lines and history are in memory for the run (`SessionScripts.Printed`, `ReportScript`), never saved. + The prompt exists only with a scripts root whose folder exists and a window with a character; otherwise the model's + `Unavailable` says which. Every gesture ends in `RunConsoleLine`/`DeleteStoreKey`/`ReloadConsoleScripts` (surface + `script-console`, parity-probed). The demo scene has its own sandbox (`_demoScripts`), so the snapshot's prompt runs. +- **GMCP channels go to a window per channel through `SpawnLine`** (`ChannelCapture`, Core; + `WorldDefinition.CaptureChannels`, F5 ▸ `channels`: off/copy/move, off by default). `Comm.Channel.Text`'s `channel` + names the window (letters, digits, space, `-`, `_`, 24 at most); its `text` is parsed through `AnsiParser`. `move` + gags the main-window echo by exact text, only when it arrives within 3 s of the GMCP (32 pending at most), so an echo + that arrives *before* the GMCP is not taken out. +- **Highlighted names are an ingest-time restyle** (`NameHighlights`, Core; `WorldDefinition.HighlightNames`, F5 ▸ + `names`, `TextRule.NameHighlights`). `Name=colour` from `HighlightColours`, gold by default, 64 names; one whole-word, + case-insensitive regex with a 50 ms timeout, applied before emoji and links and to captured channel lines. Only the + foreground is set, so the formatter's floor still applies. Like `join wraps`, it changes the next line, never history. +- **A scene log is the focused window's lines into a file of its own** (`SceneLog`/`ScenePoses`, Core; + `SharpMUTermApp.SceneLog.cs`; ⌃P `term:scene-on`/`term:scene-off`; F7 ▸ Scene log: HTML or plain, poses or every line). + Under `/scenes/`, `scene--`, never overwriting, through `HtmlLogSink`/`PlainTextLogSink`. Fed at + `OnLine`/`OnSpawnLine`, the restore log's seam, so chrome is never recorded. A pose is a line that starts with a + present name or has the say-shape; present is the room roster plus the character, named in the header. **No log root, + no scene log**: refused out loud, the `logRoot` gate. - **Lua's `store.*` is one JSON file per character** (`ScriptStore`, Scripting; `script-data/.json` beside `config.json`, `0600`). The `scriptStoreRoot:` constructor parameter is null by default, the `save:`/`logRoot:` family, but the host's store never is: with no folder it is memory-only by construction, the diff --git a/src/SharpMUTerm.Avalonia/ModalOverlay.cs b/src/SharpMUTerm.Avalonia/ModalOverlay.cs index eed0a7f3..a60b524a 100644 --- a/src/SharpMUTerm.Avalonia/ModalOverlay.cs +++ b/src/SharpMUTerm.Avalonia/ModalOverlay.cs @@ -47,6 +47,7 @@ public ModalOverlay(ModalSession session, Action remove, Action new WelcomeView(welcome, Colours, Done), HelpSession help => new HelpView(help, Colours, Done), DictionaryOfferSession offer => new DictionaryOfferView(offer, Colours, Done), + ScriptConsoleSession console => new ScriptConsoleView(console, Colours, Done), _ => throw new ArgumentException($"no native view for {session.GetType().Name}", nameof(session)), }; AutomationProperties.SetName(this, _view.Title); diff --git a/src/SharpMUTerm.Avalonia/ScriptConsoleView.cs b/src/SharpMUTerm.Avalonia/ScriptConsoleView.cs new file mode 100644 index 00000000..7e9c1155 --- /dev/null +++ b/src/SharpMUTerm.Avalonia/ScriptConsoleView.cs @@ -0,0 +1,299 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Input; +using Avalonia.Interactivity; +using Avalonia.Layout; +using Avalonia.Media; +using Avalonia.Threading; +using SharpMUTerm.Client.Modals; + +namespace SharpMUTerm.Avalonia; + +/// +/// The window's script console: whose scripts and how many loaded, what they printed and the errors they raised, a +/// one-line Lua prompt with its history on ↑↓, the character's store.* with Delete, and Reload. Drawn from the +/// client's , the record the cells draw; every gesture goes back through the +/// to the client's own methods, and the client republishes after each. +/// +internal sealed class ScriptConsoleView : DockPanel, IModalView +{ + private readonly ScriptConsoleSession _session; + private readonly NativeTokens _colours; + private readonly Action _done; + private readonly TextBlock _summary; + private readonly TextBox _prompt; + private readonly StackPanel _output; + private readonly ScrollViewer _outputScroller; + private readonly StackPanel _store; + private readonly TextBlock _storeHeading; + private readonly Button _delete; + private readonly List _storeRows = []; + private readonly FontFamily _mono = new($"{CellFonts.BundledFamily}, DejaVu Sans Mono, Consolas, Menlo, monospace"); + private ScriptConsoleModel _model; + private int _selectedKey = -1; + private int _historyAt = -1; + + public ScriptConsoleView(ScriptConsoleSession session, NativeTokens colours, Action done) + { + _session = session; + _colours = colours; + _done = done; + _model = session.Model; + + var heading = ModalParts.Heading("Script console", colours); + SetDock(heading, Dock.Top); + Children.Add(heading); + + _summary = ModalParts.Dim(string.Empty, colours); + SetDock(_summary, Dock.Top); + Children.Add(_summary); + + var footer = ModalParts.Footer(ScriptConsoleModel.Keys, colours); + SetDock(footer, Dock.Bottom); + Children.Add(footer); + + var buttons = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 8, Margin = new Thickness(14, 8, 14, 0), HorizontalAlignment = HorizontalAlignment.Right }; + _delete = ModalParts.Button("Delete key", "Del", colours, DeleteSelected); + buttons.Children.Add(_delete); + buttons.Children.Add(ModalParts.Button("Reload scripts", "Ctrl+L", colours, Reload)); + SetDock(buttons, Dock.Bottom); + Children.Add(buttons); + + _prompt = new TextBox + { + FontFamily = _mono, + FontSize = NativeTokens.Title, + Margin = new Thickness(14, 8, 14, 0), + Padding = new Thickness(10, 6), + CornerRadius = new CornerRadius(NativeTokens.RadiusM), + MaxLength = ScriptConsoleModel.MaxInput, + PlaceholderText = "Lua — try 1 + 1 or print(world.name)", + InnerLeftContent = new TextBlock + { + Text = "lua", + FontFamily = _mono, + Foreground = colours.Brush(colours.Accent), + VerticalAlignment = VerticalAlignment.Center, + Margin = new Thickness(0, 0, 8, 0), + }, + }; + global::Avalonia.Automation.AutomationProperties.SetName(_prompt, "Lua prompt"); + SetDock(_prompt, Dock.Bottom); + Children.Add(_prompt); + + var body = new Grid { ColumnDefinitions = new ColumnDefinitions("*,12,240"), MinHeight = 260, Margin = new Thickness(0, 4, 0, 0) }; + + _output = new StackPanel { Margin = new Thickness(14, 6, 8, 6) }; + _outputScroller = new ScrollViewer + { + Content = _output, + HorizontalScrollBarVisibility = global::Avalonia.Controls.Primitives.ScrollBarVisibility.Disabled, + VerticalScrollBarVisibility = global::Avalonia.Controls.Primitives.ScrollBarVisibility.Auto, + }; + var outputFrame = new Border + { + BorderBrush = colours.Brush(colours.Rule), + BorderThickness = new Thickness(0, 1, 1, 1), + Child = _outputScroller, + }; + Grid.SetColumn(outputFrame, 0); + body.Children.Add(outputFrame); + + var storePanel = new DockPanel(); + _storeHeading = ModalParts.GroupHeader("Store", colours, first: true); + SetDock(_storeHeading, Dock.Top); + storePanel.Children.Add(_storeHeading); + var (storeFrame, store, _) = ModalParts.List(colours); + _store = store; + storePanel.Children.Add(storeFrame); + Grid.SetColumn(storePanel, 2); + body.Children.Add(storePanel); + Children.Add(body); + + AddHandler(KeyDownEvent, OnKey, RoutingStrategies.Tunnel); + _session.Changed += OnChanged; + Draw(); + } + + public string Title => "Script console"; + + public double PreferredWidth => 860; + + public bool Centred => false; + + /// The model drawn now, for a test. + public ScriptConsoleModel Model => _model; + + /// The prompt, for a test. + public TextBox Prompt => _prompt; + + /// The store key Delete removes, or null. + public string? SelectedKey => _selectedKey >= 0 && _selectedKey < _model.Store.Count ? _model.Store[_selectedKey].Key : null; + + public void FocusFirst() => _prompt.Focus(); + + public void Detach() => _session.Changed -= OnChanged; + + /// ⏎ at the prompt: hands the line to the client and clears the box. + public void Run() + { + var line = _prompt.Text ?? string.Empty; + if (_session.Run(line)) + { + _prompt.Text = string.Empty; + _historyAt = -1; + } + } + + /// Picks store row . + public void SelectKey(int index) + { + _selectedKey = index; + Highlight(); + } + + /// Delete on the store key picked. + public void DeleteSelected() + { + if (SelectedKey is { } key) + { + _session.Delete(key); + } + } + + /// Reload scripts. + public void Reload() => _session.Reload(); + + private void OnChanged(ScriptConsoleModel model) => Dispatcher.UIThread.Post(() => + { + _model = model; + Draw(); + }); + + private void Draw() + { + _summary.Text = NativeKeys.Words(_model.Summary); + _summary.Foreground = _colours.Brush(_model.CanRun ? _colours.Dim : _colours.Warn); + _prompt.IsEnabled = _model.CanRun; + + _output.Children.Clear(); + if (_model.Lines.Count == 0) + { + _output.Children.Add(Line(_model.CanRun ? ScriptConsoleModel.Empty : _model.Unavailable ?? string.Empty, _colours.Dim, string.Empty)); + } + + foreach (var line in _model.Lines) + { + var colour = line.Kind switch + { + ScriptConsoleKind.Error => _colours.Warn, + ScriptConsoleKind.Result => _colours.Accent, + ScriptConsoleKind.Input or ScriptConsoleKind.Note => _colours.Dim, + _ => _colours.Text, + }; + _output.Children.Add(Line(line.Text, colour, ScriptConsoleModel.Mark(line.Kind))); + } + + _outputScroller.ScrollToEnd(); + + _storeHeading.Text = _model.StoreCount > _model.Store.Count + ? $"STORE · {_model.Store.Count} OF {_model.StoreCount}" + : $"STORE · {_model.StoreCount}"; + _store.Children.Clear(); + _storeRows.Clear(); + if (_model.Store.Count == 0) + { + _store.Children.Add(ModalParts.Dim(_model.CanRun ? "nothing stored" : string.Empty, _colours, new Thickness(12, 8))); + } + + for (var i = 0; i < _model.Store.Count; i++) + { + var entry = _model.Store[i]; + var index = i; + var text = new StackPanel(); + text.Children.Add(new TextBlock { Text = entry.Key, FontWeight = FontWeight.SemiBold, Foreground = _colours.Brush(_colours.Text), TextTrimming = TextTrimming.CharacterEllipsis }); + text.Children.Add(new TextBlock { Text = entry.Value, FontFamily = _mono, FontSize = NativeTokens.Small, Foreground = _colours.Brush(_colours.Dim), TextTrimming = TextTrimming.CharacterEllipsis }); + var row = ModalParts.Row(text, entry.Key, () => SelectKey(index), () => SelectKey(index)); + _storeRows.Add(row); + _store.Children.Add(row); + } + + _selectedKey = _model.Store.Count == 0 ? -1 : Math.Clamp(_selectedKey, -1, _model.Store.Count - 1); + Highlight(); + } + + private Control Line(string text, Color colour, string mark) + { + var row = new DockPanel { Margin = new Thickness(0, 1) }; + var gutter = new TextBlock { Text = mark, Width = 18, FontFamily = _mono, Foreground = _colours.Brush(colour), FontSize = NativeTokens.Body }; + SetDock(gutter, Dock.Left); + row.Children.Add(gutter); + row.Children.Add(new SelectableTextBlock + { + Text = text, + FontFamily = _mono, + FontSize = NativeTokens.Body, + Foreground = _colours.Brush(colour), + TextWrapping = TextWrapping.Wrap, + }); + return row; + } + + private void Highlight() + { + for (var i = 0; i < _storeRows.Count; i++) + { + _storeRows[i].Background = i == _selectedKey ? _colours.Brush(_colours.Selected) : Brushes.Transparent; + } + + _delete.IsEnabled = SelectedKey is not null; + } + + private void OnKey(object? sender, KeyEventArgs e) + { + switch (e.Key) + { + case Key.Escape: + e.Handled = true; + _session.Dismiss(); + _done(); + return; + case Key.L when e.KeyModifiers == KeyModifiers.Control: + e.Handled = true; + Reload(); + return; + case Key.Enter when _prompt.IsFocused: + e.Handled = true; + Run(); + return; + case Key.Up or Key.Down when _prompt.IsFocused && e.KeyModifiers == KeyModifiers.None: + e.Handled = true; + Recall(e.Key == Key.Up ? -1 : 1); + return; + case Key.Delete when !_prompt.IsFocused && SelectedKey is not null: + e.Handled = true; + DeleteSelected(); + return; + case Key.Up or Key.Down when !_prompt.IsFocused && _model.Store.Count > 0: + e.Handled = true; + SelectKey(Math.Clamp((_selectedKey < 0 ? 0 : _selectedKey) + (e.Key == Key.Up ? -1 : 1), 0, _model.Store.Count - 1)); + return; + } + } + + /// ↑↓ at the prompt: walks what was typed, newest first, and back to an empty line. + private void Recall(int delta) + { + var history = _model.History; + if (history.Count == 0) + { + return; + } + + var at = _historyAt < 0 ? history.Count : _historyAt; + at = Math.Clamp(at + delta, 0, history.Count); + _historyAt = at == history.Count ? -1 : at; + _prompt.Text = _historyAt < 0 ? string.Empty : history[_historyAt]; + _prompt.CaretIndex = _prompt.Text.Length; + } +} diff --git a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs index 1a539792..44eae132 100644 --- a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs +++ b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs @@ -20,6 +20,15 @@ public static class BuiltInCommands /// Help: keys, slash commands and how-tos (/help). public const string HelpCommand = "term:help"; + /// ⌃P ▸ Script console. + public const string ScriptConsoleCommand = "world:script-console"; + + /// ⌃P ▸ Start scene log. + public const string SceneStartCommand = "term:scene-on"; + + /// ⌃P ▸ Stop scene log. + public const string SceneStopCommand = "term:scene-off"; + /// The spelling dictionary offer. public const string DictionaryCommand = "term:get-dictionary"; @@ -96,6 +105,8 @@ void Family(string id, string prefix, Func c.State.ScriptsOn); + Add(ScriptConsoleCommand, CommandGroup.World, "Script console", + detail: "run Lua as this character, see what scripts print and keep"); // Only where the host has a screen reader to tell: the window's live region, or --plain. Add("a11y:toggle-window", CommandGroup.Terminal, "Read this window aloud", @@ -105,6 +116,9 @@ void Family(string id, string prefix, Func c.State.LoggingOn); Add("term:log-on", CommandGroup.Terminal, "Start logging", when: c => !c.State.LoggingOn); + Add(SceneStopCommand, CommandGroup.Terminal, "Stop scene log", detail: "closes the file", when: c => c.State.SceneLogging); + Add(SceneStartCommand, CommandGroup.Terminal, "Start scene log", + detail: "record this window's poses to a file of their own", when: c => !c.State.SceneLogging); Add("term:unfreeze", CommandGroup.Terminal, "Resume scrollback", when: c => c.State.Frozen); Add("term:freeze", CommandGroup.Terminal, "Freeze pane", when: c => !c.State.Frozen); Add("term:clear", CommandGroup.Terminal, "Clear window"); diff --git a/src/SharpMUTerm.Client/Modals/ScriptConsoleModel.cs b/src/SharpMUTerm.Client/Modals/ScriptConsoleModel.cs new file mode 100644 index 00000000..e8e436be --- /dev/null +++ b/src/SharpMUTerm.Client/Modals/ScriptConsoleModel.cs @@ -0,0 +1,263 @@ +namespace SharpMUTerm.Client.Modals; + +/// What a script console line is. +public enum ScriptConsoleKind +{ + /// A line typed at the prompt. + Input, + + /// The value a typed line returned. + Result, + + /// Something a script printed (print, world.print, log.*). + Output, + + /// A script's error, a load failure or a refused file, with file:line where Lua gave one. + Error, + + /// The console's own remark (scripts reloaded, a key deleted). + Note, +} + +/// One line of a character's script console. +public sealed record ScriptConsoleLine(ScriptConsoleKind Kind, string Text); + +/// One store.* key and its value, as JSON cut to . +public sealed record ScriptStoreEntry(string Key, string Value); + +/// +/// A character's script console (⌃P ▸ Script console): what its scripts printed and the errors they raised, +/// a one-line Lua prompt run in that character's sandbox, the lines typed there, and a read-only view of its +/// store.* with delete. Drawn by the cell surface (ScriptConsoleSurface.Render) and the window's native +/// modal from the same record. +/// +/// Whose scripts these are (the window's character), or empty for none. +/// Why there is no prompt (no scripts folder, no character), or null when there is one. +/// The newest console lines, oldest first, at most . +/// What was typed at the prompt, oldest first, at most . +/// The store's keys and values in the order they were first set, at most . +/// How many keys the store holds in all. +/// The script files the character's trigger sets name. +/// How many of them loaded. +/// The scripts folder, or null in a client that runs none. +public sealed record ScriptConsoleModel( + string Character, + string? Unavailable, + IReadOnlyList Lines, + IReadOnlyList History, + IReadOnlyList Store, + int StoreCount, + IReadOnlyList Files, + int Loaded, + string? Folder) +{ + /// The most console lines kept per character. + public const int MaxLines = 300; + + /// The most prompt lines remembered per character. + public const int MaxHistory = 50; + + /// The most store keys listed. + public const int MaxStoreRows = 200; + + /// The longest store value shown. + public const int MaxValueLength = 120; + + /// The longest line typed at the prompt. + public const int MaxInput = 500; + + /// The keys, in glyphs, as the cells' footer says them (a native view spells them in words). + public const string Keys = "⏎ runs · ↑↓ history · ⇥ store keys · Del deletes a key · ⌃L reloads scripts · Esc closes"; + + /// What the console says when its scripts printed nothing yet. + public const string Empty = "nothing printed yet — try 1 + 1 or print(world.name)"; + + /// Whether a line can be run. + public bool CanRun => Unavailable is null; + + /// The line under the title: whose scripts, how many loaded, how many keys. + public string Summary => + Unavailable is not null + ? Unavailable + : $"{Character} · {LoadedText} · {StoreCount} store key{(StoreCount == 1 ? string.Empty : "s")}"; + + private string LoadedText => (Files.Count, Loaded) switch + { + (0, _) => "no script files", + (var n, var l) when l < n => $"{l} of {n} files loaded", + (1, _) => "1 file loaded", + (var n, _) => $"{n} files loaded", + }; + + /// A console line's mark, the same in both hosts. + public static string Mark(ScriptConsoleKind kind) => kind switch + { + ScriptConsoleKind.Input => "›", + ScriptConsoleKind.Result => "=", + ScriptConsoleKind.Error => "!", + ScriptConsoleKind.Note => "·", + _ => " ", + }; + + public bool Equals(ScriptConsoleModel? other) => + other is not null + && Character == other.Character + && Unavailable == other.Unavailable + && StoreCount == other.StoreCount + && Loaded == other.Loaded + && Folder == other.Folder + && ModelLists.Same(Lines, other.Lines) + && ModelLists.Same(History, other.History) + && ModelLists.Same(Store, other.Store) + && ModelLists.Same(Files, other.Files); + + public override int GetHashCode() => + HashCode.Combine(Character, Unavailable, StoreCount, Loaded, ModelLists.Hash(Lines), ModelLists.Hash(Store)); +} + +/// +/// A character's console lines, kept for the run (never saved) and fed from any thread: a trigger's script prints on +/// the read loop, a timer's on the scheduler. Bounded at . +/// +public sealed class ScriptConsoleLog +{ + private readonly object _gate = new(); + private readonly LinkedList _lines = new(); + private readonly List _history = new(); + + /// Raised after a line is added, on the thread that added it. + public event Action? Changed; + + /// Adds a line, cut to one row of reasonable length per line of text. + public void Add(ScriptConsoleKind kind, string text) + { + lock (_gate) + { + foreach (var part in (text ?? string.Empty).Replace("\r", string.Empty, StringComparison.Ordinal).Split('\n').Take(20)) + { + var clean = new string(part.Select(c => char.IsControl(c) && c != '\t' ? ' ' : c).ToArray()).Replace('\t', ' '); + _lines.AddLast(new ScriptConsoleLine(kind, clean.Length > 400 ? clean[..399] + "…" : clean)); + } + + while (_lines.Count > ScriptConsoleModel.MaxLines) + { + _lines.RemoveFirst(); + } + } + + Changed?.Invoke(); + } + + /// Remembers a line typed at the prompt (a repeat of the last is not added twice). + public void Remember(string input) + { + lock (_gate) + { + if (_history.Count == 0 || _history[^1] != input) + { + _history.Add(input); + } + + if (_history.Count > ScriptConsoleModel.MaxHistory) + { + _history.RemoveAt(0); + } + } + } + + /// The lines, oldest first. + public IReadOnlyList Lines + { + get + { + lock (_gate) + { + return _lines.ToArray(); + } + } + } + + /// What was typed, oldest first. + public IReadOnlyList History + { + get + { + lock (_gate) + { + return _history.ToArray(); + } + } + } +} + +/// +/// One opening of the script console in a host's own controls. Every gesture goes back through it to the client's +/// thread and ends in the method the cell surface's key ends in; the client republishes the model after each. +/// +public sealed class ScriptConsoleSession : ModalSession +{ + private readonly Action _run; + private readonly Action _delete; + private readonly Action _reload; + + /// What the console shows. + /// Whether the client's theme is a dark one. + /// Runs a line at the prompt (RunConsoleLine). + /// Deletes a store key (DeleteStoreKey). + /// Reloads the character's scripts (ReloadConsoleScripts). + /// Told the console closed. + public ScriptConsoleSession( + ScriptConsoleModel model, + bool isDark, + Action run, + Action delete, + Action reload, + Action closed) + : base(model, isDark, closed) + { + ArgumentNullException.ThrowIfNull(run); + ArgumentNullException.ThrowIfNull(delete); + ArgumentNullException.ThrowIfNull(reload); + _run = run; + _delete = delete; + _reload = reload; + } + + public override string Surface => "script-console"; + + /// The host's: ⏎ on a line. Nothing when the console cannot run one, or the line is blank. + public bool Run(string line) + { + if (IsEnded || !Model.CanRun || string.IsNullOrWhiteSpace(line)) + { + return false; + } + + _run(line.Length > ScriptConsoleModel.MaxInput ? line[..ScriptConsoleModel.MaxInput] : line); + return true; + } + + /// The host's: Delete on a store key the model lists. + public bool Delete(string key) + { + if (IsEnded || !Model.Store.Any(e => e.Key == key)) + { + return false; + } + + _delete(key); + return true; + } + + /// The host's: Reload scripts. + public bool Reload() + { + if (IsEnded) + { + return false; + } + + _reload(); + return true; + } +} diff --git a/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs b/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs index 0ac15685..2f86e250 100644 --- a/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs +++ b/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs @@ -1,5 +1,7 @@ using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Core.Automation; using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Logging; namespace SharpMUTerm.Client.Settings; @@ -47,6 +49,9 @@ public static partial class BuiltInSettings /// Game sound; drawn only where a host passes the sound settings. public const string SoundGroup = "Sound"; + /// How a scene log is written. + public const string SceneLogGroup = "Scene log"; + /// The id of the meters field, which a host draws as a table rather than one value. public const string MetersField = "meters"; @@ -140,6 +145,23 @@ public static partial class BuiltInSettings Flag("captions", "sound captions", SoundGroup, c => c.Sound.Captions, (c, v) => c.Sound.Captions = v, "print a line of text for each sound", "audio subtitles accessibility"), + + new ChoiceField("scene-format", "scene log format", WorldFieldValues.SceneFormats, "HTML keeps the game's colours") + { + Group = SceneLogGroup, + Keywords = "roleplay rp scene log html plain transcript", + Binding = new SettingBinding( + c => c.SceneLog.Html ? WorldFieldValues.SceneFormats[0] : WorldFieldValues.SceneFormats[1], + (c, v) => c.SceneLog.Html = v != WorldFieldValues.SceneFormats[1]), + }, + new ChoiceField("scene-content", "scene log keeps", WorldFieldValues.SceneContents, "poses start with the name of someone present") + { + Group = SceneLogGroup, + Keywords = "roleplay rp scene log poses", + Binding = new SettingBinding( + c => c.SceneLog.Content == SceneLogContent.Everything ? WorldFieldValues.SceneContents[1] : WorldFieldValues.SceneContents[0], + (c, v) => c.SceneLog.Content = v == WorldFieldValues.SceneContents[1] ? SceneLogContent.Everything : SceneLogContent.Poses), + }, ], }; @@ -267,6 +289,16 @@ public static partial class BuiltInSettings (_, w) => w.AlertOnName ? WorldFieldValues.AlertChoices[1] : WorldFieldValues.AlertChoices[0], (_, w, v) => w.AlertOnName = v == WorldFieldValues.AlertChoices[1], "tell the desktop when a line names your character or pages you", "notify mention page tell"), + WorldChoice("capture-channels", "capture channels", WorldFieldValues.ChannelCaptureChoices, WorldTextGroup, + (_, w) => WorldFieldValues.ChannelCaptureName(w.CaptureChannels), + (_, w, v) => w.CaptureChannels = WorldFieldValues.ChannelCaptureOf(v), + "put each GMCP channel in a window of its own, as a copy or moved out of the main window", + "comm.channel chat ooc gossip spawn window"), + WorldText("highlight-names", "highlight names", TextRule.NameHighlights, WorldTextGroup, + (_, w) => NameHighlights.Format(w.HighlightNames), + (_, w, v) => w.HighlightNames = [.. NameHighlights.Parse(v).Names], + "names drawn in a colour wherever they appear: Ashlyn=gold, Merrow=red", + "friends enemies highlight name colour"), WorldText("edit-grab", "edit grab", TextRule.Optional, WorldTextGroup, (_, w) => w.GrabPrefix, (_, w, v) => w.GrabPrefix = v, "a line starting with this goes on the command line instead of the output", "fugueedit mush edit prefix"), diff --git a/src/SharpMUTerm.Client/Settings/TextRules.cs b/src/SharpMUTerm.Client/Settings/TextRules.cs index 0d042885..84772107 100644 --- a/src/SharpMUTerm.Client/Settings/TextRules.cs +++ b/src/SharpMUTerm.Client/Settings/TextRules.cs @@ -45,6 +45,9 @@ public enum TextRule /// The name of a window: not blank, no control characters; trimmed (a route). Window, + + /// A highlight-names list: Name=colour, …, each colour one of . + NameHighlights, } /// @@ -78,6 +81,8 @@ TextRule.Name when string.IsNullOrWhiteSpace(text) => $"{field.Label} cannot be TextRule.Name or TextRule.Secret or TextRule.Defaulted when text.Any(char.IsControl) => $"{field.Label} cannot contain control characters", TextRule.Pattern when !string.IsNullOrWhiteSpace(text) => PatternError(text), + TextRule.NameHighlights => Core.Automation.NameHighlights.Parse( + text, colour => HighlightColours.Palette.Contains(colour) && colour != HighlightColours.None).Error, _ => null, }; } diff --git a/src/SharpMUTerm.Client/Settings/WorldFieldValues.cs b/src/SharpMUTerm.Client/Settings/WorldFieldValues.cs index 6547186c..abb39b73 100644 --- a/src/SharpMUTerm.Client/Settings/WorldFieldValues.cs +++ b/src/SharpMUTerm.Client/Settings/WorldFieldValues.cs @@ -188,4 +188,20 @@ public static void SplitModules(WorldDefinition world, string? value) world.GmcpModules = modules; } + + /// The words for . + public static IReadOnlyList ChannelCaptureChoices { get; } = ["off", "copy", "move"]; + + /// A capture mode as its word. + public static string ChannelCaptureName(SharpMUTerm.Core.Protocols.ChannelCaptureMode mode) => ChannelCaptureChoices[(int)mode]; + + /// A word as a capture mode; anything else is off. + public static SharpMUTerm.Core.Protocols.ChannelCaptureMode ChannelCaptureOf(string? word) => + (SharpMUTerm.Core.Protocols.ChannelCaptureMode)Math.Max(0, ChannelCaptureChoices.ToList().IndexOf(word ?? string.Empty)); + + /// F7's words for a scene log's format. + public static IReadOnlyList SceneFormats { get; } = ["html", "plain text"]; + + /// F7's words for what a scene log keeps. + public static IReadOnlyList SceneContents { get; } = ["poses", "every line"]; } diff --git a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs index c3af479b..dabe0acc 100644 --- a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs +++ b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs @@ -186,6 +186,9 @@ public static class SurfaceCatalog /// The spelling dictionary offer: the consent step before anything is downloaded. public const string Dictionary = "dictionary"; + /// A character's script console: its scripts' output and errors, a Lua prompt, and its store.*. + public const string ScriptConsole = "script-console"; + /// /// The +3 ▾ chip a tab strip carries when its tabs do not fit even at their floors, and the list of the tabs /// past its edges it opens: a cell list in a terminal, a native menu in the window (the chip itself is cells in both). @@ -209,7 +212,7 @@ public static class SurfaceCatalog private static string[] PanelViews(string view) => ["SharpMUTerm.Avalonia." + view, "SharpMUTerm.Avalonia.PopOutButton"]; /// The modals the window draws with its own controls in place of the cell modal (ClientHost.NativeModals). - public static IReadOnlyList Modals { get; } = [Quit, Search, History, Layouts, Welcome, Help, Dictionary]; + public static IReadOnlyList Modals { get; } = [Quit, Search, History, Layouts, Welcome, Help, Dictionary, ScriptConsole]; /// A cell modal in a terminal; the window's own modal in its place. private static readonly IReadOnlyDictionary NativeModal = new Dictionary @@ -483,6 +486,18 @@ public static class SurfaceCatalog NativeModal, "SharpMUTerm.Tui.DictionaryOffer.Render", ModalViews("DictionaryOfferView")), + new( + ScriptConsole, + typeof(ScriptConsoleModel), + [ + // A line at the prompt runs in the character's sandbox; a store key is deleted; the scripts are reloaded. + new(SurfaceActionKind.Modal, "run", "RunConsoleLine"), + new(SurfaceActionKind.Modal, "delete key", "DeleteStoreKey"), + new(SurfaceActionKind.Modal, "reload", "ReloadConsoleScripts"), + ], + NativeModal, + "SharpMUTerm.Tui.ScriptConsoleSurface.Render", + ModalViews("ScriptConsoleView")), new( TabOverflow, typeof(MenuModel), diff --git a/src/SharpMUTerm.Core/Automation/NameHighlights.cs b/src/SharpMUTerm.Core/Automation/NameHighlights.cs new file mode 100644 index 00000000..4d1b3a27 --- /dev/null +++ b/src/SharpMUTerm.Core/Automation/NameHighlights.cs @@ -0,0 +1,164 @@ +using System.Text; +using System.Text.RegularExpressions; +using SharpMUTerm.Core.Text; + +namespace SharpMUTerm.Core.Automation; + +/// One name a world highlights wherever it appears as a whole word, and the colour it is drawn in. +/// The name, as typed (matched without regard to case). +/// A colour name (gold, red) or #rrggbb. +public sealed record NameHighlight(string Name, string Colour); + +/// +/// A world's highlight-names list (F5 ▸ highlight names): friends, enemies, your own name, each drawn in its colour +/// wherever it appears as a whole word in that world's output. Written as one line, Ashlyn=gold, Merrow=red; a name +/// with no colour is . Applied at ingest, after the triggers (so a rule matches what the server +/// sent) and before emoji and links, so a spawn window and the main window show the same colours. The colour is a +/// foreground only, so the pane's legibility floor still holds it (the formatter measures it against the reading plane). +/// +public static class NameHighlights +{ + /// The colour a name with none is drawn in. + public const string DefaultColour = "gold"; + + /// How many names a list may hold; past it the rest are dropped. + public const int MaxNames = 64; + + /// The longest name. + public const int MaxNameLength = 40; + + /// + /// Reads Name=colour, Name=colour (commas or semicolons between, = or : before a colour). Returns + /// the list, or why the text is not one — a colour that is not a colour, a name too long or holding a control + /// character. A blank text is the empty list. + /// + public static (IReadOnlyList Names, string? Error) Parse(string? text, Func? colourIsAllowed = null) + { + var names = new List(); + if (string.IsNullOrWhiteSpace(text)) + { + return (names, null); + } + + foreach (var raw in text.Split([',', ';'], StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries)) + { + var cut = raw.IndexOfAny(['=', ':']); + var name = (cut < 0 ? raw : raw[..cut]).Trim(); + var colour = cut < 0 ? DefaultColour : raw[(cut + 1)..].Trim().ToLowerInvariant(); + if (name.Length == 0) + { + return (names, $"'{raw}' names nobody"); + } + + if (name.Length > MaxNameLength) + { + return (names, $"a name may be at most {MaxNameLength} characters"); + } + + if (name.Any(char.IsControl)) + { + return (names, "a name cannot contain control characters"); + } + + if (colour.Length == 0) + { + colour = DefaultColour; + } + + if (!WebColors.TryParse(colour, out _) || (colourIsAllowed is not null && !colourIsAllowed(colour))) + { + return (names, $"'{colour}' is not one of the highlight colours"); + } + + if (names.Count < MaxNames && !names.Any(n => string.Equals(n.Name, name, StringComparison.OrdinalIgnoreCase))) + { + names.Add(new NameHighlight(name, colour)); + } + } + + return (names, null); + } + + /// The list as the one line reads, or null for none. + public static string? Format(IReadOnlyList? names) => + names is null || names.Count == 0 + ? null + : string.Join(", ", names.Select(n => string.Equals(n.Colour, DefaultColour, StringComparison.OrdinalIgnoreCase) ? n.Name : $"{n.Name}={n.Colour}")); + + /// + /// with every whole-word occurrence of a listed name drawn in its colour. A name is a whole + /// word when no letter, digit or underscore touches either end, so Ann lights Ann's and not + /// Annabel. Returns the line itself when nothing matched. + /// + public static StyledLine Apply(StyledLine line, Matcher? matcher) + { + ArgumentNullException.ThrowIfNull(line); + if (matcher is null || line.IsEmpty) + { + return line; + } + + MatchCollection matches; + try + { + matches = matcher.Pattern.Matches(line.Text); + } + catch (RegexMatchTimeoutException) + { + return line; + } + + foreach (Match match in matches) + { + if (matcher.ColourOf(match.Value) is { } colour) + { + line = StyledText.Restyle(line, match.Index, match.Length, style => style.WithForeground(colour)); + } + } + + return line; + } + + /// The compiled form of a list, built once per list and reused for every line; null for an empty list. + public static Matcher? Compile(IReadOnlyList? names) + { + if (names is null || names.Count == 0) + { + return null; + } + + var colours = new Dictionary(StringComparer.OrdinalIgnoreCase); + var pattern = new StringBuilder(@"(? n.Name.Length > 0).OrderByDescending(n => n.Name.Length)) + { + if (!WebColors.TryParse(name.Colour, out var colour) || !colours.TryAdd(name.Name, colour)) + { + continue; + } + + pattern.Append(first ? string.Empty : "|").Append(Regex.Escape(name.Name)); + first = false; + } + + if (first) + { + return null; + } + + pattern.Append(@")(?![\w])"); + return new Matcher( + new Regex(pattern.ToString(), RegexOptions.IgnoreCase | RegexOptions.CultureInvariant, TimeSpan.FromMilliseconds(50)), + colours); + } + + /// A list compiled to one pattern, with each name's colour. + public sealed class Matcher(Regex pattern, IReadOnlyDictionary colours) + { + public Regex Pattern { get; } = pattern; + + public TerminalColor? ColourOf(string name) => colours.TryGetValue(name, out var colour) ? colour : null; + } +} diff --git a/src/SharpMUTerm.Core/Commands/CommandCatalog.cs b/src/SharpMUTerm.Core/Commands/CommandCatalog.cs index a657cbdc..249c9c13 100644 --- a/src/SharpMUTerm.Core/Commands/CommandCatalog.cs +++ b/src/SharpMUTerm.Core/Commands/CommandCatalog.cs @@ -58,6 +58,7 @@ public sealed record CharacterRef( /// The worlds whose connected pane is narrower than the column their server wraps at, and which do not join wraps — so /// Join server wraps for … is offered (and suggested) only while it would change what the pane shows. /// +/// Whether the focused window is being recorded as a scene, so ⌃P offers to stop it. /// /// Whether the client's own dictionaries folder holds none, so Get a spelling dictionary is offered. /// @@ -78,7 +79,8 @@ public sealed record CommandContext( int KeyClashes = 0, IReadOnlyList? Floats = null, IReadOnlyList? RaggedWraps = null, - bool NoDictionary = false); + bool NoDictionary = false, + bool SceneLogging = false); /// A world whose pane is narrower than its server's wrap column. /// The world's name. diff --git a/src/SharpMUTerm.Core/Configuration/AppConfiguration.cs b/src/SharpMUTerm.Core/Configuration/AppConfiguration.cs index cf709f96..b3d2b318 100644 --- a/src/SharpMUTerm.Core/Configuration/AppConfiguration.cs +++ b/src/SharpMUTerm.Core/Configuration/AppConfiguration.cs @@ -89,6 +89,9 @@ public sealed class AppConfiguration /// Game sound: on or off, the player's levels, captions (F7 ▸ SOUND). public SoundSettings Sound { get; set; } = new(); + /// How a scene log (⌃P ▸ Start scene log) is written: HTML or plain text, poses or every line (F7 ▸ Scene log). + public SceneLogSettings SceneLog { get; set; } = new(); + /// How the command line behaves — the F8 "Input & spellcheck" screen's settings. public InputSettings Input { get; set; } = new(); @@ -186,3 +189,13 @@ public IReadOnlyList ResolveTriggerSets(CharacterDefinition characte return resolved; } } + +/// How a scene log is written (). +public sealed class SceneLogSettings +{ + /// HTML (the default, keeping the game's colours) or plain text. + public bool Html { get; set; } = true; + + /// Poses only (the default) or every line the window shows. + public Logging.SceneLogContent Content { get; set; } +} diff --git a/src/SharpMUTerm.Core/Configuration/WorldDefinition.cs b/src/SharpMUTerm.Core/Configuration/WorldDefinition.cs index 6e4f9417..e443d32a 100644 --- a/src/SharpMUTerm.Core/Configuration/WorldDefinition.cs +++ b/src/SharpMUTerm.Core/Configuration/WorldDefinition.cs @@ -165,6 +165,18 @@ public sealed class WorldDefinition /// public bool DiscordPresence { get; set; } + /// + /// What GMCP Comm.Channel.Text does (F5 ▸ capture channels): nothing (the default), a copy in a window + /// per channel, or the line moved there and kept out of the main window (). + /// + public Protocols.ChannelCaptureMode CaptureChannels { get; set; } + + /// + /// Names drawn in a colour wherever they appear as whole words in this world's output (F5 ▸ highlight names), + /// in the order they were listed. Empty by default (). + /// + public List HighlightNames { get; set; } = new(); + /// How the mapper recognises a room on a game that sends no room data (see ). public MapSettings Map { get; set; } = new(); @@ -271,6 +283,8 @@ public sealed class WorldDefinition AlertOnName = AlertOnName, GmcpLogin = GmcpLogin, DiscordPresence = DiscordPresence, + CaptureChannels = CaptureChannels, + HighlightNames = HighlightNames.ToList(), Layout = Layout, AcceptedLayoutSuggestion = AcceptedLayoutSuggestion, Characters = Characters.Select(c => c.Clone()).ToList(), diff --git a/src/SharpMUTerm.Core/Logging/SceneLog.cs b/src/SharpMUTerm.Core/Logging/SceneLog.cs new file mode 100644 index 00000000..7c529d35 --- /dev/null +++ b/src/SharpMUTerm.Core/Logging/SceneLog.cs @@ -0,0 +1,219 @@ +using System.Globalization; +using System.Text; +using System.Text.RegularExpressions; +using SharpMUTerm.Core.Text; + +namespace SharpMUTerm.Core.Logging; + +/// Which lines a scene log keeps. +public enum SceneLogContent +{ + /// Poses: lines that start with the name of someone present (). The default. + Poses, + + /// Every line the window shows. + Everything, +} + +/// +/// A roleplay scene being recorded (⌃P ▸ Start scene log): one window's lines from now until it is stopped, +/// written through or to a file of its own, under a header naming +/// the scene, when it started and who was present. It is not the session log, which is per character and kept running; +/// a scene is something a player starts and stops, and keeps. +/// +public sealed class SceneLog : IDisposable +{ + private readonly ILogSink _sink; + private readonly IReadOnlyCollection _names; + private readonly HashSet _seen = new(StringComparer.OrdinalIgnoreCase); + private readonly object _gate = new(); + private bool _closed; + + private SceneLog(ILogSink sink, string path, string windowId, string title, SceneLogContent content, IReadOnlyCollection names, DateTimeOffset started) + { + _sink = sink; + _names = names; + Path = path; + WindowId = windowId; + Title = title; + Content = content; + Started = started; + } + + /// The file being written. + public string Path { get; } + + /// The window whose lines are recorded. + public string WindowId { get; } + + /// The scene's title (the window's, unless one was given). + public string Title { get; } + + public SceneLogContent Content { get; } + + public DateTimeOffset Started { get; } + + /// How many lines have been written. + public int Lines { get; private set; } + + /// The names that started a pose so far, in no order. + public IReadOnlyCollection Posers + { + get + { + lock (_gate) + { + return _seen.ToArray(); + } + } + } + + /// + /// Starts a scene log in : scene-<title>-<yyyyMMdd-HHmmss>.html (or + /// .txt), never overwriting a file that is there. Writes the header at once. Throws an + /// or when the file cannot be made. + /// + /// Who is present: the room's roster and the player's own character. Also the names a pose starts with. + public static SceneLog Start( + string folder, + string windowId, + string title, + bool html, + SceneLogContent content, + IReadOnlyCollection present, + DateTimeOffset now) + { + ArgumentException.ThrowIfNullOrWhiteSpace(folder); + Directory.CreateDirectory(folder); + var stem = $"scene-{FileStem(title)}-{now.ToLocalTime().ToString("yyyyMMdd-HHmmss", CultureInfo.InvariantCulture)}"; + var extension = html ? ".html" : ".txt"; + var path = System.IO.Path.Combine(folder, stem + extension); + for (var n = 2; File.Exists(path); n++) + { + path = System.IO.Path.Combine(folder, $"{stem}-{n}{extension}"); + } + + var heading = $"Scene: {title}"; + ILogSink sink = html ? HtmlLogSink.CreateFile(path, heading) : PlainTextLogSink.CreateFile(path, append: false); + var log = new SceneLog(sink, path, windowId, title, content, present, now); + sink.WriteSystem(heading); + sink.WriteSystem($"Started {now.ToLocalTime().ToString("yyyy-MM-dd HH:mm", CultureInfo.InvariantCulture)}"); + sink.WriteSystem(present.Count == 0 ? "Present: nobody the client knows of" : $"Present: {string.Join(", ", present)}"); + sink.WriteSystem(content == SceneLogContent.Poses ? "Poses only" : "Every line"); + sink.Flush(); + return log; + } + + /// Offers a line the window showed; it is written when the scene keeps lines of its kind. Any thread. + public bool Offer(StyledLine line) + { + ArgumentNullException.ThrowIfNull(line); + if (line.IsPrompt || line.Text.Trim().Length == 0) + { + return false; + } + + string? poser = ScenePoses.Poser(line.Text, _names); + if (Content == SceneLogContent.Poses && poser is null) + { + return false; + } + + lock (_gate) + { + if (_closed) + { + return false; + } + + if (poser is not null) + { + _seen.Add(poser); + } + + _sink.WriteLine(line); + _sink.Flush(); + Lines++; + return true; + } + } + + /// Writes the closing lines and closes the file. + public void Stop(DateTimeOffset now) + { + lock (_gate) + { + if (_closed) + { + return; + } + + _closed = true; + _sink.WriteSystem($"Ended {now.ToLocalTime().ToString("yyyy-MM-dd HH:mm", CultureInfo.InvariantCulture)} · {Lines} line{(Lines == 1 ? string.Empty : "s")}" + + (_seen.Count == 0 ? string.Empty : $" · posed: {string.Join(", ", _seen.Order(StringComparer.OrdinalIgnoreCase))}")); + _sink.Dispose(); + } + } + + public void Dispose() => Stop(DateTimeOffset.Now); + + /// A title as part of a file name: letters, digits and dashes, at most 40. + internal static string FileStem(string title) + { + var stem = new StringBuilder(); + foreach (var c in title) + { + if (stem.Length >= 40) + { + break; + } + + stem.Append(char.IsAsciiLetterOrDigit(c) ? char.ToLowerInvariant(c) : '-'); + } + + var text = Regex.Replace(stem.ToString(), "-{2,}", "-").Trim('-'); + return text.Length == 0 ? "scene" : text; + } +} + +/// +/// What counts as a pose in a scene log: a line that starts with the name of someone present (Ashlyn smiles., +/// Ashlyn says, "…", Ashlyn's eyes narrow.), or a line in the shape a say takes (Name says, "…"). +/// Room descriptions, channel lines, system messages and the client's own lines start with no name and are left out. +/// +public static class ScenePoses +{ + private static readonly Regex SayShape = new( + @"^([A-Z][\w'-]{1,30})\s+(says|asks|exclaims|whispers|shouts|murmurs|replies)\b.*""", + RegexOptions.CultureInvariant, + TimeSpan.FromMilliseconds(50)); + + /// The name a pose starts with, or null when is not a pose. + public static string? Poser(string text, IReadOnlyCollection names) + { + var line = text.TrimStart(); + if (line.Length == 0 || line.StartsWith("***", StringComparison.Ordinal)) + { + return null; + } + + foreach (var name in names.OrderByDescending(n => n.Length)) + { + if (name.Length > 0 + && line.StartsWith(name, StringComparison.OrdinalIgnoreCase) + && (line.Length == name.Length || !char.IsLetterOrDigit(line[name.Length]))) + { + return name; + } + } + + try + { + return SayShape.Match(line) is { Success: true } say ? say.Groups[1].Value : null; + } + catch (RegexMatchTimeoutException) + { + return null; + } + } +} diff --git a/src/SharpMUTerm.Core/Protocols/ChannelCapture.cs b/src/SharpMUTerm.Core/Protocols/ChannelCapture.cs new file mode 100644 index 00000000..31bcc78c --- /dev/null +++ b/src/SharpMUTerm.Core/Protocols/ChannelCapture.cs @@ -0,0 +1,186 @@ +using System.Text; +using System.Text.Json; +using SharpMUTerm.Core.Text; + +namespace SharpMUTerm.Core.Protocols; + +/// What a world does with GMCP Comm.Channel.Text (F5 ▸ capture channels). +public enum ChannelCaptureMode +{ + /// Nothing: channel text reaches only the main window, as the server prints it. The default. + Off, + + /// Each channel's text is also put in a window of its own; the main window keeps its copy. + Copy, + + /// Each channel's text goes to its window, and the line the server prints for it is kept out of the main window. + Move, +} + +/// +/// GMCP channel capture (IRE's and Aardwolf's Comm.Channel.Text): the message is turned into a line for a spawn +/// window named after its channel, through the same SpawnLine a capture rule raises, so the restore log, ⌃F, the +/// unread badge and the activity bar treat it as any captured line. With the line +/// the server prints for the same message is gagged from the main window by . +/// +/// The gag matches text, not position: the server prints the channel line and sends the GMCP message separately, +/// and neither carries an id. A printed line whose visible text equals a message's within of it +/// is taken as that message's echo and is consumed once. IRE and Aardwolf send the GMCP first; a server that prints first +/// keeps its main-window copy, which is the safe way for this to be wrong. +/// +/// +public sealed class ChannelCapture +{ + /// How long a message waits for its printed echo. + public static readonly TimeSpan EchoWindow = TimeSpan.FromSeconds(3); + + /// The most messages waiting for an echo at once. + public const int MaxPending = 32; + + /// The longest channel name kept for a window title. + public const int MaxChannelLength = 24; + + /// The longest message text read. + public const int MaxTextLength = 4096; + + private readonly object _gate = new(); + private readonly LinkedList<(string Text, DateTimeOffset At)> _pending = new(); + private readonly TimeProvider _clock; + + public ChannelCapture(TimeProvider? clock = null) => _clock = clock ?? TimeProvider.System; + + /// + /// The window a Comm.Channel.Text payload belongs to and the lines it shows there, or null for a payload that + /// is not one (no channel, no text, not an object). The text may carry ANSI colour, which is kept. + /// + public static (string Window, IReadOnlyList Lines)? Read(string json) + { + try + { + using var document = JsonDocument.Parse(json); + var root = document.RootElement; + if (root.ValueKind != JsonValueKind.Object + || Text(root, "channel") is not { } channel + || Text(root, "text") is not { } text) + { + return null; + } + + var window = WindowName(channel); + if (window.Length == 0) + { + return null; + } + + if (text.Length > MaxTextLength) + { + text = text[..MaxTextLength]; + } + + var parser = new AnsiParser(); + var lines = new List(parser.Feed(text.Replace("\r", string.Empty, StringComparison.Ordinal))); + if (parser.Flush() is { } last) + { + lines.Add(last); + } + + while (lines.Count > 0 && lines[^1].Text.Trim().Length == 0) + { + lines.RemoveAt(lines.Count - 1); + } + + return lines.Count == 0 ? null : (window, lines); + } + catch (JsonException) + { + return null; + } + } + + /// + /// A channel name as a window title: letters, digits, spaces, - and _ only, capped, and with no + /// leading or trailing space — it names a window, and is server text. + /// + public static string WindowName(string channel) + { + var name = new StringBuilder(Math.Min(channel.Length, MaxChannelLength)); + foreach (var c in channel) + { + if (name.Length >= MaxChannelLength) + { + break; + } + + if (char.IsLetterOrDigit(c) || c is ' ' or '-' or '_') + { + name.Append(c); + } + } + + return name.ToString().Trim(); + } + + /// Notes a message whose printed echo is to be kept out of the main window. + public void ExpectEcho(IEnumerable lines) + { + var now = _clock.GetUtcNow(); + lock (_gate) + { + foreach (var line in lines) + { + var text = line.Text.Trim(); + if (text.Length > 0) + { + _pending.AddLast((text, now)); + } + } + + while (_pending.Count > MaxPending) + { + _pending.RemoveFirst(); + } + } + } + + /// Whether is the echo of a message still waiting; if so it is consumed. + public bool TakeEcho(string printed) + { + var text = printed.Trim(); + if (text.Length == 0) + { + return false; + } + + var now = _clock.GetUtcNow(); + lock (_gate) + { + while (_pending.First is { } oldest && now - oldest.Value.At > EchoWindow) + { + _pending.RemoveFirst(); + } + + for (var node = _pending.First; node is not null; node = node.Next) + { + if (string.Equals(node.Value.Text, text, StringComparison.Ordinal)) + { + _pending.Remove(node); + return true; + } + } + } + + return false; + } + + /// Forgets every message waiting for an echo (a new connection). + public void Clear() + { + lock (_gate) + { + _pending.Clear(); + } + } + + private static string? Text(JsonElement root, string name) => + root.TryGetProperty(name, out var value) && value.ValueKind == JsonValueKind.String ? value.GetString() : null; +} diff --git a/src/SharpMUTerm.Core/Session/WorldSession.cs b/src/SharpMUTerm.Core/Session/WorldSession.cs index e05b9ef7..7d81a31a 100644 --- a/src/SharpMUTerm.Core/Session/WorldSession.cs +++ b/src/SharpMUTerm.Core/Session/WorldSession.cs @@ -620,6 +620,7 @@ public async Task ConnectAsync(CancellationToken cancellationToken = default) telnet.OutputReceived += OnOutputReceived; GameData.Clear(); Occupants.Clear(); + _channels.Clear(); lock (_metersGate) { _mxpMeters = []; @@ -641,6 +642,7 @@ public async Task ConnectAsync(CancellationToken cancellationToken = default) GamePresenceChanged?.Invoke(this, EventArgs.Empty); } GmcpReceived?.Invoke(this, e); + CaptureChannel(e.Package, e.Json); if (e.Package.StartsWith("Client.Media", StringComparison.Ordinal) && Media.MediaCommand.FromGmcp(e.Package, e.Json) is { } media) { @@ -877,6 +879,54 @@ private bool TryGrab(StyledLine line) return true; } + /// Messages whose printed echo a world that moves channels keeps out of the main window. + private readonly ChannelCapture _channels = new(); + + /// The highlight-names list last compiled, and what it compiled to. + private (List? Source, int Count, NameHighlights.Matcher? Matcher) _nameMatcher; + + /// The world's highlight names, compiled once per list (F5 replaces the list whole, so its identity is the key). + private NameHighlights.Matcher? NameMatcher() + { + var names = World.HighlightNames; + var cached = _nameMatcher; + if (ReferenceEquals(cached.Source, names) && cached.Count == (names?.Count ?? 0)) + { + return cached.Matcher; + } + + var matcher = NameHighlights.Compile(names); + _nameMatcher = (names, names?.Count ?? 0, matcher); + return matcher; + } + + /// + /// GMCP Comm.Channel.Text into a window per channel, when the world captures channels: raised as + /// , the event a capture rule raises, so the restore log, search and the unread badge see a + /// captured line. Runs on the read loop, in arrival order with the output it belongs beside. + /// + internal void CaptureChannel(string package, string json) + { + if (World.CaptureChannels == ChannelCaptureMode.Off + || !string.Equals(package, "Comm.Channel.Text", StringComparison.OrdinalIgnoreCase) + || ChannelCapture.Read(json) is not { } message) + { + return; + } + + if (World.CaptureChannels == ChannelCaptureMode.Move) + { + _channels.ExpectEcho(message.Lines); + } + + foreach (var line in message.Lines) + { + var shown = ApplyLinks(ApplyEmoji(NameHighlights.Apply(line, NameMatcher()))); + Completions.ObserveLine(shown.Text); + SpawnLine?.Invoke(this, new SpawnLineEventArgs(message.Window, shown)); + } + } + private void ProcessOutputLine(StyledLine line, bool isPrompt = false) { // An MSP trigger is the server asking for a sound, and is taken out before anything else sees the @@ -918,8 +968,14 @@ private void ProcessOutputLine(StyledLine line, bool isPrompt = false) // rather than before it, so a link's target is exactly the text under it — a span whose visible // text and destination disagree is the shape of a phishing link, and this client should not be // in the business of manufacturing one. - var shown = ApplyLinks(ApplyEmoji(result.Line)).WithPrompt(isPrompt); - if (result.RouteMain || !result.Suppress || result.SpawnTargets.Count > 0) + var shown = ApplyLinks(ApplyEmoji(NameHighlights.Apply(result.Line, NameMatcher()))).WithPrompt(isPrompt); + + // A channel line whose GMCP copy has already gone to its own window is kept out of this one when the world + // moves channels (F5 ▸ capture channels). It is a gag in every other respect: a destination a rule asked for, + // `main` included, still gets it. + var suppress = result.Suppress + || (!isPrompt && World.CaptureChannels == ChannelCaptureMode.Move && _channels.TakeEcho(line.Text)); + if (result.RouteMain || !suppress || result.SpawnTargets.Count > 0) { Completions.ObserveLine(shown.Text); // only what is shown somewhere: a gagged word was never read } @@ -940,14 +996,14 @@ private void ProcessOutputLine(StyledLine line, bool isPrompt = false) // true of the main window too. So `route: main` plus `gag` keeps the line here and nowhere else, // where before it deleted the line — because `main` was the F2 screen's label for the *absence* // of a route rather than a route. - if (result.RouteMain || !result.Suppress) + if (result.RouteMain || !suppress) { Print(shown); } // Asked for by a rule (shown or not: the rule said so), or by the world for a line that mentions the // character or pages them — only a line someone will see, and never a prompt. - var shownSomewhere = result.RouteMain || !result.Suppress || result.SpawnTargets.Count > 0; + var shownSomewhere = result.RouteMain || !suppress || result.SpawnTargets.Count > 0; var reason = result.Matched.Any(t => t.Actions.Alert) ? AttentionReason.Trigger : World.AlertOnName && shownSomewhere && !isPrompt ? AttentionMatcher.Classify(shown.Text, Character?.Name) : null; diff --git a/src/SharpMUTerm.Scripting/ScriptHost.cs b/src/SharpMUTerm.Scripting/ScriptHost.cs index 503fdb86..5edc69fc 100644 --- a/src/SharpMUTerm.Scripting/ScriptHost.cs +++ b/src/SharpMUTerm.Scripting/ScriptHost.cs @@ -102,6 +102,133 @@ public DynValue Evaluate(string luaSource) } } + /// + /// The script console's one line: evaluated in this host's sandbox, as a Lua REPL does — first as an expression + /// (return …), and as a statement when that does not parse — under the host's lock, and stopped once it has + /// run Lua instructions or of time, so a loop + /// typed at the prompt cannot hang the thread it runs on. Errors are returned, never thrown. + /// + /// + /// The chunk runs as a coroutine with MoonSharp's auto-yield counter set, and is resumed until it ends or a limit + /// passes; an abandoned coroutine is dropped. The limit is checked between Lua instructions, so Lua running inside a + /// callback a library function makes (string.gsub's, table.sort's) cannot be yielded out of: there it + /// runs to its end, which the console says nothing about because nothing can. + /// + public ConsoleResult EvaluateConsole(string line, long instructionLimit = DefaultInstructionLimit, TimeSpan? timeLimit = null) + { + ArgumentNullException.ThrowIfNull(line); + var limit = timeLimit ?? DefaultTimeLimit; + lock (_gate) + { + if (_disposed) + { + return new ConsoleResult(null, "the scripts have been unloaded"); + } + + DynValue chunk; + try + { + chunk = _script.LoadString("return " + line, null, ConsoleChunk); + } + catch (SyntaxErrorException) + { + try + { + chunk = _script.LoadString(line, null, ConsoleChunk); + } + catch (InterpreterException ex) + { + return new ConsoleResult(null, ScriptException.FromInterpreter(ex).Message); + } + } + + const int slice = 1000; + var clock = System.Diagnostics.Stopwatch.StartNew(); + try + { + var coroutine = _script.CreateCoroutine(chunk).Coroutine; + coroutine.AutoYieldCounter = slice; + long ran = 0; + var result = coroutine.Resume(); + while (result.Type == DataType.YieldRequest) + { + ran += slice; + if (ran >= instructionLimit || clock.Elapsed >= limit) + { + return new ConsoleResult(null, ran >= instructionLimit + ? $"stopped after {instructionLimit.ToString("N0", CultureInfo.InvariantCulture)} instructions — a loop that does not end?" + : $"stopped after {limit.TotalMilliseconds.ToString("0", CultureInfo.InvariantCulture)} ms — a loop that does not end?"); + } + + result = coroutine.Resume(); + } + + return new ConsoleResult(Describe(result), null); + } + catch (InterpreterException ex) + { + return new ConsoleResult(null, ScriptException.FromInterpreter(ex).Message); + } + catch (Exception ex) when (ex is not OutOfMemoryException) + { + return new ConsoleResult(null, ex.Message); + } + } + } + + /// How many Lua instructions a console line may run before it is stopped. + public const long DefaultInstructionLimit = 2_000_000; + + /// How long a console line may run before it is stopped. + public static readonly TimeSpan DefaultTimeLimit = TimeSpan.FromMilliseconds(500); + + /// The chunk name a console line's errors carry. + public const string ConsoleChunk = "console"; + + /// A value as the console shows it: nothing for no value, a tuple's values separated by tabs. + private static string? Describe(DynValue value) + { + // A lone nil is what a call like print(...) returns, and showing "= nil" after every print is noise. + if (value.Type is DataType.Void or DataType.Nil || (value.Type == DataType.Tuple && value.Tuple.Length == 0)) + { + return null; + } + + var text = value.Type == DataType.Tuple + ? string.Join('\t', value.Tuple.Select(Show)) + : Show(value); + return text.Length > ConsoleValueLimit ? text[..(ConsoleValueLimit - 1)] + "…" : text; + + static string Show(DynValue v) => v.Type switch + { + DataType.String => "\"" + v.String + "\"", + DataType.Table => ShowTable(v.Table), + _ => v.ToPrintString(), + }; + + static string ShowTable(Table table) + { + var parts = new List(); + foreach (var pair in table.Pairs.Take(20)) + { + var key = pair.Key.Type == DataType.String ? pair.Key.String : "[" + pair.Key.ToPrintString() + "]"; + var val = pair.Value.Type switch + { + DataType.String => "\"" + pair.Value.String + "\"", + DataType.Table => "{…}", + _ => pair.Value.ToPrintString(), + }; + parts.Add(key + " = " + val); + } + + var more = table.Length > 20 || table.Pairs.Skip(20).Any() ? ", …" : string.Empty; + return "{ " + string.Join(", ", parts) + more + " }"; + } + } + + /// The longest value the console shows. + public const int ConsoleValueLimit = 400; + /// Loads and executes a Lua file, tracking it for . public void LoadFile(string path) { @@ -125,7 +252,24 @@ public void LoadFile(string path) } } - Execute(source); + Run(source, Path.GetFileName(full)); + } + + /// Runs a file's source under its name, so its errors say file:line. + private void Run(string source, string chunkName) + { + lock (_gate) + { + ObjectDisposedException.ThrowIf(_disposed, this); + try + { + _script.DoString(source, null, chunkName); + } + catch (InterpreterException ex) + { + throw ScriptException.FromInterpreter(ex); + } + } } /// @@ -154,7 +298,7 @@ public void Reload() throw new ScriptException($"Could not read script file '{file}': {ex.Message}", null, ex); } - Execute(source); + Run(source, Path.GetFileName(file)); } } @@ -674,3 +818,6 @@ public void Dispose() } } } + +/// What a console line came to: the value it returned (null for none), or the error that stopped it. +public sealed record ConsoleResult(string? Value, string? Error); diff --git a/src/SharpMUTerm.Scripting/SessionScripts.cs b/src/SharpMUTerm.Scripting/SessionScripts.cs index 8a9911cf..6ea4c4c8 100644 --- a/src/SharpMUTerm.Scripting/SessionScripts.cs +++ b/src/SharpMUTerm.Scripting/SessionScripts.cs @@ -88,6 +88,19 @@ public SessionScripts( /// The live host, or null before the first . public ScriptHost? Host => _host; + /// + /// Raised for every line a script prints, on the script's thread (the read loop, the UI thread, a timer), after it + /// has reached the session's window. The script console keeps its own copy from here. + /// + public event Action? Printed; + + /// + /// The script console's line, run in this character's sandbox under the host's lock and time-limited + /// (). Before the first there is no host to run it in. + /// + public ConsoleResult Evaluate(string line) => + _host is { } host ? host.EvaluateConsole(line) : new ConsoleResult(null, "the scripts have not been loaded yet"); + /// Whether the loaded scripts define a global function by this (possibly dotted) name. public bool Defines(string name) => _host?.Defines(name) ?? false; @@ -118,7 +131,7 @@ public int Reload() _session.Aliases.ClearRuntime(); _files = _session.ScriptFiles.ToArray(); - _bridge = new WorldSessionScriptBridge(_session, _sendTo); + _bridge = new WorldSessionScriptBridge(_session, _sendTo) { Printed = text => Printed?.Invoke(text) }; _host = new ScriptHost(_bridge, _store); _bridge.Attach(_host); _host.Error += OnScriptError; diff --git a/src/SharpMUTerm.Scripting/WorldSessionScriptBridge.cs b/src/SharpMUTerm.Scripting/WorldSessionScriptBridge.cs index aa4c37e2..ccee40a9 100644 --- a/src/SharpMUTerm.Scripting/WorldSessionScriptBridge.cs +++ b/src/SharpMUTerm.Scripting/WorldSessionScriptBridge.cs @@ -48,7 +48,14 @@ public static ScriptHost CreateHost(WorldSession session) public string? SendTo(string character, string command) => _sendTo is null ? "this client cannot send to another character" : _sendTo(character, command); - public void Print(string text) => _session.PrintSystem(text); + public void Print(string text) + { + _session.PrintSystem(text); + Printed?.Invoke(text); + } + + /// Told each line a script prints, after it reaches the session, on the script's thread (the console's copy). + public Action? Printed { get; init; } public void AddTrigger(string pattern, string callbackId) => _session.Triggers.Add(new Trigger diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Surfaces.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Surfaces.cs index c3e5ce81..3daa092a 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Surfaces.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Surfaces.cs @@ -35,6 +35,7 @@ private T Drawing(string surface, string key, T model) : surface == SurfaceCatalog.Welcome ? (_welcomeView.IsOpen ? _welcome?.Model : null) : surface == SurfaceCatalog.Help ? CellHelp?.Model : surface == SurfaceCatalog.Dictionary ? (_helpView.IsOpen && _helpView.Mode == "dictionary" ? _dictionaryOffer : null) + : surface == SurfaceCatalog.ScriptConsole ? CellConsole?.Model : _drawnModels.TryGetValue((surface, key), out var model) ? model : null; /// A click on a header link, as the header's own handler receives it. diff --git a/src/SharpMUTerm.Tui/ScriptConsoleSurface.cs b/src/SharpMUTerm.Tui/ScriptConsoleSurface.cs new file mode 100644 index 00000000..cf755acc --- /dev/null +++ b/src/SharpMUTerm.Tui/ScriptConsoleSurface.cs @@ -0,0 +1,262 @@ +using SharpMUTerm.Client.Modals; +using static SharpMUTerm.Tui.MarkupText; + +namespace SharpMUTerm.Tui; + +/// +/// The script console in cells: the character's console lines bottom-anchored on the left, its store.* keys on +/// the right, and a one-line Lua prompt. The state is the reader's (what is typed, where in the history, which key is +/// picked, which side ⇥ is on); what it shows is the the window's native console draws. +/// Hosted in a , which is sized once, so +/// always draws exactly the rows it is given. +/// +internal sealed class ScriptConsoleSurface +{ + /// The width the console asks for; the overlay narrows it on a small terminal. + internal const int PreferredWidth = 104; + + /// Below this width the store is shown in place of the lines (⇥), not beside them. + internal const int TwoColumns = 70; + + private int _history = -1; + + public ScriptConsoleSurface(ScriptConsoleModel model) => Model = model; + + public ScriptConsoleModel Model { get; set; } + + /// What is typed at the prompt. + public string Input { get; private set; } = string.Empty; + + /// Whether ⇥ has put the keys on the store list. + public bool OnStore { get; private set; } + + /// The store key picked. + public int StoreSelected { get; private set; } + + /// What a key asks the client to do. + internal enum Ask + { + None, + Run, + Delete, + Reload, + } + + /// + /// A key. Returns what the client is to do — run (then call ), delete the + /// picked key, reload — or when the key only moved or typed. + /// + public Ask Key(ConsoleKeyInfo key) + { + var ctrl = (key.Modifiers & ConsoleModifiers.Control) != 0; + if (ctrl && key.Key == ConsoleKey.L) + { + return Ask.Reload; + } + + if (key.Key == ConsoleKey.Tab) + { + OnStore = !OnStore && Model.Store.Count > 0; + return Ask.None; + } + + if (OnStore) + { + switch (key.Key) + { + case ConsoleKey.UpArrow: + StoreSelected = Math.Max(0, StoreSelected - 1); + return Ask.None; + case ConsoleKey.DownArrow: + StoreSelected = Math.Min(Math.Max(0, Model.Store.Count - 1), StoreSelected + 1); + return Ask.None; + case ConsoleKey.Delete or ConsoleKey.Backspace: + return StoreSelected < Model.Store.Count ? Ask.Delete : Ask.None; + } + + return Ask.None; + } + + var history = Model.History; + switch (key.Key) + { + case ConsoleKey.Enter: + return Model.CanRun && Input.Trim().Length > 0 ? Ask.Run : Ask.None; + case ConsoleKey.Backspace: + if (Input.Length > 0) + { + Input = Input[..^1]; + } + + return Ask.None; + case ConsoleKey.UpArrow when history.Count > 0: + _history = _history < 0 ? history.Count - 1 : Math.Max(0, _history - 1); + Input = history[_history]; + return Ask.None; + case ConsoleKey.DownArrow when _history >= 0: + _history++; + Input = _history < history.Count ? history[_history] : string.Empty; + if (_history >= history.Count) + { + _history = -1; + } + + return Ask.None; + } + + if (key.KeyChar >= ' ' && !char.IsControl(key.KeyChar) + && (key.Modifiers & (ConsoleModifiers.Control | ConsoleModifiers.Alt)) == 0 + && Input.Length < ScriptConsoleModel.MaxInput) + { + Input += key.KeyChar; + } + + return Ask.None; + } + + /// The line ran: the prompt empties and the history walk starts again from the newest. + public void Ran() + { + Input = string.Empty; + _history = -1; + } + + /// The picked key, for . + public string? PickedKey => StoreSelected < Model.Store.Count ? Model.Store[StoreSelected].Key : null; + + /// Keeps the pick inside a store that shrank. + public void Clamp() + { + StoreSelected = Math.Clamp(StoreSelected, 0, Math.Max(0, Model.Store.Count - 1)); + if (Model.Store.Count == 0) + { + OnStore = false; + } + } + + /// What the console draws now. + public List Render(int width, int rows) => Render(Model, Input, OnStore, StoreSelected, width, rows); + + /// The console for , with at the prompt, in exactly rows. + internal static List Render(ScriptConsoleModel model, string input, bool onStore, int storeSelected, int width, int rows) + { + width = Math.Max(30, width); + rows = Math.Max(8, rows); + var lines = new List + { + SpreadLR( + $"[{ScreenPalette.Accent}]SCRIPT CONSOLE[/] [{(model.CanRun ? ScreenPalette.Value : ScreenPalette.Caution)}]{Escape(model.Summary)}[/]", + model.Folder is { } folder ? $"[{ScreenPalette.Label}]{Escape(Fit(folder, Math.Max(10, width / 3)))}[/]" : string.Empty, + width), + string.Empty, + }; + + var body = rows - 5; + var two = width >= TwoColumns; + var storeWidth = two ? Math.Clamp(width / 3, 26, 40) : width; + var outWidth = two ? width - storeWidth - 3 : width; + + var output = OutputRows(model, outWidth, body); + var store = StoreRows(model, onStore, storeSelected, storeWidth, body); + for (var i = 0; i < body; i++) + { + if (two) + { + var left = output[i]; + var pad = Math.Max(0, outWidth - VisibleLength(left)); + lines.Add(left + new string(' ', pad) + $" [{ScreenPalette.Rule}]│[/] " + store[i]); + } + else + { + lines.Add(onStore ? store[i] : output[i]); + } + } + + lines.Add(string.Empty); + lines.Add(model.CanRun + ? $"[bold {ScreenPalette.Accent}]lua ›[/] [{ScreenPalette.Value}]{Escape(Tail(input, width - 8))}{(onStore ? string.Empty : "▏")}[/]" + : $"[{ScreenPalette.Label}]lua › no prompt here — {Escape(model.Unavailable ?? string.Empty)}[/]"); + lines.Add($"[{ScreenPalette.Label}]{Escape(Fit(ScriptConsoleModel.Keys, width))}[/]"); + return lines; + } + + private static List OutputRows(ScriptConsoleModel model, int width, int rows) + { + var wrapped = new List(); + foreach (var line in model.Lines) + { + var mark = ScriptConsoleModel.Mark(line.Kind); + var colour = line.Kind switch + { + ScriptConsoleKind.Error => ScreenPalette.Warn, + ScriptConsoleKind.Input => ScreenPalette.Accent, + ScriptConsoleKind.Result => ScreenPalette.Value, + ScriptConsoleKind.Note => ScreenPalette.Label, + _ => ScreenPalette.Muted, + }; + var first = true; + foreach (var part in HelpSurface.Wrap(line.Text, Math.Max(4, width - 2))) + { + wrapped.Add($"[{colour}]{(first ? mark : " ")} {Escape(part)}[/]"); + first = false; + } + } + + if (wrapped.Count == 0) + { + wrapped.Add($"[{ScreenPalette.Label}] {Escape(model.CanRun ? ScriptConsoleModel.Empty : "nothing to show")}[/]"); + } + + // Bottom-anchored: the newest line sits just above the prompt. + var shown = wrapped.Skip(Math.Max(0, wrapped.Count - rows)).ToList(); + while (shown.Count < rows) + { + shown.Insert(0, string.Empty); + } + + return shown; + } + + private static List StoreRows(ScriptConsoleModel model, bool onStore, int selected, int width, int rows) + { + var list = new List + { + $"[{(onStore ? ScreenPalette.Accent : ScreenPalette.Muted)}]STORE[/] [{ScreenPalette.Label}]{model.StoreCount} key{(model.StoreCount == 1 ? string.Empty : "s")} · read only[/]", + }; + + if (model.Store.Count == 0) + { + list.Add($"[{ScreenPalette.Label}] empty — store.set(k, v) keeps one[/]"); + } + + var room = rows - 1 - (model.StoreCount > model.Store.Count ? 1 : 0); + var first = Math.Clamp(selected - (room / 2), 0, Math.Max(0, model.Store.Count - room)); + var keyWidth = Math.Clamp(model.Store.Count == 0 ? 8 : model.Store.Max(e => e.Key.Length), 4, Math.Max(4, width / 2 - 2)); + for (var i = first; i < model.Store.Count && list.Count < rows; i++) + { + var entry = model.Store[i]; + var picked = onStore && i == selected; + var mark = picked ? $"[bold {ScreenPalette.Accent}]▸[/]" : " "; + var value = Fit(entry.Value, Math.Max(1, width - keyWidth - 3)); + list.Add($"{mark} [{(picked ? "bold " : string.Empty)}{ScreenPalette.Value}]{Escape(Fit(entry.Key, keyWidth).PadRight(keyWidth))}[/] [{ScreenPalette.Muted}]{Escape(value)}[/]"); + } + + if (model.StoreCount > model.Store.Count && list.Count < rows) + { + list.Add($"[{ScreenPalette.Label}] +{model.StoreCount - model.Store.Count} more[/]"); + } + + while (list.Count < rows) + { + list.Add(string.Empty); + } + + return list; + } + + private static string Fit(string text, int width) => + width <= 0 ? string.Empty : text.Length <= width ? text : width == 1 ? "…" : text[..(width - 1)] + "…"; + + private static string Tail(string text, int width) => + width <= 1 || text.Length <= width ? text : "…" + text[^(width - 1)..]; +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.NativeModals.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.NativeModals.cs index 9f91b082..54ef9c77 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.NativeModals.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.NativeModals.cs @@ -64,6 +64,7 @@ internal sealed partial class SharpMUTermApp SurfaceCatalog.Welcome => "the welcome", SurfaceCatalog.Help => "help", SurfaceCatalog.Dictionary => "the dictionary offer", + SurfaceCatalog.ScriptConsole => "the script console", null => null, _ => "what is open", }; diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.SceneLog.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.SceneLog.cs new file mode 100644 index 00000000..e25acf37 --- /dev/null +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.SceneLog.cs @@ -0,0 +1,265 @@ +using SharpMUTerm.Core.Automation; +using SharpMUTerm.Core.Diagnostics; +using SharpMUTerm.Core.Logging; +using SharpMUTerm.Core.Protocols; +using SharpMUTerm.Core.Text; +using SharpMUTerm.Core.Workspaces; + +namespace SharpMUTerm.Tui; + +/// +/// Scene logs (⌃P ▸ Start scene log / Stop scene log): the focused window's lines from now until it is +/// stopped, written to a file of their own under the log root through the session log's sinks (), +/// with a header naming the scene and who was present — the window's room roster (who-here) and its character. F7 ▸ +/// Scene log says HTML or plain text, and poses or every line. +/// +/// The log root is the gate, as it is for the session log: an app with none (a test, a snapshot) refuses out loud +/// and writes nothing. Lines are fed where the restore log is (, ), so a +/// scene in a channel window records that window, and the client's own chrome rows are never offered. +/// +/// +internal sealed partial class SharpMUTermApp +{ + /// The scenes being recorded, by window. + private readonly Dictionary _sceneLogs = new(StringComparer.Ordinal); + + /// The scene log recording a window, for the tests. + internal SceneLog? SceneLogOf(string windowId) + { + lock (_sceneLogs) + { + return _sceneLogs.GetValueOrDefault(windowId); + } + } + + /// Starts recording the focused window as a scene, titled after the window. + internal void StartSceneLog() + { + var windowId = ActiveWindowId(); + if (_logRoot is null) + { + RefuseCommand("no scene log — this client owns no log directory"); + return; + } + + if (SceneLogOf(windowId) is not null) + { + RefuseCommand($"{Snippet(WindowTitle(windowId))} is already being recorded"); + return; + } + + var session = WindowSession(windowId); + var key = session?.SessionKey ?? _workspace.FindWindow(windowId)?.SessionKey; + var present = new List(); + if (key is not null && PanelOccupants(key) is { Known: true } roster) + { + present.AddRange(roster.Snapshot.Where(o => o.IsPlayer).Select(o => o.Name)); + } + + var own = session?.Character?.Name ?? (key is not null && IsDemoKey(key) ? "Corvid" : null); + if (own is not null && !present.Contains(own, StringComparer.OrdinalIgnoreCase)) + { + present.Insert(0, own); + } + + var title = WindowTitle(windowId); + SceneLog log; + try + { + log = SceneLog.Start( + Path.Combine(_logRoot, "scenes"), + windowId, + title, + _config.SceneLog.Html, + _config.SceneLog.Content, + present, + _time.GetLocalNow()); + } + catch (Exception ex) when (ex is IOException or UnauthorizedAccessException) + { + RefuseCommand($"the scene log could not be opened: {ex.Message}"); + return; + } + + lock (_sceneLogs) + { + _sceneLogs[windowId] = log; + } + + Notice( + $"Recording {Snippet(title)} as a scene ({(_config.SceneLog.Content == SceneLogContent.Poses ? "poses" : "every line")}) → {log.Path}", + MessageSeverity.Info, + "⌃P"); + } + + /// Stops the focused window's scene log, writing its ending and closing the file. + internal void StopSceneLog() + { + var windowId = ActiveWindowId(); + SceneLog? log; + lock (_sceneLogs) + { + _sceneLogs.Remove(windowId, out log); + } + + if (log is null) + { + RefuseCommand($"{Snippet(WindowTitle(windowId))} is not being recorded"); + return; + } + + log.Stop(_time.GetLocalNow()); + Notice($"Scene saved · {log.Lines} line{(log.Lines == 1 ? string.Empty : "s")} · {log.Path}", MessageSeverity.Info, "⌃P"); + } + + /// A line a window showed: the scene recording that window, if any, decides whether to keep it. + private void RecordForScene(string windowId, StyledLine line) + { + SceneLog? log; + lock (_sceneLogs) + { + if (_sceneLogs.Count == 0 || !_sceneLogs.TryGetValue(windowId, out log)) + { + return; + } + } + + try + { + log.Offer(line); + } + catch (Exception ex) when (ex is IOException or ObjectDisposedException) + { + lock (_sceneLogs) + { + _sceneLogs.Remove(windowId); + } + + RefuseCommand($"the scene log stopped: {ex.Message}"); + } + } + + /// Closes every scene being recorded, on the way out. + private void CloseSceneLogs() + { + SceneLog[] logs; + lock (_sceneLogs) + { + logs = [.. _sceneLogs.Values]; + _sceneLogs.Clear(); + } + + foreach (var log in logs) + { + log.Stop(_time.GetLocalNow()); + } + } + + // ── demo scenes ────────────────────────────────────────────────────────────────────────────────── + + /// + /// The snapshot scenes for channel capture, highlight names and the scene log, over the demo. The demo has no live + /// session, so a channel message goes through and the routing a captured line + /// takes (, ), and a name through + /// : the functions the session runs. Returns a frame for a view drawn here alone, + /// else null to go on drawing the workspace. + /// + private string? RenderScriptingWaveScene(string? view) + { + if (view is null || _config.Worlds.Count == 0) + { + return null; + } + + var world = _config.Worlds[0]; + var names = new List { new("Ashlyn", "gold"), new("Merrow", "red") }; + if (string.Equals(view, "channels-f5", StringComparison.OrdinalIgnoreCase)) + { + world.CaptureChannels = ChannelCaptureMode.Copy; + world.HighlightNames = names; + _settings.OpenForSnapshot(ConsoleKey.F5, WorldsScreen()); + + // Edit the world and ⇥ through its fields to the names row, so the frame shows the two new rows rather + // than "19 more" — the keys a reader presses. + _settings.SimulateKey(Stroke('\r', ConsoleKey.Enter)); + for (var i = 0; i < WorldsScreenRenderer.WorldFieldOrder.ToList().IndexOf("highlight-names"); i++) + { + _settings.SimulateKey(Stroke('\t', ConsoleKey.Tab)); + } + + SyncInputWidth(); + return RenderFrame(); + } + + if (string.Equals(view, "highlight-names", StringComparison.OrdinalIgnoreCase)) + { + world.HighlightNames = names; + var matcher = NameHighlights.Compile(names); + foreach (var text in new[] + { + "Ashlyn sips her tea and glances across the plaza at Merrow.", + "Merrow says, \"Ashlyn's late again.\" Annabel laughs.", + "Brannoc nods to Ashlyn, Merrow and you.", + }) + { + AppendSessionLine(MainWindowId, NameHighlights.Apply(StyledLine.FromText(text, TextStyle.Default), matcher), StampNow()); + } + + SettleScroll(); + return null; + } + + if (string.Equals(view, "channel-capture", StringComparison.OrdinalIgnoreCase)) + { + world.CaptureChannels = ChannelCaptureMode.Copy; + string? oocId = null; + foreach (var json in DemoChannelMessages) + { + if (ChannelCapture.Read(json) is not { } message) + { + continue; + } + + foreach (var line in message.Lines) + { + var window = _workspace.RouteLine(message.Window, DemoScene.ActiveSessionKey); + window.OwnerLabel ??= "Corvid"; + PaneContentFor(window.Id, window.Title); + AppendSessionLine(window.Id, line, StampNow()); + AppendSessionLine(MainWindowId, line, StampNow()); + if (message.Window == "ooc") + { + oocId = window.Id; + } + } + } + + if (oocId is not null) + { + Activate(MainWindowId); + PaneCommands.Apply(_workspace.Layout, PaneCommand.SplitRight); + RebuildPaneArea(); + Activate(oocId); + } + + SettleScroll(); + return null; + } + + if (string.Equals(view, "scene-log", StringComparison.OrdinalIgnoreCase)) + { + OpenMenu("scene"); + } + + return null; + } + + /// Four Comm.Channel.Text payloads as IRE sends them, for the channel-capture scene. + private static readonly string[] DemoChannelMessages = + [ + "{\"channel\":\"ooc\",\"talker\":\"Ashlyn\",\"text\":\"\\u001b[36m(OOC) Ashlyn: anyone up for a scene at the docks?\\u001b[0m\"}", + "{\"channel\":\"ooc\",\"talker\":\"Merrow\",\"text\":\"\\u001b[36m(OOC) Merrow: in ten, grabbing tea\\u001b[0m\"}", + "{\"channel\":\"trade\",\"talker\":\"Brannoc\",\"text\":\"\\u001b[33m[Trade] Brannoc: selling lanterns, 4 silver\\u001b[0m\"}", + "{\"channel\":\"ooc\",\"talker\":\"Ashlyn\",\"text\":\"\\u001b[36m(OOC) Ashlyn: \\u001b[1msee you there\\u001b[0m\"}", + ]; +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.ScriptConsole.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.ScriptConsole.cs new file mode 100644 index 00000000..6043d86b --- /dev/null +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.ScriptConsole.cs @@ -0,0 +1,423 @@ +using System.Text.Json.Nodes; +using SharpMUTerm.Client.Modals; +using SharpMUTerm.Client.Surfaces; +using SharpMUTerm.Core.Diagnostics; +using SharpMUTerm.Core.Session; +using SharpMUTerm.Scripting; + +namespace SharpMUTerm.Tui; + +/// +/// The script console (⌃P ▸ Script console): one per character, holding what its scripts printed and the errors +/// they raised (with file:line), a one-line Lua prompt run in that character's own sandbox, what was typed there, +/// and a read-only view of its store.* with delete. One Client model () drawn as a +/// cell here and as a native modal in a host that has them; every gesture ends in +/// , or . +/// +/// A line runs on the UI thread, through the host's lock, and is time-limited (: +/// two million instructions or half a second), so a loop typed at the prompt cannot hang the screen. The prompt exists +/// only where scripts can run — a client with a scripts root, whose folder exists, and a window with a character — +/// and otherwise says which of those is missing. +/// +/// +/// The console's lines are in memory for the run, per character (), fed from +/// and on whichever thread a script ran; nothing is saved. +/// +/// +internal sealed partial class SharpMUTermApp +{ + /// Each character's console lines and prompt history, by session key. + private readonly Dictionary _consoleLogs = new(StringComparer.Ordinal); + + /// The cell console while it is open; null otherwise. + private ScriptConsoleSurface? _console; + + /// The character the open console (either host) belongs to. + private string? _consoleKey; + + /// A console repaint is already queued, so a script printing a thousand lines queues one. + private int _consoleRefreshQueued; + + /// The demo's sandbox, so the snapshot's console has a prompt that runs. + private (ScriptHost Host, ScriptStore Store)? _demoScripts; + + /// Whether the script console is open, in cells or natively. + internal bool ScriptConsoleIsOpen => + (_helpView.IsOpen && _helpView.Mode == "script-console") || NativeModalOf(SurfaceCatalog.ScriptConsole) is not null; + + /// The cell console's state, for a test; null while it is shut. + internal ScriptConsoleSurface? CellConsole => _helpView.IsOpen && _helpView.Mode == "script-console" ? _console : null; + + /// The native console's session while one is open, for the tests. + internal ScriptConsoleSession? NativeConsole => _nativeModal as ScriptConsoleSession; + + /// What the cell console shows, for a test. + internal IReadOnlyList ConsoleLines => _helpView.Mode == "script-console" ? _helpView.Lines : []; + + /// Feeds a key to the cell console. + internal void SimulateConsoleKey(ConsoleKeyInfo key) => _helpView.SimulateKey(key); + + /// Types at the cell console's prompt. + internal void SimulateConsoleTyping(string text) + { + foreach (var c in text) + { + SimulateConsoleKey(new ConsoleKeyInfo(c, ConsoleKey.NoName, false, false, false)); + } + } + + /// A character's console log, made on first use. + private ScriptConsoleLog ConsoleLog(string key) + { + lock (_consoleLogs) + { + if (!_consoleLogs.TryGetValue(key, out var log)) + { + log = new ScriptConsoleLog(); + log.Changed += () => QueueConsoleRefresh(key); + _consoleLogs[key] = log; + } + + return log; + } + } + + /// What the console acts on: a character's scripts, the demo's sandbox, or why there is nothing. + private sealed record ConsoleTarget( + string Key, + string Title, + Func Evaluate, + ScriptStore Store, + IReadOnlyList Files, + int Loaded, + Func Reload); + + /// The focused window's character's scripts, or why there are none to talk to. + private (ConsoleTarget? Target, string Key, string Title, string? Why) ConsoleTargetNow() + { + var session = SendTarget(); + if (session is null && _workspace.FindWindow(ActiveWindowId())?.SessionKey is { } owner && IsDemoKey(owner)) + { + var (host, store) = _demoScripts ??= NewDemoScripts(); + return (new ConsoleTarget("demo", "Corvid", line => host.EvaluateConsole(line), store, ["corvid.lua"], 1, () => "1 script loaded"), + "demo", "Corvid", null); + } + + if (session is null) + { + return (null, string.Empty, string.Empty, "this window has no character — pick one first (⌃P ▸ Switch to …)"); + } + + var title = SessionTitle(session); + if (_scriptsRoot is null || !_scripts.TryGetValue(session, out var scripts)) + { + return (null, session.SessionKey, title, "this client runs no scripts"); + } + + if (!Directory.Exists(_scriptsRoot)) + { + return (null, session.SessionKey, title, $"there is no scripts folder yet — create {_scriptsRoot} and put .lua files in it"); + } + + return (new ConsoleTarget( + session.SessionKey, + title, + scripts.Evaluate, + scripts.Store, + scripts.Files, + scripts.LoadedCount, + () => + { + scripts.Reload(); + return ScriptsLoaded(scripts); + }), + session.SessionKey, title, null); + } + + /// The console's model for the focused window's character, as it stands now. + internal ScriptConsoleModel ScriptConsoleModelNow() + { + var (target, key, title, why) = ConsoleTargetNow(); + var log = key.Length == 0 ? null : ConsoleLog(key); + var store = new List(); + var count = 0; + if (target is not null) + { + var keys = target.Store.Keys; + count = keys.Count; + foreach (var name in keys.Take(ScriptConsoleModel.MaxStoreRows)) + { + var value = target.Store.Get(name)?.ToJsonString() ?? "null"; + store.Add(new ScriptStoreEntry(name, value.Length > ScriptConsoleModel.MaxValueLength + ? value[..(ScriptConsoleModel.MaxValueLength - 1)] + "…" + : value)); + } + } + + return new ScriptConsoleModel( + title, + why, + log?.Lines ?? [], + log?.History ?? [], + store, + count, + target?.Files ?? [], + target?.Loaded ?? 0, + _scriptsRoot ?? (target is not null ? "scripts/" : null)); + } + + /// ⌃P ▸ Script console: opens the focused window's character's console, or closes it. + private void ShowScriptConsole() + { + if (NativeModalOf(SurfaceCatalog.ScriptConsole) is { } native) + { + CloseNativeModal(native); + return; + } + + if (ScriptConsoleIsOpen) + { + _helpView.Close(); + return; + } + + if (ComposerIsInTheWay("the script console") || (AnyOverlayOpen && Refuse($"close {OpenOverlayName()} first"))) + { + return; + } + + var model = ScriptConsoleModelNow(); + _consoleKey = ConsoleTargetNow().Key; + if (NativeModalsHost is { } host) + { + ScriptConsoleSession? session = null; + session = new ScriptConsoleSession( + model, + ThemeIsDark(), + line => OnUiThread(() => RunConsoleLine(line)), + key => OnUiThread(() => DeleteStoreKey(key)), + () => OnUiThread(ReloadConsoleScripts), + () => OnUiThread(() => + { + NativeModalClosed(session!); + _consoleKey = null; + })) + { + Theme = _theme.Clone(), + }; + ShowNativeModal(host, session); + return; + } + + var console = new ScriptConsoleSurface(model); + _console = console; + var rows = Math.Clamp(_system.DesktopDimensions.Height - 6, 10, 30); + _helpView.Open( + "script-console", + "Script console", + width => + { + Drawing(SurfaceCatalog.ScriptConsole, string.Empty, console.Model); + return console.Render(width, rows); + }, + ConsoleKeyPressed, + width: ScriptConsoleSurface.PreferredWidth, + closed: () => + { + _console = null; + _consoleKey = null; + }); + } + + /// A key in the cell console. + private bool ConsoleKeyPressed(ConsoleKeyInfo key) + { + if (_console is not { } console) + { + return false; + } + + switch (console.Key(key)) + { + case ScriptConsoleSurface.Ask.Run: + var line = console.Input; + console.Ran(); + RunConsoleLine(line); + break; + case ScriptConsoleSurface.Ask.Delete when console.PickedKey is { } picked: + DeleteStoreKey(picked); + break; + case ScriptConsoleSurface.Ask.Reload: + ReloadConsoleScripts(); + break; + } + + return true; + } + + /// + /// The one place a console line is run, from either host: written to the console, evaluated in the character's + /// sandbox under its lock with a limit, and its value or error written after whatever it printed. + /// + internal void RunConsoleLine(string line) + { + if (string.IsNullOrWhiteSpace(line)) + { + return; + } + + var (target, _, _, why) = ConsoleTargetNow(); + if (target is null) + { + RefuseCommand(why ?? "no scripts to run here"); + return; + } + + var log = ConsoleLog(target.Key); + log.Remember(line); + log.Add(ScriptConsoleKind.Input, line); + var result = target.Evaluate(line); + if (result.Error is { } error) + { + log.Add(ScriptConsoleKind.Error, error); + } + else if (result.Value is { } value) + { + log.Add(ScriptConsoleKind.Result, value); + } + + RefreshConsole(); + } + + /// Deletes a store.* key of the focused window's character, from either host. + internal void DeleteStoreKey(string key) + { + var (target, _, _, why) = ConsoleTargetNow(); + if (target is null) + { + RefuseCommand(why ?? "no store here"); + return; + } + + if (target.Store.Set(key, (JsonNode?)null) is { } refusal) + { + RefuseCommand(refusal); + return; + } + + ConsoleLog(target.Key).Add(ScriptConsoleKind.Note, $"deleted store key {key}"); + RefreshConsole(); + } + + /// Reloads the focused window's character's scripts from the console, from either host. + internal void ReloadConsoleScripts() + { + var (target, _, _, why) = ConsoleTargetNow(); + if (target is null) + { + RefuseCommand(why ?? "no scripts to reload"); + return; + } + + var said = target.Reload(); + ConsoleLog(target.Key).Add(ScriptConsoleKind.Note, $"reloaded · {said}"); + RefreshConsole(); + } + + /// A script printed a line or failed: the character's console keeps a copy. Any thread. + private void NoteConsole(WorldSession session, ScriptConsoleKind kind, string text) => + ConsoleLog(session.SessionKey).Add(kind, text); + + private void QueueConsoleRefresh(string key) + { + if (_consoleKey != key || Interlocked.Exchange(ref _consoleRefreshQueued, 1) == 1) + { + return; + } + + OnUiThread(() => + { + Interlocked.Exchange(ref _consoleRefreshQueued, 0); + RefreshConsole(); + }); + } + + /// Redraws whichever console is open from a fresh model. + private void RefreshConsole() + { + if (!ScriptConsoleIsOpen) + { + return; + } + + var model = ScriptConsoleModelNow(); + if (NativeModalOf(SurfaceCatalog.ScriptConsole) is ScriptConsoleSession native) + { + native.Publish(model); + return; + } + + if (_console is { } console) + { + console.Model = model; + console.Clamp(); + _helpView.Repaint(); + } + } + + /// The demo's sandbox: a host over nothing, a store with a few keys, and a few lines already printed. + private (ScriptHost, ScriptStore) NewDemoScripts() + { + var log = ConsoleLog("demo"); + var store = new ScriptStore(null); + var host = new ScriptHost(new DemoScriptWorld(text => log.Add(ScriptConsoleKind.Output, text)), store); + store.Set("kills", JsonValue.Create(42)); + store.Set("friends", new JsonArray("Ashlyn", "Merrow")); + store.Set("last_room", JsonValue.Create("The Grand Plaza")); + log.Add(ScriptConsoleKind.Note, "loaded corvid.lua"); + log.Add(ScriptConsoleKind.Output, "[info] corvid.lua: watching for tells"); + log.Add(ScriptConsoleKind.Error, "corvid.lua:(14,8-12): attempt to index a nil value (field 'vitals')"); + return (host, store); + } + + /// What the demo's scripts act on: nothing but the console. + private sealed class DemoScriptWorld(Action print) : IScriptWorld + { + public string WorldName => "Aetherfall"; + + public void Send(string command) => print($"(demo) would send: {command}"); + + public void Print(string text) => print(text); + + public void AddTrigger(string pattern, string callbackId) + { + } + + public void AddAlias(string pattern, string substitution, string callbackId) + { + } + + public IDisposable ScheduleEvery(TimeSpan interval, Action callback) => new Nothing(); + + public IDisposable ScheduleAfter(TimeSpan delay, Action callback) => new Nothing(); + + public JsonNode? GameData(string path) => null; + + public void SendGmcp(string package, string json) + { + } + + public ScriptRoom? CurrentRoom() => new(1, "The Grand Plaza", "Aetherfall"); + + public IReadOnlyList? PathTo(string target) => null; + + public string? WalkTo(string target) => "the demo keeps no map"; + + private sealed class Nothing : IDisposable + { + public void Dispose() + { + } + } + } +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index aac90e75..31b8e4cb 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -1888,6 +1888,32 @@ public string RenderSnapshot(string? view = null) ShowHelp(topic: "reading"); } + // The script console, through its ⌃P entry, over the demo's own sandbox: a value, a print, a store read and a loop + // the limit stopped, run through the console's one path before it opens. + if (string.Equals(view, "script-console", StringComparison.OrdinalIgnoreCase)) + { + RunConsoleLine("store.get('kills') + 1"); + RunConsoleLine("print('hello from ' .. world.name)"); + RunConsoleLine("map.current().name"); + RunConsoleLine("while true do end"); + DispatchCommand(SharpMUTerm.Client.Commands.BuiltInCommands.ScriptConsoleCommand); + if (CellConsole is { } console) + { + foreach (var c in "store.keys()") + { + console.Key(new ConsoleKeyInfo(c, ConsoleKey.NoName, false, false, false)); + } + + _helpView.Repaint(); + } + } + + // GMCP channel capture, the highlight-names list and a scene log, over the demo (scripting wave). + if (RenderScriptingWaveScene(view) is { } scriptingFrame) + { + return scriptingFrame; + } + // The spelling dictionary offer, through its ⌃P entry. The demo keeps no dictionaries folder, so the offer says // nothing can be saved in this run — the text a live client shows names the folder instead. if (string.Equals(view, "dictionary-offer", StringComparison.OrdinalIgnoreCase)) @@ -5046,6 +5072,7 @@ private void OnLine(WorldSession session, string windowId, StyledLine line) var stamp = StampNow(); AppendSessionLine(windowId, line, stamp); RecordForRestore(session, windowId, WindowTitle(windowId), line, stamp); + RecordForScene(windowId, line); AnnounceLine(windowId, line.Text); NoteUnseenLine(); @@ -5107,6 +5134,7 @@ private void OnSpawnLine(WorldSession session, string target, StyledLine line) var stamp = StampNow(); AppendSessionLine(window.Id, line, stamp); RecordForRestore(session, window.Id, window.Title, line, stamp); + RecordForScene(window.Id, line); AnnounceLine(window.Id, line.Text); NoteUnseenLine(); @@ -5750,7 +5778,7 @@ private string OpenOverlayName() => : _search.IsOpen ? "the search surface" : _prefixPanel.IsOpen ? "the pane keys panel" : _welcomeView.IsOpen ? "the welcome" - : _helpView.IsOpen ? (_helpView.Mode == "dictionary" ? "the dictionary offer" : "help") + : _helpView.IsOpen ? (_helpView.Mode == "dictionary" ? "the dictionary offer" : _helpView.Mode == "script-console" ? "the script console" : "help") : "what is open"; /// Whether either bar is holding unsent text — what the ✎ tab marker means. @@ -8408,7 +8436,8 @@ private CommandContext CommandState() KeyClashes: KeyClashes.Count(Host.Keys, Macros()), Floats: FloatRefs(), RaggedWraps: RaggedWraps(), - NoDictionary: NoOwnDictionary); + NoDictionary: NoOwnDictionary, + SceneLogging: _sceneLogs.ContainsKey(ActiveWindowId())); } /// @@ -8935,6 +8964,15 @@ private bool RunBuiltInCommand(string id) case "world:reload-scripts": ReloadScripts(); break; + case Client.Commands.BuiltInCommands.ScriptConsoleCommand: + ShowScriptConsole(); + break; + case Client.Commands.BuiltInCommands.SceneStartCommand: + StartSceneLog(); + break; + case Client.Commands.BuiltInCommands.SceneStopCommand: + StopSceneLog(); + break; default: // On the status line, never through _active: an unwired command is exactly what you hit // while nothing is connected, and a message that needs a session to be seen cannot @@ -9008,6 +9046,7 @@ private void OnSessionAdded(object? sender, WorldSession session) } var scripts = new SessionScripts(session, _scriptsRoot, text => ReportScript(session, text), _packages.ResolveScript, _scriptStoreRoot, ScriptSendTo); + scripts.Printed += text => NoteConsole(session, Client.Modals.ScriptConsoleKind.Output, text); _scripts[session] = scripts; scripts.Reload(); } @@ -9348,6 +9387,7 @@ private void MapCommand(string windowId, string verb, string argument) private void ReportScript(WorldSession session, string text) { session.PrintSystem($"*** {text}"); + NoteConsole(session, Client.Modals.ScriptConsoleKind.Error, text); OnUi(() => Notice($"{SessionTitle(session)}: {text}")); } @@ -14363,6 +14403,7 @@ public async ValueTask DisposeAsync() } _reconnects.Clear(); + CloseSceneLogs(); // a scene being recorded is closed with its ending written _webImageCts?.Cancel(); _webImageCts?.Dispose(); _inlineImages.Dispose(); diff --git a/src/SharpMUTerm.Tui/SnapshotViews.cs b/src/SharpMUTerm.Tui/SnapshotViews.cs index 0d3c5a09..1857ddca 100644 --- a/src/SharpMUTerm.Tui/SnapshotViews.cs +++ b/src/SharpMUTerm.Tui/SnapshotViews.cs @@ -29,5 +29,6 @@ internal static class SnapshotViews "packages", "package-review", "package-browse", "send-menu", "layouts", "layout-combat", "layout-roleplay", "panel-who", "panel-vitals", "panel-quickbar", "panel-composer", "welcome", "welcome-connect", "tour", "reconnect", "help", "help-topic", "dictionary-offer", "join-wraps", "join-wraps-f5", + "script-console", "channel-capture", "highlight-names", "channels-f5", "scene-log", ]; } diff --git a/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs b/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs index b3dceab3..b187f2fe 100644 --- a/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs +++ b/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs @@ -113,6 +113,15 @@ internal static class WorldsScreenRenderer /// , as one of . internal const int AlertOnField = 19; + /// , as one of . + internal const int CaptureChannelsField = 20; + + /// : Name=colour, …. + internal const int HighlightNamesField = 21; + + /// F5's words for . + internal static readonly IReadOnlyList ChannelCaptureChoices = WorldFieldValues.ChannelCaptureChoices; + /// F5's words for . internal static readonly IReadOnlyList ReconnectChoices = WorldFieldValues.ReconnectChoices; @@ -771,7 +780,7 @@ .. SecurityFieldOrder.Select(id => ScreenRow.Of(DeclaredFields.Toggle(DeclaredFi [ "name", "host", "port", "encoding", "keepalive", "gmcp-modules", "content", "emoji", "map-room", "map-exits", "walk-fail", "sounds", "edit-grab", "gmcp-login", "discord", "layout", "join-wraps", "reconnect", "stacking", - "alert-on", + "alert-on", "capture-channels", "highlight-names", ]; /// The world's two security checkboxes, drawn in the WORLD block (), by declared id. @@ -1090,6 +1099,23 @@ world.CommandSeparator is { } separator cursor, selectedWorld, AlertOnField)), + WorldField("channels", Field( + world.CaptureChannels switch + { + SharpMUTerm.Core.Protocols.ChannelCaptureMode.Copy => $"[{Value}]{ChannelCaptureChoices[1]} · a window per GMCP channel[/]", + SharpMUTerm.Core.Protocols.ChannelCaptureMode.Move => $"[{Value}]{ChannelCaptureChoices[2]} · out of the main window[/]", + _ => $"[{Label}]{ChannelCaptureChoices[0]} · channels stay in the main window[/]", + }, + cursor, + selectedWorld, + CaptureChannelsField)), + WorldField("names", Field( + SharpMUTerm.Core.Automation.NameHighlights.Format(world.HighlightNames) is { } names + ? $"[{Value}]{Escape(names)}[/]" + : $"[{Label}]none · e.g. Ashlyn=gold, Merrow=red[/]", + cursor, + selectedWorld, + HighlightNamesField)), string.Empty, $"[{accent}]├ CHARACTERS[/] [{Label}]a character is a connection[/]", }); diff --git a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs index 5fb69eba..72a9609e 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs @@ -258,6 +258,7 @@ await Assert.That(Rows(palette.Session!.View(query))).IsEquivalentTo(Rows(drawn! (SurfaceCatalog.Welcome, "welcome-connect"), (SurfaceCatalog.Help, "help"), (SurfaceCatalog.Dictionary, "dictionary-offer"), + (SurfaceCatalog.ScriptConsole, "script-console"), }) { using var nativeDriver = new AvaloniaConsoleDriver(140, 36); @@ -713,6 +714,24 @@ await SameModal("dictionary: download", "dictionary-offer", app => app.SimulateHelpKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false))); probed.Add(SurfaceCatalog.Dictionary); + // The script console: a line run at the prompt, a store key deleted, and the scripts reloaded — each through the + // session in the window and through the cell console's keys, ending in RunConsoleLine, DeleteStoreKey and + // ReloadConsoleScripts. The scene leaves "store.keys()" typed at the cell prompt. + await SameModal("script console: run", "script-console", + (app, m) => ((ScriptConsoleSession)m.Open(SurfaceCatalog.ScriptConsole)!).Run("store.keys()"), + app => app.SimulateConsoleKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false))); + await SameModal("script console: delete key", "script-console", + (app, m) => ((ScriptConsoleSession)m.Open(SurfaceCatalog.ScriptConsole)!).Delete("kills"), + app => + { + app.SimulateConsoleKey(new ConsoleKeyInfo('\t', ConsoleKey.Tab, false, false, false)); + app.SimulateConsoleKey(new ConsoleKeyInfo('\0', ConsoleKey.Delete, false, false, false)); + }); + await SameModal("script console: reload", "script-console", + (app, m) => ((ScriptConsoleSession)m.Open(SurfaceCatalog.ScriptConsole)!).Reload(), + app => app.SimulateConsoleKey(new ConsoleKeyInfo('\f', ConsoleKey.L, false, false, true))); + probed.Add(SurfaceCatalog.ScriptConsole); + var acting = SurfaceCatalog.All.Where(s => s.HasNative && s.Actions.Count > 0).Select(s => s.Id); // The tab overflow chip: an entry chosen from the window's menu and the same digit in the cell list bring the same // hidden tab forward. @@ -962,6 +981,7 @@ private static void HelpKeysTo(SharpMUTermApp app, Func match) WelcomeSession welcome => welcome.Model, HelpSession help => help.Model, DictionaryOfferSession offer => offer.Model, + ScriptConsoleSession console => console.Model, _ => throw new ArgumentException(session.GetType().Name), }; @@ -983,6 +1003,7 @@ private static string Outcome(SharpMUTermApp app) => string.Join( "layout=" + app.LiveLayoutId, "welcome=" + app.WelcomeIsOpen, "help=" + app.HelpIsOpen + "/" + app.DictionaryOfferOpen, + "console=" + app.ScriptConsoleIsOpen + " " + ConsoleState(app), "quick=" + app.LastQuickMacro, "walk=" + app.WalkState, "rail=" + (app.BuildChromeOverlay().Sidebar.Collapsed ? "folded" : "open"), @@ -990,6 +1011,12 @@ private static string Outcome(SharpMUTermApp app) => string.Join( "notice=" + app.LastNotice, "recent=" + string.Join(",", app.RecentCommandIds)); + private static string ConsoleState(SharpMUTermApp app) + { + var model = app.ScriptConsoleModelNow(); + return $"[{string.Join(";", model.Lines.Select(l => l.Kind + ":" + l.Text))}] [{string.Join(",", model.Store.Select(e => e.Key))}]"; + } + private static string Layouts(SharpMUTermApp app) { var model = app.LayoutsModelFor(DemoScene.ActiveSessionKey); diff --git a/tests/SharpMUTerm.Core.Tests/Session/ChannelsAndNamesTests.cs b/tests/SharpMUTerm.Core.Tests/Session/ChannelsAndNamesTests.cs new file mode 100644 index 00000000..44a66792 --- /dev/null +++ b/tests/SharpMUTerm.Core.Tests/Session/ChannelsAndNamesTests.cs @@ -0,0 +1,156 @@ +using SharpMUTerm.Core.Automation; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Logging; +using SharpMUTerm.Core.Protocols; +using SharpMUTerm.Core.Session; +using SharpMUTerm.Core.Text; + +namespace SharpMUTerm.Core.Tests.Session; + +/// GMCP channel capture, the highlight-names list and the scene log. +public class ChannelsAndNamesTests +{ + private static (WorldSession Session, FakeTelnetSession Telnet) Create(WorldDefinition world) + { + var telnet = new FakeTelnetSession(); + return (new WorldSession(world, sessionFactory: _ => telnet), telnet); + } + + private static WorldDefinition World() => new() { Name = "T", Host = "h", Port = 1 }; + + private const string Ooc = """{"channel":"ooc","talker":"Ashlyn","text":"\u001b[36m(OOC) Ashlyn: hello all\u001b[0m"}"""; + + [Test] + public async Task ChannelTextIsNotCapturedUnlessTheWorldSaysSo() + { + var (session, telnet) = Create(World()); + var spawned = new List(); + session.SpawnLine += (_, e) => spawned.Add(e); + await session.ConnectAsync(); + telnet.EmitGmcp("Comm.Channel.Text", Ooc); + await Assert.That(spawned).IsEmpty(); + } + + [Test] + public async Task CopyPutsTheChannelInItsWindowAndKeepsTheMainLine() + { + var world = World(); + world.CaptureChannels = ChannelCaptureMode.Copy; + var (session, telnet) = Create(world); + var spawned = new List(); + var printed = new List(); + session.SpawnLine += (_, e) => spawned.Add(e); + session.LinePrinted += (_, l) => printed.Add(l.Text); + await session.ConnectAsync(); + + telnet.EmitGmcp("Comm.Channel.Text", Ooc); + telnet.EmitLine("(OOC) Ashlyn: hello all"); + + await Assert.That(spawned).HasSingleItem(); + await Assert.That(spawned[0].Target).IsEqualTo("ooc"); + await Assert.That(spawned[0].Line.Text).IsEqualTo("(OOC) Ashlyn: hello all"); + await Assert.That(spawned[0].Line.Spans[0].Style.Foreground == TerminalColor.Default).IsFalse(); + await Assert.That(printed).Contains("(OOC) Ashlyn: hello all"); + } + + [Test] + public async Task MoveKeepsTheEchoOutOfTheMainWindowOnce() + { + var world = World(); + world.CaptureChannels = ChannelCaptureMode.Move; + var (session, telnet) = Create(world); + var printed = new List(); + session.LinePrinted += (_, l) => printed.Add(l.Text); + await session.ConnectAsync(); + + telnet.EmitGmcp("Comm.Channel.Text", Ooc); + telnet.EmitLine("(OOC) Ashlyn: hello all"); + telnet.EmitLine("(OOC) Ashlyn: hello all"); + + await Assert.That(printed.Count(p => p == "(OOC) Ashlyn: hello all")).IsEqualTo(1); + } + + [Test] + public async Task AChannelNameIsMadeSafeForATitle() + { + await Assert.That(ChannelCapture.WindowName("ooc:\u001b[1m/../x")).IsEqualTo("ooc1mx"); + await Assert.That(ChannelCapture.Read("""{"channel":"","text":"x"}""")).IsNull(); + await Assert.That(ChannelCapture.Read("not json")).IsNull(); + await Assert.That(ChannelCapture.Read("""{"channel":"ooc"}""")).IsNull(); + } + + [Test] + public async Task ListedNamesAreHighlightedAsWholeWords() + { + var world = World(); + world.HighlightNames = [new NameHighlight("Ann", "red")]; + var (session, telnet) = Create(world); + StyledLine? printed = null; + session.LinePrinted += (_, l) => printed = l; + await session.ConnectAsync(); + + telnet.EmitLine("Annabel waves to Ann."); + + WebColors.TryParse("red", out var red); + var spans = printed!.Spans; + await Assert.That(spans.Any(s => s.Text == "Ann" && s.Style.Foreground == red)).IsTrue(); + await Assert.That(spans.Any(s => s.Text.Contains("Annabel") && s.Style.Foreground == red)).IsFalse(); + } + + [Test] + public async Task TheListParsesAndFormats() + { + var (names, error) = NameHighlights.Parse("Ashlyn=gold; Merrow : red, Vale"); + await Assert.That(error).IsNull(); + await Assert.That(names.Select(n => n.Name)).IsEquivalentTo(["Ashlyn", "Merrow", "Vale"]); + await Assert.That(names[2].Colour).IsEqualTo(NameHighlights.DefaultColour); + await Assert.That(NameHighlights.Format(names)).IsEqualTo("Ashlyn, Merrow=red, Vale"); + await Assert.That(NameHighlights.Parse("Ann=notacolour").Error).IsNotNull(); + await Assert.That(NameHighlights.Parse("").Names).IsEmpty(); + } + + [Test] + public async Task ASceneLogKeepsPosesAndNamesWhoWasPresent() + { + var folder = Directory.CreateTempSubdirectory("smt-scene-"); + try + { + var log = SceneLog.Start(folder.FullName, "main", "Tea at the Plaza", html: false, SceneLogContent.Poses, ["Ashlyn", "Corvid"], DateTimeOffset.Now); + await Assert.That(log.Offer(StyledLine.FromText("Ashlyn sips her tea.", TextStyle.Default))).IsTrue(); + await Assert.That(log.Offer(StyledLine.FromText("The Grand Plaza", TextStyle.Default))).IsFalse(); + await Assert.That(log.Offer(StyledLine.FromText("Merrow says, \"Hello.\"", TextStyle.Default))).IsTrue(); + log.Stop(DateTimeOffset.Now); + + var text = File.ReadAllText(log.Path); + await Assert.That(Path.GetFileName(log.Path)).StartsWith("scene-tea-at-the-plaza-"); + await Assert.That(text).Contains("Present: Ashlyn, Corvid"); + await Assert.That(text).Contains("Ashlyn sips her tea."); + await Assert.That(text).DoesNotContain("The Grand Plaza"); + await Assert.That(text).Contains("posed: Ashlyn, Merrow"); + } + finally + { + folder.Delete(recursive: true); + } + } + + [Test] + public async Task ASceneLogInHtmlKeepsEveryLineWhenAsked() + { + var folder = Directory.CreateTempSubdirectory("smt-scene-"); + try + { + var log = SceneLog.Start(folder.FullName, "main", "Scene", html: true, SceneLogContent.Everything, [], DateTimeOffset.Now); + log.Offer(StyledLine.FromText("The Grand Plaza", TextStyle.Default)); + log.Stop(DateTimeOffset.Now); + var text = File.ReadAllText(log.Path); + await Assert.That(log.Path).EndsWith(".html"); + await Assert.That(text).Contains("The Grand Plaza"); + await Assert.That(text).Contains("Present: nobody"); + } + finally + { + folder.Delete(recursive: true); + } + } +} diff --git a/tests/SharpMUTerm.Scripting.Tests/ConsoleTests.cs b/tests/SharpMUTerm.Scripting.Tests/ConsoleTests.cs new file mode 100644 index 00000000..34afc8b2 --- /dev/null +++ b/tests/SharpMUTerm.Scripting.Tests/ConsoleTests.cs @@ -0,0 +1,85 @@ +namespace SharpMUTerm.Scripting.Tests; + +public class ConsoleTests +{ + [Test] + public async Task AnExpressionComesBackAsItsValue() + { + using var host = new ScriptHost(new FakeScriptWorld()); + var result = host.EvaluateConsole("1 + 2"); + await Assert.That(result.Error).IsNull(); + await Assert.That(result.Value).IsEqualTo("3"); + } + + [Test] + public async Task AStatementRunsAndReturnsNothing() + { + var world = new FakeScriptWorld(); + using var host = new ScriptHost(world); + var result = host.EvaluateConsole("x = 4; print('x is', x)"); + await Assert.That(result.Error).IsNull(); + await Assert.That(result.Value).IsNull(); + await Assert.That(world.Printed).Contains("x is\t4"); + await Assert.That(host.EvaluateConsole("x * 2").Value).IsEqualTo("8"); + } + + [Test] + public async Task StringsAndTablesAreShownReadably() + { + using var host = new ScriptHost(new FakeScriptWorld()); + await Assert.That(host.EvaluateConsole("'hi'").Value).IsEqualTo("\"hi\""); + await Assert.That(host.EvaluateConsole("{a = 1}").Value).IsEqualTo("{ a = 1 }"); + await Assert.That(host.EvaluateConsole("1, 'two'").Value).IsEqualTo("1\t\"two\""); + } + + [Test] + public async Task AnErrorIsReturnedWithItsLine() + { + using var host = new ScriptHost(new FakeScriptWorld()); + var result = host.EvaluateConsole("error('boom')"); + await Assert.That(result.Value).IsNull(); + await Assert.That(result.Error!).Contains("boom"); + await Assert.That(result.Error!).Contains("console"); + } + + [Test] + public async Task ALoopThatNeverEndsIsStopped() + { + using var host = new ScriptHost(new FakeScriptWorld()); + var clock = System.Diagnostics.Stopwatch.StartNew(); + var result = host.EvaluateConsole("while true do end", instructionLimit: 200_000); + await Assert.That(result.Error!).Contains("stopped after"); + await Assert.That(clock.Elapsed).IsLessThan(TimeSpan.FromSeconds(5)); + + // The host is still usable afterwards. + await Assert.That(host.EvaluateConsole("2 * 21").Value).IsEqualTo("42"); + } + + [Test] + public async Task ALoopIsStoppedByTimeToo() + { + using var host = new ScriptHost(new FakeScriptWorld()); + var result = host.EvaluateConsole( + "local n = 0 while true do n = n + 1 end", instructionLimit: long.MaxValue, timeLimit: TimeSpan.FromMilliseconds(50)); + await Assert.That(result.Error!).Contains("ms"); + } + + [Test] + public async Task AFilesErrorNamesTheFileAndLine() + { + var dir = Directory.CreateTempSubdirectory("smt-console-"); + try + { + var path = Path.Combine(dir.FullName, "broken.lua"); + File.WriteAllText(path, "local a = 1\nlocal b = nil\nreturn b.c\n"); + using var host = new ScriptHost(new FakeScriptWorld()); + var ex = Assert.Throws(() => host.LoadFile(path)); + await Assert.That(ex!.Message).Contains("broken.lua"); + await Assert.That(ex.Line).IsEqualTo(3); + } + finally + { + dir.Delete(recursive: true); + } + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/ScreenModelTests.cs b/tests/SharpMUTerm.Tui.Tests/ScreenModelTests.cs index 7579773e..dcdeda2b 100644 --- a/tests/SharpMUTerm.Tui.Tests/ScreenModelTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/ScreenModelTests.cs @@ -374,9 +374,10 @@ public async Task Options_NavigableRowsSkipSectionHeadersAndSpacers() // The THEME group on top adds thirteen rows and three stops: its heading and spacer, a row per built-in // theme, and the preview's caption and seven rows, which are drawn and never a stop. // ALERTS adds three rows and one stop: its heading, its spacer and `alert when away`. - await Assert.That(screen.Rows.Count).IsEqualTo(42); + // SCENE LOG adds four rows and two stops: its heading, its spacer, the format and what is recorded. + await Assert.That(screen.Rows.Count).IsEqualTo(46); await Assert.That(model.PaneCount).IsEqualTo(1); - await Assert.That(model.Sizes[0]).IsEqualTo(18); + await Assert.That(model.Sizes[0]).IsEqualTo(20); } /// diff --git a/tests/SharpMUTerm.Tui.Tests/ScriptingWaveTests.cs b/tests/SharpMUTerm.Tui.Tests/ScriptingWaveTests.cs new file mode 100644 index 00000000..71abfdac --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/ScriptingWaveTests.cs @@ -0,0 +1,314 @@ +using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Commands; +using SharpMUTerm.Client.Modals; +using SharpMUTerm.Core.Automation; +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Logging; +using SharpMUTerm.Core.Protocols; +using SharpMUTerm.Graphics; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// The script console, GMCP channel capture, highlighted names and the scene log, each driven through a connected +/// session the way a player reaches it. +/// +[NotInParallel] +public class ScriptingWaveTests +{ + private const string Ann = "Convergence.Ann"; + + private static readonly TerminalCapabilities Headless = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private static AppConfiguration Config(Action? world = null) + { + var set = new TriggerSet { Name = "Lua", ScriptFiles = { "main.lua" } }; + var config = new AppConfiguration(); + config.TriggerSets.Add(set); + var definition = new WorldDefinition + { + Name = "Convergence", + Host = "convergence.example", + Port = 4201, + Characters = { new CharacterDefinition { Name = "Ann", Logging = new LoggingSettings(), TriggerSets = { "Lua" } } }, + }; + world?.Invoke(definition); + config.Worlds.Add(definition); + return config; + } + + private static async Task<(SharpMUTermApp App, RecordingTelnetSession Wire)> Open( + AppConfiguration config, string? scriptsRoot = null, string? logRoot = null) + { + Console.SetIn(TextReader.Null); + var wire = new RecordingTelnetSession(); + var app = new SharpMUTermApp(config, Headless, new HeadlessConsoleDriver(120, 32), logRoot: logRoot, scriptsRoot: scriptsRoot); + app.TelnetFactory = _ => wire; + if (!app.DispatchCommand(CommandIds.Character(Ann))) + { + throw new InvalidOperationException("the app would not switch to Ann"); + } + + await app.FindSession(Ann)!.ConnectAsync(); + app.RenderNextFrame(); + return (app, wire); + } + + private static string Root(string lua) + { + var root = Directory.CreateTempSubdirectory("sharpmuterm-console-").FullName; + File.WriteAllText(Path.Combine(root, "main.lua"), lua); + return root; + } + + private static void Enter(SharpMUTermApp app, string line) + { + app.SimulateConsoleTyping(line); + app.SimulateConsoleKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false)); + } + + [Test] + public async Task TheConsoleRunsALineInTheCharactersSandboxAndShowsWhatItPrinted() + { + var root = Root("function greet(n) print('hello ' .. n) end\nstore.set('kills', 3)"); + try + { + var (app, _) = await Open(Config(), scriptsRoot: root); + await using var _app = app; + + await Assert.That(app.DispatchCommand(BuiltInCommands.ScriptConsoleCommand)).IsTrue(); + await Assert.That(app.ScriptConsoleIsOpen).IsTrue(); + await Assert.That(app.CellConsole!.Model.CanRun).IsTrue(); + await Assert.That(app.CellConsole!.Model.Store.Select(e => e.Key)).Contains("kills"); + + Enter(app, "1 + 1"); + Enter(app, "greet('Ann')"); + Enter(app, "error('boom')"); + + var lines = app.CellConsole!.Model.Lines; + await Assert.That(lines).Contains(new ScriptConsoleLine(ScriptConsoleKind.Result, "2")); + await Assert.That(lines).Contains(new ScriptConsoleLine(ScriptConsoleKind.Output, "hello Ann")); + await Assert.That(lines.Any(l => l.Kind == ScriptConsoleKind.Error && l.Text.Contains("boom"))).IsTrue(); + await Assert.That(app.CellConsole!.Model.History).IsEquivalentTo(new[] { "1 + 1", "greet('Ann')", "error('boom')" }); + await Assert.That(string.Join("\n", app.ConsoleLines)).Contains("hello Ann"); + } + finally + { + Directory.Delete(root, recursive: true); + } + } + + [Test] + public async Task ALoopTypedAtThePromptIsStoppedAndTheConsoleStaysUsable() + { + var root = Root("-- nothing"); + try + { + var (app, _) = await Open(Config(), scriptsRoot: root); + await using var _app = app; + app.DispatchCommand(BuiltInCommands.ScriptConsoleCommand); + + Enter(app, "while true do end"); + Enter(app, "40 + 2"); + + var lines = app.CellConsole!.Model.Lines; + await Assert.That(lines.Any(l => l.Kind == ScriptConsoleKind.Error)).IsTrue(); + await Assert.That(lines).Contains(new ScriptConsoleLine(ScriptConsoleKind.Result, "42")); + } + finally + { + Directory.Delete(root, recursive: true); + } + } + + [Test] + public async Task DeletingAStoreKeyAndReloadingGoThroughTheConsole() + { + var root = Root("store.set('a', 1)\nstore.set('b', 2)"); + try + { + var (app, _) = await Open(Config(), scriptsRoot: root); + await using var _app = app; + app.DispatchCommand(BuiltInCommands.ScriptConsoleCommand); + + app.DeleteStoreKey("a"); + await Assert.That(app.CellConsole!.Model.Store.Select(e => e.Key)).IsEquivalentTo(new[] { "b" }); + + File.WriteAllText(Path.Combine(root, "main.lua"), "print('v2 loaded')"); + app.SimulateConsoleKey(new ConsoleKeyInfo('\f', ConsoleKey.L, false, false, true)); + + var lines = app.CellConsole!.Model.Lines; + await Assert.That(lines.Any(l => l.Kind == ScriptConsoleKind.Note && l.Text.StartsWith("reloaded", StringComparison.Ordinal))).IsTrue(); + await Assert.That(lines).Contains(new ScriptConsoleLine(ScriptConsoleKind.Output, "v2 loaded")); + } + finally + { + Directory.Delete(root, recursive: true); + } + } + + [Test] + public async Task AScriptErrorReachesTheConsoleWithItsFileAndLine() + { + var root = Root("local x = 1\n\nnil_call()"); + try + { + var (app, _) = await Open(Config(), scriptsRoot: root); + await using var _app = app; + app.DispatchCommand(BuiltInCommands.ScriptConsoleCommand); + + var errors = app.CellConsole!.Model.Lines.Where(l => l.Kind == ScriptConsoleKind.Error).ToArray(); + await Assert.That(errors.Any(e => e.Text.Contains("main.lua:(3", StringComparison.Ordinal) || e.Text.Contains("main.lua:3", StringComparison.Ordinal))).IsTrue(); + } + finally + { + Directory.Delete(root, recursive: true); + } + } + + /// A client that runs no scripts still opens the console, and it says why there is no prompt. + [Test] + public async Task WithNoScriptsRootTheConsoleSaysWhyAndRunsNothing() + { + var (app, _) = await Open(Config(), scriptsRoot: null); + await using var _app = app; + + await Assert.That(app.DispatchCommand(BuiltInCommands.ScriptConsoleCommand)).IsTrue(); + await Assert.That(app.CellConsole!.Model.CanRun).IsFalse(); + await Assert.That(app.CellConsole!.Model.Unavailable!).Contains("runs no scripts"); + + Enter(app, "1 + 1"); + await Assert.That(app.CellConsole!.Model.Lines).IsEmpty(); + } + + [Test] + public async Task AChannelMessageOpensAWindowForItsChannelAndTheMainCopyStays() + { + var (app, wire) = await Open(Config(w => w.CaptureChannels = ChannelCaptureMode.Copy)); + await using var _app = app; + + wire.ReceiveGmcp("Comm.Channel.Text", """{"channel":"ooc","talker":"Rivane","text":"[OOC] Rivane: anyone around?"}"""); + wire.Receive("[OOC] Rivane: anyone around?\n"); + + var spawn = app.WindowIds().Single(id => id.StartsWith("spawn:", StringComparison.Ordinal)); + await Assert.That(spawn).Contains("ooc"); + await Assert.That(app.PaneLines(spawn).Any(l => l.Contains("anyone around?", StringComparison.Ordinal))).IsTrue(); + await Assert.That(app.PaneLines(app.ActiveWindowId()).Any(l => l.Contains("anyone around?", StringComparison.Ordinal))).IsTrue(); + } + + [Test] + public async Task MoveModeTakesTheEchoOutOfTheMainWindow() + { + var (app, wire) = await Open(Config(w => w.CaptureChannels = ChannelCaptureMode.Move)); + await using var _app = app; + + wire.ReceiveGmcp("Comm.Channel.Text", """{"channel":"ooc","talker":"Rivane","text":"[OOC] Rivane: hello"}"""); + wire.Receive("[OOC] Rivane: hello\n"); + wire.Receive("The fountain splashes.\n"); + + var main = app.PaneLines(app.ActiveWindowId()); + await Assert.That(main.Any(l => l.Contains("Rivane: hello", StringComparison.Ordinal))).IsFalse(); + await Assert.That(main.Any(l => l.Contains("fountain", StringComparison.Ordinal))).IsTrue(); + } + + [Test] + public async Task WithCaptureOffAChannelMessageOpensNoWindow() + { + var (app, wire) = await Open(Config()); + await using var _app = app; + + wire.ReceiveGmcp("Comm.Channel.Text", """{"channel":"ooc","talker":"Rivane","text":"hi"}"""); + + await Assert.That(app.WindowIds().Any(id => id.StartsWith("spawn:", StringComparison.Ordinal))).IsFalse(); + } + + [Test] + public async Task AHighlightedNameIsColouredInTheMainWindowAsAWholeWord() + { + var (app, wire) = await Open(Config(w => w.HighlightNames = [new NameHighlight("Ashlyn", "red")])); + await using var _app = app; + + wire.Receive("Ashlyn waves to Ashlynn.\n"); + + var line = app.PaneLines(app.ActiveWindowId()).Single(l => l.Contains("waves", StringComparison.Ordinal)); + await Assert.That(line).Contains("Ashlyn[/]"); + await Assert.That(line).DoesNotContain("Ashlynn[/]"); + } + + [Test] + public async Task ASceneLogRecordsTheWindowWithAHeaderAndRefusesASecondStart() + { + var logs = Directory.CreateTempSubdirectory("sharpmuterm-scene-").FullName; + try + { + var config = Config(); + config.SceneLog = new SceneLogSettings { Html = false, Content = SceneLogContent.Everything }; + var (app, wire) = await Open(config, logRoot: logs); + await using var _app = app; + + await Assert.That(app.DispatchCommand(BuiltInCommands.SceneStartCommand)).IsTrue(); + var log = app.SceneLogOf(app.ActiveWindowId()); + await Assert.That(log).IsNotNull(); + await Assert.That(app.BuildCatalog().Select(i => i.Id)).Contains(BuiltInCommands.SceneStopCommand); + + wire.Receive("Rivane says, \"Evening.\"\n"); + wire.Receive("The fountain splashes.\n"); + await Assert.That(app.DispatchCommand(BuiltInCommands.SceneStopCommand)).IsTrue(); + await Assert.That(app.SceneLogOf(app.ActiveWindowId())).IsNull(); + + var text = File.ReadAllText(log!.Path); + await Assert.That(text).Contains("Present: Ann"); + await Assert.That(text).Contains("Evening."); + await Assert.That(text).Contains("The fountain splashes."); + await Assert.That(text).Contains("Ended"); + await Assert.That(Path.GetDirectoryName(log.Path)!).IsEqualTo(Path.Combine(logs, "scenes")); + } + finally + { + Directory.Delete(logs, recursive: true); + } + } + + [Test] + public async Task PosesOnlyLeavesOutTheRoomsOwnLines() + { + var logs = Directory.CreateTempSubdirectory("sharpmuterm-scene-").FullName; + try + { + var config = Config(); + config.SceneLog = new SceneLogSettings { Html = true, Content = SceneLogContent.Poses }; + var (app, wire) = await Open(config, logRoot: logs); + await using var _app = app; + + app.DispatchCommand(BuiltInCommands.SceneStartCommand); + var log = app.SceneLogOf(app.ActiveWindowId())!; + wire.Receive("Ann says, \"Evening.\"\n"); + wire.Receive("The fountain splashes.\n"); + app.DispatchCommand(BuiltInCommands.SceneStopCommand); + + var text = File.ReadAllText(log.Path); + await Assert.That(log.Path).EndsWith(".html"); + await Assert.That(text).Contains("Evening."); + await Assert.That(text).DoesNotContain("fountain"); + } + finally + { + Directory.Delete(logs, recursive: true); + } + } + + /// An app with no log root — every test, every snapshot — refuses out loud and writes nothing. + [Test] + public async Task WithNoLogRootTheSceneLogRefuses() + { + var (app, _) = await Open(Config(), logRoot: null); + await using var _app = app; + + app.DispatchCommand(BuiltInCommands.SceneStartCommand); + + await Assert.That(app.SceneLogOf(app.ActiveWindowId())).IsNull(); + await Assert.That(app.StatusMarkup).Contains("no scene log"); + } +} From f3afd4cabc9b05ce8fddf9d08776e69be48d7848 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 13:42:11 +0000 Subject: [PATCH 050/113] Maps: other levels and areas, drag to move, hand edits kept, find room - View another level or area and come back in both hosts (MapLooking, MapViewpoint, LookMap): cell title/legend links, PgUp/PgDn/v/h while editing, canvas buttons and Shift+wheel, Ctrl+P map:level-up/-down/ next-area/here, /map level|view|here. Walking targets the real room. - Drag a room on the native canvas while editing: snapped, one MapEdit.Move per drop. - Hand edits (name, area, exits, position) are recorded per room and skipped by the recorder; Reset to server (inspector, menu, R, /map reset) clears them and re-applies the last report. MapStore format 2 with a migration from 1. - Ctrl+P Find room... and /map find . - Views map-level, map-area, map-find, map-mine; parity probes. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 12 +- CLAUDE.md | 23 +- src/SharpMUTerm.Avalonia/DesktopLayer.cs | 2 +- src/SharpMUTerm.Avalonia/FloatingPanels.cs | 2 +- src/SharpMUTerm.Avalonia/MapCanvas.cs | 244 ++++++++++++++++- src/SharpMUTerm.Avalonia/MapInspector.cs | 20 ++ .../Commands/BuiltInCommands.cs | 7 + src/SharpMUTerm.Client/Panels/MapEditing.cs | 32 ++- src/SharpMUTerm.Client/Panels/MapLooking.cs | 259 ++++++++++++++++++ src/SharpMUTerm.Client/Panels/MapViewModel.cs | 74 ++++- .../Surfaces/SurfaceCatalog.cs | 4 + .../Commands/CommandCatalog.cs | 8 +- src/SharpMUTerm.Core/Mapping/MapModel.cs | 41 +++ src/SharpMUTerm.Core/Mapping/MapRecorder.cs | 84 +++++- src/SharpMUTerm.Core/Mapping/MapStore.cs | 26 +- src/SharpMUTerm.Tui/MapRenderer.cs | 87 +++++- src/SharpMUTerm.Tui/Pointer/PointerTarget.cs | 7 +- .../Pointer/SharpMUTermApp.Desktop.cs | 3 +- src/SharpMUTerm.Tui/SharpMUTermApp.MapEdit.cs | 25 +- src/SharpMUTerm.Tui/SharpMUTermApp.MapView.cs | 196 +++++++++++++ src/SharpMUTerm.Tui/SharpMUTermApp.cs | 51 +++- src/SharpMUTerm.Tui/SnapshotViews.cs | 2 +- .../NativeMapViewTests.cs | 159 +++++++++++ .../SurfaceParityTests.cs | 51 ++++ .../Mapping/HandEditTests.cs | 187 +++++++++++++ .../SharpMUTerm.Tui.Tests/MapEditModeTests.cs | 2 + tests/SharpMUTerm.Tui.Tests/MapViewTests.cs | 199 ++++++++++++++ 27 files changed, 1765 insertions(+), 42 deletions(-) create mode 100644 src/SharpMUTerm.Client/Panels/MapLooking.cs create mode 100644 src/SharpMUTerm.Tui/SharpMUTermApp.MapView.cs create mode 100644 tests/SharpMUTerm.Avalonia.Tests/NativeMapViewTests.cs create mode 100644 tests/SharpMUTerm.Core.Tests/Mapping/HandEditTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/MapViewTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 9686bbbb..4adf89b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,8 +17,16 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] - Maps can be edited by hand: Ctrl+P ▸ Edit map in the terminal (arrow keys select, Shift+arrows move, r, a, l, w, x, n, s, Del and u edit), or right-click a room in the desktop window for its menu and inspector. Rename a room, set its area, lock it, weight it, add or remove an exit (or link one to the next room you walk into), move it, delete it, - or give it a note or a symbol; the last ten edits can be undone. A game that reports rooms over GMCP may overwrite - a room's name, area and exits the next time it describes it. + or give it a note or a symbol; the last ten edits can be undone. What you changed by hand (a name, an area, exits, + a position) is kept when the game describes the room again; Reset to server (R, or the inspector's button) gives it + back to the game. +- The map can show another level or area and come back: the ▲ ▼ and "here" in the map's title and the area names in + its legend in the terminal, the Up, Down, Areas and "Back to where I am" buttons (or Shift+wheel) in the desktop + window, PgUp/PgDn, v and h while editing, Ctrl+P ▸ Map: level up / level down / next area / back to where I am, and + `/map level up|down`, `/map view ` and `/map here`. Walking still goes from where you are. +- In the desktop window, drag a room while editing the map to move it; it snaps to the grid. +- Ctrl+P ▸ Find room… and `/map find ` list the rooms whose name or area matches, with the `/walk` for each, + and show the first on the map. - Ctrl+P ▸ Script console: one per character, it shows what your Lua scripts printed and the errors they raised (with the file and line), runs a line of Lua as that character (a runaway loop is stopped after half a second), remembers what you typed, lists the character's `store` keys with Delete, and reloads the scripts. Without a diff --git a/CLAUDE.md b/CLAUDE.md index 436460e1..b10bd267 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -154,7 +154,8 @@ fallbacks) for inline images/maps. the script host's lock). A change a script asks for (`map.walk`, a lock) is posted to the UI thread. - **The map names rooms, and is edited by hand in both hosts** (`WorldMap.Rename`/`SetArea`/`SetExit`/`Remove`/…, Core; `MapRecorder.Edit(label, touched, change)`, `LinkNext`, `Undo`; Client `MapEditing`, `MapEdit`; Tui - `SharpMUTermApp.MapEdit.cs`; Avalonia `MapInspector`; the `map-edit` view). The cell title is the current room's name, + `SharpMUTermApp.MapEdit.cs`; Avalonia `MapInspector`; the `map-edit` view; `map-level`, `map-area`, `map-find` and `map-mine` show looking up a level, another area, a find and + a hand-renamed room in edit mode). The cell title is the current room's name, and `MapViewModel.Nearby` (each exit and where it leads) fills a side column from 64 cells or the rows under the grid from 18. Every edit is a `MapEdit` through `ApplyMapEdit` → `MapEditing.Apply` → `MapRecorder.Edit`, on the UI thread under `SyncRoot`, dirty and saved like a recorded room; undo snapshots the rooms an edit touches (10 deep, areas it @@ -162,8 +163,24 @@ fallbacks) for inline images/maps. map, a cell click while editing, the canvas's right-click menu or click), so `SurfaceParityTests` compares `MapDigest()`. Cell keys are `MapEditing.Keys`; the ones that need words put a `/map …` command on the command line and put back what was being typed once it runs. "Next" on an exit links it to the next room walked into, never its - own. Deleting the room you are in is refused. **On a GMCP world the server's next report of a room overwrites a hand - edit to its name, area, exits and place**; locks, weights, notes and symbols survive. + own. Deleting the room you are in is refused. + - **A hand edit is kept from the server** (`MapRoom.HandEdited`, `MapFields`: name, area, exits, position). Each edit + marks the fields it changed; `MapRecorder` skips those fields on every later report (the rest still follow the + server), and keeps each room's last report this run (`_served`). **Reset to server** (`MapEdit.ResetToServer`; + inspector button, menu entry, cell `R`, `/map reset`) clears the marks through `Edit`, so it undoes, and re-applies + that report at once if there is one; otherwise the next report wins. Undo restores the marks with the room. + `MapStore` is format 2 (`handEdited` per room); a version-1 file migrates on read, and unknown field names are dropped. + - **A map window can look at another level or area** (Client `MapLooking`, `MapViewpoint`, `MapLook`; Tui + `SharpMUTermApp.MapView.cs`; `LookMap`, a `PanelOverlay` callback and a surface action). The look is client state per + window (`_mapLooks`), handed to `MapViewModel.From(…, look)`, which anchors on the room there nearest the current + room's x/y and sets `Viewing`, `Levels`, `LevelAbove`/`Below` and `AreaChoices` (64 at most). Looking where you are + clears it. Walking still targets the real room. Ways in: cell title `▲ ▼ ⌂ here` and legend area links + (`MapRenderer.LookPrefix`), edit keys PgUp/PgDn/`v`/`h`, the canvas's Up/Down/Areas/Back buttons and ⇧wheel, + ⌃P `map:level-up`/`-down`/`next-area`/`here`, and `/map level|view|here`. Nearby is hidden while viewing. + - **A room is dragged on the canvas while editing**: snapped to the grid, one `MapEdit.Move` per drop (the cells' + ⇧arrows' edit), ghost outline while held; a drag outside editing still pans. + - **`/map find `** (⌃P ▸ *Find room…* puts it on the command line) lists up to 20 rooms by name, then area, as + chrome lines in the session window with `/walk `, and points the map at the first. - **Sound** (`Core/Media`: `MediaCommand`, `MediaQueue`, `MediaCache`, `IAudioOutput`). MCMP's `Client.Media.*` is read with TNC.Gmcp's typed records into `MediaCommand`s (`WorldSession.MediaReceived`), and one `MediaQueue` per connection applies the specification's rules — priority halts and refuses lower, diff --git a/src/SharpMUTerm.Avalonia/DesktopLayer.cs b/src/SharpMUTerm.Avalonia/DesktopLayer.cs index d7390d06..6b8fbac5 100644 --- a/src/SharpMUTerm.Avalonia/DesktopLayer.cs +++ b/src/SharpMUTerm.Avalonia/DesktopLayer.cs @@ -340,7 +340,7 @@ private void SyncPanels(ScreenFrame frame, Size cell) () => new MapCanvas(_view), frame, cell, - (map, panel, plane) => map.Show(panel.Map!, panel.Ink, plane, text, panel.WalkTo, panel.SelectRoom, panel.EditMap)); + (map, panel, plane) => map.Show(panel.Map!, panel.Ink, plane, text, panel.WalkTo, panel.SelectRoom, panel.EditMap, panel.LookMap)); Place( _whoHere, _pointer.Panels.Where(p => p.PanelId == PanelIds.WhoHere && p.WhoHere is not null), diff --git a/src/SharpMUTerm.Avalonia/FloatingPanels.cs b/src/SharpMUTerm.Avalonia/FloatingPanels.cs index 57738f29..34253f7c 100644 --- a/src/SharpMUTerm.Avalonia/FloatingPanels.cs +++ b/src/SharpMUTerm.Avalonia/FloatingPanels.cs @@ -289,7 +289,7 @@ public void Update(FloatingPanel panel, double cellHeight) switch (_content) { case MapCanvas map when content.Map is { } model: - map.Show(model, content.Ink, plane, text, content.WalkTo, content.SelectRoom, content.EditMap); + map.Show(model, content.Ink, plane, text, content.WalkTo, content.SelectRoom, content.EditMap, content.LookMap); break; case VitalsGauges gauges when content.Vitals is { } vitals: gauges.Show(vitals, content.Ink, plane, text, cellHeight); diff --git a/src/SharpMUTerm.Avalonia/MapCanvas.cs b/src/SharpMUTerm.Avalonia/MapCanvas.cs index 61bf78e7..a90fe942 100644 --- a/src/SharpMUTerm.Avalonia/MapCanvas.cs +++ b/src/SharpMUTerm.Avalonia/MapCanvas.cs @@ -24,7 +24,14 @@ namespace SharpMUTerm.Avalonia; /// Editing. A right click on a room selects it for editing () and opens the /// client's room menu (); while a room is selected a click selects instead of walking, and the /// card in the top right corner edits it. Every edit is a handed to the -/// client (), the funnel the cell map's keys end in. +/// client (), the funnel the cell map's keys end in. While editing, a room dragged to +/// another grid cell is moved there on the drop: one , so one undo, the cell map's ⇧arrows' edit. +/// +/// +/// Other levels and areas. Buttons under the corner label step a level up or down and open the area menu +/// (); ⇧ with the wheel steps levels; a click on another area in the legend shows it; and +/// while the view is elsewhere a button goes back to where the character is. Each is a handed to the +/// client (), which redraws both hosts from the one model. /// /// internal sealed class MapCanvas : Control @@ -48,6 +55,9 @@ internal sealed class MapCanvas : Control private Action? _walkTo; private Action? _select; private Action? _edit; + private Action? _look; + private MapViewRoom? _dragRoom; + private Vector _dragBy; private readonly MapInspector _inspector = new(); private Vector _pan; private Point? _pressAt; @@ -93,17 +103,26 @@ protected override Size ArrangeOverride(Size finalSize) /// What it is showing. Internal for tests. internal MapViewModel Model => _model; - public void Show(MapViewModel model, PanelInk ink, Color plane, Color text, Action? walkTo, Action? select = null, Action? edit = null) + public void Show( + MapViewModel model, PanelInk ink, Color plane, Color text, Action? walkTo, Action? select = null, Action? edit = null, + Action? look = null) { _walkTo = walkTo; _select = select; _edit = edit; + _look = look; _inspector.Show(model, plane, text, edit, select); if (model.Equals(_model) && ink == _ink && plane == _plane && text == _text) { return; } + // Another level or area is another picture: the pan from the old one means nothing on it. + if (model.Level != _model.Level || model.Area != _model.Area || model.Viewing != _model.Viewing) + { + _pan = default; + } + _model = model; _ink = ink; _plane = plane; @@ -185,6 +204,22 @@ protected override void OnPointerPressed(PointerPressedEventArgs e) return; } + if (LookButtonAt(point.Position) is { } button) + { + if (button.Enabled) + { + PressLookButton(button.Id); + } + + return; + } + + if (LegendAreaAt(point.Position) is { } area) + { + _look?.Invoke(MapLook.ToArea(area)); + return; + } + if (e.ClickCount == 2) { _pan = default; @@ -195,6 +230,8 @@ protected override void OnPointerPressed(PointerPressedEventArgs e) _pressAt = point.Position; _panAtPress = _pan; _dragging = false; + _dragBy = default; + _dragRoom = _model.Editing && _edit is not null ? RoomAt(point.Position) : null; e.Pointer.Capture(this); } @@ -214,7 +251,15 @@ protected override void OnPointerMoved(PointerEventArgs e) if (_dragging || Math.Abs(moved.X) + Math.Abs(moved.Y) > DragThreshold) { _dragging = true; - _pan = _panAtPress + moved; + if (_dragRoom is not null) + { + _dragBy = moved; // a room being moved: drawn at the cell it would land in, the map stays put + } + else + { + _pan = _panAtPress + moved; + } + Cursor = new Cursor(StandardCursorType.SizeAll); InvalidateVisual(); } @@ -245,10 +290,21 @@ protected override void OnPointerReleased(PointerReleasedEventArgs e) } var wasDrag = _dragging; + var dragged = _dragRoom; + var by = _dragBy; _pressAt = null; _dragging = false; + _dragRoom = null; + _dragBy = default; e.Pointer.Capture(null); Cursor = new Cursor(StandardCursorType.Arrow); + if (wasDrag && dragged is not null) + { + DropRoom(dragged, by); + InvalidateVisual(); + return; + } + if (wasDrag || e.InitialPressMouseButton != MouseButton.Left || RoomAt(e.GetPosition(this)) is not { } room) { return; @@ -274,9 +330,159 @@ protected override void OnPointerWheelChanged(PointerWheelEventArgs e) } e.Handled = true; + if ((e.KeyModifiers & KeyModifiers.Shift) != 0) + { + // ⇧ with the wheel steps levels; some platforms turn ⇧-wheel into a sideways scroll, so either axis counts. + var notches = e.Delta.Y != 0 ? e.Delta.Y : e.Delta.X; + if (notches > 0 && _model.LevelAbove) + { + _look?.Invoke(MapLook.Up); + } + else if (notches < 0 && _model.LevelBelow) + { + _look?.Invoke(MapLook.Down); + } + + return; + } + ZoomAbout(e.GetPosition(this), e.Delta.Y); } + /// The grid cells a drag of pixels comes to, at the zoom shown. + internal (int Dx, int Dy) SnapOf(Vector moved) + { + var step = Spacing * Zoom; + return ((int)Math.Round(moved.X / step), (int)Math.Round(moved.Y / step)); + } + + /// + /// A room dropped pixels from where it was picked up: selected, and moved to the grid cell it came + /// to as one edit (none when it came back to its own cell, which is a click that selects it). Internal for tests, + /// which drop a room the way a release does. + /// + internal void DropRoom(MapViewRoom room, Vector by) + { + _select?.Invoke(room.Id); + var (dx, dy) = SnapOf(by); + if ((dx, dy) != (0, 0)) + { + _edit?.Invoke(MapEdit.Move(room.Id, dx, dy)); + } + } + + // ── The look buttons: a level up or down, the area menu, and back to where the character is ────────────── + + /// A look button: what it is, where it is drawn, its words, and whether it does anything now. + internal sealed record LookButton(string Id, Rect Rect, string Label, bool Enabled); + + internal const string UpButton = "up", DownButton = "down", AreasButton = "areas", HereButton = "here"; + + /// + /// The look buttons the view offers, left to right under the corner label: ▲ ▼ while the area has more than one level, + /// Areas ▾ while the map has more than one area, and Back to where I am while the view is elsewhere. Internal for tests. + /// + internal IReadOnlyList LookButtons() + { + var buttons = new List(); + if (_look is null || _model.Rooms.Count == 0) + { + return buttons; + } + + var x = 10.0; + var y = _model.Walking is not null || _model.Current is not null ? 46.0 : 28.0; + void Add(string id, string label, bool enabled) + { + var width = PanelText.Measure(label, ButtonSize, bold: false) + 14; + buttons.Add(new LookButton(id, new Rect(x, y, width, 20), label, enabled)); + x += width + 4; + } + + if (_model.Levels.Count > 1) + { + Add(UpButton, "▲ Up", _model.LevelAbove); + Add(DownButton, "▼ Down", _model.LevelBelow); + } + + if (_model.AreaChoices.Count > 1) + { + Add(AreasButton, "Areas ▾", true); + } + + if (_model.Viewing) + { + Add(HereButton, "Back to where I am", true); + } + + return buttons; + } + + private const double ButtonSize = 11; + + private LookButton? LookButtonAt(Point point) => LookButtons().FirstOrDefault(b => b.Rect.Contains(point)); + + /// What a look button does. Internal for tests, which press one the way a click does. + internal void PressLookButton(string id) + { + switch (id) + { + case UpButton: + _look?.Invoke(MapLook.Up); + break; + case DownButton: + _look?.Invoke(MapLook.Down); + break; + case HereButton: + _look?.Invoke(MapLook.Here); + break; + case AreasButton: + OpenAreaMenu(); + break; + } + } + + /// The last area menu the canvas opened. Internal for tests. + internal MenuModel? OpenedAreaMenu { get; private set; } + + /// Opens the client's area menu: each area the map has, and the way back while the view is elsewhere. + internal void OpenAreaMenu() + { + var model = MapLooking.AreaMenu(_model); + OpenedAreaMenu = model; + var view = _model; + var menu = NativeMenu.Build(model, verb => RunAreaVerb(view, verb), global::Avalonia.Controls.PlacementMode.Pointer, this); + menu.Open(this); + } + + /// What an area menu entry does. Internal for tests, which choose an entry the way a click on it would. + internal void RunAreaVerb(MapViewModel view, string verb) + { + if (MapLooking.LookFor(verb, view) is { } look) + { + _look?.Invoke(look); + } + } + + /// The other area whose legend row is under a point, or null: a click there shows that area. + internal string? LegendAreaAt(Point point) + { + if (_look is null || LegendRect(Bounds.Size) is not { } plate || !plate.Contains(point)) + { + return null; + } + + var entries = LegendEntries(); + var row = (int)Math.Floor((point.Y - plate.Y - LegendPad) / LegendRow); + if (row < 0 || row >= entries.Count) + { + return null; + } + + var first = entries.Count - _model.Areas.Count; + return row >= first && !_model.Areas[row - first].Drawn ? _model.Areas[row - first].Name : null; + } + /// /// Selects and opens the client's menu for it: walk there, each edit, undo. An edit that needs /// words opens the inspector at its field; the rest are handed to the client as they are. @@ -457,7 +663,8 @@ public override void Render(DrawingContext context) } // What and where, in the corner: the area and level, and a walk under way. - var label = _model.Area is { Length: > 0 } areaName ? $"{areaName} · level {_model.Level}" : $"level {_model.Level}"; + var label = (_model.Viewing ? "Viewing " : string.Empty) + + (_model.Area is { Length: > 0 } areaName ? $"{areaName} · level {_model.Level}" : $"level {_model.Level}"); DrawText(context, label, new Point(10, 8), 12, _model.AreaColour is { } areaHex ? Parse(areaHex) : Faded(0.75)); if (_model.Walking is { } walking) { @@ -468,9 +675,38 @@ public override void Render(DrawingContext context) DrawText(context, here.Name, new Point(10, 26), 12, accent); } + if (_dragRoom is { } moving && byId.TryGetValue(moving.Id, out var shown)) + { + // Where the room would land: an outline on the grid cell the drag has come to, joined to where it is now. + var (dx, dy) = SnapOf(_dragBy); + var from = CentreOf(shown); + var step = Spacing * Zoom; + var to = new Point(from.X + (dx * step), from.Y + (dy * step)); + var ghost = new Pen(new SolidColorBrush(path), 2, new DashStyle([3, 2], 0)); + context.DrawLine(new Pen(new SolidColorBrush(Faded(0.5)), 1, new DashStyle([2, 2], 0)), from, to); + context.DrawRectangle(new SolidColorBrush(Color.FromArgb(0x40, path.R, path.G, path.B)), ghost, new Rect(to.X - (size / 2), to.Y - (size / 2), size, size), radius, radius); + } + + DrawLookButtons(context); DrawLegend(context, bounds); } + private void DrawLookButtons(DrawingContext context) + { + foreach (var button in LookButtons()) + { + var alpha = button.Enabled ? 1.0 : 0.4; + context.DrawRectangle( + new SolidColorBrush(Mix(_plane, _text, 0.1)), + new Pen(new SolidColorBrush(Faded(0.35 * alpha)), 1), + button.Rect, + 4, + 4); + var label = PanelText.Format(button.Label, ButtonSize, Faded(0.9 * alpha), bold: false, button.Rect.Width); + context.DrawText(label, new Point(button.Rect.X + 7, button.Rect.Y + ((button.Rect.Height - label.Height) / 2))); + } + } + /// Up and down marks: a small triangle at the top of the room for a way up, at the bottom for a way down. private void DrawStairs(DrawingContext context, MapViewRoom room, Rect rect, Color ink) { diff --git a/src/SharpMUTerm.Avalonia/MapInspector.cs b/src/SharpMUTerm.Avalonia/MapInspector.cs index 556737db..49114a72 100644 --- a/src/SharpMUTerm.Avalonia/MapInspector.cs +++ b/src/SharpMUTerm.Avalonia/MapInspector.cs @@ -25,6 +25,7 @@ internal sealed class MapInspector : Border private readonly TextBlock _where = new() { Opacity = 0.75 }; private readonly TextBlock _pending = new() { TextWrapping = TextWrapping.Wrap, IsVisible = false }; private readonly StackPanel _exits = new() { Spacing = 2 }; + private readonly TextBlock _mine = new() { TextWrapping = TextWrapping.Wrap, Opacity = 0.85, IsVisible = false }; private readonly Button _undo; private readonly Button _delete; private MapViewModel _model = new(null, 0, [], [], null); @@ -89,6 +90,14 @@ public MapInspector() } }); var done = Small("Done", () => _select?.Invoke(null)); + ResetButton = Small("Reset to server", () => + { + if (_model.Selected is { } room) + { + _edit?.Invoke(MapEdit.ResetToServer(room.Id)); + } + }); + ToolTip.SetTip(ResetButton, "Let the server's room reports set the fields you edited by hand again (R on the cell map)"); var nudge = new WrapPanel(); foreach (var (label, dx, dy, dz) in new[] { ("West", -1, 0, 0), ("North", 0, -1, 0), ("South", 0, 1, 0), ("East", 1, 0, 0), ("Level up", 0, 0, 1), ("Level down", 0, 0, -1) }) @@ -132,6 +141,7 @@ void Row(string label, Control field) var buttons = new WrapPanel(); buttons.Children.Add(_undo); buttons.Children.Add(_delete); + buttons.Children.Add(ResetButton); buttons.Children.Add(done); Child = new StackPanel @@ -142,6 +152,7 @@ void Row(string label, Control field) _title, _where, grid, + _mine, LockBox, new TextBlock { Text = "Exits", Opacity = 0.75 }, _exits, @@ -175,6 +186,12 @@ void Row(string label, Control field) internal CheckBox LockBox { get; } + /// Gives the room's hand-edited fields back to the server; enabled only while it has some. + internal Button ResetButton { get; } + + /// What the card says about the fields edited by hand, or empty. Internal for tests. + internal string HandEditedText => _mine.IsVisible ? _mine.Text ?? string.Empty : string.Empty; + /// The room it shows, or null. Internal for tests. internal MapRoomDetails? Room => _model.Selected; @@ -238,6 +255,9 @@ public void Show(MapViewModel model, Color plane, Color text, Action? e _pending.Text = model.Pending ?? string.Empty; _pending.IsVisible = model.Pending is not null; + _mine.Text = room.HandEdited.Count == 0 ? string.Empty : $"Edited by hand, kept from the server: {string.Join(", ", room.HandEdited)}"; + _mine.IsVisible = room.HandEdited.Count > 0; + ResetButton.IsEnabled = room.HandEdited.Count > 0; _undo.IsEnabled = model.UndoLabel is not null; ToolTip.SetTip(_undo, model.UndoLabel is { } undo ? $"Undo {undo}" : "Nothing to undo"); _delete.IsEnabled = model.Current?.Id != room.Id; diff --git a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs index f3fb8dd8..3bb728d1 100644 --- a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs +++ b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs @@ -169,6 +169,13 @@ void Family(string id, string prefix, Func c.State.MapUndo is not null); + + // Looking at another level or area of the map, and back; offered only where the map has one to look at. + Add("map:level-up", CommandGroup.Terminal, "Map: level up", detail: "shows the next level up · /map level up", when: c => c.State.MapLevels > 1); + Add("map:level-down", CommandGroup.Terminal, "Map: level down", detail: "shows the next level down · /map level down", when: c => c.State.MapLevels > 1); + Add("map:next-area", CommandGroup.Terminal, "Map: next area", detail: "shows another area · /map view ", when: c => c.State.MapAreas > 1); + Add("map:here", CommandGroup.Terminal, "Map: back to where I am", detail: "the map follows you again · /map here", when: c => c.State.MapViewing); + Add("map:find", CommandGroup.Terminal, "Find room…", detail: "rooms by name or area · /map find ", when: c => c.State.MapLevels > 0); // The panels a layout places, openable one at a time as tabs: each draws the focused character's own data // and says so when there is none yet, so they are listed unconditionally, like the map. Add("panel:who-here", CommandGroup.Terminal, "Show who is here", detail: "players and creatures in the room · click a name to look"); diff --git a/src/SharpMUTerm.Client/Panels/MapEditing.cs b/src/SharpMUTerm.Client/Panels/MapEditing.cs index 73c0a87a..0b0a7921 100644 --- a/src/SharpMUTerm.Client/Panels/MapEditing.cs +++ b/src/SharpMUTerm.Client/Panels/MapEditing.cs @@ -26,6 +26,9 @@ public enum MapEditKind /// The last edit taken back. Undo, + + /// The room's hand-edited fields given back to the server (). + ResetToServer, } /// @@ -66,6 +69,8 @@ public sealed record MapEdit(MapEditKind Kind, long Room, string? Text = null, i public static MapEdit Symbol(long room, string? symbol) => new(MapEditKind.Symbol, room, symbol); public static MapEdit Undo { get; } = new(MapEditKind.Undo, 0); + + public static MapEdit ResetToServer(long room) => new(MapEditKind.ResetToServer, room); } /// What an edit did: whether the map changed, and a sentence for the player either way. @@ -80,7 +85,7 @@ public static class MapEditing /// A room menu entry's verbs (). A verb that needs words opens the inspector at that field. public const string WalkVerb = "walk", RenameVerb = "rename", AreaVerb = "area", NoteVerb = "note", SymbolVerb = "symbol", WeightVerb = "weight", ExitVerb = "exit", UnexitVerb = "unexit", LockVerb = "lock", UnlockVerb = "unlock", DeleteVerb = "delete", - UndoVerb = "undo"; + UndoVerb = "undo", ResetVerb = "reset"; /// The verbs that need words, which a host asks for in its inspector before an edit is made. public static IReadOnlyList TextVerbs { get; } = [RenameVerb, AreaVerb, NoteVerb, SymbolVerb, WeightVerb, ExitVerb]; @@ -93,6 +98,9 @@ public static class MapEditing [ ("←↑→↓", "select"), ("⇧←↑→↓", "move"), + ("PgUp PgDn", "level"), + ("v", "next area"), + ("h", "here"), ("r", "rename"), ("a", "area"), ("l", "lock"), @@ -102,6 +110,7 @@ public static class MapEditing ("n", "note"), ("s", "symbol"), ("Del", "delete"), + ("R", "reset to server"), ("u", "undo"), ("⏎", "walk"), ("Esc", "done"), @@ -148,6 +157,14 @@ public static MapEditResult Apply(MapRecorder recorder, MapEdit edit) return new(false, "you are in that room — walk out of it first"); } + if (edit.Kind == MapEditKind.ResetToServer) + { + var reported = recorder.HasServerReport(id); + return recorder.ResetToServer(id, $"reset {name} to server") + ? new(true, reported ? $"{name} is as the server last said" : $"{name} takes the server's next report") + : new(false, $"nothing on {name} was edited by hand"); + } + if (edit.Kind == MapEditKind.LinkNext) { return recorder.LinkNext(id, exit) @@ -194,7 +211,7 @@ public static MapEditResult Apply(MapRecorder recorder, MapEdit edit) /// The /map verbs that edit, which reads. public static IReadOnlyList CommandVerbs { get; } = - ["rename", "area", "lock", "unlock", "weight", "exit", "unexit", "move", "delete", "note", "symbol", "undo"]; + ["rename", "area", "lock", "unlock", "weight", "exit", "unexit", "move", "delete", "note", "symbol", "undo", "reset"]; /// /// A /map command's words after /map, as an edit: rename 12 The Hall, area 12 Keep, @@ -233,11 +250,12 @@ public static (MapEdit? Edit, string? Problem) Parse(string argument, Func "/map delete ", "note" => "/map note [text]", "symbol" => "/map symbol [character]", + "reset" => "/map reset ", _ => null, }; if (usage is null) { - return (null, "use /map lock|unlock [room], rename, area, weight, exit, unexit, move, delete, note, symbol or undo"); + return (null, "use /map lock|unlock [room], rename, area, weight, exit, unexit, move, delete, note, symbol, reset or undo"); } space = rest.IndexOf(' '); @@ -260,6 +278,8 @@ public static (MapEdit? Edit, string? Problem) Parse(string argument, Func MapEdit.Lock(room, false), DeleteVerb => MapEdit.Delete(room), UndoVerb => MapEdit.Undo, + ResetVerb => MapEdit.ResetToServer(room), _ => null, }; diff --git a/src/SharpMUTerm.Client/Panels/MapLooking.cs b/src/SharpMUTerm.Client/Panels/MapLooking.cs new file mode 100644 index 00000000..b4df8716 --- /dev/null +++ b/src/SharpMUTerm.Client/Panels/MapLooking.cs @@ -0,0 +1,259 @@ +using System.Globalization; +using SharpMUTerm.Client.Commands; +using SharpMUTerm.Core.Mapping; + +namespace SharpMUTerm.Client.Panels; + +/// +/// Where a map view looks when it is not where the character is: one area's one level. Held by the client per map window; +/// null means the view follows the character ( false). +/// +/// The area shown (), or null for rooms in no area. +/// The level shown (z). +public sealed record MapViewpoint(int? AreaId, int Level); + +/// What a request to look elsewhere on the map asks for. +public enum MapLookKind +{ + /// Back to where the character is. + Here, + + /// The next level up in the area shown that has rooms. + Up, + + /// The next level down in the area shown that has rooms. + Down, + + /// An area by name (). + Area, + + /// The next area by name, after the one shown. + NextArea, +} + +/// +/// A request to look at another level or area of a map, as both hosts make it: the cell map's keys, its title and legend +/// links, a /map command, and the window's buttons, wheel and area menu. Every one ends in the client's +/// LookMap, which resolves it with . +/// +public sealed record MapLook(MapLookKind Kind, string? Area = null) +{ + public static MapLook Here { get; } = new(MapLookKind.Here); + + public static MapLook Up { get; } = new(MapLookKind.Up); + + public static MapLook Down { get; } = new(MapLookKind.Down); + + public static MapLook NextArea { get; } = new(MapLookKind.NextArea); + + public static MapLook ToArea(string area) => new(MapLookKind.Area, area); +} + +/// A room a search found: its number, name and area (bounded), and where it is, which a view can be pointed at. +public sealed record MapFoundRoom(long Id, string Name, string? Area, int? AreaId, int Level); + +/// What resolving a did: whether the view moved, where it now looks, and a sentence. +public sealed record MapLookResult(bool Done, MapViewpoint? Next, string Message); + +/// Looking at another level or area of a map: resolving a request, the window's area menu, and reading /map words. +public static class MapLooking +{ + /// The area menu's entry verbs: area:N picks [N]; here goes back. + public const string AreaVerbPrefix = "area:", HereVerb = "here"; + + /// + /// Where takes a view that now looks at (null: where the character is, + /// or with no current room the most recently recorded room). A viewpoint that is where the character is comes back + /// null, so the view follows them again. Nothing is changed by a request that is refused. + /// + public static MapLookResult Resolve(WorldMap map, long? currentRoomId, MapViewpoint? now, MapLook look) + { + ArgumentNullException.ThrowIfNull(map); + ArgumentNullException.ThrowIfNull(look); + var home = (currentRoomId is { } id ? map.Room(id) : null) ?? map.Rooms.Values.LastOrDefault(); + if (home is null) + { + return new(false, now, "nothing is mapped yet"); + } + + var at = now ?? new MapViewpoint(home.AreaId, home.Z); + MapViewpoint next; + switch (look.Kind) + { + case MapLookKind.Here: + return now is null ? new(false, null, "the map already shows where you are") : new(true, null, "the map shows where you are again"); + case MapLookKind.Up or MapLookKind.Down: + { + var up = look.Kind == MapLookKind.Up; + var levels = map.Rooms.Values.Where(r => r.AreaId == at.AreaId).Select(r => r.Z).Distinct().ToList(); + var further = levels.Where(z => up ? z > at.Level : z < at.Level).ToList(); + if (further.Count == 0) + { + return new(false, now, $"no level {(up ? "above" : "below")} {at.Level.ToString(CultureInfo.InvariantCulture)} in {AreaLabel(map, at.AreaId)}"); + } + + next = at with { Level = up ? further.Min() : further.Max() }; + break; + } + + case MapLookKind.Area or MapLookKind.NextArea: + { + var choices = Choices(map); + MapArea? area; + if (look.Kind == MapLookKind.NextArea) + { + if (choices.Count < 2) + { + return new(false, now, "this map has only one area"); + } + + var index = choices.FindIndex(a => a.Id == at.AreaId); + area = choices[(index + 1) % choices.Count]; + } + else + { + var name = (look.Area ?? string.Empty).Trim(); + area = choices.FirstOrDefault(a => string.Equals(MapViewModel.Bound(a.Name), name, StringComparison.Ordinal)) + ?? choices.FirstOrDefault(a => string.Equals(a.Name, name, StringComparison.OrdinalIgnoreCase)) + ?? choices.FirstOrDefault(a => a.Name.StartsWith(name, StringComparison.OrdinalIgnoreCase) && name.Length > 0); + if (area is null) + { + return new(false, now, $"no area called {Snippet(name)} on this map"); + } + + if (area.Id == at.AreaId) + { + return new(false, now, $"the map already shows {Snippet(area.Name)}"); + } + } + + // The level the character is on when the area has rooms there, else the nearest level it has. + var levels = map.Rooms.Values.Where(r => r.AreaId == area.Id).Select(r => r.Z).Distinct().ToList(); + var level = levels.Contains(home.Z) ? home.Z : levels.OrderBy(z => Math.Abs(z - at.Level)).ThenBy(z => z).First(); + next = new MapViewpoint(area.Id, level); + break; + } + + default: + return new(false, now, "nothing to look at"); + } + + if (next.AreaId == home.AreaId && next.Level == home.Z) + { + return new(true, null, "the map shows where you are again"); + } + + return new(true, next, $"the map shows {AreaLabel(map, next.AreaId)}, level {next.Level.ToString(CultureInfo.InvariantCulture)}"); + } + + /// The areas a view can be pointed at: every named area that holds a room, by name. + public static List Choices(WorldMap map) + { + var used = map.Rooms.Values.Select(r => r.AreaId).OfType().ToHashSet(); + return map.Areas.Values + .Where(a => used.Contains(a.Id) && !string.IsNullOrWhiteSpace(a.Name)) + .OrderBy(a => a.Name, StringComparer.Ordinal) + .ThenBy(a => a.Id) + .Take(MapViewModel.MaxAreaChoices) + .ToList(); + } + + /// + /// The window's area menu: each area the map has, the one shown checked off by being disabled, then a way back to + /// where the character is while the view is elsewhere. + /// + public static MenuModel AreaMenu(MapViewModel view) + { + ArgumentNullException.ThrowIfNull(view); + var entries = new List(); + for (var i = 0; i < view.AreaChoices.Count; i++) + { + var area = view.AreaChoices[i]; + entries.Add(new MenuEntry(Snippet(area.Name), area.Drawn ? "shown" : null, area.Drawn ? null : AreaVerbPrefix + i.ToString(CultureInfo.InvariantCulture), Enabled: !area.Drawn)); + } + + if (view.Viewing) + { + entries.Add(MenuEntry.Separator); + entries.Add(new MenuEntry("Back to where I am", "h", HereVerb)); + } + + return new MenuModel(entries); + } + + /// The look an area menu verb asks for, or null for a verb that is not one. + public static MapLook? LookFor(string verb, MapViewModel view) + { + ArgumentNullException.ThrowIfNull(view); + if (verb == HereVerb) + { + return MapLook.Here; + } + + return verb.StartsWith(AreaVerbPrefix, StringComparison.Ordinal) + && int.TryParse(verb.AsSpan(AreaVerbPrefix.Length), NumberStyles.None, CultureInfo.InvariantCulture, out var index) + && index < view.AreaChoices.Count + ? MapLook.ToArea(view.AreaChoices[index].Name) + : null; + } + + /// The /map verbs that look elsewhere, which reads. + public static IReadOnlyList CommandVerbs { get; } = ["level", "view", "here"]; + + /// + /// /map level up|down, /map view <area> (or next), /map here, as a look. Null with a + /// problem for anything else. + /// + public static (MapLook? Look, string? Problem) Parse(string argument) + { + var words = (argument ?? string.Empty).Trim(); + var space = words.IndexOf(' '); + var verb = (space < 0 ? words : words[..space]).ToLowerInvariant(); + var rest = space < 0 ? string.Empty : words[(space + 1)..].Trim(); + return verb switch + { + "here" => (MapLook.Here, null), + "level" when rest.Equals("up", StringComparison.OrdinalIgnoreCase) || rest == "+" => (MapLook.Up, null), + "level" when rest.Equals("down", StringComparison.OrdinalIgnoreCase) || rest == "-" => (MapLook.Down, null), + "level" => (null, "use /map level up or /map level down"), + "view" when rest.Length == 0 => (null, "use /map view , /map view next or /map here"), + "view" when rest.Equals("next", StringComparison.OrdinalIgnoreCase) => (MapLook.NextArea, null), + "view" => (MapLook.ToArea(rest), null), + _ => (null, "use /map level up|down, /map view or /map here"), + }; + } + + /// The most rooms lists. + public const int MaxFound = 20; + + /// + /// Rooms whose name or area holds , ignoring case: name matches first, then area matches, each + /// by name and then number; at most , with how many matched in all. + /// + public static (IReadOnlyList Rooms, int Total) Find(WorldMap map, string text) + { + ArgumentNullException.ThrowIfNull(map); + var query = (text ?? string.Empty).Trim(); + if (query.Length == 0) + { + return ([], 0); + } + + string? AreaOf(MapRoom r) => r.AreaId is { } a && map.Areas.TryGetValue(a, out var area) && !string.IsNullOrWhiteSpace(area.Name) ? area.Name : null; + var matches = map.Rooms.Values + .Select(r => (Room: r, Area: AreaOf(r), ByName: r.Name.Contains(query, StringComparison.OrdinalIgnoreCase))) + .Where(m => m.ByName || (m.Area?.Contains(query, StringComparison.OrdinalIgnoreCase) ?? false)) + .OrderBy(m => m.ByName ? 0 : 1) + .ThenBy(m => m.Room.Name, StringComparer.OrdinalIgnoreCase) + .ThenBy(m => m.Room.Id) + .ToList(); + return (matches.Take(MaxFound) + .Select(m => new MapFoundRoom(m.Room.Id, MapViewModel.Bound(m.Room.Name), m.Area is null ? null : MapViewModel.Bound(m.Area), m.Room.AreaId, m.Room.Z)) + .ToList(), matches.Count); + } + + private static string AreaLabel(WorldMap map, int? areaId) => + areaId is { } id && map.Areas.TryGetValue(id, out var area) && !string.IsNullOrWhiteSpace(area.Name) ? Snippet(area.Name) : "no area"; + + private static string Snippet(string text) => text.Length <= 40 ? text : text[..39] + "…"; +} diff --git a/src/SharpMUTerm.Client/Panels/MapViewModel.cs b/src/SharpMUTerm.Client/Panels/MapViewModel.cs index 5f6a0e5a..94645457 100644 --- a/src/SharpMUTerm.Client/Panels/MapViewModel.cs +++ b/src/SharpMUTerm.Client/Panels/MapViewModel.cs @@ -19,9 +19,10 @@ namespace SharpMUTerm.Client.Panels; /// Whether it is the room being edited (). /// The one character the player marked it with, or null. /// Whether the player wrote a note on it. +/// Whether a field the server reports was changed by hand (). public sealed record MapViewRoom( long Id, string Name, int X, int Y, bool Current, bool Ahead, bool Locked, bool Up = false, bool Down = false, string? Elsewhere = null, - bool Selected = false, string? Symbol = null, bool Noted = false); + bool Selected = false, string? Symbol = null, bool Noted = false, bool HandEdited = false); /// An exit as a view names it: the direction or command, and the room it leads to, or none for a stub. /// A direction's short command (n, up) or a special exit's command. @@ -36,10 +37,17 @@ public sealed record MapViewExitName(string Exit, long? To, string? Name); public sealed record MapRoomDetails( long Id, string Name, string? Area, int X, int Y, int Z, int Weight, bool Locked, string? Symbol, string? Note, IReadOnlyList Exits) { + /// + /// The fields changed by hand (, in that order), which the server's next report leaves alone + /// until the room is reset to the server. + /// + public IReadOnlyList HandEdited { get; init; } = []; + /// Value equality over the exits too, which a record's list member does not give. public bool Equals(MapRoomDetails? other) => other is not null && Id == other.Id && Name == other.Name && Area == other.Area && (X, Y, Z) == (other.X, other.Y, other.Z) - && Weight == other.Weight && Locked == other.Locked && Symbol == other.Symbol && Note == other.Note && Exits.SequenceEqual(other.Exits); + && Weight == other.Weight && Locked == other.Locked && Symbol == other.Symbol && Note == other.Note && Exits.SequenceEqual(other.Exits) + && HandEdited.SequenceEqual(other.HandEdited); public override int GetHashCode() => HashCode.Combine(Id, Name, Area, X, Y, Z, Weight, Exits.Count); } @@ -69,6 +77,30 @@ public sealed record MapViewModel(string? Area, int Level, IReadOnlyListThe longest room or area name a view is given. public const int MaxNameLength = 80; + /// The most areas lists. + public const int MaxAreaChoices = 64; + + /// + /// Whether the view is somewhere the player asked to look () rather than where the + /// character is: both hosts then offer the way back. + /// + public bool Viewing { get; init; } + + /// The levels the drawn area has rooms on, lowest first: what the level buttons and keys step through. + public IReadOnlyList Levels { get; init; } = []; + + /// Whether the drawn area has a level above the one drawn. + public bool LevelAbove => Levels.Any(z => z > Level); + + /// Whether the drawn area has a level below the one drawn. + public bool LevelBelow => Levels.Any(z => z < Level); + + /// + /// Every named area of the map that holds a room, by name, each in its colour and for + /// the one drawn: what the window's area menu lists and the cell map's area key cycles through. + /// + public IReadOnlyList AreaChoices { get; init; } = []; + /// /// The room the view is drawn around: the character's, or with no current room the most recently recorded one. /// Null when nothing is mapped. The cell map centres on this room too, so the two views never disagree about it. @@ -125,16 +157,30 @@ public sealed record MapViewModel(string? Area, int Level, IReadOnlyList /// An exit waiting for the next room walked into (). /// What an undo would take back (). + /// + /// Another area or level to draw (), or null to draw where the character is. A viewpoint + /// with no rooms is ignored. The view is then drawn around the room of that set nearest the character's place. + /// public static MapViewModel From( WorldMap map, long? currentRoomId, IEnumerable ahead, string? walking, MapAreaPalette? palette = null, - long? selected = null, (long From, string Exit)? pending = null, string? undo = null) + long? selected = null, (long From, string Exit)? pending = null, string? undo = null, MapViewpoint? look = null) { ArgumentNullException.ThrowIfNull(map); palette ??= MapAreaPalette.Dark; var anchor = currentRoomId is { } id ? map.Room(id) : null; anchor ??= map.Rooms.Values.LastOrDefault(); + var home = anchor; + var viewing = false; + if (look is { } v && home is not null && (v.AreaId != home.AreaId || v.Level != home.Z) + && map.Rooms.Values.Where(r => r.Z == v.Level && r.AreaId == v.AreaId) + .OrderBy(r => Math.Abs(r.X - home.X) + Math.Abs(r.Y - home.Y)).ThenBy(r => r.Id).FirstOrDefault() is { } there) + { + anchor = there; + viewing = true; + } + var chosen = selected is { } pick ? map.Room(pick) : null; - if (chosen is not null && (anchor is null || chosen.Z != anchor.Z || chosen.AreaId != anchor.AreaId)) + if (!viewing && chosen is not null && (anchor is null || chosen.Z != anchor.Z || chosen.AreaId != anchor.AreaId)) { anchor = chosen; } @@ -166,7 +212,8 @@ public static MapViewModel From( Elsewhere(map, r), r.Id == chosen?.Id, ValidSymbol(r.Symbol), - r.Note is not null)) + r.Note is not null, + r.HandEdited.Count > 0)) .ToList(); var ids = rooms.Select(r => r.Id).ToHashSet(); var exits = new List(); @@ -204,10 +251,16 @@ public static MapViewModel From( } var here = currentRoomId is { } at ? map.Room(at) : null; + var choices = MapLooking.Choices(map) + .Select(a => new MapViewArea(Bounded(a.Name), palette.Colour(Bounded(a.Name)), Drawn: a.Id == anchor.AreaId)) + .ToList(); return new MapViewModel(area, anchor.Z, rooms, exits, walking) { AnchorId = anchor.Id, Areas = areas, + Viewing = viewing, + Levels = map.Rooms.Values.Where(r => r.AreaId == anchor.AreaId).Select(r => r.Z).Distinct().Order().ToList(), + AreaChoices = choices, Nearby = here is null ? [] : ExitsOf(map, here), Selected = chosen is null ? null : DetailsOf(map, chosen), Pending = pendingText, @@ -255,7 +308,13 @@ private static List ExitsOf(WorldMap map, MapRoom room) room.Locked, ValidSymbol(room.Symbol), room.Note is { } note ? Bounded(note) : null, - ExitsOf(map, room)); + ExitsOf(map, room)) + { + HandEdited = MapFields.All.Where(room.HandEdited.Contains).ToList(), + }; + + /// A name as a view is given it: at most characters. + public static string Bound(string name) => Bounded(name); /// A symbol a view may draw: its first character when that is one a cell can hold, else null. private static string? ValidSymbol(string? symbol) => @@ -309,7 +368,8 @@ private static bool Climbs(WorldMap map, MapRoom room, bool up) public bool Equals(MapViewModel? other) => other is not null && Area == other.Area && Level == other.Level && Walking == other.Walking && AnchorId == other.AnchorId && Rooms.SequenceEqual(other.Rooms) && Exits.SequenceEqual(other.Exits) && Areas.SequenceEqual(other.Areas) - && Nearby.SequenceEqual(other.Nearby) && Equals(Selected, other.Selected) && Pending == other.Pending && UndoLabel == other.UndoLabel; + && Nearby.SequenceEqual(other.Nearby) && Equals(Selected, other.Selected) && Pending == other.Pending && UndoLabel == other.UndoLabel + && Viewing == other.Viewing && Levels.SequenceEqual(other.Levels) && AreaChoices.SequenceEqual(other.AreaChoices); public override int GetHashCode() => HashCode.Combine(Area, Level, Walking, Rooms.Count, Exits.Count, Areas.Count); } diff --git a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs index a9d5b48d..0629ac20 100644 --- a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs +++ b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs @@ -304,6 +304,10 @@ public static class SurfaceCatalog // while editing), and every edit — cell key, /map command, native menu or inspector — through one funnel. new(SurfaceActionKind.Pick, "select room", "SelectMapRoom"), new(SurfaceActionKind.MapEdit, "edit", "ApplyMapEdit"), + + // Another level or area, and back: the cell title's arrows, its legend's areas and the edit keys; the + // window's level buttons, wheel and area menu. + new(SurfaceActionKind.Pick, "look", "LookMap"), PopOut, ], CellsUnderNative, diff --git a/src/SharpMUTerm.Core/Commands/CommandCatalog.cs b/src/SharpMUTerm.Core/Commands/CommandCatalog.cs index f584673d..19fdb2d7 100644 --- a/src/SharpMUTerm.Core/Commands/CommandCatalog.cs +++ b/src/SharpMUTerm.Core/Commands/CommandCatalog.cs @@ -63,6 +63,9 @@ public sealed record CharacterRef( /// Whether the client's own dictionaries folder holds none, so Get a spelling dictionary is offered. /// /// What the focused character's last map edit was, so Undo map edit is offered only with one. +/// How many levels the area the focused character's map shows has (0 with no map). +/// How many named areas that map has. +/// Whether that map shows somewhere other than where the character is. public sealed record CommandContext( bool LoggingOn = false, bool Zoomed = false, @@ -82,7 +85,10 @@ public sealed record CommandContext( IReadOnlyList? RaggedWraps = null, bool NoDictionary = false, string? MapUndo = null, - bool SceneLogging = false); + bool SceneLogging = false, + int MapLevels = 0, + int MapAreas = 0, + bool MapViewing = false); /// A world whose pane is narrower than its server's wrap column. /// The world's name. diff --git a/src/SharpMUTerm.Core/Mapping/MapModel.cs b/src/SharpMUTerm.Core/Mapping/MapModel.cs index 02425174..bf0a69bf 100644 --- a/src/SharpMUTerm.Core/Mapping/MapModel.cs +++ b/src/SharpMUTerm.Core/Mapping/MapModel.cs @@ -62,6 +62,12 @@ public sealed class MapRoom /// Anything a script wants to keep on the room. public Dictionary UserData { get; set; } = new(StringComparer.Ordinal); + /// + /// The fields the player changed by hand (): a room report from the server leaves these alone, + /// so a GMCP world does not undo a rename, an area, an exit or a move on the next visit. Kept with the map. + /// + public HashSet HandEdited { get; set; } = new(StringComparer.Ordinal); + /// A deep copy, for an edit's undo. public MapRoom Clone() => new() { @@ -83,6 +89,7 @@ public sealed class MapRoom Color = Color, Note = Note, UserData = new(UserData, StringComparer.Ordinal), + HandEdited = new(HandEdited, StringComparer.Ordinal), }; /// Every exit, direction and special alike, as the command that takes it and where it leads. @@ -100,6 +107,15 @@ public sealed class MapRoom } } +/// The fields of a room a hand edit protects from the server's next report (). +public static class MapFields +{ + public const string Name = "name", Area = "area", Exits = "exits", Position = "position"; + + /// Every field, in the order a view lists them. + public static IReadOnlyList All { get; } = [Name, Area, Exits, Position]; +} + /// A named area rooms belong to. public sealed class MapArea { @@ -162,6 +178,7 @@ public bool Rename(long id, string name) } room.Name = text; + room.HandEdited.Add(MapFields.Name); return true; } @@ -181,6 +198,7 @@ public bool SetArea(long id, string? area) } room.AreaId = next; + room.HandEdited.Add(MapFields.Area); return true; } @@ -225,6 +243,11 @@ public bool SetExit(long id, string exit, long to) var changed = !exits.TryGetValue(key, out var was) || was != to; exits[key] = to; changed |= room.Stubs.Remove(key); + if (changed) + { + room.HandEdited.Add(MapFields.Exits); + } + return changed; } @@ -240,6 +263,11 @@ public bool RemoveExit(long id, string exit) var removed = room.Exits.Remove(key) | room.SpecialExits.Remove(key) | room.Stubs.Remove(key); room.ExitWeights.Remove(key); room.LockedExits.Remove(key); + if (removed) + { + room.HandEdited.Add(MapFields.Exits); + } + return removed; } @@ -252,6 +280,19 @@ public bool Move(long id, int dx, int dy, int dz) } (room.X, room.Y, room.Z) = (room.X + dx, room.Y + dy, room.Z + dz); + room.HandEdited.Add(MapFields.Position); + return true; + } + + /// Forgets which fields of a room were edited by hand, so the server's reports set them again. + public bool ClearHandEdits(long id) + { + if (Room(id) is not { } room || room.HandEdited.Count == 0) + { + return false; + } + + room.HandEdited.Clear(); return true; } diff --git a/src/SharpMUTerm.Core/Mapping/MapRecorder.cs b/src/SharpMUTerm.Core/Mapping/MapRecorder.cs index fbdf3352..7e12b628 100644 --- a/src/SharpMUTerm.Core/Mapping/MapRecorder.cs +++ b/src/SharpMUTerm.Core/Mapping/MapRecorder.cs @@ -217,6 +217,58 @@ public bool LinkNext(long from, string exit) return true; } + /// The last report of each room, this run: what puts back. + private readonly Dictionary _served = new(); + + /// + /// Gives a room back to the server: forgets which of its fields were edited by hand () + /// and, when the server has reported the room this run, puts back its name, area, exits and place at once; otherwise + /// the next report does. Undoable like any edit. False when nothing was edited by hand. + /// + public bool ResetToServer(long id, string label) => Edit(label, [id], map => + { + if (map.Room(id) is not { } room || room.HandEdited.Count == 0) + { + return false; + } + + var edited = room.HandEdited.ToList(); + room.HandEdited.Clear(); + if (_served.TryGetValue(id, out var seen)) + { + if (edited.Contains(MapFields.Name) && seen.Name.Length > 0) + { + room.Name = seen.Name; + } + + if (edited.Contains(MapFields.Area) && !string.IsNullOrWhiteSpace(seen.Area)) + { + room.AreaId = map.AreaNamed(seen.Area).Id; + } + + if (edited.Contains(MapFields.Exits)) + { + SetExits(room, seen.Exits); + } + + if (edited.Contains(MapFields.Position) && seen.Coordinates is { } at) + { + (room.X, room.Y, room.Z) = at; + } + } + + return true; + }); + + /// Whether the server has reported this room this run, so a reset can put its values back at once. + public bool HasServerReport(long id) + { + lock (SyncRoot) + { + return _served.ContainsKey(id); + } + } + /// Takes back the last edit. Returns what it took back, or null when there was nothing to. public string? Undo() { @@ -299,7 +351,16 @@ private void ApplyCore(RoomObservation observation) { if (Map.Room(observation.Id ?? CurrentRoomId ?? long.MinValue) is { } here) { - SetExits(here, observation.Exits); + if (_served.TryGetValue(here.Id, out var seen)) + { + _served[here.Id] = seen with { Exits = observation.Exits }; + } + + if (!here.HandEdited.Contains(MapFields.Exits)) + { + SetExits(here, observation.Exits); + } + Touch(); } @@ -314,13 +375,20 @@ private void ApplyCore(RoomObservation observation) var room = Map.Room(id); var created = room is null; room ??= Map.Add(new MapRoom { Id = id }); + _served[room.Id] = observation; - if (observation.Name.Length > 0) + // A field the player edited by hand is theirs: the report leaves it alone until "reset to server". + var mine = room.HandEdited; + if (observation.Name.Length > 0 && !mine.Contains(MapFields.Name)) { room.Name = observation.Name; } - if (!string.IsNullOrWhiteSpace(observation.Area)) + if (mine.Contains(MapFields.Area)) + { + // kept as the player set it + } + else if (!string.IsNullOrWhiteSpace(observation.Area)) { room.AreaId = Map.AreaNamed(observation.Area).Id; } @@ -330,11 +398,17 @@ private void ApplyCore(RoomObservation observation) } room.Environment = observation.Environment ?? room.Environment; - SetExits(room, observation.Exits); + if (!mine.Contains(MapFields.Exits)) + { + SetExits(room, observation.Exits); + } if (observation.Coordinates is { } at) { - (room.X, room.Y, room.Z) = at; + if (!mine.Contains(MapFields.Position)) + { + (room.X, room.Y, room.Z) = at; + } } else if (created) { diff --git a/src/SharpMUTerm.Core/Mapping/MapStore.cs b/src/SharpMUTerm.Core/Mapping/MapStore.cs index d539c590..8ee8fb60 100644 --- a/src/SharpMUTerm.Core/Mapping/MapStore.cs +++ b/src/SharpMUTerm.Core/Mapping/MapStore.cs @@ -35,8 +35,11 @@ public sealed class MapStore /// What an unreadable map file is renamed with, so a new one can be written. public const string AsideSuffix = ".unreadable"; - /// This file's schema version. - public const int CurrentVersion = 1; + /// + /// This file's schema version. 2 added each room's handEdited fields (); a + /// version 1 file reads as a map with nothing edited by hand, and is written back as version 2. + /// + public const int CurrentVersion = 2; private static readonly JsonSerializerOptions Json = new() { @@ -158,6 +161,7 @@ public static WorldMap Deserialize(string text) $"this map was written by a newer SharpMUTerm (map version {version}; this one reads {CurrentVersion})"); } + Migrate(document, version); var map = new WorldMap(); foreach (var area in document["areas"]?.Deserialize(Json) ?? []) { @@ -172,6 +176,23 @@ public static WorldMap Deserialize(string text) return map; } + /// + /// Brings an older file's document up to , one revision at a time. 1 → 2: no room was + /// marked as edited by hand, because nothing recorded it — every room starts with an empty handEdited. + /// + private static void Migrate(JsonObject document, int version) + { + if (version < 2 && document["rooms"] is JsonArray rooms) + { + foreach (var room in rooms.OfType()) + { + room["handEdited"] = new JsonArray(); + } + } + + document["version"] = CurrentVersion; + } + /// /// Puts back what a hand-edited file may have lost: the dictionaries' ordinal comparers (the serializer /// builds default ones), a weight of at least 1, and only real directions among the exits. @@ -193,6 +214,7 @@ private static MapRoom Normalised(MapRoom room) room.LockedExits = new HashSet(room.LockedExits ?? [], StringComparer.Ordinal); room.Stubs = new HashSet(room.Stubs ?? [], StringComparer.Ordinal); room.UserData = new Dictionary(room.UserData ?? [], StringComparer.Ordinal); + room.HandEdited = new HashSet((room.HandEdited ?? []).Where(MapFields.All.Contains), StringComparer.Ordinal); room.Name ??= string.Empty; room.Weight = Math.Max(1, room.Weight); return room; diff --git a/src/SharpMUTerm.Tui/MapRenderer.cs b/src/SharpMUTerm.Tui/MapRenderer.cs index c182fd2f..c1397dcc 100644 --- a/src/SharpMUTerm.Tui/MapRenderer.cs +++ b/src/SharpMUTerm.Tui/MapRenderer.cs @@ -72,6 +72,34 @@ private enum Kind private readonly record struct Cell(char Glyph, Kind Kind, long? Room, string? Colour = null); + /// The payload prefix of a look link: the title's level arrows and way back, and the legend's areas. + internal const string LookPrefix = LinkPrefix + "look:"; + + /// + /// The look a map link asks for, or null for anything else: up, down, here, or area:N, the + /// Nth of 's (an index, never a name: an area's name is the + /// game's text). + /// + internal static MapLook? ParseLook(string url, MapViewModel view) + { + if (!url.StartsWith(LookPrefix, StringComparison.Ordinal)) + { + return null; + } + + var what = url[LookPrefix.Length..]; + return what switch + { + "up" => MapLook.Up, + "down" => MapLook.Down, + "here" => MapLook.Here, + _ when what.StartsWith("area:", StringComparison.Ordinal) + && int.TryParse(what.AsSpan(5), NumberStyles.None, CultureInfo.InvariantCulture, out var index) + && index < view.Areas.Count => MapLook.ToArea(view.Areas[index].Name), + _ => null, + }; + } + /// The room number a map link names, or null for anything else. internal static long? ParseLink(string url) => url.StartsWith(LinkPrefix, StringComparison.Ordinal) @@ -126,7 +154,7 @@ internal static List Render(MapViewModel view, WorldMap map, int width, var ahead = view.Rooms.Where(r => r.Ahead).Select(r => r.Id); // The room you are in leads the title: the one name a reader wants from a map at a glance, and the one a grid // of [ ] cannot say. With no current room the map is a map of somewhere else, and says so. - var title = new StringBuilder(view.Current is { } here ? here.Name : "Map"); + var title = new StringBuilder(view.Current is { } here ? here.Name : view.Viewing ? "Viewing" : "Map"); if (!string.IsNullOrWhiteSpace(view.Area)) { title.Append(" · ").Append(view.Area); @@ -138,7 +166,16 @@ internal static List Render(MapViewModel view, WorldMap map, int width, title.Append(" · ").Append(walking); } - lines.Add(Title(title.ToString(), width, ink)); + // The ways to look elsewhere and back, after the title: links the map's own handler answers. + var (controls, controlsWidth) = LookControls(view, ink); + if (controlsWidth > 0 && controlsWidth + 8 <= width) + { + lines.Add(Title(title.ToString(), width - controlsWidth, ink) + controls); + } + else + { + lines.Add(Title(title.ToString(), width, ink)); + } if (height == 1) { return lines; @@ -333,11 +370,13 @@ private static string Legend(MapViewModel view, int width, Ink ink) return marks; } + // Another area's entry is a link: a click shows that area (its index, never its name, is the payload). List<(string Markup, int Length)> Areas(int cap) => view.Areas - .Select(a => + .Select((a, i) => { var name = a.Name.Length <= cap ? a.Name : a.Name[..(cap - 1)] + "…"; - return (Markup: $"[{AreaInk(a.Colour, ink)}]■[/] [dim]{MarkupText.Escape(name)}[/]", Length: 2 + name.Length); + var markup = $"[{AreaInk(a.Colour, ink)}]■[/] [dim]{MarkupText.Escape(name)}[/]"; + return (Markup: a.Drawn ? markup : $"[link={LookPrefix}area:{i.ToString(CultureInfo.InvariantCulture)}]{markup}[/]", Length: 2 + name.Length); }) .ToList(); @@ -365,6 +404,33 @@ private static string Legend(MapViewModel view, int width, Ink ink) return Fit(string.Join(" [dim]·[/] ", Marks(words: false).Select(p => p.Markup)), width); } + /// + /// The title's look links and their width: ▲ ▼ while the drawn area has more than one level (an arrow with no + /// level that way is dim and not a link), and ⌂ here while the view is somewhere the player asked to look. + /// Empty when there is nothing to offer, so a one-level map's title is as it always was. + /// + internal static (string Markup, int Width) LookControls(MapViewModel view, Ink ink) + { + var parts = new List<(string Markup, int Width)>(); + if (view.Levels.Count > 1) + { + parts.Add((Arrow("▲", "up", view.LevelAbove), 1)); + parts.Add((Arrow("▼", "down", view.LevelBelow), 1)); + } + + if (view.Viewing) + { + parts.Add(($"[link={LookPrefix}here][bold {ink.Current}]⌂ here[/][/]", 6)); + } + + return parts.Count == 0 + ? (string.Empty, 0) + : (" " + string.Join(" ", parts.Select(p => p.Markup)), 2 + parts.Sum(p => p.Width) + parts.Count - 1); + + string Arrow(string glyph, string way, bool open) => + open ? $"[link={LookPrefix}{way}][bold {ink.Title}]{glyph}[/][/]" : $"[dim]{glyph}[/]"; + } + /// The lengths an area name is shortened through, longest first, before an area is counted instead. private static readonly int[] LegendNameCaps = [24, 14, 8]; @@ -452,7 +518,7 @@ private static List UnderLines(MapViewModel view, int width, int height, : height >= 4 ? [RoomLine(view, width, ink), .. KeysLines(width, ink, keysHeld, 1)] : []; } - if (height < UnderFromHeight || view.Nearby.Count == 0) + if (height < UnderFromHeight || view.Nearby.Count == 0 || view.Viewing) { return []; } @@ -483,6 +549,12 @@ private static List DetailLines(MapViewModel view, int width, Ink ink) lines.Add(Fit($"[dim]note [/]{Name(note, width - 6)}", width)); } + if (room.HandEdited.Count > 0) + { + // What the server's next report will leave alone, and the key that gives it back. + lines.Add(Fit($"[dim]mine [/]{MarkupText.Escape(string.Join(", ", room.HandEdited))} [dim]· R resets[/]", width)); + } + if (view.Pending is { } pending) { lines.Add(Fit($"[{ink.Path}]{Name(pending, width)}[/]", width)); @@ -530,6 +602,11 @@ private static string RoomLine(MapViewModel view, int width, Ink ink) parts.Add("note: " + note); } + if (room.HandEdited.Count > 0) + { + parts.Add("mine: " + string.Join(", ", room.HandEdited)); + } + if (view.Pending is { } pending) { parts.Add(pending); diff --git a/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs b/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs index e2a4f237..6fe97200 100644 --- a/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs +++ b/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs @@ -228,6 +228,10 @@ void Notice(NoticeOverlay notice) /// client checks it; the window only builds a from its inspector. Safe to /// call from any thread; one instance per window. /// +/// +/// For the map, looks at another level or area, or back at the character (LookMap), the funnel the cell map's look +/// keys and links end in. Safe to call from any thread; one instance per window. +/// internal sealed record PanelOverlay( string PanelId, string WindowId, @@ -244,7 +248,8 @@ internal sealed record PanelOverlay( SharpMUTerm.Client.Composer.ComposerSession? ComposerSession = null, Action? PopOut = null, Action? SelectRoom = null, - Action? EditMap = null); + Action? EditMap = null, + Action? LookMap = null); /// A panel's colours as #rrggbb: a bar or fill, the warning, and the empty part of a bar. internal sealed record PanelInk(string Bar, string Low, string Track); diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Desktop.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Desktop.cs index 2107f9ba..e9373c16 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Desktop.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Desktop.cs @@ -243,7 +243,8 @@ private void PublishPanels() : _mapWalkers[windowId] = room => OnUiThread(() => WalkFromMap(windowId, room)); return new PanelOverlay( PanelIds.Map, windowId, rect, new PanelInk(_ink.Accent, _ink.Draft, _ink.Lift(new Rgb(0x6a, 0x6a, 0x72))), null, view, walker, - PopOut: popOut, SelectRoom: MapSelectorFor(windowId), EditMap: MapEditorFor(windowId)); + PopOut: popOut, SelectRoom: MapSelectorFor(windowId), EditMap: MapEditorFor(windowId), + LookMap: MapLookerFor(windowId)); } if (!TerminalPanels.TryParseWindowId(windowId, out var panelId, out var key)) diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.MapEdit.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.MapEdit.cs index 65409e8d..2de7e3bd 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.MapEdit.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.MapEdit.cs @@ -54,7 +54,8 @@ private MapViewModel BuildMapView(string windowId, SessionMap map) var walking = map.Walk.IsWalking ? $"walking, {map.Walk.Remaining} to go" : null; long? selected = _mapSelection.TryGetValue(windowId, out var room) && map.Map.Room(room) is not null ? room : null; return MapViewModel.From( - map.Map, map.Recorder.CurrentRoomId, map.Walk.RoomsAhead, walking, MapPalette(), selected, map.Recorder.PendingLink, map.Recorder.UndoLabel); + map.Map, map.Recorder.CurrentRoomId, map.Walk.RoomsAhead, walking, MapPalette(), selected, map.Recorder.PendingLink, map.Recorder.UndoLabel, + MapLookOf(windowId)); } /// @@ -165,7 +166,7 @@ private void LeaveMapEdit(string windowId) var result = MapEditing.Apply(map.Recorder, edit); if (_mapSelection.TryGetValue(windowId, out var selected) && map.Map.Room(selected) is null) { - var next = map.Recorder.CurrentRoomId ?? MapViewModel.From(map.Map, null, [], null).AnchorId; + var next = MapViewModel.From(map.Map, map.Recorder.CurrentRoomId, [], null, look: MapLookOf(windowId)).AnchorId; if (next is { } room) { _mapSelection[windowId] = room; @@ -248,6 +249,10 @@ private bool TryMapKey(KeyPressedEventArgs e) { ApplyMapEdit(windowId, MapEdit.Delete(room)); } + else if (key.Key is ConsoleKey.PageUp or ConsoleKey.PageDown && bare) + { + LookMap(windowId, key.Key == ConsoleKey.PageUp ? MapLook.Up : MapLook.Down); + } else if (key.Key == ConsoleKey.Escape) { LeaveMapEdit(windowId); @@ -263,6 +268,9 @@ private bool TryMapKey(KeyPressedEventArgs e) { 'l' => Edit(MapEdit.Lock(room, map.Map.Room(room)?.Locked != true)), 'u' => Edit(MapEdit.Undo), + 'R' => Edit(MapEdit.ResetToServer(room)), + 'v' => Look(MapLook.NextArea), + 'h' => Look(MapLook.Here), 'r' => Words(MapEditing.RenameVerb), 'a' => Words(MapEditing.AreaVerb), 'w' => Words(MapEditing.WeightVerb), @@ -290,6 +298,12 @@ bool Edit(MapEdit edit) return true; } + bool Look(MapLook look) + { + LookMap(windowId, look); + return true; + } + bool Words(string verb) { if (BuildMapView(windowId, map).Selected is not { } details || MapEditing.CommandFor(verb, details) is not { } command) @@ -350,7 +364,7 @@ internal string MapDigest() var area = room.AreaId is { } a && map.Map.Areas.TryGetValue(a, out var named) ? named.Name : "-"; text.Append(CultureInfo.InvariantCulture, $"{room.Id}:{room.Name}@{area}({room.X},{room.Y},{room.Z})w{room.Weight}") .Append(room.Locked ? "L" : string.Empty) - .Append(CultureInfo.InvariantCulture, $"[{room.Symbol}|{room.Note}]{{") + .Append(CultureInfo.InvariantCulture, $"[{room.Symbol}|{room.Note}|{string.Join('+', room.HandEdited.Order(StringComparer.Ordinal))}]{{") .AppendJoin(',', room.AllExits().Select(e => $"{e.Key}>{e.To}").Order(StringComparer.Ordinal)) .Append('/') .AppendJoin(',', room.Stubs.Order(StringComparer.Ordinal)) @@ -366,6 +380,11 @@ internal string MapDigest() text.Append(CultureInfo.InvariantCulture, $"selected {window}={room} "); } + foreach (var (window, look) in _mapLooks.OrderBy(p => p.Key, StringComparer.Ordinal)) + { + text.Append(CultureInfo.InvariantCulture, $"look {window}={look.AreaId}/{look.Level} "); + } + return text.Append("keys=").Append(_mapKeys).ToString(); } } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.MapView.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.MapView.cs new file mode 100644 index 00000000..f480bdcf --- /dev/null +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.MapView.cs @@ -0,0 +1,196 @@ +using System.Globalization; +using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Client.Panels; +using SharpMUTerm.Core.Diagnostics; +using SharpMUTerm.Core.Mapping; +using static SharpMUTerm.Tui.MarkupText; + +namespace SharpMUTerm.Tui; + +/// +/// Looking at another level or area of a map, in both hosts, from one funnel. A map window draws where its character is +/// until the player asks to look elsewhere; then it holds a (, per map +/// window, for the run) until they ask to come back. Every way of asking — the cell map's edit keys, its title and legend +/// links, a /map command, ⌃P, and the window's level buttons, wheel and area menu — is a that +/// ends in . Walking from a viewed map still walks to the room clicked: the view changes what is +/// drawn, never which room an id names. +/// +internal sealed partial class SharpMUTermApp +{ + /// Where each map window looks, when it is not where its character is. + private readonly Dictionary _mapLooks = new(StringComparer.Ordinal); + + /// The window's look callback, one instance per map window so an overlay compares equal frame to frame. + private readonly Dictionary> _mapLookers = new(StringComparer.Ordinal); + + /// Where a map window looks, or null while it follows its character. Internal for tests. + internal MapViewpoint? MapLookOf(string windowId) => _mapLooks.GetValueOrDefault(windowId); + + /// + /// Points a map window at another level or area, or back at its character: resolved by , + /// said in a notice either way, and redrawn. While the map is being edited the selection moves to the room the view is + /// now drawn around, so the keys edit a room that is on screen. Returns what refused it, or null. + /// + internal string? LookMap(string windowId, MapLook look) + { + if (MapOf(MapOwner(windowId)) is not { } map) + { + Notice("no map here: this window has no connection.", source: NoticeModel.Sources.Map); + return "no map"; + } + + var result = MapLooking.Resolve(map.Map, map.Recorder.CurrentRoomId, MapLookOf(windowId), look); + if (result.Done) + { + SetMapLook(windowId, map, result.Next); + } + + Notice(result.Message + ".", result.Done ? MessageSeverity.Info : MessageSeverity.Warning, source: NoticeModel.Sources.Map); + return result.Done ? null : result.Message; + } + + private void SetMapLook(string windowId, SessionMap map, MapViewpoint? next) + { + if (next is null) + { + _mapLooks.Remove(windowId); + } + else + { + _mapLooks[windowId] = next; + } + + if (_mapSelection.ContainsKey(windowId) + && MapViewModel.From(map.Map, map.Recorder.CurrentRoomId, [], null, look: next).AnchorId is { } anchor) + { + _mapSelection[windowId] = anchor; + } + + RenderMap(windowId); + } + + /// The window's look callback for a map window: every native request through . + private Action MapLookerFor(string windowId) => + _mapLookers.TryGetValue(windowId, out var known) + ? known + : _mapLookers[windowId] = look => OnUiThread(() => LookMap(windowId, look)); + + /// The focused character's map window and map, for ⌃P's entries. + private (string WindowId, SessionMap Map, string Key)? FocusedMap() + { + var key = SendTarget()?.SessionKey ?? _workspace.FindWindow(ActiveWindowId())?.SessionKey; + return key is not null && MapOf(key) is { } map ? (MapWindowId(key), map, key) : null; + } + + /// What ⌃P needs to know about the focused character's map: levels in the area shown, named areas, and whether it looks elsewhere. + private (int Levels, int Areas, bool Viewing) MapCommandState() + { + if (FocusedMap() is not { } focused) + { + return (0, 0, false); + } + + var (windowId, map, _) = focused; + var home = map.Recorder.CurrentRoom ?? map.Map.Rooms.Values.LastOrDefault(); + if (home is null) + { + return (0, 0, false); + } + + var look = MapLookOf(windowId); + var areaId = look?.AreaId ?? home.AreaId; + var levels = map.Map.Rooms.Values.Where(r => r.AreaId == areaId).Select(r => r.Z).Distinct().Count(); + return (levels, MapLooking.Choices(map.Map).Count, look is not null); + } + + /// ⌃P's map view entries: level up and down, the next area, back to where you are, and Find room…. + private void RunMapViewCommand(string id) + { + if (FocusedMap() is not { } focused) + { + RefuseCommand("no map here — pick a character first (⌃P ▸ Switch to …)"); + return; + } + + var (windowId, _, key) = focused; + if (id == "map:find") + { + if (ArmedComposer() is not null) + { + ReleaseComposer(); + } + + PlaceGrab(ActiveBar(), "/map find ", key); + Notice("type part of a room's name or area — ⏎ lists the rooms.", MessageSeverity.Info, source: NoticeModel.Sources.Map); + return; + } + + if (_workspace.Layout.FindWindow(windowId) is null && !IsFloating(windowId)) + { + ShowMap(); + } + + LookMap(windowId, id switch + { + "map:level-up" => MapLook.Up, + "map:level-down" => MapLook.Down, + "map:next-area" => MapLook.NextArea, + _ => MapLook.Here, + }); + } + + /// + /// /map level up|down, /map view <area>, /map here and /map find <text>, for the + /// window's own character's map. A search lists the rooms in the window it was typed in and points the map at the first. + /// + private void MapViewCommand(string windowId, SessionMap map, string sessionKey, string argument) + { + var mapWindow = MapWindowId(sessionKey); + var words = argument.Trim(); + + // Typed in the map's own tab, the answer goes to the character's window: a map window draws no lines. + if (IsMapWindow(windowId) && FindSession(sessionKey) is { } owner && _sessionWindows.TryGetValue(owner, out var own)) + { + windowId = own; + } + if (words.StartsWith("find", StringComparison.OrdinalIgnoreCase)) + { + var text = words.Length > 4 ? words[4..].Trim() : string.Empty; + if (text.Length == 0) + { + AppendWindowLine(windowId, "[dim]*** use /map find .[/]"); + return; + } + + var (rooms, total) = MapLooking.Find(map.Map, text); + if (rooms.Count == 0) + { + AppendWindowLine(windowId, $"[dim]*** no room on the map matches {Escape(text)}.[/]"); + return; + } + + var shown = total > rooms.Count ? $"the first {rooms.Count.ToString(CultureInfo.InvariantCulture)} of {total.ToString(CultureInfo.InvariantCulture)}" : total.ToString(CultureInfo.InvariantCulture); + AppendWindowLine(windowId, $"[dim]*** rooms matching {Escape(text)} ({shown}) · /walk goes there:[/]"); + foreach (var room in rooms) + { + var where = (room.Area is { } area ? Escape(area) + " · " : string.Empty) + "level " + room.Level.ToString(CultureInfo.InvariantCulture); + AppendWindowLine(windowId, $"[dim]***[/] [bold]{room.Id.ToString(CultureInfo.InvariantCulture)}[/] {Escape(room.Name)} [dim]{where}[/]"); + } + + // The map shows the first match's area and level, so the room found is on screen. + var first = rooms[0]; + var home = map.Recorder.CurrentRoom ?? map.Map.Rooms.Values.LastOrDefault(); + SetMapLook(mapWindow, map, home is not null && home.AreaId == first.AreaId && home.Z == first.Level ? null : new MapViewpoint(first.AreaId, first.Level)); + return; + } + + var (look, problem) = MapLooking.Parse(words); + if (look is null) + { + AppendWindowLine(windowId, $"[dim]*** {Escape(problem ?? "no such view")}.[/]"); + return; + } + + LookMap(mapWindow, look); + } +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 76a0d642..7e134f31 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -1996,10 +1996,10 @@ public string RenderSnapshot(string? view = null) // The map window, over the demo's recorded streets: opened through the real ⌃P entry; `map-walking` // starts a walk to the docks through the real `/walk`, so the path ahead is marked; `map-split` puts // the map beside the output, the way it is meant to be read. - if (view?.ToLowerInvariant() is "map" or "map-walking" or "map-split" or "map-edit") + if (view?.ToLowerInvariant() is "map" or "map-walking" or "map-split" or "map-edit" or "map-level" or "map-area" or "map-find" or "map-mine") { LoadDemoMap(); - var split = view.ToLowerInvariant() is "map-split" or "map-edit"; + var split = view.ToLowerInvariant() is not ("map" or "map-walking"); if (split) { // Split first, so the map opens in front in the right-hand pane, then hand the focus back to @@ -2033,6 +2033,29 @@ public string RenderSnapshot(string? view = null) MapCommand(MainWindowId, "map", "note 4210 Spice traders gather here at dawn"); SimulateMapKey(new ConsoleKeyInfo('l', ConsoleKey.L, false, false, false)); } + + // `map-level`: the real ⌃P ▸ Map: level up, so the frame shows the bell tower's floor with the way back offered. + // `map-area`: the legend's link to the docks clicked, so the frame shows the other area drawn in its colour. + // `map-find`: `/map find temple` typed, listing the rooms and pointing the map at the first. + // `map-mine`: the market renamed by hand, then edited, so the side column says what the server will leave alone. + var mapWindow = MapWindowId(DemoScene.ActiveSessionKey); + switch (view.ToLowerInvariant()) + { + case "map-level": + DispatchCommand("map:level-up"); + break; + case "map-area" when _mapViews.TryGetValue(mapWindow, out var drawn): + OnMapLinkClicked(mapWindow, MapRenderer.LookPrefix + "area:" + drawn.Model.Areas.ToList().FindIndex(a => !a.Drawn)); + break; + case "map-find": + MapCommand(MainWindowId, "map", "find temple"); + break; + case "map-mine": + MapCommand(MainWindowId, "map", "rename 4210 Market Row of Lanterns"); + DispatchCommand("map:edit"); + SimulateMapKey(new ConsoleKeyInfo('\0', ConsoleKey.RightArrow, false, false, false)); + break; + } } // The Packages screen with two installed (one switched off), the review an install opens with, and @@ -8445,6 +8468,7 @@ private void RefreshRail() /// The stateful flags the catalog's labels read, as they stand now. private CommandContext CommandState() { + var mapState = MapCommandState(); return new CommandContext( LoggingOn: _active?.IsLogging == true, Zoomed: _workspace.Layout.ZoomedPaneId is not null, @@ -8456,6 +8480,9 @@ private CommandContext CommandState() ScriptsOn: _scriptsRoot is not null, Walking: SendTarget() is { } walker && _recorders.TryGetValue(walker, out var map) && map.Walk.IsWalking, MapUndo: MapOf(SendTarget()?.SessionKey ?? _workspace.FindWindow(ActiveWindowId())?.SessionKey)?.Recorder.UndoLabel, + MapLevels: mapState.Levels, + MapAreas: mapState.Areas, + MapViewing: mapState.Viewing, Reconnecting: _reconnects.Values.Any(r => r.IsActive), Sound: CanPlaySound ? !_muted : null, Announced: Host.Announcer is null ? null : IsAnnounced(ActiveWindowId()), @@ -8906,6 +8933,13 @@ private bool RunBuiltInCommand(string id) case "map:edit": ToggleMapEdit(); return true; + case "map:level-up": + case "map:level-down": + case "map:next-area": + case "map:here": + case "map:find": + RunMapViewCommand(id); + return true; case "map:undo": if ((SendTarget()?.SessionKey ?? _workspace.FindWindow(ActiveWindowId())?.SessionKey) is { } undoKey && MapOf(undoKey) is not null) { @@ -9274,6 +9308,13 @@ private MarkupControl MapControlFor(string windowId) /// private void OnMapLinkClicked(string windowId, string url) { + // The title's level arrows and "here", and the legend's areas: a look, by index into the view last drawn. + if (_mapViews.TryGetValue(windowId, out var drawn) && MapRenderer.ParseLook(url, drawn.Model) is { } look) + { + LookMap(windowId, look); + return; + } + if (MapRenderer.ParseLink(url) is not { } room) { return; @@ -9420,6 +9461,12 @@ private void MapCommand(string windowId, string verb, string argument) ToggleMapEdit(); return; } + else if ((WindowSession(windowId)?.SessionKey ?? _workspace.FindWindow(windowId)?.SessionKey) is { } viewer + && argument.Split(' ', 2)[0].ToLowerInvariant() is "level" or "view" or "here" or "find") + { + MapViewCommand(windowId, map, viewer, argument); + return; + } else { var parts = argument.Split(' ', 2, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries); diff --git a/src/SharpMUTerm.Tui/SnapshotViews.cs b/src/SharpMUTerm.Tui/SnapshotViews.cs index b36f4580..e759351c 100644 --- a/src/SharpMUTerm.Tui/SnapshotViews.cs +++ b/src/SharpMUTerm.Tui/SnapshotViews.cs @@ -25,7 +25,7 @@ internal static class SnapshotViews "search", "search-regex", "search-all", "search-landed", "activity-bar", "mxp-image", "mxp-figure", "input-selection", "selection", "trigger-builder", "prefix", "prefix-panel", "focus", "focus-moved", "tabs", "tabs-many", - "collapsed", "timestamps", "timestamps-toggled", "theme-switched", "rail-keys", "prompt", "meters", "gamedata", "map", "map-walking", "map-split", "map-edit", + "collapsed", "timestamps", "timestamps-toggled", "theme-switched", "rail-keys", "prompt", "meters", "gamedata", "map", "map-walking", "map-split", "map-edit", "map-level", "map-area", "map-find", "map-mine", "packages", "package-review", "package-browse", "send-menu", "layouts", "layout-combat", "layout-roleplay", "panel-who", "panel-vitals", "panel-quickbar", "panel-composer", "welcome", "welcome-connect", "tour", "reconnect", "help", "help-topic", "dictionary-offer", "import-review", "join-wraps", "join-wraps-f5", diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativeMapViewTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativeMapViewTests.cs new file mode 100644 index 00000000..797df068 --- /dev/null +++ b/tests/SharpMUTerm.Avalonia.Tests/NativeMapViewTests.cs @@ -0,0 +1,159 @@ +using Avalonia; +using Avalonia.Headless; +using Avalonia.Input; +using SharpMUTerm.Client.Panels; +using SharpMUTerm.Core.Layouts; +using SharpMUTerm.Core.Workspaces; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Avalonia.Tests; + +/// +/// The native map's look buttons, ⇧-wheel and legend (another level or area, and back), a room dragged to another grid +/// cell while editing, and the inspector's reset to the server: each handed to the client as the model's own +/// or . +/// +public class NativeMapViewTests +{ + private static MapViewModel Model(bool editing, bool viewing = false) => new( + "Town", + 0, + [ + new MapViewRoom(1, "Plaza", 0, 0, Current: !viewing, Ahead: false, Locked: false, Selected: editing), + new MapViewRoom(2, "North Road", 0, -1, Current: false, Ahead: false, Locked: false, HandEdited: true), + ], + [new MapViewExit(1, 2)], + null) + { + AnchorId = 1, + Viewing = viewing, + Levels = [0, 1], + Areas = [new MapViewArea("Town", "#5fafff", Drawn: true), new MapViewArea("Docks", "#ffaf5f", Drawn: false)], + AreaChoices = [new MapViewArea("Docks", "#ffaf5f", Drawn: false), new MapViewArea("Town", "#5fafff", Drawn: true)], + Selected = editing ? new MapRoomDetails(1, "Plaza", "Town", 0, 0, 0, 1, false, null, null, []) { HandEdited = [Core.Mapping.MapFields.Name] } : null, + }; + + private sealed record Seen(List Looks, List Edits, List Selects); + + private static Seen Publish(AvaloniaConsoleDriver driver, MapViewModel model) + { + var seen = new Seen([], [], []); + ((IPointerPresenter)driver.Pointer).Panels( + [ + new PanelOverlay( + PanelIds.Map, "map:demo", new PaneRect(0, 1, 60, 14), new PanelInk("#33ccff", "#ffaa33", "#555555"), null, model, _ => { }, + SelectRoom: seen.Selects.Add, EditMap: seen.Edits.Add, LookMap: seen.Looks.Add), + ]); + return seen; + } + + [Test] + public async Task TheButtonsTheWheelAndTheLegendLookElsewhereAndTheWayBackIsOffered() + { + var (looks, labels, menu) = await DesktopLayerTests.Run((window, view, layer, driver) => + { + var seen = Publish(driver, Model(editing: false, viewing: true)); + Dispatcher(); + window.UpdateLayout(); + var canvas = layer.Maps.Values.Single(); + var labels = canvas.LookButtons().Select(b => (b.Id, b.Enabled)).ToList(); + Point Centre(MapCanvas.LookButton b) => canvas.TranslatePoint(b.Rect.Center, window)!.Value; + + var up = canvas.LookButtons().Single(b => b.Id == MapCanvas.UpButton); + window.MouseDown(Centre(up), MouseButton.Left); + window.MouseUp(Centre(up), MouseButton.Left); + var here = canvas.LookButtons().Single(b => b.Id == MapCanvas.HereButton); + window.MouseDown(Centre(here), MouseButton.Left); + window.MouseUp(Centre(here), MouseButton.Left); + + var middle = canvas.TranslatePoint(new Point(canvas.Bounds.Width / 2, canvas.Bounds.Height / 2), window)!.Value; + window.MouseWheel(middle, new Vector(0, 1), RawInputModifiers.Shift); + + canvas.OpenAreaMenu(); + canvas.RunAreaVerb(canvas.Model, MapLooking.AreaVerbPrefix + "0"); + return (seen.Looks, labels, canvas.OpenedAreaMenu); + }, columns: 60, rows: 16); + + await Assert.That(labels).IsEquivalentTo(new[] + { + (MapCanvas.UpButton, true), (MapCanvas.DownButton, false), (MapCanvas.AreasButton, true), (MapCanvas.HereButton, true), + }); + await Assert.That(looks).IsEquivalentTo(new[] { MapLook.Up, MapLook.Here, MapLook.Up, MapLook.ToArea("Docks") }); + await Assert.That(menu!.Entries.Select(e => e.Label)).Contains("Back to where I am"); + } + + [Test] + public async Task ARoomDraggedWhileEditingIsMovedByTheGridCellsItCameToInOneEdit() + { + var seen = await DesktopLayerTests.Run((window, view, layer, driver) => + { + var seen = Publish(driver, Model(editing: true)); + Dispatcher(); + window.UpdateLayout(); + var canvas = layer.Maps.Values.Single(); + var room = canvas.Model.Rooms[1]; + var from = canvas.TranslatePoint(canvas.CentreOf(room), window)!.Value; + var step = MapCanvas.Spacing * canvas.Zoom; + + window.MouseDown(from, MouseButton.Left); + window.MouseMove(from + new Vector(step * 0.6, 0)); + window.MouseMove(from + new Vector((step * 2) + 3, step - 4)); + window.MouseUp(from + new Vector((step * 2) + 3, step - 4), MouseButton.Left); + return (seen, canvas.Pan); + }, columns: 60, rows: 16); + + await Assert.That(seen.seen.Edits).IsEquivalentTo(new[] { MapEdit.Move(2, 2, 1) }); + await Assert.That(seen.seen.Selects).Contains(2L); + await Assert.That(seen.Pan).IsEqualTo(default(Vector)).Because("dragging a room moves the room, not the map"); + } + + [Test] + public async Task OutsideEditingADragStillPansAndMovesNothing() + { + var seen = await DesktopLayerTests.Run((window, view, layer, driver) => + { + var seen = Publish(driver, Model(editing: false)); + Dispatcher(); + window.UpdateLayout(); + var canvas = layer.Maps.Values.Single(); + var from = canvas.TranslatePoint(canvas.CentreOf(canvas.Model.Rooms[1]), window)!.Value; + window.MouseDown(from, MouseButton.Left); + window.MouseMove(from + new Vector(80, 0)); + window.MouseUp(from + new Vector(80, 0), MouseButton.Left); + return (seen, canvas.Pan); + }, columns: 60, rows: 16); + + await Assert.That(seen.seen.Edits).IsEmpty(); + await Assert.That(seen.Pan).IsEqualTo(new Vector(80, 0)); + } + + [Test] + public async Task TheInspectorSaysWhatWasEditedByHandAndResetsItToTheServer() + { + var (text, enabled, edits) = await DesktopLayerTests.Run((window, view, layer, driver) => + { + var seen = Publish(driver, Model(editing: true)); + Dispatcher(); + window.UpdateLayout(); + var inspector = layer.Maps.Values.Single().Inspector; + var enabled = inspector.ResetButton.IsEnabled; + inspector.ResetButton.RaiseEvent(new global::Avalonia.Interactivity.RoutedEventArgs(global::Avalonia.Controls.Button.ClickEvent)); + return (inspector.HandEditedText, enabled, seen.Edits); + }, columns: 60, rows: 16); + + await Assert.That(text).Contains("name"); + await Assert.That(enabled).IsTrue(); + await Assert.That(edits).IsEquivalentTo(new[] { MapEdit.ResetToServer(1) }); + } + + [Test] + public async Task TheRoomMenuOffersResetOnlyForARoomEditedByHand() + { + var model = Model(editing: false); + + await Assert.That(MapEditing.Menu(model.Rooms[1], null).Entries.Select(e => e.Command)).Contains(MapEditing.ResetVerb); + await Assert.That(MapEditing.Menu(model.Rooms[0], null).Entries.Select(e => e.Command)).DoesNotContain(MapEditing.ResetVerb); + } + + private static void Dispatcher() => global::Avalonia.Threading.Dispatcher.UIThread.RunJobs(); +} diff --git a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs index cf61650f..f94aafe8 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs @@ -454,6 +454,57 @@ await Same("map: exit to the next room", "layout-combat", MapKeys(app, MapKey(ConsoleKey.X, 'x')); TypeLine(app, "climb next"); }); + + // Another level or area, and back: the canvas's buttons and menu, and the cell title's and legend's links and keys. + await Same("map: look up a level", "layout-combat", + (app, d) => Panel(d, PanelIds.Map).LookMap!(MapLook.Up), + (app, d) => app.SimulateMapClick(Panel(d, PanelIds.Map).WindowId, MapRenderer.LookPrefix + "up")); + await Same("map: look at another area", "layout-combat", + (app, d) => Panel(d, PanelIds.Map).LookMap!(MapLook.ToArea(Panel(d, PanelIds.Map).Map!.Areas.First(a => !a.Drawn).Name)), + (app, d) => + { + var map = Panel(d, PanelIds.Map).Map!; + var index = map.Areas.ToList().FindIndex(a => !a.Drawn); + app.SimulateMapClick(Panel(d, PanelIds.Map).WindowId, MapRenderer.LookPrefix + "area:" + index); + }); + await Same("map: back to where I am", "layout-combat", + (app, d) => + { + Panel(d, PanelIds.Map).LookMap!(MapLook.Up); + Panel(d, PanelIds.Map).LookMap!(MapLook.Here); + }, + (app, d) => + { + app.SimulateMapClick(Panel(d, PanelIds.Map).WindowId, MapRenderer.LookPrefix + "up"); + app.SimulateMapClick(Panel(d, PanelIds.Map).WindowId, MapRenderer.LookPrefix + "here"); + }); + await Same("map: next area while editing", "layout-combat", + (app, d) => + { + Panel(d, PanelIds.Map).SelectRoom!(OtherRoom(Panel(d, PanelIds.Map).Map!)); + Panel(d, PanelIds.Map).LookMap!(MapLook.NextArea); + }, + (app, d) => { CellSelect(app, d); MapKeys(app, MapKey(ConsoleKey.V, 'v')); }); + + // A hand edit given back to the server: the inspector's Reset button, and R on the cell map. + await Same("map: reset to server", "layout-combat", + (app, d) => + { + NativeEdit(d, room => MapEdit.Rename(room, "Spice Yard")); + Panel(d, PanelIds.Map).EditMap!(MapEdit.ResetToServer(OtherRoom(Panel(d, PanelIds.Map).Map!))); + }, + (app, d) => + { + CellSelect(app, d); + MapKeys(app, MapKey(ConsoleKey.R, 'r')); + while (app.PrimaryInputText.Count(c => c == ' ') > 3 || !app.PrimaryInputText.EndsWith(' ')) + { + MapKeys(app, MapKey(ConsoleKey.Backspace, '\b')); + } + + TypeLine(app, "Spice Yard"); + MapKeys(app, new ConsoleKeyInfo('R', ConsoleKey.R, true, false, false)); + }); probed.Add(PanelIds.Map); // Vitals: the pop-out button, and ⌃P's entry for the same window. diff --git a/tests/SharpMUTerm.Core.Tests/Mapping/HandEditTests.cs b/tests/SharpMUTerm.Core.Tests/Mapping/HandEditTests.cs new file mode 100644 index 00000000..b639b208 --- /dev/null +++ b/tests/SharpMUTerm.Core.Tests/Mapping/HandEditTests.cs @@ -0,0 +1,187 @@ +using SharpMUTerm.Core.Mapping; + +namespace SharpMUTerm.Core.Tests.Mapping; + +/// +/// A hand edit survives the server's next report of the room: the fields a player changed are recorded per room, kept +/// with the map, left alone by the recorder, and given back to the server only on "reset to server". +/// +public class HandEditTests +{ + private static RoomObservation Room(long? id, string name, params (string Key, long? To)[] exits) => + new(id, name, exits.Select(e => new ObservedExit(e.Key, e.To)).ToList()); + + private static RoomObservation Hall => Room(1, "Hall", ("north", 2)) with { Area = "Keep", Coordinates = (0, 0, 0) }; + + private static RoomObservation Gallery => Room(2, "Gallery", ("south", 1)) with { Area = "Keep", Coordinates = (0, -1, 0) }; + + private static MapRecorder Recorded() + { + var recorder = new MapRecorder(new WorldMap()); + recorder.Apply(Hall); + recorder.NoteCommand("n"); + recorder.Apply(Gallery); + return recorder; + } + + /// Back to the hall, as a GMCP game reports it: everything about the room again. + private static void Revisit(MapRecorder recorder) + { + recorder.NoteCommand("s"); + recorder.Apply(Hall); + } + + [Test] + public async Task EachEditMarksTheFieldItChangedAndNothingElse() + { + var map = Recorded().Map; + + await Assert.That(map.Room(1)!.HandEdited).IsEmpty().Because("recording is not editing"); + map.Rename(1, "Great Hall"); + map.SetArea(1, "Tower"); + await Assert.That(map.Room(1)!.HandEdited.Order()).IsEquivalentTo(new[] { MapFields.Area, MapFields.Name }); + map.SetLocked(1, true); + map.SetNote(1, "cold"); + map.SetWeight(1, 4); + await Assert.That(map.Room(1)!.HandEdited.Count).IsEqualTo(2).Because("locks, notes and weights were never the server's"); + map.SetExit(1, "ne", 2); + map.Move(1, 1, 0, 0); + await Assert.That(map.Room(1)!.HandEdited.Order()).IsEquivalentTo(new[] { MapFields.Area, MapFields.Exits, MapFields.Name, MapFields.Position }); + await Assert.That(map.Rename(1, "Great Hall")).IsFalse(); + } + + [Test] + public async Task TheServersNextReportLeavesHandEditedFieldsAlone() + { + var recorder = Recorded(); + var map = recorder.Map; + map.Rename(1, "Great Hall"); + map.SetArea(1, "Tower"); + map.SetExit(1, "climb rope", 2); + map.Move(1, 3, 2, 0); + + Revisit(recorder); + + var hall = map.Room(1)!; + await Assert.That(hall.Name).IsEqualTo("Great Hall"); + await Assert.That(map.Areas[hall.AreaId!.Value].Name).IsEqualTo("Tower"); + await Assert.That(hall.SpecialExits.ContainsKey("climb rope")).IsTrue(); + await Assert.That((hall.X, hall.Y, hall.Z)).IsEqualTo((3, 2, 0)); + await Assert.That(recorder.CurrentRoomId).IsEqualTo(1L).Because("the character still moved"); + } + + [Test] + public async Task AFieldNobodyEditedStillFollowsTheServer() + { + var recorder = Recorded(); + recorder.Map.Rename(1, "Great Hall"); + + recorder.NoteCommand("s"); + recorder.Apply(Room(1, "Hall", ("north", 2), ("east", 3)) with { Area = "Keep", Coordinates = (5, 5, 0) }); + + var hall = recorder.Map.Room(1)!; + await Assert.That(hall.Name).IsEqualTo("Great Hall"); + await Assert.That((hall.X, hall.Y)).IsEqualTo((5, 5)); + await Assert.That(hall.Exits.ContainsKey("east")).IsTrue(); + } + + [Test] + public async Task AnExitsOnlyUpdateLeavesHandEditedExitsAlone() + { + var recorder = Recorded(); + recorder.Map.RemoveExit(2, "south"); + + recorder.Apply(Room(2, string.Empty, ("south", 1), ("west", 9)) with { ExitsOnly = true }); + + await Assert.That(recorder.Map.Room(2)!.Exits).IsEmpty(); + } + + [Test] + public async Task ResetToServerPutsBackWhatTheServerLastSaidAndCanBeUndone() + { + var recorder = Recorded(); + var map = recorder.Map; + recorder.Edit("rename", [1], m => m.Rename(1, "Great Hall")); + recorder.Edit("move", [1], m => m.Move(1, 2, 0, 0)); + + await Assert.That(recorder.ResetToServer(1, "reset Hall")).IsTrue(); + await Assert.That(map.Room(1)!.Name).IsEqualTo("Hall"); + await Assert.That(map.Room(1)!.X).IsEqualTo(0); + await Assert.That(map.Room(1)!.HandEdited).IsEmpty(); + await Assert.That(recorder.ResetToServer(1, "again")).IsFalse().Because("nothing is edited by hand now"); + + await Assert.That(recorder.Undo()).IsEqualTo("reset Hall"); + await Assert.That(map.Room(1)!.Name).IsEqualTo("Great Hall"); + await Assert.That(map.Room(1)!.HandEdited).Contains(MapFields.Name); + } + + [Test] + public async Task ResetWithNoReportThisRunLetsTheNextReportSetTheFields() + { + var recorder = new MapRecorder(MapStore.Deserialize(MapStore.Serialize(Recorded().Map, "x:1"))); + recorder.Map.Rename(1, "Great Hall"); + + await Assert.That(recorder.HasServerReport(1)).IsFalse(); + await Assert.That(recorder.ResetToServer(1, "reset")).IsTrue(); + await Assert.That(recorder.Map.Room(1)!.Name).IsEqualTo("Great Hall").Because("nothing to put back yet"); + + recorder.Apply(Hall); + await Assert.That(recorder.Map.Room(1)!.Name).IsEqualTo("Hall"); + } + + [Test] + public async Task UndoingAnEditTakesItsProtectionWithIt() + { + var recorder = Recorded(); + recorder.Edit("rename", [1], m => m.Rename(1, "Great Hall")); + recorder.Undo(); + + await Assert.That(recorder.Map.Room(1)!.HandEdited).IsEmpty(); + } + + [Test] + public async Task HandEditsAreKeptWithTheMapInVersionTwo() + { + var map = Recorded().Map; + map.Rename(1, "Great Hall"); + map.Move(2, 0, -1, 0); + + var text = MapStore.Serialize(map, "example.org:4000"); + var back = MapStore.Deserialize(text); + + await Assert.That(text).Contains("\"version\": 2"); + await Assert.That(back.Room(1)!.HandEdited).IsEquivalentTo(new[] { MapFields.Name }); + await Assert.That(back.Room(2)!.HandEdited).IsEquivalentTo(new[] { MapFields.Position }); + await Assert.That(back.Room(1)!.HandEdited.Contains("NAME")).IsFalse().Because("the comparer is ordinal again"); + } + + [Test] + public async Task AVersionOneFileReadsWithNothingEditedByHandAndIsWrittenBackAsVersionTwo() + { + const string v1 = """ + {"version":1,"endpoint":"example.org:4000","areas":[{"id":1,"name":"Keep"}], + "rooms":[{"id":1,"name":"Hall","areaId":1,"x":0,"y":0,"z":0,"exits":{"north":2}}, + {"id":2,"name":"Gallery","areaId":1,"x":0,"y":-1,"z":0,"exits":{"south":1}}]} + """; + + var map = MapStore.Deserialize(v1); + + await Assert.That(map.Rooms.Count).IsEqualTo(2); + await Assert.That(map.Rooms.Values.All(r => r.HandEdited.Count == 0)).IsTrue(); + await Assert.That(MapStore.Serialize(map, "example.org:4000")).Contains("\"version\": 2"); + + var recorder = new MapRecorder(map); + recorder.Apply(Room(1, "Hall of Echoes", ("north", 2)) with { Area = "Keep" }); + await Assert.That(map.Room(1)!.Name).IsEqualTo("Hall of Echoes").Because("an old map has no hand edits to protect"); + } + + [Test] + public async Task AFileFromALaterClientWithUnknownFieldsInHandEditedKeepsOnlyTheKnownOnes() + { + const string text = """{"version":2,"rooms":[{"id":1,"name":"Hall","handEdited":["name","colour"]}]}"""; + + var map = MapStore.Deserialize(text); + + await Assert.That(map.Room(1)!.HandEdited).IsEquivalentTo(new[] { MapFields.Name }); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/MapEditModeTests.cs b/tests/SharpMUTerm.Tui.Tests/MapEditModeTests.cs index 9dd60173..46ca7ce1 100644 --- a/tests/SharpMUTerm.Tui.Tests/MapEditModeTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/MapEditModeTests.cs @@ -124,6 +124,8 @@ public async Task EveryKeyTheFooterNamesIsAnswered() ["r"] = [Key(ConsoleKey.R, 'r')], ["a"] = [Key(ConsoleKey.A, 'a')], ["l"] = [Key(ConsoleKey.L, 'l')], ["w"] = [Key(ConsoleKey.W, 'w')], ["x"] = [Key(ConsoleKey.X, 'x')], ["-"] = [Key(ConsoleKey.OemMinus, '-')], ["n"] = [Key(ConsoleKey.N, 'n')], ["s"] = [Key(ConsoleKey.S, 's')], ["Del"] = [Key(ConsoleKey.Delete)], + ["PgUp PgDn"] = [Key(ConsoleKey.PageDown)], ["v"] = [Key(ConsoleKey.V, 'v')], ["h"] = [Key(ConsoleKey.H, 'h')], + ["R"] = [Key(ConsoleKey.R, 'R', shift: true)], ["u"] = [Key(ConsoleKey.U, 'u')], ["⏎"] = [Key(ConsoleKey.Enter, '\r')], ["Esc"] = [Key(ConsoleKey.Escape, '\u001b')], }; diff --git a/tests/SharpMUTerm.Tui.Tests/MapViewTests.cs b/tests/SharpMUTerm.Tui.Tests/MapViewTests.cs new file mode 100644 index 00000000..762c359e --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/MapViewTests.cs @@ -0,0 +1,199 @@ +using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Panels; +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Mapping; +using SharpMUTerm.Graphics; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// Looking at another level or area of the map and back, protecting hand edits from the server's next report, and +/// finding a room — through the cell map's keys and links, ⌃P and /map, over a live GMCP session. +/// +[NotInParallel] +public class MapViewTests +{ + private const string Ann = "Convergence.Ann"; + + private static readonly TerminalCapabilities Headless = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private static string MapId => SharpMUTermApp.MapWindowId(Ann); + + private const string Hall = """{"num":1,"name":"Hall","area":"Keep","coords":"0,0,0","exits":{"n":2,"u":4}}"""; + + /// A keep of three rooms on level 0 and a loft on level 1, and a yard next door; Ann stands in the hall. + private static async Task<(SharpMUTermApp App, RecordingTelnetSession Wire)> Open() + { + Console.SetIn(TextReader.Null); + var config = new AppConfiguration(); + config.Worlds.Add(new WorldDefinition + { + Name = "Convergence", + Host = "convergence.example", + Port = 4201, + Characters = { new CharacterDefinition { Name = "Ann", Logging = new LoggingSettings() } }, + }); + var wire = new RecordingTelnetSession(); + var app = new SharpMUTermApp(config, Headless, new HeadlessConsoleDriver(160, 40)); + app.TelnetFactory = _ => wire; + app.DispatchCommand(CommandIds.Character(Ann)); + await app.FindSession(Ann)!.ConnectAsync(); + wire.ReceiveGmcp("Room.Info", """{"num":5,"name":"Garden","area":"Yard","coords":"2,-1,0","exits":{"w":3}}"""); + wire.ReceiveGmcp("Room.Info", """{"num":4,"name":"Loft","area":"Keep","coords":"0,0,1","exits":{"d":1}}"""); + wire.ReceiveGmcp("Room.Info", """{"num":3,"name":"Tower","area":"Keep","coords":"1,-1,0","exits":{"w":2,"e":5}}"""); + wire.ReceiveGmcp("Room.Info", """{"num":2,"name":"Gallery","area":"Keep","coords":"0,-1,0","exits":{"s":1,"e":3}}"""); + wire.ReceiveGmcp("Room.Info", Hall); + app.DispatchCommand("term:map"); + return (app, wire); + } + + private static ConsoleKeyInfo Key(ConsoleKey key, char c = '\0', bool shift = false) => new(c, key, shift, false, false); + + private static void Type(SharpMUTermApp app, string text) + { + foreach (var c in text) + { + app.SimulateKey(new ConsoleKeyInfo(c, ConsoleKey.NoName, false, false, false)); + } + + app.SimulateKey(Key(ConsoleKey.Enter, '\r')); + } + + private static WorldMap MapOf(SharpMUTermApp app) => app.SessionMapFor(app.FindSession(Ann)!)!.Map; + + private static string Title(SharpMUTermApp app) => MarkupText.Plain(app.MapMarkup(MapId)[0]); + + [Test] + public async Task PaletteStepsALevelUpAndBackAndTheTitleSaysWhereItIs() + { + var (app, _) = await Open(); + await using var _app = app; + + var ids = app.BuildCatalog().Select(i => i.Id).ToList(); + await Assert.That(ids).Contains("map:level-up"); + await Assert.That(ids).Contains("map:next-area"); + await Assert.That(ids).DoesNotContain("map:here").Because("the map already shows where Ann is"); + await Assert.That(Title(app)).Contains("Hall · Keep · z 0"); + await Assert.That(app.MapMarkup(MapId)[0]).Contains(MapRenderer.LookPrefix + "up"); + + app.DispatchCommand("map:level-up"); + + await Assert.That(app.MapLookOf(MapId)).IsEqualTo(new MapViewpoint(MapOf(app).Room(1)!.AreaId, 1)); + await Assert.That(Title(app)).StartsWith("Viewing · Keep · z 1"); + await Assert.That(Title(app)).Contains("⌂ here"); + await Assert.That(app.BuildCatalog().Select(i => i.Id)).Contains("map:here"); + + app.DispatchCommand("map:here"); + await Assert.That(app.MapLookOf(MapId)).IsNull(); + await Assert.That(Title(app)).StartsWith("Hall · Keep · z 0"); + } + + [Test] + public async Task TheTitlesArrowsAndTheLegendsAreasAreLinksTheMapAnswers() + { + var (app, _) = await Open(); + await using var _app = app; + + app.SimulateMapClick(MapId, MapRenderer.LookPrefix + "up"); + await Assert.That(app.MapLookOf(MapId)!.Level).IsEqualTo(1); + app.SimulateMapClick(MapId, MapRenderer.LookPrefix + "up"); + await Assert.That(app.MapLookOf(MapId)!.Level).IsEqualTo(1).Because("there is no level 2: refused, not moved"); + app.SimulateMapClick(MapId, MapRenderer.LookPrefix + "here"); + await Assert.That(app.MapLookOf(MapId)).IsNull(); + + var legend = app.MapMarkup(MapId)[^1]; + await Assert.That(legend).Contains(MapRenderer.LookPrefix + "area:1").Because("Yard is reached by an exit and is a link"); + app.SimulateMapClick(MapId, MapRenderer.LookPrefix + "area:1"); + var yard = MapOf(app).Areas.Values.Single(a => a.Name == "Yard").Id; + await Assert.That(app.MapLookOf(MapId)).IsEqualTo(new MapViewpoint(yard, 0)); + await Assert.That(Title(app)).StartsWith("Viewing · Yard · z 0"); + } + + [Test] + public async Task AClickOnAViewedLevelStillWalksToTheRealRoom() + { + var (app, wire) = await Open(); + await using var _app = app; + app.DispatchCommand("map:level-up"); + var before = wire.Lines.Count; + + app.SimulateMapClick(MapId, MapRenderer.LinkPrefix + "4"); + + await Assert.That(wire.Lines.Skip(before)).IsEquivalentTo(new[] { "u" }); + } + + [Test] + public async Task MapCommandsLookByLevelAndAreaAndCanFindARoom() + { + var (app, _) = await Open(); + await using var _app = app; + + Type(app, "/map view yard"); + await Assert.That(app.MapLookOf(MapId)!.AreaId).IsEqualTo(MapOf(app).Areas.Values.Single(a => a.Name == "Yard").Id); + Type(app, "/map here"); + await Assert.That(app.MapLookOf(MapId)).IsNull(); + Type(app, "/map level up"); + await Assert.That(app.MapLookOf(MapId)!.Level).IsEqualTo(1); + Type(app, "/map level down"); + await Assert.That(app.MapLookOf(MapId)).IsNull().Because("level 0 of the keep is where Ann is"); + + Type(app, "/map find loft"); + var lines = app.WindowIds().SelectMany(w => app.PaneLines(w)).Select(MarkupText.Plain).ToList(); + await Assert.That(string.Join("\n", lines)).Contains("4 Loft"); + await Assert.That(app.MapLookOf(MapId)!.Level).IsEqualTo(1).Because("the map shows the room found"); + } + + [Test] + public async Task InEditModePageKeysStepLevelsAndTheSelectionComesWith() + { + var (app, _) = await Open(); + await using var _app = app; + app.DispatchCommand("map:edit"); + await Assert.That(app.MapSelection(MapId)).IsEqualTo(1L); + + await Assert.That(app.SimulateMapKey(Key(ConsoleKey.PageUp))).IsTrue(); + await Assert.That(app.MapLookOf(MapId)!.Level).IsEqualTo(1); + await Assert.That(app.MapSelection(MapId)).IsEqualTo(4L).Because("the keys edit a room that is on screen"); + + await Assert.That(app.SimulateMapKey(Key(ConsoleKey.H, 'h'))).IsTrue(); + await Assert.That(app.MapLookOf(MapId)).IsNull(); + await Assert.That(app.MapSelection(MapId)).IsEqualTo(1L); + + await Assert.That(app.SimulateMapKey(Key(ConsoleKey.V, 'v'))).IsTrue(); + await Assert.That(app.MapSelection(MapId)).IsEqualTo(5L).Because("Yard has one room"); + } + + [Test] + public async Task AHandRenameSurvivesTheServersNextReportUntilItIsReset() + { + var (app, wire) = await Open(); + await using var _app = app; + + Type(app, "/map rename 1 Great Hall"); + wire.ReceiveGmcp("Room.Info", Hall); + await Assert.That(MapOf(app).Room(1)!.Name).IsEqualTo("Great Hall"); + await Assert.That(app.MapDigest()).Contains("|name]"); + + app.DispatchCommand("map:edit"); + await Assert.That(string.Join("\n", app.MapMarkup(MapId).Select(MarkupText.Plain))).Contains("mine name"); + await Assert.That(app.SimulateMapKey(Key(ConsoleKey.R, 'R', shift: true))).IsTrue(); + + await Assert.That(MapOf(app).Room(1)!.Name).IsEqualTo("Hall").Because("the server's last report is put back at once"); + await Assert.That(MapOf(app).Room(1)!.HandEdited).IsEmpty(); + app.DispatchCommand("map:undo"); + await Assert.That(MapOf(app).Room(1)!.Name).IsEqualTo("Great Hall"); + } + + [Test] + public async Task FindRoomPutsTheCommandOnTheCommandLine() + { + var (app, _) = await Open(); + await using var _app = app; + + await Assert.That(app.DispatchCommand("map:find")).IsTrue(); + + await Assert.That(app.ArmedInputText).IsEqualTo("/map find "); + } +} From d3e682787b7807cad43424edbf1c6e4aefa087eb Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 13:49:36 +0000 Subject: [PATCH 051/113] Polish wave 14: F5 scroll, Light contrast, [dim] exemption, native keys, dictionary chip, join-wraps note, move hold MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - F5 follows the field being edited: ScreenChrome.Window centres on the caret before the cursor band (WorldFieldScrollTests at 120x32 and 80x24; --view settings-edit edits the deepest field). - Light: WorkspacePalette.Recessed uses a shallower 0.90 step on light planes; settings-screen inks are held to 4.5:1 on light planes (ScreenTheme.FloorOn), with a bare [dim] rewritten to a held grey there. Dark and Solarized frames are unchanged. - FrameContrastTests no longer exempts the framework's [dim]. - NativeKeys.Words spells Tab, Shift+Tab, Backspace, Delete, Esc, PgUp/PgDn. - F1: "no dictionary · ⌥W gets one" in cells; the window's chip is a button opening the offer. - Native F5 shows join-wraps' recommendation via SettingsForm.WorldNotes (one string from WorldFieldValues.JoinWrapsAdvice). - Channel capture move: lines no pending GMCP expects are held until the socket read ends (ITelnetSession.ReceiveBatchEnded, at most 250 ms), so an echo just before its GMCP is caught without reordering output. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 10 +++ CLAUDE.md | 46 +++++++--- src/SharpMUTerm.Avalonia/ComposerView.cs | 35 +++++++- src/SharpMUTerm.Avalonia/HelpView.cs | 2 +- src/SharpMUTerm.Avalonia/NativeKeys.cs | 41 +++++++-- src/SharpMUTerm.Avalonia/SettingsWindow.cs | 20 +++++ .../Settings/BuiltInSettings.cs | 2 +- .../Settings/SettingsForm.cs | 23 +++++ .../Settings/WorldFieldValues.cs | 11 +++ .../Protocols/ChannelCapture.cs | 24 +++++ src/SharpMUTerm.Core/Session/WorldSession.cs | 87 ++++++++++++++++++- src/SharpMUTerm.Core/Telnet/ITelnetSession.cs | 12 +++ src/SharpMUTerm.Core/Telnet/TelnetSession.cs | 4 + src/SharpMUTerm.Tui/ComposeOverlay.cs | 5 +- src/SharpMUTerm.Tui/ScreenChrome.cs | 10 ++- src/SharpMUTerm.Tui/ScreenTheme.cs | 29 ++++++- .../SharpMUTermApp.JoinWraps.cs | 2 +- .../SharpMUTermApp.Settings.cs | 22 +++++ src/SharpMUTerm.Tui/SharpMUTermApp.cs | 12 +++ src/SharpMUTerm.Tui/WorkspacePalette.cs | 12 ++- .../NativeComposerTests.cs | 24 +++++ .../NativeKeySpellingTests.cs | 5 ++ .../SettingsWindowTests.cs | 43 ++++++++- .../ScopedSettingsTests.cs | 30 +++++++ .../Session/ChannelsAndNamesTests.cs | 45 ++++++++++ .../Session/FakeTelnetSession.cs | 20 ++++- .../ComposeSpellingTests.cs | 2 + .../FrameContrastTests.cs | 18 +--- .../RecordingTelnetSession.cs | 7 +- .../SharpMUTerm.Tui.Tests/ScreenThemeTests.cs | 55 ++++++++++++ .../WorldFieldScrollTests.cs | 67 ++++++++++++++ 31 files changed, 676 insertions(+), 49 deletions(-) create mode 100644 tests/SharpMUTerm.Tui.Tests/WorldFieldScrollTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 9686bbbb..ead4bba7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -312,6 +312,11 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Changed +- Light theme: background tabs and one-row panels (vitals, quick bar) sit on a lighter grey, and small text on the + settings screens is darker, so it is as easy to read as body text. +- Desktop window: the composer's "no dictionary" chip is a button that offers to get one; in the terminal F1 names + Alt+W beside it. The world settings show the same "join wraps" recommendation the terminal's F5 does. + - A character is named one way everywhere: the command line's prompt, the window title and tab titles now read `Corvid · Aetherfall` and `Corvid · Chat` instead of `Corvid@Aetherfall` and `Corvid - Chat`. - Messages from packages, the map and sound name where they came from as a label ("Sound: muted.") rather than in the @@ -364,6 +369,11 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Fixed +- F5: editing a world field low on the screen (channels, names) now scrolls the field into view instead of leaving + the cursor off screen. +- F5 ▸ channels `move`: a channel message whose echo arrives just before its GMCP in the same read is no longer left + in the main window as well. + - Desktop window: the settings window can be resized again from any edge, and opens at the size you last left it for the rest of the session. Notification cards disappear as soon as it opens rather than showing beside it. - Clicking a tab strip's `+N ▾` no longer also selects (or closes) the tab drawn underneath it. diff --git a/CLAUDE.md b/CLAUDE.md index 436460e1..620239de 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -807,7 +807,9 @@ fallbacks) for inline images/maps. `Func` that is null by default, so a test and a snapshot read none and their header says `no dictionary`. A MOO edit is not checked (its buffer is code as often as prose). `%`-codes, a word before `(`, and any word with a digit or an inner capital are skipped. ⌥W appends to - `dictionaries/user-words.txt`. **A command token is skipped** (one starting `+ @ & /`, up to its first `=`), and so + `dictionaries/user-words.txt`. With no dictionary F1's header reads `no dictionary · ⌥W gets one` (the docked panel + says only `no dictionary`), and the window's chip is a button (`ComposerView.DictionaryChip`) that opens the same + offer through `ComposerSession.GetDictionary`. **A command token is skipped** (one starting `+ @ & /`, up to its first `=`), and so is **every name the client knows** (`SpellChecker.KnowNames`: configured worlds and characters, each session's `CompletionIndex.Names()`), refreshed each time F1 opens and held for the run, never written to disk. - **With no dictionary, ⌥W offers to download one** (`DictionaryDownload`, Core; `DictionaryOfferModel`, Client; @@ -947,14 +949,18 @@ fallbacks) for inline images/maps. - **The audit that found most of this is a test** (`FrameContrastTests`): every emitted SGR pair over 24 views × 3 themes. Reading the source found four of the offenders; the paint found nine. It exempts the powerline wedges and box-drawing rules (fill boundaries and dividers), the solid blocks (a swatch - is a colour sample shown as the *pane* will paint it), and the framework's `[dim]`. **The half blocks + is a colour sample shown as the *pane* will paint it), and nothing else. **The half blocks are not exempt** — `▌` is the trigger left-rule and the focus marker, and one of them was a real defect this caught. - - **One thing is outside the floor's reach and is named rather than hidden.** SharpConsoleUI resolves - `[dim]` to a fixed `#808080` through no option we hold: 4.01:1 on Dark, **2.52:1** on Solarized Dark's - focused pane. Reaching it means giving up `[dim]` across every renderer for an explicit floor-checked - grey — a sweep, for a near miss on one theme. The exemption is a named predicate with the number in - it, so whoever does that sweep can delete it and watch the test pass. + - **The framework's `[dim]` is no longer exempt.** It is faint on the inherited ink, or a fixed `#808080` + with none; it once measured 2.52:1 on Solarized Dark's focused pane. The panes have since deepened, the + status row swaps it (`StatusInk`), and a light settings screen rewrites a bare `[dim]` to a held grey + (`ScreenTheme.Tag`, light planes only, so Dark and Solarized frames are unchanged), so every `[dim]` cell in + every view clears the floor. A new one that does not fails like any other ink. The workspace's own `[dim]`s + (rail, popups) were not swept, because they did not need to be. + - **Small text on a light settings screen is held to 4.5:1** (`ScreenTheme.FloorOn`, `LightTextFloor`); 3:1 + stays the floor on dark planes. Light's L*-mirrored greys left labels at about 3.2:1, which read as disabled. + `ScreenThemeTests.ALightSettingsScreensTextClearsBodyTextContrast` walks the frames. - **The settings screens follow the theme, and the renderers do not know it** (`ScreenTheme`, Tui; defect D6). `ScreenPalette`'s constants are *roles* spelt as the Dark theme's values; renderers keep writing `[{Label}]…` in them, and the views resolve the markup and every control colour through one immutable @@ -1100,8 +1106,10 @@ fallbacks) for inline images/maps. control's own background is what its content inherits, so it cannot be set there). A tab, its `×` and the `│` between tabs stay the framework's, and `PaneDragSurface.IsDragHandle` keeps the run from starting a window drag. There is no row either side of a fixed strip panel; it sits flush, and an *unfocused* strip is - recessed the backdrop's step (`SurfaceToneIn`), so it is never the same plane as an unfocused pane (2.8 L* - on Dark, 3.7 Solarized Dark, 21 Light — the pane-over-backdrop step). Side by side, nothing changed. The + recessed (`SurfaceToneIn`), so it is never the same plane as an unfocused pane. `WorkspacePalette.Recessed` + is the backdrop's step on a dark plane and a shallower 0.90 on a light one (`LightRecessScale`, about L* 87 + under Light's L* 96 panes, twice the light backdrop's step), so Light's background chips and strips are not + the deep grey a dark theme's step gives. Side by side, nothing changed. The freed row went to the panes, which is the point and a NAWS change; `StackedDividerTests` and the `split-stacked` view are the pins. - **The menu is the ⌃P catalog's own entries** (`AddCommands`), so it cannot offer an action the keyboard @@ -1824,7 +1832,10 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] maximum path); `now` reads `SendTarget()`'s game data (never `_active`'s); Delete on a meter row is a hidden trailing Remove button added only while the cursor is on one; the received-data box shows only while the cursor is in the table; path fields offer the received paths with their values as `ChoiceNotes`. - - F7 and F8 are windowed to the screen height (`ScreenChrome.Window`), because F7 is taller than 24 rows. + - F7 and F8 are windowed to the screen height (`ScreenChrome.Window`), because F7 is taller than 24 rows. F5 too: + the window centres on the *caret* (an open edit or a key capture) before the cursor band, because on F5 the band + stays on the WORLDS row while a world field is typed in (`WorldFieldScrollTests`, 120×32 and 80×24; + `--view settings-edit` edits the deepest field). - **F5's world fields and F9's character fields are declared, with scoped bindings** (`BuiltInSettings.World` and `.Character`; `SettingScope`, `SettingTarget`, `SettingBinding.ForWorld`/`ForCharacter`; `WorldFieldValues`, `TextRules`; Tui `DeclaredFields`). A binding reads a `SettingTarget` (the configuration @@ -1916,7 +1927,10 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] thread). A write captures the subject at the moment it is made. `Open the F5 screen ↗` (`OpenScreen`) is the way to the lists, and opens the *cell* screen: `OpenSectionScreen` calls `GoToSetting(…, native: false)`, or the door would reopen this window. With no world there are no fields, only a sentence and the door. A text the rule - refuses is put back with the reason as a tooltip. + refuses is put back with the reason as a tooltip. A field may carry a per-world note the cell row shows + (`SettingsForm.WorldNotes`, by field id then world, built on the client's thread; `Note` shows it only while the + field is at its default): `join wraps` carries `recommended · wraps at 78, pane is 60`, one string from + `WorldFieldValues.JoinWrapsAdvice` for both hosts. - **Search is `SettingsSearch.Find` and nothing else**, so the two surfaces always find the same fields. While searching, the page shows only matched fields, and if the section on show has none it moves to the first that has some. @@ -2098,7 +2112,8 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] move), the tokens' card and edge, and a scrim over the main window (`SettingsPresenter.Scrim`; a press on it closes). Opened from the trigger builder (`SettingsForm.BesideOutput`) it is docked to the main window's right half with no scrim, so the line the rule came from stays in view. Still a separate OS window, not an overlay. -- **Every native surface spells a key in words** (`NativeKeys.Words`, Avalonia: `KeyGlyphs.Words` plus `⏎` → `Enter`): +- **Every native surface spells a key in words** (`NativeKeys.Words`, Avalonia: `KeyGlyphs.Words` plus the named keys + `⏎` Enter, `⇥`/`↹` Tab, `⇤` Shift+Tab, `⌫` Backspace, `⌦` Delete, `⎋` Esc, `⇞`/`⇟` PgUp/PgDn; arrows stay arrows): `Ctrl+P`, `Alt+M`, `Ctrl+B b`, never `⌃P`/`⌥M`/`⏎`. The client writes keys in glyphs because the cells draw them well; whatever it hands a native view — menu keys, a toast's chip and text, palette details and chips, the composer's key row, modal footers and sentences, settings help, tooltips — goes through `Words` on the way to the @@ -3041,8 +3056,11 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] - **GMCP channels go to a window per channel through `SpawnLine`** (`ChannelCapture`, Core; `WorldDefinition.CaptureChannels`, F5 ▸ `channels`: off/copy/move, off by default). `Comm.Channel.Text`'s `channel` names the window (letters, digits, space, `-`, `_`, 24 at most); its `text` is parsed through `AnsiParser`. `move` - gags the main-window echo by exact text, only when it arrives within 3 s of the GMCP (32 pending at most), so an echo - that arrives *before* the GMCP is not taken out. + gags the main-window echo by exact text, only when it arrives within 3 s of the GMCP (32 pending at most). An echo + that arrives *before* its GMCP is caught when both are in one socket read: in `move` a line no pending GMCP expects + is held (`WorldSession.EchoHold`, ≤250 ms, under `_ingestGate`) until the read ends (`ITelnetSession.ReceiveBatchEnded`, + raised after each `InterpretByteArrayAsync`), a channel message, a prompt, a parser swap or a disconnect, then + released in order, so nothing is reordered. A GMCP in a *later* read than its echo still leaves the copy in main. - **Highlighted names are an ingest-time restyle** (`NameHighlights`, Core; `WorldDefinition.HighlightNames`, F5 ▸ `names`, `TextRule.NameHighlights`). `Name=colour` from `HighlightColours`, gold by default, 64 names; one whole-word, case-insensitive regex with a 50 ms timeout, applied before emoji and links and to captured channel lines. Only the diff --git a/src/SharpMUTerm.Avalonia/ComposerView.cs b/src/SharpMUTerm.Avalonia/ComposerView.cs index 9e0f9390..28090456 100644 --- a/src/SharpMUTerm.Avalonia/ComposerView.cs +++ b/src/SharpMUTerm.Avalonia/ComposerView.cs @@ -354,7 +354,9 @@ private void Label(ComposerModel model) model.Escaping == ComposeEscaping.Literal ? Accent : _text, ui - 1.5)); if (_fullScreen || model.Armed) { - _chips.Children.Add(Chip(model.Dictionary ?? "no dictionary", model.Dictionary is null ? Dim : _text, ui - 1.5)); + _chips.Children.Add(model.Dictionary is { } dictionary + ? Chip(dictionary, _text, ui - 1.5) + : DictionaryChip(ui - 1.5)); } } @@ -407,6 +409,37 @@ private void Label(ComposerModel model) Child = new TextBlock { Text = words, FontSize = Math.Max(9, size), Foreground = new SolidColorBrush(ink) }, }; + /// What the header's dictionary chip says while no dictionary marks the post. + internal const string NoDictionaryChip = "no dictionary · get one"; + + /// + /// The header's chip while no dictionary marks the post: a button for the offer ⌥W opens + /// (), so the state names its own way out. Where the session cannot offer + /// one (the docked panel, a MOO edit) it is the plain dim chip it always was. Internal for tests. + /// + internal Border DictionaryChip(double size) + { + if (_session is not { CanGetDictionary: true }) + { + return Chip("no dictionary", Dim, size); + } + + var chip = Chip(NoDictionaryChip, Accent, size); + chip.Name = "GetDictionary"; + chip.Cursor = new Cursor(StandardCursorType.Hand); + ToolTip.SetTip(chip, "Get a spelling dictionary (Alt+W)"); + AutomationProperties.SetName(chip, "Get a spelling dictionary"); + chip.PointerPressed += (_, e) => + { + if (e.GetCurrentPoint(chip).Properties.IsLeftButtonPressed) + { + e.Handled = true; + _session?.GetDictionary(); + } + }; + return chip; + } + protected override void OnSizeChanged(SizeChangedEventArgs e) { base.OnSizeChanged(e); diff --git a/src/SharpMUTerm.Avalonia/HelpView.cs b/src/SharpMUTerm.Avalonia/HelpView.cs index 84f39f5d..fc1684b2 100644 --- a/src/SharpMUTerm.Avalonia/HelpView.cs +++ b/src/SharpMUTerm.Avalonia/HelpView.cs @@ -228,7 +228,7 @@ private void ShowList() { _list.Children.Add(new TextBlock { - Text = NativeKeys.Words(HelpModel.NoMatches).Replace("⌫", "Backspace", StringComparison.Ordinal), + Text = NativeKeys.Words(HelpModel.NoMatches), Foreground = _colours.Brush(_colours.Dim), Margin = new Thickness(12, 10), TextWrapping = TextWrapping.Wrap, diff --git a/src/SharpMUTerm.Avalonia/NativeKeys.cs b/src/SharpMUTerm.Avalonia/NativeKeys.cs index e2e8fba6..35572140 100644 --- a/src/SharpMUTerm.Avalonia/NativeKeys.cs +++ b/src/SharpMUTerm.Avalonia/NativeKeys.cs @@ -14,17 +14,46 @@ namespace SharpMUTerm.Avalonia; /// internal static class NativeKeys { - /// The key glyphs the window never shows: the three modifiers and the Enter key. - internal static readonly char[] Glyphs = ['⌃', '⌥', '⇧', '⏎']; + /// + /// The key glyphs the window never shows: the three modifiers, and every named key the client spells with a glyph + /// (Enter, Tab, Backspace, Delete, Escape, Page Up/Down). The arrows stay arrows: a desktop application labels them + /// that way too. + /// + internal static readonly char[] Glyphs = ['⌃', '⌥', '⇧', '⏎', '⇥', '↹', '⇤', '⌫', '⌦', '⎋', '⇞', '⇟']; + + /// Each named key's glyph and its word, applied after the modifiers (so ⇧⇥ reads Shift+Tab). + private static readonly (string Glyph, string Word)[] Named = + [ + ("⏎", "Enter"), + ("⇤", "Shift+Tab"), + ("⇥", "Tab"), + ("↹", "Tab"), + ("⌫", "Backspace"), + ("⌦", "Delete"), + ("⎋", "Esc"), + ("⇞", "PgUp"), + ("⇟", "PgDn"), + ]; /// /// with every key glyph spelt as a word — ⌃⏎ is Ctrl+Enter, as the modal footers /// and the window's own chords (HostChord's words) say it; null is empty. /// - public static string Words(string? text) => - string.IsNullOrEmpty(text) || text.IndexOfAny(Glyphs) < 0 - ? text ?? string.Empty - : KeyGlyphs.Words(text).Replace("⏎", "Enter", StringComparison.Ordinal); + public static string Words(string? text) + { + if (string.IsNullOrEmpty(text) || text.IndexOfAny(Glyphs) < 0) + { + return text ?? string.Empty; + } + + var words = KeyGlyphs.Words(text); + foreach (var (glyph, word) in Named) + { + words = words.Replace(glyph, word, StringComparison.Ordinal); + } + + return words; + } /// Whether still holds a modifier glyph. public static bool HasGlyph(string? text) => text is not null && text.IndexOfAny(Glyphs) >= 0; diff --git a/src/SharpMUTerm.Avalonia/SettingsWindow.cs b/src/SharpMUTerm.Avalonia/SettingsWindow.cs index 26ab7eb1..e8ab8618 100644 --- a/src/SharpMUTerm.Avalonia/SettingsWindow.cs +++ b/src/SharpMUTerm.Avalonia/SettingsWindow.cs @@ -38,6 +38,7 @@ internal sealed class SettingsWindow : Window private readonly DispatcherTimer _clock; private readonly Dictionary _controls = new(StringComparer.Ordinal); private readonly Dictionary _resets = new(StringComparer.Ordinal); + private readonly Dictionary _notes = new(StringComparer.Ordinal); private readonly Dictionary _badges = new(StringComparer.Ordinal); private readonly List<(StatusMeter Meter, TextBlock Now)> _meterNow = []; private readonly List _themeCards = []; @@ -369,12 +370,16 @@ private void OnQuery() // ── the page ───────────────────────────────────────────────────────────────────────────────── + /// The note line under a field on the page, by field id (shown or not), for tests. + internal TextBlock? NoteFor(string id) => _notes.GetValueOrDefault(id); + private void BuildPage() { _page.Children.Clear(); _refreshers.Clear(); _controls.Clear(); _resets.Clear(); + _notes.Clear(); _meterNow.Clear(); _themeCards.Clear(); SubjectPicker = null; @@ -611,6 +616,21 @@ private Grid FieldRow(SettingsField field) words.Children.Add(new TextBlock { Text = NativeKeys.Words(Capitalise(help)), FontSize = NativeTokens.Body, Foreground = DimInk, TextWrapping = TextWrapping.Wrap }); } + // The note the cell F5 draws beside the value (join wraps' recommendation), from the same sentence, in the + // cells' caution amber; gone once the field has been changed. + var note = new TextBlock { FontSize = NativeTokens.Body, Foreground = _tokens.Brush(_tokens.Notice), TextWrapping = TextWrapping.Wrap }; + void ShowNote() + { + var text = _form.Note(field); + note.Text = text is null ? null : NativeKeys.Words(Capitalise(text)); + note.IsVisible = text is not null; + } + + ShowNote(); + _refreshers.Add(ShowNote); + _notes[field.Id] = note; + words.Children.Add(note); + grid.Children.Add(words); var control = ControlFor(field); diff --git a/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs b/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs index 2f86e250..06e1c619 100644 --- a/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs +++ b/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs @@ -277,7 +277,7 @@ public static partial class BuiltInSettings WorldChoice("emoji", "emoji", WorldFieldValues.EmojiChoices, WorldTextGroup, (_, w) => WorldFieldValues.EmojiName(w.Emoji), (_, w, v) => WorldFieldValues.SetEmoji(w.Emoji, v), "which emoji substitutions run on this world's text", "emoticons shortcodes"), - WorldChoice("join-wraps", "join wraps", WorldFieldValues.JoinWrapChoices, WorldTextGroup, + WorldChoice(WorldFieldValues.JoinWrapsFieldId, "join wraps", WorldFieldValues.JoinWrapChoices, WorldTextGroup, (_, w) => w.JoinWrappedLines ? WorldFieldValues.JoinWrapChoices[1] : WorldFieldValues.JoinWrapChoices[0], (_, w, v) => w.JoinWrappedLines = v == WorldFieldValues.JoinWrapChoices[1], "join lines the server wrapped at its own width", "reflow wrap hard"), diff --git a/src/SharpMUTerm.Client/Settings/SettingsForm.cs b/src/SharpMUTerm.Client/Settings/SettingsForm.cs index f7e16590..eb22ddb9 100644 --- a/src/SharpMUTerm.Client/Settings/SettingsForm.cs +++ b/src/SharpMUTerm.Client/Settings/SettingsForm.cs @@ -225,6 +225,29 @@ public bool IsDefault(SettingsField field) return field.Binding?.IsDefault(Target) ?? true; } + /// + /// Notes the client attaches to a world field for one world — F5's join wraps recommendation while the pane is + /// narrower than the server wraps — keyed by field id, then world name. Captured on the client's thread when the form + /// opens, from the data its cell screen draws the same sentence from, so the window reads nothing live. + /// + public IReadOnlyDictionary> WorldNotes { get; init; } = + new Dictionary>(); + + /// + /// The note beside for the world being edited, or null. A note recommends changing the + /// setting, so it holds only while the field is still at its default — once taken, it has nothing left to say. + /// + public string? Note(SettingsField field) + { + ArgumentNullException.ThrowIfNull(field); + return _world is { } world + && WorldNotes.TryGetValue(field.Id, out var byWorld) + && byWorld.TryGetValue(world.Name, out var note) + && IsDefault(field) + ? note + : null; + } + /// The default of as text, for a reset button's tooltip. public static string DefaultText(SettingsField field) { diff --git a/src/SharpMUTerm.Client/Settings/WorldFieldValues.cs b/src/SharpMUTerm.Client/Settings/WorldFieldValues.cs index abb39b73..9b900897 100644 --- a/src/SharpMUTerm.Client/Settings/WorldFieldValues.cs +++ b/src/SharpMUTerm.Client/Settings/WorldFieldValues.cs @@ -83,6 +83,17 @@ public static void SetEmoji(EmojiSettings emoji, string name) /// The words for . public static IReadOnlyList JoinWrapChoices { get; } = ["off", "join"]; + /// The id of the declared join wraps field, which a note is attached to. + public const string JoinWrapsFieldId = "join-wraps"; + + /// + /// What F5 says beside join wraps while a world's pane is narrower than its server wraps — one sentence for the + /// cell screen and the window's settings alike. + /// + public static string JoinWrapsAdvice(int column, int paneWidth) => + $"recommended · wraps at {column.ToString(System.Globalization.CultureInfo.InvariantCulture)}, " + + $"pane is {paneWidth.ToString(System.Globalization.CultureInfo.InvariantCulture)}"; + /// The words for . public static IReadOnlyList ReconnectChoices { get; } = ["off", "after a drop"]; diff --git a/src/SharpMUTerm.Core/Protocols/ChannelCapture.cs b/src/SharpMUTerm.Core/Protocols/ChannelCapture.cs index 31bcc78c..02ee1967 100644 --- a/src/SharpMUTerm.Core/Protocols/ChannelCapture.cs +++ b/src/SharpMUTerm.Core/Protocols/ChannelCapture.cs @@ -172,6 +172,30 @@ public bool TakeEcho(string printed) return false; } + /// Whether is the echo of a message still waiting, without consuming it. + public bool Expects(string printed) + { + var text = printed.Trim(); + if (text.Length == 0) + { + return false; + } + + var now = _clock.GetUtcNow(); + lock (_gate) + { + foreach (var (pending, at) in _pending) + { + if (now - at <= EchoWindow && string.Equals(pending, text, StringComparison.Ordinal)) + { + return true; + } + } + } + + return false; + } + /// Forgets every message waiting for an echo (a new connection). public void Clear() { diff --git a/src/SharpMUTerm.Core/Session/WorldSession.cs b/src/SharpMUTerm.Core/Session/WorldSession.cs index 7d81a31a..228f51e5 100644 --- a/src/SharpMUTerm.Core/Session/WorldSession.cs +++ b/src/SharpMUTerm.Core/Session/WorldSession.cs @@ -340,6 +340,8 @@ private void UpgradeParser(ContentFormat format) { ProcessOutputLine(tail); } + + ReleaseEchoHeld(); } _parser = NewParser(format); @@ -607,6 +609,9 @@ public async Task ConnectAsync(CancellationToken cancellationToken = default) _reflowRelease?.Dispose(); _wrapJoiner = new ServerWrapJoiner(); _serverWrapColumn = 0; + _echoRelease?.Dispose(); + _echoRelease = null; + _echoHeld.Clear(); // Re-read with the parser, so an F5 change to the world's emoji switches reaches the next connection. _emoji = NewEmoji(World.Emoji); @@ -661,6 +666,13 @@ public async Task ConnectAsync(CancellationToken cancellationToken = default) telnet.MxpEnabled += OnMxpEnabled; _mspActive = false; telnet.MspChanged += (_, active) => _mspActive = active; + telnet.ReceiveBatchEnded += (_, _) => + { + lock (_ingestGate) + { + ReleaseEchoHeld(); + } + }; telnet.PuebloEnabled += OnPuebloEnabled; McpStatus = null; GamePresence = null; @@ -916,7 +928,13 @@ internal void CaptureChannel(string package, string json) if (World.CaptureChannels == ChannelCaptureMode.Move) { - _channels.ExpectEcho(message.Lines); + // Lines held since the read began may be this message's echo, printed just before it: they are let go + // now, against the message, in the order they arrived. + lock (_ingestGate) + { + _channels.ExpectEcho(message.Lines); + ReleaseEchoHeld(); + } } foreach (var line in message.Lines) @@ -927,7 +945,73 @@ internal void CaptureChannel(string package, string json) } } + /// + /// Lines waiting, under , for the rest of the read they arrived in: a server + /// that prints a channel line before the GMCP message for it, in the same write, still has its echo kept out of the + /// main window. Released in order at the end of the read (), when a + /// channel message arrives, before a prompt or any other line not held, on a parser swap and on a disconnect, and + /// after at the latest. Touched only under . + /// + private readonly List _echoHeld = []; + + /// The pending release of , or null when nothing is held. + private IDisposable? _echoRelease; + + /// + /// The longest a line waits for its read's GMCP under move when the session says nothing of where a read + /// ends: the cap, not the usual wait, since a real connection lets the lines go as soon as the read is done. + /// + public TimeSpan EchoHold { get; set; } = TimeSpan.FromMilliseconds(250); + + /// + /// A completed line on its way to the engines and the windows. Under move an ordinary line that is not + /// already a waiting message's echo is held to the end of its read (); anything else lets + /// whatever is held go first, so nothing is ever shown out of order. Call under . + /// private void ProcessOutputLine(StyledLine line, bool isPrompt = false) + { + if (isPrompt || World.CaptureChannels != ChannelCaptureMode.Move) + { + ReleaseEchoHeld(); + ProcessOutputLineNow(line, isPrompt); + return; + } + + if (_echoHeld.Count == 0 && _channels.Expects(line.Text)) + { + ProcessOutputLineNow(line); + return; + } + + _echoHeld.Add(line); + _echoRelease ??= Scheduler.After(EchoHold, () => + { + lock (_ingestGate) + { + ReleaseEchoHeld(); + } + }, "echo-hold"); + } + + /// Lets every held line go, in order. Call under . + private void ReleaseEchoHeld() + { + _echoRelease?.Dispose(); + _echoRelease = null; + if (_echoHeld.Count == 0) + { + return; + } + + var held = _echoHeld.ToArray(); + _echoHeld.Clear(); + foreach (var line in held) + { + ProcessOutputLineNow(line); + } + } + + private void ProcessOutputLineNow(StyledLine line, bool isPrompt = false) { // An MSP trigger is the server asking for a sound, and is taken out before anything else sees the // line — but only on a connection that agreed MSP. Anywhere else it is text a player can type. @@ -1458,6 +1542,7 @@ private void OnDisconnected(object? sender, SessionDisconnectedEventArgs e) lock (_ingestGate) { ReleaseHeldLine(); + ReleaseEchoHeld(); } CancelGmcpLogin(); diff --git a/src/SharpMUTerm.Core/Telnet/ITelnetSession.cs b/src/SharpMUTerm.Core/Telnet/ITelnetSession.cs index 5f0c4f46..7a55186f 100644 --- a/src/SharpMUTerm.Core/Telnet/ITelnetSession.cs +++ b/src/SharpMUTerm.Core/Telnet/ITelnetSession.cs @@ -50,6 +50,18 @@ event EventHandler? MspChanged remove { } } + /// + /// Raised after every event one read from the socket produced has been raised: the lines, prompts and GMCP of a + /// single receive are one batch. Channel capture's move holds lines to the end of the batch, so an echo the + /// server printed just before its GMCP in the same write still finds it. A session that does not say leaves those + /// lines to a short timer, which is what the default does. + /// + event EventHandler? ReceiveBatchEnded + { + add { } + remove { } + } + /// /// Raised once the server has switched this connection to Pueblo (its start sequence, after our /// PUEBLOCLIENT). The of Pueblo. diff --git a/src/SharpMUTerm.Core/Telnet/TelnetSession.cs b/src/SharpMUTerm.Core/Telnet/TelnetSession.cs index ac95a254..7275f539 100644 --- a/src/SharpMUTerm.Core/Telnet/TelnetSession.cs +++ b/src/SharpMUTerm.Core/Telnet/TelnetSession.cs @@ -413,6 +413,9 @@ private Encoding? Negotiated public event EventHandler? PuebloEnabled; public event EventHandler? MspChanged; + /// + public event EventHandler? ReceiveBatchEnded; + public async Task ConnectAsync(CancellationToken cancellationToken = default) { if (_interpreter is not null) @@ -920,6 +923,7 @@ private async Task ReadLoopAsync(CancellationToken cancellationToken) } await _interpreter!.InterpretByteArrayAsync(buffer.AsMemory(0, read)).ConfigureAwait(false); + ReceiveBatchEnded?.Invoke(this, EventArgs.Empty); // The second arm of charset observation: the direction whose callback the library // does not raise (see WireCharsetCallback). Cheap — a reference comparison — and diff --git a/src/SharpMUTerm.Tui/ComposeOverlay.cs b/src/SharpMUTerm.Tui/ComposeOverlay.cs index 7d23e11a..b38006a2 100644 --- a/src/SharpMUTerm.Tui/ComposeOverlay.cs +++ b/src/SharpMUTerm.Tui/ComposeOverlay.cs @@ -581,7 +581,10 @@ internal static (string Header, string Footer) Render(ComposerModel model, int w var spelling = model.Dictionary is { } name ? $"[{ScreenPalette.Value}]{Escape(name)}[/]" - : $"[{ScreenPalette.Muted}]no dictionary[/]"; + : model.Place == ComposerPlace.FullScreen + // The state names its way out: ⌥W here is the offer to get one (the key row says so too). + ? $"[{ScreenPalette.Muted}]no dictionary[/][{ScreenPalette.Label}] · [/][{ScreenPalette.Accent}]⌥W[/][{ScreenPalette.Label}] gets one[/]" + : $"[{ScreenPalette.Muted}]no dictionary[/]"; header = $"[{ScreenPalette.Accent}]COMPOSE[/][{ScreenPalette.Label}] to [/]{target}" + $"[{ScreenPalette.Label}] · text [/]{mode}" diff --git a/src/SharpMUTerm.Tui/ScreenChrome.cs b/src/SharpMUTerm.Tui/ScreenChrome.cs index 526b6aa2..4b6e0d28 100644 --- a/src/SharpMUTerm.Tui/ScreenChrome.cs +++ b/src/SharpMUTerm.Tui/ScreenChrome.cs @@ -279,7 +279,15 @@ internal static List Window(List block, int height) return block; } - var focused = block.FindIndex(l => l.Contains(CursorMark, StringComparison.Ordinal)); + // An open edit is where the keyboard is, so its caret wins over a cursor band: on F5 the band + // stays on the WORLDS row while a world field is typed in the column beside it, and windowing + // that column by the band alone left a field below the fold being edited where nobody could see. + var focused = block.FindIndex(l => l.Contains(CaretMark, StringComparison.Ordinal)); + if (focused < 0) + { + focused = block.FindIndex(l => l.Contains(CursorMark, StringComparison.Ordinal)); + } + var start = focused < 0 ? 0 : Math.Clamp(focused - (height / 2), 0, block.Count - height); diff --git a/src/SharpMUTerm.Tui/ScreenTheme.cs b/src/SharpMUTerm.Tui/ScreenTheme.cs index f59b3200..d2994382 100644 --- a/src/SharpMUTerm.Tui/ScreenTheme.cs +++ b/src/SharpMUTerm.Tui/ScreenTheme.cs @@ -136,7 +136,7 @@ internal static ScreenTheme For(Theme theme) // Text printed on the accent: near-black on a bright accent, the panel's own tone on a dark one. var accent = roles[ScreenPalette.Accent]; var ink0 = Contrast.RelativeLuminance(accent) < LightPlaneLuminance ? roles[ScreenPalette.PanelBg] : Parse(ScreenPalette.Ink); - roles[ScreenPalette.Ink] = Contrast.Legible(ink0, accent); + roles[ScreenPalette.Ink] = Contrast.Legible(ink0, accent, FloorOn(accent)); return new ScreenTheme(roles.ToDictionary(r => r.Key, r => r.Value.ToHex(), StringComparer.OrdinalIgnoreCase)); } @@ -268,6 +268,15 @@ private string Tag(string tag, Stack planes, bool sample) } var plane = background ?? planes.Peek(); + + // The framework draws [dim] as faint text in the inherited ink (or a fixed #808080 with none), which nothing + // holds to a floor. On a light screen plane it becomes a grey held to body text's 4.5:1 there; a dark plane keeps + // the framework's faint, so Dark and Solarized Dark frames do not move. + if (foreground < 0 && !IsIdentity && FloorOn(Parse(plane)) > Contrast.Floor && Array.IndexOf(words, "dim") is >= 0 and var dim) + { + words[dim] = Contrast.Legible(FrameworkDim, Parse(plane), FloorOn(Parse(plane))).ToHex(); + } + if (foreground >= 0) { var given = words[foreground]; @@ -287,7 +296,7 @@ private string Tag(string tag, Stack planes, bool sample) else if (!IsIdentity) { // Not a role: a colour the screen was handed. Hold it to the floor where it lands. - words[foreground] = Contrast.Legible(Parse(given), Parse(plane)).ToHex(); + words[foreground] = Contrast.Legible(Parse(given), Parse(plane), FloorOn(Parse(plane))).ToHex(); } } @@ -349,7 +358,7 @@ private static Rgb Legible(Rgb ink, IReadOnlyDictionary roles, IRea { foreach (var plane in planes ?? TextPlanes) { - ink = Contrast.Legible(ink, roles[plane]); + ink = Contrast.Legible(ink, roles[plane], FloorOn(roles[plane])); } } @@ -361,6 +370,20 @@ private static Rgb Legible(Rgb ink, IReadOnlyDictionary roles, IRea private const double LightPlaneLuminance = 0.18; + /// + /// The floor an ink is held to on : WCAG AA's 4.5:1 for body text on a light plane, where a + /// settings screen's labels and help are small text in a terminal font and 3:1 read as faint; the client's 3:1 on a + /// dark one, where it was chosen (and where Dark's constants, byte for byte, are the identity this must not move). + /// + internal static double FloorOn(Rgb plane) => + Contrast.RelativeLuminance(plane) >= LightPlaneLuminance ? LightTextFloor : Contrast.Floor; + + /// The grey SharpConsoleUI resolves the [dim] tag to, through no option this client holds. + internal static readonly Rgb FrameworkDim = new(0x80, 0x80, 0x80); + + /// The floor small text is held to on a light settings screen. + internal const double LightTextFloor = 4.5; + /// /// A dark role on a light theme: the same colour at the mirrored lightness (100 − L*), keeping the /// tint it carried (its distance from the grey of its own luminance). diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.JoinWraps.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.JoinWraps.cs index ccd5d75a..efd9c3cd 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.JoinWraps.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.JoinWraps.cs @@ -38,7 +38,7 @@ internal sealed partial class SharpMUTermApp /// What F5 says beside join wraps for : a recommendation while it is ragged. internal string? JoinWrapsAdvice(WorldDefinition world) => !world.JoinWrappedLines && _raggedWraps.TryGetValue(world.Name, out var ragged) - ? $"recommended · wraps at {ragged.Column}, pane is {ragged.PaneWidth}" + ? Client.Settings.WorldFieldValues.JoinWrapsAdvice(ragged.Column, ragged.PaneWidth) : null; /// diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Settings.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Settings.cs index 101dd054..f0db1c10 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Settings.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Settings.cs @@ -194,10 +194,32 @@ internal SettingsForm NativeSettingsForm(string initial, object? item = null) Selections = _listSelections, Theme = () => _theme.Clone(), BesideOutput = item is not null, + WorldNotes = WorldNotesNow(), }; return form; } + /// + /// The notes the cell F5 draws beside a world's fields, for every world, read now on the client's thread: today the + /// join wraps recommendation (), the one sentence both surfaces say. + /// + private Dictionary> WorldNotesNow() + { + var joinWraps = new Dictionary(StringComparer.Ordinal); + foreach (var world in _config.Worlds) + { + if (JoinWrapsAdvice(world) is { } advice) + { + joinWraps[world.Name] = advice; + } + } + + return new Dictionary>(StringComparer.Ordinal) + { + [Client.Settings.WorldFieldValues.JoinWrapsFieldId] = joinWraps, + }; + } + /// /// The world and character the focused window belongs to — what F5 and F9 open on — or nulls, and the form takes the /// first. Resolved here, on the client's thread, because the focus is not safe to read from the window's. diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 76a0d642..8ee28d08 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -8012,6 +8012,18 @@ private static IEnumerable EditSnapshotKeys(string view) yield break; } + if (string.Equals(view, "settings", StringComparison.OrdinalIgnoreCase)) + { + // F5 under its second name: the world's last field, far below the fold on an ordinary terminal, + // so the frame shows the detail column windowed to the field being typed in. + for (var i = 0; i < WorldsScreenRenderer.HighlightNamesField; i++) + { + yield return Stroke('\t', ConsoleKey.Tab); + } + + yield break; + } + if (string.Equals(view, "logging", StringComparison.OrdinalIgnoreCase)) { // name → password → connect → on connect → log: the character row's fields, in order. The diff --git a/src/SharpMUTerm.Tui/WorkspacePalette.cs b/src/SharpMUTerm.Tui/WorkspacePalette.cs index 7d4a2a13..f766d89c 100644 --- a/src/SharpMUTerm.Tui/WorkspacePalette.cs +++ b/src/SharpMUTerm.Tui/WorkspacePalette.cs @@ -283,8 +283,18 @@ internal static Rgb Backdrop(Theme theme) /// tabs. A chip states one fact relative to its own strip: the selected tab is painted the plane its /// page is painted on, its siblings are recessed from it. Pane focus is not a term, because it is /// already in the plane. + /// + /// A light plane takes a shallower step (), for the backdrop's reason: the dark + /// themes' step off a near-white pane landed unselected chips and resting strip panels on a mid-grey (L* 75) that + /// read as disabled. Twice the light backdrop's step (about 9 L*), so a recessed chip or strip is still a step below + /// the pane and a step apart from the backdrop beside it. + /// /// - internal static Rgb Recessed(Rgb plane) => Scale(plane, BackdropScale); + internal static Rgb Recessed(Rgb plane) => + Scale(plane, Contrast.RelativeLuminance(plane) < LightPlaneLuminance ? BackdropScale : LightRecessScale); + + /// The recess as a fraction of a light plane: about L* 87 under Light's L* 96 panes. + private const double LightRecessScale = 0.90; /// The one-cell hairline a split draws between two panes, and beside the rail. internal static Rgb Rule(Theme theme) => Mix(Surface(theme), theme.Border, RuleLift); diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativeComposerTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativeComposerTests.cs index be38b3b6..82e57292 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/NativeComposerTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/NativeComposerTests.cs @@ -131,6 +131,30 @@ public async Task F1OpensTheNativeEditorFocusedOverTheCellsAndNotTheCellModal() await Assert.That(margin).IsTrue().Because("over the cells, clear of the native header and sidebar"); } + /// + /// With no dictionary, the header's chip is the way to one: a click opens the offer ⌥W opens, and fetches nothing. + /// + [Test] + public async Task TheNoDictionaryChipOpensTheOffer() + { + var (text, tip, offered) = await Run(rig => + { + var overlay = OpenF1(rig); + var chip = overlay.Composer.DictionaryChip(12); + var label = ((TextBlock)chip.Child!).Text; + var tooltip = ToolTip.GetTip(chip) as string; + var pointer = new Pointer(0, PointerType.Mouse, true); + var point = new PointerPointProperties(RawInputModifiers.LeftMouseButton, PointerUpdateKind.LeftButtonPressed); + chip.RaiseEvent(new PointerPressedEventArgs(chip, pointer, chip, default, 0, point, KeyModifiers.None)); + Drain(); + return (label, tooltip, rig.App.DictionaryOfferOpen); + }); + + await Assert.That(text).IsEqualTo(ComposerView.NoDictionaryChip); + await Assert.That(tip).Contains("Alt+W"); + await Assert.That(offered).IsTrue(); + } + [Test] [Arguments("+pose waves\nand sits", false)] [Arguments("+bbpost 1=Title\n\nFirst, 50% [done].\n", true)] diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativeKeySpellingTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativeKeySpellingTests.cs index 2c506e76..085f818f 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/NativeKeySpellingTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/NativeKeySpellingTests.cs @@ -259,6 +259,11 @@ public async Task WordsSpellsEveryModifierAndLeavesTheRestAlone() await Assert.That(NativeKeys.Words("F4 edits keys")).IsEqualTo("F4 edits keys"); await Assert.That(NativeKeys.Words("⌃⏎ newline · ⏎ goes")).IsEqualTo("Ctrl+Enter newline · Enter goes"); await Assert.That(NativeKeys.Words(null)).IsEqualTo(string.Empty); + await Assert.That(NativeKeys.Words("⇥ next field · ⇧⇥ back · ↹ · ⇤")).IsEqualTo("Tab next field · Shift+Tab back · Tab · Shift+Tab"); + await Assert.That(NativeKeys.Words("⌫ widens · ⌦ removes · ⎋ · ⇞/⇟ pages")).IsEqualTo("Backspace widens · Delete removes · Esc · PgUp/PgDn pages"); + await Assert.That(NativeKeys.Words("↑↓ move · ← →")).IsEqualTo("↑↓ move · ← →").Because("a desktop application labels the arrows as arrows"); + await Assert.That(NativeKeys.HasGlyph("⌫ widens the query")).IsTrue(); + await Assert.That(NativeKeys.HasGlyph("⇥")).IsTrue(); } private static string RepositoryRoot() diff --git a/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowTests.cs b/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowTests.cs index 4b7de06f..49ac7f1a 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowTests.cs @@ -27,6 +27,10 @@ private sealed class Harness /// The sections the form lists; every built-in one is declared now, so a test adds one that is not. public IReadOnlyList Sections { get; init; } = BuiltInSettings.All; + /// The notes the client captured for the world fields (F5's join wraps recommendation). + public IReadOnlyDictionary> Notes { get; init; } = + new Dictionary>(); + public SettingsForm Form(string initial = "text") { SettingsForm? form = null; @@ -45,7 +49,10 @@ public SettingsForm Form(string initial = "text") () => [new ReceivedValue("Char.Vitals.hp", "412"), new ReceivedValue("Char.Vitals.maxhp", "500")], meter => meter.Value == "Char.Vitals.hp" ? "412/500" : null, () => ThemePreviews.Cards(Config), - () => ThemePreviews.IsDark(ThemeChoices.Resolve(Config))); + () => ThemePreviews.IsDark(ThemeChoices.Resolve(Config))) + { + WorldNotes = Notes, + }; return form; } } @@ -222,6 +229,40 @@ public async Task AWorldSectionPicksItsWorldAndEditsIt() await Assert.That(harness.Commits).IsEqualTo(1); } + /// + /// The cell F5's join wraps recommendation is drawn under the field natively, from the same sentence, and goes + /// when the field is changed. + /// + [Test] + public async Task JoinWrapsCarriesTheCellScreensRecommendation() + { + var advice = WorldFieldValues.JoinWrapsAdvice(78, 60); + var harness = new Harness + { + Notes = new Dictionary> + { + [WorldFieldValues.JoinWrapsFieldId] = new Dictionary { ["Aetherfall"] = advice }, + }, + }; + harness.Config.Worlds.Clear(); + harness.Config.Worlds.Add(new WorldDefinition { Name = "Aetherfall", Host = "aether.example" }); + var (before, shownBefore, after) = await Run(harness, "worlds", window => + { + var note = window.NoteFor(WorldFieldValues.JoinWrapsFieldId)!; + var text = note.Text; + var shown = note.IsVisible; + var combo = (ComboBox)window.FieldControls[WorldFieldValues.JoinWrapsFieldId]; + combo.SelectedItem = WorldFieldValues.JoinWrapChoices[1]; + Dispatcher.UIThread.RunJobs(); + return (text, shown, window.NoteFor(WorldFieldValues.JoinWrapsFieldId)!.IsVisible); + }); + + await Assert.That(before).IsEqualTo("Recommended · wraps at 78, pane is 60"); + await Assert.That(shownBefore).IsTrue(); + await Assert.That(harness.Config.Worlds[0].JoinWrappedLines).IsTrue(); + await Assert.That(after).IsFalse(); + } + /// A text the cell screen would refuse is refused here too, and the box shows the value kept. [Test] public async Task ARefusedTextIsPutBack() diff --git a/tests/SharpMUTerm.Client.Tests/ScopedSettingsTests.cs b/tests/SharpMUTerm.Client.Tests/ScopedSettingsTests.cs index 5ecab3cb..89c6ab24 100644 --- a/tests/SharpMUTerm.Client.Tests/ScopedSettingsTests.cs +++ b/tests/SharpMUTerm.Client.Tests/ScopedSettingsTests.cs @@ -25,6 +25,36 @@ private static AppConfiguration TwoWorlds() private static SettingsField Character(string id) => BuiltInSettings.Character.Fields.Single(f => f.Id == id); + /// + /// The note F5 draws beside join wraps reaches the window through the form, for the world being edited only, in + /// the cells' own sentence, and goes once the setting is taken. + /// + [Test] + public async Task AWorldNoteIsShownForItsWorldUntilTheFieldIsChanged() + { + var config = TwoWorlds(); + var advice = WorldFieldValues.JoinWrapsAdvice(78, 60); + var form = new SettingsForm(BuiltInSettings.All, config, change => change(), _ => { }, "worlds", isDark: true) + { + WorldNotes = new Dictionary> + { + [WorldFieldValues.JoinWrapsFieldId] = new Dictionary { ["Aetherfall"] = advice }, + }, + }; + var join = World(WorldFieldValues.JoinWrapsFieldId); + + await Assert.That(advice).IsEqualTo("recommended · wraps at 78, pane is 60"); + await Assert.That(form.Note(join)).IsEqualTo(advice); + await Assert.That(form.Note(World("emoji"))).IsNull(); + + form.Choose(form.Subjects(SettingScope.World)[1]); + await Assert.That(form.Note(join)).IsNull().Because("Brightwater's pane is not ragged"); + + form.Choose(form.Subjects(SettingScope.World)[0]); + config.Worlds[0].JoinWrappedLines = true; + await Assert.That(form.Note(join)).IsNull().Because("a recommendation that has been taken has nothing left to say"); + } + [Test] public async Task TheWorldAndCharacterSectionsAreScoped() { diff --git a/tests/SharpMUTerm.Core.Tests/Session/ChannelsAndNamesTests.cs b/tests/SharpMUTerm.Core.Tests/Session/ChannelsAndNamesTests.cs index 44a66792..3d6a8cd9 100644 --- a/tests/SharpMUTerm.Core.Tests/Session/ChannelsAndNamesTests.cs +++ b/tests/SharpMUTerm.Core.Tests/Session/ChannelsAndNamesTests.cs @@ -70,6 +70,51 @@ public async Task MoveKeepsTheEchoOutOfTheMainWindowOnce() await Assert.That(printed.Count(p => p == "(OOC) Ashlyn: hello all")).IsEqualTo(1); } + /// + /// A server that prints the channel line before its GMCP message, in the same read: the line waits for the rest of + /// the read, so the echo is still kept out, and the lines around it keep their order. + /// + [Test] + public async Task MoveCatchesAnEchoPrintedBeforeItsMessageInTheSameRead() + { + var world = World(); + world.CaptureChannels = ChannelCaptureMode.Move; + var (session, telnet) = Create(world); + var printed = new List(); + session.LinePrinted += (_, l) => printed.Add(l.Text); + await session.ConnectAsync(); + printed.Clear(); + + telnet.EmitLine("The fountain splashes.", endRead: false); + telnet.EmitLine("(OOC) Ashlyn: hello all", endRead: false); + await Assert.That(printed).IsEmpty().Because("held until the read is done"); + + telnet.EmitGmcp("Comm.Channel.Text", Ooc); + telnet.EmitLine("A pigeon lands.", endRead: false); + telnet.EndRead(); + + await Assert.That(string.Join(" | ", printed)).IsEqualTo("The fountain splashes. | A pigeon lands."); + } + + /// The hold is a read long: a line whose read ended with no message is shown, in order, at once. + [Test] + public async Task MoveShowsAnUnmatchedLineWhenItsReadEnds() + { + var world = World(); + world.CaptureChannels = ChannelCaptureMode.Move; + var (session, telnet) = Create(world); + var printed = new List(); + session.LinePrinted += (_, l) => printed.Add(l.Text); + await session.ConnectAsync(); + printed.Clear(); + + telnet.EmitLine("(OOC) Ashlyn: hello all", endRead: false); + telnet.EmitPrompt("> "); + telnet.EmitGmcp("Comm.Channel.Text", Ooc); + + await Assert.That(printed.First()).IsEqualTo("(OOC) Ashlyn: hello all").Because("a prompt lets the held line go first, and a message after its read is too late"); + } + [Test] public async Task AChannelNameIsMadeSafeForATitle() { diff --git a/tests/SharpMUTerm.Core.Tests/Session/FakeTelnetSession.cs b/tests/SharpMUTerm.Core.Tests/Session/FakeTelnetSession.cs index 4d129be0..913c5db2 100644 --- a/tests/SharpMUTerm.Core.Tests/Session/FakeTelnetSession.cs +++ b/tests/SharpMUTerm.Core.Tests/Session/FakeTelnetSession.cs @@ -26,6 +26,7 @@ internal sealed class FakeTelnetSession : ITelnetSession public event EventHandler? PuebloEnabled; public event EventHandler? MsdpEnabled; public event EventHandler? MspChanged; + public event EventHandler? ReceiveBatchEnded; public List<(string Variable, string Value)> SentMsdp { get; } = new(); @@ -90,9 +91,24 @@ public Task DisconnectAsync() // ---- test drivers ---- - public void EmitLine(string text) => OutputReceived?.Invoke(this, new TelnetOutputEventArgs(text, isPrompt: false)); + /// A line, as one read of its own unless is false (more of the same read follows). + public void EmitLine(string text, bool endRead = true) + { + OutputReceived?.Invoke(this, new TelnetOutputEventArgs(text, isPrompt: false)); + if (endRead) + { + EndRead(); + } + } + + public void EmitPrompt(string text) + { + OutputReceived?.Invoke(this, new TelnetOutputEventArgs(text, isPrompt: true)); + EndRead(); + } - public void EmitPrompt(string text) => OutputReceived?.Invoke(this, new TelnetOutputEventArgs(text, isPrompt: true)); + /// The end of one read from the socket: everything it carried has been raised. + public void EndRead() => ReceiveBatchEnded?.Invoke(this, EventArgs.Empty); public void EmitGmcp(string package, string json) => GmcpReceived?.Invoke(this, new GmcpMessageEventArgs(package, json)); diff --git a/tests/SharpMUTerm.Tui.Tests/ComposeSpellingTests.cs b/tests/SharpMUTerm.Tui.Tests/ComposeSpellingTests.cs index 6a172109..1329d004 100644 --- a/tests/SharpMUTerm.Tui.Tests/ComposeSpellingTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/ComposeSpellingTests.cs @@ -93,6 +93,8 @@ public async Task WithNoDictionaryTheHeaderSaysSoAndAltWOffersToGetOne() await Assert.That(app.Composer.HeaderMarkup).Contains("no dictionary"); var rows = FrameGrid.Decode(app.RenderWholeFrame(), Width, Height); await Assert.That(rows.Any(r => r.Contains("⌥W", StringComparison.Ordinal) && r.Contains("get a dictionary", StringComparison.Ordinal))).IsTrue(); + await Assert.That(rows.Any(r => r.Contains("no dictionary · ⌥W gets one", StringComparison.Ordinal))) + .IsTrue().Because("the header names the key beside the state it gets you out of"); await Assert.That(app.Composer.SimulateKey(Key(ConsoleKey.W, ConsoleModifiers.Alt))).IsTrue(); await Assert.That(app.DictionaryOfferOpen).IsTrue().Because("⌥W with no dictionary offers one, and fetches nothing"); } diff --git a/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs b/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs index be64c780..2636b4f1 100644 --- a/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/FrameContrastTests.cs @@ -177,7 +177,6 @@ await Assert.That(painted).IsGreaterThanOrEqualTo(100) var failures = pairs .Select(pair => (pair.Key.Fg, pair.Key.Bg, pair.Value, Ratio: Contrast.Ratio(pair.Key.Fg, pair.Key.Bg))) .Where(t => t.Ratio < Contrast.Floor) - .Where(t => !IsFrameworkDim(t.Fg)) .OrderBy(t => t.Ratio) .Select(t => $"{t.Ratio:0.00} {t.Fg.ToHex()} on {t.Bg.ToHex()} ({t.Value} cells)") .ToList(); @@ -186,19 +185,10 @@ await Assert.That(failures).IsEmpty() .Because($"--theme \"{test.Theme}\" --view {(test.View.Length == 0 ? "(default)" : test.View)}"); } - /// - /// The one exemption, and it is the framework's rather than ours. SharpConsoleUI resolves the - /// [dim] markup tag to a fixed #808080 of its own — it is an internal local function in - /// the markup renderer, reachable through no option we hold — so a dim rule measures 4.01:1 on the - /// default dark theme and 2.52:1 on Solarized Dark's focused pane. - /// - /// It is exempted rather than papered over. Reaching it means giving up [dim] everywhere in - /// favour of an explicit floor-checked grey, which is a sweep across every renderer in the app for a - /// near miss on one theme; the honest state is a named exemption and a number, so that anybody who - /// does that sweep can delete this and watch the test still pass. - /// - /// - private static bool IsFrameworkDim(Rgb fg) => fg == new Rgb(0x80, 0x80, 0x80); + // There is no exemption for the framework's [dim] any more. It resolves to a fixed #808080 nothing can retheme, and + // was exempted while it measured 2.52:1 on Solarized Dark's focused pane; the panes have since been deepened, the + // settings screens repaint it off Dark (ScreenTheme), and the status row swaps it (StatusInk), so every [dim] cell + // in every view here clears the floor on all three themes, and a new one that does not fails like any other ink. /// /// A glyph that is a fill rather than text, and to which a text floor therefore does not diff --git a/tests/SharpMUTerm.Tui.Tests/RecordingTelnetSession.cs b/tests/SharpMUTerm.Tui.Tests/RecordingTelnetSession.cs index 88beceae..ec2bf9ff 100644 --- a/tests/SharpMUTerm.Tui.Tests/RecordingTelnetSession.cs +++ b/tests/SharpMUTerm.Tui.Tests/RecordingTelnetSession.cs @@ -70,6 +70,8 @@ public IReadOnlyList Lines public event EventHandler? MsdpEnabled; + public event EventHandler? ReceiveBatchEnded; + public void ReceiveGmcp(string package, string json) => GmcpReceived?.Invoke(this, new GmcpMessageEventArgs(package, json)); @@ -128,8 +130,11 @@ public void RaiseEncodingChanged() => /// lines. It is the only way to assert on what a server's markup does to this client, as /// opposed to what a hand-built StyledLine does. /// - public void Receive(string text) => + public void Receive(string text) + { OutputReceived?.Invoke(this, new TelnetOutputEventArgs(text, isPrompt: false)); + ReceiveBatchEnded?.Invoke(this, EventArgs.Empty); // one call, one read + } public Task ConnectAsync(CancellationToken cancellationToken = default) { diff --git a/tests/SharpMUTerm.Tui.Tests/ScreenThemeTests.cs b/tests/SharpMUTerm.Tui.Tests/ScreenThemeTests.cs index 710a788b..d2349cad 100644 --- a/tests/SharpMUTerm.Tui.Tests/ScreenThemeTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/ScreenThemeTests.cs @@ -171,6 +171,61 @@ await Assert.That(scheme.Paint($"[{ScreenPalette.Ink} on {ScreenPalette.Accent}] [Arguments("worlds")] public async Task NoLightSettingsFramePaintsADarkPlaneAt80Columns(string view) => await AssertNoDarkPlane(view, 80, 24); + /// + /// On a light theme a settings screen's text is body text: every ink, the framework's [dim] included, clears + /// WCAG AA's 4.5:1 on the screen plane it is painted on. Labels and help were held to the client's 3:1 and read as + /// faint in a terminal font; Dark keeps its constants (and its 3:1), byte for byte. + /// + [Test] + [Arguments("triggers")] + [Arguments("worlds")] + [Arguments("textansi")] + [Arguments("aliases")] + [Arguments("timers")] + [Arguments("keypad")] + public async Task ALightSettingsScreensTextClearsBodyTextContrast(string view) + { + Console.SetIn(TextReader.Null); + var config = DemoScene.Build(); + config.ThemeName = "Light"; + config.Theme = ThemeLibrary.Get("Light"); + var scheme = ScreenTheme.For(config.Theme); + var caps = new TerminalCapabilities(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + var app = new SharpMUTermApp(config, caps, new HeadlessConsoleDriver(120, 32)); + var frame = app.RenderSnapshot(view); + + var planes = TextPlanes.Select(p => Rgb(scheme.Role(p))).ToHashSet(); + var failures = FrameGrid.Cells(frame, 120, 32).Values + .Where(c => c.Background is { } bg && planes.Contains(bg) && c.Foreground is { }) + .Where(c => c.Glyph is not (' ' or '▌' or '▐') && !(c.Glyph is >= '─' and <= '▟') && c.Glyph is not ('\ue0b0' or '\ue0b2')) + .Select(c => (Fg: c.Foreground!.Value, Bg: c.Background!.Value)) + .Distinct() + .Where(p => Contrast.Ratio(p.Fg, p.Bg) < ScreenTheme.LightTextFloor) + .Select(p => $"{Contrast.Ratio(p.Fg, p.Bg):0.00} {p.Fg.ToHex()} on {p.Bg.ToHex()}") + .ToList(); + + await Assert.That(failures).IsEmpty().Because($"--theme Light --view {view}"); + } + + [Test] + public async Task OnALightThemeEveryInkClearsBodyTextContrast() + { + var scheme = ScreenTheme.For(ThemeLibrary.Get("Light")); + string[] inks = [ScreenPalette.Label, ScreenPalette.Muted, ScreenPalette.Value, ScreenPalette.PanelFg, ScreenPalette.Warn]; + foreach (var ink in inks) + { + foreach (var plane in ScreenTheme.PlanesUnder(ink)) + { + await Assert.That(Contrast.Ratio(Rgb(scheme.Role(ink)), Rgb(scheme.Role(plane)))) + .IsGreaterThanOrEqualTo(ScreenTheme.LightTextFloor).Because($"{ink} on {plane}"); + } + } + + await Assert.That(Contrast.Ratio(Rgb(scheme.Ink), Rgb(scheme.Accent))).IsGreaterThanOrEqualTo(ScreenTheme.LightTextFloor); + await Assert.That(scheme.Paint("[dim]x[/]")).DoesNotContain("dim").Because("the framework's fixed grey is rethemed off Dark"); + await Assert.That(ScreenTheme.For(ThemeLibrary.Get("Dark")).Paint("[dim]x[/]")).IsEqualTo("[dim]x[/]"); + } + private static async Task AssertNoDarkPlane(string view, int width, int height) { Console.SetIn(TextReader.Null); diff --git a/tests/SharpMUTerm.Tui.Tests/WorldFieldScrollTests.cs b/tests/SharpMUTerm.Tui.Tests/WorldFieldScrollTests.cs new file mode 100644 index 00000000..65a4c3b0 --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/WorldFieldScrollTests.cs @@ -0,0 +1,67 @@ +using SharpConsoleUI.Drivers; +using SharpMUTerm.Graphics; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// F5's world fields run past the fold on an ordinary terminal, and the field being typed in has to be +/// on screen. The cursor band stays on the WORLDS row while ⇥ walks the fields in the column beside it, +/// so the column is windowed by the open edit's caret, not by the band (). +/// Read off the painted frame, because the defect was a field edited where nobody could see it. +/// +[NotInParallel] +public class WorldFieldScrollTests +{ + private static readonly TerminalCapabilities Headless = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + /// Fields whose row is labelled shorter than the field's own name. + private static readonly Dictionary RowLabels = new() + { + ["gmcp modules"] = "gmcp", + ["command stacking"] = "stacking", + ["capture channels"] = "channels", + ["highlight names"] = "names", + }; + + private static ConsoleKeyInfo Key(ConsoleKey key) => new('\0', key, false, false, false); + + [Test] + [Arguments(120, 32)] + [Arguments(80, 24)] + public async Task EveryWorldFieldIsOnScreenWhileItIsBeingEdited(int width, int height) + { + Console.SetIn(TextReader.Null); + var config = DemoScene.Build(); + var app = new SharpMUTermApp(config, Headless, new HeadlessConsoleDriver(width, height)); + app.RenderSnapshot("worlds"); + + // ⏎ on the world's row opens its first field; ⇥ walks the rest. + app.SimulateSettingsKey(Key(ConsoleKey.Enter)); + var seen = new HashSet(); + var offScreen = new List(); + for (var step = 0; step < 60; step++) + { + var focus = app.Settings.Focus; + if (focus?.Edit is not { } edit || !seen.Add(edit.Field)) + { + break; + } + + var model = WorldsScreenRenderer.Model(config.Worlds, config.TriggerSets, focus.Value.Index, 0); + var label = model.FieldAt(focus.Value.Pane, focus.Value.Index, edit.Field)?.Label; + label = label is not null && RowLabels.TryGetValue(label, out var shown) ? shown : label; + var frame = FrameGrid.Decode(app.RenderWholeFrame(), width, height); + if (label is not null && !frame.Any(row => row.Contains(label + " ", StringComparison.Ordinal))) + { + offScreen.Add(label); + } + + app.SimulateSettingsKey(Key(ConsoleKey.Tab)); + } + + await Assert.That(seen.Count).IsGreaterThan(10); + await Assert.That(offScreen).IsEmpty(); + } +} From 196fa9e4b716aa9b66545a4ed3696f292de5de47 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 14:29:16 +0000 Subject: [PATCH 052/113] Alerts reach the desktop on X11 and Windows; page alerts on for new worlds - X11: an alert sets the window's urgency hint (WM_HINTS UrgencyHint and _NET_WM_STATE_DEMANDS_ATTENTION), taken back when the window is activated. - Windows: the window adopts the AppUserModelID SharpMUTerm.Window; the installer gives the shortcuts that id and registers it, and an installed copy shows a WinRT toast (via Windows PowerShell, text base64-encoded in a fixed script) beside the taskbar flash. - WorldDefinition.AlertOnPage, on for a new world; a saved world lacking it reads false, so existing worlds keep their alerts. F5's alert on row is off / pages / name & pages. - DesktopAlert decides through an IDesktopNative seam, tested with a fake. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 6 + CLAUDE.md | 15 +- docs/PACKAGING.md | 14 + packaging/windows/sharpmuterm.iss | 12 +- src/SharpMUTerm.Avalonia/DesktopAlert.cs | 441 ++++++++++++++++++ src/SharpMUTerm.Avalonia/MainWindow.cs | 11 +- src/SharpMUTerm.Avalonia/Program.cs | 2 + src/SharpMUTerm.Avalonia/WindowAttention.cs | 94 ---- .../Settings/BuiltInSettings.cs | 6 +- .../Settings/WorldFieldValues.cs | 18 +- .../Configuration/ConfigurationMigrator.cs | 23 + .../Configuration/WorldDefinition.cs | 26 +- src/SharpMUTerm.Core/Session/WorldSession.cs | 7 +- src/SharpMUTerm.Tui/WorldsScreenRenderer.cs | 6 +- .../DesktopAlertTests.cs | 143 ++++++ .../AlertChoiceTests.cs | 42 ++ .../Automation/AttentionTests.cs | 59 ++- 17 files changed, 808 insertions(+), 117 deletions(-) create mode 100644 src/SharpMUTerm.Avalonia/DesktopAlert.cs create mode 100644 tests/SharpMUTerm.Avalonia.Tests/DesktopAlertTests.cs create mode 100644 tests/SharpMUTerm.Client.Tests/AlertChoiceTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index a56b3d8f..19a1c010 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,12 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- Alerts reach more of the desktop. On Linux (X11, and XWayland) the window is marked as wanting attention, so the + taskbar or window list highlights it until you come back. On Windows, an installed copy shows a toast as well as + flashing the taskbar, and the window groups with its Start menu shortcut. +- A new world alerts you when you are paged, told or whispered to while you are in another window (F5 ▸ alert on ▸ + pages). Alerts for your character's name stay off until you choose "name & pages", since a name comes up in every + scene. Worlds you already have keep the setting they had. - Import worlds, characters, triggers, aliases, timers and keys from MUSHclient (.mcl), Mudlet (a profile folder, an XML package or a .mpackage) and TinTin++ with `/import `, Ctrl+P ▸ Import from another client… or the welcome screen. A review shows what can act as you, what will be added and what was left out (scripts are never imported or diff --git a/CLAUDE.md b/CLAUDE.md index 6be78060..71d7ce83 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -2985,8 +2985,19 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] with F5 ▸ `alert on` a line naming the character (whole word, not the line's first) or paging/telling/whispering them (`WorldSession.AttentionRequested`, raised after the line is shown, never for a prompt or a gagged line). The client asks only with F7 ▸ `alert when away` on, the host not in front, and one per 10 s. The window - (`WindowAttention`, `DesktopAlert`) knows its focus: Windows flashes the taskbar, macOS `osascript`, Linux - `notify-send`, all argv, errors swallowed. A terminal cannot tell focus-out, so `TerminalAttention.Focused` is null: + (`WindowAttention`, `DesktopAlert`, which decides through an `IDesktopNative` seam tests fake) knows its focus. + Windows: `FlashWindowEx`, plus a toast only where the installer registered the AUMID `SharpMUTerm.Window` + (`HKA\Software\Classes\AppUserModelId\…`; the shortcuts carry it too; the process adopts it in `Program`), + shown by `powershell.exe -EncodedCommand` reaching WinRT (`net10.0` has no WinRT), the text base64 inside a fixed + script; built, never run on Windows. macOS: `/usr/bin/osascript`, argv; never run. Linux: `notify-send`, and on an + `XID` handle the urgency hint (`X11Urgency`: `WM_HINTS` UrgencyHint and `_NET_WM_STATE_DEMANDS_ATTENTION` via a + root client message, own Xlib connection, 64-bit only), taken back on `Activated`. Seen under Xvfb + openbox (a + page from a fake server sets both, activation clears both); Avalonia has no Wayland back end, so Wayland is + XWayland's mapping of the hint, untried. **Page alerts are on for a new world, name alerts off** + (`WorldDefinition.AlertOnPage = true`, `AlertOnName` false and still covering pages; F5 ▸ `alert on`: off / pages / + name & pages): a page is addressed to the player, a name comes up in every scene. A saved world lacking the field + gets `false` at load (`ConfigurationMigrator.AdoptPageAlerts`, every load, no schema step), so nobody's existing + world changes. A terminal cannot tell focus-out, so `TerminalAttention.Focused` is null: kitty gets OSC 99 with `o=unfocused` (kitty filters), WezTerm/Ghostty/foot OSC 777, anything else BEL, and those last two only after 30 s with no input (`AwayAfter`). Text is stripped of control characters and base64'd for OSC 99. While a host that knows its focus is behind, the title leads with the count of lines that arrived (`(3) …`, diff --git a/docs/PACKAGING.md b/docs/PACKAGING.md index 6c0c77b5..c4e55c55 100644 --- a/docs/PACKAGING.md +++ b/docs/PACKAGING.md @@ -75,6 +75,20 @@ arguments of its own. The link itself is read as server text (`TelnetLink`): hos name or password, no path, no command. A running client is handed the link over a socket in `$XDG_RUNTIME_DIR/sharpmuterm/` (or beside `config.json`), and the new launch exits. +### Alerts and the AppUserModelID + +The window takes the AppUserModelID `SharpMUTerm.Window` at start (`SetCurrentProcessExplicitAppUserModelID`), and +the installer gives its Start menu and desktop shortcuts the same id and writes +`Software\Classes\AppUserModelId\SharpMUTerm.Window` (`DisplayName`, and `IconUri` pointing at the installed +`sharpmuterm.png`) under `HKA`, removed on uninstall. That key is what Windows needs before it shows a toast under the +id, and its presence is how the window knows it may: an alert then shows a toast (through Windows PowerShell 5.1's +WinRT `ToastNotificationManager`, the text base64-encoded inside the script) as well as flashing the taskbar. A copy +run from the `.zip` has no key and only flashes. The program never writes the key itself. **Built, never run on +Windows**: neither the toast nor the shortcut's id has been seen on a desktop. + +Linux needs nothing from the package: `notify-send` and, on X11, the window's urgency hint. macOS uses +`/usr/bin/osascript`, which files the notification under Script Editor and asks once whether to allow it. + ### Passwords Character passwords go to the system's credential store when there is one that answers: Windows Credential Manager diff --git a/packaging/windows/sharpmuterm.iss b/packaging/windows/sharpmuterm.iss index a97a52c3..82aabf82 100644 --- a/packaging/windows/sharpmuterm.iss +++ b/packaging/windows/sharpmuterm.iss @@ -51,10 +51,13 @@ Name: "telnetlinks"; Description: "Open telnet:// and telnets:// links in SharpM Source: "{#PublishDir}\sharpmuterm-window.exe"; DestDir: "{app}"; Flags: ignoreversion Source: "{#PublishDir}\sharpmuterm.exe"; DestDir: "{app}"; Flags: ignoreversion Source: "..\..\LICENSE"; DestDir: "{app}"; DestName: "LICENSE.txt"; Flags: ignoreversion +Source: "..\icons\sharpmuterm.png"; DestDir: "{app}"; Flags: ignoreversion +; AppUserModelID: the window takes the same id at start (WindowsAppId in src/SharpMUTerm.Avalonia/DesktopAlert.cs), so +; the taskbar groups it with this shortcut and an alert's toast is shown under it. [Icons] -Name: "{autoprograms}\SharpMUTerm"; Filename: "{app}\sharpmuterm-window.exe" -Name: "{autodesktop}\SharpMUTerm"; Filename: "{app}\sharpmuterm-window.exe"; Tasks: desktopicon +Name: "{autoprograms}\SharpMUTerm"; Filename: "{app}\sharpmuterm-window.exe"; AppUserModelID: "SharpMUTerm.Window" +Name: "{autodesktop}\SharpMUTerm"; Filename: "{app}\sharpmuterm-window.exe"; AppUserModelID: "SharpMUTerm.Window"; Tasks: desktopicon ; telnet:// and telnets:// links, for this user (HKA is HKCU in the default per-user install). Only with the task above; ; the program never registers itself. --open-link makes the client read the link and nothing else, so a link holding a @@ -69,6 +72,11 @@ Root: HKA; Subkey: "Software\Classes\telnets"; ValueType: string; ValueName: "UR Root: HKA; Subkey: "Software\Classes\telnets\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: """{app}\sharpmuterm-window.exe"",0"; Tasks: telnetlinks Root: HKA; Subkey: "Software\Classes\telnets\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\sharpmuterm-window.exe"" --open-link ""%1"""; Tasks: telnetlinks +; The AppUserModelID's name and icon for toasts. Always written: its presence is what tells the window a toast can be +; shown (a portable copy has none and only flashes the taskbar). +Root: HKA; Subkey: "Software\Classes\AppUserModelId\SharpMUTerm.Window"; ValueType: string; ValueName: "DisplayName"; ValueData: "SharpMUTerm"; Flags: uninsdeletekey +Root: HKA; Subkey: "Software\Classes\AppUserModelId\SharpMUTerm.Window"; ValueType: string; ValueName: "IconUri"; ValueData: "{app}\sharpmuterm.png" + [Run] Filename: "{app}\sharpmuterm-window.exe"; Description: "{cm:LaunchProgram,SharpMUTerm}"; Flags: nowait postinstall skipifsilent diff --git a/src/SharpMUTerm.Avalonia/DesktopAlert.cs b/src/SharpMUTerm.Avalonia/DesktopAlert.cs new file mode 100644 index 00000000..c6e0a384 --- /dev/null +++ b/src/SharpMUTerm.Avalonia/DesktopAlert.cs @@ -0,0 +1,441 @@ +using System.ComponentModel; +using System.Diagnostics; +using System.Runtime.InteropServices; +using System.Text; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Avalonia; + +/// Which desktop the window is on, as far as an alert cares. +internal enum DesktopPlatform +{ + Windows, + MacOS, + Linux, +} + +/// A fixed program and its arguments, each passed as one argv entry, never a shell string. +internal sealed record AlertLaunch(string Program, IReadOnlyList Arguments); + +/// +/// Everything an alert does to the machine, behind one seam so the decisions in are tested +/// with a fake ( is the real one). +/// +internal interface IDesktopNative +{ + /// Starts and does not wait for it. + void Launch(AlertLaunch launch); + + /// Flashes the taskbar button of until it is brought forward (Windows). + void Flash(IntPtr hwnd); + + /// Sets or clears the X11 urgency hint of the window ; false when it could not. + bool SetUrgency(IntPtr xid, bool urgent); + + /// + /// Whether the installer registered (Windows), which is what lets a toast be + /// shown under it. A portable copy has none and gets the flash alone. + /// + bool ToastRegistered { get; } +} + +/// +/// What the desktop does with an alert, per platform. Every way out of the process is a fixed program with the text as +/// separate arguments, and every failure is a quiet no-op: an alert is a courtesy, never an error. +/// +/// Windows: FlashWindowEx until the window is brought forward, and a toast through +/// ToastNotificationManager under the AppUserModelID the installer registered (). The +/// toast is shown by Windows PowerShell 5.1, which can reach WinRT from a script; the text travels base64-encoded inside +/// -EncodedCommand, so nothing a server sends can become script. +/// macOS: /usr/bin/osascript with a fixed display notification script and the title and body +/// as argv. macOS files it under Script Editor and asks the player once whether to allow it. +/// Linux: notify-send, and on X11 the window's urgency hint (WM_HINTS UrgencyHint and +/// _NET_WM_STATE_DEMANDS_ATTENTION, ), cleared when the window is activated. Avalonia +/// has no Wayland back end, so under Wayland the window is an XWayland client and the hint goes through XWayland. +/// +/// +internal sealed class DesktopAlert(DesktopPlatform platform, IDesktopNative native) +{ + /// How much of a line goes into a notification; a toast or a bubble shows two or three lines at most. + internal const int MaxBody = 400; + + private IntPtr _urgentWindow; + + /// The alert for the machine this runs on. + public static DesktopAlert ForThisMachine() => new( + OperatingSystem.IsWindows() ? DesktopPlatform.Windows + : OperatingSystem.IsMacOS() ? DesktopPlatform.MacOS + : DesktopPlatform.Linux, + new DesktopNative()); + + /// + /// Shows for the window behind , whose kind is + /// (Avalonia's HWND, XID or NSWindow), both null where there is none. + /// + public void Show(AttentionRequest request, IntPtr? handle, string? descriptor) + { + try + { + if (platform == DesktopPlatform.Windows && IsWindow(handle, descriptor, "HWND") is { } hwnd) + { + native.Flash(hwnd); + } + + if (platform == DesktopPlatform.Linux && IsWindow(handle, descriptor, "XID") is { } xid && native.SetUrgency(xid, true)) + { + _urgentWindow = xid; + } + + foreach (var launch in Launches(platform, request, platform == DesktopPlatform.Windows && native.ToastRegistered)) + { + native.Launch(launch); + } + } + catch (Exception ex) when (ex is Win32Exception or InvalidOperationException or PlatformNotSupportedException + or DllNotFoundException or EntryPointNotFoundException) + { + // No notifier on this machine: the title bar's count still says it. + } + } + + /// The window was brought forward: takes back an urgency hint this set. The flash stops by itself. + public void Clear() + { + if (_urgentWindow == IntPtr.Zero) + { + return; + } + + var xid = _urgentWindow; + _urgentWindow = IntPtr.Zero; + try + { + native.SetUrgency(xid, false); + } + catch (Exception ex) when (ex is DllNotFoundException or EntryPointNotFoundException) + { + // Nothing was set. + } + } + + /// Whether an urgency hint this set is still up (tests). + internal bool Urgent => _urgentWindow != IntPtr.Zero; + + /// The programs an alert starts on . + internal static IReadOnlyList Launches(DesktopPlatform platform, AttentionRequest request, bool toastRegistered) + { + var title = Bound(request.Title, 120); + var body = Bound(request.Body, MaxBody); + return platform switch + { + DesktopPlatform.Windows => toastRegistered ? [WindowsToast.Launch(WindowsAppId.Value, title, body)] : [], + DesktopPlatform.MacOS => + [ + new AlertLaunch("/usr/bin/osascript", + ["-e", "on run argv", "-e", "display notification (item 2 of argv) with title (item 1 of argv)", "-e", "end run", + title, body]), + ], + _ => [new AlertLaunch("notify-send", ["--app-name=SharpMUTerm", "--", title, body])], + }; + } + + private static IntPtr? IsWindow(IntPtr? handle, string? descriptor, string kind) => + handle is { } value && value != IntPtr.Zero && string.Equals(descriptor, kind, StringComparison.Ordinal) ? value : null; + + /// Control characters out (a notification is one or two lines), and at most characters. + internal static string Bound(string text, int max) + { + var clean = new StringBuilder(Math.Min(text.Length, max)); + foreach (var c in text) + { + if (clean.Length >= max) + { + break; + } + + clean.Append(char.IsControl(c) ? ' ' : c); + } + + if (clean.Length > 0 && char.IsHighSurrogate(clean[^1])) + { + clean.Length--; + } + + return clean.ToString(); + } +} + +/// +/// The AppUserModelID the window runs under on Windows. The process takes it at start +/// (SetCurrentProcessExplicitAppUserModelID), the installer's Start-menu shortcut carries it, and the installer +/// registers it under Software\Classes\AppUserModelId with a display name and an icon, which is what Windows needs +/// before a toast is shown under it. The program never registers it itself (the telnet-link rule). +/// +internal static class WindowsAppId +{ + /// The id. The installer (packaging/windows/sharpmuterm.iss) spells it too. + public const string Value = "SharpMUTerm.Window"; + + /// Takes for this process, so the taskbar groups the window with its shortcut. Windows only. + public static void Adopt() + { + if (!OperatingSystem.IsWindows()) + { + return; + } + + try + { + _ = SetCurrentProcessExplicitAppUserModelID(Value); + } + catch (Exception ex) when (ex is DllNotFoundException or EntryPointNotFoundException) + { + // Older than Windows 7: nothing to group by. + } + } + + [DllImport("shell32.dll", CharSet = CharSet.Unicode)] + private static extern int SetCurrentProcessExplicitAppUserModelID(string appId); +} + +/// +/// A Windows toast through WinRT's ToastNotificationManager, shown by Windows PowerShell 5.1 because .NET on the +/// plain net10.0 target reaches no WinRT itself (that needs a -windows TFM, which the Linux build and the +/// shared assemblies cannot take). The script is fixed; the title, body and id are base64 inside it, decoded by the +/// script and added as text nodes, so neither PowerShell nor the toast's XML ever parses server text. +/// +internal static class WindowsToast +{ + /// The powershell.exe launch that shows one toast. + public static AlertLaunch Launch(string appId, string title, string body) => + new("powershell.exe", + ["-NoProfile", "-NonInteractive", "-ExecutionPolicy", "Bypass", "-WindowStyle", "Hidden", + "-EncodedCommand", Convert.ToBase64String(Encoding.Unicode.GetBytes(Script(appId, title, body)))]); + + /// The script encodes. + internal static string Script(string appId, string title, string body) => + string.Join('\n', + "$ErrorActionPreference = 'Stop'", + "[void][Windows.UI.Notifications.ToastNotificationManager, Windows.UI.Notifications, ContentType = WindowsRuntime]", + "[void][Windows.Data.Xml.Dom.XmlDocument, Windows.Data.Xml.Dom.XmlDocument, ContentType = WindowsRuntime]", + "function D($s) { [Text.Encoding]::UTF8.GetString([Convert]::FromBase64String($s)) }", + "$x = [Windows.UI.Notifications.ToastNotificationManager]::GetTemplateContent([Windows.UI.Notifications.ToastTemplateType]::ToastText02)", + "$n = $x.GetElementsByTagName('text')", + $"[void]$n.Item(0).AppendChild($x.CreateTextNode((D '{Base64(title)}')))", + $"[void]$n.Item(1).AppendChild($x.CreateTextNode((D '{Base64(body)}')))", + $"[Windows.UI.Notifications.ToastNotificationManager]::CreateToastNotifier((D '{Base64(appId)}')).Show([Windows.UI.Notifications.ToastNotification]::new($x))"); + + private static string Base64(string text) => Convert.ToBase64String(Encoding.UTF8.GetBytes(text)); +} + +/// The real . +internal sealed class DesktopNative : IDesktopNative +{ + private bool? _toastRegistered; + + public bool ToastRegistered => _toastRegistered ??= ReadToastRegistered(); + + public void Launch(AlertLaunch launch) + { + var start = new ProcessStartInfo(launch.Program) + { + UseShellExecute = false, + RedirectStandardOutput = true, + RedirectStandardError = true, + CreateNoWindow = true, + }; + foreach (var argument in launch.Arguments) + { + start.ArgumentList.Add(argument); + } + + using var process = Process.Start(start); + } + + public void Flash(IntPtr hwnd) + { + if (OperatingSystem.IsWindows()) + { + WindowsFlash.Flash(hwnd); + } + } + + public bool SetUrgency(IntPtr xid, bool urgent) => + OperatingSystem.IsLinux() || OperatingSystem.IsFreeBSD() ? X11Urgency.Set(xid, urgent) : false; + + private static bool ReadToastRegistered() + { + if (!OperatingSystem.IsWindows()) + { + return false; + } + + try + { + const string key = @"Software\Classes\AppUserModelId\" + WindowsAppId.Value; + using var user = Microsoft.Win32.Registry.CurrentUser.OpenSubKey(key); + using var machine = user is null ? Microsoft.Win32.Registry.LocalMachine.OpenSubKey(key) : null; + return user is not null || machine is not null; + } + catch (Exception ex) when (ex is System.Security.SecurityException or UnauthorizedAccessException or IOException) + { + return false; + } + } +} + +/// FlashWindowEx. +internal static class WindowsFlash +{ + public static void Flash(IntPtr hwnd) + { + var info = new FlashInfo + { + Size = (uint)Marshal.SizeOf(), + Window = hwnd, + Flags = FlashAll | FlashUntilForeground, + Count = 0, + Timeout = 0, + }; + FlashWindowEx(ref info); + } + + private const uint FlashAll = 3; + private const uint FlashUntilForeground = 12; + + [StructLayout(LayoutKind.Sequential)] + private struct FlashInfo + { + public uint Size; + public IntPtr Window; + public uint Flags; + public uint Count; + public uint Timeout; + } + + [DllImport("user32.dll")] + [return: MarshalAs(UnmanagedType.Bool)] + private static extern bool FlashWindowEx(ref FlashInfo info); +} + +/// +/// The X11 urgency hint, set the two ways window managers read it: the ICCCM WM_HINTS UrgencyHint flag (which +/// the window manager may clear on focus) and the EWMH _NET_WM_STATE_DEMANDS_ATTENTION state, asked of the root +/// window with a client message as EWMH requires. Each call opens its own display connection (window ids are +/// server-wide, so Avalonia's own connection is not needed) and closes it after a flush. 64-bit only, which is every +/// platform the window ships for; anywhere else it says it did nothing. +/// +internal static class X11Urgency +{ + private const long UrgencyHint = 1L << 8; + private const long SubstructureNotifyMask = 1L << 19; + private const long SubstructureRedirectMask = 1L << 20; + private const int ClientMessage = 33; + private const long StateRemove = 0; + private const long StateAdd = 1; + private const long SourceApplication = 1; + + public static bool Set(IntPtr window, bool urgent) + { + if (!Environment.Is64BitProcess || window == IntPtr.Zero) + { + return false; + } + + var display = XOpenDisplay(IntPtr.Zero); + if (display == IntPtr.Zero) + { + return false; + } + + try + { + var hints = XGetWMHints(display, window); + var owned = hints == IntPtr.Zero; + if (owned) + { + hints = XAllocWMHints(); + } + + if (hints != IntPtr.Zero) + { + var flags = Marshal.ReadInt64(hints); + Marshal.WriteInt64(hints, urgent ? flags | UrgencyHint : flags & ~UrgencyHint); + XSetWMHints(display, window, hints); + XFree(hints); + } + + var message = new ClientMessageEvent + { + Type = ClientMessage, + SendEvent = 1, + Display = display, + Window = window, + MessageType = XInternAtom(display, "_NET_WM_STATE", false), + Format = 32, + Data0 = (IntPtr)(urgent ? StateAdd : StateRemove), + Data1 = XInternAtom(display, "_NET_WM_STATE_DEMANDS_ATTENTION", false), + Data2 = IntPtr.Zero, + Data3 = (IntPtr)SourceApplication, + }; + XSendEvent(display, XDefaultRootWindow(display), false, + (IntPtr)(SubstructureNotifyMask | SubstructureRedirectMask), ref message); + XFlush(display); + return true; + } + finally + { + XCloseDisplay(display); + } + } + + /// XClientMessageEvent, padded to the size of the XEvent union (24 longs) that XSendEvent reads. + [StructLayout(LayoutKind.Explicit, Size = 192)] + private struct ClientMessageEvent + { + [FieldOffset(0)] public int Type; + [FieldOffset(8)] public IntPtr Serial; + [FieldOffset(16)] public int SendEvent; + [FieldOffset(24)] public IntPtr Display; + [FieldOffset(32)] public IntPtr Window; + [FieldOffset(40)] public IntPtr MessageType; + [FieldOffset(48)] public int Format; + [FieldOffset(56)] public IntPtr Data0; + [FieldOffset(64)] public IntPtr Data1; + [FieldOffset(72)] public IntPtr Data2; + [FieldOffset(80)] public IntPtr Data3; + [FieldOffset(88)] public IntPtr Data4; + } + + private const string LibX11 = "libX11.so.6"; + + [DllImport(LibX11)] + private static extern IntPtr XOpenDisplay(IntPtr name); + + [DllImport(LibX11)] + private static extern int XCloseDisplay(IntPtr display); + + [DllImport(LibX11)] + private static extern IntPtr XDefaultRootWindow(IntPtr display); + + [DllImport(LibX11, CharSet = CharSet.Ansi, BestFitMapping = false)] + private static extern IntPtr XInternAtom(IntPtr display, string name, [MarshalAs(UnmanagedType.Bool)] bool onlyIfExists); + + [DllImport(LibX11)] + private static extern IntPtr XGetWMHints(IntPtr display, IntPtr window); + + [DllImport(LibX11)] + private static extern IntPtr XAllocWMHints(); + + [DllImport(LibX11)] + private static extern int XSetWMHints(IntPtr display, IntPtr window, IntPtr hints); + + [DllImport(LibX11)] + private static extern int XFree(IntPtr data); + + [DllImport(LibX11)] + private static extern int XSendEvent(IntPtr display, IntPtr window, [MarshalAs(UnmanagedType.Bool)] bool propagate, IntPtr mask, ref ClientMessageEvent message); + + [DllImport(LibX11)] + private static extern int XFlush(IntPtr display); +} diff --git a/src/SharpMUTerm.Avalonia/MainWindow.cs b/src/SharpMUTerm.Avalonia/MainWindow.cs index d3200500..5b194a6e 100644 --- a/src/SharpMUTerm.Avalonia/MainWindow.cs +++ b/src/SharpMUTerm.Avalonia/MainWindow.cs @@ -45,13 +45,20 @@ public MainWindow(WindowOptions options, IClassicDesktopStyleApplicationLifetime _driver.TitleBar.Changed += title => Dispatcher.UIThread.Post(() => Title = title); // Whether the window is in front decides whether an alert is shown at all, and the title's unread count. - Activated += (_, _) => _driver.Attention.SetFocused(true); + // Activation also takes back an X11 urgency hint the alert set (DesktopAlert). + var alert = DesktopAlert.ForThisMachine(); + Activated += (_, _) => + { + _driver.Attention.SetFocused(true); + alert.Clear(); + }; Deactivated += (_, _) => _driver.Attention.SetFocused(false); _driver.Attention.Requested += request => Dispatcher.UIThread.Post(() => { if (!IsActive) { - DesktopAlert.Show(request, TryGetPlatformHandle()?.Handle); + var handle = TryGetPlatformHandle(); + alert.Show(request, handle?.Handle, handle?.HandleDescriptor); } }); _driver.Settings.Owner = this; diff --git a/src/SharpMUTerm.Avalonia/Program.cs b/src/SharpMUTerm.Avalonia/Program.cs index 057231a3..e5be0f5a 100644 --- a/src/SharpMUTerm.Avalonia/Program.cs +++ b/src/SharpMUTerm.Avalonia/Program.cs @@ -35,6 +35,8 @@ private static int Main(string[] args) return 0; } + // The taskbar groups the window under the id its installed shortcut carries, and a toast is shown under it. + WindowsAppId.Adopt(); App.Options = options; return BuildAvaloniaApp().StartWithClassicDesktopLifetime(options.ClientArgs); } diff --git a/src/SharpMUTerm.Avalonia/WindowAttention.cs b/src/SharpMUTerm.Avalonia/WindowAttention.cs index b8c12a24..ae401d13 100644 --- a/src/SharpMUTerm.Avalonia/WindowAttention.cs +++ b/src/SharpMUTerm.Avalonia/WindowAttention.cs @@ -1,6 +1,3 @@ -using System.ComponentModel; -using System.Diagnostics; -using System.Runtime.InteropServices; using SharpMUTerm.Tui; namespace SharpMUTerm.Avalonia; @@ -42,94 +39,3 @@ public void SetFocused(bool focused) } } -/// -/// What the desktop does with an alert: a notification, and on Windows the taskbar button's flash. Every way out of -/// the process is a fixed program with the text as separate arguments (), -/// never a shell string, and a missing program is a quiet no-op: an alert is a courtesy, never an error. -/// -/// Linux: notify-send (libnotify, on every desktop that runs a notification daemon). macOS: osascript, -/// the title and body passed as argv to a fixed script. Windows: FlashWindowEx until the window is -/// brought forward — a toast needs an installed AppUserModelID this client does not register. Avalonia has no -/// urgency API of its own, so an X11 window manager's urgency hint is not set. -/// -/// -internal static class DesktopAlert -{ - /// Shows for the window behind (null where there is none). - public static void Show(AttentionRequest request, IntPtr? handle) - { - try - { - if (OperatingSystem.IsWindows()) - { - if (handle is { } hwnd && hwnd != IntPtr.Zero) - { - Flash(hwnd); - } - - return; - } - - if (OperatingSystem.IsMacOS()) - { - Run("osascript", - ["-e", "on run argv", "-e", "display notification (item 2 of argv) with title (item 1 of argv)", "-e", "end run", - request.Title, request.Body]); - return; - } - - Run("notify-send", ["--app-name=SharpMUTerm", "--", request.Title, request.Body]); - } - catch (Exception ex) when (ex is Win32Exception or InvalidOperationException or PlatformNotSupportedException) - { - // No notifier on this machine: the title bar's count still says it. - } - } - - private static void Run(string program, IReadOnlyList arguments) - { - var start = new ProcessStartInfo(program) - { - UseShellExecute = false, - RedirectStandardOutput = true, - RedirectStandardError = true, - CreateNoWindow = true, - }; - foreach (var argument in arguments) - { - start.ArgumentList.Add(argument); - } - - using var process = Process.Start(start); - } - - private static void Flash(IntPtr hwnd) - { - var info = new FlashInfo - { - Size = (uint)Marshal.SizeOf(), - Window = hwnd, - Flags = FlashAll | FlashUntilForeground, - Count = 0, - Timeout = 0, - }; - FlashWindowEx(ref info); - } - - private const uint FlashAll = 3; - private const uint FlashUntilForeground = 12; - - [StructLayout(LayoutKind.Sequential)] - private struct FlashInfo - { - public uint Size; - public IntPtr Window; - public uint Flags; - public uint Count; - public uint Timeout; - } - - [DllImport("user32.dll")] - [return: MarshalAs(UnmanagedType.Bool)] - private static extern bool FlashWindowEx(ref FlashInfo info); -} diff --git a/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs b/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs index 06e1c619..6d773b2d 100644 --- a/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs +++ b/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs @@ -286,9 +286,9 @@ public static partial class BuiltInSettings (_, w, v) => w.CommandSeparator = WorldFieldValues.SeparatorOf(v), "split a typed line on this, and #3 cmd repeats one; off for a MUSH", "separator semicolon repeat speedwalk"), WorldChoice("alert-on", "alert on", WorldFieldValues.AlertChoices, WorldTextGroup, - (_, w) => w.AlertOnName ? WorldFieldValues.AlertChoices[1] : WorldFieldValues.AlertChoices[0], - (_, w, v) => w.AlertOnName = v == WorldFieldValues.AlertChoices[1], - "tell the desktop when a line names your character or pages you", "notify mention page tell"), + (_, w) => WorldFieldValues.AlertName(w), + (_, w, v) => WorldFieldValues.SetAlert(w, v), + "tell the desktop when you are paged, or your character is named too", "notify mention page tell"), WorldChoice("capture-channels", "capture channels", WorldFieldValues.ChannelCaptureChoices, WorldTextGroup, (_, w) => WorldFieldValues.ChannelCaptureName(w.CaptureChannels), (_, w, v) => w.CaptureChannels = WorldFieldValues.ChannelCaptureOf(v), diff --git a/src/SharpMUTerm.Client/Settings/WorldFieldValues.cs b/src/SharpMUTerm.Client/Settings/WorldFieldValues.cs index 9b900897..2997abd6 100644 --- a/src/SharpMUTerm.Client/Settings/WorldFieldValues.cs +++ b/src/SharpMUTerm.Client/Settings/WorldFieldValues.cs @@ -97,8 +97,22 @@ public static string JoinWrapsAdvice(int column, int paneWidth) => /// The words for . public static IReadOnlyList ReconnectChoices { get; } = ["off", "after a drop"]; - /// The words for . - public static IReadOnlyList AlertChoices { get; } = ["off", "name & pages"]; + /// + /// The words for and together: + /// nothing, pages only (a new world's default), or the character's name as well. + /// + public static IReadOnlyList AlertChoices { get; } = ["off", "pages", "name & pages"]; + + /// The alert on row's word for . + public static string AlertName(WorldDefinition world) => + world.AlertOnName ? AlertChoices[2] : world.AlertOnPage ? AlertChoices[1] : AlertChoices[0]; + + /// Sets both alert fields from one of . + public static void SetAlert(WorldDefinition world, string choice) + { + world.AlertOnName = choice == AlertChoices[2]; + world.AlertOnPage = choice == AlertChoices[1] || choice == AlertChoices[2]; + } /// /// The words for : off, or the separator itself. A closed list, so a diff --git a/src/SharpMUTerm.Core/Configuration/ConfigurationMigrator.cs b/src/SharpMUTerm.Core/Configuration/ConfigurationMigrator.cs index 10da3ecc..0f29dc4c 100644 --- a/src/SharpMUTerm.Core/Configuration/ConfigurationMigrator.cs +++ b/src/SharpMUTerm.Core/Configuration/ConfigurationMigrator.cs @@ -38,9 +38,32 @@ public static void Migrate(JsonObject root) MigrateV4ToV5(root); } + AdoptPageAlerts(root); root["version"] = AppConfiguration.CurrentVersion; } + /// + /// A world saved before existed keeps the alerts it had: the field is + /// written as false where it is missing, so only a world made from now on gets page alerts by default. Not a + /// schema step: it runs on every load and changes nothing in a file that has the field, because it adds a field + /// with the meaning the file already had rather than moving one. + /// + private static void AdoptPageAlerts(JsonObject root) + { + if (root["worlds"] is not JsonArray worlds) + { + return; + } + + foreach (var world in worlds.OfType()) + { + if (!world.ContainsKey("alertOnPage")) + { + world["alertOnPage"] = false; + } + } + } + /// /// v4's spawn window ids named only their target (spawn:Public), so a workspace held one /// capture pane per target however many characters were capturing into it. v5 puts the owning diff --git a/src/SharpMUTerm.Core/Configuration/WorldDefinition.cs b/src/SharpMUTerm.Core/Configuration/WorldDefinition.cs index e443d32a..376cd601 100644 --- a/src/SharpMUTerm.Core/Configuration/WorldDefinition.cs +++ b/src/SharpMUTerm.Core/Configuration/WorldDefinition.cs @@ -221,12 +221,31 @@ public sealed class WorldDefinition public string? CommandSeparator { get; set; } /// - /// Whether a line naming this world's character, or a page or a tell, asks for attention while the player is in - /// another window (F5 ▸ alert on; ). Off by default. A trigger can - /// ask for the same with its own alert flag on any world. + /// Whether a line naming this world's character asks for attention while the player is in another window, and a + /// page, tell or whisper with it (F5 ▸ alert on ▸ name & pages; + /// ). Off by default: a name is said in every scene the character is in, + /// so a name alert is noisy and the player opts in. A trigger can ask for attention with its own alert flag + /// on any world. /// public bool AlertOnName { get; set; } + /// + /// Whether a page, tell or whisper to the character asks for attention while the player is in another window + /// (F5 ▸ alert on ▸ pages). On for a world made now, off for one saved before the field existed: + /// a page is addressed to the player and rare, so it is the alert worth having unasked, but a world the player + /// already set up is not changed under them — writes false into a saved + /// world that lacks the field, with no schema step. covers pages as well, as it always did. + /// + public bool AlertOnPage { get; set; } = true; + + /// Whether may ask for attention on this world (a trigger's flag always may). + public bool Alerts(Automation.AttentionReason reason) => reason switch + { + Automation.AttentionReason.Name => AlertOnName, + Automation.AttentionReason.Page => AlertOnPage || AlertOnName, + _ => true, + }; + /// /// The world's accent colour, used to keep its windows traceable to their owner once they /// scatter across panes. Default resolves to a theme-derived accent. @@ -281,6 +300,7 @@ public sealed class WorldDefinition AutoReconnect = AutoReconnect, CommandSeparator = CommandSeparator, AlertOnName = AlertOnName, + AlertOnPage = AlertOnPage, GmcpLogin = GmcpLogin, DiscordPresence = DiscordPresence, CaptureChannels = CaptureChannels, diff --git a/src/SharpMUTerm.Core/Session/WorldSession.cs b/src/SharpMUTerm.Core/Session/WorldSession.cs index 228f51e5..26e58e3e 100644 --- a/src/SharpMUTerm.Core/Session/WorldSession.cs +++ b/src/SharpMUTerm.Core/Session/WorldSession.cs @@ -1088,9 +1088,12 @@ private void ProcessOutputLineNow(StyledLine line, bool isPrompt = false) // Asked for by a rule (shown or not: the rule said so), or by the world for a line that mentions the // character or pages them — only a line someone will see, and never a prompt. var shownSomewhere = result.RouteMain || !suppress || result.SpawnTargets.Count > 0; - var reason = result.Matched.Any(t => t.Actions.Alert) + AttentionReason? reason = result.Matched.Any(t => t.Actions.Alert) ? AttentionReason.Trigger - : World.AlertOnName && shownSomewhere && !isPrompt ? AttentionMatcher.Classify(shown.Text, Character?.Name) : null; + : (World.AlertOnName || World.AlertOnPage) && shownSomewhere && !isPrompt + && AttentionMatcher.Classify(shown.Text, Character?.Name) is { } matched && World.Alerts(matched) + ? matched + : null; if (reason is { } why) { AttentionRequested?.Invoke(this, new AttentionEventArgs(why, shown.Text)); diff --git a/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs b/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs index b187f2fe..0ddc4108 100644 --- a/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs +++ b/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs @@ -110,7 +110,7 @@ internal static class WorldsScreenRenderer /// , as one of . internal const int StackingField = 18; - /// , as one of . + /// and , as one of . internal const int AlertOnField = 19; /// , as one of . @@ -1093,8 +1093,8 @@ world.CommandSeparator is { } separator selectedWorld, StackingField)), WorldField("alert on", Field( - world.AlertOnName - ? $"[{Value}]{AlertChoices[1]}[/]" + world.AlertOnName || world.AlertOnPage + ? $"[{Value}]{WorldFieldValues.AlertName(world)}[/]" : $"[{Label}]{AlertChoices[0]} · alert triggers only[/]", cursor, selectedWorld, diff --git a/tests/SharpMUTerm.Avalonia.Tests/DesktopAlertTests.cs b/tests/SharpMUTerm.Avalonia.Tests/DesktopAlertTests.cs new file mode 100644 index 00000000..045d83a1 --- /dev/null +++ b/tests/SharpMUTerm.Avalonia.Tests/DesktopAlertTests.cs @@ -0,0 +1,143 @@ +using System.Text; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Avalonia.Tests; + +/// +/// What an alert does on each desktop, read through a fake of everything that reaches the machine: which program +/// starts with which arguments, when the taskbar flashes, and when the X11 urgency hint goes up and comes down. The +/// real notifiers, the toast and the hint are not exercised here (see CLAUDE.md for what has been seen on a desktop). +/// +public class DesktopAlertTests +{ + private static readonly AttentionRequest Page = new("Corvid@Aetherfall", "Rivane pages: are you there?"); + + private sealed class FakeNative : IDesktopNative + { + public List Launched { get; } = []; + + public List Flashed { get; } = []; + + public List<(IntPtr Window, bool Urgent)> Urgency { get; } = []; + + public bool ToastRegistered { get; set; } + + public bool UrgencyWorks { get; set; } = true; + + public void Launch(AlertLaunch launch) => Launched.Add(launch); + + public void Flash(IntPtr hwnd) => Flashed.Add(hwnd); + + public bool SetUrgency(IntPtr xid, bool urgent) + { + Urgency.Add((xid, urgent)); + return UrgencyWorks; + } + } + + [Test] + public async Task OnX11TheWindowIsMarkedUrgentAndActivationTakesItBack() + { + var native = new FakeNative(); + var alert = new DesktopAlert(DesktopPlatform.Linux, native); + + alert.Show(Page, 0x2a00007, "XID"); + + await Assert.That(native.Urgency).IsEquivalentTo([((IntPtr)0x2a00007, true)]); + await Assert.That(alert.Urgent).IsTrue(); + await Assert.That(native.Launched.Single().Program).IsEqualTo("notify-send"); + await Assert.That(native.Launched.Single().Arguments) + .IsEquivalentTo(["--app-name=SharpMUTerm", "--", Page.Title, Page.Body]); + + alert.Clear(); + alert.Clear(); + await Assert.That(native.Urgency).IsEquivalentTo([((IntPtr)0x2a00007, true), ((IntPtr)0x2a00007, false)]); + await Assert.That(alert.Urgent).IsFalse(); + await Assert.That(native.Flashed).IsEmpty(); + } + + [Test] + public async Task AWindowThatIsNotAnX11WindowGetsNoHintAndNothingIsTakenBack() + { + var native = new FakeNative(); + var alert = new DesktopAlert(DesktopPlatform.Linux, native); + + alert.Show(Page, 0x10, "Wayland"); + alert.Show(Page, null, null); + alert.Clear(); + + await Assert.That(native.Urgency).IsEmpty(); + await Assert.That(native.Launched.Count).IsEqualTo(2); + } + + [Test] + public async Task AHintThatCouldNotBeSetIsNotTakenBack() + { + var native = new FakeNative { UrgencyWorks = false }; + var alert = new DesktopAlert(DesktopPlatform.Linux, native); + + alert.Show(Page, 0x2a00007, "XID"); + alert.Clear(); + + await Assert.That(native.Urgency.Count).IsEqualTo(1); + } + + [Test] + public async Task OnWindowsTheTaskbarFlashesAndAToastGoesOnlyWhereTheInstallerRegisteredTheId() + { + var portable = new FakeNative(); + new DesktopAlert(DesktopPlatform.Windows, portable).Show(Page, 0x1234, "HWND"); + await Assert.That(portable.Flashed).IsEquivalentTo([(IntPtr)0x1234]); + await Assert.That(portable.Launched).IsEmpty(); + + var installed = new FakeNative { ToastRegistered = true }; + new DesktopAlert(DesktopPlatform.Windows, installed).Show(Page, 0x1234, "HWND"); + await Assert.That(installed.Flashed.Count).IsEqualTo(1); + var toast = installed.Launched.Single(); + await Assert.That(toast.Program).IsEqualTo("powershell.exe"); + await Assert.That(toast.Arguments.Take(toast.Arguments.Count - 1)) + .IsEquivalentTo(["-NoProfile", "-NonInteractive", "-ExecutionPolicy", "Bypass", "-WindowStyle", "Hidden", "-EncodedCommand"]); + await Assert.That(installed.Urgency).IsEmpty(); + } + + [Test] + public async Task TheToastScriptCarriesTheTextOnlyAsBase64() + { + const string hostile = "'; Remove-Item C:\\ -Recurse; '&\"$(whoami)\""; + var launch = WindowsToast.Launch(WindowsAppId.Value, "Corvid", hostile); + var script = Encoding.Unicode.GetString(Convert.FromBase64String(launch.Arguments[^1])); + + await Assert.That(script).IsEqualTo(WindowsToast.Script(WindowsAppId.Value, "Corvid", hostile)); + await Assert.That(script).DoesNotContain("Remove-Item"); + await Assert.That(script).DoesNotContain("whoami"); + await Assert.That(script).Contains(Convert.ToBase64String(Encoding.UTF8.GetBytes(hostile))); + await Assert.That(script).Contains(Convert.ToBase64String(Encoding.UTF8.GetBytes("SharpMUTerm.Window"))); + await Assert.That(script).Contains("CreateToastNotifier"); + await Assert.That(script).Contains("CreateTextNode"); + } + + [Test] + public async Task OnMacOSTheTextIsArgvToAFixedScript() + { + var native = new FakeNative(); + new DesktopAlert(DesktopPlatform.MacOS, native).Show(Page, 0x55, "NSWindow"); + + var launch = native.Launched.Single(); + await Assert.That(launch.Program).IsEqualTo("/usr/bin/osascript"); + await Assert.That(launch.Arguments[^2]).IsEqualTo(Page.Title); + await Assert.That(launch.Arguments[^1]).IsEqualTo(Page.Body); + await Assert.That(native.Flashed).IsEmpty(); + await Assert.That(native.Urgency).IsEmpty(); + } + + [Test] + public async Task TheTextIsOneLineAndBounded() + { + var request = new AttentionRequest("A\u001b]0;x\u0007", new string('z', 1000) + "\nmore"); + var launch = DesktopAlert.Launches(DesktopPlatform.Linux, request, toastRegistered: false).Single(); + + await Assert.That(launch.Arguments[^2]).IsEqualTo("A ]0;x "); + await Assert.That(launch.Arguments[^1].Length).IsEqualTo(DesktopAlert.MaxBody); + await Assert.That(DesktopAlert.Bound("ab\U0001F600", 3)).IsEqualTo("ab"); + } +} diff --git a/tests/SharpMUTerm.Client.Tests/AlertChoiceTests.cs b/tests/SharpMUTerm.Client.Tests/AlertChoiceTests.cs new file mode 100644 index 00000000..9751a964 --- /dev/null +++ b/tests/SharpMUTerm.Client.Tests/AlertChoiceTests.cs @@ -0,0 +1,42 @@ +using SharpMUTerm.Client.Settings; +using SharpMUTerm.Core.Configuration; + +namespace SharpMUTerm.Client.Tests; + +/// F5's alert on row: one choice over the page and name fields, and a new world reads pages. +public class AlertChoiceTests +{ + [Test] + public async Task ANewWorldReadsPages() + { + await Assert.That(WorldFieldValues.AlertName(new WorldDefinition())).IsEqualTo("pages"); + } + + [Test] + [Arguments("off", false, false)] + [Arguments("pages", true, false)] + [Arguments("name & pages", true, true)] + public async Task EachChoiceSetsBothFieldsAndReadsBack(string choice, bool page, bool name) + { + var world = new WorldDefinition { AlertOnName = !name, AlertOnPage = !page }; + + WorldFieldValues.SetAlert(world, choice); + + await Assert.That(world.AlertOnPage).IsEqualTo(page); + await Assert.That(world.AlertOnName).IsEqualTo(name); + await Assert.That(WorldFieldValues.AlertName(world)).IsEqualTo(choice); + } + + [Test] + public async Task TheDeclaredFieldResetsToPages() + { + var config = new AppConfiguration(); + var world = new WorldDefinition { Name = "W", Host = "h", Port = 1, AlertOnPage = false }; + config.Worlds.Add(world); + var field = BuiltInSettings.World.Fields.Single(f => f.Id == "alert-on"); + + await Assert.That(WorldFieldValues.AlertName(world)).IsEqualTo("off"); + ((SettingBinding)field.Binding!).Reset(new SettingTarget(config, world)); + await Assert.That(WorldFieldValues.AlertName(world)).IsEqualTo("pages"); + } +} diff --git a/tests/SharpMUTerm.Core.Tests/Automation/AttentionTests.cs b/tests/SharpMUTerm.Core.Tests/Automation/AttentionTests.cs index a91b3f03..efabd547 100644 --- a/tests/SharpMUTerm.Core.Tests/Automation/AttentionTests.cs +++ b/tests/SharpMUTerm.Core.Tests/Automation/AttentionTests.cs @@ -43,10 +43,11 @@ public async Task TheThrottleLetsOneAlertThroughPerInterval() await Assert.That(throttle.TryTake()).IsTrue(); } - private static async Task<(FakeTelnetSession Telnet, List Raised)> Open(bool alertOnName, Trigger? trigger = null) + private static async Task<(FakeTelnetSession Telnet, List Raised)> Open( + bool alertOnName, Trigger? trigger = null, bool alertOnPage = false) { var telnet = new FakeTelnetSession(); - var world = new WorldDefinition { Name = "Aetherfall", Host = "h", Port = 1, AlertOnName = alertOnName }; + var world = new WorldDefinition { Name = "Aetherfall", Host = "h", Port = 1, AlertOnName = alertOnName, AlertOnPage = alertOnPage }; var set = new TriggerSet { Name = "s" }; if (trigger is not null) { @@ -85,12 +86,62 @@ public async Task AWorldThatDoesNotOptInIsToldOnlyOfAnAlertTrigger() await Assert.That(raised.Select(e => e.Reason)).IsEquivalentTo([AttentionReason.Trigger]); } + [Test] + public async Task AWorldWithPageAlertsIsToldOfAPageAndNotOfAMention() + { + var (telnet, raised) = await Open(alertOnName: false, alertOnPage: true); + + telnet.EmitLine("Rivane nods to Corvid."); + telnet.EmitLine("Rivane tells you 'hi'"); + + await Assert.That(raised.Select(e => e.Reason)).IsEquivalentTo([AttentionReason.Page]); + } + + [Test] + public async Task ANewWorldAlertsOnPagesAndNotOnTheName() + { + var world = new WorldDefinition(); + + await Assert.That(world.AlertOnPage).IsTrue(); + await Assert.That(world.AlertOnName).IsFalse(); + await Assert.That(world.Alerts(AttentionReason.Page)).IsTrue(); + await Assert.That(world.Alerts(AttentionReason.Name)).IsFalse(); + await Assert.That(world.Alerts(AttentionReason.Trigger)).IsTrue(); + + // The name rule covers pages, as it did before pages had a field of their own. + world.AlertOnPage = false; + world.AlertOnName = true; + await Assert.That(world.Alerts(AttentionReason.Page)).IsTrue(); + } + + [Test] + public async Task AWorldSavedBeforePageAlertsKeepsWhatItHad() + { + const string json = """ + { "version": 5, "worlds": [ + { "name": "Old", "host": "h", "port": 1 }, + { "name": "Named", "host": "h", "port": 2, "alertOnName": true }, + { "name": "New", "host": "h", "port": 3, "alertOnPage": true } ] } + """; + + var config = ConfigurationStore.Deserialize(json); + + await Assert.That(config.Worlds.Select(w => w.AlertOnPage)).IsEquivalentTo([false, false, true]); + await Assert.That(config.Worlds[1].Alerts(AttentionReason.Page)).IsTrue(); + + // A world made now and saved comes back with page alerts on. + var saved = new AppConfiguration(); + saved.Worlds.Add(new WorldDefinition { Name = "Fresh", Host = "h", Port = 4 }); + var reloaded = ConfigurationStore.Deserialize(ConfigurationStore.Serialize(saved)); + await Assert.That(reloaded.Worlds[0].AlertOnPage).IsTrue(); + } + [Test] public async Task TheAlertFlagIsCopiedWithTheRule() { var trigger = new Trigger { Name = "t", Pattern = "x", Actions = { Alert = true } }; await Assert.That(trigger.Clone().Actions.Alert).IsTrue(); - await Assert.That(new WorldDefinition { AutoReconnect = true, CommandSeparator = ";", AlertOnName = true }.Clone() is - { AutoReconnect: true, CommandSeparator: ";", AlertOnName: true }).IsTrue(); + await Assert.That(new WorldDefinition { AutoReconnect = true, CommandSeparator = ";", AlertOnName = true, AlertOnPage = false }.Clone() is + { AutoReconnect: true, CommandSeparator: ";", AlertOnName: true, AlertOnPage: false }).IsTrue(); } } From cbec8a4d06b10c6662e392fab9313ede332a5ccf Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 14:39:04 +0000 Subject: [PATCH 053/113] Fit wave 16: pinned import keys, laddered key rows, named map rooms MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ListOverlay can pin footer rows outside a scrolling body; the import review keeps its passwords question and Enter/Esc on screen at 80x24 and scrolls the rest (arrows, PgUp/PgDn, Home/End). - KeyLadder fits a cell key row to one line (full labels, parentheticals cut, short labels, then lowest-priority keys dropped; the way out never). Used by F1, the script console, the map's edit row, the import review and F10's header. F1's header no longer repeats ⌥W. - Script console: the store says "⇥ to pick" / "Del deletes" instead of "read only"; Del is named only on the store list. - Map edit keys are one laddered row under the map ("PgUp PgDnlevel" gone); ? opens /help ▸ Maps, which lists every key; ⌃P ▸ Edit map says so. - The cell map names rooms on the grid when the level fits (or on grids >= 100 wide); the exits list is always under the grid. - FooterFitTests renders every cell modal/footer view at 80x24 and fails unless its key row's first and last hints share one painted row. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 13 +- CLAUDE.md | 16 ++ .../Commands/BuiltInCommands.cs | 2 +- src/SharpMUTerm.Client/Help/HelpTopics.cs | 25 +++ src/SharpMUTerm.Client/Panels/MapEditing.cs | 1 + src/SharpMUTerm.Tui/ComposeOverlay.cs | 33 ++- src/SharpMUTerm.Tui/ImportReview.cs | 34 ++- src/SharpMUTerm.Tui/KeyLadder.cs | 121 ++++++++++ src/SharpMUTerm.Tui/ListOverlay.cs | 99 ++++++++- src/SharpMUTerm.Tui/MapRenderer.cs | 210 +++++++++++------- src/SharpMUTerm.Tui/PackageScreen.cs | 13 +- src/SharpMUTerm.Tui/ScriptConsoleSurface.cs | 31 ++- src/SharpMUTerm.Tui/SharpMUTermApp.Import.cs | 4 +- src/SharpMUTerm.Tui/SharpMUTermApp.MapEdit.cs | 9 + .../ComposeSpellingTests.cs | 5 +- tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs | 108 +++++++++ .../SharpMUTerm.Tui.Tests/MapEditModeTests.cs | 2 +- 17 files changed, 617 insertions(+), 109 deletions(-) create mode 100644 src/SharpMUTerm.Tui/KeyLadder.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index a56b3d8f..b9731ee9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -320,9 +320,15 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Changed +- At 80 columns the terminal's key rows fit on one line: the F1 composer, the script console, the map's edit keys, + the import review and F10 shorten their words and then leave out the least-used keys, never the one that closes. + The map's edit keys are now one row under the map instead of a block beside it; `?` lists them all (also under + `/help` ▸ Maps). +- The terminal map writes room names beside the rooms when the pane is wide enough, and always lists where your + room's exits lead in the same place, under the map. - Light theme: background tabs and one-row panels (vitals, quick bar) sit on a lighter grey, and small text on the settings screens is darker, so it is as easy to read as body text. -- Desktop window: the composer's "no dictionary" chip is a button that offers to get one; in the terminal F1 names +- Desktop window: the composer's "no dictionary" chip is a button that offers to get one; in the terminal F1's key row names Alt+W beside it. The world settings show the same "join wraps" recommendation the terminal's F5 does. - A character is named one way everywhere: the command line's prompt, the window title and tab titles now read @@ -377,6 +383,11 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Fixed +- The import review at 80×24 no longer scrolls its Enter and Esc keys and the passwords question out of sight: they + stay at the bottom while the rest scrolls (arrow keys, PgUp/PgDn, Home/End). +- The script console's store no longer says "read only" while Del deletes a key; the console names Del only on the + store list, where it works. +- The map's edit keys at 160 columns no longer read "PgUp PgDnlevel". - F5: editing a world field low on the screen (channels, names) now scrolls the field into view instead of leaving the cursor off screen. - F5 ▸ channels `move`: a channel message whose echo arrives just before its GMCP in the same read is no longer left diff --git a/CLAUDE.md b/CLAUDE.md index 6be78060..8cdb08f6 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -130,6 +130,12 @@ fallbacks) for inline images/maps. `CommandSent` carries player commands only — never the login line or on-connect commands. - Maps are written on disconnect, session removal and exit, not per room (`IsDirty`). MXP room tags wait for `` (Phase 5a). + - **The cell map names rooms on the grid when the level fits** (`MapRenderer.Labelling`): the column step becomes + name + 6 (`[ ] name──[ ]`), the longest name up to 16 at which the whole level fits, the block centred rather than the + room; else 8 on a grid ≥100 wide; else the plain `[ ]` grid (every test map is narrower than `LabelFromWidth`). The + exits list is always under the grid, above the legend; the side column is edit mode's inspector only. Edit mode's + keys are one laddered row at the foot (`KeysLine`, `KeyDrop`); `?` (in `MapEditing.Keys`) opens `/help` ▸ Maps + (`HelpTopics.MapTopic`), which lists every key. - **The map window is a window, not a pane control** (`map:`, `WindowKind.Auxiliary`, owned by the session; `MapRenderer`, Tui). It is drawn from the recorder on `Changed` and whenever its pane's box changes (`SyncMapSizes` on `PostBufferPaint`), never fed from a line buffer, so its control lives in @@ -232,6 +238,10 @@ fallbacks) for inline images/maps. `MarkupControl.MeasureDOM` at the modal's inner width), not as its line count: F10's header wraps at 80 columns, and counting lines made the modal a row short, so it scrolled its close key out of sight at 80×24. F10 always emits its two confirm rows (blank when idle), so the modal sized once at open still fits a confirmation. + - **A consent screen's keys are pinned, not scrolled** (`ListOverlay.Open(footer:, scrollKeys:)`): the body goes in a + `ScrollablePanelControl` and the footer rows are a sticky-bottom control, so a body taller than 80×24 scrolls under + them (↑↓ PgUp PgDn Home End, answered before the caller's key handler). The import review uses it (`ImportReview.Footer`: + passwords question + keys); `Lines` is body then footer. - **The index** (`PackageIndex`; ⌃P ▸ *Browse packages*, `b` on F10) is `{"packages":[…]}`, each entry a manifest plus an https `url` and a `sha256`, at `AppConfiguration.PackageIndexUrl`. **It is fetched only when the player opens it, never at start.** An entry that breaks a rule is dropped and counted, not @@ -630,6 +640,12 @@ fallbacks) for inline images/maps. reflection). The editor scrolls to keep the caret on a row the viewport does not have yet and never scrolls back when the viewport grows, so a newline in a one-row bar drew the new row and a blank. The three-row floor had hidden it; `NewlineKeyTests` caught it. +- **A cell key row never wraps; it ladders** (`KeyLadder`, `LadderKey`, Tui). Rungs: full labels, parentheticals cut, + `Short` labels, then keys dropped lowest `Drop` first (reading order is not drop order); `LadderKey.Keep` (the way + out, the accept) is never dropped. F1 (`ComposeOverlay.FooterKeys`; the header no longer repeats the `⌥W` chip), the + script console (per state: Del is named only on the store list), the map's edit row, the import review and F10's + header use it. `FooterFitTests` renders every cell modal/footer view at 80×24 and fails unless its first and last + hints share one painted row — add a view there when it gains a key row. - **The status row names the keys of the mode you are in** (`ModeHints`/`StatusMode`, Client; `SharpMUTermApp.ModeHints.cs`). Composer armed > search bar in the focused window > frozen > split > scrolled back; while one holds, its hints replace `FocusHints` (`End returns · ⌥F freezes`, `⌥F thaws`, `⌥G next hit · ⌃F searches diff --git a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs index 3bb728d1..a7036c3e 100644 --- a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs +++ b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs @@ -167,7 +167,7 @@ void Family(string id, string prefix, Func c.State.MapUndo is not null); // Looking at another level or area of the map, and back; offered only where the map has one to look at. diff --git a/src/SharpMUTerm.Client/Help/HelpTopics.cs b/src/SharpMUTerm.Client/Help/HelpTopics.cs index 9a3549be..359830f1 100644 --- a/src/SharpMUTerm.Client/Help/HelpTopics.cs +++ b/src/SharpMUTerm.Client/Help/HelpTopics.cs @@ -1,4 +1,5 @@ using SharpMUTerm.Client.Modals; +using SharpMUTerm.Client.Panels; namespace SharpMUTerm.Client.Help; @@ -92,5 +93,29 @@ public static IReadOnlyList For(string newline) => "F4 puts your own commands on keys and says which keys this terminal cannot deliver.", "Every key below is also an entry on ⌃P.", ]), + new(MapTopic, "Maps", "walk from the map, find a room, edit rooms", [ + "The map draws the area you are in around you, rooms named where the pane is wide enough. Click a", + "room to walk there; ⌃P ▸ Find room… looks rooms up by name or area. Exits and where they lead", + "are listed under the grid.", + "", + "⌃P ▸ Edit map gives the terminal's map the keys (the window has an inspector beside the map).", + "Its footer names the keys it has room for; these are all of them:", + .. MapKeyRows(), + "", + "/map rename, /map note and the rest do the same from the command line.", + ]), ]; + + /// The help page that lists every map-edit key, which the map's ? opens. + public const string MapTopic = "map"; + + /// , three to a row. + private static IEnumerable MapKeyRows() + { + var keys = MapEditing.Keys; + for (var i = 0; i < keys.Count; i += 3) + { + yield return " " + string.Concat(keys.Skip(i).Take(3).Select(k => (k.Key.PadRight(10) + k.Word).PadRight(26))).TrimEnd(); + } + } } diff --git a/src/SharpMUTerm.Client/Panels/MapEditing.cs b/src/SharpMUTerm.Client/Panels/MapEditing.cs index 0b0a7921..92beedba 100644 --- a/src/SharpMUTerm.Client/Panels/MapEditing.cs +++ b/src/SharpMUTerm.Client/Panels/MapEditing.cs @@ -113,6 +113,7 @@ public static class MapEditing ("R", "reset to server"), ("u", "undo"), ("⏎", "walk"), + ("?", "all keys"), ("Esc", "done"), ]; diff --git a/src/SharpMUTerm.Tui/ComposeOverlay.cs b/src/SharpMUTerm.Tui/ComposeOverlay.cs index b38006a2..959dd2f8 100644 --- a/src/SharpMUTerm.Tui/ComposeOverlay.cs +++ b/src/SharpMUTerm.Tui/ComposeOverlay.cs @@ -55,6 +55,7 @@ internal sealed class ComposeOverlay private SpellChecker? _spelling; private bool _spellingOpened; private MarkupControl? _headerBand; + private MarkupControl? _footerBand; private MarkupControl? _previewBand; /// The window system the composer opens in. @@ -293,7 +294,9 @@ private void RefreshBands() } var model = Model; - _headerBand?.SetContent(new List { _scheme.Paint(Render(model, Width).Header, ScreenPalette.HeaderBg) }); + var (header, footer) = Render(model, Width); + _headerBand?.SetContent(new List { _scheme.Paint(header, ScreenPalette.HeaderBg) }); + _footerBand?.SetContent(new List { _scheme.Paint(footer, ScreenPalette.FooterBg) }); _previewBand?.SetContent(_scheme.Lines(PreviewLines(model, Width), ScreenPalette.FooterBg)); } @@ -544,7 +547,8 @@ internal static IReadOnlyList WrapExact(string text, int width) private MarkupControl FooterBand() { - var band = ScreenChrome.Band(Render(Model).Footer, ScreenPalette.FooterBg, _scheme); + var band = ScreenChrome.Band(Render(Model, Width).Footer, ScreenPalette.FooterBg, _scheme); + _footerBand = band; band.StickyPosition = StickyPosition.Bottom; return band; } @@ -567,6 +571,7 @@ internal static (string Header, string Footer) Render(ComposerModel model, int w ? $"[{ScreenPalette.Warn}]no connection[/]" : $"[{ScreenPalette.Value}]{Escape(model.Target)}[/]"; + var footerKeys = KeyLadder.Choose(FooterKeys(model), width); string header; if (model.Edit is { } edit) { @@ -579,12 +584,11 @@ internal static (string Header, string Footer) Render(ComposerModel model, int w ? $"[{ScreenPalette.Accent}]literal[/]" : $"[{ScreenPalette.Value}]as typed[/]"; + // The key row names ⌥W (get a dictionary) and gives it up only after ⌥P and ⌥L, so the header does not name it + // again: a second chip for one key cost the header its room at 80 columns, where it was cut to "⌥W…". var spelling = model.Dictionary is { } name ? $"[{ScreenPalette.Value}]{Escape(name)}[/]" - : model.Place == ComposerPlace.FullScreen - // The state names its way out: ⌥W here is the offer to get one (the key row says so too). - ? $"[{ScreenPalette.Muted}]no dictionary[/][{ScreenPalette.Label}] · [/][{ScreenPalette.Accent}]⌥W[/][{ScreenPalette.Label}] gets one[/]" - : $"[{ScreenPalette.Muted}]no dictionary[/]"; + : $"[{ScreenPalette.Muted}]no dictionary[/]"; header = $"[{ScreenPalette.Accent}]COMPOSE[/][{ScreenPalette.Label}] to [/]{target}" + $"[{ScreenPalette.Label}] · text [/]{mode}" @@ -596,10 +600,24 @@ internal static (string Header, string Footer) Render(ComposerModel model, int w var footer = string.Join( $"[{ScreenPalette.Label}] · [/]", - model.Keys.Select(k => $"[{ScreenPalette.Accent}]{Escape(k.Key)}[/][{ScreenPalette.Label}] {Escape(k.Label)}[/]")); + footerKeys.Select(k => $"[{ScreenPalette.Accent}]{Escape(k.Key)}[/][{ScreenPalette.Label}] {Escape(k.Label)}[/]")); return (header, footer); } + /// + /// The key row as a ladder: parentheticals go first (close (keeps the draft)), then ⌥P, ⌥L and ⌥W in that order. + /// ⌃S and Esc are never given up — they are how a post leaves this screen. + /// + internal static IReadOnlyList FooterKeys(ComposerModel model) => + model.Keys.Select(k => new LadderKey(k.Key, k.Label, k.Short, k.Key switch + { + "⌥P" => 1, + "⌥L" => 2, + "⌥W" => 3, + "F1" => 4, + _ => LadderKey.Keep, + })).ToList(); + /// /// Sizes the editor to the window: every row the terminal has, less the two chrome bands. /// @@ -645,6 +663,7 @@ private void Reset() _editor = null; _edit = null; _headerBand = null; + _footerBand = null; _previewBand = null; } } diff --git a/src/SharpMUTerm.Tui/ImportReview.cs b/src/SharpMUTerm.Tui/ImportReview.cs index 3537394e..dae255d6 100644 --- a/src/SharpMUTerm.Tui/ImportReview.cs +++ b/src/SharpMUTerm.Tui/ImportReview.cs @@ -62,15 +62,34 @@ internal static List Render(ImportReviewModel model, int width) } } + return lines; + } + + /// + /// The rows pinned under the review, outside its scroll: the passwords question and the keys that answer the review. + /// Pinned because this is a consent screen — at 80×24 the body is taller than the screen, and a footer that scrolled + /// with it showed no way to accept or decline. A rule row first, so the pinned rows read as the review's foot. + /// + internal static List Footer(ImportReviewModel model, int width) + { + ArgumentNullException.ThrowIfNull(model); + width = Math.Max(30, width); + var lines = new List { $"[{ScreenPalette.Rule}]{new string('─', width - 1)}[/]" }; if (model.PasswordLine is { } passwords) { - lines.Add(string.Empty); var mark = model.StorePasswords ? $"[{ScreenPalette.Accent}]●[/] " : $"[{ScreenPalette.Label}]○[/] "; lines.AddRange(Indented(mark, passwords, width, Value, indent: 0)); } - lines.Add(string.Empty); - lines.Add(Keys(model.Empty ? "Esc close" : model.Keys)); + var keys = (model.Empty ? "Esc close" : model.Keys).Split(" · ").Select(part => + { + var space = part.IndexOf(' ', StringComparison.Ordinal); + return space < 0 ? new LadderKey(part, string.Empty) : new LadderKey(part[..space], part[(space + 1)..]); + }).ToList(); + + // The body scrolls under these rows, and the overlay answers the scroll keys before the review does. + keys.Insert(Math.Max(0, keys.Count - 1), new LadderKey("↑↓", "scroll", Drop: 1)); + lines.Add(KeyLadder.Fit(keys, width - 1, k => $"[{ScreenPalette.Accent}]{Escape(k)}[/]", Label, " ")); return lines; } @@ -96,13 +115,4 @@ private static IEnumerable Indented(string lead, string text, int width, : new string(' ', leadWidth) + style(wrapped[i]); } } - - private static string Keys(string keys) => - string.Join(" ", keys.Split(" · ").Select(part => - { - var space = part.IndexOf(' ', StringComparison.Ordinal); - return space < 0 - ? Label(part) - : $"[{ScreenPalette.Accent}]{Escape(part[..space])}[/] {Label(part[(space + 1)..])}"; - })); } diff --git a/src/SharpMUTerm.Tui/KeyLadder.cs b/src/SharpMUTerm.Tui/KeyLadder.cs new file mode 100644 index 00000000..00ab3f5b --- /dev/null +++ b/src/SharpMUTerm.Tui/KeyLadder.cs @@ -0,0 +1,121 @@ +namespace SharpMUTerm.Tui; + +/// +/// One key a footer names: the key, what it does, a shorter way to say it, and when it is given up. +/// +/// The key in glyphs (⌃S, Esc). +/// What it does, in full. +/// A shorter label for a narrow row, or null to use with any parenthetical cut. +/// +/// When this key leaves a row that cannot hold every key: lowest first. is never dropped — the key +/// that closes the surface, and the one that accepts it. +/// +internal readonly record struct LadderKey(string Key, string Label, string? Short = null, int Drop = LadderKey.Keep) +{ + /// A key a row never gives up. + public const int Keep = int.MaxValue; + + /// The label at a rung: 0 full, 1 any parenthetical cut, 2 the short label. + internal string LabelAt(int rung) => rung switch + { + 0 => Label, + 1 => KeyLadder.CutParenthetical(Label), + _ => Short ?? KeyLadder.CutParenthetical(Label), + }; +} + +/// +/// A footer's key row fitted to one row, never wrapped (the D1 lesson, and the reason a modal's way out cannot be +/// scrolled off it). Rungs, in order: every key in full; parentheticals cut (close (keeps the draft) becomes +/// close); short labels; then keys given up lowest first, in reading order otherwise +/// — the /FocusHints rule that reading order and drop order are separate. A key marked +/// is never dropped; if even those do not fit, the row is cut at the edge. +/// +internal static class KeyLadder +{ + /// The cells between two keys: · . + internal const int Gap = 3; + + /// + /// The row for in at most cells (0: no limit, every key in full). + /// and style the two halves of a key; is + /// the markup between keys (three visible cells). , when given, is appended once anything was + /// dropped — the key that lists the rest. + /// + internal static string Fit( + IReadOnlyList keys, + int width, + Func key, + Func label, + string separator, + LadderKey? more = null) => + Join(Choose(keys, width, more), key, label, separator); + + /// The keys and labels draws, for a caller that styles them itself or a test. + internal static IReadOnlyList<(string Key, string Label)> Choose(IReadOnlyList keys, int width, LadderKey? more = null) + { + ArgumentNullException.ThrowIfNull(keys); + if (width <= 0) + { + return keys.Select(k => (k.Key, k.Label)).ToList(); + } + + for (var rung = 0; rung <= 2; rung++) + { + var all = keys.Select(k => (k.Key, k.LabelAt(rung))).ToList(); + if (Length(all) <= width) + { + return all; + } + } + + // Give keys up, lowest Drop first; ties go from the end of the row, so the row keeps its first words longest. + var order = keys + .Select((k, i) => (k, i)) + .Where(p => p.k.Drop != LadderKey.Keep) + .OrderBy(p => p.k.Drop) + .ThenByDescending(p => p.i) + .Select(p => p.i) + .ToList(); + var dropped = new HashSet(); + foreach (var index in order) + { + dropped.Add(index); + var kept = keys.Where((_, i) => !dropped.Contains(i)).Select(k => (k.Key, k.LabelAt(2))).ToList(); + if (more is { } extra) + { + kept.Add((extra.Key, extra.LabelAt(2))); + } + + if (Length(kept) <= width) + { + return kept; + } + } + + var last = keys.Where((_, i) => !dropped.Contains(i)).Select(k => (k.Key, k.LabelAt(2))).ToList(); + if (more is { } tail) + { + last.Add((tail.Key, tail.LabelAt(2))); + } + + return last; + } + + /// The visible cells a row of takes. + internal static int Length(IReadOnlyList<(string Key, string Label)> keys) => + keys.Count == 0 ? 0 : keys.Sum(k => k.Key.Length + (k.Label.Length == 0 ? 0 : (k.Key.Length == 0 ? 0 : 1) + k.Label.Length)) + (Gap * (keys.Count - 1)); + + /// with a trailing (…) removed: close (keeps the draft) → close. + internal static string CutParenthetical(string text) + { + var open = text.IndexOf(" (", StringComparison.Ordinal); + return open > 0 && text.EndsWith(')') ? text[..open] : text; + } + + private static string Join(IReadOnlyList<(string Key, string Label)> keys, Func key, Func label, string separator) => + string.Join(separator, keys.Select(k => + k.Key.Length == 0 ? label(k.Label) + : k.Label.Length == 0 ? key(k.Key) + : key(k.Key) + label(" " + k.Label))); +} diff --git a/src/SharpMUTerm.Tui/ListOverlay.cs b/src/SharpMUTerm.Tui/ListOverlay.cs index 2f30858e..4285ee3f 100644 --- a/src/SharpMUTerm.Tui/ListOverlay.cs +++ b/src/SharpMUTerm.Tui/ListOverlay.cs @@ -17,7 +17,11 @@ internal sealed class ListOverlay private Window? _window; private MarkupControl? _content; + private MarkupControl? _footerControl; + private ScrollablePanelControl? _body; private Func>? _render; + private Func>? _footer; + private bool _scrollKeys; private Func? _key; private Func? _escape; private Action? _closed; @@ -39,7 +43,14 @@ public ListOverlay(ConsoleWindowSystem system, ScreenTheme? scheme = null) public string? Mode { get; private set; } /// What the surface shows now, for a test to read. - internal IReadOnlyList Lines => _render?.Invoke(Width()) ?? []; + internal IReadOnlyList Lines => + _render is null ? [] : [.. _render(Width()), .. _footer?.Invoke(Width()) ?? []]; + + /// The pinned footer's lines alone (empty for a surface with none), for a test. + internal IReadOnlyList FooterLines => _footer?.Invoke(Width()) ?? []; + + /// The body's scroll offset in rows (0 for a surface with no pinned footer), for a test. + internal int BodyScroll => _body?.VerticalScrollOffset ?? 0; /// /// Opens a surface. draws it at a width; answers a key @@ -51,6 +62,12 @@ public ListOverlay(ConsoleWindowSystem system, ScreenTheme? scheme = null) /// typed, a delete awaiting its answer) and stays open; with none, or false, Esc closes. /// /// Told once when this surface closes, however it does (not when a later one replaces it). + /// + /// Rows pinned to the modal's bottom edge, outside the scrolling body: a consent screen's keys and the question that + /// goes with them. A body taller than the screen scrolls under them, so the way to accept or decline is never + /// scrolled away (the import review at 80×24 lost both). Each row is one line, never wrapped: fit it to the width. + /// + /// Whether ↑↓ PgUp PgDn Home End scroll the body before the key handler sees them. public void Open( string mode, string title, @@ -58,7 +75,9 @@ public void Open( Func key, int? width = null, Func? escape = null, - Action? closed = null) + Action? closed = null, + Func>? footer = null, + bool scrollKeys = false) { if (_window is not null) { @@ -69,12 +88,36 @@ public void Open( _key = key; _escape = escape; _closed = closed; + _footer = footer; + _scrollKeys = scrollKeys && footer is not null; var desktop = _system.DesktopDimensions; var widest = Math.Clamp(desktop.Width - 8, 44, 110); var outer = width is { } asked ? Math.Clamp(asked + 4, 24, widest) : widest; var lines = render(outer - 4); - var height = Math.Clamp(Rows(lines, outer - 3) + 2, 8, Math.Max(8, desktop.Height - 2)); + var footerLines = footer?.Invoke(outer - 4) ?? []; + var height = Math.Clamp(Rows(lines, outer - 3) + footerLines.Count + 2, 8, Math.Max(8, desktop.Height - 2)); _content = new MarkupControl(_scheme.Lines(lines, ScreenPalette.MenuBg)); + IWindowControl body = _content; + if (footer is not null) + { + _content.HorizontalAlignment = HorizontalAlignment.Stretch; + _body = new ScrollablePanelControl + { + HorizontalAlignment = HorizontalAlignment.Stretch, + VerticalAlignment = VerticalAlignment.Fill, + VerticalScrollMode = ScrollMode.Scroll, + HorizontalScrollMode = ScrollMode.None, + ShowScrollbar = true, + AutoScroll = false, + }; + _body.AddControl(_content); + body = _body; + _footerControl = new MarkupControl(_scheme.Lines(footerLines, ScreenPalette.MenuBg)) + { + HorizontalAlignment = HorizontalAlignment.Stretch, + StickyPosition = StickyPosition.Bottom, + }; + } // Centered() after WithSize(), for CommandPalette's reason. Window? built = null; @@ -87,7 +130,7 @@ public void Open( .Resizable(false) .WithSize(outer, height) .Centered() - .AddControl(_content) + .AddControl(body) .OnClosed((_, _) => { // A window closed because the next surface replaced it must not clear the next one's state. @@ -101,6 +144,10 @@ public void Open( .Build(); _window = built; _scheme.Frame(_window); + if (_footerControl is not null) + { + _window.AddControl(_footerControl); + } _window.PreviewKeyPressed += OnKey; _system.AddWindow(_window); @@ -132,6 +179,11 @@ public void Repaint() if (_render is not null && _content is not null) { _content.SetContent(_scheme.Lines(_render(Width()), ScreenPalette.MenuBg)); + if (_footer is not null) + { + _footerControl?.SetContent(_scheme.Lines(_footer(Width()), ScreenPalette.MenuBg)); + } + _window?.Invalidate(redrawAll: true); } } @@ -170,6 +222,25 @@ private void OnKey(object? sender, KeyPressedEventArgs e) return; } + if (_scrollKeys && _body is { } body && e.KeyInfo.Modifiers == 0 && ScrollBy(body, e.KeyInfo.Key) is { } rows) + { + if (rows == int.MinValue) + { + body.ScrollToTop(); + } + else if (rows == int.MaxValue) + { + body.ScrollToBottom(); + } + else + { + body.ScrollVerticalBy(rows); + } + + _window.Invalidate(redrawAll: true); + return; + } + if (e.KeyInfo.Key == ConsoleKey.Escape || !_key(e.KeyInfo)) { if (_window == window) @@ -183,10 +254,30 @@ private void OnKey(object? sender, KeyPressedEventArgs e) Repaint(); } + /// The rows a scroll key moves the body: a line, a page less one, or either end (, ). + private static int? ScrollBy(ScrollablePanelControl body, ConsoleKey key) + { + var page = Math.Max(1, body.ActualHeight - 1); + return key switch + { + ConsoleKey.UpArrow => -1, + ConsoleKey.DownArrow => 1, + ConsoleKey.PageUp => -page, + ConsoleKey.PageDown => page, + ConsoleKey.Home => int.MinValue, + ConsoleKey.End => int.MaxValue, + _ => null, + }; + } + private void Reset() { _window = null; _content = null; + _footerControl = null; + _body = null; + _footer = null; + _scrollKeys = false; _render = null; _key = null; _escape = null; diff --git a/src/SharpMUTerm.Tui/MapRenderer.cs b/src/SharpMUTerm.Tui/MapRenderer.cs index c1397dcc..fa9d7459 100644 --- a/src/SharpMUTerm.Tui/MapRenderer.cs +++ b/src/SharpMUTerm.Tui/MapRenderer.cs @@ -63,6 +63,7 @@ private enum Kind Blank, Line, Stub, + Label, Room, Current, Path, @@ -181,13 +182,15 @@ internal static List Render(MapViewModel view, WorldMap map, int width, return lines; } - // Names go beside the grid when the map is wide, else under it: in edit mode the room and the keys that edit it, - // otherwise (in a tall pane) what each exit of your room leads to. Edit mode spends the legend's row on them. - var side = SideWidth(width); + // In edit mode the room being edited goes beside the grid when the map is wide, else under it, and the keys that + // edit it are one laddered row at the foot (edit mode spends the legend's row on them). Otherwise what each exit + // of your room leads to is always under the grid, above the legend — one place, whatever the pane's shape. + var side = view.Editing ? SideWidth(width) : 0; var gridWidth = side > 0 ? width - side - 2 : width; var legend = !view.Editing && height >= LegendMinHeight; var under = side > 0 ? [] : UnderLines(view, width, height, ink, keysHeld); - var rows = Math.Max(0, height - 1 - (legend ? 1 : 0) - under.Count); + var footer = side > 0 && height >= 4 ? KeysLine(width, ink, keysHeld) : null; + var rows = Math.Max(0, height - 1 - (legend ? 1 : 0) - under.Count - (footer is null ? 0 : 1)); var grid = new Cell[rows, gridWidth]; var ahead_ = ahead.ToHashSet(); var byId = view.Rooms.ToDictionary(r => r.Id); @@ -197,18 +200,21 @@ internal static List Render(MapViewModel view, WorldMap map, int width, // edited would then fall outside it, when that room is the centre instead. var originCol = gridWidth / 2 - 1; var originRow = rows / 2; + var level = map.Rooms.Values + .Where(r => r.Z == centre.Z && r.AreaId == centre.AreaId) + .ToList(); + var (label, cellWidth, labelledOrigin) = Labelling(level, centre, gridWidth, originCol); + originCol = labelledOrigin; if (view.Selected is { } picked && map.Room(picked.Id) is { } chosen - && (Math.Abs(chosen.X - centre.X) * CellWidth > originCol - 1 || Math.Abs(chosen.Y - centre.Y) * CellHeight > originRow)) + && (originCol + ((chosen.X - centre.X) * cellWidth) is var pickedCol && (pickedCol < 1 || pickedCol + 3 > gridWidth) + || Math.Abs(chosen.Y - centre.Y) * CellHeight > originRow)) { centre = chosen; + originCol = gridWidth / 2 - 1; } (int Col, int Row) At(MapRoom room) => - (originCol + (room.X - centre.X) * CellWidth, originRow + (room.Y - centre.Y) * CellHeight); - - var level = map.Rooms.Values - .Where(r => r.Z == centre.Z && r.AreaId == centre.AreaId) - .ToList(); + (originCol + (room.X - centre.X) * cellWidth, originRow + (room.Y - centre.Y) * CellHeight); void Put(int col, int row, char glyph, Kind kind, long? room = null, string? colour = null) { @@ -234,6 +240,7 @@ void Put(int col, int row, char glyph, Kind kind, long? room = null, string? col foreach (var room in level) { var (col, row) = At(room); + var named = label > 0 ? Math.Min(NameOf(room).Length, label) : 0; foreach (var (_, key, to) in room.AllExits()) { // A way into another area is drawn in that area's colour, which is the view's. @@ -241,14 +248,14 @@ void Put(int col, int row, char glyph, Kind kind, long? room = null, string? col && map.Areas.TryGetValue(areaId, out var area) ? AreaInk(view.ColourOf(area.Name), ink) : null; - Connect(col, row, key, Kind.Line, into); + Connect(col, row, key, Kind.Line, into, named); } foreach (var stub in room.Stubs) { if (MapDirections.Normalise(stub) is { } direction) { - Connect(col, row, direction, Kind.Stub, null); + Connect(col, row, direction, Kind.Stub, null, named); } } } @@ -267,13 +274,34 @@ void Put(int col, int row, char glyph, Kind kind, long? room = null, string? col Put(col + 2, row, ']', kind, room.Id, colour); } - var column = side > 0 ? SideLines(view, side, rows + (legend ? 1 : 0), ink, keysHeld) : []; + if (label > 0) + { + // The name after the room, one cell clear of it and elided to the room the grid leaves; a link to the room, + // like the room itself. The room you are in is named in its own ink. + foreach (var room in level) + { + var (col, row) = At(room); + var name = NameOf(room); + name = name.Length <= label ? name : name[..(label - 1)].TrimEnd() + "…"; + var labelColour = room.Id == current ? ink.Current : null; + for (var i = 0; i < name.Length; i++) + { + Put(col + 4 + i, row, name[i], Kind.Label, room.Id, labelColour); + } + } + } + + var column = side > 0 ? SideLines(view, side, rows, ink) : []; for (var row = 0; row < rows; row++) { lines.Add(WithSide(Row(grid, row, gridWidth, ink), column, row, gridWidth)); } lines.AddRange(under); + if (footer is not null) + { + lines.Add(footer); + } if (legend) { @@ -282,12 +310,27 @@ void Put(int col, int row, char glyph, Kind kind, long? room = null, string? col return lines; - void Connect(int col, int row, string direction, Kind kind, string? colour) + // A room's name as the grid draws it: the view's, else the map's, else its number. + string NameOf(MapRoom room) => + byId.GetValueOrDefault(room.Id)?.Name is { Length: > 0 } seen ? seen + : room.Name.Length > 0 ? room.Name + : "#" + room.Id.ToString(CultureInfo.InvariantCulture); + + void Connect(int col, int row, string direction, Kind kind, string? colour, int named = 0) { switch (direction) { case "east": - Put(col + 3, row, '─', kind, colour: colour); + // With names on the grid the way east starts one cell past the name and runs to the next room. + for (var c = named > 0 ? col + 5 + named : col + 3; c <= col + cellWidth - 1; c++) + { + Put(c, row, '─', kind, colour: colour); + if (label == 0) + { + break; + } + } + break; case "west": Put(col - 1, row, '─', kind, colour: colour); @@ -314,6 +357,41 @@ void Connect(int col, int row, string direction, Kind kind, string? colour) } } + /// The narrowest grid that names its rooms. + internal const int LabelFromWidth = 48; + + /// The longest and shortest room name drawn on the grid. + internal const int LabelMax = 16, LabelMin = 6; + + /// + /// How long a room's name on the grid may be, the grid's column step ([ ] name──, so a step is the name plus + /// six), and the column the centre room is drawn at. The longest name (up to ) at which the + /// whole level fits the grid, which is then centred as a block rather than on the centre room, so the names have + /// the width there is; failing that, on a grid of 100 columns or more, eight, centred on the room as before (rooms + /// past the edge are cut, as they always were); otherwise none, and the step is the plain . + /// + internal static (int Label, int CellWidth, int OriginCol) Labelling(IReadOnlyList level, MapRoom centre, int gridWidth, int originCol) + { + if (gridWidth < LabelFromWidth || level.Count == 0) + { + return (0, CellWidth, originCol); + } + + var west = Math.Max(0, centre.X - level.Min(r => r.X)); + var east = Math.Max(0, level.Max(r => r.X) - centre.X); + for (var label = LabelMax; label >= LabelMin; label--) + { + var step = label + 6; + var span = ((west + east) * step) + 4 + label; + if (span <= gridWidth) + { + return (label, step, ((gridWidth - span) / 2) + (west * step)); + } + } + + return gridWidth >= 100 ? (8, 14, originCol) : (0, CellWidth, originCol); + } + /// /// An area colour from the view, held to the floor on the pane. The palette clears it on every built-in theme, /// so this returns the view's hex unchanged there; a custom theme may move it. @@ -469,34 +547,13 @@ private static string WithSide(string row, IReadOnlyList column, int ind /// The side column, beside a wide grid: the room being edited and the keys that edit it, or else where you are and /// what each exit leads to. Every line is cut to and there are at most . /// - private static List SideLines(MapViewModel view, int width, int rows, Ink ink, bool keysHeld) + private static List SideLines(MapViewModel view, int width, int rows, Ink ink) { var lines = new List(); if (view.Selected is { } room) { lines.AddRange(DetailLines(view, width, ink)); - foreach (var exit in room.Exits.Take(Math.Max(0, rows - lines.Count - MapEditing.Keys.Count - 1))) - { - lines.Add(ExitLine(exit, width)); - } - - lines.Add(string.Empty); - if (!keysHeld) - { - lines.AddRange(KeysLines(width, ink, keysHeld, 3)); - } - else - { - foreach (var (key, word) in MapEditing.Keys.Take(Math.Max(0, rows - lines.Count))) - { - lines.Add(Fit($"[bold {ink.Current}]{MarkupText.Escape(key.PadRight(6))}[/][dim]{word}[/]", width)); - } - } - } - else if (view.Current is { } here) - { - lines.Add(Fit($"[bold {ink.Current}]@[/] [bold]{MarkupText.Escape(Elide(here.Name, width - 2))}[/]", width)); - foreach (var exit in view.Nearby.Take(Math.Max(0, rows - 1))) + foreach (var exit in room.Exits.Take(Math.Max(0, rows - lines.Count))) { lines.Add(ExitLine(exit, width)); } @@ -514,8 +571,8 @@ private static List UnderLines(MapViewModel view, int width, int height, if (view.Editing) { return height >= UnderFromHeight - ? [string.Empty, .. DetailLines(view, width, ink), .. KeysLines(width, ink, keysHeld, 5)] - : height >= 4 ? [RoomLine(view, width, ink), .. KeysLines(width, ink, keysHeld, 1)] : []; + ? [string.Empty, .. DetailLines(view, width, ink), KeysLine(width, ink, keysHeld)] + : height >= 4 ? [RoomLine(view, width, ink), KeysLine(width, ink, keysHeld)] : []; } if (height < UnderFromHeight || view.Nearby.Count == 0 || view.Viewing) @@ -616,50 +673,50 @@ private static string RoomLine(MapViewModel view, int width, Ink ink) } /// - /// Edit mode's keys over at most lines, in ' order, with - /// Esc done always the last; while a /map command waits on the command line, how to finish it instead. + /// Edit mode's keys as one row (): in ' order, the least used given + /// up first (), ? all keys and Esc done never — ? opens the help page that + /// lists every one. One row and not a block: at 80×24 the block took half the pane and still cut keys. While a + /// /map command waits on the command line, how to finish it instead. /// - internal static List KeysLines(int width, Ink ink, bool keysHeld, int max) + internal static string KeysLine(int width, Ink ink, bool keysHeld) { if (!keysHeld) { - return [Fit("[dim]finish the /map command on the command line · ⏎ applies it · ⌃P ▸ Edit map takes the keys back[/]", width)]; + return Fit("[dim]finish the /map command on the command line · ⏎ applies it · ⌃P ▸ Edit map takes the keys back[/]", width); } - string Item((string Key, string Word) k) => $"[bold {ink.Current}]{MarkupText.Escape(k.Key)}[/] [dim]{k.Word}[/]"; - static int Cost((string Key, string Word) k) => k.Key.Length + 1 + k.Word.Length; - var last = MapEditing.Keys[^1]; - var lines = new List> { new() }; - var used = 0; - foreach (var key in MapEditing.Keys.Take(MapEditing.Keys.Count - 1)) - { - var cost = (lines[^1].Count == 0 ? 0 : 3) + Cost(key); - var reserve = lines.Count == max ? 3 + Cost(last) : 0; - if (used + cost + reserve > width) - { - if (lines.Count == max) - { - break; - } - - lines.Add(new()); - used = 0; - cost = Cost(key); - } - - lines[^1].Add(key); - used += cost; - } - - if (used + 3 + Cost(last) > width && lines.Count < max) - { - lines.Add(new()); - } - - lines[^1].Add(last); - return lines.Select(l => Fit(string.Join(" [dim]·[/] ", l.Select(Item)), width)).ToList(); + var keys = MapEditing.Keys.Select(k => new LadderKey(k.Key, k.Word, Drop: KeyDrop(k.Key))).ToList(); + return KeyLadder.Fit( + keys, + width, + k => $"[bold {ink.Current}]{MarkupText.Escape(k)}[/]", + w => $"[dim]{MarkupText.Escape(w)}[/]", + " [dim]·[/] "); } + /// Which edit key a short footer gives up first: lowest first; the ones a newcomer reaches for last. + internal static int KeyDrop(string key) => key switch + { + "?" or "Esc" => LadderKey.Keep, + "←↑→↓" => 17, + "⏎" => 16, + "r" => 15, + "u" => 14, + "⇧←↑→↓" => 13, + "Del" => 12, + "x" => 11, + "n" => 10, + "l" => 9, + "PgUp PgDn" => 8, + "v" => 7, + "h" => 6, + "a" => 5, + "w" => 4, + "-" => 3, + "s" => 2, + _ => 1, + }; + private static string Elide(string text, int width) => width <= 0 ? string.Empty : text.Length <= width ? text : text[..Math.Max(0, width - 1)] + "…"; @@ -704,6 +761,7 @@ private static string Row(Cell[,] grid, int row, int width, Ink ink) Kind.Blank => escaped, Kind.Line or Kind.Room => cell.Colour is { } colour ? $"[{colour}]{escaped}[/]" : escaped, Kind.Stub => $"[dim]{escaped}[/]", + Kind.Label => cell.Colour is { } named ? $"[{named}]{escaped}[/]" : escaped, Kind.Current => $"[bold {ink.Current}]{escaped}[/]", Kind.Path => $"[{ink.Path}]{escaped}[/]", Kind.Locked => $"[{ink.Locked}]{escaped}[/]", diff --git a/src/SharpMUTerm.Tui/PackageScreen.cs b/src/SharpMUTerm.Tui/PackageScreen.cs index ce6ee8b8..c3f9b293 100644 --- a/src/SharpMUTerm.Tui/PackageScreen.cs +++ b/src/SharpMUTerm.Tui/PackageScreen.cs @@ -79,10 +79,19 @@ internal static List List( int width, List? drawn = null) { - var keys = string.Join(" · ", declaration.Actions.Select(a => $"{a.Key} {a.Label}")); + // One row, never wrapped: a ladder after the count (↑↓ goes first, then the copy and browse keys). + var count = $"{Count(packages.Count)} installed · "; + var ladder = new List { new("↑↓", "select", Drop: 1) }; + ladder.AddRange(declaration.Actions.Select(a => new LadderKey( + a.Key, + a.Label, + a.Label.Contains(' ', StringComparison.Ordinal) ? a.Label[..a.Label.IndexOf(' ', StringComparison.Ordinal)] : null, + a.Key switch { "c" => 2, "b" => 3, _ => LadderKey.Keep }))); + ladder.Add(new("Esc", "close")); + var keys = KeyLadder.Fit(ladder, Math.Max(20, width - count.Length - 1), Escape, Escape, " · "); var lines = new List { - $"[{ScreenPalette.Label}]{Count(packages.Count)} installed · ↑↓ select · {Escape(keys)} · Esc close[/]", + $"[{ScreenPalette.Label}]{count}{keys}[/]", string.Empty, }; diff --git a/src/SharpMUTerm.Tui/ScriptConsoleSurface.cs b/src/SharpMUTerm.Tui/ScriptConsoleSurface.cs index cf755acc..56c0e30a 100644 --- a/src/SharpMUTerm.Tui/ScriptConsoleSurface.cs +++ b/src/SharpMUTerm.Tui/ScriptConsoleSurface.cs @@ -176,10 +176,37 @@ internal static List Render(ScriptConsoleModel model, string input, bool lines.Add(model.CanRun ? $"[bold {ScreenPalette.Accent}]lua ›[/] [{ScreenPalette.Value}]{Escape(Tail(input, width - 8))}{(onStore ? string.Empty : "▏")}[/]" : $"[{ScreenPalette.Label}]lua › no prompt here — {Escape(model.Unavailable ?? string.Empty)}[/]"); - lines.Add($"[{ScreenPalette.Label}]{Escape(Fit(ScriptConsoleModel.Keys, width))}[/]"); + lines.Add(KeyLadder.Fit( + FooterKeys(onStore), + width, + k => $"[{ScreenPalette.Accent}]{Escape(k)}[/]", + l => $"[{ScreenPalette.Label}]{Escape(l)}[/]", + $"[{ScreenPalette.Label}] · [/]")); return lines; } + /// + /// The key row for where the keys are: at the prompt, or on the store list (where ↑↓ pick and Del deletes). A ladder, + /// so Esc is never the word cut off at 80 columns; ⌃L goes first, then ⇥, history and ⏎. + /// + internal static IReadOnlyList FooterKeys(bool onStore) => onStore + ? + [ + new("↑↓", "pick a key", "pick", Drop: 2), + new("Del", "deletes it", "deletes"), + new("⇥", "back to the prompt", "prompt", Drop: 3), + new("⌃L", "reloads scripts", "reload", Drop: 1), + new("Esc", "closes"), + ] + : + [ + new("⏎", "runs", Drop: 4), + new("↑↓", "history", Drop: 2), + new("⇥", "store keys", "store", Drop: 3), + new("⌃L", "reloads scripts", "reload", Drop: 1), + new("Esc", "closes"), + ]; + private static List OutputRows(ScriptConsoleModel model, int width, int rows) { var wrapped = new List(); @@ -221,7 +248,7 @@ private static List StoreRows(ScriptConsoleModel model, bool onStore, in { var list = new List { - $"[{(onStore ? ScreenPalette.Accent : ScreenPalette.Muted)}]STORE[/] [{ScreenPalette.Label}]{model.StoreCount} key{(model.StoreCount == 1 ? string.Empty : "s")} · read only[/]", + $"[{(onStore ? ScreenPalette.Accent : ScreenPalette.Muted)}]STORE[/] [{ScreenPalette.Label}]{model.StoreCount} key{(model.StoreCount == 1 ? string.Empty : "s")}{(model.Store.Count == 0 ? string.Empty : onStore ? " · Del deletes" : " · ⇥ to pick")}[/]", }; if (model.Store.Count == 0) diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Import.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Import.cs index b2ed1831..ea5f0b9f 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Import.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Import.cs @@ -182,7 +182,9 @@ internal void ReviewImport(ImportResult result) return true; }, width: ImportReview.PreferredWidth, - closed: () => _pendingImport = null); + closed: () => _pendingImport = null, + footer: width => ImportReview.Footer(_pendingImport?.Model ?? model, width), + scrollKeys: true); } /// diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.MapEdit.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.MapEdit.cs index 2de7e3bd..79b3b495 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.MapEdit.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.MapEdit.cs @@ -2,6 +2,7 @@ using System.Text; using SharpConsoleUI; using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Client.Help; using SharpMUTerm.Client.Panels; using SharpMUTerm.Core.Diagnostics; using SharpMUTerm.Core.Mapping; @@ -278,6 +279,7 @@ private bool TryMapKey(KeyPressedEventArgs e) '-' => Words(MapEditing.UnexitVerb), 'n' => Words(MapEditing.NoteVerb), 's' => Words(MapEditing.SymbolVerb), + '?' => AllKeys(), _ => false, }) { @@ -298,6 +300,13 @@ bool Edit(MapEdit edit) return true; } + bool AllKeys() + { + // The footer names the keys it has room for; the help page names every one. The map keeps the keys. + ShowHelp(topic: HelpTopics.MapTopic); + return true; + } + bool Look(MapLook look) { LookMap(windowId, look); diff --git a/tests/SharpMUTerm.Tui.Tests/ComposeSpellingTests.cs b/tests/SharpMUTerm.Tui.Tests/ComposeSpellingTests.cs index 1329d004..b5d2c6e4 100644 --- a/tests/SharpMUTerm.Tui.Tests/ComposeSpellingTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/ComposeSpellingTests.cs @@ -93,8 +93,9 @@ public async Task WithNoDictionaryTheHeaderSaysSoAndAltWOffersToGetOne() await Assert.That(app.Composer.HeaderMarkup).Contains("no dictionary"); var rows = FrameGrid.Decode(app.RenderWholeFrame(), Width, Height); await Assert.That(rows.Any(r => r.Contains("⌥W", StringComparison.Ordinal) && r.Contains("get a dictionary", StringComparison.Ordinal))).IsTrue(); - await Assert.That(rows.Any(r => r.Contains("no dictionary · ⌥W gets one", StringComparison.Ordinal))) - .IsTrue().Because("the header names the key beside the state it gets you out of"); + await Assert.That(rows.Count(r => r.Contains("⌥W", StringComparison.Ordinal))).IsEqualTo(1) + .Because("the key row names ⌥W, so the header does not name it a second time and is not cut for it"); + await Assert.That(app.Composer.HeaderMarkup).DoesNotContain("⌥W"); await Assert.That(app.Composer.SimulateKey(Key(ConsoleKey.W, ConsoleModifiers.Alt))).IsTrue(); await Assert.That(app.DictionaryOfferOpen).IsTrue().Because("⌥W with no dictionary offers one, and fetches nothing"); } diff --git a/tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs b/tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs new file mode 100644 index 00000000..b63d5331 --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs @@ -0,0 +1,108 @@ +using SharpConsoleUI.Drivers; +using SharpMUTerm.Core.Theming; +using SharpMUTerm.Graphics; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// Every cell modal and footer fits 80×24: each view below is rendered at the default terminal size and its key +/// row is read off the painted frame. A row's first and last hints must both be on screen and on one row — a +/// footer that wrapped puts its last hint (almost always the way out) on the row under it, and a footer that scrolled +/// with its body is not on screen at all. Both happened: the import review at 80×24 scrolled its Enter/Esc away, and +/// F1's footer wrapped "(keeps the draft)" onto a second row. Read off the frame, never the renderer: the renderers +/// were internally consistent both times. +/// +[NotInParallel] +public class FooterFitTests +{ + private const int Width = 80; + + private const int Height = 24; + + private static readonly TerminalCapabilities Headless = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + /// + /// A view and the hints that must share one painted row: the row's first key and its last (its way out, or the + /// key that accepts). Add a view here when it gains a key row. + /// + internal static readonly (string View, string[] OneRow)[] Footers = + [ + ("import-review", ["⏎ import", "↑↓ scroll", "Esc cancel"]), + ("compose", ["⌃S send", "⌥W", "Esc close"]), + ("compose-literal", ["⌃S send", "Esc close"]), + ("moo-edit", ["⌃S save", "Esc close"]), + ("script-console", ["⏎ runs", "Esc closes"]), + ("map-edit", ["←↑→↓ select", "? all keys", "Esc done"]), + ("help", ["type to search", "Esc closes"]), + ("help-topic", ["↑↓ PgUp PgDn scroll", "Esc back to the list"]), + ("dictionary-offer", ["⏎ download", "Esc not now"]), + ("quit", ["⏎ stay", "Esc stays"]), + ("search", ["↑↓ pick", "⌃F closes"]), + ("history-search", ["type to filter", "⌃R closes"]), + ("layouts", ["↑↓ pick", "[⏎] Apply"]), + ("welcome", ["↑↓ pick", "Esc closes"]), + ("welcome-connect", ["↑↓ field", "Esc back"]), + ("packages", ["installed", "Space", "Esc close"]), + ("package-review", ["⏎ install", "Esc cancel"]), + ("package-browse", ["↑↓ select", "Esc close"]), + ("messages", ["+/- level", "Esc close"]), + ("prefix-panel", ["Esc cancels", "any other key disarms"]), + ("settings", ["[Esc] Close", "[⏎] Edit"]), + ("triggers", ["[Esc] Close", "[⏎] Edit"]), + ("keypad", ["[Esc] Close", "[⏎] Edit"]), + ("trigger-builder", ["[Esc] Revert", "[⏎] Commit"]), + ]; + + public static IEnumerable> Cases() => + Footers.Select(f => (Func<(string, string)>)(() => (f.View, string.Join(" | ", f.OneRow)))); + + [Test] + [MethodDataSource(nameof(Cases))] + public async Task TheKeyRowIsOnScreenAndOnOneRowAt80x24(string view, string hints) + { + var rows = FrameGrid.Decode(Render(view), Width, Height); + var wanted = hints.Split(" | "); + var row = rows.FirstOrDefault(r => wanted.All(h => r.Contains(h, StringComparison.Ordinal))); + await Assert.That(row).IsNotNull() + .Because($"{view} at 80×24 must show '{string.Join("', '", wanted)}' on one row:\n{string.Join('\n', rows)}"); + } + + [Test] + public async Task EveryViewInTheListIsOneTheSnapshotKnows() + { + foreach (var (view, _) in Footers) + { + await Assert.That(SnapshotViews.All.Contains(view)).IsTrue().Because(view); + } + } + + [Test] + public async Task TheImportReviewScrollsItsBodyUnderAPinnedFooter() + { + var app = App(); + var first = FrameGrid.Decode(app.RenderSnapshot("import-review"), Width, Height); + await Assert.That(first.Any(r => r.Contains("LEFT OUT", StringComparison.Ordinal) && !r.Contains("password", StringComparison.Ordinal))).IsTrue(); + + app.SimulateImportKey(new ConsoleKeyInfo('\0', ConsoleKey.End, false, false, false)); + var scrolled = FrameGrid.Decode(app.RenderWholeFrame(), Width, Height); + await Assert.That(scrolled.Any(r => r.Contains("Your health is", StringComparison.Ordinal))).IsTrue() + .Because("End scrolls the body to the last of what was left out:\n" + string.Join('\n', scrolled)); + await Assert.That(scrolled.Any(r => r.Contains("⏎ import", StringComparison.Ordinal) && r.Contains("Esc cancel", StringComparison.Ordinal))).IsTrue() + .Because("the keys stay where they were"); + await Assert.That(scrolled.Any(r => r.Contains("password", StringComparison.Ordinal))).IsTrue() + .Because("and so does the passwords question"); + await Assert.That(app.ImportReviewLines.Count).IsGreaterThan(0).Because("the review is still open: End scrolled, it did not answer"); + } + + private static SharpMUTermApp App() + { + Console.SetIn(TextReader.Null); + var config = DemoScene.Build(); + config.ThemeName = "Dark"; + config.Theme = ThemeLibrary.Get("Dark"); + return new SharpMUTermApp(config, Headless, new HeadlessConsoleDriver(Width, Height)); + } + + private static string Render(string view) => App().RenderSnapshot(view); +} diff --git a/tests/SharpMUTerm.Tui.Tests/MapEditModeTests.cs b/tests/SharpMUTerm.Tui.Tests/MapEditModeTests.cs index 46ca7ce1..02e9b556 100644 --- a/tests/SharpMUTerm.Tui.Tests/MapEditModeTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/MapEditModeTests.cs @@ -126,7 +126,7 @@ public async Task EveryKeyTheFooterNamesIsAnswered() ["n"] = [Key(ConsoleKey.N, 'n')], ["s"] = [Key(ConsoleKey.S, 's')], ["Del"] = [Key(ConsoleKey.Delete)], ["PgUp PgDn"] = [Key(ConsoleKey.PageDown)], ["v"] = [Key(ConsoleKey.V, 'v')], ["h"] = [Key(ConsoleKey.H, 'h')], ["R"] = [Key(ConsoleKey.R, 'R', shift: true)], - ["u"] = [Key(ConsoleKey.U, 'u')], ["⏎"] = [Key(ConsoleKey.Enter, '\r')], ["Esc"] = [Key(ConsoleKey.Escape, '\u001b')], + ["u"] = [Key(ConsoleKey.U, 'u')], ["⏎"] = [Key(ConsoleKey.Enter, '\r')], ["?"] = [Key(ConsoleKey.Oem2, '?', shift: true)], ["Esc"] = [Key(ConsoleKey.Escape, '\u001b')], }; foreach (var (key, _) in MapEditing.Keys) From 0d05be55a08f2dabda5bc65c33c4ac8d8a7d6967 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 14:44:20 +0000 Subject: [PATCH 054/113] =?UTF-8?q?UX=20wave=2016:=20grouped=20F5=20world?= =?UTF-8?q?=20page,=20=E2=8C=83P=20groups,=20scene=20mark,=20client=20rows?= =?UTF-8?q?,=20map=20find=20picker?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - F5's world column is drawn in the declaration's order under group headings with the declared labels, in both hosts; ⇥ order and ordinals follow it. - ⌃P's OUTPUT group is split into Writing, Map, Panels and Help & setup; a new configuration is suggested Help, Welcome and Import. - A recording scene shows ● REC on the status row and the window header; the saved notice offers Open (ClientHost.OpenFile, log files under the log root only) and Copy path, as a second toast action (NoticeModel.Second). - Map edits that worked are not toasted; errors still are. - /map find lists its rooms as ⌃P "Walk to …" entries (a client-owned list, never links in a pane); reconnect messages are client rows, not session lines. - Connection-failure notices offer Show messages, not a bare ⌃P chip; no "Graphics …" on the first-run status row; "1 character" pluralised. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 14 ++ CLAUDE.md | 22 +- src/SharpMUTerm.Avalonia/NativeChrome.cs | 3 +- src/SharpMUTerm.Avalonia/NoticeToasts.cs | 45 +++- src/SharpMUTerm.Avalonia/WindowHost.cs | 1 + src/SharpMUTerm.Client/Chrome/HeaderModel.cs | 6 + src/SharpMUTerm.Client/Chrome/NoticeModel.cs | 9 + .../Commands/BuiltInCommands.cs | 104 ++++++--- .../Palette/CommandPaletteModel.cs | 21 +- .../Settings/BuiltInSettings.cs | 32 +-- .../Commands/CommandCatalog.cs | 15 +- src/SharpMUTerm.Core/Commands/CommandItem.cs | 18 +- src/SharpMUTerm.Tui/ClientRowRenderer.cs | 21 ++ src/SharpMUTerm.Tui/ExternalBrowser.cs | 41 ++++ src/SharpMUTerm.Tui/Hosting/ClientHost.cs | 10 + src/SharpMUTerm.Tui/Hosting/PlainHost.cs | 1 + .../Pointer/SharpMUTermApp.Notices.cs | 7 +- src/SharpMUTerm.Tui/SharpMUTermApp.MapEdit.cs | 8 +- src/SharpMUTerm.Tui/SharpMUTermApp.MapView.cs | 81 ++++++- .../SharpMUTermApp.Reconnect.cs | 45 +++- .../SharpMUTermApp.SceneLog.cs | 127 ++++++++++- src/SharpMUTerm.Tui/SharpMUTermApp.cs | 76 ++++++- src/SharpMUTerm.Tui/WorldsScreenRenderer.cs | 215 ++++++++++-------- .../HostParityTests.cs | 4 +- .../NoticeToastTests.cs | 28 +++ .../CommandPaletteModelTests.cs | 4 +- .../PaletteGroupsTests.cs | 95 ++++++++ .../AlertsAndReconnectTests.cs | 18 ++ .../CommandSurfaceRendererTests.cs | 2 +- .../DeclaredWorldSettingsTests.cs | 25 ++ tests/SharpMUTerm.Tui.Tests/MapViewTests.cs | 31 ++- .../ScriptingWaveTests.cs | 76 ++++++- .../WorldFieldScrollTests.cs | 10 +- .../WorldsScreenRendererTests.cs | 4 +- 34 files changed, 1012 insertions(+), 207 deletions(-) create mode 100644 src/SharpMUTerm.Tui/ClientRowRenderer.cs create mode 100644 tests/SharpMUTerm.Client.Tests/PaletteGroupsTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index a56b3d8f..3e4be66c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,11 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- While a scene log records, the status row shows `● REC` and the desktop window's header says so. The "scene saved" + notice offers Open (the scene file in your viewer; only files the client saved under its own log folder) and Copy + path. +- `/map find` lists the rooms it found in Ctrl+P as "Walk to …" entries; Enter walks there. + - Import worlds, characters, triggers, aliases, timers and keys from MUSHclient (.mcl), Mudlet (a profile folder, an XML package or a .mpackage) and TinTin++ with `/import `, Ctrl+P ▸ Import from another client… or the welcome screen. A review shows what can act as you, what will be added and what was left out (scripts are never imported or @@ -320,6 +325,15 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Changed +- F5's world page lists its fields under headings (Connection, Login & protocols, Text & input, Alerts & channels, + Map, Sound & layout) with their full names, in the same order in the terminal and in the desktop window. +- Ctrl+P's OUTPUT group is split into WRITING, MAP, PANELS and HELP & SETUP. A new configuration's palette suggests + Help, Welcome and Import first. +- Reconnect messages are written as a client row in the window, not as session lines, so they no longer reach + transcripts, the restore log, scene logs or Ctrl+F. +- The desktop window no longer shows a toast for each map edit; failed edits still do. A connection failure's notice + offers Show messages instead of a bare Ctrl+P. +- The first-run status row no longer says which graphics protocol is in use, and F5 says "1 character", not "1 chars". - Light theme: background tabs and one-row panels (vitals, quick bar) sit on a lighter grey, and small text on the settings screens is darker, so it is as easy to read as body text. - Desktop window: the composer's "no dictionary" chip is a button that offers to get one; in the terminal F1 names diff --git a/CLAUDE.md b/CLAUDE.md index 6be78060..704e5abb 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -1408,11 +1408,31 @@ fallbacks) for inline images/maps. always-on-top choice; the composer does not float; positions on a mixed-DPI desktop are assumed to be in the main window's scaling. +- **Wave 16 groups** (F5 headings, ⌃P groups, scene mark, client rows, map find). Decisions not to relitigate: + - **F5's world column is drawn in the declaration's order under its `Group` headings** (`WorldsScreenRenderer.DetailColumn` + walks `BuiltInSettings.World.Fields`), so the cell screen and the window group alike; `WorldFieldOrder` (⇥ order and the + ordinals tests navigate by) follows it, security checkboxes excepted. Labels are the declared ones, not shortenings. + - **⌃P's groups are `CommandGroup`'s nine** (Go to, Connection, Output, Writing, Map, Panels, Windows & panes, Help & setup, + Settings); `PaletteGroupsTests` keeps OUTPUT at 16 or fewer. `CommandContext.NewConfiguration` (no worlds, or a tour + owed) puts Help, Welcome and Import first in SUGGESTED. + - **`/map find` is a ⌃P family, not links in a pane** (`map:walk-to:`, `CommandContext.MapFound`; the palette opens on + `walk to `). A link in a pane is answered by the panes' handler, which is scheme-tagged server text; a palette entry is + the client's own list, in both hosts, with no new trust path. `--plain` gets client rows instead. + - **What the client says in a session window is a client row** (`ClientRowRenderer`, `AppendClientRow`: a bar function + and no `Plain`), never a `***` session line: reconnect countdowns and stops reach no transcript, restore, scene log or ⌃F. + Core's own `*** Connecting/Connection lost` lines are still session lines. + - **A scene recording is marked** (`● REC` status cell, `HeaderModel.Recording`), and the saved notice carries two actions + (`NoticeModel.Second`): `scene:open:N` and `scene:copy:N`, by index into this run's saved scenes, never a path. Open goes + through `ClientHost.OpenFile` (required; null headless), which takes only an existing absolute `.html/.htm/.txt/.log` + (`ExternalBrowser.TryParseOpenableFile`), and only under the log root. + - **`Notice(..., toast: false)`** draws the status row without a toast: map edits that worked and map hints use it. + - The parity harness's window host has `FloatingPanels = null`, like the terminal, or ⌃P's catalog differs by the pop-out entries. + ## One client, several hosts — and how they are kept the same The terminal (`sharpmuterm`), the desktop window (`sharpmuterm-window`) and the headless snapshot all run the one `SharpMUTermApp`; a host is only the place it runs. What differs between hosts is a **`ClientHost`** -(`src/SharpMUTerm.Tui/Hosting/`): driver, capabilities, clipboard, URL opener, focus reporting, keys +(`src/SharpMUTerm.Tui/Hosting/`): driver, capabilities, clipboard, URL opener, file opener, focus reporting, keys (`HostKeys`: the newline chord, and the chords the host keeps for itself), whether there is a main loop, the Sixel cell size, and what it does with the pointer (`IPointerPresenter`, null for none), whether it draws the declared settings natively (`INativeSettings`, null for the cell screens), and whether it draws ⌃P natively (`INativePalette`, null for the cell popup), whether it draws the composer with its own editor (`INativeComposer`, null for cells), whether it draws the quit prompt, ⌃F, ⌃R, ⌥M, the welcome, help and the dictionary offer itself (`INativeModals`, null for cells), where the title for what is in front goes (`IWindowTitle`: the window's title bar, the terminal's OSC 2, null headless), whether it can pop a panel out into a window of its own (`IFloatingPanels`, null for none), whether it has a native file picker (`IFilePicker`, null for none), how it asks for attention while the player is elsewhere (`IAttention`, null headless), and which chrome it draws itself beside the cells (`HostChrome`: the header and the rail, which the client then leaves out of the grid). Built by `ClientHost.Terminal`, `ClientHost.Headless`/`Snapshot` and diff --git a/src/SharpMUTerm.Avalonia/NativeChrome.cs b/src/SharpMUTerm.Avalonia/NativeChrome.cs index 147f4f8b..fa4f990c 100644 --- a/src/SharpMUTerm.Avalonia/NativeChrome.cs +++ b/src/SharpMUTerm.Avalonia/NativeChrome.cs @@ -459,7 +459,8 @@ private void LayoutPrefix(HeaderPrefix prefix, double start, double right, doubl } private static string CountsText(HeaderModel model) => - model.HasWorlds ? $"{model.ConnectedText} · {model.LogText}" : model.LogText; + (model.Recording ? $"{HeaderModel.RecordingText} · " : string.Empty) + + (model.HasWorlds ? $"{model.ConnectedText} · {model.LogText}" : model.LogText); protected override void PressedEmpty(PointerPressedEventArgs e) => View.WindowGestureFromChrome(e); diff --git a/src/SharpMUTerm.Avalonia/NoticeToasts.cs b/src/SharpMUTerm.Avalonia/NoticeToasts.cs index f83f45b8..db55155b 100644 --- a/src/SharpMUTerm.Avalonia/NoticeToasts.cs +++ b/src/SharpMUTerm.Avalonia/NoticeToasts.cs @@ -113,7 +113,7 @@ public void Show(NoticeOverlay overlay) /// Runs or dismisses the toast showing notice , as a left click on it does. Internal for /// tests; a real click comes through . /// - internal void Click(long sequence) + internal void Click(long sequence, bool second = false) { var toast = _toasts.FirstOrDefault(t => t.Overlay.Notice.Sequence == sequence); if (toast is null) @@ -122,7 +122,7 @@ internal void Click(long sequence) } _toasts.Remove(toast); - if (toast.Overlay.Notice.Action is { } action) + if ((second ? toast.Overlay.Notice.Second : toast.Overlay.Notice.Action) is { } action) { toast.Overlay.Run(action.Command); } @@ -144,7 +144,7 @@ internal void Advance(TimeSpan by) /// The words each toast draws — its key chip, its text and its action — oldest first. Internal for tests. internal IReadOnlyList DrawnText() => - Layout().SelectMany(l => new[] { SourceText(l.Toast), ChipText(l.Toast), BodyText(l.Toast), ActionText(l.Toast) }).OfType().ToList(); + Layout().SelectMany(l => new[] { SourceText(l.Toast), ChipText(l.Toast), BodyText(l.Toast), ActionText(l.Toast), SecondText(l.Toast) }).OfType().ToList(); /// Whether each toast's label is a key chip (true) or a source caption (false), oldest first; null for none. Internal for tests. internal IReadOnlyList LabelIsChip() => @@ -161,6 +161,29 @@ internal IReadOnlyList DrawnText() => private static string? ActionText(Toast toast) => toast.Overlay.Notice.Action is { } a ? $"{NativeKeys.Words(a.Label)} ›" : null; + // A second action (a saved scene's Copy path beside Open) sits on the same line, after the first, as its own click. + private static string? SecondText(Toast toast) => + toast.Overlay.Notice.Action is not null && toast.Overlay.Notice.Second is { } a ? $"{NativeKeys.Words(a.Label)} ›" : null; + + /// Where a toast's second action is drawn, or an empty rect when it has none. + private static Rect SecondArea(Placed placed) + { + if (placed.Action is not { } action || placed.Second is not { } second) + { + return default; + } + + var y = placed.Rect.Y + Padding + (placed.Source is null ? 0 : placed.Source.Height + 2) + placed.Text.Height + 6; + var x = placed.Rect.X + EdgeWidth + Padding + action.Width + SecondGap; + return new Rect(x - (SecondGap / 2), y - 3, second.Width + SecondGap, second.Height + 6); + } + + /// The gap between a toast's two actions, in pixels. + private const double SecondGap = 20; + + /// Where each toast's second action is, oldest first (empty for none). Internal for tests. + internal IReadOnlyList SecondAreas() => Layout().Select(SecondArea).ToList(); + /// Where each toast is drawn, oldest first, in this control's coordinates. Internal for tests. internal IReadOnlyList Rects() => Layout().Select(l => l.Rect).ToList(); @@ -228,7 +251,7 @@ private void SyncFreeze() // ── Layout ─────────────────────────────────────────────────────────────────────────────── - private readonly record struct Placed(Toast Toast, Rect Rect, FormattedText Text, FormattedText? Chip, FormattedText? Action, FormattedText? Source = null); + private readonly record struct Placed(Toast Toast, Rect Rect, FormattedText Text, FormattedText? Chip, FormattedText? Action, FormattedText? Source = null, FormattedText? Second = null); private List Layout() { @@ -308,10 +331,13 @@ private List FrozenLayout(Dictionary frozen) var textWidth = inner - (chip is null ? 0 : chip.Width + 8); var text = Format(BodyText(toast), TextSize, ink, bold: false, Math.Max(40, textWidth), lines: 3); var action = ActionText(toast) is { } a ? Format(a, ChipSize, PanelText.Parse(palette.Edge(toast.Overlay.Notice.Severity)), bold: true, inner) : null; + var second = action is not null && SecondText(toast) is { } b + ? Format(b, ChipSize, PanelText.Parse(palette.Edge(toast.Overlay.Notice.Severity)), bold: true, Math.Max(1, inner - action.Width - SecondGap)) + : null; var source = SourceText(toast) is { } said ? Format(said.ToUpperInvariant(), ChipSize - 1, PanelText.Parse(palette.Edge(toast.Overlay.Notice.Severity)), bold: true, inner) : null; var height = (2 * Padding) + text.Height + (action is null ? 0 : action.Height + 6) + (source is null ? 0 : source.Height + 2); var top = bottom - height; - return top < Inset ? null : new Placed(toast, new Rect(x, top, width, height), text, chip, action, source); + return top < Inset ? null : new Placed(toast, new Rect(x, top, width, height), text, chip, action, source, second); } private static FormattedText Format(string text, double size, Color colour, bool bold, double maxWidth, int lines = 1) => @@ -368,7 +394,7 @@ protected override void OnPointerPressed(PointerPressedEventArgs e) if (point.Properties.IsLeftButtonPressed) { - Click(hit.Toast.Overlay.Notice.Sequence); + Click(hit.Toast.Overlay.Notice.Sequence, SecondArea(hit).Contains(at)); } } @@ -390,8 +416,9 @@ public override void Render(DrawingContext context) { var now = _clock.Elapsed; var hovered = HoveredToast(); - foreach (var (toast, rect, text, chip, action, source) in Layout()) + foreach (var placed in Layout()) { + var (toast, rect, text, chip, action, source, second) = placed; var palette = toast.Overlay.Palette; var plane = PanelText.Parse(palette.Plane); var edge = PanelText.Parse(palette.Edge(toast.Overlay.Notice.Severity)); @@ -432,6 +459,10 @@ public override void Render(DrawingContext context) if (action is not null) { context.DrawText(action, new Point(rect.X + EdgeWidth + Padding, y + text.Height + 6)); + if (second is not null) + { + context.DrawText(second, new Point(rect.X + EdgeWidth + Padding + action.Width + SecondGap, y + text.Height + 6)); + } } } } diff --git a/src/SharpMUTerm.Avalonia/WindowHost.cs b/src/SharpMUTerm.Avalonia/WindowHost.cs index c3599d79..91ea1452 100644 --- a/src/SharpMUTerm.Avalonia/WindowHost.cs +++ b/src/SharpMUTerm.Avalonia/WindowHost.cs @@ -50,6 +50,7 @@ internal static class WindowHost Capabilities = WindowOptions.Capabilities, Clipboard = clipboard, OpenUrl = ExternalBrowser.Open, + OpenFile = ExternalBrowser.OpenFile, // Focus reporting is a terminal escape, and its focus-in arrives disguised as a Tab: in a window it // would only ever turn a real Tab after a pause into a "you were away" bar. diff --git a/src/SharpMUTerm.Client/Chrome/HeaderModel.cs b/src/SharpMUTerm.Client/Chrome/HeaderModel.cs index ebee1f4a..207f4cdc 100644 --- a/src/SharpMUTerm.Client/Chrome/HeaderModel.cs +++ b/src/SharpMUTerm.Client/Chrome/HeaderModel.cs @@ -51,6 +51,12 @@ public sealed record HeaderModel( /// panel lists in full; null otherwise. A host drawing its own header shows this in place of the search box. /// public HeaderPrefix? Prefix { get; init; } + + /// Whether a scene log is recording (⌃P ▸ Start scene log), in any window. + public bool Recording { get; init; } + + /// The recording mark as every surface words it. + public const string RecordingText = "● REC"; } /// The ⌃B keymap as the header shows it while the prefix is armed. diff --git a/src/SharpMUTerm.Client/Chrome/NoticeModel.cs b/src/SharpMUTerm.Client/Chrome/NoticeModel.cs index 1504b520..04902e93 100644 --- a/src/SharpMUTerm.Client/Chrome/NoticeModel.cs +++ b/src/SharpMUTerm.Client/Chrome/NoticeModel.cs @@ -54,8 +54,17 @@ public static class Sources /// Imports from another client. public const string Import = "Import"; + + /// Scene logs: recording, saved. + public const string Scene = "Scene log"; } + /// + /// A second command the notice offers, after (a saved scene's Copy path beside + /// Open); null for none, and always null without a first. Only the window offers it, as its own click. + /// + public NoticeAction? Second { get; init; } + /// How long a notice holds the status row, and how long a toast stays before it fades. public static readonly TimeSpan Duration = TimeSpan.FromSeconds(6); } diff --git a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs index 3bb728d1..0132bfc7 100644 --- a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs +++ b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs @@ -20,6 +20,9 @@ public static class BuiltInCommands /// Help: keys, slash commands and how-tos (/help). public const string HelpCommand = "term:help"; + /// The first-run welcome: connect to a world, browse worlds, pick a layout. + public const string WelcomeCommand = "term:welcome"; + /// Import from another client: a file picker in a host that has one, else /import on the command line. public const string ImportCommand = "term:import"; @@ -32,9 +35,30 @@ public static class BuiltInCommands /// ⌃P ▸ Stop scene log. public const string SceneStopCommand = "term:scene-off"; + /// + /// The prefix of a saved scene's notice actions, which ⌃P lists nothing under: scene:open:N and + /// scene:copy:N, where N indexes the scenes saved this run (the client's own list, never a path). + /// + public const string ScenePrefix = "scene:"; + + /// Opens saved scene N in the desktop's viewer for it. + public const string SceneOpenPrefix = "scene:open:"; + + /// Copies saved scene N's path. + public const string SceneCopyPrefix = "scene:copy:"; + /// The spelling dictionary offer. public const string DictionaryCommand = "term:get-dictionary"; + /// The prefix of the Walk to … entries the last /map find listed: map:walk-to:<room id>. + public const string MapWalkPrefix = "map:walk-to:"; + + /// What the palette opens with typed in after a /map find, so it lists the rooms found and nothing else. + public const string MapWalkQuery = "walk to "; + + /// The ⌃P id that walks to room , one the last /map find listed. + public static string MapWalk(long room) => MapWalkPrefix + room.ToString(System.Globalization.CultureInfo.InvariantCulture); + /// The ⌃P id that joins 's server wraps. public static string JoinWraps(string world) => JoinWrapsPrefix + world; @@ -119,6 +143,7 @@ void Family(string id, string prefix, Func c.State.LoggingOn); Add("term:log-on", CommandGroup.Terminal, "Start logging", when: c => !c.State.LoggingOn); + Family("term:scene-saved", ScenePrefix, _ => []); Add(SceneStopCommand, CommandGroup.Terminal, "Stop scene log", detail: "closes the file", when: c => c.State.SceneLogging); Add(SceneStartCommand, CommandGroup.Terminal, "Start scene log", detail: "record this window's poses to a file of their own", when: c => !c.State.SceneLogging); @@ -163,32 +188,36 @@ void Family(string id, string prefix, Func"); + Add("term:map", CommandGroup.Map, "Show map", detail: "this connection's map · click a room, or /walk "); // Editing the map: the room you are in selected, the map holding the keys (its footer names them). Listed // unconditionally beside Show map; it refuses out loud where there is no map. - Add("map:edit", CommandGroup.Terminal, "Edit map", detail: "rename, area, lock, weight, exits, notes · /map rename …"); - Add("map:undo", CommandGroup.Terminal, "Undo map edit", detail: "takes back the last change to the map", when: c => c.State.MapUndo is not null); + Add("map:edit", CommandGroup.Map, "Edit map", detail: "rename, area, lock, weight, exits, notes · /map rename …"); + Add("map:undo", CommandGroup.Map, "Undo map edit", detail: "takes back the last change to the map", when: c => c.State.MapUndo is not null); // Looking at another level or area of the map, and back; offered only where the map has one to look at. - Add("map:level-up", CommandGroup.Terminal, "Map: level up", detail: "shows the next level up · /map level up", when: c => c.State.MapLevels > 1); - Add("map:level-down", CommandGroup.Terminal, "Map: level down", detail: "shows the next level down · /map level down", when: c => c.State.MapLevels > 1); - Add("map:next-area", CommandGroup.Terminal, "Map: next area", detail: "shows another area · /map view ", when: c => c.State.MapAreas > 1); - Add("map:here", CommandGroup.Terminal, "Map: back to where I am", detail: "the map follows you again · /map here", when: c => c.State.MapViewing); - Add("map:find", CommandGroup.Terminal, "Find room…", detail: "rooms by name or area · /map find ", when: c => c.State.MapLevels > 0); + Add("map:level-up", CommandGroup.Map, "Map: level up", detail: "shows the next level up · /map level up", when: c => c.State.MapLevels > 1); + Add("map:level-down", CommandGroup.Map, "Map: level down", detail: "shows the next level down · /map level down", when: c => c.State.MapLevels > 1); + Add("map:next-area", CommandGroup.Map, "Map: next area", detail: "shows another area · /map view ", when: c => c.State.MapAreas > 1); + Add("map:here", CommandGroup.Map, "Map: back to where I am", detail: "the map follows you again · /map here", when: c => c.State.MapViewing); + Add("map:find", CommandGroup.Map, "Find room…", detail: "rooms by name or area · /map find ", when: c => c.State.MapLevels > 0); + + // The rooms the last /map find listed: one Walk to entry each, which the find opens the palette on. A picker of the + // client's own, never a link in a pane: the panes' link handler is server text's, and this is the client's action. + Family("map:walk-to", MapWalkPrefix, MapFoundEntries); // The panels a layout places, openable one at a time as tabs: each draws the focused character's own data // and says so when there is none yet, so they are listed unconditionally, like the map. - Add("panel:who-here", CommandGroup.Terminal, "Show who is here", detail: "players and creatures in the room · click a name to look"); - Add("panel:vitals", CommandGroup.Terminal, "Show vitals", detail: "the F7 meters as bars, and your target"); - Add("panel:quick-bar", CommandGroup.Terminal, "Show quick bar", detail: "this character's function-key macros · click one to run it"); - Add("panel:composer", CommandGroup.Terminal, "Dock the composer", detail: "a pane to write posts in · ⌃S sends"); + Add("panel:who-here", CommandGroup.Panels, "Show who is here", detail: "players and creatures in the room · click a name to look"); + Add("panel:vitals", CommandGroup.Panels, "Show vitals", detail: "the F7 meters as bars, and your target"); + Add("panel:quick-bar", CommandGroup.Panels, "Show quick bar", detail: "this character's function-key macros · click one to run it"); + Add("panel:composer", CommandGroup.Panels, "Dock the composer", detail: "a pane to write posts in · ⌃S sends"); // A panel in a window of its own, for a second monitor — only where the host can draw one (the desktop window; // Floats is null in a terminal, which keeps every panel in its region). One entry per panel window, by id, so the // action runs on that panel's own character whichever window is focused. Family("panel:popout", Client.Panels.PanelFloatCommands.PopOutPrefix, PopOuts); Family("panel:dock", Client.Panels.PanelFloatCommands.DockPrefix, Docks); - Add("term:walk-stop", CommandGroup.Terminal, "Stop walking", detail: "ends the speedwalk", when: c => c.State.Walking); + Add("term:walk-stop", CommandGroup.Map, "Stop walking", detail: "ends the speedwalk", when: c => c.State.Walking); // Game sound, for this run. The levels and the off switch are F7's; this is the quick one. Add("term:mute", CommandGroup.Terminal, "Mute sound", detail: "until unmuted or restarted", @@ -199,7 +228,7 @@ void Family(string id, string prefix, Func c.State.NoDictionary); Add("term:timestamps-off", CommandGroup.Terminal, "Hide timestamps", when: c => c.State.TimestampsOn); Add("term:timestamps-on", CommandGroup.Terminal, "Show timestamps", when: c => !c.State.TimestampsOn); - Add("term:input2-off", CommandGroup.Terminal, "Hide second input", "⌃B i", "this window", + Add("term:input2-off", CommandGroup.Compose, "Hide second input", "⌃B i", "this window", when: c => c.State.SecondInputOn, detailFirst: true); - Add("term:input2-on", CommandGroup.Terminal, "Show second input", "⌃B i", "this window", + Add("term:input2-on", CommandGroup.Compose, "Show second input", "⌃B i", "this window", when: c => !c.State.SecondInputOn, detailFirst: true); // The newline chord. Here for the same reason the scrollback keys are: a chord that works and is // named nowhere is a chord nobody finds, which is precisely how this one was reported as missing. // The host says which chord it is: a terminal reports Shift+⏎ and Ctrl+⏎ as a bare ⏎, so there it is // Alt+⏎, and a window keeps Alt+⏎ for itself, so there it is Ctrl+⏎. - Add("term:newline", CommandGroup.Terminal, "Insert a newline in the command line", KeyHint.ForHost(HostKey.Newline)); + Add("term:newline", CommandGroup.Compose, "Insert a newline in the command line", KeyHint.ForHost(HostKey.Newline)); // LAYOUT — every entry carries the chord that runs it, because this surface is where the client // is discovered from and the ⌃B keymap is otherwise visible only while the prefix is armed. @@ -430,6 +461,15 @@ private static IEnumerable JoinWrapsEntries(ICommandContext context Detail = $"it wraps at {r.Column}, the pane is {r.PaneWidth} wide · F5 ▸ join wraps", }); + private static IEnumerable MapFoundEntries(ICommandContext context) => + (context.State.MapFound ?? []).Select(r => + { + var detail = (r.Area is { } area ? area + " · " : string.Empty) + + "level " + r.Level.ToString(System.Globalization.CultureInfo.InvariantCulture) + + " · #" + r.Id.ToString(System.Globalization.CultureInfo.InvariantCulture); + return new CommandItem(CommandGroup.Map, $"Walk to {r.Name}", MapWalk(r.Id), detail) { Detail = detail }; + }); + private static IEnumerable SendGroup(ICommandContext context) { var characters = context.Characters; @@ -496,7 +536,7 @@ private static IEnumerable Panes(ICommandContext context) private static IEnumerable PopOuts(ICommandContext context) => (context.State.Floats ?? []).Where(f => !f.Floating).Select(f => new CommandItem( - CommandGroup.Layout, + CommandGroup.Panels, $"Pop out {f.Title}", Client.Panels.PanelFloatCommands.PopOut(f.WindowId), $"{f.Character} · in a window of its own") @@ -507,7 +547,7 @@ private static IEnumerable PopOuts(ICommandContext context) => private static IEnumerable Docks(ICommandContext context) => (context.State.Floats ?? []).Where(f => f.Floating).Select(f => new CommandItem( - CommandGroup.Layout, + CommandGroup.Panels, $"Dock {f.Title} back", Client.Panels.PanelFloatCommands.Dock(f.WindowId), $"{f.Character} · into its place in the layout") diff --git a/src/SharpMUTerm.Client/Palette/CommandPaletteModel.cs b/src/SharpMUTerm.Client/Palette/CommandPaletteModel.cs index 740d054e..c82c44c2 100644 --- a/src/SharpMUTerm.Client/Palette/CommandPaletteModel.cs +++ b/src/SharpMUTerm.Client/Palette/CommandPaletteModel.cs @@ -84,7 +84,11 @@ public static class CommandPaletteModel CommandGroup.GoTo, CommandGroup.World, CommandGroup.Terminal, + CommandGroup.Compose, + CommandGroup.Map, + CommandGroup.Panels, CommandGroup.Layout, + CommandGroup.Help, CommandGroup.Settings, }; @@ -92,9 +96,13 @@ public static class CommandPaletteModel public static string GroupLabel(CommandGroup group) => group switch { CommandGroup.GoTo => "GO TO", - CommandGroup.World => "WORLD", + CommandGroup.World => "CONNECTION", CommandGroup.Terminal => "OUTPUT", - CommandGroup.Layout => "LAYOUT", + CommandGroup.Compose => "WRITING", + CommandGroup.Map => "MAP", + CommandGroup.Panels => "PANELS", + CommandGroup.Layout => "WINDOWS & PANES", + CommandGroup.Help => "HELP & SETUP", CommandGroup.Settings => "SETTINGS", _ => group.ToString().ToUpperInvariant(), }; @@ -108,6 +116,15 @@ public static IReadOnlyList Suggested(CommandContext state) { ArgumentNullException.ThrowIfNull(state); var ids = new List(); + + // A configuration that is new (no world yet, or the key tour still owed): where to start, before anything else. + if (state.NewConfiguration) + { + ids.Add(BuiltInCommands.HelpCommand); + ids.Add(BuiltInCommands.WelcomeCommand); + ids.Add(BuiltInCommands.ImportCommand); + } + if (state.OutputSelected) { ids.Add("term:copy"); diff --git a/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs b/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs index 06e1c619..2cc66651 100644 --- a/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs +++ b/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs @@ -205,11 +205,14 @@ public static partial class BuiltInSettings /// F5's world groups. public const string ConnectionGroup = "Connection"; - /// What the world speaks and how it logs in. - public const string ProtocolGroup = "Protocols & login"; + /// How the world logs in and what it speaks. + public const string ProtocolGroup = "Login & protocols"; - /// How the world's text is taken in. - public const string WorldTextGroup = "Text"; + /// How the world's text is taken in, and what a typed line becomes. + public const string WorldTextGroup = "Text & input"; + + /// What the world's text tells the player about: alerts, channels, names. + public const string WorldAlertsGroup = "Alerts & channels"; /// What the mapper reads. public const string MapGroup = "Map"; @@ -254,6 +257,10 @@ public static partial class BuiltInSettings Keywords = "idle timeout ping", Binding = SettingBinding.ForWorld((_, w) => w.KeepaliveSeconds, (_, w, v) => w.KeepaliveSeconds = v), }, + WorldChoice("reconnect", "reconnect", WorldFieldValues.ReconnectChoices, ConnectionGroup, + (_, w) => w.AutoReconnect ? WorldFieldValues.ReconnectChoices[1] : WorldFieldValues.ReconnectChoices[0], + (_, w, v) => w.AutoReconnect = v == WorldFieldValues.ReconnectChoices[1], + "dial again after a dropped connection, 5 s to 60 s apart, five tries", "auto reconnect drop retry"), WorldChoice("content", "content", WorldFieldValues.ContentChoices, ProtocolGroup, (_, w) => WorldFieldValues.ContentName(w.ContentFormat), (_, w, v) => w.ContentFormat = WorldFieldValues.ContentOf(v), @@ -265,10 +272,6 @@ public static partial class BuiltInSettings (_, w) => w.GmcpLogin ? WorldFieldValues.LoginChoices[1] : WorldFieldValues.LoginChoices[0], (_, w, v) => w.GmcpLogin = v == WorldFieldValues.LoginChoices[1], "log in over GMCP when the server offers it", "char.login password credentials"), - WorldChoice("reconnect", "reconnect", WorldFieldValues.ReconnectChoices, ConnectionGroup, - (_, w) => w.AutoReconnect ? WorldFieldValues.ReconnectChoices[1] : WorldFieldValues.ReconnectChoices[0], - (_, w, v) => w.AutoReconnect = v == WorldFieldValues.ReconnectChoices[1], - "dial again after a dropped connection, 5 s to 60 s apart, five tries", "auto reconnect drop retry"), WorldChoice("discord", "discord", WorldFieldValues.DiscordChoices, ProtocolGroup, (_, w) => w.DiscordPresence ? WorldFieldValues.DiscordChoices[1] : WorldFieldValues.DiscordChoices[0], (_, w, v) => w.DiscordPresence = v == WorldFieldValues.DiscordChoices[1], @@ -285,23 +288,24 @@ public static partial class BuiltInSettings (_, w) => WorldFieldValues.SeparatorName(w.CommandSeparator), (_, w, v) => w.CommandSeparator = WorldFieldValues.SeparatorOf(v), "split a typed line on this, and #3 cmd repeats one; off for a MUSH", "separator semicolon repeat speedwalk"), - WorldChoice("alert-on", "alert on", WorldFieldValues.AlertChoices, WorldTextGroup, + WorldText("edit-grab", "edit grab", TextRule.Optional, WorldTextGroup, + (_, w) => w.GrabPrefix, (_, w, v) => w.GrabPrefix = v, + "a line starting with this goes on the command line instead of the output", "fugueedit mush edit prefix"), + + WorldChoice("alert-on", "alert on", WorldFieldValues.AlertChoices, WorldAlertsGroup, (_, w) => w.AlertOnName ? WorldFieldValues.AlertChoices[1] : WorldFieldValues.AlertChoices[0], (_, w, v) => w.AlertOnName = v == WorldFieldValues.AlertChoices[1], "tell the desktop when a line names your character or pages you", "notify mention page tell"), - WorldChoice("capture-channels", "capture channels", WorldFieldValues.ChannelCaptureChoices, WorldTextGroup, + WorldChoice("capture-channels", "capture channels", WorldFieldValues.ChannelCaptureChoices, WorldAlertsGroup, (_, w) => WorldFieldValues.ChannelCaptureName(w.CaptureChannels), (_, w, v) => w.CaptureChannels = WorldFieldValues.ChannelCaptureOf(v), "put each GMCP channel in a window of its own, as a copy or moved out of the main window", "comm.channel chat ooc gossip spawn window"), - WorldText("highlight-names", "highlight names", TextRule.NameHighlights, WorldTextGroup, + WorldText("highlight-names", "highlight names", TextRule.NameHighlights, WorldAlertsGroup, (_, w) => NameHighlights.Format(w.HighlightNames), (_, w, v) => w.HighlightNames = [.. NameHighlights.Parse(v).Names], "names drawn in a colour wherever they appear: Ashlyn=gold, Merrow=red", "friends enemies highlight name colour"), - WorldText("edit-grab", "edit grab", TextRule.Optional, WorldTextGroup, - (_, w) => w.GrabPrefix, (_, w, v) => w.GrabPrefix = v, - "a line starting with this goes on the command line instead of the output", "fugueedit mush edit prefix"), WorldText("map-room", "map room", TextRule.Pattern, MapGroup, (_, w) => w.Map.RoomNamePattern, (_, w, v) => w.Map.RoomNamePattern = v, diff --git a/src/SharpMUTerm.Core/Commands/CommandCatalog.cs b/src/SharpMUTerm.Core/Commands/CommandCatalog.cs index 19fdb2d7..f5657ed6 100644 --- a/src/SharpMUTerm.Core/Commands/CommandCatalog.cs +++ b/src/SharpMUTerm.Core/Commands/CommandCatalog.cs @@ -66,6 +66,10 @@ public sealed record CharacterRef( /// How many levels the area the focused character's map shows has (0 with no map). /// How many named areas that map has. /// Whether that map shows somewhere other than where the character is. +/// +/// Whether the configuration is new — no world yet, or the key tour still owed — so Help, Welcome and Import are suggested. +/// +/// The rooms the last /map find listed, newest search only, so ⌃P offers to walk to each. public sealed record CommandContext( bool LoggingOn = false, bool Zoomed = false, @@ -88,7 +92,16 @@ public sealed record CommandContext( bool SceneLogging = false, int MapLevels = 0, int MapAreas = 0, - bool MapViewing = false); + bool MapViewing = false, + bool NewConfiguration = false, + IReadOnlyList? MapFound = null); + +/// A room the last /map find listed, for the command surface's Walk to … entries. +/// The room's id on the map. +/// Its name. +/// Its area's name, or null. +/// Its level (z). +public sealed record FoundRoom(long Id, string Name, string? Area, int Level); /// A world whose pane is narrower than its server's wrap column. /// The world's name. diff --git a/src/SharpMUTerm.Core/Commands/CommandItem.cs b/src/SharpMUTerm.Core/Commands/CommandItem.cs index 3dac440c..cca4d7bf 100644 --- a/src/SharpMUTerm.Core/Commands/CommandItem.cs +++ b/src/SharpMUTerm.Core/Commands/CommandItem.cs @@ -6,17 +6,29 @@ public enum CommandGroup /// Navigation: switch character, jump to a window. GoTo, - /// World/connection actions: connect, disconnect, reconnect. + /// Connection actions: reconnect, disconnect, the send group, scripts. World, - /// Terminal/session actions: logging, freeze/scrollback, clear. + /// Output actions: logging and scene logs, freeze/scrollback, clear, copy, timestamps, sound. Terminal, - /// Layout actions: split, zoom, close pane, move. + /// Windows and panes: split, zoom, close pane, focus, tabs, the rail, layouts, resize. Layout, /// The configuration screens — one entry per screen the host offers, F-key and all. Settings, + + /// The map: show it, edit it, look at another level or area, find a room, stop a walk. + Map, + + /// The panels a layout places (who is here, vitals, quick bar, the docked composer), and popping them out. + Panels, + + /// Writing: the composer, command history, the second command line, the newline, the dictionary. + Compose, + + /// Help and setting up: help, the welcome, the key tour, import, packages. + Help, } /// diff --git a/src/SharpMUTerm.Tui/ClientRowRenderer.cs b/src/SharpMUTerm.Tui/ClientRowRenderer.cs new file mode 100644 index 00000000..80aa0118 --- /dev/null +++ b/src/SharpMUTerm.Tui/ClientRowRenderer.cs @@ -0,0 +1,21 @@ +namespace SharpMUTerm.Tui; + +/// +/// One row the client itself writes into a window — a reconnect counting down, a room a search found where no screen is +/// read — drawn the way the boundary bars are (): a label in the accent, the words muted, +/// a rule to the pane's edge. Not a session line: it goes into the pane buffer as chrome (AppendClientRow), so it +/// reaches no transcript, restore log, scene log, trigger or ⌃F search, and a theme change recolours it with the bars. +/// Replaces the *** lines these used to print, which read as the game's own text and were logged as it. +/// Pure, so the markup is unit-testable without a terminal. +/// +internal static class ClientRowRenderer +{ + /// The row for and , on an already-resolved #rrggbb accent. + public static string Bar(string label, string text, string accentHex, int width = 0) + { + ArgumentException.ThrowIfNullOrEmpty(label); + ArgumentException.ThrowIfNullOrEmpty(accentHex); + var (words, rule) = BarRule.Fit(label.Length + 4, text, width); + return $"[{accentHex}]› {MarkupText.Escape(label)}[/] [dim]{MarkupText.Escape(words)} {BarRule.Rule(rule)}[/]"; + } +} diff --git a/src/SharpMUTerm.Tui/ExternalBrowser.cs b/src/SharpMUTerm.Tui/ExternalBrowser.cs index 6bd7686e..9051c8a0 100644 --- a/src/SharpMUTerm.Tui/ExternalBrowser.cs +++ b/src/SharpMUTerm.Tui/ExternalBrowser.cs @@ -72,4 +72,45 @@ internal static void Open(string url) Process.Start(new ProcessStartInfo(target) { UseShellExecute = true })?.Dispose(); } + + /// The kinds of file hands to the desktop: what a transcript or scene log is written as. + internal static readonly IReadOnlyList OpenableFileExtensions = [".html", ".htm", ".txt", ".log"]; + + /// + /// Whether is a file this client will hand to the desktop, and its full form if so: an + /// absolute path to an existing regular file whose extension is one a log is written as. Never a script, a + /// .desktop entry or an executable, whatever asks — the desktop's handler for those would run them. + /// + internal static bool TryParseOpenableFile(string? path, out string full) + { + full = string.Empty; + if (string.IsNullOrWhiteSpace(path) || !Path.IsPathFullyQualified(path) || path.Contains('\0')) + { + return false; + } + + var resolved = Path.GetFullPath(path); + if (!OpenableFileExtensions.Contains(Path.GetExtension(resolved).ToLowerInvariant()) || !File.Exists(resolved)) + { + return false; + } + + full = resolved; + return true; + } + + /// + /// Opens a log file the client wrote in the desktop's viewer for its kind (a browser for HTML, an editor for text), + /// with the same shell-execute and the same gate-in-the-launcher rule as . + /// + /// The path is not an existing log file (). + internal static void OpenFile(string path) + { + if (!TryParseOpenableFile(path, out var target)) + { + throw new ArgumentException($"not a log file this client opens: {path}", nameof(path)); + } + + Process.Start(new ProcessStartInfo(target) { UseShellExecute = true })?.Dispose(); + } } diff --git a/src/SharpMUTerm.Tui/Hosting/ClientHost.cs b/src/SharpMUTerm.Tui/Hosting/ClientHost.cs index 35b28501..59099085 100644 --- a/src/SharpMUTerm.Tui/Hosting/ClientHost.cs +++ b/src/SharpMUTerm.Tui/Hosting/ClientHost.cs @@ -42,6 +42,13 @@ internal sealed record ClientHost /// Opens an http(s) link in the desktop's browser, or null for a client that refuses and says so. public required Action? OpenUrl { get; init; } + /// + /// Opens a file the client wrote (a saved scene log) in the desktop's viewer for it, or null for a client that refuses + /// and says so. The client checks the file is its own (under the log root); the opener refuses anything but a log's + /// own kinds of file (). + /// + public required Action? OpenFile { get; init; } + /// Whether to ask for terminal focus reports (). public required bool FocusReporting { get; init; } @@ -188,6 +195,7 @@ public static ClientHost Terminal(TerminalCapabilities capabilities) // Win32), so a copy lands whether the client is local or on the far end of an ssh session. Clipboard = SharpConsoleUI.Helpers.ClipboardHelper.SetText, OpenUrl = ExternalBrowser.Open, + OpenFile = ExternalBrowser.OpenFile, FocusReporting = PlatformDecodesFocusReports, Keys = HostKeys.Terminal, Pointer = TerminalPointer.Create(driver), @@ -219,6 +227,7 @@ public static ClientHost Terminal(TerminalCapabilities capabilities) Capabilities = capabilities, Clipboard = null, OpenUrl = null, + OpenFile = null, FocusReporting = false, Keys = HostKeys.Terminal, Pointer = null, @@ -282,6 +291,7 @@ internal static ClientHost HarnessTerminal( { Clipboard = clipboard, OpenUrl = openUrl, + OpenFile = null, // a test never opens a viewer FocusReporting = focusReporting ?? PlatformDecodesFocusReports, Audio = null, // a test never makes a noise Presence = null, // nor talks to Discord diff --git a/src/SharpMUTerm.Tui/Hosting/PlainHost.cs b/src/SharpMUTerm.Tui/Hosting/PlainHost.cs index 1917ce7d..92855c1e 100644 --- a/src/SharpMUTerm.Tui/Hosting/PlainHost.cs +++ b/src/SharpMUTerm.Tui/Hosting/PlainHost.cs @@ -25,6 +25,7 @@ public static ClientHost Create(TerminalCapabilities capabilities, TextWriter ou { Name = "plain", OpenUrl = ExternalBrowser.Open, + OpenFile = ExternalBrowser.OpenFile, RunsInline = false, Audio = () => DesktopAudio.TryCreate(), Presence = () => new DiscordIpc(), diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Notices.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Notices.cs index 56b30bf7..d79d7bcc 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Notices.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Notices.cs @@ -71,8 +71,13 @@ private void PublishNotice(NoticeModel notice) return; } - if (notice.Action is { } action) + foreach (var action in new[] { notice.Action, notice.Second }) { + if (action is null) + { + continue; + } + _noticeActionsOffered.Add(action.Command); if (_noticeActionsOffered.Count > NoticeActionsKept) { diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.MapEdit.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.MapEdit.cs index 2de7e3bd..1f231270 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.MapEdit.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.MapEdit.cs @@ -129,7 +129,8 @@ internal void SelectMapRoom(string windowId, long? room) RenderMap(windowId); if (entering) { - Notice("map: ←↑→↓ select · r rename · l lock · Del delete · u undo · Esc done", MessageSeverity.Info, "⌃P", source: NoticeModel.Sources.Map); + // Not toasted: the window's map inspector shows these as buttons; the status row says them for the cells. + Notice("map: ←↑→↓ select · r rename · l lock · Del delete · u undo · Esc done", MessageSeverity.Info, source: NoticeModel.Sources.Map, toast: false); } } @@ -183,7 +184,10 @@ private void LeaveMapEdit(string windowId) } RenderMap(windowId); - Notice(result.Message + ".", result.Done ? MessageSeverity.Info : MessageSeverity.Warning, source: NoticeModel.Sources.Map); + + // A done edit is said on the status row and not toasted: the map shows it, and so does the window's inspector, so a + // toast per edit only stacked over the map. A refusal is still toasted — nothing else says it. + Notice(result.Message + ".", result.Done ? MessageSeverity.Info : MessageSeverity.Warning, source: NoticeModel.Sources.Map, toast: !result.Done); return result.Done ? null : result.Message; } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.MapView.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.MapView.cs index f480bdcf..9a9eff30 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.MapView.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.MapView.cs @@ -20,6 +20,70 @@ internal sealed partial class SharpMUTermApp /// Where each map window looks, when it is not where its character is. private readonly Dictionary _mapLooks = new(StringComparer.Ordinal); + /// + /// The rooms the last /map find listed, and whose map they are on: ⌃P's Walk to … entries + /// (), for the run. Replaced by the next search. + /// + private (string SessionKey, IReadOnlyList Rooms)? _mapFound; + + /// The rooms ⌃P offers to walk to, for the catalog. + private IReadOnlyList? MapFoundRooms() => _mapFound?.Rooms; + + /// + /// A search's answer: a picker, not lines in the output. The rooms become ⌃P entries (Walk to …, the client's own + /// commands, run by the registry) and the palette opens listing them, so ⏎ walks — in the cells and in the window's + /// native palette alike, from the one model. Nothing is a link in a pane: the panes' link handler takes server text, + /// and a client action reached through it would be a new trust path. Where no screen is seen (--plain) a + /// modal would take the reader's typing, so the rooms are said as client rows instead (never session lines: they + /// reach no transcript, restore log, trigger or search). + /// + private void ShowFoundRooms(string windowId, string sessionKey, string text, IReadOnlyList rooms, int total) + { + _mapFound = (sessionKey, [.. rooms.Select(r => new Core.Commands.FoundRoom(r.Id, r.Name, r.Area, r.Level))]); + var shown = total > rooms.Count + ? $"the first {rooms.Count.ToString(CultureInfo.InvariantCulture)} of {total.ToString(CultureInfo.InvariantCulture)}" + : total.ToString(CultureInfo.InvariantCulture); + if (!Host.ScreenIsSeen) + { + AppendClientRow(windowId, "FIND", $"rooms matching {text} ({shown}) · /walk goes there"); + foreach (var room in rooms) + { + var where = (room.Area is { } area ? area + " · " : string.Empty) + "level " + room.Level.ToString(CultureInfo.InvariantCulture); + AppendClientRow(windowId, room.Id.ToString(CultureInfo.InvariantCulture), $"{room.Name} · {where}"); + } + + return; + } + + Notice($"{shown} room{(total == 1 ? string.Empty : "s")} match {text} — ⏎ walks to one", MessageSeverity.Info, source: NoticeModel.Sources.Map, toast: false); + OpenMenu(Client.Commands.BuiltInCommands.MapWalkQuery); + } + + /// ⌃P ▸ Walk to …: walks the found room's own character there, whichever window is focused. + private bool WalkToFoundRoom(string id) + { + if (_mapFound is not { } found + || !long.TryParse(id, NumberStyles.Integer, CultureInfo.InvariantCulture, out var room) + || !found.Rooms.Any(r => r.Id == room)) + { + RefuseCommand("that room is not in the last /map find"); + return true; + } + + if (MapOf(found.SessionKey) is not { } map) + { + RefuseCommand("no map here: that character has no connection"); + return true; + } + + if (map.WalkTo(room) is { } problem) + { + Notice($"cannot walk there: {problem}.", source: NoticeModel.Sources.Map); + } + + return true; + } + /// The window's look callback, one instance per map window so an overlay compares equal frame to frame. private readonly Dictionary> _mapLookers = new(StringComparer.Ordinal); @@ -45,7 +109,8 @@ internal sealed partial class SharpMUTermApp SetMapLook(windowId, map, result.Next); } - Notice(result.Message + ".", result.Done ? MessageSeverity.Info : MessageSeverity.Warning, source: NoticeModel.Sources.Map); + // The map itself shows a level or area it moved to; only a refusal is toasted (ApplyMapEdit's rule). + Notice(result.Message + ".", result.Done ? MessageSeverity.Info : MessageSeverity.Warning, source: NoticeModel.Sources.Map, toast: !result.Done); return result.Done ? null : result.Message; } @@ -158,25 +223,19 @@ private void MapViewCommand(string windowId, SessionMap map, string sessionKey, var text = words.Length > 4 ? words[4..].Trim() : string.Empty; if (text.Length == 0) { - AppendWindowLine(windowId, "[dim]*** use /map find .[/]"); + Notice("use /map find .", source: NoticeModel.Sources.Map); return; } var (rooms, total) = MapLooking.Find(map.Map, text); if (rooms.Count == 0) { - AppendWindowLine(windowId, $"[dim]*** no room on the map matches {Escape(text)}.[/]"); + _mapFound = null; + Notice($"no room on the map matches {text}.", source: NoticeModel.Sources.Map); return; } - var shown = total > rooms.Count ? $"the first {rooms.Count.ToString(CultureInfo.InvariantCulture)} of {total.ToString(CultureInfo.InvariantCulture)}" : total.ToString(CultureInfo.InvariantCulture); - AppendWindowLine(windowId, $"[dim]*** rooms matching {Escape(text)} ({shown}) · /walk goes there:[/]"); - foreach (var room in rooms) - { - var where = (room.Area is { } area ? Escape(area) + " · " : string.Empty) + "level " + room.Level.ToString(CultureInfo.InvariantCulture); - AppendWindowLine(windowId, $"[dim]***[/] [bold]{room.Id.ToString(CultureInfo.InvariantCulture)}[/] {Escape(room.Name)} [dim]{where}[/]"); - } - + ShowFoundRooms(windowId, sessionKey, text, rooms, total); // The map shows the first match's area and level, so the room found is on screen. var first = rooms[0]; var home = map.Recorder.CurrentRoom ?? map.Map.Rooms.Values.LastOrDefault(); diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Reconnect.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Reconnect.cs index cf6b037d..a3279f44 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Reconnect.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Reconnect.cs @@ -61,7 +61,7 @@ private void OnReconnectStep(WorldSession session, AutoReconnect auto, Reconnect switch (step) { case ReconnectStep.Scheduled when auto.SecondsLeft is { } seconds: - session.PrintSystem(ReconnectLine(seconds, auto.Try)); + SayInSessionWindow(session, ReconnectLabel, ReconnectLine(seconds, auto.Try)); Notice( $"{title} dropped — reconnecting in {seconds} s · ⌥R now", MessageSeverity.Info, @@ -70,7 +70,7 @@ private void OnReconnectStep(WorldSession session, AutoReconnect auto, Reconnect break; case ReconnectStep.GaveUp: - session.PrintSystem($"*** Stopped reconnecting after {AutoReconnect.Delays.Count} tries — ⌥R dials again."); + SayInSessionWindow(session, ReconnectLabel, $"stopped after {AutoReconnect.Delays.Count} tries · ⌥R dials again"); Notice($"{title} did not come back after {AutoReconnect.Delays.Count} tries — ⌥R dials again", MessageSeverity.Error, "⌥R"); break; } @@ -120,7 +120,40 @@ private void OnReconnectTick() /// The line a session's window gets when a try is scheduled; one writer for the live session and the demo's. internal static string ReconnectLine(int seconds, int attempt) => - $"*** Reconnecting in {seconds} s (try {attempt} of {AutoReconnect.Delays.Count}) — ⌥R dials now, ⌃P ▸ Stop reconnecting."; + $"in {seconds} s · try {attempt} of {AutoReconnect.Delays.Count} · ⌥R dials now · ⌃P ▸ Stop reconnecting"; + + /// The label of every row a reconnect writes into its session's window. + internal const string ReconnectLabel = "RECONNECT"; + + /// + /// Writes a client row into 's own window (): chrome, not a + /// session line, so the client's own bookkeeping never lands in the character's transcript or restore log. + /// + private void SayInSessionWindow(WorldSession session, string label, string text) + { + if (_sessionWindows.TryGetValue(session, out var windowId)) + { + AppendClientRow(windowId, label, text); + } + } + + /// + /// Appends one client row () to a window: drawn as the bars are, held as chrome (a bar + /// function and no plain text), with no stamp, because it did not arrive. Fed to nothing a session line is fed to. + /// + private void AppendClientRow(string windowId, string label, string text) + { + if (BarWidth(windowId) <= 0) + { + // Not arranged yet: drawn at the fallback width, so the next frame must redraw it at the pane's. + _chromeBarWidths.Remove(windowId); + } + + AppendWindowLine( + windowId, + ClientRowRenderer.Bar(label, text, FrozenAccentHex(), BarWidth(windowId)), + bar: accent => ClientRowRenderer.Bar(label, text, accent, BarWidth(windowId))); + } /// The demo scene's waiting reconnect, in seconds: the `reconnect` view's, which has no live session to drop. private int? _demoReconnect; @@ -135,7 +168,7 @@ private void ShowDemoReconnect() AppendWindowLine(MainWindowId, StyledLine.FromText("*** Connection lost: Connection reset by peer", WorldSession.SystemLineStyle), StampNow()); AppendWindowLine(MainWindowId, StyledLine.FromText("*** Connecting to aetherfall.mux:4201...", WorldSession.SystemLineStyle), StampNow()); AppendWindowLine(MainWindowId, StyledLine.FromText("*** Connection failed: Connection refused", WorldSession.SystemLineStyle), StampNow()); - AppendWindowLine(MainWindowId, StyledLine.FromText(ReconnectLine(12, 2), WorldSession.SystemLineStyle), StampNow()); + AppendClientRow(MainWindowId, ReconnectLabel, ReconnectLine(12, 2)); _statusIdentity = ("Corvid", "aetherfall.mux", 4201, "faulted"); RefreshStatusBar(); SettleScroll(); @@ -158,7 +191,7 @@ private void StopReconnectCommandRun() { if (SendTarget() is { } session && CancelReconnect(session)) { - session.PrintSystem("*** Stopped reconnecting."); + SayInSessionWindow(session, ReconnectLabel, "stopped · ⌥R dials again"); Notice($"stopped reconnecting {SessionTitle(session)} — ⌥R dials it", MessageSeverity.Info, "⌥R"); return; } @@ -166,7 +199,7 @@ private void StopReconnectCommandRun() // The notice's action can arrive after focus moved: any one waiting is the one the notice was about. if (_reconnects.FirstOrDefault(r => r.Value.IsActive) is { Key: { } other } && CancelReconnect(other)) { - other.PrintSystem("*** Stopped reconnecting."); + SayInSessionWindow(other, ReconnectLabel, "stopped · ⌥R dials again"); Notice($"stopped reconnecting {SessionTitle(other)}", MessageSeverity.Info); return; } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.SceneLog.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.SceneLog.cs index e25acf37..00dbb044 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.SceneLog.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.SceneLog.cs @@ -20,6 +20,33 @@ namespace SharpMUTerm.Tui; /// internal sealed partial class SharpMUTermApp { + /// The status row's mark while a scene records (). + internal const string RecordingCell = SharpMUTerm.Client.Chrome.HeaderModel.RecordingText; + + /// A saved scene's notice action: open it. + internal const string SceneOpenPrefix = SharpMUTerm.Client.Commands.BuiltInCommands.SceneOpenPrefix; + + /// A saved scene's notice action: copy its path. + internal const string SceneCopyPrefix = SharpMUTerm.Client.Commands.BuiltInCommands.SceneCopyPrefix; + + /// + /// The files this run's scene logs were saved to, in order: what a saved notice's scene:open:N and + /// scene:copy:N name by index, so no path ever travels in a command id. + /// + private readonly List _savedScenes = []; + + /// Whether any window is being recorded as a scene: the status row's and the header's mark. + internal bool SceneRecording + { + get + { + lock (_sceneLogs) + { + return _sceneLogs.Count > 0; + } + } + } + /// The scenes being recorded, by window. private readonly Dictionary _sceneLogs = new(StringComparer.Ordinal); @@ -86,10 +113,11 @@ internal void StartSceneLog() _sceneLogs[windowId] = log; } + SceneMarkChanged(); Notice( $"Recording {Snippet(title)} as a scene ({(_config.SceneLog.Content == SceneLogContent.Poses ? "poses" : "every line")}) → {log.Path}", MessageSeverity.Info, - "⌃P"); + source: SharpMUTerm.Client.Chrome.NoticeModel.Sources.Scene); } /// Stops the focused window's scene log, writing its ending and closing the file. @@ -109,7 +137,101 @@ internal void StopSceneLog() } log.Stop(_time.GetLocalNow()); - Notice($"Scene saved · {log.Lines} line{(log.Lines == 1 ? string.Empty : "s")} · {log.Path}", MessageSeverity.Info, "⌃P"); + SceneMarkChanged(); + _savedScenes.Add(log.Path); + var index = (_savedScenes.Count - 1).ToString(System.Globalization.CultureInfo.InvariantCulture); + Notice( + $"Scene saved · {log.Lines} line{(log.Lines == 1 ? string.Empty : "s")} · {log.Path}", + MessageSeverity.Info, + source: SharpMUTerm.Client.Chrome.NoticeModel.Sources.Scene, + action: new SharpMUTerm.Client.Chrome.NoticeAction(SceneOpenPrefix + index, "Open"), + second: new SharpMUTerm.Client.Chrome.NoticeAction(SceneCopyPrefix + index, "Copy path")); + } + + /// Redraws the two places the recording mark is shown, after a scene starts or stops. + private void SceneMarkChanged() + { + RefreshHeader(); + RefreshStatusBar(); + } + + /// The saved scene a notice action names by index, or null when the index names none this run saved. + private string? SavedScene(string index) => + int.TryParse(index, System.Globalization.NumberStyles.None, System.Globalization.CultureInfo.InvariantCulture, out var at) + && at >= 0 && at < _savedScenes.Count ? _savedScenes[at] : null; + + /// + /// A saved scene's Open: handed to the desktop's viewer through the host's file opener, and only a file under + /// this client's own log root — the scene folder is the only place a scene is written, and an index the client + /// assigned is the only way to name one, so nothing a server sent can choose what is opened. + /// + private bool OpenSavedScene(string index) + { + if (SavedScene(index) is not { } path) + { + RefuseCommand("no such saved scene"); + return true; + } + + if (_openFile is null) + { + RefuseCommand($"this client opens no files — the scene is at {path}"); + return true; + } + + if (!IsUnderLogRoot(path) || !File.Exists(path)) + { + RefuseCommand($"the scene is no longer at {path}"); + return true; + } + + try + { + _openFile(path); + } + catch (Exception ex) when (ex is ArgumentException or InvalidOperationException or System.ComponentModel.Win32Exception or IOException) + { + RefuseCommand($"could not open {path}: {ex.Message}"); + } + + return true; + } + + /// A saved scene's Copy path, through the client's clipboard; refused out loud where there is none. + private bool CopySavedScenePath(string index) + { + if (SavedScene(index) is not { } path) + { + RefuseCommand("no such saved scene"); + return true; + } + + if (_clipboard is null) + { + RefuseCommand($"this client has no clipboard — the scene is at {path}"); + return true; + } + + _clipboard(path); + Notice($"copied {path}", MessageSeverity.Info); + return true; + } + + /// Whether is inside this client's log root, after resolving it (no .. escapes). + private bool IsUnderLogRoot(string path) + { + if (_logRoot is null) + { + return false; + } + + var root = Path.GetFullPath(_logRoot); + if (!root.EndsWith(Path.DirectorySeparatorChar)) + { + root += Path.DirectorySeparatorChar; + } + + return Path.GetFullPath(path).StartsWith(root, StringComparison.Ordinal); } /// A line a window showed: the scene recording that window, if any, decides whether to keep it. @@ -135,6 +257,7 @@ private void RecordForScene(string windowId, StyledLine line) _sceneLogs.Remove(windowId); } + SceneMarkChanged(); RefuseCommand($"the scene log stopped: {ex.Message}"); } } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 7220e616..295f88df 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -513,6 +513,9 @@ private sealed class SizeReport /// private readonly Action? _openUrl; + /// The host's file opener for a saved scene (), or null. + private readonly Action? _openFile; + /// /// Where a copied selection goes, or null when this app may not reach a clipboard at all. /// @@ -741,6 +744,7 @@ public SharpMUTermApp( _startedEmpty = config.Worlds.Count == 0; _save = save; _openUrl = host.OpenUrl; + _openFile = host.OpenFile; _clipboard = host.Clipboard; _pointer = host.Pointer; _logRoot = string.IsNullOrWhiteSpace(logRoot) ? null : logRoot; @@ -1990,7 +1994,7 @@ public string RenderSnapshot(string? view = null) new NoticeAction(Client.Commands.LayoutCommands.Manage, "Change layout")); RefusePrefix(PrefixPanel.NoSplitRefusal); Notice("muted.", MessageSeverity.Info, source: SharpMUTerm.Client.Chrome.NoticeModel.Sources.Sound); - Notice("could not connect to aetherfall.mux:4201 — no route to host", MessageSeverity.Error, "⌃P"); + Notice("could not connect to aetherfall.mux:4201 — no route to host", MessageSeverity.Error, action: ShowMessagesAction); } // The map window, over the demo's recorded streets: opened through the real ⌃P entry; `map-walking` @@ -2993,7 +2997,7 @@ private async Task DialAtStartupAsync(WorldSession session) OnUi(() => Notice( $"could not connect {SessionTitle(session)} — {Snippet(ex.Message)}", MessageSeverity.Error, - "⌃P")); + action: ShowMessagesAction)); } } @@ -3585,7 +3589,8 @@ private void AppendWindowLine( // every line of every window (see PaneLine.Plain). A world's line is read from its spans, not from the // markup: the markup carries the client's own decoration (a highlight's `▌ ` left rule), and a search or a // trigger's live test that saw it would miss `^[public]` on the very line that rule highlighted. - buffer.Add(new PaneLine(markup, stamp, source?.Text ?? MarkupText.Plain(markup), imageAnchor, pictures, source, bar)); + // A chrome row (one drawn by a bar function) carries no plain text, so ⌃F never finds the client's own rows. + buffer.Add(new PaneLine(markup, stamp, bar is not null ? string.Empty : source?.Text ?? MarkupText.Plain(markup), imageAnchor, pictures, source, bar)); // Cap what the pane holds, and trim its control with it. The control re-parses every line it @@ -8503,7 +8508,9 @@ private CommandContext CommandState() Floats: FloatRefs(), RaggedWraps: RaggedWraps(), NoDictionary: NoOwnDictionary, - SceneLogging: _sceneLogs.ContainsKey(ActiveWindowId())); + SceneLogging: _sceneLogs.ContainsKey(ActiveWindowId()), + NewConfiguration: _config.Worlds.Count == 0 || _config.KeyTourPending, + MapFound: MapFoundRooms()); } /// @@ -8774,6 +8781,21 @@ private bool RunBuiltInCommand(string id) return true; } + if (id.StartsWith(SharpMUTerm.Client.Commands.BuiltInCommands.MapWalkPrefix, StringComparison.Ordinal)) + { + return WalkToFoundRoom(id[SharpMUTerm.Client.Commands.BuiltInCommands.MapWalkPrefix.Length..]); + } + + if (id.StartsWith(SceneOpenPrefix, StringComparison.Ordinal)) + { + return OpenSavedScene(id[SceneOpenPrefix.Length..]); + } + + if (id.StartsWith(SceneCopyPrefix, StringComparison.Ordinal)) + { + return CopySavedScenePath(id[SceneCopyPrefix.Length..]); + } + if (id.StartsWith(SharpMUTerm.Client.Commands.BuiltInCommands.JoinWrapsPrefix, StringComparison.Ordinal)) { return JoinWrapsFor(id[SharpMUTerm.Client.Commands.BuiltInCommands.JoinWrapsPrefix.Length..]); @@ -9093,6 +9115,12 @@ private bool RunBuiltInCommand(string id) /// private void RefuseCommand(string reason) => Notice(reason, MessageSeverity.Warning, "⌃P"); + /// + /// A failure's action: the message log, where the whole story is. In place of a bare ⌃P chip, which named a key + /// and not what it would do. + /// + private static readonly NoticeAction ShowMessagesAction = new("term:messages", "Show messages"); + /// /// The task the last dispatched command started, or a completed one when it ran synchronously. /// Internal so a headless test can await a connect it dispatched rather than poll for it; the app @@ -9692,7 +9720,7 @@ private async Task ReconnectAsync(WorldSession session) { if (session.State is ConnectionState.Connected or ConnectionState.Connecting) { - session.PrintSystem("*** Reconnecting..."); + SayInSessionWindow(session, ReconnectLabel, "dialling again"); await session.DisconnectAsync().ConfigureAwait(false); } @@ -9720,7 +9748,7 @@ private async Task ReconnectAsync(WorldSession session) OnUi(() => Notice( $"could not connect to {session.World.Host}:{session.World.Port} — {ex.Message}", MessageSeverity.Error, - "⌃P")); + action: ShowMessagesAction)); } } @@ -9741,7 +9769,7 @@ private void Disconnect() // Not connected but waiting to dial again: Disconnect means "stay disconnected". if (CancelReconnect(session)) { - session.PrintSystem("*** Stopped reconnecting."); + SayInSessionWindow(session, ReconnectLabel, "stopped · ⌥R dials again"); Notice($"stopped reconnecting {SessionTitle(session)} — ⌥R dials it", MessageSeverity.Info, "⌥R"); return; } @@ -13856,12 +13884,17 @@ private void SetStatus(string markup, bool displace = false) /// A command the notice offers. The status row never draws it (a terminal cell is not a button, and the text /// already names the key); a host that draws notices natively offers it as a click (). /// - private void Notice(string text, MessageSeverity severity = MessageSeverity.Warning, string? key = null, NoticeAction? action = null, string? source = null) + /// + /// False keeps the notice off a host's toast stack: the status row still says it and the message log keeps it. For a + /// notice the surface it answers already shows (a map edit, under the window's map inspector). + /// + /// A second command the notice offers, after . + private void Notice(string text, MessageSeverity severity = MessageSeverity.Warning, string? key = null, NoticeAction? action = null, string? source = null, bool toast = true, NoticeAction? second = null) { // The same notice raised again while it is still up is one notice: it keeps the row for another few seconds and // is not said, toasted or announced a second time. Two identical toasts stacked in the window were the report. if (_notice is not null && _noticeShown is { } shown && shown.Text == text && shown.Key == key && shown.Source == source - && shown.Severity == NoticeSeverityOf(severity) && shown.Action == action) + && shown.Severity == NoticeSeverityOf(severity) && shown.Action == action && shown.Second == second) { _noticeTimer?.Change(NoticeDuration, Timeout.InfiniteTimeSpan); return; @@ -13884,13 +13917,19 @@ private void Notice(string text, MessageSeverity severity = MessageSeverity.Warn var model = Drawing( SurfaceCatalog.Notice, string.Empty, - new NoticeModel(text, NoticeSeverityOf(severity), source is null ? key : null, action, _time.GetUtcNow(), ++_noticeSequence, source)); + new NoticeModel(text, NoticeSeverityOf(severity), source is null ? key : null, action, _time.GetUtcNow(), ++_noticeSequence, source) + { + Second = action is null ? null : second, + }); var markup = NoticeMarkup(model); _notice = markup; _noticeShown = model; PaintStatus(markup); - PublishNotice(model); + if (toast) + { + PublishNotice(model); + } _noticeTimer ??= _time.CreateTimer( _ => OnUiThread(ClearNotice), null, Timeout.InfiniteTimeSpan, Timeout.InfiniteTimeSpan); _noticeTimer.Change(NoticeDuration, Timeout.InfiniteTimeSpan); @@ -13902,6 +13941,9 @@ private void Notice(string text, MessageSeverity severity = MessageSeverity.Warn /// internal ClientMessageLog Messages => _messages; + /// Lifts the notice off the row now, as its timer would; for a test reading the resting row under it. + internal void ClearNoticeForTest() => ClearNotice(); + /// Lifts the notice off the row, putting the resting line back under it. private void ClearNotice() { @@ -13926,7 +13968,9 @@ private string NotConnectedMarkup() { var scrollback = ScrollbackStatus(); var suffix = scrollback.Length == 0 ? string.Empty : $" {scrollback}"; - var row = $"[dim]not connected · Graphics {Escape(_capabilities.Protocol.ToString())} · ⌃P palette · ⌃Q quit[/]{suffix}"; + // No graphics readout: which protocol the probe chose is a startup fact (--help and the session's first line say it), and on a + // first run it was the one technical word on the screen. + var row = $"[dim]not connected · ⌃P palette · ⌃Q quit[/]{suffix}"; // A client with nothing connected is still read back through, frozen and searched: the mode's keys go on // the end where they fit, the longest that does. @@ -14028,6 +14072,7 @@ internal HeaderModel BuildHeaderModel() _prefixArmed) { Prefix = _prefixArmed ? PrefixPanel.Model(PrefixFactsNow()) : null, + Recording = SceneRecording, }; } @@ -14337,6 +14382,13 @@ private string StatusBarMarkup(string character, string state) right.Add(scrollback); } + // While a scene is being recorded (⌃P ▸ Start scene log), in any window: a three-hour scene is easy to forget. + // Only by a keystroke, like the mute cell below, so it needs no reserved width; and never given up for room. + if (SceneRecording) + { + right.Add($"[{HeldOn(ScreenPalette.Warn, WorkspacePalette.Backdrop(_theme))}]{RecordingCell}[/]"); + } + // Only while muted, and only by a keystroke: nothing from the wire can make this cell appear. if (_muted) { diff --git a/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs b/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs index b187f2fe..fbe5a622 100644 --- a/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs +++ b/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs @@ -20,7 +20,7 @@ namespace SharpMUTerm.Tui; internal static class WorldsScreenRenderer { private const int LeftColumnWidth = 28; - private const int WorldLabelWidth = 9; + private const int WorldLabelWidth = 16; private const int CharLabelWidth = 10; private const int CharDetailColumnWidth = 40; @@ -69,55 +69,55 @@ internal static class WorldsScreenRenderer /// : the GMCP modules asked for beyond the client's own, as a /// comma-separated list of Name Version. /// - internal const int GmcpModulesField = 5; + internal const int GmcpModulesField = 7; /// , as . internal const int ContentField = 6; /// 's three switches, as one of . - internal const int EmojiField = 7; + internal const int EmojiField = 10; /// : the line naming a room, for a game that sends no GMCP room. - internal const int MapRoomField = 8; + internal const int MapRoomField = 17; /// : the line listing a room's exits. - internal const int MapExitsField = 9; + internal const int MapExitsField = 18; /// : a line that stops a speedwalk. - internal const int WalkFailField = 10; + internal const int WalkFailField = 19; /// , as one of . - internal const int SoundsField = 11; + internal const int SoundsField = 20; /// : the line prefix a MUSH hands text back to edit with. - internal const int GrabField = 12; + internal const int GrabField = 13; /// , as one of . - internal const int GmcpLoginField = 13; + internal const int GmcpLoginField = 8; /// , as one of . - internal const int DiscordField = 14; + internal const int DiscordField = 9; /// : the layout this world's characters use, or the suggestion. - internal const int WorldLayoutField = 15; + internal const int WorldLayoutField = 21; /// , as one of . - internal const int JoinWrapsField = 16; + internal const int JoinWrapsField = 11; /// , as one of . - internal const int ReconnectField = 17; + internal const int ReconnectField = 5; /// , as one of . - internal const int StackingField = 18; + internal const int StackingField = 12; /// , as one of . - internal const int AlertOnField = 19; + internal const int AlertOnField = 14; /// , as one of . - internal const int CaptureChannelsField = 20; + internal const int CaptureChannelsField = 15; /// : Name=colour, …. - internal const int HighlightNamesField = 21; + internal const int HighlightNamesField = 16; /// F5's words for . internal static readonly IReadOnlyList ChannelCaptureChoices = WorldFieldValues.ChannelCaptureChoices; @@ -778,9 +778,12 @@ .. SecurityFieldOrder.Select(id => ScreenRow.Of(DeclaredFields.Toggle(DeclaredFi /// internal static readonly IReadOnlyList WorldFieldOrder = [ - "name", "host", "port", "encoding", "keepalive", "gmcp-modules", "content", "emoji", "map-room", "map-exits", - "walk-fail", "sounds", "edit-grab", "gmcp-login", "discord", "layout", "join-wraps", "reconnect", "stacking", + "name", "host", "port", "encoding", "keepalive", "reconnect", + "content", "gmcp-modules", "gmcp-login", "discord", + "emoji", "join-wraps", "stacking", "edit-grab", "alert-on", "capture-channels", "highlight-names", + "map-room", "map-exits", "walk-fail", + "sounds", "layout", ]; /// The world's two security checkboxes, drawn in the WORLD block (), by declared id. @@ -930,7 +933,7 @@ internal static List WorldsColumn( left.Add(ScreenChrome.Cursor( $"{marker} [{accentHex}]▚[/] {name}", cursor.IsOn(WorldsPane, i), LeftColumnWidth)); left.Add($" [{Label}]{Escape(world.Host)}:{world.Port.ToString(CultureInfo.InvariantCulture)}[/]"); - left.Add($" [{Label}]{world.Characters.Count.ToString(CultureInfo.InvariantCulture)} chars[/]"); + left.Add($" [{Label}]{world.Characters.Count.ToString(CultureInfo.InvariantCulture)} character{Plural(world.Characters.Count)}[/]"); } if (worlds.Count == 0) @@ -987,89 +990,68 @@ internal static List DetailColumn( // where they are displayed, so it is where an open edit draws its caret. No title strip above // them: every token of one would be repeated in the rows underneath and in the WORLDS list beside // it, and the rows it cost are rows the CHARACTERS list needs at 100x24. - var right = new List + // Each world field's cell, by declared id. They are drawn in the declaration's order under its group headings + // (BuiltInSettings.World), with the declared labels, so this column and the desktop's settings window read the + // same; WorldFieldOrder is that order too, so ⇥ walks down the column rather than jumping about it. + var cells = new Dictionary(StringComparer.Ordinal) { - $"[{accent}]├ WORLD[/]", - WorldField("name", Field( - $"[{Value}]{Escape(world.Name)}[/]", cursor, selectedWorld, WorldNameField)), - WorldField("host", Field( - $"[{Value}]{Escape(world.Host)}[/]", cursor, selectedWorld, HostField)), - WorldField("port", Field( + ["name"] = Field( + $"[{Value}]{Escape(world.Name)}[/]", cursor, selectedWorld, WorldNameField), + ["host"] = Field( + $"[{Value}]{Escape(world.Host)}[/]", cursor, selectedWorld, HostField), + ["port"] = Field( $"[{Value}]{world.Port.ToString(CultureInfo.InvariantCulture)}[/]", cursor, selectedWorld, - PortField)), - }; - - right.AddRange(SecurityColumn(world, cursor)); - right.AddRange(new[] - { - WorldField("encoding", Field( - EncodingDetail(world.Encoding), cursor, selectedWorld, EncodingField)), - WorldField("keepalive", Field( + PortField), + ["encoding"] = Field( + EncodingDetail(world.Encoding), cursor, selectedWorld, EncodingField), + ["keepalive"] = Field( world.KeepaliveSeconds > 0 ? $"[{Value}]{world.KeepaliveSeconds.ToString(CultureInfo.InvariantCulture)}s[/]" : $"[{Label}]off[/]", cursor, selectedWorld, - KeepaliveField)), - WorldField("gmcp", Field( - JoinModules(world) is { } modules - ? $"[{Value}]{Escape(modules)}[/]" - : $"[{Label}]defaults[/]", + KeepaliveField), + ["reconnect"] = Field( + world.AutoReconnect + ? $"[{Value}]{ReconnectChoices[1]} · 5 s to 60 s, five tries[/]" + : $"[{Label}]{ReconnectChoices[0]} · ⌥R dials again[/]", cursor, selectedWorld, - GmcpModulesField)), - WorldField("content", Field( + ReconnectField), + ["content"] = Field( world.ContentFormat == ContentFormat.Ansi ? $"[{Label}]{ContentName(world.ContentFormat)}[/]" : $"[{Value}]{ContentName(world.ContentFormat)}[/]", cursor, selectedWorld, - ContentField)), - WorldField("emoji", Field( - world.Emoji.Enabled - ? $"[{Value}]{EmojiName(world.Emoji)}[/]" - : $"[{Label}]{EmojiOff}[/]", - cursor, - selectedWorld, - EmojiField)), - WorldField("map room", Field( - PatternDetail(world.Map.RoomNamePattern, "from GMCP"), cursor, selectedWorld, MapRoomField)), - WorldField("map exits", Field( - PatternDetail(world.Map.ExitsPattern, "from GMCP"), cursor, selectedWorld, MapExitsField)), - WorldField("walk fail", Field( - PatternDetail(world.Map.WalkFailurePattern, "timeout only"), cursor, selectedWorld, WalkFailField)), - WorldField("sounds", Field( - world.DownloadMedia ? $"[{Label}]{SoundChoices[0]}[/]" : $"[{Value}]{SoundChoices[1]}[/]", - cursor, - selectedWorld, - SoundsField)), - WorldField("edit grab", Field( - world.GrabPrefix is { } grab - ? $"[{Value}]{Escape(grab)}[/]" - : $"[{Label}]off · e.g. {Escape(SuggestedGrabPrefix)}[/]", + ContentField), + ["gmcp-modules"] = Field( + JoinModules(world) is { } modules + ? $"[{Value}]{Escape(modules)}[/]" + : $"[{Label}]defaults[/]", cursor, selectedWorld, - GrabField)), - WorldField("gmcp login", Field( + GmcpModulesField), + ["gmcp-login"] = Field( world.GmcpLogin ? $"[{Value}]{LoginChoices[1]}[/]" : $"[{Label}]{LoginChoices[0]} · connect line[/]", cursor, selectedWorld, - GmcpLoginField)), - WorldField("discord", Field( + GmcpLoginField), + ["discord"] = Field( world.DiscordPresence ? $"[{Value}]{DiscordChoices[1]}[/]" : $"[{Label}]{DiscordChoices[0]}[/]", cursor, selectedWorld, - DiscordField)), - WorldField("layout", Field( - LayoutName(all, world.Layout) is { } worldLayout - ? $"[{Value}]{Escape(worldLayout)}[/]" - : $"[{Label}]{WorldLayoutDefault} · {Escape(LayoutName(all, world.AcceptedLayoutSuggestion) ?? BuiltInLayouts.Roleplay.Name)}[/]", + DiscordField), + ["emoji"] = Field( + world.Emoji.Enabled + ? $"[{Value}]{EmojiName(world.Emoji)}[/]" + : $"[{Label}]{EmojiOff}[/]", cursor, selectedWorld, - WorldLayoutField)), - WorldField("join wraps", Field( + EmojiField), + ["join-wraps"] = Field( world.JoinWrappedLines ? $"[{Value}]{JoinWrapChoices[1]} lines the server wrapped[/]" : joinWrapsAdvice?.Invoke(world) is { } advice @@ -1077,29 +1059,29 @@ world.GrabPrefix is { } grab : $"[{Label}]{JoinWrapChoices[0]} · rows as the server sent them[/]", cursor, selectedWorld, - JoinWrapsField)), - WorldField("reconnect", Field( - world.AutoReconnect - ? $"[{Value}]{ReconnectChoices[1]} · 5 s to 60 s, five tries[/]" - : $"[{Label}]{ReconnectChoices[0]} · ⌥R dials again[/]", - cursor, - selectedWorld, - ReconnectField)), - WorldField("stacking", Field( + JoinWrapsField), + ["stacking"] = Field( world.CommandSeparator is { } separator ? $"[{Value}]{Escape(separator)} splits · #3 repeats[/]" : $"[{Label}]{SeparatorChoices[0]} · lines go as typed[/]", cursor, selectedWorld, - StackingField)), - WorldField("alert on", Field( + StackingField), + ["edit-grab"] = Field( + world.GrabPrefix is { } grab + ? $"[{Value}]{Escape(grab)}[/]" + : $"[{Label}]off · e.g. {Escape(SuggestedGrabPrefix)}[/]", + cursor, + selectedWorld, + GrabField), + ["alert-on"] = Field( world.AlertOnName ? $"[{Value}]{AlertChoices[1]}[/]" : $"[{Label}]{AlertChoices[0]} · alert triggers only[/]", cursor, selectedWorld, - AlertOnField)), - WorldField("channels", Field( + AlertOnField), + ["capture-channels"] = Field( world.CaptureChannels switch { SharpMUTerm.Core.Protocols.ChannelCaptureMode.Copy => $"[{Value}]{ChannelCaptureChoices[1]} · a window per GMCP channel[/]", @@ -1108,14 +1090,56 @@ world.CommandSeparator is { } separator }, cursor, selectedWorld, - CaptureChannelsField)), - WorldField("names", Field( + CaptureChannelsField), + ["highlight-names"] = Field( SharpMUTerm.Core.Automation.NameHighlights.Format(world.HighlightNames) is { } names ? $"[{Value}]{Escape(names)}[/]" : $"[{Label}]none · e.g. Ashlyn=gold, Merrow=red[/]", cursor, selectedWorld, - HighlightNamesField)), + HighlightNamesField), + ["map-room"] = Field( + PatternDetail(world.Map.RoomNamePattern, "from GMCP"), cursor, selectedWorld, MapRoomField), + ["map-exits"] = Field( + PatternDetail(world.Map.ExitsPattern, "from GMCP"), cursor, selectedWorld, MapExitsField), + ["walk-fail"] = Field( + PatternDetail(world.Map.WalkFailurePattern, "timeout only"), cursor, selectedWorld, WalkFailField), + ["sounds"] = Field( + world.DownloadMedia ? $"[{Label}]{SoundChoices[0]}[/]" : $"[{Value}]{SoundChoices[1]}[/]", + cursor, + selectedWorld, + SoundsField), + ["layout"] = Field( + LayoutName(all, world.Layout) is { } worldLayout + ? $"[{Value}]{Escape(worldLayout)}[/]" + : $"[{Label}]{WorldLayoutDefault} · {Escape(LayoutName(all, world.AcceptedLayoutSuggestion) ?? BuiltInLayouts.Roleplay.Name)}[/]", + cursor, + selectedWorld, + WorldLayoutField), + }; + + var right = new List { $"[{accent}]├ WORLD[/]" }; + string? group = null; + foreach (var field in BuiltInSettings.World.Fields) + { + if (field.Group is { } heading && !string.Equals(heading, group, StringComparison.Ordinal)) + { + group = heading; + right.Add(GroupHeading(heading)); + } + + if (string.Equals(field.Id, SecurityFieldOrder[0], StringComparison.Ordinal)) + { + right.AddRange(SecurityColumn(world, cursor)); + } + else if (cells.TryGetValue(field.Id, out var cell)) + { + right.Add(WorldField(field.Label, cell)); + } + } + + right.AddRange(new[] + { string.Empty, $"[{accent}]├ CHARACTERS[/] [{Label}]a character is a connection[/]", }); @@ -1536,7 +1560,10 @@ private static string CharacterRow(CharacterDefinition character, bool selected) } private static string WorldField(string label, string value) => - $" [{Label}]{label.PadLeft(WorldLabelWidth)}[/] {value}"; + $" [{Label}]{Escape(label).PadLeft(WorldLabelWidth)}[/] {value}"; + + /// A heading over one of the world's declared groups (CONNECTION, MAP), in the label column. + private static string GroupHeading(string group) => $" [bold {Label}]{Escape(group.ToUpperInvariant())}[/]"; /// /// The encoding cell: auto reads as the unremarkable default it is (dimmed, like keepalive's diff --git a/tests/SharpMUTerm.Avalonia.Tests/HostParityTests.cs b/tests/SharpMUTerm.Avalonia.Tests/HostParityTests.cs index c402d8a7..d8f629b2 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/HostParityTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/HostParityTests.cs @@ -62,7 +62,7 @@ public async Task EveryViewDrawsTheSameCellsInTheWindowAsInTheTerminal(string na using var driver = new AvaloniaConsoleDriver(Width, Height); await using (var window = new SharpMUTermApp( DemoScene.Build(), - WindowHost.Create(driver, clipboard: null, chrome) with { Capabilities = Caps, Keys = HostKeys.Terminal, Audio = null, Presence = null, Announcer = null, NativeSettings = null, NativePalette = null, RunsInline = true })) + WindowHost.Create(driver, clipboard: null, chrome) with { Capabilities = Caps, Keys = HostKeys.Terminal, Audio = null, Presence = null, Announcer = null, NativeSettings = null, NativePalette = null, FloatingPanels = null, RunsInline = true })) { window.RenderSnapshot(view); } @@ -101,7 +101,7 @@ public async Task EveryViewDrawsTheSameCellsWhenTheWindowsLoopIsRunning(string n using var driver = new AvaloniaConsoleDriver(Width, Height); await using var window = new SharpMUTermApp( DemoScene.Build(), - WindowHost.Create(driver, clipboard: null, chrome) with { Capabilities = Caps, Keys = HostKeys.Terminal, Audio = null, Presence = null, Announcer = null, NativeSettings = null, NativePalette = null }); + WindowHost.Create(driver, clipboard: null, chrome) with { Capabilities = Caps, Keys = HostKeys.Terminal, Audio = null, Presence = null, Announcer = null, NativeSettings = null, NativePalette = null, FloatingPanels = null }); window.OnUiThread(() => _ = window.RenderSnapshot(view)); var loop = new Thread(() => window.Run([])) { IsBackground = true }; loop.Start(); diff --git a/tests/SharpMUTerm.Avalonia.Tests/NoticeToastTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NoticeToastTests.cs index c1ccea22..9754aebc 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/NoticeToastTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/NoticeToastTests.cs @@ -87,6 +87,34 @@ public async Task AToastStacksAboveTheCommandLineAndAClickRunsItsActionWithoutTa await Assert.That(passedThrough).IsTrue().Because("only a toast is hit; the rest of the layer is the cells'"); } + /// A notice with two actions (a saved scene: Open and Copy path) draws both, and a click on the second runs it. + [Test] + public async Task AToastsSecondActionIsDrawnAndAClickOnItRunsIt() + { + var (words, ran) = await Run((window, view, layer, driver) => + { + var ran = new List(); + var model = new NoticeModel("scene saved", NoticeSeverity.Info, null, new NoticeAction("scene:open:0", "Open"), DateTimeOffset.UnixEpoch, 1, NoticeModel.Sources.Scene) + { + Second = new NoticeAction("scene:copy:0", "Copy path"), + }; + ((IPointerPresenter)driver.Pointer).Notice(new NoticeOverlay(model, 8, Palette, ran.Add)); + Drain(); + window.UpdateLayout(); + + var toasts = layer.Toasts; + var words = toasts.DrawnText(); + var on = toasts.TranslatePoint(toasts.SecondAreas()[0].Center, window)!.Value; + window.MouseDown(on, MouseButton.Left); + window.MouseUp(on, MouseButton.Left); + return (words, ran); + }, columns: 80, rows: 12); + + await Assert.That(words.Any(w => w.Contains("Open", StringComparison.Ordinal))).IsTrue(); + await Assert.That(words.Any(w => w.Contains("Copy path", StringComparison.Ordinal))).IsTrue(); + await Assert.That(ran).IsEquivalentTo(new[] { "scene:copy:0" }); + } + [Test] public async Task AToastFadesAfterItsTimeButStaysWhileHovered() { diff --git a/tests/SharpMUTerm.Client.Tests/CommandPaletteModelTests.cs b/tests/SharpMUTerm.Client.Tests/CommandPaletteModelTests.cs index 7f53fadb..f4ee92ea 100644 --- a/tests/SharpMUTerm.Client.Tests/CommandPaletteModelTests.cs +++ b/tests/SharpMUTerm.Client.Tests/CommandPaletteModelTests.cs @@ -98,7 +98,7 @@ public class CommandPaletteModelTests public async Task AnEmptyQueryListsEveryGroupInItsFixedOrder() { var view = CommandPaletteModel.Build("", Items); - await Assert.That(Headers(view)).IsEquivalentTo(new[] { "GO TO", "OUTPUT", "LAYOUT" }, CollectionOrdering.Matching); + await Assert.That(Headers(view)).IsEquivalentTo(new[] { "GO TO", "OUTPUT", "WINDOWS & PANES" }, CollectionOrdering.Matching); await Assert.That(view.Entries.Count).IsEqualTo(Items.Length); await Assert.That(view.Total).IsEqualTo(Items.Length); } @@ -108,7 +108,7 @@ public async Task LayFindsLayoutsFirst() { var view = CommandPaletteModel.Build("lay", Items); await Assert.That(view.Entries[0].Item.Id).IsEqualTo("layout:layouts"); - await Assert.That(view.Rows[0]).IsEqualTo(new PaletteHeader("LAYOUT")); + await Assert.That(view.Rows[0]).IsEqualTo(new PaletteHeader("WINDOWS & PANES")); } [Test] diff --git a/tests/SharpMUTerm.Client.Tests/PaletteGroupsTests.cs b/tests/SharpMUTerm.Client.Tests/PaletteGroupsTests.cs new file mode 100644 index 00000000..40c9aa2b --- /dev/null +++ b/tests/SharpMUTerm.Client.Tests/PaletteGroupsTests.cs @@ -0,0 +1,95 @@ +using SharpMUTerm.Client.Commands; +using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Client.Palette; +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Core.Workspaces; + +namespace SharpMUTerm.Client.Tests; + +/// +/// ⌃P's groups: OUTPUT used to hold forty-odd entries (help, packages, every map and panel command, the composer); the +/// catalog is now grouped by what an entry is about, and a new configuration is pointed at where to start. +/// +public class PaletteGroupsTests +{ + private static IReadOnlyList Catalog(CommandContext? state = null) + { + var registry = new ContributionRegistry(); + BuiltInCommands.Register(registry, _ => true); + return registry.Commands.Catalog(new CommandEnvironment( + state ?? new CommandContext(), + new Workspace(), + Array.Empty(), + null, + Array.Empty(), + HostKeyGlyphs.Terminal)); + } + + private static CommandGroup GroupOf(IReadOnlyList catalog, string id) => catalog.Single(i => i.Id == id).Group; + + [Test] + public async Task EachEntryIsListedUnderWhatItIsAbout() + { + var catalog = Catalog(); + await Assert.That(GroupOf(catalog, BuiltInCommands.HelpCommand)).IsEqualTo(CommandGroup.Help); + await Assert.That(GroupOf(catalog, BuiltInCommands.ImportCommand)).IsEqualTo(CommandGroup.Help); + await Assert.That(GroupOf(catalog, "term:packages")).IsEqualTo(CommandGroup.Help); + await Assert.That(GroupOf(catalog, "term:map")).IsEqualTo(CommandGroup.Map); + await Assert.That(GroupOf(catalog, "map:edit")).IsEqualTo(CommandGroup.Map); + await Assert.That(GroupOf(catalog, "panel:vitals")).IsEqualTo(CommandGroup.Panels); + await Assert.That(GroupOf(catalog, "term:compose")).IsEqualTo(CommandGroup.Compose); + await Assert.That(GroupOf(catalog, "term:history")).IsEqualTo(CommandGroup.Compose); + await Assert.That(GroupOf(catalog, BuiltInCommands.SceneStartCommand)).IsEqualTo(CommandGroup.Terminal); + + // OUTPUT is about output now: a group a reader can scan. + await Assert.That(catalog.Count(i => i.Group == CommandGroup.Terminal)).IsLessThanOrEqualTo(16); + } + + [Test] + public async Task TheGroupsAreListedInTheirFixedOrderWithHelpFirstInItsOwn() + { + var view = CommandPaletteModel.Build(string.Empty, Catalog()); + var headers = view.Rows.OfType().Select(h => h.Label).ToList(); + await Assert.That(headers).IsEquivalentTo( + new[] { "CONNECTION", "OUTPUT", "WRITING", "MAP", "PANELS", "WINDOWS & PANES", "HELP & SETUP" }, + TUnit.Assertions.Enums.CollectionOrdering.Matching); + + var help = view.Entries.First(e => e.Item.Group == CommandGroup.Help); + await Assert.That(help.Item.Id).IsEqualTo(BuiltInCommands.HelpCommand); + } + + [Test] + public async Task ANewConfigurationIsSuggestedHelpWelcomeAndImport() + { + var suggested = CommandPaletteModel.Suggested(new CommandContext(NewConfiguration: true)); + await Assert.That(suggested.Take(3)).IsEquivalentTo( + new[] { BuiltInCommands.HelpCommand, BuiltInCommands.WelcomeCommand, BuiltInCommands.ImportCommand }, + TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(CommandPaletteModel.Suggested(new CommandContext())).DoesNotContain(BuiltInCommands.HelpCommand); + + var view = CommandPaletteModel.Build(string.Empty, Catalog(), suggested: suggested); + await Assert.That(view.Rows[0]).IsEqualTo(new PaletteHeader(CommandPaletteModel.SuggestedLabel)); + await Assert.That(view.Entries[0].Item.Id).IsEqualTo(BuiltInCommands.HelpCommand); + } + + [Test] + public async Task TheRoomsAMapFindListedAreWalkToEntriesThatItsQueryAloneLists() + { + var found = new[] { new FoundRoom(12, "The Grand Plaza", "Aetherfall", 0), new FoundRoom(40, "Plaza Steps", null, 1) }; + var catalog = Catalog(new CommandContext(MapFound: found)); + var walks = catalog.Where(i => i.Id.StartsWith(BuiltInCommands.MapWalkPrefix, StringComparison.Ordinal)).ToList(); + await Assert.That(walks.Select(w => w.Id)).IsEquivalentTo( + new[] { BuiltInCommands.MapWalk(12), BuiltInCommands.MapWalk(40) }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(walks[0].Title).IsEqualTo("Walk to The Grand Plaza"); + await Assert.That(walks[0].Detail).IsEqualTo("Aetherfall · level 0 · #12"); + await Assert.That(walks.All(w => w.Group == CommandGroup.Map)).IsTrue(); + + // The palette opens with the find's query typed in, and lists the rooms and nothing else. + var view = CommandPaletteModel.Build(BuiltInCommands.MapWalkQuery, catalog); + await Assert.That(view.Entries.Select(e => e.Item.Id)).IsEquivalentTo( + walks.Select(w => w.Id), TUnit.Assertions.Enums.CollectionOrdering.Matching); + + // Nothing found, nothing offered. + await Assert.That(Catalog().Any(i => i.Id.StartsWith(BuiltInCommands.MapWalkPrefix, StringComparison.Ordinal))).IsFalse(); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/AlertsAndReconnectTests.cs b/tests/SharpMUTerm.Tui.Tests/AlertsAndReconnectTests.cs index 24cfb4f2..b680f862 100644 --- a/tests/SharpMUTerm.Tui.Tests/AlertsAndReconnectTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/AlertsAndReconnectTests.cs @@ -133,6 +133,24 @@ public async Task ADropCountsDownOnTheStatusRowAndDialsAgain() await Assert.That(rig.App.BuildCatalog().Select(i => i.Title)).DoesNotContain("Stop reconnecting"); } + /// + /// What a reconnect says in the session's window is a client row drawn like the bars, not a *** session line: + /// it is never in the session's scrollback (so never in a transcript, restore or scene log) and ⌃F does not find it. + /// + [Test] + public async Task AReconnectSaysSoInAClientRowAndNotInTheSessionsLines() + { + var rig = await Open(); + await using var _ = rig.App; + rig.Wire.Drop(new IOException("Connection reset by peer")); + + var window = rig.App.ActiveWindowId(); + var row = rig.App.PaneLines(window).Last(l => MarkupText.Plain(l).Contains(SharpMUTermApp.ReconnectLabel, StringComparison.Ordinal)); + await Assert.That(MarkupText.Plain(row)).Contains("in 5 s · try 1 of"); + await Assert.That(rig.Session.Scrollback.Snapshot().Any(l => l.Text.Contains("econnect", StringComparison.Ordinal))).IsFalse(); + await Assert.That(rig.App.SearchModelFor("try 1 of", regex: false, all: true).Rows).IsEmpty(); + } + [Test] public async Task StopReconnectingCancelsTheWait() { diff --git a/tests/SharpMUTerm.Tui.Tests/CommandSurfaceRendererTests.cs b/tests/SharpMUTerm.Tui.Tests/CommandSurfaceRendererTests.cs index 54d5f375..c7fbd6ec 100644 --- a/tests/SharpMUTerm.Tui.Tests/CommandSurfaceRendererTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/CommandSurfaceRendererTests.cs @@ -32,7 +32,7 @@ public async Task Render_EmitsGroupHeadersAndHighlightsSelected() await Assert.That(lines[0]).Contains("acting on Corvid"); await Assert.That(lines.Any(l => l.Contains("├ GO TO"))).IsTrue(); - await Assert.That(lines.Any(l => l.Contains("├ LAYOUT"))).IsTrue(); + await Assert.That(lines.Any(l => l.Contains("├ WINDOWS & PANES"))).IsTrue(); await Assert.That(lines.Any(l => l.Contains("on #00f5b7") && l.Contains("Switch to Rookery"))).IsTrue(); } diff --git a/tests/SharpMUTerm.Tui.Tests/DeclaredWorldSettingsTests.cs b/tests/SharpMUTerm.Tui.Tests/DeclaredWorldSettingsTests.cs index 273922d5..67498cfe 100644 --- a/tests/SharpMUTerm.Tui.Tests/DeclaredWorldSettingsTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/DeclaredWorldSettingsTests.cs @@ -56,6 +56,31 @@ public async Task TheCellScreenAndTheWindowListTheSameWorldFields() } } + /// + /// F5's world column is drawn in the declaration's order under its group headings, with the declared labels, and ⇥ + /// walks it in that order: the thirty-field scroll with shortened labels ("names", "channels") was the report. + /// + [Test] + public async Task TheCellWorldColumnIsGroupedAndLabelledAsDeclared() + { + var declared = BuiltInSettings.World.Fields.Select(f => f.Id) + .Where(id => !WorldsScreenRenderer.SecurityFieldOrder.Contains(id)).ToList(); + await Assert.That(WorldsScreenRenderer.WorldFieldOrder).IsEquivalentTo(declared, TUnit.Assertions.Enums.CollectionOrdering.Matching); + + var worlds = DemoScene.Build().Worlds; + var column = WorldsScreenRenderer.DetailColumn(worlds, [], 0, 0, "#00f5b7").Select(MarkupText.Plain).ToList(); + var groups = BuiltInSettings.World.Fields.Select(f => f.Group!).Distinct().ToList(); + await Assert.That(groups.Count).IsGreaterThanOrEqualTo(5); + var at = groups.Select(g => column.FindIndex(l => l.Trim() == g.ToUpperInvariant())).ToList(); + await Assert.That(at.All(i => i >= 0)).IsTrue(); + await Assert.That(at).IsEquivalentTo(at.Order().ToList(), TUnit.Assertions.Enums.CollectionOrdering.Matching); + + foreach (var label in new[] { "highlight names", "capture channels", "command stacking", "gmcp modules" }) + { + await Assert.That(column.Any(l => l.TrimStart().StartsWith(label + " ", StringComparison.Ordinal))).IsTrue().Because(label); + } + } + [Test] public async Task TheCellScreenAndTheWindowListTheSameCharacterFields() { diff --git a/tests/SharpMUTerm.Tui.Tests/MapViewTests.cs b/tests/SharpMUTerm.Tui.Tests/MapViewTests.cs index 762c359e..f2816b2d 100644 --- a/tests/SharpMUTerm.Tui.Tests/MapViewTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/MapViewTests.cs @@ -1,3 +1,4 @@ +using SharpMUTerm.Client.Commands; using SharpConsoleUI.Drivers; using SharpMUTerm.Client.Panels; using SharpMUTerm.Core.Commands; @@ -140,11 +141,37 @@ public async Task MapCommandsLookByLevelAndAreaAndCanFindARoom() await Assert.That(app.MapLookOf(MapId)).IsNull().Because("level 0 of the keep is where Ann is"); Type(app, "/map find loft"); - var lines = app.WindowIds().SelectMany(w => app.PaneLines(w)).Select(MarkupText.Plain).ToList(); - await Assert.That(string.Join("\n", lines)).Contains("4 Loft"); await Assert.That(app.MapLookOf(MapId)!.Level).IsEqualTo(1).Because("the map shows the room found"); } + /// + /// A find is a picker, not lines in the output: ⌃P opens listing a Walk to … entry per room found, the client's + /// own commands, and ⏎ on one walks there. Nothing lands in a pane, where a link would be the server text handler's. + /// + [Test] + public async Task AFindOpensThePaletteOnTheRoomsFoundAndAnEntryWalksThere() + { + var (app, wire) = await Open(); + await using var _app = app; + var before = app.WindowIds().Sum(w => app.PaneLines(w).Count); + + Type(app, "/map find loft"); + + await Assert.That(app.MenuIsOpen).IsTrue(); + var listed = app.Palette.View.Entries.Select(e => e.Item.Id).ToList(); + await Assert.That(listed).IsEquivalentTo(new[] { BuiltInCommands.MapWalk(4) }); + await Assert.That(app.Palette.View.Entries[0].Item.Title).IsEqualTo("Walk to Loft"); + await Assert.That(app.WindowIds().Sum(w => app.PaneLines(w).Count)).IsEqualTo(before).Because("no *** lines in the output"); + + var sent = wire.Lines.Count; + await Assert.That(app.DispatchCommand(BuiltInCommands.MapWalk(4))).IsTrue(); + await Assert.That(wire.Lines.Skip(sent)).IsEquivalentTo(new[] { "u" }).Because("the walk's first step went out"); + + // An id the last find did not list is refused, not walked. + await Assert.That(app.DispatchCommand(BuiltInCommands.MapWalk(1))).IsTrue(); + await Assert.That(app.StatusMarkup).Contains("not in the last /map find"); + } + [Test] public async Task InEditModePageKeysStepLevelsAndTheSelectionComesWith() { diff --git a/tests/SharpMUTerm.Tui.Tests/ScriptingWaveTests.cs b/tests/SharpMUTerm.Tui.Tests/ScriptingWaveTests.cs index 71abfdac..9607998f 100644 --- a/tests/SharpMUTerm.Tui.Tests/ScriptingWaveTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/ScriptingWaveTests.cs @@ -40,11 +40,11 @@ private static AppConfiguration Config(Action? world = null) } private static async Task<(SharpMUTermApp App, RecordingTelnetSession Wire)> Open( - AppConfiguration config, string? scriptsRoot = null, string? logRoot = null) + AppConfiguration config, string? scriptsRoot = null, string? logRoot = null, Action? clipboard = null) { Console.SetIn(TextReader.Null); var wire = new RecordingTelnetSession(); - var app = new SharpMUTermApp(config, Headless, new HeadlessConsoleDriver(120, 32), logRoot: logRoot, scriptsRoot: scriptsRoot); + var app = new SharpMUTermApp(config, Headless, new HeadlessConsoleDriver(120, 32), logRoot: logRoot, scriptsRoot: scriptsRoot, clipboard: clipboard); app.TelnetFactory = _ => wire; if (!app.DispatchCommand(CommandIds.Character(Ann))) { @@ -299,6 +299,78 @@ public async Task PosesOnlyLeavesOutTheRoomsOwnLines() } } + /// + /// While a scene records, the status row and the header model say so; the saved notice offers Open and Copy path, + /// both client commands naming the scene by index, and Open refuses out loud in a host that opens no files. + /// + [Test] + public async Task ARecordingSceneIsMarkedAndItsSavedNoticeOffersOpenAndCopyPath() + { + var logs = Directory.CreateTempSubdirectory("sharpmuterm-scene-").FullName; + try + { + var copied = new List(); + var (app, wire) = await Open(Config(), logRoot: logs, clipboard: copied.Add); + await using var _app = app; + await Assert.That(MarkupText.Plain(app.StatusMarkup)).DoesNotContain(SharpMUTermApp.RecordingCell); + + app.DispatchCommand(BuiltInCommands.SceneStartCommand); + var log = app.SceneLogOf(app.ActiveWindowId())!; + await Assert.That(app.BuildHeaderModel().Recording).IsTrue(); + await Assert.That(app.LastNoticeModel!.Source).IsEqualTo(SharpMUTerm.Client.Chrome.NoticeModel.Sources.Scene); + await Assert.That(app.LastNoticeModel!.Key).IsNull().Because("no bare chip"); + + // The notice covers the row for a while; once it goes, the resting row carries the mark. + app.ClearNoticeForTest(); + await Assert.That(MarkupText.Plain(app.StatusMarkup)).Contains(SharpMUTermApp.RecordingCell); + + wire.Receive("Ann says, \"Evening.\"\n"); + app.DispatchCommand(BuiltInCommands.SceneStopCommand); + await Assert.That(app.BuildHeaderModel().Recording).IsFalse(); + var saved = app.LastNoticeModel!; + await Assert.That(saved.Action!.Label).IsEqualTo("Open"); + await Assert.That(saved.Second!.Label).IsEqualTo("Copy path"); + await Assert.That(saved.Action.Command).DoesNotContain(logs).Because("a command id names a scene by index, never by path"); + + await Assert.That(app.DispatchCommand(saved.Second.Command)).IsTrue(); + await Assert.That(copied).IsEquivalentTo(new[] { log.Path }); + + await Assert.That(app.DispatchCommand(saved.Action.Command)).IsTrue(); + await Assert.That(app.StatusMarkup).Contains("opens no files"); + + await Assert.That(app.DispatchCommand(BuiltInCommands.SceneOpenPrefix + "7")).IsTrue(); + await Assert.That(app.StatusMarkup).Contains("no such saved scene"); + } + finally + { + Directory.Delete(logs, recursive: true); + } + } + + /// The file opener's own gate: only an existing log file, never a script or a relative path. + [Test] + public async Task TheFileOpenerTakesOnlyALogFile() + { + var dir = Directory.CreateTempSubdirectory("sharpmuterm-open-").FullName; + try + { + var html = Path.Combine(dir, "scene.html"); + var script = Path.Combine(dir, "launch.desktop"); + File.WriteAllText(html, "

    x

    "); + File.WriteAllText(script, "[Desktop Entry]"); + + await Assert.That(ExternalBrowser.TryParseOpenableFile(html, out var full)).IsTrue(); + await Assert.That(full).IsEqualTo(html); + await Assert.That(ExternalBrowser.TryParseOpenableFile(script, out _)).IsFalse(); + await Assert.That(ExternalBrowser.TryParseOpenableFile("scene.html", out _)).IsFalse(); + await Assert.That(ExternalBrowser.TryParseOpenableFile(Path.Combine(dir, "gone.txt"), out _)).IsFalse(); + } + finally + { + Directory.Delete(dir, recursive: true); + } + } + /// An app with no log root — every test, every snapshot — refuses out loud and writes nothing. [Test] public async Task WithNoLogRootTheSceneLogRefuses() diff --git a/tests/SharpMUTerm.Tui.Tests/WorldFieldScrollTests.cs b/tests/SharpMUTerm.Tui.Tests/WorldFieldScrollTests.cs index 65a4c3b0..95e32d4e 100644 --- a/tests/SharpMUTerm.Tui.Tests/WorldFieldScrollTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/WorldFieldScrollTests.cs @@ -17,13 +17,9 @@ public class WorldFieldScrollTests new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); /// Fields whose row is labelled shorter than the field's own name. - private static readonly Dictionary RowLabels = new() - { - ["gmcp modules"] = "gmcp", - ["command stacking"] = "stacking", - ["capture channels"] = "channels", - ["highlight names"] = "names", - }; + // The cell column draws every world field under its declared label (no shortened row labels), so the label the + // model reports is the label to look for. + private static readonly Dictionary RowLabels = new(); private static ConsoleKeyInfo Key(ConsoleKey key) => new('\0', key, false, false, false); diff --git a/tests/SharpMUTerm.Tui.Tests/WorldsScreenRendererTests.cs b/tests/SharpMUTerm.Tui.Tests/WorldsScreenRendererTests.cs index cd691c5a..dc2a1724 100644 --- a/tests/SharpMUTerm.Tui.Tests/WorldsScreenRendererTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/WorldsScreenRendererTests.cs @@ -76,9 +76,9 @@ public async Task Render_WorldsListedWithCounts() var lines = WorldsScreenRenderer.Render(Worlds(), TriggerSets(), selectedWorld: 0, selectedCharacter: 0); await Assert.That(lines.Any(l => l.Contains("Aetherfall"))).IsTrue(); - await Assert.That(lines.Any(l => l.Contains("2 chars"))).IsTrue(); + await Assert.That(lines.Any(l => l.Contains("2 characters"))).IsTrue(); await Assert.That(lines.Any(l => l.Contains("Voidmoor"))).IsTrue(); - await Assert.That(lines.Any(l => l.Contains("0 chars"))).IsTrue(); + await Assert.That(lines.Any(l => l.Contains("0 characters"))).IsTrue(); } [Test] From f771b943e59897934063267f1a6c4a96b77d103f Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 15:27:51 +0000 Subject: [PATCH 055/113] polish(wave17): settings headers ladder, help blocks, connection rows, F5 at 80x24, notice hints - Settings screen headers go through KeyLadder (ScreenChrome.Hints room): whole keys, the way out always kept; FooterFitTests covers every settings header at 80x24. - Help topics are blocks (HelpPage, Client): headings and key spans, drawn bold/accent in cells and as headings and key chips in the window; the cell topic header is one row. - Native modal scrim (NativeTokens.Scrim, shared with the palette and settings) strengthened and pinned. - Highlight-names syntax and colours explained where edited: under the F5 well and in the window's field help (HighlightColours.NamesHelp). - Core's connection lines become WorldSession.ConnectionNoted, drawn as client rows: no transcript, restore log, scene log, triggers or Ctrl+F. - F5's world column at 80x24 drops group headings when short and names the top group; character/trigger bands capped while a world field is focused. Tab order unchanged. - The status row names a notice's action (key, or Ctrl+P title, or the shorter label) when it fits, never cut. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 12 ++ CLAUDE.md | 19 ++- src/SharpMUTerm.Avalonia/HelpView.cs | 56 +++++++- src/SharpMUTerm.Avalonia/NativeTokens.cs | 4 +- src/SharpMUTerm.Client/Help/HelpPage.cs | 125 ++++++++++++++++++ .../Settings/BuiltInSettings.cs | 2 +- src/SharpMUTerm.Client/Settings/ItemValues.cs | 13 ++ .../Session/ConnectionNote.cs | 25 ++++ src/SharpMUTerm.Core/Session/WorldSession.cs | 25 +++- src/SharpMUTerm.Tui/AliasesScreenRenderer.cs | 3 +- src/SharpMUTerm.Tui/HelpSurface.cs | 50 ++++++- src/SharpMUTerm.Tui/KeypadScreenRenderer.cs | 3 +- src/SharpMUTerm.Tui/OptionsScreenRenderer.cs | 3 +- .../Pointer/SharpMUTermApp.Notices.cs | 40 +++++- src/SharpMUTerm.Tui/ScreenChrome.cs | 108 ++++++++++++--- .../SharpMUTermApp.Reconnect.cs | 6 +- src/SharpMUTerm.Tui/SharpMUTermApp.cs | 8 ++ src/SharpMUTerm.Tui/TimersScreenRenderer.cs | 3 +- src/SharpMUTerm.Tui/TriggersScreenRenderer.cs | 3 +- src/SharpMUTerm.Tui/WorldsScreenRenderer.cs | 77 ++++++++++- src/SharpMUTerm.Tui/WorldsScreenView.cs | 21 ++- .../NativeModalTests.cs | 28 ++++ .../SharpMUTerm.Client.Tests/HelpPageTests.cs | 72 ++++++++++ .../Session/WorldSessionLoggingTests.cs | 26 ++++ .../Session/WorldSessionReflowTests.cs | 6 +- .../AlertsAndReconnectTests.cs | 22 +++ tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs | 31 ++++- .../NoticeAndMapSurfaceTests.cs | 3 +- .../PolishWave17Tests.cs | 85 ++++++++++++ 29 files changed, 817 insertions(+), 62 deletions(-) create mode 100644 src/SharpMUTerm.Client/Help/HelpPage.cs create mode 100644 src/SharpMUTerm.Core/Session/ConnectionNote.cs create mode 100644 tests/SharpMUTerm.Client.Tests/HelpPageTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/PolishWave17Tests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index e728b2e6..118446f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -331,6 +331,18 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Changed +- The settings screens' key hints no longer lose words from the middle at 80 columns: the least-used keys are left + out and the way to close is always there. +- Help topics have headings and show their keys as keys, in the terminal and the window, and a topic's title fits + on one row at 80 columns. +- The window's dialogs (quit, search, history, layouts, welcome) dim the window behind them more clearly. +- Editing F5 ▸ highlight names shows the `Name=colour` syntax and the colours you can use, in both the terminal + and the window. +- "Connecting", "connection lost" and "connection failed" are now client rows in the window, like the reconnect + countdown: they no longer go into transcripts, the restore log, scene logs, triggers or Ctrl+F. +- At 80×24, F5's world column shows a page of fields instead of one, naming the group at the top. +- When a notice has an action, the terminal's status row names it (`· ⌃P ▸ Show messages`, or the action's key) + if there is room. - At 80 columns the terminal's key rows fit on one line: the F1 composer, the script console, the map's edit keys, the import review and F10 shorten their words and then leave out the least-used keys, never the one that closes. The map's edit keys are now one row under the map instead of a block beside it; `?` lists them all (also under diff --git a/CLAUDE.md b/CLAUDE.md index cd5c8502..1416f4a1 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -645,7 +645,9 @@ fallbacks) for inline images/maps. out, the accept) is never dropped. F1 (`ComposeOverlay.FooterKeys`; the header no longer repeats the `⌥W` chip), the script console (per state: Del is named only on the store list), the map's edit row, the import review and F10's header use it. `FooterFitTests` renders every cell modal/footer view at 80×24 and fails unless its first and last - hints share one painted row — add a view there when it gains a key row. + hints share one painted row — add a view there when it gains a key row. Settings screen headers go through it too + (`ScreenChrome.Hints(…, room)`, `HeaderRoom`): `{F}/Esc close` and an edit's ⏎/Esc are `Keep`, the pane and select + keys go first; `FooterFitTests.SettingsHeaders` fails on a `…` in any F2–F10 header at 80×24. - **The status row names the keys of the mode you are in** (`ModeHints`/`StatusMode`, Client; `SharpMUTermApp.ModeHints.cs`). Composer armed > search bar in the focused window > frozen > split > scrolled back; while one holds, its hints replace `FocusHints` (`End returns · ⌥F freezes`, `⌥F thaws`, `⌥G next hit · ⌃F searches @@ -1436,7 +1438,20 @@ fallbacks) for inline images/maps. the client's own list, in both hosts, with no new trust path. `--plain` gets client rows instead. - **What the client says in a session window is a client row** (`ClientRowRenderer`, `AppendClientRow`: a bar function and no `Plain`), never a `***` session line: reconnect countdowns and stops reach no transcript, restore, scene log or ⌃F. - Core's own `*** Connecting/Connection lost` lines are still session lines. + Core's own connection notes are too: `WorldSession.ConnectionNoted` (`ConnectionNote`: CONNECT/FAILED/LOST/CLOSED) + replaces the `*** Connecting/Connection lost/failed` lines, `BindSession` draws them as client rows and announces them. + - **The status row names a notice's action** (`NoticeActionHints`): `⌥R Reconnect` when the command has a key, else + `⌃P ▸ `, else the action's shorter label; added whole after ` · ` only if the row still fits, never cut. + - **Help topics are blocks** (`HelpPage`, Client): a paragraph or line opening `Label: ` is a heading, keys are spans + (glyph runs, F-keys, Esc, PgUp…), two-space-indented lines stay rows. The cells draw bold headings and accent keys; + the window draws headings and key chips (`NativeKeys.Words`). The cell topic header is one elided row. + - **F5's world column at 80×24 drops its group headings** when the fields do not fit, naming the top row's group on the + column's first row (`├ WORLD · CONNECTION`, `⌃ 12 more · MAP`); while a world field is focused the character form and + trigger sets are capped to a third of the height. ⇥ order is unchanged. An open `highlight names` edit draws the + syntax and colours under its well (`NamesHelpRows`; `ScreenChrome.Window(…, keepBelow)` keeps them on screen); the + window's field help is `HighlightColours.NamesHelp`, the same words. + - **The native modal scrim is `NativeTokens.Scrim`, shared with ⌃P and settings**, raised to 0x73 dark / 0x4d light; + `NativeModalTests.EveryModalIsVeiledByTheOneScrimOverTheWholeWindow` pins it. - **A scene recording is marked** (`● REC` status cell, `HeaderModel.Recording`), and the saved notice carries two actions (`NoticeModel.Second`): `scene:open:N` and `scene:copy:N`, by index into this run's saved scenes, never a path. Open goes through `ClientHost.OpenFile` (required; null headless), which takes only an existing absolute `.html/.htm/.txt/.log` diff --git a/src/SharpMUTerm.Avalonia/HelpView.cs b/src/SharpMUTerm.Avalonia/HelpView.cs index fc1684b2..39b610bf 100644 --- a/src/SharpMUTerm.Avalonia/HelpView.cs +++ b/src/SharpMUTerm.Avalonia/HelpView.cs @@ -4,6 +4,8 @@ using Avalonia.Interactivity; using Avalonia.Layout; using Avalonia.Media; +using Avalonia.Controls.Documents; +using SharpMUTerm.Client.Help; using SharpMUTerm.Client.Modals; namespace SharpMUTerm.Avalonia; @@ -168,6 +170,9 @@ private int IndexOf(HelpEntry entry) return -1; } + /// The face a help page's table rows (the map's keys) are set in, so their columns line up. + private static FontFamily TableFace { get; } = new($"{CellFonts.BundledFamily}, DejaVu Sans Mono, Consolas, Menlo, monospace"); + private void ShowPage(HelpTopic topic) { Page = topic.Id; @@ -191,16 +196,53 @@ private void ShowPage(HelpTopic topic) Foreground = _colours.Brush(_colours.Dim), TextWrapping = TextWrapping.Wrap, }); - foreach (var line in topic.Paragraphs) + // The cells' blocks (HelpPage): a heading over each paragraph, keys as key caps, the map's table rows in the + // cell face. No blank paragraphs: the stack's spacing and a heading's top margin are the gaps, so the page has no + // tall empty bands. + HelpBlock? previous = null; + foreach (var block in HelpPage.Blocks(topic)) { - _pageText.Children.Add(new TextBlock + if (block.Heading is { } heading) { - Text = NativeKeys.Words(line), - FontSize = NativeTokens.Title, + _pageText.Children.Add(new TextBlock + { + Text = NativeKeys.Words(heading), + FontSize = NativeTokens.Title, + FontWeight = FontWeight.SemiBold, + Foreground = _colours.Brush(_colours.Header), + Margin = new Thickness(0, previous is null ? 4 : 8, 0, -4), + }); + } + + var text = new TextBlock + { + FontSize = NativeTokens.Body + 1, Foreground = _colours.Brush(_colours.Text), - TextWrapping = TextWrapping.Wrap, - MinHeight = line.Length == 0 ? 4 : 0, - }); + TextWrapping = block.Preformatted ? TextWrapping.NoWrap : TextWrapping.Wrap, + LineHeight = (NativeTokens.Body + 1) * 1.45, + Margin = block.Preformatted && previous is { Preformatted: true } ? new Thickness(12, -6, 0, 0) + : block.Preformatted ? new Thickness(12, 0, 0, 0) : default, + }; + if (block.Preformatted) + { + text.FontFamily = TableFace; + } + + foreach (var span in block.Spans) + { + text.Inlines!.Add(span.IsKey + ? new Run(" " + NativeKeys.Words(span.Text) + " ") + { + Background = _colours.Brush(_colours.KeyFill), + Foreground = _colours.Brush(_colours.KeyInk), + FontWeight = FontWeight.SemiBold, + FontSize = NativeTokens.Body, + } + : new Run(NativeKeys.Words(span.Text))); + } + + _pageText.Children.Add(text); + previous = block; } var back = ModalParts.Button("Back to help", "Esc", _colours, Back); diff --git a/src/SharpMUTerm.Avalonia/NativeTokens.cs b/src/SharpMUTerm.Avalonia/NativeTokens.cs index d2e7dd81..8c8bb89f 100644 --- a/src/SharpMUTerm.Avalonia/NativeTokens.cs +++ b/src/SharpMUTerm.Avalonia/NativeTokens.cs @@ -255,7 +255,7 @@ private sealed record Canon( /// The palette's dark card, as it was drawn before there were tokens. private static readonly Canon DarkCanon = new( - Color.FromArgb(0x59, 0, 0, 0), + Color.FromArgb(0x73, 0, 0, 0), new Rgb(0x1e, 0x1e, 0x25), new Rgb(0x3a, 0x3a, 0x46), new Rgb(0x2c, 0x2c, 0x36), @@ -270,7 +270,7 @@ private sealed record Canon( /// The palette's light card. private static readonly Canon LightCanon = new( - Color.FromArgb(0x33, 0, 0, 0), + Color.FromArgb(0x4d, 0, 0, 0), new Rgb(0xff, 0xff, 0xff), new Rgb(0xd4, 0xd4, 0xdd), new Rgb(0xe6, 0xe6, 0xec), diff --git a/src/SharpMUTerm.Client/Help/HelpPage.cs b/src/SharpMUTerm.Client/Help/HelpPage.cs new file mode 100644 index 00000000..33e48056 --- /dev/null +++ b/src/SharpMUTerm.Client/Help/HelpPage.cs @@ -0,0 +1,125 @@ +using System.Text.RegularExpressions; +using SharpMUTerm.Client.Modals; + +namespace SharpMUTerm.Client.Help; + +/// A run of a help page's text: words, or a key the cells draw as a chip and the window as a key cap. +/// The text, keys in glyphs (⌃F). +/// Whether it is a key. +public readonly record struct HelpSpan(string Text, bool IsKey); + +/// +/// One block of a help page: an optional heading (the Search: a paragraph opens with), its words as spans, and +/// whether it is a table row laid out in source (the map's key list) rather than a paragraph to wrap. +/// +public sealed record HelpBlock(string? Heading, IReadOnlyList Spans, bool Preformatted) +{ + public bool Equals(HelpBlock? other) => + other is not null && Heading == other.Heading && Preformatted == other.Preformatted && Spans.SequenceEqual(other.Spans); + + public override int GetHashCode() => HashCode.Combine(Heading, Preformatted, Spans.Count); + + /// The block's words as plain text. + public string Text => string.Concat(Spans.Select(s => s.Text)); +} + +/// +/// A as both hosts draw it: blocks with headings and key spans, so a page reads like the rest of +/// the client — a heading over each paragraph, keys drawn as keys — rather than as a wall of sentences. The topics stay +/// plain sentences in source; this reads their shape: a paragraph (or a line inside one) that opens with a short +/// capitalised label and a colon starts a block headed by it, a line indented two spaces is a table row kept as written, +/// and the keys are found by their glyphs. +/// +public static class HelpPage +{ + /// The longest label read as a heading (Everything else, Ragged lines). + public const int MaxHeading = 22; + + private static readonly Regex HeadingPattern = new( + $@"^(?[A-Z][A-Za-z' ]{{0,{MaxHeading - 1}}}): (?.+)$", RegexOptions.CultureInvariant); + + /// + /// A key as the topics write one: a modifier run and what it modifies (⌃F, ⌥⇧, ⌃←→↑↓, + /// ⇧↑), a bare key glyph (⏎, ⇥, an arrow), or a named key (F5, Esc, PgUp). + /// + private static readonly Regex KeyPattern = new( + @"[⌃⌥⇧]+(?:F\d{1,2}|PgUp|PgDn|Home|End|Esc|[←→↑↓]+|[^\s,;.:)/])?|[⏎⇥]|[←→↑↓]+|\b(?:F\d{1,2}|Esc|PgUp|PgDn|End)\b", + RegexOptions.CultureInvariant); + + /// The blocks of , in order. + public static IReadOnlyList Blocks(HelpTopic topic) + { + ArgumentNullException.ThrowIfNull(topic); + var blocks = new List(); + string? heading = null; + var words = new List(); + + void Close() + { + if (words.Count > 0 || heading is not null) + { + blocks.Add(new HelpBlock(heading, Spans(string.Join(' ', words)), false)); + } + + heading = null; + words.Clear(); + } + + foreach (var line in topic.Lines) + { + if (line.Length == 0) + { + Close(); + continue; + } + + if (line.StartsWith(" ", StringComparison.Ordinal)) + { + Close(); + blocks.Add(new HelpBlock(null, Spans(line.TrimStart()), true)); + continue; + } + + if (HeadingPattern.Match(line) is { Success: true } match) + { + Close(); + heading = match.Groups["h"].Value; + + // The sentence now starts the block: "Copy / Drag across output", not "drag across output". + var rest = match.Groups["rest"].Value; + words.Add(char.IsLower(rest[0]) ? char.ToUpperInvariant(rest[0]) + rest[1..] : rest); + continue; + } + + words.Add(line); + } + + Close(); + return blocks; + } + + /// split into words and keys. + public static IReadOnlyList Spans(string text) + { + ArgumentNullException.ThrowIfNull(text); + var spans = new List(); + var at = 0; + foreach (Match key in KeyPattern.Matches(text)) + { + if (key.Index > at) + { + spans.Add(new HelpSpan(text[at..key.Index], false)); + } + + spans.Add(new HelpSpan(key.Value, true)); + at = key.Index + key.Length; + } + + if (at < text.Length) + { + spans.Add(new HelpSpan(text[at..], false)); + } + + return spans; + } +} diff --git a/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs b/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs index af1dbdf0..4bcf44c8 100644 --- a/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs +++ b/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs @@ -304,7 +304,7 @@ public static partial class BuiltInSettings WorldText("highlight-names", "highlight names", TextRule.NameHighlights, WorldAlertsGroup, (_, w) => NameHighlights.Format(w.HighlightNames), (_, w, v) => w.HighlightNames = [.. NameHighlights.Parse(v).Names], - "names drawn in a colour wherever they appear: Ashlyn=gold, Merrow=red", + HighlightColours.NamesHelp, "friends enemies highlight name colour"), WorldText("map-room", "map room", TextRule.Pattern, MapGroup, diff --git a/src/SharpMUTerm.Client/Settings/ItemValues.cs b/src/SharpMUTerm.Client/Settings/ItemValues.cs index 31ce5e9c..23d2a9f4 100644 --- a/src/SharpMUTerm.Client/Settings/ItemValues.cs +++ b/src/SharpMUTerm.Client/Settings/ItemValues.cs @@ -23,6 +23,19 @@ public static class HighlightColours "blue", "magenta", "purple", "pink", "white", "silver", "grey", "black", ]; + /// + /// How a highlight-names list is written (F5 ▸ highlight names), said where it is edited in both hosts: the cell + /// field draws it under the open edit, the window as the field's help. + /// + public const string NameSyntax = "Name=colour, comma between; a name alone is " + Core.Automation.NameHighlights.DefaultColour; + + /// The colours a highlight-names list may name: the palette without . + public static IReadOnlyList NameColours { get; } = [.. Palette.Where(n => n != None)]; + + /// The highlight-names field's help: what it does, how to write it, and every colour it takes. + public static string NamesHelp { get; } = + $"names drawn in a colour wherever they appear, e.g. Ashlyn=gold, Merrow=red. {NameSyntax}. Colours: {string.Join(", ", NameColours)}"; + /// A colour as text: a palette name where one matches, else #rrggbb or idx:N. public static string Format(TerminalColor? colour) { diff --git a/src/SharpMUTerm.Core/Session/ConnectionNote.cs b/src/SharpMUTerm.Core/Session/ConnectionNote.cs new file mode 100644 index 00000000..00c8279f --- /dev/null +++ b/src/SharpMUTerm.Core/Session/ConnectionNote.cs @@ -0,0 +1,25 @@ +namespace SharpMUTerm.Core.Session; + +/// +/// One thing a session says about its own connection (): a short label in +/// capitals and the words. The client draws it as a row of its own, not as a line of the game's output. +/// +/// What happened: , , or . +/// The words: the host, and the reason when there is one. +public sealed record ConnectionNote(string Label, string Text) +{ + /// Dialling, and connected. + public const string Connect = "CONNECT"; + + /// A dial that did not open. + public const string Failed = "FAILED"; + + /// An open connection that dropped. + public const string Lost = "LOST"; + + /// An open connection closed cleanly, by either end. + public const string Closed = "CLOSED"; + + /// The note as one plain line, for a reader with no rows (a screen reader, --plain, a test). + public override string ToString() => $"{Label}: {Text}"; +} diff --git a/src/SharpMUTerm.Core/Session/WorldSession.cs b/src/SharpMUTerm.Core/Session/WorldSession.cs index 26e58e3e..cdb6cb8d 100644 --- a/src/SharpMUTerm.Core/Session/WorldSession.cs +++ b/src/SharpMUTerm.Core/Session/WorldSession.cs @@ -399,6 +399,21 @@ public ILogger Logger public event EventHandler? LinePrinted; + /// + /// What the session says about its own connection — dialling, connected, could not connect, lost, closed. Not a + /// line: the client draws it as one of its own rows in the session's window, so it reaches no transcript, restore + /// log, scene log, trigger or search (it used to be a *** line printed into all of them as if the game had + /// said it). Raised on whichever thread the change happened on; also written to the diagnostics at debug level (the app already reports a failure as a notice, which the message log keeps). + /// + public event EventHandler? ConnectionNoted; + + /// Says about the connection () and keeps it in the diagnostics. + private void NoteConnection(string label, string text) + { + Logger.LogDebug("{World}: {Label} {Text}", World.Name, label, text); + ConnectionNoted?.Invoke(this, new ConnectionNote(label, text)); + } + public event EventHandler? PromptChanged; public event EventHandler? StateChanged; @@ -618,7 +633,7 @@ public async Task ConnectAsync(CancellationToken cancellationToken = default) _closingByPlayer = false; SetState(ConnectionState.Connecting, null); - PrintSystem($"*** Connecting to {World.Host}:{World.Port}..."); + NoteConnection(ConnectionNote.Connect, $"dialling {World.Host}:{World.Port}…"); var telnet = _sessionFactory(World.ToConnectionOptions()); _telnet = telnet; @@ -688,14 +703,14 @@ public async Task ConnectAsync(CancellationToken cancellationToken = default) { await telnet.ConnectAsync(cancellationToken).ConfigureAwait(false); SetState(ConnectionState.Connected, null); - PrintSystem("*** Connected."); + NoteConnection(ConnectionNote.Connect, $"connected to {World.Host}:{World.Port}"); await SendLoginAsync(cancellationToken).ConfigureAwait(false); StartTimers(); } catch (Exception ex) { SetState(ConnectionState.Faulted, ex); - PrintSystem($"*** Connection failed: {ex.Message}"); + NoteConnection(ConnectionNote.Failed, $"could not connect to {World.Host}:{World.Port} · {ex.Message}"); Logger.LogWarning(ex, "Connect to {Host}:{Port} failed", World.Host, World.Port); throw; } @@ -1554,7 +1569,9 @@ private void OnDisconnected(object? sender, SessionDisconnectedEventArgs e) LastClose = _closingByPlayer ? SessionClose.Player : e.IsClean ? SessionClose.Server : SessionClose.Failed; _closingByPlayer = false; SetState(e.IsClean ? ConnectionState.Disconnected : ConnectionState.Faulted, e.Error); - PrintSystem(e.IsClean ? "*** Disconnected." : $"*** Connection lost: {e.Error?.Message}"); + NoteConnection( + e.IsClean ? ConnectionNote.Closed : ConnectionNote.Lost, + e.IsClean ? "disconnected" : $"connection lost · {e.Error?.Message}"); } /// diff --git a/src/SharpMUTerm.Tui/AliasesScreenRenderer.cs b/src/SharpMUTerm.Tui/AliasesScreenRenderer.cs index 01ade1fa..56b31fdd 100644 --- a/src/SharpMUTerm.Tui/AliasesScreenRenderer.cs +++ b/src/SharpMUTerm.Tui/AliasesScreenRenderer.cs @@ -114,7 +114,8 @@ internal static string HeaderLine(int width, ScreenModel? model = null, ScreenFo { var title = $"[bold {Value}] Aliases[/]"; var hints = ScreenChrome.Hints( - ScreenChrome.ListHints, "F3", model?.HasEditableRow ?? false, focus, model?.HasRemovableRow ?? false); + ScreenChrome.ListHints, "F3", model?.HasEditableRow ?? false, focus, model?.HasRemovableRow ?? false, + room: ScreenChrome.HeaderRoom(" " + title, width)); return SpreadTitle(" " + title, hints, width); } diff --git a/src/SharpMUTerm.Tui/HelpSurface.cs b/src/SharpMUTerm.Tui/HelpSurface.cs index e232bc3e..230d6929 100644 --- a/src/SharpMUTerm.Tui/HelpSurface.cs +++ b/src/SharpMUTerm.Tui/HelpSurface.cs @@ -1,3 +1,4 @@ +using SharpMUTerm.Client.Help; using SharpMUTerm.Client.Modals; using static SharpMUTerm.Tui.MarkupText; @@ -145,14 +146,17 @@ internal static List Render(HelpModel model, string query, int selected, var body = rows - 3; if (model.Topic(topic) is { } page) { - lines.Add($"[{ScreenPalette.Accent}]HELP ▸[/] [bold {ScreenPalette.Value}]{Escape(page.Title)}[/]" - + $"[{ScreenPalette.Label}] · {Escape(page.Summary)}[/]"); + // One row, never wrapped: the summary gives way to the title (it wrapped at 80 columns). + lines.Add(ElideVisible( + $"[{ScreenPalette.Accent}]HELP ▸[/] [bold {ScreenPalette.Value}]{Escape(page.Title)}[/]" + + $"[{ScreenPalette.Label}] · {Escape(page.Summary)}[/]", + width - 1)); lines.Add(string.Empty); - var text = page.Paragraphs.SelectMany(l => Wrap(l, width - 3)).ToList(); + var text = PageRows(page, width - 3); var top = Math.Clamp(scroll, 0, Math.Max(0, text.Count - body)); foreach (var line in text.Skip(top).Take(body)) { - lines.Add($" [{ScreenPalette.Value}]{Escape(line)}[/]"); + lines.Add(line); } Pad(lines, rows - 1); @@ -206,6 +210,44 @@ internal static List Render(HelpModel model, string query, int selected, return lines; } + /// + /// A page as rows of markup (): each block's heading on a row of its own in bold, its + /// words wrapped to under it, keys in the accent as every footer draws them, a blank row + /// between blocks, and table rows (the map's keys) kept as written. The window draws the same blocks. + /// + internal static List PageRows(HelpTopic page, int width) + { + var rows = new List(); + var blocks = HelpPage.Blocks(page); + for (var i = 0; i < blocks.Count; i++) + { + var block = blocks[i]; + if (i > 0 && !(block.Preformatted && blocks[i - 1].Preformatted)) + { + rows.Add(string.Empty); + } + + if (block.Heading is { } heading) + { + rows.Add($" [bold {ScreenPalette.Value}]{Escape(heading)}[/]"); + } + + var indent = block.Preformatted ? " " : " "; + foreach (var line in Wrap(block.Text, Math.Max(10, width - (indent.Length - 1)))) + { + rows.Add(indent + Styled(line)); + } + } + + return rows; + } + + /// A row of a help page as markup: words in the value ink, keys bold in the accent. + private static string Styled(string line) => + string.Concat(HelpPage.Spans(line).Select(s => s.IsKey + ? $"[bold {ScreenPalette.Accent}]{Escape(s.Text)}[/]" + : $"[{ScreenPalette.Value}]{Escape(s.Text)}[/]")); + private static string Row(HelpEntry entry, bool selected, int width, int titleWidth) { var mark = selected ? $"[bold {ScreenPalette.Accent}]▸[/]" : " "; diff --git a/src/SharpMUTerm.Tui/KeypadScreenRenderer.cs b/src/SharpMUTerm.Tui/KeypadScreenRenderer.cs index e4a4e22f..9e4ac9ef 100644 --- a/src/SharpMUTerm.Tui/KeypadScreenRenderer.cs +++ b/src/SharpMUTerm.Tui/KeypadScreenRenderer.cs @@ -204,7 +204,8 @@ internal static string HeaderLine(int width, ScreenModel? model = null, ScreenFo { var title = $"[bold {Value}] Keypad & hotkeys[/]"; var hints = ScreenChrome.Hints( - ScreenChrome.SingleListHints, "F4", model?.HasEditableRow ?? false, focus, model?.HasRemovableRow ?? false); + ScreenChrome.SingleListHints, "F4", model?.HasEditableRow ?? false, focus, model?.HasRemovableRow ?? false, + room: ScreenChrome.HeaderRoom(" " + title, width)); return SpreadTitle(" " + title, hints, width); } diff --git a/src/SharpMUTerm.Tui/OptionsScreenRenderer.cs b/src/SharpMUTerm.Tui/OptionsScreenRenderer.cs index 98eaa81c..8558a02b 100644 --- a/src/SharpMUTerm.Tui/OptionsScreenRenderer.cs +++ b/src/SharpMUTerm.Tui/OptionsScreenRenderer.cs @@ -139,7 +139,8 @@ internal static string HeaderLine( model?.HasEditableRow ?? false, focus, removable: model?.HasRemovableRow ?? false, - resettable: resettable); + resettable: resettable, + room: ScreenChrome.HeaderRoom(" " + heading, width)); return SpreadTitle(" " + heading, hints, width); } diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Notices.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Notices.cs index d79d7bcc..7f06e925 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Notices.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Notices.cs @@ -55,8 +55,46 @@ internal string NoticeMarkup(NoticeModel notice) var body = $"[{ink}]{Escape(notice.Text)}[/]"; var label = HeldOn(_ink.Notice, plane); // A source is a label (Sound:), a key a chord chip (⌃P): two shapes, so a word is never read as a key to press. - return notice.Source is { } source ? $"[{label}]{Escape(source)}:[/] {body}" + var row = notice.Source is { } source ? $"[{label}]{Escape(source)}:[/] {body}" : notice.Key is null ? body : $"[{label}]{Escape(notice.Key)}[/] {body}"; + + // The toast offers the action as a button; the row names the way to it, where it fits whole — never by cutting + // the notice's own words, and never wrapping the row (FitStatusRow). + if (NoticeActionHints(notice.Action).FirstOrDefault(h => MarkupWidth(row) + 3 + h.Length <= HeaderWidth()) is { } hint) + { + row += $"[{label}] · {Escape(hint)}[/]"; + } + + return row; + } + + /// + /// The ways the status row may say a notice's action, longest first: its key and the action's name + /// (⌥R Reconnect) when the command has a key on this host, else the ⌃P entry it is by title + /// (⌃P ▸ Show client messages) and then by the action's shorter label, which ⌃P still finds (it matches word by + /// word). None for a command ⌃P does not list (a saved scene's Open): that is the toast's alone, and the row will not + /// name a way that is not there. Never a bare ⌃P: a chip with no verb says nothing. + /// + internal IReadOnlyList NoticeActionHints(NoticeAction? action) + { + if (action is null) + { + return []; + } + + if (CommandKey(action.Command) is { } key) + { + return [$"{key} {action.Label}"]; + } + + if (BuildCatalog().FirstOrDefault(c => c.Id == action.Command) is not { } entry) + { + return []; + } + + return string.Equals(entry.Title, action.Label, StringComparison.OrdinalIgnoreCase) + ? [$"⌃P ▸ {entry.Title}"] + : [$"⌃P ▸ {entry.Title}", $"⌃P ▸ {action.Label}"]; } /// A colour held to on : notice text is small text. diff --git a/src/SharpMUTerm.Tui/ScreenChrome.cs b/src/SharpMUTerm.Tui/ScreenChrome.cs index 4b6e0d28..c2170ecf 100644 --- a/src/SharpMUTerm.Tui/ScreenChrome.cs +++ b/src/SharpMUTerm.Tui/ScreenChrome.cs @@ -31,7 +31,8 @@ internal static string Hints( ScreenFocus? focus = null, bool removable = false, bool detailed = false, - bool resettable = false) + bool resettable = false, + int room = 0) { if (focus?.Edit is { } edit) { @@ -44,25 +45,91 @@ internal static string Hints( return $"[{ScreenPalette.Label}]{CaptureHints}[/]"; } - var editing = EditingHints - + (edit.VisibleChoices.Count > 0 ? ChoiceHint : string.Empty) - + (edit.RowFields > 1 ? NextFieldHint : string.Empty); - return $"[{ScreenPalette.Label}]{editing} · [/][{ScreenPalette.Accent}]{fkey}[/]" - + $"[{ScreenPalette.Label}] close [/]"; + var editing = new List + { + new("⏎", "commit"), + new("Esc", "revert"), + }; + if (edit.VisibleChoices.Count > 0) + { + editing.Add(new LadderKey("↑↓", "pick from list", "pick", Drop: 2)); + } + + if (edit.RowFields > 1) + { + editing.Add(new LadderKey("⇥", "next field", "next", Drop: 1)); + } + + editing.Add(new LadderKey(fkey, "close", Drop: 3)); + return HintMarkup(KeyLadder.Choose(editing, room), fkey, closesWithEsc: false); + } + + // Fitted by KeyLadder, never cut mid-word: a header narrower than its hints gives up whole keys, lowest Drop + // first, and keeps the way out. Del outlasts everything but the close, because Delete is the destructive key and + // this line is the only place it is named; `i info` and `/ search` go early, because the INFO row is drawn on + // the screen either way and search is the overlay's, not the screen's. + var keys = new List(VerbKeys(verbs)); + if (editable) + { + keys.Add(new LadderKey("⏎", "edit", Drop: 6)); + } + + if (resettable) + { + keys.Add(new LadderKey("r", "reset", Drop: 5)); + } + + if (removable) + { + keys.Add(new LadderKey("Del", "remove", Drop: 8)); + } + + if (detailed) + { + keys.Add(new LadderKey("i", "info", Drop: 4)); } - // Order is a budget, not taste: a header narrower than its hints loses the *tail* of this string - // (see the 80-column frames), so whatever is appended last is what a narrow terminal does not - // get. `i info` goes after `Del remove` because Delete is the destructive key and must be the - // one that survives — and because the INFO key's drawn row (`i info on Aetherfall`) is on the - // screen either way, while a key that removes a world has only this line and its own row. - var all = (editable ? verbs + EditHint : verbs) - + (resettable ? ResetHint : string.Empty) - + (removable ? DeleteHint : string.Empty) - + (detailed ? DetailHint : string.Empty) - + SearchHint; - return $"[{ScreenPalette.Label}]{all} · [/][{ScreenPalette.Accent}]{fkey}[/][{ScreenPalette.Label}]/[/]" - + $"[{ScreenPalette.Accent}]Esc[/][{ScreenPalette.Label}] close [/]"; + keys.Add(new LadderKey("/", "search", Drop: 1)); + keys.Add(new LadderKey($"{fkey}/Esc", "close")); + return HintMarkup(KeyLadder.Choose(keys, room), fkey, closesWithEsc: true); + } + + /// + /// The cells a header has for its hints once is drawn in : what + /// is fitted to (0 when the caller has no width). One cell for the gap, one for the trailing pad. + /// + internal static int HeaderRoom(string title, int width) => + width <= 0 ? 0 : Math.Max(1, width - MarkupText.VisibleLength(title) - 2); + + /// A verbs string (, ) as ladder keys, each with its drop rank. + private static IEnumerable VerbKeys(string verbs) + { + foreach (var part in verbs.Split(" · ", StringSplitOptions.RemoveEmptyEntries)) + { + var cut = part.LastIndexOf(' '); + var key = cut > 0 ? part[..cut] : part; + var label = cut > 0 ? part[(cut + 1)..] : string.Empty; + yield return new LadderKey(key, label, Drop: label switch + { + "pane" => 2, + "select" => 3, + _ => 7, + }); + } + } + + /// + /// A header's hints as markup: the keys in the label ink, then the close — its keys in the accent, as every screen + /// has drawn them. The close is always the last key kept (it is never dropped). + /// + private static string HintMarkup(IReadOnlyList<(string Key, string Label)> keys, string fkey, bool closesWithEsc) + { + var verbs = string.Join(" · ", keys.Take(keys.Count - 1).Select(k => k.Label.Length == 0 ? k.Key : $"{k.Key} {k.Label}")); + var lead = verbs.Length == 0 ? string.Empty : $"[{ScreenPalette.Label}]{verbs} · [/]"; + var close = closesWithEsc + ? $"[{ScreenPalette.Accent}]{fkey}[/][{ScreenPalette.Label}]/[/][{ScreenPalette.Accent}]Esc[/]" + : $"[{ScreenPalette.Accent}]{fkey}[/]"; + return lead + close + $"[{ScreenPalette.Label}] close [/]"; } /// @@ -270,7 +337,7 @@ internal static List Compact(List block, int height) /// with no cursor in it shows its top, where its heading is, and the edges say what they are hiding. /// /// - internal static List Window(List block, int height) + internal static List Window(List block, int height, int keepBelow = 0) { ArgumentNullException.ThrowIfNull(block); @@ -288,9 +355,10 @@ internal static List Window(List block, int height) focused = block.FindIndex(l => l.Contains(CursorMark, StringComparison.Ordinal)); } + // keepBelow: rows under the focused one that belong to it (an open field's explanation), kept on screen too. var start = focused < 0 ? 0 - : Math.Clamp(focused - (height / 2), 0, block.Count - height); + : Math.Clamp(Math.Max(focused - (height / 2), focused + keepBelow + 2 - height), 0, block.Count - height); var window = block.GetRange(start, height); if (start > 0) diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Reconnect.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Reconnect.cs index a3279f44..2f2efbce 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Reconnect.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Reconnect.cs @@ -165,9 +165,9 @@ private void AppendClientRow(string windowId, string label, string text) private void ShowDemoReconnect() { _demoReconnect = 12; - AppendWindowLine(MainWindowId, StyledLine.FromText("*** Connection lost: Connection reset by peer", WorldSession.SystemLineStyle), StampNow()); - AppendWindowLine(MainWindowId, StyledLine.FromText("*** Connecting to aetherfall.mux:4201...", WorldSession.SystemLineStyle), StampNow()); - AppendWindowLine(MainWindowId, StyledLine.FromText("*** Connection failed: Connection refused", WorldSession.SystemLineStyle), StampNow()); + AppendClientRow(MainWindowId, ConnectionNote.Lost, "connection lost · Connection reset by peer"); + AppendClientRow(MainWindowId, ConnectionNote.Connect, "dialling aetherfall.mux:4201…"); + AppendClientRow(MainWindowId, ConnectionNote.Failed, "could not connect to aetherfall.mux:4201 · Connection refused"); AppendClientRow(MainWindowId, ReconnectLabel, ReconnectLine(12, 2)); _statusIdentity = ("Corvid", "aetherfall.mux", 4201, "faulted"); RefreshStatusBar(); diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 295f88df..b7abef7d 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -3250,6 +3250,14 @@ private void BindSession(WorldSession session, string? windowId = null) } session.LinePrinted += (_, line) => OnUi(() => OnLine(session, windowId, line)); + + // What the session says about its connection is the client's row in this window, never a line of the session: + // no transcript, restore log, scene log, trigger or ⌃F sees it (ClientRowRenderer). A reader with no rows hears it. + session.ConnectionNoted += (_, note) => OnUi(() => + { + AppendClientRow(windowId, note.Label, note.Text); + AnnounceLine(windowId, note.ToString()); + }); session.PromptChanged += (_, _) => OnUi(() => { UpdateStatus(); diff --git a/src/SharpMUTerm.Tui/TimersScreenRenderer.cs b/src/SharpMUTerm.Tui/TimersScreenRenderer.cs index b5ea5e9d..e084ed0a 100644 --- a/src/SharpMUTerm.Tui/TimersScreenRenderer.cs +++ b/src/SharpMUTerm.Tui/TimersScreenRenderer.cs @@ -114,7 +114,8 @@ internal static string HeaderLine(int width, ScreenModel? model = null, ScreenFo { var title = $"[bold {Value}] Timers[/]"; var hints = ScreenChrome.Hints( - ScreenChrome.ListHints, "F6", model?.HasEditableRow ?? false, focus, model?.HasRemovableRow ?? false); + ScreenChrome.ListHints, "F6", model?.HasEditableRow ?? false, focus, model?.HasRemovableRow ?? false, + room: ScreenChrome.HeaderRoom(" " + title, width)); return SpreadTitle(" " + title, hints, width); } diff --git a/src/SharpMUTerm.Tui/TriggersScreenRenderer.cs b/src/SharpMUTerm.Tui/TriggersScreenRenderer.cs index e9d98577..8d120289 100644 --- a/src/SharpMUTerm.Tui/TriggersScreenRenderer.cs +++ b/src/SharpMUTerm.Tui/TriggersScreenRenderer.cs @@ -294,7 +294,8 @@ internal static string HeaderLine(int width, ScreenModel? model = null, ScreenFo { var title = $"[bold {Value}] Triggers & spawn routing[/]"; var hints = ScreenChrome.Hints( - ScreenChrome.ListHints, "F2", model?.HasEditableRow ?? false, focus, model?.HasRemovableRow ?? false); + ScreenChrome.ListHints, "F2", model?.HasEditableRow ?? false, focus, model?.HasRemovableRow ?? false, + room: ScreenChrome.HeaderRoom(" " + title, width)); return SpreadTitle(" " + title, hints, width); } diff --git a/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs b/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs index b28c4445..dd1b7917 100644 --- a/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs +++ b/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs @@ -355,7 +355,8 @@ internal static string HeaderLine( model?.HasEditableRow ?? false, focus, model?.HasRemovableRow ?? false, - model?.HasDetailRow ?? false); + model?.HasDetailRow ?? false, + room: ScreenChrome.HeaderRoom(" " + title, width)); return SpreadTitle(" " + title, hints, width); } @@ -1119,15 +1120,23 @@ world.GrabPrefix is { } grab }; var right = new List { $"[{accent}]├ WORLD[/]" }; + + // Which group each world row is under, and which rows are the headings: a short column gives the headings up + // and names the group of its first drawn row on its top row instead (see the end of this method). + var groupOf = new Dictionary(); + var namesHelp = 0; + var headings = new HashSet(); string? group = null; foreach (var field in BuiltInSettings.World.Fields) { if (field.Group is { } heading && !string.Equals(heading, group, StringComparison.Ordinal)) { group = heading; + headings.Add(right.Count); right.Add(GroupHeading(heading)); } + var first = right.Count; if (string.Equals(field.Id, SecurityFieldOrder[0], StringComparison.Ordinal)) { right.AddRange(SecurityColumn(world, cursor)); @@ -1135,6 +1144,18 @@ world.GrabPrefix is { } grab else if (cells.TryGetValue(field.Id, out var cell)) { right.Add(WorldField(field.Label, cell)); + if (string.Equals(field.Id, "highlight-names", StringComparison.Ordinal) + && cursor.EditOn(WorldsPane, selectedWorld, HighlightNamesField) is not null) + { + var help = NamesHelpRows().ToList(); + namesHelp = help.Count; + right.AddRange(help); + } + } + + for (var i = first; i < right.Count && group is not null; i++) + { + groupOf[i] = group; } } @@ -1169,8 +1190,58 @@ world.GrabPrefix is { } grab // Compacted, then windowed, then overlaid: the dropdown replaces rows by index, so anything that // moves a row has to happen before it is drawn or the list slides off the field it belongs to. - return ScreenChrome.Choices( - ScreenChrome.Window(ScreenChrome.Compact(right, height), height), cursor.Edit, DetailRowWidth); + if (height <= 0 || ScreenChrome.Compact(new List(right), height).Count <= height) + { + return ScreenChrome.Choices( + ScreenChrome.Window(ScreenChrome.Compact(right, height), height, namesHelp), cursor.Edit, DetailRowWidth); + } + + // Too short for every row: the group headings go first after the blanks (each costs a row and names no field), + // and the group of the first field drawn is named on the column's top row — `├ WORLD · CONNECTION`, or + // `⌃ 12 more · MAP` once it scrolls. ⇥ order is the fields' and is untouched. + var rows = new List<(string Line, string? Group)>(); + for (var i = 0; i < right.Count; i++) + { + if (!headings.Contains(i)) + { + rows.Add((right[i], groupOf.TryGetValue(i, out var g) ? g : null)); + } + } + + var window = ScreenChrome.Window(ScreenChrome.Compact(rows.ConvertAll(r => r.Line), height), height, namesHelp); + if (window.Count > 1 && rows.FirstOrDefault(r => string.Equals(r.Line, window[1], StringComparison.Ordinal)).Group is { } top) + { + window[0] += $"[{Label}] · {Escape(top.ToUpperInvariant())}[/]"; + } + + return ScreenChrome.Choices(window, cursor.Edit, DetailRowWidth); + } + + /// + /// What an open highlight-names edit draws under its well (, then the colours + /// it takes, a few to a row): the syntax is not on screen anywhere else. The window says the same as the field's help. + /// + internal static IEnumerable NamesHelpRows() + { + const int room = 28; + yield return WorldField(string.Empty, $"[{Label}]{Escape(HighlightColours.NameSyntax.Split(';')[0])}[/]"); + yield return WorldField(string.Empty, $"[{Label}]{Escape(HighlightColours.NameSyntax.Split(';')[1].Trim())}[/]"); + var line = "colours:"; + foreach (var colour in HighlightColours.NameColours) + { + if (line.Length > 0 && line.Length + 1 + colour.Length > room) + { + yield return WorldField(string.Empty, $"[{Label}]{line}[/]"); + line = string.Empty; + } + + line = line.Length == 0 ? colour : line + " " + colour; + } + + if (line.Length > 0) + { + yield return WorldField(string.Empty, $"[{Label}]{line}[/]"); + } } /// diff --git a/src/SharpMUTerm.Tui/WorldsScreenView.cs b/src/SharpMUTerm.Tui/WorldsScreenView.cs index fb573b2a..73a9894b 100644 --- a/src/SharpMUTerm.Tui/WorldsScreenView.cs +++ b/src/SharpMUTerm.Tui/WorldsScreenView.cs @@ -51,17 +51,24 @@ public static IWindowControl Build( // How many rows the WORLDS/detail body has once the header, the character band, the gap under // it and the action bar have taken theirs. The detail column is built against that number, so a // pane taller than its slot compacts and then scrolls rather than losing its tail silently. + // While the keyboard is in the world's own rows (the WORLDS list, a world field, its security boxes) the character + // band below gives up rows to them: it is drawn to a third of the screen and says what it holds back, so a short + // terminal shows a page of world fields rather than one field and "⌄ 33 more". On a character it is whole again. + var capBand = height > 0 && focus is { Pane: WorldsScreenRenderer.WorldsPane or WorldsScreenRenderer.SecurityPane }; + var bandCap = capBand ? Math.Max(5, (height - 3) / 3) : 0; + List Capped(List rows) => capBand ? ScreenChrome.Window(rows, bandCap) : rows; + var band = WorldsScreenRenderer.HasCharacter(worlds, selectedWorld, selectedCharacter) ? Math.Max( - WorldsScreenRenderer.FormColumn( - worlds[selectedWorld].Characters[selectedCharacter], accent, focus, selectedCharacter, layouts).Count, - WorldsScreenRenderer.TriggersColumn( + Capped(WorldsScreenRenderer.FormColumn( + worlds[selectedWorld].Characters[selectedCharacter], accent, focus, selectedCharacter, layouts).ToList()).Count, + Capped(WorldsScreenRenderer.TriggersColumn( worlds[selectedWorld].Characters[selectedCharacter], triggerSets, accent, focus, selectedSet, - worlds).Count) + 2 + worlds).ToList()).Count) + 2 : 1; var rows = height <= 0 ? 0 : Math.Max(1, height - 1 - band); @@ -88,10 +95,10 @@ public static IWindowControl Build( if (WorldsScreenRenderer.HasCharacter(worlds, selectedWorld, selectedCharacter)) { var character = worlds[selectedWorld].Characters[selectedCharacter]; - var form = WorldsScreenRenderer.FormColumn(character, accent, focus, selectedCharacter, layouts).ToList(); - var triggers = WorldsScreenRenderer + var form = Capped(WorldsScreenRenderer.FormColumn(character, accent, focus, selectedCharacter, layouts).ToList()); + var triggers = Capped(WorldsScreenRenderer .TriggersColumn(character, triggerSets, accent, focus, selectedSet, worlds) - .ToList(); + .ToList()); var editHeight = Math.Max(form.Count, triggers.Count); // Form panel on the left; the trigger checklist pushed to the right by a flex spacer so its diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativeModalTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativeModalTests.cs index 3a612c38..ea9a0158 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/NativeModalTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/NativeModalTests.cs @@ -3,6 +3,7 @@ using Avalonia.Headless; using Avalonia.Input; using Avalonia.Interactivity; +using Avalonia.Media; using SharpMUTerm.Client.Modals; using SharpMUTerm.Core.Configuration; using SharpMUTerm.Core.Theming; @@ -183,6 +184,33 @@ public async Task EscClosesAndGivesTheKeyboardBack() await Assert.That(focused).IsTrue(); } + /// + /// Every native modal lies under one veil, the palette's and the settings window's (): + /// the whole window is dimmed, so the cells behind do not look live. Two stacked modals are two veils, the quit + /// prompt's in front. + /// + [Test] + public async Task EveryModalIsVeiledByTheOneScrimOverTheWholeWindow() + { + var (searchVeil, quitVeil, spans, inFront) = await Run(rig => + { + Key(rig, CtrlF); + var search = rig.Driver.Modals.Modal!; + Key(rig, CtrlQ); + var quit = rig.Driver.Modals.Quit!; + return ((search.Background as SolidColorBrush)?.Color, (quit.Background as SolidColorBrush)?.Color, + search.Bounds.Width >= rig.Root.Bounds.Width - 1 && search.Bounds.Height >= rig.Root.Bounds.Height - 1, + ReferenceEquals(rig.Root.Children[^1], quit)); + }); + + await Assert.That(searchVeil).IsEqualTo(NativeTokens.Dark.Scrim); + await Assert.That(quitVeil).IsEqualTo(NativeTokens.Dark.Scrim); + await Assert.That(spans).IsTrue().Because("the veil covers the header, the sidebar and the cells"); + await Assert.That(inFront).IsTrue(); + await Assert.That(NativeTokens.Dark.Scrim.A).IsGreaterThanOrEqualTo((byte)0x70).Because("faint enough to read through, dark enough to read as a veil"); + await Assert.That(NativeTokens.Light.Scrim.A).IsGreaterThanOrEqualTo((byte)0x48); + } + [Test] public async Task TheQuitPromptStaysInFrontOfAnythingAddedAfterIt() { diff --git a/tests/SharpMUTerm.Client.Tests/HelpPageTests.cs b/tests/SharpMUTerm.Client.Tests/HelpPageTests.cs new file mode 100644 index 00000000..954ef5b8 --- /dev/null +++ b/tests/SharpMUTerm.Client.Tests/HelpPageTests.cs @@ -0,0 +1,72 @@ +using SharpMUTerm.Client.Help; +using SharpMUTerm.Client.Settings; + +namespace SharpMUTerm.Client.Tests; + +/// +/// A help page as both hosts draw it (): headings read off a paragraph's opening label, keys found +/// by their glyphs, the map's key table kept as rows. And the highlight-names explanation both hosts show where the field +/// is edited. +/// +public class HelpPageTests +{ + private static HelpTopicLookup Topics => new(HelpTopics.For("⌥⏎")); + + private sealed record HelpTopicLookup(IReadOnlyList All) + { + public Modals.HelpTopic this[string id] => All.Single(t => t.Id == id); + } + + [Test] + public async Task AParagraphOpeningWithALabelIsABlockHeadedByIt() + { + var blocks = HelpPage.Blocks(Topics["reading"]); + + await Assert.That(blocks.Select(b => b.Heading ?? string.Empty)).IsEquivalentTo(new[] { "Scroll", "Search", "Freeze", "Ragged lines", "Copy" }); + await Assert.That(blocks[^1].Text).StartsWith("Drag across output").Because("the sentence starts the block, so it is capitalised"); + await Assert.That(blocks[0].Text).Contains("the live tail below").Because("a paragraph's source lines are joined"); + } + + [Test] + public async Task LinesInsideOneParagraphThatOpenWithALabelAreBlocksOfTheirOwn() + { + var headings = HelpPage.Blocks(Topics["keys"]).Select(b => b.Heading).Where(h => h is not null).ToList(); + + await Assert.That(headings).Contains("Windows"); + await Assert.That(headings).Contains("Characters"); + await Assert.That(headings).Contains("Connection"); + } + + [Test] + public async Task KeysAreSpansOfTheirOwn() + { + var keys = HelpPage.Spans("⌃Z/⌃Y undo, ⌥⇧ and an arrow, ⇧↑/⇧↓ a line, PgUp/PgDn, ⏎ goes, F5 ▸ join, Esc closes, ⌃B | splits") + .Where(s => s.IsKey).Select(s => s.Text).ToList(); + + await Assert.That(keys).IsEquivalentTo(new[] { "⌃Z", "⌃Y", "⌥⇧", "⇧↑", "⇧↓", "PgUp", "PgDn", "⏎", "F5", "Esc", "⌃B" }); + await Assert.That(string.Concat(HelpPage.Spans("a ⌃F b").Select(s => s.Text))).IsEqualTo("a ⌃F b").Because("nothing is lost"); + } + + [Test] + public async Task TheMapsKeyTableStaysAsRows() + { + var rows = HelpPage.Blocks(Topics[HelpTopics.MapTopic]).Where(b => b.Preformatted).ToList(); + + await Assert.That(rows.Count).IsGreaterThan(1).Because("each row of the table is a row, not one joined paragraph"); + await Assert.That(rows.All(r => r.Heading is null)).IsTrue(); + } + + [Test] + public async Task TheHighlightNamesHelpSaysTheSyntaxAndEveryColour() + { + var help = BuiltInSettings.World.Fields.Single(f => f.Id == "highlight-names").Help!; + + await Assert.That(help).Contains(HighlightColours.NameSyntax); + foreach (var colour in HighlightColours.NameColours) + { + await Assert.That(help).Contains(colour); + } + + await Assert.That(HighlightColours.NameColours).DoesNotContain(HighlightColours.None); + } +} diff --git a/tests/SharpMUTerm.Core.Tests/Session/WorldSessionLoggingTests.cs b/tests/SharpMUTerm.Core.Tests/Session/WorldSessionLoggingTests.cs index 28892b03..d05d57f8 100644 --- a/tests/SharpMUTerm.Core.Tests/Session/WorldSessionLoggingTests.cs +++ b/tests/SharpMUTerm.Core.Tests/Session/WorldSessionLoggingTests.cs @@ -32,6 +32,32 @@ private sealed class RecordingSink : ILogSink private static WorldSession Session() => new(new WorldDefinition { Name = "T", Host = "h", Port = 1 }); + /// + /// Dialling, connecting and losing the connection are said as , never as + /// lines: nothing reaches the transcript, the scrollback or . + /// + [Test] + public async Task TheConnectionsOwnNotesReachNoTranscriptAndNoScrollback() + { + var telnet = new FakeTelnetSession(); + var session = new WorldSession(new WorldDefinition { Name = "T", Host = "h", Port = 1 }, sessionFactory: _ => telnet); + var sink = new RecordingSink(); + session.AttachLog(sink); + var notes = new List(); + var lines = new List(); + session.ConnectionNoted += (_, n) => notes.Add(n); + session.LinePrinted += (_, l) => lines.Add(l); + + await session.ConnectAsync(); + await telnet.DisconnectAsync(); + + await Assert.That(notes.Select(n => n.Label)).IsEquivalentTo(new[] { ConnectionNote.Connect, ConnectionNote.Connect, ConnectionNote.Closed }); + await Assert.That(notes[0].Text).IsEqualTo("dialling h:1…"); + await Assert.That(sink.Lines).IsEmpty(); + await Assert.That(lines).IsEmpty(); + await Assert.That(session.Scrollback.Snapshot()).IsEmpty(); + } + [Test] public async Task AttachedMidSession_TheLogTakesSubsequentLines() { diff --git a/tests/SharpMUTerm.Core.Tests/Session/WorldSessionReflowTests.cs b/tests/SharpMUTerm.Core.Tests/Session/WorldSessionReflowTests.cs index d00a1777..07b7008d 100644 --- a/tests/SharpMUTerm.Core.Tests/Session/WorldSessionReflowTests.cs +++ b/tests/SharpMUTerm.Core.Tests/Session/WorldSessionReflowTests.cs @@ -31,6 +31,10 @@ private static (WorldSession Session, FakeTelnetSession Telnet, List }; var printed = new List(); session.LinePrinted += (_, l) => printed.Add(l); + + // The connection's own notes are not lines any more (ConnectionNoted); recorded in order with the lines, as + // "*** CLOSED: …", so a test can still say a note came after a line. + session.ConnectionNoted += (_, n) => printed.Add(StyledLine.FromText("*** " + n, TextStyle.Default)); return (session, telnet, printed); } @@ -142,6 +146,6 @@ public async Task ADisconnectReleasesAHeldLineBeforeItsOwnMessage() var texts = printed.Select(l => l.Text).ToList(); var held = texts.IndexOf(Paragraph[0]); await Assert.That(held).IsGreaterThanOrEqualTo(0); - await Assert.That(texts.FindIndex(t => t.StartsWith("*** Disconnected", StringComparison.Ordinal))).IsGreaterThan(held); + await Assert.That(texts.FindIndex(t => t.StartsWith("*** " + ConnectionNote.Closed, StringComparison.Ordinal))).IsGreaterThan(held); } } diff --git a/tests/SharpMUTerm.Tui.Tests/AlertsAndReconnectTests.cs b/tests/SharpMUTerm.Tui.Tests/AlertsAndReconnectTests.cs index b680f862..3963a73a 100644 --- a/tests/SharpMUTerm.Tui.Tests/AlertsAndReconnectTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/AlertsAndReconnectTests.cs @@ -151,6 +151,28 @@ public async Task AReconnectSaysSoInAClientRowAndNotInTheSessionsLines() await Assert.That(rig.App.SearchModelFor("try 1 of", regex: false, all: true).Rows).IsEmpty(); } + /// + /// The session's own connection lines (dialling, connected, lost) are client rows too, not *** session lines: + /// the window still says them, and no scrollback (so no transcript, restore or scene log), trigger or ⌃F sees them. + /// + [Test] + public async Task ConnectingAndLosingTheConnectionAreClientRowsNotSessionLines() + { + var rig = await Open(autoReconnect: false); + await using var _ = rig.App; + rig.Wire.Drop(new IOException("Connection reset by peer")); + + var window = rig.App.ActiveWindowId(); + var rows = rig.App.PaneLines(window).Select(MarkupText.Plain).ToList(); + await Assert.That(rows.Any(r => r.Contains(ConnectionNote.Connect + " dialling aetherfall.example:4201", StringComparison.Ordinal))).IsTrue() + .Because(string.Join('\n', rows)); + await Assert.That(rows.Any(r => r.Contains(ConnectionNote.Connect + " connected to aetherfall.example:4201", StringComparison.Ordinal))).IsTrue(); + await Assert.That(rows.Any(r => r.Contains(ConnectionNote.Lost + " connection lost · Connection reset by peer", StringComparison.Ordinal))).IsTrue(); + await Assert.That(rows.Any(r => r.StartsWith("***", StringComparison.Ordinal))).IsFalse(); + await Assert.That(rig.Session.Scrollback.Snapshot().Any(l => l.Text.Contains("onnect", StringComparison.Ordinal))).IsFalse(); + await Assert.That(rig.App.SearchModelFor("dialling", regex: false, all: true).Rows).IsEmpty(); + } + [Test] public async Task StopReconnectingCancelsTheWait() { diff --git a/tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs b/tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs index b63d5331..8fc7fa39 100644 --- a/tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs @@ -71,12 +71,41 @@ await Assert.That(row).IsNotNull() [Test] public async Task EveryViewInTheListIsOneTheSnapshotKnows() { - foreach (var (view, _) in Footers) + foreach (var (view, _) in Footers.Concat(SettingsHeaders.Select(v => (v, Array.Empty())))) { await Assert.That(SnapshotViews.All.Contains(view)).IsTrue().Because(view); } } + /// + /// Every settings screen, navigating and mid-edit. Their header's keys are fitted by + /// (ScreenChrome.Hints): at 80 columns they used to be cut from the middle (⏎ …, Del remo…). + /// + internal static readonly string[] SettingsHeaders = + [ + "settings", "worlds", "triggers", "route", "highlight", "set", "aliases", "timers", "keypad", "textansi", "input", + "logging", "password", "startup", "settings-search", "settings-meters", "settings-changed", + "settings-themes", "triggers-edit", "logging-edit", "keypad-edit", "password-edit", "startup-edit", "channels-f5", + "join-wraps-f5", + ]; + + public static IEnumerable> SettingsCases() => SettingsHeaders.Select(v => (Func)(() => v)); + + [Test] + [MethodDataSource(nameof(SettingsCases))] + public async Task ASettingsHeaderKeepsWholeKeysAndItsWayOutAt80x24(string view) + { + var rows = FrameGrid.Decode(Render(view), Width, Height); + var header = rows[0]; + await Assert.That(header.Contains('…')).IsFalse() + .Because($"{view}: a key is given up whole, never cut: '{header}'"); + await Assert.That(header.Contains("close", StringComparison.Ordinal) || header.Contains("cancels", StringComparison.Ordinal) + || header.Contains("Esc back", StringComparison.Ordinal)) + .IsTrue().Because($"{view}: the way out stays: '{header}'"); + var footer = rows.LastOrDefault(r => r.Contains("[Esc]", StringComparison.Ordinal)); + await Assert.That(footer).IsNotNull().Because($"{view}: its action bar is on screen:\n{string.Join('\n', rows)}"); + } + [Test] public async Task TheImportReviewScrollsItsBodyUnderAPinnedFooter() { diff --git a/tests/SharpMUTerm.Tui.Tests/NoticeAndMapSurfaceTests.cs b/tests/SharpMUTerm.Tui.Tests/NoticeAndMapSurfaceTests.cs index 92d6d839..9a016160 100644 --- a/tests/SharpMUTerm.Tui.Tests/NoticeAndMapSurfaceTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/NoticeAndMapSurfaceTests.cs @@ -44,8 +44,9 @@ public async Task TheStatusRowDrawsANoticeAsItAlwaysHas() var chip = plain[..plain.IndexOf("⌃B", StringComparison.Ordinal)]; var muted = plain[(plain.IndexOf("⌃B[/] ", StringComparison.Ordinal) + "⌃B[/] ".Length)..plain.IndexOf("nothing", StringComparison.Ordinal)]; + // A cell is not a button, so the row names the way to the action instead — after the words, unchanged. app.SimulateNotice("nothing to split", MessageSeverity.Warning, "⌃B", new NoticeAction("layout:layouts", "Change layout")); - await Assert.That(app.LastNotice).IsEqualTo(plain).Because("the action is the window's to offer; the row is unchanged"); + await Assert.That(app.LastNotice).StartsWith(plain).And.EndsWith(" · ⌥M Change layout[/]"); app.SimulateNotice("no route to host", MessageSeverity.Error, null, null); await Assert.That(app.LastNotice).IsEqualTo($"[{ScreenPalette.Warn}]no route to host[/]"); diff --git a/tests/SharpMUTerm.Tui.Tests/PolishWave17Tests.cs b/tests/SharpMUTerm.Tui.Tests/PolishWave17Tests.cs new file mode 100644 index 00000000..d0242ff0 --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/PolishWave17Tests.cs @@ -0,0 +1,85 @@ +using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Client.Help; +using SharpMUTerm.Client.Modals; +using SharpMUTerm.Core.Diagnostics; +using SharpMUTerm.Core.Theming; +using SharpMUTerm.Graphics; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// The wave-17 polish read off frames: a notice's action named on the status row where it fits, F5's world column at +/// 80×24 showing a page of fields rather than one, and a help page's header on one row with its keys drawn as keys. +/// +[NotInParallel] +public class PolishWave17Tests +{ + private static readonly TerminalCapabilities Headless = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private static SharpMUTermApp App(int width, int height) + { + Console.SetIn(TextReader.Null); + var config = DemoScene.Build(); + config.ThemeName = "Dark"; + config.Theme = ThemeLibrary.Get("Dark"); + return new SharpMUTermApp(config, Headless, new HeadlessConsoleDriver(width, height)); + } + + [Test] + public async Task TheStatusRowNamesANoticesActionWhereItFits() + { + await using var wide = App(120, 32); + wide.SimulateNotice("could not connect to aetherfall.mux:4201 — no route to host", MessageSeverity.Error, null, + new NoticeAction("term:messages", "Show messages")); + await Assert.That(MarkupText.Plain(wide.StatusMarkup)).EndsWith("· ⌃P ▸ Show client messages"); + + // At 80 the palette's title does not fit beside the words; the action's own, shorter label does. + await using var narrow = App(80, 24); + narrow.SimulateNotice("could not connect to aetherfall.mux:4201 — no route to host", MessageSeverity.Error, null, + new NoticeAction("term:messages", "Show messages")); + var row = MarkupText.Plain(narrow.StatusMarkup); + await Assert.That(row).EndsWith("· ⌃P ▸ Show messages"); + await Assert.That(row.Length).IsLessThanOrEqualTo(80); + await Assert.That(row).DoesNotContain("…").Because("the hint is added whole or not at all; the words are never cut for it"); + } + + [Test] + public async Task AnActionWithAKeyIsNamedByItsKey_AndOneThePaletteDoesNotListIsNotNamed() + { + await using var app = App(120, 32); + await Assert.That(app.NoticeActionHints(new NoticeAction("world:reconnect", "Reconnect"))).IsEquivalentTo(new[] { "⌥R Reconnect" }); + await Assert.That(app.NoticeActionHints(new NoticeAction("scene:open:0", "Open"))).IsEmpty(); + + app.SimulateNotice("a notice too long to leave room for anything beside it at all, said at length, on and on and on and on", + MessageSeverity.Error, null, new NoticeAction("term:messages", "Show messages")); + await Assert.That(MarkupText.Plain(app.StatusMarkup)).DoesNotContain("⌃P ▸"); + } + + [Test] + public async Task F5At80x24ShowsAPageOfWorldFieldsUnderAnInlineGroupLabel() + { + await using var app = App(80, 24); + var rows = FrameGrid.Decode(app.RenderSnapshot("settings"), 80, 24); + string[] labels = ["name", "host", "port", "security", "encoding", "keepalive", "reconnect", "content", "gmcp modules"]; + var shown = labels.Count(l => rows.Any(r => r.Contains($" {l} ", StringComparison.Ordinal))); + + await Assert.That(shown).IsGreaterThanOrEqualTo(8).Because(string.Join('\n', rows)); + await Assert.That(rows.Any(r => r.Contains("├ WORLD · CONNECTION", StringComparison.Ordinal))).IsTrue() + .Because("the heading the short column gave up is named on its top row"); + await Assert.That(rows.Any(r => r.Contains("more", StringComparison.Ordinal) && r.Contains('⌄'))).IsTrue() + .Because("the character form held back says what it holds back"); + } + + [Test] + public async Task AHelpPagesHeaderIsOneRowAndItsKeysAreDrawnAsKeys() + { + var model = HelpModel.Build([], "⌥⏎", []); + var lines = HelpSurface.Render(model, string.Empty, 0, "reading", 0, 70, 20); + + await Assert.That(MarkupText.VisibleLength(lines[0])).IsLessThanOrEqualTo(69); + await Assert.That(lines.Any(l => l.Contains($"[bold {ScreenPalette.Value}]Search[/]", StringComparison.Ordinal))).IsTrue(); + await Assert.That(lines.Any(l => l.Contains($"[bold {ScreenPalette.Accent}]⌃F[/]", StringComparison.Ordinal))).IsTrue(); + } +} From 91fa7ad74af6dbed2b7132b46af808b239150327 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 15:34:31 +0000 Subject: [PATCH 056/113] =?UTF-8?q?feat:=20script=20editing=20loop=20and?= =?UTF-8?q?=20deeper=20history=20search=20(=E2=8C=83F=20=E2=8C=A5H)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Scripts: ⌃P ▸ Edit script… / New script…, the console's ⌃E and /script edit|new list and open the character's script files in the composer's script mode (verbatim lines, no escaping or spelling, monospace). ⌃S writes atomically under the scripts folder only (ScriptFiles), reloads that character's scripts and shows the first error (file:line) in the header and the console. Package scripts open read only. Both hosts. Search: ⌥H searches the session's whole scrollback, ring and spill, in ranged reads off the UI thread with cancellation and the match timeout (ScrollbackSearch), streaming older hits after the pane's. ⏎ on one goes to the pane if it still holds the line, else opens a read-only history view (cell ScrollbackViewSurface, native ScrollbackView). Captures say they keep no older history. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 7 + CLAUDE.md | 17 + src/SharpMUTerm.Avalonia/ComposerView.cs | 44 +- src/SharpMUTerm.Avalonia/ModalOverlay.cs | 1 + src/SharpMUTerm.Avalonia/ScriptConsoleView.cs | 19 + src/SharpMUTerm.Avalonia/ScrollbackView.cs | 146 ++++++ src/SharpMUTerm.Avalonia/SearchView.cs | 63 ++- .../Commands/BuiltInCommands.cs | 33 ++ .../Composer/ComposerModel.cs | 31 +- src/SharpMUTerm.Client/Help/SlashCommands.cs | 2 + .../Modals/ScriptConsoleModel.cs | 26 +- .../Modals/ScrollbackViewModel.cs | 126 +++++ src/SharpMUTerm.Client/Modals/SearchModel.cs | 52 +- .../Surfaces/SurfaceCatalog.cs | 24 +- .../Commands/CommandCatalog.cs | 10 +- src/SharpMUTerm.Core/Text/ScrollbackSearch.cs | 137 +++++ src/SharpMUTerm.Scripting/ScriptFiles.cs | 264 ++++++++++ src/SharpMUTerm.Tui/ComposeOverlay.cs | 86 ++- src/SharpMUTerm.Tui/ScriptConsoleSurface.cs | 9 +- src/SharpMUTerm.Tui/ScrollbackViewSurface.cs | 61 +++ src/SharpMUTerm.Tui/SearchPrompt.cs | 40 +- src/SharpMUTerm.Tui/SearchSurface.cs | 33 +- .../SharpMUTermApp.DeepSearch.cs | 489 ++++++++++++++++++ .../SharpMUTermApp.NativeComposer.cs | 27 +- .../SharpMUTermApp.NativeModals.cs | 17 +- .../SharpMUTermApp.ScriptConsole.cs | 6 +- .../SharpMUTermApp.ScriptEdit.cs | 448 ++++++++++++++++ src/SharpMUTerm.Tui/SharpMUTermApp.cs | 98 +++- src/SharpMUTerm.Tui/SnapshotViews.cs | 2 +- .../SurfaceParityTests.cs | 33 +- .../Text/ScrollbackSearchTests.cs | 119 +++++ .../ScriptFilesTests.cs | 138 +++++ .../SharpMUTerm.Tui.Tests/DeepSearchTests.cs | 137 +++++ .../ScriptEditLoopTests.cs | 196 +++++++ 34 files changed, 2842 insertions(+), 99 deletions(-) create mode 100644 src/SharpMUTerm.Avalonia/ScrollbackView.cs create mode 100644 src/SharpMUTerm.Client/Modals/ScrollbackViewModel.cs create mode 100644 src/SharpMUTerm.Core/Text/ScrollbackSearch.cs create mode 100644 src/SharpMUTerm.Scripting/ScriptFiles.cs create mode 100644 src/SharpMUTerm.Tui/ScrollbackViewSurface.cs create mode 100644 src/SharpMUTerm.Tui/SharpMUTermApp.DeepSearch.cs create mode 100644 src/SharpMUTerm.Tui/SharpMUTermApp.ScriptEdit.cs create mode 100644 tests/SharpMUTerm.Core.Tests/Text/ScrollbackSearchTests.cs create mode 100644 tests/SharpMUTerm.Scripting.Tests/ScriptFilesTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/DeepSearchTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/ScriptEditLoopTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index e728b2e6..7b802522 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,13 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- Scripts can be edited without leaving the client. ⌃P ▸ Edit script… (or ⌃E in the script console, or `/script edit`) + lists your character's script files; one opens in the composer with line numbers, exactly as written. ⌃S saves it, + reloads that character's scripts and shows the first error with its file and line. ⌃P ▸ New script… (or + `/script new `) starts one. Scripts from a package open read only. +- ⌃F can search older history. Press ⌥H to search the whole of a character's scrollback, including what has been + moved to disk, as well as what the pane still shows. Results stream in below the pane's own, marked "older"; ⏎ on + one opens a read-only page of history around it. Capture windows keep no older history, and the search says so. - Alerts reach more of the desktop. On Linux (X11, and XWayland) the window is marked as wanting attention, so the taskbar or window list highlights it until you come back. On Windows, an installed copy shows a toast as well as flashing the taskbar, and the window groups with its Start menu shortcut. diff --git a/CLAUDE.md b/CLAUDE.md index cd5c8502..aab4cf8f 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -106,6 +106,14 @@ fallbacks) for inline images/maps. - **A rebuild clears the engines' runtime rules first** (`ClearRuntime`), or a reload doubles every `trigger.add`. `SaveConfiguration` rebuilds only when a session's file list changed (`SyncFiles`), since a rebuild restarts script timers; ⌃P ▸ *Reload scripts* always rebuilds and re-reads. + - **Scripts are edited in the composer's script mode** (`ScriptFiles`, Scripting; `SharpMUTermApp.ScriptEdit.cs`; + `ComposerEdit.Script`; ⌃P ▸ *Edit script…* / *New script…*, the console's ⌃E, `/script edit|new`; the `script-list` + and `script-edit` views). The files are ⌃P entries (`script:open:`, a family listed only once asked for, map + find's rule). Names go through `ScriptFiles.Check` and then `SessionScripts.Resolve`; a save is a temp file in the same + folder and a rename, refused through a link and outside the root. Lines verbatim (no `%r`, no escaping, no spelling, + line numbers, monospace). ⌃S saves, reloads that character's scripts and says the first error (`file:line`) in the + header and the console; the editor stays open. Esc keeps unsaved text per file for the run. `package:` scripts open + read only. The demo saves nothing. - **GMCP and MSDP data is held per session in `GameDataStore`, and three things read it**: the status row's meters (`StatusMeter`, F7 ▸ `meters`), ⌃P ▸ *Show game data* (`GameDataOverlay`) and Lua (`gmcp.get`, `msdp.get`). GMCP packages are stored by name with objects merged key by key, because IRE and Aardwolf send @@ -398,6 +406,15 @@ fallbacks) for inline images/maps. viewport width) when drawn, the label elides before the rule shrinks, and `SyncChromeBarWidths` (on `PostBufferPaint`) redraws a window's bars in place when its width moves. Width 0 (not arranged) draws 48 cells. ⌃F's footer is a drop ladder (`SearchPrompt.HintLadder`), so the surface fits from 44 columns. + - **⌥H searches older history too** (`ScrollbackSearch`, Core; `SharpMUTermApp.DeepSearch.cs`; `ScrollbackViewModel`, + Client; `ScrollbackViewSurface`, Tui; `ScrollbackView`, Avalonia; the `search-older` and `search-history` views). Only + a session window has any: its session's `ScrollbackBuffer`, ring and spill, walked newest first in ranged reads of + `MaxRangeLines` off the UI thread (inline headless, so frames are deterministic), cancelled by the next query or by + closing, `OutputSearch.Match`'s timeout per line, at most 500 hits. Lines the pane still holds are skipped by + reference (a session window's `PaneLine.Source` is the ring's instance). Older rows list after the pane's, tagged + `older`; the note on the count row says the bound and the progress, and that captures keep no older history. ⏎ on + one goes to the pane if it holds the line, else opens the **history view**: a modal page of 20 lines, every move a + ranged read, never inserted into a pane buffer. ⌥G stays pane-only. - **The demo scene loads with `_watching` off.** It pours a spawn window's whole history in before the first frame, and every line would otherwise count as missed — so any frame that later made such a window visible carried an activity bar reporting the client's own setup as news. diff --git a/src/SharpMUTerm.Avalonia/ComposerView.cs b/src/SharpMUTerm.Avalonia/ComposerView.cs index 28090456..78c831b9 100644 --- a/src/SharpMUTerm.Avalonia/ComposerView.cs +++ b/src/SharpMUTerm.Avalonia/ComposerView.cs @@ -218,7 +218,7 @@ public void Show(ComposerModel model, ComposerSession session, PanelInk ink, Col try { _editor.Text = model.Body; - _editor.CaretIndex = model.Body.Length; + _editor.CaretIndex = model.Edit is { Line: > 0 } at ? LineStart(model.Body, at.Line) : model.Body.Length; _editor.ClearSelection(); } finally @@ -233,6 +233,9 @@ public void Show(ComposerModel model, ComposerSession session, PanelInk ink, Col _editor.Marks = session.Marks(_editor.Text ?? string.Empty); } + // A package's script is only read: the editor shows it and keeps every edit out. + _editor.IsReadOnly = model.Edit?.ReadOnly == true; + if (coloursChanged || previous is null) { Paint(); @@ -329,11 +332,37 @@ private void ApplyFont() } } + /// Where line (from 1) of starts; the end when it has fewer. + internal static int LineStart(string text, int line) + { + var at = 0; + for (var i = 1; i < line; i++) + { + var next = text.IndexOf('\n', at); + if (next < 0) + { + return text.Length; + } + + at = next + 1; + } + + return at; + } + /// The header and the key row, from the model. private void Label(ComposerModel model) { var ui = _title.FontSize; - if (model.Edit is { } edit) + if (model.Edit is { Script: true } script) + { + // A script: its name, that a save reloads the character's scripts, and what the last save did. + _title.Text = script.ReadOnly ? "READ ONLY" : "SCRIPT"; + var whose = model.Target.Length == 0 ? "no connection" : model.Target; + _target.Text = $"{script.Name} lua · {(script.ReadOnly ? "a package's script" : $"reloads {whose}")}" + + (script.Status is { } status ? $" · {status.TrimStart('!', ' ')}" : string.Empty); + } + else if (model.Edit is { } edit) { _title.Text = "EDIT"; _target.Text = $"{edit.Name} {edit.Type} · from {(model.Target.Length == 0 ? "no connection" : model.Target)}"; @@ -345,7 +374,8 @@ private void Label(ComposerModel model) _target.Text = model.Target.Length == 0 ? $"{verb}no connection" : $"{verb}to {model.Target}"; } - _target.Foreground = new SolidColorBrush(model.Target.Length == 0 ? Warn : _text); + _target.Foreground = new SolidColorBrush( + model.Target.Length == 0 || model.Edit?.Status?.StartsWith('!') == true ? Warn : _text); _chips.Children.Clear(); if (model.Edit is null) @@ -686,8 +716,12 @@ internal ContextMenu OpenMenu(int offset) items.Add(Item("Copy", _editor.Copy, enabled: _editor.CanCopy)); items.Add(Item("Paste", _editor.Paste, enabled: _editor.CanPaste)); items.Add(Item("Select all", _editor.SelectAll)); - items.Add(new Separator()); - items.Add(Item(Proportional ? "Monospace font" : "Proportional font", () => ChooseFace(!Proportional))); + if (_model?.Edit is not { Script: true }) + { + // A script is code, and stays monospace. + items.Add(new Separator()); + items.Add(Item(Proportional ? "Monospace font" : "Proportional font", () => ChooseFace(!Proportional))); + } var menu = new ContextMenu { ItemsSource = items }; menu.Closed += (_, _) => _editor.Focus(); diff --git a/src/SharpMUTerm.Avalonia/ModalOverlay.cs b/src/SharpMUTerm.Avalonia/ModalOverlay.cs index ab095c65..d00eb612 100644 --- a/src/SharpMUTerm.Avalonia/ModalOverlay.cs +++ b/src/SharpMUTerm.Avalonia/ModalOverlay.cs @@ -49,6 +49,7 @@ public ModalOverlay(ModalSession session, Action remove, Action new DictionaryOfferView(offer, Colours, Done), ImportReviewSession import => new ImportReviewView(import, Colours, Done), ScriptConsoleSession console => new ScriptConsoleView(console, Colours, Done), + ScrollbackViewSession history => new ScrollbackView(history, Colours, Done), _ => throw new ArgumentException($"no native view for {session.GetType().Name}", nameof(session)), }; AutomationProperties.SetName(this, _view.Title); diff --git a/src/SharpMUTerm.Avalonia/ScriptConsoleView.cs b/src/SharpMUTerm.Avalonia/ScriptConsoleView.cs index 7e9c1155..dd4d97fe 100644 --- a/src/SharpMUTerm.Avalonia/ScriptConsoleView.cs +++ b/src/SharpMUTerm.Avalonia/ScriptConsoleView.cs @@ -55,6 +55,11 @@ public ScriptConsoleView(ScriptConsoleSession session, NativeTokens colours, Act var buttons = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 8, Margin = new Thickness(14, 8, 14, 0), HorizontalAlignment = HorizontalAlignment.Right }; _delete = ModalParts.Button("Delete key", "Del", colours, DeleteSelected); buttons.Children.Add(_delete); + if (_session.CanEdit) + { + buttons.Children.Add(ModalParts.Button("Edit a script…", "Ctrl+E", colours, EditScript)); + } + buttons.Children.Add(ModalParts.Button("Reload scripts", "Ctrl+L", colours, Reload)); SetDock(buttons, Dock.Bottom); Children.Add(buttons); @@ -164,6 +169,16 @@ public void DeleteSelected() /// Reload scripts. public void Reload() => _session.Reload(); + /// Edit a script: the console closes and the client lists the character's scripts (⌃P), the cells' ⌃E. + public void EditScript() + { + if (_session.CanEdit) + { + _session.EditScript(); + _done(); + } + } + private void OnChanged(ScriptConsoleModel model) => Dispatcher.UIThread.Post(() => { _model = model; @@ -262,6 +277,10 @@ private void OnKey(object? sender, KeyEventArgs e) e.Handled = true; Reload(); return; + case Key.E when e.KeyModifiers == KeyModifiers.Control && _session.CanEdit: + e.Handled = true; + EditScript(); + return; case Key.Enter when _prompt.IsFocused: e.Handled = true; Run(); diff --git a/src/SharpMUTerm.Avalonia/ScrollbackView.cs b/src/SharpMUTerm.Avalonia/ScrollbackView.cs new file mode 100644 index 00000000..9a16d6bf --- /dev/null +++ b/src/SharpMUTerm.Avalonia/ScrollbackView.cs @@ -0,0 +1,146 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Input; +using Avalonia.Interactivity; +using Avalonia.Layout; +using Avalonia.Media; +using Avalonia.Threading; +using SharpMUTerm.Client.Modals; + +namespace SharpMUTerm.Avalonia; + +/// +/// The window's read-only history view (⏎ on an older-history hit in ⌃F): the page of a session's scrollback the client +/// read, the found line on the selection plane, the query marked in every line. The page is the client's +/// , the record the cells draw; a key or the wheel asks the client for another page +/// (), so the two hosts always show the same lines. +/// +internal sealed class ScrollbackView : DockPanel, IModalView +{ + private readonly ScrollbackViewSession _session; + private readonly NativeTokens _colours; + private readonly Action _done; + private readonly TextBlock _title; + private readonly TextBlock _position; + private readonly StackPanel _list; + private ScrollbackViewModel _model; + + public ScrollbackView(ScrollbackViewSession session, NativeTokens colours, Action done) + { + _session = session; + _colours = colours; + _done = done; + _model = session.Model; + Focusable = true; + + var header = new DockPanel { Margin = new Thickness(20, 14, 20, 8) }; + _title = ModalParts.Heading(string.Empty, colours); + _position = new TextBlock + { + FontSize = NativeTokens.Body, + Foreground = colours.Brush(colours.Dim), + HorizontalAlignment = HorizontalAlignment.Right, + VerticalAlignment = VerticalAlignment.Center, + }; + SetDock(_title, Dock.Left); + header.Children.Add(_title); + header.Children.Add(_position); + SetDock(header, Dock.Top); + Children.Add(header); + + var footer = ModalParts.Footer(NativeKeys.Words(ScrollbackViewModel.Keys), colours); + SetDock(footer, Dock.Bottom); + Children.Add(footer); + + _list = new StackPanel { Margin = new Thickness(8, 4, 8, 4) }; + var frame = new Border + { + BorderBrush = colours.Brush(colours.Rule), + BorderThickness = new Thickness(0, 1, 0, 1), + Child = _list, + }; + Children.Add(frame); + + AddHandler(KeyDownEvent, OnKey, RoutingStrategies.Tunnel); + PointerWheelChanged += (_, e) => + { + e.Handled = true; + _session.Key(e.Delta.Y > 0 ? ConsoleKey.UpArrow : ConsoleKey.DownArrow); + }; + _session.Changed += OnChanged; + _model = session.Model; // a page published while the view was being built + Draw(); + } + + public string Title => "Older history"; + + public double PreferredWidth => 900; + + public bool Centred => false; + + /// The page drawn now, for a test. + public ScrollbackViewModel Model => _model; + + public void FocusFirst() => Focus(); + + public void Detach() => _session.Changed -= OnChanged; + + private void OnChanged(ScrollbackViewModel model) => Dispatcher.UIThread.Post(() => + { + _model = model; + Draw(); + }); + + private void Draw() + { + _title.Text = _model.Title; + _position.Text = _model.Position; + _list.Children.Clear(); + var mono = new FontFamily($"{CellFonts.BundledFamily}, DejaVu Sans Mono, Consolas, Menlo, monospace"); + foreach (var line in _model.Lines) + { + var marked = line.Index == _model.Marked; + var text = new TextBlock + { + FontFamily = mono, + FontSize = NativeTokens.Body, + Foreground = _colours.Brush(_colours.Text), + TextTrimming = TextTrimming.CharacterEllipsis, + }; + text.Inlines = ModalParts.Marked(line.Text, line.MatchStart, line.MatchLength, _colours); + _list.Children.Add(new Border + { + CornerRadius = new CornerRadius(NativeTokens.RadiusM), + Padding = new Thickness(12, 2), + Background = marked ? _colours.Brush(_colours.Selected) : Brushes.Transparent, + Child = text, + }); + } + + for (var i = _model.Lines.Count; i < ScrollbackViewModel.PageRows; i++) + { + _list.Children.Add(new TextBlock { Text = " ", FontFamily = mono, FontSize = NativeTokens.Body, Margin = new Thickness(12, 2) }); + } + } + + private void OnKey(object? sender, KeyEventArgs e) + { + if (ModalParts.Console(e) is not { } key) + { + return; + } + + if (key.Key == ConsoleKey.Escape) + { + e.Handled = true; + _session.Dismiss(); + _done(); + return; + } + + if (key.Modifiers == 0 && _session.Key(key.Key)) + { + e.Handled = true; + } + } +} diff --git a/src/SharpMUTerm.Avalonia/SearchView.cs b/src/SharpMUTerm.Avalonia/SearchView.cs index 8bf90e32..f70d393a 100644 --- a/src/SharpMUTerm.Avalonia/SearchView.cs +++ b/src/SharpMUTerm.Avalonia/SearchView.cs @@ -12,8 +12,8 @@ namespace SharpMUTerm.Avalonia; /// -/// The window's ⌃F: a search box, the two toggles as switches (⌥E regex, ⌥A every window), the count with its bound, -/// and the hits with the match marked. The client searches () and publishes the +/// The window's ⌃F: a search box, the three toggles as switches (⌥E regex, ⌥A every window, ⌥H older history), the +/// count with its bound and older history's progress, and the hits with the match marked (an older hit tagged so). The client searches () and publishes the /// hits; ⏎ on a row goes through the client's one path to a hit. The keys that are not typing mean what they mean in /// cells, because they are read by the same rules (). /// @@ -25,7 +25,9 @@ internal sealed class SearchView : DockPanel, IModalView private readonly TextBox _box; private readonly ToggleButton _regex; private readonly ToggleButton _all; + private readonly ToggleButton _older; private readonly TextBlock _state; + private readonly TextBlock _note; private readonly TextBlock _count; private readonly StackPanel _list; private readonly ScrollViewer _scroller; @@ -49,9 +51,11 @@ public SearchView(SearchSession session, NativeTokens colours, Action done) var toggles = new DockPanel { Margin = new Thickness(16, 0, 16, 6) }; _regex = Toggle("Regex", "Alt+E", _model.Regex); _all = Toggle("All windows", "Alt+A", _model.AllWindows); + _older = Toggle("Older history", "Alt+H", _model.Older); var switches = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 8 }; switches.Children.Add(_regex); switches.Children.Add(_all); + switches.Children.Add(_older); SetDock(switches, Dock.Left); toggles.Children.Add(switches); _count = new TextBlock @@ -69,7 +73,11 @@ public SearchView(SearchSession session, NativeTokens colours, Action done) SetDock(_state, Dock.Top); Children.Add(_state); - var footer = ModalParts.Footer("↑↓ pick · Enter go · Alt+E regex · Alt+A all windows · Esc cancel", colours); + _note = ModalParts.Dim(string.Empty, colours, new Thickness(20, 0, 20, 6)); + SetDock(_note, Dock.Top); + Children.Add(_note); + + var footer = ModalParts.Footer("↑↓ pick · Enter go · Alt+E regex · Alt+A all windows · Alt+H older history · Esc cancel", colours); SetDock(footer, Dock.Bottom); Children.Add(footer); @@ -89,11 +97,29 @@ public SearchView(SearchSession session, NativeTokens colours, Action done) }; _regex.IsCheckedChanged += (_, _) => Toggled(); _all.IsCheckedChanged += (_, _) => Toggled(); + _older.IsCheckedChanged += (_, _) => Toggled(); AddHandler(KeyDownEvent, OnKey, RoutingStrategies.Tunnel); _session.Changed += OnChanged; + + // A model published while this view was being built (an older-history search that finished first) is read again + // now that it listens, or the view would sit on the empty one it started from. + _model = session.Model; + SyncQuery(); Draw(); } + /// Puts the model's query in an empty box: the client's own search (a snapshot, a reopening) typed it. + private void SyncQuery() + { + if (string.IsNullOrEmpty(_box.Text) && _model.Query.Length > 0) + { + _syncing = true; + _box.Text = _model.Query; + _box.CaretIndex = _model.Query.Length; + _syncing = false; + } + } + public string Title => "Search the output"; public double PreferredWidth => 760; @@ -114,6 +140,12 @@ public SearchView(SearchSession session, NativeTokens colours, Action done) public ToggleButton AllWindowsToggle => _all; + /// The ⌥H switch, for a test. + public ToggleButton OlderToggle => _older; + + /// What older history says (its bound, or how far its search has got), for a test. + public string Note => _note.Text ?? string.Empty; + public void FocusFirst() { _box.Focus(); @@ -156,11 +188,13 @@ private void Toggled() } } - private void Search() => _session.Search(_box.Text ?? string.Empty, _regex.IsChecked == true, _all.IsChecked == true); + private void Search() => + _session.Search(_box.Text ?? string.Empty, _regex.IsChecked == true, _all.IsChecked == true, _older.IsChecked == true); private void OnChanged(SearchModel model) => Dispatcher.UIThread.Post(() => { _model = model; + SyncQuery(); Draw(); }); @@ -178,6 +212,11 @@ private void Draw() { _all.IsChecked = _model.AllWindows; } + + if (_older.IsChecked != _model.Older) + { + _older.IsChecked = _model.Older; + } } finally { @@ -186,6 +225,9 @@ private void Draw() _state.Text = NativeKeys.Words(_model.StateText); _count.Text = _model.CountText; + _note.Text = NativeKeys.Words(_model.HistoryNote ?? string.Empty); + _note.IsVisible = _model.HistoryNote is not null; + _note.Foreground = _colours.Brush(_model.HistoryRunning ? _colours.Accent : _colours.Dim); _list.Children.Clear(); _rows.Clear(); _selected = _model.Rows.Count == 0 ? 0 : Math.Clamp(_selected, 0, _model.Rows.Count - 1); @@ -201,16 +243,19 @@ private void Draw() return; } + var labelled = _model.AllWindows || _model.Rows.Any(r => r.IsOlder); for (var i = 0; i < _model.Rows.Count; i++) { var row = _model.Rows[i]; var index = i; var line = new DockPanel(); - if (_model.AllWindows) + if (labelled) { + // The cells' window column: the window in ⌥A scope, and "older" on a row ⏎ opens in the history view. + var label = row.IsOlder ? (_model.AllWindows ? $"{row.WindowLabel} · older" : "older") : _model.AllWindows ? row.WindowLabel : string.Empty; var window = new TextBlock { - Text = row.WindowLabel, + Text = label, Width = 130, TextTrimming = TextTrimming.CharacterEllipsis, Foreground = _colours.Brush(_colours.Header), @@ -277,7 +322,7 @@ private void OnKey(object? sender, KeyEventArgs e) } var decision = SearchPrompt.Interpret( - key, _box.Text ?? string.Empty, _selected, _model.Rows.Count, _regex.IsChecked == true, _all.IsChecked == true); + key, _box.Text ?? string.Empty, _selected, _model.Rows.Count, _regex.IsChecked == true, _all.IsChecked == true, _older.IsChecked == true); if (!bare && key.Modifiers.HasFlag(ConsoleModifiers.Control) && decision.Action == SearchAction.None) { // ⌃A, ⌃C, ⌃V and the rest stay the box's. @@ -294,10 +339,12 @@ private void OnKey(object? sender, KeyEventArgs e) _session.Dismiss(); _done(); break; - case SearchAction.Redraw when decision.Regex != (_regex.IsChecked == true) || decision.AllWindows != (_all.IsChecked == true): + case SearchAction.Redraw when decision.Regex != (_regex.IsChecked == true) || decision.AllWindows != (_all.IsChecked == true) + || decision.Older != (_older.IsChecked == true): _syncing = true; _regex.IsChecked = decision.Regex; _all.IsChecked = decision.AllWindows; + _older.IsChecked = decision.Older; _syncing = false; _selected = 0; Search(); diff --git a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs index d4f560c3..b4e67bdf 100644 --- a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs +++ b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs @@ -29,6 +29,21 @@ public static class BuiltInCommands /// ⌃P ▸ Script console. public const string ScriptConsoleCommand = "world:script-console"; + /// ⌃P ▸ Edit script…: opens the palette on the character's script files. + public const string ScriptEditCommand = "world:script-edit"; + + /// ⌃P ▸ New script…: puts /script new on the command line for the name. + public const string ScriptNewCommand = "world:script-new"; + + /// The prefix of the Edit script … entries: script:open:<name>, one per script file. + public const string ScriptOpenPrefix = "script:open:"; + + /// What the palette opens with typed in for Edit script…, so it lists the script files and New script…. + public const string ScriptEditQuery = "script "; + + /// The ⌃P id that opens script in the editor. + public static string ScriptOpen(string name) => ScriptOpenPrefix + name; + /// ⌃P ▸ Start scene log. public const string SceneStartCommand = "term:scene-on"; @@ -135,6 +150,14 @@ void Family(string id, string prefix, Func c.State.ScriptsOn); + Add(ScriptNewCommand, CommandGroup.World, "New script…", + detail: "/script new · starts from a template", when: c => c.State.ScriptsOn); + Family("world:script-open", ScriptOpenPrefix, ScriptFileEntries); + // Only where the host has a screen reader to tell: the window's live region, or --plain. Add("a11y:toggle-window", CommandGroup.Terminal, "Read this window aloud", when: c => c.State.Announced is not null, @@ -461,6 +484,16 @@ private static IEnumerable JoinWrapsEntries(ICommandContext context Detail = $"it wraps at {r.Column}, the pane is {r.PaneWidth} wide · F5 ▸ join wraps", }); + private static IEnumerable ScriptFileEntries(ICommandContext context) => + (context.State.ScriptFiles ?? []).Select(f => new CommandItem( + CommandGroup.World, + f.ReadOnly ? $"Script {f.Name} (read only)" : $"Script {f.Name}", + ScriptOpen(f.Name), + f.Detail) + { + Detail = f.Detail, + }); + private static IEnumerable MapFoundEntries(ICommandContext context) => (context.State.MapFound ?? []).Select(r => { diff --git a/src/SharpMUTerm.Client/Composer/ComposerModel.cs b/src/SharpMUTerm.Client/Composer/ComposerModel.cs index ed55800e..6f413b22 100644 --- a/src/SharpMUTerm.Client/Composer/ComposerModel.cs +++ b/src/SharpMUTerm.Client/Composer/ComposerModel.cs @@ -27,8 +27,17 @@ public enum ComposerPlace /// A shorter label for a narrow pane; null when is already short. public sealed record ComposerKey(string Key, string Label, string? Short = null); -/// A MOO buffer being edited (MCP simpleedit): what it is called and its type. -public sealed record ComposerEdit(string Name, string Type); +/// +/// A buffer being edited rather than a post: a MOO's (MCP simpleedit) or a script file's. Saved as its lines — no +/// %r join, no escaping, no spelling. +/// +/// What it is called: the MOO's name for it, or the script's name under the scripts folder. +/// The MOO's type (moo-code), or lua for a script. +/// Whether this is a script file (⌃S saves it to disk and reloads the character's scripts). +/// Whether it can only be read: a package's script. +/// What the last save said (saved · 2 files loaded, or the first load error), or null. +/// The line the caret opens on, from 1; 0 for the end. +public sealed record ComposerEdit(string Name, string Type, bool Script = false, bool ReadOnly = false, string? Status = null, int Line = 0); /// /// A composer, as both hosts draw it. The terminal draws F1 and the docked panel in cells; the window draws them @@ -135,7 +144,7 @@ public static ComposerModel Create( armed, revision, ComposerMarks.For(body, checker), - KeysFor(place, edit is not null, checker is not null, canSend, armed, preview)) + KeysFor(place, edit is not null, checker is not null, canSend, armed, preview, edit)) { Preview = preview && place == ComposerPlace.FullScreen && edit is null, }; @@ -151,12 +160,16 @@ public static ComposerModel Create( /// The docked key row's keyless hint while the editor does not hold the keyboard. public const string ClickHint = "click here to write"; + /// The key row's keyless hint over a package's script, which can be read and never saved. + public const string ReadOnlyHint = "read only — a package's script"; + /// What F1's key row calls ⌥W while no dictionary marks the post. public const string GetDictionary = "get a dictionary"; /// The key row for a composer in this state. /// Whether F1's as-sent preview is showing, which names what ⌥P does next. - public static IReadOnlyList KeysFor(ComposerPlace place, bool edit, bool dictionary, bool canSend, bool armed, bool preview = false) + /// The edit it is, when : a script saves to disk, a package's script only reads. + public static IReadOnlyList KeysFor(ComposerPlace place, bool edit, bool dictionary, bool canSend, bool armed, bool preview = false, ComposerEdit? editing = null) { if (place == ComposerPlace.Docked) { @@ -176,6 +189,16 @@ public static IReadOnlyList KeysFor(ComposerPlace place, bool edit, return docked; } + if (editing is { Script: true, ReadOnly: true }) + { + return [new(string.Empty, ReadOnlyHint, "read only"), new("Esc", "close")]; + } + + if (editing is { Script: true }) + { + return [new("⌃S", "save and reload", "save"), new("Esc", "close (keeps unsaved text)", "close")]; + } + if (edit) { return diff --git a/src/SharpMUTerm.Client/Help/SlashCommands.cs b/src/SharpMUTerm.Client/Help/SlashCommands.cs index 4b291561..1dafb0d1 100644 --- a/src/SharpMUTerm.Client/Help/SlashCommands.cs +++ b/src/SharpMUTerm.Client/Help/SlashCommands.cs @@ -31,6 +31,8 @@ public static class SlashCommands new("/map", "/map rename|area|note|symbol|weight …", "Change a room on the map, by its number", "/map rename "), new("/map", "/map exit · unexit ", "Add or remove an exit by hand", "/map exit "), new("/map", "/map move [dz] · delete · undo", "Move or delete a room, or undo the last edit", "/map undo"), + new("/script", "/script edit [name]", "Open a script from the scripts folder in the editor; ⌃S saves and reloads (no name lists them)", "/script edit "), + new("/script", "/script new ", "Start a new script in the scripts folder from a template", "/script new "), new("/web", "/web ", "Open a page in the built-in web view", "/web "), new("/graphics", "/graphics", "Say how pictures are drawn in this terminal, and why", "/graphics"), new("/triggers", "/triggers", "Say which trigger rules this window's character runs, and why a window did not open", "/triggers"), diff --git a/src/SharpMUTerm.Client/Modals/ScriptConsoleModel.cs b/src/SharpMUTerm.Client/Modals/ScriptConsoleModel.cs index e8e436be..2d4fceb1 100644 --- a/src/SharpMUTerm.Client/Modals/ScriptConsoleModel.cs +++ b/src/SharpMUTerm.Client/Modals/ScriptConsoleModel.cs @@ -67,7 +67,7 @@ public sealed record ScriptConsoleModel( public const int MaxInput = 500; /// The keys, in glyphs, as the cells' footer says them (a native view spells them in words). - public const string Keys = "⏎ runs · ↑↓ history · ⇥ store keys · Del deletes a key · ⌃L reloads scripts · Esc closes"; + public const string Keys = "⏎ runs · ↑↓ history · ⇥ store keys · Del deletes a key · ⌃E edits a script · ⌃L reloads scripts · Esc closes"; /// What the console says when its scripts printed nothing yet. public const string Empty = "nothing printed yet — try 1 + 1 or print(world.name)"; @@ -165,6 +165,18 @@ public void Remember(string input) } } + /// How many lines are held now. + public int Count + { + get + { + lock (_gate) + { + return _lines.Count; + } + } + } + /// The lines, oldest first. public IReadOnlyList Lines { @@ -199,6 +211,7 @@ public sealed class ScriptConsoleSession : ModalSession private readonly Action _run; private readonly Action _delete; private readonly Action _reload; + private readonly Action? _edit; /// What the console shows. /// Whether the client's theme is a dark one. @@ -206,13 +219,15 @@ public sealed class ScriptConsoleSession : ModalSession /// Deletes a store key (DeleteStoreKey). /// Reloads the character's scripts (ReloadConsoleScripts). /// Told the console closed. + /// Opens the list of the character's script files to edit (EditScriptFromConsole); null for none. public ScriptConsoleSession( ScriptConsoleModel model, bool isDark, Action run, Action delete, Action reload, - Action closed) + Action closed, + Action? edit = null) : base(model, isDark, closed) { ArgumentNullException.ThrowIfNull(run); @@ -221,8 +236,15 @@ public ScriptConsoleSession( _run = run; _delete = delete; _reload = reload; + _edit = edit; } + /// Whether the console can open a script to edit. + public bool CanEdit => _edit is not null && Model.CanRun; + + /// The host's: Edit a script (⌃E). Closes the console first; the client lists the files. + public bool EditScript() => CanEdit && !IsEnded && CloseThen(_edit!); + public override string Surface => "script-console"; /// The host's: ⏎ on a line. Nothing when the console cannot run one, or the line is blank. diff --git a/src/SharpMUTerm.Client/Modals/ScrollbackViewModel.cs b/src/SharpMUTerm.Client/Modals/ScrollbackViewModel.cs new file mode 100644 index 00000000..2abbcf96 --- /dev/null +++ b/src/SharpMUTerm.Client/Modals/ScrollbackViewModel.cs @@ -0,0 +1,126 @@ +using System.Globalization; + +namespace SharpMUTerm.Client.Modals; + +/// One line of the history view: its absolute index in the session's scrollback, its text, and where the query matched. +public readonly record struct ScrollbackViewLine(long Index, string Text, int MatchStart, int MatchLength); + +/// +/// The read-only history view (⏎ on an older-history hit in ⌃F): lines of a session's scrollback +/// — the ring or the file-backed spill — around the line the search found, the found line marked and the query's run in +/// each line marked. Drawn by the cell surface (ScrollbackViewSurface.Render) and the window's native modal from +/// the same record; every move is a ranged read the client makes (ScrollHistoryView), so the two show the same page. +/// +/// A view, not a pane. It never puts old lines back into a pane buffer: a pane holds the newest +/// PaneLines and its indices are what every bar and boundary counts by, so a page of the past inserted there would +/// move all of them. It is a modal over the workspace, and Esc puts the reader back where they were. +/// +/// +/// What the window is called (the session's own window). +/// The search it came from, marked in each line. +/// The absolute index of the first line shown. +/// The oldest line the scrollback still holds. +/// One past the newest line. +/// The line the search found. +/// The page, oldest first, at most . +public sealed record ScrollbackViewModel( + string Window, + string Query, + long Top, + long Oldest, + long End, + long Marked, + IReadOnlyList Lines) +{ + /// The lines a page holds, the same in both hosts. + public const int PageRows = 20; + + /// The keys, in glyphs (a native view spells them in words). + public const string Keys = "↑↓ a line · PgUp PgDn a page · Home End the ends · Esc closes"; + + /// Where the page sits: lines 12,301–12,320 of 40,000 · 27,680 lines before the newest. + public string Position + { + get + { + if (Lines.Count == 0) + { + return "nothing held here any more"; + } + + var first = Lines[0].Index - Oldest + 1; + var last = Lines[^1].Index - Oldest + 1; + var held = End - Oldest; + var back = End - 1 - Lines[^1].Index; + return $"lines {N(first)}–{N(last)} of {N(held)}" + (back > 0 ? $" · {N(back)} line{(back == 1 ? string.Empty : "s")} before the newest" : " · the newest"); + } + } + + /// The title row: whose history, and that it is only read. + public string Title => $"OLDER HISTORY · {Window} · read only"; + + /// The top that shows a third of the way down a page, clamped to what is held. + public static long TopFor(long marked, long oldest, long end) => Clamp(marked - PageRows / 3, oldest, end); + + /// kept to a page that starts at or after the oldest line and ends at or before the newest. + public static long Clamp(long top, long oldest, long end) => Math.Max(oldest, Math.Min(top, Math.Max(oldest, end - PageRows))); + + /// The top a key moves to: ↑↓ a line, PgUp PgDn a page, Home End the ends; null for a key that does not move. + public long? Move(ConsoleKey key) => key switch + { + ConsoleKey.UpArrow => Clamp(Top - 1, Oldest, End), + ConsoleKey.DownArrow => Clamp(Top + 1, Oldest, End), + ConsoleKey.PageUp => Clamp(Top - (PageRows - 1), Oldest, End), + ConsoleKey.PageDown => Clamp(Top + (PageRows - 1), Oldest, End), + ConsoleKey.Home => Oldest, + ConsoleKey.End => Clamp(End, Oldest, End), + _ => null, + }; + + private static string N(long value) => value.ToString("N0", CultureInfo.InvariantCulture); + + public bool Equals(ScrollbackViewModel? other) => + other is not null + && Window == other.Window && Query == other.Query && Top == other.Top && Oldest == other.Oldest + && End == other.End && Marked == other.Marked && ModelLists.Same(Lines, other.Lines); + + public override int GetHashCode() => HashCode.Combine(Window, Query, Top, Oldest, End, Marked, ModelLists.Hash(Lines)); +} + +/// +/// One opening of the history view in a host's own controls. A move goes back to the client, which reads the page and +/// republishes; Esc closes. +/// +public sealed class ScrollbackViewSession : ModalSession +{ + private readonly Action _scroll; + + /// The page it opens on. + /// Whether the client's theme is a dark one. + /// Reads the page starting at a line (ScrollHistoryView); called from any thread. + /// Told the view closed. + public ScrollbackViewSession(ScrollbackViewModel model, bool isDark, Action scroll, Action closed) + : base(model, isDark, closed) + { + ArgumentNullException.ThrowIfNull(scroll); + _scroll = scroll; + } + + public override string Surface => "history-view"; + + /// The host's: a key that moves the page. False for a key that does not. + public bool Key(ConsoleKey key) + { + if (IsEnded || Model.Move(key) is not { } top) + { + return false; + } + + if (top != Model.Top) + { + _scroll(top); + } + + return true; + } +} diff --git a/src/SharpMUTerm.Client/Modals/SearchModel.cs b/src/SharpMUTerm.Client/Modals/SearchModel.cs index 0f9bb28c..3c96c168 100644 --- a/src/SharpMUTerm.Client/Modals/SearchModel.cs +++ b/src/SharpMUTerm.Client/Modals/SearchModel.cs @@ -4,8 +4,17 @@ namespace SharpMUTerm.Client.Modals; /// One row of ⌃F's results: which window the line is in, where it sits in that window's buffer, and where the query /// landed inside it. /// +/// +/// A row from older history (⌥H) has at the line's absolute index in its session's scrollback and +/// −1: it is not in the pane buffer, so ⏎ opens it in the read-only history view (or scrolls the +/// pane to it when the pane still holds it). +/// public readonly record struct SearchRow( - string WindowId, string WindowLabel, int LineIndex, string Text, int MatchStart, int MatchLength); + string WindowId, string WindowLabel, int LineIndex, string Text, int MatchStart, int MatchLength, long History = -1, string? SessionKey = null) +{ + /// Whether this row came from older history rather than the pane buffer. + public bool IsOlder => History >= 0; +} /// /// ⌃F's results for one query — the search surface's model, drawn by the cell surface (SearchPrompt.Render) @@ -18,7 +27,13 @@ public readonly record struct SearchRow( /// What the focused window is called, for the one-window case. /// How many lines were searched: the bound, stated rather than implied. /// Why the query could not be used (an unparseable pattern), or null. -/// The matches, in buffer order. +/// The matches, in buffer order; then, with , older history's, newest first. +/// Whether older history is searched too (⌥H): the session's scrollback and its spill. +/// +/// What older history holds or how far its search has got (⌥H searches older history · 38,000 lines in Corvid, +/// older history · 7 found in 38,000 lines), or why there is none (a capture window has no spill); null for nothing to say. +/// +/// Whether the older-history search is still reading. public sealed record SearchModel( string Query, bool Regex, @@ -26,10 +41,16 @@ public sealed record SearchModel( string Scope, int Held, string? Error, - IReadOnlyList Rows) + IReadOnlyList Rows, + bool Older = false, + string? HistoryNote = null, + bool HistoryRunning = false) { - /// The two toggles and what they mean now, in words: text · Corvid, regex · every window. - public string StateText => $"{(Regex ? "regex" : "text")} · {(AllWindows ? "every window" : Scope)}"; + /// The toggles and what they mean now, in words: text · Corvid, regex · every window · older history. + public string StateText => $"{(Regex ? "regex" : "text")} · {(AllWindows ? "every window" : Scope)}{(Older ? " · older history" : string.Empty)}"; + + /// How many rows are the pane buffer's (the rest are older history's, listed after them). + public int HeldRows => Rows.Count(r => !r.IsOlder); /// /// How many lines matched out of how many were looked at — 12 found · 4,812 lines held — so a reader who @@ -40,7 +61,7 @@ public string CountText get { var searched = $"{Held:n0} line{(Held == 1 ? string.Empty : "s")} held"; - return Error is not null ? searched : $"{Rows.Count} found · {searched}"; + return Error is not null ? searched : $"{HeldRows} found · {searched}"; } } @@ -48,13 +69,15 @@ public string CountText public string? EmptyText => Error is not null ? Error : Query.Length == 0 ? $"type to search {(AllWindows ? "every window" : Scope)}" - : Rows.Count == 0 ? "no matches — ⌫ widens the query" + : Rows.Count == 0 && HistoryRunning ? "nothing in the lines held — searching older history…" + : Rows.Count == 0 ? (Older ? "no matches here or in older history — ⌫ widens the query" : "no matches — ⌫ widens the query") : null; public bool Equals(SearchModel? other) => other is not null && Query == other.Query && Regex == other.Regex && AllWindows == other.AllWindows && Scope == other.Scope && Held == other.Held && Error == other.Error + && Older == other.Older && HistoryNote == other.HistoryNote && HistoryRunning == other.HistoryRunning && ModelLists.Same(Rows, other.Rows); public override int GetHashCode() => HashCode.Combine(Query, Regex, AllWindows, Scope, Held, Error, ModelLists.Hash(Rows)); @@ -67,15 +90,15 @@ other is not null /// public sealed class SearchSession : ModalSession { - private readonly Action _search; + private readonly Action _search; private readonly Action _go; /// The empty search it opens on. /// Whether the client's theme is a dark one. - /// Re-runs the search for a query and the two toggles; called from any thread. + /// Re-runs the search for a query and the three toggles (regex, every window, older history); called from any thread. /// Goes to row N of the model handed with it, after the surface has closed. /// Told the surface closed. - public SearchSession(SearchModel model, bool isDark, Action search, Action go, Action closed) + public SearchSession(SearchModel model, bool isDark, Action search, Action go, Action closed) : base(model, isDark, closed) { ArgumentNullException.ThrowIfNull(search); @@ -86,12 +109,15 @@ public SearchSession(SearchModel model, bool isDark, Action public override string Surface => "search"; - /// The host's: the query or a toggle changed. - public void Search(string query, bool regex, bool allWindows) + /// The host's: the query or a toggle changed. Older history stays as the model has it. + public void Search(string query, bool regex, bool allWindows) => Search(query, regex, allWindows, Model.Older); + + /// The host's: the query or a toggle changed, older history (⌥H) included. + public void Search(string query, bool regex, bool allWindows, bool older) { if (!IsEnded) { - _search(query ?? string.Empty, regex, allWindows); + _search(query ?? string.Empty, regex, allWindows, older); } } diff --git a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs index 0629ac20..e176ea8d 100644 --- a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs +++ b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs @@ -195,6 +195,12 @@ public static class SurfaceCatalog /// A character's script console: its scripts' output and errors, a Lua prompt, and its store.*. public const string ScriptConsole = "script-console"; + /// + /// The read-only history view: a page of a session's scrollback (its ring or its spill) around a line ⌃F's older-history + /// search found, opened by ⏎ on that hit. + /// + public const string HistoryView = "history-view"; + /// /// The +3 ▾ chip a tab strip carries when its tabs do not fit even at their floors, and the list of the tabs /// past its edges it opens: a cell list in a terminal, a native menu in the window (the chip itself is cells in both). @@ -218,7 +224,7 @@ public static class SurfaceCatalog private static string[] PanelViews(string view) => ["SharpMUTerm.Avalonia." + view, "SharpMUTerm.Avalonia.PopOutButton"]; /// The modals the window draws with its own controls in place of the cell modal (ClientHost.NativeModals). - public static IReadOnlyList Modals { get; } = [Quit, Search, History, Layouts, Welcome, Help, Dictionary, Import, ScriptConsole]; + public static IReadOnlyList Modals { get; } = [Quit, Search, History, Layouts, Welcome, Help, Dictionary, Import, ScriptConsole, HistoryView]; /// A cell modal in a terminal; the window's own modal in its place. private static readonly IReadOnlyDictionary NativeModal = new Dictionary @@ -442,7 +448,8 @@ [.. PanelViews("MapCanvas"), "SharpMUTerm.Avalonia.MapInspector"]), Search, typeof(SearchModel), [ - // Typing, ⌥E and ⌥A re-run the search over the pane buffers; ⏎ goes to the row through the one path to a hit. + // Typing, ⌥E, ⌥A and ⌥H re-run the search over the pane buffers (and, with ⌥H, the sessions' scrollback off + // the UI thread); ⏎ goes to the row through the one path to a hit, or opens an older one in the history view. new(SurfaceActionKind.Modal, "query", "SearchModelFor"), new(SurfaceActionKind.Modal, "go", "GoToSearchHit"), ], @@ -523,10 +530,23 @@ [.. PanelViews("MapCanvas"), "SharpMUTerm.Avalonia.MapInspector"]), new(SurfaceActionKind.Modal, "run", "RunConsoleLine"), new(SurfaceActionKind.Modal, "delete key", "DeleteStoreKey"), new(SurfaceActionKind.Modal, "reload", "ReloadConsoleScripts"), + + // ⌃E (the window's Edit a script… button): the console closes and the palette lists the script files. + new(SurfaceActionKind.Modal, "edit a script", "EditScriptFromConsole"), ], NativeModal, "SharpMUTerm.Tui.ScriptConsoleSurface.Render", ModalViews("ScriptConsoleView")), + new( + HistoryView, + typeof(ScrollbackViewModel), + [ + // ↑↓ PgUp PgDn Home End read another page of the scrollback, through the client's one ranged read. + new(SurfaceActionKind.Modal, "scroll", "ScrollHistoryView"), + ], + NativeModal, + "SharpMUTerm.Tui.ScrollbackViewSurface.Render", + ModalViews("ScrollbackView")), new( TabOverflow, typeof(MenuModel), diff --git a/src/SharpMUTerm.Core/Commands/CommandCatalog.cs b/src/SharpMUTerm.Core/Commands/CommandCatalog.cs index f5657ed6..f7682da9 100644 --- a/src/SharpMUTerm.Core/Commands/CommandCatalog.cs +++ b/src/SharpMUTerm.Core/Commands/CommandCatalog.cs @@ -70,6 +70,7 @@ public sealed record CharacterRef( /// Whether the configuration is new — no world yet, or the key tour still owed — so Help, Welcome and Import are suggested. /// /// The rooms the last /map find listed, newest search only, so ⌃P offers to walk to each. +/// The focused character's script files, so ⌃P offers to open each in the editor. public sealed record CommandContext( bool LoggingOn = false, bool Zoomed = false, @@ -94,7 +95,14 @@ public sealed record CommandContext( int MapAreas = 0, bool MapViewing = false, bool NewConfiguration = false, - IReadOnlyList? MapFound = null); + IReadOnlyList? MapFound = null, + IReadOnlyList? ScriptFiles = null); + +/// A script file ⌃P offers to open in the editor. +/// Its name under the scripts folder (combat.lua), or package:<id>/<file>. +/// What the entry says about it: where it is, whether it loaded, its last error's line. +/// Whether it can only be read (a package's script). +public sealed record ScriptFileRef(string Name, string Detail, bool ReadOnly); /// A room the last /map find listed, for the command surface's Walk to … entries. /// The room's id on the map. diff --git a/src/SharpMUTerm.Core/Text/ScrollbackSearch.cs b/src/SharpMUTerm.Core/Text/ScrollbackSearch.cs new file mode 100644 index 00000000..2c599bac --- /dev/null +++ b/src/SharpMUTerm.Core/Text/ScrollbackSearch.cs @@ -0,0 +1,137 @@ +namespace SharpMUTerm.Core.Text; + +/// One line of a session's scrollback the deep search found: its absolute index, the line, and where it matched. +/// The line's absolute index in the (stable while it is held). +/// The line itself — the ring's own instance while it is in memory, a decoded copy from the spill. +/// Where the query matched in . +/// How long the matched run is. +public readonly record struct ScrollbackMatch(long Index, StyledLine Line, int MatchStart, int MatchLength); + +/// Where a deep search has got to: what it found so far, how far it has read, and whether it has finished. +/// Every match so far, newest first. +/// How many lines have been read. +/// How many lines there were to read when it started. +/// Whether the walk has ended (finished, capped, failed — not cancelled). +/// Whether it stopped at . +/// Why the query could not be used, or null. +public sealed record ScrollbackSearchProgress( + IReadOnlyList Found, long Searched, long Total, bool Done, bool Capped, string? Error); + +/// +/// ⌃F's "search older history" step (⌥H): the session's whole — the in-memory ring and +/// the file-backed spill behind it — walked from the newest line back to the oldest in ranged reads of at most +/// , each matched by (so case, regex mode, +/// the query bound and the per-line match timeout are ⌃F's exactly). +/// +/// It runs off the UI thread: a spill read is disk I/O, and tens of thousands of lines are more than one keystroke +/// can afford. The caller hands a token and gets after every chunk, so results stream into the +/// surface as they are found; a cancelled walk reports nothing further. +/// +/// +/// Lines the pane still holds are skipped (): the ordinary ⌃F rows already list them, and a +/// session window's pane shares the ring's instances, so the caller can say which by reference. +/// +/// +public static class ScrollbackSearch +{ + /// The most hits one deep search keeps; past it the walk stops and says so. + public const int MaxHits = 500; + + /// + /// Walks from its newest line back to its oldest for . + /// + /// The session's scrollback. + /// What to look for; empty finds nothing. + /// Whether it is a pattern. + /// Lines not to list (the pane still holds them); null skips none. + /// Told after every chunk, on the walking thread. + /// Ends the walk between chunks. + /// Lines per ranged read; at most . + /// The last progress reported, or null when cancelled. + public static ScrollbackSearchProgress? Run( + ScrollbackBuffer buffer, + string query, + bool regex, + Func? skip, + Action? progress, + CancellationToken cancel, + int chunk = ScrollbackBuffer.MaxRangeLines) + { + ArgumentNullException.ThrowIfNull(buffer); + ArgumentNullException.ThrowIfNull(query); + chunk = Math.Clamp(chunk, 1, ScrollbackBuffer.MaxRangeLines); + + var end = buffer.TotalLines; + var oldest = buffer.OldestIndex; + var total = Math.Max(0, end - oldest); + var found = new List(); + long searched = 0; + + if (query.Length == 0) + { + return Report(new ScrollbackSearchProgress([], 0, total, true, false, null)); + } + + var cursor = end; + while (cursor > oldest) + { + if (cancel.IsCancellationRequested) + { + return null; + } + + // The oldest line may move up while this walks (the spill trims its front); a range that starts below it + // comes back short from the front, so each line's index is counted back from the end of the range. + var start = Math.Max(oldest, cursor - chunk); + var count = (int)(cursor - start); + var lines = buffer.GetRange(start, count); + var first = cursor - lines.Count; + var texts = new string[lines.Count]; + for (var i = 0; i < lines.Count; i++) + { + texts[i] = skip?.Invoke(lines[i]) == true ? string.Empty : lines[i].Text; + } + + var result = OutputSearch.Match(texts, query, regex); + if (result.Error is { } error) + { + return Report(new ScrollbackSearchProgress([], searched, total, true, false, error)); + } + + var capped = false; + for (var m = result.Matches.Count - 1; m >= 0; m--) + { + var match = result.Matches[m]; + found.Add(new ScrollbackMatch(first + match.LineIndex, lines[match.LineIndex], match.MatchStart, match.MatchLength)); + if (found.Count >= MaxHits) + { + capped = true; + break; + } + } + + searched += count; + cursor = start; + if (capped) + { + return Report(new ScrollbackSearchProgress(found.ToArray(), searched, total, true, true, null)); + } + + if (cancel.IsCancellationRequested) + { + return null; + } + + progress?.Invoke(new ScrollbackSearchProgress(found.ToArray(), searched, total, cursor <= oldest, false, null)); + } + + var last = new ScrollbackSearchProgress(found.ToArray(), searched, total, true, false, null); + return searched == 0 ? Report(last) : last; + + ScrollbackSearchProgress Report(ScrollbackSearchProgress done) + { + progress?.Invoke(done); + return done; + } + } +} diff --git a/src/SharpMUTerm.Scripting/ScriptFiles.cs b/src/SharpMUTerm.Scripting/ScriptFiles.cs new file mode 100644 index 00000000..20a542e4 --- /dev/null +++ b/src/SharpMUTerm.Scripting/ScriptFiles.cs @@ -0,0 +1,264 @@ +using System.Text; + +namespace SharpMUTerm.Scripting; + +/// +/// The script files a player can open, create and save from inside the client (⌃P ▸ Edit script…, the script +/// console's ⌃E, /script new|edit). Every path goes through , the rule the +/// loader already applies, so the editor can reach exactly the files the loader can read and nothing else. +/// +/// +/// +/// A name, never a path. What a player types is a relative name with / between folders. It is refused +/// when it is absolute, holds .. or a backslash, is not .lua, or resolves outside the root. Where an +/// existing file or folder on the way is a link, the save is refused too: a link inside the root that points out of it +/// would otherwise turn a save into a write anywhere. +/// +/// +/// A save is atomic: the text is written to a temporary file beside the target and renamed over it, so a crash +/// or a full disk leaves the old file whole rather than half a script the next reload would run. +/// +/// +public static class ScriptFiles +{ + /// The extension every script has. + public const string Extension = ".lua"; + + /// The most files listed. + public const int MaxListed = 200; + + /// The longest name accepted. + public const int MaxNameLength = 120; + + /// The largest file the editor opens or saves. + public const int MaxBytes = 512 * 1024; + + /// The prefix a package's script carries in a trigger set. + public const string PackagePrefix = "package:"; + + /// What a new script starts as. + public const string Template = + "-- A script for this character. Saved under the scripts folder; ⌃S saves and reloads.\n" + + "-- Name it in a trigger set's scripts (F5) to load it, and call its functions from a rule's script field.\n" + + "\n" + + "function greet(line)\n" + + " print('saw: ' .. line)\n" + + "end\n"; + + /// + /// The .lua files under , as names relative to it with / between folders, sorted, + /// at most . A missing or unreadable root lists nothing. + /// + public static IReadOnlyList List(string root) + { + ArgumentException.ThrowIfNullOrWhiteSpace(root); + var full = Path.TrimEndingDirectorySeparator(Path.GetFullPath(root)); + if (!Directory.Exists(full)) + { + return []; + } + + try + { + var options = new EnumerationOptions { RecurseSubdirectories = true, IgnoreInaccessible = true, AttributesToSkip = FileAttributes.ReparsePoint, MaxRecursionDepth = 6 }; + return Directory.EnumerateFiles(full, "*" + Extension, options) + .Select(path => Path.GetRelativePath(full, path).Replace(Path.DirectorySeparatorChar, '/')) + .Where(name => Check(name) is null) + .OrderBy(name => name, StringComparer.Ordinal) + .Take(MaxListed) + .ToArray(); + } + catch (Exception ex) when (ex is IOException or UnauthorizedAccessException) + { + return []; + } + } + + /// + /// What is wrong with as a script's name, or null when it is one: relative, / + /// between folders, no .., no backslash or control character, ending in .lua. + /// + public static string? Check(string? name) + { + if (string.IsNullOrWhiteSpace(name)) + { + return "give the script a name, such as combat.lua"; + } + + if (name.Length > MaxNameLength) + { + return $"a script's name is at most {MaxNameLength} characters"; + } + + if (name.Any(char.IsControl) || name.Contains('\\', StringComparison.Ordinal) || name.Contains(':', StringComparison.Ordinal)) + { + return "a script's name has no backslash, colon or control character — use / between folders"; + } + + if (name.StartsWith('/') || Path.IsPathRooted(name)) + { + return "a script's name is relative to the scripts folder, not a path from the root of the disk"; + } + + var parts = name.Split('/'); + if (parts.Any(p => p.Length == 0 || p == "." || p == "..")) + { + return "a script's name cannot leave the scripts folder (no .. and no empty folder names)"; + } + + if (!name.EndsWith(Extension, StringComparison.Ordinal) || name.Length == Extension.Length) + { + return "a script's name ends in .lua"; + } + + return null; + } + + /// + /// A typed name made into a script's: .lua added when it has no extension, surrounding space trimmed. Still + /// to be ed. + /// + public static string Normalise(string? typed) + { + var name = (typed ?? string.Empty).Trim(); + return name.Length > 0 && !Path.HasExtension(name) ? name + Extension : name; + } + + /// + /// The full path of script under , or why it has none: a name that + /// fails , or one that resolves outside the root. + /// + public static (string? Path, string? Error) PathOf(string root, string name) + { + ArgumentException.ThrowIfNullOrWhiteSpace(root); + if (Check(name) is { } why) + { + return (null, why); + } + + return SessionScripts.Resolve(root, name) is { } path + ? (path, null) + : (null, "that name is outside the scripts folder"); + } + + /// The text of script , or why it cannot be read. + public static (string? Text, string? Error) Read(string root, string name) + { + var (path, error) = PathOf(root, name); + if (path is null) + { + return (null, error); + } + + try + { + var info = new FileInfo(path); + if (!info.Exists) + { + return (null, $"{name} does not exist yet"); + } + + if (info.Length > MaxBytes) + { + return (null, $"{name} is larger than {MaxBytes / 1024} KB — edit it outside the client"); + } + + return (File.ReadAllText(path, Encoding.UTF8).Replace("\r\n", "\n", StringComparison.Ordinal), null); + } + catch (Exception ex) when (ex is IOException or UnauthorizedAccessException) + { + return (null, $"{name} could not be read: {ex.Message}"); + } + } + + /// + /// Writes to script under , line for line as + /// typed (line breaks as \n, one at the end): to a temporary file beside it, then renamed over it. Creates the + /// script's folders inside the root. Returns null when it was written, otherwise why not; nothing is changed on a + /// refusal. + /// + /// True for a new script: refused when the file already exists. + public static string? Save(string root, string name, string text, bool mustBeNew = false) + { + ArgumentNullException.ThrowIfNull(text); + var (path, error) = PathOf(root, name); + if (path is null) + { + return error; + } + + var body = text.Replace("\r\n", "\n", StringComparison.Ordinal).Replace('\r', '\n'); + if (body.Length > 0 && !body.EndsWith('\n')) + { + body += "\n"; + } + + var bytes = new UTF8Encoding(encoderShouldEmitUTF8Identifier: false).GetBytes(body); + if (bytes.Length > MaxBytes) + { + return $"a script is at most {MaxBytes / 1024} KB"; + } + + var fullRoot = Path.TrimEndingDirectorySeparator(Path.GetFullPath(root)); + if (!Directory.Exists(fullRoot)) + { + return $"there is no scripts folder — create {fullRoot} first"; + } + + if (LinkOnTheWay(fullRoot, path) is { } link) + { + return $"{link} is a link, and a save never follows one out of the scripts folder"; + } + + if (mustBeNew && File.Exists(path)) + { + return $"{name} already exists — open it with Edit script"; + } + + var folder = Path.GetDirectoryName(path)!; + var temp = Path.Combine(folder, $".{Path.GetFileName(path)}.{Guid.NewGuid():N}.tmp"); + try + { + Directory.CreateDirectory(folder); + if (LinkOnTheWay(fullRoot, path) is { } created) + { + return $"{created} is a link, and a save never follows one out of the scripts folder"; + } + + File.WriteAllBytes(temp, bytes); + File.Move(temp, path, overwrite: true); + return null; + } + catch (Exception ex) when (ex is IOException or UnauthorizedAccessException) + { + try + { + File.Delete(temp); + } + catch (Exception cleanup) when (cleanup is IOException or UnauthorizedAccessException) + { + // Nothing more to do: the target was never touched. + } + + return $"{name} was not saved: {ex.Message}"; + } + } + + /// The first file or folder from the root down to that exists and is a link, by its name relative to the root. + private static string? LinkOnTheWay(string fullRoot, string path) + { + var relative = Path.GetRelativePath(fullRoot, path); + var current = fullRoot; + foreach (var part in relative.Split(Path.DirectorySeparatorChar)) + { + current = Path.Combine(current, part); + FileSystemInfo info = Directory.Exists(current) ? new DirectoryInfo(current) : new FileInfo(current); + if (info.Exists && info.LinkTarget is not null) + { + return Path.GetRelativePath(fullRoot, current).Replace(Path.DirectorySeparatorChar, '/'); + } + } + + return null; + } +} diff --git a/src/SharpMUTerm.Tui/ComposeOverlay.cs b/src/SharpMUTerm.Tui/ComposeOverlay.cs index 959dd2f8..3773e81a 100644 --- a/src/SharpMUTerm.Tui/ComposeOverlay.cs +++ b/src/SharpMUTerm.Tui/ComposeOverlay.cs @@ -14,7 +14,23 @@ namespace SharpMUTerm.Tui; /// The editor's buffer, exactly as typed. /// The window's escaping mode when it happened. /// The MOO buffer this is an edit of, or null for a post. -internal readonly record struct ComposeResult(string Body, ComposeEscaping Escaping, MooEdit? Edit = null); +/// The script file this is an edit of, or null. +internal readonly record struct ComposeResult(string Body, ComposeEscaping Escaping, MooEdit? Edit = null, ScriptEdit? Script = null); + +/// +/// A script file open in the composer: its name under the scripts folder (or package:<id>/<file>), whose +/// scripts a save reloads, whether it can only be read, what the last save said and the line the caret opens on. +/// +/// The script's name. +/// The session key of the character whose scripts a save reloads; null for none. +/// A package's script: shown, never saved. +/// What the last save said, or null. +/// The line the caret opens on, from 1; 0 for the top. +internal sealed record ScriptEdit(string Name, string? Owner, bool ReadOnly, string? Status = null, int Line = 0) +{ + /// What the editor says this is: the MOO edit's shape, read by both hosts. + internal ComposerEdit Describe() => new(Name, "lua", Script: true, ReadOnly, Status, Line); +} /// /// The composer: a full-screen editor for writing a post before sending it, over the workspace. @@ -51,6 +67,7 @@ internal sealed class ComposeOverlay private string _target = string.Empty; private bool _canSend; private MooEdit? _edit; + private ScriptEdit? _script; private readonly Func? _openSpelling; private SpellChecker? _spelling; private bool _spellingOpened; @@ -80,7 +97,7 @@ internal ComposeOverlay(ConsoleWindowSystem system, Func? spellin /// The dictionary marking this post, or null: none was found, or this is a MOO edit, whose buffer is as often /// code as prose. /// - internal SpellChecker? Spelling => _edit is null ? _spelling : null; + internal SpellChecker? Spelling => _edit is null && _script is null ? _spelling : null; /// ⌥W in a post with no dictionary: the host offers to download one. internal event EventHandler? DictionaryWanted; @@ -120,6 +137,21 @@ internal void ForgetSpelling() /// internal MooEdit? Edit => _edit; + /// The script file being edited, or null. Saved as its lines, like a MOO edit. + internal ScriptEdit? Script => _script; + + /// Says what the last save of the open script did, in the header, without touching the editor. + internal void SetScriptStatus(string status) + { + if (_script is null) + { + return; + } + + _script = _script with { Status = status }; + RefreshBands(); + } + /// The header row's markup, so a test can read who the window says it will send to. internal string HeaderMarkup => Render(Model).Header; @@ -127,7 +159,7 @@ internal void ForgetSpelling() /// What the window draws, as the shared model a native composer draws: the target, the buffer as it stands, the /// mode, the edit, the dictionary and its marks, and the key row. /// - internal ComposerModel Model => ModelFor(_target, Body, _escaping, _edit, Spelling, _canSend, Preview); + internal ComposerModel Model => ModelFor(_target, Body, _escaping, _edit, Spelling, _canSend, Preview, _script); /// /// Whether F1 shows the post as it will be sent (⌥P), under the editor. One fact for the run in both hosts — the @@ -143,13 +175,13 @@ internal void ForgetSpelling() /// it, so the two say the same thing for the same draft. Revision 1: F1 opens on a draft and nothing replaces it /// while it is open. /// - internal static ComposerModel ModelFor(string target, string body, ComposeEscaping escaping, MooEdit? edit, SpellChecker? spelling, bool canSend, bool preview = false) => + internal static ComposerModel ModelFor(string target, string body, ComposeEscaping escaping, MooEdit? edit, SpellChecker? spelling, bool canSend, bool preview = false, ScriptEdit? script = null) => ComposerModel.Create( ComposerPlace.FullScreen, target, body, escaping, - edit is null ? null : new ComposerEdit(edit.Name, edit.Type), + script is not null ? script.Describe() : edit is null ? null : new ComposerEdit(edit.Name, edit.Type), spelling, canSend, armed: true, @@ -169,7 +201,8 @@ internal static ComposerModel ModelFor(string target, string body, ComposeEscapi /// which is the same rule ⏎ follows on the command line. /// /// The MOO buffer this opens on, or null for a post. - internal void Toggle(string target, string draft, ComposeEscaping escaping, bool canSend, MooEdit? edit = null) + /// The script file this opens on, or null. + internal void Toggle(string target, string draft, ComposeEscaping escaping, bool canSend, MooEdit? edit = null, ScriptEdit? script = null) { if (_window is not null) { @@ -180,12 +213,17 @@ internal void Toggle(string target, string draft, ComposeEscaping escaping, bool _target = target; _escaping = escaping; _canSend = canSend; - _edit = edit; + _edit = script is null ? edit : null; + _script = script; _editor = new MultilineEditControl { WrapMode = WrapMode.WrapWords, - ShowLineNumbers = false, + + // A script is code: its lines are numbered, so a load error's file:line can be found, and a package's script is + // shown read-only. + ShowLineNumbers = script is not null, + ReadOnly = script?.ReadOnly == true, IsEditing = true, // Fill, so the editor is the window rather than the control's ten-row default sitting in the @@ -200,7 +238,9 @@ internal void Toggle(string target, string draft, ComposeEscaping escaping, bool // into browse mode — which would make the key mean two different things depending on a // state the writer has no reason to be tracking. EscapeExitsEditMode = false, - PlaceholderText = edit is null + PlaceholderText = script is not null + ? "An empty script. ⌃S saves it and reloads this character's scripts." + : edit is null ? "Write your post. ⏎ starts a new line; the game gets one command with %r breaks." : "Empty. ⌃S saves it empty.", @@ -229,6 +269,11 @@ internal void Toggle(string target, string draft, ComposeEscaping escaping, bool } _editor.SetContent(draft); + if (script is { Line: > 0 } at) + { + _editor.GoToLine(at.Line); + } + _editor.ContentChanged += (_, _) => RefreshBands(); FitEditor(); @@ -327,7 +372,7 @@ private void OnKey(object? sender, KeyPressedEventArgs e) // ⌥L flips the escaping. Alt rather than Ctrl by this codebase's rule — ESC + a printable byte // arrives intact, while half the Ctrl alphabet collapses onto bytes a terminal already spends. - if (alt && key.Key == ConsoleKey.L && _edit is null) + if (alt && key.Key == ConsoleKey.L && _edit is null && _script is null) { e.Handled = true; _escaping = _escaping == ComposeEscaping.Literal ? ComposeEscaping.AsTyped : ComposeEscaping.Literal; @@ -345,7 +390,7 @@ private void OnKey(object? sender, KeyPressedEventArgs e) } // ⌥W with no dictionary is the way to one: the host closes this window (keeping the draft) and asks first. - if (alt && key.Key == ConsoleKey.W && _edit is null) + if (alt && key.Key == ConsoleKey.W && _edit is null && _script is null) { e.Handled = true; DictionaryWanted?.Invoke(this, EventArgs.Empty); @@ -355,7 +400,7 @@ private void OnKey(object? sender, KeyPressedEventArgs e) // ⌥P shows the post as it will be sent, and hides it again. Alt by the same rule; P for preview, and nothing in // MacroKeys.AppShortcuts, the bar's table or a host's reserved chords takes it. A MOO edit is sent as its lines, // which the editor already shows, so it has no preview. - if (alt && key.Key == ConsoleKey.P && _edit is null) + if (alt && key.Key == ConsoleKey.P && _edit is null && _script is null) { e.Handled = true; Preview = !Preview; @@ -407,7 +452,7 @@ private void SendNow() // the close so the handler sees the buffer rather than an empty window — and Closed still // follows, so a send the host refuses (no connection) keeps the post rather than dropping it on // the floor. - Send?.Invoke(this, new ComposeResult(_editor.GetContent(), _escaping, _edit)); + Send?.Invoke(this, new ComposeResult(Body, _escaping, _edit, _script)); } /// Shuts the window, handing the buffer back for the host to keep. @@ -418,7 +463,7 @@ internal void Close() return; } - var result = new ComposeResult(Body, _escaping, _edit); + var result = new ComposeResult(Body, _escaping, _edit, _script); _system.CloseModalWindow(window); Closed?.Invoke(this, result); } @@ -573,7 +618,17 @@ internal static (string Header, string Footer) Render(ComposerModel model, int w var footerKeys = KeyLadder.Choose(FooterKeys(model), width); string header; - if (model.Edit is { } edit) + if (model.Edit is { Script: true } script) + { + var status = script.Status is { } said + ? $"[{ScreenPalette.Label}] · [/][{(said.StartsWith('!') ? ScreenPalette.Warn : ScreenPalette.Value)}]{Escape(said)}[/]" + : string.Empty; + header = $"[{ScreenPalette.Accent}]{(script.ReadOnly ? "READ ONLY" : "SCRIPT")}[/] [{ScreenPalette.Value}]{Escape(script.Name)}[/]" + + $"[{ScreenPalette.Label}] lua · {(model.Target.Length == 0 ? "reloads nobody" : "reloads ")}[/]" + + (model.Target.Length == 0 ? string.Empty : $"[{ScreenPalette.Value}]{Escape(model.Target)}[/]") + + status; + } + else if (model.Edit is { } edit) { header = $"[{ScreenPalette.Accent}]EDIT[/] [{ScreenPalette.Value}]{Escape(edit.Name)}[/]" + $"[{ScreenPalette.Label}] {Escape(edit.Type)} · from [/]{target}"; @@ -662,6 +717,7 @@ private void Reset() _window = null; _editor = null; _edit = null; + _script = null; _headerBand = null; _footerBand = null; _previewBand = null; diff --git a/src/SharpMUTerm.Tui/ScriptConsoleSurface.cs b/src/SharpMUTerm.Tui/ScriptConsoleSurface.cs index 56c0e30a..7bacd41a 100644 --- a/src/SharpMUTerm.Tui/ScriptConsoleSurface.cs +++ b/src/SharpMUTerm.Tui/ScriptConsoleSurface.cs @@ -40,6 +40,7 @@ internal enum Ask Run, Delete, Reload, + Edit, } /// @@ -54,6 +55,11 @@ public Ask Key(ConsoleKeyInfo key) return Ask.Reload; } + if (ctrl && key.Key == ConsoleKey.E) + { + return Model.CanRun ? Ask.Edit : Ask.None; + } + if (key.Key == ConsoleKey.Tab) { OnStore = !OnStore && Model.Store.Count > 0; @@ -200,9 +206,10 @@ internal static IReadOnlyList FooterKeys(bool onStore) => onStore ] : [ - new("⏎", "runs", Drop: 4), + new("⏎", "runs", Drop: 5), new("↑↓", "history", Drop: 2), new("⇥", "store keys", "store", Drop: 3), + new("⌃E", "edits a script", "edit", Drop: 4), new("⌃L", "reloads scripts", "reload", Drop: 1), new("Esc", "closes"), ]; diff --git a/src/SharpMUTerm.Tui/ScrollbackViewSurface.cs b/src/SharpMUTerm.Tui/ScrollbackViewSurface.cs new file mode 100644 index 00000000..fc75cf72 --- /dev/null +++ b/src/SharpMUTerm.Tui/ScrollbackViewSurface.cs @@ -0,0 +1,61 @@ +using SharpMUTerm.Client.Modals; +using static SharpMUTerm.Tui.MarkupText; +using static SharpMUTerm.Tui.ScreenPalette; + +namespace SharpMUTerm.Tui; + +/// +/// The read-only history view in cells: a page of a session's scrollback (ring or spill) around the line ⌃F's older-history +/// search found, that line on the accent band and the query's run in every line in bold accent. Pure: the page is the +/// the window's native view draws too, and every move is the client's ranged read. +/// Always rows of page, so the overlay sized once at open keeps fitting. +/// +internal static class ScrollbackViewSurface +{ + /// The width the view asks for; the overlay narrows it on a small terminal. + internal const int PreferredWidth = 110; + + /// The view's lines at : title, position, a blank, the page, a blank, the keys. + internal static List Render(ScrollbackViewModel model, int width) + { + width = Math.Max(20, width); + var lines = new List + { + SpreadLR($"[{Label}]{Escape(model.Title)}[/]", $"[{Muted}]{Escape(model.Position)}[/]", width), + string.Empty, + }; + + for (var i = 0; i < ScrollbackViewModel.PageRows; i++) + { + lines.Add(i < model.Lines.Count ? Row(model.Lines[i], model.Lines[i].Index == model.Marked, width) : string.Empty); + } + + lines.Add(string.Empty); + lines.Add($"[{Label}]{Escape(ElidePlain(ScrollbackViewModel.Keys, width))}[/]"); + return lines; + } + + private static string Row(ScrollbackViewLine line, bool marked, int width) + { + var text = ElidePlain(line.Text.Replace('\t', ' '), width - 2); + if (marked) + { + var pad = new string(' ', Math.Max(0, width - 2 - text.Length)); + return $"[{Ink} on {Accent}]▸ {Escape(text)}{pad}[/]"; + } + + if (line.MatchStart < 0 || line.MatchStart >= text.Length || line.MatchLength <= 0) + { + return $" [{Value}]{Escape(text)}[/]"; + } + + var length = Math.Min(line.MatchLength, text.Length - line.MatchStart); + var before = text[..line.MatchStart]; + var hit = text.Substring(line.MatchStart, length); + var after = text[(line.MatchStart + length)..]; + return $" [{Value}]{Escape(before)}[/][bold {Accent}]{Escape(hit)}[/][{Value}]{Escape(after)}[/]"; + } + + private static string ElidePlain(string text, int width) => + width <= 0 ? string.Empty : text.Length <= width ? text : text[..Math.Max(0, width - 1)] + "…"; +} diff --git a/src/SharpMUTerm.Tui/SearchPrompt.cs b/src/SharpMUTerm.Tui/SearchPrompt.cs index bcf5097f..c93e2b2b 100644 --- a/src/SharpMUTerm.Tui/SearchPrompt.cs +++ b/src/SharpMUTerm.Tui/SearchPrompt.cs @@ -22,7 +22,7 @@ internal enum SearchAction /// The answer to one keystroke: what to do, and the state it leaves behind. internal readonly record struct SearchDecision( - SearchAction Action, string Query, int Selected, bool Regex, bool AllWindows); + SearchAction Action, string Query, int Selected, bool Regex, bool AllWindows, bool Older = false); /// /// The search surface (⌃F), minus the window: what a keystroke means to it, and what it says. Pure, for @@ -55,7 +55,7 @@ internal static class SearchPrompt /// be widened. /// internal const string Hints = - "type to search · ↑↓ pick · ⏎ go · ⌥E regex · ⌥A all windows · Esc cancel · ⌃F closes"; + "type to search · ↑↓ pick · ⏎ go · ⌥E regex · ⌥A all windows · ⌥H older history · Esc cancel · ⌃F closes"; /// /// The footer's drop-order ladder, longest first: the status row's rule (FocusHints). @@ -66,9 +66,9 @@ internal static class SearchPrompt internal static readonly string[] HintLadder = [ Hints, - "↑↓ pick · ⏎ go · ⌥E regex · ⌥A all windows · Esc cancel · ⌃F closes", - "↑↓ pick · ⏎ go · ⌥E regex · ⌥A all · Esc cancel · ⌃F closes", - "↑↓ · ⏎ go · ⌥E regex · ⌥A all · Esc · ⌃F", + "↑↓ pick · ⏎ go · ⌥E regex · ⌥A all windows · ⌥H older history · Esc cancel · ⌃F closes", + "↑↓ pick · ⏎ go · ⌥E regex · ⌥A all · ⌥H older · Esc cancel · ⌃F closes", + "↑↓ · ⏎ go · ⌥E regex · ⌥A all · ⌥H older · Esc · ⌃F", ]; /// The longest rung of that fits (all of it when unknown). @@ -96,9 +96,9 @@ internal static string HintsFor(int width) => /// /// internal static SearchDecision Interpret( - ConsoleKeyInfo key, string query, int selected, int count, bool regex, bool all) + ConsoleKeyInfo key, string query, int selected, int count, bool regex, bool all, bool older = false) { - var state = new SearchDecision(SearchAction.None, query, selected, regex, all); + var state = new SearchDecision(SearchAction.None, query, selected, regex, all, older); if (key.Modifiers.HasFlag(ConsoleModifiers.Control)) { @@ -118,6 +118,10 @@ internal static SearchDecision Interpret( { ConsoleKey.E => state with { Action = SearchAction.Redraw, Regex = !regex, Selected = 0 }, ConsoleKey.A => state with { Action = SearchAction.Redraw, AllWindows = !all, Selected = 0 }, + + // ⌥H: older history too — the sessions' scrollback and its spill, searched off the UI thread and listed + // after the pane's rows as they are found. H for history; nothing in the app's shortcuts takes it. + ConsoleKey.H => state with { Action = SearchAction.Redraw, Older = !older }, _ => state, }; } @@ -212,15 +216,18 @@ internal static List Render(SearchModel model, int selected, int width = var query = model.Query; var all = model.AllWindows; - var labelWidth = all - ? Math.Min(MaxLabelWidth, rows.Select(r => r.WindowLabel.Length).DefaultIfEmpty(0).Max()) + var labelWidth = all || rows.Any(r => r.IsOlder) + ? Math.Min(MaxLabelWidth, rows.Select(r => RowLabel(r, all).Length).DefaultIfEmpty(0).Max()) : 0; var entryWidth = (width > 0 ? width : DefaultEntryWidth) - 4 - (labelWidth > 0 ? labelWidth + 2 : 0); var lines = new List { SpreadLR($"[{Label}]search[/] {QueryMarkup(query)}", $"[{Label}]{Escape(model.StateText)}[/]", width), - SpreadLR(string.Empty, $"[{Label}]{Escape(model.CountText)}[/]", width), + SpreadLR( + model.HistoryNote is { } note ? $"[{(model.HistoryRunning ? Accent : Muted)}]{Escape(note)}[/]" : string.Empty, + $"[{Label}]{Escape(model.CountText)}[/]", + width), }; var body = new List(); @@ -233,7 +240,7 @@ internal static List Render(SearchModel model, int selected, int width = var last = listRows > 0 ? Math.Min(rows.Count, top + listRows - body.Count) : rows.Count; for (var i = top; i < last; i++) { - body.Add(Row(rows[i], i == selected, entryWidth, labelWidth, width)); + body.Add(Row(rows[i], i == selected, entryWidth, labelWidth, width, all)); } while (body.Count < listRows) @@ -271,10 +278,17 @@ private static string QueryMarkup(string query) => ? $"[{Ink} on {Accent}] [/]" : $"[{Value}]{Escape(query)}[/][{Ink} on {Accent}] [/]"; - private static string Row(SearchRow row, bool selected, int entryWidth, int labelWidth, int width) + /// + /// What a row's window column says: the window's name in ⌥A scope, and older on a row from older history — the + /// only place a reader can tell a line the pane holds from one ⏎ will open in the history view. + /// + private static string RowLabel(SearchRow row, bool all) => + row.IsOlder ? (all ? $"{row.WindowLabel} · older" : "older") : all ? row.WindowLabel : string.Empty; + + private static string Row(SearchRow row, bool selected, int entryWidth, int labelWidth, int width, bool all) { var (text, matchStart, matchLength) = Elide(row, entryWidth); - var label = labelWidth > 0 ? LabelCell(row.WindowLabel, labelWidth) : string.Empty; + var label = labelWidth > 0 ? LabelCell(RowLabel(row, all), labelWidth) : string.Empty; if (selected) { diff --git a/src/SharpMUTerm.Tui/SearchSurface.cs b/src/SharpMUTerm.Tui/SearchSurface.cs index 87a3c785..82f9a448 100644 --- a/src/SharpMUTerm.Tui/SearchSurface.cs +++ b/src/SharpMUTerm.Tui/SearchSurface.cs @@ -44,7 +44,7 @@ internal sealed class SearchSurface private const int ChromeRows = 4; private readonly ConsoleWindowSystem _system; - private readonly Func _search; + private readonly Func _search; private readonly Action _go; private readonly Action? _closed; @@ -73,7 +73,7 @@ internal sealed class SearchSurface /// public SearchSurface( ConsoleWindowSystem system, - Func search, + Func search, Action go, Action? closed = null) { @@ -135,6 +135,25 @@ internal static SearchModel Compute(IReadOnlyList windows, string /// Whether every window is being searched rather than the focused one. internal bool AllWindows => _model.AllWindows; + /// Whether older history is being searched too (⌥H). + internal bool Older => _model.Older; + + /// + /// Re-reads the model for the query and toggles as they stand and redraws, keeping the pointer: the older-history + /// search calls it as its results stream in. + /// + internal void Refresh() + { + if (_window is null) + { + return; + } + + Refilter(_model.Query, _model.Regex, _model.AllWindows, _model.Older, _selected); + Paint(); + _window.Invalidate(redrawAll: true); + } + /// Opens the surface, or closes it when ⌃F arrives a second time. public void Toggle() { @@ -171,7 +190,7 @@ private void Open() _model = Empty; _selected = -1; _first = 0; - Refilter(string.Empty, false, false, -1); + Refilter(string.Empty, false, false, false, -1); var desktop = _system.DesktopDimensions; @@ -217,7 +236,7 @@ private void OnKey(object? sender, KeyPressedEventArgs e) return; } - var decision = SearchPrompt.Interpret(e.KeyInfo, _model.Query, _selected, _model.Rows.Count, _model.Regex, _model.AllWindows); + var decision = SearchPrompt.Interpret(e.KeyInfo, _model.Query, _selected, _model.Rows.Count, _model.Regex, _model.AllWindows, _model.Older); e.Handled = true; switch (decision.Action) @@ -236,7 +255,7 @@ private void OnKey(object? sender, KeyPressedEventArgs e) break; case SearchAction.Redraw: - Refilter(decision.Query, decision.Regex, decision.AllWindows, decision.Selected); + Refilter(decision.Query, decision.Regex, decision.AllWindows, decision.Older, decision.Selected); Paint(); _window.Invalidate(redrawAll: true); break; @@ -251,9 +270,9 @@ private void OnKey(object? sender, KeyPressedEventArgs e) /// Re-reads the corpus and re-runs the search. The pointer is clamped to what the query actually /// matched: a narrowing must not leave ⏎ aimed past the end of the list. /// - private void Refilter(string query, bool regex, bool all, int selected) + private void Refilter(string query, bool regex, bool all, bool older, int selected) { - _model = _search(query, regex, all); + _model = _search(query, regex, all, older); _selected = _model.Rows.Count == 0 ? -1 : Math.Clamp(selected, 0, _model.Rows.Count - 1); _first = SearchPrompt.Scroll(_first, _selected, _model.Rows.Count, _listRows); } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.DeepSearch.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.DeepSearch.cs new file mode 100644 index 00000000..8636d63e --- /dev/null +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.DeepSearch.cs @@ -0,0 +1,489 @@ +using System.Globalization; +using SharpMUTerm.Client.Modals; +using SharpMUTerm.Client.Surfaces; +using SharpMUTerm.Core.Session; +using SharpMUTerm.Core.Text; + +namespace SharpMUTerm.Tui; + +/// +/// ⌃F's older history (⌥H) and the read-only history view an older hit opens. +/// +/// What is searched. ⌃F searches the pane buffers and states that bound (N lines held). ⌥H adds the +/// session's own for each session window in scope — the in-memory ring and the +/// file-backed spill behind it, which is what holds a long evening — through : newest to +/// oldest, ranged reads of at most , on a worker thread with a cancellation +/// token, every line under 's match timeout. Lines the pane still holds are skipped (a session +/// window's pane shares the ring's instances), so an older row is never a second copy of a row above it. A capture +/// window has no scrollback and no spill — its lines exist only in its pane — and the note says so rather than implying a +/// deeper search that is not there. +/// +/// +/// Results stream. Each chunk's hits are posted to the UI thread and the open surface (cells or native) is +/// redrawn from , older rows after the pane's, newest first, at most +/// . Typing or a toggle cancels the walk and starts the next one after a short +/// pause; closing ⌃F cancels it. +/// +/// +/// ⏎ on an older hit goes to the pane when the pane still holds that line (by reference), through the one path to a +/// hit; otherwise it opens the history view: a modal page of the scrollback around the line, read a page at a +/// time (), never inserted into a pane buffer — a pane's indices are what every bar and +/// boundary counts by, and a page of the past put there would move all of them. +/// +/// +internal sealed partial class SharpMUTermApp +{ + /// The older-history search running or last finished, or null. + private DeepSearch? _deep; + + /// Whether the older-history search runs inline (headless, and every snapshot), so a frame is deterministic. + private bool _deepInline; + + /// The demo's scrollback, so the snapshot has older history to search with no session. + private ScrollbackBuffer? _demoHistory; + + /// The open history view's state, in either host; null while it is shut. + private HistoryViewState? _historyView; + + /// How long typing pauses before an older-history search starts. + private static readonly TimeSpan DeepSearchPause = TimeSpan.FromMilliseconds(150); + + /// One source of older history: a session window and its session's scrollback. + private sealed record HistorySource(string WindowId, string Label, string SessionKey, ScrollbackBuffer Buffer); + + /// The state of one older-history search, written on the UI thread only. + private sealed class DeepSearch(string key, IReadOnlyList sources, long total) + { + public string Key { get; } = key; + + public IReadOnlyList Sources { get; } = sources; + + public CancellationTokenSource Cancel { get; } = new(); + + public ScrollbackSearchProgress?[] Progress { get; } = new ScrollbackSearchProgress?[sources.Count]; + + public long Total { get; } = total; + + public bool Running { get; set; } = true; + } + + /// The history view: whose scrollback, the search it came from, the line it found, and where the page starts. + private sealed class HistoryViewState(HistorySource source, string query, bool regex, long marked) + { + public HistorySource Source { get; } = source; + + public string Query { get; } = query; + + public bool Regex { get; } = regex; + + public long Marked { get; } = marked; + + public long Top { get; set; } + + public ScrollbackViewModel? Model { get; set; } + + public ScrollbackViewSession? Native { get; set; } + } + + /// Whether the history view is open, in cells or natively. + internal bool HistoryViewIsOpen => _historyView is not null; + + /// The history view's model as it stands, for the tests; null while it is shut. + internal ScrollbackViewModel? HistoryViewModel => _historyView?.Model; + + /// The native history view's session while one is open, for the tests. + internal ScrollbackViewSession? NativeHistoryView => _nativeModal as ScrollbackViewSession; + + /// + /// The search for over the windows ⌃F looks in now — the one function both the cell surface + /// and the native one ask, so the two list the same rows — with older history's rows after them when + /// (⌥H), as far as its search has got. + /// + internal SearchModel SearchModelFor(string query, bool regex, bool all, bool older = false) + { + var held = SearchSurface.Compute(SearchableWindows(all), query, regex, all); + var sources = HistorySources(all, out var captures); + EnsureDeepSearch(query, regex, all, older && held.Error is null, sources); + + var total = sources.Sum(s => s.Buffer.AvailableLines); + var who = sources.Count == 1 ? sources[0].Label : $"{sources.Count} windows"; + var spill = captures switch + { + 0 => string.Empty, + _ when sources.Count == 0 && !all => "this window is a capture: it keeps no older history — every line it holds is searched", + _ => " · captures keep no older history", + }; + + if (!older || held.Error is not null || _deep is not { } deep) + { + var note = sources.Count == 0 + ? (spill.Length > 0 ? spill.TrimStart(' ', '·') : null) + : $"⌥H searches older history · {N(total)} lines in {who}{spill}"; + return held with { Older = older, HistoryNote = note }; + } + + var rows = new List(held.Rows); + long searched = 0; + var found = 0; + var capped = false; + string? error = null; + for (var i = 0; i < deep.Sources.Count; i++) + { + if (deep.Progress[i] is not { } progress) + { + continue; + } + + searched += progress.Searched; + capped |= progress.Capped; + error ??= progress.Error; + var source = deep.Sources[i]; + foreach (var match in progress.Found) + { + if (rows.Count - held.Rows.Count >= ScrollbackSearch.MaxHits) + { + capped = true; + break; + } + + rows.Add(new SearchRow(source.WindowId, source.Label, -1, match.Line.Text, match.MatchStart, match.MatchLength, match.Index, source.SessionKey)); + found++; + } + } + + var said = error is not null + ? $"older history: {error}" + : deep.Running + ? $"searching older history · {N(searched)} of {N(deep.Total)} lines…" + : $"older history · {found} found in {N(deep.Total)} lines{(capped ? $" · the first {ScrollbackSearch.MaxHits}" : string.Empty)}"; + return held with { Rows = rows, Older = true, HistoryNote = said + spill, HistoryRunning = deep.Running && error is null }; + } + + /// + /// The session windows in ⌃F's scope whose sessions keep a scrollback, and how many capture windows in it keep none. + /// The demo's main window has a scrollback of its own, so the snapshot has older history to show. + /// + private IReadOnlyList HistorySources(bool all, out int captures) + { + captures = 0; + var sources = new List(); + foreach (var window in SearchableWindows(all)) + { + var session = _sessionWindows.FirstOrDefault(p => string.Equals(p.Value, window.WindowId, StringComparison.Ordinal)).Key; + if (session is not null) + { + sources.Add(new HistorySource(window.WindowId, window.Label, session.SessionKey, session.Scrollback)); + } + else if (string.Equals(window.WindowId, MainWindowId, StringComparison.Ordinal) + && _workspace.FindWindow(MainWindowId)?.SessionKey is { } owner && IsDemoKey(owner)) + { + sources.Add(new HistorySource(window.WindowId, window.Label, owner, _demoHistory ??= DemoHistory())); + } + else if (_workspace.FindWindow(window.WindowId)?.Kind == Core.Workspaces.WindowKind.Spawn) + { + captures++; + } + } + + return sources; + } + + /// + /// Starts the older-history search for this query and scope unless the one running is already it; cancels it when + /// ⌥H is off or the query is empty. + /// + private void EnsureDeepSearch(string query, bool regex, bool all, bool older, IReadOnlyList sources) + { + if (!older || query.Length == 0 || sources.Count == 0) + { + CancelDeepSearch(); + return; + } + + var key = string.Join('\u0001', query, regex, all, ActiveWindowId(), string.Join(',', sources.Select(s => s.WindowId))); + if (_deep is { } running && running.Key == key) + { + return; + } + + CancelDeepSearch(); + + // Which lines each pane still holds, by reference, taken here on the UI thread: the worker never touches a pane. + var held = sources.Select(s => _lines.TryGetValue(s.WindowId, out var buffer) + ? buffer.Select(l => l.Source).OfType().ToHashSet(ReferenceEqualityComparer.Instance) + : new HashSet(ReferenceEqualityComparer.Instance)).ToArray(); + var deep = new DeepSearch(key, sources, sources.Sum(s => s.Buffer.AvailableLines)); + _deep = deep; + var token = deep.Cancel.Token; + + void Walk() + { + for (var i = 0; i < sources.Count && !token.IsCancellationRequested; i++) + { + var index = i; + var last = ScrollbackSearch.Run( + sources[i].Buffer, + query, + regex, + line => held[index].Contains(line), + progress => Post(() => deep.Progress[index] = progress), + token); + if (last?.Error is not null) + { + break; + } + } + + Post(() => deep.Running = false); + } + + void Post(Action change) + { + if (token.IsCancellationRequested) + { + return; + } + + if (deep.Running && _deepInline) + { + change(); + return; + } + + OnUiThread(() => + { + if (!ReferenceEquals(_deep, deep) || token.IsCancellationRequested) + { + return; + } + + change(); + RefreshSearchSurfaces(); + }); + } + + if (_deepInline || _headless) + { + _deepInline = true; + Walk(); + return; + } + + _ = Task.Run( + async () => + { + try + { + await Task.Delay(DeepSearchPause, token).ConfigureAwait(false); + Walk(); + } + catch (OperationCanceledException) + { + // A newer query, or ⌃F closed. + } + }, + token); + } + + /// Stops the older-history search, if one is running; its rows go with it. + private void CancelDeepSearch() + { + if (_deep is { } deep) + { + deep.Cancel.Cancel(); + deep.Cancel.Dispose(); + _deep = null; + } + } + + /// Redraws whichever ⌃F is open from a fresh model, as older history's results stream in. + private void RefreshSearchSurfaces() + { + if (_search.IsOpen) + { + _search.Refresh(); + } + else if (NativeSearch is { } native) + { + var model = native.Model; + native.Publish(SearchModelFor(model.Query, model.Regex, model.AllWindows, model.Older)); + } + } + + /// + /// ⏎ on an older hit: to the pane when it still holds that line, through the one path to a hit; otherwise the history + /// view, opened on a page around it. + /// + private void GoToOlderHit(SearchModel model, SearchRow row) + { + CancelDeepSearch(); + var source = HistorySources(model.AllWindows, out _).FirstOrDefault(s => s.WindowId == row.WindowId && s.SessionKey == row.SessionKey); + if (source is null) + { + RefuseCommand("that window's history is gone"); + return; + } + + var line = source.Buffer.GetRange(row.History, 1); + if (line.Count == 0) + { + RefuseCommand("that line is no longer held — the scrollback has moved past it"); + return; + } + + if (_lines.TryGetValue(row.WindowId, out var buffer)) + { + var at = buffer.FindIndex(l => ReferenceEquals(l.Source, line[0])); + if (at >= 0) + { + GoToSearchHit(row with { LineIndex = at, History = -1 }, model.Query, model.Regex, model.AllWindows, 1, 1); + return; + } + } + + OpenHistoryView(source, model.Query, model.Regex, row.History); + } + + /// Opens the read-only history view on 's scrollback around line . + private void OpenHistoryView(HistorySource source, string query, bool regex, long marked) + { + if (AnyOverlayOpen || ComposerOpen) + { + RefuseCommand($"close {(ComposerOpen ? "the composer" : OpenOverlayName())} first"); + return; + } + + var view = new HistoryViewState(source, query, regex, marked); + _historyView = view; + view.Top = ScrollbackViewModel.TopFor(marked, source.Buffer.OldestIndex, source.Buffer.TotalLines); + view.Model = HistoryPage(view); + if (NativeModalsHost is { } host) + { + ScrollbackViewSession? session = null; + session = new ScrollbackViewSession( + view.Model, + ThemeIsDark(), + top => OnUiThread(() => ScrollHistoryView(top)), + () => OnUiThread(() => + { + NativeModalClosed(session!); + if (ReferenceEquals(_historyView, view)) + { + _historyView = null; + } + })) + { + Theme = _theme.Clone(), + }; + view.Native = session; + ShowNativeModal(host, session); + return; + } + + _helpView.Open( + "history-view", + "Older history", + width => + { + var model = view.Model!; + Drawing(SurfaceCatalog.HistoryView, string.Empty, model); + return ScrollbackViewSurface.Render(model, width); + }, + key => + { + if (key.Modifiers == 0 && view.Model!.Move(key.Key) is { } top) + { + ScrollHistoryView(top); + } + + return true; + }, + width: ScrollbackViewSurface.PreferredWidth, + closed: () => + { + if (ReferenceEquals(_historyView, view)) + { + _historyView = null; + } + }); + } + + /// + /// The history view's one move, from either host: the page starting at , read from the + /// scrollback in one ranged read and drawn. + /// + internal void ScrollHistoryView(long top) + { + if (_historyView is not { } view) + { + return; + } + + view.Top = ScrollbackViewModel.Clamp(top, view.Source.Buffer.OldestIndex, view.Source.Buffer.TotalLines); + view.Model = HistoryPage(view); + if (view.Native is { } native) + { + native.Publish(view.Model); + return; + } + + _helpView.Repaint(); + } + + /// A page of the view's scrollback from its top: one ranged read, each line's match marked. + private static ScrollbackViewModel HistoryPage(HistoryViewState view) + { + var buffer = view.Source.Buffer; + var oldest = buffer.OldestIndex; + var end = buffer.TotalLines; + var top = ScrollbackViewModel.Clamp(view.Top, oldest, end); + var lines = buffer.GetRange(top, ScrollbackViewModel.PageRows); + var first = Math.Max(top, oldest); + var texts = lines.Select(l => l.Text).ToArray(); + var matches = OutputSearch.Match(texts, view.Query, view.Regex).Matches.ToDictionary(m => m.LineIndex); + var page = new List(lines.Count); + for (var i = 0; i < lines.Count; i++) + { + var hit = matches.TryGetValue(i, out var m) ? m : default; + page.Add(new ScrollbackViewLine(first + i, texts[i], matches.ContainsKey(i) ? hit.MatchStart : -1, matches.ContainsKey(i) ? hit.MatchLength : 0)); + } + + return new ScrollbackViewModel(view.Source.Label, view.Query, top, oldest, end, view.Marked, page); + } + + /// + /// The demo's older history: an evening of the same streets, a few thousand lines older than anything the pane holds, + /// with a goblin fight in it to find. + /// + private static ScrollbackBuffer DemoHistory() + { + var buffer = new ScrollbackBuffer(10_000); + string[] streets = + [ + "You walk along the Spice Road. Lanterns sway over the stalls.", + "Ashlyn says, \"Have you seen the new market charter?\"", + "A town crier calls the hour from the steps of the guildhall.", + "Merrow pages: meet at the Grand Plaza after the bell.", + "The smell of roasting chestnuts drifts from a cart nearby.", + ]; + for (var i = 0; i < 6_000; i++) + { + var text = i switch + { + 1_200 => "A goblin leaps from behind a barrel and snarls!", + 1_203 => "You hit the goblin for 9 damage.", + 1_207 => "The goblin flees north, clutching a stolen purse.", + 4_410 => "Ashlyn says, \"That goblin came back — it is in the sewers now.\"", + _ => $"[{18 + i / 1_000:00}:{i * 7 % 60:00}] {streets[i % streets.Length]}", + }; + buffer.Append(StyledLine.FromText(text, TextStyle.Default)); + } + + return buffer; + } + + /// ⏎ on row of , for the tests. + internal void GoToSearchHitForTest(SearchModel model, int index) => GoToSearchHit(model, index); + + private static string N(long value) => value.ToString("N0", CultureInfo.InvariantCulture); +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.NativeComposer.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.NativeComposer.cs index 9419542d..631698ba 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.NativeComposer.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.NativeComposer.cs @@ -96,7 +96,7 @@ private IEnumerable SpellingNames() /// Opens F1 on a draft: in the host's editor when it has one, else the cell window. Both are given the same draft /// and say the same thing about it (). /// - private void OpenComposer(string target, string draft, ComposeEscaping escaping, bool canSend, MooEdit? edit = null) + private void OpenComposer(string target, string draft, ComposeEscaping escaping, bool canSend, MooEdit? edit = null, ScriptEdit? script = null) { // The names a game reports change between openings; the dictionary learns them each time F1 opens. if (_composerSpellingOpened) @@ -106,11 +106,16 @@ private void OpenComposer(string target, string draft, ComposeEscaping escaping, if (NativeComposerHost is not { } native) { - _composer.Toggle(target, draft, escaping, canSend, edit); + _composer.Toggle(target, draft, escaping, canSend, edit, script); return; } - var open = new NativeCompose(target, canSend, edit) { Body = draft.Replace("\r\n", "\n", StringComparison.Ordinal), Escaping = escaping }; + var open = new NativeCompose(target, canSend, script is null ? edit : null) + { + Body = draft.Replace("\r\n", "\n", StringComparison.Ordinal), + Escaping = escaping, + Script = script, + }; open.Session = new ComposerSession( NativeComposeModel(open), () => _composerSpelling, @@ -130,12 +135,12 @@ private void OpenComposer(string target, string draft, ComposeEscaping escaping, if (ReferenceEquals(_nativeCompose, open)) { open.Body = body; - SendComposed(new ComposeResult(body, open.Escaping, open.Edit)); + SendComposed(new ComposeResult(body, open.Escaping, open.Edit, open.Script)); } }), ToggleEscaping = () => OnUiThread(() => { - if (ReferenceEquals(_nativeCompose, open) && open.Edit is null) + if (ReferenceEquals(_nativeCompose, open) && open.Edit is null && open.Script is null) { open.Escaping = open.Escaping == ComposeEscaping.Literal ? ComposeEscaping.AsTyped : ComposeEscaping.Literal; open.Session.Publish(NativeComposeModel(open)); @@ -143,7 +148,7 @@ private void OpenComposer(string target, string draft, ComposeEscaping escaping, }), TogglePreview = () => OnUiThread(() => { - if (ReferenceEquals(_nativeCompose, open) && open.Edit is null) + if (ReferenceEquals(_nativeCompose, open) && open.Edit is null && open.Script is null) { // The cell window's fact, so F1 opens the same way in either host for the rest of the run. _composer.Preview = !_composer.Preview; @@ -152,7 +157,8 @@ private void OpenComposer(string target, string draft, ComposeEscaping escaping, }), AddWord = word => OnUiThread(() => AddComposerWord(word)), GetDictionary = () => OnUiThread(OfferDictionary), - Proportional = ComposerFaceOf(ComposeDraftKey(ActiveWindowId())), + // A script is code, and code is read in monospace whatever face the character writes posts in. + Proportional = script is null ? ComposerFaceOf(ComposeDraftKey(ActiveWindowId())) : () => false, ChooseFace = ChooseComposerFace(ComposeDraftKey(ActiveWindowId())), Closed = body => OnUiThread(() => { @@ -202,7 +208,7 @@ private Action ChooseComposerFace(string? sessionKey) => proportional => O /// The native F1's model for what it holds now; the cell window's for the same draft. private ComposerModel NativeComposeModel(NativeCompose open) => - ComposeOverlay.ModelFor(open.Target, open.Body, open.Escaping, open.Edit, open.Edit is null ? ComposerSpelling() : null, open.CanSend, _composer.Preview); + ComposeOverlay.ModelFor(open.Target, open.Body, open.Escaping, open.Edit, open.Edit is null && open.Script is null ? ComposerSpelling() : null, open.CanSend, _composer.Preview, open.Script); /// /// Closes F1, in whichever host it is open, keeping its buffer as the character's draft (or MOO edit) exactly as the @@ -219,7 +225,7 @@ private void CloseComposer() _nativeCompose = null; open.Session.End(); Host.NativeComposer?.Close(); - KeepComposeDraft(new ComposeResult(open.Body, open.Escaping, open.Edit)); + KeepComposeDraft(new ComposeResult(open.Body, open.Escaping, open.Edit, open.Script)); PublishPanels(); PublishHostChrome(); } @@ -376,6 +382,9 @@ private sealed class NativeCompose(string target, bool canSend, MooEdit? edit) internal ComposeEscaping Escaping { get; set; } + /// The script file this is an edit of, or null; its status moves with each save. + internal ScriptEdit? Script { get; set; } + internal ComposerSession Session { get; set; } = null!; } } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.NativeModals.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.NativeModals.cs index 54ef9c77..776b8675 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.NativeModals.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.NativeModals.cs @@ -121,13 +121,6 @@ private void ToggleQuit() // ── ⌃F, ⌃R, ⌥M and the welcome ────────────────────────────────────────────────────────────── - /// - /// The search for over the windows ⌃F looks in now — the one function both the cell - /// surface and the native one ask, so the two list the same rows. - /// - internal SearchModel SearchModelFor(string query, bool regex, bool all) => - SearchSurface.Compute(SearchableWindows(all), query, regex, all); - /// Opens ⌃F in the host's controls; false when the host has none. private bool TryOpenNativeSearch() { @@ -140,15 +133,19 @@ private bool TryOpenNativeSearch() session = new SearchSession( SearchModelFor(string.Empty, false, false), ThemeIsDark(), - (query, regex, all) => OnUiThread(() => + (query, regex, all, older) => OnUiThread(() => { if (ReferenceEquals(_nativeModal, session)) { - session!.Publish(SearchModelFor(query, regex, all)); + session!.Publish(SearchModelFor(query, regex, all, older)); } }), (model, index) => OnUiThread(() => GoToSearchHit(model, index)), - () => OnUiThread(() => NativeModalClosed(session!))) + () => OnUiThread(() => + { + CancelDeepSearch(); + NativeModalClosed(session!); + })) { Theme = _theme.Clone(), }; diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.ScriptConsole.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.ScriptConsole.cs index 6043d86b..4e8d9804 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.ScriptConsole.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.ScriptConsole.cs @@ -201,7 +201,8 @@ private void ShowScriptConsole() { NativeModalClosed(session!); _consoleKey = null; - })) + }), + () => OnUiThread(() => ListScriptsToEdit(fromConsole: true))) { Theme = _theme.Clone(), }; @@ -250,6 +251,9 @@ private bool ConsoleKeyPressed(ConsoleKeyInfo key) case ScriptConsoleSurface.Ask.Reload: ReloadConsoleScripts(); break; + case ScriptConsoleSurface.Ask.Edit: + EditScriptFromConsole(); + return true; } return true; diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.ScriptEdit.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.ScriptEdit.cs new file mode 100644 index 00000000..d5730ebd --- /dev/null +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.ScriptEdit.cs @@ -0,0 +1,448 @@ +using System.Globalization; +using System.Text.RegularExpressions; +using SharpMUTerm.Client.Modals; +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Core.Diagnostics; +using SharpMUTerm.Core.Session; +using SharpMUTerm.Core.Text; +using SharpMUTerm.Scripting; + +namespace SharpMUTerm.Tui; + +/// +/// Editing script files inside the client: a loop of list, open, save and reload that never leaves it. +/// +/// The list is ⌃P's (Script <name> entries, ), opened by ⌃P ▸ +/// Edit script…, the script console's ⌃E and /script edit: every .lua under the scripts folder, +/// the names the character's trigger sets give that do not exist yet, and the package scripts those sets name (read +/// only). A new one is /script new <name> (⌃P ▸ New script… puts it on the command line). +/// +/// +/// The editor is the composer's, in a script mode — the MOO edit's shape: no %r join, no escaping, no +/// spelling, lines saved as typed, lines numbered in cells, monospace in the window. ⌃S saves through +/// (the scripts folder only, temporary file and rename), reloads the character's scripts +/// and says in the editor's header and the console what the reload did, load errors with their file:line. The +/// editor stays open, so the next fix is one keystroke away; Esc closes it, keeping unsaved text for that file for the +/// run, and goes back to the console when that is where it was opened from. +/// +/// +internal sealed partial class SharpMUTermApp +{ + /// Unsaved text of each script, by name, for the run: Esc keeps it, a save lets it go. + private readonly Dictionary _scriptBuffers = new(StringComparer.Ordinal); + + /// Whether the script editor was reached from the console, so closing it goes back there. + private bool _scriptReturnToConsole; + + /// + /// Whether ⌃P lists the script files (Script …): from the first time they are asked for (Edit script…, the + /// console's ⌃E, a bare /script edit) for the run, as map find's rooms are — not in every empty palette. + /// + private bool _scriptsListed; + + /// The demo's own script, so the snapshot's editor has something to show without a scripts folder. + internal const string DemoScriptText = + "-- corvid.lua: Corvid's helpers\n" + + "\n" + + "function on_tell(line, who)\n" + + " store.set('last_tell', who)\n" + + " print('[info] tell from ' .. who)\n" + + "end\n" + + "\n" + + "function vitals_low()\n" + + " local hp = gmcp.get('Char.Vitals.hp')\n" + + " return hp ~= nil and hp < 100\n" + + "end\n" + + "\n" + + "function on_room()\n" + + " local room = map.current()\n" + + " if room then store.set('last_room', room.name) end\n" + + "end\n" + + "\n" + + "trigger.add('^(\\\\w+) tells you', 'on_tell')\n"; + + private static readonly Regex ErrorAt = new(@"(?[A-Za-z0-9_.\-]+\.lua):\(?(?\d+)", RegexOptions.CultureInvariant, TimeSpan.FromMilliseconds(50)); + + /// Whether the focused window is the demo's, in a client with no scripts folder — the snapshot's scripts. + private bool DemoScriptsShown => + _scriptsRoot is null && _workspace.FindWindow(ActiveWindowId())?.SessionKey is { } owner && IsDemoKey(owner); + + /// The script open in the editor (either host), or null. + internal ScriptEdit? OpenScriptEdit => _nativeCompose is { } open ? open.Script : _composer.IsOpen ? _composer.Script : null; + + /// Whose scripts the focused window's: its session's key, or its recorded owner's. + private string? ScriptOwner() => ComposeDraftKey(ActiveWindowId()); + + /// + /// The focused character's script files, as ⌃P lists them: the folder's .lua files, the names its trigger sets + /// give that are not there yet, and the package scripts those sets name. Each says whether this character loads it and + /// the line of its newest error in the console. + /// + internal IReadOnlyList ScriptFileRefs() + { + var owner = ScriptOwner(); + if (DemoScriptsShown) + { + return + [ + new("corvid.lua", "loaded by Corvid · ! line 14 in the console", false), + new("package:aetherfall-pack/combat.lua", "from the aetherfall-pack package · read only", true), + ]; + } + + if (_scriptsRoot is not { } root) + { + return []; + } + + var named = (owner is null ? null : FindSession(owner))?.ScriptFiles ?? []; + var errors = owner is null ? [] : ConsoleLog(owner).Lines.Where(l => l.Kind == ScriptConsoleKind.Error).Select(l => l.Text).ToArray(); + var refs = new List(); + var seen = new HashSet(StringComparer.Ordinal); + foreach (var name in ScriptFiles.List(root)) + { + seen.Add(name); + refs.Add(new ScriptFileRef(name, Describe(name, exists: true), false)); + } + + foreach (var name in named) + { + if (seen.Contains(name)) + { + continue; + } + + if (name.StartsWith(ScriptFiles.PackagePrefix, StringComparison.Ordinal)) + { + refs.Add(new ScriptFileRef(name, "from a package · read only", true)); + } + else if (ScriptFiles.Check(name) is null) + { + refs.Add(new ScriptFileRef(name, "named by a trigger set · not written yet — opening starts it", false)); + } + } + + return refs; + + string Describe(string name, bool exists) + { + var parts = new List { named.Contains(name, StringComparer.Ordinal) ? "loaded by this character" : "in the scripts folder" }; + if (LastErrorLine(errors, name) is { } line) + { + parts.Add($"! line {line.ToString(CultureInfo.InvariantCulture)} in the console"); + } + + return string.Join(" · ", parts); + } + } + + /// The line of the newest console error naming 's file, or null. + private static int? LastErrorLine(IReadOnlyList errors, string name) + { + var file = name[(name.LastIndexOf('/') + 1)..]; + for (var i = errors.Count - 1; i >= 0; i--) + { + foreach (Match match in ErrorAt.Matches(errors[i])) + { + if (string.Equals(match.Groups["file"].Value, file, StringComparison.Ordinal) + && int.TryParse(match.Groups["line"].Value, NumberStyles.None, CultureInfo.InvariantCulture, out var line)) + { + return line; + } + } + } + + return null; + } + + /// + /// ⌃P ▸ Edit script…, the console's ⌃E and a bare /script edit: the palette, opened on the script files. From + /// the console, closing the editor goes back to it. + /// + private void ListScriptsToEdit(bool fromConsole) + { + if (_scriptsRoot is null && !DemoScriptsShown) + { + RefuseCommand("this client runs no scripts — start it with a scripts folder to edit them"); + return; + } + + _scriptReturnToConsole = fromConsole; + _scriptsListed = true; + OpenMenu(Client.Commands.BuiltInCommands.ScriptEditQuery); + } + + /// The script console's ⌃E (the window's Edit a script… button): the console closes and the palette lists the files. + internal void EditScriptFromConsole() + { + if (ScriptConsoleIsOpen) + { + if (NativeModalOf(Client.Surfaces.SurfaceCatalog.ScriptConsole) is { } native) + { + CloseNativeModal(native); + } + else + { + _helpView.Close(); + } + } + + ListScriptsToEdit(fromConsole: true); + } + + /// ⌃P ▸ Script <name>: opens that file, at its newest error's line when the console has one. + private bool OpenScriptFromPalette(string name) + { + var refs = ScriptFileRefs(); + if (!refs.Any(r => r.Name == name)) + { + RefuseCommand($"{Snippet(name)} is not one of this character's scripts"); + return true; + } + + var owner = ScriptOwner(); + var errors = owner is null ? [] : ConsoleLog(owner).Lines.Where(l => l.Kind == ScriptConsoleKind.Error).Select(l => l.Text).ToArray(); + OpenScript(name, LastErrorLine(errors, name) ?? 0); + return true; + } + + /// /script, /script edit [name], /script new <name>. + private void ScriptCommand(string args) + { + var space = args.IndexOf(' '); + var verb = (space < 0 ? args : args[..space]).ToLowerInvariant(); + var rest = space < 0 ? string.Empty : args[(space + 1)..].Trim(); + switch (verb) + { + case "" or "edit" when rest.Length == 0: + ListScriptsToEdit(fromConsole: false); + return; + case "edit": + _scriptReturnToConsole = false; + OpenScript(ScriptFiles.Normalise(rest)); + return; + case "new": + _scriptReturnToConsole = false; + NewScript(rest); + return; + default: + RefuseCommand("/script edit [name] opens a script; /script new starts one"); + return; + } + } + + /// + /// /script new <name>: the name checked by the loader's own rule, then the editor on the template. Nothing is + /// written until ⌃S. A name that already exists opens that file instead, and says so. + /// + internal void NewScript(string typed) + { + if (_scriptsRoot is not { } root) + { + RefuseCommand("this client runs no scripts — start it with a scripts folder to write them"); + return; + } + + var name = ScriptFiles.Normalise(typed); + var (path, error) = ScriptFiles.PathOf(root, name); + if (path is null) + { + RefuseCommand(error ?? "that is not a script's name"); + return; + } + + if (File.Exists(path)) + { + Notice($"{Snippet(name)} already exists — opened it", MessageSeverity.Info); + } + + OpenScript(name); + } + + /// + /// Opens script in the composer's script mode: a package's read-only, anything else from the + /// scripts folder (the template when it does not exist yet), or the unsaved text Esc kept for it. + /// + internal void OpenScript(string name, int line = 0) + { + if (ComposerOpen || AnyOverlayOpen) + { + RefuseCommand($"close {(ComposerOpen ? "the composer" : OpenOverlayName())} first — the script editor cannot open over it"); + return; + } + + var package = name.StartsWith(ScriptFiles.PackagePrefix, StringComparison.Ordinal); + string text; + if (DemoScriptsShown) + { + text = package ? "-- combat.lua, from the aetherfall-pack package\nfunction on_hit(line) print('hit!') end\n" : DemoScriptText; + } + else if (package) + { + if (_packages.ResolveScript(name) is not { } path || !File.Exists(path) || new FileInfo(path).Length > ScriptFiles.MaxBytes) + { + RefuseCommand($"{Snippet(name)} is not in an installed package"); + return; + } + + text = File.ReadAllText(path).Replace("\r\n", "\n", StringComparison.Ordinal); + } + else if (_scriptsRoot is not { } root) + { + RefuseCommand("this client runs no scripts — start it with a scripts folder to edit them"); + return; + } + else + { + var (path, error) = ScriptFiles.PathOf(root, name); + if (path is null) + { + RefuseCommand(error ?? "that is not a script's name"); + return; + } + + if (File.Exists(path)) + { + var (read, problem) = ScriptFiles.Read(root, name); + if (read is null) + { + RefuseCommand(problem ?? $"{Snippet(name)} could not be read"); + return; + } + + text = read; + } + else + { + text = ScriptFiles.Template; + } + } + + string? status = null; + if (!package && _scriptBuffers.TryGetValue(name, out var kept)) + { + text = kept; + status = "unsaved text kept from earlier · ⌃S saves it"; + } + + var owner = ScriptOwner(); + var session = owner is null ? null : FindSession(owner); + var target = session is not null + ? SessionTitle(session) + : owner is not null ? FindCharacter(owner)?.Character.Name ?? string.Empty : string.Empty; + OpenComposer(target, text, ComposeEscaping.AsTyped, canSend: true, edit: null, script: new ScriptEdit(name, owner, package, status, line)); + } + + /// + /// ⌃S on a script: written atomically under the scripts folder only, then the character's scripts reloaded, and what + /// that did said in the editor's header and the console. The editor stays open. + /// + private void SaveScriptEdit(ScriptEdit script, string body) + { + if (script.ReadOnly) + { + RefuseCommand($"{Snippet(script.Name)} is a package's script and is only read — copy what you need into a script of your own"); + return; + } + + if (DemoScriptsShown) + { + SetScriptStatus("! the demo saves nothing"); + RefuseCommand("the demo saves nothing — run the client with a scripts folder"); + return; + } + + if (_scriptsRoot is not { } root) + { + RefuseCommand("this client runs no scripts"); + return; + } + + if (ScriptFiles.Save(root, script.Name, body) is { } refusal) + { + SetScriptStatus("! not saved: " + refusal); + RefuseCommand(refusal); + return; + } + + _scriptBuffers.Remove(script.Name); + var status = $"saved {DateTime.Now:HH:mm:ss}"; + var session = script.Owner is null ? null : FindSession(script.Owner); + if (session is null || !_scripts.TryGetValue(session, out var scripts)) + { + status += " · not reloaded — no connection"; + } + else if (!scripts.Files.Contains(script.Name, StringComparer.Ordinal) && !session.ScriptFiles.Contains(script.Name, StringComparer.Ordinal)) + { + status += " · not loaded — name it in a trigger set's scripts (F5)"; + } + else + { + var log = ConsoleLog(session.SessionKey); + var before = log.Count; + scripts.Reload(); + var errors = log.Lines.Skip(before).Where(l => l.Kind == ScriptConsoleKind.Error).Select(l => l.Text).ToList(); + log.Add(ScriptConsoleKind.Note, $"saved {script.Name} · reloaded · {ScriptsLoaded(scripts)}"); + status = errors.Count == 0 + ? $"{status} · reloaded · {ScriptsLoaded(scripts)}" + : $"! {errors[0]}{(errors.Count > 1 ? $" (+{errors.Count - 1} more in the console)" : string.Empty)}"; + RefreshConsole(); + } + + SetScriptStatus(status); + Notice($"{Snippet(script.Name)}: {status.TrimStart('!', ' ')}", status.StartsWith('!') ? MessageSeverity.Warning : MessageSeverity.Info, toast: false); + } + + /// Says what the last save did in the open script editor's header, in either host. + private void SetScriptStatus(string status) + { + if (_nativeCompose is { Script: { } script } open) + { + open.Script = script with { Status = status }; + open.Session.Publish(NativeComposeModel(open)); + return; + } + + _composer.SetScriptStatus(status); + } + + /// + /// The script editor closed: unsaved text is kept for that file for the run (nothing is kept when it matches the + /// file), and an editor opened from the console goes back to it. + /// + private void KeepScriptBuffer(ScriptEdit script, string body) + { + if (!script.ReadOnly && !DemoScriptsShown && _scriptsRoot is { } root) + { + var (onDisk, _) = ScriptFiles.Read(root, script.Name); + var normalised = body.Replace("\r\n", "\n", StringComparison.Ordinal); + if (string.Equals(normalised.TrimEnd('\n'), (onDisk ?? ScriptFiles.Template).TrimEnd('\n'), StringComparison.Ordinal)) + { + _scriptBuffers.Remove(script.Name); + } + else + { + _scriptBuffers[script.Name] = normalised; + } + } + + if (_scriptReturnToConsole) + { + _scriptReturnToConsole = false; + OnUiThread(() => + { + if (!ScriptConsoleIsOpen && !AnyOverlayOpen && !ComposerOpen) + { + ShowScriptConsole(); + } + }); + } + } + + /// The unsaved text kept for a script, for the tests. + internal string? KeptScriptText(string name) => _scriptBuffers.GetValueOrDefault(name); + + /// A character's console lines of a kind, for the tests. + internal IReadOnlyList ConsoleTexts(string key, ScriptConsoleKind kind) => + [.. ConsoleLog(key).Lines.Where(l => l.Kind == kind).Select(l => l.Text)]; +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 295f88df..fe0a63ea 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -962,7 +962,7 @@ public SharpMUTermApp( HistoryBarLabel, InsertHistoryEntry); - _search = new SearchSurface(_system, SearchModelFor, GoToSearchHit); + _search = new SearchSurface(_system, SearchModelFor, GoToSearchHit, CancelDeepSearch); SchemePopups(); _window.OnResize += (_, _) => @@ -1654,6 +1654,13 @@ public string RenderSnapshot(string? view = null) // what the real filter produced rather than an impression of it. if (view is not null && view.StartsWith("search", StringComparison.OrdinalIgnoreCase)) { + // `search-older` is ⌥H over the demo's own older history (an evening of the same streets, thousands of lines + // past the pane's), and `search-history` is ⏎ on its first older hit: the read-only history view. + var olderView = string.Equals(view, "search-older", StringComparison.OrdinalIgnoreCase) + || string.Equals(view, "search-history", StringComparison.OrdinalIgnoreCase); + var historyView = string.Equals(view, "search-history", StringComparison.OrdinalIgnoreCase); + _deepInline = true; + // A split first, so the pane is narrower than the terminal. That is the geometry that catches // a landing scrolled to the wrong row — a buffer index is not a viewport row, and in a narrow // pane almost every line wraps. @@ -1692,7 +1699,14 @@ public string RenderSnapshot(string? view = null) { var all = string.Equals(view, "search-all", StringComparison.OrdinalIgnoreCase); var regex = string.Equals(view, "search-regex", StringComparison.OrdinalIgnoreCase); - NativeSearch!.Search(regex ? @"gobl\w+ (corpse|for)" : "goblin", regex, all); + NativeSearch!.Search(regex ? @"gobl\w+ (corpse|for)" : "goblin", regex, all, olderView); + if (historyView && NativeSearch is { } older && older.Model.HeldRows < older.Model.Rows.Count) + { + var hits = older.Model; + CloseNativeModal(older); + GoToSearchHit(hits, hits.HeldRows); + } + if (string.Equals(view, "search-landed", StringComparison.OrdinalIgnoreCase) && NativeSearch is { } landing && landing.Model.Rows.Count > 0) { var hits = landing.Model; @@ -1719,6 +1733,21 @@ public string RenderSnapshot(string? view = null) SimulateSearchTyping("goblin"); } + if (olderView) + { + SimulateSearchKey(new ConsoleKeyInfo('\0', ConsoleKey.H, false, true, false)); + } + + if (historyView) + { + for (var i = 0; i < (_search.Model?.HeldRows ?? 0); i++) + { + SimulateSearchKey(new ConsoleKeyInfo('\0', ConsoleKey.DownArrow, false, false, false)); + } + + SimulateSearchKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false)); + } + if (string.Equals(view, "search-landed", StringComparison.OrdinalIgnoreCase)) { SimulateSearchKey(new ConsoleKeyInfo('\0', ConsoleKey.DownArrow, false, false, false)); @@ -1912,6 +1941,20 @@ public string RenderSnapshot(string? view = null) } } + // The script editing loop over the demo's scripts: ⌃P's list of them (`script-list`), and the demo's corvid.lua + // open in the composer's script mode with the caret on the line a reload's error named (`script-edit`). The demo + // saves nothing, so the header's error is the one a live save of this file would put there. + if (string.Equals(view, "script-list", StringComparison.OrdinalIgnoreCase)) + { + DispatchCommand(SharpMUTerm.Client.Commands.BuiltInCommands.ScriptEditCommand); + } + + if (string.Equals(view, "script-edit", StringComparison.OrdinalIgnoreCase)) + { + OpenScript("corvid.lua", 14); + SetScriptStatus("! corvid.lua:(14,22-30): attempt to index a nil value (local 'room')"); + } + // GMCP channel capture, the highlight-names list and a scene log, over the demo (scripting wave). if (RenderScriptingWaveScene(view) is { } scriptingFrame) { @@ -4947,8 +4990,17 @@ private bool RemoveAwayBar(string windowId) /// a search bar was on screen, which is a defect nobody would connect to search. /// /// - private void GoToSearchHit(SearchModel model, int index) => - GoToSearchHit(model.Rows[index], model.Query, model.Regex, model.AllWindows, index + 1, model.Rows.Count); + private void GoToSearchHit(SearchModel model, int index) + { + if (model.Rows[index].IsOlder) + { + // A hit in older history: the pane if it still holds the line, else the read-only history view. + GoToOlderHit(model, model.Rows[index]); + return; + } + + GoToSearchHit(model.Rows[index], model.Query, model.Regex, model.AllWindows, index + 1, model.HeldRows); + } /// Goes to , the th of hits for a search. private void GoToSearchHit(SearchRow row, string query, bool regex, bool all, int ordinal, int total) @@ -5246,6 +5298,14 @@ private void OnCommandEntered(InputBar bar, string command) return; } + // `/script edit|new ` opens a script file from the scripts folder in the editor. + if (command.StartsWith("/script", StringComparison.OrdinalIgnoreCase) + && (command.Length == 7 || command[7] == ' ')) + { + ScriptCommand(command[7..].Trim()); + return; + } + // `/package` opens the Packages screen; `/package install …` reads one for review. if (command.StartsWith("/package", StringComparison.OrdinalIgnoreCase) && (command.Length == 8 || command[8] == ' ')) @@ -5430,6 +5490,13 @@ session is not null /// private void SendComposed(ComposeResult result) { + // A script is saved to disk, not sent: it needs no connection, only the scripts folder. + if (result.Script is { } script) + { + SaveScriptEdit(script, result.Body); + return; + } + var windowId = ActiveWindowId(); if (WindowSession(windowId) is not { } session) { @@ -5468,6 +5535,13 @@ private void SendComposed(ComposeResult result) /// private void KeepComposeDraft(ComposeResult result) { + // A script's unsaved text is kept by file, apart from the post drafts and the MOO edits. + if (result.Script is { } script) + { + KeepScriptBuffer(script, result.Body); + return; + } + if (ComposeDraftKey(ActiveWindowId()) is not { } key) { return; @@ -5832,7 +5906,7 @@ private string OpenOverlayName() => : _search.IsOpen ? "the search surface" : _prefixPanel.IsOpen ? "the pane keys panel" : _welcomeView.IsOpen ? "the welcome" - : _helpView.IsOpen ? (_helpView.Mode switch { "dictionary" => "the dictionary offer", "import" => "the import review", "script-console" => "the script console", _ => "help" }) + : _helpView.IsOpen ? (_helpView.Mode switch { "dictionary" => "the dictionary offer", "import" => "the import review", "script-console" => "the script console", "history-view" => "the history view", _ => "help" }) : "what is open"; /// Whether either bar is holding unsent text — what the ✎ tab marker means. @@ -8510,7 +8584,8 @@ private CommandContext CommandState() NoDictionary: NoOwnDictionary, SceneLogging: _sceneLogs.ContainsKey(ActiveWindowId()), NewConfiguration: _config.Worlds.Count == 0 || _config.KeyTourPending, - MapFound: MapFoundRooms()); + MapFound: MapFoundRooms(), + ScriptFiles: !_scriptsListed || (_scriptsRoot is null && !DemoScriptsShown) ? null : ScriptFileRefs()); } /// @@ -8781,6 +8856,11 @@ private bool RunBuiltInCommand(string id) return true; } + if (id.StartsWith(SharpMUTerm.Client.Commands.BuiltInCommands.ScriptOpenPrefix, StringComparison.Ordinal)) + { + return OpenScriptFromPalette(id[SharpMUTerm.Client.Commands.BuiltInCommands.ScriptOpenPrefix.Length..]); + } + if (id.StartsWith(SharpMUTerm.Client.Commands.BuiltInCommands.MapWalkPrefix, StringComparison.Ordinal)) { return WalkToFoundRoom(id[SharpMUTerm.Client.Commands.BuiltInCommands.MapWalkPrefix.Length..]); @@ -9079,6 +9159,12 @@ private bool RunBuiltInCommand(string id) case Client.Commands.BuiltInCommands.ScriptConsoleCommand: ShowScriptConsole(); break; + case Client.Commands.BuiltInCommands.ScriptEditCommand: + ListScriptsToEdit(fromConsole: false); + break; + case Client.Commands.BuiltInCommands.ScriptNewCommand: + PlaceGrab(ActiveBar(), "/script new "); + break; case Client.Commands.BuiltInCommands.SceneStartCommand: StartSceneLog(); break; diff --git a/src/SharpMUTerm.Tui/SnapshotViews.cs b/src/SharpMUTerm.Tui/SnapshotViews.cs index e759351c..b643b93e 100644 --- a/src/SharpMUTerm.Tui/SnapshotViews.cs +++ b/src/SharpMUTerm.Tui/SnapshotViews.cs @@ -29,6 +29,6 @@ internal static class SnapshotViews "packages", "package-review", "package-browse", "send-menu", "layouts", "layout-combat", "layout-roleplay", "panel-who", "panel-vitals", "panel-quickbar", "panel-composer", "welcome", "welcome-connect", "tour", "reconnect", "help", "help-topic", "dictionary-offer", "import-review", "join-wraps", "join-wraps-f5", - "script-console", "channel-capture", "highlight-names", "channels-f5", "scene-log", + "script-console", "script-list", "script-edit", "search-older", "search-history", "channel-capture", "highlight-names", "channels-f5", "scene-log", ]; } diff --git a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs index f94aafe8..73846b6f 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs @@ -206,7 +206,7 @@ await Assert.That(Rows(palette.Session!.View(query))).IsEquivalentTo(Rows(drawn! // F1: the window's editor is handed the model the cell window draws for the same draft, in each mode and for a // MOO edit. Two clients, one with the window's editor and one without, opened on the same scene. - foreach (var view in new[] { "compose", "compose-literal", "compose-preview", "moo-edit" }) + foreach (var view in new[] { "compose", "compose-literal", "compose-preview", "moo-edit", "script-edit" }) { using var nativeDriver = new AvaloniaConsoleDriver(140, 36); var composer = new FakeComposer(); @@ -260,6 +260,8 @@ await Assert.That(Rows(palette.Session!.View(query))).IsEquivalentTo(Rows(drawn! (SurfaceCatalog.Dictionary, "dictionary-offer"), (SurfaceCatalog.Import, "import-review"), (SurfaceCatalog.ScriptConsole, "script-console"), + (SurfaceCatalog.Search, "search-older"), + (SurfaceCatalog.HistoryView, "search-history"), }) { using var nativeDriver = new AvaloniaConsoleDriver(140, 36); @@ -842,8 +844,35 @@ await SameModal("script console: delete key", "script-console", await SameModal("script console: reload", "script-console", (app, m) => ((ScriptConsoleSession)m.Open(SurfaceCatalog.ScriptConsole)!).Reload(), app => app.SimulateConsoleKey(new ConsoleKeyInfo('\f', ConsoleKey.L, false, false, true))); + await SameModal("script console: edit a script", "script-console", + (app, m) => ((ScriptConsoleSession)m.Open(SurfaceCatalog.ScriptConsole)!).EditScript(), + app => app.SimulateConsoleKey(new ConsoleKeyInfo('\u0005', ConsoleKey.E, false, false, true))); probed.Add(SurfaceCatalog.ScriptConsole); + // ⌃F's older history: ⌥H then ⏎ on the first older hit opens the history view on the same page in both; and the + // history view's one move, a page down, reads the same page in both. + await SameModal("search: older history", "search", + (app, m) => + { + var search = (SearchSession)m.Open(SurfaceCatalog.Search)!; + search.Search(search.Model.Query, false, false, true); + search.Go(search.Model.HeldRows); + }, + app => + { + app.SimulateSearchKey(new ConsoleKeyInfo('\0', ConsoleKey.H, false, true, false)); + for (var i = 0; i < app.SearchModelFor("goblin", false, false, true).HeldRows; i++) + { + app.SimulateSearchKey(new ConsoleKeyInfo('\0', ConsoleKey.DownArrow, false, false, false)); + } + + app.SimulateSearchKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false)); + }); + await SameModal("history view: scroll", "search-history", + (app, m) => ((ScrollbackViewSession)m.Open(SurfaceCatalog.HistoryView)!).Key(ConsoleKey.PageDown), + app => app.SimulateHelpKey(new ConsoleKeyInfo('\0', ConsoleKey.PageDown, false, false, false))); + probed.Add(SurfaceCatalog.HistoryView); + var acting = SurfaceCatalog.All.Where(s => s.HasNative && s.Actions.Count > 0).Select(s => s.Id); // The tab overflow chip: an entry chosen from the window's menu and the same digit in the cell list bring the same // hidden tab forward. @@ -1095,6 +1124,7 @@ private static void HelpKeysTo(SharpMUTermApp app, Func match) DictionaryOfferSession offer => offer.Model, ImportReviewSession import => import.Model, ScriptConsoleSession console => console.Model, + ScrollbackViewSession history => history.Model, _ => throw new ArgumentException(session.GetType().Name), }; @@ -1119,6 +1149,7 @@ private static string Outcome(SharpMUTermApp app) => string.Join( "import=" + app.ImportReviewOpen + " " + string.Join(",", app.Configuration.TriggerSets.Select(s => s.Name + ":" + s.Triggers.Count)) + " " + string.Join(",", app.Configuration.Worlds.SelectMany(w => w.Characters).Select(c => c.Name + (c.Password is null ? string.Empty : "*"))), "console=" + app.ScriptConsoleIsOpen + " " + ConsoleState(app), + "older=" + (app.HistoryViewModel is { } page ? $"{page.Window}:{page.Top}:{page.Marked}" : "shut"), "quick=" + app.LastQuickMacro, "walk=" + app.WalkState, "map=" + app.MapDigest(), diff --git a/tests/SharpMUTerm.Core.Tests/Text/ScrollbackSearchTests.cs b/tests/SharpMUTerm.Core.Tests/Text/ScrollbackSearchTests.cs new file mode 100644 index 00000000..8eeb63b8 --- /dev/null +++ b/tests/SharpMUTerm.Core.Tests/Text/ScrollbackSearchTests.cs @@ -0,0 +1,119 @@ +using SharpMUTerm.Core.Text; + +namespace SharpMUTerm.Core.Tests.Text; + +/// +/// ⌃F's older-history walk (⌥H): newest first, across the ring and the file-backed spill, in ranged reads, skipping what +/// the pane holds, stopping at the cap, on cancellation and on a pattern that does not parse. +/// +public class ScrollbackSearchTests +{ + private static ScrollbackBuffer Buffer(int lines, int capacity = 10_000, IScrollbackSpill? spill = null, Func? text = null) + { + var buffer = new ScrollbackBuffer(capacity, spill); + for (var i = 0; i < lines; i++) + { + buffer.Append(StyledLine.FromText(text?.Invoke(i) ?? $"line {i}", TextStyle.Default)); + } + + return buffer; + } + + [Test] + public async Task HitsAreListedNewestFirstWithTheirAbsoluteIndex() + { + var buffer = Buffer(100, text: i => i % 30 == 0 ? $"goblin {i}" : $"street {i}"); + + var result = ScrollbackSearch.Run(buffer, "GOBLIN", false, null, null, CancellationToken.None, chunk: 7); + + await Assert.That(result!.Done).IsTrue(); + await Assert.That(result.Found.Select(m => m.Index).ToArray()).IsEquivalentTo(new long[] { 90, 60, 30, 0 }); + await Assert.That(result.Found[0].Line.Text).IsEqualTo("goblin 90"); + await Assert.That(result.Found[0].MatchStart).IsEqualTo(0); + await Assert.That(result.Found[0].MatchLength).IsEqualTo(6); + await Assert.That(result.Searched).IsEqualTo(100); + } + + [Test] + public async Task LinesThePaneHoldsAreSkipped() + { + var buffer = Buffer(10, text: i => $"goblin {i}"); + var held = buffer.GetRange(5, 5).ToHashSet(ReferenceEqualityComparer.Instance); + + var result = ScrollbackSearch.Run(buffer, "goblin", false, line => held.Contains(line), null, CancellationToken.None); + + await Assert.That(result!.Found.Select(m => m.Index).ToArray()).IsEquivalentTo(new long[] { 4, 3, 2, 1, 0 }); + } + + [Test] + public async Task ProgressIsReportedAfterEveryChunk() + { + var buffer = Buffer(25, text: i => $"goblin {i}"); + var reports = new List(); + + ScrollbackSearch.Run(buffer, "goblin", false, null, reports.Add, CancellationToken.None, chunk: 10); + + await Assert.That(reports.Count).IsEqualTo(3); + await Assert.That(reports[0].Found.Count).IsEqualTo(10); + await Assert.That(reports[0].Done).IsFalse(); + await Assert.That(reports[^1].Done).IsTrue(); + } + + [Test] + public async Task ACancelledWalkReportsNothingFurther() + { + var buffer = Buffer(50, text: i => $"goblin {i}"); + using var cancel = new CancellationTokenSource(); + var reports = 0; + + var result = ScrollbackSearch.Run(buffer, "goblin", false, null, _ => { reports++; cancel.Cancel(); }, cancel.Token, chunk: 10); + + await Assert.That(result).IsNull(); + await Assert.That(reports).IsEqualTo(1); + } + + [Test] + public async Task TheWalkStopsAtTheCapAndSaysSo() + { + var buffer = Buffer(ScrollbackSearch.MaxHits + 200, text: i => $"goblin {i}"); + + var result = ScrollbackSearch.Run(buffer, "goblin", false, null, null, CancellationToken.None, chunk: 64); + + await Assert.That(result!.Capped).IsTrue(); + await Assert.That(result.Found.Count).IsEqualTo(ScrollbackSearch.MaxHits); + } + + [Test] + public async Task APatternThatDoesNotParseIsAnErrorNotAThrow() + { + var buffer = Buffer(10); + + var result = ScrollbackSearch.Run(buffer, "gob(lin", true, null, null, CancellationToken.None); + + await Assert.That(result!.Error).IsNotNull(); + await Assert.That(result.Found.Count).IsEqualTo(0); + } + + [Test] + public async Task TheSpillBehindTheRingIsSearchedToo() + { + var root = Path.Combine(Path.GetTempPath(), $"smuterm-deep-{Guid.NewGuid():N}"); + Directory.CreateDirectory(root); + try + { + using var spill = new FileScrollbackSpill(new ScrollbackSpillOptions { Directory = root }); + var buffer = Buffer(3_000, capacity: 200, spill: spill, text: i => i == 17 ? "the old goblin" : $"street {i}"); + + var result = ScrollbackSearch.Run(buffer, "goblin", false, null, null, CancellationToken.None, chunk: 500); + + // Line 17 left the 200-line ring long ago: only the spill holds it. + await Assert.That(buffer.OldestIndex).IsLessThanOrEqualTo(17); + await Assert.That(result!.Found.Select(m => m.Index).ToArray()).IsEquivalentTo(new long[] { 17 }); + await Assert.That(result.Searched).IsEqualTo(buffer.AvailableLines); + } + finally + { + Directory.Delete(root, recursive: true); + } + } +} diff --git a/tests/SharpMUTerm.Scripting.Tests/ScriptFilesTests.cs b/tests/SharpMUTerm.Scripting.Tests/ScriptFilesTests.cs new file mode 100644 index 00000000..8625ea3b --- /dev/null +++ b/tests/SharpMUTerm.Scripting.Tests/ScriptFilesTests.cs @@ -0,0 +1,138 @@ +using SharpMUTerm.Core.Automation; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Session; + +namespace SharpMUTerm.Scripting.Tests; + +/// +/// The script editing loop's file half: names are held to the scripts folder (the same rule a trigger set's file is), a +/// save is atomic and lands only under the root, and a reload after a save reports the error with its file and line. +/// +public class ScriptFilesTests +{ + private sealed class Root : IDisposable + { + public Root() => Path = Directory.CreateTempSubdirectory("sharpmuterm-scriptfiles-").FullName; + + public string Path { get; } + + public void Dispose() => Directory.Delete(Path, recursive: true); + } + + [Test] + [Arguments("../escape.lua")] + [Arguments("a/../../escape.lua")] + [Arguments("/etc/passwd.lua")] + [Arguments("C:/x.lua")] + [Arguments("a\\b.lua")] + [Arguments("./a.lua")] + [Arguments("a//b.lua")] + [Arguments("notes.txt")] + [Arguments("")] + [Arguments("bell\u0007.lua")] + public async Task ANameThatCouldLeaveTheFolderIsRefused(string name) + { + using var root = new Root(); + + await Assert.That(ScriptFiles.Check(name)).IsNotNull(); + await Assert.That(ScriptFiles.PathOf(root.Path, name).Path).IsNull(); + await Assert.That(ScriptFiles.Save(root.Path, name, "x = 1")).IsNotNull(); + await Assert.That(Directory.EnumerateFileSystemEntries(root.Path).Any()).IsFalse(); + } + + [Test] + public async Task ANameIsGivenItsExtension() + { + await Assert.That(ScriptFiles.Normalise(" combat ")).IsEqualTo("combat.lua"); + await Assert.That(ScriptFiles.Normalise("lib/util.lua")).IsEqualTo("lib/util.lua"); + await Assert.That(ScriptFiles.Check("lib/util.lua")).IsNull(); + } + + [Test] + public async Task ASaveWritesTheFileUnderTheRootAndLeavesNoTemporaryFile() + { + using var root = new Root(); + + var error = ScriptFiles.Save(root.Path, "lib/util.lua", "x = 1\r\ny = 2"); + + await Assert.That(error).IsNull(); + await Assert.That(File.ReadAllText(Path.Combine(root.Path, "lib", "util.lua"))).IsEqualTo("x = 1\ny = 2\n"); + await Assert.That(Directory.EnumerateFiles(root.Path, "*", SearchOption.AllDirectories).Count()).IsEqualTo(1); + await Assert.That(ScriptFiles.List(root.Path).ToArray()).IsEquivalentTo(new[] { "lib/util.lua" }); + await Assert.That(ScriptFiles.Read(root.Path, "lib/util.lua").Text).IsEqualTo("x = 1\ny = 2\n"); + } + + [Test] + public async Task ASaveReplacesTheWholeFile() + { + using var root = new Root(); + ScriptFiles.Save(root.Path, "a.lua", new string('-', 4_000)); + + ScriptFiles.Save(root.Path, "a.lua", "short = true"); + + await Assert.That(File.ReadAllText(Path.Combine(root.Path, "a.lua"))).IsEqualTo("short = true\n"); + } + + [Test] + public async Task ANewScriptDoesNotOverwriteOne() + { + using var root = new Root(); + ScriptFiles.Save(root.Path, "a.lua", "kept = true"); + + var error = ScriptFiles.Save(root.Path, "a.lua", "lost = true", mustBeNew: true); + + await Assert.That(error).IsNotNull(); + await Assert.That(File.ReadAllText(Path.Combine(root.Path, "a.lua"))).IsEqualTo("kept = true\n"); + } + + [Test] + public async Task ASaveThroughALinkOutOfTheFolderIsRefused() + { + if (OperatingSystem.IsWindows()) + { + return; + } + + using var root = new Root(); + using var outside = new Root(); + Directory.CreateSymbolicLink(Path.Combine(root.Path, "away"), outside.Path); + + var error = ScriptFiles.Save(root.Path, "away/x.lua", "x = 1"); + + await Assert.That(error).IsNotNull(); + await Assert.That(Directory.EnumerateFiles(outside.Path).Any()).IsFalse(); + } + + [Test] + public async Task ASaveIntoAFolderThatIsNotThereIsRefused() + { + var missing = Path.Combine(Path.GetTempPath(), $"sharpmuterm-none-{Guid.NewGuid():N}"); + + await Assert.That(ScriptFiles.Save(missing, "a.lua", "x = 1")).IsNotNull(); + await Assert.That(Directory.Exists(missing)).IsFalse(); + } + + [Test] + public async Task AReloadAfterASaveReportsTheErrorWithItsFileAndLine() + { + using var root = new Root(); + ScriptFiles.Save(root.Path, "main.lua", "function ok() return 1 end"); + var set = new TriggerSet { Name = "s", ScriptFiles = { "main.lua" } }; + var session = new WorldSession( + new WorldDefinition { Name = "T", Host = "h", Port = 1 }, + triggerSets: new[] { set }, + sessionFactory: _ => new FakeTelnetSession()); + var reports = new List(); + using var scripts = new SessionScripts(session, root.Path, reports.Add); + scripts.Reload(); + await Assert.That(reports.Count).IsEqualTo(0); + await Assert.That(scripts.Defines("ok")).IsTrue(); + + ScriptFiles.Save(root.Path, "main.lua", "function ok() return 1 end\n\nfunction broken(\n"); + scripts.Reload(); + + await Assert.That(reports.Count).IsGreaterThan(0); + await Assert.That(reports[0]).Contains("main.lua"); + await Assert.That(System.Text.RegularExpressions.Regex.IsMatch(reports[0], @"main\.lua:\(?\d+")).IsTrue(); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/DeepSearchTests.cs b/tests/SharpMUTerm.Tui.Tests/DeepSearchTests.cs new file mode 100644 index 00000000..4726a9c4 --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/DeepSearchTests.cs @@ -0,0 +1,137 @@ +using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Modals; +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Graphics; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// ⌃F's older-history step (⌥H): the session's scrollback behind the pane is searched, its hits listed after the pane's +/// as "older", ⏎ on one opens the read-only history view on a page around it (or goes to the pane while it still holds +/// the line), and a capture window, which keeps no older history, says so. +/// +[NotInParallel] +public class DeepSearchTests +{ + private const string Ann = "Convergence.Ann"; + + private static readonly ConsoleKeyInfo AltH = new('\0', ConsoleKey.H, false, true, false); + private static readonly ConsoleKeyInfo Enter = new('\r', ConsoleKey.Enter, false, false, false); + private static readonly ConsoleKeyInfo Down = new('\0', ConsoleKey.DownArrow, false, false, false); + + private static readonly TerminalCapabilities Headless = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + /// A connected Ann whose pane holds the newest 40 lines of 400, with goblins at lines 10 and 395. + private static async Task Live() + { + var config = new AppConfiguration { PaneLines = 40 }; + config.Worlds.Add(new WorldDefinition + { + Name = "Convergence", + Host = "convergence.example", + Port = 4201, + Characters = { new CharacterDefinition { Name = "Ann", Logging = new LoggingSettings() } }, + }); + Console.SetIn(TextReader.Null); + var wire = new RecordingTelnetSession(); + var app = new SharpMUTermApp(config, Headless, new HeadlessConsoleDriver(120, 32)); + app.TelnetFactory = _ => wire; + app.DispatchCommand(CommandIds.Character(Ann)); + await app.FindSession(Ann)!.ConnectAsync(); + for (var i = 0; i < 400; i++) + { + wire.Receive(i is 10 or 395 ? $"a goblin, line {i}" : $"street {i}"); + } + + app.RenderNextFrame(); + return app; + } + + [Test] + public async Task WithoutAltHTheBoundSaysOlderHistoryCanBeSearched() + { + await using var app = await Live(); + + var model = app.SearchModelFor("goblin", false, false); + + await Assert.That(model.Rows.Count).IsEqualTo(1); + await Assert.That(model.Rows[0].IsOlder).IsFalse(); + await Assert.That(model.HistoryNote).Contains("⌥H searches older history"); + } + + [Test] + public async Task AltHListsTheScrollbacksHitsAfterThePanesAndNeverTwice() + { + await using var app = await Live(); + + var model = app.SearchModelFor("goblin", false, false, older: true); + + // The pane's own hit (line 395) once, then line 10 from the scrollback behind it. + await Assert.That(model.Rows.Count).IsEqualTo(2); + await Assert.That(model.Rows[0].IsOlder).IsFalse(); + await Assert.That(model.Rows[1].IsOlder).IsTrue(); + await Assert.That(model.Rows[1].Text).IsEqualTo("a goblin, line 10"); + await Assert.That(model.HeldRows).IsEqualTo(1); + await Assert.That(model.HistoryRunning).IsFalse(); + await Assert.That(model.HistoryNote).Contains("1 found"); + await Assert.That(model.StateText).Contains("older history"); + } + + [Test] + public async Task EnterOnAnOlderHitOpensTheHistoryViewAroundIt() + { + await using var app = await Live(); + app.OpenSearchForSnapshot(); + app.SimulateSearchTyping("goblin"); + app.SimulateSearchKey(AltH); + await Assert.That(app.SearchRows.Count).IsEqualTo(2); + + app.SimulateSearchKey(Down); + app.SimulateSearchKey(Enter); + + await Assert.That(app.SearchIsOpen).IsFalse(); + await Assert.That(app.HistoryViewIsOpen).IsTrue(); + var page = app.HistoryViewModel!; + await Assert.That(page.Lines.Count).IsEqualTo(ScrollbackViewModel.PageRows); + await Assert.That(page.Lines.Any(l => l.Index == page.Marked && l.Text == "a goblin, line 10")).IsTrue(); + await Assert.That(page.Title).Contains("read only"); + + // A move is a ranged read from the scrollback, never the pane. + app.ScrollHistoryView(page.Top + 5); + await Assert.That(app.HistoryViewModel!.Top).IsEqualTo(page.Top + 5); + await Assert.That(app.HistoryViewModel!.Lines[0].Text).IsEqualTo(app.FindSession(Ann)!.Scrollback.GetRange(page.Top + 5, 1)[0].Text); + } + + [Test] + public async Task AnOlderHitThePaneStillHoldsGoesToThePane() + { + await using var app = await Live(); + var model = app.SearchModelFor("goblin", false, false, older: true); + var held = model.Rows[0]; + + // The same line, as if it had been found in the scrollback: ⏎ goes to the pane, not the history view. + var session = app.FindSession(Ann)!; + var index = session.Scrollback.TotalLines - 5; + var asOlder = held with { LineIndex = -1, History = index, SessionKey = Ann }; + var rows = new List(model.Rows) { asOlder }; + app.GoToSearchHitForTest(model with { Rows = rows }, rows.Count - 1); + + await Assert.That(app.HistoryViewIsOpen).IsFalse(); + } + + [Test] + public async Task TheDemosCaptureWindowSaysItKeepsNoOlderHistory() + { + Console.SetIn(TextReader.Null); + await using var app = new SharpMUTermApp(DemoScene.Build(), Headless, new HeadlessConsoleDriver(120, 32)); + app.RenderSnapshot(); + app.SimulateWindowChange(DemoScene.ChatWindowId); + + var model = app.SearchModelFor("goblin", false, false, older: true); + + await Assert.That(model.HistoryNote).Contains("keeps no older history"); + await Assert.That(model.Rows.Any(r => r.IsOlder)).IsFalse(); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/ScriptEditLoopTests.cs b/tests/SharpMUTerm.Tui.Tests/ScriptEditLoopTests.cs new file mode 100644 index 00000000..f9d0a952 --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/ScriptEditLoopTests.cs @@ -0,0 +1,196 @@ +using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Commands; +using SharpMUTerm.Client.Modals; +using SharpMUTerm.Core.Automation; +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Graphics; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// The script editing loop from the client's side: ⌃P lists the character's scripts, one opens in the composer's script +/// mode (lines verbatim, no escaping, no spelling), ⌃S writes it under the scripts folder and reloads that character's +/// scripts, and a reload's error is said in the editor's header with its file and line and kept in the console. A +/// package's script is only read. +/// +[NotInParallel] +public class ScriptEditLoopTests +{ + private const string Ann = "Convergence.Ann"; + + private static readonly ConsoleKeyInfo CtrlS = new('\u0013', ConsoleKey.S, false, false, true); + private static readonly ConsoleKeyInfo Esc = new('\u001b', ConsoleKey.Escape, false, false, false); + + private static readonly TerminalCapabilities Headless = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private sealed class World : IAsyncDisposable + { + private World(string root, SharpMUTermApp app, RecordingTelnetSession wire) + { + Root = root; + App = app; + Wire = wire; + } + + public string Root { get; } + + public SharpMUTermApp App { get; } + + public RecordingTelnetSession Wire { get; } + + public static async Task Open(string lua) + { + var root = Directory.CreateTempSubdirectory("sharpmuterm-scriptedit-").FullName; + File.WriteAllText(Path.Combine(root, "main.lua"), lua); + var set = new TriggerSet { Name = "Lua", ScriptFiles = { "main.lua" } }; + set.Triggers.Add(new Trigger { Name = "ping", Pattern = "^ping$", Actions = new TriggerActions { ScriptCallback = "on_ping" } }); + var config = new AppConfiguration(); + config.TriggerSets.Add(set); + config.Worlds.Add(new WorldDefinition + { + Name = "Convergence", + Host = "convergence.example", + Port = 4201, + Characters = { new CharacterDefinition { Name = "Ann", Logging = new LoggingSettings(), TriggerSets = { "Lua" } } }, + }); + + Console.SetIn(TextReader.Null); + var wire = new RecordingTelnetSession(); + var app = new SharpMUTermApp(config, Headless, new HeadlessConsoleDriver(120, 32), scriptsRoot: root); + app.TelnetFactory = _ => wire; + app.DispatchCommand(CommandIds.Character(Ann)); + await app.FindSession(Ann)!.ConnectAsync(); + app.RenderNextFrame(); + return new World(root, app, wire); + } + + public async ValueTask DisposeAsync() + { + await App.DisposeAsync(); + Directory.Delete(Root, recursive: true); + } + } + + [Test] + public async Task EditScriptListsTheCharactersScriptsOnThePalette() + { + await using var world = await World.Open("function on_ping() world.send('v1') end"); + File.WriteAllText(Path.Combine(world.Root, "extra.lua"), "-- not loaded"); + + await Assert.That(world.App.DispatchCommand(BuiltInCommands.ScriptEditCommand)).IsTrue(); + + var ids = world.App.BuildCatalog().Select(i => i.Id).ToList(); + await Assert.That(ids).Contains(BuiltInCommands.ScriptOpen("main.lua")); + await Assert.That(ids).Contains(BuiltInCommands.ScriptOpen("extra.lua")); + var main = world.App.BuildCatalog().Single(i => i.Id == BuiltInCommands.ScriptOpen("main.lua")); + await Assert.That(main.Detail).Contains("loaded by this character"); + } + + [Test] + public async Task AScriptOpensVerbatimWithNoEscapingOrSpelling() + { + await using var world = await World.Open("x = '%r [y]'\n"); + + await Assert.That(world.App.DispatchCommand(BuiltInCommands.ScriptOpen("main.lua"))).IsTrue(); + + await Assert.That(world.App.Composer.IsOpen).IsTrue(); + await Assert.That(world.App.Composer.Script!.Name).IsEqualTo("main.lua"); + await Assert.That(world.App.Composer.Body).StartsWith("x = '%r [y]'"); + await Assert.That(world.App.Composer.Spelling).IsNull(); + await Assert.That(world.App.Composer.Model.Edit!.Script).IsTrue(); + await Assert.That(world.App.Composer.Model.Keys.Select(k => k.Key)).Contains("⌃S"); + await Assert.That(world.App.Composer.Model.Keys.Select(k => k.Key)).DoesNotContain("⌥L"); + } + + [Test] + public async Task CtrlSSavesTheFileAndReloadsTheCharactersScripts() + { + await using var world = await World.Open("function on_ping() world.send('v1') end"); + world.App.DispatchCommand(BuiltInCommands.ScriptOpen("main.lua")); + world.App.Composer.SimulateTyping("\nfunction on_ping() world.send('v2') end\n"); + + await Assert.That(world.App.Composer.SimulateKey(CtrlS)).IsTrue(); + + // Saved verbatim, nothing sent to the game, the editor still open on the file, and the new function live. + await Assert.That(File.ReadAllText(Path.Combine(world.Root, "main.lua"))).Contains("world.send('v2')"); + await Assert.That(world.Wire.Lines.Any(l => l.Contains("on_ping", StringComparison.Ordinal))).IsFalse(); + await Assert.That(world.App.Composer.IsOpen).IsTrue(); + await Assert.That(world.App.Composer.Script!.Status).Contains("reloaded"); + world.Wire.Receive("ping"); + await Assert.That(world.Wire.Lines).Contains("v2"); + await Assert.That(world.App.ConsoleTexts(Ann, ScriptConsoleKind.Note).Any(t => t.Contains("saved main.lua", StringComparison.Ordinal))).IsTrue(); + } + + [Test] + public async Task AReloadErrorIsSaidWithItsFileAndLineAndKeptInTheConsole() + { + await using var world = await World.Open("function on_ping() world.send('v1') end"); + world.App.DispatchCommand(BuiltInCommands.ScriptOpen("main.lua")); + world.App.Composer.SimulateTyping("\n\nfunction broken(\n"); + + world.App.Composer.SimulateKey(CtrlS); + + var status = world.App.Composer.Script!.Status!; + await Assert.That(status).StartsWith("!"); + await Assert.That(status).Contains("main.lua"); + await Assert.That(world.App.Composer.HeaderMarkup).Contains("main.lua:"); + await Assert.That(world.App.ConsoleTexts(Ann, ScriptConsoleKind.Error).Any(t => t.Contains("main.lua", StringComparison.Ordinal))).IsTrue(); + + // Opened again from ⌃P, the editor lands on the line the error named. + world.App.Composer.SimulateKey(Esc); + world.App.DispatchCommand(BuiltInCommands.ScriptOpen("main.lua")); + await Assert.That(world.App.Composer.Script!.Line).IsGreaterThan(0); + } + + [Test] + public async Task EscKeepsUnsavedTextForTheFileUntilItIsSaved() + { + await using var world = await World.Open("x = 1\n"); + world.App.DispatchCommand(BuiltInCommands.ScriptOpen("main.lua")); + world.App.Composer.SimulateTyping("y = 2\n"); + + world.App.Composer.SimulateKey(Esc); + + await Assert.That(world.App.Composer.IsOpen).IsFalse(); + await Assert.That(world.App.KeptScriptText("main.lua")).Contains("y = 2"); + await Assert.That(File.ReadAllText(Path.Combine(world.Root, "main.lua"))).IsEqualTo("x = 1\n"); + world.App.DispatchCommand(BuiltInCommands.ScriptOpen("main.lua")); + await Assert.That(world.App.Composer.Body).Contains("y = 2"); + } + + [Test] + public async Task ANewScriptIsCreatedByNameAndARefusedNameWritesNothing() + { + await using var world = await World.Open("x = 1\n"); + + world.App.NewScript("../outside"); + await Assert.That(world.App.Composer.IsOpen).IsFalse(); + await Assert.That(File.Exists(Path.Combine(Path.GetDirectoryName(world.Root)!, "outside.lua"))).IsFalse(); + + world.App.NewScript("lib/helpers"); + await Assert.That(world.App.Composer.IsOpen).IsTrue(); + await Assert.That(world.App.Composer.Script!.Name).IsEqualTo("lib/helpers.lua"); + world.App.Composer.SimulateKey(CtrlS); + await Assert.That(File.Exists(Path.Combine(world.Root, "lib", "helpers.lua"))).IsTrue(); + await Assert.That(world.App.Composer.Script!.Status).Contains("not loaded"); + } + + [Test] + public async Task APackagesScriptIsOnlyRead() + { + Console.SetIn(TextReader.Null); + await using var demo = new SharpMUTermApp(DemoScene.Build(), Headless, new HeadlessConsoleDriver(120, 32)); + demo.RenderSnapshot(); + + demo.OpenScript("package:aetherfall-pack/combat.lua"); + + await Assert.That(demo.Composer.IsOpen).IsTrue(); + await Assert.That(demo.Composer.Script!.ReadOnly).IsTrue(); + await Assert.That(demo.Composer.Model.Keys.Select(k => k.Key)).DoesNotContain("⌃S"); + await Assert.That(demo.Composer.HeaderMarkup).Contains("READ ONLY"); + await Assert.That(demo.Composer.SimulateKey(CtrlS)).IsTrue(); + await Assert.That(demo.Composer.IsOpen).IsTrue(); + } +} From a7e8fa76bd3f94fe072566a4aa07d98830809a66 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 15:41:15 +0000 Subject: [PATCH 057/113] fix: nullability of the deep search's held-line sets Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- src/SharpMUTerm.Tui/SharpMUTermApp.DeepSearch.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.DeepSearch.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.DeepSearch.cs index 8636d63e..6bb11475 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.DeepSearch.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.DeepSearch.cs @@ -210,7 +210,7 @@ private void EnsureDeepSearch(string query, bool regex, bool all, bool older, IR // Which lines each pane still holds, by reference, taken here on the UI thread: the worker never touches a pane. var held = sources.Select(s => _lines.TryGetValue(s.WindowId, out var buffer) - ? buffer.Select(l => l.Source).OfType().ToHashSet(ReferenceEqualityComparer.Instance) + ? new HashSet(buffer.Select(l => l.Source).OfType(), ReferenceEqualityComparer.Instance) : new HashSet(ReferenceEqualityComparer.Instance)).ToArray(); var deep = new DeepSearch(key, sources, sources.Sum(s => s.Buffer.AvailableLines)); _deep = deep; From 37535bd6ced0a4c37c4ab4e57c8999c3560aea3c Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 16:02:19 +0000 Subject: [PATCH 058/113] =?UTF-8?q?feat(wave18a):=20script=20error=20line,?= =?UTF-8?q?=20centred=20history=20view,=20=E2=8C=A5H=20offer=20on=20?= =?UTF-8?q?=E2=8C=83F's=20status=20line?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Script editor: ComposerEdit.ErrorLine (Client ScriptErrors.LineIn, the one reader of file.lua:(N,…)) set by ScriptEdit.Said from a save's status. Cells mark the line on a warning band (SetLineHighlight); the window numbers lines in a gutter beside its editor (ComposerView.LineGutter, from the TextBox layout) and flags the line there and behind it. - History view opens centred on the hit (ScrollbackViewModel.TopFor), Role() marks the three lines either side as context: body ink in both hosts, the rest muted. - ⌃F offers ⌥H on its status line while the pane cap trimmed what it searched (SearchModel.OlderLines/OffersOlder/OlderHintLadder), laddered beside the count; the window's hint is clickable. Nothing trimmed, nothing said. - F5 at 80x24: the top row's group label re-reads the first shown field each scroll step; verified correct and pinned by a walking test. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 7 + CLAUDE.md | 19 ++- src/SharpMUTerm.Avalonia/ComposerEditor.cs | 82 ++++++++++++ src/SharpMUTerm.Avalonia/ComposerView.cs | 113 +++++++++++++++- src/SharpMUTerm.Avalonia/ScrollbackView.cs | 9 +- src/SharpMUTerm.Avalonia/SearchView.cs | 13 +- .../Composer/ComposerModel.cs | 7 +- .../Composer/ScriptErrors.cs | 65 +++++++++ .../Modals/ScrollbackViewModel.cs | 33 ++++- src/SharpMUTerm.Client/Modals/SearchModel.cs | 67 ++++++++++ .../Surfaces/SurfaceCatalog.cs | 1 + src/SharpMUTerm.Tui/ComposeOverlay.cs | 48 ++++++- src/SharpMUTerm.Tui/ScrollbackViewSurface.cs | 15 ++- src/SharpMUTerm.Tui/SearchPrompt.cs | 25 +++- .../SharpMUTermApp.DeepSearch.cs | 19 ++- .../SharpMUTermApp.ScriptEdit.cs | 32 ++--- .../NativeScriptEditorTests.cs | 72 ++++++++++ .../SurfaceParityTests.cs | 15 +++ .../SearchAndScriptModelTests.cs | 85 ++++++++++++ .../SharpMUTerm.Tui.Tests/DeepSearchTests.cs | 18 ++- tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs | 1 + .../SearchAndScriptWaveTests.cs | 123 ++++++++++++++++++ 22 files changed, 812 insertions(+), 57 deletions(-) create mode 100644 src/SharpMUTerm.Client/Composer/ScriptErrors.cs create mode 100644 tests/SharpMUTerm.Avalonia.Tests/NativeScriptEditorTests.cs create mode 100644 tests/SharpMUTerm.Client.Tests/SearchAndScriptModelTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/SearchAndScriptWaveTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index d854af60..f43a0489 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,13 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- The script editor numbers its lines in the desktop window too, and after a save whose reload fails, the line the + error names is marked in both the terminal and the window. +- When Ctrl+F finds fewer matches than it might because the pane no longer holds older lines, its status line offers + Alt+H to search older history, saying how many more lines there are (in the window, clicking the hint does it). +- The read-only history page an older match opens is centred on the match, with the three lines either side drawn as + its context and the rest of the page quieter. + - Scripts can be edited without leaving the client. ⌃P ▸ Edit script… (or ⌃E in the script console, or `/script edit`) lists your character's script files; one opens in the composer with line numbers, exactly as written. ⌃S saves it, reloads that character's scripts and shows the first error with its file and line. ⌃P ▸ New script… (or diff --git a/CLAUDE.md b/CLAUDE.md index fe8c717e..3b42af3f 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -114,6 +114,13 @@ fallbacks) for inline images/maps. line numbers, monospace). ⌃S saves, reloads that character's scripts and says the first error (`file:line`) in the header and the console; the editor stays open. Esc keeps unsaved text per file for the run. `package:` scripts open read only. The demo saves nothing. + - **The error's line is one model field, `ComposerEdit.ErrorLine`** (Client `ScriptErrors.LineIn`, the one reader of + `file.lua:(N,…)`, also behind ⌃P's `! line N`; `ScriptEdit.Said(status)` sets it from a `! …` status naming this file + and clears it on anything else). The cell editor puts that line on a band (`MultilineEditControl.SetLineHighlight`, + `ComposeOverlay.ErrorBand`: warn 28% over the well — a syntax token carries a foreground only); the window numbers + lines in a gutter (`ComposerView.LineGutter`, read off the `TextBox`'s own layout via `ComposerEditor.LineSpans`) and + flags the line there and with a band over the text (`DrawMarks`). The gutter re-measures only when its digits or face + change: the editor's layout raises `MarksMoved`, and measuring on each was an infinite layout loop. - **GMCP and MSDP data is held per session in `GameDataStore`, and three things read it**: the status row's meters (`StatusMeter`, F7 ▸ `meters`), ⌃P ▸ *Show game data* (`GameDataOverlay`) and Lua (`gmcp.get`, `msdp.get`). GMCP packages are stored by name with objects merged key by key, because IRE and Aardwolf send @@ -414,7 +421,14 @@ fallbacks) for inline images/maps. reference (a session window's `PaneLine.Source` is the ring's instance). Older rows list after the pane's, tagged `older`; the note on the count row says the bound and the progress, and that captures keep no older history. ⏎ on one goes to the pane if it holds the line, else opens the **history view**: a modal page of 20 lines, every move a - ranged read, never inserted into a pane buffer. ⌥G stays pane-only. + ranged read, never inserted into a pane buffer. ⌥G stays pane-only. It opens **centred on the hit** + (`ScrollbackViewModel.TopFor`, clamped at the ends), and `Role(line)` makes the `ContextRows` (3) either side context: + body ink behind a `│` in cells, a rule in the window; the rest of the page muted/dim. + - **⌥H is offered on the status line, not in a modal, only while the pane cap trimmed what ⌃F searched** + (`SearchModel.OlderLines`/`OlderSource`/`OffersOlder`: a query, ⌥H off, and the session scrollback holding lines the pane + does not). `OlderHintLadder` is four rungs, all starting `⌥H`; the cells take the longest that fits beside the count + (`NoteFor(room)`, chord in bold accent), the window shows the first in words, accent, and a click on it is ⌥H. Nothing + trimmed, nothing said. `FooterFitTests` pins the offer and the count on one row at 80×24. - **The demo scene loads with `_watching` off.** It pours a spawn window's whole history in before the first frame, and every line would otherwise count as missed — so any frame that later made such a window visible carried an activity bar reporting the client's own setup as news. @@ -1463,7 +1477,8 @@ fallbacks) for inline images/maps. (glyph runs, F-keys, Esc, PgUp…), two-space-indented lines stay rows. The cells draw bold headings and accent keys; the window draws headings and key chips (`NativeKeys.Words`). The cell topic header is one elided row. - **F5's world column at 80×24 drops its group headings** when the fields do not fit, naming the top row's group on the - column's first row (`├ WORLD · CONNECTION`, `⌃ 12 more · MAP`); while a world field is focused the character form and + column's first row (`├ WORLD · CONNECTION`, `⌃ 12 more · MAP`) — re-read at every scroll step from the first field + shown, which `SearchAndScriptWaveTests` walks with ⇥ (checked in wave 18: it was already right); while a world field is focused the character form and trigger sets are capped to a third of the height. ⇥ order is unchanged. An open `highlight names` edit draws the syntax and colours under its well (`NamesHelpRows`; `ScreenChrome.Window(…, keepBelow)` keeps them on screen); the window's field help is `HighlightColours.NamesHelp`, the same words. diff --git a/src/SharpMUTerm.Avalonia/ComposerEditor.cs b/src/SharpMUTerm.Avalonia/ComposerEditor.cs index 840110b6..ba56a895 100644 --- a/src/SharpMUTerm.Avalonia/ComposerEditor.cs +++ b/src/SharpMUTerm.Avalonia/ComposerEditor.cs @@ -133,6 +133,76 @@ public IReadOnlyList MarkRects() return rects; } + /// + /// The line a script's last load error named, from 1, or 0: , the field the cell + /// editor marks too. Drawn as a band over the line by and in the gutter. + /// + public int ErrorLine + { + get => _errorLine; + set + { + if (_errorLine != value) + { + _errorLine = value; + MarksMoved?.Invoke(); + } + } + } + + private int _errorLine; + + /// The band's colour (the warning ink, mostly transparent so the text under it reads). + public Color ErrorColour { get; set; } = Color.FromRgb(0xff, 0x6b, 0x6b); + + /// + /// Each source line (from 1) in view, with the top and bottom of all the rows it wraps onto, in this control's + /// coordinates: what the gutter numbers and the error band covers. Read off the box's own layout, so it follows + /// wrapping, scrolling and the face. Empty before the template is applied. + /// + public IReadOnlyList<(int Line, double Top, double Bottom)> LineSpans() + { + if (_presenter is not { TextLayout: { } layout } presenter) + { + return []; + } + + var text = Text ?? string.Empty; + var spans = new List<(int, double, double)>(); + var start = 0; + var line = 1; + var height = Bounds.Height; + while (start <= text.Length) + { + var end = text.IndexOf('\n', start); + var stop = end < 0 ? text.Length : end; + var first = layout.HitTestTextPosition(start); + var last = layout.HitTestTextPosition(stop); + if (presenter.TranslatePoint(first.TopLeft, this) is { } top && presenter.TranslatePoint(last.BottomLeft, this) is { } bottom) + { + if (top.Y > height) + { + break; + } + + if (bottom.Y >= 0) + { + spans.Add((line, top.Y, Math.Max(bottom.Y, top.Y + first.Height))); + } + } + + if (end < 0) + { + break; + } + + start = end + 1; + line++; + } + + return spans; + } + /// /// Draws the wavy lines onto . A paints its text and its own /// background in children of its template, which are drawn after anything the box itself draws, so the lines are @@ -140,6 +210,18 @@ public IReadOnlyList MarkRects() /// public void DrawMarks(DrawingContext context, Visual surface) { + if (_errorLine > 0) + { + foreach (var (line, top, bottom) in LineSpans()) + { + if (line == _errorLine && this.TranslatePoint(new Point(0, top), surface) is { } at) + { + var band = Color.FromArgb(0x3a, ErrorColour.R, ErrorColour.G, ErrorColour.B); + context.FillRectangle(new SolidColorBrush(band), new Rect(at.X, at.Y, Bounds.Width, bottom - top)); + } + } + } + var rects = MarkRects(); if (rects.Count == 0) { diff --git a/src/SharpMUTerm.Avalonia/ComposerView.cs b/src/SharpMUTerm.Avalonia/ComposerView.cs index 78c831b9..a2df2fe4 100644 --- a/src/SharpMUTerm.Avalonia/ComposerView.cs +++ b/src/SharpMUTerm.Avalonia/ComposerView.cs @@ -37,6 +37,7 @@ internal sealed class ComposerView : Border private readonly bool _fullScreen; private readonly ComposerEditor _editor; private readonly MarkLayer _marks; + private readonly LineGutter _gutter; private readonly Border _header; private readonly TextBlock _title; private readonly TextBlock _target; @@ -78,6 +79,7 @@ public ComposerView(TerminalView view, bool fullScreen) _editor.GotFocus += (_, _) => AskToArm(); _editor.ContextRequested += OnContextRequested; _marks = new MarkLayer(_editor); + _gutter = new LineGutter(_editor) { IsVisible = false }; _title = new TextBlock { FontWeight = FontWeight.Bold, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(0, 0, 10, 0) }; _target = new TextBlock { VerticalAlignment = VerticalAlignment.Center, TextTrimming = TextTrimming.CharacterEllipsis }; @@ -110,10 +112,17 @@ public ComposerView(TerminalView view, bool fullScreen) // The armed rule down the docked editor's left edge: the cell composer's ▌ marker, in the accent. _rule = new Border { Width = 3, HorizontalAlignment = HorizontalAlignment.Left }; - var body = new Panel(); - body.Children.Add(_editor); - body.Children.Add(_marks); - body.Children.Add(_rule); + var text = new Panel(); + text.Children.Add(_editor); + text.Children.Add(_marks); + text.Children.Add(_rule); + + // A script's lines are numbered in a gutter beside the editor, the cells' line numbers; the error line is marked there. + var body = new Grid { ColumnDefinitions = new ColumnDefinitions("Auto,*") }; + Grid.SetColumn(_gutter, 0); + Grid.SetColumn(text, 1); + body.Children.Add(_gutter); + body.Children.Add(text); var grid = new Grid { RowDefinitions = new RowDefinitions("Auto,*,Auto,Auto") }; Grid.SetRow(_header, 0); @@ -236,6 +245,11 @@ public void Show(ComposerModel model, ComposerSession session, PanelInk ink, Col // A package's script is only read: the editor shows it and keeps every edit out. _editor.IsReadOnly = model.Edit?.ReadOnly == true; + // A script: its lines numbered, and the line the last load error named marked in the gutter and behind the text, + // from the model's one field the cell editor marks too. + _gutter.IsVisible = model.Edit is { Script: true }; + _editor.ErrorLine = model.Edit is { Script: true, ErrorLine: > 0 } failed ? failed.ErrorLine : 0; + if (coloursChanged || previous is null) { Paint(); @@ -265,6 +279,9 @@ public void Show(ComposerModel model, ComposerSession session, PanelInk ink, Col } } + /// The gutter of line numbers, shown for a script. Internal for tests. + internal LineGutter Gutter => _gutter; + /// The header's length cell as drawn. Internal for tests. internal string CountText => _count.Text ?? string.Empty; @@ -301,6 +318,11 @@ private void Paint() _editor.SelectionBrush = new SolidColorBrush(Color.FromArgb(0x70, Accent.R, Accent.G, Accent.B)); _editor.SelectionForegroundBrush = new SolidColorBrush(_text); _editor.MarkColour = Warn; + _editor.ErrorColour = Warn; + _gutter.Ink = Dim; + _gutter.Warn = Warn; + _gutter.Background = new SolidColorBrush(Band); + _gutter.InvalidateVisual(); _title.Foreground = new SolidColorBrush(Accent); _target.Foreground = new SolidColorBrush(_text); _count.Foreground = new SolidColorBrush(Dim); @@ -787,4 +809,87 @@ public MarkLayer(ComposerEditor editor) public override void Render(DrawingContext context) => _editor.DrawMarks(context, this); } + + /// + /// A script's line numbers, beside the editor and level with each source line's first row (read off the editor's own + /// layout, so a wrapped line is numbered once and scrolling moves the numbers): the window's form of the cell editor's + /// numbered gutter. The line names is drawn in the warning ink with a bar at the + /// edge. It takes no input. + /// + internal sealed class LineGutter : Control + { + private readonly ComposerEditor _editor; + + public LineGutter(ComposerEditor editor) + { + _editor = editor; + IsHitTestVisible = false; + Focusable = false; + ClipToBounds = true; + // Repainted whenever the text moves (the editor's layout, a scroll); re-measured only when the width it needs + // changed — a digit more, another face or size — because the editor's own layout pass raises MarksMoved, and a + // gutter that re-measured on every one would never let layout settle. + editor.MarksMoved += () => + { + if (_measured != (Digits, _editor.FontSize, _editor.FontFamily)) + { + InvalidateMeasure(); + } + + InvalidateVisual(); + }; + } + + private (int Digits, double Size, FontFamily Face) _measured; + + /// The numbers' ink. + public Color Ink { get; set; } = Colors.Gray; + + /// The error line's ink. + public Color Warn { get; set; } = Colors.IndianRed; + + /// The gutter's plane. + public IBrush? Background { get; set; } + + /// The numbers drawn now, by line, for a test: the lines in view with the error line's flagged. + public IReadOnlyList<(int Line, bool Error)> Numbers => + [.. _editor.LineSpans().Select(s => (s.Line, s.Line == _editor.ErrorLine))]; + + private int Digits => Math.Max(2, (_editor.Text ?? string.Empty).Count(c => c == '\n') + 1).ToString(System.Globalization.CultureInfo.InvariantCulture).Length; + + protected override Size MeasureOverride(Size availableSize) + { + _measured = (Digits, _editor.FontSize, _editor.FontFamily); + var sample = Text(new string('8', Digits), Ink, FontWeight.Normal); + return new Size(Math.Ceiling(sample.Width) + 22, 0); + } + + public override void Render(DrawingContext context) + { + if (Background is { } plane) + { + context.FillRectangle(plane, new Rect(Bounds.Size)); + } + + foreach (var (line, top, bottom) in _editor.LineSpans()) + { + if (_editor.TranslatePoint(new Point(0, top), this) is not { } at) + { + continue; + } + + var error = line == _editor.ErrorLine; + var number = Text(line.ToString(System.Globalization.CultureInfo.InvariantCulture), error ? Warn : Ink, error ? FontWeight.Bold : FontWeight.Normal); + context.DrawText(number, new Point(Bounds.Width - 10 - number.Width, at.Y)); + if (error) + { + context.FillRectangle(new SolidColorBrush(Warn), new Rect(Bounds.Width - 4, at.Y, 3, bottom - top)); + } + } + } + + private FormattedText Text(string text, Color ink, FontWeight weight) => + new(text, System.Globalization.CultureInfo.InvariantCulture, FlowDirection.LeftToRight, + new Typeface(_editor.FontFamily, FontStyle.Normal, weight), _editor.FontSize, new SolidColorBrush(ink)); + } } diff --git a/src/SharpMUTerm.Avalonia/ScrollbackView.cs b/src/SharpMUTerm.Avalonia/ScrollbackView.cs index 9a16d6bf..075dce08 100644 --- a/src/SharpMUTerm.Avalonia/ScrollbackView.cs +++ b/src/SharpMUTerm.Avalonia/ScrollbackView.cs @@ -99,12 +99,15 @@ private void Draw() var mono = new FontFamily($"{CellFonts.BundledFamily}, DejaVu Sans Mono, Consolas, Menlo, monospace"); foreach (var line in _model.Lines) { - var marked = line.Index == _model.Marked; + // The hit on the selection plane, its context in the body ink behind a rule, the rest of the page in the dim ink: + // the model's roles, which the cells draw too. + var role = _model.Role(line); + var marked = role == ScrollbackLineRole.Hit; var text = new TextBlock { FontFamily = mono, FontSize = NativeTokens.Body, - Foreground = _colours.Brush(_colours.Text), + Foreground = _colours.Brush(role == ScrollbackLineRole.Page ? _colours.Dim : _colours.Text), TextTrimming = TextTrimming.CharacterEllipsis, }; text.Inlines = ModalParts.Marked(line.Text, line.MatchStart, line.MatchLength, _colours); @@ -113,6 +116,8 @@ private void Draw() CornerRadius = new CornerRadius(NativeTokens.RadiusM), Padding = new Thickness(12, 2), Background = marked ? _colours.Brush(_colours.Selected) : Brushes.Transparent, + BorderBrush = role == ScrollbackLineRole.Context ? _colours.Brush(_colours.Rule) : null, + BorderThickness = new Thickness(role == ScrollbackLineRole.Context ? 2 : 0, 0, 0, 0), Child = text, }); } diff --git a/src/SharpMUTerm.Avalonia/SearchView.cs b/src/SharpMUTerm.Avalonia/SearchView.cs index f70d393a..8f04abbf 100644 --- a/src/SharpMUTerm.Avalonia/SearchView.cs +++ b/src/SharpMUTerm.Avalonia/SearchView.cs @@ -74,6 +74,16 @@ public SearchView(SearchSession session, NativeTokens colours, Action done) Children.Add(_state); _note = ModalParts.Dim(string.Empty, colours, new Thickness(20, 0, 20, 6)); + + // While the pane cap trimmed what was searched, the note is the ⌥H offer, and a click on it is ⌥H. + _note.PointerPressed += (_, e) => + { + if (_model.OffersOlder) + { + e.Handled = true; + _older.IsChecked = true; + } + }; SetDock(_note, Dock.Top); Children.Add(_note); @@ -227,7 +237,8 @@ private void Draw() _count.Text = _model.CountText; _note.Text = NativeKeys.Words(_model.HistoryNote ?? string.Empty); _note.IsVisible = _model.HistoryNote is not null; - _note.Foreground = _colours.Brush(_model.HistoryRunning ? _colours.Accent : _colours.Dim); + _note.Foreground = _colours.Brush(_model.HistoryRunning || _model.OffersOlder ? _colours.Accent : _colours.Dim); + _note.Cursor = _model.OffersOlder ? new Cursor(StandardCursorType.Hand) : null; _list.Children.Clear(); _rows.Clear(); _selected = _model.Rows.Count == 0 ? 0 : Math.Clamp(_selected, 0, _model.Rows.Count - 1); diff --git a/src/SharpMUTerm.Client/Composer/ComposerModel.cs b/src/SharpMUTerm.Client/Composer/ComposerModel.cs index 6f413b22..a37d2ec4 100644 --- a/src/SharpMUTerm.Client/Composer/ComposerModel.cs +++ b/src/SharpMUTerm.Client/Composer/ComposerModel.cs @@ -37,7 +37,12 @@ public sealed record ComposerKey(string Key, string Label, string? Short = null) /// Whether it can only be read: a package's script. /// What the last save said (saved · 2 files loaded, or the first load error), or null. /// The line the caret opens on, from 1; 0 for the end. -public sealed record ComposerEdit(string Name, string Type, bool Script = false, bool ReadOnly = false, string? Status = null, int Line = 0); +/// +/// The line of this script the last load error named (corvid.lua:(14,…)), from 1; 0 for none. Both hosts mark it +/// from this one field — the cells on a warning band behind the line, the window in its gutter and behind the line +/// (). +/// +public sealed record ComposerEdit(string Name, string Type, bool Script = false, bool ReadOnly = false, string? Status = null, int Line = 0, int ErrorLine = 0); /// /// A composer, as both hosts draw it. The terminal draws F1 and the docked panel in cells; the window draws them diff --git a/src/SharpMUTerm.Client/Composer/ScriptErrors.cs b/src/SharpMUTerm.Client/Composer/ScriptErrors.cs new file mode 100644 index 00000000..1058137e --- /dev/null +++ b/src/SharpMUTerm.Client/Composer/ScriptErrors.cs @@ -0,0 +1,65 @@ +using System.Globalization; +using System.Text.RegularExpressions; + +namespace SharpMUTerm.Client.Composer; + +/// +/// Reads the line a Lua load or run error names in a script file: MoonSharp says corvid.lua:(14,22-30): … (a chunk is +/// loaded under its file's name), and a plain corvid.lua:14: is read too. One reader, so ⌃P's list of scripts, the +/// line an opened script lands on and the line the editor marks () are the same number. +/// +public static class ScriptErrors +{ + private static readonly Regex ErrorAt = new( + @"(?[A-Za-z0-9_.\-]+\.lua):\(?(?\d+)", + RegexOptions.CultureInvariant, + TimeSpan.FromMilliseconds(50)); + + /// + /// The line of script (folders and a package: prefix allowed; its file name is what is + /// matched) that names, or null. + /// + public static int? LineIn(string? text, string name) + { + ArgumentNullException.ThrowIfNull(name); + if (string.IsNullOrEmpty(text)) + { + return null; + } + + var file = name[(name.LastIndexOf('/') + 1)..]; + try + { + foreach (Match match in ErrorAt.Matches(text)) + { + if (string.Equals(match.Groups["file"].Value, file, StringComparison.Ordinal) + && int.TryParse(match.Groups["line"].Value, NumberStyles.None, CultureInfo.InvariantCulture, out var line) + && line > 0) + { + return line; + } + } + } + catch (RegexMatchTimeoutException) + { + return null; + } + + return null; + } + + /// The line the newest of (oldest first) names in , or null. + public static int? LineIn(IReadOnlyList errors, string name) + { + ArgumentNullException.ThrowIfNull(errors); + for (var i = errors.Count - 1; i >= 0; i--) + { + if (LineIn(errors[i], name) is { } line) + { + return line; + } + } + + return null; + } +} diff --git a/src/SharpMUTerm.Client/Modals/ScrollbackViewModel.cs b/src/SharpMUTerm.Client/Modals/ScrollbackViewModel.cs index 2abbcf96..8c28560b 100644 --- a/src/SharpMUTerm.Client/Modals/ScrollbackViewModel.cs +++ b/src/SharpMUTerm.Client/Modals/ScrollbackViewModel.cs @@ -5,10 +5,25 @@ namespace SharpMUTerm.Client.Modals; /// One line of the history view: its absolute index in the session's scrollback, its text, and where the query matched. public readonly record struct ScrollbackViewLine(long Index, string Text, int MatchStart, int MatchLength); +/// What a line of the history view is to the line the search found. +public enum ScrollbackLineRole +{ + /// A line of the page, away from the hit: drawn quieter. + Page, + + /// One of the lines either side of the hit: the body ink. + Context, + + /// The line the search found: marked. + Hit, +} + /// /// The read-only history view (⏎ on an older-history hit in ⌃F): lines of a session's scrollback /// — the ring or the file-backed spill — around the line the search found, the found line marked and the query's run in -/// each line marked. Drawn by the cell surface (ScrollbackViewSurface.Render) and the window's native modal from +/// each line marked. It opens centred on the found line (), and the lines +/// either side of it are its context (): drawn in the body ink, the rest of the page quieter, so the hit +/// reads with what was said around it. Drawn by the cell surface (ScrollbackViewSurface.Render) and the window's native modal from /// the same record; every move is a ranged read the client makes (ScrollHistoryView), so the two show the same page. /// /// A view, not a pane. It never puts old lines back into a pane buffer: a pane holds the newest @@ -35,6 +50,9 @@ public sealed record ScrollbackViewModel( /// The lines a page holds, the same in both hosts. public const int PageRows = 20; + /// How many lines either side of the found line are its context. + public const int ContextRows = 3; + /// The keys, in glyphs (a native view spells them in words). public const string Keys = "↑↓ a line · PgUp PgDn a page · Home End the ends · Esc closes"; @@ -59,8 +77,17 @@ public string Position /// The title row: whose history, and that it is only read. public string Title => $"OLDER HISTORY · {Window} · read only"; - /// The top that shows a third of the way down a page, clamped to what is held. - public static long TopFor(long marked, long oldest, long end) => Clamp(marked - PageRows / 3, oldest, end); + /// + /// The top that shows in the middle of a page — / 2 lines above it, the + /// rest below — clamped to what is held, so a hit near either end sits as near the middle as the history allows. + /// + public static long TopFor(long marked, long oldest, long end) => Clamp(marked - PageRows / 2, oldest, end); + + /// What a line of the page is to the hit: the hit itself, its context ( either side), or the rest. + public ScrollbackLineRole Role(ScrollbackViewLine line) => + line.Index == Marked ? ScrollbackLineRole.Hit + : Math.Abs(line.Index - Marked) <= ContextRows ? ScrollbackLineRole.Context + : ScrollbackLineRole.Page; /// kept to a page that starts at or after the oldest line and ends at or before the newest. public static long Clamp(long top, long oldest, long end) => Math.Max(oldest, Math.Min(top, Math.Max(oldest, end - PageRows))); diff --git a/src/SharpMUTerm.Client/Modals/SearchModel.cs b/src/SharpMUTerm.Client/Modals/SearchModel.cs index 3c96c168..80a12843 100644 --- a/src/SharpMUTerm.Client/Modals/SearchModel.cs +++ b/src/SharpMUTerm.Client/Modals/SearchModel.cs @@ -1,3 +1,5 @@ +using System.Globalization; + namespace SharpMUTerm.Client.Modals; /// @@ -49,6 +51,70 @@ public sealed record SearchModel( /// The toggles and what they mean now, in words: text · Corvid, regex · every window · older history. public string StateText => $"{(Regex ? "regex" : "text")} · {(AllWindows ? "every window" : Scope)}{(Older ? " · older history" : string.Empty)}"; + /// + /// How many lines the scrollback behind the searched windows holds that their panes no longer do — what the pane cap + /// trimmed, and so what this search could not see. Set only while ⌥H is off; 0 when the panes hold everything. + /// + public long OlderLines { get; init; } + + /// Whose older history counts: the window's name, or 3 windows. + public string OlderSource { get; init; } = string.Empty; + + /// + /// Whether the status line offers ⌥H: a query was searched, ⌥H is off, and the pane cap trimmed lines the scrollback + /// still holds, so this search found fewer hits than it might. A hint on the line under the query, never a modal. + /// + public bool OffersOlder => !Older && Error is null && Query.Length > 0 && OlderLines > 0; + + /// The offer's chord, which a host draws as a key. + public const string OlderKey = "⌥H"; + + /// + /// The offer, longest first, for a status line too narrow for all of it: whose history and how much, then how much, + /// then the offer alone, then the chord and two words. Every rung starts with . Empty when + /// nothing is offered. + /// + public IReadOnlyList OlderHintLadder + { + get + { + if (!OffersOlder) + { + return []; + } + + var lines = OlderLines.ToString("N0", CultureInfo.InvariantCulture); + var more = $"{lines} more line{(OlderLines == 1 ? string.Empty : "s")}"; + return + [ + OlderSource.Length > 0 ? $"{OlderKey} searches older history · {more} in {OlderSource}" : $"{OlderKey} searches older history · {more}", + $"{OlderKey} searches older history · {more}", + $"{OlderKey} searches older history", + $"{OlderKey} older history", + ]; + } + } + + /// + /// The status line's note in cells (0 for no limit): the longest rung of + /// that fits while ⌥H is offered (its last rung if none does), else . + /// + public string? NoteFor(int room) + { + var ladder = OlderHintLadder; + if (ladder.Count == 0) + { + return HistoryNote; + } + + if (room <= 0) + { + return HistoryNote ?? ladder[0]; + } + + return ladder.FirstOrDefault(r => r.Length <= room) ?? ladder[^1]; + } + /// How many rows are the pane buffer's (the rest are older history's, listed after them). public int HeldRows => Rows.Count(r => !r.IsOlder); @@ -78,6 +144,7 @@ other is not null && Query == other.Query && Regex == other.Regex && AllWindows == other.AllWindows && Scope == other.Scope && Held == other.Held && Error == other.Error && Older == other.Older && HistoryNote == other.HistoryNote && HistoryRunning == other.HistoryRunning + && OlderLines == other.OlderLines && OlderSource == other.OlderSource && ModelLists.Same(Rows, other.Rows); public override int GetHashCode() => HashCode.Combine(Query, Regex, AllWindows, Scope, Held, Error, ModelLists.Hash(Rows)); diff --git a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs index e176ea8d..791387a4 100644 --- a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs +++ b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs @@ -450,6 +450,7 @@ [.. PanelViews("MapCanvas"), "SharpMUTerm.Avalonia.MapInspector"]), [ // Typing, ⌥E, ⌥A and ⌥H re-run the search over the pane buffers (and, with ⌥H, the sessions' scrollback off // the UI thread); ⏎ goes to the row through the one path to a hit, or opens an older one in the history view. + // The status line's ⌥H offer (SearchModel.OlderHintLadder) is the same query: a click on it in the window is ⌥H. new(SurfaceActionKind.Modal, "query", "SearchModelFor"), new(SurfaceActionKind.Modal, "go", "GoToSearchHit"), ], diff --git a/src/SharpMUTerm.Tui/ComposeOverlay.cs b/src/SharpMUTerm.Tui/ComposeOverlay.cs index 3773e81a..09c974ae 100644 --- a/src/SharpMUTerm.Tui/ComposeOverlay.cs +++ b/src/SharpMUTerm.Tui/ComposeOverlay.cs @@ -26,10 +26,21 @@ namespace SharpMUTerm.Tui; /// A package's script: shown, never saved. /// What the last save said, or null. /// The line the caret opens on, from 1; 0 for the top. -internal sealed record ScriptEdit(string Name, string? Owner, bool ReadOnly, string? Status = null, int Line = 0) +/// The line the last load error named in this file, from 1; 0 for none. +internal sealed record ScriptEdit(string Name, string? Owner, bool ReadOnly, string? Status = null, int Line = 0, int ErrorLine = 0) { /// What the editor says this is: the MOO edit's shape, read by both hosts. - internal ComposerEdit Describe() => new(Name, "lua", Script: true, ReadOnly, Status, Line); + internal ComposerEdit Describe() => new(Name, "lua", Script: true, ReadOnly, Status, Line, ErrorLine); + + /// + /// This edit after a save said : an error (! …) naming a line of this file marks that + /// line; anything else clears the mark. + /// + internal ScriptEdit Said(string status) => this with + { + Status = status, + ErrorLine = status.StartsWith('!') ? ScriptErrors.LineIn(status, Name) ?? 0 : 0, + }; } /// @@ -148,7 +159,8 @@ internal void SetScriptStatus(string status) return; } - _script = _script with { Status = status }; + _script = _script.Said(status); + MarkErrorLine(); RefreshBands(); } @@ -274,6 +286,8 @@ internal void Toggle(string target, string draft, ComposeEscaping escaping, bool _editor.GoToLine(at.Line); } + MarkErrorLine(); + _editor.ContentChanged += (_, _) => RefreshBands(); FitEditor(); @@ -303,6 +317,34 @@ internal void Toggle(string target, string draft, ComposeEscaping escaping, bool _window.FocusManager.SetFocus(_editor, FocusReason.Programmatic); } + /// + /// The line the last load error named (, the field the window's editor marks too) + /// on a band behind it in the warning ink, the rest cleared. A background, because the editor's syntax tokens carry a + /// foreground only. + /// + private void MarkErrorLine() + { + if (_editor is null) + { + return; + } + + _editor.ClearLineHighlights(); + if (_script is { ErrorLine: > 0 } script) + { + _editor.SetLineHighlight(script.ErrorLine - 1, ErrorBand(_scheme)); + } + } + + /// The error line's band: the warning ink part of the way over the editor's well, so the text on it stays legible. + internal static Color ErrorBand(ScreenTheme scheme) + { + var well = scheme.Colour(ScreenPalette.EditBg); + var warn = scheme.Colour(ScreenPalette.Warn); + static byte Mix(byte a, byte b) => (byte)Math.Round(a + ((b - a) * 0.28)); + return new Color(Mix(well.R, warn.R), Mix(well.G, warn.G), Mix(well.B, warn.B)); + } + /// /// Feeds one key through the very handler PreviewKeyPressed raises, so a headless test and a /// snapshot can drive this window. The framework only pumps input inside Run(), which neither diff --git a/src/SharpMUTerm.Tui/ScrollbackViewSurface.cs b/src/SharpMUTerm.Tui/ScrollbackViewSurface.cs index fc75cf72..770d0260 100644 --- a/src/SharpMUTerm.Tui/ScrollbackViewSurface.cs +++ b/src/SharpMUTerm.Tui/ScrollbackViewSurface.cs @@ -6,7 +6,8 @@ namespace SharpMUTerm.Tui; /// /// The read-only history view in cells: a page of a session's scrollback (ring or spill) around the line ⌃F's older-history -/// search found, that line on the accent band and the query's run in every line in bold accent. Pure: the page is the +/// search found, centred: that line on the accent band, its context ( either side) +/// in the body ink behind a │, the rest of the page muted, and the query's run in every line in bold accent. Pure: the page is the /// the window's native view draws too, and every move is the client's ranged read. /// Always rows of page, so the overlay sized once at open keeps fitting. /// @@ -27,7 +28,7 @@ internal static List Render(ScrollbackViewModel model, int width) for (var i = 0; i < ScrollbackViewModel.PageRows; i++) { - lines.Add(i < model.Lines.Count ? Row(model.Lines[i], model.Lines[i].Index == model.Marked, width) : string.Empty); + lines.Add(i < model.Lines.Count ? Row(model.Lines[i], model.Role(model.Lines[i]), width) : string.Empty); } lines.Add(string.Empty); @@ -35,10 +36,10 @@ internal static List Render(ScrollbackViewModel model, int width) return lines; } - private static string Row(ScrollbackViewLine line, bool marked, int width) + private static string Row(ScrollbackViewLine line, ScrollbackLineRole role, int width) { var text = ElidePlain(line.Text.Replace('\t', ' '), width - 2); - if (marked) + if (role == ScrollbackLineRole.Hit) { var pad = new string(' ', Math.Max(0, width - 2 - text.Length)); return $"[{Ink} on {Accent}]▸ {Escape(text)}{pad}[/]"; @@ -46,14 +47,16 @@ private static string Row(ScrollbackViewLine line, bool marked, int width) if (line.MatchStart < 0 || line.MatchStart >= text.Length || line.MatchLength <= 0) { - return $" [{Value}]{Escape(text)}[/]"; + return role == ScrollbackLineRole.Context ? $"[{Muted}]│[/] [{Value}]{Escape(text)}[/]" : $" [{Muted}]{Escape(text)}[/]"; } var length = Math.Min(line.MatchLength, text.Length - line.MatchStart); var before = text[..line.MatchStart]; var hit = text.Substring(line.MatchStart, length); var after = text[(line.MatchStart + length)..]; - return $" [{Value}]{Escape(before)}[/][bold {Accent}]{Escape(hit)}[/][{Value}]{Escape(after)}[/]"; + var ink = role == ScrollbackLineRole.Context ? Value : Muted; + var lead = role == ScrollbackLineRole.Context ? $"[{Muted}]│[/] " : " "; + return $"{lead}[{ink}]{Escape(before)}[/][bold {Accent}]{Escape(hit)}[/][{ink}]{Escape(after)}[/]"; } private static string ElidePlain(string text, int width) => diff --git a/src/SharpMUTerm.Tui/SearchPrompt.cs b/src/SharpMUTerm.Tui/SearchPrompt.cs index c93e2b2b..de4fe733 100644 --- a/src/SharpMUTerm.Tui/SearchPrompt.cs +++ b/src/SharpMUTerm.Tui/SearchPrompt.cs @@ -224,10 +224,7 @@ internal static List Render(SearchModel model, int selected, int width = var lines = new List { SpreadLR($"[{Label}]search[/] {QueryMarkup(query)}", $"[{Label}]{Escape(model.StateText)}[/]", width), - SpreadLR( - model.HistoryNote is { } note ? $"[{(model.HistoryRunning ? Accent : Muted)}]{Escape(note)}[/]" : string.Empty, - $"[{Label}]{Escape(model.CountText)}[/]", - width), + SpreadLR(NoteMarkup(model, width), $"[{Label}]{Escape(model.CountText)}[/]", width), }; var body = new List(); @@ -254,6 +251,26 @@ internal static List Render(SearchModel model, int selected, int width = return lines; } + /// + /// The status line's left half: older history's note, or — while the pane cap trimmed what this search could see — the + /// ⌥H offer, laddered to the room the count leaves (), its chord in the accent. + /// + private static string NoteMarkup(SearchModel model, int width) + { + var room = width > 0 ? width - VisibleLength(model.CountText) - 2 : 0; + if (model.NoteFor(room) is not { } note) + { + return string.Empty; + } + + if (model.OffersOlder && note.StartsWith(SearchModel.OlderKey, StringComparison.Ordinal)) + { + return $"[bold {Accent}]{SearchModel.OlderKey}[/][{Muted}]{Escape(note[SearchModel.OlderKey.Length..])}[/]"; + } + + return $"[{(model.HistoryRunning ? Accent : Muted)}]{Escape(note)}[/]"; + } + /// /// Where the list area's top must sit for to be inside it, moving as /// little as possible from . diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.DeepSearch.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.DeepSearch.cs index 6bb11475..b06da0c4 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.DeepSearch.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.DeepSearch.cs @@ -105,7 +105,6 @@ internal SearchModel SearchModelFor(string query, bool regex, bool all, bool old var sources = HistorySources(all, out var captures); EnsureDeepSearch(query, regex, all, older && held.Error is null, sources); - var total = sources.Sum(s => s.Buffer.AvailableLines); var who = sources.Count == 1 ? sources[0].Label : $"{sources.Count} windows"; var spill = captures switch { @@ -116,10 +115,20 @@ internal SearchModel SearchModelFor(string query, bool regex, bool all, bool old if (!older || held.Error is not null || _deep is not { } deep) { - var note = sources.Count == 0 - ? (spill.Length > 0 ? spill.TrimStart(' ', '·') : null) - : $"⌥H searches older history · {N(total)} lines in {who}{spill}"; - return held with { Older = older, HistoryNote = note }; + // What the pane cap trimmed: the scrollback's lines the panes no longer hold. While there are some, the status + // line offers ⌥H (SearchModel.OlderHintLadder); while there are none, older history has nothing more to find. + long trimmed = 0; + foreach (var source in sources) + { + var inPane = _lines.TryGetValue(source.WindowId, out var buffer) ? buffer.Count(l => l.Source is StyledLine) : 0; + trimmed += Math.Max(0, source.Buffer.AvailableLines - inPane); + } + + var model = held with { Older = older, OlderLines = older ? 0 : trimmed, OlderSource = sources.Count == 0 ? string.Empty : who }; + var note = model.OffersOlder + ? model.OlderHintLadder[0] + spill + : spill.Length > 0 ? spill.TrimStart(' ', '·') : null; + return model with { HistoryNote = note }; } var rows = new List(held.Rows); diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.ScriptEdit.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.ScriptEdit.cs index d5730ebd..fdede98d 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.ScriptEdit.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.ScriptEdit.cs @@ -1,5 +1,5 @@ using System.Globalization; -using System.Text.RegularExpressions; +using SharpMUTerm.Client.Composer; using SharpMUTerm.Client.Modals; using SharpMUTerm.Core.Commands; using SharpMUTerm.Core.Diagnostics; @@ -61,8 +61,6 @@ internal sealed partial class SharpMUTermApp "\n" + "trigger.add('^(\\\\w+) tells you', 'on_tell')\n"; - private static readonly Regex ErrorAt = new(@"(?[A-Za-z0-9_.\-]+\.lua):\(?(?\d+)", RegexOptions.CultureInvariant, TimeSpan.FromMilliseconds(50)); - /// Whether the focused window is the demo's, in a client with no scripts folder — the snapshot's scripts. private bool DemoScriptsShown => _scriptsRoot is null && _workspace.FindWindow(ActiveWindowId())?.SessionKey is { } owner && IsDemoKey(owner); @@ -137,23 +135,7 @@ string Describe(string name, bool exists) } /// The line of the newest console error naming 's file, or null. - private static int? LastErrorLine(IReadOnlyList errors, string name) - { - var file = name[(name.LastIndexOf('/') + 1)..]; - for (var i = errors.Count - 1; i >= 0; i--) - { - foreach (Match match in ErrorAt.Matches(errors[i])) - { - if (string.Equals(match.Groups["file"].Value, file, StringComparison.Ordinal) - && int.TryParse(match.Groups["line"].Value, NumberStyles.None, CultureInfo.InvariantCulture, out var line)) - { - return line; - } - } - } - - return null; - } + private static int? LastErrorLine(IReadOnlyList errors, string name) => ScriptErrors.LineIn(errors, name); /// /// ⌃P ▸ Edit script…, the console's ⌃E and a bare /script edit: the palette, opened on the script files. From @@ -202,7 +184,8 @@ private bool OpenScriptFromPalette(string name) var owner = ScriptOwner(); var errors = owner is null ? [] : ConsoleLog(owner).Lines.Where(l => l.Kind == ScriptConsoleKind.Error).Select(l => l.Text).ToArray(); - OpenScript(name, LastErrorLine(errors, name) ?? 0); + var line = LastErrorLine(errors, name) ?? 0; + OpenScript(name, line, errorLine: line); return true; } @@ -263,7 +246,8 @@ internal void NewScript(string typed) /// Opens script in the composer's script mode: a package's read-only, anything else from the /// scripts folder (the template when it does not exist yet), or the unsaved text Esc kept for it. /// - internal void OpenScript(string name, int line = 0) + /// The line the console's newest error names in it, marked in the editor; 0 for none. + internal void OpenScript(string name, int line = 0, int errorLine = 0) { if (ComposerOpen || AnyOverlayOpen) { @@ -330,7 +314,7 @@ internal void OpenScript(string name, int line = 0) var target = session is not null ? SessionTitle(session) : owner is not null ? FindCharacter(owner)?.Character.Name ?? string.Empty : string.Empty; - OpenComposer(target, text, ComposeEscaping.AsTyped, canSend: true, edit: null, script: new ScriptEdit(name, owner, package, status, line)); + OpenComposer(target, text, ComposeEscaping.AsTyped, canSend: true, edit: null, script: new ScriptEdit(name, owner, package, status, line, errorLine)); } /// @@ -398,7 +382,7 @@ private void SetScriptStatus(string status) { if (_nativeCompose is { Script: { } script } open) { - open.Script = script with { Status = status }; + open.Script = script.Said(status); open.Session.Publish(NativeComposeModel(open)); return; } diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativeScriptEditorTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativeScriptEditorTests.cs new file mode 100644 index 00000000..48d11ab4 --- /dev/null +++ b/tests/SharpMUTerm.Avalonia.Tests/NativeScriptEditorTests.cs @@ -0,0 +1,72 @@ +using Avalonia.Controls; +using Avalonia.Media; +using SharpMUTerm.Client.Composer; +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Avalonia.Tests; + +/// +/// The window's script editor: a script's lines are numbered in a gutter beside the native editor, level with the text, +/// and the line the reload's error named (, the field the cell editor marks) is the one +/// the gutter flags. A post has no gutter. +/// +[NotInParallel] +public class NativeScriptEditorTests +{ + private static ComposerModel Script(int errorLine) => + ComposerModel.Create( + ComposerPlace.FullScreen, + "Corvid", + SharpMUTermApp.DemoScriptText, + ComposeEscaping.AsTyped, + new ComposerEdit("corvid.lua", "lua", Script: true, Status: errorLine > 0 ? "! corvid.lua:(14,22-30): nil" : null, ErrorLine: errorLine), + null, + canSend: true, + armed: true, + revision: 1); + + private static Task Shown(ComposerModel model, Func read) => + DesktopLayerTests.Run((window, view, layer, driver) => + { + var composer = new ComposerView(view, fullScreen: true); + var host = new Window { Content = composer, Width = 900, Height = 700 }; + host.Show(); + composer.Show(model, new ComposerSession(model, null, new ComposerCallbacks()), new PanelInk("#5fafff", "#ff5f5f", "#3a3a40"), Colors.Black, Colors.White); + DesktopLayerTests.Drain(); + host.UpdateLayout(); + DesktopLayerTests.Drain(); + try + { + return read(composer); + } + finally + { + host.Close(); + } + }); + + [Test] + public async Task AScriptsLinesAreNumberedAndTheErrorLineIsFlagged() + { + var (visible, width, numbers, editorLine) = await Shown(Script(14), c => + (c.Gutter.IsVisible, c.Gutter.Bounds.Width, c.Gutter.Numbers, c.Editor.ErrorLine)); + + await Assert.That(visible).IsTrue(); + await Assert.That(width).IsGreaterThan(0); + await Assert.That(numbers.Select(n => n.Line).Take(3)).IsEquivalentTo([1, 2, 3], TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That(numbers.Where(n => n.Error).Select(n => n.Line)).IsEquivalentTo([14]); + await Assert.That(editorLine).IsEqualTo(14).Because("the band behind the text is drawn from the same field"); + } + + [Test] + public async Task ACleanScriptFlagsNothingAndAPostHasNoGutter() + { + var clean = await Shown(Script(0), c => c.Gutter.Numbers.Count(n => n.Error)); + await Assert.That(clean).IsEqualTo(0); + + var post = ComposerModel.Create(ComposerPlace.FullScreen, "Corvid", "hello", ComposeEscaping.AsTyped, null, null, true, true, 1); + var gutter = await Shown(post, c => c.Gutter.IsVisible); + await Assert.That(gutter).IsFalse(); + } +} diff --git a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs index 73846b6f..5265ddf7 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs @@ -220,6 +220,10 @@ await Assert.That(Rows(palette.Session!.View(query))).IsEquivalentTo(Rows(drawn! await Assert.That(composer.Session).IsNotNull().Because($"{view}: F1 opened in the window's editor"); await Assert.That(native.Composer.IsOpen).IsFalse().Because($"{view}: and not in cells under it"); await Assert.That(cells.DrawnModel(SurfaceCatalog.Compose)).IsEqualTo((object)composer.Session!.Model).Because(view); + if (view == "script-edit") + { + await Assert.That(composer.Session.Model.Edit!.ErrorLine).IsEqualTo(14).Because("both hosts mark the line the error named"); + } } covered.Add(SurfaceCatalog.Compose); @@ -281,6 +285,17 @@ await Assert.That(Rows(palette.Session!.View(query))).IsEquivalentTo(Rows(drawn! covered.Add(surface); } + // ⌃F's ⌥H offer: the model both hosts draw offers older history while the pane cap trimmed what was searched. + { + using var nativeDriver = new AvaloniaConsoleDriver(140, 36); + var modals = new FakeModals(); + await using var native = App(nativeDriver, DemoScene.Build(), modals: modals); + native.RenderSnapshot("search"); + var offered = ((SearchSession)modals.Open(SurfaceCatalog.Search)!).Model; + await Assert.That(offered.OffersOlder).IsTrue(); + await Assert.That(offered.HistoryNote).StartsWith(SearchModel.OlderKey); + } + // ⌃R filtered: the view hands its query to the native box, and the native list's rows for it are the cell list's. { using var nativeDriver = new AvaloniaConsoleDriver(140, 36); diff --git a/tests/SharpMUTerm.Client.Tests/SearchAndScriptModelTests.cs b/tests/SharpMUTerm.Client.Tests/SearchAndScriptModelTests.cs new file mode 100644 index 00000000..fbee2b2b --- /dev/null +++ b/tests/SharpMUTerm.Client.Tests/SearchAndScriptModelTests.cs @@ -0,0 +1,85 @@ +using SharpMUTerm.Client.Composer; +using SharpMUTerm.Client.Modals; + +namespace SharpMUTerm.Client.Tests; + +/// +/// Wave 18's model facts, each one field both hosts read: the line a Lua error names (), the +/// history view centred on its hit with context either side, and ⌃F's ⌥H offer laddered to the status line's room. +/// +public class SearchAndScriptModelTests +{ + [Test] + [Arguments("corvid.lua:(14,22-30): attempt to index a nil value", "corvid.lua", 14)] + [Arguments("! corvid.lua:(14,22-30): attempt to index a nil value (+1 more in the console)", "corvid.lua", 14)] + [Arguments("main.lua:3: unexpected symbol", "main.lua", 3)] + [Arguments("other.lua:(9,1): oops", "corvid.lua", 0)] + [Arguments("package:pack/combat.lua names combat.lua:(2,4)", "package:pack/combat.lua", 2)] + [Arguments("saved 12:00:00 · reloaded · 2 files loaded", "corvid.lua", 0)] + public async Task TheLineAnErrorNamesIsReadForItsOwnFileOnly(string text, string name, int line) + { + await Assert.That(ScriptErrors.LineIn(text, name) ?? 0).IsEqualTo(line); + } + + [Test] + public async Task TheNewestErrorNamingTheFileWins() + { + string[] errors = ["corvid.lua:(3,1): old", "main.lua:(8,1): elsewhere", "corvid.lua:(11,2): newer"]; + + await Assert.That(ScriptErrors.LineIn(errors, "corvid.lua")).IsEqualTo(11); + await Assert.That(ScriptErrors.LineIn(errors, "nothing.lua")).IsNull(); + } + + [Test] + public async Task TheHistoryViewOpensCentredOnItsHit() + { + var top = ScrollbackViewModel.TopFor(1_000, 0, 5_000); + + await Assert.That(1_000 - top).IsEqualTo(ScrollbackViewModel.PageRows / 2).Because("as many lines above the hit as the page allows"); + await Assert.That(ScrollbackViewModel.TopFor(3, 0, 5_000)).IsEqualTo(0).Because("near the oldest line the page starts at it"); + await Assert.That(ScrollbackViewModel.TopFor(4_998, 0, 5_000)).IsEqualTo(5_000 - ScrollbackViewModel.PageRows); + } + + [Test] + public async Task TheLinesEitherSideOfTheHitAreItsContext() + { + var lines = Enumerable.Range(90, ScrollbackViewModel.PageRows).Select(i => new ScrollbackViewLine(i, $"line {i}", -1, 0)).ToArray(); + var model = new ScrollbackViewModel("Corvid", "goblin", 90, 0, 500, 100, lines); + + await Assert.That(model.Role(lines[10])).IsEqualTo(ScrollbackLineRole.Hit); + await Assert.That(model.Role(lines[10 - ScrollbackViewModel.ContextRows])).IsEqualTo(ScrollbackLineRole.Context); + await Assert.That(model.Role(lines[10 + ScrollbackViewModel.ContextRows])).IsEqualTo(ScrollbackLineRole.Context); + await Assert.That(model.Role(lines[10 + ScrollbackViewModel.ContextRows + 1])).IsEqualTo(ScrollbackLineRole.Page); + await Assert.That(model.Role(lines[0])).IsEqualTo(ScrollbackLineRole.Page); + } + + private static SearchModel Found(string query = "goblin", long older = 5_930, bool on = false) => + new(query, false, false, "Corvid", 70, null, [], Older: on) { OlderLines = older, OlderSource = "Corvid" }; + + [Test] + public async Task OlderHistoryIsOfferedOnlyWhileThePaneCapTrimmedWhatWasSearched() + { + await Assert.That(Found().OffersOlder).IsTrue(); + await Assert.That(Found(older: 0).OffersOlder).IsFalse().Because("the panes hold everything: ⌥H has nothing more to find"); + await Assert.That(Found(query: string.Empty).OffersOlder).IsFalse().Because("nothing has been searched yet"); + await Assert.That(Found(on: true).OffersOlder).IsFalse().Because("⌥H is already on"); + } + + [Test] + public async Task TheOfferIsLadderedToTheRoomAndAlwaysNamesTheChord() + { + var model = Found(); + var ladder = model.OlderHintLadder; + + await Assert.That(ladder[0]).IsEqualTo("⌥H searches older history · 5,930 more lines in Corvid"); + await Assert.That(ladder.All(r => r.StartsWith(SearchModel.OlderKey, StringComparison.Ordinal))).IsTrue(); + for (var i = 1; i < ladder.Count; i++) + { + await Assert.That(ladder[i].Length).IsLessThan(ladder[i - 1].Length); + } + + await Assert.That(model.NoteFor(200)).IsEqualTo(ladder[0]); + await Assert.That(model.NoteFor(40)).IsEqualTo("⌥H searches older history"); + await Assert.That(model.NoteFor(5)).IsEqualTo(ladder[^1]).Because("the shortest rung, never nothing"); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/DeepSearchTests.cs b/tests/SharpMUTerm.Tui.Tests/DeepSearchTests.cs index 4726a9c4..5bdb261d 100644 --- a/tests/SharpMUTerm.Tui.Tests/DeepSearchTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/DeepSearchTests.cs @@ -24,9 +24,9 @@ public class DeepSearchTests new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); /// A connected Ann whose pane holds the newest 40 lines of 400, with goblins at lines 10 and 395. - private static async Task Live() + private static async Task Live(int paneLines = 40) { - var config = new AppConfiguration { PaneLines = 40 }; + var config = new AppConfiguration { PaneLines = paneLines }; config.Worlds.Add(new WorldDefinition { Name = "Convergence", @@ -59,6 +59,20 @@ public async Task WithoutAltHTheBoundSaysOlderHistoryCanBeSearched() await Assert.That(model.Rows.Count).IsEqualTo(1); await Assert.That(model.Rows[0].IsOlder).IsFalse(); await Assert.That(model.HistoryNote).Contains("⌥H searches older history"); + await Assert.That(model.OffersOlder).IsTrue(); + await Assert.That(model.OlderLines).IsGreaterThan(300).Because("400 lines arrived and the pane keeps about 40"); + } + + [Test] + public async Task NothingIsOfferedWhileThePaneHoldsEveryLine() + { + await using var app = await Live(paneLines: 2_000); + + var model = app.SearchModelFor("goblin", false, false); + + await Assert.That(model.Rows.Count).IsEqualTo(2).Because("both goblins are in the pane"); + await Assert.That(model.OffersOlder).IsFalse(); + await Assert.That(model.HistoryNote).IsNull(); } [Test] diff --git a/tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs b/tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs index 8fc7fa39..f17d48e5 100644 --- a/tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs @@ -39,6 +39,7 @@ internal static readonly (string View, string[] OneRow)[] Footers = ("dictionary-offer", ["⏎ download", "Esc not now"]), ("quit", ["⏎ stay", "Esc stays"]), ("search", ["↑↓ pick", "⌃F closes"]), + ("search", ["⌥H searches older history", "lines held"]), ("history-search", ["type to filter", "⌃R closes"]), ("layouts", ["↑↓ pick", "[⏎] Apply"]), ("welcome", ["↑↓ pick", "Esc closes"]), diff --git a/tests/SharpMUTerm.Tui.Tests/SearchAndScriptWaveTests.cs b/tests/SharpMUTerm.Tui.Tests/SearchAndScriptWaveTests.cs new file mode 100644 index 00000000..34bc24ef --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/SearchAndScriptWaveTests.cs @@ -0,0 +1,123 @@ +using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Modals; +using SharpMUTerm.Client.Settings; +using SharpMUTerm.Core.Theming; +using SharpMUTerm.Graphics; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// Wave 18, read off painted frames: the cell script editor marks the line the reload's error named (the model's +/// ErrorLine, which the window marks too); the history view opens centred on its hit with its context drawn apart; +/// ⌃F offers ⌥H on its status line while the pane cap trimmed what it searched; and F5's short column names the group of +/// the first field it shows after every scroll step. +/// +[NotInParallel] +public class SearchAndScriptWaveTests +{ + private static readonly TerminalCapabilities Headless = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private static SharpMUTermApp App(int width, int height) + { + Console.SetIn(TextReader.Null); + var config = DemoScene.Build(); + config.ThemeName = "Dark"; + config.Theme = ThemeLibrary.Get("Dark"); + return new SharpMUTermApp(config, Headless, new HeadlessConsoleDriver(width, height)); + } + + [Test] + public async Task TheCellEditorMarksTheLineTheReloadsErrorNamed() + { + await using var app = App(120, 32); + var frame = app.RenderSnapshot("script-edit"); + + await Assert.That(app.Composer.Model.Edit!.ErrorLine).IsEqualTo(14); + + var rows = FrameGrid.Decode(frame, 120, 32); + var row = rows.ToList().FindIndex(r => r.Contains("local room = map.current()", StringComparison.Ordinal)); + await Assert.That(row).IsGreaterThan(0).Because(string.Join('\n', rows)); + var column = rows[row].IndexOf("local room", StringComparison.Ordinal); + var backgrounds = FrameGrid.Backgrounds(frame); + var band = FrameGrid.Sgr(ComposeOverlay.ErrorBand(ScreenTheme.Dark)); + await Assert.That(backgrounds[(row, column)]).IsEqualTo(band).Because("line 14 is on the error band"); + + var other = rows.ToList().FindIndex(r => r.Contains("function on_room()", StringComparison.Ordinal)); + await Assert.That(backgrounds[(other, rows[other].IndexOf("function", StringComparison.Ordinal))]).IsNotEqualTo(band) + .Because("and only line 14"); + } + + [Test] + public async Task ASaveThatLoadsCleanlyClearsTheMarkAndAnErrorElsewhereDoesNotSetIt() + { + var edit = new ScriptEdit("corvid.lua", null, false, ErrorLine: 14); + + await Assert.That(edit.Said("saved 12:00:00 · reloaded · 2 files loaded").ErrorLine).IsEqualTo(0); + await Assert.That(edit.Said("! main.lua:(3,1): unexpected symbol").ErrorLine).IsEqualTo(0); + await Assert.That(edit.Said("! corvid.lua:(6,2): unexpected symbol").ErrorLine).IsEqualTo(6); + await Assert.That(edit.Said("! corvid.lua:(6,2): x").Describe().ErrorLine).IsEqualTo(6).Because("both hosts read Describe"); + } + + [Test] + public async Task TheHistoryViewOpensCentredOnItsHitWithItsContextDrawnApart() + { + await using var app = App(120, 32); + var frame = app.RenderSnapshot("search-history"); + var page = app.HistoryViewModel!; + + await Assert.That(page.Marked - page.Top).IsEqualTo(ScrollbackViewModel.PageRows / 2); + var rows = FrameGrid.Decode(frame, 120, 32); + var context = rows.Count(r => r.Contains("│ ", StringComparison.Ordinal) && r.Contains("] ", StringComparison.Ordinal)); + await Assert.That(context).IsGreaterThanOrEqualTo(2 * ScrollbackViewModel.ContextRows).Because(string.Join('\n', rows)); + await Assert.That(rows.Any(r => r.Contains("▸ ", StringComparison.Ordinal) && r.Contains("goblin", StringComparison.Ordinal))).IsTrue(); + } + + [Test] + [Arguments(80, 24)] + [Arguments(120, 32)] + public async Task CtrlFOffersOlderHistoryOnItsStatusLineWhileThePaneCapTrimmedIt(int width, int height) + { + await using var app = App(width, height); + var rows = FrameGrid.Decode(app.RenderSnapshot("search"), width, height); + + var status = rows.FirstOrDefault(r => r.Contains("lines held", StringComparison.Ordinal)); + await Assert.That(status).IsNotNull().Because(string.Join('\n', rows)); + await Assert.That(status!).Contains("⌥H").And.Contains("older history"); + await Assert.That(status!.Contains('…')).IsFalse().Because("a rung is chosen whole, never cut"); + } + + [Test] + public async Task F5sShortColumnNamesTheFirstShownFieldsGroupAfterEveryScrollStep() + { + await using var app = App(80, 24); + app.RenderSnapshot("worlds"); + app.SimulateSettingsKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false)); + var groups = BuiltInSettings.World.Fields.Where(f => f.Group is not null) + .ToDictionary(f => f.Label, f => f.Group!.ToUpperInvariant(), StringComparer.Ordinal); + var steps = 0; + var scrolled = 0; + for (var step = 0; step < 22; step++) + { + var rows = FrameGrid.Decode(app.RenderWholeFrame(), 80, 24); + var top = rows.ToList().FindIndex(r => r.Contains("├ WORLD", StringComparison.Ordinal) || r.Contains("⌃ ", StringComparison.Ordinal)); + if (top >= 0 && top + 1 < rows.Count) + { + var right = rows[top + 1][32..]; + var label = right.Trim().Split(" ")[0]; + var group = label is "security" || right.TrimStart().StartsWith('[') ? "CONNECTION" : groups.GetValueOrDefault(label); + if (group is not null && !rows[top].Contains("▾", StringComparison.Ordinal)) + { + steps++; + scrolled += rows[top].Contains("⌃ ", StringComparison.Ordinal) ? 1 : 0; + await Assert.That(rows[top]).Contains($"· {group}").Because($"step {step}: first shown '{label}'\n{string.Join('\n', rows)}"); + } + } + + app.SimulateSettingsKey(new ConsoleKeyInfo('\t', ConsoleKey.Tab, false, false, false)); + } + + await Assert.That(steps).IsGreaterThan(15); + await Assert.That(scrolled).IsGreaterThan(10).Because("the walk scrolled the column"); + } +} From 38b0f9f7375bde49f1f70e91d96dfed196ea46ab Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 16:20:47 +0000 Subject: [PATCH 059/113] feat(welcome): Browse worlds lists mu*index; a pick fills in the connect form The welcome's Browse row, Ctrl+P > Browse worlds... and /browse [words] open a list of worlds from the mu*index directory (WorldDirectory, Core: https only, size-capped while streaming, 15 s, 200 rows, server text bounded and stripped). One Client model (WorldBrowseModel) is drawn as a cell overlay and as a native modal. A pick asks the directory for the world's address and opens the welcome's connect form filled in; nothing is saved or dialled until its Enter, which goes through ConnectFromWelcome/ConnectCommand. The fetch is caller-supplied and null by default; the demo answers from memory. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 5 + CLAUDE.md | 25 +- src/SharpMUTerm.Avalonia/ModalOverlay.cs | 1 + src/SharpMUTerm.Avalonia/WelcomeView.cs | 2 +- src/SharpMUTerm.Avalonia/WorldBrowseView.cs | 320 +++++++++++++ .../Commands/BuiltInCommands.cs | 4 + src/SharpMUTerm.Client/Help/SlashCommands.cs | 2 + src/SharpMUTerm.Client/Modals/WelcomeModel.cs | 18 +- .../Modals/WorldBrowseModel.cs | 213 +++++++++ .../Surfaces/SurfaceCatalog.cs | 17 +- .../Configuration/AppConfiguration.cs | 9 + .../WorldIndex/WorldDirectory.cs | 363 ++++++++++++++ src/SharpMUTerm.Tui/DemoWorldDirectory.cs | 58 +++ .../Pointer/SharpMUTermApp.Surfaces.cs | 1 + src/SharpMUTerm.Tui/Program.cs | 3 +- .../SharpMUTermApp.NativeModals.cs | 1 + src/SharpMUTerm.Tui/SharpMUTermApp.Welcome.cs | 23 +- .../SharpMUTermApp.WorldBrowse.cs | 447 ++++++++++++++++++ src/SharpMUTerm.Tui/SharpMUTermApp.cs | 38 +- src/SharpMUTerm.Tui/SnapshotViews.cs | 2 +- src/SharpMUTerm.Tui/WelcomeSurface.cs | 42 +- src/SharpMUTerm.Tui/WorldBrowseSurface.cs | 209 ++++++++ .../SurfaceParityTests.cs | 24 + .../WorldBrowseModelTests.cs | 104 ++++ .../WorldIndex/WorldDirectoryTests.cs | 155 ++++++ tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs | 3 + tests/SharpMUTerm.Tui.Tests/WelcomeTests.cs | 6 +- .../SharpMUTerm.Tui.Tests/WorldBrowseTests.cs | 250 ++++++++++ 28 files changed, 2312 insertions(+), 33 deletions(-) create mode 100644 src/SharpMUTerm.Avalonia/WorldBrowseView.cs create mode 100644 src/SharpMUTerm.Client/Modals/WorldBrowseModel.cs create mode 100644 src/SharpMUTerm.Core/WorldIndex/WorldDirectory.cs create mode 100644 src/SharpMUTerm.Tui/DemoWorldDirectory.cs create mode 100644 src/SharpMUTerm.Tui/SharpMUTermApp.WorldBrowse.cs create mode 100644 src/SharpMUTerm.Tui/WorldBrowseSurface.cs create mode 100644 tests/SharpMUTerm.Client.Tests/WorldBrowseModelTests.cs create mode 100644 tests/SharpMUTerm.Core.Tests/WorldIndex/WorldDirectoryTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/WorldBrowseTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index d854af60..90d41b14 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,11 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- Browse worlds: the welcome's Browse row, ⌃P ▸ Browse worlds… and `/browse [words]` list worlds from the mu*index + directory, most played first, searchable and sortable by name. Picking one fills in the connect form with its host, + port and TLS; nothing is saved or dialled until you press ⏎ there. The directory is asked only when you open the list. + With `--plain`, `/browse` reads the list out and `/browse 3` tells you the `/connect` line for world 3. + - Scripts can be edited without leaving the client. ⌃P ▸ Edit script… (or ⌃E in the script console, or `/script edit`) lists your character's script files; one opens in the composer with line numbers, exactly as written. ⌃S saves it, reloads that character's scripts and shows the first error with its file and line. ⌃P ▸ New script… (or diff --git a/CLAUDE.md b/CLAUDE.md index fe8c717e..63d1ee54 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -742,8 +742,8 @@ fallbacks) for inline images/maps. - **A client with no worlds opens on a welcome, and the first connect of a new configuration leaves a key tour** (`WelcomeSurface`, `SharpMUTermApp.Welcome.cs`; `/welcome`, ⌃P ▸ *Welcome* / *Key tour*). The welcome is a `ListOverlay` over a pure model (the `QuitPrompt` split): *Connect to a host* (a form: host, port 4000, TLS, an - optional character, a password reminder), *Browse games* (`BrowsePackages`, so the index is still fetched only - when asked; with no https `PackageIndexUrl` it says so on the row instead), *Open settings* (F5), the + optional character, a password reminder), *Browse worlds* (mu*index, below; with no https + `WorldDirectoryUrl` it says so on the row instead), *Open settings* (F5), the `/connect` example, and a starting layout. Decisions not to relitigate: - **Its words live on `WelcomeModel`** (headings, intro, field labels, key rows), so both hosts say the same thing; the client calls a game a *world* on every surface of it. @@ -765,6 +765,24 @@ fallbacks) for inline images/maps. run. The row is chrome (`AppendWindowLine`), found again by its markup, and hidden or shown by ⌃P ▸ *Key tour* — not by a link, because the panes' link handler is scheme-tagged server text and a client action there would be a new trust path. +- **Browse worlds lists mu*index, and a pick only fills in the welcome's connect form** (`WorldDirectory`, Core + `WorldIndex/`; `WorldBrowseModel`/`WorldBrowseSession`, Client; `WorldBrowseSurface`, `SharpMUTermApp.WorldBrowse.cs`, + `DemoWorldDirectory`, Tui; `WorldBrowseView`, Avalonia; the welcome's Browse row, ⌃P ▸ *Browse worlds…*, `/browse + [words]`, `/browse N`; surface `browse-worlds`; the `browse-worlds`, `-failed` and `-picked` views). Decisions: + - **Asked only when opened**, through `worldFetch:` (the `save:` family: null in tests and snapshots, which say they asked + nothing; `Program` passes `WorldDirectory.DownloadAsync`; the demo answers from `DemoWorldDirectory`, made-up worlds on + `.example` hosts). https only (`AppConfiguration.WorldDirectoryUrl`, default `https://mu-index.com/api`), 2 MiB capped + while streaming, 15 s, 200 rows; an answer from a stale request (newer question, or closed) is dropped by generation. + - **The answer is server text**: names, taglines and codebases are bounded and stripped of control, format (bidi), + private-use and unassigned characters (`WorldDirectory.Clean`); a row with no id or name, archived, or repeated is + dropped and counted; a player count is shown only when the directory says `measured`, or `declared` marked `~`. + - **A pick asks `GET /games/{id}` for the address**: `telnet` or `tls`, `active` before `stale`, never `gone`, newest + `lastSeenAt`, and only what `ConnectEndpoint.Parse` takes. Then Browse closes and the welcome's form opens prefilled + (`WelcomeSurface.Prefill`, `WelcomeModel.WorldName`); nothing is saved or dialled until its ⏎, which goes through + `ConnectFromWelcome` → `ConnectCommand` and names the world as listed (dropped if the host is edited). + - ⏎ on a search none of the held rows match asks the directory (`AsksDirectory`). Every listing shows the CC BY 4.0 + credit (`AttributionLine`). `--plain` says the rows as numbered lines and `/browse N` says the `/connect` line. + - *Browse packages* is unchanged; the welcome no longer leads there. The live API has not been exercised from here. - **The URLs a world prints as plain text are marked up by this client, because the terminal's own detection cannot survive a pane** (`UrlDetector`, Core; F7 ▸ `detect links in output`, default on). Kitty, WezTerm and Ghostty all find URLs in the cells they paint — across the terminal **row**. A pane @@ -1764,7 +1782,8 @@ python3 tools/ansi_frame_to_image.py frame.ansi frame.html # or .svg its connect form filled in by real keys), `tour` (the key tour row at the end of the demo's main window), `reconnect` (Corvid dropped, the second try counting down on the status row), `help`/`help-topic` (in-app help's list, and its *Reading output* page), `dictionary-offer` (the spelling dictionary - offer, in a run that keeps no folder) and `join-wraps`/`join-wraps-f5` (a ragged world suggested on ⌃P, and + offer, in a run that keeps no folder), `browse-worlds`/`browse-worlds-failed`/`browse-worlds-picked` (Browse worlds over + the demo's directory, one whose directory does not answer, and the connect form a pick leaves) and `join-wraps`/`join-wraps-f5` (a ragged world suggested on ⌃P, and recommended on F5 — the row is under `14 more` below about 50 rows), plus the default workspace (no `--view`). Any settings screen also takes a `-edit` suffix, which opens it and drives real diff --git a/src/SharpMUTerm.Avalonia/ModalOverlay.cs b/src/SharpMUTerm.Avalonia/ModalOverlay.cs index d00eb612..7bbbd0fa 100644 --- a/src/SharpMUTerm.Avalonia/ModalOverlay.cs +++ b/src/SharpMUTerm.Avalonia/ModalOverlay.cs @@ -47,6 +47,7 @@ public ModalOverlay(ModalSession session, Action remove, Action new WelcomeView(welcome, Colours, Done), HelpSession help => new HelpView(help, Colours, Done), DictionaryOfferSession offer => new DictionaryOfferView(offer, Colours, Done), + WorldBrowseSession browse => new WorldBrowseView(browse, Colours, Done), ImportReviewSession import => new ImportReviewView(import, Colours, Done), ScriptConsoleSession console => new ScriptConsoleView(console, Colours, Done), ScrollbackViewSession history => new ScrollbackView(history, Colours, Done), diff --git a/src/SharpMUTerm.Avalonia/WelcomeView.cs b/src/SharpMUTerm.Avalonia/WelcomeView.cs index ca321d6b..b67398ab 100644 --- a/src/SharpMUTerm.Avalonia/WelcomeView.cs +++ b/src/SharpMUTerm.Avalonia/WelcomeView.cs @@ -207,7 +207,7 @@ private void DrawMenu() private void DrawForm() { _heading.Text = WelcomeModel.FormHeading; - _body.Children.Add(ModalParts.Dim(WelcomeModel.FormIntro, _colours, new Thickness(22, 0, 22, 10))); + _body.Children.Add(ModalParts.Dim(NativeKeys.Words(_model.FormIntroLine), _colours, new Thickness(22, 0, 22, 10))); var grid = new Grid { ColumnDefinitions = new ColumnDefinitions("Auto,*"), diff --git a/src/SharpMUTerm.Avalonia/WorldBrowseView.cs b/src/SharpMUTerm.Avalonia/WorldBrowseView.cs new file mode 100644 index 00000000..a36fe40f --- /dev/null +++ b/src/SharpMUTerm.Avalonia/WorldBrowseView.cs @@ -0,0 +1,320 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Input; +using Avalonia.Interactivity; +using Avalonia.Layout; +using Avalonia.Media; +using Avalonia.Threading; +using SharpMUTerm.Client.Modals; +using SharpMUTerm.Core.WorldIndex; + +namespace SharpMUTerm.Avalonia; + +/// +/// The window's Browse worlds: a search box, mu*index's rows for what is typed in the order chosen, the credit the +/// directory's licence asks for, and the keys. The rows are , the function the cell +/// surface lists, so both hosts list the same rows. Enter on a row hands the pick to the client, which asks where the +/// world is and opens the connect form in this modal's place; Enter on a search the rows cannot answer asks the +/// directory. Every word is the window's (). +/// +internal sealed class WorldBrowseView : DockPanel, IModalView +{ + private readonly WorldBrowseSession _session; + private readonly NativeTokens _colours; + private readonly Action _done; + private readonly TextBox _box; + private readonly TextBlock _count; + private readonly Button _sort; + private readonly TextBlock _note; + private readonly StackPanel _list; + private readonly List _rows = []; + private WorldBrowseModel _model; + private IReadOnlyList _view = []; + private WorldDirectorySort _order = WorldDirectorySort.Players; + private int _selected; + private string _query; + + public WorldBrowseView(WorldBrowseSession session, NativeTokens colours, Action done) + { + _session = session; + _colours = colours; + _done = done; + _model = session.Model; + + var heading = ModalParts.Heading(WorldBrowseModel.Heading, colours); + SetDock(heading, Dock.Top); + Children.Add(heading); + + var credit = ModalParts.Dim(WorldBrowseModel.AttributionLine, colours); + SetDock(credit, Dock.Top); + Children.Add(credit); + + _box = ModalParts.SearchBox(WorldBrowseModel.SearchPlaceholder, "Search worlds"); + SetDock(_box, Dock.Top); + Children.Add(_box); + + var bar = new DockPanel { Margin = new Thickness(20, 0, 14, 4) }; + _sort = ModalParts.Button(SortLabel(), "Tab", colours, ToggleSort); + SetDock(_sort, Dock.Right); + bar.Children.Add(_sort); + _count = ModalParts.Dim(string.Empty, colours, new Thickness(0)); + _count.VerticalAlignment = VerticalAlignment.Center; + bar.Children.Add(_count); + SetDock(bar, Dock.Top); + Children.Add(bar); + + var footer = ModalParts.Footer(string.Join(" · ", WorldBrowseModel.Keys.Select(k => $"{k.Key} {k.Label}")), colours); + SetDock(footer, Dock.Bottom); + Children.Add(footer); + + _note = ModalParts.Dim(string.Empty, colours, new Thickness(20, 6, 20, 0)); + SetDock(_note, Dock.Bottom); + Children.Add(_note); + + var (frame, list, _) = ModalParts.List(colours); + _list = list; + frame.MinHeight = 220; + Children.Add(frame); + + _box.Text = session.InitialQuery; + _box.CaretIndex = session.InitialQuery.Length; + _query = session.InitialQuery; + _box.TextChanged += (_, _) => + { + var query = _box.Text ?? string.Empty; + if (query == _query) + { + return; + } + + _query = query; + _selected = 0; + ShowList(); + }; + AddHandler(KeyDownEvent, OnKey, RoutingStrategies.Tunnel); + _session.Changed += OnChanged; + ShowList(); + } + + public string Title => WorldBrowseModel.Heading; + + public double PreferredWidth => 820; + + public bool Centred => false; + + /// The rows listed now, for a test. + public IReadOnlyList Rows => _view; + + /// The row Enter acts on. + public int Selected => _selected; + + /// The order the rows are in, for a test. + public WorldDirectorySort Order => _order; + + /// The search box, for a test. + public TextBox Box => _box; + + /// What the list says under it now, for a test. + public string Note => _note.Text ?? string.Empty; + + public void FocusFirst() => _box.Focus(); + + public void Detach() => _session.Changed -= OnChanged; + + /// Enter on listed row , or on a search the rows cannot answer. + public void Choose(int row) + { + if (_model.AsksDirectory(_query)) + { + _session.Ask(_query); + return; + } + + if (row < 0 || row >= _view.Count || _model.Opening is not null) + { + return; + } + + for (var i = 0; i < _model.Rows.Count; i++) + { + if (ReferenceEquals(_model.Rows[i], _view[row])) + { + _session.Pick(i); + return; + } + } + } + + /// Tab, and the order button: by players or by name. + public void ToggleSort() + { + _order = WorldBrowseModel.Next(_order); + _sort.Content = SortLabel(); + _selected = 0; + ShowList(); + } + + private string SortLabel() + { + var name = WorldBrowseModel.SortName(_order); + return char.ToUpperInvariant(name[0]) + name[1..]; + } + + private void OnChanged(WorldBrowseModel model) => Dispatcher.UIThread.Post(() => + { + var rowsChanged = !ReferenceEquals(model.Rows, _model.Rows); + _model = model; + if (rowsChanged) + { + _selected = 0; + } + + ShowList(); + }); + + private void ShowList() + { + _view = _model.View(_query, _order); + _count.Text = _model.CountLine(_query); + _note.Text = NativeKeys.Words( + _model.Opening is not null ? _model.OpeningLine + : _model.State == WorldBrowseState.Ready && _model.Problem is { } problem ? problem + : _model.State == WorldBrowseState.Ready && _view.Count > 0 + ? (_model.AnyDeclared ? WorldBrowseModel.DeclaredNote + " · " : string.Empty) + WorldBrowseModel.PickNote + : string.Empty); + _note.Foreground = _colours.Brush(_model.State == WorldBrowseState.Ready && _model.Problem is not null && _model.Opening is null + ? _colours.Warn + : _colours.Dim); + _list.Children.Clear(); + _rows.Clear(); + _selected = _view.Count == 0 ? 0 : Math.Clamp(_selected, 0, _view.Count - 1); + if (_model.Empty(_query) is { } empty) + { + _list.Children.Add(new TextBlock + { + Text = NativeKeys.Words(empty), + Foreground = _colours.Brush(_model.State is WorldBrowseState.Failed or WorldBrowseState.Unavailable ? _colours.Warn : _colours.Dim), + FontSize = NativeTokens.Body, + Margin = new Thickness(12, 10), + TextWrapping = TextWrapping.Wrap, + }); + return; + } + + for (var i = 0; i < _view.Count; i++) + { + var world = _view[i]; + var index = i; + var line = new DockPanel(); + var players = new TextBlock + { + Text = WorldBrowseModel.Players(world), + Foreground = _colours.Brush(_colours.Accent), + FontSize = NativeTokens.Title, + FontWeight = FontWeight.SemiBold, + Width = 48, + TextAlignment = TextAlignment.Right, + Margin = new Thickness(0, 0, 14, 0), + VerticalAlignment = VerticalAlignment.Center, + }; + SetDock(players, Dock.Left); + line.Children.Add(players); + + var title = new TextBlock + { + Text = world.Name, + Foreground = _colours.Brush(_colours.Text), + FontSize = NativeTokens.Title, + Width = 220, + Margin = new Thickness(0, 0, 12, 0), + TextTrimming = TextTrimming.CharacterEllipsis, + VerticalAlignment = VerticalAlignment.Center, + }; + SetDock(title, Dock.Left); + line.Children.Add(title); + + var codebase = new TextBlock + { + Text = world.Codebase, + Foreground = _colours.Brush(_colours.Dim), + FontSize = NativeTokens.Small, + Width = 96, + Margin = new Thickness(0, 0, 12, 0), + TextTrimming = TextTrimming.CharacterEllipsis, + VerticalAlignment = VerticalAlignment.Center, + }; + SetDock(codebase, Dock.Left); + line.Children.Add(codebase); + + line.Children.Add(new TextBlock + { + Text = world.Tagline, + Foreground = _colours.Brush(_colours.Dim), + FontSize = NativeTokens.Body, + TextTrimming = TextTrimming.CharacterEllipsis, + VerticalAlignment = VerticalAlignment.Center, + }); + var row = ModalParts.Row(line, world.Name, () => Select(index), () => Choose(index)); + ToolTip.SetTip(row, world.Tagline.Length == 0 ? world.Name : $"{world.Name} — {world.Tagline}"); + _rows.Add(row); + _list.Children.Add(row); + } + + Highlight(); + } + + private void Select(int index) + { + if (index != _selected) + { + _selected = index; + Highlight(); + } + } + + private void Highlight() + { + for (var i = 0; i < _rows.Count; i++) + { + _rows[i].Background = i == _selected ? _colours.Brush(_colours.Selected) : Brushes.Transparent; + } + + if (_selected < _rows.Count) + { + _rows[_selected].BringIntoView(); + } + } + + private void OnKey(object? sender, KeyEventArgs e) + { + if (e.KeyModifiers != KeyModifiers.None) + { + return; + } + + switch (e.Key) + { + case Key.Escape: + e.Handled = true; + _session.Dismiss(); + _done(); + return; + case Key.Up: + e.Handled = true; + Select(ModalParts.Step(_selected, -1, _view.Count)); + return; + case Key.Down: + e.Handled = true; + Select(ModalParts.Step(_selected, 1, _view.Count)); + return; + case Key.Tab: + e.Handled = true; + ToggleSort(); + return; + case Key.Enter: + e.Handled = true; + Choose(_selected); + return; + } + } +} diff --git a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs index b4e67bdf..5c4aa3fa 100644 --- a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs +++ b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs @@ -23,6 +23,9 @@ public static class BuiltInCommands /// The first-run welcome: connect to a world, browse worlds, pick a layout. public const string WelcomeCommand = "term:welcome"; + /// Browse worlds: mu*index's listing, a pick filling in the connect form (/browse). + public const string BrowseWorldsCommand = "term:browse-worlds"; + /// Import from another client: a file picker in a host that has one, else /import on the command line. public const string ImportCommand = "term:import"; @@ -270,6 +273,7 @@ void Family(string id, string prefix, Func [port] [tls]", "Add a world for a host and connect to it (port 4000 by default)", "/connect "), new("/welcome", "/welcome", "Show the first-run welcome again", "/welcome"), new("/welcome", "/welcome layout roleplay|combat|suggested", "Choose the starting layout the welcome offers", "/welcome layout "), + new("/browse", "/browse [words]", "Browse worlds listed on mu*index, searched for the words; a pick fills in the connect form", "/browse "), + new("/browse", "/browse ", "Where world n of the list /browse said is (with no screen to read, the /connect line to type)", "/browse "), new("/import", "/import ", "Import worlds, characters and automation from MUSHclient, Mudlet or TinTin++; nothing is written before Enter", "/import "), new("/package", "/package", "Open the Packages screen (F10)", "/package"), new("/package", "/package browse", "Browse the package index, this game's packages first", "/package browse"), diff --git a/src/SharpMUTerm.Client/Modals/WelcomeModel.cs b/src/SharpMUTerm.Client/Modals/WelcomeModel.cs index 5b2a1003..52c53bb8 100644 --- a/src/SharpMUTerm.Client/Modals/WelcomeModel.cs +++ b/src/SharpMUTerm.Client/Modals/WelcomeModel.cs @@ -6,7 +6,7 @@ public enum WelcomeChoice /// The small form: host, port, TLS, a character name. Connect, - /// The package index browser, fetched only now. + /// The world directory (mu*index), fetched only now. Browse, /// F5, to add a world by hand. @@ -40,7 +40,8 @@ public enum WelcomeField /// /// The first-run welcome's model: the menu or the connect form, with everything either says. Drawn by the cell -/// surface (WelcomeSurface.Render) and by the window's native one. +/// surface (WelcomeSurface.Render) and by the window's native one. IndexProblem is why Browse worlds cannot +/// ask the world directory (null when it can); WorldName is the world Browse worlds filled the form in for. /// public sealed record WelcomeModel( bool InForm, @@ -53,7 +54,8 @@ public sealed record WelcomeModel( string Character, bool PasswordLater, string? Problem, - string? IndexProblem) + string? IndexProblem, + string? WorldName = null) { /// The example the surface names, a host nobody owns (RFC 2606). public const string ExampleCommand = "/connect mud.example.org 4201 tls"; @@ -85,6 +87,14 @@ public sealed record WelcomeModel( /// The line under the form's heading. public const string FormIntro = "Saved as a world, so you can come back to it."; + /// + /// The line under the form's heading: , or, when Browse worlds filled the form in, which world + /// it is and that the address came from the directory. + /// + public string FormIntroLine => WorldName is null + ? FormIntro + : $"{WorldName}, as listed on mu*index. Check it and press ⏎ to save and connect."; + /// The TLS row's words when on; the window's check box carries these words. public const string TlsOn = "On, encrypted"; @@ -123,7 +133,7 @@ public sealed record WelcomeModel( public (string Title, string Detail) Describe(WelcomeChoice choice) => choice switch { WelcomeChoice.Connect => ("Connect to a world", "Type a host and port"), - WelcomeChoice.Browse => ("Browse worlds", IndexProblem is null ? "From the package index" : "No package index set"), + WelcomeChoice.Browse => ("Browse worlds", IndexProblem is null ? "From the mu*index directory" : "No world directory set"), WelcomeChoice.Import => ("Import", "From MUSHclient, Mudlet or TinTin++"), _ => ("Open settings", "F5, add a world by hand"), }; diff --git a/src/SharpMUTerm.Client/Modals/WorldBrowseModel.cs b/src/SharpMUTerm.Client/Modals/WorldBrowseModel.cs new file mode 100644 index 00000000..a99b96dd --- /dev/null +++ b/src/SharpMUTerm.Client/Modals/WorldBrowseModel.cs @@ -0,0 +1,213 @@ +using System.Globalization; +using SharpMUTerm.Core.WorldIndex; + +namespace SharpMUTerm.Client.Modals; + +/// Where Browse worlds is: asking the directory, listing what it said, failed, or not able to ask at all. +public enum WorldBrowseState +{ + /// The list is being fetched. + Loading, + + /// The rows are in. + Ready, + + /// The directory did not answer, or answered with something the client cannot read. + Failed, + + /// This run asks nothing (no fetch, or no https directory set), and says why. + Unavailable, +} + +/// +/// Browse worlds: the rows mu*index listed (), and what the surface says about them. Drawn by +/// the cell surface (WorldBrowseSurface.Render) and by the window's native one; both list for +/// what the player typed and the order chosen, so a query lists the same rows in both. What is typed, the order and the +/// row selected are each host's own; the model is what the client knows. +/// +/// Where the list is. +/// Every row the directory sent, in its order (most played first). +/// How many worlds the directory holds for the question asked. +/// The words the directory was last asked to search for, or empty for its most played. +/// Why the list failed or cannot be asked, or why the last pick did not open; null when nothing. +/// The world whose address is being asked for after a pick, or null. +public sealed record WorldBrowseModel( + WorldBrowseState State, + IReadOnlyList Rows, + int Total, + string AskedFor, + string? Problem, + string? Opening) +{ + // The surface's words, said once here so both hosts say them alike. + + /// The surface's title. + public const string Heading = "Browse worlds"; + + /// The credit the directory's licence asks for, on every listing. + public static string AttributionLine => + $"Listing from {WorldDirectory.Name} · data {WorldDirectory.Licence}, {WorldDirectory.Attribution}"; + + /// What the list says while it is fetched. + public const string LoadingLine = "Asking mu*index for worlds…"; + + /// What the list says when a pick is waiting on its address. + public string OpeningLine => $"Asking mu*index where {Opening} is…"; + + /// The search box's placeholder. + public const string SearchPlaceholder = "Type to narrow by name, codebase or tagline"; + + /// What a pick leads to, said under the list. + public const string PickNote = "⏎ fills in the connect form; nothing is saved or dialled until you press ⏎ there."; + + /// What a count the game reports about itself is marked with. + public const string DeclaredMark = "~"; + + /// What the mark means, said only while a row carries it. + public const string DeclaredNote = "~ a count the game reports about itself"; + + /// The keys that act, in glyphs: the cells ladder them, the window spells them in words. + public static IReadOnlyList<(string Key, string Label)> Keys { get; } = + [ + ("↑↓", "pick"), + ("⇥", "sort"), + ("⏎", "connect form"), + ("Esc", "closes"), + ]; + + /// A sort's name as both hosts say it. + public static string SortName(WorldDirectorySort sort) => sort == WorldDirectorySort.Name ? "by name" : "by players"; + + /// The other sort: what ⇥ and the window's toggle switch to. + public static WorldDirectorySort Next(WorldDirectorySort sort) => + sort == WorldDirectorySort.Players ? WorldDirectorySort.Name : WorldDirectorySort.Players; + + /// A row's player count as both hosts write it: 12, ~12 for a declared one, – for none. + public static string Players(WorldListing row) + { + ArgumentNullException.ThrowIfNull(row); + return row.Players is not { } count ? "–" + : (row.Count == WorldPlayerCount.Declared ? DeclaredMark : string.Empty) + count.ToString(CultureInfo.InvariantCulture); + } + + /// + /// The rows for in 's order: each word of the query somewhere in a + /// row's name, codebase or tagline. By players keeps the directory's order (its uncounted worlds follow as it put + /// them); by name is alphabetical. + /// + public IReadOnlyList View(string? query, WorldDirectorySort sort) + { + var words = (query ?? string.Empty).Split(' ', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries); + IEnumerable rows = Rows; + if (words.Length > 0) + { + rows = rows.Where(r => words.All(w => + r.Name.Contains(w, StringComparison.OrdinalIgnoreCase) + || r.Codebase.Contains(w, StringComparison.OrdinalIgnoreCase) + || r.Tagline.Contains(w, StringComparison.OrdinalIgnoreCase))); + } + + if (sort == WorldDirectorySort.Name) + { + rows = rows.OrderBy(r => r.Name, StringComparer.OrdinalIgnoreCase); + } + + return rows.ToArray(); + } + + /// + /// Whether ⏎ on asks the directory itself: nothing among the rows held matches, and the + /// directory holds more than it sent, or was last asked something else. + /// + public bool AsksDirectory(string? query) + { + var words = (query ?? string.Empty).Trim(); + return State == WorldBrowseState.Ready && words.Length > 0 && View(words, WorldDirectorySort.Players).Count == 0 + && (Total > Rows.Count || !string.Equals(words, AskedFor, StringComparison.OrdinalIgnoreCase)); + } + + /// What the list says in place of rows, or null when it has rows to show for . + public string? Empty(string? query) => State switch + { + WorldBrowseState.Loading => LoadingLine, + WorldBrowseState.Failed => $"mu*index did not answer: {Problem}", + WorldBrowseState.Unavailable => Problem, + _ when Rows.Count == 0 => AskedFor.Length > 0 ? $"mu*index lists no world for “{AskedFor}”" : "mu*index lists no worlds right now", + _ when View(query, WorldDirectorySort.Players).Count == 0 => AsksDirectory(query) + ? $"none of the {Rows.Count} listed match — ⏎ asks mu*index for “{query!.Trim()}”" + : "nothing listed matches — ⌫ widens the search", + _ => null, + }; + + /// The count line: how many rows are listed, of how many the directory holds. + public string CountLine(string? query) + { + if (State != WorldBrowseState.Ready) + { + return string.Empty; + } + + var shown = View(query, WorldDirectorySort.Players).Count; + var of = Total > Rows.Count ? $"{Rows.Count} of {Total}" : Rows.Count.ToString(CultureInfo.InvariantCulture); + return shown == Rows.Count ? $"{of} worlds" : $"{shown} of {of}"; + } + + /// Whether any row carries a count the game reports about itself, so is said. + public bool AnyDeclared => Rows.Any(r => r.Count == WorldPlayerCount.Declared); + + public bool Equals(WorldBrowseModel? other) => + other is not null && State == other.State && Total == other.Total && AskedFor == other.AskedFor + && Problem == other.Problem && Opening == other.Opening && ModelLists.Same(Rows, other.Rows); + + public override int GetHashCode() => HashCode.Combine(State, Total, AskedFor, Problem, Opening, ModelLists.Hash(Rows)); +} + +/// +/// One opening of Browse worlds in a host's own controls. The host filters and sorts the model's rows itself +/// (); a pick and a search the rows held cannot answer come back through here to the +/// methods the cell surface's ⏎ ends in. A pick does not close the surface: the client asks where the world is, and +/// closes it once the connect form opens in its place. +/// +public sealed class WorldBrowseSession : ModalSession +{ + private readonly Action _pick; + private readonly Action _ask; + + /// What the surface lists now. + /// Whether the client's theme is a dark one. + /// Picks row N of . + /// Asks the directory to search for the words. + /// Told the surface closed. + public WorldBrowseSession(WorldBrowseModel model, bool isDark, Action pick, Action ask, Action closed) + : base(model, isDark, closed) + { + ArgumentNullException.ThrowIfNull(pick); + ArgumentNullException.ThrowIfNull(ask); + _pick = pick; + _ask = ask; + } + + public override string Surface => "browse-worlds"; + + /// What the search box opens with typed in (/browse words). + public string InitialQuery { get; init; } = string.Empty; + + /// The host's: ⏎ on row of . + public void Pick(int index) + { + if (!IsEnded && index >= 0 && index < Model.Rows.Count) + { + _pick(index); + } + } + + /// The host's: ⏎ on a query the rows held do not answer (). + public void Ask(string query) + { + ArgumentNullException.ThrowIfNull(query); + if (!IsEnded && Model.AsksDirectory(query)) + { + _ask(query.Trim()); + } + } +} diff --git a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs index e176ea8d..befdef82 100644 --- a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs +++ b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs @@ -189,6 +189,9 @@ public static class SurfaceCatalog /// The spelling dictionary offer: the consent step before anything is downloaded. public const string Dictionary = "dictionary"; + /// Browse worlds: mu*index's listing, a pick filling in the welcome's connect form. + public const string BrowseWorlds = "browse-worlds"; + /// The review of an import from another client: the consent step before anything is written. public const string Import = "import"; @@ -224,7 +227,7 @@ public static class SurfaceCatalog private static string[] PanelViews(string view) => ["SharpMUTerm.Avalonia." + view, "SharpMUTerm.Avalonia.PopOutButton"]; /// The modals the window draws with its own controls in place of the cell modal (ClientHost.NativeModals). - public static IReadOnlyList Modals { get; } = [Quit, Search, History, Layouts, Welcome, Help, Dictionary, Import, ScriptConsole, HistoryView]; + public static IReadOnlyList Modals { get; } = [Quit, Search, History, Layouts, Welcome, Help, Dictionary, BrowseWorlds, Import, ScriptConsole, HistoryView]; /// A cell modal in a terminal; the window's own modal in its place. private static readonly IReadOnlyDictionary NativeModal = new Dictionary @@ -511,6 +514,18 @@ [.. PanelViews("MapCanvas"), "SharpMUTerm.Avalonia.MapInspector"]), NativeModal, "SharpMUTerm.Tui.DictionaryOffer.Render", ModalViews("DictionaryOfferView")), + new( + BrowseWorlds, + typeof(WorldBrowseModel), + [ + // A pick asks the directory where the world is, then opens the welcome's connect form filled in: nothing is + // saved or dialled before the player's own Enter there. A query the rows held cannot answer is asked of it. + new(SurfaceActionKind.Modal, "pick", "PickWorld"), + new(SurfaceActionKind.Modal, "ask", "AskWorldDirectory"), + ], + NativeModal, + "SharpMUTerm.Tui.WorldBrowseSurface.Render", + ModalViews("WorldBrowseView")), new( Import, typeof(ImportReviewModel), diff --git a/src/SharpMUTerm.Core/Configuration/AppConfiguration.cs b/src/SharpMUTerm.Core/Configuration/AppConfiguration.cs index b3d2b318..f9896771 100644 --- a/src/SharpMUTerm.Core/Configuration/AppConfiguration.cs +++ b/src/SharpMUTerm.Core/Configuration/AppConfiguration.cs @@ -139,6 +139,15 @@ public sealed class AppConfiguration /// The project's own index, until a player names another. public const string DefaultPackageIndexUrl = "https://raw.githubusercontent.com/SharpMUSH/sharpmuterm-packages/main/index.json"; + /// + /// The world directory Browse worlds reads: the https base of a mu*index API (/games and /games/{id} + /// under it). Asked only when the player opens Browse, never at start. + /// + public string WorldDirectoryUrl { get; set; } = DefaultWorldDirectoryUrl; + + /// mu*index, the maintainer's own MU* directory. + public const string DefaultWorldDirectoryUrl = "https://mu-index.com/api"; + /// /// The last workspace layout (panes, windows, focus) so the app can resume where it left off. /// Null on a fresh config; the shell rebuilds a live workspace from it at startup via diff --git a/src/SharpMUTerm.Core/WorldIndex/WorldDirectory.cs b/src/SharpMUTerm.Core/WorldIndex/WorldDirectory.cs new file mode 100644 index 00000000..37d1ccda --- /dev/null +++ b/src/SharpMUTerm.Core/WorldIndex/WorldDirectory.cs @@ -0,0 +1,363 @@ +using System.Globalization; +using System.Text; +using System.Text.Json; +using SharpMUTerm.Core.Configuration; + +namespace SharpMUTerm.Core.WorldIndex; + +/// How Browse worlds orders the directory's rows. +public enum WorldDirectorySort +{ + /// Most players counted now first, the directory's own default; games it could not count follow. + Players, + + /// Alphabetical: the one order that ranks nobody. + Name, +} + +/// How a row's player count was obtained, as the directory labels it. +public enum WorldPlayerCount +{ + /// No count, or none the directory could say it measured. + Unknown, + + /// Counted by the directory's own probe (a WHO, a connect screen). + Measured, + + /// A number the game reports about itself (MSSP PLAYERS). + Declared, +} + +/// One world as the directory lists it, every text already bounded and stripped of control characters. +/// The directory's durable key, for asking where the world is. +/// Its name. +/// Its one-line description, or empty. +/// The server software family (PennMUSH), or empty when unknown. +/// Players counted now, or null. +/// How was obtained. +public sealed record WorldListing(Guid Id, string Name, string Tagline, string Codebase, int? Players, WorldPlayerCount Count); + +/// A page of the directory: the rows read, how many the directory holds for the question, and how many rows it sent that were not read. +public sealed record WorldListPage(IReadOnlyList Rows, int Total, int Dropped) +{ + public bool Equals(WorldListPage? other) => + other is not null && Total == other.Total && Dropped == other.Dropped && Rows.SequenceEqual(other.Rows); + + public override int GetHashCode() => HashCode.Combine(Total, Dropped, Rows.Count); +} + +/// Where a world is: one telnet address the directory has seen it answer at, checked as /connect checks one. +public sealed record WorldAddress(string Name, string Host, int Port, bool Tls); + +/// +/// The client side of mu*index (https://mu-index.com), the MU* directory Browse worlds lists: what to ask, how much of +/// an answer to read, and how to read it. Everything that comes back is server text: a name or a tagline is +/// bounded and stripped of control characters before anything draws it, an address is read by +/// (the reader /connect uses) or not at all, and a row that breaks a rule is +/// dropped and counted rather than failing the list. The listing carries no address, so it is asked for one game at a +/// time, when the player picks it (). +/// +public static class WorldDirectory +{ + /// Rows asked for in one listing: the directory's most played, then the player types to narrow them. + public const int MaxRows = 200; + + /// The most bytes one answer may be, counted while it streams. + public const int MaxResponseBytes = 2 * 1024 * 1024; + + /// How long one request may take. + public static readonly TimeSpan Timeout = TimeSpan.FromSeconds(15); + + /// The longest a world's name is kept. + public const int MaxName = 64; + + /// The longest a tagline is kept. + public const int MaxTagline = 160; + + /// The longest a codebase is kept. + public const int MaxCodebase = 32; + + /// The longest query sent. + public const int MaxQuery = 64; + + /// What the dataset's licence asks every listing to say (CC BY 4.0). + public const string Attribution = "MUIndex (https://github.com/SharpMUSH/MUIndex)"; + + /// The licence the directory publishes its data under. + public const string Licence = "CC BY 4.0"; + + /// The directory's name as the client says it. + public const string Name = "mu*index"; + + /// The address of the listing for , or null when the base is not an https link. + public static Uri? ListUri(string? baseUrl, string? query = null) + { + if (Base(baseUrl) is not { } root) + { + return null; + } + + var text = new StringBuilder(root).Append("/games?limit=").Append(MaxRows).Append("&sort=players"); + var q = Clean(query, MaxQuery); + if (q.Length > 0) + { + text.Append("&q=").Append(Uri.EscapeDataString(q)); + } + + return new Uri(text.ToString()); + } + + /// The address of one game's page, which names its addresses; null when the base is not an https link. + public static Uri? GameUri(string? baseUrl, Guid id) => + Base(baseUrl) is { } root ? new Uri($"{root}/games/{id:D}") : null; + + /// Why cannot be asked, or null when it can. + public static string? Problem(string? baseUrl) => + Base(baseUrl) is not null ? null + : string.IsNullOrWhiteSpace(baseUrl) ? "no world directory is set (worldDirectoryUrl in config.json)" + : "the world directory is not an https link (worldDirectoryUrl in config.json)"; + + private static string? Base(string? baseUrl) => + Uri.TryCreate(baseUrl?.Trim(), UriKind.Absolute, out var uri) && uri.Scheme == Uri.UriSchemeHttps + && string.IsNullOrEmpty(uri.Query) && string.IsNullOrEmpty(uri.Fragment) && string.IsNullOrEmpty(uri.UserInfo) + ? uri.GetLeftPart(UriPartial.Path).TrimEnd('/') + : null; + + private static readonly JsonDocumentOptions Options = new() { MaxDepth = 32, AllowTrailingCommas = false }; + + /// Reads a GET /games answer (GameListView). + public static (WorldListPage? Page, string? Problem) ParseList(ReadOnlySpan json) + { + if (json.Length > MaxResponseBytes) + { + return (null, "the answer was too large"); + } + + try + { + using var document = JsonDocument.Parse(json.ToArray(), Options); + var root = document.RootElement; + if (root.ValueKind != JsonValueKind.Object + || !root.TryGetProperty("games", out var games) || games.ValueKind != JsonValueKind.Array) + { + return (null, "the answer is not a list of worlds"); + } + + var rows = new List(); + var seen = new HashSet(); + var dropped = 0; + foreach (var game in games.EnumerateArray()) + { + if (rows.Count >= MaxRows || ReadListing(game) is not { } row || !seen.Add(row.Id)) + { + dropped++; + continue; + } + + rows.Add(row); + } + + var total = root.TryGetProperty("total", out var t) && t.ValueKind == JsonValueKind.Number && t.TryGetInt32(out var n) && n >= 0 + ? Math.Max(n, rows.Count) + : rows.Count; + return (new WorldListPage(rows, total, dropped), null); + } + catch (JsonException) + { + return (null, "the answer is not JSON the client can read"); + } + } + + private static WorldListing? ReadListing(JsonElement game) + { + if (game.ValueKind != JsonValueKind.Object + || Text(game, "id") is not { } idText || !Guid.TryParse(idText, out var id) || id == Guid.Empty) + { + return null; + } + + var name = Clean(Text(game, "name"), MaxName); + if (name.Length == 0 || (game.TryGetProperty("archived", out var archived) && archived.ValueKind == JsonValueKind.True)) + { + return null; + } + + int? players = game.TryGetProperty("playersNow", out var p) && p.ValueKind == JsonValueKind.Number + && p.TryGetInt32(out var count) && count is >= 0 and < 1_000_000 + ? count + : null; + var how = players is null ? WorldPlayerCount.Unknown : Text(game, "playersNowState") switch + { + "measured" => WorldPlayerCount.Measured, + "declared" => WorldPlayerCount.Declared, + _ => WorldPlayerCount.Unknown, + }; + + // A number the directory will not say it measured is not shown as one. + if (how == WorldPlayerCount.Unknown) + { + players = null; + } + + return new WorldListing(id, name, Clean(Text(game, "tagline"), MaxTagline), Clean(Text(game, "codebase"), MaxCodebase), players, how); + } + + /// + /// Reads a GET /games/{id} answer (GameView) down to the one address to offer: a telnet or + /// tls endpoint, never one the directory calls gone; active before stale, then the one + /// seen most recently. An address refuses is skipped. + /// + public static (WorldAddress? Address, string? Problem) ParseGame(ReadOnlySpan json) + { + if (json.Length > MaxResponseBytes) + { + return (null, "the answer was too large"); + } + + try + { + using var document = JsonDocument.Parse(json.ToArray(), Options); + var root = document.RootElement; + if (root.ValueKind != JsonValueKind.Object) + { + return (null, "the answer is not a world"); + } + + var name = Clean(Text(root, "name"), MaxName); + if (!root.TryGetProperty("endpoints", out var endpoints) || endpoints.ValueKind != JsonValueKind.Array) + { + return (null, "the directory lists no address for it"); + } + + var candidates = new List<(WorldAddress Address, int Rank, DateTimeOffset Seen)>(); + foreach (var endpoint in endpoints.EnumerateArray().Take(64)) + { + if (endpoint.ValueKind != JsonValueKind.Object) + { + continue; + } + + var kind = Text(endpoint, "kind"); + var rank = Text(endpoint, "state") switch + { + "active" => 0, + "stale" => 1, + _ => -1, + }; + if (kind is not ("telnet" or "tls") || rank < 0 + || Text(endpoint, "host") is not { Length: > 0 and <= 253 } host + || host.Any(c => char.IsWhiteSpace(c) || char.IsControl(c)) + || !endpoint.TryGetProperty("port", out var portValue) || portValue.ValueKind != JsonValueKind.Number + || !portValue.TryGetInt32(out var port) + || ConnectEndpoint.Parse([host, port.ToString(CultureInfo.InvariantCulture)]) is not { } parsed) + { + continue; + } + + var tls = kind == "tls" || (endpoint.TryGetProperty("tlsMeasured", out var measured) && measured.ValueKind == JsonValueKind.True); + var seen = Text(endpoint, "lastSeenAt") is { } at + && DateTimeOffset.TryParse(at, CultureInfo.InvariantCulture, DateTimeStyles.RoundtripKind, out var when) + ? when + : DateTimeOffset.MinValue; + candidates.Add((new WorldAddress(name.Length == 0 ? parsed.Host : name, parsed.Host, parsed.Port, tls), rank, seen)); + } + + if (candidates.Count == 0) + { + return (null, "the directory lists no telnet address for it that answers"); + } + + var best = candidates.OrderBy(c => c.Rank).ThenByDescending(c => c.Seen).First(); + return (best.Address, null); + } + catch (JsonException) + { + return (null, "the answer is not JSON the client can read"); + } + } + + /// + /// Server text made safe to draw: control, format (bidirectional overrides included), private-use and astral characters and line breaks + /// become spaces, runs of space collapse, and what is left is cut to with an ellipsis. + /// + public static string Clean(string? text, int max) + { + if (string.IsNullOrEmpty(text) || max <= 0) + { + return string.Empty; + } + + var built = new StringBuilder(Math.Min(text.Length, max + 1)); + var space = false; + foreach (var c in text) + { + if (built.Length > max * 2) + { + break; + } + + var category = char.GetUnicodeCategory(c); + var blank = char.IsWhiteSpace(c) || char.IsControl(c) + || category is UnicodeCategory.Format or UnicodeCategory.LineSeparator or UnicodeCategory.ParagraphSeparator + or UnicodeCategory.PrivateUse or UnicodeCategory.Surrogate or UnicodeCategory.OtherNotAssigned; + if (blank) + { + space = built.Length > 0; + continue; + } + + if (space) + { + built.Append(' '); + space = false; + } + + built.Append(c); + } + + var cleaned = built.ToString(); + return cleaned.Length <= max ? cleaned : cleaned[..(max - 1)].TrimEnd() + "…"; + } + + private static string? Text(JsonElement element, string name) => + element.TryGetProperty(name, out var value) && value.ValueKind == JsonValueKind.String ? value.GetString() : null; + + private static readonly HttpClient Client = new() { Timeout = Timeout }; + + /// + /// Downloads : https only, JSON asked for, the size counted while it streams. Null when it + /// is not https, did not succeed, or was larger than . + /// + public static async Task DownloadAsync(Uri uri, CancellationToken token) + { + ArgumentNullException.ThrowIfNull(uri); + if (uri.Scheme != Uri.UriSchemeHttps) + { + return null; + } + + using var request = new HttpRequestMessage(HttpMethod.Get, uri); + request.Headers.Accept.ParseAdd("application/json"); + using var response = await Client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, token).ConfigureAwait(false); + if (!response.IsSuccessStatusCode || response.Content.Headers.ContentLength > MaxResponseBytes) + { + return null; + } + + await using var stream = await response.Content.ReadAsStreamAsync(token).ConfigureAwait(false); + using var buffer = new MemoryStream(); + var chunk = new byte[16384]; + int read; + while ((read = await stream.ReadAsync(chunk, token).ConfigureAwait(false)) > 0) + { + if (buffer.Length + read > MaxResponseBytes) + { + return null; + } + + buffer.Write(chunk, 0, read); + } + + return buffer.ToArray(); + } +} diff --git a/src/SharpMUTerm.Tui/DemoWorldDirectory.cs b/src/SharpMUTerm.Tui/DemoWorldDirectory.cs new file mode 100644 index 00000000..acb7818a --- /dev/null +++ b/src/SharpMUTerm.Tui/DemoWorldDirectory.cs @@ -0,0 +1,58 @@ +namespace SharpMUTerm.Tui; + +/// +/// The demo scene's world directory: a mu*index listing and the pages it names, in mu*index's own JSON shapes +/// (GameListView, GameView, camelCase), answered from memory. Every world here is made up and every host is +/// under .example (RFC 2606), so a demo that picks one and presses ⏎ dials nothing real. +/// +internal static class DemoWorldDirectory +{ + private sealed record Game(string Id, string Name, string Tagline, string? Codebase, int? Players, string Count, string Host, int Port, bool Tls); + + private static readonly Game[] Games = + [ + new("6f1c2a52-8d2e-4a52-9b8e-0c6a1f3d2e01", "Aetherfall", "Sky-islands roleplay under a shattered moon", "PennMUSH", 64, "measured", "aetherfall.example", 4201, true), + new("6f1c2a52-8d2e-4a52-9b8e-0c6a1f3d2e02", "Lanternport", "A harbour city of guilds, smugglers and tide-bells", "TinyMUX", 41, "measured", "lanternport.example", 2860, false), + new("6f1c2a52-8d2e-4a52-9b8e-0c6a1f3d2e03", "The Hollow Crown", "Courtly intrigue in a kingdom with an empty throne", "RhostMUSH", 33, "declared", "hollowcrown.example", 4000, false), + new("6f1c2a52-8d2e-4a52-9b8e-0c6a1f3d2e04", "Ironvale", "Hack-and-slash with a hundred-zone map and remorts", "CircleMUD", 28, "measured", "ironvale.example", 4000, false), + new("6f1c2a52-8d2e-4a52-9b8e-0c6a1f3d2e05", "Starfall Station", "Science-fiction roleplay aboard a failing waystation", "Evennia", 19, "measured", "starfall.example", 4000, true), + new("6f1c2a52-8d2e-4a52-9b8e-0c6a1f3d2e06", "Mossgrove", "A slow, kind game about tending a forest village", "LambdaMOO", 12, "measured", "mossgrove.example", 7777, false), + new("6f1c2a52-8d2e-4a52-9b8e-0c6a1f3d2e07", "Duskwatch", "Gothic horror; consent-based, plot-driven", "PennMUSH", 9, "declared", "duskwatch.example", 4201, false), + new("6f1c2a52-8d2e-4a52-9b8e-0c6a1f3d2e08", "Copperline", "Steam, rails and frontier towns", "TinyMUX", null, "unknown", "copperline.example", 2000, false), + new("6f1c2a52-8d2e-4a52-9b8e-0c6a1f3d2e09", "Glass Archipelago", "Islands, sails and a sea that remembers", null, null, "unknown", "glassarch.example", 4444, false), + ]; + + /// The answer to : one game's page, or the listing (narrowed by its q). + public static string Answer(Uri uri) + { + ArgumentNullException.ThrowIfNull(uri); + var path = uri.AbsolutePath.TrimEnd('/'); + var slash = path.LastIndexOf('/'); + if (slash >= 0 && Guid.TryParse(path[(slash + 1)..], out var id) + && Games.FirstOrDefault(g => Guid.Parse(g.Id) == id) is { } game) + { + return Page(game); + } + + var q = System.Web.HttpUtility.ParseQueryString(uri.Query)["q"] ?? string.Empty; + var listed = Games.Where(g => q.Length == 0 + || g.Name.Contains(q, StringComparison.OrdinalIgnoreCase) + || g.Tagline.Contains(q, StringComparison.OrdinalIgnoreCase) + || (g.Codebase ?? string.Empty).Contains(q, StringComparison.OrdinalIgnoreCase)).ToArray(); + var rows = string.Join(",", listed.Select(Summary)); + return $$"""{"apiVersion":"1","generatedAt":"2026-11-04T12:00:00+00:00","filter":{"q":{{Json(q.Length == 0 ? null : q)}}},"facets":[],"total":{{listed.Length}},"limit":200,"offset":0,"count":{{listed.Length}},"games":[{{rows}}]}"""; + } + + private static string Summary(Game g) => + $$"""{"id":"{{g.Id}}","slug":"{{g.Name.ToLowerInvariant().Replace(' ', '-')}}","name":{{Json(g.Name)}},"tagline":{{Json(g.Tagline)}},"state":"active","archived":false,"claimed":false,"playersNow":{{(g.Players is { } p ? p.ToString(System.Globalization.CultureInfo.InvariantCulture) : "null")}},"playersNowState":"{{g.Count}}","playersNowProvenance":null,"codebase":{{Json(g.Codebase)}},"codebaseProvenance":null,"measuredProtocols":["gmcp","mssp"],"lastReachableAt":"2026-11-04T11:40:00+00:00","url":"/g/{{g.Id}}","apiUrl":"/api/games/{{g.Id}}"}"""; + + private static string Page(Game g) + { + var endpoints = g.Tls + ? $$"""[{"host":"{{g.Host}}","port":{{g.Port + 1}},"kind":"tls","tlsMeasured":true,"firstSeenAt":"2025-02-01T00:00:00+00:00","lastSeenAt":"2026-11-04T11:40:00+00:00","state":"active"},{"host":"{{g.Host}}","port":{{g.Port}},"kind":"telnet","tlsMeasured":false,"firstSeenAt":"2024-01-01T00:00:00+00:00","lastSeenAt":"2026-11-04T11:00:00+00:00","state":"active"}]""" + : $$"""[{"host":"old.{{g.Host}}","port":{{g.Port}},"kind":"telnet","tlsMeasured":false,"firstSeenAt":"2019-01-01T00:00:00+00:00","lastSeenAt":"2021-06-01T00:00:00+00:00","state":"gone"},{"host":"{{g.Host}}","port":{{g.Port}},"kind":"telnet","tlsMeasured":false,"firstSeenAt":"2021-06-01T00:00:00+00:00","lastSeenAt":"2026-11-04T11:40:00+00:00","state":"active"}]"""; + return $$"""{"id":"{{g.Id}}","slug":"x","name":{{Json(g.Name)}},"tagline":{{Json(g.Tagline)}},"description":null,"state":"active","archived":false,"claimed":false,"playersNow":null,"playersNowState":"unknown","codebase":{{Json(g.Codebase)}},"measuredProtocols":[],"endpoints":{{endpoints}},"url":"/g/x","apiUrl":"/api/games/{{g.Id}}"}"""; + } + + private static string Json(string? text) => text is null ? "null" : System.Text.Json.JsonSerializer.Serialize(text); +} diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Surfaces.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Surfaces.cs index 8dce471e..1c7fbad0 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Surfaces.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Surfaces.cs @@ -35,6 +35,7 @@ private T Drawing(string surface, string key, T model) : surface == SurfaceCatalog.Welcome ? (_welcomeView.IsOpen ? _welcome?.Model : null) : surface == SurfaceCatalog.Help ? CellHelp?.Model : surface == SurfaceCatalog.Dictionary ? (_helpView.IsOpen && _helpView.Mode == "dictionary" ? _dictionaryOffer : null) + : surface == SurfaceCatalog.BrowseWorlds ? (_helpView.IsOpen && _helpView.Mode == WorldBrowseMode ? _worldModel : null) : surface == SurfaceCatalog.Import ? (_helpView.IsOpen && _helpView.Mode == "import" ? _pendingImport?.Model : null) : surface == SurfaceCatalog.ScriptConsole ? CellConsole?.Model : _drawnModels.TryGetValue((surface, key), out var model) ? model : null; diff --git a/src/SharpMUTerm.Tui/Program.cs b/src/SharpMUTerm.Tui/Program.cs index dfdc21ef..d93d18bb 100644 --- a/src/SharpMUTerm.Tui/Program.cs +++ b/src/SharpMUTerm.Tui/Program.cs @@ -227,7 +227,8 @@ internal static int RunLive( scriptStoreRoot: Path.Combine(Path.GetDirectoryName(ConfigurationStore.DefaultPath)!, "script-data"), spelling: () => OpenDictionary(loadLogger), autoLayout: true, - dictionaries: DictionariesFolder); + dictionaries: DictionariesFolder, + worldFetch: SharpMUTerm.Core.WorldIndex.WorldDirectory.DownloadAsync); ready?.Invoke(liveApp); // A telnet:// link on the command line is followed once the loop runs, the way /connect host port would be; diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.NativeModals.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.NativeModals.cs index 776b8675..c53fdaa1 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.NativeModals.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.NativeModals.cs @@ -64,6 +64,7 @@ internal sealed partial class SharpMUTermApp SurfaceCatalog.Welcome => "the welcome", SurfaceCatalog.Help => "help", SurfaceCatalog.Dictionary => "the dictionary offer", + SurfaceCatalog.BrowseWorlds => "Browse worlds", SurfaceCatalog.ScriptConsole => "the script console", null => null, _ => "what is open", diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Welcome.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Welcome.cs index a74f416e..b2b19b32 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Welcome.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Welcome.cs @@ -71,13 +71,8 @@ internal void SimulateWelcomeKey(ConsoleKeyInfo key) _welcomeView.SimulateKey(key); } - /// Why the package index cannot be browsed, or null when it can be asked for. - private string? PackageIndexProblem() => - Uri.TryCreate(_config.PackageIndexUrl, UriKind.Absolute, out var uri) && uri.Scheme == Uri.UriSchemeHttps - ? null - : string.IsNullOrWhiteSpace(_config.PackageIndexUrl) - ? "no package index is set (packageIndexUrl in config.json)" - : "the package index is not an https link (packageIndexUrl in config.json)"; + /// Why the world directory cannot be browsed, or null when it can be asked for. + private string? WorldDirectoryProblem() => Core.WorldIndex.WorldDirectory.Problem(_config.WorldDirectoryUrl); /// /// Shows the welcome: the surface where the screen is seen, the lines where it is not. Opened at start on @@ -85,7 +80,7 @@ internal void SimulateWelcomeKey(ConsoleKeyInfo key) /// internal void ShowWelcome() { - var problem = PackageIndexProblem(); + var problem = WorldDirectoryProblem(); if (Host.Announcer is { } announcer) { foreach (var line in WelcomeSurface.PlainLines(_welcomeLayout, problem)) @@ -138,7 +133,7 @@ private bool WelcomeKey(WelcomeSurface welcome, ConsoleKeyInfo key) => /// /// What the welcome asked for, from either host: the cell surface's key and the native welcome's click both end - /// here. Browse and Open settings close it and open what they name; Connect closes it and dials the form through + /// here. Browse (Browse worlds) and Open settings close it and open what they name; Connect closes it and dials the form through /// /connect's path. Anything else keeps it open, which is the return value. /// private bool RunWelcomeAction(WelcomeSurface welcome, WelcomeAction action) @@ -148,7 +143,7 @@ private bool RunWelcomeAction(WelcomeSurface welcome, WelcomeAction action) { case WelcomeAction.Browse: CloseWelcome(); - BrowsePackages(); + ShowWorldBrowse(); return false; case WelcomeAction.Settings: @@ -201,6 +196,13 @@ private void ConnectFromWelcome(WelcomeConnect request) ConnectCommand(ActiveWindowId(), arguments, world => { ApplyWelcomeLayout(world); + + // Browse worlds named it: the directory's name for it, made unique, in place of the host. + if (request.WorldName is { Length: > 0 } listed) + { + world.Name = UniqueWorldName(listed); + } + if (request.Character is { } name) { world.Characters.Add(new CharacterDefinition { Name = name }); @@ -370,6 +372,7 @@ private string RenderWelcomeSnapshot(string view) RefreshHeader(); RefreshRail(); UpdateStatus(); + WorldFetch ??= DemoWorldFetch; LastCommand = StartAsync([]); if (string.Equals(view, WelcomeView + "-connect", StringComparison.OrdinalIgnoreCase)) diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.WorldBrowse.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.WorldBrowse.cs new file mode 100644 index 00000000..e540b100 --- /dev/null +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.WorldBrowse.cs @@ -0,0 +1,447 @@ +using System.Globalization; +using SharpMUTerm.Client.Modals; +using SharpMUTerm.Client.Surfaces; +using SharpMUTerm.Core.Accessibility; +using SharpMUTerm.Core.WorldIndex; + +namespace SharpMUTerm.Tui; + +/// +/// Browse worlds (the welcome's Browse row, ⌃P ▸ Browse worlds…, /browse [words]): mu*index's listing, +/// one Client model () drawn as a cell here and as a native modal +/// in a host that has them. Every gesture in either ends in one method: and +/// . +/// +/// Asked only when the player opens it, never at start, through a fetch the caller supplies (worldFetch:, +/// the save:/logRoot: family): null in a test and a snapshot, which then say they asked nothing. The demo +/// scene answers from memory. A pick saves nothing and dials nothing: it asks the directory where the world is and +/// opens the welcome's connect form filled in, so the player's own ⏎ there — through /connect's path — is what +/// adds the world. +/// +/// +internal sealed partial class SharpMUTermApp +{ + /// The cell overlay's mode while Browse worlds is in it. + internal const string WorldBrowseMode = "browse-worlds"; + + /// The fetch the live entry point supplies; null in a run that may ask nothing. + private readonly Func>? _worldFetch; + + /// The cell surface's state while it is open. + private WorldBrowseSurface? _worldBrowse; + + /// What Browse worlds lists now, in either host. + private WorldBrowseModel _worldModel = new(WorldBrowseState.Loading, [], 0, string.Empty, null, null); + + /// Bumped by every request, so an answer that arrives after a newer question (or a close) is dropped. + private int _worldGeneration; + + /// The rows /browse last said as lines, so /browse 3 names one of them. + private IReadOnlyList _saidWorlds = []; + + /// + /// How the directory is asked: the caller's fetch, or one a test or the demo scene sets. Null asks nothing. + /// + internal Func>? WorldFetch { get; set; } + + /// Whether Browse worlds is open, in cells or natively. + internal bool WorldBrowseOpen => + (_helpView.IsOpen && _helpView.Mode == WorldBrowseMode) || NativeModalOf(SurfaceCatalog.BrowseWorlds) is not null; + + /// What Browse worlds lists now, for the tests. + internal WorldBrowseModel WorldBrowseModelNow => _worldModel; + + /// The cell surface's state, for the tests; null while it is shut. + internal WorldBrowseSurface? CellWorldBrowse => _helpView.IsOpen && _helpView.Mode == WorldBrowseMode ? _worldBrowse : null; + + /// The native session while one is open, for the tests. + internal WorldBrowseSession? NativeWorldBrowse => _nativeModal as WorldBrowseSession; + + /// Feeds a key to the cell surface. + internal void SimulateWorldBrowseKey(ConsoleKeyInfo key) => _helpView.SimulateKey(key); + + /// + /// Opens Browse worlds with typed into its search — the welcome's Browse row, ⌃P and + /// /browse — or closes it when it is open (⌃P's entry is a toggle). With no screen to read, the rows are said + /// as lines instead. + /// + internal void ShowWorldBrowse(string query = "") + { + if (NativeModalOf(SurfaceCatalog.BrowseWorlds) is { } native) + { + CloseNativeModal(native); + return; + } + + if (_helpView.IsOpen && _helpView.Mode == WorldBrowseMode) + { + _helpView.Close(); + return; + } + + query = WorldDirectory.Clean(query, WorldDirectory.MaxQuery); + if (!Host.ScreenIsSeen) + { + SayWorlds(query); + return; + } + + if (ComposerIsInTheWay("Browse worlds") || (AnyOverlayOpen && Refuse($"close {OpenOverlayName()} first"))) + { + return; + } + + // The list is the directory's most played; what is typed narrows it as the player types. Opened on a query + // (/browse words), the directory itself is asked, since its most played may hold none of them. + StartWorldList(query); + if (NativeModalsHost is { } host) + { + WorldBrowseSession? session = null; + session = new WorldBrowseSession( + _worldModel, + ThemeIsDark(), + index => OnUiThread(() => PickWorld(session!.Model, index)), + words => OnUiThread(() => AskWorldDirectory(words)), + () => OnUiThread(() => + { + NativeModalClosed(session!); + _worldGeneration++; + })) + { + Theme = _theme.Clone(), + InitialQuery = query, + }; + ShowNativeModal(host, session); + return; + } + + var browse = new WorldBrowseSurface(query); + _worldBrowse = browse; + var rows = Math.Clamp(_system.DesktopDimensions.Height - 6, 10, 30); + _helpView.Open( + WorldBrowseMode, + WorldBrowseModel.Heading, + width => browse.Render(Drawing(SurfaceCatalog.BrowseWorlds, string.Empty, _worldModel), width, rows), + key => + { + switch (browse.Key(_worldModel, key)) + { + case WorldBrowseAction.Pick: + PickWorld(_worldModel, browse.SelectedRow(_worldModel)); + break; + case WorldBrowseAction.Ask: + AskWorldDirectory(browse.Query); + break; + } + + return WorldBrowseOpen; + }, + width: WorldBrowseSurface.PreferredWidth, + closed: () => + { + _worldBrowse = null; + _worldGeneration++; + }); + } + + /// + /// Asks for the listing — the directory's most played, or its search for — and publishes + /// the model it leaves: loading now, then the rows or why there are none. Nothing is asked with no https directory + /// or no fetch, and the model says which. + /// + /// Told the model once the list is in, failed or could not be asked. + private void StartWorldList(string query, Action? settled = null) + { + var generation = ++_worldGeneration; + void Settle(WorldBrowseModel model) + { + PublishWorldModel(model); + settled?.Invoke(model); + } + + if (WorldDirectoryProblem() is { } problem) + { + Settle(new WorldBrowseModel(WorldBrowseState.Unavailable, [], 0, query, problem, null)); + return; + } + + if ((WorldFetch ?? _worldFetch) is null) + { + Settle(new WorldBrowseModel( + WorldBrowseState.Unavailable, [], 0, query, "this run asks no world directory, so nothing was fetched", null)); + return; + } + + PublishWorldModel(new WorldBrowseModel(WorldBrowseState.Loading, [], 0, query, null, null)); + FetchWorlds(WorldDirectory.ListUri(_config.WorldDirectoryUrl, query)!, generation, (bytes, failure) => + { + if (bytes is null) + { + Settle(new WorldBrowseModel(WorldBrowseState.Failed, [], 0, query, failure, null)); + return; + } + + var (page, unread) = WorldDirectory.ParseList(bytes); + Settle(page is null + ? new WorldBrowseModel(WorldBrowseState.Failed, [], 0, query, unread, null) + : new WorldBrowseModel(WorldBrowseState.Ready, page.Rows, page.Total, query, null, null)); + }); + } + + /// + /// The pick, from either host: row of . Asks the directory where that + /// world is; once it answers with an address /connect would take, Browse worlds closes and the welcome's connect + /// form opens filled in. Nothing is saved or dialled here. A refusal is said in place and the list stays. + /// + internal void PickWorld(WorldBrowseModel model, int index) + { + if (index < 0 || index >= model.Rows.Count || _worldModel.Opening is not null) + { + return; + } + + var row = model.Rows[index]; + if (WorldDirectory.GameUri(_config.WorldDirectoryUrl, row.Id) is not { } uri || (WorldFetch ?? _worldFetch) is null) + { + PublishWorldModel(_worldModel with { Problem = $"{row.Name} not opened: {WorldDirectoryProblem() ?? "this run asks no world directory"}" }); + return; + } + + var generation = ++_worldGeneration; + PublishWorldModel(_worldModel with { Opening = row.Name, Problem = null }); + FetchWorlds(uri, generation, (bytes, failure) => + { + var (address, unread) = bytes is null ? (null, failure) : WorldDirectory.ParseGame(bytes); + if (address is null) + { + PublishWorldModel(_worldModel with { Opening = null, Problem = $"{row.Name} not opened: {unread}" }); + return; + } + + // The listing's name, which the player chose by; the page's own is the same world. + OpenWorldForm(address with { Name = row.Name }); + }); + } + + /// + /// ⏎ on a query none of the rows held match, from either host: asks the directory itself to search for it, and lists + /// what it says in place of its most played. + /// + internal void AskWorldDirectory(string query) + { + if (!_worldModel.AsksDirectory(query)) + { + return; + } + + StartWorldList(WorldDirectory.Clean(query, WorldDirectory.MaxQuery)); + } + + /// Closes Browse worlds and opens the welcome's connect form filled in with . + private void OpenWorldForm(WorldAddress address) + { + CloseWorldBrowse(); + var welcome = new WelcomeSurface(WorldDirectoryProblem()) { Layout = _welcomeLayout }; + welcome.Prefill(address.Name, address.Host, address.Port, address.Tls); + if (WelcomeIsOpen) + { + CloseWelcome(); + } + + _welcome = welcome; + if (!TryOpenNativeWelcome(welcome)) + { + OpenWelcomeView(); + } + } + + /// Closes Browse worlds in whichever host it is open. + private void CloseWorldBrowse() + { + if (NativeModalOf(SurfaceCatalog.BrowseWorlds) is { } native) + { + CloseNativeModal(native); + } + + if (_helpView.IsOpen && _helpView.Mode == WorldBrowseMode) + { + _helpView.Close(); + } + } + + /// A new model: the native session is told, the cell surface repainted. + private void PublishWorldModel(WorldBrowseModel model) + { + _worldModel = model; + if (NativeWorldBrowse is { } session) + { + session.Publish(model); + } + + if (_helpView.IsOpen && _helpView.Mode == WorldBrowseMode) + { + _helpView.Repaint(); + } + } + + /// + /// Asks through the fetch and hands back the bytes, or why there are none, on the UI thread — + /// unless a newer request (or a close) has bumped since, when the answer is dropped. An + /// answer already in hand (the demo's, a test's) is handled at once. + /// + private void FetchWorlds(Uri uri, int generation, Action then) + { + var fetch = WorldFetch ?? _worldFetch; + if (fetch is null) + { + return; + } + + void Deliver(byte[]? bytes, string? problem) + { + if (generation == _worldGeneration) + { + then(bytes, bytes is null ? problem ?? "it did not answer, or the answer was too large" : null); + } + } + + Task task; + try + { + task = fetch(uri, CancellationToken.None); + } + catch (Exception ex) when (ex is HttpRequestException or IOException or InvalidOperationException) + { + Deliver(null, ex.Message); + return; + } + + if (task.IsCompleted) + { + Deliver(task.IsCompletedSuccessfully ? task.Result : null, task.Exception?.InnerException?.Message); + return; + } + + _ = Task.Run(async () => + { + byte[]? bytes = null; + string? problem = null; + try + { + bytes = await task.WaitAsync(WorldDirectory.Timeout).ConfigureAwait(false); + } + catch (TimeoutException) + { + problem = "it took too long to answer"; + } + catch (Exception ex) when (ex is HttpRequestException or IOException or TaskCanceledException or InvalidOperationException) + { + problem = ex.Message; + } + + OnUiThread(() => Deliver(bytes, problem)); + }); + } + + // ── /browse, and the lines a host with no screen hears ──────────────────────────────────────── + + /// + /// /browse [words] opens Browse worlds (asking the directory for the words); /browse N picks row N of the + /// list /browse last said as lines. + /// + private void BrowseCommand(string arguments) + { + var words = arguments.Trim(); + if (int.TryParse(words, NumberStyles.None, CultureInfo.InvariantCulture, out var n) && _saidWorlds.Count > 0) + { + if (n < 1 || n > _saidWorlds.Count) + { + RefuseCommand($"/browse lists {_saidWorlds.Count} worlds; say a number from 1 to {_saidWorlds.Count}"); + return; + } + + SayWorldAddress(_saidWorlds[n - 1]); + return; + } + + if (WorldBrowseOpen) + { + CloseWorldBrowse(); + } + + ShowWorldBrowse(words); + } + + /// The listing said as numbered lines, for a host nobody reads the screen of; /browse N picks one. + private void SayWorlds(string query) => StartWorldList(query, model => + { + var lines = new List { WorldBrowseModel.AttributionLine }; + if (model.Empty(string.Empty) is { } empty) + { + lines.Add(empty); + _saidWorlds = []; + } + else + { + _saidWorlds = model.Rows.Take(20).ToArray(); + lines.Add($"{model.CountLine(string.Empty)}; the first {_saidWorlds.Count}, most played first:"); + lines.AddRange(_saidWorlds.Select((r, i) => string.Join( + " — ", + new[] { $"{i + 1}. {r.Name}", $"{WorldBrowseModel.Players(r)} players", r.Codebase, r.Tagline }.Where(p => p.Length > 0)))); + lines.Add("Type /browse and a number to see where that world is, or /browse and words to search."); + } + + SayLines(lines); + }); + + /// Where a world /browse N named is, said as the /connect line to type; nothing is saved or dialled. + private void SayWorldAddress(WorldListing row) + { + if (WorldDirectory.GameUri(_config.WorldDirectoryUrl, row.Id) is not { } uri || (WorldFetch ?? _worldFetch) is null) + { + RefuseCommand($"{row.Name} not looked up: {WorldDirectoryProblem() ?? "this run asks no world directory"}"); + return; + } + + var generation = ++_worldGeneration; + FetchWorlds(uri, generation, (bytes, failure) => + { + var (address, unread) = bytes is null ? (null, failure) : WorldDirectory.ParseGame(bytes); + if (address is null) + { + RefuseCommand($"{row.Name} not looked up: {unread}"); + return; + } + + var host = address.Host.Contains(':') ? $"[{address.Host}]" : address.Host; + var command = $"/connect {host} {address.Port}" + (address.Tls ? " tls" : string.Empty); + if (Host.ScreenIsSeen) + { + OpenWorldForm(address with { Name = row.Name }); + return; + } + + SayLines( + [ + $"{row.Name} is at {address.Host} port {address.Port}{(address.Tls ? ", encrypted" : string.Empty)}, as listed on mu*index.", + $"To add it and connect, type: {command}", + ]); + }); + } + + /// Lines into the focused window and the announcer, as help says its rows. + private void SayLines(IEnumerable lines) + { + foreach (var line in lines) + { + AppendWindowLine(ActiveWindowId(), $"[dim]*** {MarkupText.Escape(line)}[/]"); + Host.Announcer?.Announce(line, AnnouncementKind.Notice); + } + } + + // ── the demo ────────────────────────────────────────────────────────────────────────────────── + + /// The demo's directory, answered from memory, so a window demo can browse and pick without a byte leaving. + private static Task DemoWorldFetch(Uri uri, CancellationToken token) => + Task.FromResult(System.Text.Encoding.UTF8.GetBytes(DemoWorldDirectory.Answer(uri))); +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 0befbe2b..741be210 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -733,9 +733,11 @@ public SharpMUTermApp( string? scriptStoreRoot = null, Func? spelling = null, bool autoLayout = false, - string? dictionaries = null) + string? dictionaries = null, + Func>? worldFetch = null) { _spelling = spelling; + _worldFetch = worldFetch; _dictionariesRoot = string.IsNullOrWhiteSpace(dictionaries) ? null : dictionaries; _autoLayout = autoLayout; var capabilities = host.Capabilities; @@ -1961,6 +1963,24 @@ public string RenderSnapshot(string? view = null) return scriptingFrame; } + // Browse worlds over the demo's directory (answered from memory): the list through its ⌃P entry; `-failed` with a + // directory that does not answer; `-picked` after a pick, so the frame is the welcome's connect form filled in. + if (string.Equals(view, "browse-worlds", StringComparison.OrdinalIgnoreCase) + || string.Equals(view, "browse-worlds-failed", StringComparison.OrdinalIgnoreCase) + || string.Equals(view, "browse-worlds-picked", StringComparison.OrdinalIgnoreCase)) + { + if (string.Equals(view, "browse-worlds-failed", StringComparison.OrdinalIgnoreCase)) + { + WorldFetch = static (_, _) => Task.FromResult(null); + } + + DispatchCommand(SharpMUTerm.Client.Commands.BuiltInCommands.BrowseWorldsCommand); + if (string.Equals(view, "browse-worlds-picked", StringComparison.OrdinalIgnoreCase)) + { + PickWorld(_worldModel, 0); + } + } + // The spelling dictionary offer, through its ⌃P entry. The demo keeps no dictionaries folder, so the offer says // nothing can be saved in this run — the text a live client shows names the folder instead. if (string.Equals(view, "dictionary-offer", StringComparison.OrdinalIgnoreCase)) @@ -2898,6 +2918,9 @@ private bool RestoreLogWanted(string? sessionKey) => /// private void InitDemoRuntimeState() { + // The demo's world directory answers from memory, so Browse worlds lists and picks without a byte leaving. + WorldFetch ??= DemoWorldFetch; + foreach (var (world, character) in StartupConnections.Resolve(_config)) { var key = $"{world.Name}.{character?.Name ?? world.Name}"; @@ -5290,6 +5313,14 @@ private void OnCommandEntered(InputBar bar, string command) return; } + // `/browse [words]` opens Browse worlds (mu*index); `/browse N` picks a row it said as lines. + if (command.StartsWith("/browse", StringComparison.OrdinalIgnoreCase) + && (command.Length == 7 || command[7] == ' ')) + { + BrowseCommand(command[7..]); + return; + } + // `/welcome` shows the first-run welcome again; `/welcome layout …` picks its starting layout. if (command.StartsWith("/welcome", StringComparison.OrdinalIgnoreCase) && (command.Length == 8 || command[8] == ' ')) @@ -5914,7 +5945,7 @@ private string OpenOverlayName() => : _search.IsOpen ? "the search surface" : _prefixPanel.IsOpen ? "the pane keys panel" : _welcomeView.IsOpen ? "the welcome" - : _helpView.IsOpen ? (_helpView.Mode switch { "dictionary" => "the dictionary offer", "import" => "the import review", "script-console" => "the script console", "history-view" => "the history view", _ => "help" }) + : _helpView.IsOpen ? (_helpView.Mode switch { "dictionary" => "the dictionary offer", "import" => "the import review", "script-console" => "the script console", "history-view" => "the history view", "browse-worlds" => "Browse worlds", _ => "help" }) : "what is open"; /// Whether either bar is holding unsent text — what the ✎ tab marker means. @@ -9112,6 +9143,9 @@ private bool RunBuiltInCommand(string id) case "term:welcome": ShowWelcome(); return true; + case SharpMUTerm.Client.Commands.BuiltInCommands.BrowseWorldsCommand: + ShowWorldBrowse(); + return true; case SharpMUTerm.Client.Commands.BuiltInCommands.ImportCommand: StartImport(); return true; diff --git a/src/SharpMUTerm.Tui/SnapshotViews.cs b/src/SharpMUTerm.Tui/SnapshotViews.cs index b643b93e..999d6ac5 100644 --- a/src/SharpMUTerm.Tui/SnapshotViews.cs +++ b/src/SharpMUTerm.Tui/SnapshotViews.cs @@ -28,7 +28,7 @@ internal static class SnapshotViews "collapsed", "timestamps", "timestamps-toggled", "theme-switched", "rail-keys", "prompt", "meters", "gamedata", "map", "map-walking", "map-split", "map-edit", "map-level", "map-area", "map-find", "map-mine", "packages", "package-review", "package-browse", "send-menu", "layouts", "layout-combat", "layout-roleplay", "panel-who", "panel-vitals", "panel-quickbar", "panel-composer", - "welcome", "welcome-connect", "tour", "reconnect", "help", "help-topic", "dictionary-offer", "import-review", "join-wraps", "join-wraps-f5", + "welcome", "welcome-connect", "tour", "reconnect", "help", "help-topic", "dictionary-offer", "browse-worlds", "browse-worlds-failed", "browse-worlds-picked", "import-review", "join-wraps", "join-wraps-f5", "script-console", "script-list", "script-edit", "search-older", "search-history", "channel-capture", "highlight-names", "channels-f5", "scene-log", ]; } diff --git a/src/SharpMUTerm.Tui/WelcomeSurface.cs b/src/SharpMUTerm.Tui/WelcomeSurface.cs index a59f6e5b..d0370c06 100644 --- a/src/SharpMUTerm.Tui/WelcomeSurface.cs +++ b/src/SharpMUTerm.Tui/WelcomeSurface.cs @@ -13,7 +13,7 @@ internal enum WelcomeAction /// Dial . Connect, - /// Close, and open the package index. + /// Close, and open Browse worlds. Browse, /// Close, and open F5. @@ -24,7 +24,7 @@ internal enum WelcomeAction } /// What the connect form asks for, read once ⏎ has checked it. -internal sealed record WelcomeConnect(string Host, int Port, bool Tls, string? Character, bool PasswordLater); +internal sealed record WelcomeConnect(string Host, int Port, bool Tls, string? Character, bool PasswordLater, string? WorldName = null); /// /// The first-run welcome: what it says and what a key on it means, with no window in it — the @@ -51,7 +51,7 @@ internal sealed class WelcomeSurface private readonly string? _indexProblem; - /// Why the package index cannot be browsed, or null when it can be asked for. + /// Why the world directory cannot be browsed, or null when it can be asked for. public WelcomeSurface(string? indexProblem) => _indexProblem = indexProblem; public WelcomeChoice Selected { get; private set; } = WelcomeChoice.Connect; @@ -79,9 +79,32 @@ internal sealed class WelcomeSurface /// The checked form, once ⏎ has accepted it. public WelcomeConnect? Request { get; private set; } + /// The world Browse worlds filled the form in for, or null; dropped once the host is changed. + public string? WorldName { get; private set; } + + /// The host Browse worlds filled in, so a changed host drops the name that went with it. + private string? _prefilledHost; + /// Everything the surface says now: what the cells draw and the window's native welcome draws. public WelcomeModel Model => - new(InForm, Selected, Layout, Field, Host, Port, Tls, Character, PasswordLater, Problem, _indexProblem); + new(InForm, Selected, Layout, Field, Host, Port, Tls, Character, PasswordLater, Problem, _indexProblem, WorldName); + + /// + /// The form, filled in from a world Browse worlds picked: its host, port and TLS, and its name for the world it will + /// be saved as. Only fills it in — the player's own ⏎ there is what saves and dials, through /connect's path. + /// + public void Prefill(string worldName, string host, int port, bool tls) + { + InForm = true; + Field = WelcomeField.Character; + Host = new string(host.Where(c => !char.IsWhiteSpace(c) && !char.IsControl(c)).Take(MaxHost).ToArray()); + Port = port.ToString(System.Globalization.CultureInfo.InvariantCulture); + Tls = tls; + WorldName = worldName; + _prefilledHost = Host; + Problem = null; + Request = null; + } /// /// A menu choice made outright — the native welcome's click, or ⏎ on the cell menu once the pointer is on it. The @@ -292,7 +315,12 @@ private WelcomeAction Submit(Func, (string Host, int Port) } var character = Character.Trim(); - Request = new WelcomeConnect(endpoint.Host, endpoint.Port, Tls, character.Length == 0 ? null : character, PasswordLater); + if (WorldName is not null && !string.Equals(Host, _prefilledHost, StringComparison.OrdinalIgnoreCase)) + { + WorldName = null; + } + + Request = new WelcomeConnect(endpoint.Host, endpoint.Port, Tls, character.Length == 0 ? null : character, PasswordLater, WorldName); return WelcomeAction.Connect; } @@ -378,7 +406,7 @@ private static List RenderForm(WelcomeModel model, int width) var lines = new List { Accent(WelcomeModel.FormHeading), - Label(WelcomeModel.FormIntro), + Label(model.FormIntroLine), string.Empty, }; @@ -435,7 +463,7 @@ public static IReadOnlyList PlainLines(WelcomeLayout layout, string? ind "Welcome to SharpMUTerm. No worlds yet.", "To connect, type /connect, a host and a port, and tls for an encrypted connection: " + ExampleCommand, indexProblem is null - ? "To browse worlds from the package index, type /package browse" + ? "To browse worlds listed on mu*index, type /browse, or /browse and words to search for" : "Browsing worlds is not available: " + indexProblem, "To import worlds and automation from MUSHclient, Mudlet or TinTin++, type /import and the path to the file", "Starting layout: " + (layout == WelcomeLayout.Suggested ? "suggested from what the game sends" : layout.ToString()) diff --git a/src/SharpMUTerm.Tui/WorldBrowseSurface.cs b/src/SharpMUTerm.Tui/WorldBrowseSurface.cs new file mode 100644 index 00000000..4fc865a2 --- /dev/null +++ b/src/SharpMUTerm.Tui/WorldBrowseSurface.cs @@ -0,0 +1,209 @@ +using SharpMUTerm.Client.Modals; +using SharpMUTerm.Core.WorldIndex; +using static SharpMUTerm.Tui.MarkupText; + +namespace SharpMUTerm.Tui; + +/// What a key on Browse worlds asks the app to do. +internal enum WorldBrowseAction +{ + /// Nothing beyond a repaint. + Redraw, + + /// Ask where the selected row is (), then open the connect form. + Pick, + + /// Ask the directory itself for what is typed: nothing among the rows held matches it. + Ask, +} + +/// +/// Browse worlds in cells: a search line, mu*index's rows for what is typed, the credit its licence asks for, and the +/// keys. The state is the reader's (what is typed, the order, which row); what it lists is the model's +/// , so the window's native list shows the same rows for the same query. Hosted in a +/// , which is sized once when it opens, so +/// always draws exactly the rows it is given — loading, failed or listed. +/// +internal sealed class WorldBrowseSurface +{ + /// The width the surface asks for; the overlay narrows it on a small terminal. + internal const int PreferredWidth = 100; + + public WorldBrowseSurface(string query = "") => Query = query.Length > WorldDirectory.MaxQuery ? query[..WorldDirectory.MaxQuery] : query; + + public string Query { get; private set; } + + public WorldDirectorySort Sort { get; private set; } = WorldDirectorySort.Players; + + /// The row selected in the listed rows. + public int Selected { get; private set; } + + /// The index in 's rows of the row selected, or -1. + public int SelectedRow(WorldBrowseModel model) + { + ArgumentNullException.ThrowIfNull(model); + var view = model.View(Query, Sort); + if (Selected < 0 || Selected >= view.Count) + { + return -1; + } + + for (var i = 0; i < model.Rows.Count; i++) + { + if (ReferenceEquals(model.Rows[i], view[Selected])) + { + return i; + } + } + + return -1; + } + + /// A key, read against what the surface lists now. + public WorldBrowseAction Key(WorldBrowseModel model, ConsoleKeyInfo key) + { + ArgumentNullException.ThrowIfNull(model); + var count = model.View(Query, Sort).Count; + switch (key.Key) + { + case ConsoleKey.UpArrow: + Selected = count == 0 ? 0 : (Selected - 1 + count) % count; + return WorldBrowseAction.Redraw; + case ConsoleKey.DownArrow: + Selected = count == 0 ? 0 : (Selected + 1) % count; + return WorldBrowseAction.Redraw; + case ConsoleKey.PageUp: + Selected = Math.Max(0, Selected - 10); + return WorldBrowseAction.Redraw; + case ConsoleKey.PageDown: + Selected = Math.Min(Math.Max(0, count - 1), Selected + 10); + return WorldBrowseAction.Redraw; + case ConsoleKey.Tab: + Sort = WorldBrowseModel.Next(Sort); + Selected = 0; + return WorldBrowseAction.Redraw; + case ConsoleKey.Backspace: + if (Query.Length > 0) + { + Query = Query[..^1]; + Selected = 0; + } + + return WorldBrowseAction.Redraw; + case ConsoleKey.Enter: + if (model.Opening is not null) + { + return WorldBrowseAction.Redraw; + } + + return model.AsksDirectory(Query) ? WorldBrowseAction.Ask + : SelectedRow(model) >= 0 ? WorldBrowseAction.Pick + : WorldBrowseAction.Redraw; + } + + if (key.KeyChar >= ' ' && !char.IsControl(key.KeyChar) + && (key.Modifiers & (ConsoleModifiers.Control | ConsoleModifiers.Alt)) == 0 + && Query.Length < WorldDirectory.MaxQuery) + { + Query += key.KeyChar; + Selected = 0; + } + + return WorldBrowseAction.Redraw; + } + + /// What the surface draws now, in rows of . + public List Render(WorldBrowseModel model, int width, int rows) => Render(model, Query, Sort, Selected, width, rows); + + /// + /// Browse worlds for in 's order, row marked, + /// in exactly rows: the search line, the credit, the list (or what stands for it), a note and + /// the keys. + /// + internal static List Render(WorldBrowseModel model, string query, WorldDirectorySort sort, int selected, int width, int rows) + { + ArgumentNullException.ThrowIfNull(model); + width = Math.Max(30, width); + rows = Math.Max(9, rows); + var lines = new List + { + SpreadLR( + $"[{ScreenPalette.Accent}]WORLDS[/] [{ScreenPalette.Label}]search[/] [{ScreenPalette.Value}]{Escape(query)}▏[/]", + $"[{ScreenPalette.Label}]{Escape(Join(model.CountLine(query), WorldBrowseModel.SortName(sort)))}[/]", + width), + ElideVisible($"[{ScreenPalette.Muted}]{Escape(WorldBrowseModel.AttributionLine)}[/]", width), + string.Empty, + }; + + var body = rows - lines.Count - 2; + var view = model.View(query, sort); + if (model.Empty(query) is { } empty) + { + var tone = model.State is WorldBrowseState.Failed or WorldBrowseState.Unavailable ? ScreenPalette.Caution : ScreenPalette.Label; + lines.Add($" [{tone}]{Escape(Elide(empty, width - 2))}[/]"); + } + else + { + var nameWidth = Math.Clamp(view.Max(r => r.Name.Length) + 1, 12, Math.Max(12, width * 30 / 100)); + var codebaseWidth = Math.Clamp(view.Max(r => r.Codebase.Length) + 1, 8, 14); + var first = Math.Clamp(selected - (body / 2), 0, Math.Max(0, view.Count - body)); + for (var i = first; i < view.Count && i < first + body; i++) + { + lines.Add(Row(view[i], i == selected, width, nameWidth, codebaseWidth)); + } + } + + Pad(lines, rows - 2); + var note = model.Opening is not null ? model.OpeningLine + : model.State == WorldBrowseState.Ready && model.Problem is { } problem ? problem + : model.State == WorldBrowseState.Ready && view.Count > 0 ? (model.AnyDeclared ? WorldBrowseModel.DeclaredNote + " · " : string.Empty) + WorldBrowseModel.PickNote + : string.Empty; + var noteTone = model.State == WorldBrowseState.Ready && model.Problem is not null && model.Opening is null ? ScreenPalette.Caution : ScreenPalette.Label; + lines.Add(note.Length == 0 ? string.Empty : $"[{noteTone}]{Escape(Elide(note, width - 1))}[/]"); + lines.Add(Footer(width)); + return lines; + } + + /// The key row, laddered to one row: the way out and the pick are never given up. + internal static string Footer(int width) + { + var keys = WorldBrowseModel.Keys.Select(k => k.Key switch + { + "⏎" or "Esc" => new LadderKey(k.Key, k.Label), + "⇥" => new LadderKey(k.Key, k.Label, Drop: 1), + _ => new LadderKey(k.Key, k.Label, Drop: 2), + }).ToList(); + keys.Insert(0, new LadderKey("type", "to search", Drop: 0)); + return KeyLadder.Fit(keys, width - 1, k => $"[{ScreenPalette.Accent}]{Escape(k)}[/]", l => $"[{ScreenPalette.Label}]{Escape(l)}[/]", $"[{ScreenPalette.Label}] · [/]"); + } + + private static string Row(WorldListing row, bool selected, int width, int nameWidth, int codebaseWidth) + { + var mark = selected ? $"[bold {ScreenPalette.Accent}]▸[/]" : " "; + var weight = selected ? "bold " : string.Empty; + var players = WorldBrowseModel.Players(row).PadLeft(5); + var tagline = Elide(row.Tagline, Math.Max(0, width - 2 - nameWidth - 6 - codebaseWidth - 1)); + return $"{mark} [{weight}{ScreenPalette.Value}]{Escape(Elide(row.Name, nameWidth - 1).PadRight(nameWidth))}[/]" + + $"[{ScreenPalette.Accent}]{Escape(players)}[/] " + + $"[{ScreenPalette.Label}]{Escape(Elide(row.Codebase, codebaseWidth - 1).PadRight(codebaseWidth))}[/]" + + $"[{ScreenPalette.Value}]{Escape(tagline)}[/]"; + } + + private static string Join(string a, string b) => a.Length == 0 ? b : $"{a} · {b}"; + + private static string Elide(string text, int width) => + width <= 0 ? string.Empty : text.Length <= width ? text : width == 1 ? "…" : text[..(width - 1)] + "…"; + + private static void Pad(List lines, int count) + { + while (lines.Count < count) + { + lines.Add(string.Empty); + } + + if (lines.Count > count) + { + lines.RemoveRange(count, lines.Count - count); + } + } +} diff --git a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs index 73846b6f..99a5a38b 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs @@ -258,6 +258,8 @@ await Assert.That(Rows(palette.Session!.View(query))).IsEquivalentTo(Rows(drawn! (SurfaceCatalog.Welcome, "welcome-connect"), (SurfaceCatalog.Help, "help"), (SurfaceCatalog.Dictionary, "dictionary-offer"), + (SurfaceCatalog.BrowseWorlds, "browse-worlds"), + (SurfaceCatalog.BrowseWorlds, "browse-worlds-failed"), (SurfaceCatalog.Import, "import-review"), (SurfaceCatalog.ScriptConsole, "script-console"), (SurfaceCatalog.Search, "search-older"), @@ -810,6 +812,25 @@ await SameModal("dictionary: download", "dictionary-offer", app => app.SimulateHelpKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false))); probed.Add(SurfaceCatalog.Dictionary); + // Browse worlds: a pick asks the demo's directory where the world is and opens the welcome's connect form filled + // in, saving nothing; a search none of the rows match asks the directory itself — the same in both hosts. + await SameModal("browse worlds: pick", "browse-worlds", + (app, m) => ((WorldBrowseSession)m.Open(SurfaceCatalog.BrowseWorlds)!).Pick(0), + app => app.SimulateWorldBrowseKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false))); + await SameModal("browse worlds: ask the directory", "browse-worlds", + (app, m) => ((WorldBrowseSession)m.Open(SurfaceCatalog.BrowseWorlds)!).Ask("zork"), + app => + { + foreach (var c in "zork") + { + app.SimulateWorldBrowseKey(new ConsoleKeyInfo(c, ConsoleKey.NoName, false, false, false)); + } + + // None of the demo's most played hold the word, so the cells' Enter asks the directory rather than picking. + app.SimulateWorldBrowseKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false)); + }); + probed.Add(SurfaceCatalog.BrowseWorlds); + // The import review: Import writes the same world, character and set as the cells' Enter; with the passwords // switched on first (the window's check box, the cells' p), the password is stored on the character in both. await SameModal("import: accept", "import-review", @@ -1122,6 +1143,7 @@ private static void HelpKeysTo(SharpMUTermApp app, Func match) WelcomeSession welcome => welcome.Model, HelpSession help => help.Model, DictionaryOfferSession offer => offer.Model, + WorldBrowseSession browse => browse.Model, ImportReviewSession import => import.Model, ScriptConsoleSession console => console.Model, ScrollbackViewSession history => history.Model, @@ -1146,6 +1168,8 @@ private static string Outcome(SharpMUTermApp app) => string.Join( "layout=" + app.LiveLayoutId, "welcome=" + app.WelcomeIsOpen, "help=" + app.HelpIsOpen + "/" + app.DictionaryOfferOpen, + "browse=" + app.WorldBrowseOpen + " " + app.WorldBrowseModelNow.State + ":" + app.WorldBrowseModelNow.AskedFor + ":" + app.WorldBrowseModelNow.Rows.Count + + " " + (app.Welcome is { } w ? $"{w.InForm}:{w.Host}:{w.Port}:{w.Tls}:{w.WorldName}" : "none"), "import=" + app.ImportReviewOpen + " " + string.Join(",", app.Configuration.TriggerSets.Select(s => s.Name + ":" + s.Triggers.Count)) + " " + string.Join(",", app.Configuration.Worlds.SelectMany(w => w.Characters).Select(c => c.Name + (c.Password is null ? string.Empty : "*"))), "console=" + app.ScriptConsoleIsOpen + " " + ConsoleState(app), diff --git a/tests/SharpMUTerm.Client.Tests/WorldBrowseModelTests.cs b/tests/SharpMUTerm.Client.Tests/WorldBrowseModelTests.cs new file mode 100644 index 00000000..c91c2d96 --- /dev/null +++ b/tests/SharpMUTerm.Client.Tests/WorldBrowseModelTests.cs @@ -0,0 +1,104 @@ +using SharpMUTerm.Client.Modals; +using SharpMUTerm.Core.WorldIndex; + +namespace SharpMUTerm.Client.Tests; + +/// Browse worlds' one model: what both hosts list for a query and an order, and what they say in place of rows. +public class WorldBrowseModelTests +{ + private static WorldListing Row(int n, string name, string codebase, int? players, WorldPlayerCount count = WorldPlayerCount.Measured, string tagline = "") => + new(new Guid(n, 0, 0, new byte[8]), name, tagline, codebase, players, players is null ? WorldPlayerCount.Unknown : count); + + private static readonly WorldListing[] Rows = + [ + Row(1, "Aetherfall", "PennMUSH", 64, tagline: "Sky islands"), + Row(2, "Hollow Crown", "TinyMUX", 33, WorldPlayerCount.Declared), + Row(3, "copperline", "Evennia", null), + ]; + + private static WorldBrowseModel Ready(int total = 3, string asked = "") => new(WorldBrowseState.Ready, Rows, total, asked, null, null); + + [Test] + public async Task ByPlayersKeepsTheDirectorysOrderAndByNameIsAlphabetical() + { + await Assert.That(string.Join("|", Ready().View("", WorldDirectorySort.Players).Select(r => r.Name))) + .IsEqualTo("Aetherfall|Hollow Crown|copperline"); + await Assert.That(string.Join("|", Ready().View(null, WorldDirectorySort.Name).Select(r => r.Name))) + .IsEqualTo("Aetherfall|copperline|Hollow Crown"); + } + + [Test] + public async Task EveryWordMustMatchANameCodebaseOrTagline() + { + await Assert.That(Ready().View("sky penn", WorldDirectorySort.Players).Single().Name).IsEqualTo("Aetherfall"); + await Assert.That(Ready().View("tinymux", WorldDirectorySort.Players).Single().Name).IsEqualTo("Hollow Crown"); + await Assert.That(Ready().View("sky mux", WorldDirectorySort.Players).Count).IsEqualTo(0); + } + + [Test] + public async Task PlayersMarkADeclaredCountAndDashAnUnknownOne() + { + await Assert.That(WorldBrowseModel.Players(Rows[0])).IsEqualTo("64"); + await Assert.That(WorldBrowseModel.Players(Rows[1])).IsEqualTo("~33"); + await Assert.That(WorldBrowseModel.Players(Rows[2])).IsEqualTo("–"); + await Assert.That(Ready().AnyDeclared).IsTrue(); + } + + [Test] + public async Task EnterAsksTheDirectoryOnlyWhenTheRowsHeldCannotAnswer() + { + await Assert.That(Ready().AsksDirectory("aether")).IsFalse().Because("a row matches; ⏎ picks it"); + await Assert.That(Ready().AsksDirectory("zork")).IsTrue(); + await Assert.That(Ready(asked: "zork").AsksDirectory("zork")).IsFalse().Because("the directory was asked that already and sent all it holds"); + await Assert.That(Ready(total: 400, asked: "zork").AsksDirectory("zork")).IsTrue(); + await Assert.That(Ready().AsksDirectory(" ")).IsFalse(); + await Assert.That((Ready() with { State = WorldBrowseState.Loading }).AsksDirectory("zork")).IsFalse(); + } + + [Test] + public async Task EachStateSaysWhatIsTrue() + { + var empty = new WorldBrowseModel(WorldBrowseState.Ready, [], 0, string.Empty, null, null); + await Assert.That(new WorldBrowseModel(WorldBrowseState.Loading, [], 0, "", null, null).Empty("")).IsEqualTo(WorldBrowseModel.LoadingLine); + await Assert.That(new WorldBrowseModel(WorldBrowseState.Failed, [], 0, "", "it timed out", null).Empty("")).IsEqualTo("mu*index did not answer: it timed out"); + await Assert.That(new WorldBrowseModel(WorldBrowseState.Unavailable, [], 0, "", "nothing was fetched", null).Empty("")).IsEqualTo("nothing was fetched"); + await Assert.That(empty.Empty("")).IsEqualTo("mu*index lists no worlds right now"); + await Assert.That((empty with { AskedFor = "zork" }).Empty("zork")).IsEqualTo("mu*index lists no world for “zork”"); + await Assert.That(Ready().Empty("zork")).Contains("⏎ asks mu*index for “zork”"); + await Assert.That(Ready(asked: "zork").Empty("zork")).IsEqualTo("nothing listed matches — ⌫ widens the search"); + await Assert.That(Ready().Empty("aether")).IsNull(); + } + + [Test] + public async Task TheCountSaysHowManyOfHowMany() + { + await Assert.That(Ready().CountLine("")).IsEqualTo("3 worlds"); + await Assert.That(Ready(total: 412).CountLine("")).IsEqualTo("3 of 412 worlds"); + await Assert.That(Ready().CountLine("aether")).IsEqualTo("1 of 3"); + } + + [Test] + public async Task TwoModelsOverEqualRowsAreEqual() + { + var copy = new WorldBrowseModel(WorldBrowseState.Ready, Rows.ToList(), 3, "", null, null); + await Assert.That(copy).IsEqualTo(Ready()); + await Assert.That(copy.GetHashCode()).IsEqualTo(Ready().GetHashCode()); + await Assert.That(copy with { Opening = "Aetherfall" }).IsNotEqualTo(Ready()); + } + + [Test] + public async Task ASessionPicksARowInRangeAndAsksOnlyWhatTheRowsCannotAnswer() + { + var picked = new List(); + var asked = new List(); + var session = new WorldBrowseSession(Ready(), true, picked.Add, asked.Add, () => { }); + + session.Pick(1); + session.Pick(9); + session.Ask("aether"); + session.Ask(" zork "); + + await Assert.That(string.Join(",", picked)).IsEqualTo("1"); + await Assert.That(string.Join(",", asked)).IsEqualTo("zork"); + } +} diff --git a/tests/SharpMUTerm.Core.Tests/WorldIndex/WorldDirectoryTests.cs b/tests/SharpMUTerm.Core.Tests/WorldIndex/WorldDirectoryTests.cs new file mode 100644 index 00000000..4e13bea2 --- /dev/null +++ b/tests/SharpMUTerm.Core.Tests/WorldIndex/WorldDirectoryTests.cs @@ -0,0 +1,155 @@ +using System.Text; +using SharpMUTerm.Core.WorldIndex; + +namespace SharpMUTerm.Core.Tests.WorldIndex; + +/// +/// mu*index's answers read as untrusted server text: rows bounded and cleaned, a bad row dropped and counted, an address +/// only what /connect would take. The fixtures are shaped from MUIndex's GameListView/GameView +/// (camelCase, enums as camelCase strings); the live service was not reachable when they were written. +/// +public class WorldDirectoryTests +{ + private const string Listing = """ + { + "games": [ + { "id": "6f1c2a52-0000-4000-8000-0c6a1f3d2e01", "name": "Aetherfall", "tagline": "Sky islands", + "state": "active", "archived": false, "playersNow": 64, "playersNowState": "measured", + "codebase": "PennMUSH", "measuredProtocols": ["gmcp", "mssp"], + "provenance": { "name": "crawler" }, "facets": { "genre": ["fantasy"] } }, + { "id": "6f1c2a52-0000-4000-8000-0c6a1f3d2e02", "name": "Hollow Crown", "tagline": "Courts", + "playersNow": 33, "playersNowState": "declared", "codebase": "TinyMUX" }, + { "id": "6f1c2a52-0000-4000-8000-0c6a1f3d2e03", "name": "Copperline", "playersNow": 12, "playersNowState": "unknown" }, + { "id": "6f1c2a52-0000-4000-8000-0c6a1f3d2e04", "name": "Gone Away", "archived": true }, + { "id": "", "name": "No id" }, + { "id": "6f1c2a52-0000-4000-8000-0c6a1f3d2e05", "name": " " }, + { "id": "6f1c2a52-0000-4000-8000-0c6a1f3d2e01", "name": "Aetherfall again" } + ], + "total": 412 + } + """; + + private static byte[] Bytes(string json) => Encoding.UTF8.GetBytes(json); + + [Test] + public async Task AListingIsReadAndItsBadRowsAreDroppedAndCounted() + { + var (page, problem) = WorldDirectory.ParseList(Bytes(Listing)); + + await Assert.That(problem).IsNull(); + await Assert.That(string.Join("|", page!.Rows.Select(r => r.Name))).IsEqualTo("Aetherfall|Hollow Crown|Copperline"); + await Assert.That(page.Dropped).IsEqualTo(4); + await Assert.That(page.Total).IsEqualTo(412); + await Assert.That(page.Rows[0].Players).IsEqualTo(64); + await Assert.That(page.Rows[0].Count).IsEqualTo(WorldPlayerCount.Measured); + await Assert.That(page.Rows[1].Count).IsEqualTo(WorldPlayerCount.Declared); + await Assert.That(page.Rows[2].Players).IsNull().Because("a number the directory does not say it measured is not shown"); + } + + [Test] + public async Task NamesAndTaglinesAreStrippedOfControlAndBidiCharactersAndBounded() + { + var json = "{\"games\":[{\"id\":\"6f1c2a52-0000-4000-8000-0c6a1f3d2e01\",\"name\":\"Evil\\u001b[31m\\u202eName\\n\",\"tagline\":\"" + + new string('x', 500) + "\"}]}"; + + var row = WorldDirectory.ParseList(Bytes(json)).Page!.Rows.Single(); + + await Assert.That(row.Name).IsEqualTo("Evil [31m Name"); + await Assert.That(row.Tagline.Length).IsEqualTo(WorldDirectory.MaxTagline); + await Assert.That(row.Tagline).EndsWith("…"); + } + + [Test] + public async Task NoMoreThanMaxRowsAreKept() + { + var rows = string.Join(',', Enumerable.Range(1, WorldDirectory.MaxRows + 5) + .Select(i => $"{{\"id\":\"{new Guid(i, 0, 0, new byte[8])}\",\"name\":\"W{i}\"}}")); + + var page = WorldDirectory.ParseList(Bytes("{\"games\":[" + rows + "]}")).Page!; + + await Assert.That(page.Rows.Count).IsEqualTo(WorldDirectory.MaxRows); + await Assert.That(page.Dropped).IsEqualTo(5); + } + + [Test] + public async Task AnAnswerThatIsNotAListSaysSo() + { + await Assert.That(WorldDirectory.ParseList(Bytes("not json")).Problem).IsEqualTo("the answer is not JSON the client can read"); + await Assert.That(WorldDirectory.ParseList(Bytes("[]")).Problem).IsEqualTo("the answer is not a list of worlds"); + } + + [Test] + public async Task TheAddressIsAnActiveTelnetOrTlsEndpointSeenMostRecently() + { + const string game = """ + { "id": "6f1c2a52-0000-4000-8000-0c6a1f3d2e01", "name": "Aetherfall", + "endpoints": [ + { "host": "old.example", "port": 4000, "kind": "telnet", "state": "gone", "lastSeenAt": "2026-10-30T00:00:00Z" }, + { "host": "ws.example", "port": 443, "kind": "websocket", "state": "active" }, + { "host": "stale.example", "port": 4000, "kind": "telnet", "state": "stale", "lastSeenAt": "2026-11-01T00:00:00Z" }, + { "host": "a.example", "port": 4201, "kind": "telnet", "state": "active", "lastSeenAt": "2026-10-01T00:00:00Z" }, + { "host": "b.example", "port": 4202, "kind": "tls", "state": "active", "lastSeenAt": "2026-11-02T00:00:00Z" } + ] } + """; + + var (address, problem) = WorldDirectory.ParseGame(Bytes(game)); + + await Assert.That(problem).IsNull(); + await Assert.That(address).IsEqualTo(new WorldAddress("Aetherfall", "b.example", 4202, true)); + } + + [Test] + public async Task AStaleEndpointIsOfferedWhenNoneIsActiveAndTlsMeasuredCounts() + { + const string game = """ + { "name": "Copperline", "endpoints": [ + { "host": "c.example", "port": 23, "kind": "telnet", "state": "stale", "tlsMeasured": true } ] } + """; + + await Assert.That(WorldDirectory.ParseGame(Bytes(game)).Address).IsEqualTo(new WorldAddress("Copperline", "c.example", 23, true)); + } + + [Test] + public async Task AHostOrPortConnectWouldRefuseIsNeverOffered() + { + const string game = """ + { "name": "Bad", "endpoints": [ + { "host": "evil host", "port": 4000, "kind": "telnet", "state": "active" }, + { "host": "ok.example", "port": 0, "kind": "telnet", "state": "active" }, + { "host": "ok.example", "port": 70000, "kind": "telnet", "state": "active" }, + { "host": "x.example", "port": 4000, "kind": "telnet", "state": "gone" } ] } + """; + + var (address, problem) = WorldDirectory.ParseGame(Bytes(game)); + + await Assert.That(address).IsNull(); + await Assert.That(problem).IsEqualTo("the directory lists no telnet address for it that answers"); + await Assert.That(WorldDirectory.ParseGame(Bytes("{\"name\":\"N\"}")).Problem).IsEqualTo("the directory lists no address for it"); + } + + [Test] + public async Task TheListIsAskedOverHttpsOnlyWithTheQueryEscaped() + { + var list = WorldDirectory.ListUri("https://mu-index.com/api/", "red & blue")!.AbsoluteUri; + await Assert.That(list).StartsWith("https://mu-index.com/api/games?limit=200&sort=players&q=red"); + await Assert.That(list).Contains("%26"); + await Assert.That(WorldDirectory.ListUri("http://mu-index.com/api")).IsNull(); + await Assert.That(WorldDirectory.ListUri("https://user@mu-index.com/api")).IsNull(); + await Assert.That(WorldDirectory.GameUri("https://mu-index.com/api", Guid.Parse("6f1c2a52-0000-4000-8000-0c6a1f3d2e01"))!.AbsoluteUri) + .IsEqualTo("https://mu-index.com/api/games/6f1c2a52-0000-4000-8000-0c6a1f3d2e01"); + } + + [Test] + public async Task ProblemNamesTheSettingWhenThereIsNoUsableDirectory() + { + await Assert.That(WorldDirectory.Problem(SharpMUTerm.Core.Configuration.AppConfiguration.DefaultWorldDirectoryUrl)).IsNull(); + await Assert.That(WorldDirectory.Problem("")).Contains("no world directory is set"); + await Assert.That(WorldDirectory.Problem("http://mu-index.com/api")).Contains("not an https link"); + } + + [Test] + public async Task ADownloadOfAPlainHttpLinkFetchesNothing() + { + await Assert.That(await WorldDirectory.DownloadAsync(new Uri("http://mu-index.com/api/games"), CancellationToken.None)).IsNull(); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs b/tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs index 8fc7fa39..bc96d410 100644 --- a/tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs @@ -37,6 +37,9 @@ internal static readonly (string View, string[] OneRow)[] Footers = ("help", ["type to search", "Esc closes"]), ("help-topic", ["↑↓ PgUp PgDn scroll", "Esc back to the list"]), ("dictionary-offer", ["⏎ download", "Esc not now"]), + ("browse-worlds", ["↑↓ pick", "Esc closes"]), + ("browse-worlds-failed", ["↑↓ pick", "Esc closes"]), + ("browse-worlds-picked", ["↑↓ field", "Esc back"]), ("quit", ["⏎ stay", "Esc stays"]), ("search", ["↑↓ pick", "⌃F closes"]), ("history-search", ["type to filter", "⌃R closes"]), diff --git a/tests/SharpMUTerm.Tui.Tests/WelcomeTests.cs b/tests/SharpMUTerm.Tui.Tests/WelcomeTests.cs index 03ea255c..d6f49f12 100644 --- a/tests/SharpMUTerm.Tui.Tests/WelcomeTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/WelcomeTests.cs @@ -238,17 +238,17 @@ public async Task EscOnTheFormGoesBackToTheMenu() await Assert.That(run.App.Welcome!.InForm).IsFalse(); } - /// With no index to read, Browse says so where the player is looking and fetches nothing. + /// With no world directory to read, Browse says so where the player is looking and fetches nothing. [Test] public async Task BrowseWithNoIndexSaysSoInPlace() { - await using var run = await Start(new AppConfiguration { PackageIndexUrl = string.Empty }); + await using var run = await Start(new AppConfiguration { WorldDirectoryUrl = string.Empty }); run.App.SimulateWelcomeKey(Key(ConsoleKey.DownArrow)); run.App.SimulateWelcomeKey(Key(ConsoleKey.Enter, '\r')); await Assert.That(run.App.WelcomeIsOpen).IsTrue(); - await Assert.That(string.Join('\n', run.App.WelcomeLines.Select(MarkupText.Plain))).Contains("no package index is set"); + await Assert.That(string.Join('\n', run.App.WelcomeLines.Select(MarkupText.Plain))).Contains("no world directory is set"); } [Test] diff --git a/tests/SharpMUTerm.Tui.Tests/WorldBrowseTests.cs b/tests/SharpMUTerm.Tui.Tests/WorldBrowseTests.cs new file mode 100644 index 00000000..0e3d691d --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/WorldBrowseTests.cs @@ -0,0 +1,250 @@ +using System.Text; +using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Commands; +using SharpMUTerm.Client.Modals; +using SharpMUTerm.Core.Accessibility; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Graphics; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// Browse worlds: mu*index asked only when the player opens it, a pick that fills in the welcome's connect form and +/// saves nothing, and the player's own ⏎ there — through /connect's path — that adds the world. Answered from the +/// demo's recorded directory; nothing here reaches the network. +/// +[NotInParallel] +public class WorldBrowseTests +{ + private static readonly TerminalCapabilities Headless = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private sealed class Recorder : IAnnouncer + { + public List Heard { get; } = []; + + public void Announce(string text, AnnouncementKind kind) => Heard.Add(text); + } + + private sealed record Run(SharpMUTermApp App, AppConfiguration Config, List Asked, List Saved) : IAsyncDisposable + { + public ValueTask DisposeAsync() => App.DisposeAsync(); + } + + private static async Task Start( + bool fetch = true, + Func? host = null, + Func? answer = null, + AppConfiguration? config = null) + { + Console.SetIn(TextReader.Null); + config ??= new AppConfiguration(); + var asked = new List(); + var saved = new List(); + var baseHost = ClientHost.ForHarness(Headless, new HeadlessConsoleDriver(120, 32), null, null, null); + Func>? worldFetch = fetch + ? (uri, _) => + { + asked.Add(uri); + return Task.FromResult(answer is null ? Encoding.UTF8.GetBytes(DemoWorldDirectory.Answer(uri)) : answer(uri)); + } + : null; + var app = new SharpMUTermApp(config, host?.Invoke(baseHost) ?? baseHost, save: _ => saved.Add(true), worldFetch: worldFetch); + app.TelnetFactory = _ => new RecordingTelnetSession(); + await app.StartAsync([]); + return new Run(app, config, asked, saved); + } + + private static ConsoleKeyInfo Key(ConsoleKey key, char c = '\0') => new(c, key, false, false, false); + + private static void TypeCommand(SharpMUTermApp app, string text) + { + foreach (var c in text) + { + app.SimulateKey(new ConsoleKeyInfo(c, ConsoleKey.NoName, false, false, false)); + } + + app.SimulateKey(Key(ConsoleKey.Enter, '\r')); + } + + private static void OpenFromTheWelcome(SharpMUTermApp app) + { + app.SimulateWelcomeKey(Key(ConsoleKey.DownArrow)); + app.SimulateWelcomeKey(Key(ConsoleKey.Enter, '\r')); + } + + [Test] + public async Task NothingIsAskedAtStart() + { + await using var run = await Start(); + + await Assert.That(run.Asked.Count).IsEqualTo(0); + await Assert.That(run.App.WorldBrowseOpen).IsFalse(); + } + + [Test] + public async Task TheWelcomesBrowseRowOpensTheListFromTheDirectory() + { + await using var run = await Start(); + + OpenFromTheWelcome(run.App); + + await Assert.That(run.App.WorldBrowseOpen).IsTrue(); + await Assert.That(run.App.WelcomeIsOpen).IsFalse(); + await Assert.That(run.Asked.Single().AbsoluteUri).IsEqualTo("https://mu-index.com/api/games?limit=200&sort=players"); + var model = run.App.WorldBrowseModelNow; + await Assert.That(model.State).IsEqualTo(WorldBrowseState.Ready); + await Assert.That(model.Rows[0].Name).IsEqualTo("Aetherfall"); + } + + [Test] + public async Task ARunWithNoFetchSaysSoAndAsksNothing() + { + await using var run = await Start(fetch: false); + + OpenFromTheWelcome(run.App); + + await Assert.That(run.App.WorldBrowseOpen).IsTrue(); + await Assert.That(run.App.WorldBrowseModelNow.State).IsEqualTo(WorldBrowseState.Unavailable); + await Assert.That(run.App.WorldBrowseModelNow.Empty("")).Contains("nothing was fetched"); + } + + [Test] + public async Task ADirectoryThatDoesNotAnswerIsSaidHonestly() + { + await using var run = await Start(answer: _ => null); + + OpenFromTheWelcome(run.App); + + await Assert.That(run.App.WorldBrowseModelNow.State).IsEqualTo(WorldBrowseState.Failed); + await Assert.That(run.App.WorldBrowseModelNow.Empty("")).StartsWith("mu*index did not answer:"); + } + + /// A pick fills the welcome's form in and saves nothing; the player's ⏎ there adds the world, named as listed. + [Test] + public async Task APickFillsInTheConnectFormAndOnlyItsEnterAddsTheWorld() + { + await using var run = await Start(); + OpenFromTheWelcome(run.App); + + run.App.SimulateWorldBrowseKey(Key(ConsoleKey.Enter, '\r')); + + await Assert.That(run.App.WorldBrowseOpen).IsFalse(); + var form = run.App.Welcome!; + await Assert.That(form.InForm).IsTrue(); + await Assert.That(form.Host).IsEqualTo("aetherfall.example"); + await Assert.That(form.Tls).IsTrue(); + await Assert.That(form.WorldName).IsEqualTo("Aetherfall"); + await Assert.That(run.Config.Worlds.Count).IsEqualTo(0).Because("nothing is saved before the form's ⏎"); + await Assert.That(run.Saved.Count).IsEqualTo(0); + await Assert.That(string.Join('\n', run.App.WelcomeLines.Select(MarkupText.Plain))).Contains("as listed on mu*index"); + + run.App.SimulateWelcomeKey(Key(ConsoleKey.Enter, '\r')); + await run.App.LastCommand; + + var world = run.Config.Worlds.Single(); + await Assert.That(world.Name).IsEqualTo("Aetherfall"); + await Assert.That(world.Host).IsEqualTo("aetherfall.example"); + await Assert.That(world.UseTls).IsTrue(); + } + + [Test] + public async Task ChangingTheHostDropsTheListedName() + { + await using var run = await Start(); + OpenFromTheWelcome(run.App); + run.App.SimulateWorldBrowseKey(Key(ConsoleKey.DownArrow)); + run.App.SimulateWorldBrowseKey(Key(ConsoleKey.Enter, '\r')); + await Assert.That(run.App.Welcome!.Host).IsEqualTo("lanternport.example"); + + // Back to the host field and a different host typed over the end of it. + run.App.SimulateWelcomeKey(new ConsoleKeyInfo('\t', ConsoleKey.Tab, true, false, false)); + run.App.SimulateWelcomeKey(new ConsoleKeyInfo('\t', ConsoleKey.Tab, true, false, false)); + run.App.SimulateWelcomeKey(new ConsoleKeyInfo('\t', ConsoleKey.Tab, true, false, false)); + run.App.SimulateWelcomeKey(new ConsoleKeyInfo('x', ConsoleKey.NoName, false, false, false)); + run.App.SimulateWelcomeKey(Key(ConsoleKey.Enter, '\r')); + await run.App.LastCommand; + + var world = run.Config.Worlds.Single(); + await Assert.That(world.Host).IsNotEqualTo("lanternport.example"); + await Assert.That(world.Name).IsNotEqualTo("Lanternport"); + } + + [Test] + public async Task APickTheDirectoryCannotPlaceStaysOnTheListAndSaysWhy() + { + await using var run = await Start(answer: uri => uri.AbsolutePath.EndsWith("/games", StringComparison.Ordinal) + ? Encoding.UTF8.GetBytes(DemoWorldDirectory.Answer(uri)) + : Encoding.UTF8.GetBytes("{\"name\":\"x\",\"endpoints\":[]}")); + OpenFromTheWelcome(run.App); + + run.App.SimulateWorldBrowseKey(Key(ConsoleKey.Enter, '\r')); + + await Assert.That(run.App.WorldBrowseOpen).IsTrue(); + await Assert.That(run.App.WorldBrowseModelNow.Problem).IsEqualTo("Aetherfall not opened: the directory lists no telnet address for it that answers"); + await Assert.That(run.App.WorldBrowseModelNow.Opening).IsNull(); + } + + [Test] + public async Task EnterOnASearchTheRowsCannotAnswerAsksTheDirectory() + { + await using var run = await Start(); + OpenFromTheWelcome(run.App); + + foreach (var c in "zork") + { + run.App.SimulateWorldBrowseKey(new ConsoleKeyInfo(c, ConsoleKey.NoName, false, false, false)); + } + + run.App.SimulateWorldBrowseKey(Key(ConsoleKey.Enter, '\r')); + + await Assert.That(run.Asked.Count).IsEqualTo(2); + await Assert.That(run.Asked[1].Query).Contains("q=zork"); + await Assert.That(run.App.WorldBrowseModelNow.AskedFor).IsEqualTo("zork"); + await Assert.That(run.App.WelcomeIsOpen).IsFalse().Because("no world was picked"); + } + + [Test] + public async Task TheCommandPaletteEntryOpensItAndAPackageBrowseIsUntouched() + { + await using var run = await Start(); + run.App.SimulateWelcomeKey(Key(ConsoleKey.Escape, '\x1b')); + + await Assert.That(run.App.DispatchCommand(BuiltInCommands.BrowseWorldsCommand)).IsTrue(); + + await Assert.That(run.App.WorldBrowseOpen).IsTrue(); + await Assert.That(run.Asked.Count).IsEqualTo(1); + } + + [Test] + public async Task SlashBrowseWithWordsAsksTheDirectoryForThem() + { + await using var run = await Start(); + run.App.SimulateWelcomeKey(Key(ConsoleKey.Escape, '\x1b')); + + TypeCommand(run.App, "/browse harbour"); + + await Assert.That(run.App.WorldBrowseOpen).IsTrue(); + await Assert.That(run.Asked.Single().Query).Contains("q=harbour"); + await Assert.That(run.App.WorldBrowseModelNow.Rows.Single().Name).IsEqualTo("Lanternport"); + } + + /// --plain: the rows are said as numbered lines, and /browse 2 says the /connect line to type. + [Test] + public async Task WhereTheScreenIsNotSeenTheListIsLinesAndANumberSaysTheConnectLine() + { + var heard = new Recorder(); + await using var run = await Start(host: h => h with { Announcer = heard, ScreenIsSeen = false }); + + TypeCommand(run.App, "/browse"); + + await Assert.That(run.App.WorldBrowseOpen).IsFalse(); + await Assert.That(heard.Heard).Contains(WorldBrowseModel.AttributionLine); + await Assert.That(heard.Heard).Contains(line => line.StartsWith("2. Lanternport", StringComparison.Ordinal)); + + TypeCommand(run.App, "/browse 2"); + + await Assert.That(heard.Heard).Contains("To add it and connect, type: /connect lanternport.example 2860"); + await Assert.That(run.Config.Worlds.Count).IsEqualTo(0); + } +} From af87acb21b67dd16a1f67db6746b54b416ecd2d1 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 16:27:04 +0000 Subject: [PATCH 060/113] feat(wave18b): history view fits 80x24, one count row in Ctrl+F, console errors link to their line MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ScrollbackViewModel carries its page size (PageRowsFor the screen, 13 at 80x24), title and position on two rows below 100 columns, keys pinned with ListOverlay.Open(footer:). - Ctrl+F with Alt+H: one count row (this window 3 of 39 · older 4 of 6,000); older rows say how far back (1.6k lines ago), pane rows "here" (SearchModel.LabelFor, both hosts). - Script console error rows naming file.lua:(N,…) are client links (mux:script-error:N on the console's own handler; native rows via ScriptConsoleSession.OpenError) ending in OpenConsoleError, which opens the script at line N with ErrorLine set. Surface action declared and parity-probed. One demo error constant (DemoScriptError). - Cell console sized to what it holds at open, so no blank rows above the log. - Demo history stamped monotonically; FooterFitTests gains the four new views. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 7 + CLAUDE.md | 26 +++- src/SharpMUTerm.Avalonia/ScriptConsoleView.cs | 49 +++++- src/SharpMUTerm.Avalonia/ScrollbackView.cs | 2 +- src/SharpMUTerm.Avalonia/SearchView.cs | 7 +- .../Composer/ScriptErrors.cs | 29 ++++ .../Modals/ScriptConsoleModel.cs | 35 ++++- .../Modals/ScrollbackViewModel.cs | 62 ++++++-- src/SharpMUTerm.Client/Modals/SearchModel.cs | 83 +++++++++- .../Surfaces/SurfaceCatalog.cs | 4 + src/SharpMUTerm.Tui/ListOverlay.cs | 20 ++- src/SharpMUTerm.Tui/ScriptConsoleSurface.cs | 31 +++- src/SharpMUTerm.Tui/ScrollbackViewSurface.cs | 35 +++-- src/SharpMUTerm.Tui/SearchPrompt.cs | 20 +-- .../SharpMUTermApp.DeepSearch.cs | 70 ++++++--- .../SharpMUTermApp.ScriptConsole.cs | 80 +++++++++- .../SharpMUTermApp.ScriptEdit.cs | 15 +- src/SharpMUTerm.Tui/SharpMUTermApp.cs | 2 +- .../SurfaceParityTests.cs | 15 ++ .../SearchAndScriptModelTests.cs | 72 ++++++++- .../SharpMUTerm.Tui.Tests/DeepSearchTests.cs | 5 +- tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs | 6 + .../SearchAndScriptWaveTests.cs | 2 +- .../SearchScriptsFitTests.cs | 142 ++++++++++++++++++ 24 files changed, 727 insertions(+), 92 deletions(-) create mode 100644 tests/SharpMUTerm.Tui.Tests/SearchScriptsFitTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index f43a0489..7f4006f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- A script error in the script console that names a file and line is now a link: click it to open that script with the + caret on the line and the line marked. Closing the editor goes back to the console. - The script editor numbers its lines in the desktop window too, and after a save whose reload fails, the line the error names is marked in both the terminal and the window. - When Ctrl+F finds fewer matches than it might because the pane no longer holds older lines, its status line offers @@ -345,6 +347,11 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Changed +- The older-history page fits an 80×24 terminal: it sizes its page to the screen, keeps its keys on screen and no longer + covers the command line. +- Ctrl+F with older history says both counts on one line (`this window 3 of 39 · older 4 of 6,000`). Older matches say + how far back they are (`1.6k lines ago`) and the pane's own say `here`. +- The script console opens at the size of what it holds, so its log no longer starts under blank rows. - The settings screens' key hints no longer lose words from the middle at 80 columns: the least-used keys are left out and the way to close is always there. - Help topics have headings and show their keys as keys, in the terminal and the window, and a topic's title fits diff --git a/CLAUDE.md b/CLAUDE.md index 3b42af3f..4130b0ab 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -418,12 +418,18 @@ fallbacks) for inline images/maps. a session window has any: its session's `ScrollbackBuffer`, ring and spill, walked newest first in ranged reads of `MaxRangeLines` off the UI thread (inline headless, so frames are deterministic), cancelled by the next query or by closing, `OutputSearch.Match`'s timeout per line, at most 500 hits. Lines the pane still holds are skipped by - reference (a session window's `PaneLine.Source` is the ring's instance). Older rows list after the pane's, tagged - `older`; the note on the count row says the bound and the progress, and that captures keep no older history. ⏎ on - one goes to the pane if it holds the line, else opens the **history view**: a modal page of 20 lines, every move a - ranged read, never inserted into a pane buffer. ⌥G stays pane-only. It opens **centred on the hit** - (`ScrollbackViewModel.TopFor`, clamped at the ends), and `Role(line)` makes the `ContextRows` (3) either side context: - body ink behind a `│` in cells, a rule in the window; the rest of the page muted/dim. + reference (a session window's `PaneLine.Source` is the ring's instance). Older rows list after the pane's, their + window column saying how far back (`SearchModel.AgeLabel`: `1.6k lines ago` — the scrollback keeps no clock) and the + pane's rows `here` (`SearchModel.LabelFor`, both hosts). **Both counts are one row** (`CountText`: `this window 3 of 39 · + older 4 of 6,000`, `older 2… 1,200 of 6,000 read` while it reads; `OlderFound`/`OlderSearched`/`OlderTotal`); the note + says only what is not a count (an error, captures keep no older history). ⏎ on one goes to the pane if it holds the + line, else opens the **history view**: a modal page, every move a ranged read, never inserted into a pane buffer. ⌥G + stays pane-only. **The page size is the model's** (`ScrollbackViewModel.PageRows`, from `PageRowsFor(rows, columns)` at + open: the modal ends above the command line, 13 at 80×24, at most 20), title and position on two rows below 100 columns + (`TwoTitleRows`), keys pinned with `ListOverlay.Open(footer:)` (`KeysLadder`); the window reads the same page. It opens + **centred on the hit** (`TopFor(…, page)`, clamped at the ends), and `Role(line)` makes the `ContextRows` (3) either side + context: body ink behind a `│` in cells, a rule in the window; the rest of the page muted/dim. The demo's history is + stamped 18:00–22:59 and only moves forward (`DemoHistoryStamp`). - **⌥H is offered on the status line, not in a modal, only while the pane cap trimmed what ⌃F searched** (`SearchModel.OlderLines`/`OlderSource`/`OffersOlder`: a query, ⌥H off, and the session scrollback holding lines the pane does not). `OlderHintLadder` is four rungs, all starting `⌥H`; the cells take the longest that fits beside the count @@ -3164,6 +3170,14 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] The prompt exists only with a scripts root whose folder exists and a window with a character; otherwise the model's `Unavailable` says which. Every gesture ends in `RunConsoleLine`/`DeleteStoreKey`/`ReloadConsoleScripts` (surface `script-console`, parity-probed). The demo scene has its own sandbox (`_demoScripts`), so the snapshot's prompt runs. + - **An error row naming `file.lua:(N,…)` is a link to that line** (`ScriptConsoleModel.ErrorAt`, `ScriptErrors.At`): in + cells `[link=mux:script-error:N]`, N an index into the lines drawn, answered by the console's own `ListOverlay` link + handler (`Open(link:)`), never the panes'; in the window an underlined row (`ScriptConsoleSession.OpenError`). Both end + in `OpenConsoleError`: the file is matched against `ScriptFileRefs()`, the console closes, and `OpenScriptAt` (⌃P's + `Script …` path) opens it with the caret and `ErrorLine` on N; Esc returns to the console. The demo's error is one + constant, `DemoScriptError`, in the console and the `script-edit` header. + - **The cell console is sized to what it holds when it opens** (`ScriptConsoleSurface.RowsFor`, at least `MinBodyRows` + of log), so its log is not drawn under blank padding; then the size is fixed and the log scrolls, newest above the prompt. - **GMCP channels go to a window per channel through `SpawnLine`** (`ChannelCapture`, Core; `WorldDefinition.CaptureChannels`, F5 ▸ `channels`: off/copy/move, off by default). `Comm.Channel.Text`'s `channel` names the window (letters, digits, space, `-`, `_`, 24 at most); its `text` is parsed through `AnsiParser`. `move` diff --git a/src/SharpMUTerm.Avalonia/ScriptConsoleView.cs b/src/SharpMUTerm.Avalonia/ScriptConsoleView.cs index dd4d97fe..bdcb410d 100644 --- a/src/SharpMUTerm.Avalonia/ScriptConsoleView.cs +++ b/src/SharpMUTerm.Avalonia/ScriptConsoleView.cs @@ -197,8 +197,9 @@ private void Draw() _output.Children.Add(Line(_model.CanRun ? ScriptConsoleModel.Empty : _model.Unavailable ?? string.Empty, _colours.Dim, string.Empty)); } - foreach (var line in _model.Lines) + for (var i = 0; i < _model.Lines.Count; i++) { + var line = _model.Lines[i]; var colour = line.Kind switch { ScriptConsoleKind.Error => _colours.Warn, @@ -206,7 +207,10 @@ private void Draw() ScriptConsoleKind.Input or ScriptConsoleKind.Note => _colours.Dim, _ => _colours.Text, }; - _output.Children.Add(Line(line.Text, colour, ScriptConsoleModel.Mark(line.Kind))); + var index = i; + _output.Children.Add(_model.ErrorAt(i) is { } at + ? ErrorLink(line.Text, colour, at, () => OpenError(index)) + : Line(line.Text, colour, ScriptConsoleModel.Mark(line.Kind))); } _outputScroller.ScrollToEnd(); @@ -237,6 +241,47 @@ private void Draw() Highlight(); } + /// + /// A click on error row : the console closes and the client opens the script it names on its + /// line (), the cells' link. + /// + public void OpenError(int index) + { + if (_session.OpenError(index)) + { + _done(); + } + } + + /// An error row naming a script line: underlined, a hand under the pointer, and a click opens that line. + private Control ErrorLink(string text, Color colour, (string File, int Line) at, Action open) + { + var row = new DockPanel { Margin = new Thickness(0, 1), Background = Brushes.Transparent, Cursor = new Cursor(StandardCursorType.Hand) }; + var gutter = new TextBlock { Text = ScriptConsoleModel.Mark(ScriptConsoleKind.Error), Width = 18, FontFamily = _mono, Foreground = _colours.Brush(colour), FontSize = NativeTokens.Body }; + SetDock(gutter, Dock.Left); + row.Children.Add(gutter); + row.Children.Add(new TextBlock + { + Text = text, + FontFamily = _mono, + FontSize = NativeTokens.Body, + Foreground = _colours.Brush(colour), + TextWrapping = TextWrapping.Wrap, + TextDecorations = TextDecorations.Underline, + }); + ToolTip.SetTip(row, $"Open {at.File} at line {at.Line.ToString(System.Globalization.CultureInfo.InvariantCulture)}"); + global::Avalonia.Automation.AutomationProperties.SetName(row, text); + row.PointerPressed += (_, e) => + { + if (e.GetCurrentPoint(row).Properties.IsLeftButtonPressed) + { + e.Handled = true; + open(); + } + }; + return row; + } + private Control Line(string text, Color colour, string mark) { var row = new DockPanel { Margin = new Thickness(0, 1) }; diff --git a/src/SharpMUTerm.Avalonia/ScrollbackView.cs b/src/SharpMUTerm.Avalonia/ScrollbackView.cs index 075dce08..1aa248ce 100644 --- a/src/SharpMUTerm.Avalonia/ScrollbackView.cs +++ b/src/SharpMUTerm.Avalonia/ScrollbackView.cs @@ -122,7 +122,7 @@ private void Draw() }); } - for (var i = _model.Lines.Count; i < ScrollbackViewModel.PageRows; i++) + for (var i = _model.Lines.Count; i < _model.PageRows; i++) { _list.Children.Add(new TextBlock { Text = " ", FontFamily = mono, FontSize = NativeTokens.Body, Margin = new Thickness(12, 2) }); } diff --git a/src/SharpMUTerm.Avalonia/SearchView.cs b/src/SharpMUTerm.Avalonia/SearchView.cs index 8f04abbf..8cacff78 100644 --- a/src/SharpMUTerm.Avalonia/SearchView.cs +++ b/src/SharpMUTerm.Avalonia/SearchView.cs @@ -254,7 +254,7 @@ private void Draw() return; } - var labelled = _model.AllWindows || _model.Rows.Any(r => r.IsOlder); + var labelled = _model.Labelled; for (var i = 0; i < _model.Rows.Count; i++) { var row = _model.Rows[i]; @@ -262,8 +262,9 @@ private void Draw() var line = new DockPanel(); if (labelled) { - // The cells' window column: the window in ⌥A scope, and "older" on a row ⏎ opens in the history view. - var label = row.IsOlder ? (_model.AllWindows ? $"{row.WindowLabel} · older" : "older") : _model.AllWindows ? row.WindowLabel : string.Empty; + // The cells' window column (SearchModel.LabelFor): the window in ⌥A scope, how far back an older row is + // (⏎ opens it in the history view), and "here" on a row the pane holds. + var label = _model.LabelFor(row); var window = new TextBlock { Text = label, diff --git a/src/SharpMUTerm.Client/Composer/ScriptErrors.cs b/src/SharpMUTerm.Client/Composer/ScriptErrors.cs index 1058137e..766fc803 100644 --- a/src/SharpMUTerm.Client/Composer/ScriptErrors.cs +++ b/src/SharpMUTerm.Client/Composer/ScriptErrors.cs @@ -48,6 +48,35 @@ public static class ScriptErrors return null; } + /// + /// The first script file and line names (corvid.lua:(14,…) → corvid.lua, 14), or + /// null when it names none — what makes a console error row a link to its line. + /// + public static (string File, int Line)? At(string? text) + { + if (string.IsNullOrEmpty(text)) + { + return null; + } + + try + { + foreach (Match match in ErrorAt.Matches(text)) + { + if (int.TryParse(match.Groups["line"].Value, NumberStyles.None, CultureInfo.InvariantCulture, out var line) && line > 0) + { + return (match.Groups["file"].Value, line); + } + } + } + catch (RegexMatchTimeoutException) + { + return null; + } + + return null; + } + /// The line the newest of (oldest first) names in , or null. public static int? LineIn(IReadOnlyList errors, string name) { diff --git a/src/SharpMUTerm.Client/Modals/ScriptConsoleModel.cs b/src/SharpMUTerm.Client/Modals/ScriptConsoleModel.cs index 2d4fceb1..2db6c3c2 100644 --- a/src/SharpMUTerm.Client/Modals/ScriptConsoleModel.cs +++ b/src/SharpMUTerm.Client/Modals/ScriptConsoleModel.cs @@ -89,6 +89,21 @@ Unavailable is not null (var n, _) => $"{n} files loaded", }; + /// + /// The scheme of a cell console error row's link: mux:script-error:N, N an index into . Answered by + /// the console's own control (never the output panes' handler), and only for a row this model says names a line. + /// + public const string ErrorLinkPrefix = "mux:script-error:"; + + /// + /// The script file and line console line names, when it is an error that names one + /// () — such a row is a link that opens that script on that line — else null. + /// + public (string File, int Line)? ErrorAt(int index) => + index >= 0 && index < Lines.Count && Lines[index].Kind == ScriptConsoleKind.Error + ? Composer.ScriptErrors.At(Lines[index].Text) + : null; + /// A console line's mark, the same in both hosts. public static string Mark(ScriptConsoleKind kind) => kind switch { @@ -212,6 +227,7 @@ public sealed class ScriptConsoleSession : ModalSession private readonly Action _delete; private readonly Action _reload; private readonly Action? _edit; + private readonly Action? _openError; /// What the console shows. /// Whether the client's theme is a dark one. @@ -220,6 +236,10 @@ public sealed class ScriptConsoleSession : ModalSession /// Reloads the character's scripts (ReloadConsoleScripts). /// Told the console closed. /// Opens the list of the character's script files to edit (EditScriptFromConsole); null for none. + /// + /// Opens the script an error row names on its line (OpenConsoleError), handed the model the row was drawn from + /// and its index; null for none. + /// public ScriptConsoleSession( ScriptConsoleModel model, bool isDark, @@ -227,7 +247,8 @@ public ScriptConsoleSession( Action delete, Action reload, Action closed, - Action? edit = null) + Action? edit = null, + Action? openError = null) : base(model, isDark, closed) { ArgumentNullException.ThrowIfNull(run); @@ -237,6 +258,18 @@ public ScriptConsoleSession( _delete = delete; _reload = reload; _edit = edit; + _openError = openError; + } + + /// + /// The host's: a click on console line , an error naming file.lua:(N,…). Closes the + /// console first; the client opens that script with the caret on line N and the line marked. False for a line that + /// names none. + /// + public bool OpenError(int index) + { + var model = Model; + return _openError is not null && !IsEnded && model.ErrorAt(index) is not null && CloseThen(() => _openError(model, index)); } /// Whether the console can open a script to edit. diff --git a/src/SharpMUTerm.Client/Modals/ScrollbackViewModel.cs b/src/SharpMUTerm.Client/Modals/ScrollbackViewModel.cs index 8c28560b..41e7865f 100644 --- a/src/SharpMUTerm.Client/Modals/ScrollbackViewModel.cs +++ b/src/SharpMUTerm.Client/Modals/ScrollbackViewModel.cs @@ -38,6 +38,10 @@ public enum ScrollbackLineRole /// One past the newest line. /// The line the search found. /// The page, oldest first, at most . +/// +/// The lines a page holds: the screen the client draws on, so the cell view fits an 80×24 +/// terminal with its keys on screen. The window's view reads the same number, so both hosts show the same page. +/// public sealed record ScrollbackViewModel( string Window, string Query, @@ -45,10 +49,38 @@ public sealed record ScrollbackViewModel( long Oldest, long End, long Marked, - IReadOnlyList Lines) + IReadOnlyList Lines, + int PageRows = ScrollbackViewModel.MaxPageRows) { - /// The lines a page holds, the same in both hosts. - public const int PageRows = 20; + /// The most lines a page holds, on a screen with room for more. + public const int MaxPageRows = 20; + + /// The fewest lines a page holds, however small the screen. + public const int MinPageRows = 5; + + /// Below this many columns the title and the position take a row each (). + public const int WideColumns = 100; + + /// + /// The page a screen of × cells has room for: the view is a modal + /// centred on the screen that must end above the command line and the status row, so it is at most rows − 4 + /// tall; less its frame (2), its title (one row, two below ), the blank under it, the blank + /// above the keys and the keys (3). Between and ; 13 at 80×24. + /// + public static int PageRowsFor(int rows, int columns) => + Math.Clamp(rows - 4 - 2 - (TwoTitleRows(columns) ? 2 : 1) - 3, MinPageRows, MaxPageRows); + + /// Whether a screen wide puts the title and the position on a row each. + public static bool TwoTitleRows(int columns) => columns < WideColumns; + + /// The keys as a ladder, longest first, for a key row too narrow for all of them; every rung keeps Esc. + public static IReadOnlyList KeysLadder { get; } = + [ + Keys, + "↑↓ line · PgUp PgDn page · Home End ends · Esc closes", + "↑↓ PgUp PgDn Home End · Esc closes", + "↑↓ · Esc closes", + ]; /// How many lines either side of the found line are its context. public const int ContextRows = 3; @@ -78,10 +110,10 @@ public string Position public string Title => $"OLDER HISTORY · {Window} · read only"; /// - /// The top that shows in the middle of a page — / 2 lines above it, the - /// rest below — clamped to what is held, so a hit near either end sits as near the middle as the history allows. + /// The top that shows in the middle of a page of lines — half of them + /// above it, the rest below — clamped to what is held, so a hit near either end sits as near the middle as the history allows. /// - public static long TopFor(long marked, long oldest, long end) => Clamp(marked - PageRows / 2, oldest, end); + public static long TopFor(long marked, long oldest, long end, int page = MaxPageRows) => Clamp(marked - page / 2, oldest, end, page); /// What a line of the page is to the hit: the hit itself, its context ( either side), or the rest. public ScrollbackLineRole Role(ScrollbackViewLine line) => @@ -89,18 +121,18 @@ public ScrollbackLineRole Role(ScrollbackViewLine line) => : Math.Abs(line.Index - Marked) <= ContextRows ? ScrollbackLineRole.Context : ScrollbackLineRole.Page; - /// kept to a page that starts at or after the oldest line and ends at or before the newest. - public static long Clamp(long top, long oldest, long end) => Math.Max(oldest, Math.Min(top, Math.Max(oldest, end - PageRows))); + /// kept to a page of lines that starts at or after the oldest line and ends at or before the newest. + public static long Clamp(long top, long oldest, long end, int page = MaxPageRows) => Math.Max(oldest, Math.Min(top, Math.Max(oldest, end - page))); /// The top a key moves to: ↑↓ a line, PgUp PgDn a page, Home End the ends; null for a key that does not move. public long? Move(ConsoleKey key) => key switch { - ConsoleKey.UpArrow => Clamp(Top - 1, Oldest, End), - ConsoleKey.DownArrow => Clamp(Top + 1, Oldest, End), - ConsoleKey.PageUp => Clamp(Top - (PageRows - 1), Oldest, End), - ConsoleKey.PageDown => Clamp(Top + (PageRows - 1), Oldest, End), + ConsoleKey.UpArrow => Clamp(Top - 1, Oldest, End, PageRows), + ConsoleKey.DownArrow => Clamp(Top + 1, Oldest, End, PageRows), + ConsoleKey.PageUp => Clamp(Top - (PageRows - 1), Oldest, End, PageRows), + ConsoleKey.PageDown => Clamp(Top + (PageRows - 1), Oldest, End, PageRows), ConsoleKey.Home => Oldest, - ConsoleKey.End => Clamp(End, Oldest, End), + ConsoleKey.End => Clamp(End, Oldest, End, PageRows), _ => null, }; @@ -109,9 +141,9 @@ public ScrollbackLineRole Role(ScrollbackViewLine line) => public bool Equals(ScrollbackViewModel? other) => other is not null && Window == other.Window && Query == other.Query && Top == other.Top && Oldest == other.Oldest - && End == other.End && Marked == other.Marked && ModelLists.Same(Lines, other.Lines); + && End == other.End && Marked == other.Marked && PageRows == other.PageRows && ModelLists.Same(Lines, other.Lines); - public override int GetHashCode() => HashCode.Combine(Window, Query, Top, Oldest, End, Marked, ModelLists.Hash(Lines)); + public override int GetHashCode() => HashCode.Combine(Window, Query, Top, Oldest, End, Marked, PageRows, ModelLists.Hash(Lines)); } /// diff --git a/src/SharpMUTerm.Client/Modals/SearchModel.cs b/src/SharpMUTerm.Client/Modals/SearchModel.cs index 80a12843..4745e675 100644 --- a/src/SharpMUTerm.Client/Modals/SearchModel.cs +++ b/src/SharpMUTerm.Client/Modals/SearchModel.cs @@ -9,10 +9,18 @@ namespace SharpMUTerm.Client.Modals; /// /// A row from older history (⌥H) has at the line's absolute index in its session's scrollback and /// −1: it is not in the pane buffer, so ⏎ opens it in the read-only history view (or scrolls the -/// pane to it when the pane still holds it). +/// pane to it when the pane still holds it). Its says how far back it is (). /// public readonly record struct SearchRow( - string WindowId, string WindowLabel, int LineIndex, string Text, int MatchStart, int MatchLength, long History = -1, string? SessionKey = null) + string WindowId, + string WindowLabel, + int LineIndex, + string Text, + int MatchStart, + int MatchLength, + long History = -1, + string? SessionKey = null, + string? Age = null) { /// Whether this row came from older history rather than the pane buffer. public bool IsOlder => History >= 0; @@ -118,19 +126,83 @@ public IReadOnlyList OlderHintLadder /// How many rows are the pane buffer's (the rest are older history's, listed after them). public int HeldRows => Rows.Count(r => !r.IsOlder); + /// How many older-history lines matched so far (⌥H): set by the client as the search streams in. + public int OlderFound { get; init; } + + /// How many older-history lines have been read so far. + public long OlderSearched { get; init; } + + /// How many lines the older-history search covers in all. + public long OlderTotal { get; init; } + + /// Whether older history found more than the rows it lists. + public bool OlderCapped { get; init; } + /// - /// How many lines matched out of how many were looked at — 12 found · 4,812 lines held — so a reader who - /// cannot find an old line sees the bound rather than concluding the search is broken. + /// How many lines matched out of how many were looked at, on one row — 12 found · 4,812 lines held, and with + /// older history (⌥H) both bounds side by side: this window 3 of 39 · older 4 of 6,000 (while it reads, + /// older 2… 1,200 of 6,000 read) — so a reader who cannot find an old line sees the bound rather than concluding + /// the search is broken, and never two counts competing for the same row. /// public string CountText { get { var searched = $"{Held:n0} line{(Held == 1 ? string.Empty : "s")} held"; - return Error is not null ? searched : $"{HeldRows} found · {searched}"; + if (Error is not null) + { + return searched; + } + + if (!Older || OlderTotal <= 0) + { + return $"{HeldRows} found · {searched}"; + } + + var here = $"{(AllWindows ? "these windows" : "this window")} {HeldRows} of {Held:n0}"; + var older = HistoryRunning + ? $"older {OlderFound}… {OlderSearched:n0} of {OlderTotal:n0} read" + : $"older {OlderFound}{(OlderCapped ? "+" : string.Empty)} of {OlderTotal:n0}"; + return $"{here} · {older}"; } } + /// + /// What a row's window column says, in both hosts: the window's name in ⌥A scope; on an older-history row how far back + /// it is (); and here on a row the pane holds once older rows are listed beside it. + /// + public string LabelFor(SearchRow row) + { + if (row.IsOlder) + { + var age = row.Age ?? "older"; + return AllWindows ? $"{row.WindowLabel} · {age}" : age; + } + + var olderListed = Rows.Any(r => r.IsOlder); + return AllWindows ? (olderListed ? $"{row.WindowLabel} · here" : row.WindowLabel) : olderListed ? "here" : string.Empty; + } + + /// Whether the rows carry a window column at all: in ⌥A scope, or once older history lists a row. + public bool Labelled => AllWindows || Rows.Any(r => r.IsOlder); + + /// + /// How far back an older-history line is, from how many lines arrived after it: 40 lines ago, 1.6k lines ago. + /// The scrollback keeps no clock, so the age is in lines — the unit the history view's position says too. + /// + public static string AgeLabel(long linesAfter) + { + linesAfter = Math.Max(0, linesAfter); + return linesAfter switch + { + 0 => "the newest", + 1 => "1 line ago", + < 1_000 => $"{linesAfter} lines ago", + < 100_000 => (linesAfter / 1000.0).ToString("0.#", CultureInfo.InvariantCulture) + "k lines ago", + _ => (linesAfter / 1000).ToString(CultureInfo.InvariantCulture) + "k lines ago", + }; + } + /// What the list says when it lists nothing, or null when it lists something. public string? EmptyText => Error is not null ? Error @@ -145,6 +217,7 @@ other is not null && Scope == other.Scope && Held == other.Held && Error == other.Error && Older == other.Older && HistoryNote == other.HistoryNote && HistoryRunning == other.HistoryRunning && OlderLines == other.OlderLines && OlderSource == other.OlderSource + && OlderFound == other.OlderFound && OlderSearched == other.OlderSearched && OlderTotal == other.OlderTotal && OlderCapped == other.OlderCapped && ModelLists.Same(Rows, other.Rows); public override int GetHashCode() => HashCode.Combine(Query, Regex, AllWindows, Scope, Held, Error, ModelLists.Hash(Rows)); diff --git a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs index 791387a4..fe927eeb 100644 --- a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs +++ b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs @@ -534,6 +534,10 @@ [.. PanelViews("MapCanvas"), "SharpMUTerm.Avalonia.MapInspector"]), // ⌃E (the window's Edit a script… button): the console closes and the palette lists the script files. new(SurfaceActionKind.Modal, "edit a script", "EditScriptFromConsole"), + + // A click on an error row naming file.lua:(N,…) (the cells' mux:script-error:N link, the console's own): the + // console closes and that script opens in the editor with the caret on line N and the line marked. + new(SurfaceActionKind.Modal, "open an error's line", "OpenConsoleError"), ], NativeModal, "SharpMUTerm.Tui.ScriptConsoleSurface.Render", diff --git a/src/SharpMUTerm.Tui/ListOverlay.cs b/src/SharpMUTerm.Tui/ListOverlay.cs index 4285ee3f..d6e3d960 100644 --- a/src/SharpMUTerm.Tui/ListOverlay.cs +++ b/src/SharpMUTerm.Tui/ListOverlay.cs @@ -25,6 +25,7 @@ internal sealed class ListOverlay private Func? _key; private Func? _escape; private Action? _closed; + private Action? _link; private ScreenTheme _scheme; @@ -68,6 +69,10 @@ public ListOverlay(ConsoleWindowSystem system, ScreenTheme? scheme = null) /// scrolled away (the import review at 80×24 lost both). Each row is one line, never wrapped: fit it to the width. /// /// Whether ↑↓ PgUp PgDn Home End scroll the body before the key handler sees them. + /// + /// Told the target of a [link=…] clicked in the body: this surface's own handler, never the output panes' + /// (whose links are scheme-tagged server text). With none, a link in the body does nothing. + /// public void Open( string mode, string title, @@ -77,13 +82,15 @@ public void Open( Func? escape = null, Action? closed = null, Func>? footer = null, - bool scrollKeys = false) + bool scrollKeys = false, + Action? link = null) { if (_window is not null) { Close(); } + _link = link; _render = render; _key = key; _escape = escape; @@ -97,6 +104,7 @@ public void Open( var footerLines = footer?.Invoke(outer - 4) ?? []; var height = Math.Clamp(Rows(lines, outer - 3) + footerLines.Count + 2, 8, Math.Max(8, desktop.Height - 2)); _content = new MarkupControl(_scheme.Lines(lines, ScreenPalette.MenuBg)); + _content.LinkClicked += (_, e) => _link?.Invoke(e.Url); IWindowControl body = _content; if (footer is not null) { @@ -190,6 +198,15 @@ public void Repaint() internal void SimulateKey(ConsoleKeyInfo key) => OnKey(this, new KeyPressedEventArgs(key, false)); + /// A click on a body link with target , for a test (the surface's own handler, as a click). + internal void SimulateLink(string url) + { + if (_window is not null) + { + _link?.Invoke(url); + } + } + public void Close() { if (_window is { } window) @@ -278,6 +295,7 @@ private void Reset() _body = null; _footer = null; _scrollKeys = false; + _link = null; _render = null; _key = null; _escape = null; diff --git a/src/SharpMUTerm.Tui/ScriptConsoleSurface.cs b/src/SharpMUTerm.Tui/ScriptConsoleSurface.cs index 7bacd41a..fd7195ad 100644 --- a/src/SharpMUTerm.Tui/ScriptConsoleSurface.cs +++ b/src/SharpMUTerm.Tui/ScriptConsoleSurface.cs @@ -140,6 +140,25 @@ public void Clamp() } } + /// The fewest log rows the console opens with, so a short log still leaves room for the next few lines. + internal const int MinBodyRows = 6; + + /// + /// The rows the console asks for at : what its log and store hold when it opens (at least + /// of body), up to . Sized to what it holds, so the log is not drawn + /// under rows of blank padding; once open the overlay keeps its size and the log scrolls, newest above the prompt. + /// + internal static int RowsFor(ScriptConsoleModel model, int width, int maxRows) + { + width = Math.Max(30, width); + var two = width >= TwoColumns; + var storeWidth = two ? Math.Clamp(width / 3, 26, 40) : width; + var outWidth = two ? width - storeWidth - 3 : width; + var log = model.Lines.Sum(l => HelpSurface.Wrap(l.Text, Math.Max(4, outWidth - 2)).Count()); + var store = two ? 1 + Math.Max(1, model.Store.Count) + (model.StoreCount > model.Store.Count ? 1 : 0) : 0; + return Math.Clamp(5 + Math.Max(Math.Max(log, store), MinBodyRows), 8, Math.Max(8, maxRows)); + } + /// What the console draws now. public List Render(int width, int rows) => Render(Model, Input, OnStore, StoreSelected, width, rows); @@ -217,9 +236,16 @@ internal static IReadOnlyList FooterKeys(bool onStore) => onStore private static List OutputRows(ScriptConsoleModel model, int width, int rows) { var wrapped = new List(); - foreach (var line in model.Lines) + for (var index = 0; index < model.Lines.Count; index++) { + var line = model.Lines[index]; var mark = ScriptConsoleModel.Mark(line.Kind); + + // An error naming file.lua:(N,…) is a link to that line: the console's own link, an index into these lines, + // answered by the console control and never by the output panes' handler. + var link = model.ErrorAt(index) is not null + ? ScriptConsoleModel.ErrorLinkPrefix + index.ToString(System.Globalization.CultureInfo.InvariantCulture) + : null; var colour = line.Kind switch { ScriptConsoleKind.Error => ScreenPalette.Warn, @@ -231,7 +257,8 @@ private static List OutputRows(ScriptConsoleModel model, int width, int var first = true; foreach (var part in HelpSurface.Wrap(line.Text, Math.Max(4, width - 2))) { - wrapped.Add($"[{colour}]{(first ? mark : " ")} {Escape(part)}[/]"); + var row = $"[{colour}]{(first ? mark : " ")} {Escape(part)}[/]"; + wrapped.Add(link is null ? row : $"[link={link}]{row}[/]"); first = false; } } diff --git a/src/SharpMUTerm.Tui/ScrollbackViewSurface.cs b/src/SharpMUTerm.Tui/ScrollbackViewSurface.cs index 770d0260..2ee1a9f7 100644 --- a/src/SharpMUTerm.Tui/ScrollbackViewSurface.cs +++ b/src/SharpMUTerm.Tui/ScrollbackViewSurface.cs @@ -9,33 +9,48 @@ namespace SharpMUTerm.Tui; /// search found, centred: that line on the accent band, its context ( either side) /// in the body ink behind a │, the rest of the page muted, and the query's run in every line in bold accent. Pure: the page is the /// the window's native view draws too, and every move is the client's ranged read. -/// Always rows of page, so the overlay sized once at open keeps fitting. +/// Always the model's rows of page — sized from the screen, so the overlay sized +/// once at open keeps fitting, at 80×24 too — and the keys are pinned under the body (), never scrolled. /// internal static class ScrollbackViewSurface { /// The width the view asks for; the overlay narrows it on a small terminal. internal const int PreferredWidth = 110; - /// The view's lines at : title, position, a blank, the page, a blank, the keys. - internal static List Render(ScrollbackViewModel model, int width) + /// + /// The view's body at : the title and the position (one row, or a row each with + /// , below ), a blank, and the page. + /// + internal static List Render(ScrollbackViewModel model, int width, bool twoTitleRows = false) { width = Math.Max(20, width); - var lines = new List + var lines = new List(); + if (twoTitleRows) { - SpreadLR($"[{Label}]{Escape(model.Title)}[/]", $"[{Muted}]{Escape(model.Position)}[/]", width), - string.Empty, - }; + lines.Add($"[{Label}]{Escape(ElidePlain(model.Title, width))}[/]"); + lines.Add($"[{Muted}]{Escape(ElidePlain(model.Position, width))}[/]"); + } + else + { + lines.Add(SpreadLR($"[{Label}]{Escape(model.Title)}[/]", $"[{Muted}]{Escape(model.Position)}[/]", width)); + } - for (var i = 0; i < ScrollbackViewModel.PageRows; i++) + lines.Add(string.Empty); + for (var i = 0; i < model.PageRows; i++) { lines.Add(i < model.Lines.Count ? Row(model.Lines[i], model.Role(model.Lines[i]), width) : string.Empty); } - lines.Add(string.Empty); - lines.Add($"[{Label}]{Escape(ElidePlain(ScrollbackViewModel.Keys, width))}[/]"); return lines; } + /// The pinned key row at : a blank, then the longest rung of the keys that fits. + internal static List Footer(int width) + { + var keys = ScrollbackViewModel.KeysLadder.FirstOrDefault(k => k.Length <= width) ?? ScrollbackViewModel.KeysLadder[^1]; + return [string.Empty, $"[{Label}]{Escape(keys)}[/]"]; + } + private static string Row(ScrollbackViewLine line, ScrollbackLineRole role, int width) { var text = ElidePlain(line.Text.Replace('\t', ' '), width - 2); diff --git a/src/SharpMUTerm.Tui/SearchPrompt.cs b/src/SharpMUTerm.Tui/SearchPrompt.cs index de4fe733..071fa3d9 100644 --- a/src/SharpMUTerm.Tui/SearchPrompt.cs +++ b/src/SharpMUTerm.Tui/SearchPrompt.cs @@ -214,10 +214,8 @@ internal static List Render(SearchModel model, int selected, int width = ArgumentNullException.ThrowIfNull(model); var rows = model.Rows; var query = model.Query; - var all = model.AllWindows; - - var labelWidth = all || rows.Any(r => r.IsOlder) - ? Math.Min(MaxLabelWidth, rows.Select(r => RowLabel(r, all).Length).DefaultIfEmpty(0).Max()) + var labelWidth = model.Labelled + ? Math.Min(MaxLabelWidth, rows.Select(r => model.LabelFor(r).Length).DefaultIfEmpty(0).Max()) : 0; var entryWidth = (width > 0 ? width : DefaultEntryWidth) - 4 - (labelWidth > 0 ? labelWidth + 2 : 0); @@ -237,7 +235,7 @@ internal static List Render(SearchModel model, int selected, int width = var last = listRows > 0 ? Math.Min(rows.Count, top + listRows - body.Count) : rows.Count; for (var i = top; i < last; i++) { - body.Add(Row(rows[i], i == selected, entryWidth, labelWidth, width, all)); + body.Add(Row(rows[i], model.LabelFor(rows[i]), i == selected, entryWidth, labelWidth, width)); } while (body.Count < listRows) @@ -296,16 +294,14 @@ private static string QueryMarkup(string query) => : $"[{Value}]{Escape(query)}[/][{Ink} on {Accent}] [/]"; /// - /// What a row's window column says: the window's name in ⌥A scope, and older on a row from older history — the - /// only place a reader can tell a line the pane holds from one ⏎ will open in the history view. + /// One row. is the window column (): the window's name in + /// ⌥A scope, how far back an older-history row is and here beside it — the only place a reader can tell a line the + /// pane holds from one ⏎ will open in the history view. /// - private static string RowLabel(SearchRow row, bool all) => - row.IsOlder ? (all ? $"{row.WindowLabel} · older" : "older") : all ? row.WindowLabel : string.Empty; - - private static string Row(SearchRow row, bool selected, int entryWidth, int labelWidth, int width, bool all) + private static string Row(SearchRow row, string rowLabel, bool selected, int entryWidth, int labelWidth, int width) { var (text, matchStart, matchLength) = Elide(row, entryWidth); - var label = labelWidth > 0 ? LabelCell(RowLabel(row, all), labelWidth) : string.Empty; + var label = labelWidth > 0 ? LabelCell(rowLabel, labelWidth) : string.Empty; if (selected) { diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.DeepSearch.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.DeepSearch.cs index b06da0c4..838e6de7 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.DeepSearch.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.DeepSearch.cs @@ -68,10 +68,13 @@ private sealed class DeepSearch(string key, IReadOnlyList sources } /// The history view: whose scrollback, the search it came from, the line it found, and where the page starts. - private sealed class HistoryViewState(HistorySource source, string query, bool regex, long marked) + private sealed class HistoryViewState(HistorySource source, string query, bool regex, long marked, int pageRows) { public HistorySource Source { get; } = source; + /// The lines a page holds, from the screen when the view opened (). + public int PageRows { get; } = pageRows; + public string Query { get; } = query; public bool Regex { get; } = regex; @@ -155,17 +158,26 @@ internal SearchModel SearchModelFor(string query, bool regex, bool all, bool old break; } - rows.Add(new SearchRow(source.WindowId, source.Label, -1, match.Line.Text, match.MatchStart, match.MatchLength, match.Index, source.SessionKey)); + var age = SearchModel.AgeLabel(source.Buffer.TotalLines - 1 - match.Index); + rows.Add(new SearchRow(source.WindowId, source.Label, -1, match.Line.Text, match.MatchStart, match.MatchLength, match.Index, source.SessionKey, age)); found++; } } - var said = error is not null - ? $"older history: {error}" - : deep.Running - ? $"searching older history · {N(searched)} of {N(deep.Total)} lines…" - : $"older history · {found} found in {N(deep.Total)} lines{(capped ? $" · the first {ScrollbackSearch.MaxHits}" : string.Empty)}"; - return held with { Rows = rows, Older = true, HistoryNote = said + spill, HistoryRunning = deep.Running && error is null }; + // The counts are one row (SearchModel.CountText: "this window 3 of 39 · older 4 of 6,000"); the note says only what + // is not a count — an error, or that a capture keeps no older history. + var said = error is not null ? $"older history: {error}{spill}" : spill.Length > 0 ? spill.TrimStart(' ', '·') : null; + return held with + { + Rows = rows, + Older = true, + HistoryNote = said, + HistoryRunning = deep.Running && error is null, + OlderFound = found, + OlderSearched = searched, + OlderTotal = deep.Total, + OlderCapped = capped, + }; } /// @@ -362,9 +374,13 @@ private void OpenHistoryView(HistorySource source, string query, bool regex, lon return; } - var view = new HistoryViewState(source, query, regex, marked); + // The page is sized from the screen, so the cell view (a modal centred on it) ends above the command line with its + // keys on screen at 80×24; the window's view reads the same model and so shows the same page. + var screen = _system.DesktopDimensions; + var twoTitleRows = ScrollbackViewModel.TwoTitleRows(screen.Width); + var view = new HistoryViewState(source, query, regex, marked, ScrollbackViewModel.PageRowsFor(screen.Height, screen.Width)); _historyView = view; - view.Top = ScrollbackViewModel.TopFor(marked, source.Buffer.OldestIndex, source.Buffer.TotalLines); + view.Top = ScrollbackViewModel.TopFor(marked, source.Buffer.OldestIndex, source.Buffer.TotalLines, view.PageRows); view.Model = HistoryPage(view); if (NativeModalsHost is { } host) { @@ -396,7 +412,7 @@ private void OpenHistoryView(HistorySource source, string query, bool regex, lon { var model = view.Model!; Drawing(SurfaceCatalog.HistoryView, string.Empty, model); - return ScrollbackViewSurface.Render(model, width); + return ScrollbackViewSurface.Render(model, width, twoTitleRows); }, key => { @@ -414,7 +430,8 @@ private void OpenHistoryView(HistorySource source, string query, bool regex, lon { _historyView = null; } - }); + }, + footer: ScrollbackViewSurface.Footer); } /// @@ -428,7 +445,7 @@ internal void ScrollHistoryView(long top) return; } - view.Top = ScrollbackViewModel.Clamp(top, view.Source.Buffer.OldestIndex, view.Source.Buffer.TotalLines); + view.Top = ScrollbackViewModel.Clamp(top, view.Source.Buffer.OldestIndex, view.Source.Buffer.TotalLines, view.PageRows); view.Model = HistoryPage(view); if (view.Native is { } native) { @@ -445,8 +462,8 @@ private static ScrollbackViewModel HistoryPage(HistoryViewState view) var buffer = view.Source.Buffer; var oldest = buffer.OldestIndex; var end = buffer.TotalLines; - var top = ScrollbackViewModel.Clamp(view.Top, oldest, end); - var lines = buffer.GetRange(top, ScrollbackViewModel.PageRows); + var top = ScrollbackViewModel.Clamp(view.Top, oldest, end, view.PageRows); + var lines = buffer.GetRange(top, view.PageRows); var first = Math.Max(top, oldest); var texts = lines.Select(l => l.Text).ToArray(); var matches = OutputSearch.Match(texts, view.Query, view.Regex).Matches.ToDictionary(m => m.LineIndex); @@ -457,14 +474,27 @@ private static ScrollbackViewModel HistoryPage(HistoryViewState view) page.Add(new ScrollbackViewLine(first + i, texts[i], matches.ContainsKey(i) ? hit.MatchStart : -1, matches.ContainsKey(i) ? hit.MatchLength : 0)); } - return new ScrollbackViewModel(view.Source.Label, view.Query, top, oldest, end, view.Marked, page); + return new ScrollbackViewModel(view.Source.Label, view.Query, top, oldest, end, view.Marked, page, view.PageRows); + } + + /// How many lines the demo's older history holds. + private const int DemoHistoryLines = 6_000; + + /// + /// The clock stamp of the demo's history line : 18:00 to 22:59 over the evening, never going + /// back, so every line — the goblin's included — reads like its neighbours. + /// + internal static string DemoHistoryStamp(int index) + { + var minutes = 18 * 60 + (index * 300 / DemoHistoryLines); + return $"{minutes / 60:00}:{minutes % 60:00}"; } /// /// The demo's older history: an evening of the same streets, a few thousand lines older than anything the pane holds, /// with a goblin fight in it to find. /// - private static ScrollbackBuffer DemoHistory() + internal static ScrollbackBuffer DemoHistory() { var buffer = new ScrollbackBuffer(10_000); string[] streets = @@ -475,7 +505,7 @@ private static ScrollbackBuffer DemoHistory() "Merrow pages: meet at the Grand Plaza after the bell.", "The smell of roasting chestnuts drifts from a cart nearby.", ]; - for (var i = 0; i < 6_000; i++) + for (var i = 0; i < DemoHistoryLines; i++) { var text = i switch { @@ -483,9 +513,9 @@ private static ScrollbackBuffer DemoHistory() 1_203 => "You hit the goblin for 9 damage.", 1_207 => "The goblin flees north, clutching a stolen purse.", 4_410 => "Ashlyn says, \"That goblin came back — it is in the sewers now.\"", - _ => $"[{18 + i / 1_000:00}:{i * 7 % 60:00}] {streets[i % streets.Length]}", + _ => streets[i % streets.Length], }; - buffer.Append(StyledLine.FromText(text, TextStyle.Default)); + buffer.Append(StyledLine.FromText($"[{DemoHistoryStamp(i)}] {text}", TextStyle.Default)); } return buffer; diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.ScriptConsole.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.ScriptConsole.cs index 4e8d9804..ee2afdad 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.ScriptConsole.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.ScriptConsole.cs @@ -1,3 +1,4 @@ +using System.Globalization; using System.Text.Json.Nodes; using SharpMUTerm.Client.Modals; using SharpMUTerm.Client.Surfaces; @@ -57,6 +58,15 @@ internal sealed partial class SharpMUTermApp /// Feeds a key to the cell console. internal void SimulateConsoleKey(ConsoleKeyInfo key) => _helpView.SimulateKey(key); + /// A click on a link in the cell console's body, for the tests: the console control's own handler. + internal void SimulateConsoleLink(string url) + { + if (CellConsole is not null) + { + _helpView.SimulateLink(url); + } + } + /// Types at the cell console's prompt. internal void SimulateConsoleTyping(string text) { @@ -202,7 +212,8 @@ private void ShowScriptConsole() NativeModalClosed(session!); _consoleKey = null; }), - () => OnUiThread(() => ListScriptsToEdit(fromConsole: true))) + () => OnUiThread(() => ListScriptsToEdit(fromConsole: true)), + (drawn, index) => OnUiThread(() => OpenConsoleError(drawn, index))) { Theme = _theme.Clone(), }; @@ -212,14 +223,19 @@ private void ShowScriptConsole() var console = new ScriptConsoleSurface(model); _console = console; - var rows = Math.Clamp(_system.DesktopDimensions.Height - 6, 10, 30); + + // Sized on the first draw (the overlay measures at its width before it is built) to what the console holds, so the + // log is not drawn under rows of blank padding; after that the size is fixed and the log scrolls. + var maxRows = Math.Clamp(_system.DesktopDimensions.Height - 6, 10, 30); + int? rows = null; _helpView.Open( "script-console", "Script console", width => { Drawing(SurfaceCatalog.ScriptConsole, string.Empty, console.Model); - return console.Render(width, rows); + rows ??= ScriptConsoleSurface.RowsFor(console.Model, width, maxRows); + return console.Render(width, rows.Value); }, ConsoleKeyPressed, width: ScriptConsoleSurface.PreferredWidth, @@ -227,7 +243,61 @@ private void ShowScriptConsole() { _console = null; _consoleKey = null; - }); + }, + link: url => OpenConsoleErrorLink(console, url)); + } + + /// + /// A click on a link in the cell console: only and an index into the + /// lines the console last drew, so nothing a script printed can name another action. + /// + private void OpenConsoleErrorLink(ScriptConsoleSurface console, string url) + { + if (!url.StartsWith(ScriptConsoleModel.ErrorLinkPrefix, StringComparison.Ordinal) + || !int.TryParse(url.AsSpan(ScriptConsoleModel.ErrorLinkPrefix.Length), NumberStyles.None, CultureInfo.InvariantCulture, out var index)) + { + return; + } + + OpenConsoleError(console.Model, index); + } + + /// + /// A console error row clicked, from either host: the script it names (file.lua:(N,…), matched against this + /// character's scripts the way ⌃P lists them) opens in the editor with the caret on line N and that line marked — the + /// path ⌃P's Script … entries take — and closing the editor comes back to the console. A row that names no line + /// of a script of this character's is refused out loud. + /// + internal void OpenConsoleError(ScriptConsoleModel model, int index) + { + if (model.ErrorAt(index) is not { } at) + { + RefuseCommand("that console line names no script line"); + return; + } + + var text = model.Lines[index].Text; + var name = ScriptFileRefs().FirstOrDefault(r => SharpMUTerm.Client.Composer.ScriptErrors.LineIn(text, r.Name) is not null)?.Name; + if (name is null) + { + RefuseCommand($"{Snippet(at.File)} is not one of this character's scripts"); + return; + } + + if (ScriptConsoleIsOpen) + { + if (NativeModalOf(SurfaceCatalog.ScriptConsole) is { } native) + { + CloseNativeModal(native); + } + else + { + _helpView.Close(); + } + } + + _scriptReturnToConsole = true; + OpenScriptAt(name, at.Line); } /// A key in the cell console. @@ -380,7 +450,7 @@ private void RefreshConsole() store.Set("last_room", JsonValue.Create("The Grand Plaza")); log.Add(ScriptConsoleKind.Note, "loaded corvid.lua"); log.Add(ScriptConsoleKind.Output, "[info] corvid.lua: watching for tells"); - log.Add(ScriptConsoleKind.Error, "corvid.lua:(14,8-12): attempt to index a nil value (field 'vitals')"); + log.Add(ScriptConsoleKind.Error, DemoScriptError); return (host, store); } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.ScriptEdit.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.ScriptEdit.cs index fdede98d..5ae36ed9 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.ScriptEdit.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.ScriptEdit.cs @@ -61,6 +61,12 @@ internal sealed partial class SharpMUTermApp "\n" + "trigger.add('^(\\\\w+) tells you', 'on_tell')\n"; + /// + /// The demo's one script error: what its console shows and what the editor's header says over corvid.lua line 14 + /// (map.current is columns 16–26 there), so the two never disagree. + /// + internal const string DemoScriptError = "corvid.lua:(14,16-26): attempt to call a nil value (field 'current')"; + /// Whether the focused window is the demo's, in a client with no scripts folder — the snapshot's scripts. private bool DemoScriptsShown => _scriptsRoot is null && _workspace.FindWindow(ActiveWindowId())?.SessionKey is { } owner && IsDemoKey(owner); @@ -184,11 +190,16 @@ private bool OpenScriptFromPalette(string name) var owner = ScriptOwner(); var errors = owner is null ? [] : ConsoleLog(owner).Lines.Where(l => l.Kind == ScriptConsoleKind.Error).Select(l => l.Text).ToArray(); - var line = LastErrorLine(errors, name) ?? 0; - OpenScript(name, line, errorLine: line); + OpenScriptAt(name, LastErrorLine(errors, name) ?? 0); return true; } + /// + /// Opens script with the caret on and that line marked as the error's + /// (0 for neither): the one way in for ⌃P's Script … entries and a console error row's link. + /// + private void OpenScriptAt(string name, int line) => OpenScript(name, line, errorLine: line); + /// /script, /script edit [name], /script new <name>. private void ScriptCommand(string args) { diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 0befbe2b..5d20fc2f 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -1952,7 +1952,7 @@ public string RenderSnapshot(string? view = null) if (string.Equals(view, "script-edit", StringComparison.OrdinalIgnoreCase)) { OpenScript("corvid.lua", 14); - SetScriptStatus("! corvid.lua:(14,22-30): attempt to index a nil value (local 'room')"); + SetScriptStatus("! " + DemoScriptError); } // GMCP channel capture, the highlight-names list and a scene log, over the demo (scripting wave). diff --git a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs index 5265ddf7..83b1654d 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs @@ -862,6 +862,16 @@ await SameModal("script console: reload", "script-console", await SameModal("script console: edit a script", "script-console", (app, m) => ((ScriptConsoleSession)m.Open(SurfaceCatalog.ScriptConsole)!).EditScript(), app => app.SimulateConsoleKey(new ConsoleKeyInfo('\u0005', ConsoleKey.E, false, false, true))); + + // A click on the demo's error row (corvid.lua:(14,…)): the native row through the session, the cells' row through its + // own mux:script-error:N link — both end in OpenConsoleError, the script open on line 14 with the line marked. + await SameModal("script console: open an error's line", "script-console", + (app, m) => + { + var console = (ScriptConsoleSession)m.Open(SurfaceCatalog.ScriptConsole)!; + console.OpenError(ErrorRow(console.Model)); + }, + app => app.SimulateConsoleLink(ScriptConsoleModel.ErrorLinkPrefix + ErrorRow(app.ScriptConsoleModelNow()))); probed.Add(SurfaceCatalog.ScriptConsole); // ⌃F's older history: ⌥H then ⏎ on the first older hit opens the history view on the same page in both; and the @@ -1164,6 +1174,7 @@ private static string Outcome(SharpMUTermApp app) => string.Join( "import=" + app.ImportReviewOpen + " " + string.Join(",", app.Configuration.TriggerSets.Select(s => s.Name + ":" + s.Triggers.Count)) + " " + string.Join(",", app.Configuration.Worlds.SelectMany(w => w.Characters).Select(c => c.Name + (c.Password is null ? string.Empty : "*"))), "console=" + app.ScriptConsoleIsOpen + " " + ConsoleState(app), + "script=" + (app.OpenScriptEdit is { } script ? $"{script.Name}:{script.Line}:{script.ErrorLine}" : "shut"), "older=" + (app.HistoryViewModel is { } page ? $"{page.Window}:{page.Top}:{page.Marked}" : "shut"), "quick=" + app.LastQuickMacro, "walk=" + app.WalkState, @@ -1173,6 +1184,10 @@ private static string Outcome(SharpMUTermApp app) => string.Join( "notice=" + app.LastNotice, "recent=" + string.Join(",", app.RecentCommandIds)); + /// The index of the first console line that names a script line (the demo's corvid.lua error). + private static int ErrorRow(ScriptConsoleModel model) => + Enumerable.Range(0, model.Lines.Count).First(i => model.ErrorAt(i) is not null); + private static string ConsoleState(SharpMUTermApp app) { var model = app.ScriptConsoleModelNow(); diff --git a/tests/SharpMUTerm.Client.Tests/SearchAndScriptModelTests.cs b/tests/SharpMUTerm.Client.Tests/SearchAndScriptModelTests.cs index fbee2b2b..7a7c5a34 100644 --- a/tests/SharpMUTerm.Client.Tests/SearchAndScriptModelTests.cs +++ b/tests/SharpMUTerm.Client.Tests/SearchAndScriptModelTests.cs @@ -35,15 +35,15 @@ public async Task TheHistoryViewOpensCentredOnItsHit() { var top = ScrollbackViewModel.TopFor(1_000, 0, 5_000); - await Assert.That(1_000 - top).IsEqualTo(ScrollbackViewModel.PageRows / 2).Because("as many lines above the hit as the page allows"); + await Assert.That(1_000 - top).IsEqualTo(ScrollbackViewModel.MaxPageRows / 2).Because("as many lines above the hit as the page allows"); await Assert.That(ScrollbackViewModel.TopFor(3, 0, 5_000)).IsEqualTo(0).Because("near the oldest line the page starts at it"); - await Assert.That(ScrollbackViewModel.TopFor(4_998, 0, 5_000)).IsEqualTo(5_000 - ScrollbackViewModel.PageRows); + await Assert.That(ScrollbackViewModel.TopFor(4_998, 0, 5_000)).IsEqualTo(5_000 - ScrollbackViewModel.MaxPageRows); } [Test] public async Task TheLinesEitherSideOfTheHitAreItsContext() { - var lines = Enumerable.Range(90, ScrollbackViewModel.PageRows).Select(i => new ScrollbackViewLine(i, $"line {i}", -1, 0)).ToArray(); + var lines = Enumerable.Range(90, ScrollbackViewModel.MaxPageRows).Select(i => new ScrollbackViewLine(i, $"line {i}", -1, 0)).ToArray(); var model = new ScrollbackViewModel("Corvid", "goblin", 90, 0, 500, 100, lines); await Assert.That(model.Role(lines[10])).IsEqualTo(ScrollbackLineRole.Hit); @@ -53,6 +53,72 @@ public async Task TheLinesEitherSideOfTheHitAreItsContext() await Assert.That(model.Role(lines[0])).IsEqualTo(ScrollbackLineRole.Page); } + [Test] + [Arguments(24, 80, 13)] + [Arguments(32, 120, 20)] + [Arguments(40, 160, 20)] + [Arguments(12, 40, ScrollbackViewModel.MinPageRows)] + public async Task TheHistoryPageIsSizedFromTheScreen(int rows, int columns, int page) + { + await Assert.That(ScrollbackViewModel.PageRowsFor(rows, columns)).IsEqualTo(page); + await Assert.That(ScrollbackViewModel.TwoTitleRows(columns)).IsEqualTo(columns < ScrollbackViewModel.WideColumns); + } + + [Test] + public async Task APageMovesByTheRowsTheModelCarries() + { + var lines = Enumerable.Range(90, 13).Select(i => new ScrollbackViewLine(i, $"line {i}", -1, 0)).ToArray(); + var model = new ScrollbackViewModel("Corvid", "goblin", 90, 0, 500, 96, lines, 13); + + await Assert.That(model.Move(ConsoleKey.PageDown)).IsEqualTo(90 + 12); + await Assert.That(model.Move(ConsoleKey.End)).IsEqualTo(500 - 13); + await Assert.That(ScrollbackViewModel.TopFor(96, 0, 500, 13)).IsEqualTo(96 - 6); + await Assert.That(model).IsNotEqualTo(model with { PageRows = 20 }).Because("the page size is part of what both hosts draw"); + await Assert.That(ScrollbackViewModel.KeysLadder.All(k => k.EndsWith("Esc closes", StringComparison.Ordinal))).IsTrue(); + } + + [Test] + public async Task OlderHistoryCountsShareOneRowAndOlderRowsSayHowFarBack() + { + SearchRow[] rows = + [ + new("main", "Corvid", 3, "The goblin snarls.", 4, 6), + new("main", "Corvid", -1, "A goblin leaps.", 2, 6, 1_200, "demo", SearchModel.AgeLabel(4_799)), + ]; + var model = new SearchModel("goblin", false, false, "Corvid", 39, null, rows, Older: true) + { + OlderFound = 4, OlderSearched = 6_000, OlderTotal = 6_000, + }; + + await Assert.That(model.CountText).IsEqualTo("this window 1 of 39 · older 4 of 6,000"); + await Assert.That((model with { HistoryRunning = true, OlderSearched = 1_200 }).CountText).IsEqualTo("this window 1 of 39 · older 4… 1,200 of 6,000 read"); + await Assert.That(model.LabelFor(rows[0])).IsEqualTo("here"); + await Assert.That(model.LabelFor(rows[1])).IsEqualTo("4.8k lines ago"); + await Assert.That((model with { AllWindows = true }).LabelFor(rows[0])).IsEqualTo("Corvid · here"); + await Assert.That(new SearchModel("goblin", false, false, "Corvid", 39, null, [rows[0]]).CountText).IsEqualTo("1 found · 39 lines held") + .Because("without ⌥H the count is the one it always was"); + await Assert.That(SearchModel.AgeLabel(40)).IsEqualTo("40 lines ago"); + await Assert.That(SearchModel.AgeLabel(1)).IsEqualTo("1 line ago"); + } + + [Test] + public async Task AConsoleErrorNamingAScriptLineIsALinkAndNothingElseIs() + { + ScriptConsoleLine[] lines = + [ + new(ScriptConsoleKind.Error, "corvid.lua:(14,16-26): attempt to call a nil value"), + new(ScriptConsoleKind.Error, "stopped after 2,000,000 instructions"), + new(ScriptConsoleKind.Output, "corvid.lua:(3,1) printed by a script"), + ]; + var model = new ScriptConsoleModel("Corvid", null, lines, [], [], 0, ["corvid.lua"], 1, "scripts/"); + + await Assert.That(model.ErrorAt(0)).IsEqualTo(("corvid.lua", 14)); + await Assert.That(model.ErrorAt(1)).IsNull().Because("an error that names no line"); + await Assert.That(model.ErrorAt(2)).IsNull().Because("only an error row: what a script printed is not a link"); + await Assert.That(model.ErrorAt(9)).IsNull(); + await Assert.That(ScriptErrors.At("! main.lua:3: unexpected symbol")).IsEqualTo(("main.lua", 3)); + } + private static SearchModel Found(string query = "goblin", long older = 5_930, bool on = false) => new(query, false, false, "Corvid", 70, null, [], Older: on) { OlderLines = older, OlderSource = "Corvid" }; diff --git a/tests/SharpMUTerm.Tui.Tests/DeepSearchTests.cs b/tests/SharpMUTerm.Tui.Tests/DeepSearchTests.cs index 5bdb261d..4ef7f82d 100644 --- a/tests/SharpMUTerm.Tui.Tests/DeepSearchTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/DeepSearchTests.cs @@ -89,7 +89,8 @@ public async Task AltHListsTheScrollbacksHitsAfterThePanesAndNeverTwice() await Assert.That(model.Rows[1].Text).IsEqualTo("a goblin, line 10"); await Assert.That(model.HeldRows).IsEqualTo(1); await Assert.That(model.HistoryRunning).IsFalse(); - await Assert.That(model.HistoryNote).Contains("1 found"); + await Assert.That(model.CountText).StartsWith("this window 1 of ").And.Contains(" · older 1 of "); + await Assert.That(model.HistoryNote).IsNull().Because("the counts are one row; the note says only what is not a count"); await Assert.That(model.StateText).Contains("older history"); } @@ -108,7 +109,7 @@ public async Task EnterOnAnOlderHitOpensTheHistoryViewAroundIt() await Assert.That(app.SearchIsOpen).IsFalse(); await Assert.That(app.HistoryViewIsOpen).IsTrue(); var page = app.HistoryViewModel!; - await Assert.That(page.Lines.Count).IsEqualTo(ScrollbackViewModel.PageRows); + await Assert.That(page.Lines.Count).IsEqualTo(page.PageRows); await Assert.That(page.Lines.Any(l => l.Index == page.Marked && l.Text == "a goblin, line 10")).IsTrue(); await Assert.That(page.Title).Contains("read only"); diff --git a/tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs b/tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs index f17d48e5..35b6efa8 100644 --- a/tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs @@ -53,6 +53,12 @@ internal static readonly (string View, string[] OneRow)[] Footers = ("triggers", ["[Esc] Close", "[⏎] Edit"]), ("keypad", ["[Esc] Close", "[⏎] Edit"]), ("trigger-builder", ["[Esc] Revert", "[⏎] Commit"]), + ("search-older", ["↑↓ pick", "⌃F closes"]), + ("search-older", ["this window 3 of 39", "older 4 of 6,000"]), + ("search-history", ["↑↓ a line", "Esc closes"]), + ("search-history", ["OLDER HISTORY · Corvid · read only"]), + ("script-edit", ["⌃S save and reload", "Esc close"]), + ("script-list", ["Script corvid.lua", "line 14 in the console"]), ]; public static IEnumerable> Cases() => diff --git a/tests/SharpMUTerm.Tui.Tests/SearchAndScriptWaveTests.cs b/tests/SharpMUTerm.Tui.Tests/SearchAndScriptWaveTests.cs index 34bc24ef..1d345bdd 100644 --- a/tests/SharpMUTerm.Tui.Tests/SearchAndScriptWaveTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/SearchAndScriptWaveTests.cs @@ -66,7 +66,7 @@ public async Task TheHistoryViewOpensCentredOnItsHitWithItsContextDrawnApart() var frame = app.RenderSnapshot("search-history"); var page = app.HistoryViewModel!; - await Assert.That(page.Marked - page.Top).IsEqualTo(ScrollbackViewModel.PageRows / 2); + await Assert.That(page.Marked - page.Top).IsEqualTo(page.PageRows / 2); var rows = FrameGrid.Decode(frame, 120, 32); var context = rows.Count(r => r.Contains("│ ", StringComparison.Ordinal) && r.Contains("] ", StringComparison.Ordinal)); await Assert.That(context).IsGreaterThanOrEqualTo(2 * ScrollbackViewModel.ContextRows).Because(string.Join('\n', rows)); diff --git a/tests/SharpMUTerm.Tui.Tests/SearchScriptsFitTests.cs b/tests/SharpMUTerm.Tui.Tests/SearchScriptsFitTests.cs new file mode 100644 index 00000000..d240cc99 --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/SearchScriptsFitTests.cs @@ -0,0 +1,142 @@ +using System.Globalization; +using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Modals; +using SharpMUTerm.Core.Theming; +using SharpMUTerm.Graphics; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// Wave 18B, read off painted frames: the older-history view fits 80×24 above the command line with its keys pinned; ⌃F +/// says both bounds on one row; a console error row is a link that opens its line in the editor; the console's log is +/// not drawn under blank padding; and the demo's history and script error agree with themselves. +/// +[NotInParallel] +public class SearchScriptsFitTests +{ + private static readonly TerminalCapabilities Headless = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private static SharpMUTermApp App(int width, int height) + { + Console.SetIn(TextReader.Null); + var config = DemoScene.Build(); + config.ThemeName = "Dark"; + config.Theme = ThemeLibrary.Get("Dark"); + return new SharpMUTermApp(config, Headless, new HeadlessConsoleDriver(width, height)); + } + + [Test] + public async Task TheOlderHistoryViewEndsAboveTheCommandLineAt80x24() + { + await using var app = App(80, 24); + var rows = FrameGrid.Decode(app.RenderSnapshot("search-history"), 80, 24); + var page = app.HistoryViewModel!; + + await Assert.That(page.PageRows).IsEqualTo(ScrollbackViewModel.PageRowsFor(24, 80)); + await Assert.That(page.Lines.Count).IsEqualTo(page.PageRows); + var prompt = rows.ToList().FindIndex(r => r.Contains("Corvid · Aetherfall ›", StringComparison.Ordinal)); + await Assert.That(prompt).IsGreaterThan(0).Because("the command line is not under the view's border:\n" + string.Join('\n', rows)); + var bottom = rows.ToList().FindLastIndex(r => r.Contains('└')); + await Assert.That(bottom).IsLessThan(prompt); + await Assert.That(rows.Any(r => r.Contains(page.Position, StringComparison.Ordinal))).IsTrue() + .Because("the position has a row of its own below 100 columns"); + } + + [Test] + public async Task CtrlFsOlderCountsAreOneRowAndItsRowsSayWhereTheyAre() + { + await using var app = App(80, 24); + var rows = FrameGrid.Decode(app.RenderSnapshot("search-older"), 80, 24); + + await Assert.That(rows.Count(r => r.Contains(" of ", StringComparison.Ordinal) && r.Contains("older", StringComparison.Ordinal) && r.Contains("this window", StringComparison.Ordinal))) + .IsEqualTo(1).Because(string.Join('\n', rows)); + await Assert.That(rows.Any(r => r.Contains("found in", StringComparison.Ordinal))).IsFalse().Because("the second count is gone"); + await Assert.That(rows.Count(r => r.Contains(" here ", StringComparison.Ordinal))).IsEqualTo(3); + await Assert.That(rows.Count(r => r.Contains("lines ago", StringComparison.Ordinal))).IsEqualTo(4); + } + + [Test] + public async Task TheDemosHistoryOnlyMovesForwardAndEveryLineIsStamped() + { + var buffer = SharpMUTermApp.DemoHistory(); + var lines = new List(); + for (var at = buffer.OldestIndex; at < buffer.TotalLines; at += 2_000) + { + lines.AddRange(buffer.GetRange(at, (int)Math.Min(2_000, buffer.TotalLines - at))); + } + + await Assert.That(lines.Count).IsEqualTo((int)buffer.AvailableLines); + var previous = string.Empty; + foreach (var line in lines) + { + await Assert.That(line.Text.Length > 8 && line.Text[0] == '[' && line.Text[6] == ']').IsTrue().Because(line.Text); + var stamp = line.Text[1..6]; + await Assert.That(string.CompareOrdinal(stamp, previous)).IsGreaterThanOrEqualTo(0).Because($"{previous} then {stamp}"); + previous = stamp; + } + + await Assert.That(lines.Any(l => l.Text.Contains("goblin came back", StringComparison.Ordinal))).IsTrue(); + } + + [Test] + public async Task TheDemoConsoleAndTheEditorShowTheOneError() + { + await using var console = App(120, 32); + console.RenderSnapshot("script-console"); + await Assert.That(console.ConsoleTexts("demo", ScriptConsoleKind.Error)).Contains(SharpMUTermApp.DemoScriptError); + + await using var editor = App(120, 32); + editor.RenderSnapshot("script-edit"); + await Assert.That(editor.Composer.Model.Edit!.Status).IsEqualTo("! " + SharpMUTermApp.DemoScriptError); + await Assert.That(editor.Composer.Model.Edit!.ErrorLine).IsEqualTo(SharpMUTerm.Client.Composer.ScriptErrors.At(SharpMUTermApp.DemoScriptError)!.Value.Line); + } + + [Test] + public async Task AConsoleErrorRowIsALinkThatOpensItsLineInTheEditor() + { + await using var app = App(120, 32); + app.RenderSnapshot("script-console"); + var model = app.CellConsole!.Model; + var index = model.Lines.ToList().FindIndex(l => l.Text == SharpMUTermApp.DemoScriptError); + var link = ScriptConsoleModel.ErrorLinkPrefix + index.ToString(CultureInfo.InvariantCulture); + + await Assert.That(app.ConsoleLines.Any(l => l.Contains($"[link={link}]", StringComparison.Ordinal))).IsTrue() + .Because("the error row carries the console's own link"); + await Assert.That(app.ConsoleLines.Where(l => l.Contains("[link=", StringComparison.Ordinal)).All(l => l.Contains($"[link={link}]", StringComparison.Ordinal))) + .IsTrue().Because("only the error naming a line is a link — not the limit's error, not what a script printed"); + + app.SimulateConsoleLink(link); + + await Assert.That(app.ScriptConsoleIsOpen).IsFalse(); + await Assert.That(app.OpenScriptEdit?.Name).IsEqualTo("corvid.lua"); + await Assert.That(app.Composer.Model.Edit!.Line).IsEqualTo(14); + await Assert.That(app.Composer.Model.Edit!.ErrorLine).IsEqualTo(14); + } + + [Test] + public async Task ALinkNotNamingAnErrorRowOpensNothing() + { + await using var app = App(120, 32); + app.RenderSnapshot("script-console"); + + app.SimulateConsoleLink(ScriptConsoleModel.ErrorLinkPrefix + "0"); + app.SimulateConsoleLink("mux:send:@shutdown"); + + await Assert.That(app.ScriptConsoleIsOpen).IsTrue(); + await Assert.That(app.OpenScriptEdit).IsNull(); + } + + [Test] + [Arguments(80, 24)] + [Arguments(120, 32)] + public async Task TheConsolesLogIsNotDrawnUnderBlankPadding(int width, int height) + { + await using var app = App(width, height); + app.RenderSnapshot("script-console"); + var lines = app.ConsoleLines; + + // Title, the blank under it, then the log: its first line is the oldest console line. + await Assert.That(lines[2]).Contains("loaded corvid.lua").Because(string.Join('\n', lines)); + } +} From 805233312f008d52280eeec478e98e62af4fe58f Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 16:45:07 +0000 Subject: [PATCH 061/113] Wave 18: map fit, pop-out hover, palette tidy-up, F5 at 80 columns, group routes, tab floor - Native map opens fitted to the rooms near the character, names drawn whenever a step has room (NamesFromStep 40 px); stays put once the player zooms or pans; double-click refits. - Pop-out buttons show on hover only; a one-row strip reserves its right end for the button. - Script entries move to HELP & SETUP and are gated together (ScriptsEditable); FuzzyMatch.StrictLength 4 -> 5 so "scene" no longer scatters. - Cell palette stops above the command line (KeepClearBelow); F5 columns elide with an ellipsis (MarkupText.FitVisible); highlight-names help inks each colour. - Send group: Alt+S / "Send to group" (key hint), `g` on a rail row under Alt+C toggles membership; Ctrl+P > Recent alerts (in memory, 20, newest first) going to the character's window; menu-alerts view. - Overflowed tabs floor at 3 letters + ellipsis (MinimumName 4); an edge tab that would be cut shorter is counted under the chip. - Suppress GHSA-v76p-62qx-wwq2 (ImageSharp TIFF fax decoder, unreachable): build is warning-free. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 18 +++ CLAUDE.md | 34 +++-- Directory.Packages.props | 2 + src/SharpMUTerm.Avalonia/DesktopLayer.cs | 104 +++++++++++++-- src/SharpMUTerm.Avalonia/FloatingPanels.cs | 44 +++++- src/SharpMUTerm.Avalonia/MapCanvas.cs | 106 +++++++++++++-- .../Commands/BuiltInCommands.cs | 79 ++++++++--- src/SharpMUTerm.Client/Palette/FuzzyMatch.cs | 2 +- .../Commands/CommandCatalog.cs | 17 ++- src/SharpMUTerm.Core/Commands/CommandItem.cs | 4 +- src/SharpMUTerm.Core/Session/SendGroup.cs | 2 +- src/SharpMUTerm.Tui/CommandPalette.cs | 21 ++- src/SharpMUTerm.Tui/MacroKeys.cs | 3 + src/SharpMUTerm.Tui/MarkupText.cs | 18 ++- .../SharpMUTermApp.Attention.cs | 1 + .../SharpMUTermApp.RailKeys.cs | 29 +++- .../SharpMUTermApp.RecentAlerts.cs | 85 ++++++++++++ .../SharpMUTermApp.SendGroup.cs | 2 +- .../SharpMUTermApp.TabOverflow.cs | 27 +++- src/SharpMUTerm.Tui/SharpMUTermApp.cs | 56 +++++++- src/SharpMUTerm.Tui/SnapshotViews.cs | 2 +- src/SharpMUTerm.Tui/TabStripFit.cs | 11 +- src/SharpMUTerm.Tui/WorldsScreenRenderer.cs | 13 +- src/SharpMUTerm.Tui/WorldsScreenView.cs | 10 +- .../DesktopLayerTests.cs | 2 +- .../Wave18WindowTests.cs | 107 +++++++++++++++ .../CommandPaletteModelTests.cs | 27 +++- tests/SharpMUTerm.Tui.Tests/SendGroupTests.cs | 46 ++++++- .../SharpMUTerm.Tui.Tests/TabOverflowTests.cs | 5 +- .../Wave18PaletteAndScreenTests.cs | 125 ++++++++++++++++++ 30 files changed, 918 insertions(+), 84 deletions(-) create mode 100644 src/SharpMUTerm.Tui/SharpMUTermApp.RecentAlerts.cs create mode 100644 tests/SharpMUTerm.Avalonia.Tests/Wave18WindowTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/Wave18PaletteAndScreenTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index c52877e3..057cacdb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,11 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] - A script error in the script console that names a file and line is now a link: click it to open that script with the caret on the line and the line marked. Closing the editor goes back to the console. +- ⌃P ▸ Recent alerts lists the pages and alerts every character has had this run, newest first, with how long ago; + choosing one goes to that character's window. +- ⌥S sends the command line to the send group (⌃P ▸ Send to group), and `g` on a sidebar row while ⌥C holds the keys + adds that character to the group or takes them out. + - The script editor numbers its lines in the desktop window too, and after a save whose reload fails, the line the error names is marked in both the terminal and the window. - When Ctrl+F finds fewer matches than it might because the pane no longer holds older lines, its status line offers @@ -356,6 +361,15 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] - Ctrl+F with older history says both counts on one line (`this window 3 of 39 · older 4 of 6,000`). Older matches say how far back they are (`1.6k lines ago`) and the pane's own say `here`. - The script console opens at the size of what it holds, so its log no longer starts under blank rows. +- In the desktop window the map opens sized to the rooms around you, with their names, and stays where you put it + once you zoom or pan (a double-click fits it again). +- The pop-out button on a docked panel shows only while the pointer is over that panel, and never covers the text of a + one-row strip. +- The command palette's script entries are under Help & setup, and a five-letter search such as "scene" no longer + matches letters scattered across unrelated entries. +- F5 at 80 columns shortens long values with "…" instead of cutting them off, and the highlight-names help shows each + colour in that colour. + - The settings screens' key hints no longer lose words from the middle at 80 columns: the least-used keys are left out and the way to close is always there. - Help topics have headings and show their keys as keys, in the terminal and the window, and a topic's title fits @@ -440,6 +454,10 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Fixed +- The command palette no longer covers the command line on an 80×24 terminal. +- A tab squeezed by a crowded strip keeps at least three letters of its name. +- The build no longer warns about an ImageSharp advisory in a decoder SharpMUTerm never uses. + - The import review at 80×24 no longer scrolls its Enter and Esc keys and the passwords question out of sight: they stay at the bottom while the rest scrolls (arrow keys, PgUp/PgDn, Home/End). - The script console's store no longer says "read only" while Del deletes a key; the console names Del only on the diff --git a/CLAUDE.md b/CLAUDE.md index 7bfaa89e..fe6c9950 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -164,8 +164,11 @@ fallbacks) for inline images/maps. colour through `Contrast.Legible`. `Areas` lists the drawn area first, then areas reached by an exit. A room carries `Up`/`Down` (an up/down exit or stub, or an exit to a room on another level) and `Elsewhere` (the other area an exit leads to). The cells draw a one-line legend on the last row from 6 rows up — words go - first, then names shorten, then areas are counted (`+2`); it never wraps. The window adds names from zoom - 1.6, the hovered name on a plate, stairs triangles, a halo on the current room and a legend plate. + first, then names shorten, then areas are counted (`+2`); it never wraps. The window opens fitted (`MapCanvas.Fit`: the + rooms within 6 steps of the character's, up to zoom 2.4) and refits on a new model until the player zooms or pans + (`Fitted`; a double-click or another level or area fits again); it names rooms whenever a step is 40 px or more + (`NamesFromStep`), the current room always, plus the hovered name on a plate, stairs triangles, a halo on the + current room and a legend plate. - **A speedwalk sends one step and waits for the map to say it arrived** (`Speedwalk`); it goes through `SendCommandAsync`, so the recorder sees the step. It stops off the path, on the world's `WalkFailurePattern`, after `StepTimeout` with no room, and on disconnect. @@ -309,9 +312,9 @@ fallbacks) for inline images/maps. - **Matching is subsequence, word by word, in order**, scored per character: +1 matched, +8 at a word start, +6 straight after the previous match, +4 on the first character, −1 per skipped character (−4 at most per gap), +20 when the title starts with the whole query. Each word is aligned by dynamic programming, - falling back to the earliest-ending alignment. **A query word of `FuzzyMatch.StrictLength` (4) letters or + falling back to the earliest-ending alignment. **A query word of `FuzzyMatch.StrictLength` (5) letters or fewer must start at a word start and continue in runs or at word starts** (`layo` no longer finds "Clear - window, say you"); a longer word may match as any subsequence. A title match always + window, say you"; `scene` no longer finds Import or Packages); a longer word may match as any subsequence. A title match always lists above a match on the detail, the key or the group's name; ties keep catalog order. Groups keep their headers but are ordered by their best entry, so the best match is the first row. - **An empty query lists RECENT, then SUGGESTED, then the groups**, each entry once. SUGGESTED is read off @@ -1481,6 +1484,15 @@ fallbacks) for inline images/maps. always-on-top choice; the composer does not float; positions on a mixed-DPI desktop are assumed to be in the main window's scaling. +- **Wave 18 tidy-up.** The script entries (reload, console, edit, new, the files) are under HELP & SETUP; Edit and New + and the file entries are offered together, only while scripts are on or the files are listed (`ScriptsEditable`). The + cell ⌃P stops above the command line (`CommandPalette.KeepClearBelow` = `InputBandRows`), so at 80×24 its border is a row + above the prompt. F5's columns are fitted with `MarkupText.FitVisible` (elided with `…`, trailing blanks cut silently), + and `highlight names`' help inks each colour in itself, held to the floor. An overflowed tab keeps 3 letters and `…` + (`TabStripFit.MinimumName` 4); the tab the chip would leave shorter than that (`ChipReserve`) is counted under the chip. + In the window a pop-out button shows only while the pointer is over its panel (`DesktopLayer.SyncPopOutHover`), and a + one-row strip gives the button its right end (`ReservesPopOut`: the native control is narrowed, the corner painted the + pane's plane), so the button never sits on a strip's text. - **Wave 16 groups** (F5 headings, ⌃P groups, scene mark, client rows, map find). Decisions not to relitigate: - **F5's world column is drawn in the declaration's order under its `Group` headings** (`WorldsScreenRenderer.DetailColumn` walks `BuiltInSettings.World.Fields`), so the cell screen and the window group alike; `WorldFieldOrder` (⇥ order and the @@ -1878,8 +1890,8 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] **StbImageSharp reads no WebP**, and the bump silently turned every WebP picture (all of SharpMUSH's) back into its label. `ImageDecoder` is the one decode path for panes and the web view: the framework first, then ImageSharp 3.1 configured with the **WebP module only and metadata skipped**. That narrowing - is what keeps the 3.1.12 advisories (TIFF codecs, ICC/EXIF) unreachable and is why they are - `NuGetAuditSuppress`ed by id; 4.x fixes them but will not build without a Six Labors license key. + is what keeps the 3.1.12 advisories (TIFF codecs including the fax tile decoder, ICC/EXIF) unreachable + and is why they are `NuGetAuditSuppress`ed by id (`Directory.Packages.props`; a new one is NU1903 until listed); 4.x fixes them but will not build without a Six Labors license key. - **Controls default to `HorizontalAlignment.Left`, which self-sizes to content** instead of filling the slot. This is the single biggest cause of "why doesn't this fill the width?" Use `.WithAlignment(HorizontalAlignment.Stretch)`. A `.Flex(n)` column only fills if the grid is @@ -3165,8 +3177,14 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] each member's `SendUserInputAsync`, so aliases and echo apply per character, once each. A disconnected member gets nothing and is named in the notice. A closed session leaves the group. `world.sendTo(name, cmd)` resolves through `SendGroup.Find`: an exact `World.Character` key, else a unique character name. It refuses an - ambiguous or disconnected name and sends raw, like `world.send`. Not done: no ⌃P chord, and no rail gesture - to toggle membership. + ambiguous or disconnected name and sends raw, like `world.send`. ⌃P ▸ *Send to group* is ⌥S (`BuiltInCommands.SendGroupKey`, + in `MacroKeys.AppShortcuts`); `g` on a row while ⌥C holds the sidebar toggles that row's character and keeps the keys + there (`ToggleGroupAtRailCursor`). +- **⌃P ▸ *Recent alerts* lists every character's pages and alerts this run** (`SharpMUTermApp.RecentAlerts.cs`; kept from + `AttentionRequested` whether or not the host was asked, 20, newest first, in memory, never saved). The entry opens the + palette on `alert ` (`AlertQuery`), the only time the `alert:go:` family lists anything (`CommandContext.Alerts`), and + an entry goes through `CommandIds.Character`, the id a ⌃P *Switch to …* runs. An id no longer kept refuses. The + `menu-alerts` view. - **NEW-ENVIRON is answered as MNES** (`TelnetSessionOptions.MnesIdentity`; the library's `NewEnvironProtocol`). The variables are `CLIENT_NAME`, `CLIENT_VERSION`, `TERMINAL_TYPE` and `MTTS`, read from the same TTYPE list, so the two channels cannot disagree (`MTTS 2845`, which now includes MNES 512). It answers a server's `DO` and diff --git a/Directory.Packages.props b/Directory.Packages.props index b1c8bec7..aaef7849 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -88,6 +88,8 @@ + + diff --git a/src/SharpMUTerm.Avalonia/DesktopLayer.cs b/src/SharpMUTerm.Avalonia/DesktopLayer.cs index 6b8fbac5..074542b7 100644 --- a/src/SharpMUTerm.Avalonia/DesktopLayer.cs +++ b/src/SharpMUTerm.Avalonia/DesktopLayer.cs @@ -367,10 +367,75 @@ private void SyncPanels(ScreenFrame frame, Size cell) SyncPopOuts(frame, cell); } + /// Whether a panel is a one-row strip that keeps a corner for its pop-out button rather than sitting under it. + internal static bool ReservesPopOut(PanelOverlay panel) => panel.PopOut is not null && panel.Rect.Height == 1; + + /// The pixels a one-row strip leaves at its right end for the button. + private static double PopOutReserve(Size cell) => PopOutSize(cell) + 6; + + private static double PopOutSize(Size cell) => Math.Clamp(cell.Height - 2, 12, 18); + + /// Where the pointer last was over the window, in this layer's coordinates; null once it left. + private Point? _pointerAt; + + /// + /// Shows each pop-out button while the pointer is over its panel and hides it otherwise (D3: an always-on button lay + /// over the panel's own text). A one-row strip's reserved corner stays, as the pane's plane, with the icon on hover. + /// + private void SyncPopOutHover() + { + foreach (var button in _popOuts.Values) + { + var over = _pointerAt is { } at && button.PanelBounds.Contains(at); + button.Hovering = over; + button.IsVisible = over || button.Reserved; + } + } + + protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e) + { + base.OnAttachedToVisualTree(e); + if (TopLevel.GetTopLevel(this) is { } top) + { + top.AddHandler(PointerMovedEvent, OnWindowPointerMoved, global::Avalonia.Interactivity.RoutingStrategies.Tunnel, handledEventsToo: true); + top.PointerExited += OnWindowPointerExited; + } + } + + protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e) + { + if (TopLevel.GetTopLevel(this) is { } top) + { + top.RemoveHandler(PointerMovedEvent, OnWindowPointerMoved); + top.PointerExited -= OnWindowPointerExited; + } + + base.OnDetachedFromVisualTree(e); + } + + private void OnWindowPointerMoved(object? sender, PointerEventArgs e) + { + _pointerAt = e.GetPosition(this); + SyncPopOutHover(); + } + + private void OnWindowPointerExited(object? sender, PointerEventArgs e) + { + _pointerAt = null; + SyncPopOutHover(); + } + + /// Moves the pointer for a test, as the window's own pointer movement would. + internal void SimulatePointer(Point? at) + { + _pointerAt = at; + SyncPopOutHover(); + } + /// /// A pop-out button in the top right corner of every docked panel the client says can float, above the panel's - /// own view and below the toasts. A panel that cannot float (or a host that cannot) publishes no callback, and - /// gets no button. + /// own view and below the toasts, shown while the pointer is over the panel. A panel that cannot float (or a host + /// that cannot) publishes no callback, and gets no button. /// private void SyncPopOuts(ScreenFrame frame, Size cell) { @@ -391,14 +456,35 @@ private void SyncPopOuts(ScreenFrame frame, Size cell) Children.Insert(Math.Max(0, Children.IndexOf(_toasts)), button); } - var size = Math.Clamp(cell.Height - 2, 12, 18); + var size = PopOutSize(cell); var rect = panel.Rect; - button.Width = size; - button.Height = size; - SetLeft(button, origin.X + ((rect.X + rect.Width) * cell.Width) - size - 3); - SetTop(button, origin.Y + (rect.Y * cell.Height) + 2); + var right = origin.X + ((rect.X + rect.Width) * cell.Width); + button.PanelBounds = new Rect(origin.X + (rect.X * cell.Width), origin.Y + (rect.Y * cell.Height), rect.Width * cell.Width, rect.Height * cell.Height); + button.Reserved = ReservesPopOut(panel); + if (button.Reserved) + { + // The strip's reserved end: the whole row's height, on the pane's own plane. + var reserve = PopOutReserve(cell); + button.Width = reserve; + button.Height = rect.Height * cell.Height; + SetLeft(button, right - reserve); + SetTop(button, origin.Y + (rect.Y * cell.Height)); + var inside = rect.X >= 0 && rect.Y >= 0 && rect.X < frame.Width && rect.Y < frame.Height; + button.Plane = Colour(inside ? _view.Renderer.Background(frame[rect.X + rect.Width - 1, rect.Y]) : _view.Renderer.DefaultBackground); + } + else + { + button.Width = size; + button.Height = size; + SetLeft(button, right - size - 3); + SetTop(button, origin.Y + (rect.Y * cell.Height) + 2); + button.Plane = null; + } + button.Show(panel, Colour(_view.Renderer.DefaultForeground)); } + + SyncPopOutHover(); } /// @@ -436,7 +522,9 @@ private void Place( var origin = CellOrigin; SetLeft(control, origin.X + (rect.X * cell.Width)); SetTop(control, origin.Y + (rect.Y * cell.Height)); - control.Width = rect.Width * cell.Width; + // A one-row strip that can pop out leaves its right end to the button (ReservesPopOut), so the button never + // lies over its text (`88 / 100`, `F4 edits keys`); the button paints the pane's plane over the cells there. + control.Width = Math.Max(0, (rect.Width * cell.Width) - (ReservesPopOut(panel) ? PopOutReserve(cell) : 0)); control.Height = rect.Height * cell.Height; // The pane's own plane, read off the frame, so the native view sits on whatever the pane wears — its diff --git a/src/SharpMUTerm.Avalonia/FloatingPanels.cs b/src/SharpMUTerm.Avalonia/FloatingPanels.cs index 34253f7c..df1a5f5c 100644 --- a/src/SharpMUTerm.Avalonia/FloatingPanels.cs +++ b/src/SharpMUTerm.Avalonia/FloatingPanels.cs @@ -489,6 +489,31 @@ public PopOutButton() /// The panel it pops out, as the client last published it. public PanelOverlay? Panel { get; private set; } + /// The panel's rectangle in the layer, which the pointer must be over for the button to show. + internal Rect PanelBounds { get; set; } + + /// Whether the button holds a one-row strip's reserved end, which stays (as ) when the icon goes. + internal bool Reserved { get; set; } + + /// The pane's plane, painted under a reserved button so the cells under the strip's end do not show; else null. + internal Color? Plane { get; set; } + + /// Whether the pointer is over the panel, which is when the icon is drawn. + internal bool Hovering + { + get => _hovering; + set + { + if (_hovering != value) + { + _hovering = value; + InvalidateVisual(); + } + } + } + + private bool _hovering; + public Color Ink { get; set; } = Colors.White; /// Shows the button for , in . @@ -546,7 +571,24 @@ protected override void OnPointerWheelChanged(PointerWheelEventArgs e) public override void Render(DrawingContext context) { - var bounds = new Rect(Bounds.Size); + var whole = new Rect(Bounds.Size); + if (Plane is { } under) + { + context.FillRectangle(new SolidColorBrush(under), whole); + } + + if (!Hovering && !IsPointerOver && !_pressed) + { + return; + } + + // A reserved strip end draws the icon as a square at its right, vertically centred. + var square = Math.Min(whole.Width, Math.Min(whole.Height, 18)); + var bounds = Reserved + ? new Rect(whole.Width - square - 3, Math.Round((whole.Height - square) / 2), square, square) + : whole; + using var _ = context.PushTransform(Matrix.CreateTranslation(bounds.X, bounds.Y)); + bounds = new Rect(bounds.Size); var plate = (byte)(_pressed ? 0x60 : IsPointerOver ? 0x40 : 0x18); context.DrawRectangle(new SolidColorBrush(Color.FromArgb(plate, Ink.R, Ink.G, Ink.B)), null, bounds, 3, 3); diff --git a/src/SharpMUTerm.Avalonia/MapCanvas.cs b/src/SharpMUTerm.Avalonia/MapCanvas.cs index a90fe942..54ecb467 100644 --- a/src/SharpMUTerm.Avalonia/MapCanvas.cs +++ b/src/SharpMUTerm.Avalonia/MapCanvas.cs @@ -41,6 +41,12 @@ internal sealed class MapCanvas : Control private const double MinZoom = 0.35, MaxZoom = 3, DragThreshold = 4; + /// The most the fit zooms in: past it a small area's rooms are boxes the size of buttons. + internal const double FitMaxZoom = 2.4; + + /// How many grid steps from the character's room the fit takes in; a larger area is fitted around them. + internal const int FitRadius = 6; + private readonly TerminalView _view; /// @@ -60,6 +66,14 @@ internal sealed class MapCanvas : Control private Vector _dragBy; private readonly MapInspector _inspector = new(); private Vector _pan; + + /// + /// The offset and zoom that fit the area to the canvas, recomputed whenever the picture or the canvas changes until the + /// player zooms or pans (); a double-click or another level or area fits it again. + /// + private Vector _fit; + private bool _moved; + private (MapViewModel Model, Size Size, bool Inspector)? _fitFor; private Point? _pressAt; private Vector _panAtPress; private bool _dragging; @@ -95,7 +109,21 @@ protected override Size ArrangeOverride(Size finalSize) internal MenuModel? OpenedRoomMenu { get; private set; } /// The zoom, 1 at pixels between rooms. Internal for tests. - internal double Zoom { get; private set; } = 1; + internal double Zoom + { + get + { + Fit(); + return _zoom; + } + + private set => _zoom = value; + } + + private double _zoom = 1; + + /// Whether the view is the fit (true) or where the player zoomed or panned it to. Internal for tests. + internal bool Fitted => !_moved; /// The pan from the character's room, in pixels. Internal for tests. internal Vector Pan => _pan; @@ -117,10 +145,11 @@ public void Show( return; } - // Another level or area is another picture: the pan from the old one means nothing on it. + // Another level or area is another picture: the pan from the old one means nothing on it, and it is fitted afresh. if (model.Level != _model.Level || model.Area != _model.Area || model.Viewing != _model.Viewing) { _pan = default; + _moved = false; } _model = model; @@ -135,7 +164,7 @@ internal Point CentreOf(MapViewRoom room) { var anchor = _model.Current ?? _model.Rooms.FirstOrDefault(); var step = Spacing * Zoom; - var middle = Middle + _pan; + var middle = Middle + _fit + _pan; return anchor is null ? middle : new Point(middle.X + ((room.X - anchor.X) * step), middle.Y + ((room.Y - anchor.Y) * step)); @@ -155,6 +184,54 @@ private Point Middle private double RoomSize => Math.Max(5, Spacing * Zoom * 0.56); + /// + /// Fits the area to the canvas: the rooms within steps of the character's, centred in the open + /// part below the corner label, at the largest zoom up to that holds them with a room's width + /// to spare. Only until the player zooms or pans; then the view is theirs. + /// + private void Fit() + { + if (_moved) + { + return; + } + + var key = (_model, Bounds.Size, _inspector.IsVisible); + if (_fitFor is { } was && ReferenceEquals(was.Model, key._model) && was.Size == key.Size && was.Inspector == key.IsVisible) + { + return; + } + + _fitFor = (key._model, key.Size, key.IsVisible); + var anchor = _model.Current ?? _model.Rooms.FirstOrDefault(); + if (anchor is null || Bounds.Width <= 0 || Bounds.Height <= 0) + { + _zoom = 1; + _fit = default; + return; + } + + var near = _model.Rooms.Where(r => Math.Abs(r.X - anchor.X) <= FitRadius && Math.Abs(r.Y - anchor.Y) <= FitRadius).ToList(); + var minX = near.Min(r => r.X - anchor.X); + var maxX = near.Max(r => r.X - anchor.X); + var minY = near.Min(r => r.Y - anchor.Y); + var maxY = near.Max(r => r.Y - anchor.Y); + var open = Middle.X * 2; + const double top = 44; // the corner label and the walk or room line under it + var across = Math.Max(1, open - 24) / ((maxX - minX + 1.6) * Spacing); + var down = Math.Max(1, Bounds.Height - top - 16) / ((maxY - minY + 1.6) * Spacing); + _zoom = Math.Clamp(Math.Min(across, down), MinZoom, FitMaxZoom); + var step = Spacing * _zoom; + _fit = new Vector(-(minX + maxX) / 2.0 * step, (top / 2) - ((minY + maxY) / 2.0 * step)); + } + + /// The player took the view: the fit stops following, and stays where it was. + private void TakeView() + { + Fit(); + _moved = true; + } + /// The room under a point, or null. internal MapViewRoom? RoomAt(Point point) { @@ -222,7 +299,10 @@ protected override void OnPointerPressed(PointerPressedEventArgs e) if (e.ClickCount == 2) { + // Re-centre: the fit again, as when the map opened. _pan = default; + _moved = false; + _fitFor = null; InvalidateVisual(); return; } @@ -257,6 +337,7 @@ protected override void OnPointerMoved(PointerEventArgs e) } else { + TakeView(); _pan = _panAtPress + moved; } @@ -517,6 +598,7 @@ internal void RunMenuVerb(long room, string verb) /// Zooms by about , keeping what is under it there. internal void ZoomAbout(Point point, double notches) { + TakeView(); var next = Math.Clamp(Zoom * Math.Pow(1.18, notches), MinZoom, MaxZoom); if (Math.Abs(next - Zoom) < 1e-9) { @@ -526,16 +608,22 @@ internal void ZoomAbout(Point point, double notches) // The centre is middle + pan; a point at offset d from it moves to d·ratio, so the pan takes up the difference. var middle = Middle; var ratio = next / Zoom; - var fromCentre = point - (middle + _pan); - _pan = point - middle - (fromCentre * ratio); + var fromCentre = point - (middle + _fit + _pan); + _pan = point - middle - _fit - (fromCentre * ratio); Zoom = next; InvalidateVisual(); } // ── Drawing ─────────────────────────────────────────────────────────────────────────────── - /// The zoom from which every room's name is written under it, not only the hovered one's. - internal const double NamesFromZoom = 1.6; + /// + /// The pixels between room centres from which every room's name is written under it: wherever a few letters fit + /// between two rooms. Below it only the character's own room is named (and the hovered one, on a plate). + /// + internal const double NamesFromStep = 40; + + /// Whether every room is named at the zoom shown. Internal for tests. + internal bool NamesShown => Spacing * Zoom >= NamesFromStep; /// /// The colour a room is drawn in: its area's, as the view gives it (), or the @@ -593,7 +681,7 @@ public override void Render(DrawingContext context) var accent = Parse(_ink.Bar); var path = Parse(_ink.Low); var radius = size * 0.22; - var names = Zoom >= NamesFromZoom; + var names = NamesShown; foreach (var room in _model.Rooms) { var c = CentreOf(room); @@ -650,7 +738,7 @@ public override void Render(DrawingContext context) context.DrawRectangle(null, ring, rect.Inflate(size * 0.42), radius * 2.2, radius * 2.2); } - if ((names || room.Id == _hovered) && room.Id != _hovered) + if ((names || room.Current) && room.Id != _hovered) { DrawName(context, room.Name, c, size, plate: false); } diff --git a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs index 5c4aa3fa..6eefd48c 100644 --- a/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs +++ b/src/SharpMUTerm.Client/Commands/BuiltInCommands.cs @@ -29,6 +29,21 @@ public static class BuiltInCommands /// Import from another client: a file picker in a host that has one, else /import on the command line. public const string ImportCommand = "term:import"; + /// The chord that sends the command line to the send group (). + public const string SendGroupKey = "⌥S"; + + /// ⌃P ▸ Recent alerts: opens the palette on this run's pages and alerts, every character's. + public const string RecentAlertsCommand = "world:recent-alerts"; + + /// The prefix of the alert entries: alert:go:<id>, one per kept alert. + public const string AlertPrefix = "alert:go:"; + + /// What the palette opens with typed in for Recent alerts, so it lists the alerts. + public const string AlertQuery = "alert "; + + /// The ⌃P id that goes to alert 's character. + public static string Alert(int id) => AlertPrefix + id.ToString(System.Globalization.CultureInfo.InvariantCulture); + /// ⌃P ▸ Script console. public const string ScriptConsoleCommand = "world:script-console"; @@ -147,19 +162,14 @@ void Family(string id, string prefix, Func c.State.Reconnecting); Family("world:send-group", CommandIds.GroupPrefix, SendGroup); - Family("world:join-wraps", JoinWrapsPrefix, JoinWrapsEntries); - Add("world:reload-scripts", CommandGroup.World, "Reload scripts", - detail: "re-reads this character's Lua files", when: c => c.State.ScriptsOn); - Add(ScriptConsoleCommand, CommandGroup.World, "Script console", - detail: "run Lua as this character, see what scripts print and keep"); - // Editing the script files under the scripts folder, in the composer's editor: the list (one entry per file, which - // Edit script… opens the palette on) and a new one by name. Only where the client runs scripts. - Add(ScriptEditCommand, CommandGroup.World, "Edit script…", - detail: "open a .lua file from the scripts folder · ⌃S saves and reloads", when: c => c.State.ScriptsOn); - Add(ScriptNewCommand, CommandGroup.World, "New script…", - detail: "/script new · starts from a template", when: c => c.State.ScriptsOn); - Family("world:script-open", ScriptOpenPrefix, ScriptFileEntries); + // The pages and alerts of this run, every character's (in memory, never saved): the entry opens the palette on + // them, one per alert, newest first, and choosing one goes to that character's window. + Add(RecentAlertsCommand, CommandGroup.World, "Recent alerts", + titleFor: c => $"Recent alerts ({c.State.RecentAlerts})", + detail: "pages and alerts this run, every character's", when: c => c.State.RecentAlerts > 0); + Family("world:alerts", AlertPrefix, AlertEntries); + Family("world:join-wraps", JoinWrapsPrefix, JoinWrapsEntries); // Only where the host has a screen reader to tell: the window's live region, or --plain. Add("a11y:toggle-window", CommandGroup.Terminal, "Read this window aloud", @@ -284,6 +294,20 @@ void Family(string id, string prefix, Func c.State.ScriptsOn); + Add(ScriptConsoleCommand, CommandGroup.Help, "Script console", + detail: "run Lua as this character, see what scripts print and keep"); + Add(ScriptEditCommand, CommandGroup.Help, "Edit script…", + detail: "open a .lua file from the scripts folder · ⌃S saves and reloads", when: ScriptsEditable); + Add(ScriptNewCommand, CommandGroup.Help, "New script…", + detail: "/script new · starts from a template", when: ScriptsEditable); + Family("world:script-open", ScriptOpenPrefix, ScriptFileEntries); + // A spelling dictionary, downloaded only when asked — the offer says what, from where and where to, first. Add(DictionaryCommand, CommandGroup.Compose, "Get a spelling dictionary…", detail: "English, for the composer · asks first", @@ -488,9 +512,16 @@ private static IEnumerable JoinWrapsEntries(ICommandContext context Detail = $"it wraps at {r.Column}, the pane is {r.PaneWidth} wide · F5 ▸ join wraps", }); + /// + /// Whether ⌃P offers the script files, Edit script… and New script…: the client runs scripts, or it is showing a + /// list of files to edit (the snapshot's demo scripts). One predicate for all three, so they come and go together. + /// + private static bool ScriptsEditable(ICommandContext context) => + context.State.ScriptsOn || context.State.ScriptFiles is not null; + private static IEnumerable ScriptFileEntries(ICommandContext context) => - (context.State.ScriptFiles ?? []).Select(f => new CommandItem( - CommandGroup.World, + !ScriptsEditable(context) ? [] : (context.State.ScriptFiles ?? []).Select(f => new CommandItem( + CommandGroup.Help, f.ReadOnly ? $"Script {f.Name} (read only)" : $"Script {f.Name}", ScriptOpen(f.Name), f.Detail) @@ -498,6 +529,13 @@ private static IEnumerable ScriptFileEntries(ICommandContext contex Detail = f.Detail, }); + private static IEnumerable AlertEntries(ICommandContext context) => + (context.State.Alerts ?? []).Select(a => + { + var detail = $"{a.Why} · {a.Age}"; + return new CommandItem(CommandGroup.World, $"Alert · {a.Who}: {a.Text}", Alert(a.Id), detail) { Detail = detail }; + }); + private static IEnumerable MapFoundEntries(ICommandContext context) => (context.State.MapFound ?? []).Select(r => { @@ -530,11 +568,14 @@ private static IEnumerable SendGroup(ICommandContext context) var members = characters.Count(c => c.InGroup); if (members > 0) { - yield return new CommandItem( - CommandGroup.World, - "Send the command line to the group", - CommandIds.GroupSend, - members == 1 ? "1 character" : $"{members} characters"); + // ⌥S, the group's own chord (MacroKeys), named here because this is where it is learnt; the rail's `g` while ⌥C + // holds the keys is the other half, putting characters in. + var who = members == 1 ? "the command line, to 1 character" : $"the command line, to {members} characters"; + yield return new CommandItem(CommandGroup.World, "Send to group", CommandIds.GroupSend, $"{SendGroupKey} · {who}") + { + Key = SendGroupKey, + Detail = who, + }; yield return new CommandItem(CommandGroup.World, "Clear the send group", CommandIds.GroupClear); } } diff --git a/src/SharpMUTerm.Client/Palette/FuzzyMatch.cs b/src/SharpMUTerm.Client/Palette/FuzzyMatch.cs index 87eb004c..aec630e8 100644 --- a/src/SharpMUTerm.Client/Palette/FuzzyMatch.cs +++ b/src/SharpMUTerm.Client/Palette/FuzzyMatch.cs @@ -56,7 +56,7 @@ public static class FuzzyMatch public const int WholePrefix = 20; /// A query word this long or shorter matches only at word starts and runs (see the class remarks). - public const int StrictLength = 4; + public const int StrictLength = 5; /// /// Matches against , or returns null when it is not a diff --git a/src/SharpMUTerm.Core/Commands/CommandCatalog.cs b/src/SharpMUTerm.Core/Commands/CommandCatalog.cs index f7682da9..42ca6c31 100644 --- a/src/SharpMUTerm.Core/Commands/CommandCatalog.cs +++ b/src/SharpMUTerm.Core/Commands/CommandCatalog.cs @@ -71,6 +71,11 @@ public sealed record CharacterRef( /// /// The rooms the last /map find listed, newest search only, so ⌃P offers to walk to each. /// The focused character's script files, so ⌃P offers to open each in the editor. +/// How many pages and alerts this run has kept, across every character, so ⌃P offers Recent alerts. +/// +/// Those alerts, newest first, once Recent alerts has opened the palette on them (null before), so each is an entry +/// that goes to its character's window without crowding every other ⌃P. +/// public sealed record CommandContext( bool LoggingOn = false, bool Zoomed = false, @@ -96,7 +101,17 @@ public sealed record CommandContext( bool MapViewing = false, bool NewConfiguration = false, IReadOnlyList? MapFound = null, - IReadOnlyList? ScriptFiles = null); + IReadOnlyList? ScriptFiles = null, + int RecentAlerts = 0, + IReadOnlyList? Alerts = null); + +/// A page or alert the client kept this run, for ⌃P's Recent alerts entries. +/// Its number this run, which the entry's id carries. +/// The character it was for, as every surface names one (Corvid · Aetherfall). +/// What it was: page, mentioned you or alert. +/// The line, bounded. +/// How long ago, in words (just now, 4 min ago). +public sealed record AlertRef(int Id, string Who, string Why, string Text, string Age); /// A script file ⌃P offers to open in the editor. /// Its name under the scripts folder (combat.lua), or package:<id>/<file>. diff --git a/src/SharpMUTerm.Core/Commands/CommandItem.cs b/src/SharpMUTerm.Core/Commands/CommandItem.cs index cca4d7bf..d2310782 100644 --- a/src/SharpMUTerm.Core/Commands/CommandItem.cs +++ b/src/SharpMUTerm.Core/Commands/CommandItem.cs @@ -6,7 +6,7 @@ public enum CommandGroup /// Navigation: switch character, jump to a window. GoTo, - /// Connection actions: reconnect, disconnect, the send group, scripts. + /// Connection actions: reconnect, disconnect, the send group, recent alerts. World, /// Output actions: logging and scene logs, freeze/scrollback, clear, copy, timestamps, sound. @@ -27,7 +27,7 @@ public enum CommandGroup /// Writing: the composer, command history, the second command line, the newline, the dictionary. Compose, - /// Help and setting up: help, the welcome, the key tour, import, packages. + /// Help and setting up: help, the welcome, the key tour, import, packages, scripts. Help, } diff --git a/src/SharpMUTerm.Core/Session/SendGroup.cs b/src/SharpMUTerm.Core/Session/SendGroup.cs index e0cf1834..05de44b8 100644 --- a/src/SharpMUTerm.Core/Session/SendGroup.cs +++ b/src/SharpMUTerm.Core/Session/SendGroup.cs @@ -1,7 +1,7 @@ namespace SharpMUTerm.Core.Session; /// -/// The characters one line can be sent to at once (⌃P ▸ Send the command line to the group), and how a +/// The characters one line can be sent to at once (⌃P ▸ Send to group), and how a /// script names another character (world.sendTo). What BeipMU calls puppets: a MUSH player's alts, moved /// together. /// diff --git a/src/SharpMUTerm.Tui/CommandPalette.cs b/src/SharpMUTerm.Tui/CommandPalette.cs index 1bb1478e..8991c88a 100644 --- a/src/SharpMUTerm.Tui/CommandPalette.cs +++ b/src/SharpMUTerm.Tui/CommandPalette.cs @@ -90,6 +90,12 @@ public void Toggle() } } + /// + /// How many rows at the desktop's foot the palette must leave uncovered — the command line and the status row — or + /// null for none. Asked each time it opens, since the command line grows. + /// + public Func? KeepClearBelow { get; init; } + private void Open() { _selected = 0; @@ -115,7 +121,11 @@ private void Open() // narrower desktop elides titles and details, never keys (CommandSurfaceRenderer). var initial = Build(string.Empty); var desktop = _system.DesktopDimensions; - var height = Math.Clamp(initial.Rows.Count + 1 + 3, 6, Math.Max(6, desktop.Height - 2)); + // The rows the command line and the status row take at the desktop's foot stay clear (KeepClearBelow), so the + // line being typed is never under the palette's bottom border; the palette centres in what is above them. + var clear = Math.Clamp(KeepClearBelow?.Invoke() ?? 0, 0, Math.Max(0, desktop.Height - 8)); + var above = desktop.Height - clear; + var height = Math.Clamp(initial.Rows.Count + 1 + 3, 6, Math.Max(6, clear > 0 ? above - 1 : desktop.Height - 2)); _contentWidth = Math.Clamp( Math.Max(CommandSurfaceRenderer.NaturalWidth(initial), HeaderWidth(initial)) + 1, 32, @@ -129,15 +139,18 @@ private void Open() // Centered() *after* WithSize(): it reads the bounds set so far and falls back to 80x25, so // centring first placed the surface as if it were that size — which only became visible once // the catalog grew tall enough for the misplacement to push its bottom border off-screen. - _window = new WindowBuilder(_system) + var builder = new WindowBuilder(_system) .WithTitle(Title) .AsModal() .WithBorderStyle(BorderStyle.Single) .WithBackgroundColor(Scheme.Colour(ScreenPalette.MenuBg)) .HideTitleButtons() .Resizable(false) - .WithSize(width, height) - .Centered() + .WithSize(width, height); + builder = clear > 0 + ? builder.AtPosition(Math.Max(0, (desktop.Width - width) / 2), Math.Max(1, (above - height) / 2)) + : builder.Centered(); + _window = builder .AddControl(_search) .AddControl(_results) .OnClosed((_, _) => Reset()) diff --git a/src/SharpMUTerm.Tui/MacroKeys.cs b/src/SharpMUTerm.Tui/MacroKeys.cs index d6aef8b0..8a999723 100644 --- a/src/SharpMUTerm.Tui/MacroKeys.cs +++ b/src/SharpMUTerm.Tui/MacroKeys.cs @@ -183,6 +183,9 @@ private static AppShortcut[] BuildAppShortcuts() // are read off. new(ConsoleModifiers.Alt, ConsoleKey.J, "goes to the next character"), new(ConsoleModifiers.Alt, ConsoleKey.K, "goes to the previous character"), + // The send group's line (⌃P ▸ Send to group). ⌥S is `ESC s`, one Alt chord like the rest; nothing here, in the + // framework or in the window's HostKeys.Reserved takes it. S for send; ⌃S is the composer's own send. + new(ConsoleModifiers.Alt, ConsoleKey.S, "sends the command line to the send group"), // F1 is the composer and not a settings screen, which is why it sits ahead of the F2–F9 block // rather than in it: those keys all open the same overlay from one table, and this one opens a // different surface. It is claimed here for the same reason they are — F4 reads this list to say diff --git a/src/SharpMUTerm.Tui/MarkupText.cs b/src/SharpMUTerm.Tui/MarkupText.cs index 603a39c6..546ff9a5 100644 --- a/src/SharpMUTerm.Tui/MarkupText.cs +++ b/src/SharpMUTerm.Tui/MarkupText.cs @@ -123,14 +123,26 @@ internal static string SpreadTitle(string title, string hints, int width) /// Cuts a markup string to visible cells, ending in … when anything /// was cut. Tags are kept, including those after the cut, so every span that opened still closes. /// - internal static string ElideVisible(string markup, int width) + internal static string ElideVisible(string markup, int width) => ElideVisible(markup, width, mark: true); + + /// + /// A row of a column cells wide: unchanged when it fits; cut without a mark when only its + /// trailing blanks (a cursor band's padding) are past the edge; else elided with … — never clipped mid-word + /// by the control, which says nothing about what was lost. Zero or less means the width is not known. + /// + internal static string FitVisible(string markup, int width) => + width <= 0 || VisibleLength(markup) <= width + ? markup + : ElideVisible(markup, width, mark: Plain(markup).TrimEnd().Length > width); + + private static string ElideVisible(string markup, int width, bool mark) { if (VisibleLength(markup) <= width) { return markup; } - var budget = Math.Max(0, width - 1); + var budget = Math.Max(0, mark ? width - 1 : width); var result = new System.Text.StringBuilder(markup.Length); var shown = 0; var cut = false; @@ -145,7 +157,7 @@ void Visible(string text) else if (!cut) { cut = true; - if (width > 0) + if (mark && width > 0) { result.Append('…'); } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Attention.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Attention.cs index 03b4619e..e13a50d6 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Attention.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Attention.cs @@ -78,6 +78,7 @@ private void NoteUnseenLine() private void OnAttentionRequested(WorldSession session, AttentionEventArgs e) { + KeepAlert(session.SessionKey, e.Reason, e.Text); if (!_config.Text.AlertWhenAway || Host.Attention is not { } host) { return; diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.RailKeys.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.RailKeys.cs index 9cec4dc2..816ee254 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.RailKeys.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.RailKeys.cs @@ -70,7 +70,7 @@ private void ToggleRailKeys() RefreshRail(); SyncComposerBands(); // the command line goes idle: ⏎ goes to a row now, not to the game UpdateInputChrome(); // and its prompt with it, which is painted to match the band - Notice("sidebar: ↑↓ walk · ⏎ goes · Esc returns", MessageSeverity.Info, "⌥C"); + Notice("sidebar: ↑↓ walk · ⏎ goes · g send group · Esc returns", MessageSeverity.Info, "⌥C"); } /// Hands the keys back to the command line. Does nothing when the sidebar does not hold them. @@ -117,6 +117,9 @@ private bool TryRailKey(KeyPressedEventArgs e) case ConsoleKey.Escape: LeaveRailKeys(); break; + case ConsoleKey.G when bare: + ToggleGroupAtRailCursor(); + break; case ConsoleKey.Enter when bare: var row = BuildSidebar().NavigableRows().FirstOrDefault(r => SidebarModel.KeyOf(r) == _railCursor); LeaveRailKeys(); @@ -135,6 +138,30 @@ private bool TryRailKey(KeyPressedEventArgs e) return true; } + /// + /// g on a sidebar row: the row's character joins or leaves the send group (⌃P's Add … to the send group, + /// through the same id), and the keys stay in the sidebar so the next row can be added. A window row stands for its + /// owner; a row with no character refuses. + /// + private void ToggleGroupAtRailCursor() + { + var row = BuildSidebar().NavigableRows().FirstOrDefault(r => SidebarModel.KeyOf(r) == _railCursor); + var key = row?.Target switch + { + { } t when t.StartsWith(CommandIds.CharacterPrefix, StringComparison.Ordinal) => t[CommandIds.CharacterPrefix.Length..], + { } t when t.StartsWith(CommandIds.WindowPrefix, StringComparison.Ordinal) => + _workspace.FindWindow(t[CommandIds.WindowPrefix.Length..])?.SessionKey, + _ => null, + }; + if (key is null) + { + RefuseCommand("that row is no character — g adds a character to the send group"); + return; + } + + DispatchGroupCommand(CommandIds.GroupToggle(key)); + } + /// Moves the cursor by rows, clamped; the extremes of int go to the ends. private void MoveRailCursor(int step) { diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.RecentAlerts.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.RecentAlerts.cs new file mode 100644 index 00000000..5c7b0234 --- /dev/null +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.RecentAlerts.cs @@ -0,0 +1,85 @@ +using SharpMUTerm.Core.Automation; +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Core.Session; + +namespace SharpMUTerm.Tui; + +/// +/// ⌃P ▸ Recent alerts: the pages and alerts this run has seen, every character's, newest first. Kept from +/// whether or not the desktop was asked (the player may have been looking +/// at another character's pane), in memory for the run and never saved. The entry opens the palette on them +/// (), one entry each, and choosing one goes to that character's +/// window through the same id a ⌃P Switch to … runs. +/// +internal sealed partial class SharpMUTermApp +{ + /// How many alerts are kept; the oldest goes first. + internal const int RecentAlertCap = 20; + + private readonly List _recentAlerts = []; + private int _nextAlertId = 1; + private bool _alertsListed; + + private sealed record KeptAlert(int Id, string SessionKey, AttentionReason Reason, string Text, DateTimeOffset At); + + /// The alerts kept, newest first, as ⌃P lists them; for the tests. + internal IReadOnlyList RecentAlerts => AlertRefs(); + + private void KeepAlert(string sessionKey, AttentionReason reason, string line, TimeSpan ago = default) + { + var text = line.ReplaceLineEndings(" ").Trim(); + _recentAlerts.Insert(0, new KeptAlert(_nextAlertId++, sessionKey, reason, text.Length <= 80 ? text : text[..79] + "…", _time.GetUtcNow() - ago)); + if (_recentAlerts.Count > RecentAlertCap) + { + _recentAlerts.RemoveAt(_recentAlerts.Count - 1); + } + } + + private IReadOnlyList AlertRefs() + { + var now = _time.GetUtcNow(); + return _recentAlerts.Select(a => new AlertRef(a.Id, DisplayName(a.SessionKey), a.Reason switch + { + AttentionReason.Page => "page", + AttentionReason.Name => "mentioned you", + _ => "alert", + }, a.Text, Age(now - a.At))).ToList(); + } + + private static string Age(TimeSpan ago) => ago.TotalSeconds < 60 + ? "just now" + : ago.TotalMinutes < 60 + ? $"{(int)ago.TotalMinutes} min ago" + : $"{(int)ago.TotalHours} h ago"; + + /// ⌃P ▸ Recent alerts: the palette, opened on the alerts. + private void ShowRecentAlerts() + { + if (_recentAlerts.Count == 0) + { + RefuseCommand("no pages or alerts yet this run"); + return; + } + + OpenMenu(Client.Commands.BuiltInCommands.AlertQuery); + } + + /// An alert entry: goes to its character's window. False when the alert is no longer kept. + private bool GoToAlert(string id) + { + var alert = int.TryParse(id, System.Globalization.NumberStyles.None, System.Globalization.CultureInfo.InvariantCulture, out var n) + ? _recentAlerts.FirstOrDefault(a => a.Id == n) + : null; + if (alert is null) + { + RefuseCommand("that alert is no longer kept"); + return false; + } + + return DispatchCommand(CommandIds.Character(alert.SessionKey)); + } + + /// Keeps an alert as the session's event would, for a test or the demo scene. + internal void SimulateAlert(string sessionKey, AttentionReason reason, string text, TimeSpan ago = default) => + KeepAlert(sessionKey, reason, text, ago); +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.SendGroup.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.SendGroup.cs index 205f0eda..cb5b01ce 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.SendGroup.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.SendGroup.cs @@ -6,7 +6,7 @@ namespace SharpMUTerm.Tui; /// /// The send group: characters picked on ⌃P, marked ◆ on the rail, and sent one line together by -/// ⌃P ▸ Send the command line to the group. Lua reaches the same sessions by name through +/// ⌃P ▸ Send to group. Lua reaches the same sessions by name through /// world.sendTo. /// internal sealed partial class SharpMUTermApp diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.TabOverflow.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.TabOverflow.cs index 15234794..2e14daf7 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.TabOverflow.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.TabOverflow.cs @@ -31,6 +31,9 @@ internal sealed partial class SharpMUTermApp /// The commands the last overflow list offered, so a choice can be checked against them. private MenuModel? _tabOverflowOffered; + /// The cells at a strip's right edge a chip takes, for deciding which clipped tab it covers: a space and +9 ▾. + private const int ChipReserve = 5; + /// The chip for a list: +3 ▾. internal static string TabOverflowChip(MenuModel menu) => $"+{menu.Entries.Count} ▾"; @@ -189,16 +192,34 @@ private void PaintTabOverflowChips(SharpConsoleUI.Layout.CharacterBuffer buffer) /// private List? HiddenTabs(TabControl tabs, int width) { - var seen = new HashSet(); + // Cells per tab along the whole strip, and left of where a chip would sit. A tab the framework clipped at the + // right edge to a letter or two (`R`) names nothing, and the chip is painted over it anyway: it counts as hidden + // unless the part left of the chip holds its pad and TabStripFit's floor (three letters and an ellipsis). + var total = new Dictionary(); + var shown = new Dictionary(); for (var x = 0; x < width; x++) { if (FrameworkHitTests.TabAt(tabs, x) is var index and >= 0) { - seen.Add(index); + total[index] = total.GetValueOrDefault(index) + 1; + if (x < width - ChipReserve) + { + shown[index] = shown.GetValueOrDefault(index) + 1; + } } } - if (seen.Count == 0 || seen.Count >= tabs.TabCount) + if (total.Count == 0) + { + return null; + } + + // Only the tab reaching the strip's last cell can have been clipped. + var edge = FrameworkHitTests.TabAt(tabs, width - 1); + var seen = total.Keys + .Where(i => i != edge || shown.GetValueOrDefault(i) >= Math.Min(total[i], 1 + TabStripFit.MinimumName)) + .ToHashSet(); + if (seen.Count >= tabs.TabCount) { return null; } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 7726e240..3959d4cc 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -935,7 +935,10 @@ public SharpMUTermApp( () => _active is { } acting ? DisplayName(acting.SessionKey) : null, id => DispatchCommand(id), _recentCommands, - () => CommandPaletteModel.Suggested(CommandState())); + () => CommandPaletteModel.Suggested(CommandState())) + { + KeepClearBelow = InputBandRows, + }; _messageLog = new MessageLogOverlay(_system, _diagnostics); _gameData = new GameDataOverlay(_system, _time); _screens = ScreenTheme.For(_theme); @@ -1912,6 +1915,19 @@ public string RenderSnapshot(string? view = null) OpenMenu(); } + // ⌃P ▸ Recent alerts over three kept pages and alerts, two characters', oldest first in time: the entry itself runs, + // so the palette opens on them the way it does live, each with its character and how long ago. + if (string.Equals(view, "menu-alerts", StringComparison.OrdinalIgnoreCase)) + { + SimulateAlert("Aetherfall.Rookery", SharpMUTerm.Core.Automation.AttentionReason.Page, + "Merrow pages: are you coming to the crypt?", TimeSpan.FromMinutes(14)); + SimulateAlert("Grapevine.Thistle", SharpMUTerm.Core.Automation.AttentionReason.Name, + "Ashlyn says, \"Thistle, the herbs came in.\"", TimeSpan.FromMinutes(3)); + SimulateAlert(DemoScene.ActiveSessionKey, SharpMUTerm.Core.Automation.AttentionReason.Page, + "Rivane pages: meet at the north gate"); + DispatchCommand(SharpMUTerm.Client.Commands.BuiltInCommands.RecentAlertsCommand); + } + // Help, opened by the ⌃P entry itself: the list, and a how-to page (the one that names join wraps). if (string.Equals(view, "help", StringComparison.OrdinalIgnoreCase)) { @@ -6121,6 +6137,22 @@ private void SyncInputHeights(bool secondShown) /// count is arithmetic on the text rather than a reading of the last frame: the veto has to be right /// on the first frame too, and nothing has been arranged yet when the window is built. /// + /// + /// The rows from the top of the input band (the prompt row, then the command lines) to the desktop's foot, as last + /// arranged — what a popup must leave uncovered so the line being typed stays in view. Zero before anything is + /// arranged. + /// + private int InputBandRows() + { + var tops = new[] { (IWindowControl)_promptRow, _input, _second } + .Where(c => c.Visible) + .Select(c => BoundsOf(c)) + .Where(b => b is { Height: > 0 }) + .Select(b => b!.Value.Y - _system.DesktopUpperLeft.Y) + .ToList(); + return tops.Count == 0 ? 0 : Math.Max(0, _system.DesktopDimensions.Height - tops.Min()); + } + private int ChromeRows() => // No row for a header the host draws: it is not in the cells, so the bars may have the row it would take. (_header.Visible ? InputLayout.WrappedRows(MarkupWidth(_header.Text), HeaderWidth()) : 0) @@ -7423,6 +7455,12 @@ private void RegisterFocusReportTab() return () => { CycleCharacter(-1); return true; }; } + // ⌥S sends the command line to the send group, as ⌃P ▸ Send to group does. + if (claim.Key == ConsoleKey.S) + { + return () => { SendToGroup(); return true; }; + } + // ⌥G walks to the next hit of the last search, so a reader following a name down a transcript // presses one key rather than reopening the surface for each. There is no backward chord — // see MacroKeys, where the measurement that rules ⌥⇧G out is recorded. @@ -8624,6 +8662,8 @@ private CommandContext CommandState() SceneLogging: _sceneLogs.ContainsKey(ActiveWindowId()), NewConfiguration: _config.Worlds.Count == 0 || _config.KeyTourPending, MapFound: MapFoundRooms(), + RecentAlerts: _recentAlerts.Count, + Alerts: _alertsListed ? AlertRefs() : null, ScriptFiles: !_scriptsListed || (_scriptsRoot is null && !DemoScriptsShown) ? null : ScriptFileRefs()); } @@ -8900,6 +8940,11 @@ private bool RunBuiltInCommand(string id) return OpenScriptFromPalette(id[SharpMUTerm.Client.Commands.BuiltInCommands.ScriptOpenPrefix.Length..]); } + if (id.StartsWith(SharpMUTerm.Client.Commands.BuiltInCommands.AlertPrefix, StringComparison.Ordinal)) + { + return GoToAlert(id[SharpMUTerm.Client.Commands.BuiltInCommands.AlertPrefix.Length..]); + } + if (id.StartsWith(SharpMUTerm.Client.Commands.BuiltInCommands.MapWalkPrefix, StringComparison.Ordinal)) { return WalkToFoundRoom(id[SharpMUTerm.Client.Commands.BuiltInCommands.MapWalkPrefix.Length..]); @@ -9201,6 +9246,9 @@ private bool RunBuiltInCommand(string id) case Client.Commands.BuiltInCommands.ScriptConsoleCommand: ShowScriptConsole(); break; + case Client.Commands.BuiltInCommands.RecentAlertsCommand: + ShowRecentAlerts(); + break; case Client.Commands.BuiltInCommands.ScriptEditCommand: ListScriptsToEdit(fromConsole: false); break; @@ -10062,6 +10110,12 @@ private void ToggleMenu() return; } + // The alert entries are listed only in the palette Recent alerts opened, so they never crowd any other. + if (!_palette.IsOpen) + { + _alertsListed = _openingQuery == Client.Commands.BuiltInCommands.AlertQuery; + } + // A host that draws ⌃P itself gets it, unless the cell popup is already up (then this closes that). if (_palette.IsOpen || !TryOpenNativePalette()) { diff --git a/src/SharpMUTerm.Tui/SnapshotViews.cs b/src/SharpMUTerm.Tui/SnapshotViews.cs index 999d6ac5..3f2ebfb9 100644 --- a/src/SharpMUTerm.Tui/SnapshotViews.cs +++ b/src/SharpMUTerm.Tui/SnapshotViews.cs @@ -18,7 +18,7 @@ internal static class SnapshotViews "triggers-edit", "logging-edit", "keypad-edit", "password-edit", "startup-edit", "freeze", "freeze-scrollback", "spawn", "split", "split-stacked", "move", "drag", "history", "history-search", "history-search-filter", "draft", "draft2", - "menu", "menu-split", "menu-fuzzy", "menu-recent", "messages", "notices", "quit", "connections", "characters", + "menu", "menu-split", "menu-fuzzy", "menu-recent", "menu-alerts", "messages", "notices", "quit", "connections", "characters", "tint", "tint-input", "tint-input-moved", "tint-tabs", "compose", "compose-literal", "compose-preview", "moo-edit", "mssp", "mssp-none", "mssp-never", "web", "rail-long", "scrollback", "scrollback-up", "scrollback-split", "reflow", "links", "away", "away-scrollback", diff --git a/src/SharpMUTerm.Tui/TabStripFit.cs b/src/SharpMUTerm.Tui/TabStripFit.cs index aa0c1cd6..c1c38aa8 100644 --- a/src/SharpMUTerm.Tui/TabStripFit.cs +++ b/src/SharpMUTerm.Tui/TabStripFit.cs @@ -61,12 +61,13 @@ namespace SharpMUTerm.Tui; internal static class TabStripFit { /// - /// The fewest cells of name a background tab is cut to. Below three a name is an initial and an - /// ellipsis, which identifies nothing; at three there is still a syllable to recognise. It is a floor - /// rather than a guarantee — a strip narrower than its tabs at the floor is one the framework will - /// clip, and this cannot prevent that, only postpone it. + /// The fewest cells of name a background tab is cut to: three letters and the ellipsis. Below that a + /// name is an initial or two (Pu…), which identifies nothing; three letters are a syllable to + /// recognise. It is a floor rather than a guarantee — a strip narrower than its tabs at the floor is + /// one the framework will clip, and a tab it clips below the floor is counted into the overflow chip + /// (+N ▾) rather than left showing a letter. /// - internal const int MinimumName = 3; + internal const int MinimumName = 4; /// /// The fewest for the tab the pane is showing. Higher than on purpose: it diff --git a/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs b/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs index dd1b7917..f66dce91 100644 --- a/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs +++ b/src/SharpMUTerm.Tui/WorldsScreenRenderer.cs @@ -1226,21 +1226,30 @@ internal static IEnumerable NamesHelpRows() const int room = 28; yield return WorldField(string.Empty, $"[{Label}]{Escape(HighlightColours.NameSyntax.Split(';')[0])}[/]"); yield return WorldField(string.Empty, $"[{Label}]{Escape(HighlightColours.NameSyntax.Split(';')[1].Trim())}[/]"); + // Each colour's name is drawn in that colour, held to the floor on the column's plane (black and grey lift on a + // dark screen), so the list is its own sample; the light screens re-hold it on theirs (ScreenTheme.Paint). + var plane = RgbJsonConverter.Parse(PanelBg); var line = "colours:"; + var markup = $"[{Label}]colours:[/]"; foreach (var colour in HighlightColours.NameColours) { if (line.Length > 0 && line.Length + 1 + colour.Length > room) { - yield return WorldField(string.Empty, $"[{Label}]{line}[/]"); + yield return WorldField(string.Empty, markup); line = string.Empty; + markup = string.Empty; } + var ink = HighlightColours.TryParse(colour, out var parsed) && HighlightColours.Hex(parsed) is { } hex + ? Contrast.Legible(RgbJsonConverter.Parse(hex), plane).ToHex() + : Label; + markup += (line.Length == 0 ? string.Empty : " ") + $"[{ink}]{Escape(colour)}[/]"; line = line.Length == 0 ? colour : line + " " + colour; } if (line.Length > 0) { - yield return WorldField(string.Empty, $"[{Label}]{line}[/]"); + yield return WorldField(string.Empty, markup); } } diff --git a/src/SharpMUTerm.Tui/WorldsScreenView.cs b/src/SharpMUTerm.Tui/WorldsScreenView.cs index 73a9894b..fe37430b 100644 --- a/src/SharpMUTerm.Tui/WorldsScreenView.cs +++ b/src/SharpMUTerm.Tui/WorldsScreenView.cs @@ -75,9 +75,12 @@ public static IWindowControl Build( // Body: WORLDS list │ detail, as two real columns. var worldsCol = ScreenChrome.Stretch(ScreenChrome.Panel( WorldsScreenRenderer.WorldsColumn(worlds, selectedWorld, focus, rows, info), scheme)); + // The detail column is what is left of the width after the WORLDS column, its rule and the spacer (32 cells); a + // value too long for it (`[x] TLS — encrypt this conne`) is elided to it rather than clipped by the control. var detailCol = ScreenChrome.Stretch(ScreenChrome.Panel( WorldsScreenRenderer - .DetailColumn(worlds, triggerSets, selectedWorld, selectedCharacter, accent, focus, rows, layouts, joinWrapsAdvice), + .DetailColumn(worlds, triggerSets, selectedWorld, selectedCharacter, accent, focus, rows, layouts, joinWrapsAdvice) + .ConvertAll(line => MarkupText.FitVisible(line, width - 32)), scheme)); var body = Controls.HorizontalGrid() .WithAlignment(HorizontalAlignment.Stretch) @@ -107,7 +110,10 @@ public static IWindowControl Build( // gives the full-width elevated band behind both. var formPanel = ScreenChrome.Panel(ScreenChrome.Indent(form), scheme, ScreenPalette.EditBg); formPanel.HorizontalAlignment = HorizontalAlignment.Left; - var trigPanel = ScreenChrome.Panel(triggers, scheme, ScreenPalette.EditBg); + // The checklist hugs its rows beside the 48-cell form and a 2-cell margin; on a narrow screen its notes + // (`channel + page routing`) are elided to what is left. + var trigPanel = ScreenChrome.Panel( + triggers.ConvertAll(line => MarkupText.FitVisible(line, width - 50)), scheme, ScreenPalette.EditBg); trigPanel.HorizontalAlignment = HorizontalAlignment.Left; var edit = Controls.HorizontalGrid() .WithAlignment(HorizontalAlignment.Stretch) diff --git a/tests/SharpMUTerm.Avalonia.Tests/DesktopLayerTests.cs b/tests/SharpMUTerm.Avalonia.Tests/DesktopLayerTests.cs index cd4387ab..d7ca6ed0 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/DesktopLayerTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/DesktopLayerTests.cs @@ -304,7 +304,7 @@ [new MapViewExit(1, 2)], }); await Assert.That(walked).IsEquivalentTo(new long[] { 2 }); - await Assert.That(pan).IsEqualTo(new Vector(30, 12)); + await Assert.That(new Vector(Math.Round(pan.X, 6), Math.Round(pan.Y, 6))).IsEqualTo(new Vector(30, 12)); await Assert.That(zoom).IsGreaterThan(1.0); await Assert.That(clientSaw.Count).IsEqualTo(2).Because("only the right click is handed on, pressed and released"); await Assert.That(clientSaw[0]).Contains(MouseFlags.Button3Pressed); diff --git a/tests/SharpMUTerm.Avalonia.Tests/Wave18WindowTests.cs b/tests/SharpMUTerm.Avalonia.Tests/Wave18WindowTests.cs new file mode 100644 index 00000000..b0332695 --- /dev/null +++ b/tests/SharpMUTerm.Avalonia.Tests/Wave18WindowTests.cs @@ -0,0 +1,107 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Headless; +using Avalonia.Input; +using SharpMUTerm.Client.Panels; +using SharpMUTerm.Core.Layouts; +using SharpMUTerm.Core.Workspaces; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Avalonia.Tests; + +/// +/// Wave 18's window fixes: the native map opens fitted to the rooms around the character with their names on, and stays +/// where the player puts it; a pop-out button shows only while the pointer is over its panel, and a one-row strip keeps +/// its right end for it rather than drawing text under it. +/// +public class Wave18WindowTests +{ + private static readonly VitalsModel Vitals = new( + [new VitalsMeter("hp", "412", "500", true, 412 / 500.0, false)], + null); + + private static MapViewModel Street() => new( + "Town", + 0, + [ + new MapViewRoom(1, "Plaza", 0, 0, Current: true, Ahead: false, Locked: false), + new MapViewRoom(2, "North Road", 0, -1, Current: false, Ahead: false, Locked: false), + new MapViewRoom(3, "East Gate", 1, 0, Current: false, Ahead: false, Locked: false), + ], + [new MapViewExit(1, 2), new MapViewExit(1, 3)], + null) + { + AnchorId = 1, + }; + + [Test] + public async Task TheMapOpensFittedToItsRoomsWithTheirNamesAndKeepsAViewThePlayerTook() + { + var (fitted, zoom, names, afterWheel, movedZoom, refitted) = await DesktopLayerTests.Run((window, view, layer, driver) => + { + ((IPointerPresenter)driver.Pointer).Panels( + [new PanelOverlay(PanelIds.Map, "map:demo", new PaneRect(0, 0, 60, 16), new PanelInk("#33ccff", "#ffaa33", "#555555"), null, Street(), _ => { })]); + DesktopLayerTests.Drain(); + window.UpdateLayout(); + var canvas = layer.Maps.Values.Single(); + var fitted = canvas.Fitted; + var zoom = canvas.Zoom; + var names = canvas.NamesShown; + + var middle = canvas.TranslatePoint(new Point(canvas.Bounds.Width / 2, canvas.Bounds.Height / 2), window)!.Value; + window.MouseWheel(middle, new Vector(0, -1)); + var afterWheel = canvas.Fitted; + var movedZoom = canvas.Zoom; + + window.MouseDown(middle, MouseButton.Left); + window.MouseUp(middle, MouseButton.Left); + window.MouseDown(middle, MouseButton.Left); + window.MouseUp(middle, MouseButton.Left); + return (fitted, zoom, names, afterWheel, movedZoom, canvas.Fitted); + }, columns: 60, rows: 16); + + await Assert.That(fitted).IsTrue(); + await Assert.That(zoom).IsGreaterThan(1.0).Because("three rooms in a 60-column pane are drawn larger than the old fixed scale"); + await Assert.That(names).IsTrue().Because("the names are drawn whenever a room step has room for them"); + await Assert.That(afterWheel).IsFalse().Because("a zoom is the player taking the view"); + await Assert.That(movedZoom).IsLessThan(zoom); + await Assert.That(refitted).IsTrue().Because("a double-click re-centres and fits again"); + } + + [Test] + public async Task APopOutButtonShowsOnlyUnderThePointerAndAStripKeepsItsCorner() + { + var result = await DesktopLayerTests.Run((window, view, layer, driver) => + { + ((IPointerPresenter)driver.Pointer).Panels( + [ + new PanelOverlay(PanelIds.Vitals, "panel:vitals:strip", new PaneRect(0, 0, 40, 1), new PanelInk("#3ccf6a", "#ff5555", "#333338"), Vitals, PopOut: () => { }), + new PanelOverlay(PanelIds.Vitals, "panel:vitals:pane", new PaneRect(0, 2, 40, 6), new PanelInk("#3ccf6a", "#ff5555", "#333338"), Vitals, PopOut: () => { }), + ]); + DesktopLayerTests.Drain(); + window.UpdateLayout(); + var strip = layer.PopOuts["panel:vitals:strip"]; + var pane = layer.PopOuts["panel:vitals:pane"]; + layer.SimulatePointer(null); + var awayStrip = (strip.IsVisible, strip.Hovering); + var awayPane = pane.IsVisible; + + var cell = view.SizeFor(1, 1); + layer.SimulatePointer(new Point(5 * cell.Width, 4 * cell.Height)); + var overPane = (pane.IsVisible, pane.Hovering, strip.Hovering); + + var gauges = layer.Gauges["panel:vitals:strip"]; + var stripRight = Canvas.GetLeft(gauges) + gauges.Width; + return (awayStrip, awayPane, overPane, stripRight, Canvas.GetLeft(strip), strip.Height, cell.Height); + }, columns: 40, rows: 10); + + await Assert.That(result.awayPane).IsFalse().Because("away from the panel the button does not cover its text"); + await Assert.That(result.awayStrip.Item1).IsTrue().Because("a strip's reserved corner stays, as its own plane"); + await Assert.That(result.awayStrip.Item2).IsFalse(); + await Assert.That(result.overPane.Item1).IsTrue(); + await Assert.That(result.overPane.Item2).IsTrue(); + await Assert.That(result.overPane.Item3).IsFalse(); + await Assert.That(result.stripRight).IsLessThanOrEqualTo(result.Item5).Because("the strip's own view ends before the button's corner"); + await Assert.That(result.Item6).IsEqualTo(result.Item7); + } +} diff --git a/tests/SharpMUTerm.Client.Tests/CommandPaletteModelTests.cs b/tests/SharpMUTerm.Client.Tests/CommandPaletteModelTests.cs index f4ee92ea..7d9cea99 100644 --- a/tests/SharpMUTerm.Client.Tests/CommandPaletteModelTests.cs +++ b/tests/SharpMUTerm.Client.Tests/CommandPaletteModelTests.cs @@ -49,20 +49,37 @@ public async Task WordsAreMatchedInOrder_EachAfterTheLast() [Test] public async Task AWholePrefixBeatsAScatteredMatch() { - var prefix = FuzzyMatch.Match("layou", "Layouts")!; - var scattered = FuzzyMatch.Match("layou", "Clear window, say you")!; + // Six letters may scatter; the whole prefix still wins. (Five no longer may: see the next test.) + var prefix = FuzzyMatch.Match("layout", "Layouts")!; + var scattered = FuzzyMatch.Match("layout", "Clear window, say you two")!; await Assert.That(prefix.Score).IsGreaterThan(scattered.Score); // And a short query cannot scatter at all. await Assert.That(FuzzyMatch.Match("lay", "Clear window, say")).IsNull(); + await Assert.That(FuzzyMatch.Match("layou", "Clear window, say you")).IsNull(); + } + + /// + /// Five letters are short too: scene listed Import, Packages and the panel entries (an s, c, e, n, e spread over + /// their titles and details), wave 18's D7. It finds what starts or runs with it, and acronym-like word starts. + /// + [Test] + public async Task AFiveLetterWordMatchesOnlyAtWordStartsAndRuns() + { + await Assert.That(FuzzyMatch.Match("scene", "Start scene log")).IsNotNull(); + await Assert.That(FuzzyMatch.Match("scene", "Stop scene log")).IsNotNull(); + await Assert.That(FuzzyMatch.Match("scene", "Show client messages")).IsNull(); + await Assert.That(FuzzyMatch.Match("scene", "Import from another client…")).IsNull(); + await Assert.That(FuzzyMatch.Match("scene", "installed packages, on/off, remove")).IsNull(); + await Assert.That(FuzzyMatch.Match("scene", "players and creatures in the room · click a name to look")).IsNull(); } [Test] public async Task WordStartsBeatTheMiddleOfAWord() { - // f…p at two word starts, against an f and a p buried in words. - var starts = FuzzyMatch.Match("frzpn", "Freeze pane")!; - var buried = FuzzyMatch.Match("frzpn", "Fur-zip ink")!; + // f…p at two word starts, against an f and a p buried in words (six letters, so it may scatter at all). + var starts = FuzzyMatch.Match("frzpan", "Freeze pane")!; + var buried = FuzzyMatch.Match("frzpan", "Fairs, zapped, ran")!; await Assert.That(starts.Score).IsGreaterThan(buried.Score); } diff --git a/tests/SharpMUTerm.Tui.Tests/SendGroupTests.cs b/tests/SharpMUTerm.Tui.Tests/SendGroupTests.cs index 5ed0e1d7..e22b197d 100644 --- a/tests/SharpMUTerm.Tui.Tests/SendGroupTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/SendGroupTests.cs @@ -60,12 +60,12 @@ public async Task TheGroupIsOfferedOnceTwoCharactersAreOpenAndEachMemberIsMarked var titles = app.BuildCatalog().Select(i => i.Title).ToArray(); await Assert.That(titles).Contains("Add Ann to the send group"); - await Assert.That(titles).DoesNotContain("Send the command line to the group"); + await Assert.That(titles).DoesNotContain("Send to group"); app.DispatchCommand(CommandIds.GroupToggle("Mush.Ann")); titles = app.BuildCatalog().Select(i => i.Title).ToArray(); await Assert.That(titles).Contains("Remove Ann from the send group"); - await Assert.That(titles).Contains("Send the command line to the group"); + await Assert.That(titles).Contains("Send to group"); var rail = app.RailLines.Select(MarkupText.Plain).ToArray(); await Assert.That(rail.Single(l => l.Contains("Ann"))).Contains("◆"); @@ -96,4 +96,46 @@ public async Task ALineGoesOnceToEachConnectedMemberAndNotToTheOthers() await Assert.That(app.ArmedInputText).IsEqualTo(string.Empty); await Assert.That(app.Messages.Entries[^1].Text).Contains("not to Cy"); } + + /// ⌥C, then g on a row: that character joins the group, and the keys stay in the sidebar for the next. + [Test] + public async Task GOnASidebarRowTogglesThatCharacterInTheGroup() + { + var (app, _) = await Open("Ann", "Bob"); + await using var _app = app; + + app.SimulateKey(new ConsoleKeyInfo('c', ConsoleKey.C, false, true, false)); + await Assert.That(app.RailKeysActive).IsTrue(); + app.SimulateRailKey(new ConsoleKeyInfo('g', ConsoleKey.G, false, false, false)); + + await Assert.That(app.SendGroupKeys.Count).IsEqualTo(1); + await Assert.That(app.RailKeysActive).IsTrue().Because("g keeps the keys in the sidebar"); + + app.SimulateRailKey(new ConsoleKeyInfo('g', ConsoleKey.G, false, false, false)); + await Assert.That(app.SendGroupKeys.Count).IsEqualTo(0).Because("a second g takes the character out again"); + } + + /// ⌥S sends the command line to the group, as ⌃P ▸ Send to group does, and the entry names the chord. + [Test] + public async Task AltSSendsTheCommandLineToTheGroup() + { + var (app, wires) = await Open("Ann", "Bob"); + await using var _app = app; + app.DispatchCommand(CommandIds.GroupToggle("Mush.Ann")); + app.DispatchCommand(CommandIds.GroupToggle("Mush.Bob")); + + var entry = app.BuildCatalog().Single(i => i.Id == CommandIds.GroupSend); + await Assert.That(entry.Key).IsEqualTo("⌥S"); + + foreach (var c in "wave") + { + app.SimulateKey(new ConsoleKeyInfo(c, ConsoleKey.NoName, false, false, false)); + } + + app.SimulateKey(new ConsoleKeyInfo('s', ConsoleKey.S, false, true, false)); + await Task.Delay(50); + + await Assert.That(wires["Ann"].Lines).IsEquivalentTo(new[] { "wave" }); + await Assert.That(wires["Bob"].Lines).IsEquivalentTo(new[] { "wave" }); + } } diff --git a/tests/SharpMUTerm.Tui.Tests/TabOverflowTests.cs b/tests/SharpMUTerm.Tui.Tests/TabOverflowTests.cs index df5ba4fc..62b00367 100644 --- a/tests/SharpMUTerm.Tui.Tests/TabOverflowTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/TabOverflowTests.cs @@ -104,9 +104,8 @@ public async Task AClickOnTheChipDoesNotAlsoSelectTheTabUnderIt() var click = new List { MouseFlags.Button1Released, MouseFlags.Button1Clicked }; var at = new System.Drawing.Point(chip.X + 1, chip.Y); - await Assert.That(app.AChipClickReachesTheTabUnderIt(paneId, filtered: false)).IsTrue() - .Because("unfiltered, the framework's own click on the chip's cells lands on the tab drawn under it — the defect"); - + // Since the tab floor (wave 18) a tab left with fewer than four cells beside the chip is counted under it, so in + // this fixture the chip sits on the strip's fill; the filter is still what keeps a press from reaching the strip. await Assert.That(app.TakesTabOverflowPress(press, at)).IsTrue(); await Assert.That(app.TakesTabOverflowPress(click, at)).IsTrue(); await Assert.That(press.Concat(click).Any(f => f.ToString().StartsWith("Button1", StringComparison.Ordinal))).IsFalse() diff --git a/tests/SharpMUTerm.Tui.Tests/Wave18PaletteAndScreenTests.cs b/tests/SharpMUTerm.Tui.Tests/Wave18PaletteAndScreenTests.cs new file mode 100644 index 00000000..b7ccbcbb --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/Wave18PaletteAndScreenTests.cs @@ -0,0 +1,125 @@ +using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Commands; +using SharpMUTerm.Client.Palette; +using SharpMUTerm.Core.Automation; +using SharpMUTerm.Core.Commands; +using SharpMUTerm.Graphics; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// Wave 18's ⌃P, F5 and tab-strip fixes, read off real frames: the script entries' group, the five-letter match, +/// Recent alerts, the palette leaving the command line in view at 80×24, F5 eliding at 80 columns and the tab floor. +/// +[NotInParallel] +public class Wave18PaletteAndScreenTests +{ + private static readonly TerminalCapabilities Caps = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private static SharpMUTermApp Demo(int width = 120, int height = 32) + { + Console.SetIn(TextReader.Null); + return new SharpMUTermApp(DemoScene.Build(), ClientHost.Headless(new HeadlessConsoleDriver(width, height), Caps)); + } + + [Test] + public async Task TheScriptEntriesAreUnderHelpAndSetupNotConnection() + { + await using var app = Demo(); + app.RenderSnapshot("script-list"); + var catalog = app.BuildCatalog(); + + var console = catalog.Single(i => i.Id == BuiltInCommands.ScriptConsoleCommand); + await Assert.That(console.Group).IsEqualTo(CommandGroup.Help); + var files = catalog.Where(i => i.Id.StartsWith(BuiltInCommands.ScriptOpenPrefix, StringComparison.Ordinal)).ToList(); + await Assert.That(files.Count).IsGreaterThan(0); + await Assert.That(files.All(f => f.Group == CommandGroup.Help)).IsTrue(); + + // Listed together or not at all (D7c): the files are listed here, so New script… is too. + await Assert.That(catalog.Select(i => i.Id)).Contains(BuiltInCommands.ScriptNewCommand); + await Assert.That(catalog.Select(i => i.Id)).Contains(BuiltInCommands.ScriptEditCommand); + } + + [Test] + public async Task SceneListsOnlyTheSceneEntries() + { + await using var app = Demo(); + app.RenderSnapshot(null); + var view = CommandPaletteModel.Build("scene", app.BuildCatalog()); + + await Assert.That(view.Entries.Count).IsGreaterThan(0); + await Assert.That(view.Entries.All(e => e.Item.Title.Contains("scene", StringComparison.OrdinalIgnoreCase) + || (e.Item.Detail ?? e.Item.Subtitle ?? string.Empty).Contains("scene", StringComparison.OrdinalIgnoreCase))).IsTrue() + .Because(string.Join(", ", view.Entries.Select(e => e.Item.Title))); + } + + [Test] + public async Task RecentAlertsListsEveryCharactersAlertsAndGoesToTheirWindow() + { + await using var app = Demo(); + var frame = string.Join("\n", FrameGrid.Decode(app.RenderSnapshot("menu-alerts"), 120, 32)); + + await Assert.That(app.RecentAlerts.Count).IsEqualTo(3); + await Assert.That(app.RecentAlerts[0].Text).Contains("north gate").Because("newest first"); + await Assert.That(frame).Contains("Alert · Corvid · Aetherfall: Rivane pages"); + await Assert.That(frame).Contains("Alert · Thistle · Grapevine"); + await Assert.That(frame).Contains("14 min ago"); + + var corvid = app.RecentAlerts[0]; + await Assert.That(app.DispatchCommand(BuiltInCommands.Alert(corvid.Id))).IsTrue(); + await Assert.That(app.DispatchCommand(BuiltInCommands.Alert(9999))).IsFalse().Because("an alert no longer kept refuses"); + } + + [Test] + public async Task TheAlertEntriesAreListedOnlyInThePaletteRecentAlertsOpened() + { + await using var app = Demo(); + app.RenderSnapshot(null); + await Assert.That(app.BuildCatalog().Any(i => i.Id == BuiltInCommands.RecentAlertsCommand)).IsFalse().Because("none kept yet"); + + app.SimulateAlert(DemoScene.ActiveSessionKey, AttentionReason.Page, "Rivane pages: hello"); + var catalog = app.BuildCatalog(); + await Assert.That(catalog.Single(i => i.Id == BuiltInCommands.RecentAlertsCommand).Title).IsEqualTo("Recent alerts (1)"); + await Assert.That(catalog.Any(i => i.Id.StartsWith(BuiltInCommands.AlertPrefix, StringComparison.Ordinal))).IsFalse() + .Because("a plain ⌃P is not crowded with them"); + } + + [Test] + public async Task ThePaletteLeavesTheCommandLineInViewAt80By24() + { + await using var app = Demo(80, 24); + var rows = FrameGrid.Decode(app.RenderSnapshot("menu"), 80, 24); + + await Assert.That(rows[22]).StartsWith("Corvid · Aetherfall ›").Because(rows[22]); + await Assert.That(rows.Take(22).Any(r => r.Contains('└'))).IsTrue().Because("the palette's bottom border is above it"); + } + + [Test] + public async Task F5ElidesItsValuesAt80Columns() + { + await using var app = Demo(80, 24); + var rows = FrameGrid.Decode(app.RenderSnapshot("worlds"), 80, 24); + + await Assert.That(rows.Any(r => r.TrimEnd().EndsWith("encrypt this conn…", StringComparison.Ordinal))).IsTrue() + .Because(string.Join("\n", rows)); + await Assert.That(rows.Any(r => r.Contains("channel + page …", StringComparison.Ordinal))).IsTrue(); + } + + [Test] + public async Task NoOverflowedTabIsCutBelowThreeLetters() + { + await using var app = Demo(80, 24); + var rows = FrameGrid.Decode(app.RenderSnapshot("tabs-many"), 80, 24); + var strip = rows.First(r => r.Contains('▾')); + + foreach (System.Text.RegularExpressions.Match cut in System.Text.RegularExpressions.Regex.Matches(strip, @"(\S+)…")) + { + await Assert.That(cut.Groups[1].Value.Length).IsGreaterThanOrEqualTo(3).Because(strip); + } + + // Nothing left of a clipped tab beside the chip: the cell before " +N ▾" is the strip's own fill or a tab's end. + var chip = strip.IndexOf(" +", StringComparison.Ordinal); + await Assert.That(strip[..chip].TrimEnd()).DoesNotEndWith(" R"); + } +} From cd3f115c6136cb26f032e5b38209eb80379eafda Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 17:09:09 +0000 Subject: [PATCH 062/113] Browse worlds: choose among a world's addresses; carry its charset; ask unnamed=!yes A pick whose game lists more than one telnet/TLS address (not gone) opens an address choice in the same surface, both hosts: host:port, TLS or plain, active/stale, not connectable where /connect would refuse it. The first connectable one is selected; Esc goes back to the list. The chosen address fills the connect form, TLS included, and mu*index's per-game CHARSET sets the world's encoding when it is a non-UTF-8 charset F5 offers. WorldDirectory now shows the directory's data as it states it (rows, order, counts and labels, addresses in order) and keeps only safety: https, size, time and row caps, text cleaning, ConnectEndpoint.Parse before the form. Every list asks unnamed=!yes. --plain gains /browse N M. New browse-worlds-endpoints view. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 5 + CLAUDE.md | 32 ++- src/SharpMUTerm.Avalonia/WorldBrowseView.cs | 133 ++++++++++- src/SharpMUTerm.Client/Help/SlashCommands.cs | 3 +- src/SharpMUTerm.Client/Modals/WelcomeModel.cs | 10 +- .../Modals/WorldBrowseModel.cs | 110 ++++++++- .../Surfaces/SurfaceCatalog.cs | 4 + .../WorldIndex/WorldDirectory.cs | 217 +++++++++++++----- src/SharpMUTerm.Tui/DemoWorldDirectory.cs | 29 ++- src/SharpMUTerm.Tui/SharpMUTermApp.Welcome.cs | 6 + .../SharpMUTermApp.WorldBrowse.cs | 173 ++++++++++++-- src/SharpMUTerm.Tui/SharpMUTermApp.cs | 12 +- src/SharpMUTerm.Tui/SnapshotViews.cs | 2 +- src/SharpMUTerm.Tui/WelcomeSurface.cs | 16 +- src/SharpMUTerm.Tui/WorldBrowseSurface.cs | 108 ++++++++- .../SurfaceParityTests.cs | 17 +- .../WorldBrowseModelTests.cs | 47 +++- .../WorldIndex/WorldDirectoryTests.cs | 86 +++++-- tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs | 1 + .../SharpMUTerm.Tui.Tests/WorldBrowseTests.cs | 125 +++++++++- 20 files changed, 977 insertions(+), 159 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c52877e3..aeb802fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,11 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- Browse worlds: a world listed at several addresses (TLS and plain, another port, an old one) now lets you choose + which before the connect form opens; the form takes that address's TLS setting, and the world is saved with the + game's character set when mu*index names one other than UTF-8. `/browse N M` says address M in `--plain`. +- Browse worlds shows mu*index's list as mu*index gives it — every row, in its order, with its player counts and their + labels — and asks it to leave out games listed only by an address. - A script error in the script console that names a file and line is now a link: click it to open that script with the caret on the line and the line marked. Closing the editor goes back to the console. - The script editor numbers its lines in the desktop window too, and after a save whose reload fails, the line the diff --git a/CLAUDE.md b/CLAUDE.md index 7bfaa89e..6a851c4a 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -788,20 +788,32 @@ fallbacks) for inline images/maps. - **Browse worlds lists mu*index, and a pick only fills in the welcome's connect form** (`WorldDirectory`, Core `WorldIndex/`; `WorldBrowseModel`/`WorldBrowseSession`, Client; `WorldBrowseSurface`, `SharpMUTermApp.WorldBrowse.cs`, `DemoWorldDirectory`, Tui; `WorldBrowseView`, Avalonia; the welcome's Browse row, ⌃P ▸ *Browse worlds…*, `/browse - [words]`, `/browse N`; surface `browse-worlds`; the `browse-worlds`, `-failed` and `-picked` views). Decisions: + [words]`, `/browse N`, `/browse N M`; surface `browse-worlds`; the `browse-worlds`, `-failed`, `-picked` and `-endpoints` + views). Decisions: - **Asked only when opened**, through `worldFetch:` (the `save:` family: null in tests and snapshots, which say they asked nothing; `Program` passes `WorldDirectory.DownloadAsync`; the demo answers from `DemoWorldDirectory`, made-up worlds on `.example` hosts). https only (`AppConfiguration.WorldDirectoryUrl`, default `https://mu-index.com/api`), 2 MiB capped - while streaming, 15 s, 200 rows; an answer from a stale request (newer question, or closed) is dropped by generation. - - **The answer is server text**: names, taglines and codebases are bounded and stripped of control, format (bidi), - private-use and unassigned characters (`WorldDirectory.Clean`); a row with no id or name, archived, or repeated is - dropped and counted; a player count is shown only when the directory says `measured`, or `declared` marked `~`. - - **A pick asks `GET /games/{id}` for the address**: `telnet` or `tls`, `active` before `stale`, never `gone`, newest - `lastSeenAt`, and only what `ConnectEndpoint.Parse` takes. Then Browse closes and the welcome's form opens prefilled - (`WelcomeSurface.Prefill`, `WelcomeModel.WorldName`); nothing is saved or dialled until its ⏎, which goes through - `ConnectFromWelcome` → `ConnectCommand` and names the world as listed (dropped if the host is edited). + while streaming, 15 s, 200 rows, 8 addresses a game; an answer from a stale request (newer question, or closed) is + dropped by generation. Every list asks `unnamed=!yes` (MUIndex's facet that leaves out games listed only by host:port). + - **The directory is the authority on its own data; the client does not second-guess it.** Rows are shown in its order, + archived, repeated, unnamed or id-less included (an id-less pick says so), with its player count and its label (`~` + declared, `?` unlabelled); addresses in its order, leaving out only `gone` and kinds this client cannot dial (websocket, + http). What stays is safety: the caps above, and every text is server text, bounded and stripped of control, format + (bidi), private-use and unassigned characters (`WorldDirectory.Clean`). + - **A pick asks `GET /games/{id}`.** One address goes straight to the form; several are a choice in the same surface + (`WorldBrowseModel.Choosing`, a `WorldGame`): `host:port`, TLS or plain, active or stale, the first connectable one + selected; Esc goes back to the list (`LeaveWorldChoice`), ⏎ is `ChooseWorldEndpoint`. An address `ConnectEndpoint.Parse` + refuses is listed `not connectable` and refused out loud, never put in the form. Then Browse closes and the welcome's + form opens prefilled (`WelcomeSurface.Prefill`: host, port, TLS, `WorldName`, `Encoding`); nothing is saved or dialled + until its ⏎, which goes through `ConnectFromWelcome` → `ConnectCommand` and names the world as listed (name and encoding + dropped if the host is edited). + - **Charset is the game's, not an address's.** mu*index's `GameView` has no per-endpoint charset; the only one is + `fields.CHARSET` (the precedence winner of a game field: handshake-measured or MSSP-declared, with `source`/`measured` + beside it). The choice says it once, for the whole game. A world is saved with an encoding only when that names a charset + F5 offers that is not UTF-8 or ASCII (`WorldDirectory.EncodingFor`: ISO-8859-1, CP1252, CP437); otherwise `auto`. - ⏎ on a search none of the held rows match asks the directory (`AsksDirectory`). Every listing shows the CC BY 4.0 - credit (`AttributionLine`). `--plain` says the rows as numbered lines and `/browse N` says the `/connect` line. + credit (`AttributionLine`). `--plain` says the rows as numbered lines; `/browse N` says the `/connect` line, or the + addresses numbered when there are several, and `/browse N M` says address M's. - *Browse packages* is unchanged; the welcome no longer leads there. The live API has not been exercised from here. - **The URLs a world prints as plain text are marked up by this client, because the terminal's own detection cannot survive a pane** (`UrlDetector`, Core; F7 ▸ `detect links in output`, default on). diff --git a/src/SharpMUTerm.Avalonia/WorldBrowseView.cs b/src/SharpMUTerm.Avalonia/WorldBrowseView.cs index a36fe40f..555c21c4 100644 --- a/src/SharpMUTerm.Avalonia/WorldBrowseView.cs +++ b/src/SharpMUTerm.Avalonia/WorldBrowseView.cs @@ -15,7 +15,8 @@ namespace SharpMUTerm.Avalonia; /// directory's licence asks for, and the keys. The rows are , the function the cell /// surface lists, so both hosts list the same rows. Enter on a row hands the pick to the client, which asks where the /// world is and opens the connect form in this modal's place; Enter on a search the rows cannot answer asks the -/// directory. Every word is the window's (). +/// directory. A world that answers at several addresses lists them in the same card (): +/// Enter hands the chosen one to the client, Esc goes back to the list. Every word is the window's (). /// internal sealed class WorldBrowseView : DockPanel, IModalView { @@ -26,6 +27,8 @@ internal sealed class WorldBrowseView : DockPanel, IModalView private readonly TextBlock _count; private readonly Button _sort; private readonly TextBlock _note; + private readonly TextBlock _footer; + private readonly DockPanel _bar; private readonly StackPanel _list; private readonly List _rows = []; private WorldBrowseModel _model; @@ -53,7 +56,7 @@ public WorldBrowseView(WorldBrowseSession session, NativeTokens colours, Action SetDock(_box, Dock.Top); Children.Add(_box); - var bar = new DockPanel { Margin = new Thickness(20, 0, 14, 4) }; + var bar = _bar = new DockPanel { Margin = new Thickness(20, 0, 14, 4) }; _sort = ModalParts.Button(SortLabel(), "Tab", colours, ToggleSort); SetDock(_sort, Dock.Right); bar.Children.Add(_sort); @@ -63,7 +66,7 @@ public WorldBrowseView(WorldBrowseSession session, NativeTokens colours, Action SetDock(bar, Dock.Top); Children.Add(bar); - var footer = ModalParts.Footer(string.Join(" · ", WorldBrowseModel.Keys.Select(k => $"{k.Key} {k.Label}")), colours); + var footer = _footer = ModalParts.Footer(KeysText(WorldBrowseModel.Keys), colours); SetDock(footer, Dock.Bottom); Children.Add(footer); @@ -111,6 +114,9 @@ public WorldBrowseView(WorldBrowseSession session, NativeTokens colours, Action /// The order the rows are in, for a test. public WorldDirectorySort Order => _order; + /// Whether a picked world's addresses are listed in place of the worlds, for a test. + public bool ChoosingAddress => _model.Choosing is not null; + /// The search box, for a test. public TextBox Box => _box; @@ -121,9 +127,15 @@ public WorldBrowseView(WorldBrowseSession session, NativeTokens colours, Action public void Detach() => _session.Changed -= OnChanged; - /// Enter on listed row , or on a search the rows cannot answer. + /// Enter on listed row , or on a search the rows cannot answer — or, while a world's addresses are listed, on address . public void Choose(int row) { + if (_model.Choosing is not null) + { + _session.Choose(row); + return; + } + if (_model.AsksDirectory(_query)) { _session.Ask(_query); @@ -162,25 +174,116 @@ private string SortLabel() private void OnChanged(WorldBrowseModel model) => Dispatcher.UIThread.Post(() => { - var rowsChanged = !ReferenceEquals(model.Rows, _model.Rows); + var rowsChanged = !ReferenceEquals(model.Rows, _model.Rows) || !ReferenceEquals(model.Choosing, _model.Choosing); + var leftChoice = _model.Choosing is not null && model.Choosing is null; _model = model; if (rowsChanged) { - _selected = 0; + _selected = Math.Max(0, model.Choosing?.FirstConnectable ?? 0); } ShowList(); + if (leftChoice) + { + _box.Focus(); + } }); + private static string KeysText(IReadOnlyList<(string Key, string Label)> keys) => + string.Join(" · ", keys.Select(k => $"{k.Key} {k.Label}")); + + /// A picked world's addresses, one row each: host:port, TLS or plain, and its state. + private void ShowChoice(WorldGame game) + { + _box.IsVisible = false; + _bar.IsVisible = false; + _footer.Text = NativeKeys.Words(KeysText(WorldBrowseModel.ChoiceKeys)); + _note.Text = NativeKeys.Words(_model.Problem ?? WorldBrowseModel.ChoiceNote); + _note.Foreground = _colours.Brush(_model.Problem is null ? _colours.Dim : _colours.Warn); + _list.Children.Clear(); + _rows.Clear(); + _list.Children.Add(new TextBlock + { + Text = _model.ChoiceLine, + Foreground = _colours.Brush(_colours.Text), + FontSize = NativeTokens.Title, + FontWeight = FontWeight.SemiBold, + Margin = new Thickness(12, 8, 12, 2), + TextWrapping = TextWrapping.Wrap, + }); + _list.Children.Add(new TextBlock + { + Text = _model.CharsetLine, + Foreground = _colours.Brush(_colours.Dim), + FontSize = NativeTokens.Body, + Margin = new Thickness(12, 0, 12, 8), + TextWrapping = TextWrapping.Wrap, + }); + _selected = Math.Clamp(_selected, 0, game.Endpoints.Count - 1); + for (var i = 0; i < game.Endpoints.Count; i++) + { + var endpoint = game.Endpoints[i]; + var (address, security, state) = WorldBrowseModel.Endpoint(endpoint); + var index = i; + var line = new DockPanel(); + var host = new TextBlock + { + Text = address, + Foreground = _colours.Brush(_colours.Text), + FontSize = NativeTokens.Title, + Width = 300, + Margin = new Thickness(0, 0, 12, 0), + TextTrimming = TextTrimming.CharacterEllipsis, + VerticalAlignment = VerticalAlignment.Center, + }; + SetDock(host, Dock.Left); + line.Children.Add(host); + var kind = new TextBlock + { + Text = security, + Foreground = _colours.Brush(endpoint.Tls ? _colours.Accent : _colours.Dim), + FontSize = NativeTokens.Body, + FontWeight = endpoint.Tls ? FontWeight.SemiBold : FontWeight.Normal, + Width = 64, + VerticalAlignment = VerticalAlignment.Center, + }; + SetDock(kind, Dock.Left); + line.Children.Add(kind); + line.Children.Add(new TextBlock + { + Text = state, + Foreground = _colours.Brush(endpoint.Stale || !endpoint.Connectable ? _colours.Warn : _colours.Dim), + FontSize = NativeTokens.Body, + TextTrimming = TextTrimming.CharacterEllipsis, + VerticalAlignment = VerticalAlignment.Center, + }); + var row = ModalParts.Row(line, address, () => Select(index), () => Choose(index)); + ToolTip.SetTip(row, WorldBrowseModel.EndpointText(endpoint)); + _rows.Add(row); + _list.Children.Add(row); + } + + Highlight(); + } + private void ShowList() { + if (_model.Choosing is { } game) + { + ShowChoice(game); + return; + } + + _box.IsVisible = true; + _bar.IsVisible = true; + _footer.Text = NativeKeys.Words(KeysText(WorldBrowseModel.Keys)); _view = _model.View(_query, _order); _count.Text = _model.CountLine(_query); _note.Text = NativeKeys.Words( _model.Opening is not null ? _model.OpeningLine : _model.State == WorldBrowseState.Ready && _model.Problem is { } problem ? problem : _model.State == WorldBrowseState.Ready && _view.Count > 0 - ? (_model.AnyDeclared ? WorldBrowseModel.DeclaredNote + " · " : string.Empty) + WorldBrowseModel.PickNote + ? _model.MarksNote + WorldBrowseModel.PickNote : string.Empty); _note.Foreground = _colours.Brush(_model.State == WorldBrowseState.Ready && _model.Problem is not null && _model.Opening is null ? _colours.Warn @@ -296,20 +399,30 @@ private void OnKey(object? sender, KeyEventArgs e) { case Key.Escape: e.Handled = true; + if (_model.Choosing is not null) + { + _session.Back(); + return; + } + _session.Dismiss(); _done(); return; case Key.Up: e.Handled = true; - Select(ModalParts.Step(_selected, -1, _view.Count)); + Select(ModalParts.Step(_selected, -1, _rows.Count)); return; case Key.Down: e.Handled = true; - Select(ModalParts.Step(_selected, 1, _view.Count)); + Select(ModalParts.Step(_selected, 1, _rows.Count)); return; case Key.Tab: e.Handled = true; - ToggleSort(); + if (_model.Choosing is null) + { + ToggleSort(); + } + return; case Key.Enter: e.Handled = true; diff --git a/src/SharpMUTerm.Client/Help/SlashCommands.cs b/src/SharpMUTerm.Client/Help/SlashCommands.cs index 68c3bd87..8df5baa6 100644 --- a/src/SharpMUTerm.Client/Help/SlashCommands.cs +++ b/src/SharpMUTerm.Client/Help/SlashCommands.cs @@ -21,7 +21,8 @@ public static class SlashCommands new("/welcome", "/welcome", "Show the first-run welcome again", "/welcome"), new("/welcome", "/welcome layout roleplay|combat|suggested", "Choose the starting layout the welcome offers", "/welcome layout "), new("/browse", "/browse [words]", "Browse worlds listed on mu*index, searched for the words; a pick fills in the connect form", "/browse "), - new("/browse", "/browse ", "Where world n of the list /browse said is (with no screen to read, the /connect line to type)", "/browse "), + new("/browse", "/browse ", "Where world n of the list /browse said is (with no screen to read, the /connect line to type, or its addresses numbered when it has several)", "/browse "), + new("/browse", "/browse ", "Address m of world n, when it answers at several (TLS, plain, another port): its /connect line", "/browse "), new("/import", "/import ", "Import worlds, characters and automation from MUSHclient, Mudlet or TinTin++; nothing is written before Enter", "/import "), new("/package", "/package", "Open the Packages screen (F10)", "/package"), new("/package", "/package browse", "Browse the package index, this game's packages first", "/package browse"), diff --git a/src/SharpMUTerm.Client/Modals/WelcomeModel.cs b/src/SharpMUTerm.Client/Modals/WelcomeModel.cs index 52c53bb8..676faa94 100644 --- a/src/SharpMUTerm.Client/Modals/WelcomeModel.cs +++ b/src/SharpMUTerm.Client/Modals/WelcomeModel.cs @@ -41,7 +41,8 @@ public enum WelcomeField /// /// The first-run welcome's model: the menu or the connect form, with everything either says. Drawn by the cell /// surface (WelcomeSurface.Render) and by the window's native one. IndexProblem is why Browse worlds cannot -/// ask the world directory (null when it can); WorldName is the world Browse worlds filled the form in for. +/// ask the world directory (null when it can); WorldName is the world Browse worlds filled the form in for, and +/// Encoding the encoding the world will be saved with because mu*index named a non-UTF-8 charset for it (null: auto). /// public sealed record WelcomeModel( bool InForm, @@ -55,7 +56,8 @@ public sealed record WelcomeModel( bool PasswordLater, string? Problem, string? IndexProblem, - string? WorldName = null) + string? WorldName = null, + string? Encoding = null) { /// The example the surface names, a host nobody owns (RFC 2606). public const string ExampleCommand = "/connect mud.example.org 4201 tls"; @@ -93,7 +95,9 @@ public sealed record WelcomeModel( /// public string FormIntroLine => WorldName is null ? FormIntro - : $"{WorldName}, as listed on mu*index. Check it and press ⏎ to save and connect."; + : Encoding is { } encoding + ? $"{WorldName}, as listed on mu*index, saved with encoding {encoding}. Check it and press ⏎ to save and connect." + : $"{WorldName}, as listed on mu*index. Check it and press ⏎ to save and connect."; /// The TLS row's words when on; the window's check box carries these words. public const string TlsOn = "On, encrypted"; diff --git a/src/SharpMUTerm.Client/Modals/WorldBrowseModel.cs b/src/SharpMUTerm.Client/Modals/WorldBrowseModel.cs index a99b96dd..3caa812a 100644 --- a/src/SharpMUTerm.Client/Modals/WorldBrowseModel.cs +++ b/src/SharpMUTerm.Client/Modals/WorldBrowseModel.cs @@ -31,13 +31,18 @@ public enum WorldBrowseState /// The words the directory was last asked to search for, or empty for its most played. /// Why the list failed or cannot be asked, or why the last pick did not open; null when nothing. /// The world whose address is being asked for after a pick, or null. +/// +/// A picked world that answers at more than one usable address, while the player chooses one; null otherwise. A world +/// with one address goes straight to the connect form and is never chosen here. +/// public sealed record WorldBrowseModel( WorldBrowseState State, IReadOnlyList Rows, int Total, string AskedFor, string? Problem, - string? Opening) + string? Opening, + WorldGame? Choosing = null) { // The surface's words, said once here so both hosts say them alike. @@ -66,6 +71,12 @@ public sealed record WorldBrowseModel( /// What the mark means, said only while a row carries it. public const string DeclaredNote = "~ a count the game reports about itself"; + /// What a count the directory does not label measured or declared is marked with. + public const string UnlabelledMark = "?"; + + /// What that mark means, said only while a row carries it. + public const string UnlabelledNote = "? a count mu*index does not label"; + /// The keys that act, in glyphs: the cells ladder them, the window spells them in words. public static IReadOnlyList<(string Key, string Label)> Keys { get; } = [ @@ -75,6 +86,46 @@ public sealed record WorldBrowseModel( ("Esc", "closes"), ]; + /// The keys while an address is being chosen. + public static IReadOnlyList<(string Key, string Label)> ChoiceKeys { get; } = + [ + ("↑↓", "pick"), + ("⏎", "connect form"), + ("Esc", "back"), + ]; + + /// What the address choice says under its rows. + public const string ChoiceNote = "⏎ fills in the connect form with this address; nothing is saved or dialled until you press ⏎ there."; + + /// The address choice's first line: whose addresses, and how many. + public string ChoiceLine => Choosing is { } game + ? $"{game.Name} answers at {game.Endpoints.Count} addresses — choose one" + : string.Empty; + + /// + /// What the address choice says about text encoding: the charset mu*index names for the whole game (it names none + /// per address), and whether the form will set the world's encoding from it. + /// + public string CharsetLine => Choosing is not { } game ? string.Empty + : game.Charset is not { } charset ? "mu*index names no charset for it; the world's encoding stays auto" + : game.Encoding is { } encoding ? $"charset {charset} for the whole game (not per address) · the form sets encoding {encoding}" + : $"charset {charset} for the whole game (not per address) · the world's encoding stays auto"; + + /// An address's columns as both hosts write them: host:port, TLS or plain, and its state. + public static (string Address, string Security, string State) Endpoint(WorldEndpoint endpoint) + { + ArgumentNullException.ThrowIfNull(endpoint); + var state = endpoint.Stale ? "stale · not reached lately" : "active"; + return (endpoint.Address, endpoint.Tls ? "TLS" : "plain", endpoint.Connectable ? state : $"{state} · not connectable"); + } + + /// An address as one line (--plain, a tooltip). + public static string EndpointText(WorldEndpoint endpoint) + { + var (address, security, state) = Endpoint(endpoint); + return $"{address} — {security} — {state}"; + } + /// A sort's name as both hosts say it. public static string SortName(WorldDirectorySort sort) => sort == WorldDirectorySort.Name ? "by name" : "by players"; @@ -82,12 +133,16 @@ public sealed record WorldBrowseModel( public static WorldDirectorySort Next(WorldDirectorySort sort) => sort == WorldDirectorySort.Players ? WorldDirectorySort.Name : WorldDirectorySort.Players; - /// A row's player count as both hosts write it: 12, ~12 for a declared one, – for none. + /// + /// A row's player count as both hosts write it, with the directory's label: 12 measured, ~12 declared, + /// ?12 unlabelled, – for none. + /// public static string Players(WorldListing row) { ArgumentNullException.ThrowIfNull(row); return row.Players is not { } count ? "–" - : (row.Count == WorldPlayerCount.Declared ? DeclaredMark : string.Empty) + count.ToString(CultureInfo.InvariantCulture); + : (row.Count switch { WorldPlayerCount.Declared => DeclaredMark, WorldPlayerCount.Unknown => UnlabelledMark, _ => string.Empty }) + + count.ToString(CultureInfo.InvariantCulture); } /// @@ -153,38 +208,57 @@ public string CountLine(string? query) } /// Whether any row carries a count the game reports about itself, so is said. - public bool AnyDeclared => Rows.Any(r => r.Count == WorldPlayerCount.Declared); + public bool AnyDeclared => Rows.Any(r => r.Players is not null && r.Count == WorldPlayerCount.Declared); + + /// Whether any row carries a count the directory does not label, so is said. + public bool AnyUnlabelled => Rows.Any(r => r.Players is not null && r.Count == WorldPlayerCount.Unknown); + + /// What the marks on the counts listed mean, joined, followed by " · "; empty when no row is marked. + public string MarksNote => + string.Concat( + AnyDeclared ? DeclaredNote + " · " : string.Empty, + AnyUnlabelled ? UnlabelledNote + " · " : string.Empty); public bool Equals(WorldBrowseModel? other) => other is not null && State == other.State && Total == other.Total && AskedFor == other.AskedFor - && Problem == other.Problem && Opening == other.Opening && ModelLists.Same(Rows, other.Rows); + && Problem == other.Problem && Opening == other.Opening && Equals(Choosing, other.Choosing) && ModelLists.Same(Rows, other.Rows); - public override int GetHashCode() => HashCode.Combine(State, Total, AskedFor, Problem, Opening, ModelLists.Hash(Rows)); + public override int GetHashCode() => HashCode.Combine(State, Total, AskedFor, Problem, Opening, Choosing, ModelLists.Hash(Rows)); } /// /// One opening of Browse worlds in a host's own controls. The host filters and sorts the model's rows itself /// (); a pick and a search the rows held cannot answer come back through here to the /// methods the cell surface's ⏎ ends in. A pick does not close the surface: the client asks where the world is, and -/// closes it once the connect form opens in its place. +/// closes it once the connect form opens in its place — or, when the world answers at several addresses, publishes them +/// () for or . /// public sealed class WorldBrowseSession : ModalSession { private readonly Action _pick; private readonly Action _ask; + private readonly Action _choose; + private readonly Action _back; /// What the surface lists now. /// Whether the client's theme is a dark one. /// Picks row N of . /// Asks the directory to search for the words. + /// Chooses address N of . + /// Leaves the address choice for the list. /// Told the surface closed. - public WorldBrowseSession(WorldBrowseModel model, bool isDark, Action pick, Action ask, Action closed) + public WorldBrowseSession( + WorldBrowseModel model, bool isDark, Action pick, Action ask, Action choose, Action back, Action closed) : base(model, isDark, closed) { ArgumentNullException.ThrowIfNull(pick); ArgumentNullException.ThrowIfNull(ask); + ArgumentNullException.ThrowIfNull(choose); + ArgumentNullException.ThrowIfNull(back); _pick = pick; _ask = ask; + _choose = choose; + _back = back; } public override string Surface => "browse-worlds"; @@ -195,7 +269,7 @@ public WorldBrowseSession(WorldBrowseModel model, bool isDark, Action pick, /// The host's: ⏎ on row of . public void Pick(int index) { - if (!IsEnded && index >= 0 && index < Model.Rows.Count) + if (!IsEnded && Model.Choosing is null && index >= 0 && index < Model.Rows.Count) { _pick(index); } @@ -210,4 +284,22 @@ public void Ask(string query) _ask(query.Trim()); } } + + /// The host's: ⏎ on address of . + public void Choose(int index) + { + if (!IsEnded && Model.Choosing is { } game && index >= 0 && index < game.Endpoints.Count && game.Endpoints[index].Connectable) + { + _choose(index); + } + } + + /// The host's: Esc while an address is being chosen, back to the list. + public void Back() + { + if (!IsEnded && Model.Choosing is not null) + { + _back(); + } + } } diff --git a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs index 49c2c84d..ab372e3a 100644 --- a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs +++ b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs @@ -523,6 +523,10 @@ [.. PanelViews("MapCanvas"), "SharpMUTerm.Avalonia.MapInspector"]), // saved or dialled before the player's own Enter there. A query the rows held cannot answer is asked of it. new(SurfaceActionKind.Modal, "pick", "PickWorld"), new(SurfaceActionKind.Modal, "ask", "AskWorldDirectory"), + + // A world that answers at several addresses is chosen from first (TLS active first); Esc goes back. + new(SurfaceActionKind.Modal, "choose", "ChooseWorldEndpoint"), + new(SurfaceActionKind.Modal, "back", "LeaveWorldChoice"), ], NativeModal, "SharpMUTerm.Tui.WorldBrowseSurface.Render", diff --git a/src/SharpMUTerm.Core/WorldIndex/WorldDirectory.cs b/src/SharpMUTerm.Core/WorldIndex/WorldDirectory.cs index 37d1ccda..a1cbd562 100644 --- a/src/SharpMUTerm.Core/WorldIndex/WorldDirectory.cs +++ b/src/SharpMUTerm.Core/WorldIndex/WorldDirectory.cs @@ -29,15 +29,18 @@ public enum WorldPlayerCount } /// One world as the directory lists it, every text already bounded and stripped of control characters. -/// The directory's durable key, for asking where the world is. +/// The directory's durable key, for asking where the world is; when the row gave none it could read. /// Its name. /// Its one-line description, or empty. /// The server software family (PennMUSH), or empty when unknown. -/// Players counted now, or null. -/// How was obtained. +/// Players now, as the directory says, or null. +/// How was obtained, as the directory labels it. public sealed record WorldListing(Guid Id, string Name, string Tagline, string Codebase, int? Players, WorldPlayerCount Count); -/// A page of the directory: the rows read, how many the directory holds for the question, and how many rows it sent that were not read. +/// +/// A page of the directory: the rows read, in the directory's order, how many it holds for the question, and how many rows +/// it sent that were not read — past , or not a JSON object. +/// public sealed record WorldListPage(IReadOnlyList Rows, int Total, int Dropped) { public bool Equals(WorldListPage? other) => @@ -47,15 +50,83 @@ public bool Equals(WorldListPage? other) => } /// Where a world is: one telnet address the directory has seen it answer at, checked as /connect checks one. -public sealed record WorldAddress(string Name, string Host, int Port, bool Tls); +/// The world's name. +/// The host. +/// The port. +/// Whether the address is a TLS one. +/// +/// The encoding a world added from here is set to (one of F5's names), or null to leave it auto: set only when the +/// directory names a charset that is not UTF-8 and not ASCII (). +/// +public sealed record WorldAddress(string Name, string Host, int Port, bool Tls, string? Encoding = null); + +/// +/// One address a game answers at, as the directory lists it: a telnet or tls endpoint it does not call gone. +/// +/// The host: as read it, or the directory's text, cleaned and bounded, when it could not. +/// The port, or 0 when the directory gave none. +/// Whether it is a TLS address (the directory's tls kind, or TLS it measured there). +/// Whether the directory calls it stale: listed, not reached lately. +/// +/// Whether — the reader /connect uses — takes it. One it refuses is still listed, +/// marked not connectable, and is never put in the connect form. +/// +public sealed record WorldEndpoint(string Host, int Port, bool Tls, bool Stale, bool Connectable = true) +{ + /// host:port, an IPv6 host in brackets. + public string Address => $"{(Host.Contains(':') ? $"[{Host}]" : Host)}:{Port.ToString(CultureInfo.InvariantCulture)}"; +} + +/// +/// A game's page read down to what a connect needs: its telnet and TLS addresses in the order the directory lists them, +/// and the charset it names for the whole game, if any. +/// +/// The game's name. +/// At least one address, at most , in the directory's order. +/// The game's charset as the directory names it (bounded, cleaned), or null when it names none. +public sealed record WorldGame(string Name, IReadOnlyList Endpoints, string? Charset) +{ + /// The first address that can be dialled — the default — or -1 when none can. + public int FirstConnectable + { + get + { + for (var i = 0; i < Endpoints.Count; i++) + { + if (Endpoints[i].Connectable) + { + return i; + } + } + + return -1; + } + } + + /// The encoding a world added from this game is set to, or null to leave it auto. + public string? Encoding => WorldDirectory.EncodingFor(Charset); + + /// Endpoint as the address the connect form is filled in with. + public WorldAddress Address(int index) + { + var endpoint = Endpoints[index]; + return new WorldAddress(Name, endpoint.Host, endpoint.Port, endpoint.Tls, Encoding); + } + + public bool Equals(WorldGame? other) => + other is not null && Name == other.Name && Charset == other.Charset && Endpoints.SequenceEqual(other.Endpoints); + + public override int GetHashCode() => HashCode.Combine(Name, Charset, Endpoints.Count); +} /// /// The client side of mu*index (https://mu-index.com), the MU* directory Browse worlds lists: what to ask, how much of /// an answer to read, and how to read it. Everything that comes back is server text: a name or a tagline is -/// bounded and stripped of control characters before anything draws it, an address is read by -/// (the reader /connect uses) or not at all, and a row that breaks a rule is -/// dropped and counted rather than failing the list. The listing carries no address, so it is asked for one game at a -/// time, when the player picks it (). +/// bounded and stripped of control characters before anything draws it, and an address goes into the connect form only +/// if (the reader /connect uses) takes it. Otherwise what the directory says +/// is shown as it says it — its rows, their order, its counts and their labels, its addresses in its order — because the +/// directory is the authority on its own data; the client caps how much it reads and asks for nothing at start. The +/// listing carries no address, so it is asked for one game at a time, when the player picks it (). /// public static class WorldDirectory { @@ -77,6 +148,15 @@ public static class WorldDirectory /// The longest a codebase is kept. public const int MaxCodebase = 32; + /// The longest host shown for an address the client could not read as one. + public const int MaxHostShown = 64; + + /// The longest charset name kept. + public const int MaxCharset = 32; + + /// The most addresses one game offers. + public const int MaxEndpoints = 8; + /// The longest query sent. public const int MaxQuery = 64; @@ -97,7 +177,8 @@ public static class WorldDirectory return null; } - var text = new StringBuilder(root).Append("/games?limit=").Append(MaxRows).Append("&sort=players"); + // unnamed=!yes: the directory leaves out games it lists only by host:port (MUIndex's `unnamed` facet). + var text = new StringBuilder(root).Append("/games?limit=").Append(MaxRows).Append("&sort=players&unnamed=!yes"); var q = Clean(query, MaxQuery); if (q.Length > 0) { @@ -144,17 +225,16 @@ public static (WorldListPage? Page, string? Problem) ParseList(ReadOnlySpan(); - var seen = new HashSet(); var dropped = 0; foreach (var game in games.EnumerateArray()) { - if (rows.Count >= MaxRows || ReadListing(game) is not { } row || !seen.Add(row.Id)) + if (rows.Count >= MaxRows || game.ValueKind != JsonValueKind.Object) { dropped++; continue; } - rows.Add(row); + rows.Add(ReadListing(game)); } var total = root.TryGetProperty("total", out var t) && t.ValueKind == JsonValueKind.Number && t.TryGetInt32(out var n) && n >= 0 @@ -168,46 +248,32 @@ public static (WorldListPage? Page, string? Problem) ParseList(ReadOnlySpan= 0 and < 1_000_000 ? count : null; - var how = players is null ? WorldPlayerCount.Unknown : Text(game, "playersNowState") switch + var how = Text(game, "playersNowState") switch { "measured" => WorldPlayerCount.Measured, "declared" => WorldPlayerCount.Declared, _ => WorldPlayerCount.Unknown, }; - // A number the directory will not say it measured is not shown as one. - if (how == WorldPlayerCount.Unknown) - { - players = null; - } - - return new WorldListing(id, name, Clean(Text(game, "tagline"), MaxTagline), Clean(Text(game, "codebase"), MaxCodebase), players, how); + return new WorldListing( + id, Clean(Text(game, "name"), MaxName), Clean(Text(game, "tagline"), MaxTagline), Clean(Text(game, "codebase"), MaxCodebase), players, how); } /// - /// Reads a GET /games/{id} answer (GameView) down to the one address to offer: a telnet or - /// tls endpoint, never one the directory calls gone; active before stale, then the one - /// seen most recently. An address refuses is skipped. + /// Reads a GET /games/{id} answer (GameView) down to its addresses, in the order the directory lists + /// them: telnet and tls endpoints (a websocket or http one is not a telnet address) that it does not call + /// gone, at most . An address refuses is listed and + /// marked not connectable. The charset is the game's fields.CHARSET value — the directory's one charset field, + /// which names no address. /// - public static (WorldAddress? Address, string? Problem) ParseGame(ReadOnlySpan json) + public static (WorldGame? Game, string? Problem) ParseGame(ReadOnlySpan json) { if (json.Length > MaxResponseBytes) { @@ -229,46 +295,39 @@ public static (WorldAddress? Address, string? Problem) ParseGame(ReadOnlySpan(); + var listed = new List(); foreach (var endpoint in endpoints.EnumerateArray().Take(64)) { - if (endpoint.ValueKind != JsonValueKind.Object) + if (listed.Count >= MaxEndpoints) { - continue; + break; } var kind = Text(endpoint, "kind"); - var rank = Text(endpoint, "state") switch - { - "active" => 0, - "stale" => 1, - _ => -1, - }; - if (kind is not ("telnet" or "tls") || rank < 0 - || Text(endpoint, "host") is not { Length: > 0 and <= 253 } host - || host.Any(c => char.IsWhiteSpace(c) || char.IsControl(c)) - || !endpoint.TryGetProperty("port", out var portValue) || portValue.ValueKind != JsonValueKind.Number - || !portValue.TryGetInt32(out var port) - || ConnectEndpoint.Parse([host, port.ToString(CultureInfo.InvariantCulture)]) is not { } parsed) + var state = Text(endpoint, "state"); + if (endpoint.ValueKind != JsonValueKind.Object || kind is not ("telnet" or "tls") || state == "gone") { continue; } + var host = Text(endpoint, "host") ?? string.Empty; + var port = endpoint.TryGetProperty("port", out var portValue) && portValue.ValueKind == JsonValueKind.Number + && portValue.TryGetInt32(out var number) ? number : 0; var tls = kind == "tls" || (endpoint.TryGetProperty("tlsMeasured", out var measured) && measured.ValueKind == JsonValueKind.True); - var seen = Text(endpoint, "lastSeenAt") is { } at - && DateTimeOffset.TryParse(at, CultureInfo.InvariantCulture, DateTimeStyles.RoundtripKind, out var when) - ? when - : DateTimeOffset.MinValue; - candidates.Add((new WorldAddress(name.Length == 0 ? parsed.Host : name, parsed.Host, parsed.Port, tls), rank, seen)); + var parsed = host.Length is > 0 and <= 253 && !host.Any(c => char.IsWhiteSpace(c) || char.IsControl(c)) && port is > 0 and <= 65535 + ? ConnectEndpoint.Parse([host, port.ToString(CultureInfo.InvariantCulture)]) + : null; + listed.Add(parsed is { } ok + ? new WorldEndpoint(ok.Host, ok.Port, tls, state == "stale") + : new WorldEndpoint(Clean(host, MaxHostShown), Math.Clamp(port, 0, 65535), tls, state == "stale", Connectable: false)); } - if (candidates.Count == 0) + if (listed.Count == 0) { - return (null, "the directory lists no telnet address for it that answers"); + return (null, "the directory lists no telnet address for it"); } - var best = candidates.OrderBy(c => c.Rank).ThenByDescending(c => c.Seen).First(); - return (best.Address, null); + return (new WorldGame(name.Length == 0 ? listed[0].Host : name, listed, Charset(root)), null); } catch (JsonException) { @@ -276,6 +335,40 @@ public static (WorldAddress? Address, string? Problem) ParseGame(ReadOnlySpanThe game's fields.CHARSET value, cleaned and bounded; null when there is none. + private static string? Charset(JsonElement root) + { + if (!root.TryGetProperty("fields", out var fields) || fields.ValueKind != JsonValueKind.Object + || !fields.TryGetProperty("CHARSET", out var field) || field.ValueKind != JsonValueKind.Object) + { + return null; + } + + var value = Clean(Text(field, "value"), MaxCharset); + return value.Length > 0 ? value : null; + } + + /// + /// The F5 encoding a world is set to for a directory's , or null to leave it auto: + /// UTF-8, ASCII (which UTF-8 reads) and any name the client does not offer stay auto, so CHARSET still decides. + /// + public static string? EncodingFor(string? charset) + { + if (string.IsNullOrWhiteSpace(charset)) + { + return null; + } + + var key = new string(charset.Where(char.IsAsciiLetterOrDigit).ToArray()).ToUpperInvariant(); + return key switch + { + "ISO88591" or "LATIN1" or "ISOLATIN1" or "L1" or "ISOIR100" or "CP819" or "IBM819" => "ISO-8859-1", + "CP1252" or "WINDOWS1252" => "CP1252", + "CP437" or "IBM437" or "437" => "CP437", + _ => null, + }; + } + /// /// Server text made safe to draw: control, format (bidirectional overrides included), private-use and astral characters and line breaks /// become spaces, runs of space collapse, and what is left is cut to with an ellipsis. diff --git a/src/SharpMUTerm.Tui/DemoWorldDirectory.cs b/src/SharpMUTerm.Tui/DemoWorldDirectory.cs index acb7818a..fab87144 100644 --- a/src/SharpMUTerm.Tui/DemoWorldDirectory.cs +++ b/src/SharpMUTerm.Tui/DemoWorldDirectory.cs @@ -3,7 +3,9 @@ namespace SharpMUTerm.Tui; /// /// The demo scene's world directory: a mu*index listing and the pages it names, in mu*index's own JSON shapes /// (GameListView, GameView, camelCase), answered from memory. Every world here is made up and every host is -/// under .example (RFC 2606), so a demo that picks one and presses ⏎ dials nothing real. +/// under .example (RFC 2606), so a demo that picks one and presses ⏎ dials nothing real. Aetherfall answers at three +/// addresses (TLS, plain, and a stale old port) and names a charset, so a pick of it shows the address choice; every other +/// world has one usable address and goes straight to the connect form. /// internal static class DemoWorldDirectory { @@ -46,12 +48,29 @@ public static string Answer(Uri uri) private static string Summary(Game g) => $$"""{"id":"{{g.Id}}","slug":"{{g.Name.ToLowerInvariant().Replace(' ', '-')}}","name":{{Json(g.Name)}},"tagline":{{Json(g.Tagline)}},"state":"active","archived":false,"claimed":false,"playersNow":{{(g.Players is { } p ? p.ToString(System.Globalization.CultureInfo.InvariantCulture) : "null")}},"playersNowState":"{{g.Count}}","playersNowProvenance":null,"codebase":{{Json(g.Codebase)}},"codebaseProvenance":null,"measuredProtocols":["gmcp","mssp"],"lastReachableAt":"2026-11-04T11:40:00+00:00","url":"/g/{{g.Id}}","apiUrl":"/api/games/{{g.Id}}"}"""; + private const string Seen = "\"firstSeenAt\":\"2024-01-01T00:00:00+00:00\",\"lastSeenAt\":\"2026-11-04T11:40:00+00:00\""; + + private static string Endpoint(string host, int port, string kind, string state, string seen = Seen) => + $$"""{"host":"{{host}}","port":{{port}},"kind":"{{kind}}","tlsMeasured":{{(kind == "tls" ? "true" : "false")}},{{seen}},"state":"{{state}}"}"""; + private static string Page(Game g) { - var endpoints = g.Tls - ? $$"""[{"host":"{{g.Host}}","port":{{g.Port + 1}},"kind":"tls","tlsMeasured":true,"firstSeenAt":"2025-02-01T00:00:00+00:00","lastSeenAt":"2026-11-04T11:40:00+00:00","state":"active"},{"host":"{{g.Host}}","port":{{g.Port}},"kind":"telnet","tlsMeasured":false,"firstSeenAt":"2024-01-01T00:00:00+00:00","lastSeenAt":"2026-11-04T11:00:00+00:00","state":"active"}]""" - : $$"""[{"host":"old.{{g.Host}}","port":{{g.Port}},"kind":"telnet","tlsMeasured":false,"firstSeenAt":"2019-01-01T00:00:00+00:00","lastSeenAt":"2021-06-01T00:00:00+00:00","state":"gone"},{"host":"{{g.Host}}","port":{{g.Port}},"kind":"telnet","tlsMeasured":false,"firstSeenAt":"2021-06-01T00:00:00+00:00","lastSeenAt":"2026-11-04T11:40:00+00:00","state":"active"}]"""; - return $$"""{"id":"{{g.Id}}","slug":"x","name":{{Json(g.Name)}},"tagline":{{Json(g.Tagline)}},"description":null,"state":"active","archived":false,"claimed":false,"playersNow":null,"playersNowState":"unknown","codebase":{{Json(g.Codebase)}},"measuredProtocols":[],"endpoints":{{endpoints}},"url":"/g/x","apiUrl":"/api/games/{{g.Id}}"}"""; + // Aetherfall, listed TLS first as the directory might: TLS and plain both active, an old port the directory has not reached lately, a gone one and a + // websocket (neither offered), and a charset — the address choice. Everything else: one usable address. + var endpoints = g.Name == "Aetherfall" + ? string.Join(",", + Endpoint(g.Host, g.Port + 1, "tls", "active"), + Endpoint(g.Host, g.Port, "telnet", "active"), + Endpoint(g.Host, 4000, "telnet", "stale", "\"firstSeenAt\":\"2019-01-01T00:00:00+00:00\",\"lastSeenAt\":\"2026-08-12T00:00:00+00:00\""), + Endpoint("old." + g.Host, g.Port, "telnet", "gone"), + Endpoint(g.Host, 4280, "websocket", "active")) + : g.Tls + ? Endpoint(g.Host, g.Port + 1, "tls", "active") + : string.Join(",", Endpoint("old." + g.Host, g.Port, "telnet", "gone"), Endpoint(g.Host, g.Port, "telnet", "active")); + var fields = g.Name == "Aetherfall" + ? """{"CHARSET":{"value":"ISO-8859-1","source":"handshake","measured":true,"lastConfirmedAt":"2026-11-04T11:40:00+00:00","ageSeconds":1200,"age":"20 minutes","stale":false}}""" + : "{}"; + return $$"""{"id":"{{g.Id}}","slug":"x","name":{{Json(g.Name)}},"tagline":{{Json(g.Tagline)}},"description":null,"state":"active","archived":false,"claimed":false,"playersNow":null,"playersNowState":"unknown","codebase":{{Json(g.Codebase)}},"measuredProtocols":[],"endpoints":[{{endpoints}}],"fields":{{fields}},"url":"/g/x","apiUrl":"/api/games/{{g.Id}}"}"""; } private static string Json(string? text) => text is null ? "null" : System.Text.Json.JsonSerializer.Serialize(text); diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Welcome.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Welcome.cs index b2b19b32..6d5c5f50 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Welcome.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Welcome.cs @@ -203,6 +203,12 @@ private void ConnectFromWelcome(WelcomeConnect request) world.Name = UniqueWorldName(listed); } + // mu*index named a charset that is not UTF-8 for it: the world starts on that encoding, still F5's to change. + if (request.Encoding is { Length: > 0 } encoding) + { + world.Encoding = encoding; + } + if (request.Character is { } name) { world.Characters.Add(new CharacterDefinition { Name = name }); diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.WorldBrowse.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.WorldBrowse.cs index e540b100..97314d7f 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.WorldBrowse.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.WorldBrowse.cs @@ -9,8 +9,8 @@ namespace SharpMUTerm.Tui; /// /// Browse worlds (the welcome's Browse row, ⌃P ▸ Browse worlds…, /browse [words]): mu*index's listing, /// one Client model () drawn as a cell here and as a native modal -/// in a host that has them. Every gesture in either ends in one method: and -/// . +/// in a host that has them. Every gesture in either ends in one method: , +/// , and . /// /// Asked only when the player opens it, never at start, through a fetch the caller supplies (worldFetch:, /// the save:/logRoot: family): null in a test and a snapshot, which then say they asked nothing. The demo @@ -102,6 +102,8 @@ internal void ShowWorldBrowse(string query = "") ThemeIsDark(), index => OnUiThread(() => PickWorld(session!.Model, index)), words => OnUiThread(() => AskWorldDirectory(words)), + endpoint => OnUiThread(() => ChooseWorldEndpoint(session!.Model, endpoint)), + () => OnUiThread(LeaveWorldChoice), () => OnUiThread(() => { NativeModalClosed(session!); @@ -132,11 +134,25 @@ internal void ShowWorldBrowse(string query = "") case WorldBrowseAction.Ask: AskWorldDirectory(browse.Query); break; + case WorldBrowseAction.Choose: + ChooseWorldEndpoint(_worldModel, browse.Endpoint); + break; } return WorldBrowseOpen; }, width: WorldBrowseSurface.PreferredWidth, + escape: () => + { + // Esc on the address choice goes back to the list; on the list it closes. + if (_worldModel.Choosing is null) + { + return false; + } + + LeaveWorldChoice(); + return true; + }, closed: () => { _worldBrowse = null; @@ -190,17 +206,25 @@ void Settle(WorldBrowseModel model) /// /// The pick, from either host: row of . Asks the directory where that - /// world is; once it answers with an address /connect would take, Browse worlds closes and the welcome's connect - /// form opens filled in. Nothing is saved or dialled here. A refusal is said in place and the list stays. + /// world is; once it answers with one address /connect would take, Browse worlds closes and the welcome's connect + /// form opens filled in. With several (TLS and plain, another port, a stale one), they are published as a choice + /// () and opens the form. Nothing is saved or + /// dialled here. A refusal is said in place and the list stays. /// internal void PickWorld(WorldBrowseModel model, int index) { - if (index < 0 || index >= model.Rows.Count || _worldModel.Opening is not null) + if (index < 0 || index >= model.Rows.Count || _worldModel.Opening is not null || _worldModel.Choosing is not null) { return; } var row = model.Rows[index]; + if (row.Id == Guid.Empty) + { + PublishWorldModel(_worldModel with { Problem = $"{row.Name} not opened: mu*index gave no id to ask for it by" }); + return; + } + if (WorldDirectory.GameUri(_config.WorldDirectoryUrl, row.Id) is not { } uri || (WorldFetch ?? _worldFetch) is null) { PublishWorldModel(_worldModel with { Problem = $"{row.Name} not opened: {WorldDirectoryProblem() ?? "this run asks no world directory"}" }); @@ -211,18 +235,65 @@ internal void PickWorld(WorldBrowseModel model, int index) PublishWorldModel(_worldModel with { Opening = row.Name, Problem = null }); FetchWorlds(uri, generation, (bytes, failure) => { - var (address, unread) = bytes is null ? (null, failure) : WorldDirectory.ParseGame(bytes); - if (address is null) + var (game, unread) = bytes is null ? (null, failure) : WorldDirectory.ParseGame(bytes); + if (game is null) { PublishWorldModel(_worldModel with { Opening = null, Problem = $"{row.Name} not opened: {unread}" }); return; } // The listing's name, which the player chose by; the page's own is the same world. - OpenWorldForm(address with { Name = row.Name }); + game = game with { Name = row.Name }; + if (game.Endpoints.Count == 1) + { + if (!game.Endpoints[0].Connectable) + { + PublishWorldModel(_worldModel with { Opening = null, Problem = NotConnectable(game, 0) }); + return; + } + + OpenWorldForm(game.Address(0)); + return; + } + + PublishWorldModel(_worldModel with { Opening = null, Choosing = game }); }); } + /// + /// The address chosen, from either host: endpoint of 's choice. Browse + /// worlds closes and the connect form opens filled in with it — host, port, TLS, and the encoding when mu*index names a + /// charset that is not UTF-8. Nothing is saved or dialled. + /// + internal void ChooseWorldEndpoint(WorldBrowseModel model, int index) + { + if (model.Choosing is not { } game || _worldModel.Choosing is null || index < 0 || index >= game.Endpoints.Count) + { + return; + } + + if (!game.Endpoints[index].Connectable) + { + PublishWorldModel(_worldModel with { Problem = NotConnectable(game, index) }); + return; + } + + OpenWorldForm(game.Address(index)); + } + + /// Why address of does not go into the connect form. + private static string NotConnectable(WorldGame game, int index) => + $"{game.Name} not opened: mu*index lists it at {game.Endpoints[index].Address}, which /connect cannot dial"; + + /// Esc on the address choice, from either host: back to the list, as it was. + internal void LeaveWorldChoice() + { + if (_worldModel.Choosing is not null) + { + PublishWorldModel(_worldModel with { Choosing = null, Problem = null }); + } + } + /// /// ⏎ on a query none of the rows held match, from either host: asks the directory itself to search for it, and lists /// what it says in place of its most played. @@ -242,7 +313,7 @@ private void OpenWorldForm(WorldAddress address) { CloseWorldBrowse(); var welcome = new WelcomeSurface(WorldDirectoryProblem()) { Layout = _welcomeLayout }; - welcome.Prefill(address.Name, address.Host, address.Port, address.Tls); + welcome.Prefill(address.Name, address.Host, address.Port, address.Tls, address.Encoding); if (WelcomeIsOpen) { CloseWelcome(); @@ -347,12 +418,14 @@ void Deliver(byte[]? bytes, string? problem) /// /// /browse [words] opens Browse worlds (asking the directory for the words); /browse N picks row N of the - /// list /browse last said as lines. + /// list /browse last said as lines, and /browse N M address M of the ones it said for that world. /// private void BrowseCommand(string arguments) { var words = arguments.Trim(); - if (int.TryParse(words, NumberStyles.None, CultureInfo.InvariantCulture, out var n) && _saidWorlds.Count > 0) + var parts = words.Split(' ', StringSplitOptions.RemoveEmptyEntries); + if (parts.Length is 1 or 2 && _saidWorlds.Count > 0 + && int.TryParse(parts[0], NumberStyles.None, CultureInfo.InvariantCulture, out var n)) { if (n < 1 || n > _saidWorlds.Count) { @@ -360,7 +433,19 @@ private void BrowseCommand(string arguments) return; } - SayWorldAddress(_saidWorlds[n - 1]); + int? endpoint = null; + if (parts.Length == 2) + { + if (!int.TryParse(parts[1], NumberStyles.None, CultureInfo.InvariantCulture, out var m) || m < 1 || m > WorldDirectory.MaxEndpoints) + { + RefuseCommand($"/browse {n} and the number of one of its addresses, from 1"); + return; + } + + endpoint = m - 1; + } + + SayWorldAddress(_saidWorlds[n - 1], n, endpoint); return; } @@ -388,15 +473,24 @@ private void SayWorlds(string query) => StartWorldList(query, model => lines.AddRange(_saidWorlds.Select((r, i) => string.Join( " — ", new[] { $"{i + 1}. {r.Name}", $"{WorldBrowseModel.Players(r)} players", r.Codebase, r.Tagline }.Where(p => p.Length > 0)))); - lines.Add("Type /browse and a number to see where that world is, or /browse and words to search."); + lines.Add("Type /browse and a number to hear where that world is (/browse 1 2 for its second address), or /browse and words to search."); } SayLines(lines); }); - /// Where a world /browse N named is, said as the /connect line to type; nothing is saved or dialled. - private void SayWorldAddress(WorldListing row) + /// + /// Where a world /browse N named is, said as the /connect line to type; when it answers at several + /// addresses and none was named, they are said as numbered lines for /browse N M. Nothing is saved or dialled. + /// + private void SayWorldAddress(WorldListing row, int number, int? endpoint) { + if (row.Id == Guid.Empty) + { + RefuseCommand($"{row.Name} not looked up: mu*index gave no id to ask for it by"); + return; + } + if (WorldDirectory.GameUri(_config.WorldDirectoryUrl, row.Id) is not { } uri || (WorldFetch ?? _worldFetch) is null) { RefuseCommand($"{row.Name} not looked up: {WorldDirectoryProblem() ?? "this run asks no world directory"}"); @@ -406,26 +500,63 @@ private void SayWorldAddress(WorldListing row) var generation = ++_worldGeneration; FetchWorlds(uri, generation, (bytes, failure) => { - var (address, unread) = bytes is null ? (null, failure) : WorldDirectory.ParseGame(bytes); - if (address is null) + var (game, unread) = bytes is null ? (null, failure) : WorldDirectory.ParseGame(bytes); + if (game is null) { RefuseCommand($"{row.Name} not looked up: {unread}"); return; } + game = game with { Name = row.Name }; + if (endpoint is { } chosen && chosen >= game.Endpoints.Count) + { + RefuseCommand($"{row.Name} has {game.Endpoints.Count} addresses; say /browse {number} and a number from 1 to {game.Endpoints.Count}"); + return; + } + + if (endpoint is null && game.Endpoints.Count > 1 && !Host.ScreenIsSeen) + { + var model = new WorldBrowseModel(WorldBrowseState.Ready, [], 0, string.Empty, null, null, game); + var lines = new List + { + $"{model.ChoiceLine}:", + game.Charset is { } charset + ? $"mu*index names its charset {charset}, for the whole game rather than per address." + : "mu*index names no charset for it.", + }; + lines.AddRange(game.Endpoints.Select((e, i) => $"{i + 1}. {WorldBrowseModel.EndpointText(e)}")); + lines.Add($"Type /browse {number} and an address number (/browse {number} 1 is the first) to hear its /connect line."); + SayLines(lines); + return; + } + + var index = endpoint ?? game.FirstConnectable; + if (index < 0 || !game.Endpoints[index].Connectable) + { + RefuseCommand(NotConnectable(game, Math.Max(0, index))); + return; + } + + var address = game.Address(index); var host = address.Host.Contains(':') ? $"[{address.Host}]" : address.Host; var command = $"/connect {host} {address.Port}" + (address.Tls ? " tls" : string.Empty); if (Host.ScreenIsSeen) { - OpenWorldForm(address with { Name = row.Name }); + OpenWorldForm(address); return; } - SayLines( - [ + var said = new List + { $"{row.Name} is at {address.Host} port {address.Port}{(address.Tls ? ", encrypted" : string.Empty)}, as listed on mu*index.", $"To add it and connect, type: {command}", - ]); + }; + if (address.Encoding is { } encoding) + { + said.Add($"mu*index names its charset {game.Charset}: set the world's encoding to {encoding} on F5 (/connect leaves it auto)."); + } + + SayLines(said); }); } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 7726e240..0e1572ba 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -1964,10 +1964,13 @@ public string RenderSnapshot(string? view = null) } // Browse worlds over the demo's directory (answered from memory): the list through its ⌃P entry; `-failed` with a - // directory that does not answer; `-picked` after a pick, so the frame is the welcome's connect form filled in. + // directory that does not answer; `-picked` after a pick of a world with one address (Lanternport), so the frame is + // the welcome's connect form filled in; `-endpoints` after a pick of Aetherfall, which answers at three addresses + // and names a charset, so the frame is the address choice. if (string.Equals(view, "browse-worlds", StringComparison.OrdinalIgnoreCase) || string.Equals(view, "browse-worlds-failed", StringComparison.OrdinalIgnoreCase) - || string.Equals(view, "browse-worlds-picked", StringComparison.OrdinalIgnoreCase)) + || string.Equals(view, "browse-worlds-picked", StringComparison.OrdinalIgnoreCase) + || string.Equals(view, "browse-worlds-endpoints", StringComparison.OrdinalIgnoreCase)) { if (string.Equals(view, "browse-worlds-failed", StringComparison.OrdinalIgnoreCase)) { @@ -1976,6 +1979,11 @@ public string RenderSnapshot(string? view = null) DispatchCommand(SharpMUTerm.Client.Commands.BuiltInCommands.BrowseWorldsCommand); if (string.Equals(view, "browse-worlds-picked", StringComparison.OrdinalIgnoreCase)) + { + PickWorld(_worldModel, 1); + } + + if (string.Equals(view, "browse-worlds-endpoints", StringComparison.OrdinalIgnoreCase)) { PickWorld(_worldModel, 0); } diff --git a/src/SharpMUTerm.Tui/SnapshotViews.cs b/src/SharpMUTerm.Tui/SnapshotViews.cs index 999d6ac5..1930e7a3 100644 --- a/src/SharpMUTerm.Tui/SnapshotViews.cs +++ b/src/SharpMUTerm.Tui/SnapshotViews.cs @@ -28,7 +28,7 @@ internal static class SnapshotViews "collapsed", "timestamps", "timestamps-toggled", "theme-switched", "rail-keys", "prompt", "meters", "gamedata", "map", "map-walking", "map-split", "map-edit", "map-level", "map-area", "map-find", "map-mine", "packages", "package-review", "package-browse", "send-menu", "layouts", "layout-combat", "layout-roleplay", "panel-who", "panel-vitals", "panel-quickbar", "panel-composer", - "welcome", "welcome-connect", "tour", "reconnect", "help", "help-topic", "dictionary-offer", "browse-worlds", "browse-worlds-failed", "browse-worlds-picked", "import-review", "join-wraps", "join-wraps-f5", + "welcome", "welcome-connect", "tour", "reconnect", "help", "help-topic", "dictionary-offer", "browse-worlds", "browse-worlds-failed", "browse-worlds-picked", "browse-worlds-endpoints", "import-review", "join-wraps", "join-wraps-f5", "script-console", "script-list", "script-edit", "search-older", "search-history", "channel-capture", "highlight-names", "channels-f5", "scene-log", ]; } diff --git a/src/SharpMUTerm.Tui/WelcomeSurface.cs b/src/SharpMUTerm.Tui/WelcomeSurface.cs index d0370c06..6330934b 100644 --- a/src/SharpMUTerm.Tui/WelcomeSurface.cs +++ b/src/SharpMUTerm.Tui/WelcomeSurface.cs @@ -24,7 +24,7 @@ internal enum WelcomeAction } /// What the connect form asks for, read once ⏎ has checked it. -internal sealed record WelcomeConnect(string Host, int Port, bool Tls, string? Character, bool PasswordLater, string? WorldName = null); +internal sealed record WelcomeConnect(string Host, int Port, bool Tls, string? Character, bool PasswordLater, string? WorldName = null, string? Encoding = null); /// /// The first-run welcome: what it says and what a key on it means, with no window in it — the @@ -82,18 +82,24 @@ internal sealed class WelcomeSurface /// The world Browse worlds filled the form in for, or null; dropped once the host is changed. public string? WorldName { get; private set; } + /// + /// The encoding the world will be saved with, from the charset mu*index names for the world Browse worlds picked + /// (null: auto); dropped with once the host is changed. + /// + public string? Encoding { get; private set; } + /// The host Browse worlds filled in, so a changed host drops the name that went with it. private string? _prefilledHost; /// Everything the surface says now: what the cells draw and the window's native welcome draws. public WelcomeModel Model => - new(InForm, Selected, Layout, Field, Host, Port, Tls, Character, PasswordLater, Problem, _indexProblem, WorldName); + new(InForm, Selected, Layout, Field, Host, Port, Tls, Character, PasswordLater, Problem, _indexProblem, WorldName, Encoding); /// /// The form, filled in from a world Browse worlds picked: its host, port and TLS, and its name for the world it will /// be saved as. Only fills it in — the player's own ⏎ there is what saves and dials, through /connect's path. /// - public void Prefill(string worldName, string host, int port, bool tls) + public void Prefill(string worldName, string host, int port, bool tls, string? encoding = null) { InForm = true; Field = WelcomeField.Character; @@ -101,6 +107,7 @@ public void Prefill(string worldName, string host, int port, bool tls) Port = port.ToString(System.Globalization.CultureInfo.InvariantCulture); Tls = tls; WorldName = worldName; + Encoding = encoding; _prefilledHost = Host; Problem = null; Request = null; @@ -318,9 +325,10 @@ private WelcomeAction Submit(Func, (string Host, int Port) if (WorldName is not null && !string.Equals(Host, _prefilledHost, StringComparison.OrdinalIgnoreCase)) { WorldName = null; + Encoding = null; } - Request = new WelcomeConnect(endpoint.Host, endpoint.Port, Tls, character.Length == 0 ? null : character, PasswordLater, WorldName); + Request = new WelcomeConnect(endpoint.Host, endpoint.Port, Tls, character.Length == 0 ? null : character, PasswordLater, WorldName, Encoding); return WelcomeAction.Connect; } diff --git a/src/SharpMUTerm.Tui/WorldBrowseSurface.cs b/src/SharpMUTerm.Tui/WorldBrowseSurface.cs index 4fc865a2..55d4d48f 100644 --- a/src/SharpMUTerm.Tui/WorldBrowseSurface.cs +++ b/src/SharpMUTerm.Tui/WorldBrowseSurface.cs @@ -15,6 +15,9 @@ internal enum WorldBrowseAction /// Ask the directory itself for what is typed: nothing among the rows held matches it. Ask, + + /// Open the connect form with the address chosen () of the world being chosen for. + Choose, } /// @@ -38,6 +41,22 @@ internal sealed class WorldBrowseSurface /// The row selected in the listed rows. public int Selected { get; private set; } + /// The address selected while a picked world's addresses are being chosen from (0 is the default, TLS first). + public int Endpoint => _choiceFor is null ? 0 : _endpoint; + + private int _endpoint; + private WorldGame? _choiceFor; + + /// Starts the address choice at its first row whenever a different world's addresses are shown. + private void Follow(WorldBrowseModel model) + { + if (!ReferenceEquals(model.Choosing, _choiceFor)) + { + _choiceFor = model.Choosing; + _endpoint = Math.Max(0, model.Choosing?.FirstConnectable ?? 0); + } + } + /// The index in 's rows of the row selected, or -1. public int SelectedRow(WorldBrowseModel model) { @@ -63,6 +82,25 @@ public int SelectedRow(WorldBrowseModel model) public WorldBrowseAction Key(WorldBrowseModel model, ConsoleKeyInfo key) { ArgumentNullException.ThrowIfNull(model); + Follow(model); + if (model.Choosing is { } game) + { + var addresses = game.Endpoints.Count; + switch (key.Key) + { + case ConsoleKey.UpArrow: + _endpoint = (_endpoint - 1 + addresses) % addresses; + break; + case ConsoleKey.DownArrow: + _endpoint = (_endpoint + 1) % addresses; + break; + case ConsoleKey.Enter: + return WorldBrowseAction.Choose; + } + + return WorldBrowseAction.Redraw; + } + var count = model.View(Query, Sort).Count; switch (key.Key) { @@ -113,18 +151,28 @@ public WorldBrowseAction Key(WorldBrowseModel model, ConsoleKeyInfo key) } /// What the surface draws now, in rows of . - public List Render(WorldBrowseModel model, int width, int rows) => Render(model, Query, Sort, Selected, width, rows); + public List Render(WorldBrowseModel model, int width, int rows) + { + ArgumentNullException.ThrowIfNull(model); + Follow(model); + return Render(model, Query, Sort, Selected, width, rows, Endpoint); + } /// /// Browse worlds for in 's order, row marked, /// in exactly rows: the search line, the credit, the list (or what stands for it), a note and /// the keys. /// - internal static List Render(WorldBrowseModel model, string query, WorldDirectorySort sort, int selected, int width, int rows) + internal static List Render(WorldBrowseModel model, string query, WorldDirectorySort sort, int selected, int width, int rows, int endpoint = 0) { ArgumentNullException.ThrowIfNull(model); width = Math.Max(30, width); rows = Math.Max(9, rows); + if (model.Choosing is not null) + { + return RenderChoice(model, endpoint, width, rows); + } + var lines = new List { SpreadLR( @@ -156,7 +204,7 @@ internal static List Render(WorldBrowseModel model, string query, WorldD Pad(lines, rows - 2); var note = model.Opening is not null ? model.OpeningLine : model.State == WorldBrowseState.Ready && model.Problem is { } problem ? problem - : model.State == WorldBrowseState.Ready && view.Count > 0 ? (model.AnyDeclared ? WorldBrowseModel.DeclaredNote + " · " : string.Empty) + WorldBrowseModel.PickNote + : model.State == WorldBrowseState.Ready && view.Count > 0 ? model.MarksNote + WorldBrowseModel.PickNote : string.Empty; var noteTone = model.State == WorldBrowseState.Ready && model.Problem is not null && model.Opening is null ? ScreenPalette.Caution : ScreenPalette.Label; lines.Add(note.Length == 0 ? string.Empty : $"[{noteTone}]{Escape(Elide(note, width - 1))}[/]"); @@ -164,6 +212,60 @@ internal static List Render(WorldBrowseModel model, string query, WorldD return lines; } + /// + /// A picked world's addresses, row marked, in exactly rows: whose + /// they are, what mu*index says of its charset, one row per address (host:port, TLS or plain, its state), a note + /// and the keys. + /// + private static List RenderChoice(WorldBrowseModel model, int endpoint, int width, int rows) + { + var game = model.Choosing!; + var lines = new List + { + ElideVisible($"[{ScreenPalette.Accent}]ADDRESSES[/] [{ScreenPalette.Value}]{Escape(model.ChoiceLine)}[/]", width), + ElideVisible($"[{ScreenPalette.Muted}]{Escape(WorldBrowseModel.AttributionLine)}[/]", width), + string.Empty, + }; + + // The charset sentence on one row where it fits, else broken at its " · " so the encoding is never elided away. + var charset = model.CharsetLine; + var pieces = charset.Length <= width - 3 ? [charset] : charset.Split(" · ", 2); + lines.AddRange(pieces.Select(piece => $" [{ScreenPalette.Label}]{Escape(Elide(piece, width - 3))}[/]")); + lines.Add(string.Empty); + + var columns = game.Endpoints.Select(WorldBrowseModel.Endpoint).ToArray(); + var addressWidth = Math.Clamp(columns.Max(c => c.Address.Length) + 2, 12, Math.Max(12, width / 2)); + for (var i = 0; i < columns.Length && lines.Count < rows - 2; i++) + { + var (address, security, state) = columns[i]; + var chosen = i == endpoint; + var mark = chosen ? $"[bold {ScreenPalette.Accent}]▸[/]" : " "; + var weight = chosen ? "bold " : string.Empty; + var stateTone = game.Endpoints[i].Stale || !game.Endpoints[i].Connectable ? ScreenPalette.Caution : ScreenPalette.Label; + var stateText = Elide(state, Math.Max(0, width - 4 - addressWidth - 7)); + lines.Add($"{mark} [{weight}{ScreenPalette.Value}]{Escape(Elide(address, addressWidth - 1).PadRight(addressWidth))}[/]" + + $"[{(game.Endpoints[i].Tls ? ScreenPalette.Accent : ScreenPalette.Label)}]{Escape(security.PadRight(7))}[/]" + + $"[{stateTone}]{Escape(stateText)}[/]"); + } + + Pad(lines, rows - 2); + var note = model.Problem ?? WorldBrowseModel.ChoiceNote; + lines.Add($"[{(model.Problem is null ? ScreenPalette.Label : ScreenPalette.Caution)}]{Escape(Elide(note, width - 1))}[/]"); + lines.Add(ChoiceFooter(width)); + return lines; + } + + /// The address choice's key row, laddered to one row: the choice and the way back are never given up. + internal static string ChoiceFooter(int width) + { + var keys = WorldBrowseModel.ChoiceKeys.Select(k => k.Key switch + { + "⏎" or "Esc" => new LadderKey(k.Key, k.Label), + _ => new LadderKey(k.Key, k.Label, Drop: 1), + }).ToList(); + return KeyLadder.Fit(keys, width - 1, k => $"[{ScreenPalette.Accent}]{Escape(k)}[/]", l => $"[{ScreenPalette.Label}]{Escape(l)}[/]", $"[{ScreenPalette.Label}] · [/]"); + } + /// The key row, laddered to one row: the way out and the pick are never given up. internal static string Footer(int width) { diff --git a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs index 23cbdcac..0aa66dac 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs @@ -264,6 +264,7 @@ await Assert.That(Rows(palette.Session!.View(query))).IsEquivalentTo(Rows(drawn! (SurfaceCatalog.Dictionary, "dictionary-offer"), (SurfaceCatalog.BrowseWorlds, "browse-worlds"), (SurfaceCatalog.BrowseWorlds, "browse-worlds-failed"), + (SurfaceCatalog.BrowseWorlds, "browse-worlds-endpoints"), (SurfaceCatalog.Import, "import-review"), (SurfaceCatalog.ScriptConsole, "script-console"), (SurfaceCatalog.Search, "search-older"), @@ -844,6 +845,19 @@ await SameModal("browse worlds: ask the directory", "browse-worlds", // None of the demo's most played hold the word, so the cells' Enter asks the directory rather than picking. app.SimulateWorldBrowseKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false)); }); + + // A world that answers at several addresses (the demo's Aetherfall): choosing the second (plain) fills in the form + // with it and the charset's encoding, and Esc goes back to the list — the same in both hosts. + await SameModal("browse worlds: choose an address", "browse-worlds-endpoints", + (app, m) => ((WorldBrowseSession)m.Open(SurfaceCatalog.BrowseWorlds)!).Choose(1), + app => + { + app.SimulateWorldBrowseKey(new ConsoleKeyInfo('\0', ConsoleKey.DownArrow, false, false, false)); + app.SimulateWorldBrowseKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false)); + }); + await SameModal("browse worlds: back from the addresses", "browse-worlds-endpoints", + (app, m) => ((WorldBrowseSession)m.Open(SurfaceCatalog.BrowseWorlds)!).Back(), + app => app.SimulateWorldBrowseKey(new ConsoleKeyInfo('\x1b', ConsoleKey.Escape, false, false, false))); probed.Add(SurfaceCatalog.BrowseWorlds); // The import review: Import writes the same world, character and set as the cells' Enter; with the passwords @@ -1194,7 +1208,8 @@ private static string Outcome(SharpMUTermApp app) => string.Join( "welcome=" + app.WelcomeIsOpen, "help=" + app.HelpIsOpen + "/" + app.DictionaryOfferOpen, "browse=" + app.WorldBrowseOpen + " " + app.WorldBrowseModelNow.State + ":" + app.WorldBrowseModelNow.AskedFor + ":" + app.WorldBrowseModelNow.Rows.Count - + " " + (app.Welcome is { } w ? $"{w.InForm}:{w.Host}:{w.Port}:{w.Tls}:{w.WorldName}" : "none"), + + ":" + (app.WorldBrowseModelNow.Choosing?.Endpoints.Count ?? 0) + + " " + (app.Welcome is { } w ? $"{w.InForm}:{w.Host}:{w.Port}:{w.Tls}:{w.WorldName}:{w.Encoding}" : "none"), "import=" + app.ImportReviewOpen + " " + string.Join(",", app.Configuration.TriggerSets.Select(s => s.Name + ":" + s.Triggers.Count)) + " " + string.Join(",", app.Configuration.Worlds.SelectMany(w => w.Characters).Select(c => c.Name + (c.Password is null ? string.Empty : "*"))), "console=" + app.ScriptConsoleIsOpen + " " + ConsoleState(app), diff --git a/tests/SharpMUTerm.Client.Tests/WorldBrowseModelTests.cs b/tests/SharpMUTerm.Client.Tests/WorldBrowseModelTests.cs index c91c2d96..debbe4c9 100644 --- a/tests/SharpMUTerm.Client.Tests/WorldBrowseModelTests.cs +++ b/tests/SharpMUTerm.Client.Tests/WorldBrowseModelTests.cs @@ -91,7 +91,7 @@ public async Task ASessionPicksARowInRangeAndAsksOnlyWhatTheRowsCannotAnswer() { var picked = new List(); var asked = new List(); - var session = new WorldBrowseSession(Ready(), true, picked.Add, asked.Add, () => { }); + var session = new WorldBrowseSession(Ready(), true, picked.Add, asked.Add, _ => { }, () => { }, () => { }); session.Pick(1); session.Pick(9); @@ -101,4 +101,49 @@ public async Task ASessionPicksARowInRangeAndAsksOnlyWhatTheRowsCannotAnswer() await Assert.That(string.Join(",", picked)).IsEqualTo("1"); await Assert.That(string.Join(",", asked)).IsEqualTo("zork"); } + + private static WorldGame Game(string? charset) => new( + "Aetherfall", + [new("a.example", 4202, true, false), new("a.example", 4201, false, false), new("a.example", 4000, false, true)], + charset); + + [Test] + public async Task TheAddressChoiceSaysEachAddressItsSecurityItsStateAndTheGamesCharset() + { + var model = Ready() with { Choosing = Game("ISO-8859-1") }; + + await Assert.That(model.ChoiceLine).IsEqualTo("Aetherfall answers at 3 addresses — choose one"); + await Assert.That(model.CharsetLine).IsEqualTo("charset ISO-8859-1 for the whole game (not per address) · the form sets encoding ISO-8859-1"); + await Assert.That((Ready() with { Choosing = Game("UTF-8") }).CharsetLine).EndsWith("the world's encoding stays auto"); + await Assert.That((Ready() with { Choosing = Game(null) }).CharsetLine).IsEqualTo("mu*index names no charset for it; the world's encoding stays auto"); + await Assert.That(WorldBrowseModel.Endpoint(model.Choosing!.Endpoints[0])).IsEqualTo(("a.example:4202", "TLS", "active")); + await Assert.That(WorldBrowseModel.Endpoint(model.Choosing.Endpoints[2])).IsEqualTo(("a.example:4000", "plain", "stale · not reached lately")); + await Assert.That(WorldBrowseModel.Endpoint(new WorldEndpoint("2001:db8::1", 23, false, false)).Address).IsEqualTo("[2001:db8::1]:23"); + await Assert.That(WorldBrowseModel.Endpoint(new WorldEndpoint("bad host", 4000, false, false, Connectable: false)).State).IsEqualTo("active · not connectable"); + await Assert.That(model).IsEqualTo(Ready() with { Choosing = Game("ISO-8859-1") }); + await Assert.That(model).IsNotEqualTo(Ready()); + } + + [Test] + public async Task ASessionChoosesAnAddressOnlyWhileOneIsBeingChosenAndPicksNoRowMeanwhile() + { + var picked = new List(); + var chosen = new List(); + var backs = 0; + var session = new WorldBrowseSession(Ready(), true, picked.Add, _ => { }, chosen.Add, () => backs++, () => { }); + + session.Choose(0); + session.Back(); + session.Publish(Ready() with { Choosing = Game(null) }); + session.Pick(1); + session.Choose(2); + session.Choose(3); + session.Publish(Ready() with { Choosing = new WorldGame("W", [new("bad host", 4000, false, false, Connectable: false), new("w.example", 23, false, false)], null) }); + session.Choose(0); + session.Back(); + + await Assert.That(picked.Count).IsEqualTo(0); + await Assert.That(string.Join(",", chosen)).IsEqualTo("2"); + await Assert.That(backs).IsEqualTo(1); + } } diff --git a/tests/SharpMUTerm.Core.Tests/WorldIndex/WorldDirectoryTests.cs b/tests/SharpMUTerm.Core.Tests/WorldIndex/WorldDirectoryTests.cs index 4e13bea2..75fe75cb 100644 --- a/tests/SharpMUTerm.Core.Tests/WorldIndex/WorldDirectoryTests.cs +++ b/tests/SharpMUTerm.Core.Tests/WorldIndex/WorldDirectoryTests.cs @@ -4,8 +4,9 @@ namespace SharpMUTerm.Core.Tests.WorldIndex; /// -/// mu*index's answers read as untrusted server text: rows bounded and cleaned, a bad row dropped and counted, an address -/// only what /connect would take. The fixtures are shaped from MUIndex's GameListView/GameView +/// mu*index's answers read as untrusted server text and otherwise as the directory states them: rows kept in its order +/// with its counts and labels, text bounded and cleaned, sizes capped, and an address put in the connect form only when +/// /connect would take it. The fixtures are shaped from MUIndex's GameListView/GameView /// (camelCase, enums as camelCase strings); the live service was not reachable when they were written. /// public class WorldDirectoryTests @@ -32,18 +33,22 @@ public class WorldDirectoryTests private static byte[] Bytes(string json) => Encoding.UTF8.GetBytes(json); [Test] - public async Task AListingIsReadAndItsBadRowsAreDroppedAndCounted() + public async Task AListingIsReadAsTheDirectoryStatesItEveryRowInItsOrder() { var (page, problem) = WorldDirectory.ParseList(Bytes(Listing)); await Assert.That(problem).IsNull(); - await Assert.That(string.Join("|", page!.Rows.Select(r => r.Name))).IsEqualTo("Aetherfall|Hollow Crown|Copperline"); - await Assert.That(page.Dropped).IsEqualTo(4); + await Assert.That(string.Join("|", page!.Rows.Select(r => r.Name))) + .IsEqualTo("Aetherfall|Hollow Crown|Copperline|Gone Away|No id||Aetherfall again") + .Because("the client drops no archived, repeated, unnamed or id-less row: the directory decides what it lists"); + await Assert.That(page.Dropped).IsEqualTo(0); await Assert.That(page.Total).IsEqualTo(412); await Assert.That(page.Rows[0].Players).IsEqualTo(64); await Assert.That(page.Rows[0].Count).IsEqualTo(WorldPlayerCount.Measured); await Assert.That(page.Rows[1].Count).IsEqualTo(WorldPlayerCount.Declared); - await Assert.That(page.Rows[2].Players).IsNull().Because("a number the directory does not say it measured is not shown"); + await Assert.That(page.Rows[2].Players).IsEqualTo(12).Because("a count is shown with the directory's own label"); + await Assert.That(page.Rows[2].Count).IsEqualTo(WorldPlayerCount.Unknown); + await Assert.That(page.Rows[4].Id).IsEqualTo(Guid.Empty); } [Test] @@ -68,7 +73,7 @@ public async Task NoMoreThanMaxRowsAreKept() var page = WorldDirectory.ParseList(Bytes("{\"games\":[" + rows + "]}")).Page!; await Assert.That(page.Rows.Count).IsEqualTo(WorldDirectory.MaxRows); - await Assert.That(page.Dropped).IsEqualTo(5); + await Assert.That(page.Dropped).IsEqualTo(5).Because("the row cap is the one thing that leaves rows unread"); } [Test] @@ -79,7 +84,7 @@ public async Task AnAnswerThatIsNotAListSaysSo() } [Test] - public async Task TheAddressIsAnActiveTelnetOrTlsEndpointSeenMostRecently() + public async Task AddressesAreListedInTheDirectorysOrderLeavingOutOnlyGoneAndUndialableKinds() { const string game = """ { "id": "6f1c2a52-0000-4000-8000-0c6a1f3d2e01", "name": "Aetherfall", @@ -88,14 +93,52 @@ public async Task TheAddressIsAnActiveTelnetOrTlsEndpointSeenMostRecently() { "host": "ws.example", "port": 443, "kind": "websocket", "state": "active" }, { "host": "stale.example", "port": 4000, "kind": "telnet", "state": "stale", "lastSeenAt": "2026-11-01T00:00:00Z" }, { "host": "a.example", "port": 4201, "kind": "telnet", "state": "active", "lastSeenAt": "2026-10-01T00:00:00Z" }, - { "host": "b.example", "port": 4202, "kind": "tls", "state": "active", "lastSeenAt": "2026-11-02T00:00:00Z" } + { "host": "b.example", "port": 4202, "kind": "tls", "state": "active", "lastSeenAt": "2026-11-02T00:00:00Z" }, + { "host": "a.example", "port": 4201, "kind": "telnet", "state": "active" } ] } """; - var (address, problem) = WorldDirectory.ParseGame(Bytes(game)); + var (parsed, problem) = WorldDirectory.ParseGame(Bytes(game)); await Assert.That(problem).IsNull(); - await Assert.That(address).IsEqualTo(new WorldAddress("Aetherfall", "b.example", 4202, true)); + await Assert.That(string.Join(",", parsed!.Endpoints.Select(e => $"{e.Address}:{(e.Tls ? "tls" : "plain")}:{(e.Stale ? "stale" : "active")}"))) + .IsEqualTo("stale.example:4000:plain:stale,a.example:4201:plain:active,b.example:4202:tls:active,a.example:4201:plain:active") + .Because("the client neither re-ranks nor de-duplicates what the directory lists"); + await Assert.That(parsed.FirstConnectable).IsEqualTo(0); + await Assert.That(parsed.Address(2)).IsEqualTo(new WorldAddress("Aetherfall", "b.example", 4202, true)); + await Assert.That(parsed.Charset).IsNull(); + } + + [Test] + public async Task NoMoreThanMaxEndpointsAreOffered() + { + var endpoints = string.Join(',', Enumerable.Range(1, 20).Select(i => $"{{\"host\":\"h{i}.example\",\"port\":{i},\"kind\":\"telnet\",\"state\":\"active\"}}")); + + var parsed = WorldDirectory.ParseGame(Bytes("{\"name\":\"W\",\"endpoints\":[" + endpoints + "]}")).Game!; + + await Assert.That(parsed.Endpoints.Count).IsEqualTo(WorldDirectory.MaxEndpoints); + await Assert.That(parsed.Endpoints[0].Host).IsEqualTo("h1.example"); + } + + [Test] + public async Task TheGamesCharsetIsReadFromItsFieldsAndANonUtf8OneSetsTheEncoding() + { + static WorldGame Game(string charset) => WorldDirectory.ParseGame(Bytes( + "{\"name\":\"W\",\"endpoints\":[{\"host\":\"w.example\",\"port\":4000,\"kind\":\"telnet\",\"state\":\"active\"}]," + + "\"fields\":{\"CHARSET\":{\"value\":" + charset + ",\"source\":\"handshake\",\"measured\":true}}}")).Game!; + + await Assert.That(Game("\"ISO-8859-1\"").Charset).IsEqualTo("ISO-8859-1"); + await Assert.That(Game("\"ISO-8859-1\"").Address(0).Encoding).IsEqualTo("ISO-8859-1"); + await Assert.That(Game("\"latin1\"").Encoding).IsEqualTo("ISO-8859-1"); + await Assert.That(Game("\"windows-1252\"").Encoding).IsEqualTo("CP1252"); + await Assert.That(Game("\"UTF-8\"").Charset).IsEqualTo("UTF-8"); + await Assert.That(Game("\"UTF-8\"").Encoding).IsNull().Because("UTF-8 leaves the world's encoding auto"); + await Assert.That(Game("\"US-ASCII\"").Encoding).IsNull().Because("UTF-8 reads ASCII"); + await Assert.That(Game("\"KOI8-R\"").Encoding).IsNull().Because("a charset F5 does not offer is not guessed at"); + await Assert.That(Game("\"\\u001b[31mevil\\u202echarset\"").Charset).IsEqualTo("[31mevil charset").Because("control and bidi characters are stripped"); + await Assert.That(Game("\"\\u001b[31mevil\\u202echarset\"").Encoding).IsNull(); + await Assert.That(Game("\"" + new string('a', 200) + "\"").Charset!.Length).IsEqualTo(WorldDirectory.MaxCharset).Because("a charset name is bounded"); + await Assert.That(Game("12").Charset).IsNull(); } [Test] @@ -106,11 +149,13 @@ public async Task AStaleEndpointIsOfferedWhenNoneIsActiveAndTlsMeasuredCounts() { "host": "c.example", "port": 23, "kind": "telnet", "state": "stale", "tlsMeasured": true } ] } """; - await Assert.That(WorldDirectory.ParseGame(Bytes(game)).Address).IsEqualTo(new WorldAddress("Copperline", "c.example", 23, true)); + var parsed = WorldDirectory.ParseGame(Bytes(game)).Game!; + await Assert.That(parsed.Endpoints.Count).IsEqualTo(1); + await Assert.That(parsed.Address(0)).IsEqualTo(new WorldAddress("Copperline", "c.example", 23, true)); } [Test] - public async Task AHostOrPortConnectWouldRefuseIsNeverOffered() + public async Task AnAddressConnectWouldRefuseIsListedAsNotConnectableAndNeverFillsTheForm() { const string game = """ { "name": "Bad", "endpoints": [ @@ -120,10 +165,14 @@ public async Task AHostOrPortConnectWouldRefuseIsNeverOffered() { "host": "x.example", "port": 4000, "kind": "telnet", "state": "gone" } ] } """; - var (address, problem) = WorldDirectory.ParseGame(Bytes(game)); + var (parsed, problem) = WorldDirectory.ParseGame(Bytes(game)); - await Assert.That(address).IsNull(); - await Assert.That(problem).IsEqualTo("the directory lists no telnet address for it that answers"); + await Assert.That(problem).IsNull(); + await Assert.That(parsed!.Endpoints.Count).IsEqualTo(3).Because("the gone one is left out, the three it cannot dial are listed"); + await Assert.That(parsed.Endpoints.All(e => !e.Connectable)).IsTrue(); + await Assert.That(parsed.FirstConnectable).IsEqualTo(-1); + await Assert.That(parsed.Endpoints[0].Host).IsEqualTo("evil host"); + await Assert.That(WorldDirectory.ParseGame(Bytes("{\"name\":\"N\",\"endpoints\":[]}")).Problem).IsEqualTo("the directory lists no telnet address for it"); await Assert.That(WorldDirectory.ParseGame(Bytes("{\"name\":\"N\"}")).Problem).IsEqualTo("the directory lists no address for it"); } @@ -131,7 +180,10 @@ public async Task AHostOrPortConnectWouldRefuseIsNeverOffered() public async Task TheListIsAskedOverHttpsOnlyWithTheQueryEscaped() { var list = WorldDirectory.ListUri("https://mu-index.com/api/", "red & blue")!.AbsoluteUri; - await Assert.That(list).StartsWith("https://mu-index.com/api/games?limit=200&sort=players&q=red"); + await Assert.That(list).StartsWith("https://mu-index.com/api/games?limit=200&sort=players&unnamed=!yes&q=red"); + await Assert.That(WorldDirectory.ListUri("https://mu-index.com/api")!.AbsoluteUri) + .IsEqualTo("https://mu-index.com/api/games?limit=200&sort=players&unnamed=!yes") + .Because("every list asks the directory to leave out games listed only by host:port"); await Assert.That(list).Contains("%26"); await Assert.That(WorldDirectory.ListUri("http://mu-index.com/api")).IsNull(); await Assert.That(WorldDirectory.ListUri("https://user@mu-index.com/api")).IsNull(); diff --git a/tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs b/tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs index e3a0ac73..697408f9 100644 --- a/tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs @@ -40,6 +40,7 @@ internal static readonly (string View, string[] OneRow)[] Footers = ("browse-worlds", ["↑↓ pick", "Esc closes"]), ("browse-worlds-failed", ["↑↓ pick", "Esc closes"]), ("browse-worlds-picked", ["↑↓ field", "Esc back"]), + ("browse-worlds-endpoints", ["↑↓ pick", "Esc back"]), ("quit", ["⏎ stay", "Esc stays"]), ("search", ["↑↓ pick", "⌃F closes"]), ("search", ["⌥H searches older history", "lines held"]), diff --git a/tests/SharpMUTerm.Tui.Tests/WorldBrowseTests.cs b/tests/SharpMUTerm.Tui.Tests/WorldBrowseTests.cs index 0e3d691d..33d83210 100644 --- a/tests/SharpMUTerm.Tui.Tests/WorldBrowseTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/WorldBrowseTests.cs @@ -91,7 +91,7 @@ public async Task TheWelcomesBrowseRowOpensTheListFromTheDirectory() await Assert.That(run.App.WorldBrowseOpen).IsTrue(); await Assert.That(run.App.WelcomeIsOpen).IsFalse(); - await Assert.That(run.Asked.Single().AbsoluteUri).IsEqualTo("https://mu-index.com/api/games?limit=200&sort=players"); + await Assert.That(run.Asked.Single().AbsoluteUri).IsEqualTo("https://mu-index.com/api/games?limit=200&sort=players&unnamed=!yes"); var model = run.App.WorldBrowseModelNow; await Assert.That(model.State).IsEqualTo(WorldBrowseState.Ready); await Assert.That(model.Rows[0].Name).IsEqualTo("Aetherfall"); @@ -120,21 +120,24 @@ public async Task ADirectoryThatDoesNotAnswerIsSaidHonestly() await Assert.That(run.App.WorldBrowseModelNow.Empty("")).StartsWith("mu*index did not answer:"); } - /// A pick fills the welcome's form in and saves nothing; the player's ⏎ there adds the world, named as listed. + /// A pick of a world with one address fills the welcome's form in and saves nothing; the form's ⏎ adds it. [Test] - public async Task APickFillsInTheConnectFormAndOnlyItsEnterAddsTheWorld() + public async Task APickWithOneAddressFillsInTheConnectFormAndOnlyItsEnterAddsTheWorld() { await using var run = await Start(); OpenFromTheWelcome(run.App); + run.App.SimulateWorldBrowseKey(Key(ConsoleKey.DownArrow)); run.App.SimulateWorldBrowseKey(Key(ConsoleKey.Enter, '\r')); await Assert.That(run.App.WorldBrowseOpen).IsFalse(); var form = run.App.Welcome!; await Assert.That(form.InForm).IsTrue(); - await Assert.That(form.Host).IsEqualTo("aetherfall.example"); - await Assert.That(form.Tls).IsTrue(); - await Assert.That(form.WorldName).IsEqualTo("Aetherfall"); + await Assert.That(form.Host).IsEqualTo("lanternport.example"); + await Assert.That(form.Port).IsEqualTo("2860"); + await Assert.That(form.Tls).IsFalse(); + await Assert.That(form.WorldName).IsEqualTo("Lanternport"); + await Assert.That(form.Encoding).IsNull(); await Assert.That(run.Config.Worlds.Count).IsEqualTo(0).Because("nothing is saved before the form's ⏎"); await Assert.That(run.Saved.Count).IsEqualTo(0); await Assert.That(string.Join('\n', run.App.WelcomeLines.Select(MarkupText.Plain))).Contains("as listed on mu*index"); @@ -142,10 +145,72 @@ public async Task APickFillsInTheConnectFormAndOnlyItsEnterAddsTheWorld() run.App.SimulateWelcomeKey(Key(ConsoleKey.Enter, '\r')); await run.App.LastCommand; + var world = run.Config.Worlds.Single(); + await Assert.That(world.Name).IsEqualTo("Lanternport"); + await Assert.That(world.Host).IsEqualTo("lanternport.example"); + await Assert.That(world.Encoding).IsEqualTo("auto"); + } + + /// + /// A world with several addresses is chosen from first — TLS active, then plain active, then stale — and the address + /// chosen fills in the form with its TLS, and the encoding mu*index's non-UTF-8 charset names; still nothing is saved + /// before the form's ⏎. + /// + [Test] + public async Task APickWithSeveralAddressesIsChosenFromAndTheChoiceFillsInTheFormWithItsEncoding() + { + await using var run = await Start(); + OpenFromTheWelcome(run.App); + + run.App.SimulateWorldBrowseKey(Key(ConsoleKey.Enter, '\r')); + + await Assert.That(run.App.WorldBrowseOpen).IsTrue(); + var game = run.App.WorldBrowseModelNow.Choosing!; + await Assert.That(string.Join(",", game.Endpoints.Select(WorldBrowseModel.EndpointText))) + .IsEqualTo("aetherfall.example:4202 — TLS — active,aetherfall.example:4201 — plain — active,aetherfall.example:4000 — plain — stale · not reached lately"); + await Assert.That(game.Charset).IsEqualTo("ISO-8859-1"); + var drawn = string.Join('\n', run.App.CellWorldBrowse!.Render(run.App.WorldBrowseModelNow, 96, 20).Select(MarkupText.Plain)); + await Assert.That(drawn).Contains("Aetherfall answers at 3 addresses").And.Contains("▸ aetherfall.example:4202").And.Contains("charset ISO-8859-1"); + + run.App.SimulateWorldBrowseKey(Key(ConsoleKey.DownArrow)); + run.App.SimulateWorldBrowseKey(Key(ConsoleKey.Enter, '\r')); + + await Assert.That(run.App.WorldBrowseOpen).IsFalse(); + var form = run.App.Welcome!; + await Assert.That(form.Host).IsEqualTo("aetherfall.example"); + await Assert.That(form.Port).IsEqualTo("4201"); + await Assert.That(form.Tls).IsFalse(); + await Assert.That(form.Encoding).IsEqualTo("ISO-8859-1"); + await Assert.That(run.Config.Worlds.Count).IsEqualTo(0); + await Assert.That(string.Join('\n', run.App.WelcomeLines.Select(MarkupText.Plain))).Contains("encoding ISO-8859-1"); + + run.App.SimulateWelcomeKey(Key(ConsoleKey.Enter, '\r')); + await run.App.LastCommand; + var world = run.Config.Worlds.Single(); await Assert.That(world.Name).IsEqualTo("Aetherfall"); - await Assert.That(world.Host).IsEqualTo("aetherfall.example"); - await Assert.That(world.UseTls).IsTrue(); + await Assert.That(world.Port).IsEqualTo(4201); + await Assert.That(world.UseTls).IsFalse(); + await Assert.That(world.Encoding).IsEqualTo("ISO-8859-1"); + } + + [Test] + public async Task TheDefaultAddressIsTheFirstListedAndEscGoesBackToTheList() + { + await using var run = await Start(); + OpenFromTheWelcome(run.App); + run.App.SimulateWorldBrowseKey(Key(ConsoleKey.Enter, '\r')); + + run.App.SimulateWorldBrowseKey(Key(ConsoleKey.Escape, '\x1b')); + + await Assert.That(run.App.WorldBrowseOpen).IsTrue().Because("Esc on the address choice goes back, not out"); + await Assert.That(run.App.WorldBrowseModelNow.Choosing).IsNull(); + + run.App.SimulateWorldBrowseKey(Key(ConsoleKey.Enter, '\r')); + run.App.SimulateWorldBrowseKey(Key(ConsoleKey.Enter, '\r')); + + await Assert.That(run.App.Welcome!.Port).IsEqualTo("4202"); + await Assert.That(run.App.Welcome!.Tls).IsTrue(); } [Test] @@ -181,10 +246,25 @@ public async Task APickTheDirectoryCannotPlaceStaysOnTheListAndSaysWhy() run.App.SimulateWorldBrowseKey(Key(ConsoleKey.Enter, '\r')); await Assert.That(run.App.WorldBrowseOpen).IsTrue(); - await Assert.That(run.App.WorldBrowseModelNow.Problem).IsEqualTo("Aetherfall not opened: the directory lists no telnet address for it that answers"); + await Assert.That(run.App.WorldBrowseModelNow.Problem).IsEqualTo("Aetherfall not opened: the directory lists no telnet address for it"); await Assert.That(run.App.WorldBrowseModelNow.Opening).IsNull(); } + [Test] + public async Task AnAddressConnectCannotDialIsSaidAndNeverFillsTheForm() + { + await using var run = await Start(answer: uri => uri.AbsolutePath.EndsWith("/games", StringComparison.Ordinal) + ? Encoding.UTF8.GetBytes(DemoWorldDirectory.Answer(uri)) + : Encoding.UTF8.GetBytes("{\"name\":\"x\",\"endpoints\":[{\"host\":\"bad host\",\"port\":4000,\"kind\":\"telnet\",\"state\":\"active\"}]}")); + OpenFromTheWelcome(run.App); + + run.App.SimulateWorldBrowseKey(Key(ConsoleKey.Enter, '\r')); + + await Assert.That(run.App.WorldBrowseOpen).IsTrue(); + await Assert.That(run.App.WelcomeIsOpen).IsFalse(); + await Assert.That(run.App.WorldBrowseModelNow.Problem).IsEqualTo("Aetherfall not opened: mu*index lists it at bad host:4000, which /connect cannot dial"); + } + [Test] public async Task EnterOnASearchTheRowsCannotAnswerAsksTheDirectory() { @@ -247,4 +327,31 @@ public async Task WhereTheScreenIsNotSeenTheListIsLinesAndANumberSaysTheConnectL await Assert.That(heard.Heard).Contains("To add it and connect, type: /connect lanternport.example 2860"); await Assert.That(run.Config.Worlds.Count).IsEqualTo(0); } + + /// --plain: a world with several addresses has them said as numbered lines, and /browse 1 2 says the second's line. + [Test] + public async Task WhereTheScreenIsNotSeenSeveralAddressesAreNumberedAndASecondNumberSaysOne() + { + var heard = new Recorder(); + await using var run = await Start(host: h => h with { Announcer = heard, ScreenIsSeen = false }); + TypeCommand(run.App, "/browse"); + + TypeCommand(run.App, "/browse 1"); + + await Assert.That(heard.Heard).Contains("Aetherfall answers at 3 addresses — choose one:"); + await Assert.That(heard.Heard).Contains("1. aetherfall.example:4202 — TLS — active"); + await Assert.That(heard.Heard).Contains("3. aetherfall.example:4000 — plain — stale · not reached lately"); + await Assert.That(heard.Heard).Contains("mu*index names its charset ISO-8859-1, for the whole game rather than per address."); + + TypeCommand(run.App, "/browse 1 1"); + await Assert.That(heard.Heard).Contains("To add it and connect, type: /connect aetherfall.example 4202 tls"); + + TypeCommand(run.App, "/browse 1 2"); + await Assert.That(heard.Heard).Contains("To add it and connect, type: /connect aetherfall.example 4201"); + await Assert.That(heard.Heard).Contains(line => line.Contains("set the world's encoding to ISO-8859-1", StringComparison.Ordinal)); + + TypeCommand(run.App, "/browse 1 7"); + await Assert.That(run.App.LastNotice).Contains("Aetherfall has 3 addresses"); + await Assert.That(run.Config.Worlds.Count).IsEqualTo(0); + } } From 788e18de524628da2e47545347d42122ae42802b Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 17:20:35 +0000 Subject: [PATCH 063/113] Give the package link test ten seconds under a loaded test host It waited two seconds for the review to open and failed once in a parallel run; alone it passes in milliseconds. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- tests/SharpMUTerm.Tui.Tests/PackagesAppTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/SharpMUTerm.Tui.Tests/PackagesAppTests.cs b/tests/SharpMUTerm.Tui.Tests/PackagesAppTests.cs index 175ac4c6..b93dc74d 100644 --- a/tests/SharpMUTerm.Tui.Tests/PackagesAppTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/PackagesAppTests.cs @@ -134,7 +134,7 @@ public async Task ALinkIsFetchedThenReviewed() rig.App.PackageFetch = (uri, _) => { asked = uri; return Task.FromResult(Archive()); }; Type(rig.App, "/package install https://packages.example/basics.zip"); - for (var i = 0; i < 200 && !rig.App.PackageView.IsOpen; i++) + for (var i = 0; i < 1000 && !rig.App.PackageView.IsOpen; i++) { await Task.Delay(10); } From 26ca3c9a8599c59aa805a9e4067eb5996a665b27 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 17:22:54 +0000 Subject: [PATCH 064/113] Window: panel headings, docked composer footer, page welcome MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Every docked native panel draws a heading from its model (PanelHeading, Client): Compose for Corvid, Here The Grand Plaza · 6, Vitals GMCP Char.Vitals, Map Aetherfall · level 0. Who-here marks active, idle and NPC with a dot and right-aligned state and ends in its footnote; a tall vitals pane is a card with the target under a rule; the quick bar's buttons carry their key and end in "+ Bind a key" (F4). The docked composer gets an escaping chip, a paragraph/word summary, and Preview (F1 with the as-sent band, PreviewDocked) and Send buttons. The window's welcome is one page: a Find a world card that lists mu*index only on Show worlds (WelcomeSession.FindWorlds, the browse list's pick on Add), Connect directly with its /connect line, and two starting-layout cards. New surface actions are probed in SurfaceParityTests. Terminal frames are unchanged. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 8 + CLAUDE.md | 8 + src/SharpMUTerm.Avalonia/ComposerView.cs | 207 ++++- src/SharpMUTerm.Avalonia/MapCanvas.cs | 25 +- src/SharpMUTerm.Avalonia/NativeTokens.cs | 3 + src/SharpMUTerm.Avalonia/PanelText.cs | 45 ++ src/SharpMUTerm.Avalonia/QuickBarButtons.cs | 64 +- src/SharpMUTerm.Avalonia/VitalsGauges.cs | 81 +- src/SharpMUTerm.Avalonia/WelcomeView.cs | 722 +++++++++++++----- src/SharpMUTerm.Avalonia/WhoHereList.cs | 90 +-- .../Composer/ComposerModel.cs | 32 + src/SharpMUTerm.Client/Modals/WelcomeModel.cs | 103 +++ src/SharpMUTerm.Client/Panels/PanelHeading.cs | 57 ++ .../Panels/QuickBarModel.cs | 6 + src/SharpMUTerm.Client/Panels/VitalsModel.cs | 45 +- src/SharpMUTerm.Client/Panels/WhoHereModel.cs | 13 + .../Surfaces/SurfaceCatalog.cs | 8 + .../SharpMUTermApp.NativeComposer.cs | 26 + .../SharpMUTermApp.NativeModals.cs | 14 +- src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs | 13 +- src/SharpMUTerm.Tui/SharpMUTermApp.Welcome.cs | 5 + .../SharpMUTermApp.WorldBrowse.cs | 83 +- .../NativeComposerTests.cs | 2 +- .../SurfaceParityTests.cs | 49 ++ .../PanelHeadingTests.cs | 56 ++ 25 files changed, 1411 insertions(+), 354 deletions(-) create mode 100644 src/SharpMUTerm.Client/Panels/PanelHeading.cs create mode 100644 tests/SharpMUTerm.Client.Tests/PanelHeadingTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index c52877e3..53474907 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,14 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- In the desktop window, every docked panel has a heading saying what it shows (Compose for Corvid, Here The Grand + Plaza · 6, Vitals GMCP Char.Vitals, Map Aetherfall · level 0). Who is here marks each person active, idle or NPC; a + tall vitals pane draws a card with the target under a rule; the quick bar's buttons show their key and end in a + "+ Bind a key" button that opens F4. +- The docked composer in the window has its escaping on a chip you can click, a paragraph and word count, and Preview + and Send buttons; Preview opens the full-screen composer with the as-sent band. +- The window's welcome is one page: find a world from mu*index and add it, connect directly (with the `/connect` line + it stands for), and pick a starting layout from two cards. Nothing is fetched until you ask for the list. - A script error in the script console that names a file and line is now a link: click it to open that script with the caret on the line and the line marked. Closing the editor goes back to the console. - The script editor numbers its lines in the desktop window too, and after a save whose reload fails, the line the diff --git a/CLAUDE.md b/CLAUDE.md index 7bfaa89e..e50f4f54 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -1481,6 +1481,14 @@ fallbacks) for inline images/maps. always-on-top choice; the composer does not float; positions on a mixed-DPI desktop are assumed to be in the main window's scaling. +- **Wave 19 panels and welcome (window only; the cells are unchanged).** Each docked native panel draws a heading from + its model (`PanelHeading.For`, Client; `PanelText.Heading`); `VitalsModel.Source` names where the meters came from + (`SourceOf`, set in `ReadVitals`), a mixture names nothing. The docked composer's footer (summary, Preview, Send) ends + in `ComposerSession`: Preview is `PreviewDocked` → F1 with `_composer.Preview` on (surface action `preview`). The quick + bar and the vitals row leave 22–30 px at the right for the pop-out button. The native welcome is a page + (`WelcomeView`): its Find card attaches a `WorldBrowseSession` to the welcome (`WelcomeSession.FindWorlds` → + `FindWorldsInWelcome`, actions `find`/`add`), fetched only on Show worlds, forgotten when the welcome closes; Add is the + browse pick, which reopens the welcome with the form filled. - **Wave 16 groups** (F5 headings, ⌃P groups, scene mark, client rows, map find). Decisions not to relitigate: - **F5's world column is drawn in the declaration's order under its `Group` headings** (`WorldsScreenRenderer.DetailColumn` walks `BuiltInSettings.World.Fields`), so the cell screen and the window group alike; `WorldFieldOrder` (⇥ order and the diff --git a/src/SharpMUTerm.Avalonia/ComposerView.cs b/src/SharpMUTerm.Avalonia/ComposerView.cs index a2df2fe4..f54348a2 100644 --- a/src/SharpMUTerm.Avalonia/ComposerView.cs +++ b/src/SharpMUTerm.Avalonia/ComposerView.cs @@ -49,6 +49,12 @@ internal sealed class ComposerView : Border private readonly Border _footer; private readonly WrapPanel _keys; private readonly Border _rule; + + // The docked panel's own parts: the editor's framed well, and the footer's summary, Preview and Send. + private readonly Border? _well; + private readonly TextBlock _summary = new() { VerticalAlignment = VerticalAlignment.Center, TextTrimming = TextTrimming.CharacterEllipsis }; + private readonly Border _previewButton; + private readonly Border _sendButton; private ComposerSession? _session; private ComposerModel? _model; private long _applied = -1; @@ -70,7 +76,7 @@ public ComposerView(TerminalView view, bool fullScreen) _editor = new ComposerEditor { Background = Brushes.Transparent, - Padding = fullScreen ? new Thickness(22, 14) : new Thickness(12, 6), + Padding = fullScreen ? new Thickness(22, 14) : new Thickness(10, 8), }; AutomationProperties.SetName(_editor, fullScreen ? "Compose a post" : "Docked composer"); _editor.TextChanged += (_, _) => OnTextChanged(); @@ -81,7 +87,7 @@ public ComposerView(TerminalView view, bool fullScreen) _marks = new MarkLayer(_editor); _gutter = new LineGutter(_editor) { IsVisible = false }; - _title = new TextBlock { FontWeight = FontWeight.Bold, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(0, 0, 10, 0) }; + _title = new TextBlock { FontWeight = fullScreen ? FontWeight.Bold : FontWeight.SemiBold, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(0, 0, fullScreen ? 10 : 8, 0) }; _target = new TextBlock { VerticalAlignment = VerticalAlignment.Center, TextTrimming = TextTrimming.CharacterEllipsis }; _chips = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 6, VerticalAlignment = VerticalAlignment.Center }; _count = new TextBlock { VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(10, 0, 0, 0) }; @@ -93,10 +99,29 @@ public ComposerView(TerminalView view, bool fullScreen) headerRow.Children.Add(_count); headerRow.Children.Add(_chips); headerRow.Children.Add(_target); - _header = new Border { Child = headerRow, Padding = fullScreen ? new Thickness(22, 10) : new Thickness(12, 3, 8, 3) }; + // The docked panel's heading is every panel's (PanelText.Heading): 16 px in, a rule under it, the pop-out button + // clear at the right. + _header = new Border { Child = headerRow, Padding = fullScreen ? new Thickness(22, 10) : new Thickness(PanelText.Pad, 10, 30, 10) }; _keys = new WrapPanel { Orientation = Orientation.Horizontal, VerticalAlignment = VerticalAlignment.Center }; - _footer = new Border { Child = _keys, Padding = fullScreen ? new Thickness(22, 8) : new Thickness(12, 2, 8, 3) }; + + // The docked footer: how long the post is, then Preview (F1 with its as-sent band) and Send, each the session's. + _previewButton = ActionButton("Preview", "The post as it will be sent, in F1", () => _session?.TogglePreview()); + _previewButton.Name = "Preview"; + _sendButton = ActionButton("Send Ctrl+S", "Send the post (Ctrl+S)", () => _session?.Send(_editor.Text ?? string.Empty)); + _sendButton.Name = "Send"; + var dockedFooter = new DockPanel { LastChildFill = true }; + DockPanel.SetDock(_sendButton, Dock.Right); + DockPanel.SetDock(_previewButton, Dock.Right); + _previewButton.Margin = new Thickness(8, 0, 8, 0); + dockedFooter.Children.Add(_sendButton); + dockedFooter.Children.Add(_previewButton); + dockedFooter.Children.Add(_summary); + _footer = new Border + { + Child = fullScreen ? _keys : dockedFooter, + Padding = fullScreen ? new Thickness(22, 8) : new Thickness(PanelText.Pad, 10, PanelText.Pad, 12), + }; // F1's as-sent preview (⌥P): the one command ⌃S sends, in the editor's face, under the editor. _previewHeading = new TextBlock { Text = "AS SENT", FontWeight = FontWeight.Bold, Margin = new Thickness(0, 0, 0, 4) }; @@ -119,10 +144,25 @@ public ComposerView(TerminalView view, bool fullScreen) // A script's lines are numbered in a gutter beside the editor, the cells' line numbers; the error line is marked there. var body = new Grid { ColumnDefinitions = new ColumnDefinitions("Auto,*") }; + Control page = text; + if (!fullScreen) + { + // Docked, the editor is a framed well inside the panel, as the mockup's Text field is. + _well = new Border + { + Child = text, + Margin = new Thickness(PanelText.Pad, 12, PanelText.Pad, 0), + CornerRadius = new CornerRadius(NativeTokens.RadiusS + 2), + BorderThickness = new Thickness(1), + ClipToBounds = true, + }; + page = _well; + } + Grid.SetColumn(_gutter, 0); - Grid.SetColumn(text, 1); + Grid.SetColumn(page, 1); body.Children.Add(_gutter); - body.Children.Add(text); + body.Children.Add(page); var grid = new Grid { RowDefinitions = new RowDefinitions("Auto,*,Auto,Auto") }; Grid.SetRow(_header, 0); @@ -165,8 +205,10 @@ public ComposerView(TerminalView view, bool fullScreen) .Concat(_chips.Children.OfType().Select(b => (b.Child as TextBlock)?.Text)).Where(t => !string.IsNullOrEmpty(t))); /// The key row's words, joined, for a test. - internal string FooterText => string.Join(" · ", _keys.Children.OfType() - .Select(p => string.Join(" ", p.Children.OfType().Select(Words).Where(t => t.Length > 0)))); + internal string FooterText => !_fullScreen + ? string.Join(" · ", new[] { _summary.Text, Words(_previewButton.Child!), Words(_sendButton.Child!) }.Where(t => !string.IsNullOrEmpty(t))) + : string.Join(" · ", _keys.Children.OfType() + .Select(p => string.Join(" ", p.Children.OfType().Select(Words).Where(t => t.Length > 0)))); /// The menu the editor last opened. Internal for tests. internal ContextMenu? OpenedMenu { get; private set; } @@ -303,15 +345,29 @@ private static bool SameChrome(ComposerModel a, ComposerModel b) => /// The bands' plane: the pane's, one step toward the text, so the editor reads as the page between them. private Color Band => Mix(_plane, _text, _fullScreen ? 0.06 : 0.045); + /// The docked editor's well: a step deeper than the panel on a dark plane, lighter on a light one. + private Color Well => Luma(_plane) < 0.5 ? Mix(_plane, Colors.Black, 0.25) : Mix(_plane, Colors.White, 0.7); + + private static double Luma(Color c) => ((0.2126 * c.R) + (0.7152 * c.G) + (0.0722 * c.B)) / 255; + private void Paint() { Background = new SolidColorBrush(_plane); - _header.Background = new SolidColorBrush(Band); - _footer.Background = new SolidColorBrush(Band); - _header.BorderBrush = new SolidColorBrush(Mix(_plane, _text, 0.12)); + _header.Background = new SolidColorBrush(_fullScreen ? Band : _plane); + _footer.Background = new SolidColorBrush(_fullScreen ? Band : _plane); + _header.BorderBrush = new SolidColorBrush(_fullScreen ? Mix(_plane, _text, 0.12) : PanelText.Rule(_text, _plane)); _header.BorderThickness = new Thickness(0, 0, 0, 1); _footer.BorderBrush = _header.BorderBrush; - _footer.BorderThickness = new Thickness(0, 1, 0, 0); + _footer.BorderThickness = _fullScreen ? new Thickness(0, 1, 0, 0) : default; + if (_well is not null) + { + _well.Background = new SolidColorBrush(Well); + _well.BorderBrush = new SolidColorBrush(Mix(_plane, _text, 0.2)); + } + + _summary.Foreground = new SolidColorBrush(Dim); + PaintButton(_previewButton, accent: false); + PaintButton(_sendButton, accent: true); _rule.Background = new SolidColorBrush(Accent); _editor.Foreground = new SolidColorBrush(_text); _editor.CaretBrush = new SolidColorBrush(Accent); @@ -323,8 +379,8 @@ private void Paint() _gutter.Warn = Warn; _gutter.Background = new SolidColorBrush(Band); _gutter.InvalidateVisual(); - _title.Foreground = new SolidColorBrush(Accent); - _target.Foreground = new SolidColorBrush(_text); + _title.Foreground = new SolidColorBrush(_fullScreen ? Accent : _text); + _target.Foreground = new SolidColorBrush(_fullScreen ? _text : Dim); _count.Foreground = new SolidColorBrush(Dim); _preview.Background = new SolidColorBrush(Band); _preview.BorderBrush = _header.BorderBrush; @@ -338,9 +394,17 @@ private void ApplyFont() { var cell = _view.CellExtent.Height > 0 ? _view.CellExtent.Height : 17; var ui = Math.Clamp(cell * 0.72, 11, 15); - _title.FontSize = ui; - _target.FontSize = ui; + _title.FontSize = _fullScreen ? ui : PanelText.Size; + _target.FontSize = _fullScreen ? ui : PanelText.Size; _count.FontSize = ui - 1; + _summary.FontSize = PanelText.Size - 1; + foreach (var button in new[] { _previewButton, _sendButton }) + { + if (button.Child is TextBlock words) + { + words.FontSize = PanelText.Size - 1; + } + } _previewHeading.FontSize = ui - 1.5; _previewText.FontSize = Math.Clamp(cell * 0.72, 11, 16); _previewText.FontFamily = new FontFamily($"{_view.Renderer.Fonts.FamilyName}, {CellFonts.BundledFamily}, DejaVu Sans Mono, Liberation Mono, Consolas, Menlo, monospace"); @@ -389,18 +453,49 @@ private void Label(ComposerModel model) _title.Text = "EDIT"; _target.Text = $"{edit.Name} {edit.Type} · from {(model.Target.Length == 0 ? "no connection" : model.Target)}"; } + else if (!_fullScreen) + { + // The panel heading: Compose for Corvid. + var heading = SharpMUTerm.Client.Panels.PanelHeading.For(model); + _title.Text = heading.Title; + _target.Text = heading.Context ?? string.Empty; + } else { _title.Text = "COMPOSE"; - var verb = !_fullScreen && model.Verb.Length > 0 ? $"{model.Verb} " : string.Empty; - _target.Text = model.Target.Length == 0 ? $"{verb}no connection" : $"{verb}to {model.Target}"; + _target.Text = model.Target.Length == 0 ? "no connection" : $"to {model.Target}"; } _target.Foreground = new SolidColorBrush( - model.Target.Length == 0 || model.Edit?.Status?.StartsWith('!') == true ? Warn : _text); + model.Target.Length == 0 || model.Edit?.Status?.StartsWith('!') == true ? Warn : _fullScreen ? _text : Dim); _chips.Children.Clear(); - if (model.Edit is null) + if (model.Edit is null && !_fullScreen) + { + // The escaping, as a chip that switches it (⌥L): Literal or As typed. + var literal = model.Escaping == ComposeEscaping.Literal; + var escaping = Chip(literal ? "Literal" : "As typed", literal ? Accent : Dim, ui - 1.5); + escaping.Name = "Escaping"; + escaping.Cursor = new Cursor(StandardCursorType.Hand); + ToolTip.SetTip(escaping, literal ? "Sent as typed, % [ ] escaped (Alt+L switches)" : "Sent exactly as typed (Alt+L switches)"); + escaping.PointerPressed += (_, e) => + { + if (e.GetCurrentPoint(escaping).Properties.IsLeftButtonPressed) + { + e.Handled = true; + _session?.ToggleEscaping(); + } + }; + _chips.Children.Add(escaping); + if (model.Armed && model.Dictionary is { } named) + { + _chips.Children.Add(Chip(named, Dim, ui - 1.5)); + } + + _count.IsVisible = false; + _sendButton.Opacity = model.CanSend ? 1 : 0.55; + } + else if (model.Edit is null) { _chips.Children.Add(Chip(model.Escaping == ComposeEscaping.Literal ? "literal" : "as typed", model.Escaping == ComposeEscaping.Literal ? Accent : _text, ui - 1.5)); @@ -416,7 +511,15 @@ private void Label(ComposerModel model) SyncLength(); _keys.Children.Clear(); - var narrow = !_fullScreen && Bounds.Width is > 0 and < 560; + if (!_fullScreen) + { + // A docked composer too short for its footer keeps the editor and drops the footer. + _footer.IsVisible = Bounds.Height is 0 or >= 96; + _editor.PlaceholderText = !model.Armed ? ComposerModel.ClickToWrite : null; + _editor.PlaceholderForeground = new SolidColorBrush(Dim); + return; + } + // The idle editor's placeholder says "Click to write a post"; the row's keyless hint saying it again was the // panel saying one thing twice. var placeholder = !model.Armed && !_fullScreen; @@ -436,7 +539,7 @@ private void Label(ComposerModel model) item.Children.Add(new TextBlock { - Text = NativeKeys.Words(narrow && key.Short is { } brief ? brief : key.Label), + Text = NativeKeys.Words(key.Label), FontSize = ui - 1, Foreground = new SolidColorBrush(Dim), VerticalAlignment = VerticalAlignment.Center, @@ -516,6 +619,14 @@ private void SyncLength() var text = _editor.Text ?? string.Empty; _count.Text = ComposerModel.CharactersLabel(ComposerModel.SentLength(text, model.Escaping, model.Edit is not null)); + if (!_fullScreen) + { + // 2 paragraphs · 31 words · 240 chars; before anything is written, the keys that move in and out of it. + var summary = ComposerModel.Summary(text); + _summary.Text = summary.Length > 0 + ? $"{summary} · {_count.Text}" + : NativeKeys.Words(model.Armed ? "Esc command line · F1 full screen" : "F1 full screen"); + } if (_preview.IsVisible) { var command = ComposeMessage.Build(text.Replace("\r\n", "\n", StringComparison.Ordinal), model.Escaping); @@ -783,6 +894,58 @@ private void Replace(SpellRange mark, string replacement) // ── colours ────────────────────────────────────────────────────────────────────────────── + /// A footer button drawn as a plate, as the panels' are: a click runs . + private static Border ActionButton(string words, string tip, Action click) + { + var button = new Border + { + Child = new TextBlock { Text = words, VerticalAlignment = VerticalAlignment.Center }, + Padding = new Thickness(10, 5), + CornerRadius = new CornerRadius(NativeTokens.RadiusS + 2), + BorderThickness = new Thickness(1), + Cursor = new Cursor(StandardCursorType.Hand), + VerticalAlignment = VerticalAlignment.Center, + }; + ToolTip.SetTip(button, tip); + AutomationProperties.SetName(button, words); + button.PointerPressed += (_, e) => + { + if (e.GetCurrentPoint(button).Properties.IsLeftButtonPressed) + { + e.Handled = true; + click(); + } + }; + return button; + } + + private void PaintButton(Border button, bool accent) + { + button.Background = new SolidColorBrush(accent ? Accent : Mix(_plane, _text, 0.07)); + button.BorderBrush = new SolidColorBrush(accent ? Accent : Mix(_plane, _text, 0.18)); + if (button.Child is TextBlock words) + { + words.Foreground = new SolidColorBrush(accent ? (Luma(Accent) > 0.5 ? Mix(Accent, Colors.Black, 0.85) : Colors.White) : _text); + words.FontWeight = accent ? FontWeight.SemiBold : FontWeight.Normal; + } + } + + /// Presses the docked footer's Preview or Send button, as a click on it does. Internal for tests. + internal void PressFooter(string name) + { + if (name == "Send") + { + _session?.Send(_editor.Text ?? string.Empty); + } + else + { + _session?.TogglePreview(); + } + } + + /// The docked footer's summary as drawn. Internal for tests. + internal string SummaryText => _summary.Text ?? string.Empty; + internal static Color Mix(Color a, Color b, double t) => Color.FromRgb( (byte)Math.Round(a.R + ((b.R - a.R) * t)), (byte)Math.Round(a.G + ((b.G - a.G) * t)), diff --git a/src/SharpMUTerm.Avalonia/MapCanvas.cs b/src/SharpMUTerm.Avalonia/MapCanvas.cs index a90fe942..05586083 100644 --- a/src/SharpMUTerm.Avalonia/MapCanvas.cs +++ b/src/SharpMUTerm.Avalonia/MapCanvas.cs @@ -390,8 +390,9 @@ internal IReadOnlyList LookButtons() return buttons; } - var x = 10.0; - var y = _model.Walking is not null || _model.Current is not null ? 46.0 : 28.0; + var x = PanelText.Pad; + var heading = PanelText.HeadingHeight(CellHeight); + var y = _model.Walking is not null || _model.Current is not null ? heading + 26 : heading + 8; void Add(string id, string label, bool enabled) { var width = PanelText.Measure(label, ButtonSize, bold: false) + 14; @@ -420,6 +421,9 @@ void Add(string id, string label, bool enabled) private const double ButtonSize = 11; + /// The cell height the panel sits on, which sizes its heading as every panel's. + private double CellHeight => _view.CellExtent.Height > 0 ? _view.CellExtent.Height : 17; + private LookButton? LookButtonAt(Point point) => LookButtons().FirstOrDefault(b => b.Rect.Contains(point)); /// What a look button does. Internal for tests, which press one the way a click does. @@ -662,17 +666,22 @@ public override void Render(DrawingContext context) DrawName(context, hovered.Current ? $"{hovered.Name} — you are here" : hovered.Name, CentreOf(hovered), size, plate: true); } - // What and where, in the corner: the area and level, and a walk under way. - var label = (_model.Viewing ? "Viewing " : string.Empty) - + (_model.Area is { Length: > 0 } areaName ? $"{areaName} · level {_model.Level}" : $"level {_model.Level}"); - DrawText(context, label, new Point(10, 8), 12, _model.AreaColour is { } areaHex ? Parse(areaHex) : Faded(0.75)); + // What and where: the panel heading (Map, the area and level) with the area's colour as a mark before its name's + // line, then the room the character is in, or a walk under way, under it. + var heading = PanelText.Heading(context, PanelHeading.For(_model), bounds.Width, CellHeight, _plane, _text, right: 20); + if (_model.AreaColour is { } areaHex) + { + context.DrawRectangle(new SolidColorBrush(Parse(areaHex)), null, new Rect(PanelText.Pad - 9, (heading / 2) - 5, 3, 10), 1.5, 1.5); + } + + var under = heading + 6; if (_model.Walking is { } walking) { - DrawText(context, walking, new Point(10, 26), 12, path); + DrawText(context, walking, new Point(PanelText.Pad, under), 12, path); } else if (_model.Current is { } here) { - DrawText(context, here.Name, new Point(10, 26), 12, accent); + DrawText(context, here.Name, new Point(PanelText.Pad, under), 12, accent); } if (_dragRoom is { } moving && byId.TryGetValue(moving.Id, out var shown)) diff --git a/src/SharpMUTerm.Avalonia/NativeTokens.cs b/src/SharpMUTerm.Avalonia/NativeTokens.cs index 8c8bb89f..363bea89 100644 --- a/src/SharpMUTerm.Avalonia/NativeTokens.cs +++ b/src/SharpMUTerm.Avalonia/NativeTokens.cs @@ -56,6 +56,9 @@ internal sealed record NativeTokens( /// The type ramp: a surface's or a page's heading. public const double Heading = 18; + /// The type ramp: a whole page's title, of which there is one (the first-run welcome). + public const double Display = 26; + /// /// Not on the ramp: the theme cards' miniature of the cells (F7), which is a picture of a terminal at a quarter of /// its size rather than text to read. diff --git a/src/SharpMUTerm.Avalonia/PanelText.cs b/src/SharpMUTerm.Avalonia/PanelText.cs index 47b9e705..5d4dc396 100644 --- a/src/SharpMUTerm.Avalonia/PanelText.cs +++ b/src/SharpMUTerm.Avalonia/PanelText.cs @@ -58,4 +58,49 @@ public static double Draw(DrawingContext context, string text, double x, double /// A #rrggbb from the client, or grey when it is not one. public static Color Parse(string hex) => Color.TryParse(hex, out var colour) ? colour : Colors.Gray; + + // ── The panel heading: one row every docked panel draws over its content ──────────────────────────────────── + + /// The panels' side padding, and the heading's. + public const double Pad = 16; + + /// The panels' text size: the window's body size, one step up, which is what the mockups' side column reads at. + public const double Size = NativeTokens.Body + 1; + + /// How tall the heading is, its rule included, for the cell height the panel sits on: 42 px at a 20 px cell. + public static double HeadingHeight(double cellHeight) => Math.Clamp(cellHeight * 2.1, 32, 44); + + /// The secondary ink: mixed toward , opaque so it can be floor-checked. + public static Color Dim(Color text, Color plane) => Mix(text, plane, 0.38); + + /// The heading's rule, and every rule in a panel: a step from the plane toward the text. + public static Color Rule(Color text, Color plane) => Mix(plane, text, 0.14); + + /// Mixes toward by (0 is a, 1 is b), opaque. + public static Color Mix(Color a, Color b, double amount) => Color.FromRgb( + (byte)Math.Round(a.R + ((b.R - a.R) * amount)), + (byte)Math.Round(a.G + ((b.G - a.G) * amount)), + (byte)Math.Round(a.B + ((b.B - a.B) * amount))); + + /// + /// Draws a panel heading across the top of — the title semibold, the context dim beside it, + /// a rule under both — and returns the height it took (). is the + /// room kept clear at the right edge (a chip, the pop-out button). + /// + public static double Heading(DrawingContext context, SharpMUTerm.Client.Panels.PanelHeading heading, double width, double cellHeight, Color plane, Color text, double right = 0) + { + var height = HeadingHeight(cellHeight); + context.FillRectangle(new SolidColorBrush(plane), new Rect(0, 0, width, height)); + var middle = (height - 1) / 2; + var limit = width - Pad - right; + var x = Pad; + x += Draw(context, heading.Title, x, middle, Size, text, true, limit - x) + 8; + if (heading.Context is { Length: > 0 } words) + { + Draw(context, words, x, middle, Size, Dim(text, plane), false, limit - x); + } + + context.FillRectangle(new SolidColorBrush(Rule(text, plane)), new Rect(0, height - 1, width, 1)); + return height; + } } diff --git a/src/SharpMUTerm.Avalonia/QuickBarButtons.cs b/src/SharpMUTerm.Avalonia/QuickBarButtons.cs index 45b1db80..72793cc3 100644 --- a/src/SharpMUTerm.Avalonia/QuickBarButtons.cs +++ b/src/SharpMUTerm.Avalonia/QuickBarButtons.cs @@ -43,7 +43,10 @@ internal enum SlotKind /// The widest a binding's name is drawn before it is trimmed. internal const double MaxTitleWidth = 150; - private const double Gap = 6, PadX = 8; + private const double Gap = 8, PadX = 12; + + /// The pane's top-right corner, where the pop-out button sits: the bar ends short of it. + private const double EndRoom = 22; private readonly TerminalView _view; @@ -117,7 +120,10 @@ public void Show(QuickBarModel model, PanelInk ink, Color plane, Color text, dou InvalidateVisual(); } - private double FontSize => Math.Clamp(_cellHeight * 0.62, 9, 13); + private double FontSize => Math.Min(PanelText.Size, Math.Max(9, _cellHeight * 0.66)); + + /// The key chip's size: a step under the label, as a caption. + private double KeySize => Math.Max(8, FontSize - 2); private static string Trim(QuickBarItem item) => item.Title; @@ -125,12 +131,12 @@ private double ItemWidth(QuickBarItem item) { var size = FontSize; var title = Math.Min(MaxTitleWidth, PanelText.Measure(Trim(item), size, false)); - return PadX + PanelText.Measure(NativeKeys.Words(item.Key), size, true) + 5 + title + PadX; + return PadX + PanelText.Measure(NativeKeys.Words(item.Key), KeySize, false) + 7 + title + PadX; } private double MoreWidth(int hidden) => PadX + PanelText.Measure($"+{hidden.ToString(CultureInfo.InvariantCulture)}", FontSize, true) + PadX; - private double EditWidth => PanelText.Measure(QuickBarModel.EditHint, FontSize, false) + (PadX * 2); + private double EditWidth => PanelText.Measure(QuickBarModel.BindLabel, FontSize, false) + (PadX * 2); /// /// The cells' rule, in pixels: the link first, then as many bindings as fit in order, with +N for the @@ -157,7 +163,7 @@ private void Layout(Size size) var widths = items.Select(ItemWidth).ToList(); foreach (var withEdit in new[] { true, false }) { - var room = size.Width - (Gap * 2) - (withEdit ? EditWidth + Gap : 0); + var room = size.Width - EndRoom - (Gap * 2) - (withEdit ? EditWidth + Gap : 0); for (var take = items.Count; take >= 0 && room >= 0; take--) { var hidden = items.Count - take; @@ -182,7 +188,7 @@ private void Layout(Size size) if (withEdit) { - _slots.Add(new Slot(SlotKind.Edit, -1, new Rect(size.Width - Gap - EditWidth, top, EditWidth, height))); + _slots.Add(new Slot(SlotKind.Edit, -1, new Rect(size.Width - EndRoom - Gap - EditWidth, top, EditWidth, height))); } return; @@ -346,49 +352,43 @@ public override void Render(DrawingContext context) { case SlotKind.Item: { + // The key as a caption, then the binding's name: a button per binding, as the mockups draw the bar. var item = _model.Items[slot.Index]; - Plate(context, rect, hot, down); - var keyInk = item.Fires ? accent : dim; + Plate(context, rect, hot, down, dashed: false); + var keyInk = item.Fires ? dim : PanelText.Mix(dim, _plane, 0.35); var titleInk = item.Fires ? _text : dim; var x = rect.Left + PadX; - x += PanelText.Draw(context, NativeKeys.Words(item.Key), x, middle, size, keyInk, true, rect.Width) + 5; + x += PanelText.Draw(context, NativeKeys.Words(item.Key), x, middle, KeySize, keyInk, false, rect.Width) + 7; PanelText.Draw(context, Trim(item), x, middle, size, titleInk, false, rect.Right - PadX - x + 0.5); break; } case SlotKind.More: - Plate(context, rect, hot, down); + Plate(context, rect, hot, down, dashed: false); PanelText.Draw(context, $"+{slot.Index.ToString(CultureInfo.InvariantCulture)}", rect.Left + PadX, middle, size, _text, true, rect.Width); break; case SlotKind.Edit: - { - // A link, not a button: the accent key, the words in the dim ink, underlined under the pointer. - var x = rect.Left + PadX; - var keyWidth = PanelText.Draw(context, QuickBarModel.EditKey, x, middle, size, accent, true, rect.Width); - var rest = QuickBarModel.EditHint[QuickBarModel.EditKey.Length..]; - var restWidth = PanelText.Draw(context, rest, x + keyWidth, middle, size, hot ? _text : dim, false, rect.Right - x - keyWidth); - if (hot) - { - var y = Math.Round(middle + (size * 0.62)) + 0.5; - context.DrawLine(new Pen(new SolidColorBrush(PanelText.Alpha(_text, 0xC0)), 1), new Point(x, y), new Point(x + keyWidth + restWidth, y)); - } - + // F4's door as a button with a dashed edge: an empty slot to put a binding in. + Plate(context, rect, hot, down, dashed: true); + PanelText.Draw(context, QuickBarModel.BindLabel, rect.Left + PadX, middle, size, hot ? _text : dim, false, rect.Width - (PadX * 2) + 1); break; - } } } } - /// A button's plate: the text colour at a low alpha, stronger under the pointer and while pressed. - private void Plate(DrawingContext context, Rect rect, bool hot, bool down) + /// + /// A button's plate: a step off the plane with a rule-coloured edge, stronger under the pointer and while pressed; the + /// bind button's edge is dashed and its plate empty until the pointer is on it. + /// + private void Plate(DrawingContext context, Rect rect, bool hot, bool down, bool dashed) { - var alpha = (byte)(down ? 0x48 : hot ? 0x30 : 0x18); - context.DrawRectangle( - new SolidColorBrush(PanelText.Alpha(_text, alpha)), - new Pen(new SolidColorBrush(PanelText.Alpha(_text, 0x26)), 1), - rect.Deflate(0.5), - 4, - 4); + var fill = dashed && !hot && !down ? _plane : PanelText.Mix(_plane, _text, down ? 0.2 : hot ? 0.13 : 0.07); + var edge = new Pen( + new SolidColorBrush(PanelText.Mix(_plane, _text, dashed ? 0.3 : 0.18)), + 1, + dashed ? new DashStyle([4, 3], 0) : null); + var radius = Math.Min(NativeTokens.RadiusM, rect.Height / 2); + context.DrawRectangle(new SolidColorBrush(fill), edge, rect.Deflate(0.5), radius, radius); } } diff --git a/src/SharpMUTerm.Avalonia/VitalsGauges.cs b/src/SharpMUTerm.Avalonia/VitalsGauges.cs index 5563ec14..2489dce5 100644 --- a/src/SharpMUTerm.Avalonia/VitalsGauges.cs +++ b/src/SharpMUTerm.Avalonia/VitalsGauges.cs @@ -59,15 +59,32 @@ public void Show(VitalsModel model, PanelInk ink, Color plane, Color text, doubl InvalidateVisual(); } - /// Height one stacked block takes: a line of text and a bar under it. - private static double BlockHeight(double cellHeight) => Math.Max(30, cellHeight * 2.1); + /// The meter's label line in a stacked block: the name and the numbers over the bar. + private static double LabelHeight(double cellHeight) => Math.Max(14, cellHeight * 0.85); + + /// A stacked meter's bar: ten pixels on an ordinary cell, as the mockups draw it. + private static double BarHeight(double cellHeight) => cellHeight >= 15 ? 10 : 8; + + /// Height one stacked block takes: a line of text, the bar under it, and the gap to the next. + private static double BlockHeight(double cellHeight) => LabelHeight(cellHeight) + 4 + BarHeight(cellHeight) + 10; + + /// The height every stacked block takes, the target's rule included. + private double BlocksHeight(VitalsModel model) => + (model.Meters.Count * BlockHeight(_cellHeight)) + (model.Target is null ? 0 : BlockHeight(_cellHeight) + 8); private bool StackedFor(double height, VitalsModel model) { var blocks = model.Meters.Count + (model.Target is null ? 0 : 1); - return blocks > 0 && height >= (blocks * BlockHeight(_cellHeight)) + 8; + return blocks > 0 && height >= BlocksHeight(model) + 12; } + /// Whether a stacked pane also has room for the panel heading over the blocks. + private bool HeadedFor(double height, VitalsModel model) => + height >= PanelText.HeadingHeight(_cellHeight) + 12 + BlocksHeight(model) + 4; + + /// Whether the heading is drawn now. Internal for tests. + internal bool Headed => Stacked && HeadedFor(Bounds.Height > 0 ? Bounds.Height : Height, _model); + public override void Render(DrawingContext context) { var bounds = new Rect(Bounds.Size); @@ -90,31 +107,46 @@ public override void Render(DrawingContext context) } } + /// + /// The side column's card: the heading (Vitals and where the numbers come from) when there is room for it, then a + /// block per meter — the name and the numbers over a ten-pixel rounded bar, a low meter's words and bar in the + /// warning ink with · low — and the target under a rule, on a thinner bar. + /// private void RenderStacked(DrawingContext context, Rect bounds) { var block = BlockHeight(_cellHeight); - var size = Math.Clamp(_cellHeight * 0.68, 10, 15); - var barHeight = Math.Clamp(_cellHeight * 0.45, 6, 10); - var inner = bounds.Deflate(new Thickness(12, 8)); + var label = LabelHeight(_cellHeight); + var barHeight = BarHeight(_cellHeight); + var size = Math.Min(PanelText.Size - 1, Math.Max(10, _cellHeight * 0.68)); + var top = HeadedFor(bounds.Height, _model) + ? PanelText.Heading(context, PanelHeading.For(_model), bounds.Width, _cellHeight, _plane, _text, right: 20) + 12 + : 8; + var inner = new Rect(PanelText.Pad, top, Math.Max(1, bounds.Width - (PanelText.Pad * 2)), Math.Max(1, bounds.Height - top)); + var dim = PanelText.Dim(_text, _plane); + var warn = Parse(_ink.Low); var y = inner.Top; foreach (var meter in _model.Meters) { var low = meter.Low; + var middle = y + (label / 2); var title = low ? $"{meter.Title} · low" : meter.Title; - DrawText(context, title, new Point(inner.Left, y), size, low ? Parse(_ink.Low) : Dim(), bold: low, alignRight: false, inner.Width); - DrawText(context, Numbers(meter), new Point(inner.Right, y), size, _text, bold: true, alignRight: true, inner.Width); - var bar = new Rect(inner.Left, y + (size * 1.45), inner.Width, barHeight); - DrawBar(context, bar, meter.HasMax ? meter.Share ?? 0 : 1, low); + PanelText.Draw(context, title, inner.Left, middle, size, low ? warn : _text, low, inner.Width * 0.6); + PanelText.Draw(context, Numbers(meter), inner.Right, middle, size, low ? warn : _text, false, inner.Width * 0.4, alignRight: true); + DrawBar(context, new Rect(inner.Left, y + label + 4, inner.Width, barHeight), meter.HasMax ? meter.Share ?? 0 : 1, low); y += block; } if (_model.Target is { } target) { - DrawText(context, $"Target · {target.Name}", new Point(inner.Left, y), size, Dim(), bold: false, alignRight: false, inner.Width * 0.75); + context.FillRectangle(new SolidColorBrush(PanelText.Rule(_text, _plane)), new Rect(inner.Left, y - 4, inner.Width, 1)); + y += 4; + var middle = y + (label / 2); + var leadWidth = 6 + PanelText.Draw(context, "Target", inner.Left, middle, size, dim, false, inner.Width * 0.3); + PanelText.Draw(context, target.Name, inner.Left + leadWidth, middle, size, target.Low ? warn : _text, false, (inner.Width * 0.75) - leadWidth); if (target.Share is { } share) { - DrawText(context, Percent(share), new Point(inner.Right, y), size, _text, bold: true, alignRight: true, inner.Width); - DrawBar(context, new Rect(inner.Left, y + (size * 1.45), inner.Width, barHeight), share, target.Low); + PanelText.Draw(context, Percent(share), inner.Right, middle, size, _text, false, inner.Width * 0.25, alignRight: true); + DrawBar(context, new Rect(inner.Left, y + label + 4, inner.Width, Math.Max(4, barHeight - 4)), share, target.Low); } } } @@ -126,7 +158,7 @@ private void RenderRow(DrawingContext context, Rect bounds) { var size = Math.Clamp(_cellHeight * 0.62, 9, 14); var barHeight = Math.Clamp(bounds.Height * 0.32, 4, 9); - var inner = bounds.Deflate(new Thickness(10, 0)); + var inner = bounds.Deflate(new Thickness(10, 0, 30, 0)); var gap = 18.0; var shares = _model.Meters.Count + (_model.Target is null ? 0 : 1.4); var unit = (inner.Width - (gap * Math.Max(0, Math.Ceiling(shares) - 1))) / shares; @@ -214,23 +246,13 @@ private static FormattedText Format(string text, double size, Color colour, bool private void DrawBar(DrawingContext context, Rect track, double share, bool low) { + // Flat fills on a track one step off the plane, rounded to the bar's height: the mockups' gauge. var radius = track.Height / 2; - context.DrawRectangle(new SolidColorBrush(Parse(_ink.Track)), null, track, radius, radius); + context.DrawRectangle(new SolidColorBrush(PanelText.Mix(_plane, _text, 0.12)), null, track, radius, radius); var fill = new Rect(track.X, track.Y, track.Width * Math.Clamp(share, 0, 1), track.Height); if (fill.Width > 0.5) { - var colour = Parse(low ? _ink.Low : _ink.Bar); - var brush = new LinearGradientBrush - { - StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative), - EndPoint = new RelativePoint(0, 1, RelativeUnit.Relative), - GradientStops = - { - new GradientStop(Lighten(colour, 0.18), 0), - new GradientStop(colour, 1), - }, - }; - context.DrawRectangle(brush, null, fill, radius, radius); + context.DrawRectangle(new SolidColorBrush(Parse(low ? _ink.Low : _ink.Bar)), null, fill, radius, radius); } _drawn.Add((track, fill, low)); @@ -254,9 +276,4 @@ private static string Percent(double share) => private Color Dim() => Color.FromArgb(0xB0, _text.R, _text.G, _text.B); private static Color Parse(string hex) => Color.TryParse(hex, out var colour) ? colour : Colors.Gray; - - private static Color Lighten(Color colour, double amount) => Color.FromRgb( - (byte)(colour.R + ((255 - colour.R) * amount)), - (byte)(colour.G + ((255 - colour.G) * amount)), - (byte)(colour.B + ((255 - colour.B) * amount))); } diff --git a/src/SharpMUTerm.Avalonia/WelcomeView.cs b/src/SharpMUTerm.Avalonia/WelcomeView.cs index b67398ab..8365700f 100644 --- a/src/SharpMUTerm.Avalonia/WelcomeView.cs +++ b/src/SharpMUTerm.Avalonia/WelcomeView.cs @@ -1,42 +1,54 @@ +using System.Globalization; using Avalonia; using Avalonia.Controls; +using Avalonia.Controls.Documents; using Avalonia.Input; using Avalonia.Interactivity; using Avalonia.Layout; using Avalonia.Media; using Avalonia.Threading; +using Avalonia.VisualTree; using SharpMUTerm.Client.Modals; +using SharpMUTerm.Core.WorldIndex; namespace SharpMUTerm.Avalonia; /// -/// The window's first-run welcome: the menu (connect to a host, browse games, open settings, the /connect -/// example and the starting layout) and the connect form (host, port, TLS, a character, a password reminder). A choice, -/// a layout and the filled form go back through the session; the client checks the form through /connect's own -/// path, so a refusal comes back as the model's problem and the form stays up. ↑↓ and ⏎ work the menu, ←→ the -/// layout; on the form ⇥ moves, ⏎ connects and Esc goes back to the menu. +/// The window's first-run welcome as one page: a heading, then two cards side by side — Find a world (a search box +/// and mu*index's rows, asked only when the player opens the list, each with an Add that does what a pick in Browse worlds +/// does: fills in the connect form) and Connect directly (host, port, character, TLS, Connect, and the +/// /connect line it is the same as) — then the starting layout as two cards. Everything it says is +/// 's and 's; every button ends in the session: a choice and a +/// layout in RunWelcomeAction/SetWelcomeLayout, the form in ConnectFromWelcome (through +/// /connect's own path, so a refusal comes back as the model's problem and the page stays up), the list in +/// FindWorldsInWelcome and a row's Add in PickWorld. ⏎ in the form connects, ⏎ in the search asks, Esc +/// closes. The cells keep their menu (WelcomeSurface): a page this wide does not fit a terminal. /// internal sealed class WelcomeView : DockPanel, IModalView { - private static readonly WelcomeChoice[] Choices = [WelcomeChoice.Connect, WelcomeChoice.Browse, WelcomeChoice.Settings, WelcomeChoice.Import]; - private static readonly WelcomeLayout[] Layouts = [WelcomeLayout.Suggested, WelcomeLayout.Roleplay, WelcomeLayout.Combat]; + /// The most rows the find card shows at once; the rest scroll. + private const int ShownRows = 3; private readonly WelcomeSession _session; private readonly NativeTokens _colours; private readonly Action _done; - private readonly StackPanel _body = new(); - private readonly TextBlock _footer; - private readonly TextBlock _heading; - private readonly List _choiceRows = []; - private readonly List internal bool CellsHoldHeader { get; set; } = true; + /// + /// Whether this view draws the command line's field around the bars' rows (): the + /// grid is then shorter, and a frame carrying a band + /// () draws its rows that much lower inside a padded, rounded field. + /// + internal bool DrawsInputField { get; set; } + + /// The plane the field's strip is painted on: the backdrop the status row and the sidebar sit on. + internal SKColor? FooterPlane { get; set; } + + /// The vertical pixels the field takes beside the rows it frames: none unless the view draws it. + private double FieldReserve => DrawsInputField ? NativeLayout.FieldReserve : 0; + + /// The top of screen row in logical units: rows of a band sit lower by the field's top padding. + internal double RowTop(int row) + { + var top = row * CellSize.Height; + return DrawsInputField && _driver.Frame.Band is { } band && row >= band.Top ? top + NativeLayout.FieldTop : top; + } + /// /// Raised on the window's thread after a new frame is taken for painting, and when the cell size or the view's /// size changes: when anything placed over cells may need to move. @@ -128,10 +150,10 @@ public TerminalView(AvaloniaConsoleDriver driver, SKColor foreground, SKColor ba /// The grid a window of holds, in whole cells. public (int Columns, int Rows) GridFor(Size size) => - (Math.Max(20, (int)(size.Width / CellSize.Width)), Math.Max(8, (int)(size.Height / CellSize.Height))); + (Math.Max(20, (int)(size.Width / CellSize.Width)), Math.Max(8, (int)((size.Height - FieldReserve) / CellSize.Height))); /// The window size that holds a grid of × . - public Size SizeFor(int columns, int rows) => new(columns * CellSize.Width, rows * CellSize.Height); + public Size SizeFor(int columns, int rows) => new(columns * CellSize.Width, (rows * CellSize.Height) + FieldReserve); protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e) { @@ -156,7 +178,14 @@ protected override void OnSizeChanged(SizeChangedEventArgs e) public override void Render(DrawingContext context) { - context.Custom(new FrameDraw(new Rect(Bounds.Size), _driver.Frame, _driver.Pictures, _renderer, _scale)); + var frame = _driver.Frame; + var band = DrawsInputField ? frame.Band : null; + context.Custom(new FrameDraw(new Rect(Bounds.Size), frame, _driver.Pictures, _renderer, _scale, band, FooterPlane ?? Darker(_renderer.DefaultBackground))); + if (band is not null) + { + DrawFieldText(context, frame, band); + } + DrawHover(context); DrawScrollbars(context); } @@ -174,7 +203,7 @@ private void DrawHover(DrawingContext context) var cell = CellSize; var area = _target.Area; - var rect = new Rect(area.X * cell.Width, area.Y * cell.Height, area.Width * cell.Width, area.Height * cell.Height); + var rect = new Rect(area.X * cell.Width, RowTop(area.Y), area.Width * cell.Width, area.Height * cell.Height); context.DrawRectangle(Brush(_renderer.DefaultForeground, 0x24), null, rect.Inflate(new Thickness(1, 0)), 2, 2); } @@ -184,7 +213,7 @@ private void Rescale(double scale) // with them. A change of display scale is rare enough that one set of leaked fonts is the cheaper fix. _scale = scale; _renderer = new CellRenderer( - new CellFonts((float)(_fontPoints * scale), _family), + new CellFonts((float)(_fontPoints * scale), _family, _lineHeight), _renderer.DefaultForeground, _renderer.DefaultBackground); Repainted?.Invoke(); @@ -710,6 +739,14 @@ private System.Drawing.Point Cell(Point position) var frame = _driver.Frame; var x = Math.Clamp((int)(position.X / size.Width), 0, Math.Max(0, frame.Width - 1)); var y = Math.Clamp((int)(position.Y / size.Height), 0, Math.Max(0, frame.Height - 1)); + + // Below the panes, the field: its padding is the band's first and last rows, and its rows sit lower. + if (DrawsInputField && frame.Band is { } band && position.Y >= band.Top * size.Height) + { + var inside = (position.Y - (band.Top * size.Height) - NativeLayout.FieldTop) / size.Height; + y = Math.Clamp(band.Top + (int)Math.Floor(inside), band.Top, Math.Min(frame.Height, band.Top + band.Rows) - 1); + } + return new System.Drawing.Point(x, y); } @@ -719,7 +756,7 @@ private static PointerModifiers Modifiers(KeyModifiers keys) => | ((keys & KeyModifiers.Control) != 0 ? PointerModifiers.Ctrl : 0); /// One frame, drawn straight onto the compositor's Skia canvas. - private sealed class FrameDraw(Rect bounds, ScreenFrame frame, PictureStore pictures, CellRenderer renderer, double scale) + private sealed class FrameDraw(Rect bounds, ScreenFrame frame, PictureStore pictures, CellRenderer renderer, double scale, InputBand? band, SKColor plane) : ICustomDrawOperation { public Rect Bounds { get; } = bounds; @@ -727,7 +764,9 @@ private sealed class FrameDraw(Rect bounds, ScreenFrame frame, PictureStore pict public bool HitTest(Point p) => Bounds.Contains(p); public bool Equals(ICustomDrawOperation? other) => - other is FrameDraw draw && ReferenceEquals(draw.Frame, Frame) && draw.Bounds == Bounds; + other is FrameDraw draw && ReferenceEquals(draw.Frame, Frame) && draw.Bounds == Bounds && draw.Plane == Plane; + + private SKColor Plane => plane; private ScreenFrame Frame => frame; @@ -743,12 +782,159 @@ public void Render(ImmediateDrawingContext context) canvas.Save(); canvas.ClipRect(new SKRect(0, 0, (float)Bounds.Width, (float)Bounds.Height)); canvas.Scale((float)(1 / scale)); + if (band is null) + { + renderer.Render(canvas, frame, pictures); + } + else + { + RenderWithField(canvas, band); + } + + canvas.Restore(); + } + + /// + /// The panes as they are, then the field: the strip across the bottom on the backdrop, the rounded field in the + /// bars' own band colour (read off the cells, so armed, idle and a character's tint are the cells' own), the + /// bars' rows drawn inside it lower by its top padding, and a one-pixel edge. Device pixels throughout. + /// + private void RenderWithField(SKCanvas canvas, InputBand band) + { + var ch = renderer.Fonts.CellHeight; + var cw = renderer.Fonts.CellWidth; + var s = (float)scale; + var width = (float)(Bounds.Width * scale); + var height = (float)(Bounds.Height * scale); + var top = band.Top * ch; + + canvas.Save(); + canvas.ClipRect(new SKRect(0, 0, width, top)); renderer.Render(canvas, frame, pictures); canvas.Restore(); + + var field = FieldRect(band, cw, ch, frame.Width, s); + var fill = renderer.Background(frame[Math.Min(frame.Width - 1, band.Pad), band.Top].Background); + using var paint = new SKPaint { IsAntialias = true }; + paint.Color = plane; + canvas.DrawRect(0, top, width, height - top, paint); + paint.Color = Mix(plane, renderer.DefaultForeground, 0.10f); + canvas.DrawRect(0, top, width, Math.Max(1, s), paint); + + var radius = (float)(NativeTokens.RadiusM * scale); + var rounded = new SKRoundRect(field, radius); + paint.Color = fill; + canvas.DrawRoundRect(rounded, paint); + + canvas.Save(); + canvas.ClipRoundRect(rounded, SKClipOperation.Intersect, true); + canvas.Translate(0, (float)(NativeLayout.FieldTop * scale)); + + // The bars' rows only, and not the client's right padding, whose colour is the margin's rather than the band's. + canvas.ClipRect(new SKRect(0, top, (frame.Width - band.Pad) * cw, (band.Top + band.Rows) * ch)); + renderer.Render(canvas, frame, pictures); + canvas.Restore(); + + paint.Style = SKPaintStyle.Stroke; + paint.StrokeWidth = Math.Max(1, s); + paint.Color = Mix(fill, renderer.DefaultForeground, 0.22f); + var edge = rounded; + edge.Deflate(paint.StrokeWidth / 2, paint.StrokeWidth / 2); + canvas.DrawRoundRect(edge, paint); } public void Dispose() { } } + + /// + /// The field's rectangle in device pixels: inset from the grid's edges so the client's band-coloured padding columns + /// are its inner padding, from the strip's top padding to below the last row. + /// + internal static SKRect FieldRect(InputBand band, int cw, int ch, int columns, float scale) + { + var inset = Math.Max(4 * scale, (band.Pad * cw) - (float)(NativeLayout.FieldInsetX * scale)); + var top = (band.Top * ch) + (float)(NativeLayout.FieldOuter * scale); + var bottom = ((band.Top + band.Rows) * ch) + (float)((NativeLayout.FieldTop + NativeLayout.FieldInner) * scale); + return new SKRect(inset, top, (columns * cw) - inset, bottom); + } + + /// + /// The prompt in the UI face, semibold, over the prompt's own cells; and the newline hint at the right of the first + /// row while the cells under it are blank — it stands down the moment the typed text reaches it. + /// + private void DrawFieldText(DrawingContext context, ScreenFrame frame, InputBand band) + { + var cell = CellSize; + foreach (var prompt in band.Prompts) + { + var text = prompt.Text.TrimEnd(); + if (text.Length == 0 || prompt.Row < 0 || prompt.Row >= frame.Height || band.Pad >= frame.Width) + { + continue; + } + + var first = frame[band.Pad, prompt.Row]; + var ink = Ink(frame, band.Pad, prompt.Row, text.Length); + var plate = new Rect(band.Pad * cell.Width, RowTop(prompt.Row), Math.Min(text.Length, frame.Width - band.Pad) * cell.Width, cell.Height); + context.FillRectangle(Brush(_renderer.Background(first.Background)), plate); + var formatted = new FormattedText( + text, System.Globalization.CultureInfo.CurrentCulture, FlowDirection.LeftToRight, + new Typeface(NativeTokens.UiFont, FontStyle.Normal, FontWeight.SemiBold), NativeTokens.Input, Brush(ink)) + { + MaxTextWidth = plate.Width + (2 * cell.Width), + MaxLineCount = 1, + Trimming = TextTrimming.CharacterEllipsis, + }; + // Against the text, not the field's edge: the UI face is narrower than the cells it covers, and a prompt + // that kept to the left would leave a gap between itself and the line being typed. + var left = Math.Max(plate.X, plate.Right - formatted.Width); + context.DrawText(formatted, new Point(Math.Round(left), plate.Y + ((cell.Height - formatted.Height) / 2))); + } + + if (band.Hint.Length == 0 || band.Top >= frame.Height) + { + return; + } + + var hint = new FormattedText( + NativeKeys.Words(band.Hint), System.Globalization.CultureInfo.CurrentCulture, FlowDirection.LeftToRight, + new Typeface(NativeTokens.UiFont), NativeTokens.Small, Brush(SKColors.White)); + var right = (frame.Width - band.Pad) * cell.Width; + var from = Math.Max(0, (int)Math.Floor((right - hint.Width) / cell.Width) - 2); + var promptEnd = band.Pad + (band.Prompts.FirstOrDefault(p => p.Row == band.Top)?.Text.Length ?? 0); + if (from <= promptEnd || frame.Caret is { Visible: true } caret && caret.Y == band.Top && caret.X >= from) + { + return; + } + + for (var x = from; x < frame.Width - band.Pad; x++) + { + if (frame[x, band.Top].Rune.Value != ' ') + { + return; + } + } + + var bandColour = _renderer.Background(frame[band.Pad, band.Top].Background); + hint.SetForegroundBrush(Brush(Mix(bandColour, _renderer.DefaultForeground, 0.6f))); + context.DrawText(hint, new Point(right - hint.Width, RowTop(band.Top) + ((cell.Height - hint.Height) / 2))); + } + + /// The ink of the first non-blank cell of a run, the run's own colour. + private SKColor Ink(ScreenFrame frame, int x, int y, int length) + { + for (var i = x; i < Math.Min(frame.Width, x + length); i++) + { + if (frame[i, y].Rune.Value != ' ') + { + return _renderer.Foreground(frame[i, y].Foreground); + } + } + + return _renderer.DefaultForeground; + } + + private static SKColor Darker(SKColor colour) => Mix(colour, SKColors.Black, 0.25f); } diff --git a/src/SharpMUTerm.Avalonia/ThemeCardView.cs b/src/SharpMUTerm.Avalonia/ThemeCardView.cs index b8dc3162..029844c6 100644 --- a/src/SharpMUTerm.Avalonia/ThemeCardView.cs +++ b/src/SharpMUTerm.Avalonia/ThemeCardView.cs @@ -72,7 +72,7 @@ public void SetInUse(bool inUse, NativeTokens tokens) _frame.BorderBrush = tokens.Brush(inUse ? tokens.Accent : tokens.Edge); } - private static readonly FontFamily Mono = FontFamily.Parse("monospace"); + private static readonly FontFamily Mono = NativeTokens.MonoFont; private static IBrush Brush(Rgb colour) => new SolidColorBrush(Color.FromRgb(colour.R, colour.G, colour.B)); diff --git a/src/SharpMUTerm.Avalonia/VitalsGauges.cs b/src/SharpMUTerm.Avalonia/VitalsGauges.cs index 5563ec14..5a3db83e 100644 --- a/src/SharpMUTerm.Avalonia/VitalsGauges.cs +++ b/src/SharpMUTerm.Avalonia/VitalsGauges.cs @@ -197,7 +197,7 @@ private static FormattedText Format(string text, double size, Color colour, bool text, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, - new Typeface(FontFamily.Default, FontStyle.Normal, bold ? FontWeight.SemiBold : FontWeight.Normal), + new Typeface(NativeTokens.UiFont, FontStyle.Normal, bold ? FontWeight.SemiBold : FontWeight.Normal), size, new SolidColorBrush(colour)) { diff --git a/src/SharpMUTerm.Avalonia/WelcomeView.cs b/src/SharpMUTerm.Avalonia/WelcomeView.cs index b67398ab..b372faec 100644 --- a/src/SharpMUTerm.Avalonia/WelcomeView.cs +++ b/src/SharpMUTerm.Avalonia/WelcomeView.cs @@ -182,7 +182,7 @@ private void DrawMenu() example.Inlines.Add(new global::Avalonia.Controls.Documents.Run(WelcomeModel.ExampleCommand) { Foreground = _colours.Brush(_colours.Accent), - FontFamily = new FontFamily("JetBrains Mono, DejaVu Sans Mono, Consolas, Menlo, monospace"), + FontFamily = NativeTokens.MonoFont, }); _body.Children.Add(example); diff --git a/src/SharpMUTerm.Avalonia/WindowHost.cs b/src/SharpMUTerm.Avalonia/WindowHost.cs index 91ea1452..592fb601 100644 --- a/src/SharpMUTerm.Avalonia/WindowHost.cs +++ b/src/SharpMUTerm.Avalonia/WindowHost.cs @@ -75,7 +75,7 @@ internal static class WindowHost // The header band and the connections sidebar are the window's own controls, beside the cell grid rather // than over it (MainWindow, DesktopLayer): the client draws neither. - Chrome = chrome ?? HostChrome.HeaderAndRail, + Chrome = chrome ?? HostChrome.Desktop, // ⌃P is a native palette over the window, listing the same rows as the cell one. NativePalette = driver.Palette, diff --git a/src/SharpMUTerm.Avalonia/WindowOptions.cs b/src/SharpMUTerm.Avalonia/WindowOptions.cs index 857321a5..9612a789 100644 --- a/src/SharpMUTerm.Avalonia/WindowOptions.cs +++ b/src/SharpMUTerm.Avalonia/WindowOptions.cs @@ -24,13 +24,25 @@ internal sealed record WindowOptions( int Columns, int Rows, bool TitleBar = false, - bool CellChrome = false) + bool CellChrome = false, + float LineHeight = WindowOptions.DefaultLineHeight) { + /// + /// The cell text size when --font-size names none: 10 pt, the 13 px game text of the window's mockups. + /// + public const float DefaultPoints = 10f; + + /// + /// The row height, as a multiple of the face's own height, when --line-height names none: JetBrains Mono at + /// 13 px is 18 px tall, and the mockups set it on 20 px rows. + /// + public const float DefaultLineHeight = 1.12f; + /// /// Which chrome the window draws natively: the header and the sidebar, unless --cell-chrome asked for the /// terminal's cells or this is --render-png, which draws cells and nothing native. /// - public HostChrome Chrome => CellChrome || RenderPng is not null ? HostChrome.None : HostChrome.HeaderAndRail; + public HostChrome Chrome => CellChrome || RenderPng is not null ? HostChrome.None : HostChrome.Desktop; /// /// What the client is told about this "terminal": Kitty graphics and truecolour. Both are true by @@ -43,7 +55,8 @@ public static WindowOptions Parse(string[] args) { var rest = new List(); string? font = null, view = null, theme = null, png = null; - var points = 14f; + var points = DefaultPoints; + var lineHeight = DefaultLineHeight; var demo = false; var titleBar = false; var cellChrome = false; @@ -60,6 +73,13 @@ public static WindowOptions Parse(string[] args) points = Math.Clamp(p, 6, 48); } + break; + case "--line-height": + if (float.TryParse(Next(), NumberStyles.Float, CultureInfo.InvariantCulture, out var l)) + { + lineHeight = Math.Clamp(l, 1f, 2f); + } + break; case "--demo-config": demo = true; break; case "--title-bar": titleBar = true; break; @@ -79,7 +99,7 @@ public static WindowOptions Parse(string[] args) } } - return new WindowOptions([.. rest], font, points, demo, view, theme, png, columns, rows, titleBar, cellChrome); + return new WindowOptions([.. rest], font, points, demo, view, theme, png, columns, rows, titleBar, cellChrome, lineHeight); } /// Applies --theme, the way the snapshot does: name and inline theme both. @@ -124,8 +144,9 @@ public static string Usage [ ("Window:", [ - new("--font ", "Monospace font (default: the first installed Nerd Font, then Cascadia, Consolas…)."), - new("--font-size ", "Font size (default 14)."), + new("--font ", "An installed monospace font (default: the bundled JetBrains Mono)."), + new("--font-size ", "Font size (default 10)."), + new("--line-height ", "Row height as a multiple of the font's (1 to 2; default 1.12)."), new("--size ", "The window's first size in cells, and the grid for --render-png (default 120x36)."), new("--title-bar", "Keep the system title bar. Without it, drag the blank part of the header", "to move the window, double-click it to maximise, and drag an edge to resize."), diff --git a/src/SharpMUTerm.Avalonia/WindowPointer.cs b/src/SharpMUTerm.Avalonia/WindowPointer.cs index 4a3e1b33..cb605ef9 100644 --- a/src/SharpMUTerm.Avalonia/WindowPointer.cs +++ b/src/SharpMUTerm.Avalonia/WindowPointer.cs @@ -119,6 +119,29 @@ void IPointerPresenter.Chrome(ChromeOverlay chrome) /// Raised on the client's thread with each notice the client says. public event Action? NoticeSaid; + private StatusOverlay? _status; + private InputBand? _band; + + /// The status row as the client last described it, or null before it has (). + public StatusOverlay? Status => Volatile.Read(ref _status); + + /// + /// Where the command line's rows are, as of the client's last word (): read by the + /// driver when it flushes a frame, so each frame carries the band it was painted with. + /// + public InputBand? Band => Volatile.Read(ref _band); + + /// Raised on the client's thread when changes. + public event Action? StatusChanged; + + void IPointerPresenter.Status(StatusOverlay status) + { + Volatile.Write(ref _status, status); + StatusChanged?.Invoke(); + } + + void IPointerPresenter.InputBand(InputBand? band) => Volatile.Write(ref _band, band); + void IPointerPresenter.Notice(NoticeOverlay notice) { var next = Notices.Append(notice).TakeLast(NoticesKept).ToList(); diff --git a/src/SharpMUTerm.Client/Chrome/StatusModel.cs b/src/SharpMUTerm.Client/Chrome/StatusModel.cs new file mode 100644 index 00000000..2a1f523c --- /dev/null +++ b/src/SharpMUTerm.Client/Chrome/StatusModel.cs @@ -0,0 +1,164 @@ +namespace SharpMUTerm.Client.Chrome; + +/// One run of the status row: text in one ink and weight, and what a click on it does (null for nothing). +/// The run's visible text, keys in the cells' glyphs (a native host spells them in words). +/// Its colour, #rrggbb, already held to the floor on the row's plane. +/// Whether the cells draw it bold. +/// +/// What a click hands back: a target the client put here itself (the palette, a notice's action), never a command a +/// host spelt. Null for text a click does nothing on. +/// +public sealed record StatusRun(string Text, string Ink, bool Bold, string? Target = null); + +/// +/// The status row as data: what SharpMUTermApp.PaintStatus writes into the cells — the connection, the mode's +/// keys, meters, reconnect, ● REC, ♪ muted, the scrollback segment, or a notice laid over them — split +/// into the cluster read from the left and the one read from the right. The terminal draws the row in cells; the window +/// (HostChrome.Status) leaves no cell for it and draws this as its footer, so the two cannot say different things. +/// +/// The runs from the left edge. +/// The runs that end at the right edge. +/// The row's plane, #rrggbb. +public sealed record StatusModel(IReadOnlyList Left, IReadOnlyList Right, string Plane) +{ + /// A status row with nothing on it. + public static StatusModel Empty { get; } = new([], [], "#000000"); + + /// Every target a click on this row may hand back. + public IEnumerable Targets() => + Left.Concat(Right).Select(r => r.Target).OfType().Distinct(StringComparer.Ordinal); + + /// The row as plain text, the two clusters joined by a gap: what a test or a screen reader reads. + public string Text => + string.Concat(Left.Select(r => r.Text)).TrimEnd() + + (Right.Count > 0 ? " " + string.Concat(Right.Select(r => r.Text)).Trim() : string.Empty); + + /// + public bool Equals(StatusModel? other) => + other is not null && Plane == other.Plane && Left.SequenceEqual(other.Left) && Right.SequenceEqual(other.Right); + + /// + public override int GetHashCode() => HashCode.Combine(Plane, Left.Count, Right.Count); + + /// + /// Splits one row of runs into its two clusters at the widest run of spaces — the padding the row's renderer puts + /// between what it reads from the left and what it right-aligns — when that gap is at least three wide; otherwise + /// the whole row reads from the left. Runs are split at the gap and the gap itself is dropped. + /// + public static StatusModel From(IReadOnlyList runs, string plane) + { + ArgumentNullException.ThrowIfNull(runs); + var text = string.Concat(runs.Select(r => r.Text)); + var (gapAt, gapLength) = (-1, 0); + for (var i = 0; i < text.Length;) + { + if (text[i] != ' ') + { + i++; + continue; + } + + var start = i; + while (i < text.Length && text[i] == ' ') + { + i++; + } + + // Only a gap with text on both sides divides the row; trailing padding is not a right cluster. + if (i < text.Length && start > 0 && i - start >= 3 && i - start > gapLength) + { + (gapAt, gapLength) = (start, i - start); + } + } + + if (gapAt < 0) + { + return new StatusModel(Trim(Slice(runs, 0, text.Length)), [], plane); + } + + return new StatusModel(Trim(Slice(runs, 0, gapAt)), Trim(Slice(runs, gapAt + gapLength, text.Length)), plane); + } + + private static List Slice(IReadOnlyList runs, int from, int to) + { + var result = new List(); + var at = 0; + foreach (var run in runs) + { + var (start, end) = (Math.Max(from, at), Math.Min(to, at + run.Text.Length)); + if (end > start) + { + result.Add(run with { Text = run.Text[(start - at)..(end - at)] }); + } + + at += run.Text.Length; + } + + return result; + } + + private static List Trim(List runs) + { + while (runs.Count > 0 && string.IsNullOrWhiteSpace(runs[0].Text)) + { + runs.RemoveAt(0); + } + + while (runs.Count > 0 && string.IsNullOrWhiteSpace(runs[^1].Text)) + { + runs.RemoveAt(runs.Count - 1); + } + + if (runs.Count > 0) + { + runs[0] = runs[0] with { Text = runs[0].Text.TrimStart() }; + runs[^1] = runs[^1] with { Text = runs[^1].Text.TrimEnd() }; + } + + return runs; + } + + /// + /// The runs with set on the characters of the last occurrence of , + /// splitting runs at its edges; unchanged when the text is not there. How the client marks a hint or a notice's + /// action as clickable after drawing it. + /// + public static IReadOnlyList Mark(IReadOnlyList runs, string text, string target) + { + ArgumentNullException.ThrowIfNull(runs); + var whole = string.Concat(runs.Select(r => r.Text)); + var at = string.IsNullOrEmpty(text) ? -1 : whole.LastIndexOf(text, StringComparison.Ordinal); + if (at < 0) + { + return runs; + } + + var end = at + text.Length; + var result = new List(); + var pos = 0; + foreach (var run in runs) + { + var (rs, re) = (pos, pos + run.Text.Length); + pos = re; + if (re <= at || rs >= end) + { + result.Add(run); + continue; + } + + var (a, b) = (Math.Max(rs, at), Math.Min(re, end)); + if (a > rs) + { + result.Add(run with { Text = run.Text[..(a - rs)] }); + } + + result.Add(run with { Text = run.Text[(a - rs)..(b - rs)], Target = target }); + if (re > b) + { + result.Add(run with { Text = run.Text[(b - rs)..] }); + } + } + + return result; + } +} diff --git a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs index 49c2c84d..854a6266 100644 --- a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs +++ b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs @@ -165,6 +165,12 @@ public static class SurfaceCatalog /// A notice: the status row's message in cells, and in the window a toast over them as well. public const string Notice = "notice"; + /// + /// The status row: the last row of cells in a terminal; in the window (HostChrome.Status) a native footer + /// under the cells and the sidebar, which then leave the row out. + /// + public const string Status = "status"; + /// F1, the full-screen composer: a cell modal in a terminal, the window's native editor in its place. public const string Compose = "compose"; @@ -398,6 +404,18 @@ [.. PanelViews("MapCanvas"), "SharpMUTerm.Avalonia.MapInspector"]), CellsUnderNative, "SharpMUTerm.Tui.SharpMUTermApp.NoticeMarkup", ["SharpMUTerm.Avalonia.NoticeToasts"]), + new( + Status, + typeof(StatusModel), + [ + // The palette hint opens ⌃P, the header search box's path; a showing notice's action runs as the toast's + // click does. In cells the row is not a button: ⌃P itself, and the notice's command on ⌃P. + new(SurfaceActionKind.Target, HeaderModel.PaletteTarget, "ToggleMenu", CellsVia: Header), + new(SurfaceActionKind.Target, "notice action", "RunNoticeAction", CellsVia: "term:messages"), + ], + NativeChrome, + "SharpMUTerm.Tui.SharpMUTermApp.StatusRowMarkup", + ["SharpMUTerm.Avalonia.NativeFooter"]), new( Compose, typeof(ComposerModel), diff --git a/src/SharpMUTerm.Tui/ClientUsage.cs b/src/SharpMUTerm.Tui/ClientUsage.cs index 17d14365..aab33e91 100644 --- a/src/SharpMUTerm.Tui/ClientUsage.cs +++ b/src/SharpMUTerm.Tui/ClientUsage.cs @@ -51,7 +51,7 @@ public static string[] NarrowToLink(string[] args) /// The options that take a value, so their value is never mistaken for the host. public static IReadOnlySet TakingValues { get; } = new HashSet(StringComparer.Ordinal) { - "--name", "--size", "--view", "--out", "--theme", "--transparency", "--font", "--font-size", "--render-png", OpenLink, + "--name", "--size", "--view", "--out", "--theme", "--transparency", "--font", "--font-size", "--line-height", "--render-png", OpenLink, }; /// The arguments that are not an option or an option's value: the host, then the port. diff --git a/src/SharpMUTerm.Tui/Hosting/ClientHost.cs b/src/SharpMUTerm.Tui/Hosting/ClientHost.cs index 59099085..3756030f 100644 --- a/src/SharpMUTerm.Tui/Hosting/ClientHost.cs +++ b/src/SharpMUTerm.Tui/Hosting/ClientHost.cs @@ -309,7 +309,17 @@ internal static ClientHost HarnessTerminal( /// /// The host draws the header band (the client's first row). /// The host draws the connection rail (the client's left column, with its divider and spacer). -internal sealed record HostChrome(bool Header, bool Rail) +/// +/// The host draws the status row (the client's last row) from , +/// published through . +/// +/// +/// The host draws the command line's field around the cell editor: the client keeps the editor, its keys and its band +/// colours, pads it ( band-coloured columns either side) and says where its rows are +/// each frame (), so the host can draw the field's frame and padding in its own +/// units around those rows. No keystroke path changes. +/// +internal sealed record HostChrome(bool Header, bool Rail, bool Status = false, bool Input = false) { /// The client draws all of its chrome in cells: the terminal, the snapshot, the tests. public static HostChrome None { get; } = new(false, false); @@ -317,6 +327,9 @@ internal sealed record HostChrome(bool Header, bool Rail) /// The host draws the header and the rail natively: the desktop window. public static HostChrome HeaderAndRail { get; } = new(true, true); + /// The host draws the header, the rail, the status footer and the command line's field: the desktop window. + public static HostChrome Desktop { get; } = new(true, true, true, true); + /// Whether the host draws anything at all. - public bool Any => Header || Rail; + public bool Any => Header || Rail || Status || Input; } diff --git a/src/SharpMUTerm.Tui/InputBarControl.cs b/src/SharpMUTerm.Tui/InputBarControl.cs index febf1f8d..f72838bc 100644 --- a/src/SharpMUTerm.Tui/InputBarControl.cs +++ b/src/SharpMUTerm.Tui/InputBarControl.cs @@ -313,7 +313,29 @@ internal int Rows() => InputLayout.Height(WrappedRowCount(FieldWidth(ActualWidth > 0 ? ActualWidth : Width ?? 80)), MinRows, MaxRows); /// - public override int? ContentWidth => MarkupParser.StripLength(Prompt) + 10 + Margin.Left + Margin.Right; + public override int? ContentWidth => PromptWidth + 10 + Margin.Left + Margin.Right; + + /// + /// Band-coloured columns before the prompt on every row ( when the host draws + /// the field, else none). Part of the gutter, so every row indents past it as it does past the prompt. + /// + internal int LeadingPad + { + get => _leadingPad; + set + { + if (_leadingPad != value) + { + _leadingPad = Math.Max(0, value); + Invalidate(Invalidation.Relayout); + } + } + } + + private int _leadingPad; + + /// The gutter: the leading pad and the prompt. + private int PromptWidth => _leadingPad + MarkupParser.StripLength(Prompt); /// ⇥ is ours whenever there is another bar to hand it to; otherwise it stays traversal. public new bool WantsTabKey => HasSibling(); @@ -548,7 +570,7 @@ private bool Send() /// How many columns of text fit on one row: the field, less the prompt it indents past. private int FieldWidth(int width) => - Math.Max(1, width - Margin.Left - Margin.Right - MarkupParser.StripLength(Prompt)); + Math.Max(1, width - Margin.Left - Margin.Right - PromptWidth); /// /// The rows the text takes at : the editor's own wrapped rows, plus one @@ -604,11 +626,11 @@ public override LayoutSize MeasureDOM(LayoutConstraints constraints) // Past the last column means the end of a full row; the row under it is the one Rows() added. // A bar past its cap shows the editor's scrollbar, which takes the field's last column. var field = FieldWidth(ActualWidth > 0 ? ActualWidth : Width ?? 80); - var right = Margin.Left + MarkupParser.StripLength(Prompt) + field + var right = Margin.Left + PromptWidth + field - (WrappedRowCount(field) > ViewportHeight ? 1 : 0); if (caret.X >= right && caret.Y + 1 - Margin.Top < ViewportHeight) { - return new Point(Margin.Left + MarkupParser.StripLength(Prompt), caret.Y + 1); + return new Point(Margin.Left + PromptWidth, caret.Y + 1); } return caret.X >= right ? caret with { X = right - 1 } : caret; @@ -674,7 +696,7 @@ private sealed class PromptGutter(InputBarControl bar) : IGutterRenderer // The prompt's width is re-read on every measure, so there is nothing for this to announce. public event EventHandler? Invalidated { add { } remove { } } - public int GetWidth(int totalLineCount) => MarkupParser.StripLength(Markup); + public int GetWidth(int totalLineCount) => bar._leadingPad + MarkupParser.StripLength(Markup); public void Render(in GutterRenderContext context, int width) { @@ -687,9 +709,10 @@ public void Render(in GutterRenderContext context, int width) if (context.SourceLineIndex == 0 && context.IsFirstWrappedSegment) { + var pad = Math.Min(bar._leadingPad, width); context.Buffer.WriteCellsClipped( - context.X, context.Y, MarkupParser.Parse(Markup, ink, band), - new LayoutRect(context.X, context.Y, width, 1)); + context.X + pad, context.Y, MarkupParser.Parse(Markup, ink, band), + new LayoutRect(context.X + pad, context.Y, width - pad, 1)); } } } diff --git a/src/SharpMUTerm.Tui/InputLayout.cs b/src/SharpMUTerm.Tui/InputLayout.cs index 9ca717ea..5305580c 100644 --- a/src/SharpMUTerm.Tui/InputLayout.cs +++ b/src/SharpMUTerm.Tui/InputLayout.cs @@ -28,6 +28,12 @@ internal readonly record struct InputRow(int Start, int Length) /// internal static class InputLayout { + /// + /// The band-coloured columns a command line leaves at each end of its rows when the host draws its field + /// (): the field's inner padding, inside the frame the host draws. + /// + internal const int HostFieldPad = 3; + /// /// Breaks into the rows it occupies at columns. /// Newlines break hard; everything else wraps at the last space that fits, or mid-word when a word diff --git a/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs b/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs index 6fe97200..11b4959e 100644 --- a/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs +++ b/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs @@ -176,6 +176,23 @@ void Chrome(ChromeOverlay chrome) void Notice(NoticeOverlay notice) { } + + /// + /// The status row, as data, whenever what it says changes — only to a host that draws it + /// (), which the client leaves no cell for. A host that draws none ignores this. + /// + void Status(StatusOverlay status) + { + } + + /// + /// Where the command line's rows are, or null when there is no field to draw (another of the client's windows is in + /// front) — only to a host that draws the field (). Said on the client's thread while + /// the main window paints, before the frame it describes is flushed, so a host may keep it with that frame. + /// + void InputBand(InputBand? band) + { + } } /// diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Footer.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Footer.cs new file mode 100644 index 00000000..6be600e8 --- /dev/null +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Footer.cs @@ -0,0 +1,236 @@ +using SharpConsoleUI; +using SharpConsoleUI.Parsing; +using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Client.Palette; +using SharpMUTerm.Client.Surfaces; + +namespace SharpMUTerm.Tui; + +/// +/// The status row and the command line's field, for a host that draws them itself (, +/// ; the window). +/// +/// The status row is the markup writes, parsed by the framework's own parser into runs +/// () — so the footer says exactly what the cells would, notices, mode keys, meters, reconnect, +/// ● REC, ♪ muted and the scrollback segment included — and the row's cell is left out of the grid. A click +/// hands back a target the client put on a run: a notice's action (to , the toast's path) +/// or the palette hint (to the palette, the header search box's path). Anything else is refused. +/// +/// +/// The command line stays the cell editor. Every key, the history, completion, selection and paste go where +/// they always went; the client only pads the bar with band-coloured columns () +/// and says, with every frame, which rows the bars are on (). The host draws the field around +/// those rows — its frame, its padding, the prompt in its UI face and the newline hint over blank cells — in its own +/// units. The band colour is read off the cells, so armed, idle and the character's tint read exactly as they do there. +/// +/// +internal sealed partial class SharpMUTermApp +{ + private StatusOverlay? _statusOverlay; + private Action? _statusActivate; + private InputBand? _inputBand; + private bool _inputBandSaid; + + /// Tells a host that draws the status row what it says, when that changed. + private void PublishStatus() + { + if (_pointer is null || !Host.Chrome.Status || _window is null) + { + return; + } + + var overlay = BuildStatusOverlay(); + if (overlay == _statusOverlay) + { + return; + } + + _statusOverlay = overlay; + Drawing(SurfaceCatalog.Status, string.Empty, overlay.Model); + _pointer.Status(overlay); + } + + /// The status row as the host is to draw it. Internal for tests. + internal StatusOverlay BuildStatusOverlay() + { + _statusActivate ??= target => OnUiThread(() => ActivateStatusTarget(target)); + return new StatusOverlay(BuildStatusModel(), MainWindowInFront(), _statusActivate); + } + + /// + /// The row's markup as runs: the framework's parse of exactly what the cells are given, one run per change of ink + /// or weight, split into the left and right clusters, with the palette hint and a showing notice's action marked + /// clickable. + /// + internal StatusModel BuildStatusModel() + { + var plane = WorkspacePalette.Backdrop(_theme); + var fg = ToColor(_theme.StatusForeground); + var bg = ToColor(plane); + var runs = new List(); + var text = new System.Text.StringBuilder(); + (string Ink, bool Bold)? style = null; + foreach (var cell in MarkupParser.Parse(_statusBar.Text, fg, bg)) + { + if (cell.IsWideContinuation) + { + continue; + } + + var next = (ColourHex(cell.Foreground), cell.Decorations.HasFlag(TextDecoration.Bold)); + if (style is { } current && current != next) + { + runs.Add(new StatusRun(text.ToString(), current.Ink, current.Bold)); + text.Clear(); + } + + style = next; + text.Append(cell.Character.ToString()); + } + + if (style is { } last && text.Length > 0) + { + runs.Add(new StatusRun(text.ToString(), last.Ink, last.Bold)); + } + + IReadOnlyList marked = runs; + if (_noticeShown?.Action is { } action && _notice is not null) + { + foreach (var hint in NoticeActionHints(action)) + { + marked = StatusModel.Mark(marked, hint, action.Command); + } + } + + marked = StatusModel.Mark(marked, PaletteHintText, HeaderModel.PaletteTarget); + return StatusModel.From(marked, Hex(plane)); + } + + /// + /// The model as cell markup: each run in its ink, bold where it was, the clusters a gap apart. The row the cells + /// paint is the markup this model was parsed from; this is the way back, and StatusFooterTests holds the two + /// to the same visible text. + /// + internal static string StatusRowMarkup(StatusModel model) + { + static string Run(StatusRun run) => + $"[{(run.Bold ? "bold " : string.Empty)}{run.Ink}]{MarkupText.Escape(run.Text)}[/]"; + + var left = string.Concat(model.Left.Select(Run)); + return model.Right.Count == 0 ? left : left + " " + string.Concat(model.Right.Select(Run)); + } + + /// The status row's way to the palette, as the row writes it. + private static string PaletteHintText => $"{KeyGlyphs.Normalize("⌃P")} palette"; + + /// + /// A click on the host's status footer, by the target the client put on a run. Internal so a test can drive it the + /// way the host does; returns whether the target was offered and was acted on. + /// + internal bool ActivateStatusTarget(string target) + { + var offered = _statusOverlay ?? BuildStatusOverlay(); + if (!offered.Model.Targets().Contains(target, StringComparer.Ordinal)) + { + RefuseCommand($"the status row never offered {Snippet(target)}"); + return false; + } + + if (!MainWindowInFront()) + { + return false; + } + + if (target == HeaderModel.PaletteTarget) + { + if (!_palette.IsOpen && !NativePaletteIsOpen) + { + OpenMenu(); + } + + return true; + } + + return RunNoticeAction(target); + } + + /// What the host was last told about the status row. Internal for tests. + internal StatusOverlay? StatusOverlayPublished => _statusOverlay; + + /// + /// Tells a host that draws the command line's field which rows the bars are on, or that there is no field to draw + /// (another of the client's windows is in front: its cells, not the bars, are at the bottom of the screen). Called + /// on every paint of the main window, before the frame is flushed, so the host reads it with the frame it belongs to. + /// + private void PublishInputBand() + { + if (_pointer is null || !Host.Chrome.Input || _window is null) + { + return; + } + + var band = InputBandNow(); + if (_inputBandSaid && band == _inputBand) + { + return; + } + + (_inputBand, _inputBandSaid) = (band, true); + _pointer.InputBand(band); + } + + /// Where the bars are now, or null with no field to draw. Internal for tests. + internal InputBand? InputBandNow() + { + if (!Host.Chrome.Input || !MainWindowInFront() || AnyOverlayOpen || _input.ActualHeight <= 0) + { + return null; + } + + var rows = _input.ActualHeight + (_second.Visible ? _second.ActualHeight : 0); + var top = _system.ConsoleDriver.ScreenSize.Height - rows - (_statusBar.Visible ? Math.Max(0, _statusBar.ActualHeight) : 0); + if (top <= 0) + { + return null; + } + + var prompts = new List { new(top, MarkupParser.Remove(_input.Prompt)) }; + if (_second.Visible) + { + prompts.Add(new InputPrompt(top + _input.ActualHeight, MarkupParser.Remove(_second.Prompt))); + } + + return new InputBand(top, rows, InputLayout.HostFieldPad, prompts, $"⏎ sends · {KeyGlyphs.Normalize(Host.Keys.Newline.Glyph)} new line"); + } + + private static string ColourHex(Color colour) => $"#{colour.R:x2}{colour.G:x2}{colour.B:x2}"; +} + +/// The status row, for a host that draws it (). +/// What the row says. +/// Whether the main window is in front; while a modal is, the footer takes no click. +/// Acts on a run's target; safe from any thread, and the same instance for the life of the app. +internal sealed record StatusOverlay(StatusModel Model, bool Interactive, Action Activate); + +/// A command line's prompt, by the screen row its first line is on, as plain text. +internal sealed record InputPrompt(int Row, string Text); + +/// +/// The command line's rows, for a host that draws its field (): the field's frame and +/// padding go around rows to + , the full width. +/// +/// The first screen row of the first bar. +/// How many rows the bars take between them. +/// The band-coloured columns the client leaves at each end of a bar row, for the field's inner padding. +/// Each bar's prompt, drawn in the bar's first cells after . +/// The newline hint, in the cells' glyphs, for the host to draw where the first row is blank. +internal sealed record InputBand(int Top, int Rows, int Pad, IReadOnlyList Prompts, string Hint) +{ + /// + public bool Equals(InputBand? other) => + other is not null && Top == other.Top && Rows == other.Rows && Pad == other.Pad && Hint == other.Hint + && Prompts.SequenceEqual(other.Prompts); + + /// + public override int GetHashCode() => HashCode.Combine(Top, Rows, Pad, Hint); +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 7726e240..b01d8a6d 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -878,6 +878,10 @@ public SharpMUTermApp( _statusBar = Controls.Markup("[dim]not connected[/]").StickyBottom().Build(); + // A host that draws the status row itself (the window's footer) gets no cell for it: a hidden sticky band takes + // no row, and ChromeRows counts none, so the bars and the panes have the row. + _statusBar.Visible = !host.Chrome.Status; + // Sticky-bottom, added ahead of the bars so it sits above them, and hidden until a prompt // arrives: most sessions never see one, and a permanently blank row would cost every pane a // row for nothing. @@ -1031,6 +1035,8 @@ public SharpMUTermApp( PublishPanels(); PublishFloating(); PublishChrome(); + PublishInputBand(); + PublishStatus(); SyncMapSizes(); SyncPanelSizes(); SyncScrollSplitBars(); @@ -1040,7 +1046,11 @@ public SharpMUTermApp( // A modal that covers the main window entirely leaves it unpainted, so no PostBufferPaint says the native // panels are now under it; the modal stack changing says it instead. - _system.ModalStateService.StateChanged += (_, _) => PublishPanels(); + _system.ModalStateService.StateChanged += (_, _) => + { + PublishPanels(); + PublishInputBand(); + }; if (_sixel is not null) { // Another window over this one rewrites the cells a picture sits on, and the frame that puts @@ -1050,8 +1060,8 @@ public SharpMUTermApp( } // The native chrome stands down while another window is in front, and that window repaints, not this one. - _window.Activated += (_, _) => PublishChrome(); - _window.Deactivated += (_, _) => PublishChrome(); + _window.Activated += (_, _) => { PublishChrome(); PublishInputBand(); PublishStatus(); }; + _window.Deactivated += (_, _) => { PublishChrome(); PublishInputBand(); PublishStatus(); }; // Pane drag-and-drop listens at the driver, not at a control: SharpConsoleUI delivers mouse // frames to the control that was pressed (it captures on Button1Pressed), so a control-level @@ -5972,6 +5982,14 @@ private void SetUpBar(InputBarControl bar, InputBar kind) // and the first chrome refresh. PaintInputBands(PaneTint.None); bar.HasSibling = () => _second.Visible; + + // A host that draws the field (the window) gets band-coloured padding inside it at both ends of every row: the + // gutter's leading columns on the left, a margin the editor does not wrap into on the right. + if (Host.Chrome.Input) + { + bar.LeadingPad = InputLayout.HostFieldPad; + bar.Margin = new Margin(0, 0, InputLayout.HostFieldPad, 0); + } bar.Complete = CompleteWord; bar.Entered += text => OnCommandEntered(kind, text); bar.Changed += text => OnInputChanged(kind, text); @@ -6124,7 +6142,7 @@ private void SyncInputHeights(bool secondShown) private int ChromeRows() => // No row for a header the host draws: it is not in the cells, so the bars may have the row it would take. (_header.Visible ? InputLayout.WrappedRows(MarkupWidth(_header.Text), HeaderWidth()) : 0) - + InputLayout.WrappedRows(MarkupWidth(_statusBar.Text), HeaderWidth()) + + (_statusBar.Visible ? InputLayout.WrappedRows(MarkupWidth(_statusBar.Text), HeaderWidth()) : 0) // One, not WrappedRows: the prompt row is elided to a single row by construction, precisely so // that a long prompt cannot take a second row off the panes. See PromptRowRenderer. + (_promptRow.Visible ? 1 : 0); @@ -13910,6 +13928,7 @@ private void PaintStatus(string markup) { _statusBar.SetContent(new List { StatusInk(FitStatusRow(markup, HeaderWidth())) }); SyncInputHeights(_second.Visible); + PublishStatus(); // a host's footer has no cell to repaint, so a change may paint no frame (RefreshHeader's reason) } /// diff --git a/tests/SharpMUTerm.Avalonia.Tests/DesktopLayerTests.cs b/tests/SharpMUTerm.Avalonia.Tests/DesktopLayerTests.cs index cd4387ab..3b05e66e 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/DesktopLayerTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/DesktopLayerTests.cs @@ -52,7 +52,7 @@ public async Task TheClientPublishesTheVitalsPaneWithTheModelItsCellStripIsDrawn public async Task PublishingPanelsMovesNoPaneRectangle() { using var headless = new HeadlessConsoleDriver(140, 36); - await using var terminal = new SharpMUTermApp(DemoScene.Build(), ClientHost.Headless(headless, WindowOptions.Capabilities) with { Chrome = HostChrome.HeaderAndRail }); + await using var terminal = new SharpMUTermApp(DemoScene.Build(), ClientHost.Headless(headless, WindowOptions.Capabilities) with { Chrome = HostChrome.Desktop }); terminal.RenderSnapshot("layout-combat"); using var driver = new AvaloniaConsoleDriver(140, 36); diff --git a/tests/SharpMUTerm.Avalonia.Tests/HostParityTests.cs b/tests/SharpMUTerm.Avalonia.Tests/HostParityTests.cs index d8f629b2..ab72b449 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/HostParityTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/HostParityTests.cs @@ -27,17 +27,23 @@ public partial class HostParityTests public static IEnumerable Views() => SnapshotViews.All.Select(v => v ?? "(default)"); /// - /// Every view under both chrome arrangements: the client's chrome in cells (the terminal's, and the window's with - /// --cell-chrome), and the header and rail drawn by the host (the window as a person runs it). Both hosts - /// are told the same arrangement each time, so the comparison is still of drivers and nothing else, over every - /// cell either one draws. + /// Every view under each chrome arrangement: the client's chrome in cells (the terminal's, and the window's with + /// --cell-chrome), the header and rail drawn by the host, and the window as a person runs it — header, rail, + /// status footer and the command line's field drawn by the host (). Both hosts are + /// told the same arrangement each time, so the comparison is still of drivers and nothing else, over every cell + /// either one draws. /// - public static IEnumerable<(string View, bool HostChrome)> ViewsUnderBothChromes() => + public static IEnumerable<(string View, string HostChrome)> ViewsUnderBothChromes() => from view in Views() - from native in new[] { false, true } - select (view, native); + from chrome in new[] { "none", "header-rail", "desktop" } + select (view, chrome); - private static HostChrome ChromeFor(bool native) => native ? HostChrome.HeaderAndRail : HostChrome.None; + private static HostChrome ChromeFor(string chrome) => chrome switch + { + "header-rail" => HostChrome.HeaderAndRail, + "desktop" => HostChrome.Desktop, + _ => HostChrome.None, + }; /// /// A view drawn in the window is the view drawn in the terminal, cell for cell. What this catches is the @@ -46,7 +52,7 @@ from view in Views() /// [Test] [MethodDataSource(nameof(ViewsUnderBothChromes))] - public async Task EveryViewDrawsTheSameCellsInTheWindowAsInTheTerminal(string name, bool hostChrome) + public async Task EveryViewDrawsTheSameCellsInTheWindowAsInTheTerminal(string name, string hostChrome) { var view = name == "(default)" ? null : name; var chrome = ChromeFor(hostChrome); @@ -83,7 +89,7 @@ public async Task EveryViewDrawsTheSameCellsInTheWindowAsInTheTerminal(string na [MethodDataSource(nameof(Views))] public async Task EveryViewDrawsTheSameCellsWhenTheWindowsLoopIsRunning(string name) { - var chrome = HostChrome.HeaderAndRail; + var chrome = HostChrome.Desktop; var view = name == "(default)" ? null : name; if (view is "timestamps" or "timestamps-toggled") { diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativeChromeTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativeChromeTests.cs index 62104f46..46d4a9ce 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/NativeChromeTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/NativeChromeTests.cs @@ -377,7 +377,7 @@ public async Task APressOnEmptyHeaderSpaceMovesTheWindowAndNeverReachesTheClient public async Task TheLiveClientDrawsNoChromeCellAndLaysThePanesOutAsATerminalToldTheSame(string view) { using var headless = new HeadlessConsoleDriver(120, 32); - await using var terminal = new SharpMUTermApp(DemoScene.Build(), ClientHost.Headless(headless, WindowOptions.Capabilities) with { Chrome = HostChrome.HeaderAndRail }); + await using var terminal = new SharpMUTermApp(DemoScene.Build(), ClientHost.Headless(headless, WindowOptions.Capabilities) with { Chrome = HostChrome.Desktop }); terminal.RenderSnapshot(view); using var driver = new AvaloniaConsoleDriver(120, 32); @@ -394,7 +394,7 @@ public async Task TheLiveClientDrawsNoChromeCellAndLaysThePanesOutAsATerminalTol var chrome = driver.Pointer.Chrome; await Assert.That(chrome).IsNotNull(); - await Assert.That(chrome!.Drawn).IsEqualTo(HostChrome.HeaderAndRail); + await Assert.That(chrome!.Drawn).IsEqualTo(HostChrome.Desktop); await Assert.That(chrome.Sidebar).IsEqualTo(window.BuildSidebar()); await Assert.That(window.LaidOutRows.Header).IsEqualTo(0); await Assert.That(Enumerable.Range(0, 32).Any(y => driver.Frame.RowText(y).Contains("muterm", StringComparison.Ordinal))).IsFalse() diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativeFooterTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativeFooterTests.cs new file mode 100644 index 00000000..6b6dc600 --- /dev/null +++ b/tests/SharpMUTerm.Avalonia.Tests/NativeFooterTests.cs @@ -0,0 +1,129 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Headless; +using Avalonia.Input; +using Avalonia.Media; +using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Tui; +using SkiaSharp; +using Window = Avalonia.Controls.Window; + +namespace SharpMUTerm.Avalonia.Tests; + +/// +/// The window as a person runs it (): the bundled faces resolve, the status footer draws +/// what the client said and hands back only the targets the client put on it, and the field frames the bars' rows. +/// +public class NativeFooterTests +{ + private const int Columns = 100; + private const int Rows = 24; + private static readonly SKColor Back = new(0x1e, 0x1e, 0x25); + + [Test] + public async Task TheBundledFacesResolveByNameOnEveryPlatform() + { + var (loaded, ui, mono, plain) = await Session.Dispatch(() => + { + var manager = FontManager.Current; + manager.TryGetGlyphTypeface(new Typeface(NativeTokens.UiFont), out var uiFace); + manager.TryGetGlyphTypeface(new Typeface(NativeTokens.MonoFont), out var monoFace); + manager.TryGetGlyphTypeface(new Typeface("Inter"), out var plainFace); + return (new BundledFonts().Loaded, uiFace?.FamilyName, monoFace?.FamilyName, plainFace?.FamilyName); + }, CancellationToken.None); + + await Assert.That(loaded).IsEqualTo(8); + await Assert.That(ui).IsEqualTo("Inter"); + await Assert.That(mono).IsEqualTo("JetBrains Mono"); + await Assert.That(plain).IsEqualTo("Inter").Because("a view naming Inter gets the bundle, not an installed face"); + } + + [Test] + public async Task TheFooterDrawsWhatTheClientSaidAndHandsBackOnlyItsTargets() + { + var activated = new List(); + var model = StatusModel.From( + StatusModel.Mark([new("Corvid · connected", "#cccccc", false), new(" ", "#cccccc", false), new("⌃P palette", "#cccccc", false)], "⌃P palette", HeaderModel.PaletteTarget), + "#101014"); + + var (visible, top, height, hits, text, clicked) = await Run((window, layer, driver) => + { + ((IPointerPresenter)driver.Pointer).Status(new StatusOverlay(model, true, activated.Add)); + Drain(); + window.CaptureRenderedFrame()?.Dispose(); + var footer = layer.Footer; + var bounds = new Rect(footer.TranslatePoint(default, window)!.Value, footer.Bounds.Size); + var hit = footer.Hits.Single(); + var centre = footer.TranslatePoint(hit.Area.Center, window)!.Value; + window.MouseMove(centre); + window.MouseDown(centre, MouseButton.Left); + window.MouseUp(centre, MouseButton.Left); + Drain(); + footer.Click("term:quit"); + return (footer.IsVisible, bounds.Bottom, bounds.Height, footer.Hits.Select(h => h.Target).ToList(), footer.Text, activated.ToList()); + }); + + await Assert.That(visible).IsTrue(); + await Assert.That(height).IsEqualTo(NativeLayout.StatusHeight); + await Assert.That(top).IsGreaterThan(0); + await Assert.That(hits).IsEquivalentTo(new[] { HeaderModel.PaletteTarget }); + await Assert.That(text).Contains("Ctrl+P palette").Because("keys in words"); + + // The click hands back the palette; a target the client never offered still goes to the client, which refuses it. + await Assert.That(clicked.First()).IsEqualTo(HeaderModel.PaletteTarget); + } + + [Test] + public async Task TheFieldIsInsetFromTheGridAndFramesTheBarsRows() + { + var band = new InputBand(20, 2, InputLayout.HostFieldPad, [new InputPrompt(20, "Corvid ›")], "⏎ sends"); + var rect = TerminalView.FieldRect(band, 10, 20, 80, 1f); + + await Assert.That((double)rect.Left).IsEqualTo((3 * 10) - NativeLayout.FieldInsetX); + await Assert.That((double)rect.Right).IsEqualTo(800 - ((3 * 10) - NativeLayout.FieldInsetX)); + await Assert.That((double)rect.Top).IsEqualTo((20 * 20) + NativeLayout.FieldOuter); + await Assert.That((double)rect.Bottom).IsEqualTo((22 * 20) + NativeLayout.FieldTop + NativeLayout.FieldInner); + + // The grid gives up exactly the field's padding: the rows it frames are still whole cells. + var sizes = await Session.Dispatch(() => + { + using var driver = new AvaloniaConsoleDriver(Columns, Rows); + var view = new TerminalView(driver, SKColors.White, Back, 16, null) { DrawsInputField = true }; + var plain = new TerminalView(driver, SKColors.White, Back, 16, null); + return (view.SizeFor(Columns, Rows).Height, plain.SizeFor(Columns, Rows).Height); + }, CancellationToken.None); + await Assert.That(sizes.Item1 - sizes.Item2).IsEqualTo(NativeLayout.FieldReserve); + } + + private static void Drain() => global::Avalonia.Threading.Dispatcher.UIThread.RunJobs(); + + private static Task Run(Func body) => + Session.Dispatch(() => + { + var driver = new AvaloniaConsoleDriver(Columns, Rows); + var view = new TerminalView(driver, SKColors.White, Back, 16, null); + var layer = new DesktopLayer(view, HostChrome.Desktop); + var root = new Panel(); + root.Children.Add(view); + root.Children.Add(layer); + var window = new Window { Content = root, WindowDecorations = WindowDecorations.BorderOnly }; + var cells = view.SizeFor(Columns, Rows); + window.Width = cells.Width + NativeLayout.SidebarWidth + NativeLayout.SidebarGutter; + window.Height = cells.Height + NativeLayout.HeaderHeight + NativeLayout.StatusHeight; + window.Show(); + view.Focus(); + driver.Flush(); + Drain(); + try + { + return body(window, layer, driver); + } + finally + { + window.Close(); + driver.Dispose(); + } + }, CancellationToken.None); + + private static HeadlessUnitTestSession Session => TerminalViewTests.Session; +} diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativePanelTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativePanelTests.cs index 0751fcf8..80ee27ad 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/NativePanelTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/NativePanelTests.cs @@ -95,7 +95,7 @@ public async Task NativeListsMoveNoPaneRectangle() foreach (var view in new[] { "layout-roleplay", "layout-combat" }) { using var headless = new HeadlessConsoleDriver(140, 36); - await using var terminal = new SharpMUTermApp(DemoScene.Build(), ClientHost.Headless(headless, WindowOptions.Capabilities) with { Chrome = HostChrome.HeaderAndRail }); + await using var terminal = new SharpMUTermApp(DemoScene.Build(), ClientHost.Headless(headless, WindowOptions.Capabilities) with { Chrome = HostChrome.Desktop }); terminal.RenderSnapshot(view); using var driver = new AvaloniaConsoleDriver(140, 36); diff --git a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs index 23cbdcac..848ee52f 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs @@ -202,6 +202,14 @@ await Assert.That(Rows(palette.Session!.View(query))).IsEquivalentTo(Rows(drawn! await Assert.That(app.NoticeMarkup(said[^1].Notice)).IsEqualTo(app.LastNotice); await Assert.That(said[0].Notice.Action).IsNotNull().Because("the first offers its action"); covered.Add(SurfaceCatalog.Notice); + + // The footer: what the window was last told is the row the cells' renderer was handed in the same frame, and + // it carries the notice's action as a run a click hands back. + var status = driver.Pointer.Status; + await Assert.That(status).IsNotNull(); + await Assert.That((object)status!.Model).IsEqualTo(app.DrawnModel(SurfaceCatalog.Status)).Because("status"); + await Assert.That((object)status.Model).IsEqualTo(app.BuildStatusModel()).Because("status: now"); + covered.Add(SurfaceCatalog.Status); } // F1: the window's editor is handed the model the cell window draws for the same draft, in each mode and for a @@ -621,6 +629,30 @@ await Same("notice: action", "layout-combat", }); probed.Add(SurfaceCatalog.Notice); + // Status footer: the palette hint opens ⌃P as ⌃P does; a notice's action on the footer runs its command as the + // ⌃P entry does. + await Same("status: palette", "layout-combat", + (app, d) => app.ActivateStatusTarget(HeaderModel.PaletteTarget), + (app, _) => app.SimulateHeaderLink(HeaderModel.PaletteTarget)); + await Same("status: notice action", "layout-combat", + (app, d) => + { + app.SimulateNotice("a set is missing", SharpMUTerm.Core.Diagnostics.MessageSeverity.Warning, "⌃P", openF5); + app.RenderNextFrame(); + if (!d.Pointer.Status!.Model.Targets().Contains(openF5.Command)) + { + throw new InvalidOperationException("the footer did not offer the notice's action"); + } + + app.ActivateStatusTarget(openF5.Command); + }, + (app, _) => + { + app.SimulateNotice("a set is missing", SharpMUTerm.Core.Diagnostics.MessageSeverity.Warning, "⌃P", openF5); + app.DispatchCommand(openF5.Command); + }); + probed.Add(SurfaceCatalog.Status); + // F1: ⌃S in the window's editor and ⌃S in the cell window send the same command for the same draft — as typed and // literal, one line and several paragraphs. Esc keeps the draft, and its mode, in both. foreach (var (draft, literal) in new[] diff --git a/tests/SharpMUTerm.Avalonia.Tests/TerminalViewTests.cs b/tests/SharpMUTerm.Avalonia.Tests/TerminalViewTests.cs index 67a5ec90..02494c17 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/TerminalViewTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/TerminalViewTests.cs @@ -321,7 +321,7 @@ public sealed class TestApp : Application public override void Initialize() => Styles.Add(new SimpleTheme()); public static AppBuilder BuildAvaloniaApp() => - AppBuilder.Configure() + BundledFonts.Use(AppBuilder.Configure() .UseSkia() - .UseHeadless(new AvaloniaHeadlessPlatformOptions { UseHeadlessDrawing = false }); + .UseHeadless(new AvaloniaHeadlessPlatformOptions { UseHeadlessDrawing = false })); } diff --git a/tests/SharpMUTerm.Client.Tests/StatusModelTests.cs b/tests/SharpMUTerm.Client.Tests/StatusModelTests.cs new file mode 100644 index 00000000..4495fffd --- /dev/null +++ b/tests/SharpMUTerm.Client.Tests/StatusModelTests.cs @@ -0,0 +1,51 @@ +using SharpMUTerm.Client.Chrome; + +namespace SharpMUTerm.Client.Tests; + +/// The status row as data: two clusters split at the renderer's padding, and runs a click can hand back. +public class StatusModelTests +{ + private const string Ink = "#cccccc"; + + [Test] + public async Task TheRowSplitsAtItsWidestGapAndDropsTheGap() + { + var model = StatusModel.From( + [new("Corvid · connected ⌥F freezes", Ink, false), new(" ", Ink, false), new("UTF-8 · ⌃P palette ", Ink, true)], + "#101010"); + + await Assert.That(model.Left.Select(r => r.Text)).IsEquivalentTo(new[] { "Corvid · connected ⌥F freezes" }); + await Assert.That(model.Right.Select(r => r.Text)).IsEquivalentTo(new[] { "UTF-8 · ⌃P palette" }); + await Assert.That(model.Right.Single().Bold).IsTrue(); + await Assert.That(model.Text).IsEqualTo("Corvid · connected ⌥F freezes UTF-8 · ⌃P palette"); + } + + [Test] + public async Task ARowWithNoWideGapReadsFromTheLeft() + { + var model = StatusModel.From([new(" a notice, said once ", Ink, false)], "#000000"); + await Assert.That(model.Right).IsEmpty(); + await Assert.That(model.Text).IsEqualTo("a notice, said once"); + } + + [Test] + public async Task MarkSetsTheTargetOnTheLastOccurrenceAndSplitsRuns() + { + var runs = StatusModel.Mark([new("⌥R Reconnect · ⌥R Reconnect", Ink, false)], "⌥R Reconnect", "world:reconnect"); + + await Assert.That(runs.Select(r => r.Text)).IsEquivalentTo(new[] { "⌥R Reconnect · ", "⌥R Reconnect" }); + await Assert.That(runs[1].Target).IsEqualTo("world:reconnect"); + await Assert.That(StatusModel.From(runs, "#000000").Targets()).IsEquivalentTo(new[] { "world:reconnect" }); + + var unchanged = StatusModel.Mark(runs, "not there", "x"); + await Assert.That(unchanged).IsSameReferenceAs(runs); + } + + [Test] + public async Task TwoRowsThatSayTheSameAreEqual() + { + StatusModel Make() => StatusModel.From([new("left", Ink, false), new(" right", Ink, false)], "#000000"); + await Assert.That(Make()).IsEqualTo(Make()); + await Assert.That(Make()).IsNotEqualTo(StatusModel.Empty); + } +} diff --git a/tests/SharpMUTerm.Client.Tests/SurfaceCatalogTests.cs b/tests/SharpMUTerm.Client.Tests/SurfaceCatalogTests.cs index 0f1e4f44..3efa56a7 100644 --- a/tests/SharpMUTerm.Client.Tests/SurfaceCatalogTests.cs +++ b/tests/SharpMUTerm.Client.Tests/SurfaceCatalogTests.cs @@ -73,7 +73,7 @@ public async Task PanelSurfacesAreKnownPanels() var panels = SurfaceCatalog.All.Where(s => s.Id is not (SurfaceCatalog.Header or SurfaceCatalog.Sidebar or SurfaceCatalog.Settings or SurfaceCatalog.LayoutsMenu or SurfaceCatalog.Palette or SurfaceCatalog.Prefix or SurfaceCatalog.RailStrip or SurfaceCatalog.Notice or SurfaceCatalog.Compose - or SurfaceCatalog.FloatingPanel or SurfaceCatalog.TabOverflow) + or SurfaceCatalog.FloatingPanel or SurfaceCatalog.TabOverflow or SurfaceCatalog.Status) && !SurfaceCatalog.Modals.Contains(s.Id)); foreach (var surface in panels) { diff --git a/tests/SharpMUTerm.Tui.Tests/StatusFooterTests.cs b/tests/SharpMUTerm.Tui.Tests/StatusFooterTests.cs new file mode 100644 index 00000000..b90acf05 --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/StatusFooterTests.cs @@ -0,0 +1,128 @@ +using System.Drawing; +using SharpConsoleUI.Drivers; +using SharpConsoleUI.Parsing; +using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Graphics; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// A host that draws the status row () gets no cell for it and is told what the row +/// would have said; a host that draws the command line's field () is told which rows the +/// bars are on, and the bars stay the cell editor. +/// +/// Serialised: rendering a frame redirects the process-global Console.Out. +[NotInParallel] +public class StatusFooterTests +{ + private const int Width = 120; + private const int Height = 32; + + private static readonly TerminalCapabilities Caps = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private sealed class FooterPresenter : IPointerPresenter + { + public List Statuses { get; } = []; + + public List Bands { get; } = []; + + public void Hover(PointerTarget target) + { + } + + public void ShowMenu(Point cell, IReadOnlyList items) + { + } + + public bool DrawsMenus => true; + + public void Scrollbars(IReadOnlyList bars) + { + } + + public void Status(StatusOverlay status) => Statuses.Add(status); + + public void InputBand(InputBand? band) => Bands.Add(band); + } + + private static SharpMUTermApp App(HostChrome chrome, out string frame, IPointerPresenter? pointer = null, string? view = null) + { + Console.SetIn(TextReader.Null); + var host = ClientHost.Headless(new HeadlessConsoleDriver(Width, Height), Caps) with { Chrome = chrome, Pointer = pointer }; + var app = new SharpMUTermApp(DemoScene.Build(), host); + frame = app.RenderSnapshot(view); + app.RenderNextFrame(); + return app; + } + + private static string Squash(string text) => string.Join(' ', text.Split(' ', StringSplitOptions.RemoveEmptyEntries)); + + [Test] + public async Task AHostThatDrawsTheStatusRowGetsNoStatusRowAndIsToldWhatItSays() + { + await using var cells = App(HostChrome.None, out var cellFrame); + var presenter = new FooterPresenter(); + await using var native = App(HostChrome.None with { Status = true }, out _, presenter); + + await Assert.That(cells.LaidOutRows.Status).IsEqualTo(1); + await Assert.That(native.LaidOutRows.Status).IsEqualTo(0); + await Assert.That(native.LaidOutRows.Workspace).IsEqualTo(cells.LaidOutRows.Workspace + 1); + + // What the footer was told is what the terminal's last row says. + await Assert.That(presenter.Statuses).IsNotEmpty(); + var said = presenter.Statuses[^1].Model; + var lastRow = FrameGrid.Decode(cellFrame, Width, Height)[^1]; + await Assert.That(Squash(said.Text)).IsEqualTo(Squash(lastRow)); + await Assert.That(said.Targets()).Contains(HeaderModel.PaletteTarget); + + // The cell renderer's markup of the model reads the same. + var back = MarkupParser.Remove(SharpMUTermApp.StatusRowMarkup(said)); + await Assert.That(Squash(back)).IsEqualTo(Squash(lastRow)); + } + + [Test] + public async Task AStatusClickRunsOnlyWhatTheRowOffered() + { + await using (var refused = App(HostChrome.None with { Status = true }, out _, new FooterPresenter())) + { + await Assert.That(refused.ActivateStatusTarget("term:quit")).IsFalse(); + await Assert.That(refused.MenuIsOpen).IsFalse(); + } + + await using var app = App(HostChrome.None with { Status = true }, out _, new FooterPresenter()); + await Assert.That(app.ActivateStatusTarget(HeaderModel.PaletteTarget)).IsTrue(); + await Assert.That(app.MenuIsOpen).IsTrue(); + } + + [Test] + public async Task AHostThatDrawsTheFieldIsToldTheBarsRowsAndThePanesDoNotMove() + { + await using var cells = App(HostChrome.None, out _); + var presenter = new FooterPresenter(); + await using var native = App(HostChrome.None with { Input = true }, out _, presenter); + + // The field is the host's pixels: no pane rectangle, so nothing said over NAWS, moves for it. + await Assert.That(native.PaneOutputRects()).IsEquivalentTo(cells.PaneOutputRects()); + await Assert.That(native.LaidOutRows).IsEqualTo(cells.LaidOutRows); + + var band = native.InputBandNow(); + await Assert.That(band).IsNotNull(); + await Assert.That(band!.Pad).IsEqualTo(InputLayout.HostFieldPad); + await Assert.That(band.Top + band.Rows).IsEqualTo(Height - native.LaidOutRows.Status); + await Assert.That(band.Prompts.Single().Text).Contains("›"); + await Assert.That(band.Hint).Contains("new line"); + await Assert.That(presenter.Bands.OfType()).IsNotEmpty(); + + // A host that does not draw the field is told nothing. + await Assert.That(cells.InputBandNow()).IsNull(); + } + + [Test] + public async Task UnderAModalTheFieldIsNotDrawn() + { + await using var app = App(HostChrome.None with { Input = true }, out _, new FooterPresenter(), "menu"); + await Assert.That(app.InputBandNow()).IsNull(); + } +} From c02bd746bff1c554ae34fa3bbbcee2b0f40d12b6 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 17:33:13 +0000 Subject: [PATCH 066/113] feat(window): native tab strips and scrolled-back band per pane The window draws each pane's tab strip natively (HostChrome.Tabs; HostChrome.Native is the window's default) over the strip's own cell row, which the client paints blank, so the layout, the pane rectangles and NAWS stay the terminal's. One TabStripModel per strip titles the cells and is published through IPointerPresenter.PaneChrome; the scroll split's band is a ScrollBandModel drawn natively with a Jump to latest button. Every gesture ends in the cell gesture's method (ActivateStripTab, CloseStripTab, OpenTabMenu, OpenTabOverflow, ReturnToLiveTail) and is refused unless offered. New surfaces tab-strip and scroll-band with parity probes; HostParityTests gains the native arrangement. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 5 + CLAUDE.md | 37 +- src/SharpMUTerm.Avalonia/DesktopLayer.cs | 71 +++ src/SharpMUTerm.Avalonia/PaneChromeViews.cs | 543 ++++++++++++++++++ src/SharpMUTerm.Avalonia/WindowHost.cs | 4 +- src/SharpMUTerm.Avalonia/WindowOptions.cs | 2 +- src/SharpMUTerm.Avalonia/WindowPointer.cs | 14 + .../Chrome/TabStripModel.cs | 91 +++ .../Surfaces/SurfaceCatalog.cs | 36 ++ src/SharpMUTerm.Tui/Hosting/ClientHost.cs | 14 +- src/SharpMUTerm.Tui/Pointer/PointerTarget.cs | 9 + .../Pointer/SharpMUTermApp.PaneChrome.cs | 368 ++++++++++++ .../Pointer/SharpMUTermApp.Pointer.cs | 40 +- src/SharpMUTerm.Tui/ScrollSplitBarRenderer.cs | 12 +- .../SharpMUTermApp.ScrollSplit.cs | 21 +- src/SharpMUTerm.Tui/SharpMUTermApp.cs | 135 +++-- src/SharpMUTerm.Tui/TabTitles.cs | 54 +- .../HostParityTests.cs | 25 +- .../NativeChromeTests.cs | 4 +- .../SurfaceParityTests.cs | 43 ++ .../SurfaceCatalogTests.cs | 2 +- .../NativeTabStripTests.cs | 159 +++++ 22 files changed, 1590 insertions(+), 99 deletions(-) create mode 100644 src/SharpMUTerm.Avalonia/PaneChromeViews.cs create mode 100644 src/SharpMUTerm.Client/Chrome/TabStripModel.cs create mode 100644 src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.PaneChrome.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/NativeTabStripTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index c52877e3..d0b31b05 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,11 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- In the desktop window each pane's tabs are drawn as native tabs: the tab in front is a card joined to its pane, + unread counts are in the accent, a tab's close appears when you point at it, a right click shows the tab's menu, + and tabs that do not fit are behind a `+N` button. The terminal is unchanged. +- In the desktop window a pane split by scrolling back shows a native band — "Scrolled back N rows · New lines keep + arriving below" — with a Jump to latest button that does what End does. - A script error in the script console that names a file and line is now a link: click it to open that script with the caret on the line and the line marked. Closing the editor goes back to the console. - The script editor numbers its lines in the desktop window too, and after a save whose reload fails, the line the diff --git a/CLAUDE.md b/CLAUDE.md index 7bfaa89e..0c5ae11c 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -1285,9 +1285,9 @@ fallbacks) for inline images/maps. is the row projection. The header's presence dot reads `ConnectedCharacters()`, the same answer as the rail's dot and the fraction. While ⌃B is armed `HeaderModel.Prefix` carries `PrefixPanel.Entries` (key, title, why it is blocked) and the exit, so the native header shows the keymap where the cell header shows its strip. - - **`ClientHost.Chrome` (`HostChrome(Header, Rail)`, required) says which chrome the host draws, and the client + - **`ClientHost.Chrome` (`HostChrome(Header, Rail, Tabs)`, required) says which chrome the host draws, and the client leaves no cell for it.** `HostChrome.None` for the terminal, the snapshot, `--plain` and the tests; - `HeaderAndRail` for the window (`WindowHost.Create`, from `WindowOptions.Chrome`; `--cell-chrome` and + `Native` (header, rail and tab strips) for the window (`WindowHost.Create`, from `WindowOptions.Chrome`; `--cell-chrome` and `--render-png` say None). It is a flag per part, not a size: the space is the host's own business (42 px, 232 px, `NativeLayout`), and the client is only told the part is not its to draw. With `Header` the header control is `Visible = false` — a hidden sticky band takes no row — and `ChromeRows()` counts no header row, so the @@ -1328,8 +1328,8 @@ fallbacks) for inline images/maps. header space calls `TerminalView.WindowGestureFromChrome`: edge band resizes, the rest moves the window, double-click maximises. The header leaves the header buttons' slots clear; with a native header the buttons sit in it, 30 px, right-aligned. - - **Parity is cells against cells under the same `HostChrome`.** `HostParityTests` draws every view twice inline — - both hosts told `None`, and both told `HeaderAndRail` — and the looping pass with `HeaderAndRail`, comparing every + - **Parity is cells against cells under the same `HostChrome`.** `HostParityTests` draws every view three times inline — + both hosts told `None`, `HeaderAndRail`, then `Native` (tabs too) — and the looping pass with `Native`, comparing every cell. Telling both hosts the same arrangement keeps the comparison a comparison of drivers (the guarantee it exists for), and covering both arrangements means the layout a person actually runs in the window is held to the terminal's cell for cell, rather than compared below an offset or skipped. What the native header and @@ -1355,6 +1355,31 @@ fallbacks) for inline images/maps. - **Not done**: no animation when the sidebar folds; the command line keeps its armed band while the sidebar holds the keys; the terminal has no row menu (no pointer menus there), its entries are ⌃P's. +- **The window draws each pane's tab strip and the scrolled-back band natively, over rows the cells keep** + (`HostChrome.Tabs`, `HostChrome.Native` = all three, the window's default; Client `TabStripModel`/`TabChipModel`, + `ScrollBandModel`; Tui `Pointer/SharpMUTermApp.PaneChrome.cs`, `PaneChromeOverlay`; Avalonia `PaneChromeViews.cs`: + `NativeTabStrip`, `ScrollBandView`; surfaces `tab-strip` (`NativeChrome`) and `scroll-band` (`CellsUnderNative`)). + Decisions not to relitigate: + - **Unlike the header and rail, the strip keeps its cell row.** One cell grid cannot be inset per pane, so the + layout, `PaneOutputRects` and NAWS stay the terminal's exactly; the client paints the strip row blank in the + pane's recessed plane after the frame (`BlankNativeTabStrips`, `PostBufferPaint`) and the native strip lies on it. + The strip is one cell row tall (~25 px), not the mockup's 38. The band needs no blanking: its cells stay under it. + - **One model per strip, and the cells title from it**: `BuildPaneTabs`/`RetitlePane` build `StripModelFor` through + `Drawing(TabStrip, paneId, …)` and `TabTitles.Strip` writes the titles; the band is recorded in + `RefreshScrollSplitBar`. Published through `IPointerPresenter.PaneChrome` (default member) on `PostBufferPaint` + and modal changes, only on change, never while a modal or the native F1 covers the panes. Bands go to every host + with a presenter; strips only where `Tabs`. + - **Every gesture ends in the cell one's method, and is refused unless offered**: a tab → `ActivateStripTab` (what + `OnTabChanged` runs), its × → `CloseStripTab` (what the cell × runs; only where `Closable`), a right click → + `OpenTabMenu` (`AddTabMenu`, the cell tab's menu), `+N ▾` → `OpenTabOverflow` with the recorded `MenuModel`, the + band's button → `ReturnToLiveTail` (End's and ⌃End's path). + - **Presses**: the views hit only their tabs and buttons (`ICustomHitTest`); a press on the strip's empty run goes to + the cells, where the strip row is the stacked divider (`HeaderFill` returns the whole row under `Tabs`) and + `TakesNativeStripPress` strikes the button flags after the client's own handlers, so the framework never selects + or closes a tab under the native one. `PaneTargetAt` says Nothing on a strip row. + - **Not done**: no dragging a native tab to another pane (the cell drag handle is under it, unreachable); no hover + plate on the empty run. + - **Layouts are realised as panes, one per panel that has data** (`Core/Layouts`: `LayoutFold` → `LayoutRealiser` → `WorkspaceLayout.ReplaceTree`, `LayoutCapture` for the way back; Tui `SharpMUTermApp.Layouts.cs`, `TerminalPanels.cs`; ⌥M / ⌃P ▸ *Layouts*; F5 `layout` rows; the `layouts`, `layout-combat` and `layout-roleplay` views). The layout's @@ -1537,8 +1562,8 @@ draws ⌃P natively (`INativePalette`, null for the cell popup), whether it draw `ClientHost`. Don't use `WarningsAsErrors` for it: that ignores the folder's `severity = none`. - **Every snapshot view is drawn through both drivers and compared cell for cell**, glyph and background (`HostParityTests.EveryViewDrawsTheSameCellsInTheWindowAsInTheTerminal`, Avalonia suite), with the same - capabilities, keys and `HostChrome` — once with the chrome in cells and once with the header and rail drawn by - the host, as the window runs — so a difference can only be the driver. The list is `SnapshotViews.All`, and + capabilities, keys and `HostChrome` — with the chrome in cells, with the header and rail drawn by the host, and with + the tab strips drawn by it too, as the window runs — so a difference can only be the driver. The list is `SnapshotViews.All`, and `EveryViewTheSnapshotKnowsIsInTheParityList` reads `RenderSnapshot`'s source and fails when it learns a view the list does not name. The harness drag goes through `IMouseInjector` so `drag` draws in both. A second pass (`EveryViewDrawsTheSameCellsWhenTheWindowsLoopIsRunning`) draws each view with the window's loop diff --git a/src/SharpMUTerm.Avalonia/DesktopLayer.cs b/src/SharpMUTerm.Avalonia/DesktopLayer.cs index 6b8fbac5..96481dc8 100644 --- a/src/SharpMUTerm.Avalonia/DesktopLayer.cs +++ b/src/SharpMUTerm.Avalonia/DesktopLayer.cs @@ -49,6 +49,9 @@ internal sealed class DesktopLayer : Canvas private readonly Dictionary _quickBars = new(StringComparer.Ordinal); private readonly Dictionary _composers = new(StringComparer.Ordinal); private readonly NoticeToasts _toasts; + private readonly Dictionary _strips = new(StringComparer.Ordinal); + private readonly Dictionary _bands = new(StringComparer.Ordinal); + private (SharpMUTerm.Core.Theming.Theme Theme, NativeTokens Tokens)? _paneTokens; private int _noticeAboveRow; /// The cells. @@ -66,6 +69,7 @@ public DesktopLayer(TerminalView view, HostChrome chrome) _pointer.ActionsChanged += () => Dispatcher.UIThread.Post(Sync); _pointer.PanelsChanged += () => Dispatcher.UIThread.Post(Sync); _pointer.ChromeChanged += () => Dispatcher.UIThread.Post(Sync); + _pointer.PaneChromeChanged += () => Dispatcher.UIThread.Post(Sync); // The chrome first, so every panel and button is drawn over it. _header = new NativeHeader(view) { IsVisible = false }; @@ -168,9 +172,76 @@ internal void Sync() SyncChrome(); SyncButtons(frame, cell); SyncPanels(frame, cell); + SyncPaneChrome(cell); SyncToasts(frame, cell); } + /// The native tab strips by pane id. Internal for tests. + internal IReadOnlyDictionary Strips => _strips; + + /// The native scrolled-back bands by window id. Internal for tests. + internal IReadOnlyDictionary Bands => _bands; + + /// + /// Each pane's tab strip over the row the client left blank for it, and each scrolled-back band over its row: placed + /// from the cells, so a strip is exactly its pane's width and one row deep, and never over another cell. + /// + private void SyncPaneChrome(Size cell) + { + var said = _pointer.PaneChrome; + var strips = said?.Strips ?? []; + var bands = said?.Bands ?? []; + NativeTokens tokens = NativeTokens.Dark; + if (said is not null) + { + if (_paneTokens is not { } cached || !ReferenceEquals(cached.Theme, said.Theme)) + { + _paneTokens = (said.Theme, NativeTokens.For(said.Theme)); + } + + tokens = _paneTokens.Value.Tokens; + } + + var origin = CellOrigin; + Sync(_strips, strips.Select(s => (s.Model.PaneId, s.Row)), () => new NativeTabStrip(), origin, cell); + foreach (var strip in strips) + { + _strips[strip.Model.PaneId].Show(strip, tokens, said!.Interactive); + } + + Sync(_bands, bands.Select(b => (b.Model.WindowId, b.Row)), () => new ScrollBandView(), origin, cell); + foreach (var band in bands) + { + _bands[band.Model.WindowId].Show(band, tokens, said!.Interactive); + } + } + + private void Sync(Dictionary controls, IEnumerable<(string Key, PaneRect Row)> wanted, Func create, Point origin, Size cell) + where T : Control + { + var rows = wanted.ToList(); + foreach (var stale in controls.Keys.Where(k => rows.All(r => r.Key != k)).ToList()) + { + Children.Remove(controls[stale]); + controls.Remove(stale); + } + + foreach (var (key, row) in rows) + { + if (!controls.TryGetValue(key, out var control)) + { + control = create(); + controls[key] = control; + Children.Insert(0, control); + } + + SetLeft(control, origin.X + (row.X * cell.Width)); + SetTop(control, origin.Y + (row.Y * cell.Height)); + control.Width = row.Width * cell.Width; + control.Height = row.Height * cell.Height; + } + } + /// The toasts over the cell area, their stack sitting on the row the client said the pane area ends at. private void SyncToasts(ScreenFrame frame, Size cell) { diff --git a/src/SharpMUTerm.Avalonia/PaneChromeViews.cs b/src/SharpMUTerm.Avalonia/PaneChromeViews.cs new file mode 100644 index 00000000..7aef7add --- /dev/null +++ b/src/SharpMUTerm.Avalonia/PaneChromeViews.cs @@ -0,0 +1,543 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Input; +using Avalonia.Media; +using Avalonia.Rendering; +using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Core.Text; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Avalonia; + +/// +/// A pane's tab strip, drawn by the window over the strip's row, which the client paints blank where the window draws +/// the strips (). The model is the one the cells' titles are written from +/// (): the selected tab is a card joined to the pane, on the pane's own plane (its character's +/// tint and focus lift come with it), the others plain text in the quiet ink — an idle tab of another character's on its +/// own plane, as in the cells — an unread count in the accent, a close on hover where the tab offers one, and +/// +N ▾ where the cells' list of hidden tabs would open. +/// +/// Input. Only the tabs and the +N ▾ button are hit (): a press on the strip's +/// empty run goes on to the cells, where the client reads it as the divider or a window drag, exactly as the empty run +/// of a cell strip is read. Every gesture is handed back as a pane and window id, never a command; it takes no focus. +/// +/// +internal sealed class NativeTabStrip : Control, ICustomHitTest +{ + private readonly List<(Rect Area, Rect? Close, TabChipModel Tab, Color Plane)> _tabs = []; + + private readonly List _names = []; + + private string[] _labels = []; + + /// The narrowest a name is cut to while sharing room; the tab in front keeps more (the cells' floors). + private const double NameFloor = 36, SelectedNameFloor = 72, NameCap = 220; + private Rect? _overflow; + private string? _hoverTab; + private bool _hoverClose; + private bool _hoverOverflow; + private (string? Tab, bool Close, bool Overflow) _pressed; + + public NativeTabStrip() + { + Focusable = false; + ClipToBounds = true; + } + + /// What the client last said about this strip. Internal for tests. + internal TabStripOverlay? Overlay { get; private set; } + + private NativeTokens Tokens { get; set; } = NativeTokens.Dark; + + private bool Interactive { get; set; } = true; + + /// Each tab's area, as last laid out. Internal for tests. + internal IReadOnlyList<(Rect Area, Rect? Close, TabChipModel Tab, Color Plane)> Tabs => _tabs; + + /// The +N ▾ button's area, or null when every tab fits. Internal for tests. + internal Rect? OverflowArea => _overflow; + + /// The type size for the strip's depth: one cell row, which is the window's cell height. + private double Size => (double.IsNaN(Height) ? Bounds.Height : Height) switch + { + >= 24 => NativeTokens.Title, + >= 18 => NativeTokens.Body, + _ => NativeTokens.Small, + }; + + /// Takes the client's strip and the window's tokens, lays the tabs out and redraws. + public void Show(TabStripOverlay overlay, NativeTokens tokens, bool interactive) + { + Overlay = overlay; + Tokens = tokens; + Interactive = interactive; + Lay(); + InvalidateVisual(); + } + + protected override void OnSizeChanged(SizeChangedEventArgs e) + { + base.OnSizeChanged(e); + Lay(); + } + + private static Color Parse(string? hex, Color fallback) => hex is not null && Color.TryParse(hex, out var c) ? c : fallback; + + private static Rgb Rgb(Color c) => new(c.R, c.G, c.B); + + private static Color Colour(Rgb c) => Color.FromRgb(c.R, c.G, c.B); + + /// An ink held to the window's text floor on the plane it is drawn on. + internal static Color Held(Color ink, Color plane) => Colour(Contrast.Legible(Rgb(ink), Rgb(plane), NativeTokens.TextFloor)); + + private void Lay() + { + _tabs.Clear(); + _names.Clear(); + _overflow = null; + if (Overlay is not { } overlay) + { + return; + } + + var width = double.IsNaN(Width) ? Bounds.Width : Width; + var height = double.IsNaN(Height) ? Bounds.Height : Height; + var strip = Parse(overlay.StripPlane, Tokens.Card); + var plane = Parse(overlay.Plane, Tokens.Card); + var right = width - 6; + if (overlay.Overflow is { Entries.Count: > 0 } menu) + { + var label = $"+{menu.Entries.Count} ▾"; + var w = PanelText.Measure(label, Size, bold: true) + 16; + _overflow = new Rect(Math.Max(0, width - w - 6), 3, w, Math.Max(4, height - 6)); + right = _overflow.Value.X - 6; + } + + var x = 8.0; + var top = Math.Min(4, Math.Max(1, height / 6)); + var names = Fit(overlay.Model.Tabs, right - x); + for (var i = 0; i < overlay.Model.Tabs.Count; i++) + { + var tab = overlay.Model.Tabs[i]; + var name = names[i]; + var extra = Extra(tab); + var close = tab.Closable ? 16 : 0; + var w = 14 + name + extra + close + 14; + var area = new Rect(x, top, w, Math.Max(4, height - top)); + var chip = overlay.Chips.Count > i && overlay.Chips[i] is { } hex ? Parse(hex, strip) : strip; + Rect? closeArea = tab.Closable ? new Rect(area.Right - 14 - close, top + ((area.Height - 16) / 2), 16, 16) : null; + _tabs.Add((area, closeArea, tab, tab.Selected ? plane : chip)); + _names.Add(name); + x += w + 2; + if (x > right) + { + break; + } + } + } + + private double Extra(TabChipModel tab) => + (tab.Unread > 0 ? PanelText.Measure(" " + UnreadBadge.Format(tab.Unread), Size, true) : 0) + + (Marks(tab).Length > 0 ? PanelText.Measure(Marks(tab), Size, false) : 0); + + /// + /// Each name's width so the tabs fit , the way the cells' strip shares its row + /// (TabStripFit): a cap is lowered until the row fits and every longer name is cut to it, so short names stay + /// whole; the tab in front keeps a floor of its own. Past the floors the row clips, as the cells' does. + /// + private double[] Fit(IReadOnlyList tabs, double room) + { + var fixedCost = tabs.Sum(t => 28 + Extra(t) + (t.Closable ? 16 : 0) + 2); + double Measure(string label, TabChipModel t) => Math.Min(NameCap, PanelText.Measure(label, Size, t.Selected)); + + // The owner prefix goes first, and for the whole strip, as in the cells: the chip and the other character's + // mark still say whose a tab is. + _labels = tabs.Select(t => t.Name).ToArray(); + if (fixedCost + tabs.Sum(t => Measure(t.Name, t)) > room) + { + _labels = tabs.Select(t => t.Title).ToArray(); + } + + var full = tabs.Select((t, i) => Measure(_labels[i], t)).ToArray(); + double Width(double cap) => full.Select((w, i) => Math.Min(w, Math.Max(cap, tabs[i].Selected ? Math.Min(w, SelectedNameFloor) : 0))).Sum(); + if (fixedCost + full.Sum() <= room || full.Length == 0) + { + return full; + } + + var cap = full.Max(); + while (cap > NameFloor && fixedCost + Width(cap) > room) + { + cap -= 2; + } + + return full.Select((w, i) => Math.Min(w, Math.Max(cap, tabs[i].Selected ? Math.Min(w, SelectedNameFloor) : 0))).ToArray(); + } + + /// The quiet marks after a name: the draft pen and the other character's sign, as the cells write them. + private static string Marks(TabChipModel tab) => (tab.Draft ? " ✎" : string.Empty) + (tab.Foreign ? " ⌁" : string.Empty); + + public bool HitTest(Point point) => + Interactive && (_tabs.Any(t => t.Area.Contains(point)) || _overflow?.Contains(point) == true); + + protected override void OnPointerMoved(PointerEventArgs e) + { + base.OnPointerMoved(e); + var p = e.GetPosition(this); + var hit = _tabs.FirstOrDefault(t => t.Area.Contains(p)); + var tab = hit.Tab?.WindowId; + var close = hit.Close?.Contains(p) == true; + var overflow = _overflow?.Contains(p) == true; + if (tab != _hoverTab || close != _hoverClose || overflow != _hoverOverflow) + { + _hoverTab = tab; + _hoverClose = close; + _hoverOverflow = overflow; + Cursor = tab is not null || overflow ? new Cursor(StandardCursorType.Hand) : Cursor.Default; + ToolTip.SetTip(this, hit.Tab is { } t ? Tip(t, close) : overflow ? $"{Overlay?.Overflow?.Entries.Count} more tabs" : null); + InvalidateVisual(); + } + } + + private static string Tip(TabChipModel tab, bool close) => + NativeKeys.Words(close + ? "Close this tab (Ctrl+W)" + : tab.Name + (tab.Unread > 0 ? $"\n{UnreadBadge.Format(tab.Unread)} new" : string.Empty) + + (tab.Draft ? "\nan unsent line on its command line" : string.Empty)); + + protected override void OnPointerExited(PointerEventArgs e) + { + base.OnPointerExited(e); + _hoverTab = null; + _hoverClose = false; + _hoverOverflow = false; + InvalidateVisual(); + } + + protected override void OnPointerPressed(PointerPressedEventArgs e) + { + base.OnPointerPressed(e); + e.Handled = true; + var p = e.GetPosition(this); + var hit = _tabs.FirstOrDefault(t => t.Area.Contains(p)); + if (e.GetCurrentPoint(this).Properties.IsRightButtonPressed) + { + // The menu takes the pointer, so the release would never arrive: a right press is the whole click. + if (Overlay is { } overlay && hit.Tab is { } tab) + { + overlay.Menu(overlay.Model.PaneId, tab.WindowId); + } + + return; + } + + _pressed = (hit.Tab?.WindowId, hit.Close?.Contains(p) == true, _overflow?.Contains(p) == true); + } + + protected override void OnPointerReleased(PointerReleasedEventArgs e) + { + base.OnPointerReleased(e); + e.Handled = true; + var pressed = _pressed; + _pressed = default; + if (e.InitialPressMouseButton != MouseButton.Left || Overlay is not { } overlay) + { + return; + } + + var p = e.GetPosition(this); + var hit = _tabs.FirstOrDefault(t => t.Area.Contains(p)); + if (pressed.Overflow && _overflow?.Contains(p) == true) + { + overlay.OpenOverflow(overlay.Model.PaneId); + } + else if (pressed.Tab is { } id && hit.Tab?.WindowId == id) + { + if (pressed.Close && hit.Close?.Contains(p) == true) + { + overlay.Close(overlay.Model.PaneId, id); + } + else + { + overlay.Activate(overlay.Model.PaneId, id); + } + } + } + + /// Clicks a tab as a left press and release on it would. Internal for tests. + internal void PerformClick(string windowId, bool close = false) + { + if (Overlay is { } overlay) + { + if (close) + { + overlay.Close(overlay.Model.PaneId, windowId); + } + else + { + overlay.Activate(overlay.Model.PaneId, windowId); + } + } + } + + public override void Render(DrawingContext context) + { + if (Overlay is not { } overlay) + { + return; + } + + var bounds = new Rect(Bounds.Size); + var strip = Parse(overlay.StripPlane, Tokens.Card); + context.FillRectangle(new SolidColorBrush(strip), bounds); + var rule = new Pen(new SolidColorBrush(Tokens.Rule), 1); + var bottom = Math.Floor(bounds.Height) - 0.5; + context.DrawLine(rule, new Point(0, bottom), new Point(bounds.Width, bottom)); + + var size = Size; + var middle = (bounds.Height / 2) + 1; + var index = -1; + foreach (var (area, close, tab, plane) in _tabs) + { + index++; + var hovered = tab.WindowId == _hoverTab; + if (tab.Selected) + { + // A card joined to the pane: rounded at the top, ruled on three sides, open at the bottom onto the pane. + var r = Math.Min(NativeTokens.RadiusM, area.Height / 2); + var card = CardGeometry(area, r, bounds.Height); + context.DrawGeometry(new SolidColorBrush(plane), null, card); + context.DrawGeometry(null, new Pen(new SolidColorBrush(Tokens.Rule), 1), CardOutline(area, r, bounds.Height)); + + // The focused pane's front tab carries the focus cue: an accent bar along its top, between the corners. + if (overlay.Model.Focused) + { + context.DrawRectangle(new SolidColorBrush(Tokens.Accent), null, new Rect(area.X + r, area.Y, Math.Max(0, area.Width - (2 * r)), 2), 1, 1); + } + } + else + { + if (plane != strip) + { + context.DrawRectangle(new SolidColorBrush(plane), null, area.Deflate(new Thickness(0, 1, 0, 3)), NativeTokens.RadiusS, NativeTokens.RadiusS); + } + + if (hovered && Interactive) + { + context.DrawRectangle(new SolidColorBrush(PanelText.Alpha(Tokens.Text, 0x14)), null, area.Deflate(new Thickness(0, 1, 0, 3)), NativeTokens.RadiusS, NativeTokens.RadiusS); + } + } + + var ink = Held(tab.Selected ? Tokens.Text : Tokens.Dim, plane); + var x = area.X + 14; + var limit = area.Right - 14 - (close is null ? 0 : 16) - x; + var drawn = PanelText.Draw(context, _labels.Length > index ? _labels[index] : tab.Name, x, middle, size, ink, tab.Selected, Math.Min(_names.Count > index ? _names[index] : NameCap, limit)); + x += drawn; + if (tab.Unread > 0) + { + x += PanelText.Draw(context, " " + UnreadBadge.Format(tab.Unread), x, middle, size, Held(Tokens.Accent, plane), true, area.Right - x); + } + + if (Marks(tab) is { Length: > 0 } marks) + { + PanelText.Draw(context, marks, x, middle, size, Held(Tokens.Dim, plane), false, area.Right - x); + } + + if (close is { } c && hovered && Interactive) + { + var shade = _hoverClose && hovered ? 0x30 : 0; + if (shade > 0) + { + context.DrawRectangle(new SolidColorBrush(PanelText.Alpha(Tokens.Text, (byte)shade)), null, c, NativeTokens.RadiusS, NativeTokens.RadiusS); + } + + var pen = new Pen(new SolidColorBrush(PanelText.Alpha(ink, 0xe0)), 1.25); + var m = c.Center; + context.DrawLine(pen, new Point(m.X - 3.5, m.Y - 3.5), new Point(m.X + 3.5, m.Y + 3.5)); + context.DrawLine(pen, new Point(m.X + 3.5, m.Y - 3.5), new Point(m.X - 3.5, m.Y + 3.5)); + } + } + + if (_overflow is { } o && overlay.Overflow is { } menu) + { + var fill = _hoverOverflow ? Tokens.Selected : Tokens.Raised; + context.DrawRectangle(new SolidColorBrush(fill), new Pen(new SolidColorBrush(Tokens.Edge), 1), o, NativeTokens.RadiusS, NativeTokens.RadiusS); + PanelText.Draw(context, $"+{menu.Entries.Count} ▾", o.X + 8, o.Center.Y, size, Held(Tokens.Accent, fill), true, o.Width - 10); + } + + if (!Interactive) + { + context.FillRectangle(new SolidColorBrush(PanelText.Alpha(strip, 0x70)), bounds); + } + } + + /// The selected tab's fill: rounded top corners, square bottom running down over the strip's rule. + private static Geometry CardGeometry(Rect area, double r, double height) + { + var g = new StreamGeometry(); + using var c = g.Open(); + var bottom = height; + c.BeginFigure(new Point(area.X, bottom), true); + c.LineTo(new Point(area.X, area.Y + r)); + c.ArcTo(new Point(area.X + r, area.Y), new Size(r, r), 0, false, SweepDirection.Clockwise); + c.LineTo(new Point(area.Right - r, area.Y)); + c.ArcTo(new Point(area.Right, area.Y + r), new Size(r, r), 0, false, SweepDirection.Clockwise); + c.LineTo(new Point(area.Right, bottom)); + c.EndFigure(true); + return g; + } + + /// The selected tab's edge: three sides, none along the bottom, which is where it joins its pane. + private static Geometry CardOutline(Rect area, double r, double height) + { + var g = new StreamGeometry(); + using var c = g.Open(); + var left = area.X + 0.5; + var right = area.Right - 0.5; + var top = area.Y + 0.5; + c.BeginFigure(new Point(left, height), false); + c.LineTo(new Point(left, top + r)); + c.ArcTo(new Point(left + r, top), new Size(r, r), 0, false, SweepDirection.Clockwise); + c.LineTo(new Point(right - r, top)); + c.ArcTo(new Point(right, top + r), new Size(r, r), 0, false, SweepDirection.Clockwise); + c.LineTo(new Point(right, height)); + c.EndFigure(false); + return g; + } +} + +/// +/// The band across a pane split by scrolling back, drawn by the window over the band's row (its cells stay drawn under +/// it): how far back the history is, that new lines keep arriving below, and a Jump to latest button that ends +/// where End does (, the model the cells' rule is drawn from). Only the button is hit; the +/// rest of the band passes the pointer on to the cells. It takes no focus. +/// +internal sealed class ScrollBandView : Control, ICustomHitTest +{ + private Rect _button; + private bool _hover; + private bool _pressed; + + public ScrollBandView() + { + Focusable = false; + ClipToBounds = true; + } + + /// What the client last said about this band. Internal for tests. + internal ScrollBandOverlay? Overlay { get; private set; } + + private NativeTokens Tokens { get; set; } = NativeTokens.Dark; + + private bool Interactive { get; set; } = true; + + /// The button's area, as last laid out. Internal for tests. + internal Rect Button => _button; + + private double Size => (double.IsNaN(Height) ? Bounds.Height : Height) >= 20 ? NativeTokens.Body : NativeTokens.Small; + + private string ButtonText => $"{ScrollBandModel.Action} {NativeKeys.Words(ScrollBandModel.ReturnKey)}"; + + /// Takes the client's band and the window's tokens and redraws. + public void Show(ScrollBandOverlay band, NativeTokens tokens, bool interactive) + { + Overlay = band; + Tokens = tokens; + Interactive = interactive; + Lay(); + InvalidateVisual(); + } + + protected override void OnSizeChanged(SizeChangedEventArgs e) + { + base.OnSizeChanged(e); + Lay(); + } + + private void Lay() + { + var width = double.IsNaN(Width) ? Bounds.Width : Width; + var height = double.IsNaN(Height) ? Bounds.Height : Height; + var w = PanelText.Measure(ButtonText, Size, bold: true) + 20; + var h = Math.Max(4, Math.Min(height - 4, 24)); + _button = new Rect(Math.Max(0, width - w - 12), (height - h) / 2, w, h); + } + + public bool HitTest(Point point) => Interactive && _button.Contains(point); + + protected override void OnPointerEntered(PointerEventArgs e) + { + base.OnPointerEntered(e); + _hover = true; + Cursor = new Cursor(StandardCursorType.Hand); + ToolTip.SetTip(this, "Back to the live output (End, Ctrl+End)"); + InvalidateVisual(); + } + + protected override void OnPointerExited(PointerEventArgs e) + { + base.OnPointerExited(e); + _hover = false; + InvalidateVisual(); + } + + protected override void OnPointerPressed(PointerPressedEventArgs e) + { + base.OnPointerPressed(e); + e.Handled = true; + _pressed = e.GetCurrentPoint(this).Properties.IsLeftButtonPressed; + InvalidateVisual(); + } + + protected override void OnPointerReleased(PointerReleasedEventArgs e) + { + base.OnPointerReleased(e); + e.Handled = true; + var click = _pressed && e.InitialPressMouseButton == MouseButton.Left && _button.Contains(e.GetPosition(this)); + _pressed = false; + InvalidateVisual(); + if (click) + { + PerformClick(); + } + } + + /// Clicks the button as a left press and release would. Internal for tests. + internal void PerformClick() + { + if (Overlay is { } band) + { + band.Jump(band.Model.WindowId); + } + } + + public override void Render(DrawingContext context) + { + if (Overlay is not { } band) + { + return; + } + + var bounds = new Rect(Bounds.Size); + var plane = Tokens.Raised; + context.FillRectangle(new SolidColorBrush(plane), bounds); + var rule = new Pen(new SolidColorBrush(Tokens.Rule), 1); + context.DrawLine(rule, new Point(0, 0.5), new Point(bounds.Width, 0.5)); + context.DrawLine(rule, new Point(0, Math.Floor(bounds.Height) - 0.5), new Point(bounds.Width, Math.Floor(bounds.Height) - 0.5)); + + var size = Size; + var middle = bounds.Height / 2; + var x = 12.0; + var room = _button.X - 12; + x += PanelText.Draw(context, band.Model.Lead(band.Count), x, middle, size, NativeTabStrip.Held(Tokens.Text, plane), true, room - x); + if (room - x > 40) + { + PanelText.Draw(context, ScrollBandModel.Detail, x + 12, middle, size, NativeTabStrip.Held(Tokens.Dim, plane), false, room - x - 12); + } + + var fill = Tokens.Accent; + var shade = _hover && Interactive ? 0xe8 : 0xff; + context.DrawRectangle(new SolidColorBrush(Color.FromArgb((byte)shade, fill.R, fill.G, fill.B)), null, _button, NativeTokens.RadiusS + 2, NativeTokens.RadiusS + 2); + PanelText.Draw(context, ButtonText, _button.X + 10, _button.Center.Y, size, Tokens.AccentInk, true, _button.Width - 12); + } +} diff --git a/src/SharpMUTerm.Avalonia/WindowHost.cs b/src/SharpMUTerm.Avalonia/WindowHost.cs index 91ea1452..4d9a5054 100644 --- a/src/SharpMUTerm.Avalonia/WindowHost.cs +++ b/src/SharpMUTerm.Avalonia/WindowHost.cs @@ -40,7 +40,7 @@ internal static class WindowHost /// The window's driver. /// Where a copy goes. /// - /// Which chrome the window draws natively. The header and the rail by default, which is the window a person runs; + /// Which chrome the window draws natively. The header, the rail and the tab strips by default (), which is the window a person runs; /// for --render-png and --cell-chrome, where the cells carry it all. /// public static ClientHost Create(AvaloniaConsoleDriver driver, Action? clipboard, HostChrome? chrome = null) => new() @@ -75,7 +75,7 @@ internal static class WindowHost // The header band and the connections sidebar are the window's own controls, beside the cell grid rather // than over it (MainWindow, DesktopLayer): the client draws neither. - Chrome = chrome ?? HostChrome.HeaderAndRail, + Chrome = chrome ?? HostChrome.Native, // ⌃P is a native palette over the window, listing the same rows as the cell one. NativePalette = driver.Palette, diff --git a/src/SharpMUTerm.Avalonia/WindowOptions.cs b/src/SharpMUTerm.Avalonia/WindowOptions.cs index 857321a5..8b9025f3 100644 --- a/src/SharpMUTerm.Avalonia/WindowOptions.cs +++ b/src/SharpMUTerm.Avalonia/WindowOptions.cs @@ -30,7 +30,7 @@ internal sealed record WindowOptions( /// Which chrome the window draws natively: the header and the sidebar, unless --cell-chrome asked for the /// terminal's cells or this is --render-png, which draws cells and nothing native. /// - public HostChrome Chrome => CellChrome || RenderPng is not null ? HostChrome.None : HostChrome.HeaderAndRail; + public HostChrome Chrome => CellChrome || RenderPng is not null ? HostChrome.None : HostChrome.Native; /// /// What the client is told about this "terminal": Kitty graphics and truecolour. Both are true by diff --git a/src/SharpMUTerm.Avalonia/WindowPointer.cs b/src/SharpMUTerm.Avalonia/WindowPointer.cs index 4a3e1b33..e19a6a16 100644 --- a/src/SharpMUTerm.Avalonia/WindowPointer.cs +++ b/src/SharpMUTerm.Avalonia/WindowPointer.cs @@ -108,6 +108,20 @@ void IPointerPresenter.Chrome(ChromeOverlay chrome) ChromeChanged?.Invoke(); } + private PaneChromeOverlay? _paneChrome; + + /// The panes' tab strips and scrolled-back bands as the client last described them, or null before it has. + public PaneChromeOverlay? PaneChrome => Volatile.Read(ref _paneChrome); + + /// Raised on the client's thread when changes. + public event Action? PaneChromeChanged; + + void IPointerPresenter.PaneChrome(PaneChromeOverlay chrome) + { + Volatile.Write(ref _paneChrome, chrome); + PaneChromeChanged?.Invoke(); + } + private IReadOnlyList _notices = []; /// The notices the client has said, newest last, the most recent . diff --git a/src/SharpMUTerm.Client/Chrome/TabStripModel.cs b/src/SharpMUTerm.Client/Chrome/TabStripModel.cs new file mode 100644 index 00000000..79ad5ede --- /dev/null +++ b/src/SharpMUTerm.Client/Chrome/TabStripModel.cs @@ -0,0 +1,91 @@ +using SharpMUTerm.Core.Workspaces; + +namespace SharpMUTerm.Client.Chrome; + +/// +/// One tab of a pane's strip, as data: what the cell strip writes into the tab's title (TabTitles) and what the +/// window's native strip draws, so the two say the same thing about the same window. +/// +/// The window the tab brings forward. +/// The window's name as the strip spells it: the owner ahead of a capture's title (Corvid · Chat). +/// The window's own title, without the owner — what an elided cell tab falls back to. +/// Whether it is the strip's front tab. +/// Lines that arrived while it was not caught up; zero for none. +/// Whether its command line holds an unsent line. +/// Whether it belongs to a character other than the focused one (the cells' ⌁). +/// Whether it offers a close (the cells' ×): the front tab, never the main window. +/// The session key of the character it belongs to, or null for a window nobody owns. +public sealed record TabChipModel( + string WindowId, + string Name, + string Title, + bool Selected, + int Unread, + bool Draft, + bool Foreign, + bool Closable, + string? Owner) +{ + /// The command a click on the tab is the same as: the ⌃P "Go to …" entry for its window. + public string Target => Core.Commands.CommandIds.Window(WindowId); + + /// The tab for , as the strip of a pane whose focused character is . + public static TabChipModel From(WorkspaceWindow window, string? focusedCharacterKey, bool selected, bool closable) + { + ArgumentNullException.ThrowIfNull(window); + var name = window.Kind != WindowKind.Main ? CharacterNames.Window(window.OwnerLabel, window.Title) : window.Title; + var foreign = focusedCharacterKey is not null + && window.SessionKey is not null + && !string.Equals(window.SessionKey, focusedCharacterKey, StringComparison.Ordinal); + return new TabChipModel( + window.Id, name, window.Title, selected, Math.Max(0, window.Unread), window.HasUnsentInput, foreign, closable, window.SessionKey); + } +} + +/// +/// A pane's tab strip, as data (SurfaceCatalog.TabStrip): the tabs in strip order and whether the pane holds the +/// keyboard. The cells write each tab's title from it; the window draws it natively over the strip's row, which the +/// client leaves blank when the host says it draws the strips (HostChrome.Tabs). Value equality, lists included, +/// so an unchanged strip is not published again. +/// +public sealed record TabStripModel(string PaneId, bool Focused, IReadOnlyList Tabs) +{ + /// The tab a click on names, or null when the strip does not hold it. + public TabChipModel? Find(string windowId) => Tabs.FirstOrDefault(t => string.Equals(t.WindowId, windowId, StringComparison.Ordinal)); + + public bool Equals(TabStripModel? other) => + other is not null + && string.Equals(PaneId, other.PaneId, StringComparison.Ordinal) + && Focused == other.Focused + && Tabs.SequenceEqual(other.Tabs); + + public override int GetHashCode() => HashCode.Combine(PaneId, Focused, Tabs.Count); +} + +/// +/// The band across a pane split by scrolling back (SurfaceCatalog.ScrollBand): how far back the history above it +/// is, in display rows, and the way back to the live tail. The cells draw it as a rule +/// (ScrollSplitBarRenderer); the window draws it natively over that row, its button ending where End does. +/// +/// The split window. +/// Display rows below the history viewport: the status row's figure. +public sealed record ScrollBandModel(string WindowId, int RowsBack) +{ + /// The command the band's button is the same as: ⌃P ▸ Back to live output. + public const string LiveCommand = "term:scroll-live"; + + /// The key that returns, named on the button. + public const string ReturnKey = "End"; + + /// The key that freezes the split instead. + public const string FreezeKey = "⌥F"; + + /// The native band's lead: Scrolled back 120 rows, the count capped as the cells cap it. + public string Lead(string count) => $"Scrolled back {count} rows"; + + /// What the native band says beside its lead. + public const string Detail = "New lines keep arriving below"; + + /// The native button's words, before its key. + public const string Action = "Jump to latest"; +} diff --git a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs index 49c2c84d..c0aee430 100644 --- a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs +++ b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs @@ -210,6 +210,18 @@ public static class SurfaceCatalog /// public const string TabOverflow = "tab-overflow"; + /// + /// A pane's tab strip: the framework's strip of cells in a terminal, written from the model; in the window + /// (HostChrome.Tabs) a native strip over the strip's row, which the client then paints blank. + /// + public const string TabStrip = "tab-strip"; + + /// + /// The band across a pane split by scrolling back: a rule of cells in a terminal; in the window a native band over + /// that row as well, whose button ends where End does. + /// + public const string ScrollBand = "scroll-band"; + /// /// A panel popped out into a window of its own (the desktop window only; a terminal keeps every panel in its /// region). The frame around the panel's own native view: its title, whose it is, and the way back. @@ -578,6 +590,30 @@ [.. PanelViews("MapCanvas"), "SharpMUTerm.Avalonia.MapInspector"]), CellsUnderNative, "SharpMUTerm.Tui.SharpMUTermApp.TabOverflowLines", ["SharpMUTerm.Avalonia.NativeMenu"]), + new( + TabStrip, + typeof(TabStripModel), + [ + // A tab click brings its window forward and focuses its pane; the × closes the front tab; a right click + // opens the tab's menu; +N ▾ opens the overflow list. Each is the method the cell strip's click ends in. + new(SurfaceActionKind.Pick, "tab", "ActivateStripTab"), + new(SurfaceActionKind.Pick, "close", "CloseStripTab"), + new(SurfaceActionKind.Pick, "tab menu", "OpenTabMenu"), + new(SurfaceActionKind.Target, "overflow", "OpenTabOverflow"), + ], + NativeChrome, + "SharpMUTerm.Tui.TabTitles.Strip", + ["SharpMUTerm.Avalonia.NativeTabStrip"]), + new( + ScrollBand, + typeof(ScrollBandModel), + [ + // Jump to latest: End's method. The cells' band is a rule, not a button: End, ⌃End or the ⌃P entry. + new(SurfaceActionKind.Target, "jump to latest", "ReturnToLiveTail", CellsVia: ScrollBandModel.LiveCommand), + ], + CellsUnderNative, + "SharpMUTerm.Tui.ScrollSplitBarRenderer.Bar", + ["SharpMUTerm.Avalonia.ScrollBandView"]), new( FloatingPanel, typeof(FloatingPanelModel), diff --git a/src/SharpMUTerm.Tui/Hosting/ClientHost.cs b/src/SharpMUTerm.Tui/Hosting/ClientHost.cs index 59099085..6d4f6ae4 100644 --- a/src/SharpMUTerm.Tui/Hosting/ClientHost.cs +++ b/src/SharpMUTerm.Tui/Hosting/ClientHost.cs @@ -309,14 +309,22 @@ internal static ClientHost HarnessTerminal( /// /// The host draws the header band (the client's first row). /// The host draws the connection rail (the client's left column, with its divider and spacer). -internal sealed record HostChrome(bool Header, bool Rail) +/// +/// The host draws each pane's tab strip. A strip's row cannot be taken out of one pane of a uniform cell grid, so this +/// one part keeps its row: the client paints it blank and publishes the strip as data (TabStripModel), and the +/// host draws over exactly that row. The pane rectangles, and so NAWS, are the terminal's. +/// +internal sealed record HostChrome(bool Header, bool Rail, bool Tabs = false) { /// The client draws all of its chrome in cells: the terminal, the snapshot, the tests. public static HostChrome None { get; } = new(false, false); - /// The host draws the header and the rail natively: the desktop window. + /// The host draws the header and the rail natively. public static HostChrome HeaderAndRail { get; } = new(true, true); + /// The host draws the header, the rail and every pane's tab strip natively: the desktop window as it runs. + public static HostChrome Native { get; } = new(true, true, true); + /// Whether the host draws anything at all. - public bool Any => Header || Rail; + public bool Any => Header || Rail || Tabs; } diff --git a/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs b/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs index 6fe97200..31f94d3f 100644 --- a/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs +++ b/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs @@ -160,6 +160,15 @@ void Chrome(ChromeOverlay chrome) { } + /// + /// The panes' tab strips (when the host draws them, ) and the bands of panes split by + /// scrolling back, as data, whenever one moves or what it says changes. A host that draws neither ignores this (the + /// default). + /// + void PaneChrome(PaneChromeOverlay chrome) + { + } + /// /// How many columns a terminal the size of the host's whole window would have: its cells plus the chrome it draws /// beside them, in cells. Null when the cells are the whole window (the terminal, and the default). The client's diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.PaneChrome.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.PaneChrome.cs new file mode 100644 index 00000000..8878a73a --- /dev/null +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.PaneChrome.cs @@ -0,0 +1,368 @@ +using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Client.Commands; +using SharpMUTerm.Client.Surfaces; +using SharpMUTerm.Core.Text; +using SharpMUTerm.Core.Theming; +using SharpMUTerm.Core.Workspaces; + +namespace SharpMUTerm.Tui; + +/// +/// The panes' own chrome as data, for a host that draws it natively over the cells: each pane's tab strip (only where +/// the host says it draws them, ) and the band of each pane split by scrolling back. +/// +/// A strip keeps its row. The header and the rail are taken out of the grid, but a pane's strip is one row of +/// one pane, and a uniform cell grid cannot be inset per pane. So the client lays the panes out exactly as in a +/// terminal — the pane rectangles, and therefore NAWS, are the terminal's — paints each strip's row blank after the +/// frame (, the way the header dividers and the overflow chip are painted), and the +/// host draws its strip over exactly that row. A press the host lets through reaches only the client's own pointer +/// path (the divider, a window drag), never the framework's strip, whose labels are under the blank cells +/// (). +/// +/// +/// Every gesture ends in the cell click's method: a tab in (the cell strip's +/// TabChanged), its close in (the ×), a right click in +/// (the cell tab's menu), +N ▾ in , and the band's +/// button in (End). Each is refused unless the overlay last published offered it. +/// +/// +internal sealed partial class SharpMUTermApp +{ + private PaneChromeOverlay? _paneChrome; + + private Action? _stripActivate; + private Action? _stripClose; + private Action? _stripMenu; + private Action? _stripOverflow; + private Action? _bandJump; + + /// The strip rows the host draws over, in desktop cells, as the last frame painted them; read on the input thread. + private volatile PaneRect[] _nativeStripRows = []; + + /// What the host was last told about the panes' strips and bands. Internal for tests. + internal PaneChromeOverlay? PaneChromePublished => _paneChrome; + + /// + /// Tells the host about the strips and bands on screen, when any changed. Rides the frame, after every strip has been + /// re-titled and every band re-counted, and the modal stack, for ' reason. + /// + private void PublishPaneChrome() + { + if (_pointer is null || _window is null) + { + return; + } + + var overlay = BuildPaneChrome(); + if (overlay.Equals(_paneChrome)) + { + return; + } + + _paneChrome = overlay; + _pointer.PaneChrome(overlay); + } + + /// The strips and bands as they stand. Internal for tests. + internal PaneChromeOverlay BuildPaneChrome() + { + _stripActivate ??= (pane, window) => OnUiThread(() => ActivateOfferedStripTab(pane, window)); + _stripClose ??= (pane, window) => OnUiThread(() => CloseOfferedStripTab(pane, window)); + _stripMenu ??= (pane, window) => OnUiThread(() => OpenTabMenu(pane, window)); + _stripOverflow ??= pane => OnUiThread(() => OpenOfferedTabOverflow(pane)); + _bandJump ??= window => OnUiThread(() => ReturnFromOfferedBand(window)); + + // A modal over the main window is drawn in cells over the panes; a native strip would sit on top of it. + var covered = _system.ModalStateService.HasModals || _nativeCompose is not null; + var strips = new List(); + var bands = new List(); + if (!covered) + { + foreach (var (paneId, tabs, _) in RealisedPanes()) + { + if (Host.Chrome.Tabs && tabs.ShowTabHeader && BoundsOf(tabs) is { Width: > 0 } box + && DrawnModel(SurfaceCatalog.TabStrip, paneId) is TabStripModel model) + { + var surface = PaneSurfaceTone(paneId); + var chips = model.Tabs + .Select(t => t.Selected || _workspace.FindWindow(t.WindowId) is not { } w ? null : ChipFor(paneId, w).Plane) + .ToList(); + strips.Add(new TabStripOverlay( + new PaneRect(box.X, box.Y, box.Width, Math.Max(1, tabs.TabHeaderHeight)), + model, + surface.ToHex(), + WorkspacePalette.Recessed(surface).ToHex(), + chips, + _tabOverflow.TryGetValue(paneId, out var overflow) ? overflow.Menu : null, + _stripActivate, + _stripClose, + _stripMenu, + _stripOverflow)); + } + + if (_workspace.Layout.FindPane(paneId)?.ActiveTab is { } windowId && _scrollSplits.ContainsKey(windowId) + && _scrollSplitBars.TryGetValue(windowId, out var bar) && BoundsOf(bar) is { Width: > 0 } row + && DrawnModel(SurfaceCatalog.ScrollBand, windowId) is ScrollBandModel band) + { + bands.Add(new ScrollBandOverlay( + new PaneRect(row.X, row.Y, row.Width, 1), band, ScrollSplitBarRenderer.Count(band.RowsBack), _bandJump)); + } + } + } + + _nativeStripRows = [.. strips.Select(s => s.Row)]; + return new PaneChromeOverlay(strips, bands, _theme, MainWindowInFront()); + } + + /// + /// Paints the row of every strip the host draws blank, after the frame, in the strip's own recessed plane: the + /// framework's labels, separators and × go, the row stays, and the host's strip lies over it. Only where the + /// host draws the strips. + /// + private void BlankNativeTabStrips(SharpConsoleUI.Layout.CharacterBuffer buffer) + { + if (!Host.Chrome.Tabs) + { + return; + } + + var top = _window.Top + _system.DesktopUpperLeft.Y; + foreach (var (paneId, tabs, _) in RealisedPanes()) + { + if (!tabs.ShowTabHeader || BoundsOf(tabs) is not { Width: > 0 } strip) + { + continue; + } + + var plane = ToColor(WorkspacePalette.Recessed(PaneSurfaceTone(paneId))); + for (var y = strip.Y; y < strip.Y + Math.Max(1, tabs.TabHeaderHeight); y++) + { + var by = y - top; + for (var x = strip.X; x < strip.X + strip.Width; x++) + { + var bx = x - _window.Left; + if (bx >= 0 && by >= 0 && bx < buffer.Width && by < buffer.Height) + { + buffer.SetCell(bx, by, new SharpConsoleUI.Layout.Cell(' ', plane, plane)); + } + } + } + } + } + + /// + /// Strikes the button flags of a frame on a strip row the host draws over, leaving the framework a movement. Called + /// after this client's own handlers have read the frame whole. Internal for tests. + /// + internal bool TakesNativeStripPress(List flags, System.Drawing.Point point) + { + var rows = _nativeStripRows; + if (rows.Length == 0 || !rows.Any(r => Contains(r, point))) + { + return false; + } + + var removed = flags.RemoveAll(f => f is MouseFlags.Button1Pressed or MouseFlags.Button1Released + or MouseFlags.Button1Clicked or MouseFlags.Button1DoubleClicked or MouseFlags.Button1TripleClicked + or MouseFlags.Button1Dragged); + if (removed > 0 && flags.Count == 0) + { + flags.Add(MouseFlags.ReportMousePosition); + } + + return removed > 0; + } + + /// + /// A tab clicked, in either host: its pane takes the focus and its window comes forward, through the one activation + /// path. The cell strip's TabChanged ends here too. + /// + internal void ActivateStripTab(string paneId, string windowId) + { + _workspace.Layout.Focus(paneId); + Activate(windowId); + } + + /// A tab's close, in either host: the cell × and the native one. + internal void CloseStripTab(string windowId) => CloseWindow(windowId); + + /// + /// A right click on a tab: the tab comes forward and the host shows the tab's menu (), the + /// menu a right click on a cell tab shows. Internal for tests; returns whether a menu was shown. + /// + internal bool OpenTabMenu(string paneId, string windowId) + { + if (_pointer is null || !Offered(paneId, windowId, out var strip) || !MainWindowInFront()) + { + return false; + } + + var items = new List(); + AddTabMenu(items, windowId); + var tidy = Tidy(items); + if (tidy.Count == 0) + { + return false; + } + + _pointer.ShowMenu(new System.Drawing.Point(strip!.Row.X, strip.Row.Y), tidy); + return true; + } + + /// A native tab click, checked against what the strip offered. Internal for tests. + internal bool ActivateOfferedStripTab(string paneId, string windowId) + { + if (!Offered(paneId, windowId, out _)) + { + RefuseCommand($"the tab strip never offered {Snippet(windowId)}"); + return false; + } + + if (!MainWindowInFront()) + { + return false; + } + + ActivateStripTab(paneId, windowId); + return true; + } + + /// A native tab's close, checked: only a tab the strip offered a close on. Internal for tests. + internal bool CloseOfferedStripTab(string paneId, string windowId) + { + if (!Offered(paneId, windowId, out var strip) || strip!.Model.Find(windowId) is not { Closable: true }) + { + RefuseCommand($"the tab strip never offered to close {Snippet(windowId)}"); + return false; + } + + if (!MainWindowInFront()) + { + return false; + } + + CloseStripTab(windowId); + return true; + } + + /// A native +N ▾: the overflow list the cells recorded for that strip. Internal for tests. + internal bool OpenOfferedTabOverflow(string paneId) + { + var offered = _paneChrome?.Strips.FirstOrDefault(s => s.Model.PaneId == paneId); + if (offered?.Overflow is null) + { + RefuseCommand($"the tab strip never offered a list for {Snippet(paneId)}"); + return false; + } + + return MainWindowInFront() && OpenTabOverflow(paneId, new System.Drawing.Point(offered.Row.X + offered.Row.Width - 1, offered.Row.Y)); + } + + /// A native band's Jump to latest, checked against the bands last published. Internal for tests. + internal bool ReturnFromOfferedBand(string windowId) + { + if (_paneChrome?.Bands.Any(b => b.Model.WindowId == windowId) != true) + { + RefuseCommand($"no band offered to return {Snippet(windowId)}"); + return false; + } + + return MainWindowInFront() && ReturnToLiveTail(windowId); + } + + /// + /// The first column of a pane's strip, relative to the pane, at which the framework's own hit test finds the tab + /// showing , or -1. Internal for tests: where a cell click on that tab lands. + /// + internal int CellTabColumn(string paneId, string windowId) + { + SharpConsoleUI.Controls.TabControl? tabs; + lock (_paneTabsLock) + { + if (!_paneTabs.TryGetValue(paneId, out tabs)) + { + return -1; + } + } + + var index = _workspace.Layout.FindPane(paneId)?.Tabs.ToList().IndexOf(windowId) ?? -1; + var width = BoundsOf(tabs)?.Width ?? 0; + for (var x = 0; index >= 0 && x < width; x++) + { + if (FrameworkHitTests.TabAt(tabs, x) == index) + { + return x + 1; + } + } + + return -1; + } + + private bool Offered(string paneId, string windowId, out TabStripOverlay? strip) + { + strip = (_paneChrome ?? BuildPaneChrome()).Strips.FirstOrDefault(s => s.Model.PaneId == paneId); + return strip?.Model.Find(windowId) is not null; + } +} + +/// +/// The panes' own chrome, for a host that draws it natively over the cells: the tab strips (only where +/// ) and the scrolled-back bands. +/// +/// One per pane that shows a strip, in pane order. +/// One per pane whose front window is split by scrolling back. +/// The client's theme, from which the host derives its inks. +/// Whether the main window is in front; under a modal the chrome takes no click. +internal sealed record PaneChromeOverlay( + IReadOnlyList Strips, + IReadOnlyList Bands, + Theme Theme, + bool Interactive) +{ + public bool Equals(PaneChromeOverlay? other) => + other is not null && Strips.SequenceEqual(other.Strips) && Bands.SequenceEqual(other.Bands) + && ReferenceEquals(Theme, other.Theme) && Interactive == other.Interactive; + + public override int GetHashCode() => HashCode.Combine(Strips.Count, Bands.Count, Interactive); +} + +/// +/// One pane's tab strip, for a host that draws it over the strip's row. +/// +/// The strip's row, in desktop cells; the client paints it blank. +/// The strip as the cells wrote it. +/// The pane's own plane (its character's tint, the focus lift): the selected tab is drawn on it. +/// The strip's plane, one step recessed from the pane's: what the cells' idle chips wear. +/// Per tab, an unselected tab's own plane when it belongs to another character; else null. +/// The tabs the strip cannot show (), or null when all fit. +/// Brings a tab forward by pane and window id; any thread. +/// Closes a tab the strip offered a close on, by pane and window id; any thread. +/// Opens a tab's menu, by pane and window id; any thread. +/// Opens the overflow list, by pane id; any thread. +internal sealed record TabStripOverlay( + PaneRect Row, + TabStripModel Model, + string Plane, + string StripPlane, + IReadOnlyList Chips, + MenuModel? Overflow, + Action Activate, + Action Close, + Action Menu, + Action OpenOverflow) +{ + public bool Equals(TabStripOverlay? other) => + other is not null && Row == other.Row && Model.Equals(other.Model) && Plane == other.Plane + && StripPlane == other.StripPlane && Chips.SequenceEqual(other.Chips) && Equals(Overflow, other.Overflow) + && ReferenceEquals(Activate, other.Activate); + + public override int GetHashCode() => HashCode.Combine(Row, Model, Plane); +} + +/// A pane's scrolled-back band, for a host that draws it over the band's row. +/// The band's row, in desktop cells; its cells stay drawn under the host's band. +/// The band as the cells drew it. +/// The count as the cells show it, capped. +/// Takes the window back to its live tail, by window id; any thread. +internal sealed record ScrollBandOverlay(PaneRect Row, ScrollBandModel Model, string Count, Action Jump); diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs index e3bc86c8..0e725c29 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs @@ -118,6 +118,13 @@ private void RegisterHeaderDivider(SplitNode split, int index) return null; } + // A host that draws the strips takes the presses on its tabs; what reaches the cells is the strip's empty run, + // wherever the host's tabs end, so the whole blank row is the handle. + if (Host.Chrome.Tabs) + { + return new PaneRect(rect.X, rect.Y, rect.Width, 1); + } + var from = rect.Width; while (from > 0 && FrameworkHitTests.TabAt(tabs, from - 1) < 0) { @@ -420,6 +427,13 @@ private PointerTarget PaneTargetAt(string paneId, TabControl tabs, PaneRect rect { if (point.Y < rect.Y + tabs.TabHeaderHeight) { + // Where the host draws the strips, the framework's labels under them are blank cells: a press on the row + // that reaches the cells is past the host's last tab, nothing the framework's hit test should answer. + if (Host.Chrome.Tabs) + { + return PointerTarget.Nothing; + } + var index = FrameworkHitTests.TabAt(tabs, point.X - rect.X); var pages = tabs.TabPages; if (index < 0 || index >= pages.Count || pages[index].Tag is not string tabWindow) @@ -573,15 +587,7 @@ internal IReadOnlyList PointerMenu(System.Drawing.Point point) break; case PointerKind.Tab: - var tabWindow = target.Key.Split(':', 3)[2]; - Activate(tabWindow); - if (tabWindow != MainWindowId) - { - items.Add(new PointerMenuItem("Close tab", "⌃W", () => OnUiThread(() => CloseWindow(tabWindow)))); - } - - AddCommands(items, "layout:next-tab", null, "layout:split-right", "layout:split-down", "layout:zoom", "layout:unzoom", "layout:close"); - AddPopOut(items); + AddTabMenu(items, target.Key.Split(':', 3)[2]); break; case PointerKind.Link: @@ -621,6 +627,22 @@ internal IReadOnlyList PointerMenu(System.Drawing.Point point) return Tidy(items); } + /// + /// A tab's menu: the tab is brought forward, so every entry acts on it, then Close and the pane's own commands. One + /// list for a right click on a cell tab and on the window's native tab (). + /// + private void AddTabMenu(List items, string tabWindow) + { + Activate(tabWindow); + if (tabWindow != MainWindowId) + { + items.Add(new PointerMenuItem("Close tab", "⌃W", () => OnUiThread(() => CloseWindow(tabWindow)))); + } + + AddCommands(items, "layout:next-tab", null, "layout:split-right", "layout:split-down", "layout:zoom", "layout:unzoom", "layout:close"); + AddPopOut(items); + } + /// The window and payload of a link target, read back out of its key. private static (string WindowId, string Url, LinkPayload Payload)? LinkOf(PointerTarget target) { diff --git a/src/SharpMUTerm.Tui/ScrollSplitBarRenderer.cs b/src/SharpMUTerm.Tui/ScrollSplitBarRenderer.cs index 7f8c4e89..f76a0912 100644 --- a/src/SharpMUTerm.Tui/ScrollSplitBarRenderer.cs +++ b/src/SharpMUTerm.Tui/ScrollSplitBarRenderer.cs @@ -13,11 +13,21 @@ internal static class ScrollSplitBarRenderer /// (), so the label does not move as output arrives; the hints are dropped, last /// first, when the pane is too narrow for them, and the rule takes whatever is left. /// + public static string Bar(SharpMUTerm.Client.Chrome.ScrollBandModel band, int width, string accentHex) + { + ArgumentNullException.ThrowIfNull(band); + return Bar(band.RowsBack, width, accentHex); + } + + /// The count a band shows for : capped, as the status row caps it. + public static string Count(int rowsBack) => UnreadBadge.Format(Math.Max(1, rowsBack)); + + /// The bar for a count, as draws it. public static string Bar(int rowsBack, int width, string accentHex) { ArgumentException.ThrowIfNullOrEmpty(accentHex); - var count = UnreadBadge.Format(Math.Max(1, rowsBack)).PadLeft(UnreadBadge.FieldWidth); + var count = Count(rowsBack).PadLeft(UnreadBadge.FieldWidth); var label = $"{Glyphs.Scrollback} scrolled back {count} rows"; string[] hints = ["End returns", "⌥F freezes"]; diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.ScrollSplit.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.ScrollSplit.cs index 9063a7ef..9d6432f1 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.ScrollSplit.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.ScrollSplit.cs @@ -1,4 +1,6 @@ using SharpConsoleUI; +using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Client.Surfaces; using SharpConsoleUI.Controls; using SharpConsoleUI.Layout; using SharpConsoleUI.Builders; @@ -217,7 +219,8 @@ private bool RefreshScrollSplitBar(string windowId) var bar = ScrollSplitBarFor(windowId); var width = panel.ViewportWidth > 0 ? panel.ViewportWidth : 80; var below = panel.TotalContentHeight - panel.ViewportHeight - panel.VerticalScrollOffset; - var markup = ScrollSplitBarRenderer.Bar(below, width, _ink.Notice); + var band = Drawing(SurfaceCatalog.ScrollBand, windowId, new ScrollBandModel(windowId, below)); + var markup = ScrollSplitBarRenderer.Bar(band, width, _ink.Notice); if (!string.Equals(_scrollSplitBarText.GetValueOrDefault(windowId), markup, StringComparison.Ordinal)) { _scrollSplitBarText[windowId] = markup; @@ -267,6 +270,22 @@ private bool TryEndReturnsFromSplit(KeyPressedEventArgs e) } e.Handled = true; + ReturnToLiveTail(windowId); + return true; + } + + /// + /// Takes a split window back to its live tail: End's work, and what the window's native band's Jump to latest + /// ends in (). Internal so a test can drive it as the window does; returns + /// whether the window was split and is now following its tail. + /// + internal bool ReturnToLiveTail(string windowId) + { + if (!_scrollSplits.ContainsKey(windowId) || _paneScrolls.GetValueOrDefault(windowId) is not { } panel) + { + return false; + } + BackToLive(panel); SyncScrollbackState(); return true; diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 7726e240..5e1b69bf 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -1026,6 +1026,7 @@ public SharpMUTermApp( SyncTransparentColours(); PaintHeaderDividers(buffer); PaintTabOverflow(buffer); + BlankNativeTabStrips(buffer); DrawSixelOverlay(buffer); PublishScrollbars(); PublishPanels(); @@ -1036,11 +1037,16 @@ public SharpMUTermApp( SyncScrollSplitBars(); SyncChromeBarWidths(); SyncStatusMode(); + PublishPaneChrome(); }; // A modal that covers the main window entirely leaves it unpainted, so no PostBufferPaint says the native // panels are now under it; the modal stack changing says it instead. - _system.ModalStateService.StateChanged += (_, _) => PublishPanels(); + _system.ModalStateService.StateChanged += (_, _) => + { + PublishPanels(); + PublishPaneChrome(); + }; if (_sixel is not null) { // Another window over this one rewrites the cells a picture sits on, and the frame that puts @@ -10233,11 +10239,13 @@ private static string Snippet(string text) => /// private void OnTabChanged(string paneId, TabPage? newTab) { - _workspace.Layout.Focus(paneId); if (newTab?.Tag is string id) { - Activate(id); + ActivateStripTab(paneId, id); + return; } + + _workspace.Layout.Focus(paneId); } /// @@ -11531,21 +11539,16 @@ private IWindowControl BuildPaneTabs(PaneNode pane) { var builder = Controls.TabControl(); var ids = new List(); - var focused = IsFocusedPane(pane.Id); - foreach (var windowId in pane.Tabs) - { - if (_workspace.FindWindow(windowId) is not { } window) - { - continue; - } - // ▌ is the focus half of the signal and bold is the selection half; both read on a monochrome - // terminal, where a luminance step does not. - var selected = string.Equals(pane.ActiveTab, windowId, StringComparison.Ordinal); - builder.AddTab( - TabTitles.For( - window, ActiveCharacterKey(), focused && selected, selected, _ink, ChipFor(pane.Id, window)), - BuildTabContent(pane, windowId, window)); + // ▌ is the focus half of the signal and bold is the selection half; both read on a monochrome + // terminal, where a luminance step does not. The titles are the strip's model drawn as cells, the model the + // window's native strip draws (SurfaceCatalog.TabStrip). + var strip = Drawing(SurfaceCatalog.TabStrip, pane.Id, StripModelFor(pane.Id, pane.Tabs, pane.ActiveTab, ActiveCharacterKey())); + var titles = TabTitles.Strip(strip, _ink, ChipOf(pane.Id)); + for (var i = 0; i < strip.Tabs.Count; i++) + { + var windowId = strip.Tabs[i].WindowId; + builder.AddTab(titles[i], BuildTabContent(pane, windowId, _workspace.FindWindow(windowId)!)); ids.Add(windowId); } @@ -12877,6 +12880,20 @@ private void OnDriverMouseEvent(object sender, List flags, System.Dr // thread; the copy is because the driver may reuse its list. var frame = flags.ToList(); OnUiThread(() => OnPointerFrame(frame, point)); + try + { + RouteDriverMouseEvent(flags, point); + } + finally + { + // A strip row the host draws over: the press is the client's own (the divider, a window drag), never the + // framework's, whose labels under it are blank cells. Struck last, so the tracker above saw the frame whole. + TakesNativeStripPress(flags, point); + } + } + + private void RouteDriverMouseEvent(List flags, System.Drawing.Point point) + { // A press on a tab strip's +N ▾ chip opens its list and nothing else: the framework, which reads this same list // after us, is left a pointer movement rather than a click on the tab under the chip. @@ -13269,7 +13286,7 @@ private void OnTabCloseRequested(TabPage tab) { if (tab.Tag is string windowId) { - OnUiThread(() => CloseWindow(windowId)); + OnUiThread(() => CloseStripTab(windowId)); } } @@ -13575,59 +13592,81 @@ private void RetitlePane(string paneId, TabControl tabs, string? focusedCharacte { var activeTab = _workspace.Layout.FindPane(paneId)?.ActiveTab; var pages = tabs.TabPages; - var costs = new List(pages.Count); - var windows = new WorkspaceWindow?[pages.Count]; - var full = new string?[pages.Count]; + // The × follows the active tab, so keep it in step with every title refresh — and it has to be settled before + // the strip is costed, because it is one of the cells being counted. + var ids = new List(pages.Count); for (var i = 0; i < pages.Count; i++) { - var page = pages[i]; - var id = page.Tag as string; - var window = id is not null ? _workspace.FindWindow(id) : null; - var selected = id is not null && string.Equals(activeTab, id, StringComparison.Ordinal); - - // The × follows the active tab, so keep it in step with every title refresh — and it has to - // be settled before the strip is costed, because it is one of the cells being counted. - if (id is not null && window is not null) + if (pages[i].Tag is string id && _workspace.FindWindow(id) is not null) { - page.IsClosable = CanCloseTab(id, activeTab); + pages[i].IsClosable = CanCloseTab(id, activeTab); + ids.Add(id); } + } + var strip = Drawing(SurfaceCatalog.TabStrip, paneId, StripModelFor(paneId, ids, activeTab, focusedCharacter)); + var chipOf = ChipOf(paneId); + var full = TabTitles.Strip(strip, _ink, chipOf); + var costs = new List(pages.Count); + var tabAt = new int[pages.Count]; + var next = 0; + for (var i = 0; i < pages.Count; i++) + { + var page = pages[i]; var frame = 2 + (page.IsClosable ? 1 : 0) + (i < pages.Count - 1 ? 1 : 0); - if (window is null) + var selected = page.Tag is string pageId && string.Equals(activeTab, pageId, StringComparison.Ordinal); + if (next >= strip.Tabs.Count || !string.Equals(page.Tag as string, strip.Tabs[next].WindowId, StringComparison.Ordinal)) { + tabAt[i] = -1; costs.Add(new TabCost(0, 0, MarkupText.VisibleLength(page.Title) + frame, selected)); continue; } - var title = TabTitles.For( - window, focusedCharacter, IsFocusedPane(paneId) && selected, selected, _ink, - ChipFor(paneId, window)); - var name = TabTitles.Name(window).Length; - - windows[i] = window; - full[i] = title; - costs.Add(new TabCost( - name, window.Title.Length, MarkupText.VisibleLength(title) - name + frame, selected)); + var tab = strip.Tabs[next]; + tabAt[i] = next; + var name = tab.Name.Length; + costs.Add(new TabCost(name, tab.Title.Length, MarkupText.VisibleLength(full[next]) - name + frame, selected)); + next++; } var budgets = TabStripFit.Budgets(costs, _stripWidths.GetValueOrDefault(paneId)); for (var i = 0; i < pages.Count; i++) { - if (windows[i] is not { } window) + if (tabAt[i] is var t and >= 0) { - continue; + var tab = strip.Tabs[t]; + pages[i].Title = budgets[i] >= costs[i].NameLength + ? full[t] + : TabTitles.For(tab, strip.Focused && tab.Selected, _ink, chipOf(tab), budgets[i]); } + } + } - var selected = costs[i].Selected; - pages[i].Title = budgets[i] >= costs[i].NameLength - ? full[i]! - : TabTitles.For( - window, focusedCharacter, IsFocusedPane(paneId) && selected, selected, _ink, - ChipFor(paneId, window), budgets[i]); + /// + /// A pane's tab strip as data (): one tab per window in + /// that still exists, in strip order. What the cells write into the tab titles and what a host that draws the strips + /// () is handed are this one model. + /// + private TabStripModel StripModelFor(string paneId, IEnumerable windowIds, string? activeTab, string? focusedCharacter) + { + var tabs = new List(); + foreach (var id in windowIds) + { + if (_workspace.FindWindow(id) is { } window) + { + var selected = string.Equals(activeTab, id, StringComparison.Ordinal); + tabs.Add(TabChipModel.From(window, focusedCharacter, selected, CanCloseTab(id, activeTab))); + } } + + return new TabStripModel(paneId, IsFocusedPane(paneId), tabs); } + /// The plane each unselected tab of a pane is drawn on (), by its model. + private Func ChipOf(string paneId) => + tab => _workspace.FindWindow(tab.WindowId) is { } window ? ChipFor(paneId, window) : null; + /// /// Re-measures each strip against the pane it was just arranged into, and re-titles the ones that /// moved. It rides PostBufferPaint beside and for that diff --git a/src/SharpMUTerm.Tui/TabTitles.cs b/src/SharpMUTerm.Tui/TabTitles.cs index fa6de88f..54b9ca56 100644 --- a/src/SharpMUTerm.Tui/TabTitles.cs +++ b/src/SharpMUTerm.Tui/TabTitles.cs @@ -1,3 +1,4 @@ +using SharpMUTerm.Client.Chrome; using SharpMUTerm.Core.Workspaces; namespace SharpMUTerm.Tui; @@ -60,27 +61,50 @@ public static string For( int nameBudget = 0) { ArgumentNullException.ThrowIfNull(window); + return For(TabChipModel.From(window, focusedCharacterKey, selected, closable: false), focusedPane, ink, chip, nameBudget); + } + + /// + /// Every title of a strip, drawn from its model (): the cells' renderer of the tab-strip + /// surface, whose model the window's native strip draws. gives an unselected tab its own + /// plane; , when given, is each name's budget (). + /// + public static List Strip( + TabStripModel strip, ChromeInk? ink, Func chipFor, IReadOnlyList? budgets = null) + { + ArgumentNullException.ThrowIfNull(strip); + ArgumentNullException.ThrowIfNull(chipFor); + var titles = new List(strip.Tabs.Count); + for (var i = 0; i < strip.Tabs.Count; i++) + { + var tab = strip.Tabs[i]; + titles.Add(For(tab, strip.Focused && tab.Selected, ink, chipFor(tab), budgets is null ? 0 : budgets[i])); + } + + return titles; + } + + /// One tab's title from its model; 's work. + public static string For(TabChipModel tab, bool focusedPane, ChromeInk? ink, TabChip? chip, int nameBudget = 0) + { + ArgumentNullException.ThrowIfNull(tab); - var name = MarkupText.Escape(Elide(window, nameBudget)); + var name = MarkupText.Escape(Elide(tab, nameBudget)); // Capped through the sidebar's own formatter, so the two surfaces reading one number cannot print // different answers and a count from the wire cannot push a narrow strip's later tabs off the end. - var unread = window.Unread > 0 ? $" ({UnreadBadge.Format(window.Unread)})" : string.Empty; - var pen = window.HasUnsentInput ? $" {Glyphs.Draft}" : string.Empty; + var unread = tab.Unread > 0 ? $" ({UnreadBadge.Format(tab.Unread)})" : string.Empty; + var pen = tab.Draft ? $" {Glyphs.Draft}" : string.Empty; // ⌁ marks a window owned by a character other than the focused one. - var cross = focusedCharacterKey is not null - && window.SessionKey is not null - && !string.Equals(window.SessionKey, focusedCharacterKey, StringComparison.Ordinal) - ? " ⌁" - : string.Empty; + var cross = tab.Foreign ? " ⌁" : string.Empty; var focus = focusedPane ? Glyphs.FocusedPane + " " : string.Empty; // Tint and weight cover the name and count only: the ▌ ahead and the ✎ / ⌁ behind are other // facts. One tag rather than two nested, because a selected tab can also be unread. var named = name + unread; - var style = (selected, window.Unread > 0) switch + var style = (tab.Selected, tab.Unread > 0) switch { (true, true) => $"bold {UnreadBadge.TintFor(ink)}", (true, false) => "bold", @@ -91,7 +115,7 @@ public static string For( // The chip is the tab's own plane, which only an unselected tab carries — the selected one is // painted by the strip, in the plane its page is on. Foreground first so an unread tab keeps its // accent: the plane says whose window this is, the accent says it has something new. - if (chip is { } tile && !selected) + if (chip is { } tile && !tab.Selected) { style = $"{style ?? tile.Ink} on {tile.Plane}"; } @@ -126,16 +150,16 @@ public static string Name(WorkspaceWindow window) /// the chip behind the tab already says whose window this is, and cutting from the front would spend /// the surviving cells on Corvid… — the half that every other tab in the strip repeats. /// - private static string Elide(WorkspaceWindow window, int budget) + private static string Elide(TabChipModel tab, int budget) { - var name = Name(window); + var name = tab.Name; if (budget <= 0 || name.Length <= budget) { return name; } - return window.Title.Length <= budget - ? window.Title - : window.Title[..Math.Max(1, budget - 1)] + "…"; + return tab.Title.Length <= budget + ? tab.Title + : tab.Title[..Math.Max(1, budget - 1)] + "…"; } } diff --git a/tests/SharpMUTerm.Avalonia.Tests/HostParityTests.cs b/tests/SharpMUTerm.Avalonia.Tests/HostParityTests.cs index d8f629b2..7c7d8f68 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/HostParityTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/HostParityTests.cs @@ -27,17 +27,22 @@ public partial class HostParityTests public static IEnumerable Views() => SnapshotViews.All.Select(v => v ?? "(default)"); /// - /// Every view under both chrome arrangements: the client's chrome in cells (the terminal's, and the window's with - /// --cell-chrome), and the header and rail drawn by the host (the window as a person runs it). Both hosts - /// are told the same arrangement each time, so the comparison is still of drivers and nothing else, over every - /// cell either one draws. + /// Every view under each chrome arrangement: the client's chrome in cells (the terminal's, and the window's with + /// --cell-chrome), the header and rail drawn by the host, and those with every pane's tab strip drawn by the + /// host too (the window as a person runs it, whose strip rows the client paints blank). Both hosts are told the same + /// arrangement each time, so the comparison is still of drivers and nothing else, over every cell either one draws. /// - public static IEnumerable<(string View, bool HostChrome)> ViewsUnderBothChromes() => + public static IEnumerable<(string View, string HostChrome)> ViewsUnderBothChromes() => from view in Views() - from native in new[] { false, true } - select (view, native); + from chrome in new[] { "cells", "header-and-rail", "native" } + select (view, chrome); - private static HostChrome ChromeFor(bool native) => native ? HostChrome.HeaderAndRail : HostChrome.None; + private static HostChrome ChromeFor(string chrome) => chrome switch + { + "native" => HostChrome.Native, + "header-and-rail" => HostChrome.HeaderAndRail, + _ => HostChrome.None, + }; /// /// A view drawn in the window is the view drawn in the terminal, cell for cell. What this catches is the @@ -46,7 +51,7 @@ from view in Views() /// [Test] [MethodDataSource(nameof(ViewsUnderBothChromes))] - public async Task EveryViewDrawsTheSameCellsInTheWindowAsInTheTerminal(string name, bool hostChrome) + public async Task EveryViewDrawsTheSameCellsInTheWindowAsInTheTerminal(string name, string hostChrome) { var view = name == "(default)" ? null : name; var chrome = ChromeFor(hostChrome); @@ -83,7 +88,7 @@ public async Task EveryViewDrawsTheSameCellsInTheWindowAsInTheTerminal(string na [MethodDataSource(nameof(Views))] public async Task EveryViewDrawsTheSameCellsWhenTheWindowsLoopIsRunning(string name) { - var chrome = HostChrome.HeaderAndRail; + var chrome = HostChrome.Native; var view = name == "(default)" ? null : name; if (view is "timestamps" or "timestamps-toggled") { diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativeChromeTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativeChromeTests.cs index 62104f46..492b511d 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/NativeChromeTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/NativeChromeTests.cs @@ -377,7 +377,7 @@ public async Task APressOnEmptyHeaderSpaceMovesTheWindowAndNeverReachesTheClient public async Task TheLiveClientDrawsNoChromeCellAndLaysThePanesOutAsATerminalToldTheSame(string view) { using var headless = new HeadlessConsoleDriver(120, 32); - await using var terminal = new SharpMUTermApp(DemoScene.Build(), ClientHost.Headless(headless, WindowOptions.Capabilities) with { Chrome = HostChrome.HeaderAndRail }); + await using var terminal = new SharpMUTermApp(DemoScene.Build(), ClientHost.Headless(headless, WindowOptions.Capabilities) with { Chrome = HostChrome.Native }); terminal.RenderSnapshot(view); using var driver = new AvaloniaConsoleDriver(120, 32); @@ -394,7 +394,7 @@ public async Task TheLiveClientDrawsNoChromeCellAndLaysThePanesOutAsATerminalTol var chrome = driver.Pointer.Chrome; await Assert.That(chrome).IsNotNull(); - await Assert.That(chrome!.Drawn).IsEqualTo(HostChrome.HeaderAndRail); + await Assert.That(chrome!.Drawn).IsEqualTo(HostChrome.Native); await Assert.That(chrome.Sidebar).IsEqualTo(window.BuildSidebar()); await Assert.That(window.LaidOutRows.Header).IsEqualTo(0); await Assert.That(Enumerable.Range(0, 32).Any(y => driver.Frame.RowText(y).Contains("muterm", StringComparison.Ordinal))).IsFalse() diff --git a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs index 23cbdcac..82559c3e 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs @@ -343,6 +343,27 @@ await Assert.That(Rows(palette.Session!.View(query))).IsEquivalentTo(Rows(drawn! covered.Add(SurfaceCatalog.TabOverflow); } + // The panes' tab strips and the scrolled-back band: each is handed the model the cells were titled or drawn from. + foreach (var view in new[] { "tabs", "scrollback-split" }) + { + using var driver = new AvaloniaConsoleDriver(140, 36); + await using var app = App(driver, DemoScene.Build()); + app.RenderSnapshot(view); + var panes = driver.Pointer.PaneChrome; + await Assert.That(panes).IsNotNull().Because($"{view}: the pane chrome was published"); + foreach (var strip in panes!.Strips) + { + await Assert.That(app.DrawnModel(SurfaceCatalog.TabStrip, strip.Model.PaneId)).IsEqualTo((object)strip.Model).Because($"{view}: tab-strip {strip.Model.PaneId}"); + covered.Add(SurfaceCatalog.TabStrip); + } + + foreach (var band in panes.Bands) + { + await Assert.That(app.DrawnModel(SurfaceCatalog.ScrollBand, band.Model.WindowId)).IsEqualTo((object)band.Model).Because($"{view}: scroll-band"); + covered.Add(SurfaceCatalog.ScrollBand); + } + } + var drawnNatively = SurfaceCatalog.All.Where(s => s.On(SurfaceHosts.Window).HasFlag(SurfaceDrawing.Native)).Select(s => s.Id); await Assert.That(covered).IsEquivalentTo(drawnNatively).Because("every surface the window draws natively has its model compared here"); } @@ -945,6 +966,27 @@ await SameModal("history view: scroll", "search-history", probed.Add(SurfaceCatalog.TabOverflow); + // A tab: the native click and the cell click on the same tab bring the same window forward in the same pane. + await Same("tab-strip: tab", "tabs", + (app, _) => + { + var strip = app.PaneChromePublished!.Strips.First(s => !s.Model.Focused && s.Model.Tabs.Count > 1); + app.ActivateOfferedStripTab(strip.Model.PaneId, strip.Model.Tabs.First(t => !t.Selected).WindowId); + }, + (app, _) => + { + var strip = app.BuildPaneChrome().Strips.First(s => !s.Model.Focused && s.Model.Tabs.Count > 1); + var window = strip.Model.Tabs.First(t => !t.Selected).WindowId; + app.SimulateTabStripClick(strip.Model.PaneId, app.CellTabColumn(strip.Model.PaneId, window), 0); + }); + probed.Add(SurfaceCatalog.TabStrip); + + // The band's Jump to latest ends where End does: the split closes and the pane follows its live tail again. + await Same("scroll-band: jump to latest", "scrollback-split", + (app, _) => app.ReturnFromOfferedBand(app.PaneChromePublished!.Bands.Single().Model.WindowId), + (app, _) => app.DispatchCommand(ScrollBandModel.LiveCommand)); + probed.Add(SurfaceCatalog.ScrollBand); + await Assert.That(probed).IsEquivalentTo(acting).Because("every native surface with actions has a probe here"); } @@ -1205,6 +1247,7 @@ private static string Outcome(SharpMUTermApp app) => string.Join( "map=" + app.MapDigest(), "rail=" + (app.BuildChromeOverlay().Sidebar.Collapsed ? "folded" : "open"), "floating=" + string.Join(",", app.FloatingPublished.Select(f => f.Model.WindowId)), + "split=" + string.Join(",", app.PaneWindows().Values.Where(app.IsScrollSplit)), "notice=" + app.LastNotice, "recent=" + string.Join(",", app.RecentCommandIds)); diff --git a/tests/SharpMUTerm.Client.Tests/SurfaceCatalogTests.cs b/tests/SharpMUTerm.Client.Tests/SurfaceCatalogTests.cs index 0f1e4f44..74f11121 100644 --- a/tests/SharpMUTerm.Client.Tests/SurfaceCatalogTests.cs +++ b/tests/SharpMUTerm.Client.Tests/SurfaceCatalogTests.cs @@ -73,7 +73,7 @@ public async Task PanelSurfacesAreKnownPanels() var panels = SurfaceCatalog.All.Where(s => s.Id is not (SurfaceCatalog.Header or SurfaceCatalog.Sidebar or SurfaceCatalog.Settings or SurfaceCatalog.LayoutsMenu or SurfaceCatalog.Palette or SurfaceCatalog.Prefix or SurfaceCatalog.RailStrip or SurfaceCatalog.Notice or SurfaceCatalog.Compose - or SurfaceCatalog.FloatingPanel or SurfaceCatalog.TabOverflow) + or SurfaceCatalog.FloatingPanel or SurfaceCatalog.TabOverflow or SurfaceCatalog.TabStrip or SurfaceCatalog.ScrollBand) && !SurfaceCatalog.Modals.Contains(s.Id)); foreach (var surface in panels) { diff --git a/tests/SharpMUTerm.Tui.Tests/NativeTabStripTests.cs b/tests/SharpMUTerm.Tui.Tests/NativeTabStripTests.cs new file mode 100644 index 00000000..98030196 --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/NativeTabStripTests.cs @@ -0,0 +1,159 @@ +using System.Drawing; +using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Client.Surfaces; +using SharpMUTerm.Graphics; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// A host that draws the panes' tab strips () is handed each strip as the model the cells' +/// titles are written from, the client paints each strip's row blank under it, and nothing moves: the pane rectangles, +/// and so what every world is told over NAWS, are the terminal's. Every gesture on a native strip, and on the native +/// scrolled-back band, ends in the method the cell gesture ends in, and only if the client offered it. +/// +/// Serialised: rendering a frame redirects the process-global Console.Out. +[NotInParallel] +public class NativeTabStripTests +{ + private const int Width = 120; + private const int Height = 32; + + private static readonly TerminalCapabilities Caps = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private sealed class PanePresenter : IPointerPresenter + { + public List Published { get; } = []; + + public List> Menus { get; } = []; + + public void Hover(PointerTarget target) + { + } + + public void ShowMenu(Point cell, IReadOnlyList items) => Menus.Add(items); + + public bool DrawsMenus => true; + + public void Scrollbars(IReadOnlyList bars) + { + } + + public void PaneChrome(PaneChromeOverlay chrome) => Published.Add(chrome); + } + + private static SharpMUTermApp App(HostChrome chrome, out string frame, string? view, IPointerPresenter? pointer = null) + { + Console.SetIn(TextReader.Null); + var host = ClientHost.Headless(new HeadlessConsoleDriver(Width, Height), Caps) with { Chrome = chrome, Pointer = pointer }; + var app = new SharpMUTermApp(DemoScene.Build(), host); + frame = app.RenderSnapshot(view); + app.RenderNextFrame(); + return app; + } + + [Test] + public async Task TheStripRowStaysAndNothingMoves() + { + await using var cells = App(HostChrome.HeaderAndRail, out _, "split"); + await using var native = App(HostChrome.Native, out _, "split"); + + await Assert.That(native.PaneOutputRects()).IsEquivalentTo(cells.PaneOutputRects()); + } + + [Test] + public async Task EachStripRowIsBlankWhereTheHostDrawsItAndTheModelIsWhatTheCellsWrote() + { + var pointer = new PanePresenter(); + await using var cellApp = App(HostChrome.HeaderAndRail, out var cellFrame, "tabs"); + await using var app = App(HostChrome.Native, out var frame, "tabs", pointer); + + var chrome = pointer.Published.Last(); + await Assert.That(chrome.Strips.Count).IsGreaterThanOrEqualTo(2).Because("one strip per pane of the split"); + var rows = FrameGrid.Decode(frame, Width, Height); + var cellRows = FrameGrid.Decode(cellFrame, Width, Height); + foreach (var strip in chrome.Strips) + { + await Assert.That((object)strip.Model).IsEqualTo(app.DrawnModel(SurfaceCatalog.TabStrip, strip.Model.PaneId)); + var row = rows[strip.Row.Y].Substring(strip.Row.X, strip.Row.Width); + await Assert.That(row.Trim()).IsEmpty().Because($"the strip of {strip.Model.PaneId} is the host's to draw"); + var first = strip.Model.Tabs[0].Name; + await Assert.That(cellRows[strip.Row.Y]).Contains(first[..Math.Min(4, first.Length)]).Because("the terminal still writes it"); + } + + await Assert.That(chrome.Strips.Count(s => s.Model.Focused)).IsEqualTo(1); + } + + [Test] + public async Task AHostThatDrawsNoStripsIsHandedNone() + { + var pointer = new PanePresenter(); + await using var app = App(HostChrome.HeaderAndRail, out _, "tabs", pointer); + await Assert.That(pointer.Published.Last().Strips).IsEmpty(); + } + + [Test] + public async Task ANativeTabClickBringsTheWindowForwardAndARefusedOneDoesNothing() + { + var pointer = new PanePresenter(); + await using var app = App(HostChrome.Native, out _, "tabs", pointer); + var strip = pointer.Published.Last().Strips.First(s => s.Model.Tabs.Count > 1 && !s.Model.Focused); + var other = strip.Model.Tabs.First(t => !t.Selected); + + await Assert.That(app.ActivateOfferedStripTab(strip.Model.PaneId, "no-such-window")).IsFalse(); + await Assert.That(app.ActivateOfferedStripTab(strip.Model.PaneId, other.WindowId)).IsTrue(); + await Assert.That(app.ActiveWindowId()).IsEqualTo(other.WindowId); + } + + [Test] + public async Task OnlyAClosableTabIsClosedAndARightClickShowsTheTabsMenu() + { + var pointer = new PanePresenter(); + await using var app = App(HostChrome.Native, out _, "tabs", pointer); + var strip = pointer.Published.Last().Strips.First(s => s.Model.Focused); + var main = strip.Model.Tabs.First(t => !t.Closable); + + await Assert.That(app.CloseOfferedStripTab(strip.Model.PaneId, main.WindowId)).IsFalse().Because("the main window has no close"); + await Assert.That(app.OpenTabMenu(strip.Model.PaneId, main.WindowId)).IsTrue(); + await Assert.That(pointer.Menus.Last().Any(i => i.Label == "Split right" || i.Label.StartsWith("Split", StringComparison.Ordinal))).IsTrue(); + } + + [Test] + public async Task APressOnAStripRowNeverReachesTheFrameworkThere() + { + var pointer = new PanePresenter(); + await using var app = App(HostChrome.Native, out _, "tabs", pointer); + var row = pointer.Published.Last().Strips[0].Row; + var frame = new List { MouseFlags.Button1Pressed }; + await Assert.That(app.TakesNativeStripPress(frame, new Point(row.X + 1, row.Y))).IsTrue(); + await Assert.That(frame).IsEquivalentTo(new[] { MouseFlags.ReportMousePosition }); + + var below = new List { MouseFlags.Button1Pressed }; + await Assert.That(app.TakesNativeStripPress(below, new Point(row.X + 1, row.Y + 2))).IsFalse(); + } + + [Test] + public async Task TheBandIsPublishedAndItsButtonEndsWhereEndDoes() + { + var pointer = new PanePresenter(); + await using var app = App(HostChrome.Native, out _, "scrollback-split", pointer); + var band = pointer.Published.Last().Bands.Single(); + await Assert.That((object)band.Model).IsEqualTo(app.DrawnModel(SurfaceCatalog.ScrollBand, band.Model.WindowId)); + await Assert.That(band.Model.RowsBack).IsGreaterThan(0); + await Assert.That(app.IsScrollSplit(band.Model.WindowId)).IsTrue(); + + await Assert.That(app.ReturnFromOfferedBand("no-such-window")).IsFalse(); + await Assert.That(app.ReturnFromOfferedBand(band.Model.WindowId)).IsTrue(); + await Assert.That(app.IsScrollSplit(band.Model.WindowId)).IsFalse(); + } + + [Test] + public async Task TheBandIsHandedToAHostThatDrawsNoStripsToo() + { + var pointer = new PanePresenter(); + await using var app = App(HostChrome.None, out _, "scrollback-split", pointer); + await Assert.That(pointer.Published.Last().Bands).Count().IsEqualTo(1); + await Assert.That(pointer.Published.Last().Strips).IsEmpty(); + } +} From a2308d7b07fa40f22155e8b83107adb69e7221f4 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 17:39:23 +0000 Subject: [PATCH 067/113] Wave 19 slice E: the window's floating surfaces in the mockup's language NativeTokens' Dark canon is the mockup's palette (card #171b24, raised #1d2333, a Well #10131a for inputs, Edge #2c3447, Focus #3a4f73, selected #1f3a3a, ink #d7deec/#9aa4b8, #0f1620 on the accent); Light and Solarized derive as before and every ink is still held to 4.5:1, the well included. ModalParts gains a sunk search box with a magnifier, mono key caps, an accent bar on the selected row and a footer band; the palette, search, history, help, layouts and script console use them. Toasts are rounded on a soft shadow with an inset severity bar; menus take the palette's row height, mono dim keys, and no white popup corners. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 3 + CLAUDE.md | 11 +- src/SharpMUTerm.Avalonia/HelpView.cs | 4 +- src/SharpMUTerm.Avalonia/HistoryView.cs | 4 +- src/SharpMUTerm.Avalonia/LayoutsView.cs | 2 +- src/SharpMUTerm.Avalonia/ModalParts.cs | 110 +++++++++++++++--- src/SharpMUTerm.Avalonia/NativeMenu.cs | 41 ++++++- src/SharpMUTerm.Avalonia/NativeTokens.cs | 69 +++++++---- src/SharpMUTerm.Avalonia/NoticeToasts.cs | 30 ++--- src/SharpMUTerm.Avalonia/PaletteOverlay.cs | 53 +++++---- src/SharpMUTerm.Avalonia/ScriptConsoleView.cs | 2 +- src/SharpMUTerm.Avalonia/SearchView.cs | 4 +- .../NativeTokenTests.cs | 6 +- 13 files changed, 251 insertions(+), 88 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 057cacdb..c6b1b947 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -356,6 +356,9 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Changed +- In the desktop window, ⌃P, the quit prompt, search, history, layouts, help, the script console, toasts and the + right-click menu now match the window's new look: blue-grey cards, search boxes sunk into the page with a magnifier, + keys drawn as small key caps, an accent bar on the selected row, and a footer band naming the keys. - The older-history page fits an 80×24 terminal: it sizes its page to the screen, keeps its keys on screen and no longer covers the command line. - Ctrl+F with older history says both counts on one line (`this window 3 of 39 · older 4 of 6,000`). Older matches say diff --git a/CLAUDE.md b/CLAUDE.md index fe6c9950..857aea99 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -2237,7 +2237,7 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] - **The window has one design language: `NativeTokens`** (Avalonia). Planes (card, raised, selected, scrim), edge and rule, inks (text, dim, header, accent, warn, notice, accent and key inks), radii `RadiusS/M/L` 4/8/12 and the type ramp `Small/Body/Title/Heading` 11/12/14/18 (`Miniature` 9 only for a theme card's preview). Derived - from the client's `Theme` the `ScreenTheme` way: a canonical Dark (`#1e1e25` card) and Light (white) set, the + from the client's `Theme` the `ScreenTheme` way: a canonical Dark (the mockup's: `#171b24` card) and Light (white) set, the theme background's hue shift added, every ink held to `TextFloor` 4.5:1 on each plane it is drawn on; the accent is the client's teal, never Fluent's blue. `Apply` sets the Fluent keys on a scope and `ApplySimple` the Simple theme's (menus). The settings window, list editor, package page, theme cards, menus, palette and @@ -2245,6 +2245,15 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] `SettingsForm.Theme`). `NativeTokenTests.NoViewWritesALiteralFontSizeOrColour` fails on a literal `FontSize =` number or `Color.Parse("#` anywhere in the window's assembly outside `NativeTokens.cs`; widen its allow-list only with a reason. A quiet line is the `Dim` ink, never an opacity (an opacity is not floor-checked). + - **The floating surfaces are the mockup's cards** (wave 19, `ux-mockups/Main.dc.html`). Dark's canon is the mockup's + palette: card `#171b24`, raised `#1d2333`, `Well` `#10131a` (the ground an input sits in), `Edge` `#2c3447`, `Focus` + `#3a4f73`, selected `#1f3a3a`, ink `#d7deec`/`#9aa4b8`, `#0f1620` on the accent. Every ⌃P and modal search box is sunk + (`ModalParts.Sunk`: the well, a rule turning to `Focus`, a magnifier); a key is a cap in the cells' mono + (`ModalParts.Chip`, `NativeTokens.KeyFace`); a selected row is the selected plane plus a `MarkWidth` accent bar on its + left (`ModalParts.Mark`); a modal's key line is a band on the card's foot in the well (`ModalParts.Footer`). Toasts are + rounded on `ShadowSmall` with the severity as an inset bar, still on the client's `NoticePalette` plane; menus take + the palette's row height, keys in the mono and the dim ink, and the popup's own window shows the card's plane in the + rounded corners where it cannot be transparent. - **The settings window is the palette's modal**: undecorated with its own title bar (title, ✕, Esc, drag to move), the tokens' card and edge, and a scrim over the main window (`SettingsPresenter.Scrim`; a press on it closes). Opened from the trigger builder (`SettingsForm.BesideOutput`) it is docked to the main window's right diff --git a/src/SharpMUTerm.Avalonia/HelpView.cs b/src/SharpMUTerm.Avalonia/HelpView.cs index 39b610bf..d1289d79 100644 --- a/src/SharpMUTerm.Avalonia/HelpView.cs +++ b/src/SharpMUTerm.Avalonia/HelpView.cs @@ -39,7 +39,7 @@ public HelpView(HelpSession session, NativeTokens colours, Action done) _colours = colours; _done = done; - _box = ModalParts.SearchBox("Search help: keys, slash commands, how-tos…", "Search help"); + _box = ModalParts.SearchBox("Search help: keys, slash commands, how-tos…", "Search help", colours); SetDock(_box, Dock.Top); Children.Add(_box); @@ -339,7 +339,7 @@ private void Highlight() { for (var i = 0; i < _rows.Count; i++) { - _rows[i].Background = i == _selected ? _colours.Brush(_colours.Selected) : Brushes.Transparent; + ModalParts.Mark(_rows[i], i == _selected, _colours); } if (_selected < _rows.Count) diff --git a/src/SharpMUTerm.Avalonia/HistoryView.cs b/src/SharpMUTerm.Avalonia/HistoryView.cs index eb8e2ba7..107df297 100644 --- a/src/SharpMUTerm.Avalonia/HistoryView.cs +++ b/src/SharpMUTerm.Avalonia/HistoryView.cs @@ -34,7 +34,7 @@ public HistoryView(HistorySession session, NativeTokens colours, Action done) _done = done; var model = session.Model; - _box = ModalParts.SearchBox("Filter the history…", "Filter the history"); + _box = ModalParts.SearchBox("Filter the history…", "Filter the history", colours); SetDock(_box, Dock.Top); Children.Add(_box); @@ -152,7 +152,7 @@ private void Highlight() { for (var i = 0; i < _rows.Count; i++) { - _rows[i].Background = i == _selected ? _colours.Brush(_colours.Selected) : Brushes.Transparent; + ModalParts.Mark(_rows[i], i == _selected, _colours); } if (_selected < _rows.Count) diff --git a/src/SharpMUTerm.Avalonia/LayoutsView.cs b/src/SharpMUTerm.Avalonia/LayoutsView.cs index ffa400cd..0eeebdb7 100644 --- a/src/SharpMUTerm.Avalonia/LayoutsView.cs +++ b/src/SharpMUTerm.Avalonia/LayoutsView.cs @@ -308,7 +308,7 @@ private void Highlight() for (var i = 0; i < _rows.Count; i++) { var mine = _rowIndex[i] == _selected; - _rows[i].Background = mine ? _colours.Brush(_colours.Selected) : Brushes.Transparent; + ModalParts.Mark(_rows[i], mine, _colours); if (mine) { _rows[i].BringIntoView(); diff --git a/src/SharpMUTerm.Avalonia/ModalParts.cs b/src/SharpMUTerm.Avalonia/ModalParts.cs index b523c738..5adeb142 100644 --- a/src/SharpMUTerm.Avalonia/ModalParts.cs +++ b/src/SharpMUTerm.Avalonia/ModalParts.cs @@ -17,7 +17,7 @@ internal static class ModalParts FontSize = NativeTokens.Heading, FontWeight = FontWeight.SemiBold, Foreground = colours.Brush(colours.Text), - Margin = new Thickness(20, 16, 20, 4), + Margin = new Thickness(20, 18, 20, 4), TextWrapping = TextWrapping.Wrap, }; @@ -31,14 +31,20 @@ internal static class ModalParts TextWrapping = TextWrapping.Wrap, }; - /// The keys the modal answers, right-aligned under it, in the window's words. + /// + /// The keys the modal answers, in the window's words, on a band along the card's foot — the mockup's footer: the + /// ground the card's inputs sit in, ruled off above, the keys right-aligned on it. + /// public static TextBlock Footer(string text, NativeTokens colours) => new() { Text = NativeKeys.Words(text), FontSize = NativeTokens.Small, Foreground = colours.Brush(colours.Dim), - Margin = new Thickness(20, 8, 20, 12), - HorizontalAlignment = HorizontalAlignment.Right, + Background = colours.Brush(colours.Well), + Padding = new Thickness(20, 9, 20, 10), + Margin = new Thickness(0, 10, 0, 0), + HorizontalAlignment = HorizontalAlignment.Stretch, + TextAlignment = TextAlignment.Right, TextWrapping = TextWrapping.Wrap, }; @@ -53,21 +59,67 @@ internal static class ModalParts Margin = new Thickness(12, first ? 8 : 14, 12, 4), }; - /// A search box, the palette's. - public static TextBox SearchBox(string placeholder, string name) + /// + /// A search box, the palette's: the mockup's header search — sunk into the ground the page sits on, a rule for its + /// edge that turns to the focused edge while it has the keyboard, a magnifier before the text. + /// + public static TextBox SearchBox(string placeholder, string name, NativeTokens? colours = null) { var box = new TextBox { PlaceholderText = placeholder, FontSize = NativeTokens.Title, - Margin = new Thickness(14, 14, 14, 6), - Padding = new Thickness(12, 8), + Margin = new Thickness(14, 14, 14, 8), + Padding = new Thickness(8, 9, 12, 9), CornerRadius = new CornerRadius(NativeTokens.RadiusM), }; + if (colours is not null) + { + Sunk(box, colours); + } + global::Avalonia.Automation.AutomationProperties.SetName(box, name); return box; } + /// + /// Sinks into the ground (), its edge a rule that becomes + /// while it has the keyboard, with a magnifier before the text when + /// . + /// + public static void Sunk(TextBox box, NativeTokens colours, bool magnifier = true) + { + var well = colours.Brush(colours.Well); + foreach (var key in new[] { "TextControlBackground", "TextControlBackgroundPointerOver", "TextControlBackgroundFocused" }) + { + box.Resources[key] = well; + } + + box.Resources["TextControlBorderBrush"] = colours.Brush(colours.Edge); + box.Resources["TextControlBorderBrushPointerOver"] = colours.Brush(colours.Focus); + box.Resources["TextControlBorderBrushFocused"] = colours.Brush(colours.Focus); + box.Resources["TextControlBorderThemeThicknessFocused"] = new Thickness(1); + if (magnifier) + { + box.InnerLeftContent = Magnifier(colours); + } + } + + /// The magnifier the mockup draws in its search box, in the quiet ink. + public static Control Magnifier(NativeTokens colours) => new global::Avalonia.Controls.Shapes.Path + { + Data = Geometry.Parse("M 6.5 1 A 5.5 5.5 0 1 1 6.5 12 A 5.5 5.5 0 1 1 6.5 1 Z M 10.5 10.5 L 14 14"), + Stroke = colours.Brush(colours.Dim), + StrokeThickness = 1.6, + StrokeLineCap = PenLineCap.Round, + Width = 15, + Height = 15, + Stretch = Stretch.None, + Margin = new Thickness(12, 0, 2, 0), + VerticalAlignment = VerticalAlignment.Center, + IsHitTestVisible = false, + }; + /// A list of rows that scrolls, ruled above and below. public static (Border Frame, StackPanel List, ScrollViewer Scroller) List(NativeTokens colours) { @@ -93,8 +145,10 @@ public static Border Row(Control content, string name, Action select, Action cho var row = new Border { CornerRadius = new CornerRadius(NativeTokens.RadiusM), - Padding = new Thickness(12, 6), + Padding = new Thickness(12 - NativeTokens.MarkWidth, 7, 12, 7), Background = Brushes.Transparent, + BorderBrush = Brushes.Transparent, + BorderThickness = new Thickness(NativeTokens.MarkWidth, 0, 0, 0), Child = content, Cursor = new Cursor(StandardCursorType.Hand), }; @@ -140,18 +194,44 @@ public static InlineCollection Marked(string text, int start, int length, Native } /// A key chip, as the palette draws a key. - public static Border Key(string key, NativeTokens colours) => new() + public static Border Key(string key, NativeTokens colours) => Chip(NativeKeys.Words(key), colours, new Thickness(6, 0, 0, 0)); + + /// + /// One key cap: the raised plane, a rule for its edge, the key in the cells' mono at the small size — the mockup's + /// Alt+1 given a cap. Every native list (⌃P, help, the modals) draws a key with this. + /// + public static Border Chip(string words, NativeTokens colours, Thickness margin = default) => new() { Background = colours.Brush(colours.KeyFill), BorderBrush = colours.Brush(colours.Edge), BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(NativeTokens.RadiusS), - Padding = new Thickness(6, 0), - Margin = new Thickness(6, 0, 0, 0), + Padding = new Thickness(6, 1, 6, 2), + Margin = margin, + MinWidth = 22, VerticalAlignment = VerticalAlignment.Center, - Child = new TextBlock { Text = NativeKeys.Words(key), FontSize = NativeTokens.Small, Foreground = colours.Brush(colours.KeyInk) }, + Child = new TextBlock + { + Text = words, + FontFamily = NativeTokens.KeyFace, + FontSize = NativeTokens.Small, + Foreground = colours.Brush(colours.KeyInk), + HorizontalAlignment = HorizontalAlignment.Center, + }, }; + /// + /// Paints selected or not: the selected row's plane, and the accent bar down its left edge + /// that the mockup's selected navigation wears — so the selection reads at a glance on every theme, not only by a + /// step in luminance. + /// + public static void Mark(Border row, bool selected, NativeTokens colours) + { + row.Background = selected ? colours.Brush(colours.Selected) : Brushes.Transparent; + row.BorderBrush = selected ? colours.Brush(colours.Accent) : Brushes.Transparent; + row.BorderThickness = new Thickness(NativeTokens.MarkWidth, 0, 0, 0); + } + /// A button whose label is followed by the key that presses it. public static Button Button(string label, string? key, NativeTokens colours, Action click, bool accent = false) { @@ -172,8 +252,10 @@ public static Button Button(string label, string? key, NativeTokens colours, Act var button = new Button { Content = content, - Padding = new Thickness(14, 6), + Padding = new Thickness(14, 7), + MinHeight = 32, CornerRadius = new CornerRadius(NativeTokens.RadiusM), + FontWeight = accent ? FontWeight.SemiBold : FontWeight.Normal, }; if (accent) { diff --git a/src/SharpMUTerm.Avalonia/NativeMenu.cs b/src/SharpMUTerm.Avalonia/NativeMenu.cs index b85cfafc..8b4be696 100644 --- a/src/SharpMUTerm.Avalonia/NativeMenu.cs +++ b/src/SharpMUTerm.Avalonia/NativeMenu.cs @@ -51,20 +51,41 @@ private static ContextMenu Build( BorderBrush = tokens.Brush(tokens.Edge), BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(NativeTokens.RadiusM), - Padding = new Thickness(4), + Padding = new Thickness(6), FontSize = NativeTokens.Body, }; tokens.ApplySimple(menu.Resources); + + // The highlighted entry is the palette's selected row, a plane; Simple outlines it in its accent too, which on a + // menu reads as a second, louder selection. + menu.Resources["ThemeAccentBrush"] = tokens.Brush(tokens.Selected); + + // The popup's own window shows in the menu's rounded corners: clear where the platform composites it, else the + // card's own plane, so a corner is never the popup's default white. + menu.Opened += (_, _) => + { + if (TopLevel.GetTopLevel(menu) is { } root and not Window) + { + root.TransparencyLevelHint = [WindowTransparencyLevel.Transparent]; + root.Background = root.ActualTransparencyLevel == WindowTransparencyLevel.Transparent ? null : tokens.Brush(tokens.Card); + } + }; Grid.SetIsSharedSizeScope(menu, true); foreach (var item in items) { if (item is not { } entry) { - menu.Items.Add(new Separator()); + menu.Items.Add(new Separator { Background = tokens.Brush(tokens.Rule), Margin = new Thickness(8, 4) }); continue; } - var menuItem = new MenuItem { Header = Header(entry.Label, entry.Hint), IsEnabled = entry.Enabled }; + // The palette's row: the same height and inset, so a menu and ⌃P read as one list. + var menuItem = new MenuItem + { + Header = Header(entry.Label, entry.Hint, tokens), + IsEnabled = entry.Enabled, + MinHeight = 30, + }; if (entry.Checked) { menuItem.ToggleType = MenuItemToggleType.CheckBox; @@ -80,7 +101,7 @@ private static ContextMenu Build( } /// An entry's label with its key after it, the keys lined up in a column of their own, both in the window's words. - private static Control Header(string label, string? hint) + private static Control Header(string label, string? hint, NativeTokens tokens) { var grid = new Grid(); grid.ColumnDefinitions.Add(new ColumnDefinition(GridLength.Auto) { SharedSizeGroup = "label" }); @@ -88,7 +109,17 @@ private static Control Header(string label, string? hint) grid.Children.Add(new TextBlock { Text = NativeKeys.Words(label), VerticalAlignment = VerticalAlignment.Center }); if (hint is { } key) { - var text = new TextBlock { Text = NativeKeys.Words(key), Opacity = 0.7, Margin = new Thickness(28, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center }; + // The key in the quiet ink and the keys' face, as the mockup's rail spells Alt+1 — an ink held to the floor, + // never an opacity. + var text = new TextBlock + { + Text = NativeKeys.Words(key), + FontFamily = NativeTokens.KeyFace, + FontSize = NativeTokens.Small, + Foreground = tokens.Brush(tokens.Dim), + Margin = new Thickness(32, 0, 0, 0), + VerticalAlignment = VerticalAlignment.Center, + }; Grid.SetColumn(text, 1); grid.Children.Add(text); } diff --git a/src/SharpMUTerm.Avalonia/NativeTokens.cs b/src/SharpMUTerm.Avalonia/NativeTokens.cs index 8c8bb89f..820b1d18 100644 --- a/src/SharpMUTerm.Avalonia/NativeTokens.cs +++ b/src/SharpMUTerm.Avalonia/NativeTokens.cs @@ -40,7 +40,9 @@ internal sealed record NativeTokens( Color KeyFill, Color KeyInk, Color Warn, - Color Notice) + Color Notice, + Color Well, + Color Focus) { // ── the scales ────────────────────────────────────────────────────────────────────────────── @@ -74,14 +76,28 @@ internal sealed record NativeTokens( /// The floor every ink is held to on every plane it is drawn on: WCAG AA for body text. public const double TextFloor = 4.5; - /// The shadow a surface casts on what it floats over. + /// The shadow a surface casts on what it floats over: the palette, a modal. public static BoxShadows Shadow { get; } = new(new BoxShadow { - OffsetY = 16, - Blur = 40, - Color = Color.FromArgb(0x66, 0, 0, 0), + OffsetY = 18, + Blur = 48, + Color = Color.FromArgb(0x80, 0, 0, 0), }); + /// The smaller shadow a toast or a menu casts: it floats, but over the page rather than over a scrim. + public static BoxShadows ShadowSmall { get; } = new(new BoxShadow + { + OffsetY = 6, + Blur = 18, + Color = Color.FromArgb(0x59, 0, 0, 0), + }); + + /// The thickness of the accent bar a selected row and a toast's severity wear on their left. + public const double MarkWidth = 3; + + /// The face keys are spelt in on a chip, as the mockup's rail spells Alt+1: the cells' bundled mono. + public static FontFamily KeyFace { get; } = new($"{CellFonts.BundledFamily}, DejaVu Sans Mono, Consolas, Menlo, monospace"); + /// The raised plane an input, a key cap or a hovered row sits on. public Color Raised => KeyFill; @@ -113,7 +129,8 @@ public static NativeTokens For(Theme theme) var rule = Shift(canon.Rule, shift); var selected = Shift(canon.Selected, shift); var keyFill = Shift(canon.KeyFill, shift); - Rgb[] planes = [card, selected, keyFill]; + var well = Shift(canon.Well, shift); + Rgb[] planes = [card, selected, keyFill, well]; var accent = Held(ChromeInk.BaseAccent, planes); var accentInk = Contrast.Legible( @@ -134,7 +151,9 @@ public static NativeTokens For(Theme theme) Colour(keyFill), Colour(Held(canon.KeyInk, [keyFill])), Colour(Held(canon.Warn, planes)), - Colour(Held(ChromeInk.BaseNotice, planes))); + Colour(Held(ChromeInk.BaseNotice, planes)), + Colour(well), + Colour(Shift(canon.Focus, shift))); } /// A brush of . @@ -251,22 +270,28 @@ public void ApplySimple(IResourceDictionary resources) /// One side of mid-grey's set, before a theme is laid onto it. private sealed record Canon( Color Scrim, Rgb Card, Rgb Edge, Rgb Rule, Rgb Text, Rgb Dim, Rgb Header, Rgb Selected, Rgb AccentInk, Rgb KeyFill, - Rgb KeyInk, Rgb Warn); + Rgb KeyInk, Rgb Warn, Rgb Well, Rgb Focus); - /// The palette's dark card, as it was drawn before there were tokens. + /// + /// The dark set: the mockup's (ux-mockups/Main.dc.html) — panels #171b24, raised #1d2333, the + /// ground an input sits in #10131a, rules #2c3447 and a focused edge #3a4f73, ink #d7deec + /// over #9aa4b8, the selected row's #1f3a3a, and #0f1620 on the accent. + /// private static readonly Canon DarkCanon = new( Color.FromArgb(0x73, 0, 0, 0), - new Rgb(0x1e, 0x1e, 0x25), - new Rgb(0x3a, 0x3a, 0x46), - new Rgb(0x2c, 0x2c, 0x36), - new Rgb(0xec, 0xec, 0xf1), - new Rgb(0x9a, 0x9a, 0xab), - new Rgb(0x80, 0x80, 0x8f), - new Rgb(0x22, 0x40, 0x3a), - new Rgb(0x06, 0x23, 0x1b), - new Rgb(0x2a, 0x2a, 0x34), - new Rgb(0xcf, 0xcf, 0xdb), - new Rgb(0xff, 0xb4, 0x54)); + new Rgb(0x17, 0x1b, 0x24), + new Rgb(0x2c, 0x34, 0x47), + new Rgb(0x26, 0x2d, 0x3d), + new Rgb(0xd7, 0xde, 0xec), + new Rgb(0x9a, 0xa4, 0xb8), + new Rgb(0x8f, 0x99, 0xad), + new Rgb(0x1f, 0x3a, 0x3a), + new Rgb(0x0f, 0x16, 0x20), + new Rgb(0x1d, 0x23, 0x33), + new Rgb(0xc8, 0xd0, 0xe0), + new Rgb(0xff, 0xb4, 0x54), + new Rgb(0x10, 0x13, 0x1a), + new Rgb(0x3a, 0x4f, 0x73)); /// The palette's light card. private static readonly Canon LightCanon = new( @@ -281,7 +306,9 @@ private sealed record Canon( new Rgb(0xff, 0xff, 0xff), new Rgb(0xf1, 0xf1, 0xf5), new Rgb(0x40, 0x40, 0x4c), - new Rgb(0xa3, 0x4a, 0x00)); + new Rgb(0xa3, 0x4a, 0x00), + new Rgb(0xf6, 0xf7, 0xfa), + new Rgb(0xa9, 0xb3, 0xc6)); /// An ink moved, if it must be, until it clears on every plane given. private static Rgb Held(Rgb ink, IReadOnlyList planes) diff --git a/src/SharpMUTerm.Avalonia/NoticeToasts.cs b/src/SharpMUTerm.Avalonia/NoticeToasts.cs index db55155b..f08b1981 100644 --- a/src/SharpMUTerm.Avalonia/NoticeToasts.cs +++ b/src/SharpMUTerm.Avalonia/NoticeToasts.cs @@ -39,7 +39,9 @@ internal sealed class NoticeToasts : Control /// How long a toast stays after the pointer leaves it. internal static readonly TimeSpan HoverGrace = TimeSpan.FromSeconds(2); - private const double Inset = 12, Gap = 8, Padding = 10, EdgeWidth = 4, CardWidth = 380, TextSize = 13, ChipSize = 11; + // The severity is a bar inset from the card's left edge (the mockup's pill mark, as a highlighted line wears it), so the + // text starts past the bar and its margin: EdgeWidth is that whole lead, BarInset where the bar starts. + private const double Inset = 12, Gap = 8, Padding = 12, EdgeWidth = 10, BarInset = 7, CardWidth = 380, TextSize = 13, ChipSize = 11; private readonly List _toasts = []; private readonly Stopwatch _clock = Stopwatch.StartNew(); @@ -424,19 +426,19 @@ public override void Render(DrawingContext context) var edge = PanelText.Parse(palette.Edge(toast.Overlay.Notice.Severity)); using var _ = context.PushOpacity(FadeOf(toast, now)); - // A soft shadow, the card, and the severity edge down its left side. - context.DrawRectangle(new SolidColorBrush(Color.FromArgb(0x50, 0, 0, 0)), null, rect.Translate(new Vector(0, 2)).Inflate(1), 7, 7); + // The card on a soft shadow (NativeTokens' small one: it floats over the page, not over a scrim), a rule for + // its edge, and the severity as a rounded bar down its left side. var lift = toast == hovered ? 0.08 : 0; + var card = new RoundedRect(rect, NativeTokens.RadiusM); context.DrawRectangle( - new SolidColorBrush(Mix(plane, PanelText.Parse(palette.Text), lift)), - new Pen(new SolidColorBrush(Color.FromArgb(0x60, edge.R, edge.G, edge.B)), 1), - rect, - 6, - 6); - using (context.PushClip(new RoundedRect(rect, 6))) - { - context.FillRectangle(new SolidColorBrush(edge), new Rect(rect.X, rect.Y, EdgeWidth, rect.Height)); - } + new SolidColorBrush(Mix(plane, PanelText.Parse(palette.Text), lift + 0.03)), + new Pen(new SolidColorBrush(Mix(plane, PanelText.Parse(palette.Text), 0.16)), 1), + card, + NativeTokens.ShadowSmall); + context.DrawRectangle( + new SolidColorBrush(edge), + null, + new RoundedRect(new Rect(rect.X + BarInset, rect.Y + 9, NativeTokens.MarkWidth, Math.Max(4, rect.Height - 18)), NativeTokens.MarkWidth / 2)); var x = rect.X + EdgeWidth + Padding; var y = rect.Y + Padding; @@ -449,8 +451,8 @@ public override void Render(DrawingContext context) if (chip is not null) { - var chipRect = new Rect(x - 3, y + 1, chip.Width + 6, chip.Height); - context.DrawRectangle(new SolidColorBrush(Color.FromArgb(0x30, edge.R, edge.G, edge.B)), null, chipRect, 3, 3); + var chipRect = new Rect(x - 4, y, chip.Width + 8, chip.Height + 2); + context.DrawRectangle(new SolidColorBrush(Color.FromArgb(0x30, edge.R, edge.G, edge.B)), null, chipRect, NativeTokens.RadiusS, NativeTokens.RadiusS); context.DrawText(chip, new Point(x, y + 1)); x += chip.Width + 8; } diff --git a/src/SharpMUTerm.Avalonia/PaletteOverlay.cs b/src/SharpMUTerm.Avalonia/PaletteOverlay.cs index 4b039bb0..b0c16394 100644 --- a/src/SharpMUTerm.Avalonia/PaletteOverlay.cs +++ b/src/SharpMUTerm.Avalonia/PaletteOverlay.cs @@ -70,10 +70,11 @@ public PaletteOverlay(PaletteSession session, Action remove) { PlaceholderText = Placeholder, FontSize = NativeTokens.Title, - Margin = new Thickness(14, 14, 14, 6), - Padding = new Thickness(12, 9), + Margin = new Thickness(14, 14, 14, 8), + Padding = new Thickness(8, 10, 12, 10), CornerRadius = new CornerRadius(NativeTokens.RadiusM), }; + ModalParts.Sunk(_search, _colours); AutomationProperties.SetName(_search, "Command palette"); _search.TextChanged += (_, _) => Refresh(resetSelection: true); DockPanel.SetDock(_search, Dock.Top); @@ -82,17 +83,30 @@ public PaletteOverlay(PaletteSession session, Action remove) { FontSize = NativeTokens.Body, Foreground = new SolidColorBrush(_colours.Dim), - Margin = new Thickness(20, 0, 20, 6), + Margin = new Thickness(22, 0, 22, 8), }; DockPanel.SetDock(_status, Dock.Top); - var footer = new TextBlock + // The keys as caps on the card's foot band, the mockup's footer. + var keys = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 6, HorizontalAlignment = HorizontalAlignment.Right }; + foreach (var (cap, does) in new[] { ("↑↓", "move"), ("Enter", "run"), ("Esc", "close") }) { - Text = "↑↓ move Enter run Esc close", - FontSize = NativeTokens.Small, - Foreground = new SolidColorBrush(_colours.Dim), - Margin = new Thickness(20, 6, 20, 10), - HorizontalAlignment = HorizontalAlignment.Right, + keys.Children.Add(ModalParts.Chip(cap, _colours)); + keys.Children.Add(new TextBlock + { + Text = does, + FontSize = NativeTokens.Small, + Foreground = new SolidColorBrush(_colours.Dim), + Margin = new Thickness(0, 0, 8, 0), + VerticalAlignment = VerticalAlignment.Center, + }); + } + + var footer = new Border + { + Background = new SolidColorBrush(_colours.Well), + Padding = new Thickness(20, 8, 12, 8), + Child = keys, }; DockPanel.SetDock(footer, Dock.Bottom); @@ -110,7 +124,7 @@ public PaletteOverlay(PaletteSession session, Action remove) dock.Children.Add(footer); dock.Children.Add(new Border { - BorderBrush = new SolidColorBrush(_colours.Rule), + BorderBrush = new SolidColorBrush(_colours.Edge), BorderThickness = new Thickness(0, 1, 0, 1), Child = _scroller, }); @@ -314,16 +328,7 @@ private Border EntryRow(PaletteEntry entry, string? key, int index) var chips = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 4, Margin = new Thickness(16, 0, 0, 0) }; foreach (var part in key.Split(' ', StringSplitOptions.RemoveEmptyEntries)) { - chips.Children.Add(new Border - { - Background = new SolidColorBrush(_colours.KeyFill), - BorderBrush = new SolidColorBrush(_colours.Edge), - BorderThickness = new Thickness(1), - CornerRadius = new CornerRadius(NativeTokens.RadiusS), - Padding = new Thickness(7, 1), - VerticalAlignment = VerticalAlignment.Center, - Child = new TextBlock { Text = part, FontSize = NativeTokens.Body, Foreground = new SolidColorBrush(_colours.KeyInk) }, - }); + chips.Children.Add(ModalParts.Chip(part, _colours)); } Grid.SetColumn(chips, 1); @@ -333,8 +338,10 @@ private Border EntryRow(PaletteEntry entry, string? key, int index) var row = new Border { CornerRadius = new CornerRadius(NativeTokens.RadiusM), - Padding = new Thickness(12, 7), + Padding = new Thickness(12 - NativeTokens.MarkWidth, 7, 12, 7), Background = Brushes.Transparent, + BorderBrush = Brushes.Transparent, + BorderThickness = new Thickness(NativeTokens.MarkWidth, 0, 0, 0), Child = grid, Cursor = new Cursor(StandardCursorType.Hand), }; @@ -395,14 +402,14 @@ private void Select(int index, bool reveal) if (_selected >= 0 && _selected < _entryRows.Count) { - _entryRows[_selected].Background = Brushes.Transparent; + ModalParts.Mark(_entryRows[_selected], false, _colours); } _selected = index; if (index >= 0 && index < _entryRows.Count) { var row = _entryRows[index]; - row.Background = new SolidColorBrush(_colours.Selected); + ModalParts.Mark(row, true, _colours); if (reveal) { row.BringIntoView(); diff --git a/src/SharpMUTerm.Avalonia/ScriptConsoleView.cs b/src/SharpMUTerm.Avalonia/ScriptConsoleView.cs index bdcb410d..9c501f96 100644 --- a/src/SharpMUTerm.Avalonia/ScriptConsoleView.cs +++ b/src/SharpMUTerm.Avalonia/ScriptConsoleView.cs @@ -303,7 +303,7 @@ private void Highlight() { for (var i = 0; i < _storeRows.Count; i++) { - _storeRows[i].Background = i == _selectedKey ? _colours.Brush(_colours.Selected) : Brushes.Transparent; + ModalParts.Mark(_storeRows[i], i == _selectedKey, _colours); } _delete.IsEnabled = SelectedKey is not null; diff --git a/src/SharpMUTerm.Avalonia/SearchView.cs b/src/SharpMUTerm.Avalonia/SearchView.cs index 8cacff78..97368846 100644 --- a/src/SharpMUTerm.Avalonia/SearchView.cs +++ b/src/SharpMUTerm.Avalonia/SearchView.cs @@ -43,7 +43,7 @@ public SearchView(SearchSession session, NativeTokens colours, Action done) _done = done; _model = session.Model; - _box = ModalParts.SearchBox("Search the output…", "Search"); + _box = ModalParts.SearchBox("Search the output…", "Search", colours); _box.Text = _model.Query; SetDock(_box, Dock.Top); Children.Add(_box); @@ -310,7 +310,7 @@ private void Highlight() { for (var i = 0; i < _rows.Count; i++) { - _rows[i].Background = i == _selected ? _colours.Brush(_colours.Selected) : Brushes.Transparent; + ModalParts.Mark(_rows[i], i == _selected, _colours); } if (_selected < _rows.Count) diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativeTokenTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativeTokenTests.cs index 9a577b8d..fa0d43b2 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/NativeTokenTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/NativeTokenTests.cs @@ -66,7 +66,9 @@ public async Task NoViewWritesALiteralFontSizeOrColour() [Test] public async Task TheDarkAndLightThemesResolveToThePalettesOwnCards() { - await Assert.That(NativeTokens.Dark.Card).IsEqualTo(Color.Parse("#1e1e25")); + await Assert.That(NativeTokens.Dark.Card).IsEqualTo(Color.Parse("#171b24")).Because("the mockup's panel plane"); + await Assert.That(NativeTokens.Dark.Well).IsEqualTo(Color.Parse("#10131a")).Because("the mockup's ground, which its inputs sit in"); + await Assert.That(NativeTokens.Dark.Selected).IsEqualTo(Color.Parse("#1f3a3a")).Because("the mockup's selected row"); await Assert.That(NativeTokens.Dark.Accent).IsEqualTo(Color.Parse("#00f5b7")).Because("the client's own teal, already legible on a dark card"); await Assert.That(NativeTokens.Light.Card).IsEqualTo(Colors.White); await Assert.That(NativeTokens.Dark.IsDark).IsTrue(); @@ -88,7 +90,7 @@ public async Task SolarizedGetsItsOwnHueNotTheDarkThemesGrey() public async Task EveryInkClearsTheTextFloorOnEveryPlaneItIsDrawnOn(string name) { var tokens = NativeTokens.For(ThemeLibrary.Get(name)); - Color[] planes = [tokens.Card, tokens.Selected, tokens.Raised]; + Color[] planes = [tokens.Card, tokens.Selected, tokens.Raised, tokens.Well]; var misses = new List(); foreach (var (ink, label) in new[] { From 3f4811b52e54d29b85fe5a1f87a7a5e41abf670e Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 17:47:26 +0000 Subject: [PATCH 068/113] Wave 19 terminal audit: modal padding, freeze bar width, header brand, welcome band, notice and label duplicates, script gutter ink A sweep of every snapshot view at 80x24 and 120x32, Dark and Light: - a notice that already names its key no longer gets a second copy of it - the map edit label no longer says "Map: map:" - Browse worlds' failure text no longer repeats itself - the script editor's line numbers clear the floor on Light - the FROZEN bar's rule runs to the pane's edge, redrawn on resize - the import review stays above the command line at 80x24 - cell modals keep one cell between the frame and the words - the welcome's choice is a band across the list - the header spells SharpMUTerm where it fits, muterm where it does not Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 7 ++ CLAUDE.md | 8 +++ src/SharpMUTerm.Tui/ComposeOverlay.cs | 4 ++ src/SharpMUTerm.Tui/FreezeBarRenderer.cs | 15 +++- src/SharpMUTerm.Tui/GameDataOverlay.cs | 5 +- src/SharpMUTerm.Tui/HistorySurface.cs | 3 +- src/SharpMUTerm.Tui/ListOverlay.cs | 6 +- src/SharpMUTerm.Tui/MessageLogOverlay.cs | 5 +- .../Pointer/SharpMUTermApp.Notices.cs | 14 +++- src/SharpMUTerm.Tui/PrefixOverlay.cs | 1 + src/SharpMUTerm.Tui/QuitOverlay.cs | 1 + src/SharpMUTerm.Tui/SearchSurface.cs | 3 +- .../SharpMUTermApp.ChromeBars.cs | 12 ++++ src/SharpMUTerm.Tui/SharpMUTermApp.MapEdit.cs | 2 +- src/SharpMUTerm.Tui/SharpMUTermApp.Theme.cs | 5 ++ .../SharpMUTermApp.WorldBrowse.cs | 2 +- src/SharpMUTerm.Tui/SharpMUTermApp.cs | 36 ++++++++-- src/SharpMUTerm.Tui/WelcomeSurface.cs | 5 +- tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs | 3 +- .../HostChromeLayoutTests.cs | 4 +- .../TerminalAuditWave19Tests.cs | 69 +++++++++++++++++++ 21 files changed, 186 insertions(+), 24 deletions(-) create mode 100644 tests/SharpMUTerm.Tui.Tests/TerminalAuditWave19Tests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 057cacdb..8d4bfa61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -454,6 +454,13 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Fixed +- Terminal polish from a sweep of every screen at 80×24 and 120×32: the header's brand reads `SharpMUTerm` where the row + has room; the welcome's chosen row is a band across the list; pop-ups keep a cell between their frame and their words; + a tall pop-up (the import review at 80×24) no longer covers the command line; the `❄ FROZEN` bar's rule runs to the + pane's edge instead of vanishing in a narrow pane or stopping short in a wide one; the script editor's line numbers are + legible on the Light theme; and the status row no longer says a key twice (`⌥R … connects it · ⌥R Reconnect`) or a + label twice (`Map: map: …`). + - The command palette no longer covers the command line on an 80×24 terminal. - A tab squeezed by a crowded strip keeps at least three letters of its name. - The build no longer warns about an ImageSharp advisory in a decoder SharpMUTerm never uses. diff --git a/CLAUDE.md b/CLAUDE.md index fe6c9950..519eea7e 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -688,6 +688,14 @@ fallbacks) for inline images/maps. hints share one painted row — add a view there when it gains a key row. Settings screen headers go through it too (`ScreenChrome.Hints(…, room)`, `HeaderRoom`): `{F}/Esc close` and an edit's ⏎/Esc are `Keep`, the pane and select keys go first; `FooterFitTests.SettingsHeaders` fails on a `…` in any F2–F10 header at 80×24. +- **Wave 19's terminal sweep** (every `SnapshotViews.All` view at 80×24 and 120×32, Dark and Light; `TerminalAuditWave19Tests`). + Cell pop-ups take `WithPadding(1, 0, 0, 0)` (ListOverlay, quit, ⌃B, ⌃F, ⌃R, game data, messages; not ⌃P, whose `├` + headings join the frame): each already laid its lines out a cell or two narrower than its inside, so the padding spends + that slack, and ⌃F/⌃R grew one column where they had none. A `ListOverlay` with pinned keys (`footer:`) is at most `desktop − 4` + rows, so a centred one never covers the command line; one without keeps `desktop − 2`, since its keys are its last rows. The `❄ FROZEN` bar is sized to its pane like every other bar (`_freezeBars`, redrawn + in `SyncChromeBarWidths` and on a theme switch). The header's brand is `SharpMUTerm` unless the row would then not fit, + where it is `muterm` (`BrandWord`/`ShortBrandWord`). A notice whose words already name its action's way gets no + `· ⌥R Reconnect` after them (`NamesWay`). - **The status row names the keys of the mode you are in** (`ModeHints`/`StatusMode`, Client; `SharpMUTermApp.ModeHints.cs`). Composer armed > search bar in the focused window > frozen > split > scrolled back; while one holds, its hints replace `FocusHints` (`End returns · ⌥F freezes`, `⌥F thaws`, `⌥G next hit · ⌃F searches diff --git a/src/SharpMUTerm.Tui/ComposeOverlay.cs b/src/SharpMUTerm.Tui/ComposeOverlay.cs index 09c974ae..36226d2c 100644 --- a/src/SharpMUTerm.Tui/ComposeOverlay.cs +++ b/src/SharpMUTerm.Tui/ComposeOverlay.cs @@ -267,6 +267,10 @@ internal void Toggle(string target, string draft, ComposeEscaping escaping, bool FocusedForegroundColor = _scheme.Colour(ScreenPalette.Value), SelectionBackgroundColor = _scheme.Colour(ScreenPalette.CursorBg), SelectionForegroundColor = _scheme.Colour(ScreenPalette.Value), + + // The script gutter's numbers in the screens' label ink, held to the floor on the well; the control's + // default grey was 2.7:1 on a light theme's well. + LineNumberColor = _scheme.Colour(ScreenPalette.Label), }; if (!_spellingOpened) diff --git a/src/SharpMUTerm.Tui/FreezeBarRenderer.cs b/src/SharpMUTerm.Tui/FreezeBarRenderer.cs index a7d61492..cc06aa46 100644 --- a/src/SharpMUTerm.Tui/FreezeBarRenderer.cs +++ b/src/SharpMUTerm.Tui/FreezeBarRenderer.cs @@ -8,13 +8,22 @@ namespace SharpMUTerm.Tui; /// internal static class FreezeBarRenderer { - /// Builds the frozen-split bar markup from an already-resolved #rrggbb accent. - public static string Bar(string accentHex) + /// The label's cells, the space after it included. + private const int LabelCells = 12; + + /// + /// Builds the frozen-split bar markup from an already-resolved #rrggbb accent, its rule running to the edge + /// of a pane cells wide ('s rule: 0 is not arranged yet, and draws + /// the old 48 cells). A fixed 48 wrapped in every pane narrower than 61 cells, and the bar's one row then showed + /// no rule at all; in a wide pane it stopped short. + /// + public static string Bar(string accentHex, int width = 0) { ArgumentException.ThrowIfNullOrEmpty(accentHex); // A single line that is both the label and the divider border between pinned scrollback and the // live tail: the accented "❄ FROZEN ⌥F" label followed by a dim rule. - return $"[{accentHex}]{Glyphs.Freeze} FROZEN ⌥F[/] [dim]{new string('─', 48)}[/]"; + var rule = width > 0 ? Math.Max(0, width - LabelCells) : BarRule.Fallback; + return $"[{accentHex}]{Glyphs.Freeze} FROZEN ⌥F[/] [dim]{BarRule.Rule(rule)}[/]"; } } diff --git a/src/SharpMUTerm.Tui/GameDataOverlay.cs b/src/SharpMUTerm.Tui/GameDataOverlay.cs index 006d1a6d..fa6a05ba 100644 --- a/src/SharpMUTerm.Tui/GameDataOverlay.cs +++ b/src/SharpMUTerm.Tui/GameDataOverlay.cs @@ -57,7 +57,7 @@ public void Toggle(GameDataStore data, string owner) var desktop = _system.DesktopDimensions; var width = Math.Max(44, desktop.Width - 8); var height = Math.Max(10, desktop.Height - 4); - _content = new MarkupControl(Scheme.Lines(Lines(width - 3, height - 2), ScreenPalette.MenuBg)); + _content = new MarkupControl(Scheme.Lines(Lines(width - 4, height - 2), ScreenPalette.MenuBg)); // Centered() after WithSize(), for CommandPalette's reason. _window = new WindowBuilder(_system) @@ -67,6 +67,7 @@ public void Toggle(GameDataStore data, string owner) .WithBackgroundColor(Scheme.Colour(ScreenPalette.MenuBg)) .HideTitleButtons() .Resizable(false) + .WithPadding(new SharpConsoleUI.Layout.Padding(1, 0, 0, 0)) // a cell between the frame and the words .WithSize(width, height) .Centered() .AddControl(_content) @@ -144,7 +145,7 @@ private void Repaint() { if (_window is { } window) { - _content?.SetContent(Scheme.Lines(Lines(Math.Max(20, window.Width - 3), Math.Max(6, window.Height - 2)), ScreenPalette.MenuBg)); + _content?.SetContent(Scheme.Lines(Lines(Math.Max(20, window.Width - 4), Math.Max(6, window.Height - 2)), ScreenPalette.MenuBg)); } } diff --git a/src/SharpMUTerm.Tui/HistorySurface.cs b/src/SharpMUTerm.Tui/HistorySurface.cs index 129fa1ed..f67919f6 100644 --- a/src/SharpMUTerm.Tui/HistorySurface.cs +++ b/src/SharpMUTerm.Tui/HistorySurface.cs @@ -170,7 +170,7 @@ private void Open() // instead of leaning on it, and the selected row's bar stops there too. _contentWidth = Math.Clamp( HistorySearchPrompt.MaxWidth(initial) + 2, MinimumWidth, Math.Max(MinimumWidth, desktop.Width - 6)); - var width = _contentWidth + 2; // + the 1-cell left/right border + var width = _contentWidth + 3; // + the 1-cell left/right border and the cell of padding on the left var height = Math.Min(_listRows + ChromeRows + 2, Math.Max(ChromeRows + 3, desktop.Height - 2)); _body = new MarkupControl(new List()); @@ -185,6 +185,7 @@ private void Open() .WithBackgroundColor(Scheme.Colour(ScreenPalette.MenuBg)) .HideTitleButtons() .Resizable(false) + .WithPadding(new SharpConsoleUI.Layout.Padding(1, 0, 0, 0)) // a cell between the frame and the words .WithSize(width, height) .Centered() .AddControl(_body) diff --git a/src/SharpMUTerm.Tui/ListOverlay.cs b/src/SharpMUTerm.Tui/ListOverlay.cs index d6e3d960..776ed4d0 100644 --- a/src/SharpMUTerm.Tui/ListOverlay.cs +++ b/src/SharpMUTerm.Tui/ListOverlay.cs @@ -102,7 +102,10 @@ public void Open( var outer = width is { } asked ? Math.Clamp(asked + 4, 24, widest) : widest; var lines = render(outer - 4); var footerLines = footer?.Invoke(outer - 4) ?? []; - var height = Math.Clamp(Rows(lines, outer - 3) + footerLines.Count + 2, 8, Math.Max(8, desktop.Height - 2)); + // A modal whose body scrolls under pinned keys is at most four rows short of the desktop, so centred it leaves the + // header, the command line and the status row in view (two short, the import review at 80×24 sat on the command + // line). One without scrolling keeps the two: its last rows are its keys, and they must not be cut off. + var height = Math.Clamp(Rows(lines, outer - 3) + footerLines.Count + 2, 8, Math.Max(8, desktop.Height - (footer is null ? 2 : 4))); _content = new MarkupControl(_scheme.Lines(lines, ScreenPalette.MenuBg)); _content.LinkClicked += (_, e) => _link?.Invoke(e.Url); IWindowControl body = _content; @@ -136,6 +139,7 @@ public void Open( .WithBackgroundColor(_scheme.Colour(ScreenPalette.MenuBg)) .HideTitleButtons() .Resizable(false) + .WithPadding(new SharpConsoleUI.Layout.Padding(1, 0, 0, 0)) // a cell between the frame and the words .WithSize(outer, height) .Centered() .AddControl(body) diff --git a/src/SharpMUTerm.Tui/MessageLogOverlay.cs b/src/SharpMUTerm.Tui/MessageLogOverlay.cs index 10289014..0f3e4ece 100644 --- a/src/SharpMUTerm.Tui/MessageLogOverlay.cs +++ b/src/SharpMUTerm.Tui/MessageLogOverlay.cs @@ -61,7 +61,7 @@ public void Toggle() var width = Math.Clamp(ClientMessageRenderer.MaxWidth(entries) + 3, 44, Math.Max(44, desktop.Width - 6)); var height = Math.Clamp(entries.Count + 4, 8, Math.Max(8, desktop.Height - 2)); - _content = new MarkupControl(Scheme.Lines(Lines(width - 3), ScreenPalette.MenuBg)); + _content = new MarkupControl(Scheme.Lines(Lines(width - 4), ScreenPalette.MenuBg)); // Centered() after WithSize(): the builder reads the bounds set so far and falls back to 80x25, // so centring first places the window as if it were that size (see CommandPalette). @@ -72,6 +72,7 @@ public void Toggle() .WithBackgroundColor(Scheme.Colour(ScreenPalette.MenuBg)) .HideTitleButtons() .Resizable(false) + .WithPadding(new SharpConsoleUI.Layout.Padding(1, 0, 0, 0)) // a cell between the frame and the words .WithSize(width, height) .Centered() .AddControl(_content) @@ -102,7 +103,7 @@ internal void StepLevel(int delta) var index = Array.IndexOf(Levels, _diagnostics.MinimumLevel); index = index < 0 ? Array.IndexOf(Levels, LogLevel.Information) : index; _diagnostics.MinimumLevel = Levels[Math.Clamp(index + delta, 0, Levels.Length - 1)]; - _content?.SetContent(Scheme.Lines(Lines(_window is { } window ? Math.Max(20, window.Width - 3) : 80), ScreenPalette.MenuBg)); + _content?.SetContent(Scheme.Lines(Lines(_window is { } window ? Math.Max(20, window.Width - 4) : 80), ScreenPalette.MenuBg)); } private static string Level(LogLevel level) => level.ToString().ToLowerInvariant(); diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Notices.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Notices.cs index 7f06e925..cf056f13 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Notices.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Notices.cs @@ -60,7 +60,9 @@ internal string NoticeMarkup(NoticeModel notice) // The toast offers the action as a button; the row names the way to it, where it fits whole — never by cutting // the notice's own words, and never wrapping the row (FitStatusRow). - if (NoticeActionHints(notice.Action).FirstOrDefault(h => MarkupWidth(row) + 3 + h.Length <= HeaderWidth()) is { } hint) + // A notice whose own words already name the way (`offline — ⌥R (⌃P ▸ Reconnect) connects it`) gets no second + // copy: the row read `… connects it · ⌥R Reconnect`. + if (NoticeActionHints(notice.Action).FirstOrDefault(h => !NamesWay(notice.Text, h) && MarkupWidth(row) + 3 + h.Length <= HeaderWidth()) is { } hint) { row += $"[{label}] · {Escape(hint)}[/]"; } @@ -97,6 +99,16 @@ internal IReadOnlyList NoticeActionHints(NoticeAction? action) : [$"⌃P ▸ {entry.Title}", $"⌃P ▸ {action.Label}"]; } + /// + /// Whether already says 's way to the action: its chord (⌥R of + /// ⌥R Reconnect), or the whole ⌃P ▸ … path. + /// + internal static bool NamesWay(string text, string hint) + { + var way = hint.StartsWith("⌃P ▸ ", StringComparison.Ordinal) ? hint : hint.Split(' ')[0]; + return text.Contains(way, StringComparison.Ordinal); + } + /// A colour held to on : notice text is small text. private static string HeldOn(string hex, Rgb plane) => TryParseRgb(hex, out var rgb) ? Hex(Contrast.Legible(rgb, plane, WorkspacePalette.HeaderTextFloor)) : hex; diff --git a/src/SharpMUTerm.Tui/PrefixOverlay.cs b/src/SharpMUTerm.Tui/PrefixOverlay.cs index f66d7cb2..0b1de5ca 100644 --- a/src/SharpMUTerm.Tui/PrefixOverlay.cs +++ b/src/SharpMUTerm.Tui/PrefixOverlay.cs @@ -108,6 +108,7 @@ public void Open() .WithBackgroundColor(Scheme.Colour(ScreenPalette.MenuBg)) .HideTitleButtons() .Resizable(false) + .WithPadding(new SharpConsoleUI.Layout.Padding(1, 0, 0, 0)) // a cell between the frame and the words .WithSize(width, height) .Centered() .AddControl(new MarkupControl(Scheme.Lines(lines, ScreenPalette.MenuBg))) diff --git a/src/SharpMUTerm.Tui/QuitOverlay.cs b/src/SharpMUTerm.Tui/QuitOverlay.cs index 4f5ae4b6..5a0d02e7 100644 --- a/src/SharpMUTerm.Tui/QuitOverlay.cs +++ b/src/SharpMUTerm.Tui/QuitOverlay.cs @@ -107,6 +107,7 @@ private void Open() .WithBackgroundColor(Scheme.Colour(ScreenPalette.MenuBg)) .HideTitleButtons() .Resizable(false) + .WithPadding(new SharpConsoleUI.Layout.Padding(1, 0, 0, 0)) // a cell between the frame and the words .WithSize(width, height) .Centered() .AddControl(_body) diff --git a/src/SharpMUTerm.Tui/SearchSurface.cs b/src/SharpMUTerm.Tui/SearchSurface.cs index 82f9a448..0853eecc 100644 --- a/src/SharpMUTerm.Tui/SearchSurface.cs +++ b/src/SharpMUTerm.Tui/SearchSurface.cs @@ -204,7 +204,7 @@ private void Open() _listRows = Math.Max(3, desktop.Height - ChromeRows - 6); _contentWidth = Math.Max(MinimumWidth, desktop.Width - 6); - var width = _contentWidth + 2; // + the 1-cell left/right border + var width = _contentWidth + 3; // + the 1-cell left/right border and the cell of padding on the left var height = Math.Min(_listRows + ChromeRows + 2, Math.Max(ChromeRows + 3, desktop.Height - 2)); _body = new MarkupControl(new List()); @@ -217,6 +217,7 @@ private void Open() .WithBackgroundColor(Scheme.Colour(ScreenPalette.MenuBg)) .HideTitleButtons() .Resizable(false) + .WithPadding(new SharpConsoleUI.Layout.Padding(1, 0, 0, 0)) // a cell between the frame and the words .WithSize(width, height) .Centered() .AddControl(_body) diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.ChromeBars.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.ChromeBars.cs index 1c6ebe24..4273ee8b 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.ChromeBars.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.ChromeBars.cs @@ -53,5 +53,17 @@ private void SyncChromeBarWidths() RepaintPane(windowId, keepSelection: true); } } + + // The freeze bar is a control of its own between a frozen pane's halves, not a buffer row. + foreach (var (windowId, (control, drawn)) in _freezeBars.ToArray()) + { + var width = BarWidth(windowId); + if (width > 0 && width != drawn) + { + accent ??= FrozenAccentHex(); + control.SetContent(new List { FreezeBarRenderer.Bar(accent, width) }); + _freezeBars[windowId] = (control, width); + } + } } } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.MapEdit.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.MapEdit.cs index 16034d37..a5275238 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.MapEdit.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.MapEdit.cs @@ -131,7 +131,7 @@ internal void SelectMapRoom(string windowId, long? room) if (entering) { // Not toasted: the window's map inspector shows these as buttons; the status row says them for the cells. - Notice("map: ←↑→↓ select · r rename · l lock · Del delete · u undo · Esc done", MessageSeverity.Info, source: NoticeModel.Sources.Map, toast: false); + Notice("←↑→↓ select · r rename · l lock · Del delete · u undo · Esc done", MessageSeverity.Info, source: NoticeModel.Sources.Map, toast: false); } } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Theme.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Theme.cs index b871d4bd..836fbf93 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Theme.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Theme.cs @@ -128,6 +128,11 @@ private void ApplyTheme(Theme theme) internal void RestylePaneLines() { var accent = FrozenAccentHex(); + foreach (var (windowId, (control, width)) in _freezeBars.ToArray()) + { + control.SetContent(new List { FreezeBarRenderer.Bar(accent, width) }); + } + foreach (var buffer in _lines.Values) { for (var i = 0; i < buffer.Count; i++) diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.WorldBrowse.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.WorldBrowse.cs index e540b100..f36ebbba 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.WorldBrowse.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.WorldBrowse.cs @@ -301,7 +301,7 @@ void Deliver(byte[]? bytes, string? problem) { if (generation == _worldGeneration) { - then(bytes, bytes is null ? problem ?? "it did not answer, or the answer was too large" : null); + then(bytes, bytes is null ? problem ?? "the request failed, or the answer was too large" : null); } } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 3959d4cc..8b56c7fa 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -90,6 +90,9 @@ internal sealed partial class SharpMUTermApp : IAsyncDisposable /// the pinned half is precisely the half a reader scrolls through. /// private readonly Dictionary _frozenPanes = new(StringComparer.Ordinal); + + /// Each frozen window's ❄ FROZEN bar and the pane width its rule was drawn for (SyncChromeBarWidths). + private readonly Dictionary _freezeBars = new(StringComparer.Ordinal); private readonly DraftStore _drafts; private readonly InputBarVisibility _secondBars; @@ -11712,7 +11715,9 @@ private IWindowControl BuildFrozenContent(string windowId, string title) var frozen = FrozenContentFor(windowId); FeedRange(frozen, buffer, 0, split); - var bar = new MarkupControl(new List { FreezeBarRenderer.Bar(FrozenAccentHex()) }); + var barWidth = BarWidth(windowId); + var bar = new MarkupControl(new List { FreezeBarRenderer.Bar(FrozenAccentHex(), barWidth) }); + _freezeBars[windowId] = (bar, barWidth); var live = PaneContentFor(windowId, title); FeedRange(live, buffer, split, buffer.Count - split); @@ -13377,6 +13382,7 @@ private void CloseWindow(string id) _paneScrolls.Remove(id); // and its scroll position: a reopened window starts live _paneScrolls.Remove(FrozenRegionKey(id)); _frozenPanes.Remove(id); + _freezeBars.Remove(id); ForgetScrollSplit(id); _drafts.Forget(id); // both bars: a closed window keeps neither of its two drafts _pendingGrabs.Remove(id); @@ -14281,7 +14287,7 @@ private string HeaderMarkup(HeaderModel model) // legible is the text *on* it, so each segment's ink is measured against the fill it lands on. var brandBg = FillHex(AccentPalette[2]); // violet var sb = new System.Text.StringBuilder(); - sb.Append($"[link={HeaderModel.PaletteTarget}][bold {SegmentInk(brandBg)} on {brandBg}] {caret} muterm [/][/]"); + sb.Append($"[link={HeaderModel.PaletteTarget}][bold {SegmentInk(brandBg)} on {brandBg}] {caret} {BrandWord} [/][/]"); var tail = brandBg; if (model.World is { } active) @@ -14304,6 +14310,15 @@ private string HeaderMarkup(HeaderModel model) sb.Append($"[{tail} on {headerBg}]{Glyphs.PowerRight}[/]"); var leftBar = sb.ToString(); + var right = HeaderRight(model); + + // The product's name where the row has room for it beside the ribbon and the right-hand cluster (the mockups' + // `≡ SharpMUTerm`); the short `muterm` it always was where it has not, because an overlong header wraps. + if (MarkupWidth(leftBar) + MarkupWidth(right) + 3 > HeaderWidth()) + { + var at = leftBar.IndexOf($" {BrandWord} ", StringComparison.Ordinal); + leftBar = string.Concat(leftBar.AsSpan(0, at), $" {ShortBrandWord} ", leftBar.AsSpan(at + BrandWord.Length + 2)); + } // The ⌃B prefix indicator shows only while armed, and it is the *terse* half of the which-key // pair: the keys immediately, the panel a few hundred milliseconds later if nothing was pressed. @@ -14328,6 +14343,17 @@ private string HeaderMarkup(HeaderModel model) // test that says so, and anything added here has to keep it passing. // The quiet half of the row is held to the header's floor on its band rather than left to the framework's // fixed [dim] grey, which is 3.4:1 on Dark's band and less on Light's. + // Right-align the status cluster to the far edge so the menu bar spans the whole console. + var gap = Math.Max(3, HeaderWidth() - MarkupWidth(leftBar) - MarkupWidth(right)); + return $"{leftBar}{new string(' ', gap)}{right}"; + } + + /// The product's name on the header's brand button, and the short form a narrow row falls back to. + private const string BrandWord = "SharpMUTerm", ShortBrandWord = "muterm"; + + /// The header's right-hand cluster: the connected fraction and the log cell. + private string HeaderRight(HeaderModel model) + { var muted = WorkspacePalette.HeaderMuted(_theme).ToHex(); var conn = model.HasWorlds ? $"{model.ConnectedText} " : string.Empty; var log = model.Log == LogFormat.None @@ -14339,11 +14365,7 @@ private string HeaderMarkup(HeaderModel model) // "*** SharpMUTerm — theme '…', graphics: …" when it opens, and the not-connected status line // repeats it. A startup fact belongs where startup facts are read, not in the row that has to // fit an identity ribbon and a live count at eighty columns. - var right = $"[{muted}]{conn}[/]{log} "; - - // Right-align the status cluster to the far edge so the menu bar spans the whole console. - var gap = Math.Max(3, HeaderWidth() - MarkupWidth(leftBar) - MarkupWidth(right)); - return $"{leftBar}{new string(' ', gap)}{right}"; + return $"[{muted}]{conn}[/]{log} "; } /// diff --git a/src/SharpMUTerm.Tui/WelcomeSurface.cs b/src/SharpMUTerm.Tui/WelcomeSurface.cs index d0370c06..3dfb9705 100644 --- a/src/SharpMUTerm.Tui/WelcomeSurface.cs +++ b/src/SharpMUTerm.Tui/WelcomeSurface.cs @@ -379,7 +379,10 @@ private static List RenderMenu(WelcomeModel model, int width) var selected = choice == model.Selected; var (title, detail) = model.Describe(choice); var marker = selected ? $"[bold {ScreenPalette.Accent}]▸[/]" : " "; - lines.Add($"{marker} {Pad(Value(title, selected), 20)} {Label(detail)}"); + var row = $"{marker} {Pad(Value(title, selected), 20)} {(selected ? $"[{ScreenPalette.Muted}]{Escape(detail)}[/]" : Label(detail))}"; + + // The choice ⏎ takes is a band across the list, the menus' selected row (the mockup's), not a marker alone. + lines.Add(selected ? $"[on {ScreenPalette.MenuSelectedBg}]{Pad(row, width)}[/]" : row); } lines.Add(model.Problem is null ? string.Empty : $" [{ScreenPalette.Caution}]{Escape(model.Problem)}[/]"); diff --git a/tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs b/tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs index e3a0ac73..7bdb4c98 100644 --- a/tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs @@ -121,7 +121,8 @@ public async Task TheImportReviewScrollsItsBodyUnderAPinnedFooter() { var app = App(); var first = FrameGrid.Decode(app.RenderSnapshot("import-review"), Width, Height); - await Assert.That(first.Any(r => r.Contains("LEFT OUT", StringComparison.Ordinal) && !r.Contains("password", StringComparison.Ordinal))).IsTrue(); + await Assert.That(first.Any(r => r.Contains("WHAT IT ADDS", StringComparison.Ordinal))).IsTrue(); + await Assert.That(first.Any(r => r.Contains("Your health is", StringComparison.Ordinal))).IsFalse().Because("the end of the list is below the fold"); app.SimulateImportKey(new ConsoleKeyInfo('\0', ConsoleKey.End, false, false, false)); var scrolled = FrameGrid.Decode(app.RenderWholeFrame(), Width, Height); diff --git a/tests/SharpMUTerm.Tui.Tests/HostChromeLayoutTests.cs b/tests/SharpMUTerm.Tui.Tests/HostChromeLayoutTests.cs index 4ff70b81..57bab9bb 100644 --- a/tests/SharpMUTerm.Tui.Tests/HostChromeLayoutTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/HostChromeLayoutTests.cs @@ -84,8 +84,8 @@ public async Task AHostThatDrawsTheHeaderGetsNoHeaderRowAndTheWorkspaceTakesIt() await Assert.That(native.LaidOutRows.Workspace).IsEqualTo(cells.LaidOutRows.Workspace + 1); // The ribbon's brand is on the terminal's first row and on no row of the window's cells. - await Assert.That(FrameGrid.Decode(cellFrame, Width, Height)[0]).Contains("muterm"); - await Assert.That(FrameGrid.Decode(nativeFrame, Width, Height).Any(row => row.Contains("muterm", StringComparison.Ordinal))).IsFalse(); + await Assert.That(FrameGrid.Decode(cellFrame, Width, Height)[0]).Contains("MUTerm"); + await Assert.That(FrameGrid.Decode(nativeFrame, Width, Height).Any(row => row.Contains("MUTerm", StringComparison.Ordinal) || row.Contains("muterm", StringComparison.Ordinal))).IsFalse(); // The bands still fill the grid exactly: nothing promised to a header that is not there. var rows = native.LaidOutRows; diff --git a/tests/SharpMUTerm.Tui.Tests/TerminalAuditWave19Tests.cs b/tests/SharpMUTerm.Tui.Tests/TerminalAuditWave19Tests.cs new file mode 100644 index 00000000..56c7251d --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/TerminalAuditWave19Tests.cs @@ -0,0 +1,69 @@ +using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Client.Modals; +using SharpMUTerm.Core.Diagnostics; +using SharpMUTerm.Core.Theming; +using SharpMUTerm.Graphics; + +namespace SharpMUTerm.Tui.Tests; + +/// Wave 19's terminal audit: the cell defects found by sweeping every snapshot view at 80×24 and 120×32. +[NotInParallel] +public class TerminalAuditWave19Tests +{ + private static readonly TerminalCapabilities Headless = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private static SharpMUTermApp App(int width, int height) + { + Console.SetIn(TextReader.Null); + var config = DemoScene.Build(); + config.ThemeName = "Dark"; + config.Theme = ThemeLibrary.Get("Dark"); + return new SharpMUTermApp(config, Headless, new HeadlessConsoleDriver(width, height)); + } + + [Test] + public async Task ANoticeThatAlreadyNamesItsKeyIsNotFollowedByASecondCopy() + { + await using var app = App(120, 32); + app.SimulateNotice("switched to Corvid · offline — ⌥R (⌃P ▸ Reconnect) connects it", MessageSeverity.Info, null, + new NoticeAction("world:reconnect", "Reconnect")); + var row = MarkupText.Plain(app.StatusMarkup); + await Assert.That(row).DoesNotContain("· ⌥R Reconnect"); + await Assert.That(row.Split("⌥R").Length - 1).IsEqualTo(1); + } + + [Test] + public async Task TheFreezeBarsRuleRunsToThePanesEdge() + { + foreach (var width in new[] { 30, 72, 140 }) + { + await Assert.That(MarkupText.Plain(FreezeBarRenderer.Bar("#c678dd", width)).Length).IsEqualTo(width); + } + + await Assert.That(MarkupText.Plain(FreezeBarRenderer.Bar("#c678dd")).Length).IsEqualTo(12 + BarRule.Fallback); + } + + [Test] + public async Task TheHeaderSpellsTheProductsNameWhereItFitsAndNeverWraps() + { + await using var wide = App(120, 32); + await Assert.That(MarkupText.Plain(wide.HeaderText)).Contains(" SharpMUTerm "); + + await using var narrow = App(44, 16); + var plain = MarkupText.Plain(narrow.HeaderText); + await Assert.That(plain).Contains(" muterm "); + await Assert.That(plain.Length).IsLessThanOrEqualTo(44); + } + + [Test] + public async Task TheWelcomesChoiceIsABandAcrossTheList() + { + var model = new WelcomeSurface(null).Model; + var lines = WelcomeSurface.Render(model, 60); + var band = lines.Single(l => l.Contains($"[on {ScreenPalette.MenuSelectedBg}]", StringComparison.Ordinal)); + await Assert.That(MarkupText.Plain(band)).Contains(model.Describe(model.Selected).Title); + await Assert.That(MarkupText.Plain(band).Length).IsEqualTo(60); + } +} From c3f33886c99d1e1bf5976c13fa203ddf653643ac Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 17:53:45 +0000 Subject: [PATCH 069/113] Welcome: choose a world's address in the Find a world card The welcome's embedded world list builds its WorldBrowseSession with the address-choice callbacks (ChooseWorldEndpoint, LeaveWorldChoice), which fixes the merged build. While the model is Choosing, the card lists the addresses as Browse worlds does (host:port, TLS/plain, stale, not connectable, charset note), Up/Down/Enter choose, Esc or Back returns to the worlds. Choosing clears the choice before the welcome reopens with the form filled in, so the reopened list shows the worlds again. Declared as the welcome surface's address/leave actions, with a parity probe: welcome find, add Aetherfall, choose address 2 equals the cells' Browse pick and choice. Cross-slice fixes: the existing welcome add probe picks a one-address world (Aetherfall now opens the choice), and NativeTabStripTests compares the desktop arrangement with and without native tabs, since HostChrome.Native now also takes the status row and command line out of the cells. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 3 +- src/SharpMUTerm.Avalonia/WelcomeView.cs | 189 +++++++++++++++++- .../Surfaces/SurfaceCatalog.cs | 5 + .../SharpMUTermApp.WorldBrowse.cs | 4 + .../SurfaceParityTests.cs | 28 ++- .../NativeTabStripTests.cs | 3 +- 6 files changed, 226 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5cef7e25..48aaec46 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,7 +21,8 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] - The docked composer in the window has its escaping on a chip you can click, a paragraph and word count, and Preview and Send buttons; Preview opens the full-screen composer with the as-sent band. - The window's welcome is one page: find a world from mu*index and add it, connect directly (with the `/connect` line - it stands for), and pick a starting layout from two cards. Nothing is fetched until you ask for the list. + it stands for), and pick a starting layout from two cards. Nothing is fetched until you ask for the list. A world + listed at several addresses lets you choose one right in the Find a world card (Esc goes back to the worlds). - The desktop window's status line is now a footer under the whole window, in the window's own type, with keys in words. Clicking "Ctrl+P palette" opens the palette, and clicking a notice's action (Reconnect, Open F5…) runs it. - The desktop window draws the command line as a rounded field with the prompt in its own type and a hint at the right diff --git a/src/SharpMUTerm.Avalonia/WelcomeView.cs b/src/SharpMUTerm.Avalonia/WelcomeView.cs index 8365700f..42932243 100644 --- a/src/SharpMUTerm.Avalonia/WelcomeView.cs +++ b/src/SharpMUTerm.Avalonia/WelcomeView.cs @@ -46,9 +46,13 @@ internal sealed class WelcomeView : DockPanel, IModalView private readonly TextBlock _layoutReason; private readonly List<(WelcomeLayout Layout, Border Card)> _layoutCards = []; private readonly List _worldRows = []; + private readonly List _addressRows = []; + private readonly TextBlock _footer; private WelcomeModel _model; private WorldBrowseSession? _worlds; private WelcomeModel? _filledFrom; + private WorldGame? _choiceDrawn; + private int _address; public WelcomeView(WelcomeSession session, NativeTokens colours, Action done) { @@ -200,7 +204,7 @@ public WelcomeView(WelcomeSession session, NativeTokens colours, Action done) others.Children.Add(ModalParts.Button("Import…", null, colours, () => Choose(WelcomeChoice.Import))); page.Children.Add(others); - var footer = ModalParts.Footer("Tab moves · Enter connects, or searches · Esc closes", colours); + var footer = _footer = ModalParts.Footer(PageKeys, colours); SetDock(footer, Dock.Bottom); Children.Add(footer); Children.Add(new ScrollViewer @@ -248,6 +252,15 @@ public WelcomeView(WelcomeSession session, NativeTokens colours, Action done) /// The world rows the find card shows now, for a test. public IReadOnlyList WorldRows => _worldRows; + /// The address rows the find card shows while a picked world's addresses are chosen from, for a test. + public IReadOnlyList AddressRows => _addressRows; + + /// Whether the find card lists a picked world's addresses in place of the worlds, for a test. + public bool ChoosingAddress => _worlds?.Model.Choosing is not null; + + /// The address Enter would choose, for a test. + public int SelectedAddress => _address; + /// The /connect line under the form as drawn, for a test. public string CommandLine => string.Concat(_command.Inlines?.OfType().Select(r => r.Text) ?? []); @@ -304,7 +317,19 @@ public void Connect() /// A row's Add: Browse worlds' pick of row of the list's rows. public void Add(int index) => _worlds?.Pick(index); - private static FontFamily Mono => new("JetBrains Mono, DejaVu Sans Mono, Consolas, Menlo, monospace"); + /// + /// An address row, or Enter on the selected one, while a picked world's addresses are listed: Browse worlds' own + /// choice, which reopens the welcome with the form filled in from it. + /// + public void ChooseAddress(int index) => _worlds?.Choose(index); + + /// Back, or Esc, while the addresses are listed: the worlds again, as Browse worlds' Esc does. + public void LeaveAddresses() => _worlds?.Back(); + + /// The page's keys, spelt in words. + private const string PageKeys = "Tab moves · Enter connects, or searches · Esc closes"; + + private static FontFamily Mono => NativeTokens.MonoFont; private void OnChanged(WelcomeModel model) => Dispatcher.UIThread.Post(() => { @@ -402,6 +427,8 @@ private void DrawFind() { _findBody.Children.Clear(); _worldRows.Clear(); + _addressRows.Clear(); + _search.IsVisible = true; if (!_session.CanFindWorlds) { // No directory set (or a host that cannot list in place): the model's reason, and Browse worlds as a choice. @@ -435,7 +462,23 @@ private void DrawRows() _findBody.Children.Clear(); _worldRows.Clear(); + _addressRows.Clear(); var model = worlds.Model; + if (model.Choosing is { } game) + { + DrawChoice(model, game); + return; + } + + var choosingWasDrawn = _choiceDrawn is not null; + _choiceDrawn = null; + _search.IsVisible = true; + _footer.Text = PageKeys; + if (choosingWasDrawn) + { + _search.Focus(); + } + var query = _search.Text ?? string.Empty; var shown = model.View(query, WorldDirectorySort.Players); var list = new StackPanel { Spacing = 8 }; @@ -473,6 +516,124 @@ private void DrawRows() _findNote.Foreground = _colours.Brush(model.State is WorldBrowseState.Failed || (model.Problem is not null && model.State == WorldBrowseState.Ready) ? _colours.Warn : _colours.Dim); } + /// + /// A picked world's addresses in the find card, in place of the worlds: Browse worlds' choice, with its words — whose + /// addresses and how many, the charset, then a row per address (host:port, TLS or plain, its state) — and Back. + /// + private void DrawChoice(WorldBrowseModel model, WorldGame game) + { + if (!ReferenceEquals(_choiceDrawn, game)) + { + _address = Math.Max(0, game.FirstConnectable); + } + + var fresh = _choiceDrawn is null; + _choiceDrawn = game; + _search.IsVisible = false; + _footer.Text = NativeKeys.Words(string.Join(" · ", WorldBrowseModel.ChoiceKeys.Select(k => $"{k.Key} {k.Label}"))); + _findBody.Children.Add(new TextBlock + { + Text = model.ChoiceLine, + FontSize = NativeTokens.Title, + FontWeight = FontWeight.SemiBold, + Foreground = _colours.Brush(_colours.Text), + TextWrapping = TextWrapping.Wrap, + }); + _findBody.Children.Add(new TextBlock + { + Text = model.CharsetLine, + FontSize = NativeTokens.Body, + Foreground = _colours.Brush(_colours.Dim), + TextWrapping = TextWrapping.Wrap, + }); + + var list = new StackPanel { Spacing = 2 }; + _address = Math.Clamp(_address, 0, game.Endpoints.Count - 1); + for (var i = 0; i < game.Endpoints.Count; i++) + { + var endpoint = game.Endpoints[i]; + var (address, security, state) = WorldBrowseModel.Endpoint(endpoint); + var index = i; + var line = new DockPanel(); + var host = new TextBlock + { + Text = address, + FontFamily = Mono, + FontSize = NativeTokens.Body + 1, + Foreground = _colours.Brush(_colours.Text), + Width = 210, + Margin = new Thickness(0, 0, 10, 0), + TextTrimming = TextTrimming.CharacterEllipsis, + VerticalAlignment = VerticalAlignment.Center, + }; + DockPanel.SetDock(host, Dock.Left); + line.Children.Add(host); + var kind = new TextBlock + { + Text = security, + FontSize = NativeTokens.Body, + FontWeight = endpoint.Tls ? FontWeight.SemiBold : FontWeight.Normal, + Foreground = _colours.Brush(endpoint.Tls ? _colours.Accent : _colours.Dim), + Width = 44, + VerticalAlignment = VerticalAlignment.Center, + }; + DockPanel.SetDock(kind, Dock.Left); + line.Children.Add(kind); + line.Children.Add(new TextBlock + { + Text = state, + FontSize = NativeTokens.Body, + Foreground = _colours.Brush(endpoint.Stale || !endpoint.Connectable ? _colours.Warn : _colours.Dim), + TextTrimming = TextTrimming.CharacterEllipsis, + VerticalAlignment = VerticalAlignment.Center, + }); + var row = ModalParts.Row(line, address, () => SelectAddress(index), () => ChooseAddress(index)); + ToolTip.SetTip(row, WorldBrowseModel.EndpointText(endpoint)); + _addressRows.Add(row); + list.Children.Add(row); + } + + _findBody.Children.Add(new ScrollViewer + { + Content = list, + MaxHeight = ShownRows * 40, + HorizontalScrollBarVisibility = global::Avalonia.Controls.Primitives.ScrollBarVisibility.Disabled, + VerticalScrollBarVisibility = global::Avalonia.Controls.Primitives.ScrollBarVisibility.Auto, + }); + + var back = ModalParts.Button("Back to the worlds", "Esc", _colours, LeaveAddresses); + back.Name = "BackToWorlds"; + back.HorizontalAlignment = HorizontalAlignment.Left; + _findBody.Children.Add(back); + + _findNote.Text = NativeKeys.Words(model.Problem ?? WorldBrowseModel.ChoiceNote); + _findNote.Foreground = _colours.Brush(model.Problem is null ? _colours.Dim : _colours.Warn); + HighlightAddress(); + + // The Add pressed to get here has left the page; the keys stay with the choice. + if (fresh) + { + back.Focus(); + } + } + + private void SelectAddress(int index) + { + if (index != _address) + { + _address = index; + HighlightAddress(); + } + } + + private void HighlightAddress() + { + for (var i = 0; i < _addressRows.Count; i++) + { + _addressRows[i].Background = i == _address ? _colours.Brush(_colours.Selected) : Brushes.Transparent; + } + } + private static int IndexOf(WorldBrowseModel model, WorldListing world) { for (var i = 0; i < model.Rows.Count; i++) @@ -624,6 +785,26 @@ private void OnKey(object? sender, KeyEventArgs e) return; } + if (_worlds?.Model.Choosing is { } game) + { + switch (e.Key) + { + case Key.Escape: + e.Handled = true; + LeaveAddresses(); + return; + case Key.Up when !IsWithinForm(e.Source): + case Key.Down when !IsWithinForm(e.Source): + e.Handled = true; + SelectAddress(ModalParts.Step(_address, e.Key == Key.Up ? -1 : 1, game.Endpoints.Count)); + return; + case Key.Enter when !IsWithinForm(e.Source): + e.Handled = true; + ChooseAddress(_address); + return; + } + } + if (e.Key == Key.Escape) { e.Handled = true; @@ -648,6 +829,10 @@ private void OnKey(object? sender, KeyEventArgs e) } } + /// Whether a key came from the connect card's fields, where Enter connects whatever the find card shows. + private bool IsWithinForm(object? source) => + source is Visual v && new Visual[] { _host, _port, _character, _tls, _passwordLater }.Any(f => IsWithin(v, f)); + private static bool IsWithin(Visual visual, Visual ancestor) { for (Visual? at = visual; at is not null; at = at.GetVisualParent()) diff --git a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs index 5759247b..e463761f 100644 --- a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs +++ b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs @@ -530,6 +530,11 @@ [.. PanelViews("MapCanvas"), "SharpMUTerm.Avalonia.MapInspector"]), // Add is Browse worlds' own pick. The cells reach both through the Browse row. new(SurfaceActionKind.Modal, "find", "FindWorldsInWelcome"), new(SurfaceActionKind.Modal, "add", "PickWorld"), + + // A world added from there that answers at several addresses is chosen from in the card, as in Browse + // worlds, and the choice fills in the form; Esc goes back to the worlds. + new(SurfaceActionKind.Modal, "address", "ChooseWorldEndpoint"), + new(SurfaceActionKind.Modal, "leave", "LeaveWorldChoice"), ], NativeModal, "SharpMUTerm.Tui.WelcomeSurface.Render", diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.WorldBrowse.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.WorldBrowse.cs index c4b31959..baf50a87 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.WorldBrowse.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.WorldBrowse.cs @@ -280,6 +280,8 @@ internal void ChooseWorldEndpoint(WorldBrowseModel model, int index) return; } + // The choice is over, so a list shown again (the welcome's find card, reopened filled in) lists the worlds again. + _worldModel = _worldModel with { Choosing = null, Problem = null }; OpenWorldForm(game.Address(index)); } @@ -380,6 +382,8 @@ private void AttachWelcomeWorlds(WelcomeSession welcome) ThemeIsDark(), index => OnUiThread(() => PickWorld(worlds!.Model, index)), words => OnUiThread(() => AskWorldDirectory(words)), + endpoint => OnUiThread(() => ChooseWorldEndpoint(worlds!.Model, endpoint)), + () => OnUiThread(LeaveWorldChoice), () => { }) { Theme = _theme.Clone(), diff --git a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs index f2127117..253fa5e2 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs @@ -864,20 +864,44 @@ await SameModal("welcome: layout and browse", "welcome", app.SimulateWelcomeKey(new ConsoleKeyInfo('\0', ConsoleKey.DownArrow, false, false, false)); app.SimulateWelcomeKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false)); }); - // The welcome's Find a world card: Show worlds lists the directory in the page, Add on the first row is the - // browse list's pick — the same connect form, filled in, as the cells' Browse worlds row and ⏎. + // The welcome's Find a world card: Show worlds lists the directory in the page, Add on the second row (Lanternport, + // one address) is the browse list's pick — the same connect form, filled in, as the cells' Browse worlds row and ⏎. await SameModal("welcome: find a world and add it", "welcome", + (app, m) => + { + var welcome = (WelcomeSession)m.Open(SurfaceCatalog.Welcome)!; + welcome.FindWorlds(string.Empty); + welcome.Worlds!.Pick(1); + }, + app => + { + app.SimulateWelcomeKey(new ConsoleKeyInfo('\0', ConsoleKey.DownArrow, false, false, false)); + app.SimulateWelcomeKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false)); + app.SimulateWorldBrowseKey(new ConsoleKeyInfo('\0', ConsoleKey.DownArrow, false, false, false)); + app.SimulateWorldBrowseKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false)); + }); + // The demo's first world (Aetherfall) answers at several addresses, so Add lists them in the card; choosing the + // second (plain) fills in the form with it and the charset's encoding — as the cells' Browse pick and choice do. + await SameModal("welcome: add a world with several addresses, choose the second", "welcome", (app, m) => { var welcome = (WelcomeSession)m.Open(SurfaceCatalog.Welcome)!; welcome.FindWorlds(string.Empty); welcome.Worlds!.Pick(0); + if (welcome.Worlds.Model.Choosing is not { Endpoints.Count: > 1 }) + { + throw new InvalidOperationException("the demo's first world no longer answers at several addresses"); + } + + welcome.Worlds.Choose(1); }, app => { app.SimulateWelcomeKey(new ConsoleKeyInfo('\0', ConsoleKey.DownArrow, false, false, false)); app.SimulateWelcomeKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false)); app.SimulateWorldBrowseKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false)); + app.SimulateWorldBrowseKey(new ConsoleKeyInfo('\0', ConsoleKey.DownArrow, false, false, false)); + app.SimulateWorldBrowseKey(new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false)); }); probed.Add(SurfaceCatalog.Welcome); diff --git a/tests/SharpMUTerm.Tui.Tests/NativeTabStripTests.cs b/tests/SharpMUTerm.Tui.Tests/NativeTabStripTests.cs index 98030196..63d32e4d 100644 --- a/tests/SharpMUTerm.Tui.Tests/NativeTabStripTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/NativeTabStripTests.cs @@ -56,7 +56,8 @@ private static SharpMUTermApp App(HostChrome chrome, out string frame, string? v [Test] public async Task TheStripRowStaysAndNothingMoves() { - await using var cells = App(HostChrome.HeaderAndRail, out _, "split"); + // The same arrangement with the strips left to the cells: drawing them natively is the only difference. + await using var cells = App(HostChrome.Native with { Tabs = false }, out _, "split"); await using var native = App(HostChrome.Native, out _, "split"); await Assert.That(native.PaneOutputRects()).IsEquivalentTo(cells.PaneOutputRects()); From aac28804fbf87ff82ce06524efd4a8cedf27d7c4 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 17:56:19 +0000 Subject: [PATCH 070/113] Wave 19 D: native settings window to the Desktop-Settings mockup Header with search (glass, match count) and the scoped section's subject as 'Applies to'; a nav column with the accent row; a footer; a page title with 'Showing settings that match ... Show all N'; one card per declared group with fields as rows (marked search words, Changed mark, Reset to default link). List and package pages in cards; meter table restyled with the received paths as a drop-down style panel. Planes come from new page tokens (NativeTokens.Page, the mockup's hexes on Dark, mirrored on Light, shifted for other themes, inks held to the floor). Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 4 + CLAUDE.md | 11 + src/SharpMUTerm.Avalonia/ListEditorView.cs | 49 +- src/SharpMUTerm.Avalonia/NativeTokens.Page.cs | 177 +++++ src/SharpMUTerm.Avalonia/NativeTokens.cs | 2 +- src/SharpMUTerm.Avalonia/PackagePageView.cs | 21 +- src/SharpMUTerm.Avalonia/SettingsWindow.cs | 629 +++++++++++++----- src/SharpMUTerm.Avalonia/ThemeCardView.cs | 11 +- .../NativeTokenTests.cs | 34 +- .../SettingsWindowTests.cs | 2 +- 10 files changed, 737 insertions(+), 203 deletions(-) create mode 100644 src/SharpMUTerm.Avalonia/NativeTokens.Page.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 057cacdb..cd52dee8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -356,6 +356,10 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Changed +- The desktop window's settings look like the rest of the redesigned app: a header with the search box and, for worlds + and characters, which one the settings apply to; the sections down a darker side column; each group of settings in a + card of its own, with what you searched for marked in the labels, a "Changed" mark and a "Reset to default" link; and + a footer saying changes apply as you make them. The meter table shows the paths received as a drop-down style panel. - The older-history page fits an 80×24 terminal: it sizes its page to the screen, keeps its keys on screen and no longer covers the command line. - Ctrl+F with older history says both counts on one line (`this window 3 of 39 · older 4 of 6,000`). Older matches say diff --git a/CLAUDE.md b/CLAUDE.md index fe6c9950..57f65c80 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -2249,6 +2249,17 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] move), the tokens' card and edge, and a scrim over the main window (`SettingsPresenter.Scrim`; a press on it closes). Opened from the trigger builder (`SettingsForm.BesideOutput`) it is docked to the main window's right half with no scrim, so the line the rule came from stays in view. Still a separate OS window, not an overlay. + - **It is laid out as the Desktop-Settings mockup, on page tokens** (`NativeTokens.Page` → `PageTokens`, in + `NativeTokens.Page.cs`: ground, nav, card, rule, field, focus edge, button, popup, inks, link, search mark; the Dark + set is the mockup's hexes, Light mirrors it, other themes get the card's shift, every ink held to `TextFloor` on + every page plane; `PageTokens.Apply` lays them over `Apply` for Fluent). A 56 px header (title, search box with + glass and `N settings`, the scoped section's subject as *Applies to*, ✕), a 232 px nav (accent row for the section + in front, counts while searching, a note at its foot), a 36 px footer, and the page: a 20 px title, a line saying + what it shows (*Showing settings that match “x”. Show all N*, which clears the search; F5/F9's door is a link + there), then **one card per declared group** with its fields as rows (label in the label weight with search words + marked, `● Changed`, help under it; *Reset to default* link and the control on the right). A group whose name is its + only field's label draws no heading. List and package pages put both halves in cards. Still generated from the + declarations; nothing is placed by hand. Fonts are inherited (the window sets no UI family). - **Every native surface spells a key in words** (`NativeKeys.Words`, Avalonia: `KeyGlyphs.Words` plus the named keys `⏎` Enter, `⇥`/`↹` Tab, `⇤` Shift+Tab, `⌫` Backspace, `⌦` Delete, `⎋` Esc, `⇞`/`⇟` PgUp/PgDn; arrows stay arrows): `Ctrl+P`, `Alt+M`, `Ctrl+B b`, never `⌃P`/`⌥M`/`⏎`. The client writes keys in glyphs because the cells draw them diff --git a/src/SharpMUTerm.Avalonia/ListEditorView.cs b/src/SharpMUTerm.Avalonia/ListEditorView.cs index 8bdcf25b..03af45ad 100644 --- a/src/SharpMUTerm.Avalonia/ListEditorView.cs +++ b/src/SharpMUTerm.Avalonia/ListEditorView.cs @@ -54,7 +54,7 @@ public ListEditorView(SettingsForm form, SettingsSectionContribution section, Fu _visible = visible; _tokens = tokens; _accent = tokens.Brush(tokens.Accent); - ColumnDefinitions = new ColumnDefinitions("292,*"); + ColumnDefinitions = new ColumnDefinitions("316,*"); Margin = new Thickness(0, 10, 0, 0); AddButton = ToolButton("+ Add", $"Add a {_collection.Noun} to the selected set"); @@ -81,22 +81,22 @@ public ListEditorView(SettingsForm form, SettingsSectionContribution section, Fu _list.SelectionChanged += (_, _) => OnRowChosen(); _list.KeyDown += OnListKey; - var left = new DockPanel { LastChildFill = true, Margin = new Thickness(0, 0, 14, 0) }; + // Both halves are cards on the page, as the settings mockup draws its sections: the list with its tools over it, + // and the selected item's fields. + var page = tokens.Page; + var left = new DockPanel { LastChildFill = true }; DockPanel.SetDock(tools, Dock.Top); + tools.Margin = new Thickness(10, 10, 10, 4); left.Children.Add(tools); - left.Children.Add(new Border - { - Child = _list, - BorderThickness = new Thickness(1), - BorderBrush = Hairline, - CornerRadius = new CornerRadius(NativeTokens.RadiusM), - }); - Children.Add(left); + _list.Margin = new Thickness(4, 0, 4, 6); + left.Children.Add(_list); + Children.Add(PageCard(left, page, new Thickness(0), new Thickness(0, 0, 16, 0))); - _detail = new StackPanel { Spacing = 2, Margin = new Thickness(4, 0, 4, 16) }; + _detail = new StackPanel { Spacing = 2, Margin = new Thickness(20, 16, 20, 18) }; var scroller = new ScrollViewer { Content = _detail, HorizontalScrollBarVisibility = global::Avalonia.Controls.Primitives.ScrollBarVisibility.Disabled }; - SetColumn(scroller, 1); - Children.Add(scroller); + var detailCard = PageCard(scroller, page, new Thickness(0), new Thickness(0)); + SetColumn(detailCard, 1); + Children.Add(detailCard); // The item this section had selected last (switched away from, or the window closed) wins over the first — // unless the form opened on an item of this list (the trigger builder's new rule). @@ -196,14 +196,27 @@ public void Refresh() // ── the list ───────────────────────────────────────────────────────────────────────────────── - private IBrush Hairline => _tokens.Brush(_tokens.Edge); + private IBrush Hairline => _tokens.Page.Brush(_tokens.Page.Rule); + + /// A card on the settings page: the card plane, a hairline edge, the card radius. + internal static Border PageCard(Control child, PageTokens page, Thickness padding, Thickness margin) => new() + { + Child = child, + Background = page.Brush(page.Card), + BorderBrush = page.Brush(page.Rule), + BorderThickness = new Thickness(1), + CornerRadius = new CornerRadius(NativeTokens.RadiusCard), + Padding = padding, + Margin = margin, + ClipToBounds = true, + }; /// A quiet line's ink, held to the floor (an opacity would not be). - private IBrush DimInk => _tokens.Brush(_tokens.Dim); + private IBrush DimInk => _tokens.Page.Brush(_tokens.Page.Dim); private static Button ToolButton(string text, string tip) { - var button = new Button { Content = text, Padding = new Thickness(8, 3), MinWidth = 32, HorizontalContentAlignment = HorizontalAlignment.Center }; + var button = new Button { Content = text, Padding = new Thickness(10, 4), MinWidth = 32, FontSize = NativeTokens.Label, HorizontalContentAlignment = HorizontalAlignment.Center }; ToolTip.SetTip(button, NativeKeys.Words(tip)); AutomationProperties.SetName(button, tip); return button; @@ -445,7 +458,7 @@ private void BuildDetail() } var title = _collection.TitleOf(item); - _detail.Children.Add(new TextBlock { Text = title.Length == 0 ? "(unnamed)" : NativeKeys.Words(title), FontSize = NativeTokens.Heading, FontWeight = FontWeight.SemiBold, TextTrimming = TextTrimming.CharacterEllipsis }); + _detail.Children.Add(new TextBlock { Text = title.Length == 0 ? "(unnamed)" : NativeKeys.Words(title), FontSize = NativeTokens.PageTitle - 2, FontWeight = FontWeight.SemiBold, TextTrimming = TextTrimming.CharacterEllipsis }); if (group.ReadOnly) { var banner = new DockPanel { LastChildFill = true, Margin = new Thickness(0, 6, 0, 4) }; @@ -521,7 +534,7 @@ private static Grid Row(SettingsField field, Control control) { var grid = new Grid { ColumnDefinitions = new ColumnDefinitions("118,*"), Margin = new Thickness(0, 3), MinHeight = 34 }; var words = new StackPanel { VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(0, 0, 12, 0) }; - words.Children.Add(new TextBlock { Text = NativeKeys.Words(Capitalise(field.Label)), FontSize = NativeTokens.Title, TextWrapping = TextWrapping.Wrap }); + words.Children.Add(new TextBlock { Text = NativeKeys.Words(Capitalise(field.Label)), FontSize = NativeTokens.Label, FontWeight = FontWeight.SemiBold, TextWrapping = TextWrapping.Wrap }); if (field.Help is { } help) { ToolTip.SetTip(words, NativeKeys.Words(Capitalise(help))); diff --git a/src/SharpMUTerm.Avalonia/NativeTokens.Page.cs b/src/SharpMUTerm.Avalonia/NativeTokens.Page.cs new file mode 100644 index 00000000..6cfedc24 --- /dev/null +++ b/src/SharpMUTerm.Avalonia/NativeTokens.Page.cs @@ -0,0 +1,177 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Media; +using SharpMUTerm.Core.Text; + +namespace SharpMUTerm.Avalonia; + +/// +/// The page tokens: the planes a full page is built from (the settings window), as against a surface floating over the +/// cells (the palette, a modal). The settings mockup lays a page out on three planes — a ground, a navigation column a +/// step above it and cards a step above that — with hairline rules, inputs sunk into the ground and a yellow mark for a +/// search match. The Dark set is the mockup's own; the Light set mirrors it; any other theme gets the same shift of its +/// background the canonical card gets, and every ink is held to on every page plane. +/// +internal sealed partial record NativeTokens +{ + /// A page's own heading (the settings section's title). + public const double PageTitle = 20; + + /// A card's heading on a page (a settings group). + public const double CardTitle = 15; + + /// A field's label on a page. + public const double Label = 13; + + /// Corner radius of an input, a button or a navigation row on a page. + public const double RadiusControl = 6; + + /// Corner radius of a card on a page. + public const double RadiusCard = 10; + + /// The page planes and inks for this theme. + public PageTokens Page => PageFor(this); + + private sealed record PageCanon( + Rgb Ground, Rgb Nav, Rgb Card, Rgb Rule, Rgb Field, Rgb FieldEdge, Rgb FocusEdge, Rgb Button, Rgb Popup, + Rgb PopupSelected, Rgb Text, Rgb Dim, Rgb Mark, Rgb MarkInk); + + /// The settings mockup's dark page. + private static readonly PageCanon DarkPage = new( + new Rgb(0x10, 0x13, 0x1a), + new Rgb(0x14, 0x18, 0x22), + new Rgb(0x17, 0x1b, 0x24), + new Rgb(0x2c, 0x34, 0x47), + new Rgb(0x10, 0x13, 0x1a), + new Rgb(0x2c, 0x34, 0x47), + new Rgb(0x3a, 0x4f, 0x73), + new Rgb(0x1d, 0x23, 0x33), + new Rgb(0x1d, 0x23, 0x33), + new Rgb(0x23, 0x30, 0x49), + new Rgb(0xd7, 0xde, 0xec), + new Rgb(0x9a, 0xa4, 0xb8), + new Rgb(0x4a, 0x42, 0x20), + new Rgb(0xf5, 0xe6, 0x63)); + + /// The same page mirrored for a light theme. + private static readonly PageCanon LightPage = new( + new Rgb(0xf3, 0xf4, 0xf7), + new Rgb(0xec, 0xee, 0xf3), + new Rgb(0xff, 0xff, 0xff), + new Rgb(0xdd, 0xe1, 0xe8), + new Rgb(0xff, 0xff, 0xff), + new Rgb(0xc9, 0xcf, 0xda), + new Rgb(0x7d, 0x8f, 0xb0), + new Rgb(0xf4, 0xf5, 0xf8), + new Rgb(0xff, 0xff, 0xff), + new Rgb(0xe3, 0xea, 0xf5), + new Rgb(0x1d, 0x22, 0x2c), + new Rgb(0x5a, 0x63, 0x73), + new Rgb(0xfb, 0xea, 0xa0), + new Rgb(0x4a, 0x3c, 0x00)); + + private static PageTokens PageFor(NativeTokens tokens) + { + var canon = tokens.IsDark ? DarkCanon : LightCanon; + var page = tokens.IsDark ? DarkPage : LightPage; + + // The theme's shift off the canonical background, recovered from the card it was laid onto. + var shift = (tokens.Card.R - canon.Card.R, tokens.Card.G - canon.Card.G, tokens.Card.B - canon.Card.B); + var ground = Shift(page.Ground, shift); + var nav = Shift(page.Nav, shift); + var card = Shift(page.Card, shift); + var field = Shift(page.Field, shift); + var button = Shift(page.Button, shift); + var popup = Shift(page.Popup, shift); + var popupSelected = Shift(page.PopupSelected, shift); + Rgb[] planes = [ground, nav, card, field, button, popup, popupSelected]; + var accent = new Rgb(tokens.Accent.R, tokens.Accent.G, tokens.Accent.B); + var mark = Shift(page.Mark, shift); + + return new PageTokens( + Colour(ground), + Colour(nav), + Colour(card), + Colour(Shift(page.Rule, shift)), + Colour(field), + Colour(Shift(page.FieldEdge, shift)), + Colour(Shift(page.FocusEdge, shift)), + Colour(button), + Colour(popup), + Colour(popupSelected), + Colour(Held(page.Text, planes)), + Colour(Held(page.Dim, planes)), + Colour(Held(accent, planes)), + Colour(mark), + Colour(Held(page.MarkInk, [mark]))); + } +} + +/// A page's planes and inks (). +internal sealed record PageTokens( + Color Ground, + Color Nav, + Color Card, + Color Rule, + Color Field, + Color FieldEdge, + Color FocusEdge, + Color Button, + Color Popup, + Color PopupSelected, + Color Text, + Color Dim, + Color Link, + Color Mark, + Color MarkInk) +{ + /// A brush of . + public SolidColorBrush Brush(Color colour) => new(colour); + + /// + /// Lays the page planes over what handed Fluent: inputs sunk into the ground with a + /// hairline edge and the focus edge when focused, buttons on the raised button plane, drop-downs on the popup plane, + /// and the control radius the page uses. + /// + public void Apply(IResourceDictionary resources) + { + ArgumentNullException.ThrowIfNull(resources); + + void Set(Color colour, params string[] keys) + { + var brush = Brush(colour); + foreach (var key in keys) + { + resources[key] = brush; + } + } + + Set(Field, + "TextControlBackground", "TextControlBackgroundPointerOver", "TextControlBackgroundFocused", + "ComboBoxBackground", "ComboBoxBackgroundPointerOver", "ComboBoxBackgroundFocused"); + Set(FieldEdge, + "TextControlBorderBrush", "ComboBoxBorderBrush", + "ButtonBorderBrush", "RepeatButtonBorderBrush", "ToggleSwitchStrokeOff", + "CheckBoxCheckBackgroundStrokeUnchecked"); + Set(FocusEdge, + "TextControlBorderBrushFocused", "ComboBoxBorderBrushPointerOver", "ButtonBorderBrushPointerOver", + "TextControlBorderBrushPointerOver", "ComboBoxDropDownBorderBrush"); + Set(Button, "ButtonBackground", "RepeatButtonBackground", "ToggleSwitchFillOff", "ToggleSwitchFillOffPointerOver"); + Set(PopupSelected, + "ButtonBackgroundPointerOver", "ButtonBackgroundPressed", "RepeatButtonBackgroundPointerOver", + "ComboBoxItemBackgroundPointerOver", "ComboBoxItemBackgroundSelected", "ComboBoxItemBackgroundSelectedPointerOver", + "ListBoxItemBackgroundPointerOver", "ListBoxItemBackgroundSelected", "ListBoxItemBackgroundSelectedPointerOver", + "ListBoxItemBackgroundSelectedPressed", "SystemControlHighlightListAccentLowBrush", + "SystemControlHighlightListAccentMediumBrush", "SystemControlHighlightListAccentHighBrush"); + Set(Card, "TabItemHeaderBackgroundSelected"); + Set(Popup, "ComboBoxDropDownBackground", "FlyoutPresenterBackground", "MenuFlyoutPresenterBackground"); + Set(Text, + "TextControlForeground", "TextControlForegroundPointerOver", "TextControlForegroundFocused", "ButtonForeground", + "ButtonForegroundPointerOver", "ButtonForegroundPressed", "ComboBoxForeground", "ComboBoxItemForeground", + "ComboBoxItemForegroundSelected", "ListBoxItemForeground", "ListBoxItemForegroundPointerOver", + "ToggleSwitchContentForeground", "CheckBoxForegroundUnchecked", "CheckBoxForegroundChecked"); + Set(Dim, "TextControlPlaceholderForeground", "TextControlPlaceholderForegroundPointerOver", + "TextControlPlaceholderForegroundFocused"); + resources["ControlCornerRadius"] = new CornerRadius(NativeTokens.RadiusControl); + } +} diff --git a/src/SharpMUTerm.Avalonia/NativeTokens.cs b/src/SharpMUTerm.Avalonia/NativeTokens.cs index 8c8bb89f..356363c8 100644 --- a/src/SharpMUTerm.Avalonia/NativeTokens.cs +++ b/src/SharpMUTerm.Avalonia/NativeTokens.cs @@ -25,7 +25,7 @@ namespace SharpMUTerm.Avalonia; /// their reasons. /// /// -internal sealed record NativeTokens( +internal sealed partial record NativeTokens( bool IsDark, Color Scrim, Color Card, diff --git a/src/SharpMUTerm.Avalonia/PackagePageView.cs b/src/SharpMUTerm.Avalonia/PackagePageView.cs index 235fa095..575db670 100644 --- a/src/SharpMUTerm.Avalonia/PackagePageView.cs +++ b/src/SharpMUTerm.Avalonia/PackagePageView.cs @@ -186,25 +186,20 @@ public void Refresh() private Grid MasterDetail(Control list, Control detail) { - var grid = new Grid { ColumnDefinitions = new ColumnDefinitions("260,*"), Margin = new Thickness(0, 10, 0, 0) }; - grid.Children.Add(new Border - { - Child = list, - BorderThickness = new Thickness(1), - BorderBrush = Hairline, - CornerRadius = new CornerRadius(NativeTokens.RadiusM), - Margin = new Thickness(0, 0, 14, 0), - }); + var grid = new Grid { ColumnDefinitions = new ColumnDefinitions("260,*"), Margin = new Thickness(0, 12, 0, 0) }; + var page = _tokens.Page; + grid.Children.Add(ListEditorView.PageCard(list, page, new Thickness(4, 6), new Thickness(0, 0, 16, 0))); var scroller = new ScrollViewer { Content = detail, HorizontalScrollBarVisibility = ScrollBarVisibility.Disabled }; - SetColumn(scroller, 1); - grid.Children.Add(scroller); + var card = ListEditorView.PageCard(scroller, page, new Thickness(16, 12, 4, 0), new Thickness(0)); + SetColumn(card, 1); + grid.Children.Add(card); return grid; } - private IBrush Hairline => _tokens.Brush(_tokens.Edge); + private IBrush Hairline => _tokens.Page.Brush(_tokens.Page.Rule); /// A quiet line's ink, held to the floor (an opacity would not be). - private IBrush DimInk => _tokens.Brush(_tokens.Dim); + private IBrush DimInk => _tokens.Page.Brush(_tokens.Page.Dim); private IBrush Warning => _tokens.Brush(_tokens.Warn); diff --git a/src/SharpMUTerm.Avalonia/SettingsWindow.cs b/src/SharpMUTerm.Avalonia/SettingsWindow.cs index e8ab8618..060a00e4 100644 --- a/src/SharpMUTerm.Avalonia/SettingsWindow.cs +++ b/src/SharpMUTerm.Avalonia/SettingsWindow.cs @@ -2,6 +2,7 @@ using Avalonia; using Avalonia.Automation; using Avalonia.Controls; +using Avalonia.Controls.Documents; using Avalonia.Controls.Primitives; using Avalonia.Controls.Shapes; using Avalonia.Input; @@ -44,6 +45,16 @@ internal sealed class SettingsWindow : Window private readonly List _themeCards = []; private readonly Border _frame; private readonly TextBlock _title; + private readonly Border _bar; + private readonly Border _searchFrame; + private readonly TextBlock _searchCount; + private readonly global::Avalonia.Controls.Shapes.Path _searchGlass; + private readonly ContentControl _scope; + private readonly Border _nav; + private readonly TextBlock _navNote; + private readonly Border _footer; + private readonly TextBlock _footerLeft; + private readonly TextBlock _footerRight; private SettingsForm _form; private NativeTokens _tokens; private IReadOnlyList _matches = []; @@ -53,7 +64,7 @@ internal sealed class SettingsWindow : Window private int _meterRows = -1; /// The size the window first opens at, before the player resizes it. - internal const double DefaultWidth = 960, DefaultHeight = 680; + internal const double DefaultWidth = 1120, DefaultHeight = 760; public SettingsWindow(SettingsForm form) { @@ -63,7 +74,7 @@ public SettingsWindow(SettingsForm form) Width = DefaultWidth; Height = DefaultHeight; MinWidth = 640; - MinHeight = 420; + MinHeight = 440; WindowStartupLocation = WindowStartupLocation.CenterOwner; // The palette's frame, not the platform's: the window draws its own title, close button and edge, so it reads @@ -71,19 +82,20 @@ public SettingsWindow(SettingsForm form) WindowDecorations = WindowDecorations.None; Styles.Add(new FluentTheme()); + // ── the header: title, search, the subject a scoped section is for, close ── _title = new TextBlock { Text = "Settings", - FontSize = NativeTokens.Title, + FontSize = NativeTokens.CardTitle + 1, FontWeight = FontWeight.SemiBold, VerticalAlignment = VerticalAlignment.Center, - Margin = new Thickness(16, 0, 0, 0), + Width = 212, }; CloseButton = new Button { Content = "✕", Padding = new Thickness(10, 4), - Margin = new Thickness(0, 0, 8, 0), + Margin = new Thickness(12, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center, Background = Brushes.Transparent, BorderThickness = new Thickness(0), @@ -91,35 +103,107 @@ public SettingsWindow(SettingsForm form) AutomationProperties.SetName(CloseButton, "Close settings"); ToolTip.SetTip(CloseButton, "Close (Esc)"); CloseButton.Click += (_, _) => Close(); - var bar = new DockPanel { Height = 40, LastChildFill = true, Background = Brushes.Transparent }; - DockPanel.SetDock(CloseButton, Dock.Right); - bar.Children.Add(CloseButton); - bar.Children.Add(_title); - bar.PointerPressed += (_, e) => - { - if (e.GetCurrentPoint(bar).Properties.IsLeftButtonPressed && !ReferenceEquals(e.Source, CloseButton)) - { - BeginMoveDrag(e); - } - }; - DockPanel.SetDock(bar, Dock.Top); _search = new TextBox { PlaceholderText = "Search settings", - Margin = new Thickness(16, 4, 16, 10), - FontSize = NativeTokens.Title, - Padding = new Thickness(12, 7), + FontSize = NativeTokens.Label, + Padding = new Thickness(0, 2), + MinHeight = 0, + BorderThickness = new Thickness(0), + Background = Brushes.Transparent, + VerticalAlignment = VerticalAlignment.Center, }; + foreach (var key in new[] + { + "TextControlBackground", "TextControlBackgroundPointerOver", "TextControlBackgroundFocused", + "TextControlBorderBrush", "TextControlBorderBrushPointerOver", "TextControlBorderBrushFocused", + }) + { + _search.Resources[key] = Brushes.Transparent; + } + AutomationProperties.SetName(_search, "Search settings"); _search.TextChanged += (_, _) => OnQuery(); - DockPanel.SetDock(_search, Dock.Top); - - _sections = new ListBox { Width = 250, Margin = new Thickness(8, 0, 0, 12), Background = Brushes.Transparent }; + _searchCount = new TextBlock { FontSize = NativeTokens.Body, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(8, 0, 0, 0) }; + _searchGlass = new global::Avalonia.Controls.Shapes.Path + { + Data = Geometry.Parse("M6,0 A6,6 0 1 1 6,12 A6,6 0 1 1 6,0 M10.5,10.5 L14,14"), + StrokeThickness = 1.6, + Width = 14, + Height = 14, + Stretch = Stretch.Uniform, + VerticalAlignment = VerticalAlignment.Center, + Margin = new Thickness(0, 0, 8, 0), + }; + var searchRow = new Grid { ColumnDefinitions = new ColumnDefinitions("Auto,*,Auto") }; + searchRow.Children.Add(_searchGlass); + Grid.SetColumn(_search, 1); + searchRow.Children.Add(_search); + Grid.SetColumn(_searchCount, 2); + searchRow.Children.Add(_searchCount); + _searchFrame = new Border + { + Child = searchRow, + BorderThickness = new Thickness(1), + CornerRadius = new CornerRadius(NativeTokens.RadiusM), + Padding = new Thickness(12, 6), + HorizontalAlignment = HorizontalAlignment.Stretch, + VerticalAlignment = VerticalAlignment.Center, + Cursor = new Cursor(StandardCursorType.Ibeam), + }; + _searchFrame.PointerPressed += (_, _) => _search.Focus(); + + _scope = new ContentControl { VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(16, 0, 0, 0) }; + var header = new Grid { ColumnDefinitions = [new ColumnDefinition(GridLength.Auto), new ColumnDefinition(3, GridUnitType.Star) { MaxWidth = 480 }, new ColumnDefinition(GridLength.Star), new ColumnDefinition(GridLength.Auto), new ColumnDefinition(GridLength.Auto)], Margin = new Thickness(20, 0, 8, 0), Background = Brushes.Transparent }; + header.Children.Add(_title); + Grid.SetColumn(_searchFrame, 1); + header.Children.Add(_searchFrame); + Grid.SetColumn(_scope, 3); + header.Children.Add(_scope); + Grid.SetColumn(CloseButton, 4); + header.Children.Add(CloseButton); + _bar = new Border { Height = 56, BorderThickness = new Thickness(0, 0, 0, 1), Child = header }; + _bar.PointerPressed += (_, e) => + { + if (e.GetCurrentPoint(_bar).Properties.IsLeftButtonPressed + && (ReferenceEquals(e.Source, _bar) || ReferenceEquals(e.Source, header) || ReferenceEquals(e.Source, _title))) + { + BeginMoveDrag(e); + } + }; + DockPanel.SetDock(_bar, Dock.Top); + + // ── the footer ── + _footerLeft = new TextBlock { Text = "Changes apply to connected sessions as you make them.", FontSize = NativeTokens.Body, VerticalAlignment = VerticalAlignment.Center }; + _footerRight = new TextBlock { Text = "Ctrl+F searches · Esc closes", FontSize = NativeTokens.Body, VerticalAlignment = VerticalAlignment.Center }; + var footerRow = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto"), Margin = new Thickness(20, 0) }; + footerRow.Children.Add(_footerLeft); + Grid.SetColumn(_footerRight, 1); + footerRow.Children.Add(_footerRight); + _footer = new Border { Height = 36, BorderThickness = new Thickness(0, 1, 0, 0), Child = footerRow }; + DockPanel.SetDock(_footer, Dock.Bottom); + + // ── the section navigation ── + _sections = new ListBox { Background = Brushes.Transparent, Padding = new Thickness(0) }; _sections.SelectionChanged += (_, _) => OnSectionChosen(); - DockPanel.SetDock(_sections, Dock.Left); - - _page = new StackPanel { Margin = new Thickness(28, 4, 28, 28), Spacing = 2 }; + _navNote = new TextBlock + { + Text = "Every page here is drawn from the same declared settings the terminal's F-screens use.", + FontSize = NativeTokens.Body, + LineHeight = 18, + TextWrapping = TextWrapping.Wrap, + Margin = new Thickness(10, 8, 10, 4), + }; + var navDock = new DockPanel { LastChildFill = true }; + DockPanel.SetDock(_navNote, Dock.Bottom); + navDock.Children.Add(_navNote); + navDock.Children.Add(_sections); + _nav = new Border { Width = 232, BorderThickness = new Thickness(0, 0, 1, 0), Padding = new Thickness(10, 12), Child = navDock }; + DockPanel.SetDock(_nav, Dock.Left); + + // ── the page ── + _page = new StackPanel { Margin = new Thickness(40, 24, 40, 28), Spacing = 20 }; _scroller = new ScrollViewer { Content = _page, HorizontalScrollBarVisibility = ScrollBarVisibility.Disabled }; // A list editor fills the page below its title rather than scrolling with it: its list and its detail scroll @@ -138,9 +222,9 @@ public SettingsWindow(SettingsForm form) }; var dock = new DockPanel { LastChildFill = true }; - dock.Children.Add(bar); - dock.Children.Add(_search); - dock.Children.Add(_sections); + dock.Children.Add(_bar); + dock.Children.Add(_footer); + dock.Children.Add(_nav); dock.Children.Add(_scroller); _frame = new Border { BorderThickness = new Thickness(1), Child = dock }; @@ -197,11 +281,39 @@ private void ApplyTokens(NativeTokens tokens) _tokens = tokens; RequestedThemeVariant = tokens.IsDark ? ThemeVariant.Dark : ThemeVariant.Light; tokens.Apply(Resources); - Background = tokens.Brush(tokens.Card); - Foreground = tokens.Brush(tokens.Text); - _frame.BorderBrush = tokens.Brush(tokens.Edge); - _title.Foreground = tokens.Brush(tokens.Text); - CloseButton.Foreground = tokens.Brush(tokens.Dim); + var page = tokens.Page; + page.Apply(Resources); + foreach (var key in new[] { "SystemControlHighlightListAccentLowBrush", "SystemControlHighlightListAccentMediumBrush", "SystemControlHighlightListAccentHighBrush" }) + { + _sections.Resources[key] = tokens.Brush(tokens.Accent); + } + + _sections.Resources["ListBoxItemBackgroundSelected"] = tokens.Brush(tokens.Accent); + _sections.Resources["ListBoxItemBackgroundSelectedPointerOver"] = tokens.Brush(tokens.Accent); + _sections.Resources["ListBoxItemBackgroundSelectedPressed"] = tokens.Brush(tokens.Accent); + _sections.Resources["ListBoxItemForegroundSelected"] = tokens.Brush(tokens.AccentInk); + _sections.Resources["ListBoxItemForegroundSelectedPointerOver"] = tokens.Brush(tokens.AccentInk); + _sections.Resources["ListBoxItemBackgroundPointerOver"] = page.Brush(page.Button); + _sections.Resources["ListBoxItemBackgroundPressed"] = page.Brush(page.PopupSelected); + Background = page.Brush(page.Ground); + Foreground = page.Brush(page.Text); + _frame.BorderBrush = page.Brush(page.Rule); + _frame.Background = page.Brush(page.Ground); + _bar.Background = page.Brush(page.Card); + _bar.BorderBrush = page.Brush(page.Rule); + _footer.Background = page.Brush(page.Card); + _footer.BorderBrush = page.Brush(page.Rule); + _footerLeft.Foreground = page.Brush(page.Dim); + _footerRight.Foreground = page.Brush(page.Dim); + _nav.Background = page.Brush(page.Nav); + _nav.BorderBrush = page.Brush(page.Rule); + _navNote.Foreground = page.Brush(page.Dim); + _searchFrame.Background = page.Brush(page.Ground); + _searchFrame.BorderBrush = page.Brush(page.FocusEdge); + _searchGlass.Stroke = page.Brush(page.Dim); + _searchCount.Foreground = page.Brush(page.Dim); + _title.Foreground = page.Brush(page.Text); + CloseButton.Foreground = page.Brush(page.Dim); } /// The ids of the fields drawn on the right, in order, for a test. @@ -211,7 +323,7 @@ private void ApplyTokens(NativeTokens tokens) public IReadOnlyDictionary FieldControls => _controls; /// The height a list editor takes: the page's viewport less the title above it. - private double ListEditorHeight() => Math.Max(360, _scroller.Bounds.Height - 96); + private double ListEditorHeight() => Math.Max(360, _scroller.Bounds.Height - 124); /// F10's package manager page, or null on any other page. internal PackagePageView? PackagePage { get; private set; } @@ -278,14 +390,22 @@ private void BuildSectionList() var items = new List(); foreach (var section in _form.Sections) { - var title = new TextBlock { Text = section.Title, VerticalAlignment = VerticalAlignment.Center, TextTrimming = TextTrimming.CharacterEllipsis }; - var badge = new TextBlock { Foreground = DimInk, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(8, 0, 0, 0) }; + var title = new TextBlock { Text = section.Title, FontSize = NativeTokens.Label, VerticalAlignment = VerticalAlignment.Center, TextTrimming = TextTrimming.CharacterEllipsis }; + var badge = new TextBlock { FontSize = NativeTokens.Label, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(8, 0, 0, 0) }; _badges[section.Id] = badge; var row = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto") }; row.Children.Add(title); Grid.SetColumn(badge, 1); row.Children.Add(badge); - var item = new ListBoxItem { Content = row, Tag = section.Id, Padding = new Thickness(12, 9) }; + var item = new ListBoxItem + { + Content = row, + Tag = section.Id, + Padding = new Thickness(10, 8), + Margin = new Thickness(0, 0, 0, 2), + MinHeight = 0, + CornerRadius = new CornerRadius(NativeTokens.RadiusControl), + }; ToolTip.SetTip(item, SettingsForm.IsDeclared(section) ? section.Key : $"Opens the {section.Key} screen"); items.Add(item); } @@ -311,6 +431,30 @@ private void UpdateBadges() item.Opacity = searching && count == 0 ? 0.45 : 1; } } + + StyleNavigation(); + var total = _matches.Count(m => m.Field is not null); + _searchCount.Text = searching ? $"{total} setting{(total == 1 ? string.Empty : "s")}" : string.Empty; + } + + /// + /// The chosen section's row wears the accent with its ink and weight, as the mockup's does; the rest wear the page's + /// text, their counts quiet. (The row's fill is the list's own selected brush.) + /// + private void StyleNavigation() + { + var page = _tokens.Page; + foreach (var item in Items) + { + var chosen = Equals(item.Tag, _shown); + if (item.Content is Grid { Children: [TextBlock title, TextBlock badge] }) + { + title.FontWeight = chosen ? FontWeight.SemiBold : FontWeight.Normal; + title.Foreground = chosen ? _tokens.Brush(_tokens.AccentInk) : page.Brush(page.Text); + badge.FontWeight = title.FontWeight; + badge.Foreground = chosen ? _tokens.Brush(_tokens.AccentInk) : page.Brush(page.Dim); + } + } } private void OnSectionChosen() @@ -346,6 +490,7 @@ private void Select(string? id) _choosing = true; _sections.SelectedItem = Items.FirstOrDefault(i => Equals(i.Tag, id)); _choosing = false; + StyleNavigation(); } // ── search ─────────────────────────────────────────────────────────────────────────────────── @@ -390,15 +535,13 @@ private void BuildPage() _meterRows = -1; if (_shown is null || _form.Section(_shown) is not { } section) { + _scope.Content = null; ShownFields = []; return; } - _page.Children.Add(new TextBlock { Text = section.Title, FontSize = NativeTokens.Heading, FontWeight = FontWeight.SemiBold, Margin = new Thickness(0, 0, 0, 2) }); - if (section.Key is { } key) - { - _page.Children.Add(new TextBlock { Text = $"{key} in the client · changes apply as you make them", Foreground = DimInk, Margin = new Thickness(0, 0, 0, 6) }); - } + _scope.Content = section.Scope is SettingScope.World or SettingScope.Character ? SubjectRow(section) : null; + _page.Children.Add(PageHead(section)); if (section.Packages is not null) { @@ -455,14 +598,12 @@ private void BuildPage() return; } - if (section.Scope != SettingScope.App) + if (section.Scope != SettingScope.App && !_form.HasSubject(section)) { - _page.Children.Add(SubjectRow(section)); - if (!_form.HasSubject(section)) - { - ShownFields = []; - return; - } + var noun = section.Scope == SettingScope.World ? "world" : "character"; + _page.Children.Add(new TextBlock { Text = $"There is no {noun} yet. Add one on its own screen.", Foreground = DimInk }); + ShownFields = []; + return; } var visible = Searching @@ -473,24 +614,35 @@ private void BuildPage() _page.Children.Add(new TextBlock { Text = "No setting here matches the search.", Foreground = DimInk, Margin = new Thickness(0, 16, 0, 0) }); } + // A card per group, as the mockup draws its sections: the group's name heads it and its fields are rows inside, + // a hairline between them. + StackPanel? body = null; string? group = null; foreach (var field in visible) { - if (field.Group is { } heading && !string.Equals(heading, group, StringComparison.Ordinal)) + if (body is null || !string.Equals(field.Group, group, StringComparison.Ordinal)) { - group = heading; - _page.Children.Add(new TextBlock + group = field.Group; + body = new StackPanel(); + if (group is { } heading && !string.Equals(heading, field.Label, StringComparison.OrdinalIgnoreCase)) { - Text = heading.ToUpperInvariant(), - FontSize = NativeTokens.Small, - FontWeight = FontWeight.SemiBold, - LetterSpacing = 0.8, - Margin = new Thickness(0, 20, 0, 6), - Foreground = _tokens.Brush(_tokens.Header), - }); + body.Children.Add(new TextBlock + { + Text = heading, + FontSize = NativeTokens.CardTitle, + FontWeight = FontWeight.SemiBold, + Margin = new Thickness(0, 12, 0, 0), + }); + } + + _page.Children.Add(Card(body)); + } + else + { + body.Children.Add(new Border { Height = 1, Background = _tokens.Page.Brush(_tokens.Page.Rule) }); } - _page.Children.Add(field switch + body.Children.Add(field switch { ListField { Id: BuiltInSettings.MetersField } meters => MeterTable(meters), ThemeField theme => ThemePicker(theme), @@ -502,66 +654,134 @@ private void BuildPage() } /// - /// A scoped section's header row: which world or character its fields are for, picked from every one there is, and - /// the way to the section's own cell screen for what is not a field — the lists of characters and trigger sets, - /// adding and deleting. With nothing to edit yet it says so and offers only the screen. + /// The page's heading: the section's title and, under it, what the page is showing — the screen it is in the + /// terminal, or what the search matched with the way back to everything — and, for a scoped section, the way to its + /// own cell screen for what is not a field (the lists of characters and trigger sets, adding and deleting). /// - private StackPanel SubjectRow(SettingsSectionContribution section) + private StackPanel PageHead(SettingsSectionContribution section) { - var row = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 10, Margin = new Thickness(0, 6, 0, 2) }; - var subjects = _form.Subjects(section.Scope); - var noun = section.Scope == SettingScope.World ? "world" : "character"; - if (subjects.Count == 0) + var head = new StackPanel { Spacing = 6 }; + head.Children.Add(new TextBlock { Text = section.Title, FontSize = NativeTokens.PageTitle, FontWeight = FontWeight.SemiBold }); + var line = new WrapPanel { Orientation = Orientation.Horizontal }; + if (Searching) { - row.Children.Add(new TextBlock { Text = $"There is no {noun} yet.", VerticalAlignment = VerticalAlignment.Center, Foreground = DimInk }); + line.Children.Add(new TextBlock { Text = $"Showing settings that match “{_search.Text!.Trim()}”. ", FontSize = NativeTokens.Label, Foreground = DimInk, VerticalAlignment = VerticalAlignment.Center }); + var all = section.Fields.Count; + var clear = LinkButton(all > 0 ? $"Show all {all}" : "Show all"); + AutomationProperties.SetName(clear, "Clear the search"); + clear.Click += (_, _) => _search.Text = string.Empty; + line.Children.Add(clear); } - else + else if (section.Key is { } key) { - var labels = subjects.Select(s => s.Label).ToList(); - var current = _form.Subject(section.Scope); - var picker = new ComboBox { ItemsSource = labels, MinWidth = 240, SelectedItem = current?.Label }; - AutomationProperties.SetName(picker, $"The {noun} these settings are for"); - picker.SelectionChanged += (_, _) => - { - if (!_syncing && picker.SelectedIndex is >= 0 and var i && i < subjects.Count - && !string.Equals(subjects[i].Label, _form.Subject(section.Scope)?.Label, StringComparison.Ordinal)) - { - _form.Choose(subjects[i]); - var offset = _scroller.Offset; - BuildPage(); - _scroller.Offset = offset; - } - }; - SubjectPicker = picker; - row.Children.Add(new TextBlock { Text = section.Scope == SettingScope.World ? "World" : "Character", VerticalAlignment = VerticalAlignment.Center, FontWeight = FontWeight.SemiBold }); - row.Children.Add(picker); + line.Children.Add(new TextBlock { Text = $"{key} in the client · changes apply as you make them", FontSize = NativeTokens.Label, Foreground = DimInk, VerticalAlignment = VerticalAlignment.Center }); } - if (section.Key is { } key) + if (section.Scope is SettingScope.World or SettingScope.Character && section.Key is { } screen) { - var door = new Button { Content = $"Open the {key} screen ↗", VerticalAlignment = VerticalAlignment.Center }; + var door = LinkButton($"Open the {screen} screen ↗"); + door.Margin = new Thickness(line.Children.Count > 0 ? 12 : 0, 0, 0, 0); ToolTip.SetTip(door, section.Scope == SettingScope.World ? "Adding and deleting worlds, their characters and trigger sets are on the cell screen" : "Adding and deleting characters is on the cell screen"); - AutomationProperties.SetName(door, $"Open the {key} screen"); + AutomationProperties.SetName(door, $"Open the {screen} screen"); var id = section.Id; door.Click += (_, _) => _form.OpenScreen(id); ScreenDoor = door; - row.Children.Add(door); + line.Children.Add(door); } + if (line.Children.Count > 0) + { + head.Children.Add(line); + } + + return head; + } + + /// A card on the page: the card plane, a hairline edge, the card radius. + private Border Card(Control body) => new() + { + Child = body, + Background = _tokens.Page.Brush(_tokens.Page.Card), + BorderBrush = _tokens.Page.Brush(_tokens.Page.Rule), + BorderThickness = new Thickness(1), + CornerRadius = new CornerRadius(NativeTokens.RadiusCard), + Padding = new Thickness(20, 6), + }; + + /// A button drawn as a link in the accent, underlined, as the mockup's "Reset to default" and "Show all". + private Button LinkButton(string text) + { + var button = new Button + { + Content = new TextBlock { Text = text, TextDecorations = TextDecorations.Underline, FontSize = NativeTokens.Body }, + Background = Brushes.Transparent, + BorderThickness = new Thickness(0), + Padding = new Thickness(0), + MinHeight = 0, + VerticalAlignment = VerticalAlignment.Center, + Foreground = _tokens.Page.Brush(_tokens.Page.Link), + Cursor = new Cursor(StandardCursorType.Hand), + }; + foreach (var key in new[] { "ButtonBackgroundPointerOver", "ButtonBackgroundPressed", "ButtonBorderBrushPointerOver" }) + { + button.Resources[key] = Brushes.Transparent; + } + + foreach (var key in new[] { "ButtonForegroundPointerOver", "ButtonForegroundPressed" }) + { + button.Resources[key] = _tokens.Page.Brush(_tokens.Page.Link); + } + + return button; + } + + /// + /// A scoped section's subject, in the header as the mockup's "Applies to": which world or character the fields are + /// for, picked from every one there is. + /// + private Control SubjectRow(SettingsSectionContribution section) + { + var row = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 8 }; + var subjects = _form.Subjects(section.Scope); + var noun = section.Scope == SettingScope.World ? "world" : "character"; + if (subjects.Count == 0) + { + row.Children.Add(new TextBlock { Text = $"No {noun} yet", VerticalAlignment = VerticalAlignment.Center, Foreground = DimInk, FontSize = NativeTokens.Label }); + return row; + } + + var labels = subjects.Select(s => s.Label).ToList(); + var current = _form.Subject(section.Scope); + var picker = new ComboBox { ItemsSource = labels, MinWidth = 180, MaxWidth = 280, SelectedItem = current?.Label, FontSize = NativeTokens.Label }; + AutomationProperties.SetName(picker, $"The {noun} these settings are for"); + picker.SelectionChanged += (_, _) => + { + if (!_syncing && picker.SelectedIndex is >= 0 and var i && i < subjects.Count + && !string.Equals(subjects[i].Label, _form.Subject(section.Scope)?.Label, StringComparison.Ordinal)) + { + _form.Choose(subjects[i]); + var offset = _scroller.Offset; + BuildPage(); + _scroller.Offset = offset; + } + }; + SubjectPicker = picker; + row.Children.Add(new TextBlock { Text = section.Scope == SettingScope.World ? "Applies to world" : "Applies to character", VerticalAlignment = VerticalAlignment.Center, Foreground = DimInk, FontSize = NativeTokens.Label }); + row.Children.Add(picker); return row; } /// The theme field: a card per theme, its preview drawn from the client's model; a click uses it. private StackPanel ThemePicker(ThemeField field) { - var outer = new StackPanel { Spacing = 6, Margin = new Thickness(0, 4, 0, 4) }; - var words = new StackPanel { Spacing = 1 }; - words.Children.Add(new TextBlock { Text = NativeKeys.Words(Capitalise(field.Label)), FontSize = NativeTokens.Title }); + var outer = new StackPanel { Spacing = 6, Margin = new Thickness(0, 12, 0, 4) }; + var words = new StackPanel(); + words.Children.Add(LabelBlock(field.Label)); if (field.Help is { } help) { - words.Children.Add(new TextBlock { Text = NativeKeys.Words(Capitalise(help)), FontSize = NativeTokens.Body, Foreground = DimInk, TextWrapping = TextWrapping.Wrap }); + words.Children.Add(HelpBlock(help)); } outer.Children.Add(words); @@ -598,27 +818,88 @@ private StackPanel ThemePicker(ThemeField field) private string? CurrentTheme(ThemeField field) => field.Binding is SettingBinding binding ? _form.Get(binding) : null; - /// The accent the changed dot wears: the client's, as every native surface's. - private SolidColorBrush Accent => _tokens.Brush(_tokens.Accent); + /// The accent the changed dot wears: the client's, as every native surface's, held on the page's planes. + private SolidColorBrush Accent => _tokens.Page.Brush(_tokens.Page.Link); - /// A quiet line's ink, held to the floor (an opacity would not be). - private SolidColorBrush DimInk => _tokens.Brush(_tokens.Dim); + /// A quiet line's ink, held to the floor on the page's planes (an opacity would not be). + private SolidColorBrush DimInk => _tokens.Page.Brush(_tokens.Page.Dim); - /// One field: label and help on the left, its control, then the changed dot and the reset. - private Grid FieldRow(SettingsField field) + /// + /// A field's label, in the label weight, with every word of the search marked as the mockup marks "meter": the + /// page's mark plane behind it and the mark ink on it. + /// + private TextBlock LabelBlock(string label) { - var grid = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto,Auto"), Margin = new Thickness(0, 4), MinHeight = 44 }; + var text = NativeKeys.Words(Capitalise(label)); + var block = new TextBlock { FontSize = NativeTokens.Label, FontWeight = FontWeight.SemiBold, TextWrapping = TextWrapping.Wrap, VerticalAlignment = VerticalAlignment.Center }; + var words = Searching + ? _search.Text!.Split(' ', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries) + : []; + var marks = new bool[text.Length]; + foreach (var word in words) + { + for (var at = text.IndexOf(word, StringComparison.OrdinalIgnoreCase); at >= 0; at = text.IndexOf(word, at + word.Length, StringComparison.OrdinalIgnoreCase)) + { + Array.Fill(marks, true, at, word.Length); + } + } + + if (!marks.Contains(true)) + { + block.Text = text; + return block; + } + + var page = _tokens.Page; + for (var i = 0; i < text.Length;) + { + var marked = marks[i]; + var j = i; + while (j < text.Length && marks[j] == marked) + { + j++; + } + + var run = new Run(text[i..j]); + if (marked) + { + run.Background = page.Brush(page.Mark); + run.Foreground = page.Brush(page.MarkInk); + } + + block.Inlines!.Add(run); + i = j; + } + + return block; + } - var words = new StackPanel { VerticalAlignment = VerticalAlignment.Center, Spacing = 1, Margin = new Thickness(0, 0, 16, 0) }; - words.Children.Add(new TextBlock { Text = NativeKeys.Words(Capitalise(field.Label)), FontSize = NativeTokens.Title, TextWrapping = TextWrapping.Wrap }); + /// A field's help line under its label: quiet, wrapped. + private TextBlock HelpBlock(string help) => + new() { Text = NativeKeys.Words(Capitalise(help)), FontSize = NativeTokens.Body, Foreground = DimInk, TextWrapping = TextWrapping.Wrap, Margin = new Thickness(0, 2, 0, 0) }; + + /// + /// One field, as a row of its group's card: the label (with the changed mark beside it) and its help on the left; + /// the reset link and the control on the right. + /// + private Grid FieldRow(SettingsField field) + { + var grid = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto,Auto"), Margin = new Thickness(0, 12), MinHeight = 32 }; + + var words = new StackPanel { VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(0, 0, 16, 0) }; + var (changed, reset) = ChangedMark(field); + var top = new WrapPanel { Orientation = Orientation.Horizontal }; + top.Children.Add(LabelBlock(field.Label)); + top.Children.Add(changed); + words.Children.Add(top); if (field.Help is { } help) { - words.Children.Add(new TextBlock { Text = NativeKeys.Words(Capitalise(help)), FontSize = NativeTokens.Body, Foreground = DimInk, TextWrapping = TextWrapping.Wrap }); + words.Children.Add(HelpBlock(help)); } // The note the cell F5 draws beside the value (join wraps' recommendation), from the same sentence, in the // cells' caution amber; gone once the field has been changed. - var note = new TextBlock { FontSize = NativeTokens.Body, Foreground = _tokens.Brush(_tokens.Notice), TextWrapping = TextWrapping.Wrap }; + var note = new TextBlock { FontSize = NativeTokens.Body, Foreground = _tokens.Brush(_tokens.Notice), TextWrapping = TextWrapping.Wrap, Margin = new Thickness(0, 2, 0, 0) }; void ShowNote() { var text = _form.Note(field); @@ -633,43 +914,45 @@ void ShowNote() grid.Children.Add(words); + reset.Margin = new Thickness(0, 0, 16, 0); + Grid.SetColumn(reset, 1); + grid.Children.Add(reset); + var control = ControlFor(field); control.VerticalAlignment = VerticalAlignment.Center; AutomationProperties.SetName(control, field.Label); - Grid.SetColumn(control, 1); + Grid.SetColumn(control, 2); grid.Children.Add(control); _controls[field.Id] = control; - - grid.Children.Add(ChangedMark(field, column: 2)); return grid; } - /// The dot and reset button for , shown only while it differs from its default. - private StackPanel ChangedMark(SettingsField field, int column) + /// + /// The changed mark for — a dot and the word "Changed", beside the label — and its reset + /// link, both shown only while the field differs from its default. + /// + private (Control Changed, Button Reset) ChangedMark(SettingsField field) { - var dot = new Ellipse { Width = 8, Height = 8, Fill = Accent, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(14, 0, 8, 0) }; - ToolTip.SetTip(dot, "Changed from its default"); - var reset = new Button { Content = "Reset", Padding = new Thickness(10, 3), VerticalAlignment = VerticalAlignment.Center }; + var mark = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 6, Margin = new Thickness(10, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center }; + mark.Children.Add(new Ellipse { Width = 6, Height = 6, Fill = Accent, VerticalAlignment = VerticalAlignment.Center }); + mark.Children.Add(new TextBlock { Text = "Changed", FontSize = NativeTokens.Body, Foreground = DimInk, VerticalAlignment = VerticalAlignment.Center }); + ToolTip.SetTip(mark, "Changed from its default"); + var reset = LinkButton("Reset to default"); ToolTip.SetTip(reset, $"Back to the default: {SettingsForm.DefaultText(field)}"); AutomationProperties.SetName(reset, $"Reset {field.Label}"); reset.Click += (_, _) => _form.Reset(field); _resets[field.Id] = reset; - var panel = new StackPanel { Orientation = Orientation.Horizontal, VerticalAlignment = VerticalAlignment.Center, MinWidth = 100 }; - panel.Children.Add(dot); - panel.Children.Add(reset); - Grid.SetColumn(panel, column); - void Refresh() { var changed = !_form.IsDefault(field); - dot.Opacity = changed ? 1 : 0; + mark.IsVisible = changed; reset.IsVisible = changed; } Refresh(); _refreshers.Add(Refresh); - return panel; + return (mark, reset); } /// The native control for a field's kind, wired to the form and refreshed from it. @@ -822,35 +1105,38 @@ private static StackPanel Swatch(string name) private StackPanel MeterTable(ListField field) { - var outer = new StackPanel { Spacing = 8, Margin = new Thickness(0, 4, 0, 4) }; + var outer = new StackPanel { Spacing = 10, Margin = new Thickness(0, 12, 0, 4) }; + var page = _tokens.Page; var top = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto") }; - var words = new StackPanel { Spacing = 1 }; - words.Children.Add(new TextBlock { Text = NativeKeys.Words(Capitalise(field.Label)), FontSize = NativeTokens.Title }); + var (changed, reset) = ChangedMark(field); + var heading = new WrapPanel { Orientation = Orientation.Horizontal }; + heading.Children.Add(LabelBlock(field.Label)); + heading.Children.Add(changed); + top.Children.Add(heading); + Grid.SetColumn(reset, 1); + top.Children.Add(reset); + outer.Children.Add(top); if (field.Help is { } help) { - words.Children.Add(new TextBlock { Text = NativeKeys.Words(Capitalise(help)), FontSize = NativeTokens.Body, Foreground = DimInk, TextWrapping = TextWrapping.Wrap }); + outer.Children.Add(HelpBlock(help)); } - top.Children.Add(words); - top.Children.Add(ChangedMark(field, column: 1)); - outer.Children.Add(top); - var received = _form.Received(); var paths = received.Select(r => r.Path).ToList(); var meters = _form.Meters(field); _meterRows = meters.Count; - var grid = new Grid { ColumnDefinitions = new ColumnDefinitions("110,*,*,100,Auto"), ColumnSpacing = 8, RowSpacing = 6 }; + var grid = new Grid { ColumnDefinitions = new ColumnDefinitions("120,*,*,120,32"), ColumnSpacing = 8, RowSpacing = 8 }; MeterGrid = grid; _controls[field.Id] = grid; - string[] headings = ["Label", "Value path", "Maximum path", "Now"]; + string[] headings = ["Label", "Value path", "Maximum path", "Live value"]; grid.RowDefinitions.Add(new RowDefinition(GridLength.Auto)); for (var c = 0; c < headings.Length; c++) { - var heading = new TextBlock { Text = headings[c], FontSize = NativeTokens.Body, FontWeight = FontWeight.SemiBold, Foreground = DimInk }; - Grid.SetColumn(heading, c); - grid.Children.Add(heading); + var title = new TextBlock { Text = headings[c], FontSize = NativeTokens.Body, Foreground = DimInk }; + Grid.SetColumn(title, c); + grid.Children.Add(title); } AutoCompleteBox? lastPath = null; @@ -862,7 +1148,7 @@ private StackPanel MeterTable(ListField field) var row = i + 1; grid.RowDefinitions.Add(new RowDefinition(GridLength.Auto)); - var label = new TextBox { Text = meter.Label, MaxLength = StatusMeter.MaxLabelLength }; + var label = new TextBox { Text = meter.Label, MaxLength = StatusMeter.MaxLabelLength, FontSize = NativeTokens.Label }; AutomationProperties.SetName(label, $"meter {row} label"); label.LostFocus += (_, _) => { @@ -878,10 +1164,18 @@ private StackPanel MeterTable(ListField field) value.GotFocus += (_, _) => lastPath = value; max.GotFocus += (_, _) => lastPath = max; - var now = new TextBlock { VerticalAlignment = VerticalAlignment.Center, FontWeight = FontWeight.SemiBold }; + var now = new TextBlock { VerticalAlignment = VerticalAlignment.Center, FontFamily = Mono, FontSize = NativeTokens.Body }; _meterNow.Add((meter, now)); - var remove = new Button { Content = "✕", Padding = new Thickness(9, 3) }; + var remove = new Button + { + Content = "✕", + Padding = new Thickness(8, 3), + Background = Brushes.Transparent, + BorderThickness = new Thickness(0), + Foreground = DimInk, + HorizontalAlignment = HorizontalAlignment.Center, + }; ToolTip.SetTip(remove, $"Remove {meter.Label}"); AutomationProperties.SetName(remove, $"Remove meter {meter.Label}"); var index = i; @@ -902,37 +1196,29 @@ private StackPanel MeterTable(ListField field) outer.Children.Add(grid); - var add = new Button { Content = "+ Meter", HorizontalAlignment = HorizontalAlignment.Left }; - AutomationProperties.SetName(add, "Add a meter"); - add.Click += (_, _) => - { - meters.Add(new StatusMeter { Label = "new" }); - Commit(); - }; - outer.Children.Add(add); - - // What this connection has received, to pick a path from: a click puts it in the path box last used. - var box = new StackPanel { Spacing = 2 }; - box.Children.Add(new TextBlock { Text = "Received on this connection", FontSize = NativeTokens.Body, FontWeight = FontWeight.SemiBold, Foreground = DimInk, Margin = new Thickness(0, 2, 0, 2) }); + // What this connection has received, to pick a path from: a click puts it in the path box last used. Drawn as the + // mockup's drop-down panel, under the path columns. + var box = new StackPanel(); + box.Children.Add(new TextBlock { Text = "Paths this connection has received", FontSize = NativeTokens.Body, Foreground = DimInk, Margin = new Thickness(12, 4, 12, 4) }); if (received.Count == 0) { - box.Children.Add(new TextBlock { Text = "Nothing yet — a meter shows once its value arrives.", FontSize = NativeTokens.Body, Foreground = DimInk }); + box.Children.Add(new TextBlock { Text = "Nothing yet — a meter shows once its value arrives.", FontSize = NativeTokens.Body, Foreground = DimInk, Margin = new Thickness(12, 4, 12, 6) }); } foreach (var item in received.Take(40)) { - var line = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto") }; - line.Children.Add(new TextBlock { Text = item.Path, FontFamily = FontFamily.Parse("monospace"), FontSize = NativeTokens.Body }); - var v = new TextBlock { Text = item.Value, FontSize = NativeTokens.Body, Foreground = DimInk, Margin = new Thickness(16, 0, 0, 0) }; - Grid.SetColumn(v, 1); - line.Children.Add(v); + var line = new TextBlock { FontFamily = Mono, FontSize = NativeTokens.Body, TextTrimming = TextTrimming.CharacterEllipsis }; + line.Inlines!.Add(new Run(item.Path) { Foreground = page.Brush(page.Text) }); + line.Inlines.Add(new Run($" = {item.Value}") { Foreground = DimInk }); var pick = new Button { Content = line, Background = Brushes.Transparent, - Padding = new Thickness(6, 2), + BorderThickness = new Thickness(0), + CornerRadius = new CornerRadius(0), + Padding = new Thickness(12, 6), HorizontalAlignment = HorizontalAlignment.Stretch, - HorizontalContentAlignment = HorizontalAlignment.Stretch, + HorizontalContentAlignment = HorizontalAlignment.Left, }; ToolTip.SetTip(pick, "Use this path in the path box you were last in"); pick.Click += (_, _) => @@ -949,23 +1235,40 @@ private StackPanel MeterTable(ListField field) outer.Children.Add(new Border { Child = box, + Background = page.Brush(page.Popup), BorderThickness = new Thickness(1), - BorderBrush = _tokens.Brush(_tokens.Edge), + BorderBrush = page.Brush(page.FocusEdge), CornerRadius = new CornerRadius(NativeTokens.RadiusM), - Padding = new Thickness(10, 6, 10, 8), - Margin = new Thickness(0, 4, 0, 0), + Padding = new Thickness(0, 8), + Margin = new Thickness(128, 0, 0, 0), + MaxWidth = 420, + HorizontalAlignment = HorizontalAlignment.Left, }); + var add = new Button { Content = "+ Add a meter", HorizontalAlignment = HorizontalAlignment.Left, Padding = new Thickness(12, 6), FontSize = NativeTokens.Label }; + AutomationProperties.SetName(add, "Add a meter"); + add.Click += (_, _) => + { + meters.Add(new StatusMeter { Label = "new" }); + Commit(); + }; + outer.Children.Add(add); + Tick(); return outer; } + /// The page's monospace face, for paths and values (the mockup's game-text face). + private static readonly FontFamily Mono = FontFamily.Parse("monospace"); + private static AutoCompleteBox PathBox(string? text, IReadOnlyList paths, string name, Action set, Action commit) { var box = new AutoCompleteBox { Text = text ?? string.Empty, ItemsSource = paths, + FontFamily = Mono, + FontSize = NativeTokens.Body, FilterMode = AutoCompleteFilterMode.ContainsOrdinal, MinimumPrefixLength = 0, HorizontalAlignment = HorizontalAlignment.Stretch, @@ -1001,7 +1304,7 @@ private void Tick() { var text = _form.Now(meter); now.Text = text ?? "waiting"; - now.Opacity = text is null ? 0.6 : 1; + now.Foreground = text is null ? DimInk : _tokens.Page.Brush(_tokens.Page.Text); } } diff --git a/src/SharpMUTerm.Avalonia/ThemeCardView.cs b/src/SharpMUTerm.Avalonia/ThemeCardView.cs index b8dc3162..7be55109 100644 --- a/src/SharpMUTerm.Avalonia/ThemeCardView.cs +++ b/src/SharpMUTerm.Avalonia/ThemeCardView.cs @@ -29,7 +29,7 @@ public ThemeCardView(ThemeCard card, bool inUse, NativeTokens tokens) BorderThickness = new Thickness(0); HorizontalContentAlignment = HorizontalAlignment.Stretch; Margin = new Thickness(0, 0, 14, 14); - Width = 300; + Width = 264; AutomationProperties.SetName(this, $"Use the {card.Name} theme"); ToolTip.SetTip(this, $"Use {card.Name}"); @@ -46,7 +46,7 @@ public ThemeCardView(ThemeCard card, bool inUse, NativeTokens tokens) _frame = new Border { Child = body, - CornerRadius = new CornerRadius(NativeTokens.RadiusM), + CornerRadius = new CornerRadius(NativeTokens.RadiusCard), ClipToBounds = true, BorderThickness = new Thickness(2), }; @@ -64,12 +64,13 @@ public ThemeCardView(ThemeCard card, bool inUse, NativeTokens tokens) public void SetInUse(bool inUse, NativeTokens tokens) { ArgumentNullException.ThrowIfNull(tokens); - _frame.Background = tokens.Brush(tokens.Raised); - _state.Foreground = tokens.Brush(tokens.Dim); + var page = tokens.Page; + _frame.Background = page.Brush(page.Button); + _state.Foreground = page.Brush(page.Dim); InUse = inUse; var kind = $"{(Card.IsDark ? "dark" : "light")} · {(Card.IsCustom ? "your own" : "built in")}"; _state.Text = inUse ? $"In use · {kind}" : kind; - _frame.BorderBrush = tokens.Brush(inUse ? tokens.Accent : tokens.Edge); + _frame.BorderBrush = inUse ? page.Brush(page.Link) : page.Brush(page.Rule); } private static readonly FontFamily Mono = FontFamily.Parse("monospace"); diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativeTokenTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativeTokenTests.cs index 9a577b8d..87ece070 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/NativeTokenTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/NativeTokenTests.cs @@ -142,7 +142,7 @@ await Assert.That(Contrast.RelativeLuminance(backdrop)).IsGreaterThan(0.7) } /// - /// The settings window wears the tokens: its plane is the palette's card and Fluent's accent is the client's, not + /// The settings window wears the tokens: its plane is the page tokens' ground and Fluent's accent is the client's, not /// Fluent's own blue (#60cdff/#005fb8) — and it follows a Light theme the same way. /// [Test] @@ -172,11 +172,41 @@ public async Task TheSettingsWindowWearsTheTokens(string name) }, CancellationToken.None); var tokens = NativeTokens.For(theme); - await Assert.That(background).IsEqualTo(tokens.Card); + await Assert.That(background).IsEqualTo(tokens.Page.Ground).Because("a page stands on the page tokens' ground"); await Assert.That(accent).IsEqualTo(tokens.Accent); await Assert.That(close).IsTrue().Because("the frame has its own close button"); } + /// + /// The page tokens are the settings mockup's on Dark, and on every built-in theme each page ink clears the floor on + /// every page plane it can land on (and the search mark's ink on the mark). + /// + [Test] + [Arguments("Dark")] + [Arguments("Light")] + [Arguments("Solarized Dark")] + public async Task ThePageInksClearTheFloorOnEveryPagePlane(string name) + { + var page = NativeTokens.For(ThemeLibrary.Get(name)).Page; + static Rgb Of(Color c) => new(c.R, c.G, c.B); + foreach (var plane in new[] { page.Ground, page.Nav, page.Card, page.Field, page.Button, page.Popup, page.PopupSelected }) + { + foreach (var ink in new[] { page.Text, page.Dim, page.Link }) + { + await Assert.That(Contrast.Ratio(Of(ink), Of(plane))).IsGreaterThanOrEqualTo(NativeTokens.TextFloor) + .Because($"{name}: {ink} on {plane}"); + } + } + + await Assert.That(Contrast.Ratio(Of(page.MarkInk), Of(page.Mark))).IsGreaterThanOrEqualTo(NativeTokens.TextFloor); + if (name == "Dark") + { + await Assert.That(page.Ground).IsEqualTo(Color.Parse("#10131a")).Because("the mockup's ground"); + await Assert.That(page.Card).IsEqualTo(Color.Parse("#171b24")).Because("the mockup's card"); + await Assert.That(page.Rule).IsEqualTo(Color.Parse("#2c3447")).Because("the mockup's rule"); + } + } + /// /// The settings window is a modal over the main window: a scrim lies over it while it is open (a press on it closes /// the settings) and goes with it. Opened beside the output — the trigger builder — it is docked to the main window's diff --git a/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowTests.cs b/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowTests.cs index 49ac7f1a..d69cb5c6 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowTests.cs @@ -142,7 +142,7 @@ public async Task TheMeterTableHasARowPerMeterAndReadsNow() var rows = grid.RowDefinitions.Count; var now = grid.Children.OfType().Where(t => Grid.GetRow(t) == 1 && Grid.GetColumn(t) == 3).Select(t => t.Text).Single(); - var add = window.GetVisualDescendantsOf public static class PanelSizing { + /// + /// A vitals pane taking less than this fraction of the window's width (by the split weights above it) is a card + /// rather than a strip: a strip wants the width a card has no use for. + /// + public const double CardBelowWidthShare = 0.5; + + /// + /// The rows of content a vitals card takes for meters: its heading and a blank (the card + /// draws no tab strip, so it titles itself), two a meter (name and numbers, then the bar), a rule and two for the + /// target, which is reserved whether or not the game names one (a target arriving never reflows the column), and a + /// row under it. Twenty-pixel rows are what the window's stacked, headed gauges need for the same blocks. + /// + public static int VitalsCardRows(int meters) => (2 * Math.Max(0, meters)) + 6; + /// The rows of content a docked composer is never squeezed below: its header, four rows of post and its key hints. public const int ComposerMinRows = 6; @@ -35,8 +55,13 @@ public static class PanelSizing public static bool IsStrip(IReadOnlyList panels) => panels.Count > 0 && panels.All(p => FixedRows(p) is not null); - /// Whether a pane holding draws its tab strip: anything but a one-tab strip. - public static bool ShowsTabStrip(IReadOnlyList panels) => !(panels.Count == 1 && IsStrip(panels)); + /// + /// Whether a pane holding draws its tab strip: not when it holds one panel and nothing + /// else. Every panel titles itself (COMPOSE, HERE, the vitals heading, the map's room; a strip's row says what it + /// is), so a strip over it would say the same thing twice and cost a row; a pane holding windows, or several tabs, + /// keeps it. + /// + public static bool ShowsTabStrip(IReadOnlyList panels) => !(panels.Count == 1 && panels[0] is not null); /// /// Sets 's and from what it @@ -45,17 +70,28 @@ public static bool IsStrip(IReadOnlyList panels) => /// A strip is as tall as its tallest panel (plus the tab strip when it holds several); any other pane shares, /// with a floor from the tallest floor among its panels. /// - public static void Apply(PaneNode pane, Func panelOf, int tabStripRows) + /// The pane. + /// The panel each tab draws, or null. + /// The height of the tab strip the host draws. + /// + /// Non-null when a vitals tab here is drawn as a card of that many rows ( decides); null for + /// the one-row strip. + /// + public static void Apply(PaneNode pane, Func panelOf, int tabStripRows, int? vitalsCardRows = null) { ArgumentNullException.ThrowIfNull(pane); ArgumentNullException.ThrowIfNull(panelOf); var panels = pane.Tabs.Select(panelOf).ToList(); + int? Rows(string? panel) => + vitalsCardRows is { } card && string.Equals(panel, PanelIds.Vitals, StringComparison.Ordinal) ? card : FixedRows(panel); + + var strip = panels.Count > 0 && panels.All(p => Rows(p) is not null); var chrome = ShowsTabStrip(panels) ? Math.Max(0, tabStripRows) : 0; pane.DrawsHeader = chrome > 0; - if (IsStrip(panels)) + if (strip) { - pane.FixedRows = panels.Max(p => FixedRows(p)!.Value) + chrome; + pane.FixedRows = panels.Max(p => Rows(p)!.Value) + chrome; pane.MinRows = null; return; } @@ -64,4 +100,47 @@ public static void Apply(PaneNode pane, Func panelOf, int tabSt var floor = panels.Select(MinRows).Where(m => m is not null).Select(m => m!.Value).DefaultIfEmpty(0).Max(); pane.MinRows = floor > 0 ? floor + chrome : null; } + + /// + /// for every pane under , with each vitals pane's shape decided from its + /// share of the window's width (). is how many + /// meters the character behind a vitals window has, by window id. + /// + public static void ApplyAll(LayoutNode root, Func panelOf, int tabStripRows, Func vitalsMetersOf) + { + ArgumentNullException.ThrowIfNull(root); + ArgumentNullException.ThrowIfNull(vitalsMetersOf); + foreach (var (pane, share) in WidthShares(root, 1.0)) + { + int? card = null; + if (share < CardBelowWidthShare + && pane.Tabs.FirstOrDefault(t => string.Equals(panelOf(t), PanelIds.Vitals, StringComparison.Ordinal)) is { } vitals) + { + card = VitalsCardRows(vitalsMetersOf(vitals)); + } + + Apply(pane, panelOf, tabStripRows, card); + } + } + + /// Each pane with the fraction of the window's width its row splits give it. + public static IEnumerable<(PaneNode Pane, double Share)> WidthShares(LayoutNode node, double share) + { + if (node is PaneNode pane) + { + yield return (pane, share); + yield break; + } + + var split = (SplitNode)node; + var total = split.Sizes.Sum(s => Math.Max(0, s)); + for (var i = 0; i < split.Children.Count; i++) + { + var part = split.Direction == SplitDirection.Row && total > 0 ? Math.Max(0, split.Sizes[i]) / total : 1.0; + foreach (var inner in WidthShares(split.Children[i], share * part)) + { + yield return inner; + } + } + } } diff --git a/src/SharpMUTerm.Tui/Panels/VitalsStripRenderer.cs b/src/SharpMUTerm.Tui/Panels/VitalsStripRenderer.cs index 25ec70ca..36625711 100644 --- a/src/SharpMUTerm.Tui/Panels/VitalsStripRenderer.cs +++ b/src/SharpMUTerm.Tui/Panels/VitalsStripRenderer.cs @@ -79,6 +79,93 @@ internal static string Render(VitalsModel vitals, int width, Ink ink) => width, ink); + /// + /// The card a tall vitals pane draws (): a heading, then per meter its title + /// and numbers on one row and a bar the width of the box under it, then a rule and the target the same way, its + /// rows held whether or not the game names one — the window's stacked gauges, block for block. A box too short + /// for that draws one row a meter, and one row or two draws the strip. + /// + internal static IReadOnlyList RenderCard(VitalsModel vitals, int width, int height, Ink ink) + { + width = Math.Max(1, width); + var blocks = vitals.Meters.Count; + if (height < 3 || vitals.IsEmpty) + { + return [Render(vitals, width, ink)]; + } + + var lines = new List(); + + // The card titles itself (a one-panel pane draws no tab strip): VITALS and where the numbers come from, as the + // window's heading says it — when there is a row for it beside the blocks. + if (height >= (2 * blocks) + 5) + { + var source = vitals.Source is { } from ? " [dim]" + Escape(Fit(from, Math.Max(1, width - 8))) + "[/]" : string.Empty; + lines.Add($"[bold {ink.Bar}]VITALS[/]{source}"); + lines.Add(string.Empty); + } + + if (height >= (2 * blocks) + 3) + { + foreach (var meter in vitals.Meters) + { + var colour = meter.Low ? ink.Low : ink.Bar; + var title = Escape(Fit(meter.Low ? $"{meter.Title} · {LowMark}" : meter.Title, width - 1)); + lines.Add(Spread(meter.Low ? $"[bold {colour}]{title}[/]" : $"[bold]{title}[/]", Numbers(meter), width)); + lines.Add(Bar(meter.HasMax ? meter.Share ?? 0 : 1, width, colour, ink)); + } + + lines.Add($"[{ink.Empty}]{new string('─', width)}[/]"); + if (vitals.Target is { } target) + { + var percent = target.Share is { } share ? StatusMeterRenderer.Percent(share) : string.Empty; + var name = Escape(Fit(target.Name, Math.Max(1, width - 8 - percent.Length))); + lines.Add(Spread("[dim]Target[/] " + (target.Low ? $"[{ink.Low}]{name}[/]" : name), percent, width)); + lines.Add(target.Share is { } s ? Bar(s, width, target.Low ? ink.Low : ink.Bar, ink) : string.Empty); + } + + return lines; + } + + // One row a meter: the label, a bar in what is left, the value. + foreach (var meter in vitals.Meters.Take(Math.Max(1, height - (vitals.Target is null ? 0 : 1)))) + { + var colour = meter.Low ? ink.Low : ink.Bar; + var value = Escape(StatusMeter.Fit(meter.Value, StatusMeterRenderer.ValueWidth)); + var label = Fit(meter.Label, 4).PadRight(4); + var bar = Math.Max(0, width - label.Length - VisibleLength(value) - 2); + var drawn = bar > 0 && meter.HasMax ? " " + Bar(meter.Share, bar, colour, ink) : new string(' ', bar + 1); + lines.Add($"[dim]{Escape(label)}[/]{drawn} " + (meter.Low ? $"[bold {colour}]{value}[/]" : $"[bold]{value}[/]")); + } + + if (vitals.Target is { } t && lines.Count < height) + { + var percent = t.Share is { } share ? StatusMeterRenderer.Percent(share) : string.Empty; + lines.Add(Spread("[dim]target[/] " + Escape(Fit(t.Name, Math.Max(1, width - 8 - percent.Length))), percent, width)); + } + + return lines; + } + + /// The numbers a card's meter row ends in: 412/500, or the value alone. + private static string Numbers(VitalsMeter meter) => meter.HasMax ? $"{meter.Value}/{meter.Max ?? "?"}" : meter.Value; + + /// markup at the start of a row of , text at its end. + private static string Spread(string left, string right, int width) + { + var room = width - VisibleLength(left) - right.Length; + if (room < 1) + { + return ElideVisible(left, Math.Max(1, width - right.Length - 1)) + " " + Escape(right); + } + + return left + new string(' ', room) + $"[bold]{Escape(right)}[/]"; + } + + /// cut to cells with an ellipsis. + private static string Fit(string text, int width) => + width <= 0 ? string.Empty : text.Length <= width ? text : text[..Math.Max(0, width - 1)] + "…"; + private static string Compose( IReadOnlyList meters, CombatTarget? target, Level level, int width, Ink ink) { diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs index 78d54701..9fc048e9 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs @@ -267,6 +267,8 @@ internal bool ApplyLayout(string key, LayoutDefinition layout, string? focusWind return false; } + layout = BuiltInLayouts.ForWidth(layout, IsNarrow()); // a built-in's narrow arrangement below 100 columns + if (CanFloatPanels && adoptFloating) { AdoptFloating(key, layout); @@ -351,7 +353,7 @@ internal void RefoldLayout() } var layout = Layouts.Find(live.LayoutId) ?? ResolveLayout(live.SessionKey).Layout; - var fold = LayoutFold.Fold(layout, LayoutAvailability(live.SessionKey)); + var fold = LayoutFold.Fold(BuiltInLayouts.ForWidth(layout, IsNarrow()), LayoutAvailability(live.SessionKey)); if (string.Equals(LayoutRealiser.FoldShape(fold), live.FoldShape, StringComparison.Ordinal)) { return; diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Narrow.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Narrow.cs index 326afb16..7971116a 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Narrow.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Narrow.cs @@ -67,6 +67,9 @@ internal bool SyncNarrowLayout() } _narrowSeen = narrow; + + // A built-in layout owning the panes has a narrow arrangement; crossing the line re-folds into it (or out of it). + RefoldLayout(); if (_railCollapsed == narrow) { return false; diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs index 0ecc48a1..f5e6a5b3 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs @@ -171,15 +171,23 @@ private void OfferLook(string windowId, string sessionKey, string name) private IWindowControl NewVitalsPanel(TerminalPanelContext context) { - var view = NewPanelView(context, (width, _) => + var view = NewPanelView(context, (width, height) => { if (ReadVitals(context.SessionKey) is not { } vitals) { return ["[dim]No vitals: this character is not connected.[/]"]; } - var strip = VitalsStripRenderer.Render(Drawing(PanelIds.Vitals, context.WindowId, vitals), width, VitalsInk()); - return [strip.Length > 0 ? strip : "[dim]No vitals yet — the game has sent none of the meters F7 names.[/]"]; + var drawn = Drawing(PanelIds.Vitals, context.WindowId, vitals); + if (drawn.IsEmpty) + { + return ["[dim]No vitals yet — the game has sent none of the meters F7 names.[/]"]; + } + + // A pane in a side column is a card (PanelSizing.ApplyAll made it tall); a strip is one row. + return height >= 3 + ? [.. VitalsStripRenderer.RenderCard(drawn, width, height, VitalsInk())] + : [VitalsStripRenderer.Render(drawn, width, VitalsInk())]; }); if (context.Session is { } session) diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 022e4c76..5c26c86c 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -10934,10 +10934,8 @@ private IWindowControl BuildWorkspaceRow() // Each pane's height claim, from what it holds: a strip panel is as tall as its content and an editor has a // floor. Derived here on every rebuild rather than stored, so a pane handed an ordinary window stops being a // strip at once. - foreach (var pane in _workspace.Layout.Root.Panes()) - { - Core.Layouts.PanelSizing.Apply(pane, PanelIdOfWindow, TabStripRows); - } + // A vitals pane in a side column is a card, its height from the character's meters. + Core.Layouts.PanelSizing.ApplyAll(_workspace.Layout.Root, PanelIdOfWindow, TabStripRows, VitalsMetersOfWindow); // When a pane is zoomed, render just that pane full-area; otherwise render the whole tree. var zoomed = _workspace.Layout.ZoomedPaneId is { } zid ? _workspace.Layout.FindPane(zid) : null; @@ -11580,6 +11578,10 @@ private IWindowControl BuildLayoutNode(SharpMUTerm.Core.Workspaces.LayoutNode no private static string? PanelIdOfWindow(string windowId) => TerminalPanels.TryParseWindowId(windowId, out var panelId, out _) ? panelId : null; + /// How many meters the character behind a vitals panel window draws: the height of its card. + private int VitalsMetersOfWindow(string windowId) => + TerminalPanels.TryParseWindowId(windowId, out _, out var sessionKey) ? PanelMeters(sessionKey).Count : 0; + /// Whether a pane is the one every workspace keystroke is aimed at. private bool IsFocusedPane(string paneId) => string.Equals(paneId, _workspace.Layout.FocusedPaneId, StringComparison.Ordinal); @@ -11668,10 +11670,9 @@ private IWindowControl BuildPaneTabs(PaneNode pane) PaintTabChips(tabs, PaneSurfaceTone(pane.Id)); - // A one-tab strip (the vitals meters, the quick bar) draws no tab strip: its row already says what it is, - // and a strip the height of its content has no row to spare. PaneOutputRects reads TabHeaderHeight, so the - // rectangle it reports follows. - tabs.ShowTabHeader = Core.Layouts.PanelSizing.ShowsTabStrip(pane.Tabs.Select(PanelIdOfWindow).ToList()); + // A pane holding one panel and nothing else draws no tab strip: the panel titles itself (PanelSizing.ShowsTabStrip, + // which ApplyAll has just applied). PaneOutputRects reads TabHeaderHeight, so the rectangle it reports follows. + tabs.ShowTabHeader = pane.DrawsHeader; var paneId = pane.Id; tabs.TabChanged += (_, e) => OnTabChanged(paneId, e.NewTab); diff --git a/tests/SharpMUTerm.Core.Tests/Layouts/LayoutFoldAndAvailabilityTests.cs b/tests/SharpMUTerm.Core.Tests/Layouts/LayoutFoldAndAvailabilityTests.cs index f1013ea4..622a00f9 100644 --- a/tests/SharpMUTerm.Core.Tests/Layouts/LayoutFoldAndAvailabilityTests.cs +++ b/tests/SharpMUTerm.Core.Tests/Layouts/LayoutFoldAndAvailabilityTests.cs @@ -56,21 +56,22 @@ public async Task AvailabilityIsReadOffTheGameDataStore() } [Test] - public async Task RoleplayWithEverythingFoldsIntoOutputComposerAndASideColumnWithChatAsATab() + public async Task RoleplayWithEverythingFoldsIntoOutputWithChatBehindItAndAColumnOfComposerOverWhoHere() { var fold = LayoutFold.Fold(BuiltInLayouts.Roleplay); - // Row[ Column[ output, composer ], side ] + // Row[ output+chat, Column[ composer, who-here ] ] var root = (SplitNode)fold.Root!; await Assert.That(root.Direction).IsEqualTo(SplitDirection.Row); - await Assert.That(root.Sizes[1]).IsEqualTo(LayoutFold.DefaultShare(LayoutRegion.Side)).Within(1e-9); + await Assert.That(root.Sizes[1]).IsEqualTo(0.35).Within(1e-9); - var centre = (SplitNode)root.Children[0]; - await Assert.That(centre.Direction).IsEqualTo(SplitDirection.Column); - await Assert.That(centre.Panes().Select(p => p.Id)).IsEquivalentTo(new[] { "panel:output", "panel:composer" }); + var main = (PaneNode)root.Children[0]; + await Assert.That(main.Tabs).IsEquivalentTo(new[] { PanelIds.Output, PanelIds.Chat }); - var side = (PaneNode)root.Children[1]; - await Assert.That(side.Tabs).IsEquivalentTo(new[] { PanelIds.WhoHere, PanelIds.Chat }); + var side = (SplitNode)root.Children[1]; + await Assert.That(side.Direction).IsEqualTo(SplitDirection.Column); + await Assert.That(side.Panes().Select(p => p.Id)).IsEquivalentTo(new[] { "panel:composer", "panel:who-here" }); + await Assert.That(side.Sizes[0]).IsGreaterThan(side.Sizes[1]); await Assert.That(fold.Collapsed).IsEmpty(); await Assert.That(fold.Waiting).IsEmpty(); } @@ -79,11 +80,22 @@ public async Task RoleplayWithEverythingFoldsIntoOutputComposerAndASideColumnWit public async Task ATabWhoseHostHasNoDataTakesAPaneOfItsOwn() { // A MUSH sends no Room.Players, but trigger rules have opened a channel window. - var fold = LayoutFold.Fold(BuiltInLayouts.Roleplay, new PanelAvailability(SpawnWindows: 1)); + var layout = new LayoutDefinition + { + Id = "x", + Name = "X", + Placements = + [ + new() { PanelId = PanelIds.Output }, + new() { PanelId = PanelIds.WhoHere, Region = LayoutRegion.Side, Order = 0 }, + new() { PanelId = PanelIds.Chat, Region = LayoutRegion.Side, Order = 1, TabOf = PanelIds.WhoHere }, + ], + }; + var fold = LayoutFold.Fold(layout, new PanelAvailability(SpawnWindows: 1)); var panes = fold.Root!.Panes().ToList(); - await Assert.That(panes.Select(p => p.Id)).IsEquivalentTo(new[] { "panel:output", "panel:composer", "panel:chat" }); - await Assert.That(panes[2].Tabs).IsEquivalentTo(new[] { PanelIds.Chat }); + await Assert.That(panes.Select(p => p.Id)).IsEquivalentTo(new[] { "panel:output", "panel:chat" }); + await Assert.That(panes[1].Tabs).IsEquivalentTo(new[] { PanelIds.Chat }); await Assert.That(fold.Waiting.Select(p => p.PanelId)).IsEquivalentTo(new[] { PanelIds.WhoHere }); } @@ -97,18 +109,59 @@ public async Task CombatWithNoDataYetIsOutputAndTheQuickBar() } [Test] - public async Task CombatWithEverythingHasAStripOnTopAndListsChatAsCollapsed() + public async Task CombatWithEverythingHasAColumnOfVitalsOverTheMapAndListsChatAsCollapsed() { var fold = LayoutFold.Fold(BuiltInLayouts.Combat); - // Column[ vitals, Row[ Column[ output, quick-bar ], map ] ] + // Row[ Column[ output, quick-bar ], Column[ vitals, map ] ] var root = (SplitNode)fold.Root!; + await Assert.That(root.Direction).IsEqualTo(SplitDirection.Row); + var side = (SplitNode)root.Children[1]; + await Assert.That(side.Direction).IsEqualTo(SplitDirection.Column); + await Assert.That(side.Panes().Select(p => p.Id)).IsEquivalentTo(new[] { "panel:vitals", "panel:map" }); + await Assert.That(root.Panes().Select(p => p.Id)) + .IsEquivalentTo(new[] { "panel:output", "panel:quick-bar", "panel:vitals", "panel:map" }); + await Assert.That(fold.Collapsed.Select(p => p.PanelId)).IsEquivalentTo(new[] { PanelIds.Chat }); + } + + [Test] + public async Task NarrowCombatPutsTheVitalsInAStripOnTop() + { + var narrow = BuiltInLayouts.ForWidth(BuiltInLayouts.Combat, narrow: true); + await Assert.That(narrow.Id).IsEqualTo(BuiltInLayouts.CombatId); + await Assert.That(narrow.IsBuiltIn).IsTrue(); + + // Column[ vitals, Row[ Column[ output, quick-bar ], map ] ] + var root = (SplitNode)LayoutFold.Fold(narrow).Root!; await Assert.That(root.Direction).IsEqualTo(SplitDirection.Column); await Assert.That(((PaneNode)root.Children[0]).Id).IsEqualTo("panel:vitals"); await Assert.That(root.Sizes[0]).IsEqualTo(LayoutFold.DefaultShare(LayoutRegion.TopStrip)).Within(1e-9); - await Assert.That(root.Panes().Select(p => p.Id)) - .IsEquivalentTo(new[] { "panel:vitals", "panel:output", "panel:quick-bar", "panel:map" }); - await Assert.That(fold.Collapsed.Select(p => p.PanelId)).IsEquivalentTo(new[] { PanelIds.Chat }); + } + + [Test] + public async Task NarrowRoleplayPutsTheComposerUnderTheOutput() + { + var narrow = BuiltInLayouts.ForWidth(BuiltInLayouts.Roleplay, narrow: true); + await Assert.That(narrow.Id).IsEqualTo(BuiltInLayouts.RoleplayId); + + // Row[ Column[ output+chat, composer ], who-here ] + var root = (SplitNode)LayoutFold.Fold(narrow).Root!; + await Assert.That(root.Direction).IsEqualTo(SplitDirection.Row); + await Assert.That(root.Children[0].Panes().Select(p => p.Id)).IsEquivalentTo(new[] { "panel:output", "panel:composer" }); + await Assert.That(((PaneNode)root.Children[1]).Id).IsEqualTo("panel:who-here"); + } + + [Test] + public async Task OnlyABuiltInHasANarrowArrangement() + { + await Assert.That(BuiltInLayouts.ForWidth(BuiltInLayouts.Combat, narrow: false)).IsSameReferenceAs(BuiltInLayouts.Combat); + + // A saved copy of a built-in is the player's, even under the built-in's id (a hand-edited file). + var copy = BuiltInLayouts.Combat with { IsBuiltIn = false }; + await Assert.That(BuiltInLayouts.ForWidth(copy, narrow: true)).IsSameReferenceAs(copy); + var library = new LayoutLibrary([]); + var saved = library.SaveAsNew("Mine", BuiltInLayouts.Combat.Placements); + await Assert.That(BuiltInLayouts.ForWidth(saved, narrow: true)).IsSameReferenceAs(saved); } [Test] diff --git a/tests/SharpMUTerm.Core.Tests/Layouts/LayoutRealiserTests.cs b/tests/SharpMUTerm.Core.Tests/Layouts/LayoutRealiserTests.cs index a0a44db7..f81c89af 100644 --- a/tests/SharpMUTerm.Core.Tests/Layouts/LayoutRealiserTests.cs +++ b/tests/SharpMUTerm.Core.Tests/Layouts/LayoutRealiserTests.cs @@ -92,7 +92,8 @@ public async Task CapturingTheCombatArrangementGivesBackItsRegions() var byId = captured.Placements.ToDictionary(p => p.PanelId); await Assert.That(byId[PanelIds.Output].Region).IsEqualTo(LayoutRegion.Main); await Assert.That(byId[PanelIds.Map].Region).IsEqualTo(LayoutRegion.Side); - await Assert.That(byId[PanelIds.Vitals].Region).IsEqualTo(LayoutRegion.TopStrip); + await Assert.That(byId[PanelIds.Vitals].Region).IsEqualTo(LayoutRegion.Side); + await Assert.That(byId[PanelIds.Vitals].Order).IsLessThan(byId[PanelIds.Map].Order); await Assert.That(byId[PanelIds.Chat].TabOf).IsEqualTo(PanelIds.Map); // Not on screen (no window draws it), so it keeps the placement the layout gave it. await Assert.That(byId[PanelIds.QuickBar].Region).IsEqualTo(LayoutRegion.Bottom); diff --git a/tests/SharpMUTerm.Core.Tests/Workspace/PaneExtentTests.cs b/tests/SharpMUTerm.Core.Tests/Workspace/PaneExtentTests.cs index 4b10a5e2..f7590ec9 100644 --- a/tests/SharpMUTerm.Core.Tests/Workspace/PaneExtentTests.cs +++ b/tests/SharpMUTerm.Core.Tests/Workspace/PaneExtentTests.cs @@ -263,6 +263,33 @@ public async Task TwoStripPanelsInOnePaneAddTheTabStripTheyThenNeed() await Assert.That(PanelSizing.ShowsTabStrip(pane.Tabs.Select(PanelOf).ToList())).IsTrue(); } + [Test] + public async Task AVitalsPaneInASideColumnIsACardAndAFullWidthOneIsAStrip() + { + // Row[ Column[ output, quick bar ], Column[ vitals, map ] ] with the side column at 30%. + var side = new PaneNode("side", ["panel:vitals:W.C"]); + var top = new PaneNode("top", ["panel:vitals:W.C"]); + var root = new SplitNode(SplitDirection.Column, + [ + top, + new SplitNode(SplitDirection.Row, [new PaneNode("output", ["main"]), new SplitNode(SplitDirection.Column, [side, new PaneNode("map", ["map:W.C"])])], [0.7, 0.3]), + ], [0.1, 0.9]); + + PanelSizing.ApplyAll(root, PanelOf, tabStripRows: 1, _ => 3); + + await Assert.That(side.FixedRows).IsEqualTo(PanelSizing.VitalsCardRows(3)); + await Assert.That(side.DrawsHeader).IsFalse(); + await Assert.That(top.FixedRows).IsEqualTo(1); + await Assert.That(top.DrawsHeader).IsFalse(); + } + + [Test] + public async Task AVitalsCardHoldsTwoRowsAMeterAndTheTargetsRowsWhetherOrNotThereIsOne() + { + await Assert.That(PanelSizing.VitalsCardRows(3)).IsEqualTo(12); + await Assert.That(PanelSizing.VitalsCardRows(0)).IsEqualTo(6); + } + [Test] public async Task AStripHandedAnOrdinaryWindowStopsBeingAStrip() { @@ -275,13 +302,20 @@ public async Task AStripHandedAnOrdinaryWindowStopsBeingAStrip() } [Test] - public async Task AComposerPaneHasAFloorOfItsEditorAndItsTabStrip() + public async Task AComposerPaneHasAFloorOfItsEditorAndNoTabStripUntilItHoldsAWindowToo() { var pane = new PaneNode("p", ["panel:composer:W.C"]); PanelSizing.Apply(pane, PanelOf, tabStripRows: 1); + // Alone, the composer titles itself (COMPOSE): no tab strip over it. await Assert.That(pane.FixedRows).IsNull(); + await Assert.That(pane.DrawsHeader).IsFalse(); + await Assert.That(pane.MinRows).IsEqualTo(PanelSizing.ComposerMinRows); + + pane.Tabs.Add("main"); + PanelSizing.Apply(pane, PanelOf, tabStripRows: 1); + await Assert.That(pane.DrawsHeader).IsTrue(); await Assert.That(pane.MinRows).IsEqualTo(PanelSizing.ComposerMinRows + 1); } diff --git a/tests/SharpMUTerm.Tui.Tests/LayoutStripTests.cs b/tests/SharpMUTerm.Tui.Tests/LayoutStripTests.cs index fab2698b..81690751 100644 --- a/tests/SharpMUTerm.Tui.Tests/LayoutStripTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/LayoutStripTests.cs @@ -42,11 +42,10 @@ private static ConsoleKeyInfo Letter(char c) => private static ConsoleKeyInfo Typed(char c) => char.IsLetter(c) ? Letter(c) : new(c, ConsoleKey.Spacebar, false, false, false); [Test] - [Arguments(120, 32)] - [Arguments(80, 24)] - public async Task CombatsVitalsAndQuickBarAreOneRowEachWithNoTabStrip(int width, int height) + public async Task NarrowCombatsVitalsAndQuickBarAreOneRowEachWithNoTabStrip() { - await using var app = Demo(width: width, height: height); + const int height = 24; + await using var app = Demo(width: 80, height: height); app.RenderSnapshot("layout-combat"); var output = app.PaneOutputRects(); @@ -57,12 +56,38 @@ public async Task CombatsVitalsAndQuickBarAreOneRowEachWithNoTabStrip(int width, // No tab strip: the pane is its content, so its whole rectangle is that one row too. await Assert.That(whole["panel:vitals"].Height).IsEqualTo(1); await Assert.That(whole["panel:quick-bar"].Height).IsEqualTo(1); + await Assert.That(whole["panel:vitals"].Width).IsGreaterThan(whole["panel:output"].Width); // The output pane keeps its tab strip, and everything the strips did not take. await Assert.That(whole["panel:output"].Height - output["panel:output"].Height).IsEqualTo(1); await Assert.That(output["panel:output"].Height).IsGreaterThan(height / 2); } + [Test] + public async Task WideCombatsVitalsAreACardOverTheMapWithItsOwnTitle() + { + await using var app = Demo(width: 120, height: 32); + app.RenderSnapshot("layout-combat"); + + var output = app.PaneOutputRects(); + var whole = app.PaneSnapshot().Rects; + var vitals = whole["panel:vitals"]; + var map = whole["panel:map"]; + + // A card of its heading, the demo's three meters and the target's reserved rows, with no tab strip, flush above the map. + await Assert.That(output["panel:vitals"].Height).IsEqualTo(PanelSizing.VitalsCardRows(3)); + await Assert.That(vitals.Height).IsEqualTo(PanelSizing.VitalsCardRows(3)); + await Assert.That(map.Y).IsEqualTo(vitals.Y + vitals.Height); + await Assert.That(map.X).IsEqualTo(vitals.X); + await Assert.That(output["panel:quick-bar"].Height).IsEqualTo(1); + + var card = string.Join("\n", app.PanelMarkup(TerminalPanels.WindowId(PanelIds.Vitals, DemoScene.ActiveSessionKey))); + await Assert.That(card).Contains("VITALS"); + await Assert.That(card).Contains("Health"); + await Assert.That(card).Contains("412/500"); + await Assert.That(app.VitalsStripShowing()).IsTrue(); + } + [Test] public async Task TheStatusRowLeavesOutTheMetersWhileTheVitalsStripShowsThem() { diff --git a/tests/SharpMUTerm.Tui.Tests/NarrowLayoutTests.cs b/tests/SharpMUTerm.Tui.Tests/NarrowLayoutTests.cs index 40410aea..d6e68298 100644 --- a/tests/SharpMUTerm.Tui.Tests/NarrowLayoutTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/NarrowLayoutTests.cs @@ -154,6 +154,28 @@ public async Task ANewlineInTheOneRowBarShowsBothRows() await Assert.That(rows.Count(r => r.Contains("say hello there", StringComparison.Ordinal))).IsEqualTo(1); } + /// + /// A built-in layout owning the panes re-folds when the width crosses the line: Combat's vitals card in the side + /// column becomes a one-row strip across the top below 100 columns, and comes back when the window widens. + /// + [Test] + public async Task CrossingTheLineFoldsABuiltInIntoItsNarrowArrangementAndBack() + { + var window = new WindowPresenter { Columns = 120 }; + await using var app = App(120, 32, HostChrome.None, window, "layout-combat"); + await Assert.That(app.PaneOutputRects()["panel:vitals"].Height).IsGreaterThan(1); + + window.Columns = 90; + app.SyncNarrowLayout(); + app.RenderNextFrame(); + await Assert.That(app.PaneOutputRects()["panel:vitals"].Height).IsEqualTo(1); + + window.Columns = 120; + app.SyncNarrowLayout(); + app.RenderNextFrame(); + await Assert.That(app.PaneOutputRects()["panel:vitals"].Height).IsGreaterThan(1); + } + /// /// ⌃B b (or ⌃P, or the window's fold button) wins over the automatic fold until the width crosses the line again: /// a resize that stays on one side changes nothing the player chose. diff --git a/tests/SharpMUTerm.Tui.Tests/StackedDividerTests.cs b/tests/SharpMUTerm.Tui.Tests/StackedDividerTests.cs index f622fa2f..ab24c66f 100644 --- a/tests/SharpMUTerm.Tui.Tests/StackedDividerTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/StackedDividerTests.cs @@ -21,13 +21,13 @@ public class StackedDividerTests private static readonly TerminalCapabilities Headless = new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); - private static SharpMUTermApp App(string view, string theme = "Dark") + private static SharpMUTermApp App(string view, string theme = "Dark", int width = Width, int height = Height) { Console.SetIn(TextReader.Null); var config = DemoScene.Build(); config.ThemeName = theme; config.Theme = ThemeLibrary.Get(theme); - var app = new SharpMUTermApp(config, Headless, new HeadlessConsoleDriver(Width, Height)); + var app = new SharpMUTermApp(config, Headless, new HeadlessConsoleDriver(width, height)); app.RenderSnapshot(view); app.RenderNextFrame(); return app; @@ -60,7 +60,7 @@ public async Task ASideBySideSplitKeepsItsDividerColumn() /// /// The vitals strip sits flush on the panes under it and is told apart from them by its plane, on every theme /// and whether or not the pane beside it holds the focus: an unfocused strip is recessed a step, so it is never - /// the same plane as an unfocused pane. + /// the same plane as an unfocused pane. Narrow, where Combat draws its vitals as a strip across the top. /// [Test] [Arguments("Dark")] @@ -68,7 +68,7 @@ public async Task ASideBySideSplitKeepsItsDividerColumn() [Arguments("Solarized Dark")] public async Task AStripSitsFlushAndIsToldApartByItsPlane(string theme) { - var app = App("layout-combat", theme); + var app = App("layout-combat", theme, 80, 24); foreach (var moved in new[] { false, true }) { if (moved) From 4e43c5ac02fa57bac8843b976ad63357f80e3340 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 18:41:47 +0000 Subject: [PATCH 073/113] =?UTF-8?q?Wave=2020=20B:=20model-first=20cleanups?= =?UTF-8?q?=20=E2=80=94=20status=20model,=20toast=20card,=20body=2013,=20p?= =?UTF-8?q?inned=20package=20review,=20sized=20palette?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - The status row is a StatusModel first: StatusBarRow, NotConnectedRow, NoticeSegment and the move/drag prompts build role-tagged segments, the cells are written from the model (StatusRowMarkup, StatusModel.Fit) and the native footer draws the same instance. Terminal frames are byte-identical; the markup parser is gone. - Toasts are drawn on NativeTokens.Card with edge colours held to the floor on it. - NativeTokens.Body is 13. - The package review pins its keys under a scrolling body (ListOverlay footer) and stays clear of the command line at 80x24. - The cell command palette shrinks to its matching rows (at least 10) and keeps its top edge. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 5 + CLAUDE.md | 24 +- src/SharpMUTerm.Avalonia/NativeFooter.cs | 9 +- src/SharpMUTerm.Avalonia/NativeTokens.cs | 2 +- src/SharpMUTerm.Avalonia/NoticeToasts.cs | 46 ++- src/SharpMUTerm.Client/Chrome/StatusModel.cs | 264 +++++++++++------- src/SharpMUTerm.Tui/CommandPalette.cs | 35 +++ src/SharpMUTerm.Tui/PackageScreen.cs | 27 +- .../Pointer/SharpMUTermApp.Footer.cs | 111 ++++---- .../Pointer/SharpMUTermApp.Notices.cs | 43 ++- .../SharpMUTermApp.ModeHints.cs | 23 +- src/SharpMUTerm.Tui/SharpMUTermApp.MooEdit.cs | 7 +- .../SharpMUTermApp.Packages.cs | 4 +- src/SharpMUTerm.Tui/SharpMUTermApp.cs | 229 +++++++-------- src/SharpMUTerm.Tui/StatusMeterRenderer.cs | 46 +-- .../NativeFooterTests.cs | 11 +- .../NoticeToastTests.cs | 28 ++ .../StatusModelTests.cs | 65 +++-- tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs | 42 +++ tests/SharpMUTerm.Tui.Tests/NoticeFitTests.cs | 11 +- 20 files changed, 664 insertions(+), 368 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b591f8b2..bb53ddf8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- The package review keeps ⏎ install and Esc cancel on screen at 80×24: the review scrolls (↑↓ PgUp PgDn Home End) + under its keys and stops above the command line. - Browse worlds: a world listed at several addresses (TLS and plain, another port, an old one) now lets you choose which before the connect form opens; the form takes that address's TLS setting, and the world is saved with the game's character set when mu*index names one other than UTF-8. `/browse N M` says address M in `--plain`. @@ -384,6 +386,9 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Changed +- The command palette in the terminal shrinks to the rows a search matches instead of filling the screen with blank. +- In the window, notices are drawn on the same card colour as the palette and dialogs, and body text is a size larger + (13 px) across the window's own views. - The built-in layouts follow the new designs: Roleplay puts the composer in the side column above who is here, with the chat windows as tabs behind the output; Combat puts the vitals in the side column above the map as a card, one meter over another. Below 100 columns they fall back to what fits: Roleplay's composer goes under the output and diff --git a/CLAUDE.md b/CLAUDE.md index 993878aa..913f49d7 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -259,7 +259,9 @@ fallbacks) for inline images/maps. - **A consent screen's keys are pinned, not scrolled** (`ListOverlay.Open(footer:, scrollKeys:)`): the body goes in a `ScrollablePanelControl` and the footer rows are a sticky-bottom control, so a body taller than 80×24 scrolls under them (↑↓ PgUp PgDn Home End, answered before the caller's key handler). The import review uses it (`ImportReview.Footer`: - passwords question + keys); `Lines` is body then footer. + passwords question + keys); `Lines` is body then footer. So does the package review (`PackageScreen.ReviewFooter`: a rule, + then ⏎ install · ↑↓ scroll · Esc cancel laddered, the "nothing is written" note only where it fits); a modal with a + footer stops 4 rows short of the desktop, so the command line stays in view at 80×24. - **The index** (`PackageIndex`; ⌃P ▸ *Browse packages*, `b` on F10) is `{"packages":[…]}`, each entry a manifest plus an https `url` and a `sha256`, at `AppConfiguration.PackageIndexUrl`. **It is fetched only when the player opens it, never at start.** An entry that breaks a rule is dropped and counted, not @@ -329,6 +331,9 @@ fallbacks) for inline images/maps. for the pointer menu and the tests that read it. Keys are shown through `KeyGlyphs.Normalize`, so the host's `Alt+⏎`/`Ctrl+⏎` read `⌥⏎`/`⌃⏎` in the column while `--help` keeps the words. The key column is right-aligned at the widest key; a narrow surface drops the detail, then elides the title, never the key. + - **The cell palette is as tall as what it lists** (`CommandPalette.FitHeight`): the whole catalog's height (capped above + the command line) while the query is empty, the matching rows' once something is typed, at least `FilteredMinHeight` (10) + and never taller than it opened; the top edge stays put, so the prompt does not move. - **Clashes come from `MacroKeys`, never a second table** (`KeyClashes`, Tui). `ClaimedBy` (a global shortcut: the client wins, `Verdict` already says Taken) and `YieldedBy` (what the main window does with a chord only after `DispatchMacro` declined it: the binding wins, a warning). `YieldedBy`'s list mirrors the @@ -1675,13 +1680,14 @@ draws ⌃P natively (`INativePalette`, null for the cell popup), whether it draw the same door is ⌃P (`CellsVia: term:messages`). Three notices carry one so far: the layout suggestion (*Change layout*), "switched to … · offline" (*Reconnect*) and the orphan trigger-set notice (*Open F5*). - **Severity is mapped from `MessageSeverity`**: Info → info, Error → warning (a failure), Warning → refusal - (the default voice of `Notice`). Edge colours are the accent, `ScreenPalette.Warn` and the notice ink, held to - 4.5:1 on the status plane because they also ink the key chip and the action line. + (the default voice of `Notice`). The card is `NativeTokens.Card` (rule `Edge`, text `Text`) of the theme the overlay + carries (`NoticeOverlay.Theme`); the edge colours — accent, `ScreenPalette.Warn`, the notice ink — are held to + `TextFloor` on that card, because they also ink the key chip and the action line (`NoticeToasts.ColoursOf`). - The message log (⌃P ▸ *Show client messages*) stays the history; a toast keeps nothing. - **A notice said again while it is still on the row is said once** (`Notice` compares text, key, severity and action with `_noticeShown`): the timer restarts, nothing is logged, announced or published twice. That was the audit's "notices show twice" — the row-plus-toast pair is the design above, the repeat was not. - - **The row is elided to its width in both hosts** (`FitStatusRow` in `PaintStatus`), so no notice can wrap it + - **The row is elided to its width in both hosts** (`StatusModel.Fit` in `PaintStatus`), so no notice can wrap it (`NoticeFitTests`, 80×24 down to 40×12). - **Toasts stay off what is being used and are hidden under a modal.** Besides the map's legend, `SyncToasts` avoids the native quick bars and docked composers; `DesktopLayer.ToastsHidden` (set by `MainWindow`: settings window, ⌃P, a @@ -1690,9 +1696,11 @@ draws ⌃P natively (`INativePalette`, null for the cell popup), whether it draw - **The window draws the status row and the command line's field too** (`HostChrome.Status`/`Input`, `HostChrome.Desktop` = all four, the window's default; `SharpMUTermApp.Footer.cs`; Client `StatusModel`; Avalonia `NativeFooter`, `TerminalView`'s field; surface `status`). Decisions not to relitigate: - - **The footer says what the cells would**: `BuildStatusModel` parses the very markup `PaintStatus` writes with the - framework's `MarkupParser` into runs, split at the widest gap; the palette hint and a showing notice's action hints are - marked as targets. `IPointerPresenter.Status`, published from `PaintStatus` and `PostBufferPaint`, only on change. + - **The model comes first and the cells are drawn from it**: `StatusBarRow`, `NotConnectedRow`, `NoticeSegment` and the + move/drag prompts build a `StatusModel` (left and right `StatusSegment`s with a `StatusRole`, each a list of + `StatusRun`s; a null ink is the row's own, so the cells write no tag for it), `PaintStatus` records it (`Drawing`) and + writes `StatusRowMarkup(model.Fit(width))`, and the footer draws the same instance. Terminal frames are byte for byte + what the markup-first row wrote; there is no markup parser. The palette hint and a notice's action hints carry targets. `IPointerPresenter.Status`, published from `PaintStatus` and `PostBufferPaint`, only on change. A click is `ActivateStatusTarget`: refused unless offered, the palette through `OpenMenu`, an action through `RunNoticeAction`. With `Status` the row is `Visible = false` and `ChromeRows` counts none. Toasts sit above it. - **The command line stays the cell editor; the host draws the field around it.** The bars get `HostFieldPad` (3) @@ -2336,7 +2344,7 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] - Screenshots from a real window under Xvfb, driven with XTest (`ux-wave8/modals-*.png`). - **The window has one design language: `NativeTokens`** (Avalonia). Planes (card, raised, selected, scrim), edge and rule, inks (text, dim, header, accent, warn, notice, accent and key inks), radii `RadiusS/M/L` 4/8/12 and - the type ramp `Small/Body/Title/Heading` 11/12/14/18 (`Miniature` 9 only for a theme card's preview). Derived + the type ramp `Small/Body/Title/Heading` 11/13/14/18 (`Miniature` 9 only for a theme card's preview). Derived from the client's `Theme` the `ScreenTheme` way: a canonical Dark (the mockup's: `#171b24` card) and Light (white) set, the theme background's hue shift added, every ink held to `TextFloor` 4.5:1 on each plane it is drawn on; the accent is the client's teal, never Fluent's blue. `Apply` sets the Fluent keys on a scope and `ApplySimple` diff --git a/src/SharpMUTerm.Avalonia/NativeFooter.cs b/src/SharpMUTerm.Avalonia/NativeFooter.cs index 62f06603..8bf8ddae 100644 --- a/src/SharpMUTerm.Avalonia/NativeFooter.cs +++ b/src/SharpMUTerm.Avalonia/NativeFooter.cs @@ -117,7 +117,7 @@ private double Draw(DrawingContext context, StatusRun run, double x, double midd _hits.Add((area, target)); if (_hover == target && Overlay is { Interactive: true }) { - var colour = NativeChromeView.Parse(run.Ink); + var colour = InkOf(run); context.FillRectangle(new SolidColorBrush(colour), new Rect(x, top + formatted.Baseline + 2, width, 1)); } } @@ -126,19 +126,22 @@ private double Draw(DrawingContext context, StatusRun run, double x, double midd } /// A run as text in the UI face: keys in words, padding runs of spaces shortened to a gap. - private static FormattedText Format(StatusRun run, Color plane) => new( + private FormattedText Format(StatusRun run, Color plane) => new( Gaps.Replace(NativeKeys.Words(run.Text), " "), CultureInfo.InvariantCulture, FlowDirection.LeftToRight, new Typeface(NativeTokens.UiFont, FontStyle.Normal, run.Bold ? FontWeight.SemiBold : FontWeight.Normal), NativeTokens.Body, - new SolidColorBrush(NativeChromeView.Parse(run.Ink))) + new SolidColorBrush(InkOf(run))) { MaxLineCount = 1, }; private static readonly Regex Gaps = new(" {3,}", RegexOptions.CultureInvariant); + /// A run's ink: its own, else the row's (a run the cells write with no colour). + private Color InkOf(StatusRun run) => NativeChromeView.Parse(run.Ink ?? Overlay?.Model.Ink); + private static string HexOf(SkiaSharp.SKColor colour) => $"#{colour.Red:x2}{colour.Green:x2}{colour.Blue:x2}"; private string? TargetAt(Point point) => _hits.FirstOrDefault(h => h.Area.Contains(point)).Target; diff --git a/src/SharpMUTerm.Avalonia/NativeTokens.cs b/src/SharpMUTerm.Avalonia/NativeTokens.cs index 7a509cb1..db7d9d20 100644 --- a/src/SharpMUTerm.Avalonia/NativeTokens.cs +++ b/src/SharpMUTerm.Avalonia/NativeTokens.cs @@ -50,7 +50,7 @@ internal sealed partial record NativeTokens( public const double Small = 11; /// The type ramp: body text, help, rows. - public const double Body = 12; + public const double Body = 13; /// The type ramp: a field's label, a list item's name, a search box. public const double Title = 14; diff --git a/src/SharpMUTerm.Avalonia/NoticeToasts.cs b/src/SharpMUTerm.Avalonia/NoticeToasts.cs index 839cb137..59f643d5 100644 --- a/src/SharpMUTerm.Avalonia/NoticeToasts.cs +++ b/src/SharpMUTerm.Avalonia/NoticeToasts.cs @@ -326,17 +326,17 @@ private List FrozenLayout(Dictionary frozen) private Placed? Measure(Toast toast, double width, double bottom) { var x = Bounds.Width - Inset - width; - var palette = toast.Overlay.Palette; - var ink = PanelText.Parse(palette.Text); + var colours = ColoursOf(toast); + var ink = colours.Text; var inner = width - EdgeWidth - (2 * Padding); - var chip = ChipText(toast) is { } key ? Format(key, ChipSize, PanelText.Parse(palette.Edge(toast.Overlay.Notice.Severity)), bold: true, inner) : null; + var chip = ChipText(toast) is { } key ? Format(key, ChipSize, colours.Edge, bold: true, inner) : null; var textWidth = inner - (chip is null ? 0 : chip.Width + 8); var text = Format(BodyText(toast), TextSize, ink, bold: false, Math.Max(40, textWidth), lines: 3); - var action = ActionText(toast) is { } a ? Format(a, ChipSize, PanelText.Parse(palette.Edge(toast.Overlay.Notice.Severity)), bold: true, inner) : null; + var action = ActionText(toast) is { } a ? Format(a, ChipSize, colours.Edge, bold: true, inner) : null; var second = action is not null && SecondText(toast) is { } b - ? Format(b, ChipSize, PanelText.Parse(palette.Edge(toast.Overlay.Notice.Severity)), bold: true, Math.Max(1, inner - action.Width - SecondGap)) + ? Format(b, ChipSize, colours.Edge, bold: true, Math.Max(1, inner - action.Width - SecondGap)) : null; - var source = SourceText(toast) is { } said ? Format(said.ToUpperInvariant(), ChipSize - 1, PanelText.Parse(palette.Edge(toast.Overlay.Notice.Severity)), bold: true, inner) : null; + var source = SourceText(toast) is { } said ? Format(said.ToUpperInvariant(), ChipSize - 1, colours.Edge, bold: true, inner) : null; var height = (2 * Padding) + text.Height + (action is null ? 0 : action.Height + 6) + (source is null ? 0 : source.Height + 2); var top = bottom - height; return top < Inset ? null : new Placed(toast, new Rect(x, top, width, height), text, chip, action, source, second); @@ -421,18 +421,17 @@ public override void Render(DrawingContext context) foreach (var placed in Layout()) { var (toast, rect, text, chip, action, source, second) = placed; - var palette = toast.Overlay.Palette; - var plane = PanelText.Parse(palette.Plane); - var edge = PanelText.Parse(palette.Edge(toast.Overlay.Notice.Severity)); + var colours = ColoursOf(toast); + var (plane, edge) = (colours.Plane, colours.Edge); using var _ = context.PushOpacity(FadeOf(toast, now)); // The card on a soft shadow (NativeTokens' small one: it floats over the page, not over a scrim), a rule for // its edge, and the severity as a rounded bar down its left side. - var lift = toast == hovered ? 0.08 : 0; + var lift = toast == hovered ? 0.06 : 0; var card = new RoundedRect(rect, NativeTokens.RadiusM); context.DrawRectangle( - new SolidColorBrush(Mix(plane, PanelText.Parse(palette.Text), lift + 0.03)), - new Pen(new SolidColorBrush(Mix(plane, PanelText.Parse(palette.Text), 0.16)), 1), + new SolidColorBrush(Mix(plane, colours.Text, lift)), + new Pen(new SolidColorBrush(colours.Rule), 1), card, NativeTokens.ShadowSmall); context.DrawRectangle( @@ -469,6 +468,29 @@ public override void Render(DrawingContext context) } } + /// + /// A toast's colours: the tokens' card plane and its rule and text — the surface every other native card is — with + /// the severity's edge (which also inks the key chip, the source caption and the action line, all small text) held to + /// on that card. The client's palette says which edge; the window's tokens say + /// what it is drawn on. + /// + private static ToastColours ColoursOf(Toast toast) => ColoursOf(toast.Overlay); + + /// + internal static ToastColours ColoursOf(NoticeOverlay overlay) + { + var said = PanelText.Parse(overlay.Palette.Plane); + var tokens = NativeTokens.For(overlay.Theme, (0.299 * said.R) + (0.587 * said.G) + (0.114 * said.B) < 140); + var card = new SharpMUTerm.Core.Text.Rgb(tokens.Card.R, tokens.Card.G, tokens.Card.B); + var edge = PanelText.Parse(overlay.Palette.Edge(overlay.Notice.Severity)); + var held = SharpMUTerm.Core.Text.Contrast.Legible( + new SharpMUTerm.Core.Text.Rgb(edge.R, edge.G, edge.B), card, NativeTokens.TextFloor); + return new ToastColours(tokens.Card, tokens.Edge, tokens.Text, Color.FromRgb(held.R, held.G, held.B)); + } + + /// A toast's card, its rule, its text and its severity's edge. + internal readonly record struct ToastColours(Color Plane, Color Rule, Color Text, Color Edge); + private static Color Mix(Color from, Color to, double amount) => Color.FromRgb( (byte)(from.R + ((to.R - from.R) * amount)), (byte)(from.G + ((to.G - from.G) * amount)), diff --git a/src/SharpMUTerm.Client/Chrome/StatusModel.cs b/src/SharpMUTerm.Client/Chrome/StatusModel.cs index 2a1f523c..2737675e 100644 --- a/src/SharpMUTerm.Client/Chrome/StatusModel.cs +++ b/src/SharpMUTerm.Client/Chrome/StatusModel.cs @@ -1,164 +1,212 @@ +using System.Globalization; + namespace SharpMUTerm.Client.Chrome; /// One run of the status row: text in one ink and weight, and what a click on it does (null for nothing). /// The run's visible text, keys in the cells' glyphs (a native host spells them in words). -/// Its colour, #rrggbb, already held to the floor on the row's plane. +/// +/// Its colour, #rrggbb, already held to the floor on the row's plane; null for the row's own ink +/// (), which the cells draw by writing no colour at all. +/// /// Whether the cells draw it bold. /// /// What a click hands back: a target the client put here itself (the palette, a notice's action), never a command a /// host spelt. Null for text a click does nothing on. /// -public sealed record StatusRun(string Text, string Ink, bool Bold, string? Target = null); +public sealed record StatusRun(string Text, string? Ink, bool Bold, string? Target = null); -/// -/// The status row as data: what SharpMUTermApp.PaintStatus writes into the cells — the connection, the mode's -/// keys, meters, reconnect, ● REC, ♪ muted, the scrollback segment, or a notice laid over them — split -/// into the cluster read from the left and the one read from the right. The terminal draws the row in cells; the window -/// (HostChrome.Status) leaves no cell for it and draws this as its footer, so the two cannot say different things. -/// -/// The runs from the left edge. -/// The runs that end at the right edge. -/// The row's plane, #rrggbb. -public sealed record StatusModel(IReadOnlyList Left, IReadOnlyList Right, string Plane) +/// What a segment of the status row is, so a host can tell the parts apart without reading their words. +public enum StatusRole { - /// A status row with nothing on it. - public static StatusModel Empty { get; } = new([], [], "#000000"); + /// Words with no other role (the not-connected line). + Text, - /// Every target a click on this row may hand back. - public IEnumerable Targets() => - Left.Concat(Right).Select(r => r.Target).OfType().Distinct(StringComparer.Ordinal); + /// The connection: the world's dot, the character and its state (or the reconnect countdown). + Identity, - /// The row as plain text, the two clusters joined by a gap: what a test or a screen reader reads. - public string Text => - string.Concat(Left.Select(r => r.Text)).TrimEnd() - + (Right.Count > 0 ? " " + string.Concat(Right.Select(r => r.Text)).Trim() : string.Empty); + /// The game's meters (hp 450/500). + Meters, + + /// Where the map says the character is. + Room, + + /// What the MOO last put in its status line. + Moo, + + /// How far the focused pane is scrolled back, and the key back. + Scrollback, + + /// ● REC: a scene log is being recorded. + Recording, + + /// ♪ muted. + Muted, + + /// The encoding in force on the connection. + Encoding, + + /// How long the armed line is, or the history-recall hint in its place. + Count, + + /// The way to the command palette. + Palette, + + /// The keys of the mode the keyboard is in (scrolled back, frozen, a search bar, the composer). + ModeHint, + + /// The keys that move between panes, tabs and command lines. + FocusHint, + + /// A notice laid over the row (). + Notice, + + /// A mode prompt that displaces the row (moving or dragging a window). + Prompt, +} + +/// One part of the status row: its role and its runs. +/// What it is. +/// How it reads. +public sealed record StatusSegment(StatusRole Role, IReadOnlyList Runs) +{ + /// The segment's visible text. + public string Text => string.Concat(Runs.Select(r => r.Text)); + + /// The cells the segment takes, counting text elements. + public int Width => StatusModel.WidthOf(Text); /// - public bool Equals(StatusModel? other) => - other is not null && Plane == other.Plane && Left.SequenceEqual(other.Left) && Right.SequenceEqual(other.Right); + public bool Equals(StatusSegment? other) => other is not null && Role == other.Role && Runs.SequenceEqual(other.Runs); /// - public override int GetHashCode() => HashCode.Combine(Plane, Left.Count, Right.Count); + public override int GetHashCode() => HashCode.Combine(Role, Runs.Count); +} - /// - /// Splits one row of runs into its two clusters at the widest run of spaces — the padding the row's renderer puts - /// between what it reads from the left and what it right-aligns — when that gap is at least three wide; otherwise - /// the whole row reads from the left. Runs are split at the gap and the gap itself is dropped. - /// - public static StatusModel From(IReadOnlyList runs, string plane) - { - ArgumentNullException.ThrowIfNull(runs); - var text = string.Concat(runs.Select(r => r.Text)); - var (gapAt, gapLength) = (-1, 0); - for (var i = 0; i < text.Length;) - { - if (text[i] != ' ') - { - i++; - continue; - } +/// +/// The status row as data, built first by SharpMUTermApp.PaintStatus's callers — the connection, the mode's keys, +/// meters, reconnect, ● REC, ♪ muted, the scrollback segment, or a notice or prompt laid over them — as the +/// segments the row lays out from the left and the ones it right-aligns, already cut to what fits the row's width with +/// its reserved fields and drop order. The terminal's cells are rendered from this; the window +/// (HostChrome.Status) leaves no cell for the row and draws the same instance as its footer. +/// +/// The segments from the left edge, a apart. +/// The segments that end at the right edge, a apart. +/// The row's plane, #rrggbb. +/// The row's own ink, #rrggbb: the colour of a run whose is null. +public sealed record StatusModel( + IReadOnlyList LeftSegments, + IReadOnlyList RightSegments, + string Plane, + string Ink) +{ + /// What is written between two segments of one cluster. + public const string Separator = " "; - var start = i; - while (i < text.Length && text[i] == ' ') - { - i++; - } + /// The least space kept between the clusters. + public const int MinGap = 3; - // Only a gap with text on both sides divides the row; trailing padding is not a right cluster. - if (i < text.Length && start > 0 && i - start >= 3 && i - start > gapLength) - { - (gapAt, gapLength) = (start, i - start); - } - } + /// A status row with nothing on it. + public static StatusModel Empty { get; } = new([], [], "#000000", "#ffffff"); - if (gapAt < 0) - { - return new StatusModel(Trim(Slice(runs, 0, text.Length)), [], plane); - } + /// The cells the row was laid out in; the right cluster ends there. Zero when not known. + public int Width { get; init; } - return new StatusModel(Trim(Slice(runs, 0, gapAt)), Trim(Slice(runs, gapAt + gapLength, text.Length)), plane); - } + /// The notice laid over the row, when the row is one. + public NoticeModel? Notice { get; init; } - private static List Slice(IReadOnlyList runs, int from, int to) - { - var result = new List(); - var at = 0; - foreach (var run in runs) - { - var (start, end) = (Math.Max(from, at), Math.Min(to, at + run.Text.Length)); - if (end > start) - { - result.Add(run with { Text = run.Text[(start - at)..(end - at)] }); - } + /// The left cluster as runs, with a run of the row's ink between segments. + public IReadOnlyList Left => Flatten(LeftSegments); - at += run.Text.Length; - } + /// The right cluster as runs, with a run of the row's ink between segments. + public IReadOnlyList Right => Flatten(RightSegments); - return result; - } + /// The cells a cluster of segments takes, separators included. + public static int WidthOf(IReadOnlyCollection segments) => + segments.Count == 0 ? 0 : segments.Sum(s => s.Width) + (Separator.Length * (segments.Count - 1)); - private static List Trim(List runs) - { - while (runs.Count > 0 && string.IsNullOrWhiteSpace(runs[0].Text)) - { - runs.RemoveAt(0); - } + /// The cells a text takes, counting text elements. + public static int WidthOf(string text) => new StringInfo(text).LengthInTextElements; - while (runs.Count > 0 && string.IsNullOrWhiteSpace(runs[^1].Text)) - { - runs.RemoveAt(runs.Count - 1); - } + /// Every target a click on this row may hand back. + public IEnumerable Targets() => + Left.Concat(Right).Select(r => r.Target).OfType().Distinct(StringComparer.Ordinal); - if (runs.Count > 0) + /// The row as plain text, the two clusters joined by a gap: what a test or a screen reader reads. + public string Text => + string.Concat(Left.Select(r => r.Text)) + + (RightSegments.Count > 0 ? Separator + string.Concat(Right.Select(r => r.Text)) : string.Empty); + + /// + /// The row as the cells lay it out: the left cluster, then spaces to push the right cluster to + /// (at least ), as runs. Runs of the same ink and weight are not merged here; a renderer may. + /// + public IReadOnlyList Row() + { + var runs = new List(Left); + if (RightSegments.Count > 0) { - runs[0] = runs[0] with { Text = runs[0].Text.TrimStart() }; - runs[^1] = runs[^1] with { Text = runs[^1].Text.TrimEnd() }; + var gap = Math.Max(MinGap, Width - WidthOf(LeftSegments) - WidthOf(RightSegments)); + runs.Add(new StatusRun(new string(' ', gap), null, false)); + runs.AddRange(Right); } return runs; } /// - /// The runs with set on the characters of the last occurrence of , - /// splitting runs at its edges; unchanged when the text is not there. How the client marks a hint or a notice's - /// action as clickable after drawing it. + /// cut to cells, ending in … in the ink of the run it cut into; + /// unchanged when it fits or the width is not known. The row is one row in every host: a notice is a sentence, and a + /// row wider than its window wraps and takes a row off the command line. /// - public static IReadOnlyList Mark(IReadOnlyList runs, string text, string target) + public IReadOnlyList Fit(int width) { - ArgumentNullException.ThrowIfNull(runs); - var whole = string.Concat(runs.Select(r => r.Text)); - var at = string.IsNullOrEmpty(text) ? -1 : whole.LastIndexOf(text, StringComparison.Ordinal); - if (at < 0) + var runs = Row(); + if (width <= 0 || WidthOf(string.Concat(runs.Select(r => r.Text))) <= width) { return runs; } - var end = at + text.Length; + var budget = Math.Max(0, width - 1); var result = new List(); - var pos = 0; + var shown = 0; foreach (var run in runs) { - var (rs, re) = (pos, pos + run.Text.Length); - pos = re; - if (re <= at || rs >= end) + if (shown + run.Text.Length <= budget) { result.Add(run); + shown += run.Text.Length; continue; } - var (a, b) = (Math.Max(rs, at), Math.Min(re, end)); - if (a > rs) - { - result.Add(run with { Text = run.Text[..(a - rs)] }); - } + result.Add(run with { Text = run.Text[..(budget - shown)] + "…" }); + break; + } + + return result; + } + + /// + public bool Equals(StatusModel? other) => + other is not null && Plane == other.Plane && Ink == other.Ink && Width == other.Width + && Equals(Notice, other.Notice) + && LeftSegments.SequenceEqual(other.LeftSegments) && RightSegments.SequenceEqual(other.RightSegments); + + /// + public override int GetHashCode() => HashCode.Combine(Plane, Ink, Width, LeftSegments.Count, RightSegments.Count); - result.Add(run with { Text = run.Text[(a - rs)..(b - rs)], Target = target }); - if (re > b) + private static List Flatten(IReadOnlyList segments) + { + var runs = new List(); + for (var i = 0; i < segments.Count; i++) + { + if (i > 0) { - result.Add(run with { Text = run.Text[(b - rs)..] }); + runs.Add(new StatusRun(Separator, null, false)); } + + runs.AddRange(segments[i].Runs); } - return result; + return runs; } } diff --git a/src/SharpMUTerm.Tui/CommandPalette.cs b/src/SharpMUTerm.Tui/CommandPalette.cs index 8991c88a..c94b58ce 100644 --- a/src/SharpMUTerm.Tui/CommandPalette.cs +++ b/src/SharpMUTerm.Tui/CommandPalette.cs @@ -126,6 +126,7 @@ private void Open() var clear = Math.Clamp(KeepClearBelow?.Invoke() ?? 0, 0, Math.Max(0, desktop.Height - 8)); var above = desktop.Height - clear; var height = Math.Clamp(initial.Rows.Count + 1 + 3, 6, Math.Max(6, clear > 0 ? above - 1 : desktop.Height - 2)); + _fullHeight = height; _contentWidth = Math.Clamp( Math.Max(CommandSurfaceRenderer.NaturalWidth(initial), HeaderWidth(initial)) + 1, 32, @@ -174,8 +175,42 @@ private void Refresh(string query) _view = Build(query); _selected = _view.Entries.Count == 0 ? -1 : Math.Clamp(_selected, 0, _view.Entries.Count - 1); Paint(); + FitHeight(query); } + /// The height the palette opened at: the whole catalog's, capped above the command line. + private int _fullHeight; + + /// The least a filtered palette shrinks to, so a query matching one row or none is still a surface. + internal const int FilteredMinHeight = 10; + + /// + /// Sizes the palette to what it lists: the whole catalog's height while the query is empty, and the matching rows' + /// (at least , never past the height it opened at, which is held above the command + /// line) once something is typed — a filtered list in a full-height frame was a column of blank. The top edge stays + /// where it opened, so the prompt being typed into does not move. + /// + private void FitHeight(string query) + { + if (_window is not { } window || _fullHeight <= 0) + { + return; + } + + var height = query.Length == 0 + ? _fullHeight + : Math.Clamp(_view.Rows.Count + 1 + 3, Math.Min(FilteredMinHeight, _fullHeight), _fullHeight); + if (height != window.Height) + { + var at = new System.Drawing.Point(window.Left, window.Top); + window.SetSize(window.Width, height); + window.SetPosition(at); + } + } + + /// The palette window's height now, or 0 while closed; for a test. + internal int WindowHeight => _window?.Height ?? 0; + private void Paint() => _results?.SetContent(Scheme.Lines(CommandSurfaceRenderer.Render(_view, _selected, _context(), _contentWidth), ScreenPalette.MenuBg)); diff --git a/src/SharpMUTerm.Tui/PackageScreen.cs b/src/SharpMUTerm.Tui/PackageScreen.cs index c3f9b293..ba4eca7f 100644 --- a/src/SharpMUTerm.Tui/PackageScreen.cs +++ b/src/SharpMUTerm.Tui/PackageScreen.cs @@ -47,11 +47,34 @@ internal static List Review(PackageReviewModel model, int width) } } - lines.Add(string.Empty); - lines.Add($"[{ScreenPalette.Label}]⏎ install · Esc cancel — nothing is written until you press ⏎[/]"); return lines; } + /// + /// The rows pinned under the review, outside its scroll (the import review's shape): a rule, then the keys that answer + /// it and that nothing is written until ⏎. Pinned because this is a consent screen — at 80×24 the body filled the + /// screen down to the command line, and a longer package would have scrolled its way to accept out of sight. + /// + internal static List ReviewFooter(int width) + { + width = Math.Max(30, width); + var keys = new List + { + new("⏎", "install", Drop: LadderKey.Keep), + new("↑↓", "scroll", Drop: 1), + new("Esc", "cancel", Drop: LadderKey.Keep), + }; + var ladder = KeyLadder.Fit(keys, width - 1, k => $"[{ScreenPalette.Accent}]{Escape(k)}[/]", Label, " "); + var note = $"[{ScreenPalette.Label}]— nothing is written until you press ⏎[/]"; + return + [ + $"[{ScreenPalette.Rule}]{new string('─', width - 1)}[/]", + VisibleLength(ladder) + 3 + VisibleLength(note) <= width - 1 ? $"{ladder} {note}" : ladder, + ]; + } + + private static string Label(string text) => $"[{ScreenPalette.Label}]{Escape(text)}[/]"; + private static string ReviewRow(PackageReviewRow row, int width) { var ink = row.Tone switch diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Footer.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Footer.cs index 6be600e8..077fe3ec 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Footer.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Footer.cs @@ -10,9 +10,10 @@ namespace SharpMUTerm.Tui; /// The status row and the command line's field, for a host that draws them itself (, /// ; the window). /// -/// The status row is the markup writes, parsed by the framework's own parser into runs -/// () — so the footer says exactly what the cells would, notices, mode keys, meters, reconnect, -/// ● REC, ♪ muted and the scrollback segment included — and the row's cell is left out of the grid. A click +/// The status row is a built first — segments by role, laid out to the row's width — and +/// renders the cells from it (), so the footer says +/// exactly what the cells would, notices, mode keys, meters, reconnect, ● REC, ♪ muted and the scrollback +/// segment included — and the row's cell is left out of the grid. A click /// hands back a target the client put on a run: a notice's action (to , the toast's path) /// or the palette hint (to the palette, the header search box's path). Anything else is refused. /// @@ -57,71 +58,74 @@ internal StatusOverlay BuildStatusOverlay() return new StatusOverlay(BuildStatusModel(), MainWindowInFront(), _statusActivate); } + /// The status row's model, as last painted: the instance the cells were rendered from. Internal for tests. + internal StatusModel BuildStatusModel() => _statusModel ?? StatusRowModel([]); + + /// The model the status row was last rendered from. + private StatusModel? _statusModel; + + /// A status row laid out at the row's width now, on the row's plane, in the row's ink. + private StatusModel StatusRowModel( + IReadOnlyList left, + IReadOnlyList? right = null, + NoticeModel? notice = null) => + new(left, right ?? [], Hex(WorkspacePalette.Backdrop(_theme)), Hex(_theme.StatusForeground)) + { + Width = HeaderWidth(), + Notice = notice, + }; + /// - /// The row's markup as runs: the framework's parse of exactly what the cells are given, one run per change of ink - /// or weight, split into the left and right clusters, with the palette hint and a showing notice's action marked - /// clickable. + /// The status row's quiet ink: a grey held to 4.5:1 on the backdrop it is painted on, in place of the framework's + /// fixed [dim] #808080 — 3.4:1 on Light's status plane, and the row is small text a reader looks for + /// (UX audit wave 11, #2 and #7). /// - internal StatusModel BuildStatusModel() + private string StatusDim => Hex(WorkspacePalette.NoticeMuted(_theme, WorkspacePalette.Backdrop(_theme))); + + /// A run of the status row; a null ink is the row's own. + private static StatusRun Run(string text, string? ink = null, bool bold = false, string? target = null) => + new(text, ink, bold, target); + + /// A run in the row's quiet ink. + private StatusRun Dim(string text, string? target = null) => new(text, StatusDim, false, target); + + /// A segment of the status row. + private static StatusSegment Segment(StatusRole role, params StatusRun[] runs) => new(role, runs); + + /// + /// The cell renderer of the status row: each run in its ink, bold where it is, a run in the row's own ink written + /// with no colour (so it takes the control's, as unstyled text always did), neighbouring runs of one style merged. + /// + internal static string StatusRowMarkup(IReadOnlyList runs) { - var plane = WorkspacePalette.Backdrop(_theme); - var fg = ToColor(_theme.StatusForeground); - var bg = ToColor(plane); - var runs = new List(); - var text = new System.Text.StringBuilder(); - (string Ink, bool Bold)? style = null; - foreach (var cell in MarkupParser.Parse(_statusBar.Text, fg, bg)) + var markup = new System.Text.StringBuilder(); + for (var i = 0; i < runs.Count;) { - if (cell.IsWideContinuation) + var (ink, bold) = (runs[i].Ink, runs[i].Bold); + var text = new System.Text.StringBuilder(); + for (; i < runs.Count && runs[i].Ink == ink && runs[i].Bold == bold; i++) { - continue; + text.Append(runs[i].Text); } - var next = (ColourHex(cell.Foreground), cell.Decorations.HasFlag(TextDecoration.Bold)); - if (style is { } current && current != next) + if (text.Length == 0) { - runs.Add(new StatusRun(text.ToString(), current.Ink, current.Bold)); - text.Clear(); + continue; } - style = next; - text.Append(cell.Character.ToString()); + var escaped = MarkupText.Escape(text.ToString()); + var tag = (bold ? "bold " : string.Empty) + (ink ?? string.Empty); + markup.Append(tag.Length == 0 ? escaped : $"[{tag.TrimEnd()}]{escaped}[/]"); } - if (style is { } last && text.Length > 0) - { - runs.Add(new StatusRun(text.ToString(), last.Ink, last.Bold)); - } - - IReadOnlyList marked = runs; - if (_noticeShown?.Action is { } action && _notice is not null) - { - foreach (var hint in NoticeActionHints(action)) - { - marked = StatusModel.Mark(marked, hint, action.Command); - } - } - - marked = StatusModel.Mark(marked, PaletteHintText, HeaderModel.PaletteTarget); - return StatusModel.From(marked, Hex(plane)); + return markup.ToString(); } - /// - /// The model as cell markup: each run in its ink, bold where it was, the clusters a gap apart. The row the cells - /// paint is the markup this model was parsed from; this is the way back, and StatusFooterTests holds the two - /// to the same visible text. - /// - internal static string StatusRowMarkup(StatusModel model) - { - static string Run(StatusRun run) => - $"[{(run.Bold ? "bold " : string.Empty)}{run.Ink}]{MarkupText.Escape(run.Text)}[/]"; - - var left = string.Concat(model.Left.Select(Run)); - return model.Right.Count == 0 ? left : left + " " + string.Concat(model.Right.Select(Run)); - } + /// The status row's way to the palette, as the row writes it; the run a click opens ⌃P from. + private const string PaletteHintText = "⌃P palette"; - /// The status row's way to the palette, as the row writes it. - private static string PaletteHintText => $"{KeyGlyphs.Normalize("⌃P")} palette"; + /// The model as cell markup, laid out at its width: what the cells paint. Internal for tests. + internal static string StatusRowMarkup(StatusModel model) => StatusRowMarkup(model.Row()); /// /// A click on the host's status footer, by the target the client put on a run. Internal so a test can drive it the @@ -203,7 +207,6 @@ private void PublishInputBand() return new InputBand(top, rows, InputLayout.HostFieldPad, prompts, $"⏎ sends · {KeyGlyphs.Normalize(Host.Keys.Newline.Glyph)} new line"); } - private static string ColourHex(Color colour) => $"#{colour.R:x2}{colour.G:x2}{colour.B:x2}"; } /// The status row, for a host that draws it (). diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Notices.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Notices.cs index cf056f13..e1292b1a 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Notices.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Notices.cs @@ -45,29 +45,45 @@ internal sealed partial class SharpMUTermApp /// failure in the raw red was 1.39:1 on Light, and the framework's fixed [dim] grey 2.4:1. The cell /// renderer of the notice surface. /// - internal string NoticeMarkup(NoticeModel notice) + internal string NoticeMarkup(NoticeModel notice) => StatusRowMarkup(NoticeSegment(notice).Runs); + + /// + /// The notice as the status row's segment: the key chip (or the source's label) in the notice ink, then the text — + /// in the warning red when something failed, otherwise a muted grey — then the way to its action, a click's target. + /// + private StatusSegment NoticeSegment(NoticeModel notice) { ArgumentNullException.ThrowIfNull(notice); var plane = WorkspacePalette.Backdrop(_theme); var ink = notice.Severity == NoticeSeverity.Warning ? HeldOn(ScreenPalette.Warn, plane) : Hex(WorkspacePalette.NoticeMuted(_theme, plane)); - var body = $"[{ink}]{Escape(notice.Text)}[/]"; var label = HeldOn(_ink.Notice, plane); + var runs = new List(); + // A source is a label (Sound:), a key a chord chip (⌃P): two shapes, so a word is never read as a key to press. - var row = notice.Source is { } source ? $"[{label}]{Escape(source)}:[/] {body}" - : notice.Key is null ? body : $"[{label}]{Escape(notice.Key)}[/] {body}"; + if (notice.Source is { } source) + { + runs.AddRange([Run($"{source}:", label), Run(" ")]); + } + else if (notice.Key is { } key) + { + runs.AddRange([Run(key, label), Run(" ")]); + } + + runs.Add(Run(notice.Text, ink)); // The toast offers the action as a button; the row names the way to it, where it fits whole — never by cutting - // the notice's own words, and never wrapping the row (FitStatusRow). + // the notice's own words, and never wrapping the row (StatusModel.Fit). // A notice whose own words already name the way (`offline — ⌥R (⌃P ▸ Reconnect) connects it`) gets no second // copy: the row read `… connects it · ⌥R Reconnect`. - if (NoticeActionHints(notice.Action).FirstOrDefault(h => !NamesWay(notice.Text, h) && MarkupWidth(row) + 3 + h.Length <= HeaderWidth()) is { } hint) + var width = StatusModel.WidthOf(string.Concat(runs.Select(r => r.Text))); + if (NoticeActionHints(notice.Action).FirstOrDefault(h => !NamesWay(notice.Text, h) && width + 3 + h.Length <= HeaderWidth()) is { } hint) { - row += $"[{label}] · {Escape(hint)}[/]"; + runs.AddRange([Run(" · ", label), Run(hint, label, target: notice.Action!.Command)]); } - return row; + return new StatusSegment(StatusRole.Notice, runs); } /// @@ -136,7 +152,7 @@ private void PublishNotice(NoticeModel notice) } _noticeRun ??= id => OnUiThread(() => RunNoticeAction(id)); - _pointer.Notice(new NoticeOverlay(notice, NoticeAboveRow(), NoticePalette(), _noticeRun)); + _pointer.Notice(new NoticeOverlay(notice, NoticeAboveRow(), NoticePalette(), _noticeRun) { Theme = _theme }); } /// @@ -221,7 +237,14 @@ internal void SimulateNotice(string text, MessageSeverity severity, string? key, /// Runs the notice's action by its command id, through the registry; a command no notice offered is refused. Safe to /// call from any thread. The same instance for the life of the client. /// -internal sealed record NoticeOverlay(NoticeModel Notice, int AboveRow, NoticePalette Palette, Action Run); +internal sealed record NoticeOverlay(NoticeModel Notice, int AboveRow, NoticePalette Palette, Action Run) +{ + /// + /// The client's theme, which the window derives its card plane from (NativeTokens): a toast is a native card + /// like the palette's, not a piece of the status row. Null when not said; the host then picks by the palette's plane. + /// + public Core.Theming.Theme? Theme { get; init; } +} /// A toast's colours as #rrggbb: its plane, its text, and its edge per severity. internal sealed record NoticePalette(string Plane, string Text, string Info, string Warning, string Refusal) diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.ModeHints.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.ModeHints.cs index a12cd463..b58f9943 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.ModeHints.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.ModeHints.cs @@ -46,20 +46,31 @@ internal StatusMode CurrentStatusMode() } /// - /// The row's candidates for , longest first, as markup: each key in the client's notice - /// voice and what it does dimmed, so the way out reads at a glance. Every candidate is exactly as wide as the + /// The row's candidates for , longest first: each key in the client's notice voice and what + /// it does in the row's quiet ink, so the way out reads at a glance. Every candidate is exactly as wide as the /// plain text gives, which is what the row measures. /// - private List ModeHintMarkup(StatusMode mode) + private List ModeHintSegments(StatusMode mode) { var keys = HostKeyGlyphs(); var hints = ModeHints.For(mode) - .Select(h => $"[{_ink.Notice}]{MarkupText.Escape(Client.Palette.KeyGlyphs.Normalize(h.Key.Resolve(keys)))}[/] [dim]{MarkupText.Escape(h.Does)}[/]") + .Select(h => new[] { Run(Client.Palette.KeyGlyphs.Normalize(h.Key.Resolve(keys)), _ink.Notice), Run(" "), Dim(h.Does) }) .ToList(); - var candidates = new List(hints.Count); + var candidates = new List(hints.Count); for (var n = hints.Count; n > 0; n--) { - candidates.Add(string.Join("[dim] · [/]", hints.Take(n))); + var runs = new List(); + foreach (var hint in hints.Take(n)) + { + if (runs.Count > 0) + { + runs.Add(Dim(" · ")); + } + + runs.AddRange(hint); + } + + candidates.Add(new StatusSegment(StatusRole.ModeHint, runs)); } return candidates; diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.MooEdit.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.MooEdit.cs index 42ab5d42..7eb8ae08 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.MooEdit.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.MooEdit.cs @@ -75,7 +75,10 @@ async Task SaveAsync() } /// » status, elided and padded to . The text is the server's. - internal static string MooStatusCell(string status) + internal static string MooStatusCell(string status) => $"[dim]{Escape(MooStatusText(status))}[/]"; + + /// 's text: » status, elided and padded. + internal static string MooStatusText(string status) { var text = new string([.. status.Select(c => char.IsControl(c) ? ' ' : c)]).Trim(); var room = MooStatusCellWidth - 2; @@ -84,6 +87,6 @@ internal static string MooStatusCell(string status) text = text[..(room - 1)] + "…"; } - return $"[dim]» {Escape(text.PadRight(room))}[/]"; + return $"» {text.PadRight(room)}"; } } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Packages.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Packages.cs index dda4127f..7dbcfdff 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Packages.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Packages.cs @@ -236,7 +236,9 @@ internal void ReviewPackage(byte[] archive, PackageIndexEntry? listed = null) AcceptPackage(model); return false; - }); + }, + footer: PackageScreen.ReviewFooter, + scrollKeys: true); } /// diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 5c26c86c..66d52564 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -2693,7 +2693,8 @@ void Feed(string windowId, string ansiLine) // server agreed to UTF-8, which the row draws unqualified. A world that pinned an encoding // would read "utf-8 forced" and a server that never negotiated "utf-8 assumed". _demoEncoding = new SessionEncoding(Encoding.UTF8, EncodingSource.Negotiated); - _statusBar.SetContent(new List { StatusInk(StatusBarMarkup("Corvid", "connected")) }); + _statusModel = StatusBarRow("Corvid", "connected"); + _statusBar.SetContent(new List { StatusRowMarkup(_statusModel) }); RefreshHeader(); _input.SetAndNotify("say hello there"); RebuildPaneArea(); // realise the Chat spawn tab, then refresh badges @@ -7043,11 +7044,11 @@ private void SyncScrollbackState(string? windowId = null) /// sign that a pane is not showing its newest line, because the panes deliberately carry no /// scrollbar (see ), so it has to be right rather than decorative. /// - private string ScrollbackStatus() + private StatusSegment? ScrollbackStatus() { if (ScrollTarget() is not { CanScrollDown: true } panel) { - return string.Empty; + return null; } // Kept short on purpose. The row right-aligns a cluster of five segments and only guarantees a @@ -7064,7 +7065,7 @@ private string ScrollbackStatus() // segment is the same width whatever it says. var below = Math.Max(1, panel.TotalContentHeight - panel.ViewportHeight - panel.VerticalScrollOffset); var distance = UnreadBadge.Format(below).PadLeft(UnreadBadge.FieldWidth); - return $"[{_ink.Notice}]{Glyphs.Scrollback} scrollback[/] [dim]{distance} · ⌃End live[/]"; + return Segment(StatusRole.Scrollback, Run($"{Glyphs.Scrollback} scrollback", _ink.Notice), Run(" "), Dim($"{distance} · ⌃End live")); } /// @@ -7081,8 +7082,8 @@ private void RefreshStatusRow() } SetStatus(_statusIdentity is { } id - ? StatusBarMarkup(id.Character, id.State) - : NotConnectedMarkup()); + ? StatusBarRow(id.Character, id.State) + : NotConnectedRow()); } /// @@ -7275,7 +7276,7 @@ private void RefreshStatusBar() return; } - SetStatus(StatusBarMarkup(id.Character, id.State)); + SetStatus(StatusBarRow(id.Character, id.State)); } /// The world.character key of the character whose windows the rail expands. @@ -12834,7 +12835,7 @@ private void EnterMoveMode() } RebuildPaneArea(); - SetStatus(MovePromptMarkup(), displace: true); + SetStatus(MovePromptRow(), displace: true); } /// Handles a key while in move mode: pick pane (1–9), edge (arrows), commit (⏎), cancel (Esc). @@ -12862,7 +12863,7 @@ private void HandleMoveKey(KeyPressedEventArgs e) { _moveEdge = _moveEdge == edge ? null : edge; RebuildPaneArea(); - SetStatus(MovePromptMarkup(), displace: true); + SetStatus(MovePromptRow(), displace: true); return; } @@ -12874,7 +12875,7 @@ private void HandleMoveKey(KeyPressedEventArgs e) { _moveTargetPaneId = match.Key; RebuildPaneArea(); - SetStatus(MovePromptMarkup(), displace: true); + SetStatus(MovePromptRow(), displace: true); } } } @@ -12908,13 +12909,20 @@ private void ExitMoveMode(bool commit) } /// The move-mode status prompt. - private string MovePromptMarkup() + private StatusModel MovePromptRow() { - var name = _moveWindowId is { } id && _workspace.FindWindow(id) is { } w ? Escape(w.Title) : "window"; - return $"[{_ink.Notice}]MOVE[/] [bold]{name}[/] [dim]→[/] [{_ink.Accent}]{DropLabel(_moveTargetPaneId, _moveEdge)}[/]" - + " [dim]1–9 pane · ←↑↓→ edge · ⏎ commit · Esc cancel[/]"; + var name = _moveWindowId is { } id && _workspace.FindWindow(id) is { } w ? w.Title : "window"; + return StatusRowModel( + [ + DropPrompt("MOVE", name, DropLabel(_moveTargetPaneId, _moveEdge)), + Segment(StatusRole.ModeHint, Dim("1–9 pane · ←↑↓→ edge · ⏎ commit · Esc cancel")), + ]); } + /// The move and drag prompts' first segment: MOVE window → where. + private StatusSegment DropPrompt(string verb, string window, string where) => + Segment(StatusRole.Prompt, Run(verb, _ink.Notice), Run(" "), Run(window, bold: true), Run(" "), Dim("→"), Run(" "), Run(where, _ink.Accent)); + /// Human-readable description of a pending drop, for the move prompt and drag preview. private string DropLabel(string? paneId, Edge? edge) { @@ -13233,7 +13241,7 @@ private void ApplyDragResult(PaneDragResult result) _dragTargetPaneId = result.TargetPaneId; _dragEdge = result.Edge; RebuildPaneArea(); - SetStatus(DragPromptMarkup(result.WindowId, result.TargetPaneId, result.Edge), displace: true); + SetStatus(DragPromptRow(result.WindowId, result.TargetPaneId, result.Edge), displace: true); break; case PaneDragAction.Commit: @@ -13269,11 +13277,14 @@ private void EndDrag() } /// The status line shown while a pane drag is in flight. - private string DragPromptMarkup(string? windowId, string? targetPaneId, Edge? edge) + private StatusModel DragPromptRow(string? windowId, string? targetPaneId, Edge? edge) { - var name = windowId is { } id && _workspace.FindWindow(id) is { } window ? Escape(window.Title) : "window"; - return $"[{_ink.Notice}]DRAG[/] [bold]{name}[/] [dim]→[/] [{_ink.Accent}]{DropLabel(targetPaneId, edge)}[/]" - + " [dim]release to drop · Esc cancel[/]"; + var name = windowId is { } id && _workspace.FindWindow(id) is { } window ? window.Title : "window"; + return StatusRowModel( + [ + DropPrompt("DRAG", name, DropLabel(targetPaneId, edge)), + Segment(StatusRole.ModeHint, Dim("release to drop · Esc cancel")), + ]); } /// A pane rendered as a live drop target, sized from the drag's frozen geometry. @@ -14049,33 +14060,15 @@ private async Task AnnounceWindowSizeAsync(WorldSession session, int width, int /// took. Re-deriving here rather than in is what covers the notice case too. /// /// - private void PaintStatus(string markup) + private void PaintStatus(StatusModel model) { - _statusBar.SetContent(new List { StatusInk(FitStatusRow(markup, HeaderWidth())) }); + // The model first, the cells from it: cut to the width now (StatusModel.Fit), so a notice never wraps the row. + _statusModel = Drawing(SurfaceCatalog.Status, string.Empty, model); + _statusBar.SetContent(new List { StatusRowMarkup(model.Fit(HeaderWidth())) }); SyncInputHeights(_second.Visible); PublishStatus(); // a host's footer has no cell to repaint, so a change may paint no frame (RefreshHeader's reason) } - /// - /// The status row's quiet text in a grey held to 4.5:1 on the backdrop it is painted on, in place of the framework's - /// fixed [dim] #808080 — 3.4:1 on Light's status plane, and the row is small text a reader looks for - /// (UX audit wave 11, #2 and #7). Only the bare tag is replaced; the cells do not move. - /// - private string StatusInk(string markup) => - BareDim.Replace(markup, $"[{Hex(WorkspacePalette.NoticeMuted(_theme, WorkspacePalette.Backdrop(_theme)))}]"); - - /// A [dim] tag that is a tag, not the escaped text [[dim]]. - private static readonly System.Text.RegularExpressions.Regex BareDim = new(@"(? - /// The status row's markup cut to cells, ending in …. The row is one row in every - /// host: a notice is a sentence, and a window narrower than it wrapped the row onto a second line and took that row - /// off the command line (the D1 lesson, live in the window). Everything the resting row lays out already fits; this is - /// the floor under the notices and anything else that does not measure itself. Internal for tests. - /// - internal static string FitStatusRow(string markup, int width) => - width > 0 && MarkupWidth(markup) > width ? ElideVisible(markup, width) : markup; - /// /// Sets what the status row says at rest: the connection identity, a mode prompt, the /// not-connected line. Remembered as well as painted, so a laid over the top of @@ -14093,7 +14086,7 @@ internal static string FitStatusRow(string markup, int width) => /// True for a line that must be seen now — the move and drag prompts, which are a mode the /// user just entered rather than a background repaint. /// - private void SetStatus(string markup, bool displace = false) + private void SetStatus(StatusModel markup, bool displace = false) { _restingStatus = markup; if (displace) @@ -14108,7 +14101,7 @@ private void SetStatus(string markup, bool displace = false) } /// What the status row says with no notice over it. Kept in step by . - private string _restingStatus = "[dim]not connected[/]"; + private StatusModel? _restingStatus; /// /// How long a holds the status row. tmux's display-time is well under a @@ -14193,11 +14186,11 @@ private void Notice(string text, MessageSeverity severity = MessageSeverity.Warn { Second = action is null ? null : second, }); - var markup = NoticeMarkup(model); + var segment = NoticeSegment(model); - _notice = markup; + _notice = StatusRowMarkup(segment.Runs); _noticeShown = model; - PaintStatus(markup); + PaintStatus(StatusRowModel([segment], notice: model)); if (toast) { PublishNotice(model); @@ -14225,7 +14218,7 @@ private void ClearNotice() } ForgetNotice(); - PaintStatus(_restingStatus); + PaintStatus(_restingStatus ?? NotConnectedRow()); } /// Forgets the notice and disarms its timer, without painting — for callers about to paint. @@ -14236,22 +14229,30 @@ private void ForgetNotice() } /// The resting status row of a client with nothing connected. - private string NotConnectedMarkup() + private StatusModel NotConnectedRow() { - var scrollback = ScrollbackStatus(); - var suffix = scrollback.Length == 0 ? string.Empty : $" {scrollback}"; // No graphics readout: which protocol the probe chose is a startup fact (--help and the session's first line say it), and on a // first run it was the one technical word on the screen. - var row = $"[dim]not connected · ⌃P palette · ⌃Q quit[/]{suffix}"; + var row = new List + { + Segment(StatusRole.Text, Dim("not connected · "), Dim(PaletteHintText, HeaderModel.PaletteTarget), Dim(" · ⌃Q quit")), + }; + if (ScrollbackStatus() is { } scrollback) + { + row.Add(scrollback); + } // A client with nothing connected is still read back through, frozen and searched: the mode's keys go on // the end where they fit, the longest that does. var mode = CurrentStatusMode(); _statusModeShown = mode; - return mode != StatusMode.None - && ModeHintMarkup(mode).FirstOrDefault(h => MarkupWidth(row) + 3 + MarkupWidth(h) <= HeaderWidth()) is { } hint - ? $"{row} {hint}" - : row; + if (mode != StatusMode.None + && ModeHintSegments(mode).FirstOrDefault(h => StatusModel.WidthOf(row) + 3 + h.Width <= HeaderWidth()) is { } hint) + { + row.Add(hint); + } + + return StatusRowModel(row); } private void UpdateStatus() @@ -14262,7 +14263,7 @@ private void UpdateStatus() // Clear the identity too: leaving a stale one behind means the next RefreshStatusBar // repaints a connection that is no longer there. _statusIdentity = null; - SetStatus(NotConnectedMarkup()); + SetStatus(NotConnectedRow()); return; } @@ -14532,7 +14533,7 @@ private string HeaderRight(HeaderModel model) /// you are outlives everything. /// /// - private string[] FocusHints() + private StatusSegment[] FocusHints() { var panes = _workspace.Layout.Panes.Count > 1 && _workspace.Layout.ZoomedPaneId is null; var bars = _second.Visible; @@ -14556,10 +14557,10 @@ private string[] FocusHints() }; var segments = ordered.OfType<(string Text, int Rank)>().ToList(); - var candidates = new List(segments.Count); + var candidates = new List(segments.Count); while (segments.Count > 0) { - candidates.Add($"[dim]{string.Join(" · ", segments.Select(s => s.Text))}[/]"); + candidates.Add(Segment(StatusRole.FocusHint, Dim(string.Join(" · ", segments.Select(s => s.Text))))); segments.Remove(segments.MinBy(s => s.Rank)); } @@ -14585,11 +14586,11 @@ private string[] FocusHints() /// place. A function of the row and never of the room's name, so a walk still moves nothing: at 160 columns the /// cell read The Grand Plaza · Aetherf… with thirty cells free beside it. /// - private int RoomCellFor(string left, string rightBar, StatusMode mode) + private int RoomCellFor(int left, int rightBar, StatusMode mode) { - var hints = mode == StatusMode.None ? FocusHints().Select(h => MarkupWidth(h) + 3).DefaultIfEmpty(0).Max() : 0; + var hints = mode == StatusMode.None ? FocusHints().Select(h => h.Width + 3).DefaultIfEmpty(0).Max() : 0; var moo = _active?.McpStatus is null ? 0 : MooStatusCellWidth + 3; - var spare = HeaderWidth() - MarkupWidth(left) - 3 - MarkupWidth(rightBar) - MinStatusGap - MeterSlack - hints - moo; + var spare = HeaderWidth() - left - 3 - rightBar - MinStatusGap - MeterSlack - hints - moo; return Math.Clamp(spare, RoomCellWidth, RoomCellMaxWidth); } @@ -14599,7 +14600,11 @@ private int RoomCellFor(string left, string rightBar, StatusMode mode) /// ⌂ Room · Area, elided and padded to . The room leads: it is what /// changes, and it is what an elision should keep. - internal static string RoomCell(string name, string? area, int width = RoomCellWidth) + internal static string RoomCell(string name, string? area, int width = RoomCellWidth) => + $"[dim]{Escape(RoomCellText(name, area, width))}[/]"; + + /// 's text: ⌂ Room · Area, elided and padded. + internal static string RoomCellText(string name, string? area, int width = RoomCellWidth) { var text = string.IsNullOrWhiteSpace(area) ? name : $"{name} · {area}"; var room = Math.Max(RoomCellWidth, width) - 2; @@ -14608,7 +14613,7 @@ internal static string RoomCell(string name, string? area, int width = RoomCellW text = text[..(room - 1)] + "…"; } - return $"[dim]⌂ {Escape(text.PadRight(room))}[/]"; + return $"⌂ {text.PadRight(room)}"; } /// Whether the status row last left its meters out because the vitals strip was showing them. @@ -14648,24 +14653,37 @@ private void SyncStatusMeters() /// The cells the meters leave free for the typed-character count to grow into. private const int MeterSlack = 4; - private string StatusBarMarkup(string character, string state) + /// + /// The resting status row of a connected client, as a model: every segment by its role, laid out to the row's width + /// with the row's reserved fields and drop order. The cells are rendered from it (), and the + /// window's footer draws the same instance. + /// + private StatusModel StatusBarRow(string character, string state) { // A dropped connection waiting to dial again says when, in place of "faulted" (SharpMUTermApp.Reconnect.cs). state = ReconnectStatus(_active) ?? state; var accent = ActiveWorld() is { } world ? AccentHex(world.Accent) : _ink.Accent; - var left = $"[{accent}]●[/] [bold]{Escape(character)}[/] [dim]{Escape(state)}[/]"; + var left = new List + { + Segment(StatusRole.Identity, Run("●", accent), Run(" "), Run(character, bold: true), Run(" "), Dim(state)), + }; + int W(IReadOnlyCollection cluster) => StatusModel.WidthOf(cluster); + // The vitals strip already draws these meters for this character, larger; the row says them only while it // is not on screen. Nothing else on the row moves with it: every other cell is reserved or dropped by width. _statusMetersHidden = VitalsStripShowing(); - var meters = _statusMetersHidden - ? string.Empty - : StatusMeterRenderer.Render(StatusMeters(), StatusData(), LowInk(_theme.StatusBackground)); + StatusSegment? MeterSegment(bool compact) => + StatusMeterRenderer.Runs(StatusMeters(), StatusData(), LowInk(_theme.StatusBackground), StatusDim, compact) is { Count: > 0 } runs + ? new StatusSegment(StatusRole.Meters, runs) + : null; + var meters = _statusMetersHidden ? null : MeterSegment(compact: false); - var right = new List(); + var right = new List(); // Leftmost of the right cluster while it is there at all: a pane that is not showing its newest // line is the most important thing the row can say, because nothing else on screen says it. - if (ScrollbackStatus() is { Length: > 0 } scrollback) + var scrollback = ScrollbackStatus(); + if (scrollback is not null) { right.Add(scrollback); } @@ -14674,13 +14692,13 @@ private string StatusBarMarkup(string character, string state) // Only by a keystroke, like the mute cell below, so it needs no reserved width; and never given up for room. if (SceneRecording) { - right.Add($"[{HeldOn(ScreenPalette.Warn, WorkspacePalette.Backdrop(_theme))}]{RecordingCell}[/]"); + right.Add(Segment(StatusRole.Recording, Run(RecordingCell, HeldOn(ScreenPalette.Warn, WorkspacePalette.Backdrop(_theme))))); } // Only while muted, and only by a keystroke: nothing from the wire can make this cell appear. if (_muted) { - right.Add($"[{_ink.Notice}]{MutedCell}[/]"); + right.Add(Segment(StatusRole.Muted, Run(MutedCell, _ink.Notice))); } // No latency meter. There was one — a heartbeat glyph, a sparkline and a round-trip figure — and @@ -14705,10 +14723,10 @@ private string StatusBarMarkup(string character, string state) // "utf-8" means the server agreed, "utf-8 assumed" means nobody said, "iso-8859-1 forced" means // you did. With nothing connected there is no fact to report, and the cell is not drawn — the // same rule that took the address and the invented latency meter off this row. - string? encodingCell = null; + StatusSegment? encodingCell = null; if (EffectiveEncoding() is { } encoding) { - encodingCell = $"[dim]{Escape(encoding.Label)}[/]"; + encodingCell = Segment(StatusRole.Encoding, Dim(encoding.Label)); right.Add(encodingCell); } @@ -14716,10 +14734,10 @@ private string StatusBarMarkup(string character, string state) // history it becomes the "back to draft" hint instead. Both read the armed bar, so a count that // moves is always the line ⏎ would send. right.Add(HistoryFor(BarKind(ActiveBar())).IsRecalling - ? $"[{AccentHex(AccentPalette[0])}]history[/] [dim]· ↓ back to draft[/]" - : $"[dim]{ActiveBar().Text.Length} chars[/]"); + ? Segment(StatusRole.Count, Run("history", AccentHex(AccentPalette[0])), Run(" "), Dim("· ↓ back to draft")) + : Segment(StatusRole.Count, Dim($"{ActiveBar().Text.Length} chars"))); - const string paletteCell = "[dim]⌃P palette[/]"; + var paletteCell = Segment(StatusRole.Palette, Dim(PaletteHintText, HeaderModel.PaletteTarget)); right.Add(paletteCell); // The cluster above is built unconditionally, and at 80 columns a scrolled-back pane's segment @@ -14732,14 +14750,11 @@ private string StatusBarMarkup(string character, string state) // The meters count here too: on a narrow terminal they are worth more to someone in a fight than // either of those two cells, and they used to be the thing that lost — at 80 columns a world // publishing HP showed none of it. - var compactMeters = meters.Length > 0 - ? StatusMeterRenderer.Render(StatusMeters(), StatusData(), LowInk(_theme.StatusBackground), compact: true) - : string.Empty; - var meterCost = compactMeters.Length > 0 ? 3 + MarkupWidth(compactMeters) + MeterSlack : 0; + var compactMeters = meters is not null ? MeterSegment(compact: true) : null; + var meterCost = compactMeters is not null ? 3 + compactMeters.Width + MeterSlack : 0; foreach (var droppable in new[] { encodingCell, paletteCell }) { - if (droppable is null - || MarkupWidth(left) + MinStatusGap + MarkupWidth(string.Join(" ", right)) + meterCost <= HeaderWidth()) + if (droppable is null || W(left) + MinStatusGap + W(right) + meterCost <= HeaderWidth()) { continue; } @@ -14747,8 +14762,7 @@ private string StatusBarMarkup(string character, string state) right.Remove(droppable); } - if (right.Count > 1 - && MarkupWidth(left) + MinStatusGap + MarkupWidth(string.Join(" ", right)) > HeaderWidth()) + if (right.Count > 1 && W(left) + MinStatusGap + W(right) > HeaderWidth()) { right.RemoveAt(right.Count - 1); } @@ -14759,22 +14773,19 @@ private string StatusBarMarkup(string character, string state) // exactly this reason). A hint that quietly costs a row of output on a 100-column terminal is a // worse trade than a hint that is only there when there is room for it, and this is the same // measurement the header already makes to right-align its own cluster. - var rightBar = string.Join(" ", right); // The meters sit beside the identity they describe, and only when the row has room for them with a // few cells to spare: the character count on the right grows as a line is typed, and a cluster that // came and went with it would be worse than one that is absent on a narrow terminal. - if (meters.Length > 0 - && MarkupWidth(left) + 3 + MarkupWidth(meters) + MarkupWidth(rightBar) + MinStatusGap + MeterSlack > HeaderWidth()) + if (meters is not null && W(left) + 3 + meters.Width + W(right) + MinStatusGap + MeterSlack > HeaderWidth()) { // Too narrow for value/max: the share alone, in a field just as fixed. - meters = StatusMeterRenderer.Render(StatusMeters(), StatusData(), LowInk(_theme.StatusBackground), compact: true); + meters = MeterSegment(compact: true); } - if (meters.Length > 0 - && MarkupWidth(left) + 3 + MarkupWidth(meters) + MarkupWidth(rightBar) + MinStatusGap + MeterSlack <= HeaderWidth()) + if (meters is not null && W(left) + 3 + meters.Width + W(right) + MinStatusGap + MeterSlack <= HeaderWidth()) { - left = $"{left} {meters}"; + left.Add(meters); } // A mode's keys outrank the room and the MOO's status, and the encoding and the palette hint too: while the @@ -14786,11 +14797,11 @@ private string StatusBarMarkup(string character, string state) _statusModeShown = mode; if (mode != StatusMode.None) { - bool Fits(string hint, IEnumerable cluster) => - MarkupWidth(left) + 3 + MarkupWidth(hint) + MarkupWidth(string.Join(" ", cluster)) + MinStatusGap <= HeaderWidth(); + bool Fits(StatusSegment hint, IEnumerable cluster) => + W(left) + 3 + hint.Width + W(cluster.ToList()) + MinStatusGap <= HeaderWidth(); - var droppables = new[] { encodingCell, paletteCell }.OfType().Where(right.Contains).ToList(); - foreach (var hint in ModeHintMarkup(mode)) + var droppables = new[] { encodingCell, paletteCell }.OfType().Where(right.Contains).ToList(); + foreach (var hint in ModeHintSegments(mode)) { var given = 0; while (!Fits(hint, right.Except(droppables.Take(given))) && given < droppables.Count) @@ -14806,46 +14817,42 @@ bool Fits(string hint, IEnumerable cluster) => right.RemoveAll(c => droppables.Take(given).Contains(c)); // Leftmost of the cluster but for the scrollback segment, which states the mode the hint answers. - right.Insert(right.Count > 0 && ScrollbackStatus().Length > 0 ? 1 : 0, hint); + right.Insert(right.Count > 0 && scrollback is not null ? 1 : 0, hint); break; } - - rightBar = string.Join(" ", right); } // Where the character stands, once the map knows. A reserved width, so a walk does not move the right // cluster with every room name; a name too long for it is elided, never wrapped. if (StatusRoom() is { } here) { - var cell = RoomCell(here.Name, here.Area, RoomCellFor(left, rightBar, mode)); - if (MarkupWidth(left) + 3 + RoomCellWidth + MarkupWidth(rightBar) + MinStatusGap + MeterSlack <= HeaderWidth()) + var cell = Segment(StatusRole.Room, Dim(RoomCellText(here.Name, here.Area, RoomCellFor(W(left), W(right), mode)))); + if (W(left) + 3 + RoomCellWidth + W(right) + MinStatusGap + MeterSlack <= HeaderWidth()) { - left = $"{left} {cell}"; + left.Add(cell); } } // What the MOO last put in its status line, once it has put anything there this connection. Reserved // and elided like the room, for the same reason, and dropped first when the row is short. if (_active?.McpStatus is { } mooStatus - && MarkupWidth(left) + 3 + MooStatusCellWidth + MarkupWidth(rightBar) + MinStatusGap + MeterSlack <= HeaderWidth()) + && W(left) + 3 + MooStatusCellWidth + W(right) + MinStatusGap + MeterSlack <= HeaderWidth()) { - left = $"{left} {MooStatusCell(mooStatus)}"; + left.Add(Segment(StatusRole.Moo, Dim(MooStatusText(mooStatus)))); } - var room = HeaderWidth() - MarkupWidth(left) - MarkupWidth(rightBar) - MinStatusGap; + var room = HeaderWidth() - W(left) - W(right) - MinStatusGap; foreach (var focusHint in mode == StatusMode.None ? FocusHints() : []) { - if (MarkupWidth(focusHint) + 3 <= room) + if (focusHint.Width + 3 <= room) { right.Insert(right.Count - 1, focusHint); - rightBar = string.Join(" ", right); break; } } - // Right-align the cluster to the far edge; identity stays pinned left. - var gap = Math.Max(MinStatusGap, HeaderWidth() - MarkupWidth(left) - MarkupWidth(rightBar)); - return $"{left}{new string(' ', gap)}{rightBar}"; + // Right-aligned to the far edge by the model (StatusModel.Row); identity stays pinned left. + return StatusRowModel(left, right); } /// diff --git a/src/SharpMUTerm.Tui/StatusMeterRenderer.cs b/src/SharpMUTerm.Tui/StatusMeterRenderer.cs index 53ffb13a..3d078e9f 100644 --- a/src/SharpMUTerm.Tui/StatusMeterRenderer.cs +++ b/src/SharpMUTerm.Tui/StatusMeterRenderer.cs @@ -35,34 +35,44 @@ internal static class StatusMeterRenderer /// -cell field, for a status row too narrow for value/max; a meter with no /// usable maximum is drawn as its value either way. /// - internal static string Render(IReadOnlyList meters, GameDataStore data, string lowInk, bool compact = false) + internal static string Render(IReadOnlyList meters, GameDataStore data, string lowInk, bool compact = false) => + string.Concat(Runs(meters, data, lowInk, DimMark, compact).Select(r => + r.Ink == DimMark ? $"[dim]{MarkupText.Escape(r.Text)}[/]" + : r.Bold ? $"[bold{(r.Ink is null ? string.Empty : " " + r.Ink)}]{MarkupText.Escape(r.Text)}[/]" + : MarkupText.Escape(r.Text))); + + /// The ink hands to stand for the framework's [dim]. + private const string DimMark = "dim"; + + /// + /// The meters that have a value, as status-row runs, or none when none does: each label in + /// , the value bold (in when low), the maximum in + /// , two cells between meters. is the same runs as markup. + /// + internal static List Runs( + IReadOnlyList meters, GameDataStore data, string lowInk, string dimInk, bool compact = false) { - var cells = new List(); + var runs = new List(); foreach (var reading in Read(meters, data)) { - var label = MarkupText.Escape(reading.Label); - if (compact && reading.Share is { } share) + if (runs.Count > 0) { - var percent = Percent(share).PadLeft(ShareWidth); - cells.Add(reading.Low - ? $"[dim]{label}[/] [bold {lowInk}]{percent}[/]" - : $"[dim]{label}[/] [bold]{percent}[/]"); - continue; + runs.Add(new(" ", null, false)); } - var shown = MarkupText.Escape(StatusMeter.Fit(reading.Value, ValueWidth).PadLeft(ValueWidth)); - var cell = reading.Low - ? $"[dim]{label}[/] [bold {lowInk}]{shown}[/]" - : $"[dim]{label}[/] [bold]{shown}[/]"; - if (reading.HasMax) + var value = compact && reading.Share is { } share + ? Percent(share).PadLeft(ShareWidth) + : StatusMeter.Fit(reading.Value, ValueWidth).PadLeft(ValueWidth); + runs.Add(new(reading.Label, dimInk, false)); + runs.Add(new(" ", null, false)); + runs.Add(new(value, reading.Low ? lowInk : null, true)); + if (!(compact && reading.Share is not null) && reading.HasMax) { - cell += $"[dim]/{MarkupText.Escape(StatusMeter.Fit(reading.Max ?? string.Empty, ValueWidth).PadRight(ValueWidth))}[/]"; + runs.Add(new($"/{StatusMeter.Fit(reading.Max ?? string.Empty, ValueWidth).PadRight(ValueWidth)}", dimInk, false)); } - - cells.Add(cell); } - return string.Join(" ", cells); + return runs; } /// diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativeFooterTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativeFooterTests.cs index 6b6dc600..e71bf418 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/NativeFooterTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/NativeFooterTests.cs @@ -42,9 +42,14 @@ public async Task TheBundledFacesResolveByNameOnEveryPlatform() public async Task TheFooterDrawsWhatTheClientSaidAndHandsBackOnlyItsTargets() { var activated = new List(); - var model = StatusModel.From( - StatusModel.Mark([new("Corvid · connected", "#cccccc", false), new(" ", "#cccccc", false), new("⌃P palette", "#cccccc", false)], "⌃P palette", HeaderModel.PaletteTarget), - "#101014"); + var model = new StatusModel( + [new StatusSegment(StatusRole.Identity, [new("Corvid · connected", null, false)])], + [new StatusSegment(StatusRole.Palette, [new("⌃P palette", "#cccccc", false, HeaderModel.PaletteTarget)])], + "#101014", + "#cccccc") + { + Width = 80, + }; var (visible, top, height, hits, text, clicked) = await Run((window, layer, driver) => { diff --git a/tests/SharpMUTerm.Avalonia.Tests/NoticeToastTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NoticeToastTests.cs index 9754aebc..febd2654 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/NoticeToastTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/NoticeToastTests.cs @@ -24,6 +24,34 @@ public class NoticeToastTests private static NoticeOverlay Overlay(long sequence, string text, NoticeAction? action, Action run, int aboveRow = 8) => new(new NoticeModel(text, NoticeSeverity.Info, "⌥M", action, DateTimeOffset.UnixEpoch, sequence), aboveRow, Palette, run); + /// + /// A toast is a native card: the tokens' card plane, not the status row's, with every severity's edge (which inks its + /// chip and action line) held to the text floor on that card, in each built-in theme. + /// + [Test] + public async Task AToastIsDrawnOnTheTokensCardWithItsEdgesHeldToTheFloor() + { + foreach (var theme in SharpMUTerm.Core.Theming.ThemeLibrary.Names.Select(SharpMUTerm.Core.Theming.ThemeLibrary.Get)) + { + var tokens = NativeTokens.For(theme); + foreach (var severity in Enum.GetValues()) + { + var overlay = new NoticeOverlay(new NoticeModel("x", severity, null, null, DateTimeOffset.UnixEpoch, 1), 8, Palette, _ => { }) + { + Theme = theme, + }; + var colours = NoticeToasts.ColoursOf(overlay); + await Assert.That(colours.Plane).IsEqualTo(tokens.Card).Because(theme.Name); + var ratio = SharpMUTerm.Core.Text.Contrast.Ratio( + new SharpMUTerm.Core.Text.Rgb(colours.Edge.R, colours.Edge.G, colours.Edge.B), + new SharpMUTerm.Core.Text.Rgb(colours.Plane.R, colours.Plane.G, colours.Plane.B)); + await Assert.That(ratio).IsGreaterThanOrEqualTo(NativeTokens.TextFloor - 0.01).Because($"{theme.Name} {severity}"); + } + } + + await Assert.That(NativeTokens.Dark.Card).IsEqualTo(global::Avalonia.Media.Color.FromRgb(0x17, 0x1b, 0x24)).Because("the mockup's card"); + } + /// A notice's source is a caption on the toast, not a key chip: a word in a chip reads as a key to press. [Test] public async Task ASourceIsACaptionAndAKeyIsAChip() diff --git a/tests/SharpMUTerm.Client.Tests/StatusModelTests.cs b/tests/SharpMUTerm.Client.Tests/StatusModelTests.cs index 4495fffd..242eebf5 100644 --- a/tests/SharpMUTerm.Client.Tests/StatusModelTests.cs +++ b/tests/SharpMUTerm.Client.Tests/StatusModelTests.cs @@ -2,50 +2,63 @@ namespace SharpMUTerm.Client.Tests; -/// The status row as data: two clusters split at the renderer's padding, and runs a click can hand back. +/// The status row as data: segments by role, laid out to the row's width, and runs a click can hand back. public class StatusModelTests { - private const string Ink = "#cccccc"; + private const string Dim = "#888888"; + + private static StatusSegment Seg(StatusRole role, params StatusRun[] runs) => new(role, runs); + + private static StatusModel Row(int width) => new( + [Seg(StatusRole.Identity, new("Corvid", null, true), new(" ", null, false), new("connected", Dim, false))], + [Seg(StatusRole.Encoding, new StatusRun("utf-8", Dim, false)), Seg(StatusRole.Palette, new StatusRun("⌃P palette", Dim, false, HeaderModel.PaletteTarget))], + "#101010", + "#e0e0e0") + { + Width = width, + }; [Test] - public async Task TheRowSplitsAtItsWidestGapAndDropsTheGap() + public async Task TheClustersReadWithASeparatorBetweenSegments() { - var model = StatusModel.From( - [new("Corvid · connected ⌥F freezes", Ink, false), new(" ", Ink, false), new("UTF-8 · ⌃P palette ", Ink, true)], - "#101010"); - - await Assert.That(model.Left.Select(r => r.Text)).IsEquivalentTo(new[] { "Corvid · connected ⌥F freezes" }); - await Assert.That(model.Right.Select(r => r.Text)).IsEquivalentTo(new[] { "UTF-8 · ⌃P palette" }); - await Assert.That(model.Right.Single().Bold).IsTrue(); - await Assert.That(model.Text).IsEqualTo("Corvid · connected ⌥F freezes UTF-8 · ⌃P palette"); + var model = Row(60); + await Assert.That(model.Text).IsEqualTo("Corvid connected utf-8 ⌃P palette"); + await Assert.That(model.Right.Select(r => r.Text)).IsEquivalentTo(new[] { "utf-8", StatusModel.Separator, "⌃P palette" }); + await Assert.That(StatusModel.WidthOf(model.RightSegments)).IsEqualTo(18); } [Test] - public async Task ARowWithNoWideGapReadsFromTheLeft() + public async Task TheRowPushesTheRightClusterToItsWidth() { - var model = StatusModel.From([new(" a notice, said once ", Ink, false)], "#000000"); - await Assert.That(model.Right).IsEmpty(); - await Assert.That(model.Text).IsEqualTo("a notice, said once"); + var row = Row(60).Row(); + await Assert.That(string.Concat(row.Select(r => r.Text)).Length).IsEqualTo(60); + await Assert.That(row[^1].Target).IsEqualTo(HeaderModel.PaletteTarget); + + // Narrower than both clusters: the gap is never less than its minimum. + var tight = string.Concat(Row(10).Row().Select(r => r.Text)); + await Assert.That(tight).Contains("connected" + new string(' ', StatusModel.MinGap) + "utf-8"); } [Test] - public async Task MarkSetsTheTargetOnTheLastOccurrenceAndSplitsRuns() + public async Task FitCutsTheRowEndingInTheInkItCutInto() { - var runs = StatusModel.Mark([new("⌥R Reconnect · ⌥R Reconnect", Ink, false)], "⌥R Reconnect", "world:reconnect"); - - await Assert.That(runs.Select(r => r.Text)).IsEquivalentTo(new[] { "⌥R Reconnect · ", "⌥R Reconnect" }); - await Assert.That(runs[1].Target).IsEqualTo("world:reconnect"); - await Assert.That(StatusModel.From(runs, "#000000").Targets()).IsEquivalentTo(new[] { "world:reconnect" }); + var fit = Row(60).Fit(12); + await Assert.That(string.Concat(fit.Select(r => r.Text))).IsEqualTo("Corvid conn…"); + await Assert.That(fit[^1].Ink).IsEqualTo(Dim); + await Assert.That(Row(60).Fit(60)).IsEquivalentTo(Row(60).Row()); + } - var unchanged = StatusModel.Mark(runs, "not there", "x"); - await Assert.That(unchanged).IsSameReferenceAs(runs); + [Test] + public async Task TargetsAreWhatTheClientPutOnRuns() + { + await Assert.That(Row(60).Targets()).IsEquivalentTo(new[] { HeaderModel.PaletteTarget }); } [Test] public async Task TwoRowsThatSayTheSameAreEqual() { - StatusModel Make() => StatusModel.From([new("left", Ink, false), new(" right", Ink, false)], "#000000"); - await Assert.That(Make()).IsEqualTo(Make()); - await Assert.That(Make()).IsNotEqualTo(StatusModel.Empty); + await Assert.That(Row(60)).IsEqualTo(Row(60)); + await Assert.That(Row(60)).IsNotEqualTo(Row(61)); + await Assert.That(Row(60)).IsNotEqualTo(StatusModel.Empty); } } diff --git a/tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs b/tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs index e2cd000a..bf044ca1 100644 --- a/tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/FooterFitTests.cs @@ -136,6 +136,48 @@ await Assert.That(scrolled.Any(r => r.Contains("password", StringComparison.Ordi await Assert.That(app.ImportReviewLines.Count).IsGreaterThan(0).Because("the review is still open: End scrolled, it did not answer"); } + [Test] + public async Task ThePackageReviewScrollsItsBodyUnderAPinnedFooterClearOfTheCommandLine() + { + var app = App(); + var rows = FrameGrid.Decode(app.RenderSnapshot("package-review"), Width, Height); + var keys = rows.ToList().FindIndex(r => r.Contains("⏎ install", StringComparison.Ordinal) && r.Contains("Esc cancel", StringComparison.Ordinal)); + var line = rows.ToList().FindIndex(r => r.Contains("say hello there", StringComparison.Ordinal)); + await Assert.That(keys).IsGreaterThan(0).Because(string.Join('\n', rows)); + await Assert.That(line).IsGreaterThan(keys + 1).Because("the review's bottom edge is above the command line, which stays in view"); + await Assert.That(rows[keys - 1].Contains('─')).IsTrue().Because("a rule marks the pinned rows as the review's foot"); + + app.PackageView.SimulateKey(new ConsoleKeyInfo('\0', ConsoleKey.End, false, false, false)); + var scrolled = FrameGrid.Decode(app.RenderWholeFrame(), Width, Height); + await Assert.That(scrolled.Any(r => r.Contains("characters", StringComparison.Ordinal) && r.Contains("Corvid", StringComparison.Ordinal))).IsTrue() + .Because("End scrolls to the last row:\n" + string.Join('\n', scrolled)); + await Assert.That(scrolled[keys]).Contains("⏎ install").Because("the keys stay where they were"); + await Assert.That(app.PackageView.IsOpen).IsTrue().Because("End scrolled, it did not answer"); + } + + [Test] + public async Task TheCellPaletteShrinksToItsRowsWhenFilteredAndNeverPastTheCommandLine() + { + var app = App(); + app.RenderSnapshot("menu"); + var full = app.Palette.WindowHeight; + var fullRows = FrameGrid.Decode(app.RenderWholeFrame(), Width, Height); + await Assert.That(full).IsGreaterThan(CommandPalette.FilteredMinHeight); + + app.SimulateCellPaletteQuery("freeze"); + var filtered = app.Palette.WindowHeight; + var rows = FrameGrid.Decode(app.RenderWholeFrame(), Width, Height); + await Assert.That(filtered).IsLessThan(full).Because("a few matches: not the whole catalog's height:\n" + string.Join('\n', rows)); + await Assert.That(filtered).IsGreaterThanOrEqualTo(CommandPalette.FilteredMinHeight).Because("never below the floor"); + await Assert.That(rows.Any(r => r.Contains("Freeze", StringComparison.Ordinal))).IsTrue(); + await Assert.That(rows.ToList().FindIndex(r => r.Contains("›freeze", StringComparison.Ordinal))) + .IsEqualTo(fullRows.ToList().FindIndex(r => r.Contains('›', StringComparison.Ordinal))).Because("the prompt does not move"); + await Assert.That(rows.Any(r => r.Contains("say hello there", StringComparison.Ordinal))).IsTrue().Because("the command line stays clear"); + + app.SimulateCellPaletteQuery(string.Empty); + await Assert.That(app.Palette.WindowHeight).IsEqualTo(full).Because("an emptied query lists the whole catalog again"); + } + private static SharpMUTermApp App() { Console.SetIn(TextReader.Null); diff --git a/tests/SharpMUTerm.Tui.Tests/NoticeFitTests.cs b/tests/SharpMUTerm.Tui.Tests/NoticeFitTests.cs index b8918770..b87c76a1 100644 --- a/tests/SharpMUTerm.Tui.Tests/NoticeFitTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/NoticeFitTests.cs @@ -1,4 +1,5 @@ using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Chrome; using SharpMUTerm.Core.Configuration; using SharpMUTerm.Core.Diagnostics; using SharpMUTerm.Graphics; @@ -44,9 +45,13 @@ public async Task ALongNoticeIsElidedToTheRowAndTheRowStaysOneRow(int width, int [Test] public async Task FitStatusRowLeavesARowThatFitsAlone() { - await Assert.That(SharpMUTermApp.FitStatusRow("[dim]short[/]", 80)).IsEqualTo("[dim]short[/]"); - await Assert.That(SharpMUTermApp.MarkupWidth(SharpMUTermApp.FitStatusRow("[dim]" + new string('x', 100) + "[/]", 80))) - .IsLessThanOrEqualTo(80); + static StatusModel Row(string text) => + new([new StatusSegment(StatusRole.Text, [new(text, "#808080", false)])], [], "#000000", "#ffffff") { Width = 80 }; + + await Assert.That(SharpMUTermApp.StatusRowMarkup(Row("short").Fit(80))).IsEqualTo("[#808080]short[/]"); + var cut = SharpMUTermApp.StatusRowMarkup(Row(new string('x', 100)).Fit(80)); + await Assert.That(SharpMUTermApp.MarkupWidth(cut)).IsEqualTo(80); + await Assert.That(cut).EndsWith("x…[/]").Because("the mark takes the ink of the run it cut into"); } [Test] From d04dd7cf79dcddee37ead29a05994feb53dce620 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 19:10:22 +0000 Subject: [PATCH 074/113] =?UTF-8?q?Wave=2021=20A:=20window=20seams=20?= =?UTF-8?q?=E2=80=94=20hairline=20pane=20dividers,=20prompt-hugging=20comm?= =?UTF-8?q?and=20line,=20UI-face=20placeholder,=20deterministic=20fonts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - The client publishes its pane dividers (IPointerPresenter.Dividers, PaneDividerOverlay) with each frame; the window draws each divider cell as the two panes' planes meeting at the tokens' 1 px rule (lit: the cells' RuleHover, 3 px). Cells, hit area and NAWS unchanged. - The command line's typed text is drawn shifted left to start a mono space after the UI-face prompt (TerminalView.BarsOf); the caret moves with it and a press maps back to the cell under it. - The docked composer's "Click to write a post" is a UI-face overlay instead of the editor's mono placeholder. - BundledFonts makes its eight faces once per process and never disposes them, so the per-test font manager of the headless suite no longer remakes and disposes them every test. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 3 + CLAUDE.md | 15 +- .../AvaloniaConsoleDriver.cs | 5 + src/SharpMUTerm.Avalonia/BundledFonts.cs | 45 +++- src/SharpMUTerm.Avalonia/CellGrid.cs | 12 +- src/SharpMUTerm.Avalonia/ComposerView.cs | 39 ++- src/SharpMUTerm.Avalonia/DesktopLayer.cs | 1 + src/SharpMUTerm.Avalonia/TerminalView.cs | 249 ++++++++++++++++-- src/SharpMUTerm.Avalonia/WindowPointer.cs | 10 + src/SharpMUTerm.Tui/Pointer/PointerTarget.cs | 17 ++ .../Pointer/SharpMUTermApp.Pointer.cs | 49 ++++ src/SharpMUTerm.Tui/SharpMUTermApp.cs | 6 +- .../WindowSeamTests.cs | 143 ++++++++++ tests/SharpMUTerm.Tui.Tests/PointerTests.cs | 41 +++ 14 files changed, 605 insertions(+), 30 deletions(-) create mode 100644 tests/SharpMUTerm.Avalonia.Tests/WindowSeamTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index bb53ddf8..f1226070 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -386,6 +386,9 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Changed +- In the desktop window, the line between two panes is a hairline where the panes meet instead of a grey band, and + lights up wider while you hover or drag it. In the command line, what you type starts right after the prompt. + The docked composer's "Click to write a post" is in the interface font. - The command palette in the terminal shrinks to the rows a search matches instead of filling the screen with blank. - In the window, notices are drawn on the same card colour as the palette and dialogs, and body text is a size larger (13 px) across the window's own views. diff --git a/CLAUDE.md b/CLAUDE.md index 913f49d7..9565101c 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -1711,6 +1711,16 @@ draws ⌃P natively (`INativePalette`, null for the cell popup), whether it draw over its cells and the newline hint over blank cells. The grid gives up `FieldReserve` px, never a row, so panes and NAWS are a terminal's told the same chrome. Null under a modal. Rebuilding it on a `TextBox` would fork every key rule above. + - **The typed text meets the prompt by drawing, not by cells** (`TerminalView.BarsOf`, `FieldBar`). The Inter prompt is + narrower than its cells, so each bar's text is drawn `Shift` px left (to one mono space after the measured prompt), the + caret with it, and `Cell` maps a press there back to the cell under it; the right padding the shift uncovers is the + field's fill. The gutter, the caret's cell and every key are unchanged, so parity needs nothing. +- **The window draws pane dividers as the panes meeting at a hairline** (`IPointerPresenter.Dividers`, + `PaneDividerOverlay`, `DividersNow`; `ScreenFrame.Dividers`; `TerminalView.FrameDraw.DrawDividers`). The client publishes + each divider control's cells and whether it is lit (never a tab strip standing in for one, nothing under a modal) on + `PostBufferPaint`, `Flush` keeps them with the frame, and the window paints each half of the cell in the plane beside it + (read off the frame) with `NativeTokens.Rule` 1 px in the middle; lit, the cells' own `RuleHover`, 3 px. The cells, the + hit area and NAWS are the terminal's. - `HostParityTests` draws every view under `none`, `header-rail` and `desktop`. - **The window bundles its faces** (`BundledFonts`, Avalonia; `Fonts/README.md`). Inter 4.1 (four static weights, 1.67 MB) and JetBrains Mono are registered as `fonts:SharpMUTerm`, Inter is Avalonia's default family and the bare names map onto @@ -1718,7 +1728,10 @@ draws ⌃P natively (`INativePalette`, null for the cell popup), whether it draw bundle lacks (emoji, CJK, neither bundled). One token each: `NativeTokens.UiFont`/`MonoFont`/`CellFace`. The cells default to the bundled JetBrains Mono at 10 pt unless `--font` names an installed family; `--line-height` (default 1.12) adds leading by making the cell taller and centring the glyph, so a row is still one cell. No F7 face picker: the cell face is - a launch option of the window, read before the client exists, and not a declared setting. + a launch option of the window, read before the client exists, and not a declared setting. **The eight faces are made + once per process** and every `BundledFonts` adds the same `GlyphTypeface`s, re-implementing `IDisposable` as a no-op: + the headless suite sets up an app (and a font manager that disposes its collections) per test, and remaking and + disposing the faces per test is what made a test now and then fail to find Inter. - **A pane narrower than its server's wrap is told about join wraps, once per world per run** (`SuggestJoinWraps`, `SharpMUTermApp.JoinWraps.cs`; `WorldSession.ServerWrapColumn`, now learnt whether or not the world joins). Checked on every pane-size report; the notice's action is `world:join-wraps:`. **Suggested, never on by default**: a false diff --git a/src/SharpMUTerm.Avalonia/AvaloniaConsoleDriver.cs b/src/SharpMUTerm.Avalonia/AvaloniaConsoleDriver.cs index f57af288..45f4637e 100644 --- a/src/SharpMUTerm.Avalonia/AvaloniaConsoleDriver.cs +++ b/src/SharpMUTerm.Avalonia/AvaloniaConsoleDriver.cs @@ -124,6 +124,11 @@ public void Flush() frame = frame.WithBand(band); } + if (Pointer.Dividers is { Count: > 0 } dividers) + { + frame = frame.WithDividers(dividers); + } + Volatile.Write(ref _frame, frame); Interlocked.Increment(ref _frames); FrameReady?.Invoke(); diff --git a/src/SharpMUTerm.Avalonia/BundledFonts.cs b/src/SharpMUTerm.Avalonia/BundledFonts.cs index a5c204e0..e3a59c38 100644 --- a/src/SharpMUTerm.Avalonia/BundledFonts.cs +++ b/src/SharpMUTerm.Avalonia/BundledFonts.cs @@ -15,8 +15,18 @@ namespace SharpMUTerm.Avalonia; /// "JetBrains Mono" or "Inter" gets the bundled face and an installed copy cannot replace it. /// /// -internal sealed class BundledFonts : FontCollectionBase +/// +/// The faces are made once per process and shared by every collection. A font manager disposes its collections, +/// and the base collection disposes every face it holds; the headless tests set up a fresh application, and so a fresh +/// font manager and collection, for every test, so the faces were read, made and disposed once per test, hundreds of +/// times a run, and now and then one test failed to find Inter. Shared and never disposed, the eight faces are made +/// once; the window has one font manager, so nothing changes there. +/// +internal sealed class BundledFonts : FontCollectionBase, IDisposable { + private static readonly object Gate = new(); + private static GlyphTypeface[]? s_faces; + /// The collection's key: families in it are named fonts:SharpMUTerm#Inter. public static readonly Uri CollectionKey = new("fonts:SharpMUTerm"); @@ -40,16 +50,43 @@ internal sealed class BundledFonts : FontCollectionBase public BundledFonts() { - foreach (var file in Files) + GlyphTypeface[] shared; + lock (Gate) { - using var stream = typeof(BundledFonts).Assembly.GetManifestResourceStream($"Fonts.{file}"); - if (stream is not null && TryAddGlyphTypeface(stream, out _)) + if (s_faces is null) + { + var faces = new List(); + foreach (var file in Files) + { + using var stream = typeof(BundledFonts).Assembly.GetManifestResourceStream($"Fonts.{file}"); + if (stream is not null && TryAddGlyphTypeface(stream, out var face)) + { + faces.Add(face); + } + } + + s_faces = [.. faces]; + Loaded = s_faces.Length; + return; + } + + shared = s_faces; + } + + foreach (var face in shared) + { + if (TryAddGlyphTypeface(face)) { Loaded++; } } } + /// The shared faces outlive any one font manager, so a manager disposing this collection disposes none of them. + void IDisposable.Dispose() + { + } + /// /// Inter as the default family (what resolves to, so every view that names none /// is Inter), and the bare names mapped onto the bundle. diff --git a/src/SharpMUTerm.Avalonia/CellGrid.cs b/src/SharpMUTerm.Avalonia/CellGrid.cs index ef90d5b3..082574cf 100644 --- a/src/SharpMUTerm.Avalonia/CellGrid.cs +++ b/src/SharpMUTerm.Avalonia/CellGrid.cs @@ -39,10 +39,20 @@ internal sealed class ScreenFrame(int width, int height, GridCell[] cells, Caret /// public SharpMUTerm.Tui.InputBand? Band { get; init; } + /// + /// The pane dividers as the client said they were when this frame was painted: the window draws their cells as the + /// two panes' planes meeting at a hairline rather than as a band of the rule's colour. + /// + public IReadOnlyList Dividers { get; init; } = []; + public GridCell this[int x, int y] => cells[(y * Width) + x]; /// This frame carrying : the same cells, not copied. - public ScreenFrame WithBand(SharpMUTerm.Tui.InputBand band) => new(Width, Height, cells, Caret) { Band = band }; + public ScreenFrame WithBand(SharpMUTerm.Tui.InputBand band) => new(Width, Height, cells, Caret) { Band = band, Dividers = Dividers }; + + /// This frame carrying : the same cells, not copied. + public ScreenFrame WithDividers(IReadOnlyList dividers) => + new(Width, Height, cells, Caret) { Band = Band, Dividers = dividers }; public static ScreenFrame Empty(int width, int height) => new(width, height, Enumerable.Repeat(GridCell.Blank, width * height).ToArray(), default); diff --git a/src/SharpMUTerm.Avalonia/ComposerView.cs b/src/SharpMUTerm.Avalonia/ComposerView.cs index 2f6e2fa6..658b0e21 100644 --- a/src/SharpMUTerm.Avalonia/ComposerView.cs +++ b/src/SharpMUTerm.Avalonia/ComposerView.cs @@ -40,6 +40,14 @@ internal sealed class ComposerView : Border private readonly LineGutter _gutter; private readonly Border _header; private readonly TextBlock _title; + + /// + /// "Click to write a post", in the UI face over the empty idle editor. The editor's own placeholder would be in the + /// editor's face, the post's monospace; a hint is the panel speaking, not the post. Never hit: a click goes to the editor. + /// + private readonly TextBlock _placeholder; + + private bool _placeholderWanted; private readonly TextBlock _target; private readonly StackPanel _chips; private readonly TextBlock _count; @@ -137,8 +145,18 @@ public ComposerView(TerminalView view, bool fullScreen) // The armed rule down the docked editor's left edge: the cell composer's ▌ marker, in the accent. _rule = new Border { Width = 3, HorizontalAlignment = HorizontalAlignment.Left }; + _placeholder = new TextBlock + { + Text = ComposerModel.ClickToWrite, + FontFamily = NativeTokens.UiFont, + IsHitTestVisible = false, + IsVisible = false, + Margin = _editor.Padding + new Thickness(1), + }; + var text = new Panel(); text.Children.Add(_editor); + text.Children.Add(_placeholder); text.Children.Add(_marks); text.Children.Add(_rule); @@ -516,8 +534,7 @@ private void Label(ComposerModel model) // A docked composer too short for its footer keeps the editor and drops the footer: the heading, the footer // and an editor of two lines need about 136 px, and below that the footer would squeeze the well shut. _footer.IsVisible = Bounds.Height is 0 or >= 136; - _editor.PlaceholderText = !model.Armed ? ComposerModel.ClickToWrite : null; - _editor.PlaceholderForeground = new SolidColorBrush(Dim); + ShowPlaceholder(!model.Armed); return; } @@ -550,10 +567,23 @@ private void Label(ComposerModel model) // A docked composer too short for its key row keeps the editor and drops the row. _footer.IsVisible = _fullScreen || Bounds.Height is 0 or >= 64; - _editor.PlaceholderText = placeholder ? ComposerModel.ClickToWrite : null; - _editor.PlaceholderForeground = new SolidColorBrush(Dim); + ShowPlaceholder(placeholder); + } + + /// The UI-face placeholder (): wanted while idle, shown while the editor is empty. + private void ShowPlaceholder(bool wanted) + { + _placeholderWanted = wanted; + _placeholder.Foreground = new SolidColorBrush(Dim); + _placeholder.FontSize = Math.Max(NativeTokens.Body, _editor.FontSize - 1); + SyncPlaceholder(); } + private void SyncPlaceholder() => _placeholder.IsVisible = _placeholderWanted && string.IsNullOrEmpty(_editor.Text); + + /// What the idle editor says while empty, or null. Internal for tests. + internal string? Placeholder => _placeholder.IsVisible ? _placeholder.Text : null; + private Border Chip(string words, Color ink, double size) => new() { Background = new SolidColorBrush(Mix(_plane, ink, 0.14)), @@ -638,6 +668,7 @@ private void SyncLength() private void OnTextChanged() { SyncLength(); + SyncPlaceholder(); var text = _editor.Text ?? string.Empty; if (_session is { } session) { diff --git a/src/SharpMUTerm.Avalonia/DesktopLayer.cs b/src/SharpMUTerm.Avalonia/DesktopLayer.cs index c961f349..d8a256f2 100644 --- a/src/SharpMUTerm.Avalonia/DesktopLayer.cs +++ b/src/SharpMUTerm.Avalonia/DesktopLayer.cs @@ -208,6 +208,7 @@ private void SyncPaneChrome(Size cell) } tokens = _paneTokens.Value.Tokens; + _view.DividerRule = new SKColor(tokens.Rule.R, tokens.Rule.G, tokens.Rule.B); } var origin = CellOrigin; diff --git a/src/SharpMUTerm.Avalonia/TerminalView.cs b/src/SharpMUTerm.Avalonia/TerminalView.cs index da69a47d..58c40aa8 100644 --- a/src/SharpMUTerm.Avalonia/TerminalView.cs +++ b/src/SharpMUTerm.Avalonia/TerminalView.cs @@ -129,6 +129,12 @@ public TerminalView(AvaloniaConsoleDriver driver, SKColor foreground, SKColor ba /// The plane the field's strip is painted on: the backdrop the status row and the sidebar sit on. internal SKColor? FooterPlane { get; set; } + /// + /// The hairline a pane divider is drawn as (): the native tokens' rule, set with the + /// pane chrome. Null until then, when it is a faint step off the cells' background. + /// + internal SKColor? DividerRule { get; set; } + /// The vertical pixels the field takes beside the rows it frames: none unless the view draws it. private double FieldReserve => DrawsInputField ? NativeLayout.FieldReserve : 0; @@ -180,16 +186,83 @@ public override void Render(DrawingContext context) { var frame = _driver.Frame; var band = DrawsInputField ? frame.Band : null; - context.Custom(new FrameDraw(new Rect(Bounds.Size), frame, _driver.Pictures, _renderer, _scale, band, FooterPlane ?? Darker(_renderer.DefaultBackground))); + IReadOnlyList bars = band is null ? [] : BarsOf(frame, band); + _fieldBars = bars; + var rule = DividerRule ?? Mix(_renderer.DefaultBackground, _renderer.DefaultForeground, 0.12f); + context.Custom(new FrameDraw( + new Rect(Bounds.Size), frame, _driver.Pictures, _renderer, _scale, band, FooterPlane ?? Darker(_renderer.DefaultBackground), bars, rule)); if (band is not null) { - DrawFieldText(context, frame, band); + DrawFieldText(context, frame, band, bars); } DrawHover(context); DrawScrollbars(context); } + /// + /// One command line inside the field: its screen rows, the column its typed text starts at (past the prompt's cells), + /// and how far that text is drawn to the left (, logical units) so it starts a mono space after + /// the prompt drawn in the UI face, which is narrower than the cells it covers. The cells do not move: only the drawing, + /// the caret drawn with it, and the pointer's mapping back to a cell () are shifted. + /// + internal readonly record struct FieldBar(int Top, int End, int TextStart, double PromptWidth, double Shift); + + /// The bars as last drawn, for mapping the pointer: the same shifts the paint used. + private IReadOnlyList _fieldBars = []; + + private (string Text, double Width) _promptMeasure = ("", 0); + + /// The prompt's width in the UI face it is drawn in, in logical units; the last one is remembered. + private double PromptWidth(string text) + { + if (_promptMeasure.Text == text) + { + return _promptMeasure.Width; + } + + var width = PromptText(text, SKColors.White, double.PositiveInfinity).WidthIncludingTrailingWhitespace; + _promptMeasure = (text, width); + return width; + } + + private static FormattedText PromptText(string text, SKColor ink, double maxWidth) => + new(text, System.Globalization.CultureInfo.CurrentCulture, FlowDirection.LeftToRight, + new Typeface(NativeTokens.UiFont, FontStyle.Normal, FontWeight.SemiBold), NativeTokens.Input, Brush(ink)) + { + MaxTextWidth = maxWidth, + MaxLineCount = 1, + Trimming = TextTrimming.CharacterEllipsis, + }; + + /// + /// Each bar in : from its prompt's row to the next prompt's (or the band's end), its text a + /// mono space after the prompt as the UI face draws it. Internal for tests. + /// + internal IReadOnlyList BarsOf(ScreenFrame frame, InputBand band) + { + var cell = CellSize; + var end = Math.Min(frame.Height, band.Top + band.Rows); + var prompts = band.Prompts.Where(p => p.Row >= band.Top && p.Row < end).OrderBy(p => p.Row).ToList(); + var bars = new List(prompts.Count); + for (var i = 0; i < prompts.Count; i++) + { + var prompt = prompts[i]; + var to = i + 1 < prompts.Count ? prompts[i + 1].Row : end; + var start = Math.Min(frame.Width, band.Pad + prompt.Text.Length); + var trimmed = prompt.Text.TrimEnd(); + var width = trimmed.Length == 0 ? 0 : PromptWidth(trimmed); + var room = (start - band.Pad) * cell.Width; + var shift = trimmed.Length == 0 ? 0 : Math.Max(0, room - width - cell.Width); + + // Whole device pixels, so the glyphs land on the pixel grid the unshifted ones would. + shift = Math.Round(shift * _scale) / _scale; + bars.Add(new FieldBar(prompt.Row, to, start, width, shift)); + } + + return bars; + } + /// /// A faint plate under whatever a click acts on — a link, a tab, a sidebar row — so it reads as a control /// before it is clicked. Drawn over the cells, never in them, so the frame is the terminal's frame. @@ -745,6 +818,15 @@ private System.Drawing.Point Cell(Point position) { var inside = (position.Y - (band.Top * size.Height) - NativeLayout.FieldTop) / size.Height; y = Math.Clamp(band.Top + (int)Math.Floor(inside), band.Top, Math.Min(frame.Height, band.Top + band.Rows) - 1); + + // The typed text is drawn shifted left to meet the prompt; a press on it is a press on the cell drawn there. + foreach (var bar in _fieldBars) + { + if (y >= bar.Top && y < bar.End && bar.Shift > 0 && position.X >= (bar.TextStart * size.Width) - bar.Shift) + { + x = Math.Clamp((int)((position.X + bar.Shift) / size.Width), Math.Min(bar.TextStart, frame.Width - 1), Math.Max(0, frame.Width - 1)); + } + } } return new System.Drawing.Point(x, y); @@ -756,7 +838,9 @@ private static PointerModifiers Modifiers(KeyModifiers keys) => | ((keys & KeyModifiers.Control) != 0 ? PointerModifiers.Ctrl : 0); /// One frame, drawn straight onto the compositor's Skia canvas. - private sealed class FrameDraw(Rect bounds, ScreenFrame frame, PictureStore pictures, CellRenderer renderer, double scale, InputBand? band, SKColor plane) + private sealed class FrameDraw( + Rect bounds, ScreenFrame frame, PictureStore pictures, CellRenderer renderer, double scale, InputBand? band, SKColor plane, + IReadOnlyList bars, SKColor rule) : ICustomDrawOperation { public Rect Bounds { get; } = bounds; @@ -764,7 +848,12 @@ private sealed class FrameDraw(Rect bounds, ScreenFrame frame, PictureStore pict public bool HitTest(Point p) => Bounds.Contains(p); public bool Equals(ICustomDrawOperation? other) => - other is FrameDraw draw && ReferenceEquals(draw.Frame, Frame) && draw.Bounds == Bounds && draw.Plane == Plane; + other is FrameDraw draw && ReferenceEquals(draw.Frame, Frame) && draw.Bounds == Bounds && draw.Plane == Plane + && draw.Rule == Rule && draw.Bars.SequenceEqual(Bars); + + private SKColor Rule => rule; + + private IReadOnlyList Bars => bars; private SKColor Plane => plane; @@ -791,9 +880,110 @@ public void Render(ImmediateDrawingContext context) RenderWithField(canvas, band); } + DrawDividers(canvas); canvas.Restore(); } + /// + /// Each pane divider's cells as the two panes' planes meeting, read off the cells beside it, with the tokens' + /// hairline centred where they meet; a lit divider (hovered or dragged) keeps the cells' own hover colour, wider. + /// The cells themselves, and so the divider's hit area, are the client's as in any host. Device pixels. + /// + private void DrawDividers(SKCanvas canvas) + { + var dividers = frame.Dividers; + if (dividers.Count == 0) + { + return; + } + + var cw = renderer.Fonts.CellWidth; + var ch = renderer.Fonts.CellHeight; + var s = (float)scale; + var hair = Math.Max(1f, MathF.Round(s)); + var wide = Math.Max(2f, MathF.Round(3 * s)); + using var paint = new SKPaint { IsAntialias = false, Style = SKPaintStyle.Fill }; + foreach (var divider in dividers) + { + var x0 = Math.Max(0, divider.Area.X); + var y0 = Math.Max(0, divider.Area.Y); + var x1 = Math.Min(frame.Width, divider.Area.X + divider.Area.Width); + var y1 = Math.Min(frame.Height, divider.Area.Y + divider.Area.Height); + if (band is { } field) + { + y1 = Math.Min(y1, field.Top); + } + + if (x1 <= x0 || y1 <= y0) + { + continue; + } + + var w = divider.Lit ? wide : hair; + var colour = divider.Lit ? renderer.Background(frame[x0, y0]) : rule; + if (divider.Vertical) + { + float left = x0 * cw, right = x1 * cw; + var at = MathF.Round(left + ((right - left - w) / 2)); + for (var y = y0; y < y1; y++) + { + paint.Color = PlaneBeside(x0 - 1, y, -1, 0); + canvas.DrawRect(left, y * ch, at - left, ch, paint); + paint.Color = PlaneBeside(x1, y, 1, 0); + canvas.DrawRect(at + w, y * ch, right - at - w, ch, paint); + } + + paint.Color = colour; + canvas.DrawRect(at, y0 * ch, w, (y1 - y0) * ch, paint); + } + else + { + float top = y0 * ch, bottom = y1 * ch; + var at = MathF.Round(top + ((bottom - top - w) / 2)); + for (var x = x0; x < x1; x++) + { + paint.Color = PlaneBeside(x, y0 - 1, 0, -1); + canvas.DrawRect(x * cw, top, cw, at - top, paint); + paint.Color = PlaneBeside(x, y1, 0, 1); + canvas.DrawRect(x * cw, at + w, cw, bottom - at - w, paint); + } + + paint.Color = colour; + canvas.DrawRect(x0 * cw, at, (x1 - x0) * cw, w, paint); + } + } + } + + /// + /// The plane of the pane beside a divider at (, ), stepping along another + /// divider that crosses there (along it, not across it) so a junction takes a pane's plane, not a rule's. + /// + private SKColor PlaneBeside(int x, int y, int dx, int dy) + { + for (var step = 0; step < 4; step++) + { + x = Math.Clamp(x, 0, frame.Width - 1); + y = Math.Clamp(y, 0, frame.Height - 1); + var cx = x; + var cy = y; + if (!frame.Dividers.Any(d => cx >= d.Area.X && cx < d.Area.X + d.Area.Width && cy >= d.Area.Y && cy < d.Area.Y + d.Area.Height)) + { + break; + } + + if (dx != 0) + { + y = y > 0 ? y - 1 : y + 1; + } + else + { + x = x > 0 ? x - 1 : x + 1; + } + } + + return renderer.Background(frame[Math.Clamp(x, 0, frame.Width - 1), Math.Clamp(y, 0, frame.Height - 1)]); + } + /// /// The panes as they are, then the field: the strip across the bottom on the backdrop, the rounded field in the /// bars' own band colour (read off the cells, so armed, idle and a character's tint are the cells' own), the @@ -831,8 +1021,34 @@ private void RenderWithField(SKCanvas canvas, InputBand band) canvas.Translate(0, (float)(NativeLayout.FieldTop * scale)); // The bars' rows only, and not the client's right padding, whose colour is the margin's rather than the band's. - canvas.ClipRect(new SKRect(0, top, (frame.Width - band.Pad) * cw, (band.Top + band.Rows) * ch)); - renderer.Render(canvas, frame, pictures); + var textRight = (frame.Width - band.Pad) * cw; + if (bars.Count == 0) + { + canvas.ClipRect(new SKRect(0, top, textRight, (band.Top + band.Rows) * ch)); + renderer.Render(canvas, frame, pictures); + } + else + { + // Each bar in two parts: the prompt's cells as they are (the UI-face prompt is drawn over them), then the + // typed text drawn its shift to the left, to start a mono space after the prompt. + foreach (var bar in bars) + { + var shift = (float)(bar.Shift * scale); + var meet = (bar.TextStart * cw) - shift; + canvas.Save(); + canvas.ClipRect(new SKRect(0, bar.Top * ch, meet, bar.End * ch)); + renderer.Render(canvas, frame, pictures); + canvas.Restore(); + + canvas.Save(); + // Short of the right padding by the shift, so what comes in from the right is the field's fill. + canvas.ClipRect(new SKRect(meet, bar.Top * ch, textRight - shift, bar.End * ch)); + canvas.Translate(-shift, 0); + renderer.Render(canvas, frame, pictures); + canvas.Restore(); + } + } + canvas.Restore(); paint.Style = SKPaintStyle.Stroke; @@ -864,7 +1080,7 @@ internal static SKRect FieldRect(InputBand band, int cw, int ch, int columns, fl /// The prompt in the UI face, semibold, over the prompt's own cells; and the newline hint at the right of the first /// row while the cells under it are blank — it stands down the moment the typed text reaches it. /// - private void DrawFieldText(DrawingContext context, ScreenFrame frame, InputBand band) + private void DrawFieldText(DrawingContext context, ScreenFrame frame, InputBand band, IReadOnlyList bars) { var cell = CellSize; foreach (var prompt in band.Prompts) @@ -877,18 +1093,15 @@ private void DrawFieldText(DrawingContext context, ScreenFrame frame, InputBand var first = frame[band.Pad, prompt.Row]; var ink = Ink(frame, band.Pad, prompt.Row, text.Length); - var plate = new Rect(band.Pad * cell.Width, RowTop(prompt.Row), Math.Min(text.Length, frame.Width - band.Pad) * cell.Width, cell.Height); + // The plate hides the prompt's mono cells up to where the shifted text begins (BarsOf), never over that text. + var cells = Math.Min(text.Length, frame.Width - band.Pad) * cell.Width; + var room = Math.Min(prompt.Text.Length, frame.Width - band.Pad) * cell.Width; + var shift = bars.FirstOrDefault(b => b.Top == prompt.Row).Shift; + var plate = new Rect(band.Pad * cell.Width, RowTop(prompt.Row), Math.Max(0, room - shift), cell.Height); context.FillRectangle(Brush(_renderer.Background(first.Background)), plate); - var formatted = new FormattedText( - text, System.Globalization.CultureInfo.CurrentCulture, FlowDirection.LeftToRight, - new Typeface(NativeTokens.UiFont, FontStyle.Normal, FontWeight.SemiBold), NativeTokens.Input, Brush(ink)) - { - MaxTextWidth = plate.Width + (2 * cell.Width), - MaxLineCount = 1, - Trimming = TextTrimming.CharacterEllipsis, - }; - // At the field's inner padding, as the mockup sets it: the UI face is narrower than the cells it covers, and - // what it leaves over reads as the space before the line being typed rather than a hole in front of the prompt. + var formatted = PromptText(text, ink, cells + (2 * cell.Width)); + + // At the field's inner padding, as the mockup sets it, and the typed text a mono space after it (BarsOf). context.DrawText(formatted, new Point(Math.Round(plate.X), plate.Y + ((cell.Height - formatted.Height) / 2))); } diff --git a/src/SharpMUTerm.Avalonia/WindowPointer.cs b/src/SharpMUTerm.Avalonia/WindowPointer.cs index d0897341..7b36cc14 100644 --- a/src/SharpMUTerm.Avalonia/WindowPointer.cs +++ b/src/SharpMUTerm.Avalonia/WindowPointer.cs @@ -156,6 +156,16 @@ void IPointerPresenter.Status(StatusOverlay status) void IPointerPresenter.InputBand(InputBand? band) => Volatile.Write(ref _band, band); + private IReadOnlyList _dividers = []; + + /// + /// The pane dividers as of the client's last word: read by the driver when it flushes a frame, so each frame carries + /// the dividers it was painted with (). + /// + public IReadOnlyList Dividers => Volatile.Read(ref _dividers); + + void IPointerPresenter.Dividers(IReadOnlyList dividers) => Volatile.Write(ref _dividers, dividers); + void IPointerPresenter.Notice(NoticeOverlay notice) { var next = Notices.Append(notice).TakeLast(NoticesKept).ToList(); diff --git a/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs b/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs index 680ca6b7..6a9c1b9b 100644 --- a/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs +++ b/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs @@ -202,8 +202,25 @@ void Status(StatusOverlay status) void InputBand(InputBand? band) { } + + /// + /// The pane dividers on screen, where they are and whether one is lit, or an empty list while another of the client's + /// windows or a cell modal is in front of the panes. Said on the client's thread while the main window paints, before + /// the frame it describes is flushed, so a host may keep it with that frame and draw those cells its own way (the + /// window: the two panes' planes meeting at a hairline). The cells are drawn as in any host; a host that draws them as + /// cells ignores this (the default). + /// + void Dividers(IReadOnlyList dividers) + { + } } +/// One pane divider, for a host that draws it rather than its cells. +/// Its cells, in desktop cells: one column between panes side by side, one row between stacked ones. +/// Whether it is a column (the panes are side by side). +/// Whether it is under the pointer or being dragged: its cells are then WorkspacePalette.RuleHover. +internal sealed record PaneDividerOverlay(PaneRect Area, bool Vertical, bool Lit); + /// /// One panel on screen, for a host that draws it natively over its pane rather than in cells: where it is and what /// it shows. The cells under it are drawn as in any host, so a host that draws nothing loses nothing, and the diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs index 0e725c29..0fe54d42 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs @@ -160,6 +160,55 @@ private List HeaderDividerCells() => private void PublishHeaderDividers() => Volatile.Write(ref _headerDividerSlots, _dividers.Where(slot => slot.HeaderPaneId is not null).ToArray()); + private IReadOnlyList _dividersSaid = []; + + /// + /// Tells the host where the drawn dividers are (), on every paint of the main + /// window, before the frame is flushed; said only on change. + /// + private void PublishDividers() + { + if (_pointer is null || _window is null) + { + return; + } + + var now = DividersNow(); + if (now.SequenceEqual(_dividersSaid)) + { + return; + } + + _dividersSaid = now; + _pointer.Dividers(now); + } + + /// + /// The dividers drawn as cells (a tab strip standing in for one is the host's strip, not a divider), or none while + /// anything is drawn over the panes. Internal for tests. + /// + internal IReadOnlyList DividersNow() + { + if (!MainWindowInFront() || AnyOverlayOpen) + { + return []; + } + + var list = new List(); + foreach (var slot in _dividers) + { + if (slot.Control is null || AreaOf(slot) is not { Width: > 0, Height: > 0 } area) + { + continue; + } + + var lit = _litDivider is { } key && key.Equals(new DividerKey(slot.Split, slot.Index)); + list.Add(new PaneDividerOverlay(area, slot.Split.Direction == SplitDirection.Row, lit)); + } + + return list; + } + /// Where a divider's handle is, in desktop cells: its control's cells, or the empty run of a tab strip. private PaneRect? AreaOf(DividerSlot slot) => slot.Control is { } control ? BoundsOf(control) : slot.HeaderPaneId is { } paneId ? HeaderFill(paneId) : null; diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 66d52564..23c9f1e8 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -1043,6 +1043,7 @@ public SharpMUTermApp( PublishFloating(); PublishChrome(); PublishInputBand(); + PublishDividers(); PublishStatus(); SyncMapSizes(); SyncPanelSizes(); @@ -1058,6 +1059,7 @@ public SharpMUTermApp( { PublishPanels(); PublishInputBand(); + PublishDividers(); PublishPaneChrome(); }; if (_sixel is not null) @@ -1069,8 +1071,8 @@ public SharpMUTermApp( } // The native chrome stands down while another window is in front, and that window repaints, not this one. - _window.Activated += (_, _) => { PublishChrome(); PublishInputBand(); PublishStatus(); }; - _window.Deactivated += (_, _) => { PublishChrome(); PublishInputBand(); PublishStatus(); }; + _window.Activated += (_, _) => { PublishChrome(); PublishInputBand(); PublishDividers(); PublishStatus(); }; + _window.Deactivated += (_, _) => { PublishChrome(); PublishInputBand(); PublishDividers(); PublishStatus(); }; // Pane drag-and-drop listens at the driver, not at a control: SharpConsoleUI delivers mouse // frames to the control that was pressed (it captures on Button1Pressed), so a control-level diff --git a/tests/SharpMUTerm.Avalonia.Tests/WindowSeamTests.cs b/tests/SharpMUTerm.Avalonia.Tests/WindowSeamTests.cs new file mode 100644 index 00000000..5b36c707 --- /dev/null +++ b/tests/SharpMUTerm.Avalonia.Tests/WindowSeamTests.cs @@ -0,0 +1,143 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Headless; +using Avalonia.Media; +using SharpMUTerm.Core.Workspaces; +using SharpMUTerm.Tui; +using SkiaSharp; +using CellColour = SharpConsoleUI.Color; +using Window = Avalonia.Controls.Window; + +namespace SharpMUTerm.Avalonia.Tests; + +/// +/// Where the window's drawing meets the cells: a pane divider is drawn as the two panes' planes meeting at the tokens' +/// hairline (lit, the cells' own hover colour, wider); the typed text in the command line starts a mono space after the +/// UI-face prompt and a press there is a press on the cell drawn under it; and the bundled faces are made once, so a font +/// manager disposing its collection cannot take a face from under the next. +/// +public class WindowSeamTests +{ + private const int Columns = 40; + private const int Rows = 10; + + private static readonly SKColor Back = new(0x10, 0x13, 0x1a); + private static readonly CellColour Left = new(0x20, 0x30, 0x40); + private static readonly CellColour Right = new(0x40, 0x30, 0x20); + private static readonly CellColour RuleCells = new(0x80, 0x80, 0x80); + private static readonly SKColor Hairline = new(0x2c, 0x34, 0x47); + + [Test] + [Arguments(false)] + [Arguments(true)] + public async Task ADividerIsThePanesMeetingAtAHairline(bool lit) + { + var (left, right, centre, edge) = await Run((window, view, driver) => + { + driver.FillCells(0, 0, 19, ' ', CellColour.Default, Left); + driver.FillCells(19, 0, 1, ' ', CellColour.Default, RuleCells); + driver.FillCells(20, 0, 20, ' ', CellColour.Default, Right); + ((IPointerPresenter)driver.Pointer).Dividers([new PaneDividerOverlay(new PaneRect(19, 0, 1, 1), Vertical: true, lit)]); + driver.Flush(); + Drain(); + using var frame = window.CaptureRenderedFrame()!; + var cw = (double)view.Renderer.Fonts.CellWidth; + var ch = (double)view.Renderer.Fonts.CellHeight; + var x = 19 * cw; + var middle = Math.Round(x + ((cw - (lit ? 3 : 1)) / 2)); + return (Pixel(frame, x + 0.5, ch / 2), Pixel(frame, x + cw - 0.5, ch / 2), Pixel(frame, middle, ch / 2), Pixel(frame, middle + (lit ? 2 : 0), ch / 2)); + }); + + await Assert.That(left).IsEqualTo(Color.FromRgb(Left.R, Left.G, Left.B)).Because("the left pane's plane runs up to the rule"); + await Assert.That(right).IsEqualTo(Color.FromRgb(Right.R, Right.G, Right.B)).Because("and the right pane's from it"); + var expected = lit ? Color.FromRgb(RuleCells.R, RuleCells.G, RuleCells.B) : Color.FromRgb(Hairline.Red, Hairline.Green, Hairline.Blue); + await Assert.That(centre).IsEqualTo(expected).Because(lit ? "a lit divider keeps the cells' hover colour" : "the tokens' hairline"); + await Assert.That(edge).IsEqualTo(expected).Because(lit ? "three pixels wide, so it reads as a handle" : "one pixel"); + } + + [Test] + public async Task TheTypedTextStartsAMonoSpaceAfterThePromptAndAPressThereIsItsCell() + { + const string prompt = "Corvid · Aetherfall › "; + var (bar, cellWidth, pressed) = await Run((window, view, driver) => + { + var band = new InputBand(Rows - 1, 1, InputLayout.HostFieldPad, [new InputPrompt(Rows - 1, prompt)], ""); + ((IPointerPresenter)driver.Pointer).InputBand(band); + driver.Flush(); + Drain(); + using (window.CaptureRenderedFrame()) + { + } + + var bars = view.BarsOf(driver.Frame, band); + var seen = new List(); + driver.MouseEvent += (_, _, c) => seen.Add(c); + var scale = view.Renderer.Fonts.CellWidth / view.SizeFor(1, 1).Width; + var cw = view.Renderer.Fonts.CellWidth / scale; + var ch = view.Renderer.Fonts.CellHeight / scale; + var bar = bars.Single(); + var at = new Point((bar.TextStart * cw) - bar.Shift + (cw / 2), ((Rows - 1) * ch) + NativeLayout.FieldTop + (ch / 2)); + window.MouseDown(at, global::Avalonia.Input.MouseButton.Left); + window.MouseUp(at, global::Avalonia.Input.MouseButton.Left); + return (bar, view.Renderer.Fonts.CellWidth, seen.FirstOrDefault()); + }, field: true); + + await Assert.That(bar.TextStart).IsEqualTo(InputLayout.HostFieldPad + prompt.Length); + await Assert.That(bar.Shift).IsGreaterThan(cellWidth).Because("the UI face is narrower than the cells under it"); + var gap = ((bar.TextStart - InputLayout.HostFieldPad) * (double)cellWidth) - bar.Shift - bar.PromptWidth; + await Assert.That(gap).IsBetween(cellWidth - 1.0, cellWidth + 1.0).Because("a mono space between the prompt and the text"); + await Assert.That(pressed).IsEqualTo(new System.Drawing.Point(bar.TextStart, Rows - 1)).Because("a press on the first typed character is its cell"); + } + + [Test] + public async Task TheBundledFacesAreMadeOnceAndOutliveAManagerDisposingThem() + { + var (first, second, glyph) = await TerminalViewTests.Session.Dispatch(() => + { + var a = new BundledFonts(); + a.TryGetGlyphTypeface("Inter", FontStyle.Normal, FontWeight.Normal, FontStretch.Normal, out var one); + ((IDisposable)a).Dispose(); + var b = new BundledFonts(); + b.TryGetGlyphTypeface("Inter", FontStyle.Normal, FontWeight.Normal, FontStretch.Normal, out var two); + two!.CharacterToGlyphMap.TryGetGlyph('A', out var index); + return (one, two, index); + }, CancellationToken.None); + + await Assert.That(ReferenceEquals(first, second)).IsTrue().Because("one face per process, shared by every collection"); + await Assert.That((int)glyph).IsGreaterThan(0).Because("and still usable after a collection holding it was disposed"); + } + + private static void Drain() => global::Avalonia.Threading.Dispatcher.UIThread.RunJobs(); + + private static Task Run(Func body, bool field = false) => + TerminalViewTests.Session.Dispatch(() => + { + var driver = new AvaloniaConsoleDriver(Columns, Rows); + var view = new TerminalView(driver, SKColors.White, Back, 16, null) { DividerRule = Hairline, DrawsInputField = field }; + var window = new Window { Content = view }; + var size = view.SizeFor(Columns, Rows); + window.Width = size.Width; + window.Height = size.Height; + window.Show(); + try + { + return body(window, view, driver); + } + finally + { + window.Close(); + driver.Dispose(); + } + }, CancellationToken.None); + + private static Color Pixel(global::Avalonia.Media.Imaging.WriteableBitmap bitmap, double x, double y) + { + using var buffer = bitmap.Lock(); + var bytes = new byte[buffer.RowBytes * buffer.Size.Height]; + System.Runtime.InteropServices.Marshal.Copy(buffer.Address, bytes, 0, bytes.Length); + var i = ((int)y * buffer.RowBytes) + ((int)x * 4); + return buffer.Format == global::Avalonia.Platform.PixelFormat.Rgba8888 + ? Color.FromRgb(bytes[i], bytes[i + 1], bytes[i + 2]) + : Color.FromRgb(bytes[i + 2], bytes[i + 1], bytes[i]); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/PointerTests.cs b/tests/SharpMUTerm.Tui.Tests/PointerTests.cs index d6ec71f4..836839f2 100644 --- a/tests/SharpMUTerm.Tui.Tests/PointerTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/PointerTests.cs @@ -30,6 +30,10 @@ private sealed class RecordingPresenter : IPointerPresenter public bool DrawsMenus => true; public void Scrollbars(IReadOnlyList bars) => Bars = bars; + + public IReadOnlyList Dividers { get; private set; } = []; + + void IPointerPresenter.Dividers(IReadOnlyList dividers) => Dividers = dividers; } private static (SharpMUTermApp App, RecordingPresenter Pointer) App(string view, int width = 120, int height = 34) @@ -79,6 +83,43 @@ public async Task TheLineBetweenTwoPanesIsADividerThatResizesColumns() await Assert.That(divider[0].Target.Tooltip).Contains("Drag to resize"); } + /// + /// The host is told where the divider cells are, so the window can draw them as the panes meeting at a hairline: the + /// column between the panes, the whole height, lit while hovered; and nothing while a modal is drawn over the panes. + /// + [Test] + public async Task TheHostIsToldWhereTheDividersAreAndWhichIsLit() + { + var (app, pointer) = App("split"); + var rects = app.PaneSnapshot().Rects.Values.OrderBy(r => r.X).ToArray(); + var said = pointer.Dividers.Single(); + + await Assert.That(said.Vertical).IsTrue(); + await Assert.That(said.Lit).IsFalse(); + await Assert.That(said.Area.X).IsEqualTo(rects[0].X + rects[0].Width); + await Assert.That(said.Area.Width).IsEqualTo(1); + await Assert.That(said.Area.Height).IsEqualTo(rects[0].Height); + await Assert.That(app.DividersNow()).IsEquivalentTo(pointer.Dividers); + + app.SimulatePointer(DividerCell(app), MouseFlags.ReportMousePosition); + app.RenderNextFrame(); + await Assert.That(pointer.Dividers.Single().Lit).IsTrue(); + + app.SimulateKey(new ConsoleKeyInfo('\u0010', ConsoleKey.P, shift: false, alt: false, control: true)); + app.RenderNextFrame(); + await Assert.That(app.MenuIsOpen).IsTrue(); + await Assert.That(app.DividersNow()).IsEmpty().Because("⌃P is drawn over the panes, and the host must not draw over it"); + } + + /// A stacked split whose lower pane draws its strip has no divider row, and so tells the host of none. + [Test] + public async Task AStripStandingInForADividerIsNotADividerToDraw() + { + var (app, pointer) = App("split-stacked"); + + await Assert.That(pointer.Dividers).IsEmpty(); + } + [Test] public async Task HoveringADividerLightsItAndMovesNoPane() { From 27a757223296b76736fe80063fd3011cda0e5cbd Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 19:21:41 +0000 Subject: [PATCH 075/113] Wave 21 B: one spacing scale and device-pixel rules in the window - NativeTokens.Spacing: Hairline, Space2..Space32, PanelInset/ModalInset/PageInset, ControlHeight/ControlHeightSmall/FieldHeight, and Snap/HorizontalRule/StrokeRect/HairlinePen so a 1 px rule lands on one device row at 100/125/150/200%. - Every Thickness and Spacing in the window reads the scale; NativeTokenTests forbids literals outside an allow-list with reasons, and checks the chrome sizes are whole device pixels. - Header 44 px; sidebar text, brand and Add button on the 16 px inset, child rows indented, only the active character filled; panel headings 44 px with rows and footers on their inset; command-line field 20 px from the grid where the pad allows; buttons and fields one height. - The window's pane gutter is two columns and a row above output (PaneOutputRects and NAWS follow). Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 6 + CLAUDE.md | 28 +++- src/SharpMUTerm.Avalonia/ComposerEditor.cs | 2 +- src/SharpMUTerm.Avalonia/ComposerView.cs | 53 ++++--- src/SharpMUTerm.Avalonia/DesktopLayer.cs | 34 +++-- .../DictionaryOfferView.cs | 8 +- src/SharpMUTerm.Avalonia/FloatingPanels.cs | 4 +- src/SharpMUTerm.Avalonia/HelpView.cs | 16 +- src/SharpMUTerm.Avalonia/HistoryView.cs | 4 +- src/SharpMUTerm.Avalonia/ImportReviewView.cs | 12 +- src/SharpMUTerm.Avalonia/LayoutsView.cs | 16 +- src/SharpMUTerm.Avalonia/ListEditorView.cs | 58 +++---- src/SharpMUTerm.Avalonia/MapCanvas.cs | 2 +- src/SharpMUTerm.Avalonia/MapInspector.cs | 14 +- src/SharpMUTerm.Avalonia/ModalOverlay.cs | 4 +- src/SharpMUTerm.Avalonia/ModalParts.cs | 37 ++--- src/SharpMUTerm.Avalonia/NativeChrome.cs | 77 ++++++---- src/SharpMUTerm.Avalonia/NativeMenu.cs | 10 +- .../NativeTokens.Spacing.cs | 141 ++++++++++++++++++ src/SharpMUTerm.Avalonia/PackagePageView.cs | 84 +++++------ src/SharpMUTerm.Avalonia/PaletteOverlay.cs | 30 ++-- src/SharpMUTerm.Avalonia/PaneChromeViews.cs | 28 ++-- src/SharpMUTerm.Avalonia/PanelText.cs | 20 ++- src/SharpMUTerm.Avalonia/QuickBarButtons.cs | 17 ++- src/SharpMUTerm.Avalonia/QuitView.cs | 10 +- src/SharpMUTerm.Avalonia/ScriptConsoleView.cs | 20 +-- src/SharpMUTerm.Avalonia/ScrollbackView.cs | 12 +- src/SharpMUTerm.Avalonia/SearchView.cs | 16 +- src/SharpMUTerm.Avalonia/SettingsWindow.cs | 97 ++++++------ src/SharpMUTerm.Avalonia/TerminalView.cs | 8 +- src/SharpMUTerm.Avalonia/ThemeCardView.cs | 18 +-- src/SharpMUTerm.Avalonia/VitalsGauges.cs | 4 +- src/SharpMUTerm.Avalonia/WelcomeView.cs | 59 ++++---- src/SharpMUTerm.Avalonia/WhoHereList.cs | 10 +- src/SharpMUTerm.Avalonia/WorldBrowseView.cs | 18 +-- src/SharpMUTerm.Tui/Hosting/ClientHost.cs | 7 +- src/SharpMUTerm.Tui/SharpMUTermApp.cs | 26 +++- .../DesktopLayerTests.cs | 2 +- .../NativeChromeTests.cs | 2 +- .../NativeFooterTests.cs | 10 +- .../NativePanelTests.cs | 4 +- .../NativeTokenTests.cs | 68 +++++++++ .../NativeTabStripTests.cs | 7 +- 43 files changed, 716 insertions(+), 387 deletions(-) create mode 100644 src/SharpMUTerm.Avalonia/NativeTokens.Spacing.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index f1226070..91e3c37d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -386,6 +386,12 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Changed +- The desktop window lines up: one spacing scale for every native view, the header at the mockup's 44 px, output + starting about 20 px in from its pane's edges with a row of space under the tab strip, the sidebar's names, the brand + and every panel's heading, rows and buttons on one 16 px edge, the "+ Add a world or connect" button left-aligned, + equal-height buttons and fields, and every panel heading the same height. Rules and borders are one crisp pixel at + 125% and 150% display scaling instead of a blurred two. + - In the desktop window, the line between two panes is a hairline where the panes meet instead of a grey band, and lights up wider while you hover or drag it. In the command line, what you type starts right after the prompt. The docked composer's "Click to write a post" is in the interface font. diff --git a/CLAUDE.md b/CLAUDE.md index 9565101c..d06a8f9c 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -1394,8 +1394,10 @@ fallbacks) for inline images/maps. and the native strip lies on them. **Under `Tabs` a strip is two rows** (`TabHeaderStyle.Separator`, `TabStripRows`), the mockup's ~40 px with 14 px labels centred in the tabs; `PaneOutputRects` reads `TabHeaderHeight`, so NAWS is the pane less two rows, never a native view over a row of output. The band needs no blanking: its cells stay under it. - - **`HostChrome.PaneGutter` (the window) gives every pane a blank column either side** (`tabs.Margin`, - `PaneGutterColumns`), in the pane's plane (the surface grid behind it), so output is not flush with the pane's edge. + - **`HostChrome.PaneGutter` (the window) gives every pane two blank columns either side** (`tabs.Margin`, + `PaneGutterColumns`) **and a blank row above an output window's first line** (the content's `Margin`, + `PaneGutterRowsFor`; none for a panel or a map, drawn natively over the whole pane), in the pane's plane, so output + starts the mockup's ~20 px in from the pane's edges rather than one cell's 8. The columns are lost by the pane: `PaneOutputRects` subtracts the margin and NAWS follows. A native panel is published over its output rectangle *and* the gutter (`PublishPanels`), since those cells hold nothing and the panel pads itself. The terminal has no gutter. `NativeTabStripTests.TheStripTakesTwoRows…` pins both against the cells. @@ -2390,6 +2392,28 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] marked, `● Changed`, help under it; *Reset to default* link and the control on the right). A group whose name is its only field's label draws no heading. List and package pages put both halves in cards. Still generated from the declarations; nothing is placed by hand. Fonts are inherited (the window sets no UI family). +- **The window lays out on one spacing scale and on device pixels** (`NativeTokens.Spacing.cs`; wave 21B). Insets are + `Space2…Space32` (a 4 px grid plus the mockups' 6/10/14 control half-steps; nothing odd, an odd logical pixel is half a + device pixel at 150%), `PanelInset` (16: the header's brand, the sidebar's title, world names and foot button, every + panel's heading, rows and footer, the quick bar's first button), `ModalInset`, `PageInset`; heights `ControlHeight` 32, + `ControlHeightSmall` 28, `FieldHeight` 38 (the command line's field and the welcome's inputs and Connect). Decisions: + - **Chrome sizes are multiples of 4** (`NativeLayout`: header 44, sidebar 232 + 8, footer 28, the field's strip 40 + + rows), because 4 logical pixels are whole device pixels at 100/125/150/200%: the cells start on a device pixel at + every Windows scale, so a view placed from `CellOrigin` meets them with no blended row. The old 42 px header put + every rule below it on a half pixel at 125%. + - **A drawn hairline is one device pixel, filled**: `NativeTokens.HorizontalRule`/`VerticalRule`/`StrokeRect`/ + `HairlinePen` read the visual's `RenderScaling`; the header's rule, the tab strips, the scroll band, panel headings + (`PanelText.Heading(rule:)`), the search box, key caps and the quick bar's plates use them. `Border` hairlines are + already rounded by layout rounding (on by default) and need nothing. + - **Every panel heading is 44 px** (`PanelText.PanelHeadingHeight`, the docked composer's `Border` too), whatever the + cell height, so the side column's rules line up. Only the character in front wears the sidebar's selected plate; + its window in front is the accent mark. The field sits `NativeLayout.FieldSide` (20) in from the grid as far as the + prompt's padding columns allow (`FieldRect`, edges rounded to device pixels). + - `NativeTokenTests.NoViewWritesALiteralMarginPaddingOrSpacing` fails on a number in a `new Thickness(…)` or a + `Spacing =` outside the tokens (allow-list: the tokens, `TerminalView`, the footer, the toasts, with reasons); + `TheSpacingScaleAndTheChromeSizesAreWholeDevicePixels…` pins the multiples of 4. Not done: the quick bar is still one + cell row (the mockup's is a 56 px strip of 34 px buttons), and panel internals' font sizes are not on the scale. + - **Every native surface spells a key in words** (`NativeKeys.Words`, Avalonia: `KeyGlyphs.Words` plus the named keys `⏎` Enter, `⇥`/`↹` Tab, `⇤` Shift+Tab, `⌫` Backspace, `⌦` Delete, `⎋` Esc, `⇞`/`⇟` PgUp/PgDn; arrows stay arrows): `Ctrl+P`, `Alt+M`, `Ctrl+B b`, never `⌃P`/`⌥M`/`⏎`. The client writes keys in glyphs because the cells draw them diff --git a/src/SharpMUTerm.Avalonia/ComposerEditor.cs b/src/SharpMUTerm.Avalonia/ComposerEditor.cs index ba56a895..ab1f2457 100644 --- a/src/SharpMUTerm.Avalonia/ComposerEditor.cs +++ b/src/SharpMUTerm.Avalonia/ComposerEditor.cs @@ -30,7 +30,7 @@ public ComposerEditor() TextWrapping = TextWrapping.Wrap; NewLine = "\n"; BorderThickness = new Thickness(0); - Padding = new Thickness(12, 10); + Padding = new Thickness(NativeTokens.Space12, NativeTokens.Space10); MinHeight = 0; ClipToBounds = true; } diff --git a/src/SharpMUTerm.Avalonia/ComposerView.cs b/src/SharpMUTerm.Avalonia/ComposerView.cs index 658b0e21..72b94fd5 100644 --- a/src/SharpMUTerm.Avalonia/ComposerView.cs +++ b/src/SharpMUTerm.Avalonia/ComposerView.cs @@ -84,7 +84,7 @@ public ComposerView(TerminalView view, bool fullScreen) _editor = new ComposerEditor { Background = Brushes.Transparent, - Padding = fullScreen ? new Thickness(22, 14) : new Thickness(10, 8), + Padding = fullScreen ? new Thickness(NativeTokens.Space24, NativeTokens.Space14) : new Thickness(NativeTokens.Space10, NativeTokens.Space8), }; AutomationProperties.SetName(_editor, fullScreen ? "Compose a post" : "Docked composer"); _editor.TextChanged += (_, _) => OnTextChanged(); @@ -95,10 +95,10 @@ public ComposerView(TerminalView view, bool fullScreen) _marks = new MarkLayer(_editor); _gutter = new LineGutter(_editor) { IsVisible = false }; - _title = new TextBlock { FontWeight = fullScreen ? FontWeight.Bold : FontWeight.SemiBold, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(0, 0, fullScreen ? 10 : 8, 0) }; + _title = new TextBlock { FontWeight = fullScreen ? FontWeight.Bold : FontWeight.SemiBold, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(0, 0, fullScreen ? NativeTokens.Space10 : NativeTokens.Space8, 0) }; _target = new TextBlock { VerticalAlignment = VerticalAlignment.Center, TextTrimming = TextTrimming.CharacterEllipsis }; - _chips = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 6, VerticalAlignment = VerticalAlignment.Center }; - _count = new TextBlock { VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(10, 0, 0, 0) }; + _chips = new StackPanel { Orientation = Orientation.Horizontal, Spacing = NativeTokens.Space6, VerticalAlignment = VerticalAlignment.Center }; + _count = new TextBlock { VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(NativeTokens.Space10, 0, 0, 0) }; var headerRow = new DockPanel { LastChildFill = true }; DockPanel.SetDock(_title, Dock.Left); DockPanel.SetDock(_count, Dock.Right); @@ -109,7 +109,13 @@ public ComposerView(TerminalView view, bool fullScreen) headerRow.Children.Add(_target); // The docked panel's heading is every panel's (PanelText.Heading): 16 px in, a rule under it, the pop-out button // clear at the right. - _header = new Border { Child = headerRow, Padding = fullScreen ? new Thickness(22, 10) : new Thickness(PanelText.Pad, 10, 30, 10) }; + _header = new Border { Child = headerRow, Padding = fullScreen ? new Thickness(NativeTokens.Space24, NativeTokens.Space10) : new Thickness(PanelText.Pad, 0, NativeTokens.Space32, 0) }; + if (!fullScreen) + { + // Every panel's heading height, so the composer's rule meets the one beside it (who is here, the map). + _header.Height = PanelText.PanelHeadingHeight; + headerRow.VerticalAlignment = VerticalAlignment.Center; + } _keys = new WrapPanel { Orientation = Orientation.Horizontal, VerticalAlignment = VerticalAlignment.Center }; @@ -121,29 +127,29 @@ public ComposerView(TerminalView view, bool fullScreen) var dockedFooter = new DockPanel { LastChildFill = true }; DockPanel.SetDock(_sendButton, Dock.Right); DockPanel.SetDock(_previewButton, Dock.Right); - _previewButton.Margin = new Thickness(8, 0, 8, 0); + _previewButton.Margin = new Thickness(NativeTokens.Space8, 0, NativeTokens.Space8, 0); dockedFooter.Children.Add(_sendButton); dockedFooter.Children.Add(_previewButton); dockedFooter.Children.Add(_summary); _footer = new Border { Child = fullScreen ? _keys : dockedFooter, - Padding = fullScreen ? new Thickness(22, 8) : new Thickness(PanelText.Pad, 10, PanelText.Pad, 12), + Padding = fullScreen ? new Thickness(NativeTokens.Space24, NativeTokens.Space8) : new Thickness(PanelText.Pad, NativeTokens.Space10, PanelText.Pad, NativeTokens.Space14), }; // F1's as-sent preview (⌥P): the one command ⌃S sends, in the editor's face, under the editor. - _previewHeading = new TextBlock { Text = "AS SENT", FontWeight = FontWeight.Bold, Margin = new Thickness(0, 0, 0, 4) }; + _previewHeading = new TextBlock { Text = "AS SENT", FontWeight = FontWeight.Bold, Margin = new Thickness(0, 0, 0, NativeTokens.Space4) }; _previewText = new TextBlock { TextWrapping = TextWrapping.Wrap, MaxLines = 4, TextTrimming = TextTrimming.CharacterEllipsis }; _preview = new Border { Child = new StackPanel { Children = { _previewHeading, _previewText } }, - Padding = new Thickness(22, 8), + Padding = new Thickness(NativeTokens.Space24, NativeTokens.Space8), IsVisible = false, }; AutomationProperties.SetName(_preview, "As sent"); // The armed rule down the docked editor's left edge: the cell composer's ▌ marker, in the accent. - _rule = new Border { Width = 3, HorizontalAlignment = HorizontalAlignment.Left }; + _rule = new Border { Width = NativeTokens.MarkWidth, HorizontalAlignment = HorizontalAlignment.Left }; _placeholder = new TextBlock { @@ -151,7 +157,7 @@ public ComposerView(TerminalView view, bool fullScreen) FontFamily = NativeTokens.UiFont, IsHitTestVisible = false, IsVisible = false, - Margin = _editor.Padding + new Thickness(1), + Margin = _editor.Padding + new Thickness(NativeTokens.Hairline), }; var text = new Panel(); @@ -169,9 +175,9 @@ public ComposerView(TerminalView view, bool fullScreen) _well = new Border { Child = text, - Margin = new Thickness(PanelText.Pad, 12, PanelText.Pad, 0), - CornerRadius = new CornerRadius(NativeTokens.RadiusS + 2), - BorderThickness = new Thickness(1), + Margin = new Thickness(PanelText.Pad, NativeTokens.Space12, PanelText.Pad, 0), + CornerRadius = new CornerRadius(NativeTokens.RadiusControl), + BorderThickness = new Thickness(NativeTokens.Hairline), ClipToBounds = true, }; page = _well; @@ -374,9 +380,9 @@ private void Paint() _header.Background = new SolidColorBrush(_fullScreen ? Band : _plane); _footer.Background = new SolidColorBrush(_fullScreen ? Band : _plane); _header.BorderBrush = new SolidColorBrush(_fullScreen ? Mix(_plane, _text, 0.12) : PanelText.Rule(_text, _plane)); - _header.BorderThickness = new Thickness(0, 0, 0, 1); + _header.BorderThickness = new Thickness(0, 0, 0, NativeTokens.Hairline); _footer.BorderBrush = _header.BorderBrush; - _footer.BorderThickness = _fullScreen ? new Thickness(0, 1, 0, 0) : default; + _footer.BorderThickness = _fullScreen ? new Thickness(0, NativeTokens.Hairline, 0, 0) : default; if (_well is not null) { _well.Background = new SolidColorBrush(Well); @@ -402,7 +408,7 @@ private void Paint() _count.Foreground = new SolidColorBrush(Dim); _preview.Background = new SolidColorBrush(Band); _preview.BorderBrush = _header.BorderBrush; - _preview.BorderThickness = new Thickness(0, 1, 0, 0); + _preview.BorderThickness = new Thickness(0, NativeTokens.Hairline, 0, 0); _previewHeading.Foreground = new SolidColorBrush(Accent); _previewText.Foreground = new SolidColorBrush(_text); _marks.InvalidateVisual(); @@ -549,7 +555,7 @@ private void Label(ComposerModel model) continue; } - var item = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 5, Margin = new Thickness(0, 1, 14, 1) }; + var item = new StackPanel { Orientation = Orientation.Horizontal, Spacing = NativeTokens.Space4, Margin = new Thickness(0, NativeTokens.Hairline, NativeTokens.Space14, NativeTokens.Hairline) }; if (key.Key.Length > 0) { item.Children.Add(Chip(NativeKeys.Words(key.Key), Accent, ui - 1.5)); @@ -588,9 +594,9 @@ private void ShowPlaceholder(bool wanted) { Background = new SolidColorBrush(Mix(_plane, ink, 0.14)), BorderBrush = new SolidColorBrush(Mix(_plane, ink, 0.32)), - BorderThickness = new Thickness(1), + BorderThickness = new Thickness(NativeTokens.Hairline), CornerRadius = new CornerRadius(NativeTokens.RadiusS), - Padding = new Thickness(6, 0, 6, 1), + Padding = new Thickness(NativeTokens.Space6, 0, NativeTokens.Space6, NativeTokens.Hairline), VerticalAlignment = VerticalAlignment.Center, Child = new TextBlock { Text = words, FontSize = Math.Max(9, size), Foreground = new SolidColorBrush(ink) }, }; @@ -932,9 +938,10 @@ private static Border ActionButton(string words, string tip, Action click) var button = new Border { Child = new TextBlock { Text = words, VerticalAlignment = VerticalAlignment.Center }, - Padding = new Thickness(10, 5), - CornerRadius = new CornerRadius(NativeTokens.RadiusS + 2), - BorderThickness = new Thickness(1), + Padding = new Thickness(NativeTokens.Space10, 0), + Height = NativeTokens.ControlHeightSmall, + CornerRadius = new CornerRadius(NativeTokens.RadiusControl), + BorderThickness = new Thickness(NativeTokens.Hairline), Cursor = new Cursor(StandardCursorType.Hand), VerticalAlignment = VerticalAlignment.Center, }; diff --git a/src/SharpMUTerm.Avalonia/DesktopLayer.cs b/src/SharpMUTerm.Avalonia/DesktopLayer.cs index d8a256f2..51d83de0 100644 --- a/src/SharpMUTerm.Avalonia/DesktopLayer.cs +++ b/src/SharpMUTerm.Avalonia/DesktopLayer.cs @@ -753,8 +753,11 @@ public override void Render(DrawingContext context) /// internal static class NativeLayout { - /// The header band's height. - public const double HeaderHeight = 42; + /// + /// The header band's height: the mockup's 44, a multiple of 4 like every chrome size here, so the cells below it + /// start on a whole device pixel at 125% and 150% (' spacing scale). + /// + public const double HeaderHeight = 44; /// The sidebar's width, open. public const double SidebarWidth = 232; @@ -766,34 +769,43 @@ internal static class NativeLayout /// The sidebar's breathing room before the panes: its own plane carried a few pixels on, so a pane's first column /// of text does not sit hard against the sidebar's edge. Part of the sidebar, never of a pane, so it costs no cell. /// - public const double SidebarGutter = 8; + public const double SidebarGutter = NativeTokens.Space8; /// The status footer's height (). public const double StatusHeight = 28; /// The footer's text inset from the window's edges. - public const double FooterPadX = 16; + public const double FooterPadX = NativeTokens.PanelInset; /// The command line's strip: the padding above the field and below it (). - public const double FieldOuter = 10; + public const double FieldOuter = NativeTokens.Space10; - /// The field's own padding above its first row and below its last. - public const double FieldInner = 9; + /// The field's own padding above its first row and below its last: the mockup's 9 px and its border. + public const double FieldInner = NativeTokens.Space10; /// How far the field's edge sits outside the client's padding columns, horizontally. - public const double FieldInsetX = 12; + public const double FieldInsetX = NativeTokens.Space12; + + /// + /// The field's edge from the grid's left and right edges: the mockup's 20 px, as far as the client's padding columns + /// leave room for the field's own inner padding ( at least) before the prompt. + /// + public const double FieldSide = NativeTokens.Space20; + + /// The pixels the strip adds around its rows: its padding and the field's, above and below. + public const double FieldStrip = 2 * (FieldOuter + FieldInner); /// How much lower the bars' rows are drawn than their cells: the strip's padding and the field's. public const double FieldTop = FieldOuter + FieldInner; /// The vertical pixels the field adds around the rows it frames, which the grid gives up. - public const double FieldReserve = 2 * FieldTop; + public const double FieldReserve = FieldStrip; /// A header button's side. - public const double ButtonSize = 30; + public const double ButtonSize = NativeTokens.ControlHeightSmall; /// The gap between two header buttons. - public const double ButtonGap = 6; + public const double ButtonGap = NativeTokens.Space8; /// The cells' margin in the window: the space the native header and sidebar take. public static Thickness Insets(HostChrome chrome, bool collapsed) => new( diff --git a/src/SharpMUTerm.Avalonia/DictionaryOfferView.cs b/src/SharpMUTerm.Avalonia/DictionaryOfferView.cs index 4da48954..719ccd66 100644 --- a/src/SharpMUTerm.Avalonia/DictionaryOfferView.cs +++ b/src/SharpMUTerm.Avalonia/DictionaryOfferView.cs @@ -27,11 +27,11 @@ public DictionaryOfferView(DictionaryOfferSession session, NativeTokens colours, var model = session.Model; var heading = ModalParts.Heading(model.Question, colours); - heading.Margin = new Thickness(22, 18, 22, 8); + heading.Margin = new Thickness(NativeTokens.Space24, NativeTokens.Space16, NativeTokens.Space24, NativeTokens.Space8); SetDock(heading, Dock.Top); Children.Add(heading); - var facts = new StackPanel { Margin = new Thickness(22, 2, 22, 4), Spacing = 6 }; + var facts = new StackPanel { Margin = new Thickness(NativeTokens.Space24, NativeTokens.Space2, NativeTokens.Space24, NativeTokens.Space4), Spacing = NativeTokens.Space6 }; foreach (var line in model.Lines) { facts.Children.Add(new TextBlock @@ -56,8 +56,8 @@ public DictionaryOfferView(DictionaryOfferSession session, NativeTokens colours, { Orientation = Orientation.Horizontal, HorizontalAlignment = HorizontalAlignment.Right, - Spacing = 10, - Margin = new Thickness(22, 14, 22, 0), + Spacing = NativeTokens.Space10, + Margin = new Thickness(NativeTokens.Space24, NativeTokens.Space14, NativeTokens.Space24, 0), }; buttons.Children.Add(_download); buttons.Children.Add(_later); diff --git a/src/SharpMUTerm.Avalonia/FloatingPanels.cs b/src/SharpMUTerm.Avalonia/FloatingPanels.cs index df1a5f5c..24afb4e2 100644 --- a/src/SharpMUTerm.Avalonia/FloatingPanels.cs +++ b/src/SharpMUTerm.Avalonia/FloatingPanels.cs @@ -213,8 +213,8 @@ public FloatingPanelWindow(FloatingPanel panel, TerminalView view) }; _content.Focusable = false; - _title = new TextBlock { VerticalAlignment = VerticalAlignment.Center, FontSize = NativeTokens.Body, Margin = new Thickness(10, 0, 0, 0) }; - _dock = new FrameButton("Dock") { Width = 52, Height = 20, Margin = new Thickness(0, 0, 6, 0), VerticalAlignment = VerticalAlignment.Center }; + _title = new TextBlock { VerticalAlignment = VerticalAlignment.Center, FontSize = NativeTokens.Body, Margin = new Thickness(NativeTokens.Space10, 0, 0, 0) }; + _dock = new FrameButton("Dock") { Width = 52, Height = 20, Margin = new Thickness(0, 0, NativeTokens.Space6, 0), VerticalAlignment = VerticalAlignment.Center }; _dock.Click += () => Panel.Dock(); AutomationProperties.SetName(_dock, "Dock back into the layout"); ToolTip.SetTip(_dock, "Dock back into its place in the layout"); diff --git a/src/SharpMUTerm.Avalonia/HelpView.cs b/src/SharpMUTerm.Avalonia/HelpView.cs index a209de02..73518354 100644 --- a/src/SharpMUTerm.Avalonia/HelpView.cs +++ b/src/SharpMUTerm.Avalonia/HelpView.cs @@ -59,7 +59,7 @@ public HelpView(HelpSession session, NativeTokens colours, Action done) frame.MinHeight = 160; panel.Children.Add(frame); - _pageText = new StackPanel { Margin = new Thickness(22, 4, 22, 12), Spacing = 8 }; + _pageText = new StackPanel { Margin = new Thickness(NativeTokens.Space24, NativeTokens.Space4, NativeTokens.Space24, NativeTokens.Space12), Spacing = NativeTokens.Space8 }; _page = new ScrollViewer { Content = _pageText, IsVisible = false, MinHeight = 160 }; panel.Children.Add(_page); Children.Add(panel); @@ -210,7 +210,7 @@ private void ShowPage(HelpTopic topic) FontSize = NativeTokens.Title, FontWeight = FontWeight.SemiBold, Foreground = _colours.Brush(_colours.Header), - Margin = new Thickness(0, previous is null ? 4 : 8, 0, -4), + Margin = new Thickness(0, previous is null ? NativeTokens.Space4 : NativeTokens.Space8, 0, -NativeTokens.Space4), }); } @@ -220,8 +220,8 @@ private void ShowPage(HelpTopic topic) Foreground = _colours.Brush(_colours.Text), TextWrapping = block.Preformatted ? TextWrapping.NoWrap : TextWrapping.Wrap, LineHeight = (NativeTokens.Body + 1) * 1.45, - Margin = block.Preformatted && previous is { Preformatted: true } ? new Thickness(12, -6, 0, 0) - : block.Preformatted ? new Thickness(12, 0, 0, 0) : default, + Margin = block.Preformatted && previous is { Preformatted: true } ? new Thickness(NativeTokens.Space12, -NativeTokens.Space6, 0, 0) + : block.Preformatted ? new Thickness(NativeTokens.Space12, 0, 0, 0) : default, }; if (block.Preformatted) { @@ -247,7 +247,7 @@ private void ShowPage(HelpTopic topic) var back = ModalParts.Button("Back to help", "Esc", _colours, Back); back.HorizontalAlignment = HorizontalAlignment.Left; - back.Margin = new Thickness(0, 10, 0, 0); + back.Margin = new Thickness(0, NativeTokens.Space10, 0, 0); _pageText.Children.Add(back); _page.Offset = default; _footer.Text = "Up and Down scroll · Esc back to the list"; @@ -272,7 +272,7 @@ private void ShowList() { Text = NativeKeys.Words(HelpModel.NoMatches), Foreground = _colours.Brush(_colours.Dim), - Margin = new Thickness(12, 10), + Margin = new Thickness(NativeTokens.Space12, NativeTokens.Space10), TextWrapping = TextWrapping.Wrap, }); return; @@ -293,7 +293,7 @@ private void ShowList() if (entry.Key.Length > 0) { var chip = ModalParts.Key(entry.Key, _colours); - chip.Margin = new Thickness(10, 0, 0, 0); + chip.Margin = new Thickness(NativeTokens.Space10, 0, 0, 0); SetDock(chip, Dock.Right); line.Children.Add(chip); } @@ -304,7 +304,7 @@ private void ShowList() Foreground = _colours.Brush(_colours.Text), FontSize = NativeTokens.Title, Width = 240, - Margin = new Thickness(0, 0, 14, 0), + Margin = new Thickness(0, 0, NativeTokens.Space14, 0), TextTrimming = TextTrimming.CharacterEllipsis, VerticalAlignment = VerticalAlignment.Center, }; diff --git a/src/SharpMUTerm.Avalonia/HistoryView.cs b/src/SharpMUTerm.Avalonia/HistoryView.cs index d6f06dda..43b4643a 100644 --- a/src/SharpMUTerm.Avalonia/HistoryView.cs +++ b/src/SharpMUTerm.Avalonia/HistoryView.cs @@ -38,7 +38,7 @@ public HistoryView(HistorySession session, NativeTokens colours, Action done) SetDock(_box, Dock.Top); Children.Add(_box); - var header = new DockPanel { Margin = new Thickness(20, 0, 20, 6) }; + var header = new DockPanel { Margin = new Thickness(NativeTokens.Space20, 0, NativeTokens.Space20, NativeTokens.Space6) }; var whose = new TextBlock { Text = model.BarLabel, FontSize = NativeTokens.Body, Foreground = colours.Brush(colours.Dim) }; _count = new TextBlock { FontSize = NativeTokens.Body, Foreground = colours.Brush(colours.Dim), HorizontalAlignment = global::Avalonia.Layout.HorizontalAlignment.Right }; SetDock(whose, Dock.Left); @@ -112,7 +112,7 @@ private void Draw() { Text = model.Entries.Count == 0 ? HistoryModel.NothingEntered : HistoryModel.NoMatches, Foreground = _colours.Brush(_colours.Dim), - Margin = new Thickness(12, 10), + Margin = new Thickness(NativeTokens.Space12, NativeTokens.Space10), TextWrapping = TextWrapping.Wrap, }); return; diff --git a/src/SharpMUTerm.Avalonia/ImportReviewView.cs b/src/SharpMUTerm.Avalonia/ImportReviewView.cs index f6330061..341f7dbc 100644 --- a/src/SharpMUTerm.Avalonia/ImportReviewView.cs +++ b/src/SharpMUTerm.Avalonia/ImportReviewView.cs @@ -20,7 +20,7 @@ internal sealed class ImportReviewView : DockPanel, IModalView private readonly ImportReviewSession _session; private readonly NativeTokens _colours; private readonly Action _done; - private readonly StackPanel _body = new() { Spacing = 4, Margin = new Thickness(20, 2, 20, 4) }; + private readonly StackPanel _body = new() { Spacing = NativeTokens.Space4, Margin = new Thickness(NativeTokens.Space20, NativeTokens.Space2, NativeTokens.Space20, NativeTokens.Space4) }; private readonly Button _import; private readonly Button _cancel; private readonly CheckBox _passwords; @@ -64,10 +64,10 @@ public ImportReviewView(ImportReviewSession session, NativeTokens colours, Actio } }; - var buttons = new DockPanel { Margin = new Thickness(20, 12, 20, 0), LastChildFill = false }; + var buttons = new DockPanel { Margin = new Thickness(NativeTokens.Space20, NativeTokens.Space12, NativeTokens.Space20, 0), LastChildFill = false }; DockPanel.SetDock(_passwords, Dock.Left); buttons.Children.Add(_passwords); - var right = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 10 }; + var right = new StackPanel { Orientation = Orientation.Horizontal, Spacing = NativeTokens.Space10 }; right.Children.Add(_import); right.Children.Add(_cancel); DockPanel.SetDock(right, Dock.Right); @@ -182,7 +182,7 @@ private void Draw() if (_model.PasswordLine is { } passwords) { var line = Line(passwords, _model.StorePasswords ? _colours.Text : _colours.Warn); - line.Margin = new Thickness(12, 12, 12, 0); + line.Margin = new Thickness(NativeTokens.Space12, NativeTokens.Space12, NativeTokens.Space12, 0); _body.Children.Add(line); } } @@ -193,7 +193,7 @@ private void Draw() Foreground = _colours.Brush(colour), FontSize = NativeTokens.Body, TextWrapping = TextWrapping.Wrap, - Margin = new Thickness(12, 1, 12, 1), + Margin = new Thickness(NativeTokens.Space12, NativeTokens.Hairline, NativeTokens.Space12, NativeTokens.Hairline), }; private TextBlock Row(ImportReviewRow row, Color detail) @@ -202,7 +202,7 @@ private TextBlock Row(ImportReviewRow row, Color detail) { FontSize = NativeTokens.Body, TextWrapping = TextWrapping.Wrap, - Margin = new Thickness(12, 2, 12, 2), + Margin = new Thickness(NativeTokens.Space12, NativeTokens.Space2, NativeTokens.Space12, NativeTokens.Space2), }; block.Inlines ??= new global::Avalonia.Controls.Documents.InlineCollection(); block.Inlines.Add(new global::Avalonia.Controls.Documents.Run(row.Kind + " ") { Foreground = _colours.Brush(_colours.Accent) }); diff --git a/src/SharpMUTerm.Avalonia/LayoutsView.cs b/src/SharpMUTerm.Avalonia/LayoutsView.cs index 0eeebdb7..9a3cf115 100644 --- a/src/SharpMUTerm.Avalonia/LayoutsView.cs +++ b/src/SharpMUTerm.Avalonia/LayoutsView.cs @@ -49,8 +49,8 @@ public LayoutsView(LayoutsSession session, NativeTokens colours, Action done) _rename = new TextBox { - Margin = new Thickness(14, 4, 14, 4), - Padding = new Thickness(10, 6), + Margin = new Thickness(NativeTokens.Space14, NativeTokens.Space4, NativeTokens.Space14, NativeTokens.Space4), + Padding = new Thickness(NativeTokens.Space10, NativeTokens.Space6), CornerRadius = new CornerRadius(NativeTokens.RadiusM), IsVisible = false, PlaceholderText = "New name", @@ -61,11 +61,11 @@ public LayoutsView(LayoutsSession session, NativeTokens colours, Action done) SetDock(footer, Dock.Bottom); Children.Add(footer); - _buttons = new WrapPanel { Margin = new Thickness(14, 8, 14, 0), HorizontalAlignment = HorizontalAlignment.Right }; + _buttons = new WrapPanel { Margin = new Thickness(NativeTokens.Space14, NativeTokens.Space8, NativeTokens.Space14, 0), HorizontalAlignment = HorizontalAlignment.Right }; SetDock(_buttons, Dock.Bottom); Children.Add(_buttons); - _status = ModalParts.Dim(string.Empty, colours, new Thickness(20, 8, 20, 0)); + _status = ModalParts.Dim(string.Empty, colours, new Thickness(NativeTokens.Space20, NativeTokens.Space8, NativeTokens.Space20, 0)); SetDock(_status, Dock.Bottom); Children.Add(_status); @@ -159,7 +159,7 @@ private void Draw() if (own == 0) { - _list.Children.Add(ModalParts.Dim("None yet — Save as new keeps the panes as they are now.", _colours, new Thickness(12, 2, 12, 6))); + _list.Children.Add(ModalParts.Dim("None yet — Save as new keeps the panes as they are now.", _colours, new Thickness(NativeTokens.Space12, NativeTokens.Space2, NativeTokens.Space12, NativeTokens.Space6))); } _status.Text = _confirming && _model.Current is { } doomed @@ -176,7 +176,7 @@ private void AddRow(int index) { var layout = _model.Rows[index]; var line = new DockPanel(); - var tags = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 6, VerticalAlignment = VerticalAlignment.Center }; + var tags = new StackPanel { Orientation = Orientation.Horizontal, Spacing = NativeTokens.Space6, VerticalAlignment = VerticalAlignment.Center }; if (layout.InUse) { tags.Children.Add(Chip("in use")); @@ -213,7 +213,7 @@ private void AddRow(int index) { Background = _colours.Brush(_colours.Selected), CornerRadius = new CornerRadius(NativeTokens.RadiusM), - Padding = new Thickness(8, 1), + Padding = new Thickness(NativeTokens.Space8, NativeTokens.Hairline), Child = new TextBlock { Text = text, FontSize = NativeTokens.Small, Foreground = _colours.Brush(_colours.Accent) }, }; @@ -228,7 +228,7 @@ private void DrawButtons() void Add(string label, string key, Action click, bool accent = false) { var button = ModalParts.Button(label, key, _colours, click, accent); - button.Margin = new Thickness(6, 0, 0, 6); + button.Margin = new Thickness(NativeTokens.Space6, 0, 0, NativeTokens.Space6); button.Focusable = false; _buttons.Children.Add(button); } diff --git a/src/SharpMUTerm.Avalonia/ListEditorView.cs b/src/SharpMUTerm.Avalonia/ListEditorView.cs index 50667840..a4a2e70f 100644 --- a/src/SharpMUTerm.Avalonia/ListEditorView.cs +++ b/src/SharpMUTerm.Avalonia/ListEditorView.cs @@ -41,7 +41,7 @@ internal sealed class ListEditorView : Grid private readonly Dictionary _controls = new(StringComparer.Ordinal); private readonly List<(object Item, ListBoxItem Row, CheckBox Enabled)> _rows = []; private readonly List internal sealed class SettingsWindow : Window { + /// How far the meter table's received-paths box sits in: under the path columns, past the label column. + private const double MeterPathsIndent = 128; + private readonly TextBox _search; private readonly ListBox _sections; private readonly StackPanel _page; @@ -94,8 +97,8 @@ public SettingsWindow(SettingsForm form) CloseButton = new Button { Content = "✕", - Padding = new Thickness(10, 4), - Margin = new Thickness(12, 0, 0, 0), + Padding = new Thickness(NativeTokens.Space10, NativeTokens.Space4), + Margin = new Thickness(NativeTokens.Space12, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center, Background = Brushes.Transparent, BorderThickness = new Thickness(0), @@ -108,7 +111,7 @@ public SettingsWindow(SettingsForm form) { PlaceholderText = "Search settings", FontSize = NativeTokens.Label, - Padding = new Thickness(0, 2), + Padding = new Thickness(0, NativeTokens.Space2), MinHeight = 0, BorderThickness = new Thickness(0), Background = Brushes.Transparent, @@ -125,7 +128,7 @@ public SettingsWindow(SettingsForm form) AutomationProperties.SetName(_search, "Search settings"); _search.TextChanged += (_, _) => OnQuery(); - _searchCount = new TextBlock { FontSize = NativeTokens.Body, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(8, 0, 0, 0) }; + _searchCount = new TextBlock { FontSize = NativeTokens.Body, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(NativeTokens.Space8, 0, 0, 0) }; _searchGlass = new global::Avalonia.Controls.Shapes.Path { Data = Geometry.Parse("M6,0 A6,6 0 1 1 6,12 A6,6 0 1 1 6,0 M10.5,10.5 L14,14"), @@ -134,7 +137,7 @@ public SettingsWindow(SettingsForm form) Height = 14, Stretch = Stretch.Uniform, VerticalAlignment = VerticalAlignment.Center, - Margin = new Thickness(0, 0, 8, 0), + Margin = new Thickness(0, 0, NativeTokens.Space8, 0), }; var searchRow = new Grid { ColumnDefinitions = new ColumnDefinitions("Auto,*,Auto") }; searchRow.Children.Add(_searchGlass); @@ -145,17 +148,17 @@ public SettingsWindow(SettingsForm form) _searchFrame = new Border { Child = searchRow, - BorderThickness = new Thickness(1), + BorderThickness = new Thickness(NativeTokens.Hairline), CornerRadius = new CornerRadius(NativeTokens.RadiusM), - Padding = new Thickness(12, 6), + Padding = new Thickness(NativeTokens.Space12, NativeTokens.Space6), HorizontalAlignment = HorizontalAlignment.Stretch, VerticalAlignment = VerticalAlignment.Center, Cursor = new Cursor(StandardCursorType.Ibeam), }; _searchFrame.PointerPressed += (_, _) => _search.Focus(); - _scope = new ContentControl { VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(16, 0, 0, 0) }; - var header = new Grid { ColumnDefinitions = [new ColumnDefinition(GridLength.Auto), new ColumnDefinition(3, GridUnitType.Star) { MaxWidth = 480 }, new ColumnDefinition(GridLength.Star), new ColumnDefinition(GridLength.Auto), new ColumnDefinition(GridLength.Auto)], Margin = new Thickness(20, 0, 8, 0), Background = Brushes.Transparent }; + _scope = new ContentControl { VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(NativeTokens.Space16, 0, 0, 0) }; + var header = new Grid { ColumnDefinitions = [new ColumnDefinition(GridLength.Auto), new ColumnDefinition(3, GridUnitType.Star) { MaxWidth = 480 }, new ColumnDefinition(GridLength.Star), new ColumnDefinition(GridLength.Auto), new ColumnDefinition(GridLength.Auto)], Margin = new Thickness(NativeTokens.Space20, 0, NativeTokens.Space8, 0), Background = Brushes.Transparent }; header.Children.Add(_title); Grid.SetColumn(_searchFrame, 1); header.Children.Add(_searchFrame); @@ -163,7 +166,7 @@ public SettingsWindow(SettingsForm form) header.Children.Add(_scope); Grid.SetColumn(CloseButton, 4); header.Children.Add(CloseButton); - _bar = new Border { Height = 56, BorderThickness = new Thickness(0, 0, 0, 1), Child = header }; + _bar = new Border { Height = 56, BorderThickness = new Thickness(0, 0, 0, NativeTokens.Hairline), Child = header }; _bar.PointerPressed += (_, e) => { if (e.GetCurrentPoint(_bar).Properties.IsLeftButtonPressed @@ -177,11 +180,11 @@ public SettingsWindow(SettingsForm form) // ── the footer ── _footerLeft = new TextBlock { Text = "Changes apply to connected sessions as you make them.", FontSize = NativeTokens.Body, VerticalAlignment = VerticalAlignment.Center }; _footerRight = new TextBlock { Text = "Ctrl+F searches · Esc closes", FontSize = NativeTokens.Body, VerticalAlignment = VerticalAlignment.Center }; - var footerRow = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto"), Margin = new Thickness(20, 0) }; + var footerRow = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto"), Margin = new Thickness(NativeTokens.Space20, 0) }; footerRow.Children.Add(_footerLeft); Grid.SetColumn(_footerRight, 1); footerRow.Children.Add(_footerRight); - _footer = new Border { Height = 36, BorderThickness = new Thickness(0, 1, 0, 0), Child = footerRow }; + _footer = new Border { Height = 36, BorderThickness = new Thickness(0, NativeTokens.Hairline, 0, 0), Child = footerRow }; DockPanel.SetDock(_footer, Dock.Bottom); // ── the section navigation ── @@ -193,17 +196,17 @@ public SettingsWindow(SettingsForm form) FontSize = NativeTokens.Body, LineHeight = 18, TextWrapping = TextWrapping.Wrap, - Margin = new Thickness(10, 8, 10, 4), + Margin = new Thickness(NativeTokens.Space10, NativeTokens.Space8, NativeTokens.Space10, NativeTokens.Space4), }; var navDock = new DockPanel { LastChildFill = true }; DockPanel.SetDock(_navNote, Dock.Bottom); navDock.Children.Add(_navNote); navDock.Children.Add(_sections); - _nav = new Border { Width = 232, BorderThickness = new Thickness(0, 0, 1, 0), Padding = new Thickness(10, 12), Child = navDock }; + _nav = new Border { Width = 232, BorderThickness = new Thickness(0, 0, NativeTokens.Hairline, 0), Padding = new Thickness(NativeTokens.Space10, NativeTokens.Space12), Child = navDock }; DockPanel.SetDock(_nav, Dock.Left); // ── the page ── - _page = new StackPanel { Margin = new Thickness(40, 24, 40, 28), Spacing = 20 }; + _page = new StackPanel { Margin = new Thickness(NativeTokens.PageInset, NativeTokens.Space24, NativeTokens.PageInset, NativeTokens.Space28), Spacing = NativeTokens.Space20 }; _scroller = new ScrollViewer { Content = _page, HorizontalScrollBarVisibility = ScrollBarVisibility.Disabled }; // A list editor fills the page below its title rather than scrolling with it: its list and its detail scroll @@ -226,7 +229,7 @@ public SettingsWindow(SettingsForm form) dock.Children.Add(_footer); dock.Children.Add(_nav); dock.Children.Add(_scroller); - _frame = new Border { BorderThickness = new Thickness(1), Child = dock }; + _frame = new Border { BorderThickness = new Thickness(NativeTokens.Hairline), Child = dock }; // The frame is ours, so the resize border is too: a band along each edge, as the borderless main window has. CanResize = true; @@ -391,7 +394,7 @@ private void BuildSectionList() foreach (var section in _form.Sections) { var title = new TextBlock { Text = section.Title, FontSize = NativeTokens.Label, VerticalAlignment = VerticalAlignment.Center, TextTrimming = TextTrimming.CharacterEllipsis }; - var badge = new TextBlock { FontSize = NativeTokens.Label, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(8, 0, 0, 0) }; + var badge = new TextBlock { FontSize = NativeTokens.Label, VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(NativeTokens.Space8, 0, 0, 0) }; _badges[section.Id] = badge; var row = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto") }; row.Children.Add(title); @@ -401,8 +404,8 @@ private void BuildSectionList() { Content = row, Tag = section.Id, - Padding = new Thickness(10, 8), - Margin = new Thickness(0, 0, 0, 2), + Padding = new Thickness(NativeTokens.Space10, NativeTokens.Space8), + Margin = new Thickness(0, 0, 0, NativeTokens.Space2), MinHeight = 0, CornerRadius = new CornerRadius(NativeTokens.RadiusControl), }; @@ -547,7 +550,7 @@ private void BuildPage() { if (_form.Packages is not { } manager) { - _page.Children.Add(new TextBlock { Text = "This client offers no packages.", Foreground = DimInk, Margin = new Thickness(0, 16, 0, 0) }); + _page.Children.Add(new TextBlock { Text = "This client offers no packages.", Foreground = DimInk, Margin = new Thickness(0, NativeTokens.Space16, 0, 0) }); ShownFields = []; return; } @@ -574,7 +577,7 @@ private void BuildPage() _tokens) { Height = ListEditorHeight(), - Margin = new Thickness(0, 8, 0, 0), + Margin = new Thickness(0, NativeTokens.Space8, 0, 0), }; ListEditor = editor; _page.Children.Add(editor); @@ -611,7 +614,7 @@ private void BuildPage() : section.Fields.ToList(); if (visible.Count == 0) { - _page.Children.Add(new TextBlock { Text = "No setting here matches the search.", Foreground = DimInk, Margin = new Thickness(0, 16, 0, 0) }); + _page.Children.Add(new TextBlock { Text = "No setting here matches the search.", Foreground = DimInk, Margin = new Thickness(0, NativeTokens.Space16, 0, 0) }); } // A card per group, as the mockup draws its sections: the group's name heads it and its fields are rows inside, @@ -631,7 +634,7 @@ private void BuildPage() Text = heading, FontSize = NativeTokens.CardTitle, FontWeight = FontWeight.SemiBold, - Margin = new Thickness(0, 12, 0, 0), + Margin = new Thickness(0, NativeTokens.Space12, 0, 0), }); } @@ -639,7 +642,7 @@ private void BuildPage() } else { - body.Children.Add(new Border { Height = 1, Background = _tokens.Page.Brush(_tokens.Page.Rule) }); + body.Children.Add(new Border { Height = NativeTokens.Hairline, Background = _tokens.Page.Brush(_tokens.Page.Rule) }); } body.Children.Add(field switch @@ -660,7 +663,7 @@ private void BuildPage() /// private StackPanel PageHead(SettingsSectionContribution section) { - var head = new StackPanel { Spacing = 6 }; + var head = new StackPanel { Spacing = NativeTokens.Space6 }; head.Children.Add(new TextBlock { Text = section.Title, FontSize = NativeTokens.PageTitle, FontWeight = FontWeight.SemiBold }); var line = new WrapPanel { Orientation = Orientation.Horizontal }; if (Searching) @@ -680,7 +683,7 @@ private StackPanel PageHead(SettingsSectionContribution section) if (section.Scope is SettingScope.World or SettingScope.Character && section.Key is { } screen) { var door = LinkButton($"Open the {screen} screen ↗"); - door.Margin = new Thickness(line.Children.Count > 0 ? 12 : 0, 0, 0, 0); + door.Margin = new Thickness(line.Children.Count > 0 ? NativeTokens.Space12 : 0, 0, 0, 0); ToolTip.SetTip(door, section.Scope == SettingScope.World ? "Adding and deleting worlds, their characters and trigger sets are on the cell screen" : "Adding and deleting characters is on the cell screen"); @@ -705,9 +708,9 @@ private StackPanel PageHead(SettingsSectionContribution section) Child = body, Background = _tokens.Page.Brush(_tokens.Page.Card), BorderBrush = _tokens.Page.Brush(_tokens.Page.Rule), - BorderThickness = new Thickness(1), + BorderThickness = new Thickness(NativeTokens.Hairline), CornerRadius = new CornerRadius(NativeTokens.RadiusCard), - Padding = new Thickness(20, 6), + Padding = new Thickness(NativeTokens.Space20, NativeTokens.Space6), }; /// A button drawn as a link in the accent, underlined, as the mockup's "Reset to default" and "Show all". @@ -743,7 +746,7 @@ private Button LinkButton(string text) /// private Control SubjectRow(SettingsSectionContribution section) { - var row = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 8 }; + var row = new StackPanel { Orientation = Orientation.Horizontal, Spacing = NativeTokens.Space8 }; var subjects = _form.Subjects(section.Scope); var noun = section.Scope == SettingScope.World ? "world" : "character"; if (subjects.Count == 0) @@ -776,7 +779,7 @@ private Control SubjectRow(SettingsSectionContribution section) /// The theme field: a card per theme, its preview drawn from the client's model; a click uses it. private StackPanel ThemePicker(ThemeField field) { - var outer = new StackPanel { Spacing = 6, Margin = new Thickness(0, 12, 0, 4) }; + var outer = new StackPanel { Spacing = NativeTokens.Space6, Margin = new Thickness(0, NativeTokens.Space12, 0, NativeTokens.Space4) }; var words = new StackPanel(); words.Children.Add(LabelBlock(field.Label)); if (field.Help is { } help) @@ -786,7 +789,7 @@ private StackPanel ThemePicker(ThemeField field) outer.Children.Add(words); - var wrap = new WrapPanel { Orientation = Orientation.Horizontal, Margin = new Thickness(0, 6, 0, 0) }; + var wrap = new WrapPanel { Orientation = Orientation.Horizontal, Margin = new Thickness(0, NativeTokens.Space6, 0, 0) }; var inUse = CurrentTheme(field); foreach (var card in _form.Themes()) { @@ -876,7 +879,7 @@ private TextBlock LabelBlock(string label) /// A field's help line under its label: quiet, wrapped. private TextBlock HelpBlock(string help) => - new() { Text = NativeKeys.Words(Capitalise(help)), FontSize = NativeTokens.Body, Foreground = DimInk, TextWrapping = TextWrapping.Wrap, Margin = new Thickness(0, 2, 0, 0) }; + new() { Text = NativeKeys.Words(Capitalise(help)), FontSize = NativeTokens.Body, Foreground = DimInk, TextWrapping = TextWrapping.Wrap, Margin = new Thickness(0, NativeTokens.Space2, 0, 0) }; /// /// One field, as a row of its group's card: the label (with the changed mark beside it) and its help on the left; @@ -884,9 +887,9 @@ private TextBlock HelpBlock(string help) => /// private Grid FieldRow(SettingsField field) { - var grid = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto,Auto"), Margin = new Thickness(0, 12), MinHeight = 32 }; + var grid = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto,Auto"), Margin = new Thickness(0, NativeTokens.Space12), MinHeight = 32 }; - var words = new StackPanel { VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(0, 0, 16, 0) }; + var words = new StackPanel { VerticalAlignment = VerticalAlignment.Center, Margin = new Thickness(0, 0, NativeTokens.Space16, 0) }; var (changed, reset) = ChangedMark(field); var top = new WrapPanel { Orientation = Orientation.Horizontal }; top.Children.Add(LabelBlock(field.Label)); @@ -899,7 +902,7 @@ private Grid FieldRow(SettingsField field) // The note the cell F5 draws beside the value (join wraps' recommendation), from the same sentence, in the // cells' caution amber; gone once the field has been changed. - var note = new TextBlock { FontSize = NativeTokens.Body, Foreground = _tokens.Brush(_tokens.Notice), TextWrapping = TextWrapping.Wrap, Margin = new Thickness(0, 2, 0, 0) }; + var note = new TextBlock { FontSize = NativeTokens.Body, Foreground = _tokens.Brush(_tokens.Notice), TextWrapping = TextWrapping.Wrap, Margin = new Thickness(0, NativeTokens.Space2, 0, 0) }; void ShowNote() { var text = _form.Note(field); @@ -914,7 +917,7 @@ void ShowNote() grid.Children.Add(words); - reset.Margin = new Thickness(0, 0, 16, 0); + reset.Margin = new Thickness(0, 0, NativeTokens.Space16, 0); Grid.SetColumn(reset, 1); grid.Children.Add(reset); @@ -933,7 +936,7 @@ void ShowNote() /// private (Control Changed, Button Reset) ChangedMark(SettingsField field) { - var mark = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 6, Margin = new Thickness(10, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center }; + var mark = new StackPanel { Orientation = Orientation.Horizontal, Spacing = NativeTokens.Space6, Margin = new Thickness(NativeTokens.Space10, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center }; mark.Children.Add(new Ellipse { Width = 6, Height = 6, Fill = Accent, VerticalAlignment = VerticalAlignment.Center }); mark.Children.Add(new TextBlock { Text = "Changed", FontSize = NativeTokens.Body, Foreground = DimInk, VerticalAlignment = VerticalAlignment.Center }); ToolTip.SetTip(mark, "Changed from its default"); @@ -1091,7 +1094,7 @@ void Commit() private static StackPanel Swatch(string name) { - var panel = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 8, Tag = name }; + var panel = new StackPanel { Orientation = Orientation.Horizontal, Spacing = NativeTokens.Space8, Tag = name }; if (Color.TryParse(name, out var colour)) { panel.Children.Add(new Border { Width = 14, Height = 14, CornerRadius = new CornerRadius(NativeTokens.RadiusS), Background = new SolidColorBrush(colour) }); @@ -1105,7 +1108,7 @@ private static StackPanel Swatch(string name) private StackPanel MeterTable(ListField field) { - var outer = new StackPanel { Spacing = 10, Margin = new Thickness(0, 12, 0, 4) }; + var outer = new StackPanel { Spacing = NativeTokens.Space10, Margin = new Thickness(0, NativeTokens.Space12, 0, NativeTokens.Space4) }; var page = _tokens.Page; var top = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto") }; @@ -1170,7 +1173,7 @@ private StackPanel MeterTable(ListField field) var remove = new Button { Content = "✕", - Padding = new Thickness(8, 3), + Padding = new Thickness(NativeTokens.Space8, NativeTokens.Space4), Background = Brushes.Transparent, BorderThickness = new Thickness(0), Foreground = DimInk, @@ -1199,10 +1202,10 @@ private StackPanel MeterTable(ListField field) // What this connection has received, to pick a path from: a click puts it in the path box last used. Drawn as the // mockup's drop-down panel, under the path columns. var box = new StackPanel(); - box.Children.Add(new TextBlock { Text = "Paths this connection has received", FontSize = NativeTokens.Body, Foreground = DimInk, Margin = new Thickness(12, 4, 12, 4) }); + box.Children.Add(new TextBlock { Text = "Paths this connection has received", FontSize = NativeTokens.Body, Foreground = DimInk, Margin = new Thickness(NativeTokens.Space12, NativeTokens.Space4, NativeTokens.Space12, NativeTokens.Space4) }); if (received.Count == 0) { - box.Children.Add(new TextBlock { Text = "Nothing yet — a meter shows once its value arrives.", FontSize = NativeTokens.Body, Foreground = DimInk, Margin = new Thickness(12, 4, 12, 6) }); + box.Children.Add(new TextBlock { Text = "Nothing yet — a meter shows once its value arrives.", FontSize = NativeTokens.Body, Foreground = DimInk, Margin = new Thickness(NativeTokens.Space12, NativeTokens.Space4, NativeTokens.Space12, NativeTokens.Space6) }); } foreach (var item in received.Take(40)) @@ -1216,7 +1219,7 @@ private StackPanel MeterTable(ListField field) Background = Brushes.Transparent, BorderThickness = new Thickness(0), CornerRadius = new CornerRadius(0), - Padding = new Thickness(12, 6), + Padding = new Thickness(NativeTokens.Space12, NativeTokens.Space6), HorizontalAlignment = HorizontalAlignment.Stretch, HorizontalContentAlignment = HorizontalAlignment.Left, }; @@ -1236,16 +1239,16 @@ private StackPanel MeterTable(ListField field) { Child = box, Background = page.Brush(page.Popup), - BorderThickness = new Thickness(1), + BorderThickness = new Thickness(NativeTokens.Hairline), BorderBrush = page.Brush(page.FocusEdge), CornerRadius = new CornerRadius(NativeTokens.RadiusM), - Padding = new Thickness(0, 8), - Margin = new Thickness(128, 0, 0, 0), + Padding = new Thickness(0, NativeTokens.Space8), + Margin = new Thickness(MeterPathsIndent, 0, 0, 0), MaxWidth = 420, HorizontalAlignment = HorizontalAlignment.Left, }); - var add = new Button { Content = "+ Add a meter", HorizontalAlignment = HorizontalAlignment.Left, Padding = new Thickness(12, 6), FontSize = NativeTokens.Label }; + var add = new Button { Content = "+ Add a meter", HorizontalAlignment = HorizontalAlignment.Left, Padding = new Thickness(NativeTokens.Space12, NativeTokens.Space6), FontSize = NativeTokens.Label }; AutomationProperties.SetName(add, "Add a meter"); add.Click += (_, _) => { diff --git a/src/SharpMUTerm.Avalonia/TerminalView.cs b/src/SharpMUTerm.Avalonia/TerminalView.cs index 58c40aa8..e02d1e75 100644 --- a/src/SharpMUTerm.Avalonia/TerminalView.cs +++ b/src/SharpMUTerm.Avalonia/TerminalView.cs @@ -1070,9 +1070,11 @@ public void Dispose() /// internal static SKRect FieldRect(InputBand band, int cw, int ch, int columns, float scale) { - var inset = Math.Max(4 * scale, (band.Pad * cw) - (float)(NativeLayout.FieldInsetX * scale)); - var top = (band.Top * ch) + (float)(NativeLayout.FieldOuter * scale); - var bottom = ((band.Top + band.Rows) * ch) + (float)((NativeLayout.FieldTop + NativeLayout.FieldInner) * scale); + // The mockup's 20 px from the grid's edge, as far as the padding columns leave the field its inner padding; every + // edge on a whole device pixel, so the field's 1 px border is one crisp pixel at 125% and 150%. + var inset = MathF.Round(Math.Max(4 * scale, Math.Min((float)(NativeLayout.FieldSide * scale), (band.Pad * cw) - (float)(NativeTokens.Space8 * scale)))); + var top = (band.Top * ch) + MathF.Round((float)(NativeLayout.FieldOuter * scale)); + var bottom = ((band.Top + band.Rows) * ch) + MathF.Round((float)((NativeLayout.FieldTop + NativeLayout.FieldInner) * scale)); return new SKRect(inset, top, (columns * cw) - inset, bottom); } diff --git a/src/SharpMUTerm.Avalonia/ThemeCardView.cs b/src/SharpMUTerm.Avalonia/ThemeCardView.cs index 462e226a..75ab6610 100644 --- a/src/SharpMUTerm.Avalonia/ThemeCardView.cs +++ b/src/SharpMUTerm.Avalonia/ThemeCardView.cs @@ -28,14 +28,14 @@ public ThemeCardView(ThemeCard card, bool inUse, NativeTokens tokens) Background = Brushes.Transparent; BorderThickness = new Thickness(0); HorizontalContentAlignment = HorizontalAlignment.Stretch; - Margin = new Thickness(0, 0, 14, 14); + Margin = new Thickness(0, 0, NativeTokens.Space14, NativeTokens.Space14); Width = 264; AutomationProperties.SetName(this, $"Use the {card.Name} theme"); ToolTip.SetTip(this, $"Use {card.Name}"); var name = new TextBlock { Text = card.Name, FontSize = NativeTokens.Title, FontWeight = FontWeight.SemiBold }; _state = new TextBlock { FontSize = NativeTokens.Body }; - var words = new StackPanel { Margin = new Thickness(10, 8, 10, 8), Spacing = 1 }; + var words = new StackPanel { Margin = new Thickness(NativeTokens.Space10, NativeTokens.Space8, NativeTokens.Space10, NativeTokens.Space8), Spacing = NativeTokens.Hairline }; words.Children.Add(name); words.Children.Add(_state); @@ -48,7 +48,7 @@ public ThemeCardView(ThemeCard card, bool inUse, NativeTokens tokens) Child = body, CornerRadius = new CornerRadius(NativeTokens.RadiusCard), ClipToBounds = true, - BorderThickness = new Thickness(2), + BorderThickness = new Thickness(NativeTokens.BorderStrong), }; Content = _frame; SetInUse(inUse, tokens); @@ -90,23 +90,23 @@ private static Border Preview(ThemePreview preview) } var line = preview.CommandLine; - var command = new TextBlock { FontFamily = Mono, FontSize = NativeTokens.Miniature, Padding = new Thickness(4, 2), TextTrimming = TextTrimming.CharacterEllipsis }; + var command = new TextBlock { FontFamily = Mono, FontSize = NativeTokens.Miniature, Padding = new Thickness(NativeTokens.Space4, NativeTokens.Space2), TextTrimming = TextTrimming.CharacterEllipsis }; command.Inlines!.Add(new Run(line.Prompt + " ") { Foreground = Brush(line.PromptInk), FontWeight = FontWeight.Bold }); command.Inlines.Add(new Run(line.Text) { Foreground = Brush(line.Ink) }); - var stack = new StackPanel { Spacing = 3 }; + var stack = new StackPanel { Spacing = NativeTokens.Space4 }; stack.Children.Add(panes); stack.Children.Add(new Border { Background = Brush(line.Band), Child = command }); - return new Border { Background = Brush(preview.Backdrop), Padding = new Thickness(3), Child = stack }; + return new Border { Background = Brush(preview.Backdrop), Padding = new Thickness(NativeTokens.Space4), Child = stack }; } private static Border Pane(PreviewPane pane) { - var tabs = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 1 }; + var tabs = new StackPanel { Orientation = Orientation.Horizontal, Spacing = NativeTokens.Hairline }; foreach (var tab in pane.Tabs) { - var title = new TextBlock { FontFamily = Mono, FontSize = NativeTokens.Miniature, Padding = new Thickness(3, 1) }; + var title = new TextBlock { FontFamily = Mono, FontSize = NativeTokens.Miniature, Padding = new Thickness(NativeTokens.Space4, NativeTokens.Hairline) }; title.Inlines!.Add(new Run(tab.Title) { Foreground = Brush(tab.Ink), FontWeight = tab.Selected ? FontWeight.Bold : FontWeight.Normal }); if (tab.Badge is { } badge) { @@ -116,7 +116,7 @@ private static Border Pane(PreviewPane pane) tabs.Children.Add(new Border { Background = Brush(tab.Chip), Child = title }); } - var lines = new StackPanel { Margin = new Thickness(4, 3, 4, 4) }; + var lines = new StackPanel { Margin = new Thickness(NativeTokens.Space4, NativeTokens.Space4, NativeTokens.Space4, NativeTokens.Space4) }; foreach (var runs in pane.Lines) { var text = new TextBlock { FontFamily = Mono, FontSize = NativeTokens.Miniature, TextTrimming = TextTrimming.CharacterEllipsis }; diff --git a/src/SharpMUTerm.Avalonia/VitalsGauges.cs b/src/SharpMUTerm.Avalonia/VitalsGauges.cs index a6664235..16dbff45 100644 --- a/src/SharpMUTerm.Avalonia/VitalsGauges.cs +++ b/src/SharpMUTerm.Avalonia/VitalsGauges.cs @@ -119,7 +119,7 @@ private void RenderStacked(DrawingContext context, Rect bounds) var barHeight = BarHeight(_cellHeight); var size = Math.Min(PanelText.Size - 1, Math.Max(10, _cellHeight * 0.68)); var top = HeadedFor(bounds.Height, _model) - ? PanelText.Heading(context, PanelHeading.For(_model), bounds.Width, _cellHeight, _plane, _text, right: 20) + 12 + ? PanelText.Heading(context, PanelHeading.For(_model), bounds.Width, _cellHeight, _plane, _text, right: NativeTokens.Space20, rule: NativeTokens.DevicePixel(this)) + 12 : 8; var inner = new Rect(PanelText.Pad, top, Math.Max(1, bounds.Width - (PanelText.Pad * 2)), Math.Max(1, bounds.Height - top)); var dim = PanelText.Dim(_text, _plane); @@ -158,7 +158,7 @@ private void RenderRow(DrawingContext context, Rect bounds) { var size = Math.Clamp(_cellHeight * 0.62, 9, 14); var barHeight = Math.Clamp(bounds.Height * 0.32, 4, 9); - var inner = bounds.Deflate(new Thickness(10, 0, 30, 0)); + var inner = bounds.Deflate(new Thickness(PanelText.Pad, 0, NativeTokens.Space32, 0)); var gap = 18.0; var shares = _model.Meters.Count + (_model.Target is null ? 0 : 1.4); var unit = (inner.Width - (gap * Math.Max(0, Math.Ceiling(shares) - 1))) / shares; diff --git a/src/SharpMUTerm.Avalonia/WelcomeView.cs b/src/SharpMUTerm.Avalonia/WelcomeView.cs index 42932243..af5ac914 100644 --- a/src/SharpMUTerm.Avalonia/WelcomeView.cs +++ b/src/SharpMUTerm.Avalonia/WelcomeView.cs @@ -40,7 +40,7 @@ internal sealed class WelcomeView : DockPanel, IModalView private readonly TextBlock _command; private readonly TextBlock _problem; private readonly TextBox _search; - private readonly StackPanel _findBody = new() { Spacing = 8 }; + private readonly StackPanel _findBody = new() { Spacing = NativeTokens.Space8 }; private readonly TextBlock _findNote; private readonly TextBlock _layoutTag; private readonly TextBlock _layoutReason; @@ -61,7 +61,7 @@ public WelcomeView(WelcomeSession session, NativeTokens colours, Action done) _done = done; _model = session.Model; - var page = new StackPanel { Margin = new Thickness(32, 28, 32, 24), Spacing = 0 }; + var page = new StackPanel { Margin = new Thickness(NativeTokens.Space32, NativeTokens.Space28, NativeTokens.Space32, NativeTokens.Space24), Spacing = 0 }; page.Children.Add(new TextBlock { Text = WelcomeModel.Heading, @@ -75,7 +75,7 @@ public WelcomeView(WelcomeSession session, NativeTokens colours, Action done) FontSize = NativeTokens.Title, Foreground = colours.Brush(colours.Dim), TextWrapping = TextWrapping.Wrap, - Margin = new Thickness(0, 6, 0, 22), + Margin = new Thickness(0, NativeTokens.Space6, 0, NativeTokens.Space24), }); // ── Find a world ─────────────────────────────────────────────────────────────────────── @@ -83,14 +83,16 @@ public WelcomeView(WelcomeSession session, NativeTokens colours, Action done) { PlaceholderText = WelcomeModel.FindPlaceholder, FontSize = NativeTokens.Title, - Padding = new Thickness(12, 8), + Padding = new Thickness(NativeTokens.Space12, 0), + Height = NativeTokens.FieldHeight, + VerticalContentAlignment = VerticalAlignment.Center, CornerRadius = new CornerRadius(NativeTokens.RadiusM), MaxLength = WorldDirectory.MaxQuery, }; global::Avalonia.Automation.AutomationProperties.SetName(_search, WelcomeModel.FindHeading); _search.TextChanged += (_, _) => DrawRows(); _findNote = new TextBlock { FontSize = NativeTokens.Body, Foreground = colours.Brush(colours.Dim), TextWrapping = TextWrapping.Wrap }; - var find = new StackPanel { Spacing = 12 }; + var find = new StackPanel { Spacing = NativeTokens.Space12 }; find.Children.Add(CardTitle(WelcomeModel.FindHeading)); find.Children.Add(_search); find.Children.Add(_findBody); @@ -124,10 +126,11 @@ public WelcomeView(WelcomeSession session, NativeTokens colours, Action done) var connectButton = ModalParts.Button("Connect", null, colours, Connect, accent: true); connectButton.HorizontalAlignment = HorizontalAlignment.Stretch; connectButton.HorizontalContentAlignment = HorizontalAlignment.Center; - connectButton.Padding = new Thickness(14, 8); + connectButton.Padding = new Thickness(NativeTokens.Space14, 0); + connectButton.Height = NativeTokens.FieldHeight; // the fields' height above it, as the mockup's primary button connectButton.Name = "Connect"; - var connect = new StackPanel { Spacing = 10 }; + var connect = new StackPanel { Spacing = NativeTokens.Space10 }; connect.Children.Add(CardTitle(WelcomeModel.ConnectHeading)); connect.Children.Add(Labelled(WelcomeModel.FieldLabel(WelcomeField.Host), _host)); connect.Children.Add(portAndName); @@ -147,7 +150,7 @@ public WelcomeView(WelcomeSession session, NativeTokens colours, Action done) page.Children.Add(cards); // ── Starting layout ──────────────────────────────────────────────────────────────────── - var layoutHeading = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 10, Margin = new Thickness(0, 26, 0, 10) }; + var layoutHeading = new StackPanel { Orientation = Orientation.Horizontal, Spacing = NativeTokens.Space10, Margin = new Thickness(0, NativeTokens.Space24, 0, NativeTokens.Space10) }; layoutHeading.Children.Add(new TextBlock { Text = WelcomeModel.LayoutsHeading, @@ -184,22 +187,22 @@ public WelcomeView(WelcomeSession session, NativeTokens colours, Action done) FontSize = NativeTokens.Body, Foreground = colours.Brush(colours.Dim), TextWrapping = TextWrapping.Wrap, - Margin = new Thickness(0, 10, 0, 0), + Margin = new Thickness(0, NativeTokens.Space10, 0, 0), }; page.Children.Add(_layoutReason); // ── The other ways in ───────────────────────────────────────────────────────────────── - var others = new WrapPanel { Orientation = Orientation.Horizontal, Margin = new Thickness(0, 18, 0, 0) }; + var others = new WrapPanel { Orientation = Orientation.Horizontal, Margin = new Thickness(0, NativeTokens.Space16, 0, 0) }; others.Children.Add(new TextBlock { Text = WelcomeModel.OtherWays, FontSize = NativeTokens.Body, Foreground = colours.Brush(colours.Dim), VerticalAlignment = VerticalAlignment.Center, - Margin = new Thickness(0, 0, 10, 0), + Margin = new Thickness(0, 0, NativeTokens.Space10, 0), }); var settings = ModalParts.Button("Open settings", "F5", colours, () => Choose(WelcomeChoice.Settings)); - settings.Margin = new Thickness(0, 0, 8, 0); + settings.Margin = new Thickness(0, 0, NativeTokens.Space8, 0); others.Children.Add(settings); others.Children.Add(ModalParts.Button("Import…", null, colours, () => Choose(WelcomeChoice.Import))); page.Children.Add(others); @@ -400,8 +403,10 @@ private void Fill(WelcomeModel model) { var chosen = layout == model.Layout; card.BorderBrush = _colours.Brush(chosen ? _colours.Accent : _colours.Edge); - card.BorderThickness = new Thickness(chosen ? 2 : 1); - card.Padding = chosen ? new Thickness(17, 13) : new Thickness(18, 14); + card.BorderThickness = new Thickness(chosen ? NativeTokens.BorderStrong : NativeTokens.Hairline); + card.Padding = chosen + ? new Thickness(NativeTokens.Space16 - NativeTokens.Hairline, NativeTokens.Space12 - NativeTokens.Hairline) + : new Thickness(NativeTokens.Space16, NativeTokens.Space12); card.Background = _colours.Brush(chosen ? _colours.Selected : _colours.Card); } @@ -481,7 +486,7 @@ private void DrawRows() var query = _search.Text ?? string.Empty; var shown = model.View(query, WorldDirectorySort.Players); - var list = new StackPanel { Spacing = 8 }; + var list = new StackPanel { Spacing = NativeTokens.Space8 }; foreach (var world in shown) { var index = IndexOf(model, world); @@ -547,7 +552,7 @@ private void DrawChoice(WorldBrowseModel model, WorldGame game) TextWrapping = TextWrapping.Wrap, }); - var list = new StackPanel { Spacing = 2 }; + var list = new StackPanel { Spacing = NativeTokens.Space2 }; _address = Math.Clamp(_address, 0, game.Endpoints.Count - 1); for (var i = 0; i < game.Endpoints.Count; i++) { @@ -562,7 +567,7 @@ private void DrawChoice(WorldBrowseModel model, WorldGame game) FontSize = NativeTokens.Body + 1, Foreground = _colours.Brush(_colours.Text), Width = 210, - Margin = new Thickness(0, 0, 10, 0), + Margin = new Thickness(0, 0, NativeTokens.Space10, 0), TextTrimming = TextTrimming.CharacterEllipsis, VerticalAlignment = VerticalAlignment.Center, }; @@ -675,21 +680,21 @@ private Border WorldRow(WorldListing world, int index, bool enabled) var add = ModalParts.Button(WelcomeModel.AddButton, null, _colours, () => Add(index), accent: index == 0); add.IsEnabled = enabled; - add.Padding = new Thickness(14, 4); + add.Padding = new Thickness(NativeTokens.Space14, NativeTokens.Space4); add.VerticalAlignment = VerticalAlignment.Center; global::Avalonia.Automation.AutomationProperties.SetName(add, $"{WelcomeModel.AddButton} {world.Name}"); var grid = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto") }; Grid.SetColumn(add, 1); - add.Margin = new Thickness(12, 0, 0, 0); + add.Margin = new Thickness(NativeTokens.Space12, 0, 0, 0); grid.Children.Add(words); grid.Children.Add(add); var row = new Border { Child = grid, - Padding = new Thickness(14, 9), + Padding = new Thickness(NativeTokens.Space14, NativeTokens.Space8), CornerRadius = new CornerRadius(NativeTokens.RadiusM), - BorderThickness = new Thickness(1), + BorderThickness = new Thickness(NativeTokens.Hairline), BorderBrush = _colours.Brush(_colours.Edge), Background = _colours.Brush(index == 0 ? _colours.Selected : _colours.Card), }; @@ -700,7 +705,7 @@ private Border WorldRow(WorldListing world, int index, bool enabled) private Border LayoutCard(WelcomeLayout layout) { - var words = new StackPanel { Spacing = 4 }; + var words = new StackPanel { Spacing = NativeTokens.Space4 }; words.Children.Add(new TextBlock { Text = layout.ToString(), @@ -749,16 +754,16 @@ public void PickLayout(WelcomeLayout layout) => private Border Card(Control content) => new() { Child = content, - Padding = new Thickness(22, 20), + Padding = new Thickness(NativeTokens.Space24, NativeTokens.Space20), CornerRadius = new CornerRadius(NativeTokens.RadiusL), - BorderThickness = new Thickness(1), + BorderThickness = new Thickness(NativeTokens.Hairline), BorderBrush = _colours.Brush(_colours.Edge), Background = _colours.Brush(_colours.Raised), }; private StackPanel Labelled(string label, Control field) { - var column = new StackPanel { Spacing = 4 }; + var column = new StackPanel { Spacing = NativeTokens.Space4 }; column.Children.Add(new TextBlock { Text = label, FontSize = NativeTokens.Body + 1, Foreground = _colours.Brush(_colours.Dim) }); column.Children.Add(field); return column; @@ -771,7 +776,9 @@ private static TextBox Field(string name, string placeholder, int max) PlaceholderText = placeholder, MaxLength = max, FontSize = NativeTokens.Title, - Padding = new Thickness(10, 7), + Padding = new Thickness(NativeTokens.Space10, 0), + Height = NativeTokens.FieldHeight, + VerticalContentAlignment = VerticalAlignment.Center, CornerRadius = new CornerRadius(NativeTokens.RadiusM), }; global::Avalonia.Automation.AutomationProperties.SetName(box, name); diff --git a/src/SharpMUTerm.Avalonia/WhoHereList.cs b/src/SharpMUTerm.Avalonia/WhoHereList.cs index 9def950d..1e0548ec 100644 --- a/src/SharpMUTerm.Avalonia/WhoHereList.cs +++ b/src/SharpMUTerm.Avalonia/WhoHereList.cs @@ -102,13 +102,13 @@ public void Show(WhoHereModel model, PanelInk ink, Color plane, Color text, doub private double HeaderHeight => PanelText.HeadingHeight(_cellHeight); - private double RowHeight => Math.Max(24, _cellHeight * 1.6); + private double RowHeight => Math.Round(Math.Max(NativeTokens.Space24, _cellHeight * 1.6)); /// The footnote's line, under the rows when there is room left for it. private double NoteHeight => Math.Max(20, _cellHeight * 1.3); /// How far the rows' hover plates are set in from the edges; the text inside sits on the heading's padding. - private const double Pad = 8; + private const double Pad = NativeTokens.Space8; /// Which rows fit, and where, for a size. Every row is the same height, so it is arithmetic. private void Layout(Size size) @@ -128,7 +128,7 @@ private void Layout(Size size) return; } - var top = HeaderHeight + 4; + var top = HeaderHeight + NativeTokens.Space8; var room = Math.Max(0, (int)((size.Height - top - 4) / RowHeight)); var fits = count <= room ? count : Math.Max(0, room - 1); for (var i = 0; i < fits; i++) @@ -259,7 +259,7 @@ public override void Render(DrawingContext context) var right = bounds.Width - PanelText.Pad; // Here The Grand Plaza · 4, kept clear of the pop-out button in the corner. - var top = PanelText.Heading(context, PanelHeading.For(_model), bounds.Width, _cellHeight, _plane, _text, right: 20); + var top = PanelText.Heading(context, PanelHeading.For(_model), bounds.Width, _cellHeight, _plane, _text, right: NativeTokens.Space20, rule: NativeTokens.DevicePixel(this)); if (!_model.Known) { PanelText.Draw(context, WhoHereModel.UnknownText, left, top + (RowHeight / 2), size, dim, false, right - left); @@ -280,7 +280,7 @@ public override void Render(DrawingContext context) if (index == _hovered || index == _pressed) { var plate = PanelText.Mix(_plane, _text, index == _pressed ? 0.16 : 0.08); - context.DrawRectangle(new SolidColorBrush(plate), null, rect, NativeTokens.RadiusS + 2, NativeTokens.RadiusS + 2); + context.DrawRectangle(new SolidColorBrush(plate), null, rect, NativeTokens.RadiusControl, NativeTokens.RadiusControl); } // The dot says what the game says: a creature grey, an idle player in the warning ink, an active one in the diff --git a/src/SharpMUTerm.Avalonia/WorldBrowseView.cs b/src/SharpMUTerm.Avalonia/WorldBrowseView.cs index 555c21c4..3bd8b4f1 100644 --- a/src/SharpMUTerm.Avalonia/WorldBrowseView.cs +++ b/src/SharpMUTerm.Avalonia/WorldBrowseView.cs @@ -56,7 +56,7 @@ public WorldBrowseView(WorldBrowseSession session, NativeTokens colours, Action SetDock(_box, Dock.Top); Children.Add(_box); - var bar = _bar = new DockPanel { Margin = new Thickness(20, 0, 14, 4) }; + var bar = _bar = new DockPanel { Margin = new Thickness(NativeTokens.Space20, 0, NativeTokens.Space14, NativeTokens.Space4) }; _sort = ModalParts.Button(SortLabel(), "Tab", colours, ToggleSort); SetDock(_sort, Dock.Right); bar.Children.Add(_sort); @@ -70,7 +70,7 @@ public WorldBrowseView(WorldBrowseSession session, NativeTokens colours, Action SetDock(footer, Dock.Bottom); Children.Add(footer); - _note = ModalParts.Dim(string.Empty, colours, new Thickness(20, 6, 20, 0)); + _note = ModalParts.Dim(string.Empty, colours, new Thickness(NativeTokens.Space20, NativeTokens.Space6, NativeTokens.Space20, 0)); SetDock(_note, Dock.Bottom); Children.Add(_note); @@ -208,7 +208,7 @@ private void ShowChoice(WorldGame game) Foreground = _colours.Brush(_colours.Text), FontSize = NativeTokens.Title, FontWeight = FontWeight.SemiBold, - Margin = new Thickness(12, 8, 12, 2), + Margin = new Thickness(NativeTokens.Space12, NativeTokens.Space8, NativeTokens.Space12, NativeTokens.Space2), TextWrapping = TextWrapping.Wrap, }); _list.Children.Add(new TextBlock @@ -216,7 +216,7 @@ private void ShowChoice(WorldGame game) Text = _model.CharsetLine, Foreground = _colours.Brush(_colours.Dim), FontSize = NativeTokens.Body, - Margin = new Thickness(12, 0, 12, 8), + Margin = new Thickness(NativeTokens.Space12, 0, NativeTokens.Space12, NativeTokens.Space8), TextWrapping = TextWrapping.Wrap, }); _selected = Math.Clamp(_selected, 0, game.Endpoints.Count - 1); @@ -232,7 +232,7 @@ private void ShowChoice(WorldGame game) Foreground = _colours.Brush(_colours.Text), FontSize = NativeTokens.Title, Width = 300, - Margin = new Thickness(0, 0, 12, 0), + Margin = new Thickness(0, 0, NativeTokens.Space12, 0), TextTrimming = TextTrimming.CharacterEllipsis, VerticalAlignment = VerticalAlignment.Center, }; @@ -298,7 +298,7 @@ _model.Opening is not null ? _model.OpeningLine Text = NativeKeys.Words(empty), Foreground = _colours.Brush(_model.State is WorldBrowseState.Failed or WorldBrowseState.Unavailable ? _colours.Warn : _colours.Dim), FontSize = NativeTokens.Body, - Margin = new Thickness(12, 10), + Margin = new Thickness(NativeTokens.Space12, NativeTokens.Space10), TextWrapping = TextWrapping.Wrap, }); return; @@ -317,7 +317,7 @@ _model.Opening is not null ? _model.OpeningLine FontWeight = FontWeight.SemiBold, Width = 48, TextAlignment = TextAlignment.Right, - Margin = new Thickness(0, 0, 14, 0), + Margin = new Thickness(0, 0, NativeTokens.Space14, 0), VerticalAlignment = VerticalAlignment.Center, }; SetDock(players, Dock.Left); @@ -329,7 +329,7 @@ _model.Opening is not null ? _model.OpeningLine Foreground = _colours.Brush(_colours.Text), FontSize = NativeTokens.Title, Width = 220, - Margin = new Thickness(0, 0, 12, 0), + Margin = new Thickness(0, 0, NativeTokens.Space12, 0), TextTrimming = TextTrimming.CharacterEllipsis, VerticalAlignment = VerticalAlignment.Center, }; @@ -342,7 +342,7 @@ _model.Opening is not null ? _model.OpeningLine Foreground = _colours.Brush(_colours.Dim), FontSize = NativeTokens.Small, Width = 96, - Margin = new Thickness(0, 0, 12, 0), + Margin = new Thickness(0, 0, NativeTokens.Space12, 0), TextTrimming = TextTrimming.CharacterEllipsis, VerticalAlignment = VerticalAlignment.Center, }; diff --git a/src/SharpMUTerm.Tui/Hosting/ClientHost.cs b/src/SharpMUTerm.Tui/Hosting/ClientHost.cs index 37982c3f..5f07cce8 100644 --- a/src/SharpMUTerm.Tui/Hosting/ClientHost.cs +++ b/src/SharpMUTerm.Tui/Hosting/ClientHost.cs @@ -326,9 +326,10 @@ internal static ClientHost HarnessTerminal( /// host has the depth a desktop tab wants; the pane rectangles, and so NAWS, are the panes less those two rows. /// /// -/// The client leaves one blank column of the pane's own plane either side of every pane's content (the tab control's -/// margin), so output does not run flush against the pane's edge. The columns are cells the pane really loses: the -/// output rectangles, and so NAWS, are the narrower ones. +/// The client leaves two blank columns of the pane's own plane either side of every pane's content (the tab control's +/// margin) and a blank row above an output window's first line (not above a panel or a map, which the host draws over +/// the whole pane), so output starts the mockup's ~20 px in from the pane's edges. The cells are ones the pane really +/// loses: the output rectangles, and so NAWS, are the smaller ones. /// internal sealed record HostChrome(bool Header, bool Rail, bool Status = false, bool Input = false, bool Tabs = false, bool PaneGutter = false) { diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 23c9f1e8..65a5e984 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -11574,8 +11574,18 @@ private IWindowControl BuildLayoutNode(SharpMUTerm.Core.Workspaces.LayoutNode no /// private int TabStripRows => Host.Chrome.Tabs ? 2 : 1; - /// The blank columns either side of a pane's content where the host asks for a gutter (). - private const int PaneGutterColumns = 1; + /// + /// The blank columns either side of a pane's content where the host asks for a gutter (): + /// two, so output starts the mockup's ~20 px in from the pane's edge rather than one cell's 8. + /// + private const int PaneGutterColumns = 2; + + /// + /// The blank row above an output window's first line where the host asks for a gutter: the mockup's padding under the + /// tab strip. None for a layout panel or a map, which the host draws natively over the whole pane. + /// + private int PaneGutterRowsFor(string? windowId) => + Host.Chrome.PaneGutter && windowId is not null && PanelIdOfWindow(windowId) is null && !IsMapWindow(windowId) ? 1 : 0; /// The layout panel a window draws, or null for an ordinary window. private static string? PanelIdOfWindow(string windowId) => @@ -11639,7 +11649,15 @@ private IWindowControl BuildPaneTabs(PaneNode pane) for (var i = 0; i < strip.Tabs.Count; i++) { var windowId = strip.Tabs[i].WindowId; - builder.AddTab(titles[i], BuildTabContent(pane, windowId, _workspace.FindWindow(windowId)!)); + var content = BuildTabContent(pane, windowId, _workspace.FindWindow(windowId)!); + if (Host.Chrome.PaneGutter) + { + // The gutter's row under the strip, for output only: a panel or a map is drawn natively over its pane and + // pads itself. Set every time, because a window's control is kept and re-parented across rebuilds. + content.Margin = new Margin(0, PaneGutterRowsFor(windowId), 0, 0); + } + + builder.AddTab(titles[i], content); ids.Add(windowId); } @@ -13208,7 +13226,7 @@ internal IReadOnlyDictionary PaneOutputRects() foreach (var (paneId, tabs, rect) in RealisedPanes()) { var margin = tabs.Margin; - var top = margin.Top + tabs.TabHeaderHeight; + var top = margin.Top + tabs.TabHeaderHeight + PaneGutterRowsFor(_workspace.Layout.FindPane(paneId)?.ActiveTab); rects[paneId] = new PaneRect( rect.X + margin.Left, rect.Y + top, diff --git a/tests/SharpMUTerm.Avalonia.Tests/DesktopLayerTests.cs b/tests/SharpMUTerm.Avalonia.Tests/DesktopLayerTests.cs index 7425aae7..f3e192d5 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/DesktopLayerTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/DesktopLayerTests.cs @@ -42,7 +42,7 @@ public async Task TheClientPublishesTheVitalsPaneWithTheModelItsCellStripIsDrawn var panel = driver.Pointer.Panels.SingleOrDefault(p => p.PanelId == PanelIds.Vitals); await Assert.That(panel).IsNotNull(); var pane = app.PaneOutputRects().Single(r => app.PaneWindows().GetValueOrDefault(r.Key) == panel!.WindowId); - await Assert.That(panel!.Rect).IsEqualTo(pane.Value with { X = pane.Value.X - 1, Width = pane.Value.Width + 2 }).Because("the overlay goes exactly where the strip's cells are, and over the gutter either side"); + await Assert.That(panel!.Rect).IsEqualTo(pane.Value with { X = pane.Value.X - 2, Width = pane.Value.Width + 4 }).Because("the overlay goes exactly where the strip's cells are, and over the two-column gutter either side"); await Assert.That(panel.Vitals).IsEqualTo(app.ReadVitals(DemoScene.ActiveSessionKey)); await Assert.That(panel.Vitals!.Meters.Count).IsGreaterThan(0); await Assert.That(driver.Pointer.Actions.Select(a => a.Id)).Contains(HeaderAction.LayoutsId); diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativeChromeTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativeChromeTests.cs index 2be79adf..4dcebd91 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/NativeChromeTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/NativeChromeTests.cs @@ -400,7 +400,7 @@ public async Task TheLiveClientDrawsNoChromeCellAndLaysThePanesOutAsATerminalTol await Assert.That(Enumerable.Range(0, 32).Any(y => driver.Frame.RowText(y).Contains("muterm", StringComparison.Ordinal))).IsFalse() .Because("the cell header is not drawn when the window draws its own"); var rects = window.PaneOutputRects(); - await Assert.That(rects.Values.Min(r => r.X)).IsEqualTo(1).Because("no rail column comes before the panes, only the pane's one-column gutter"); + await Assert.That(rects.Values.Min(r => r.X)).IsEqualTo(2).Because("no rail column comes before the panes, only the pane's two-column gutter"); await Assert.That(rects.OrderBy(r => r.Key).ToArray()).IsEquivalentTo(terminal.PaneOutputRects().OrderBy(r => r.Key).ToArray()); } diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativeFooterTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativeFooterTests.cs index e71bf418..ab6ddf0c 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/NativeFooterTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/NativeFooterTests.cs @@ -84,8 +84,14 @@ public async Task TheFieldIsInsetFromTheGridAndFramesTheBarsRows() var band = new InputBand(20, 2, InputLayout.HostFieldPad, [new InputPrompt(20, "Corvid ›")], "⏎ sends"); var rect = TerminalView.FieldRect(band, 10, 20, 80, 1f); - await Assert.That((double)rect.Left).IsEqualTo((3 * 10) - NativeLayout.FieldInsetX); - await Assert.That((double)rect.Right).IsEqualTo(800 - ((3 * 10) - NativeLayout.FieldInsetX)); + // The mockup's 20 px from the grid's edge, leaving the field its 8 px inner padding before the prompt's column. + await Assert.That((double)rect.Left).IsEqualTo(NativeLayout.FieldSide); + await Assert.That((double)rect.Right).IsEqualTo(800 - NativeLayout.FieldSide); + var tight = TerminalView.FieldRect(band, 8, 20, 80, 1f); + await Assert.That((double)tight.Left).IsEqualTo((3 * 8) - NativeTokens.Space8).Because("narrow cells keep the inner padding"); + var scaled = TerminalView.FieldRect(band, 13, 25, 80, 1.25f); + await Assert.That(scaled.Left % 1).IsEqualTo(0f).Because("a field edge on a whole device pixel at 125%"); + await Assert.That(scaled.Top % 1).IsEqualTo(0f); await Assert.That((double)rect.Top).IsEqualTo((20 * 20) + NativeLayout.FieldOuter); await Assert.That((double)rect.Bottom).IsEqualTo((22 * 20) + NativeLayout.FieldTop + NativeLayout.FieldInner); diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativePanelTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativePanelTests.cs index ad728020..fe3d639f 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/NativePanelTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/NativePanelTests.cs @@ -52,7 +52,7 @@ public async Task TheClientPublishesWhoHereWithTheModelItsCellRowsAreDrawnFrom() var panel = driver.Pointer.Panels.SingleOrDefault(p => p.PanelId == PanelIds.WhoHere); await Assert.That(panel).IsNotNull(); var pane = app.PaneOutputRects().Single(r => app.PaneWindows().GetValueOrDefault(r.Key) == panel!.WindowId); - await Assert.That(panel!.Rect).IsEqualTo(pane.Value with { X = pane.Value.X - 1, Width = pane.Value.Width + 2 }).Because("a panel lies over its pane's output and the gutter either side"); + await Assert.That(panel!.Rect).IsEqualTo(pane.Value with { X = pane.Value.X - 2, Width = pane.Value.Width + 4 }).Because("a panel lies over its pane's output and the two-column gutter either side"); await Assert.That(panel.WhoHere).IsEqualTo(app.ReadWhoHere(DemoScene.ActiveSessionKey)); await Assert.That(panel.WhoHere!.Rows.Count).IsGreaterThan(0); await Assert.That(panel.Pick).IsNotNull(); @@ -76,7 +76,7 @@ public async Task TheClientPublishesTheQuickBarWithTheModelItsCellRowIsDrawnFrom var panel = driver.Pointer.Panels.SingleOrDefault(p => p.PanelId == PanelIds.QuickBar); await Assert.That(panel).IsNotNull(); var pane = app.PaneOutputRects().Single(r => app.PaneWindows().GetValueOrDefault(r.Key) == panel!.WindowId); - await Assert.That(panel!.Rect).IsEqualTo(pane.Value with { X = pane.Value.X - 1, Width = pane.Value.Width + 2 }).Because("a panel lies over its pane's output and the gutter either side"); + await Assert.That(panel!.Rect).IsEqualTo(pane.Value with { X = pane.Value.X - 2, Width = pane.Value.Width + 4 }).Because("a panel lies over its pane's output and the two-column gutter either side"); await Assert.That(panel.QuickBar).IsEqualTo(app.QuickBarEntries(DemoScene.ActiveSessionKey)); await Assert.That(panel.QuickBar!.Items.Select(i => i.Key).Take(2)).IsEquivalentTo(new[] { "F11", "F12" }); diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativeTokenTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativeTokenTests.cs index 8b0e6b7e..ed759838 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/NativeTokenTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/NativeTokenTests.cs @@ -63,6 +63,74 @@ public async Task NoViewWritesALiteralFontSizeOrColour() await Assert.That(offenders).IsEmpty().Because(string.Join("\n", offenders)); } + /// + /// Files allowed a literal margin, padding or spacing, and why. Everything else takes its insets from the scale + /// (NativeTokens.Space*, PanelInset, ModalInset), so the native views share one set of insets. + /// + private static readonly Dictionary SpacingAllowed = new(StringComparer.Ordinal) + { + ["NativeTokens.cs"] = "the tokens themselves", + ["NativeTokens.Page.cs"] = "the tokens themselves", + ["NativeTokens.Spacing.cs"] = "the scale itself", + ["TerminalView.cs"] = "the cells' own view: its few insets are the grid's and the field's (NativeLayout), not a view's", + ["NativeFooter.cs"] = "the status footer, laid out from NativeLayout's footer constants in its own pass", + ["NoticeToasts.cs"] = "the toasts, laid out from their own card constants in their own pass", + }; + + [Test] + public async Task NoViewWritesALiteralMarginPaddingOrSpacing() + { + var root = Path.Combine(RepositoryRoot(), "src", "SharpMUTerm.Avalonia"); + var thickness = new Regex(@"new Thickness\(([^()]*)\)", RegexOptions.Compiled); + var literal = new Regex(@"(?(); + foreach (var file in Directory.EnumerateFiles(root, "*.cs", SearchOption.TopDirectoryOnly)) + { + if (SpacingAllowed.ContainsKey(Path.GetFileName(file))) + { + continue; + } + + var lines = File.ReadAllLines(file); + for (var i = 0; i < lines.Length; i++) + { + var line = lines[i].Trim(); + if (line.StartsWith("//", StringComparison.Ordinal)) + { + continue; + } + + if (spacing.IsMatch(line) || thickness.Matches(line).Any(m => literal.IsMatch(m.Groups[1].Value))) + { + offenders.Add($"{Path.GetFileName(file)}:{i + 1}: {line}"); + } + } + } + + await Assert.That(offenders).IsEmpty().Because(string.Join("\n", offenders)); + } + + [Test] + public async Task TheSpacingScaleAndTheChromeSizesAreWholeDevicePixelsAtWindowsScales() + { + // 4 logical pixels are whole device pixels at 100, 125, 150 and 200%, so a chrome size on that grid puts the cells + // on a device pixel at every scale Windows offers, and nothing placed from a cell origin lands on a blended row. + double[] chrome = [NativeLayout.HeaderHeight, NativeLayout.SidebarWidth, NativeLayout.SidebarSlim, NativeLayout.SidebarGutter, + NativeLayout.StatusHeight, NativeLayout.FieldStrip]; + foreach (var size in chrome) + { + await Assert.That(size % 4).IsEqualTo(0).Because($"{size} must be a multiple of 4"); + } + + double[] scale = [NativeTokens.Space2, NativeTokens.Space4, NativeTokens.Space6, NativeTokens.Space8, NativeTokens.Space10, + NativeTokens.Space12, NativeTokens.Space14, NativeTokens.Space16, NativeTokens.Space20, NativeTokens.Space24]; + foreach (var step in scale) + { + await Assert.That(step % 2).IsEqualTo(0).Because("no odd step: an odd logical pixel is half a device pixel at 150%"); + } + } + [Test] public async Task TheDarkAndLightThemesResolveToThePalettesOwnCards() { diff --git a/tests/SharpMUTerm.Tui.Tests/NativeTabStripTests.cs b/tests/SharpMUTerm.Tui.Tests/NativeTabStripTests.cs index 803e4ad2..b8cc9be4 100644 --- a/tests/SharpMUTerm.Tui.Tests/NativeTabStripTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/NativeTabStripTests.cs @@ -55,15 +55,16 @@ private static SharpMUTermApp App(HostChrome chrome, out string frame, string? v } [Test] - public async Task TheStripTakesTwoRowsAndTheGutterAColumnEachSideAndThePanesSayso() + public async Task TheStripTakesTwoRowsAndTheGutterTwoColumnsEachSideAndARowAndThePanesSayso() { // The same arrangement with the strips and the gutter left to the cells: a native strip is two rows where a cell - // strip is one, and the gutter is a column either side, and the output rectangles (NAWS) lose exactly those. + // strip is one, and the gutter is two columns either side and a row above output, and the output rectangles + // (NAWS) lose exactly those. await using var cells = App(HostChrome.Native with { Tabs = false, PaneGutter = false }, out _, "split"); await using var native = App(HostChrome.Native, out _, "split"); var expected = cells.PaneOutputRects().ToDictionary( - p => p.Key, p => new PaneRect(p.Value.X + 1, p.Value.Y + 1, p.Value.Width - 2, p.Value.Height - 1)); + p => p.Key, p => new PaneRect(p.Value.X + 2, p.Value.Y + 2, p.Value.Width - 4, p.Value.Height - 2)); await Assert.That(native.PaneOutputRects()).IsEquivalentTo(expected); await Assert.That(native.PaneChromePublished?.Strips.All(s => s.Row.Height == 2) ?? true).IsTrue(); } From 553d23050d0e764f74c78b157f7843e2153e69a6 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 19:30:54 +0000 Subject: [PATCH 076/113] Wave 21 C: the Dark theme is the mockups' navy; one selected sidebar row; plain tab names in a one-owner strip - ThemeLibrary.Dark retuned (background #222835, status #13161e, border #495573, prompt #3f61a3, ink #c8d0e0/#d7deec) so the derived planes land on the mockup in both hosts: pane #151921, focused #212835, backdrop #10131a, header #13161e, armed command line #233049, rules #2c3446. Light and Solarized Dark unchanged. - Dark's tints are laid over the old grey's hue (WorkspacePalette.TintGround) so tinted planes and the colour-vision floors are as before; ScreenTheme/NativeTokens treat Dark's background as their hue reference (nothing moved there). - Window: the command-line field's edge is the fill x1.6 on a dark fill (#3a4f73 on #233049); dark canon Rule is #2c3447. - SidebarModel.Plated / RailWindow.Own: one sidebar row wears a teal plate (the character while main is in front). - TabStripModel.OneOwner: a strip of one character's tabs drops the owner prefix (both hosts). Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 8 +++ CLAUDE.md | 15 +++++ src/SharpMUTerm.Avalonia/NativeChrome.cs | 28 +++++++-- src/SharpMUTerm.Avalonia/NativeTokens.cs | 5 +- src/SharpMUTerm.Avalonia/TerminalView.cs | 19 +++++- src/SharpMUTerm.Client/Chrome/SidebarModel.cs | 18 ++++++ .../Chrome/TabStripModel.cs | 17 ++++++ src/SharpMUTerm.Core/Theming/ThemeLibrary.cs | 20 +++--- src/SharpMUTerm.Core/Workspaces/RailModel.cs | 3 +- src/SharpMUTerm.Tui/ScreenTheme.cs | 16 ++++- src/SharpMUTerm.Tui/SharpMUTermApp.cs | 5 +- src/SharpMUTerm.Tui/WorkspacePalette.cs | 28 +++++++-- .../SelectionAndTabNameTests.cs | 61 +++++++++++++++++++ .../WorkspacePaletteTests.cs | 13 ++-- 14 files changed, 226 insertions(+), 30 deletions(-) create mode 100644 tests/SharpMUTerm.Client.Tests/SelectionAndTabNameTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 91e3c37d..4fb56dc6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -386,6 +386,14 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Changed +- The Dark theme is navy, as the mockups are, in the terminal and the window alike: deep blue panes with the focused + one a step lighter, the sidebar and status row on the darkest ground, a dark header with a hairline under it, a + command line on `#233049` with a blue edge, blue-grey rules and text. Light and Solarized Dark are unchanged, and + pane tints look as they did. +- The window's sidebar marks one row as selected, with a teal plate: the character, while their main window is in + front, or the other window that is. +- A tab strip whose tabs all belong to one character names them plainly (`Corvid`, `Chat 2`); the owner is still + written in a strip holding two characters' windows, and on a capture alone in its pane. - The desktop window lines up: one spacing scale for every native view, the header at the mockup's 44 px, output starting about 20 px in from its pane's edges with a row of space under the tab strip, the sidebar's names, the brand and every panel's heading, rows and buttons on one 16 px edge, the "+ Add a world or connect" button left-aligned, diff --git a/CLAUDE.md b/CLAUDE.md index d06a8f9c..f38e07fc 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -2828,6 +2828,21 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] used to be `#222226`. A light theme is left alone: darkening it makes a grey theme, and its focus step clamps at white either way. The cost is the pane-over-backdrop step, a ratio, which is fewer L* points a range lower (Dark 4.0 → 2.8); `EveryThemeGetsARaisedSurfaceOverARecessedBackdrop` now measures L*. + - **The built-in Dark theme is the mockups' navy, and its values were solved for, not picked** (`ThemeLibrary.Dark`, + wave 21C). Background `#222835`, StatusBackground `#13161e`, Border `#495573`, Prompt `#3f61a3`, so the derived planes + land on the mockup: pane `#151921`, focused `#212835`, backdrop `#10131a` (the ground), header `#13161e`, armed band + `#233049` (Prompt is whatever lean lands it there), idle band a step below, rule `#2c3446`. Three constraints bound the + choice and each is a test: the armed−idle luma step > 28 (`TheNewStepIsMoreThanTwice…`, which is why the header is so + dark), pane-over-backdrop > 2.5 L* (why the pane is not the mockup's darker `#12161f`), and the colour-vision floors + (why it is not bluer: a bluer untinted plane meets Azure under protanopia, a greyer one meets Rose under deuteranopia). + **Dark's tints are laid over the old grey's hue** (`WorkspacePalette.TintGround`, `#18181b`): the anchors were + searched against it, and a navy residual pulled Moss/Ochre and Teal/Jade under the floor; every other theme, and the + command line's hue-only tint, still uses its own plane. The settings screens and `NativeTokens` were already navy, so + their hue shift treats the Dark background as the reference (`ScreenTheme.ShiftedBackground`) and nothing moved there. + The window's field edge is its fill ×1.6 on a dark fill (`TerminalView.FieldEdge`: `#3a4f73` on `#233049`); the dark + canon's `Rule` is the mockup's `#2c3447`, which the pane hairlines read. A selected sidebar row is one row + (`SidebarModel.Plated`: the character while its own `main` is in front, else that window; `RailWindow.Own`), on a teal + plate. A strip whose tabs share one owner drops the owner prefix (`TabStripModel.OneOwner`, both hosts; a lone tab keeps it). - **A light theme's backdrop takes a shallower step** (`LightBackdropScale` 0.95, `Backdrop` only — `Recessed`, the chips' step, is unchanged): the dark ratio off a near-white surface put the rail and status row at mid-grey `#b7b7b9` (L* 75), which read as disabled. Light's backdrop is `#e6e6e9` now, about 4 L* under the panes. diff --git a/src/SharpMUTerm.Avalonia/NativeChrome.cs b/src/SharpMUTerm.Avalonia/NativeChrome.cs index 4a3af343..e5b3e900 100644 --- a/src/SharpMUTerm.Avalonia/NativeChrome.cs +++ b/src/SharpMUTerm.Avalonia/NativeChrome.cs @@ -234,6 +234,19 @@ protected Color Raised(double amount) return Color.FromRgb(Mix(Plane.R, target.R), Mix(Plane.G, target.G), Mix(Plane.B, target.B)); } + /// + /// The selection plate: the plane leaned toward the client's accent — about 14 % on a dark plane, the mockup's + /// #1f3a3a on #141822 — a little further while hovered. Ink on it is held to the floor by the caller's + /// own reads, and the lean is small enough that the plane's ink clears it. + /// + protected Color Plate(bool hovered) + { + var accent = Parse(Overlay?.Palette.Accent); + var amount = hovered ? 0.20 : 0.14; + byte Mix(byte a, byte b) => (byte)Math.Round(a + ((b - a) * amount)); + return Color.FromRgb(Mix(Plane.R, accent.R), Mix(Plane.G, accent.G), Mix(Plane.B, accent.B)); + } + /// The veil a modal in front lays over the chrome: drawn, readable, and plainly not the thing in use. protected void DrawVeil(DrawingContext context) { @@ -976,16 +989,21 @@ private void DrawRow(DrawingContext context, Row r, ChromeOverlay overlay, bool var middle = r.Area.Center.Y; var hovered = Hovered(r.Area.Intersect(_list)); - // Only the character in front wears the selected plate: its window in front is said by the accent mark beside - // the window's name, so the two rows do not read as two selections. - var selected = r.Kind == RailRowKind.Character && r.Character!.Active; + // One row wears the plate: the thing in front (SidebarModel.Plated), tinted with the client's accent as the + // mockup's selected row is (#1f3a3a on #141822). + var selected = r.Kind switch + { + RailRowKind.Character => overlay.Sidebar.Plated(r.Character!), + RailRowKind.Window => overlay.Sidebar.Plated(r.Window!), + _ => false, + }; if (focused) { context.DrawRectangle(new SolidColorBrush(Raised(0.14)), null, r.Area, 6, 6); } else if (selected || hovered) { - context.DrawRectangle(new SolidColorBrush(Raised(selected && hovered ? 0.16 : selected ? 0.11 : 0.07)), null, r.Area, 6, 6); + context.DrawRectangle(new SolidColorBrush(selected ? Plate(hovered) : Raised(0.07)), null, r.Area, 6, 6); } var accent = Accent(r.World.Accent); @@ -1006,7 +1024,7 @@ private void DrawRow(DrawingContext context, Row r, ChromeOverlay overlay, bool break; case RailRowKind.Window: - DrawWindow(context, r, r.Window!, accent, overlay.Sidebar.IsSelected(r.Window!), middle, right, size); + DrawWindow(context, r, r.Window!, accent, selected, middle, right, size); break; } } diff --git a/src/SharpMUTerm.Avalonia/NativeTokens.cs b/src/SharpMUTerm.Avalonia/NativeTokens.cs index db7d9d20..91967511 100644 --- a/src/SharpMUTerm.Avalonia/NativeTokens.cs +++ b/src/SharpMUTerm.Avalonia/NativeTokens.cs @@ -149,7 +149,8 @@ public static NativeTokens For(Theme theme) var light = Contrast.RelativeLuminance(theme.Background) >= 0.18; var canon = light ? LightCanon : DarkCanon; var reference = light ? new Rgb(0xfa, 0xfa, 0xfa) : new Rgb(0x1e, 0x1e, 0x1e); - var shift = (theme.Background.R - reference.R, theme.Background.G - reference.G, theme.Background.B - reference.B); + var background = ScreenTheme.ShiftedBackground(theme); + var shift = (background.R - reference.R, background.G - reference.G, background.B - reference.B); var card = Shift(canon.Card, shift); var edge = Shift(canon.Edge, shift); @@ -309,7 +310,7 @@ private sealed record Canon( Color.FromArgb(0x73, 0, 0, 0), new Rgb(0x17, 0x1b, 0x24), new Rgb(0x2c, 0x34, 0x47), - new Rgb(0x26, 0x2d, 0x3d), + new Rgb(0x2c, 0x34, 0x47), new Rgb(0xd7, 0xde, 0xec), new Rgb(0x9a, 0xa4, 0xb8), new Rgb(0x8f, 0x99, 0xad), diff --git a/src/SharpMUTerm.Avalonia/TerminalView.cs b/src/SharpMUTerm.Avalonia/TerminalView.cs index e02d1e75..bed1147c 100644 --- a/src/SharpMUTerm.Avalonia/TerminalView.cs +++ b/src/SharpMUTerm.Avalonia/TerminalView.cs @@ -794,6 +794,23 @@ private static SolidColorBrush Brush(SKColor colour, byte alpha = 0xFF) => (byte)(from.Green + (to.Green - from.Green) * amount), (byte)(from.Blue + (to.Blue - from.Blue) * amount)); + /// + /// The command-line field's one-pixel edge for a field filled . On a dark fill it is the fill + /// lifted by the client's focus step (×1.6), which is how the mockup's #3a4f73 sits on its #233049 and + /// keeps a tinted band's hue; a light fill leans toward the ink instead, since a lift there clamps at white. + /// + internal static SKColor FieldEdge(SKColor fill, SKColor ink) + { + var luma = ((fill.Red * 299) + (fill.Green * 587) + (fill.Blue * 114)) / 1000; + if (luma >= 128) + { + return Mix(fill, ink, 0.22f); + } + + static byte Lift(byte c) => (byte)Math.Clamp(Math.Round(c * 1.6), 0, 255); + return new SKColor(Lift(fill.Red), Lift(fill.Green), Lift(fill.Blue)); + } + private void RepeatPress() { if (_mouse.Repeat() is { } repeat) @@ -1053,7 +1070,7 @@ private void RenderWithField(SKCanvas canvas, InputBand band) paint.Style = SKPaintStyle.Stroke; paint.StrokeWidth = Math.Max(1, s); - paint.Color = Mix(fill, renderer.DefaultForeground, 0.22f); + paint.Color = FieldEdge(fill, renderer.DefaultForeground); var edge = rounded; edge.Deflate(paint.StrokeWidth / 2, paint.StrokeWidth / 2); canvas.DrawRoundRect(edge, paint); diff --git a/src/SharpMUTerm.Client/Chrome/SidebarModel.cs b/src/SharpMUTerm.Client/Chrome/SidebarModel.cs index 8d464679..5388e27d 100644 --- a/src/SharpMUTerm.Client/Chrome/SidebarModel.cs +++ b/src/SharpMUTerm.Client/Chrome/SidebarModel.cs @@ -73,6 +73,24 @@ public IReadOnlyList NavigableRows() => /// Whether is the one in front of the focused pane. public bool IsSelected(RailWindow window) => string.Equals(window.Id, SelectedWindowId, StringComparison.Ordinal); + /// + /// Whether wears the selection plate — one row at most, the thing in front. While the active + /// character's own window (main) is in front that is the character's row, which already says it; any other + /// window in front wears it itself, and the character row then does not, so two rows never claim to be selected. + /// + public bool Plated(RailCharacter character) + { + ArgumentNullException.ThrowIfNull(character); + return character.Active && !character.Windows.Any(w => !w.Own && IsSelected(w)); + } + + /// + public bool Plated(RailWindow window) + { + ArgumentNullException.ThrowIfNull(window); + return !window.Own && IsSelected(window); + } + /// /// Every click target this model can emit, so a host's answer can be checked against what the client offered: a /// target that is not in this set did not come from the sidebar. diff --git a/src/SharpMUTerm.Client/Chrome/TabStripModel.cs b/src/SharpMUTerm.Client/Chrome/TabStripModel.cs index 79ad5ede..092a4e8a 100644 --- a/src/SharpMUTerm.Client/Chrome/TabStripModel.cs +++ b/src/SharpMUTerm.Client/Chrome/TabStripModel.cs @@ -50,6 +50,23 @@ public static TabChipModel From(WorkspaceWindow window, string? focusedCharacter /// public sealed record TabStripModel(string PaneId, bool Focused, IReadOnlyList Tabs) { + /// + /// A strip's tabs with the owner prefix dropped when every tab belongs to the same character: Corvid beside + /// Chat, as the mockup's strip reads, rather than Corvid · Chat, which says the owner the strip's other + /// tabs, its chip and its pane already say. A strip holding two characters' windows keeps the prefix on each, and so + /// does a capture alone in a pane (one tab), which is what keeps it traceable once dragged away from its character. + /// + public static IReadOnlyList OneOwner(IReadOnlyList tabs) + { + ArgumentNullException.ThrowIfNull(tabs); + if (tabs.Count < 2 || tabs[0].Owner is not { } owner || tabs.Any(t => !string.Equals(t.Owner, owner, StringComparison.Ordinal))) + { + return tabs; + } + + return [.. tabs.Select(t => t with { Name = t.Title })]; + } + /// The tab a click on names, or null when the strip does not hold it. public TabChipModel? Find(string windowId) => Tabs.FirstOrDefault(t => string.Equals(t.WindowId, windowId, StringComparison.Ordinal)); diff --git a/src/SharpMUTerm.Core/Theming/ThemeLibrary.cs b/src/SharpMUTerm.Core/Theming/ThemeLibrary.cs index 3359d4e6..4699e010 100644 --- a/src/SharpMUTerm.Core/Theming/ThemeLibrary.cs +++ b/src/SharpMUTerm.Core/Theming/ThemeLibrary.cs @@ -5,18 +5,24 @@ namespace SharpMUTerm.Core.Theming; /// Built-in themes and lookup by name (yazi-style named flavours). public static class ThemeLibrary { - /// The default dark theme. + /// + /// The default dark theme: the UX mockups' navy (ux-mockups/Main.dc.html). Its values are chosen so the planes + /// the workspace derives from them land on the mockup — a pane on #151921, focused #212835, the + /// backdrop #10131a (the ground), the header #13161e, the armed command line #233049, rules #2c3447, + /// ink #c8d0e0 and #d7deec. is the blue the armed band leans to, picked so + /// that lean lands on #233049. + /// public static Theme Dark() => new() { Name = "Dark", - Foreground = new Rgb(0xd0, 0xd0, 0xd0), - Background = new Rgb(0x1e, 0x1e, 0x1e), - StatusForeground = new Rgb(0xe0, 0xe0, 0xe0), - StatusBackground = new Rgb(0x2d, 0x2d, 0x3f), - Border = new Rgb(0x55, 0x55, 0x66), + Foreground = new Rgb(0xc8, 0xd0, 0xe0), + Background = new Rgb(0x22, 0x28, 0x35), + StatusForeground = new Rgb(0xd7, 0xde, 0xec), + StatusBackground = new Rgb(0x13, 0x16, 0x1e), + Border = new Rgb(0x49, 0x55, 0x73), SystemMessage = new Rgb(0x6a, 0x99, 0x55), LocalEcho = new Rgb(0xdc, 0xdc, 0xaa), - Prompt = new Rgb(0x56, 0x9c, 0xd6), + Prompt = new Rgb(0x3f, 0x61, 0xa3), }; /// A light theme for bright terminals. diff --git a/src/SharpMUTerm.Core/Workspaces/RailModel.cs b/src/SharpMUTerm.Core/Workspaces/RailModel.cs index c2d9c321..f0bd1fb8 100644 --- a/src/SharpMUTerm.Core/Workspaces/RailModel.cs +++ b/src/SharpMUTerm.Core/Workspaces/RailModel.cs @@ -90,7 +90,8 @@ public sealed record RailCharacter( /// that goes to that window, rather than to whatever else happens to share its pane. /// /// -public sealed record RailWindow(string Title, string Id, string? Chord, int Unread, bool HasUnsent, bool Closed); +/// Whether this is the character's own session window (the row labelled main). +public sealed record RailWindow(string Title, string Id, string? Chord, int Unread, bool HasUnsent, bool Closed, bool Own = false); /// /// Projects the worlds/characters/windows tree into a flat list of s for the diff --git a/src/SharpMUTerm.Tui/ScreenTheme.cs b/src/SharpMUTerm.Tui/ScreenTheme.cs index d2994382..c8c215ac 100644 --- a/src/SharpMUTerm.Tui/ScreenTheme.cs +++ b/src/SharpMUTerm.Tui/ScreenTheme.cs @@ -101,13 +101,27 @@ private ScreenTheme(IReadOnlyDictionary roles) private static readonly Rgb LightReference = new(0xfa, 0xfa, 0xfa); + /// + /// The background a theme's hue shift is measured from. The canonical sets (these roles, the window's + /// NativeTokens) are the mockups' navy and were laid onto a neutral #1e1e1e; the built-in Dark theme + /// is that navy now, so its own background counts as the reference and it shifts nothing, while every other + /// theme (Solarized Dark, a customised one) is shifted exactly as before. + /// + internal static Rgb ShiftedBackground(Theme theme) + { + ArgumentNullException.ThrowIfNull(theme); + return theme.Background == DarkBuiltIn ? DarkReference : theme.Background; + } + + private static readonly Rgb DarkBuiltIn = ThemeLibrary.Dark().Background; + /// The palette for . internal static ScreenTheme For(Theme theme) { ArgumentNullException.ThrowIfNull(theme); var light = Contrast.RelativeLuminance(theme.Background) >= LightPlaneLuminance; - var shift = Delta(theme.Background, light ? LightReference : DarkReference); + var shift = Delta(ShiftedBackground(theme), light ? LightReference : DarkReference); var roles = new Dictionary(StringComparer.OrdinalIgnoreCase); foreach (var plane in Planes) diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 65a5e984..d4ee5699 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -8514,7 +8514,8 @@ private IReadOnlyList BuildRailWindows( chords.GetValueOrDefault(window.Id), window.Unread, window.HasUnsentInput, - Closed: _workspace.Layout.FindWindow(window.Id) is null)); + Closed: _workspace.Layout.FindWindow(window.Id) is null, + Own: mine && window.Kind == WindowKind.Main)); } return windows; @@ -13795,7 +13796,7 @@ private TabStripModel StripModelFor(string paneId, IEnumerable windowIds } } - return new TabStripModel(paneId, IsFocusedPane(paneId), tabs); + return new TabStripModel(paneId, IsFocusedPane(paneId), TabStripModel.OneOwner(tabs)); } /// The plane each unselected tab of a pane is drawn on (), by its model. diff --git a/src/SharpMUTerm.Tui/WorkspacePalette.cs b/src/SharpMUTerm.Tui/WorkspacePalette.cs index f766d89c..62a3405b 100644 --- a/src/SharpMUTerm.Tui/WorkspacePalette.cs +++ b/src/SharpMUTerm.Tui/WorkspacePalette.cs @@ -113,26 +113,44 @@ internal static Rgb Surface(Theme theme) internal static Rgb Tint(Theme theme, PaneTint tint) { ArgumentNullException.ThrowIfNull(theme); - return Tinted(Surface(theme), tint, TintDepth); + return Tinted(Surface(theme), TintGround(theme), tint, TintDepth); } /// /// One plane wearing one character's colour: re-lit to of its own /// luminance, then mixed toward the tint's hue at that same luminance. The two callers pass /// different depths, which is the whole composition rule — a pane takes the step down, the command - /// line takes hue only. + /// line takes hue only. is the hue the tint is laid over + /// (); only its hue counts, since it is re-lit to the plane. /// - private static Rgb Tinted(Rgb plane, PaneTint tint, double depth) + private static Rgb Tinted(Rgb plane, Rgb? ground, PaneTint tint, double depth) { if (Anchor(tint) is not { } anchor) { return plane; } - var lit = AtLuma(plane, Luma(plane) * depth); + var lit = AtLuma(ground ?? plane, Luma(plane) * depth); return Mix(lit, AtLuma(anchor, Luma(lit)), TintStrength); } + /// + /// The hue a tint is laid over, when it is not the plane's own (null). The built-in Dark theme's planes are the + /// mockups' navy, and the ten anchors were picked against the near-neutral grey its surface used to be: laid over + /// navy, the residual blue drew the tints together for a dichromat (Moss and Ochre to 1.6 under protanopia, Teal + /// and Jade to 1.7 under deuteranopia, against a floor of 1.9). So on Dark a tinted plane keeps that grey's hue + /// (), at its own luminance as before — every tinted plane, and the step between them, + /// is what it was; only the untinted plane is navy. Every other theme lays its tints over its own plane, and so does + /// the command line on every theme: it takes hue only, and its band is not one of the ten-plus-one a reader compares. + /// + private static Rgb? TintGround(Theme theme) => + theme.Background == DarkBackground ? DarkTintGround : null; + + private static readonly Rgb DarkBackground = ThemeLibrary.Dark().Background; + + /// The Dark theme's surface before it was navy, whose hue its tints are laid over. + private static readonly Rgb DarkTintGround = new(0x18, 0x18, 0x1b); + /// /// How far below the untinted surface a tinted pane sits. Bounded from below by the focus step, /// arithmetically: a client may hold tinted and untinted characters at once, and a depth reaching @@ -227,7 +245,7 @@ private static Rgb AtLuma(Rgb rgb, double target) internal static Rgb IdleBand(Theme theme, PaneTint tint) { ArgumentNullException.ThrowIfNull(theme); - return Tinted(Scale(theme.StatusBackground, IdleBandScale), tint, depth: 1.0); + return Tinted(Scale(theme.StatusBackground, IdleBandScale), ground: null, tint, depth: 1.0); } /// diff --git a/tests/SharpMUTerm.Client.Tests/SelectionAndTabNameTests.cs b/tests/SharpMUTerm.Client.Tests/SelectionAndTabNameTests.cs new file mode 100644 index 00000000..d7c811cf --- /dev/null +++ b/tests/SharpMUTerm.Client.Tests/SelectionAndTabNameTests.cs @@ -0,0 +1,61 @@ +using SharpMUTerm.Client.Chrome; +using SharpMUTerm.Core.Workspaces; + +namespace SharpMUTerm.Client.Tests; + +/// +/// One selected sidebar row (), and a strip of one character's tabs named +/// without the owner (). +/// +public class SelectionAndTabNameTests +{ + private static readonly RailWindow Main = new("main", "main:1", "⌥1", 0, false, false, Own: true); + private static readonly RailWindow Chat = new("Chat", "spawn:1", "⌥2", 2, false, false); + + private static (SidebarModel Model, RailCharacter Corvid) Sidebar(string selected) + { + var corvid = new RailCharacter("Corvid", "Aetherfall.Corvid", Connected: true, Active: true, Unread: 2, [Main, Chat]); + var world = new RailWorld("Aetherfall", "example", 4000, default, [corvid]); + return (new SidebarModel([world], selected, Collapsed: false), corvid); + } + + [Test] + public async Task WithTheMainWindowInFrontOnlyTheCharacterIsPlated() + { + var (model, corvid) = Sidebar(Main.Id); + + await Assert.That(model.Plated(corvid)).IsTrue(); + await Assert.That(model.Plated(Main)).IsFalse(); + await Assert.That(model.Plated(Chat)).IsFalse(); + } + + [Test] + public async Task WithAnotherWindowInFrontOnlyThatWindowIsPlated() + { + var (model, corvid) = Sidebar(Chat.Id); + + await Assert.That(model.Plated(corvid)).IsFalse(); + await Assert.That(model.Plated(Chat)).IsTrue(); + } + + private static TabChipModel Tab(string id, string name, string title, string? owner) => + new(id, name, title, Selected: false, Unread: 0, Draft: false, Foreign: false, Closable: false, owner); + + [Test] + public async Task OneOwnersStripDropsThePrefix() + { + var tabs = TabStripModel.OneOwner([Tab("m", "Corvid", "Corvid", "A.C"), Tab("c", "Corvid · Chat", "Chat", "A.C")]); + + await Assert.That(tabs.Select(t => t.Name)).IsEquivalentTo(["Corvid", "Chat"]); + } + + [Test] + public async Task TwoOwnersOrALoneTabKeepThePrefix() + { + var mixed = TabStripModel.OneOwner([Tab("c", "Corvid · Chat", "Chat", "A.C"), Tab("r", "Rookery · Chat", "Chat", "A.R")]); + var lone = TabStripModel.OneOwner([Tab("c", "Corvid · Chat", "Chat", "A.C")]); + + await Assert.That(mixed[0].Name).IsEqualTo("Corvid · Chat"); + await Assert.That(lone[0].Name).IsEqualTo("Corvid · Chat"); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/WorkspacePaletteTests.cs b/tests/SharpMUTerm.Tui.Tests/WorkspacePaletteTests.cs index 85e1cc4f..e174e48b 100644 --- a/tests/SharpMUTerm.Tui.Tests/WorkspacePaletteTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/WorkspacePaletteTests.cs @@ -97,17 +97,18 @@ public async Task TheHairlineIsFoundAgainstBothPlanes(string themeName) [Test] public async Task TheSurfaceCarriesTheThemesOwnChromeTint() { - var theme = ThemeLibrary.Get("Dark"); // background #1e1e1e, status background #2d2d3f + var theme = ThemeLibrary.Get("Dark"); // background #222835, status background #13161e (the mockups' navy) var surface = WorkspacePalette.Surface(theme); // A quarter of the way from the text background toward the chrome the header and input bands // are already painted in — so the output plane belongs to this application, not to the terminal — - // and then darkened, which scales every channel and so keeps that hue. #222226 before the scale. - await Assert.That(surface.R).IsEqualTo((byte)0x18); - await Assert.That(surface.G).IsEqualTo((byte)0x18); - await Assert.That(surface.B).IsEqualTo((byte)0x1b); - await Assert.That(surface.B).IsGreaterThan(surface.R); // cooler than the plain background, which is neutral + // and then darkened, which scales every channel and so keeps that hue. #1e242f before the scale; + // #151921 after, the mockup's pane navy (Main.dc.html's #12161f, lifted to keep the tints apart). + await Assert.That(surface.R).IsEqualTo((byte)0x15); + await Assert.That(surface.G).IsEqualTo((byte)0x19); + await Assert.That(surface.B).IsEqualTo((byte)0x21); + await Assert.That(surface.B).IsGreaterThan(surface.R); // navy: bluer than it is red } [Test] From a419479b32f75402c5feec8cc2402fc66f139a05 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 19:38:12 +0000 Subject: [PATCH 077/113] Wave 21 D: the window's command line sits in the output's column HostChrome.InputInColumn (on in Desktop): the prompt row and both bars leave the window's sticky band and become Auto rows of a grid wrapped round one node of the pane tree (InputColumn.Target, anchored on the live layout's output pane, never focus), so the side column runs down to the status footer as in the mockups. InputBand carries Left/Columns; TerminalView draws the strip, field, row shift and press mapping only in those columns and carries panes and dividers beside it down through the field's padding. HostFieldPad 3 -> 4 for the mockup's 20 px inset. The terminal keeps the full-width band. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 3 + CLAUDE.md | 13 +- src/SharpMUTerm.Avalonia/TerminalView.cs | 110 +++++++++++----- src/SharpMUTerm.Core/Workspace/InputColumn.cs | 80 +++++++++++ src/SharpMUTerm.Tui/Hosting/ClientHost.cs | 12 +- src/SharpMUTerm.Tui/InputLayout.cs | 2 +- .../Pointer/SharpMUTermApp.Footer.cs | 34 ++++- src/SharpMUTerm.Tui/SharpMUTermApp.cs | 124 +++++++++++++++--- .../NativeFooterTests.cs | 17 ++- .../Workspace/InputColumnTests.cs | 58 ++++++++ .../InputColumnLayoutTests.cs | 98 ++++++++++++++ 11 files changed, 491 insertions(+), 60 deletions(-) create mode 100644 src/SharpMUTerm.Core/Workspace/InputColumn.cs create mode 100644 tests/SharpMUTerm.Core.Tests/Workspace/InputColumnTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/InputColumnLayoutTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 4fb56dc6..2ea6a5a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -386,6 +386,9 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Changed +- In the desktop window the command line sits under the output column only, as wide as the text it sends to; the + side column (composer and who is here, or vitals and map) runs down to the status footer. The field is also a few + pixels further in from its edges, as the mockups draw it. The terminal is unchanged. - The Dark theme is navy, as the mockups are, in the terminal and the window alike: deep blue panes with the focused one a step lighter, the sidebar and status row on the darkest ground, a dark header with a hairline under it, a command line on `#233049` with a blue edge, blue-grey rules and text. Light and Solarized Dark are unchanged, and diff --git a/CLAUDE.md b/CLAUDE.md index f38e07fc..a4209e2e 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -1705,7 +1705,7 @@ draws ⌃P natively (`INativePalette`, null for the cell popup), whether it draw what the markup-first row wrote; there is no markup parser. The palette hint and a notice's action hints carry targets. `IPointerPresenter.Status`, published from `PaintStatus` and `PostBufferPaint`, only on change. A click is `ActivateStatusTarget`: refused unless offered, the palette through `OpenMenu`, an action through `RunNoticeAction`. With `Status` the row is `Visible = false` and `ChromeRows` counts none. Toasts sit above it. - - **The command line stays the cell editor; the host draws the field around it.** The bars get `HostFieldPad` (3) + - **The command line stays the cell editor; the host draws the field around it.** The bars get `HostFieldPad` (4) band-coloured columns either side (`InputBarControl.LeadingPad` + right margin), the client publishes an `InputBand` (rows, pad, prompts, hint) on `PostBufferPaint`, `Flush` snapshots it into the `ScreenFrame` it belongs to, and `TerminalView` draws the rows above it, the strip, a rounded field filled with the band colour read off the cells (so @@ -1717,6 +1717,17 @@ draws ⌃P natively (`INativePalette`, null for the cell popup), whether it draw narrower than its cells, so each bar's text is drawn `Shift` px left (to one mono space after the measured prompt), the caret with it, and `Cell` maps a press there back to the cell under it; the right padding the shift uncovers is the field's fill. The gutter, the caret's cell and every key are unchanged, so parity needs nothing. + - **In the window the command line is a row of the output's column** (`HostChrome.InputInColumn`, on in `Desktop`; + `InputColumn.Target`/`Anchor`, Core; `WithInputBars`/`DetachInputBars`). The prompt row and both bars leave the window's + sticky band and become Auto rows of a grid wrapped round one node of the pane tree, so the side column runs to the + status row as in the mockups. The node: from the root, into the anchor's child of a side-by-side split unless another + child holds a character's own window (two characters share the bars), into a stacked split only through its last child, + else that split (the output and its quick bar). The anchor is the live layout's output pane, else the first pane holding + a `Main` window — **never focus**, so moving the selection moves no pane (`InputColumnLayoutTests`). A rebuild takes the + bars out of the old grid before it is disposed. `InputBand` carries `Left`/`Columns`; the view draws the strip, the + field, the row shift and the press mapping only in those columns, and carries the panes and dividers beside it down + through the `FieldReserve` pixels. NAWS is the arranged rectangles. The terminal keeps the full-width band (`None`), + so its frames and the parity harness (which tells both hosts the same chrome) are unchanged. - **The window draws pane dividers as the panes meeting at a hairline** (`IPointerPresenter.Dividers`, `PaneDividerOverlay`, `DividersNow`; `ScreenFrame.Dividers`; `TerminalView.FrameDraw.DrawDividers`). The client publishes each divider control's cells and whether it is lit (never a tab strip standing in for one, nothing under a modal) on diff --git a/src/SharpMUTerm.Avalonia/TerminalView.cs b/src/SharpMUTerm.Avalonia/TerminalView.cs index bed1147c..8d239b21 100644 --- a/src/SharpMUTerm.Avalonia/TerminalView.cs +++ b/src/SharpMUTerm.Avalonia/TerminalView.cs @@ -138,11 +138,17 @@ public TerminalView(AvaloniaConsoleDriver driver, SKColor foreground, SKColor ba /// The vertical pixels the field takes beside the rows it frames: none unless the view draws it. private double FieldReserve => DrawsInputField ? NativeLayout.FieldReserve : 0; - /// The top of screen row in logical units: rows of a band sit lower by the field's top padding. - internal double RowTop(int row) + /// + /// The top of screen row at in logical units: rows of a band sit lower + /// by the field's top padding, in the columns the band spans (all of them, unless the bars are in the output's column). + /// + internal double RowTop(int row, int column) { var top = row * CellSize.Height; - return DrawsInputField && _driver.Frame.Band is { } band && row >= band.Top ? top + NativeLayout.FieldTop : top; + var frame = _driver.Frame; + return DrawsInputField && frame.Band is { } band && row >= band.Top && band.Spans(column, frame.Width) + ? top + NativeLayout.FieldTop + : top; } /// @@ -249,10 +255,10 @@ internal IReadOnlyList BarsOf(ScreenFrame frame, InputBand band) { var prompt = prompts[i]; var to = i + 1 < prompts.Count ? prompts[i + 1].Row : end; - var start = Math.Min(frame.Width, band.Pad + prompt.Text.Length); + var start = Math.Min(frame.Width, band.From + band.Pad + prompt.Text.Length); var trimmed = prompt.Text.TrimEnd(); var width = trimmed.Length == 0 ? 0 : PromptWidth(trimmed); - var room = (start - band.Pad) * cell.Width; + var room = (start - band.From - band.Pad) * cell.Width; var shift = trimmed.Length == 0 ? 0 : Math.Max(0, room - width - cell.Width); // Whole device pixels, so the glyphs land on the pixel grid the unshifted ones would. @@ -276,7 +282,7 @@ private void DrawHover(DrawingContext context) var cell = CellSize; var area = _target.Area; - var rect = new Rect(area.X * cell.Width, RowTop(area.Y), area.Width * cell.Width, area.Height * cell.Height); + var rect = new Rect(area.X * cell.Width, RowTop(area.Y, area.X), area.Width * cell.Width, area.Height * cell.Height); context.DrawRectangle(Brush(_renderer.DefaultForeground, 0x24), null, rect.Inflate(new Thickness(1, 0)), 2, 2); } @@ -831,7 +837,7 @@ private System.Drawing.Point Cell(Point position) var y = Math.Clamp((int)(position.Y / size.Height), 0, Math.Max(0, frame.Height - 1)); // Below the panes, the field: its padding is the band's first and last rows, and its rows sit lower. - if (DrawsInputField && frame.Band is { } band && position.Y >= band.Top * size.Height) + if (DrawsInputField && frame.Band is { } band && position.Y >= band.Top * size.Height && band.Spans(x, frame.Width)) { var inside = (position.Y - (band.Top * size.Height) - NativeLayout.FieldTop) / size.Height; y = Math.Clamp(band.Top + (int)Math.Floor(inside), band.Top, Math.Min(frame.Height, band.Top + band.Rows) - 1); @@ -926,7 +932,7 @@ private void DrawDividers(SKCanvas canvas) var y0 = Math.Max(0, divider.Area.Y); var x1 = Math.Min(frame.Width, divider.Area.X + divider.Area.Width); var y1 = Math.Min(frame.Height, divider.Area.Y + divider.Area.Height); - if (band is { } field) + if (band is { } field && field.Spans(x0, frame.Width)) { y1 = Math.Min(y1, field.Top); } @@ -942,16 +948,26 @@ private void DrawDividers(SKCanvas canvas) { float left = x0 * cw, right = x1 * cw; var at = MathF.Round(left + ((right - left - w) / 2)); + // Beside a band in the output's column the panes run on under the grid, through the field's padding. + var tail = band is { Columns: not null } inColumn && y1 == frame.Height && !inColumn.Spans(x0, frame.Width) + ? Math.Max(0, (float)(Bounds.Height * scale) - (y1 * ch)) + : 0; for (var y = y0; y < y1; y++) { - paint.Color = PlaneBeside(x0 - 1, y, -1, 0); - canvas.DrawRect(left, y * ch, at - left, ch, paint); - paint.Color = PlaneBeside(x1, y, 1, 0); - canvas.DrawRect(at + w, y * ch, right - at - w, ch, paint); + var h = y == y1 - 1 ? ch + tail : ch; + // A band's rows beside the divider are the field's strip, not the bar cells under it. + paint.Color = band is { } beside && y >= beside.Top && beside.Spans(x0 - 1, frame.Width) + ? plane + : PlaneBeside(x0 - 1, y, -1, 0); + canvas.DrawRect(left, y * ch, at - left, h, paint); + paint.Color = band is { } after && y >= after.Top && after.Spans(x1, frame.Width) + ? plane + : PlaneBeside(x1, y, 1, 0); + canvas.DrawRect(at + w, y * ch, right - at - w, h, paint); } paint.Color = colour; - canvas.DrawRect(at, y0 * ch, w, (y1 - y0) * ch, paint); + canvas.DrawRect(at, y0 * ch, w, ((y1 - y0) * ch) + tail, paint); } else { @@ -1015,18 +1031,38 @@ private void RenderWithField(SKCanvas canvas, InputBand band) var height = (float)(Bounds.Height * scale); var top = band.Top * ch; + // The band's columns: the whole grid, or the output's column when the bars are a row of it + // (HostChrome.InputInColumn), and then every pane beside it runs on down to the footer. + var left = band.From * cw; + var right = band.Columns is null ? width : band.To(frame.Width) * cw; + canvas.Save(); - canvas.ClipRect(new SKRect(0, 0, width, top)); + canvas.ClipRect(new SKRect(0, 0, width, height)); + canvas.ClipRect(new SKRect(left, top, right, height), SKClipOperation.Difference); renderer.Render(canvas, frame, pictures); canvas.Restore(); - var field = FieldRect(band, cw, ch, frame.Width, s); - var fill = renderer.Background(frame[Math.Min(frame.Width - 1, band.Pad), band.Top].Background); using var paint = new SKPaint { IsAntialias = true }; + if (band.Columns is not null && frame.Height > 0) + { + // Under the grid beside the band, the pixels the field's padding takes: the last row's own planes, carried down. + var gridBottom = frame.Height * ch; + for (var x = 0; x < frame.Width && gridBottom < height; x++) + { + if (!band.Spans(x, frame.Width)) + { + paint.Color = renderer.Background(frame[x, frame.Height - 1].Background); + canvas.DrawRect(x * cw, gridBottom, x == frame.Width - 1 ? width - (x * cw) : cw, height - gridBottom, paint); + } + } + } + + var field = FieldRect(band, cw, ch, frame.Width, s); + var fill = renderer.Background(frame[Math.Min(frame.Width - 1, band.From + band.Pad), band.Top].Background); paint.Color = plane; - canvas.DrawRect(0, top, width, height - top, paint); + canvas.DrawRect(left, top, right - left, height - top, paint); paint.Color = Mix(plane, renderer.DefaultForeground, 0.10f); - canvas.DrawRect(0, top, width, Math.Max(1, s), paint); + canvas.DrawRect(left, top, right - left, Math.Max(1, s), paint); var radius = (float)(NativeTokens.RadiusM * scale); var rounded = new SKRoundRect(field, radius); @@ -1038,10 +1074,10 @@ private void RenderWithField(SKCanvas canvas, InputBand band) canvas.Translate(0, (float)(NativeLayout.FieldTop * scale)); // The bars' rows only, and not the client's right padding, whose colour is the margin's rather than the band's. - var textRight = (frame.Width - band.Pad) * cw; + var textRight = (band.To(frame.Width) - band.Pad) * cw; if (bars.Count == 0) { - canvas.ClipRect(new SKRect(0, top, textRight, (band.Top + band.Rows) * ch)); + canvas.ClipRect(new SKRect(left, top, textRight, (band.Top + band.Rows) * ch)); renderer.Render(canvas, frame, pictures); } else @@ -1053,7 +1089,7 @@ private void RenderWithField(SKCanvas canvas, InputBand band) var shift = (float)(bar.Shift * scale); var meet = (bar.TextStart * cw) - shift; canvas.Save(); - canvas.ClipRect(new SKRect(0, bar.Top * ch, meet, bar.End * ch)); + canvas.ClipRect(new SKRect(left, bar.Top * ch, meet, bar.End * ch)); renderer.Render(canvas, frame, pictures); canvas.Restore(); @@ -1082,7 +1118,7 @@ public void Dispose() } /// - /// The field's rectangle in device pixels: inset from the grid's edges so the client's band-coloured padding columns + /// The field's rectangle in device pixels: inset from the band's edges so the client's band-coloured padding columns /// are its inner padding, from the strip's top padding to below the last row. /// internal static SKRect FieldRect(InputBand band, int cw, int ch, int columns, float scale) @@ -1092,7 +1128,7 @@ internal static SKRect FieldRect(InputBand band, int cw, int ch, int columns, fl var inset = MathF.Round(Math.Max(4 * scale, Math.Min((float)(NativeLayout.FieldSide * scale), (band.Pad * cw) - (float)(NativeTokens.Space8 * scale)))); var top = (band.Top * ch) + MathF.Round((float)(NativeLayout.FieldOuter * scale)); var bottom = ((band.Top + band.Rows) * ch) + MathF.Round((float)((NativeLayout.FieldTop + NativeLayout.FieldInner) * scale)); - return new SKRect(inset, top, (columns * cw) - inset, bottom); + return new SKRect((band.From * cw) + inset, top, (band.To(columns) * cw) - inset, bottom); } /// @@ -1102,21 +1138,25 @@ internal static SKRect FieldRect(InputBand band, int cw, int ch, int columns, fl private void DrawFieldText(DrawingContext context, ScreenFrame frame, InputBand band, IReadOnlyList bars) { var cell = CellSize; + + // The band's first column inside its padding, and one past its last: the whole grid, or the output's column. + var at = band.From + band.Pad; + var end = band.To(frame.Width); foreach (var prompt in band.Prompts) { var text = prompt.Text.TrimEnd(); - if (text.Length == 0 || prompt.Row < 0 || prompt.Row >= frame.Height || band.Pad >= frame.Width) + if (text.Length == 0 || prompt.Row < 0 || prompt.Row >= frame.Height || at >= end) { continue; } - var first = frame[band.Pad, prompt.Row]; - var ink = Ink(frame, band.Pad, prompt.Row, text.Length); + var first = frame[at, prompt.Row]; + var ink = Ink(frame, at, prompt.Row, text.Length); // The plate hides the prompt's mono cells up to where the shifted text begins (BarsOf), never over that text. - var cells = Math.Min(text.Length, frame.Width - band.Pad) * cell.Width; - var room = Math.Min(prompt.Text.Length, frame.Width - band.Pad) * cell.Width; + var cells = Math.Min(text.Length, end - at) * cell.Width; + var room = Math.Min(prompt.Text.Length, end - at) * cell.Width; var shift = bars.FirstOrDefault(b => b.Top == prompt.Row).Shift; - var plate = new Rect(band.Pad * cell.Width, RowTop(prompt.Row), Math.Max(0, room - shift), cell.Height); + var plate = new Rect(at * cell.Width, RowTop(prompt.Row, at), Math.Max(0, room - shift), cell.Height); context.FillRectangle(Brush(_renderer.Background(first.Background)), plate); var formatted = PromptText(text, ink, cells + (2 * cell.Width)); @@ -1124,7 +1164,7 @@ private void DrawFieldText(DrawingContext context, ScreenFrame frame, InputBand context.DrawText(formatted, new Point(Math.Round(plate.X), plate.Y + ((cell.Height - formatted.Height) / 2))); } - if (band.Hint.Length == 0 || band.Top >= frame.Height) + if (band.Hint.Length == 0 || band.Top >= frame.Height || at >= end) { return; } @@ -1132,15 +1172,15 @@ private void DrawFieldText(DrawingContext context, ScreenFrame frame, InputBand var hint = new FormattedText( NativeKeys.Words(band.Hint), System.Globalization.CultureInfo.CurrentCulture, FlowDirection.LeftToRight, new Typeface(NativeTokens.UiFont), NativeTokens.Small, Brush(SKColors.White)); - var right = (frame.Width - band.Pad) * cell.Width; + var right = (end - band.Pad) * cell.Width; var from = Math.Max(0, (int)Math.Floor((right - hint.Width) / cell.Width) - 2); - var promptEnd = band.Pad + (band.Prompts.FirstOrDefault(p => p.Row == band.Top)?.Text.Length ?? 0); + var promptEnd = at + (band.Prompts.FirstOrDefault(p => p.Row == band.Top)?.Text.Length ?? 0); if (from <= promptEnd || frame.Caret is { Visible: true } caret && caret.Y == band.Top && caret.X >= from) { return; } - for (var x = from; x < frame.Width - band.Pad; x++) + for (var x = from; x < end - band.Pad; x++) { if (frame[x, band.Top].Rune.Value != ' ') { @@ -1148,9 +1188,9 @@ private void DrawFieldText(DrawingContext context, ScreenFrame frame, InputBand } } - var bandColour = _renderer.Background(frame[band.Pad, band.Top].Background); + var bandColour = _renderer.Background(frame[at, band.Top].Background); hint.SetForegroundBrush(Brush(Mix(bandColour, _renderer.DefaultForeground, 0.6f))); - context.DrawText(hint, new Point(right - hint.Width, RowTop(band.Top) + ((cell.Height - hint.Height) / 2))); + context.DrawText(hint, new Point(right - hint.Width, RowTop(band.Top, at) + ((cell.Height - hint.Height) / 2))); } /// The ink of the first non-blank cell of a run, the run's own colour. diff --git a/src/SharpMUTerm.Core/Workspace/InputColumn.cs b/src/SharpMUTerm.Core/Workspace/InputColumn.cs new file mode 100644 index 00000000..26880871 --- /dev/null +++ b/src/SharpMUTerm.Core/Workspace/InputColumn.cs @@ -0,0 +1,80 @@ +namespace SharpMUTerm.Core.Workspaces; + +/// +/// Which part of the pane tree the command line sits under, for a host that puts it in the output's column rather than +/// across the whole window (the desktop window, as its mockups draw it: the side column runs down to the footer and +/// the command line is as wide as the output above it). +/// +/// The answer is a node of the tree, and the bars go under it. It is found from an anchor pane — the pane +/// the output is in — by walking down from the root and stopping at the first node the bars cannot go further into +/// while still touching the bottom of the pane area: +/// +/// +/// a pane is the answer; +/// side by side (), every child reaches the bottom, so the walk goes into the +/// anchor's child — unless another child holds output too (two characters side by side), and then the bars span the +/// split, because neither column is the output column; +/// stacked (), only the last child reaches the bottom, so the walk goes into +/// it only when the anchor is there; otherwise the split is the answer (the output with a quick bar under it). +/// +/// +/// Nothing here reads focus. Moving the selection between panes must not move a pane rectangle — every connected +/// server would be told a new size — so the column is a property of the arrangement, not of where the keyboard is. +/// +/// +public static class InputColumn +{ + /// + /// The node the command line goes under: the root when there is no anchor in the tree. + /// + /// The pane tree. + /// The pane the output is in, or null. + /// Whether a pane holds output of its own (a character's window), as opposed to furniture. + public static LayoutNode Target(LayoutNode root, string? anchorPaneId, Func holdsOutput) + { + ArgumentNullException.ThrowIfNull(root); + ArgumentNullException.ThrowIfNull(holdsOutput); + if (anchorPaneId is null || !root.Panes().Any(p => p.Id == anchorPaneId)) + { + return root; + } + + var node = root; + while (node is SplitNode split) + { + var index = split.Children.FindIndex(c => c.Panes().Any(p => p.Id == anchorPaneId)); + if (split.Direction == SplitDirection.Row) + { + var sharing = split.Children.Where((c, i) => i != index && c.Panes().Any(holdsOutput)).Any(); + if (sharing) + { + return split; + } + } + else if (index != split.Children.Count - 1) + { + return split; + } + + node = split.Children[index]; + } + + return node; + } + + /// + /// The pane the command line is anchored to: (the live layout's output pane) when it is + /// in the tree, else the first pane in pane order that holds output, else none. + /// + public static string? Anchor(WorkspaceLayout layout, string? preferred, Func holdsOutput) + { + ArgumentNullException.ThrowIfNull(layout); + ArgumentNullException.ThrowIfNull(holdsOutput); + if (preferred is not null && layout.FindPane(preferred) is not null) + { + return preferred; + } + + return layout.Panes.FirstOrDefault(holdsOutput)?.Id; + } +} diff --git a/src/SharpMUTerm.Tui/Hosting/ClientHost.cs b/src/SharpMUTerm.Tui/Hosting/ClientHost.cs index 5f07cce8..1144503c 100644 --- a/src/SharpMUTerm.Tui/Hosting/ClientHost.cs +++ b/src/SharpMUTerm.Tui/Hosting/ClientHost.cs @@ -331,7 +331,13 @@ internal static ClientHost HarnessTerminal( /// the whole pane), so output starts the mockup's ~20 px in from the pane's edges. The cells are ones the pane really /// loses: the output rectangles, and so NAWS, are the smaller ones. /// -internal sealed record HostChrome(bool Header, bool Rail, bool Status = false, bool Input = false, bool Tabs = false, bool PaneGutter = false) +/// +/// The command line (its prompt row and both bars) is a row of the output's column rather than a band across every pane: +/// as wide as the column the output is in (), with the panes beside +/// it running down to the status row. Only cells move; the pane rectangles, and so NAWS, are what is arranged. +/// +internal sealed record HostChrome( + bool Header, bool Rail, bool Status = false, bool Input = false, bool Tabs = false, bool PaneGutter = false, bool InputInColumn = false) { /// The client draws all of its chrome in cells: the terminal, the snapshot, the tests. public static HostChrome None { get; } = new(false, false); @@ -341,9 +347,9 @@ internal sealed record HostChrome(bool Header, bool Rail, bool Status = false, b /// /// The host draws the header, the rail, the status footer, the command line's field and every pane's tab strip, and - /// the client pads every pane with a gutter: the desktop window. + /// the client pads every pane with a gutter and puts the command line in the output's column: the desktop window. /// - public static HostChrome Desktop { get; } = new(true, true, true, true, true, true); + public static HostChrome Desktop { get; } = new(true, true, true, true, true, true, true); /// The same arrangement as ; the name the tab strip's tests use. public static HostChrome Native => Desktop; diff --git a/src/SharpMUTerm.Tui/InputLayout.cs b/src/SharpMUTerm.Tui/InputLayout.cs index 5305580c..2d4eaf14 100644 --- a/src/SharpMUTerm.Tui/InputLayout.cs +++ b/src/SharpMUTerm.Tui/InputLayout.cs @@ -32,7 +32,7 @@ internal static class InputLayout /// The band-coloured columns a command line leaves at each end of its rows when the host draws its field /// (): the field's inner padding, inside the frame the host draws. /// - internal const int HostFieldPad = 3; + internal const int HostFieldPad = 4; /// /// Breaks into the rows it occupies at columns. diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Footer.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Footer.cs index 077fe3ec..641e4c69 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Footer.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Footer.cs @@ -193,6 +193,14 @@ private void PublishInputBand() var rows = _input.ActualHeight + (_second.Visible ? _second.ActualHeight : 0); var top = _system.ConsoleDriver.ScreenSize.Height - rows - (_statusBar.Visible ? Math.Max(0, _statusBar.ActualHeight) : 0); + int? left = null, columns = null; + + // In the output's column (HostChrome.InputInColumn) the bars are where they were arranged, not across the bottom. + if (Host.Chrome.InputInColumn && BoundsOf(_input) is { } box) + { + (top, left, columns) = (box.Y, box.X, box.Width); + } + if (top <= 0) { return null; @@ -204,7 +212,11 @@ private void PublishInputBand() prompts.Add(new InputPrompt(top + _input.ActualHeight, MarkupParser.Remove(_second.Prompt))); } - return new InputBand(top, rows, InputLayout.HostFieldPad, prompts, $"⏎ sends · {KeyGlyphs.Normalize(Host.Keys.Newline.Glyph)} new line"); + return new InputBand(top, rows, InputLayout.HostFieldPad, prompts, $"⏎ sends · {KeyGlyphs.Normalize(Host.Keys.Newline.Glyph)} new line") + { + Left = left, + Columns = columns, + }; } } @@ -229,10 +241,28 @@ internal sealed record InputPrompt(int Row, string Text); /// The newline hint, in the cells' glyphs, for the host to draw where the first row is blank. internal sealed record InputBand(int Top, int Rows, int Pad, IReadOnlyList Prompts, string Hint) { + /// + /// The first column of the bars, when they are a row of the output's column (); + /// null when they span the grid from column 0. + /// + public int? Left { get; init; } + + /// How many columns the bars span, or null for the whole grid's width. + public int? Columns { get; init; } + + /// The first column of the bars. + public int From => Left ?? 0; + + /// One past the bars' last column, in a grid wide. + public int To(int width) => Columns is { } columns ? Math.Min(width, From + columns) : width; + + /// Whether column is under the bars: from down, the rows are theirs there. + public bool Spans(int x, int width) => x >= From && x < To(width); + /// public bool Equals(InputBand? other) => other is not null && Top == other.Top && Rows == other.Rows && Pad == other.Pad && Hint == other.Hint - && Prompts.SequenceEqual(other.Prompts); + && Left == other.Left && Columns == other.Columns && Prompts.SequenceEqual(other.Prompts); /// public override int GetHashCode() => HashCode.Combine(Top, Rows, Pad, Hint); diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index d4ee5699..0c0d38a3 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -869,9 +869,6 @@ public SharpMUTermApp( // The pane area renders the workspace's split tree (one TabControl per leaf pane). It's built // from the model and rebuilt whenever the layout changes; the initial row goes into the window. // A narrow terminal starts with the rail folded (SyncNarrowLayout), so the first row is built that way. - SyncNarrowLayout(); - _workspaceRow = BuildWorkspaceRow(); - // The input area is one or two bars pinned above the status line. Each paints its own full-width // band (see InputBarControl), so the row reads as solid from the prompt to the right edge with // no gap where a label ends. Draft-safe history is ours (InputHistory) and per bar. @@ -879,12 +876,6 @@ public SharpMUTermApp( SetUpBar(_second, InputBar.Secondary); _second.Visible = false; - _statusBar = Controls.Markup("[dim]not connected[/]").StickyBottom().Build(); - - // A host that draws the status row itself (the window's footer) gets no cell for it: a hidden sticky band takes - // no row, and ChromeRows counts none, so the bars and the panes have the row. - _statusBar.Visible = !host.Chrome.Status; - // Sticky-bottom, added ahead of the bars so it sits above them, and hidden until a prompt // arrives: most sessions never see one, and a permanently blank row would cost every pane a // row for nothing. @@ -892,6 +883,22 @@ public SharpMUTermApp( _promptRow.HorizontalAlignment = HorizontalAlignment.Stretch; _promptRow.Visible = false; + // A host that puts the command line in the output's column (the window) gets the prompt row and the bars as rows + // of the pane area instead (see WithInputBars), so they are built before it. + if (host.Chrome.InputInColumn) + { + _promptRow.StickyPosition = StickyPosition.None; + } + + SyncNarrowLayout(); + _workspaceRow = BuildWorkspaceRow(); + + _statusBar = Controls.Markup("[dim]not connected[/]").StickyBottom().Build(); + + // A host that draws the status row itself (the window's footer) gets no cell for it: a hidden sticky band takes + // no row, and ChromeRows counts none, so the bars and the panes have the row. + _statusBar.Visible = !host.Chrome.Status; + // The window paints the backdrop, not the text background: everything that is not a pane — the // connection rail, the status line, the gaps a split leaves — sits on it, so the panes read as // raised surfaces and an empty one is still a visible rectangle. See WorkspacePalette. @@ -920,12 +927,19 @@ public SharpMUTermApp( .WithColors(fg, bg) .AddControl(_header) .AddControl(_workspaceRow) - .AddControl(_promptRow) - .AddControl(_input) - .AddControl(_second) - .AddControl(_statusBar) .Build(); + // The bars are the window's sticky band across every pane, unless the host puts them in the output's column, where + // the pane area holds them (WithInputBars). The status row is sticky either way. + if (!host.Chrome.InputInColumn) + { + _window.AddControl(_promptRow); + _window.AddControl(_input); + _window.AddControl(_second); + } + + _window.AddControl(_statusBar); + // Nothing in this window scrolls as a window — every pane scrolls inside its own viewport — and a // frameless scrollable window reserves a scrollbar column whenever its content is taller than it is. // A shrinking terminal (or a desktop window coming back from maximised) passes through exactly that @@ -6002,7 +6016,8 @@ private bool AnyBarHasText() => /// private void SetUpBar(InputBarControl bar, InputBar kind) { - bar.StickyPosition = StickyPosition.Bottom; + // A row of the output's column where the host puts the bars there (WithInputBars), else the window's sticky band. + bar.StickyPosition = Host.Chrome.InputInColumn ? StickyPosition.None : StickyPosition.Bottom; bar.HorizontalAlignment = HorizontalAlignment.Stretch; // Both bands come from the theme through WorkspacePalette, so the armed bar is lit by the very // same tone as the focused pane and the idle one sits on the same recessed plane as the rest of @@ -10943,8 +10958,12 @@ private IWindowControl BuildWorkspaceRow() // When a pane is zoomed, render just that pane full-area; otherwise render the whole tree. var zoomed = _workspace.Layout.ZoomedPaneId is { } zid ? _workspace.Layout.FindPane(zid) : null; + DetachInputBars(); + _inputTarget = Host.Chrome.InputInColumn + ? zoomed ?? InputColumn.Target(_workspace.Layout.Root, InputAnchorPane(), HoldsOutput) + : null; var paneArea = zoomed is not null - ? OnSurface(BuildPaneTabs(zoomed), zoomed.Id) + ? WithInputBars(OnSurface(BuildPaneTabs(zoomed), zoomed.Id), zoomed) : BuildLayoutNode(_workspace.Layout.Root); PublishHeaderDividers(); @@ -11494,7 +11513,80 @@ internal static int MarkupWidth(string markup) /// becomes a proportional grid (columns for a row split, rows for a /// column split) with a draggable splitter between children. /// - private IWindowControl BuildLayoutNode(SharpMUTerm.Core.Workspaces.LayoutNode node) + private IWindowControl BuildLayoutNode(SharpMUTerm.Core.Workspaces.LayoutNode node) => + WithInputBars(BuildLayoutNodeAlone(node), node); + + /// + /// The node the command line sits under, for a host that puts it in the output's column + /// (); null for one that keeps it across the window. Set on every rebuild. + /// + private SharpMUTerm.Core.Workspaces.LayoutNode? _inputTarget; + + /// The grid holding the bars under , so a rebuild can take them out before it is disposed. + private GridControl? _inputColumn; + + /// + /// The pane the output is in: the live layout's output pane while it owns the panes, else the first pane holding a + /// character's own window. Read by , never focus, so moving the selection moves no pane. + /// + private string? InputAnchorPane() => + InputColumn.Anchor( + _workspace.Layout, + _liveLayout?.PanelPanes.GetValueOrDefault(SharpMUTerm.Core.Layouts.PanelIds.Output), + HoldsOutput); + + /// Whether a pane holds a character's own window: output, as opposed to a panel, the map or a capture. + private bool HoldsOutput(PaneNode pane) => + pane.Tabs.Any(id => _workspace.FindWindow(id) is { Kind: WindowKind.Main }); + + /// + /// , with the prompt row and the command lines as rows under it when + /// is : the output's column ends in the bars, and every pane beside it runs down to the + /// status row. The rows are the bars' own measure (Auto), so a bar growing as it wraps takes rows from this column + /// only, and the pane rectangles — and so NAWS — are what is arranged. + /// + private IWindowControl WithInputBars(IWindowControl control, SharpMUTerm.Core.Workspaces.LayoutNode node) + { + if (_inputTarget is null || !ReferenceEquals(node, _inputTarget)) + { + return control; + } + + var grid = Controls.Grid() + .WithAlignment(HorizontalAlignment.Stretch) + .WithVerticalAlignment(VerticalAlignment.Fill) + .Rows(GridLength.Star(1), GridLength.Auto(), GridLength.Auto(), GridLength.Auto()) + .Columns(GridLength.Star(1)); + grid.Place(control, 0, 0, 1, 1); + grid.Place(_promptRow, 1, 0, 1, 1); + grid.Place(_input, 2, 0, 1, 1); + grid.Place(_second, 3, 0, 1, 1); + var built = grid.Build(); + built.BackgroundColor = BackdropColor(); + _inputColumn = built; + return built; + } + + /// + /// Takes the prompt row and the bars out of the grid that held them, ahead of a rebuild: the old pane area is disposed + /// once it is swapped out, and the bars live for the life of the app. + /// + private void DetachInputBars() + { + if (_inputColumn is not { } grid) + { + return; + } + + foreach (var control in new IWindowControl[] { _promptRow, _input, _second }) + { + grid.RemoveControl(control); + } + + _inputColumn = null; + } + + private IWindowControl BuildLayoutNodeAlone(SharpMUTerm.Core.Workspaces.LayoutNode node) { if (node is PaneNode pane) { diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativeFooterTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativeFooterTests.cs index ab6ddf0c..71253fe7 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/NativeFooterTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/NativeFooterTests.cs @@ -78,6 +78,19 @@ [new StatusSegment(StatusRole.Palette, [new("⌃P palette", "#cccccc", false, He await Assert.That(clicked.First()).IsEqualTo(HeaderModel.PaletteTarget); } + [Test] + public async Task InTheOutputsColumnTheFieldIsAsWideAsTheColumn() + { + var band = new InputBand(20, 1, InputLayout.HostFieldPad, [new InputPrompt(20, "Corvid ›")], "⏎ sends") { Left = 10, Columns = 50 }; + var rect = TerminalView.FieldRect(band, 10, 20, 80, 1f); + + await Assert.That((double)rect.Left).IsEqualTo(100 + NativeLayout.FieldSide); + await Assert.That((double)rect.Right).IsEqualTo(600 - NativeLayout.FieldSide); + await Assert.That(band.Spans(9, 80)).IsFalse(); + await Assert.That(band.Spans(10, 80)).IsTrue(); + await Assert.That(band.Spans(60, 80)).IsFalse(); + } + [Test] public async Task TheFieldIsInsetFromTheGridAndFramesTheBarsRows() { @@ -87,8 +100,8 @@ public async Task TheFieldIsInsetFromTheGridAndFramesTheBarsRows() // The mockup's 20 px from the grid's edge, leaving the field its 8 px inner padding before the prompt's column. await Assert.That((double)rect.Left).IsEqualTo(NativeLayout.FieldSide); await Assert.That((double)rect.Right).IsEqualTo(800 - NativeLayout.FieldSide); - var tight = TerminalView.FieldRect(band, 8, 20, 80, 1f); - await Assert.That((double)tight.Left).IsEqualTo((3 * 8) - NativeTokens.Space8).Because("narrow cells keep the inner padding"); + var tight = TerminalView.FieldRect(band, 6, 20, 80, 1f); + await Assert.That((double)tight.Left).IsEqualTo((InputLayout.HostFieldPad * 6) - NativeTokens.Space8).Because("narrow cells keep the inner padding"); var scaled = TerminalView.FieldRect(band, 13, 25, 80, 1.25f); await Assert.That(scaled.Left % 1).IsEqualTo(0f).Because("a field edge on a whole device pixel at 125%"); await Assert.That(scaled.Top % 1).IsEqualTo(0f); diff --git a/tests/SharpMUTerm.Core.Tests/Workspace/InputColumnTests.cs b/tests/SharpMUTerm.Core.Tests/Workspace/InputColumnTests.cs new file mode 100644 index 00000000..77784137 --- /dev/null +++ b/tests/SharpMUTerm.Core.Tests/Workspace/InputColumnTests.cs @@ -0,0 +1,58 @@ +using SharpMUTerm.Core.Workspaces; + +namespace SharpMUTerm.Core.Tests.Workspaces; + +/// Where the command line goes when a host puts it in the output's column (). +public class InputColumnTests +{ + private static bool Output(PaneNode pane) => pane.Tabs.Any(t => t.StartsWith("main", StringComparison.Ordinal)); + + [Test] + public async Task ASideColumnOfFurnitureRunsDownBesideTheBars() + { + // Roleplay: the output (with Chat behind it) beside a column of composer over who is here. + var output = new PaneNode("out", ["main", "chat"]); + var side = new SplitNode(SplitDirection.Column, [new PaneNode("compose", ["panel:composer"]), new PaneNode("who", ["panel:who"])]); + var root = new SplitNode(SplitDirection.Row, [output, side]); + + await Assert.That(InputColumn.Target(root, "out", Output)).IsSameReferenceAs(output); + } + + [Test] + public async Task AStripUnderTheOutputIsInsideTheColumn() + { + // Combat: the output over a quick bar, beside the vitals over the map with Chat behind it — a capture is not output. + var column = new SplitNode(SplitDirection.Column, [new PaneNode("out", ["main"]), new PaneNode("quick", ["panel:quick"])]); + var side = new SplitNode(SplitDirection.Column, [new PaneNode("vitals", ["panel:vitals"]), new PaneNode("map", ["map:x", "chat"])]); + var root = new SplitNode(SplitDirection.Row, [column, side]); + + await Assert.That(InputColumn.Target(root, "out", Output)).IsSameReferenceAs(column); + } + + [Test] + public async Task AStripAcrossTheTopIsPassedThrough() + { + var output = new PaneNode("out", ["main"]); + var row = new SplitNode(SplitDirection.Row, [output, new PaneNode("map", ["map:x"])]); + var root = new SplitNode(SplitDirection.Column, [new PaneNode("vitals", ["panel:vitals"]), row]); + + await Assert.That(InputColumn.Target(root, "out", Output)).IsSameReferenceAs(output); + } + + [Test] + public async Task TwoCharactersSideBySideShareTheBars() + { + var root = new SplitNode(SplitDirection.Row, [new PaneNode("a", ["main:a"]), new PaneNode("b", ["main:b"])]); + + await Assert.That(InputColumn.Target(root, "a", Output)).IsSameReferenceAs(root); + } + + [Test] + public async Task NoAnchorMeansTheWholeArea() + { + var root = new SplitNode(SplitDirection.Row, [new PaneNode("a", ["main"]), new PaneNode("b", ["panel:who"])]); + + await Assert.That(InputColumn.Target(root, null, Output)).IsSameReferenceAs(root); + await Assert.That(InputColumn.Target(root, "gone", Output)).IsSameReferenceAs(root); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/InputColumnLayoutTests.cs b/tests/SharpMUTerm.Tui.Tests/InputColumnLayoutTests.cs new file mode 100644 index 00000000..0baf326e --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/InputColumnLayoutTests.cs @@ -0,0 +1,98 @@ +using SharpConsoleUI.Drivers; +using SharpMUTerm.Graphics; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// A host that puts the command line in the output's column (, the window) gets +/// the bars as wide as the output above them, the side column running down to the status row, and NAWS following the +/// pane rectangles that are really arranged; moving the selection between panes still moves none of them. +/// +/// Serialised: rendering a frame redirects the process-global Console.Out. +[NotInParallel] +public class InputColumnLayoutTests +{ + private const int Width = 120; + private const int Height = 32; + + private static readonly TerminalCapabilities Caps = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private static readonly HostChrome InColumn = HostChrome.None with { Input = true, InputInColumn = true }; + + private static SharpMUTermApp App(HostChrome chrome, string view) + { + Console.SetIn(TextReader.Null); + var host = ClientHost.Headless(new HeadlessConsoleDriver(Width, Height), Caps) with { Chrome = chrome }; + var app = new SharpMUTermApp(DemoScene.Build(), host); + app.RenderSnapshot(view); + app.RenderNextFrame(); + return app; + } + + private static ConsoleKeyInfo Ctrl(ConsoleKey key) => new('\0', key, false, false, true); + + [Test] + [Arguments("layout-roleplay")] + [Arguments("layout-combat")] + public async Task TheBarsAreAsWideAsTheOutputColumnAndTheSideColumnRunsToTheStatusRow(string view) + { + await using var app = App(InColumn, view); + var band = app.InputBandNow(); + await Assert.That(band).IsNotNull(); + await Assert.That(band!.Left).IsNotNull(); + await Assert.That(band.Columns!.Value).IsLessThan(Width - 20); + + var rects = app.PaneOutputRects(); + var bottom = Height - app.LaidOutRows.Status; + + // The output pane sits above the bars, inside their columns. + var output = rects.Values.Where(r => r.X >= band.From && r.X < band.To(Width)).ToList(); + await Assert.That(output).IsNotEmpty(); + await Assert.That(output.All(r => r.Y + r.Height <= band.Top)).IsTrue(); + + // Every pane beside the bars reaches further down than they start: the side column runs past them. + var beside = rects.Values.Where(r => r.X >= band.To(Width)).ToList(); + await Assert.That(beside).IsNotEmpty(); + await Assert.That(beside.Max(r => r.Y + r.Height)).IsGreaterThan(band.Top); + await Assert.That(band.Top + band.Rows).IsEqualTo(bottom); + + // The caret is on the bar, inside its columns. + var caret = app.CaretOnScreen(); + await Assert.That(caret.Visible).IsTrue(); + await Assert.That(caret.Y).IsEqualTo(band.Top); + await Assert.That(caret.X).IsGreaterThanOrEqualTo(band.From).And.IsLessThan(band.To(Width)); + } + + [Test] + public async Task MovingTheSelectionMovesNoPaneRectangle() + { + await using var app = App(InColumn, "layout-roleplay"); + var before = app.PaneOutputRects().ToDictionary(p => p.Key, p => p.Value, StringComparer.Ordinal); + var band = app.InputBandNow(); + var first = app.FocusedPaneId; + + app.SimulateKey(Ctrl(ConsoleKey.RightArrow)); + app.RenderNextFrame(); + + await Assert.That(app.FocusedPaneId).IsNotEqualTo(first); + var after = app.PaneOutputRects(); + foreach (var (paneId, rect) in before) + { + await Assert.That(after[paneId]).IsEqualTo(rect); + } + + await Assert.That(app.InputBandNow()?.Left).IsEqualTo(band?.Left); + } + + [Test] + public async Task TheTerminalKeepsTheBarsAcrossEveryPane() + { + await using var cells = App(HostChrome.None with { Input = true }, "layout-roleplay"); + var band = cells.InputBandNow(); + await Assert.That(band).IsNotNull(); + await Assert.That(band!.Left).IsNull(); + await Assert.That(band.Columns).IsNull(); + } +} From bfdd3aa4d9dccdaedadf381166e7f66b5742e518 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 20:05:45 +0000 Subject: [PATCH 078/113] Wave 22 C: the window's map, header and status row as the mockups draw them The native map: dark rooms outlined in a rule, exits as rules, the current room an accent ring with @, look buttons at the small control height, the legend a strip at the foot above MapViewModel.Hint, and the fit keeps every room clear of both. The native header drops the counts and sinks its search box; the footer draws the status row's compact form (StatusOverlay.Compact: connection, UTF-8, Log off, and one hint such as "2 new in Chat"), the full row while a notice holds it. Terminal frames are unchanged. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 7 + CLAUDE.md | 17 ++ src/SharpMUTerm.Avalonia/MapCanvas.cs | 257 ++++++++++++------ src/SharpMUTerm.Avalonia/NativeChrome.cs | 39 ++- src/SharpMUTerm.Avalonia/NativeFooter.cs | 16 +- src/SharpMUTerm.Client/Chrome/StatusModel.cs | 6 + src/SharpMUTerm.Client/Panels/MapViewModel.cs | 12 + .../Pointer/SharpMUTermApp.Footer.cs | 112 +++++++- .../NativeMapViewTests.cs | 39 +++ .../SurfaceParityTests.cs | 28 ++ .../PanelModelTests.cs | 6 + 11 files changed, 423 insertions(+), 116 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ea6a5a2..fba49bb6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,13 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- In the desktop window, the map is drawn the way the mockups draw it: dark rooms outlined in a rule, exits as thin lines, + your room ringed in the accent with an `@`, Up/Down/Areas as proper buttons, and the legend in a strip at the foot with + "Click a room to walk there" under it, so it never covers a room. +- In the desktop window, the header shows only the search box and your character, and the status bar reads + "Corvid connected · UTF-8 · Log off" with a short hint on the right such as "2 new in Chat" (or the keys of the mode + you are in). Notices still take the whole bar while they show. + - The package review keeps ⏎ install and Esc cancel on screen at 80×24: the review scrolls (↑↓ PgUp PgDn Home End) under its keys and stops above the command line. - Browse worlds: a world listed at several addresses (TLS and plain, another port, an old one) now lets you choose diff --git a/CLAUDE.md b/CLAUDE.md index a4209e2e..975bc9b9 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -1728,6 +1728,23 @@ draws ⌃P natively (`INativePalette`, null for the cell popup), whether it draw field, the row shift and the press mapping only in those columns, and carries the panes and dividers beside it down through the `FieldReserve` pixels. NAWS is the arranged rectangles. The terminal keeps the full-width band (`None`), so its frames and the parity harness (which tells both hosts the same chrome) are unchanged. + - **At rest the footer draws the row's compact form** (wave 22; `StatusOverlay.Compact`/`Shown`, `CompactStatus`): left the + identity segment (the cell row's instance), `UTF-8` (`CompactEncoding`) and `Log off`/`Log html` (`HeaderLogFormat`, + `StatusRole.Log`); right scrolled back (not in a split, whose native band says it), `● REC`, `♪ muted`, then one hint — + the mode's keys (not `SplitScrollback`) else `2 new in Chat` (`UnreadHint`, `StatusRole.Activity`, the active + character's windows by unread). A notice or a move/drag prompt sets it null and the footer draws `Model` whole. The cells + keep the full row (meters, room, count, focus keys): the window draws those as panels, tabs and its search box. `Model` + is still what `Drawing` recorded; parity probes compare it, `TheFootersCompactRowIsTheRowsFactsInTheMockupsWords` pins + the compact one. **The native header draws no counts** (`1/3 characters · LOG off`): the brand, the sunk search box + (`NativeChromeView.Sunk`) and the character pill, as the mockups; `HeaderModel` still carries them for the cell ribbon. +- **The native map is the mockup's** (wave 22, `MapCanvas`). Rooms are the pane's plane a step lighter (`Mix(plane, text, + 0.07)`) with a rule round them (`RuleColour`, 0.24), half a step wide; exits are that rule; the character's room is the + accent at 20% with a 2 px accent ring and `@` (`YouGlyph`) in mono when the game gives no symbol. The area colour is the + heading's mark, the legend and the spurs only. The look buttons are `ControlHeightSmall` with `RadiusControl`. The + legend is a wrapped strip at the foot above `MapViewModel.Hint` (`WalkHint`/`EditHint`, Client, null while walking or with + one room), and the fit reserves both and the buttons (`TopReserve`/`BottomReserve`), so nothing covers a fitted room + (`TheFittedRoomsAreClearOfTheButtonsTheLegendAndTheHint`). The current-room line under the heading is gone (its name is + under its box). The cell map is unchanged. - **The window draws pane dividers as the panes meeting at a hairline** (`IPointerPresenter.Dividers`, `PaneDividerOverlay`, `DividersNow`; `ScreenFrame.Dividers`; `TerminalView.FrameDraw.DrawDividers`). The client publishes each divider control's cells and whether it is lit (never a tab strip standing in for one, nothing under a modal) on diff --git a/src/SharpMUTerm.Avalonia/MapCanvas.cs b/src/SharpMUTerm.Avalonia/MapCanvas.cs index 3c57e57a..8cdc1167 100644 --- a/src/SharpMUTerm.Avalonia/MapCanvas.cs +++ b/src/SharpMUTerm.Avalonia/MapCanvas.cs @@ -78,6 +78,7 @@ internal sealed class MapCanvas : Control private Vector _panAtPress; private bool _dragging; private long? _hovered; + private string? _buttonHovered; public MapCanvas(TerminalView view) { @@ -182,7 +183,11 @@ private Point Middle } } - private double RoomSize => Math.Max(5, Spacing * Zoom * 0.56); + /// + /// A room's side: about half the step between rooms (the mockup draws 32 px rooms 90 px apart; names under them need the room), so the exits read + /// as lines between boxes rather than boxes touching. + /// + private double RoomSize => Math.Max(5, Spacing * Zoom * 0.48); /// /// Fits the area to the canvas: the rooms within steps of the character's, centred in the open @@ -217,12 +222,16 @@ private void Fit() var minY = near.Min(r => r.Y - anchor.Y); var maxY = near.Max(r => r.Y - anchor.Y); var open = Middle.X * 2; - const double top = 44; // the corner label and the walk or room line under it + + // The rooms are fitted between what is drawn above them (the heading, a walk line, the look buttons) and below + // them (the legend and the hint), so neither ever covers a room of the fitted view. + var top = TopReserve(); + var bottom = BottomReserve(Bounds.Size); var across = Math.Max(1, open - 24) / ((maxX - minX + 1.6) * Spacing); - var down = Math.Max(1, Bounds.Height - top - 16) / ((maxY - minY + 1.6) * Spacing); + var down = Math.Max(1, Bounds.Height - top - bottom) / ((maxY - minY + 1.6) * Spacing); _zoom = Math.Clamp(Math.Min(across, down), MinZoom, FitMaxZoom); var step = Spacing * _zoom; - _fit = new Vector(-(minX + maxX) / 2.0 * step, (top / 2) - ((minY + maxY) / 2.0 * step)); + _fit = new Vector(-(minX + maxX) / 2.0 * step, ((top - bottom) / 2) - ((minY + maxY) / 2.0 * step)); } /// The player took the view: the fit stops following, and stays where it was. @@ -348,6 +357,19 @@ protected override void OnPointerMoved(PointerEventArgs e) return; } + var button = LookButtonAt(position); + if (button?.Id != _buttonHovered) + { + _buttonHovered = button?.Id; + Cursor = new Cursor(button is { Enabled: true } ? StandardCursorType.Hand : StandardCursorType.Arrow); + InvalidateVisual(); + } + + if (button is not null) + { + return; + } + var room = RoomAt(position); if (room?.Id != _hovered) { @@ -472,13 +494,12 @@ internal IReadOnlyList LookButtons() } var x = PanelText.Pad; - var heading = PanelText.HeadingHeight(CellHeight); - var y = _model.Walking is not null || _model.Current is not null ? heading + 26 : heading + 8; + var y = UnderHeading(); void Add(string id, string label, bool enabled) { - var width = PanelText.Measure(label, ButtonSize, bold: false) + 14; - buttons.Add(new LookButton(id, new Rect(x, y, width, 20), label, enabled)); - x += width + 4; + var width = PanelText.Measure(label, ButtonSize, bold: false) + (2 * NativeTokens.Space10); + buttons.Add(new LookButton(id, new Rect(x, y, width, ButtonHeight), label, enabled)); + x += width + NativeTokens.Space6; } if (_model.Levels.Count > 1) @@ -500,7 +521,23 @@ void Add(string id, string label, bool enabled) return buttons; } - private const double ButtonSize = 11; + /// The look buttons' type and height: the window's small controls (). + private const double ButtonSize = NativeTokens.Body, ButtonHeight = NativeTokens.ControlHeightSmall; + + /// The first row under the panel heading: the walk line while one is under way, else the look buttons. + private double UnderHeading() => + PanelText.HeadingHeight(CellHeight) + NativeTokens.Space10 + (_model.Walking is not null ? NativeTokens.Space20 : 0); + + /// What is drawn above the rooms: the heading, a walk line, and the look buttons while there are any. + private double TopReserve() + { + var top = UnderHeading(); + return LookButtons().Count > 0 ? top + ButtonHeight + NativeTokens.Space8 : top; + } + + /// What is drawn below the rooms: the legend and the hint, with a gap above them. + private double BottomReserve(Size size) => + (LegendRect(size) is { } legend ? size.Height - legend.Top : HintBand()) + NativeTokens.Space12; /// The cell height the panel sits on, which sizes its heading as every panel's. private double CellHeight => _view.CellExtent.Height > 0 ? _view.CellExtent.Height : 17; @@ -558,14 +595,14 @@ internal void RunAreaVerb(MapViewModel view, string verb) } var entries = LegendEntries(); - var row = (int)Math.Floor((point.Y - plate.Y - LegendPad) / LegendRow); - if (row < 0 || row >= entries.Count) + var hit = LegendLayout(Bounds.Size).FirstOrDefault(e => e.Area.Contains(point)); + if (hit.Area.Width <= 0) { return null; } var first = entries.Count - _model.Areas.Count; - return row >= first && !_model.Areas[row - first].Drawn ? _model.Areas[row - first].Name : null; + return hit.Index >= first && !_model.Areas[hit.Index - first].Drawn ? _model.Areas[hit.Index - first].Name : null; } /// @@ -649,7 +686,7 @@ internal Color AreaColourOf(MapViewRoom room) => var entries = new List<(string, Color)> { ("you", Parse(_ink.Bar)) }; if (_model.Rooms.Any(r => r.Up || r.Down)) { - entries.Add(("stairs up / down", Faded(0.85))); + entries.Add((StairsLabel, DimInk)); } if (_model.Rooms.Any(r => r.Ahead)) @@ -671,8 +708,12 @@ public override void Render(DrawingContext context) return; } + // The mockup's map: rooms a step off the pane's plane with a rule round them, exits as rules between them, the + // character's room ringed in the accent. Every shade is a mix of the pane's own plane and ink, so it is the same + // drawing on every theme; only the accent, the walk and the areas' marks are colours. + var rule = RuleColour; var byId = _model.Rooms.ToDictionary(r => r.Id); - var exitPen = new Pen(new SolidColorBrush(Faded(0.42)), Math.Clamp(1.6 * Zoom, 1, 2.5), lineCap: PenLineCap.Round); + var exitPen = new Pen(new SolidColorBrush(rule), Math.Clamp(Spacing * Zoom / 45, 1, 2), lineCap: PenLineCap.Round); foreach (var exit in _model.Exits) { if (byId.TryGetValue(exit.From, out var a) && byId.TryGetValue(exit.To, out var b)) @@ -684,8 +725,9 @@ public override void Render(DrawingContext context) var size = RoomSize; var accent = Parse(_ink.Bar); var path = Parse(_ink.Low); - var radius = size * 0.22; + var radius = size * 0.19; var names = NamesShown; + var edge = new Pen(new SolidColorBrush(rule), Math.Clamp(size / 22, 1, 1.5)); foreach (var room in _model.Rooms) { var c = CentreOf(room); @@ -698,36 +740,41 @@ public override void Render(DrawingContext context) // A way into another area: a short spur off the room's corner, in that area's colour. if (ElsewhereColourOf(room) is { } elsewhere) { - var spur = new Pen(new SolidColorBrush(elsewhere), Math.Clamp(2 * Zoom, 1.5, 3), lineCap: PenLineCap.Round); - context.DrawLine(spur, rect.BottomRight - new Vector(size * 0.1, size * 0.1), rect.BottomRight + new Vector(size * 0.32, size * 0.32)); - context.DrawEllipse(new SolidColorBrush(elsewhere), null, rect.BottomRight + new Vector(size * 0.36, size * 0.36), size * 0.12, size * 0.12); + var spur = new Pen(new SolidColorBrush(elsewhere), Math.Clamp(1.6 * Zoom, 1.25, 2.5), lineCap: PenLineCap.Round); + context.DrawLine(spur, rect.BottomRight - new Vector(size * 0.1, size * 0.1), rect.BottomRight + new Vector(size * 0.3, size * 0.3)); + var dot = Math.Max(2, size * 0.11); + context.DrawEllipse(new SolidColorBrush(elsewhere), null, rect.BottomRight + new Vector(size * 0.34, size * 0.34), dot, dot); } - var area = AreaColourOf(room); if (room.Current) { - // A soft halo and a ring, then the room in the accent: the one thing the eye should find first. - context.DrawRectangle(new SolidColorBrush(Color.FromArgb(0x38, accent.R, accent.G, accent.B)), null, rect.Inflate(size * 0.34), radius * 2, radius * 2); - context.DrawRectangle(null, new Pen(new SolidColorBrush(Color.FromArgb(0xB0, accent.R, accent.G, accent.B)), 1.5), rect.Inflate(size * 0.2), radius * 1.6, radius * 1.6); - context.DrawRectangle(new SolidColorBrush(accent), new Pen(new SolidColorBrush(Mix(accent, Colors.White, 0.35)), 1.5), rect, radius, radius); + // The accent at a fifth over the plane, a two-pixel ring of it, a touch larger than its neighbours: the one + // thing the eye should find first, without a solid block of colour. + var ring = rect.Inflate(size * 0.06); + context.DrawRectangle( + new SolidColorBrush(Mix(_plane, accent, 0.2)), new Pen(new SolidColorBrush(accent), NativeTokens.BorderStrong), ring, radius * 1.15, radius * 1.15); } else { - var fill = new SolidColorBrush(Mix(_plane, area, room.Id == _hovered ? 0.55 : 0.3)); - var edge = room.Ahead ? new Pen(new SolidColorBrush(path), 2.2) : new Pen(new SolidColorBrush(area), 1.4); - context.DrawRectangle(fill, edge, rect, radius, radius); + var fill = new SolidColorBrush(Mix(_plane, _text, room.Id == _hovered ? 0.13 : 0.07)); + context.DrawRectangle(fill, room.Ahead ? new Pen(new SolidColorBrush(path), NativeTokens.BorderStrong) : edge, rect, radius, radius); if (room.Locked) { - var lockPen = new Pen(new SolidColorBrush(Faded(0.7)), 1.2); + var lockPen = new Pen(new SolidColorBrush(Faded(0.6)), 1.2); context.DrawLine(lockPen, rect.TopLeft + new Vector(size * 0.25, size * 0.25), rect.BottomRight - new Vector(size * 0.25, size * 0.25)); } } - DrawStairs(context, room, rect, room.Current ? Contrasting(accent) : _text); - if (room.Symbol is { } symbol && !room.Up && !room.Down) + DrawStairs(context, room, rect, room.Current ? _text : DimInk); + var mark = room.Symbol ?? (room.Current ? YouGlyph : null); + if (mark is not null && !room.Up && !room.Down && size >= 10) { - var mark = PanelText.Format(symbol, Math.Max(8, size * 0.5), room.Current ? Contrasting(accent) : _text, bold: true, size); - context.DrawText(mark, new Point(c.X - (mark.Width / 2), c.Y - (mark.Height / 2))); + var glyph = new FormattedText( + mark, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, new Typeface(NativeTokens.MonoFont), Math.Max(8, size * 0.42), new SolidColorBrush(_text)) + { + MaxLineCount = 1, + }; + context.DrawText(glyph, new Point(c.X - (glyph.Width / 2), c.Y - (glyph.Height / 2))); } if (room.Noted) @@ -737,9 +784,9 @@ public override void Render(DrawingContext context) if (room.Selected) { - // The room being edited: a ring in the draft colour, outside any halo, so it reads on the current room too. + // The room being edited: a ring in the draft colour, outside the room's own, so it reads on the current room too. var ring = new Pen(new SolidColorBrush(path), 2, new DashStyle([2, 1.5], 0)); - context.DrawRectangle(null, ring, rect.Inflate(size * 0.42), radius * 2.2, radius * 2.2); + context.DrawRectangle(null, ring, rect.Inflate(size * 0.3), radius * 2, radius * 2); } if ((names || room.Current) && room.Id != _hovered) @@ -755,21 +802,16 @@ public override void Render(DrawingContext context) } // What and where: the panel heading (Map, the area and level) with the area's colour as a mark before its name's - // line, then the room the character is in, or a walk under way, under it. + // line, then a walk under way, under it. The character's room is named under its own box. var heading = PanelText.Heading(context, PanelHeading.For(_model), bounds.Width, CellHeight, _plane, _text, right: NativeTokens.Space20, rule: NativeTokens.DevicePixel(this)); if (_model.AreaColour is { } areaHex) { context.DrawRectangle(new SolidColorBrush(Parse(areaHex)), null, new Rect(PanelText.Pad - 9, (heading / 2) - 5, 3, 10), 1.5, 1.5); } - var under = heading + 6; if (_model.Walking is { } walking) { - DrawText(context, walking, new Point(PanelText.Pad, under), 12, path); - } - else if (_model.Current is { } here) - { - DrawText(context, here.Name, new Point(PanelText.Pad, under), 12, accent); + DrawText(context, walking, new Point(PanelText.Pad, heading + NativeTokens.Space8), NativeTokens.Body, path); } if (_dragRoom is { } moving && byId.TryGetValue(moving.Id, out var shown)) @@ -786,45 +828,56 @@ public override void Render(DrawingContext context) DrawLookButtons(context); DrawLegend(context, bounds); + DrawHint(context, bounds); } + /// The mark in the character's room when the game gives it none: the roguelike's "you". + internal const string YouGlyph = "@"; + + /// The map's rule: a room's outline and an exit, the pane's ink a quarter of the way over its plane. + private Color RuleColour => Mix(_plane, _text, 0.24); + + /// The map's secondary ink (names, the legend, the hint): opaque, so it reads the same over a rule. + private Color DimInk => Mix(_plane, _text, 0.62); + private void DrawLookButtons(DrawingContext context) { foreach (var button in LookButtons()) { - var alpha = button.Enabled ? 1.0 : 0.4; + var hovered = button.Enabled && _buttonHovered == button.Id; context.DrawRectangle( - new SolidColorBrush(Mix(_plane, _text, 0.1)), - new Pen(new SolidColorBrush(Faded(0.35 * alpha)), 1), - button.Rect, - 4, - 4); - var label = PanelText.Format(button.Label, ButtonSize, Faded(0.9 * alpha), bold: false, button.Rect.Width); - context.DrawText(label, new Point(button.Rect.X + 7, button.Rect.Y + ((button.Rect.Height - label.Height) / 2))); + new SolidColorBrush(Mix(_plane, _text, hovered ? 0.13 : 0.07)), + new Pen(new SolidColorBrush(RuleColour), NativeTokens.DevicePixel(this)), + NativeTokens.StrokeRect(this, button.Rect), + NativeTokens.RadiusControl, + NativeTokens.RadiusControl); + var ink = button.Enabled ? _text : Mix(_plane, _text, 0.4); + var label = PanelText.Format(button.Label, ButtonSize, ink, bold: false, button.Rect.Width); + context.DrawText(label, new Point(Math.Round(button.Rect.X + NativeTokens.Space10), Math.Round(button.Rect.Y + ((button.Rect.Height - label.Height) / 2)))); } } /// Up and down marks: a small triangle at the top of the room for a way up, at the bottom for a way down. - private void DrawStairs(DrawingContext context, MapViewRoom room, Rect rect, Color ink) + private static void DrawStairs(DrawingContext context, MapViewRoom room, Rect rect, Color ink) { if (!room.Up && !room.Down) { return; } - var brush = new SolidColorBrush(Color.FromArgb(0xE0, ink.R, ink.G, ink.B)); - var w = rect.Width * 0.26; - var h = rect.Height * 0.2; + var brush = new SolidColorBrush(ink); + var w = rect.Width * 0.22; + var h = rect.Height * 0.18; var mid = rect.Center.X; if (room.Up) { - var top = rect.Y + (rect.Height * 0.16); + var top = rect.Y + (rect.Height * 0.18); context.DrawGeometry(brush, null, Triangle(new Point(mid, top), new Point(mid - w, top + h), new Point(mid + w, top + h))); } if (room.Down) { - var bottom = rect.Bottom - (rect.Height * 0.16); + var bottom = rect.Bottom - (rect.Height * 0.18); context.DrawGeometry(brush, null, Triangle(new Point(mid, bottom), new Point(mid - w, bottom - h), new Point(mid + w, bottom - h))); } } @@ -844,62 +897,86 @@ private static StreamGeometry Triangle(Point a, Point b, Point c) private void DrawName(DrawingContext context, string name, Point centre, double size, bool plate) { var maxWidth = plate ? 280 : Math.Max(30, (Spacing * Zoom) - 4); - var text = PanelText.Format(name, 11, plate ? _text : Faded(0.8), bold: plate, maxWidth); - var at = new Point(centre.X - (text.Width / 2), centre.Y + (size / 2) + 3); + var text = PanelText.Format(name, NativeTokens.Small, plate ? _text : DimInk, bold: plate, maxWidth); + var at = new Point(Math.Round(centre.X - (text.Width / 2)), Math.Round(centre.Y + (size / 2) + NativeTokens.Space4)); if (plate) { var back = new Rect(at.X - 6, at.Y - 2, text.Width + 12, text.Height + 4); - context.DrawRectangle(new SolidColorBrush(Mix(_plane, _text, 0.12)), new Pen(new SolidColorBrush(Faded(0.35)), 1), back, 4, 4); + context.DrawRectangle(new SolidColorBrush(Mix(_plane, _text, 0.1)), new Pen(new SolidColorBrush(RuleColour), 1), back, NativeTokens.RadiusS, NativeTokens.RadiusS); } else { // The pane's own plane behind the words, so an exit line passing under a room does not strike them out. - context.DrawRectangle(new SolidColorBrush(Color.FromArgb(0xD0, _plane.R, _plane.G, _plane.B)), null, new Rect(at.X - 2, at.Y, text.Width + 4, text.Height), 2, 2); + context.DrawRectangle(new SolidColorBrush(_plane), null, new Rect(at.X - 2, at.Y, text.Width + 4, text.Height), 2, 2); } context.DrawText(text, at); } /// - /// The legend, in the bottom-left corner on a plate: you, the stairs, a walk, and each area in its colour. Drawn only - /// where it fits, and it never takes the pointer from a room under it (the canvas hit-tests rooms only). + /// The legend, a strip along the foot of the map above the hint: you, the stairs, a walk, and each area in its colour, + /// laid left to right and wrapped. The fit keeps the rooms above it (), so it covers none. /// - private const double LegendSize = 11, LegendRow = 16, LegendPad = 8, LegendSwatch = 9; + private const double LegendSize = NativeTokens.Small, LegendRow = 18, LegendSwatch = 8, LegendGap = NativeTokens.Space14; + + /// The hint's band at the foot of the canvas, its gaps included; a small margin when there is no hint. + private double HintBand() => _model.Hint is null ? NativeTokens.Space8 : NativeTokens.Space12 + NativeTokens.Space20; + + /// Each legend entry's place in a canvas of , by its index in . + private List<(Rect Area, int Index)> LegendLayout(Size size) + { + var entries = LegendEntries(); + var placed = new List<(Rect, int)>(); + var x = PanelText.Pad; + var row = 0; + var right = size.Width - PanelText.Pad; + for (var i = 0; i < entries.Count; i++) + { + var width = LegendSwatch + NativeTokens.Space6 + PanelText.Measure(entries[i].Label, LegendSize, bold: false); + if (x > PanelText.Pad && x + width > right) + { + x = PanelText.Pad; + row++; + } + + placed.Add((new Rect(x, row * LegendRow, Math.Max(1, Math.Min(width, right - x)), LegendRow), i)); + x += width + LegendGap; + } + + // Laid out from the top of the strip, then moved down so its last row ends above the hint. + var top = size.Height - HintBand() - ((row + 1) * LegendRow); + return placed.Select(p => (p.Item1.Translate(new Vector(0, top)), p.Item2)).ToList(); + } /// - /// Where the legend's plate is drawn in a canvas of , in the canvas's coordinates; null when - /// none is drawn (no rooms, or it would not fit). The window keeps its toasts off it (). + /// Where the legend is drawn in a canvas of , in the canvas's coordinates; null when none is + /// drawn (no rooms, or it would take more than a third of the height). The window keeps its toasts off it + /// (). /// internal Rect? LegendRect(Size size) { - if (_model.Rooms.Count == 0) + if (_model.Rooms.Count == 0 || size.Width <= 0) { return null; } - var entries = LegendEntries(); - var widest = entries.Max(e => PanelText.Measure(e.Label, LegendSize, bold: false)); - var width = LegendPad + LegendSwatch + 6 + widest + LegendPad; - var height = (LegendPad * 2) + (entries.Count * LegendRow) - (LegendRow - LegendSize - 3); - return width > size.Width * 0.6 || height > size.Height * 0.6 ? null : new Rect(10, size.Height - height - 10, width, height); + var area = LegendLayout(size).Select(e => e.Area).Aggregate((a, b) => a.Union(b)); + return area.Height > size.Height / 3 ? null : area.Inflate(new Thickness(NativeTokens.Space4, 0)); } private void DrawLegend(DrawingContext context, Rect bounds) { - if (LegendRect(bounds.Size) is not { } plate) + if (LegendRect(bounds.Size) is null) { return; } var entries = LegendEntries(); - const double size = LegendSize, row = LegendRow, pad = LegendPad, swatch = LegendSwatch; - var widest = entries.Max(e => PanelText.Measure(e.Label, size, bold: false)); - context.DrawRectangle(new SolidColorBrush(Color.FromArgb(0xE6, _plane.R, _plane.G, _plane.B)), new Pen(new SolidColorBrush(Faded(0.25)), 1), plate, 5, 5); - var y = plate.Y + pad; - foreach (var (label, colour) in entries) - { - var mark = new Rect(plate.X + pad, y + 2, swatch, swatch); - if (label == "stairs up / down") + foreach (var (area, index) in LegendLayout(bounds.Size)) + { + var (label, colour) = entries[index]; + var mark = new Rect(area.X, area.Y + ((area.Height - LegendSwatch) / 2), LegendSwatch, LegendSwatch); + if (label == StairsLabel) { var brush = new SolidColorBrush(colour); context.DrawGeometry(brush, null, Triangle(new Point(mark.Center.X, mark.Y), new Point(mark.X, mark.Center.Y - 0.5), new Point(mark.Right, mark.Center.Y - 0.5))); @@ -910,18 +987,28 @@ private void DrawLegend(DrawingContext context, Rect bounds) context.DrawRectangle(new SolidColorBrush(colour), null, mark, 2, 2); } - context.DrawText(PanelText.Format(label, size, Faded(0.85), bold: false, widest + 1), new Point(mark.Right + 6, y)); - y += row; + PanelText.Draw(context, label, mark.Right + NativeTokens.Space6, area.Center.Y, LegendSize, DimInk, bold: false, area.Right - mark.Right - NativeTokens.Space6 + 1); } } - /// Black or white, whichever reads on : the stairs marks on the accent room. - private static Color Contrasting(Color fill) => - (0.299 * fill.R) + (0.587 * fill.G) + (0.114 * fill.B) > 140 ? Color.FromRgb(0x10, 0x10, 0x14) : Colors.White; + /// The model's hint, centred at the foot of the map: what a click on a room does. + private void DrawHint(DrawingContext context, Rect bounds) + { + if (_model.Hint is not { } hint) + { + return; + } + + var text = PanelText.Format(hint, NativeTokens.Small, DimInk, bold: false, bounds.Width - (2 * PanelText.Pad)); + context.DrawText(text, new Point(Math.Round((bounds.Width - text.Width) / 2), Math.Round(bounds.Height - NativeTokens.Space12 - text.Height))); + } + + /// The legend's label for the stairs marks. + internal const string StairsLabel = "stairs up / down"; private static void DrawText(DrawingContext context, string text, Point at, double size, Color colour) => context.DrawText( - new FormattedText(text, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, Typeface.Default, size, new SolidColorBrush(colour)) + new FormattedText(text, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, new Typeface(NativeTokens.UiFont), size, new SolidColorBrush(colour)) { MaxLineCount = 1, }, diff --git a/src/SharpMUTerm.Avalonia/NativeChrome.cs b/src/SharpMUTerm.Avalonia/NativeChrome.cs index e5b3e900..b9d2e9c0 100644 --- a/src/SharpMUTerm.Avalonia/NativeChrome.cs +++ b/src/SharpMUTerm.Avalonia/NativeChrome.cs @@ -234,6 +234,18 @@ protected Color Raised(double amount) return Color.FromRgb(Mix(Plane.R, target.R), Mix(Plane.G, target.G), Mix(Plane.B, target.B)); } + /// + /// The plane sunk by : darker on a dark theme, lighter on a light one — the well an input sits + /// in (the mockups' #10131a search box on the #171b24 header is about 0.3). + /// + protected Color Sunk(double amount) + { + var luma = (0.2126 * Plane.R) + (0.7152 * Plane.G) + (0.0722 * Plane.B); + var target = luma < 128 ? Colors.Black : Colors.White; + byte Mix(byte a, byte b) => (byte)Math.Round(a + ((b - a) * amount)); + return Color.FromRgb(Mix(Plane.R, target.R), Mix(Plane.G, target.G), Mix(Plane.B, target.B)); + } + /// /// The selection plate: the plane leaned toward the client's accent — about 14 % on a dark plane, the mockup's /// #1f3a3a on #141822 — a little further while hovered. Ink on it is held to the floor by the caller's @@ -379,7 +391,6 @@ internal sealed class NativeHeader(TerminalView view) : NativeChromeView(view) private Rect _brand; private Rect _search; private Rect _pill; - private Rect _counts; private Rect _prefix; private readonly List<(Rect Area, HeaderPrefixKey Key)> _keys = []; private Rect _exit; @@ -391,7 +402,7 @@ internal sealed class NativeHeader(TerminalView view) : NativeChromeView(view) protected override void Layout(ChromeOverlay overlay, List<(Rect Area, string Target, string Tip)> hits) { - _brand = _search = _pill = _counts = _prefix = _exit = default; + _brand = _search = _pill = _prefix = _exit = default; _keys.Clear(); var model = overlay.HeaderModel; const double size = FontSize; @@ -423,17 +434,10 @@ protected override void Layout(ChromeOverlay overlay, List<(Rect Area, string Ta return; } - var counts = CountsText(model); - var countsWidth = Measure(counts, size - 1); + // No counts beside the search box: the mockups' header is the brand, the search and the character. How many are + // connected is the sidebar's dots, the log and the recording mark are the footer's (StatusOverlay.Compact). var keyWidth = Measure(KeyGlyphs.Words(HeaderModel.PaletteKey), size - 1.5) + 12; var searchFloor = 18 + Measure("Search", size) + keyWidth + (pad * 3); - if (right - countsWidth - 20 - start >= searchFloor) - { - // The counts go to the left of the search box, which keeps its place beside the pill. - var searchWidth = Math.Min(360, right - countsWidth - 20 - start); - _counts = new Rect(right - searchWidth - 20 - countsWidth, 0, countsWidth, h); - } - if (right - start >= searchFloor) { // Beside the character's pill at the right, as the mockup sets it, rather than against the brand. @@ -475,10 +479,6 @@ private void LayoutPrefix(HeaderPrefix prefix, double start, double right, doubl } } - private static string CountsText(HeaderModel model) => - (model.Recording ? $"{HeaderModel.RecordingText} · " : string.Empty) - + (model.HasWorlds ? $"{model.ConnectedText} · {model.LogText}" : model.LogText); - protected override void PressedEmpty(PointerPressedEventArgs e) => View.WindowGestureFromChrome(e); public override void Render(DrawingContext context) @@ -512,11 +512,6 @@ public override void Render(DrawingContext context) DrawSearch(context, middle, radius); } - if (_counts.Width > 0) - { - Text(context, CountsText(model), _counts.X, middle, size - 1, Parse(overlay.Palette.HeaderMuted)); - } - if (model.Prefix is { } prefix) { DrawPrefix(context, prefix, overlay, middle); @@ -545,8 +540,8 @@ public override void Render(DrawingContext context) private void DrawSearch(DrawingContext context, double middle, double radius) { const double size = FontSize; - var fill = Hovered(_search) ? Raised(0.13) : Raised(0.07); - context.DrawRectangle(new SolidColorBrush(fill), NativeTokens.HairlinePen(this, Faint(0x30)), NativeTokens.StrokeRect(this, _search), radius, radius); + var fill = Hovered(_search) ? Raised(0.04) : Sunk(0.3); + context.DrawRectangle(new SolidColorBrush(fill), NativeTokens.HairlinePen(this, Faint(Hovered(_search) ? (byte)0x50 : (byte)0x30)), NativeTokens.StrokeRect(this, _search), radius, radius); // A magnifier: a ring and its handle. const double ring = 5; diff --git a/src/SharpMUTerm.Avalonia/NativeFooter.cs b/src/SharpMUTerm.Avalonia/NativeFooter.cs index 8bf8ddae..d81f1301 100644 --- a/src/SharpMUTerm.Avalonia/NativeFooter.cs +++ b/src/SharpMUTerm.Avalonia/NativeFooter.cs @@ -13,7 +13,9 @@ namespace SharpMUTerm.Avalonia; /// The window's status footer, across the bottom of the window under the cells and the sidebar (): /// the status row the client would have drawn in its last row, from the same — the connection, /// the mode's keys, meters, reconnect, ● REC, ♪ muted, the scrollback segment, a notice — in the UI face, -/// keys in words. The left cluster reads from the left edge and the right one ends at the right edge. +/// keys in words. The left cluster reads from the left edge and the right one ends at the right edge. At rest it draws the +/// row's compact form (: the connection, encoding and log, and one short hint, the +/// mockups' row), and the whole row while a notice or a mode prompt holds it. /// /// A run the client marked (a notice's action, the palette hint) is a link: a click hands its target back through /// , which runs the client's own method or refuses. Never focusable; every pointer @@ -41,7 +43,7 @@ public NativeFooter(TerminalView view) internal IReadOnlyList<(Rect Area, string Target)> Hits => _hits; /// The footer's text as drawn, keys in words. Internal for tests. - internal string Text => Overlay is { } o ? NativeKeys.Words(o.Model.Text) : string.Empty; + internal string Text => Overlay is { } o ? NativeKeys.Words(o.Shown.Text) : string.Empty; /// Takes what the client said and redraws. public void Show(StatusOverlay? overlay) @@ -66,7 +68,7 @@ internal void Click(string target) public override void Render(DrawingContext context) { - var plane = NativeChromeView.Parse(Overlay?.Model.Plane ?? HexOf(_view.Renderer.DefaultBackground)); + var plane = NativeChromeView.Parse(Overlay?.Shown.Plane ?? HexOf(_view.Renderer.DefaultBackground)); var bounds = new Rect(Bounds.Size); context.FillRectangle(new SolidColorBrush(plane), bounds); var ink = _view.Renderer.DefaultForeground; @@ -79,15 +81,15 @@ public override void Render(DrawingContext context) var middle = bounds.Height / 2; var right = bounds.Width - NativeLayout.FooterPadX - WindowChrome.EdgeBand; - var rightWidth = overlay.Model.Right.Sum(r => Format(r, plane).WidthIncludingTrailingWhitespace); + var rightWidth = overlay.Shown.Right.Sum(r => Format(r, plane).WidthIncludingTrailingWhitespace); var x = NativeLayout.FooterPadX; - foreach (var run in overlay.Model.Left) + foreach (var run in overlay.Shown.Left) { x += Draw(context, run, x, middle, plane, Math.Max(0, right - rightWidth - 16 - x)); } x = Math.Max(x + 16, right - rightWidth); - foreach (var run in overlay.Model.Right) + foreach (var run in overlay.Shown.Right) { x += Draw(context, run, x, middle, plane, Math.Max(0, right - x)); } @@ -140,7 +142,7 @@ private double Draw(DrawingContext context, StatusRun run, double x, double midd private static readonly Regex Gaps = new(" {3,}", RegexOptions.CultureInvariant); /// A run's ink: its own, else the row's (a run the cells write with no colour). - private Color InkOf(StatusRun run) => NativeChromeView.Parse(run.Ink ?? Overlay?.Model.Ink); + private Color InkOf(StatusRun run) => NativeChromeView.Parse(run.Ink ?? Overlay?.Shown.Ink); private static string HexOf(SkiaSharp.SKColor colour) => $"#{colour.Red:x2}{colour.Green:x2}{colour.Blue:x2}"; diff --git a/src/SharpMUTerm.Client/Chrome/StatusModel.cs b/src/SharpMUTerm.Client/Chrome/StatusModel.cs index 2737675e..278f47eb 100644 --- a/src/SharpMUTerm.Client/Chrome/StatusModel.cs +++ b/src/SharpMUTerm.Client/Chrome/StatusModel.cs @@ -62,6 +62,12 @@ public enum StatusRole /// A mode prompt that displaces the row (moving or dragging a window). Prompt, + + /// Whether the character in front is being logged (Log off, Log html): the compact row's. + Log, + + /// Where unread lines are waiting (2 new in Chat): the compact row's. + Activity, } /// One part of the status row: its role and its runs. diff --git a/src/SharpMUTerm.Client/Panels/MapViewModel.cs b/src/SharpMUTerm.Client/Panels/MapViewModel.cs index 94645457..c88e0456 100644 --- a/src/SharpMUTerm.Client/Panels/MapViewModel.cs +++ b/src/SharpMUTerm.Client/Panels/MapViewModel.cs @@ -135,6 +135,18 @@ public sealed record MapViewModel(string? Area, int Level, IReadOnlyListWhat an undo would take back, or null when nothing would. public string? UndoLabel { get; init; } + /// What a click on a room does, as a host words it under the map; null when no click would do anything. + public string? Hint => + Editing ? EditHint + : Walking is not null || Rooms.Count < 2 ? null + : WalkHint; + + /// The map's hint while a click walks. + public const string WalkHint = "Click a room to walk there"; + + /// The map's hint while a click picks the room to edit. + public const string EditHint = "Click a room to edit it"; + /// The colour of the area the view draws, or null when that area has no name. public string? AreaColour => Areas.FirstOrDefault(a => a.Drawn)?.Colour; diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Footer.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Footer.cs index 641e4c69..4f042ea9 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Footer.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Footer.cs @@ -3,6 +3,8 @@ using SharpMUTerm.Client.Chrome; using SharpMUTerm.Client.Palette; using SharpMUTerm.Client.Surfaces; +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Workspaces; namespace SharpMUTerm.Tui; @@ -55,7 +57,103 @@ private void PublishStatus() internal StatusOverlay BuildStatusOverlay() { _statusActivate ??= target => OnUiThread(() => ActivateStatusTarget(target)); - return new StatusOverlay(BuildStatusModel(), MainWindowInFront(), _statusActivate); + var model = BuildStatusModel(); + return new StatusOverlay(model, MainWindowInFront(), _statusActivate) { Compact = CompactStatus(model) }; + } + + /// + /// The status row as a host with a header and tab badges of its own words it (the window's footer, the mockups' row): + /// on the left the connection, the encoding in force and the log; on the right the state the row alone says + /// (scrolled back, ● REC, ♪ muted) and one short hint — the mode's keys while a mode holds that nothing + /// else on screen names, else where unread lines are waiting (2 new in Chat). Built from the same facts as + /// ; null while a notice or a mode prompt is on the row, which the footer then draws whole. + /// The meters, the room, the typed count and the focus keys stay the cells': the window draws the first two as + /// panels, and its command line, tabs and header search say the rest. Internal for tests. + /// + internal StatusModel? CompactStatus(StatusModel row) + { + if (row.Notice is not null || row.LeftSegments.Concat(row.RightSegments).Any(s => s.Role == StatusRole.Prompt)) + { + return null; + } + + var left = new List(); + var identity = row.LeftSegments.FirstOrDefault(s => s.Role == StatusRole.Identity); + if (identity is not null) + { + left.Add(identity); + if (EffectiveEncoding() is { } encoding) + { + left.Add(Segment(StatusRole.Encoding, Dim(CompactEncoding(encoding.Label)))); + } + + var log = HeaderLogFormat(); + left.Add(Segment(StatusRole.Log, Dim(log == LogFormat.None ? "Log off" : $"Log {log.ToString().ToLowerInvariant()}"))); + } + else + { + left.Add(Segment(StatusRole.Text, Dim("Not connected"))); + } + + // A split pane's band says how far back it is and its own way back in the window, with a button; every other + // mode is said here. + var mode = CurrentStatusMode(); + var right = row.RightSegments + .Where(s => s.Role is StatusRole.Recording or StatusRole.Muted + || (s.Role == StatusRole.Scrollback && mode != StatusMode.SplitScrollback)) + .ToList(); + + if (mode is not StatusMode.None and not StatusMode.SplitScrollback && ModeHintSegments(mode).FirstOrDefault() is { } hint) + { + right.Add(hint); + } + else if (UnreadHint() is { } unread) + { + right.Add(unread); + } + + if (identity is null) + { + right.Add(Segment(StatusRole.Palette, Dim(PaletteHintText, HeaderModel.PaletteTarget))); + } + + return new StatusModel(left, right, row.Plane, row.Ink) { Width = row.Width }; + } + + /// utf-8 assumed as the mockups write a charset: the name in capitals, its qualifier as it was. + internal static string CompactEncoding(string label) + { + var space = label.IndexOf(' ', StringComparison.Ordinal); + return space < 0 ? label.ToUpperInvariant() : label[..space].ToUpperInvariant() + label[space..]; + } + + /// + /// Where the character in front has unread lines, as the compact row says it: 2 new in Chat, the window with + /// most first, · 1 in Pages for a second, · +2 more past that; null when nothing is waiting. + /// + private StatusSegment? UnreadHint() + { + var waiting = _workspace.WindowsFor(ActiveCharacterKey()) + .Where(w => w.Unread > 0) + .OrderByDescending(w => w.Unread) + .ToList(); + if (waiting.Count == 0) + { + return null; + } + + var text = $"{UnreadBadge.Format(waiting[0].Unread)} new in {Snippet(RailWindowLabel(waiting[0], waiting[0].Kind == WindowKind.Main))}"; + if (waiting.Count > 1) + { + text += $" · {UnreadBadge.Format(waiting[1].Unread)} in {Snippet(RailWindowLabel(waiting[1], waiting[1].Kind == WindowKind.Main))}"; + } + + if (waiting.Count > 2) + { + text += $" · +{waiting.Count - 2} more"; + } + + return Segment(StatusRole.Activity, Dim(text)); } /// The status row's model, as last painted: the instance the cells were rendered from. Internal for tests. @@ -225,7 +323,17 @@ private void PublishInputBand() /// What the row says. /// Whether the main window is in front; while a modal is, the footer takes no click. /// Acts on a run's target; safe from any thread, and the same instance for the life of the app. -internal sealed record StatusOverlay(StatusModel Model, bool Interactive, Action Activate); +internal sealed record StatusOverlay(StatusModel Model, bool Interactive, Action Activate) +{ + /// + /// The row as the window's footer words it (), from the same facts as + /// ; null while a notice or a mode prompt holds the row, when the footer draws . + /// + public StatusModel? Compact { get; init; } + + /// What the footer draws: the compact row, else the row. + public StatusModel Shown => Compact ?? Model; +} /// A command line's prompt, by the screen row its first line is on, as plain text. internal sealed record InputPrompt(int Row, string Text); diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativeMapViewTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativeMapViewTests.cs index 797df068..10672969 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/NativeMapViewTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/NativeMapViewTests.cs @@ -155,5 +155,44 @@ public async Task TheRoomMenuOffersResetOnlyForARoomEditedByHand() await Assert.That(MapEditing.Menu(model.Rooms[0], null).Entries.Select(e => e.Command)).DoesNotContain(MapEditing.ResetVerb); } + /// + /// The mockup's map (wave 22): the fit keeps every room clear of what is drawn above it (the look buttons, sized to the + /// window's small controls) and below it (the legend strip and the model's hint), so the legend covers no room. + /// + [Test] + public async Task TheFittedRoomsAreClearOfTheButtonsTheLegendAndTheHint() + { + var (rooms, legend, buttons, height, hint) = await DesktopLayerTests.Run((window, view, layer, driver) => + { + var model = Model(editing: false) with + { + Rooms = + [ + new MapViewRoom(1, "Plaza", 0, 0, Current: true, Ahead: false, Locked: false), + new MapViewRoom(2, "North Road", 0, -1, Current: false, Ahead: false, Locked: false), + new MapViewRoom(3, "South Road", 0, 2, Current: false, Ahead: false, Locked: false), + new MapViewRoom(4, "Gate", 2, 2, Current: false, Ahead: false, Locked: false, Elsewhere: "Docks"), + ], + }; + Publish(driver, model); + Dispatcher(); + window.UpdateLayout(); + var canvas = layer.Maps.Values.Single(); + var size = canvas.Bounds.Size; + var rooms = canvas.Model.Rooms.Select(r => canvas.CentreOf(r)).ToList(); + return (rooms, canvas.LegendRect(size)!.Value, canvas.LookButtons().Select(b => b.Rect).ToList(), canvas.Bounds.Height, canvas.Model.Hint); + }, columns: 60, rows: 24); + + await Assert.That(hint).IsEqualTo(MapViewModel.WalkHint); + await Assert.That(buttons.All(b => b.Height == NativeTokens.ControlHeightSmall)).IsTrue(); + foreach (var centre in rooms) + { + await Assert.That(centre.Y).IsLessThan(legend.Top).Because("no room under the legend"); + await Assert.That(centre.Y).IsGreaterThan(buttons.Max(b => b.Bottom)).Because("no room under the look buttons"); + } + + await Assert.That(legend.Bottom).IsLessThan(height - NativeTokens.Space20).Because("the hint has its own line under the legend"); + } + private static void Dispatcher() => global::Avalonia.Threading.Dispatcher.UIThread.RunJobs(); } diff --git a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs index 253fa5e2..ade00e3d 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs @@ -1497,6 +1497,34 @@ public async Task TheQuickBarReadsTheHostsKeys() await Assert.That(free.Fires).IsTrue(); } + /// + /// The footer's compact row (wave 22): at rest the window draws the connection, the encoding and the log on the left + /// and where unread lines wait on the right — the mockups' row — built from the facts the cell row was built from, the + /// identity segment the same instance's; a notice puts the whole row back. + /// + [Test] + public async Task TheFootersCompactRowIsTheRowsFactsInTheMockupsWords() + { + using var driver = new AvaloniaConsoleDriver(140, 36); + await using var app = App(driver, DemoScene.Build()); + app.RenderSnapshot(null); + var status = driver.Pointer.Status!; + var compact = status.Compact!; + await Assert.That(compact).IsNotNull(); + await Assert.That(compact.LeftSegments.Select(s => s.Role)).IsEquivalentTo( + new[] { StatusRole.Identity, StatusRole.Encoding, StatusRole.Log }, TUnit.Assertions.Enums.CollectionOrdering.Matching); + await Assert.That((object)compact.LeftSegments[0]).IsEqualTo(status.Model.LeftSegments.Single(s => s.Role == StatusRole.Identity)); + await Assert.That(compact.LeftSegments[1].Text).IsEqualTo("UTF-8").Because("the charset in capitals, as the mockups write it"); + await Assert.That(compact.LeftSegments[2].Text).IsEqualTo("Log off").Because("a snapshot owns no log root"); + await Assert.That(compact.RightSegments.Single().Text).IsEqualTo("2 new in Chat"); + await Assert.That(status.Shown).IsSameReferenceAs(compact); + await Assert.That(SharpMUTermApp.CompactEncoding("iso-8859-1 forced")).IsEqualTo("ISO-8859-1 forced"); + + app.RenderSnapshot("notices"); + await Assert.That(driver.Pointer.Status!.Compact).IsNull().Because("a notice is drawn whole"); + await Assert.That((object)driver.Pointer.Status!.Shown).IsEqualTo(driver.Pointer.Status!.Model); + } + // ── helpers ────────────────────────────────────────────────────────────────────────────────── private static SharpMUTermApp App( diff --git a/tests/SharpMUTerm.Client.Tests/PanelModelTests.cs b/tests/SharpMUTerm.Client.Tests/PanelModelTests.cs index 3e76faf2..b1ee13aa 100644 --- a/tests/SharpMUTerm.Client.Tests/PanelModelTests.cs +++ b/tests/SharpMUTerm.Client.Tests/PanelModelTests.cs @@ -36,6 +36,12 @@ public async Task TheMapViewIsTheCurrentLevelAndAreaWithEachExitOnce() await Assert.That(view.Current!.Name).IsEqualTo("Plaza"); await Assert.That(view.Rooms.Single(r => r.Id == 2).Ahead).IsTrue(); await Assert.That(MapViewModel.From(map, 1, [2], "walking, 1 to go")).IsEqualTo(view); + + // The hint a host writes under the map says what a click does: nothing while a walk is under way, walk otherwise. + await Assert.That(view.Hint).IsNull().Because("a walk is under way"); + await Assert.That(MapViewModel.From(map, 1, [], null).Hint).IsEqualTo(MapViewModel.WalkHint); + await Assert.That(MapViewModel.From(map, 1, [], null, selected: 2).Hint).IsEqualTo(MapViewModel.EditHint); + await Assert.That(MapViewModel.From(map, 4, [], null).Hint).IsNull().Because("a lone room has nowhere to walk"); } /// From f009b1c6db548fa453b176e520de6702eb92d570 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 20:08:01 +0000 Subject: [PATCH 079/113] Wave 22 B: the composer's Command and Text fields, in both hosts A post is now a command field and a text in one ComposerModel. The window's docked panel and F1 draw a Command box over the Text well; the cell docked composer and F1 draw a command row above the editor (Tab switches fields). What is sent is the command, unescaped, in front of the escaped, %r-joined text (ComposeMessage.Build(command, body, escaping)); a blank command sends the text as the whole command, as before. A MOO edit has no command field. The command is kept with the draft and after a send. SurfaceParityTests probe the split send and the kept command in both hosts. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 7 +- CLAUDE.md | 11 ++ src/SharpMUTerm.Avalonia/ComposerView.cs | 172 ++++++++++++++++-- .../Composer/ComposerModel.cs | 62 ++++++- .../Composer/ComposerSession.cs | 18 ++ .../Commands/ComposeMessage.cs | 48 +++++ src/SharpMUTerm.Tui/ComposeOverlay.cs | 102 +++++++++-- .../Panels/ComposerCommandRow.cs | 96 ++++++++++ src/SharpMUTerm.Tui/Panels/DockedComposer.cs | 93 ++++++++-- .../SharpMUTermApp.NativeComposer.cs | 26 ++- src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs | 58 ++++-- src/SharpMUTerm.Tui/SharpMUTermApp.cs | 35 +++- .../NativeComposerTests.cs | 49 +++++ .../SurfaceParityTests.cs | 68 ++++++- .../ComposerModelTests.cs | 47 ++++- .../Commands/ComposeMessageTests.cs | 34 ++++ .../NativeComposerRoutingTests.cs | 2 +- 17 files changed, 837 insertions(+), 91 deletions(-) create mode 100644 src/SharpMUTerm.Tui/Panels/ComposerCommandRow.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index fba49bb6..74e2d7bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,12 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] - In the desktop window, the header shows only the search box and your character, and the status bar reads "Corvid connected · UTF-8 · Log off" with a short hint on the right such as "2 new in Chat" (or the keys of the mode you are in). Notices still take the whole bar while they show. - +- The composer has a Command field above the text, in F1 and the docked panel, in the terminal and the desktop window: + put the verb there (`+pose`, `say`, `+bbpost 3=`) and write the post below it. ⇥ moves between the two (⏎ in the + command moves on to the text); the command is sent in front of the text unescaped, joined by a space (none after + `=` or a one-character shorthand like `:`), and it stays after a send for the next post. Leave it empty to write the + whole command in the text as before. The window's docked panel now reads as the design: Command and Text fields, the + Literal/As typed chip, `2 paragraphs · 31 words`, Preview and Send. - The package review keeps ⏎ install and Esc cancel on screen at 80×24: the review scrolls (↑↓ PgUp PgDn Home End) under its keys and stops above the command line. - Browse worlds: a world listed at several addresses (TLS and plain, another port, an old one) now lets you choose diff --git a/CLAUDE.md b/CLAUDE.md index 975bc9b9..416d0ca8 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -1776,6 +1776,17 @@ draws ⌃P natively (`INativePalette`, null for the cell popup), whether it draw over the tail of a tab the framework drew, name or `×`, and the framework (subscribed later, inside `Run()`) would select or close it on the same click. The button flags are struck from the shared list, leaving a movement; the chip rects are a snapshot array published per frame. Both hosts go through that handler (`AClickOnTheChipDoesNotAlso…`). +- **A post is a command field and a text, in one model** (`ComposerModel.Verb`, `HasCommandField`, `HeadingVerb`; + `ComposeMessage.Build(command, body, escaping)`/`Join`/`CleanCommand`, Core; Tui `ComposerCommandRow`, a one-row + editor F1 and `DockedComposer` place above the text; `ComposeResult.Verb`; `ComposerSession.EditedCommand`; Avalonia + `ComposerView`'s command box). The body is built exactly as before and the command is put in front **unescaped**, one + space between (none after `=` or a lone punctuation shorthand); a blank command is the old single buffer, so a text + starting with its verb still sends as it did. ⇥/⇧⇥ move between the fields and ⏎ in the command moves to the text + (`DockedComposer.InCommand`/`Focused`, which the focus pin and `HandleComposerKey` follow; where the caret is is never + in the model). The command survives a send (`ForgetComposeText`), so a verb-only draft is kept and the quit prompt + does not count it. An edit has no command field. The window's docked panel is the mockup's: Command over its box, + Text over the well (both shown from 232 px), summary without the chars (in its tooltip). `SurfaceParityTests` sends + the same post from both hosts' two fields. - **The composer says how long the post is as sent, and ⌥P shows it** (`ComposerModel.Characters`/`SentLength`, the escaped and `%r`-joined command; a MOO edit counts its text). F1 and the docked panel carry the `N chars` cell in both hosts; ⌥P toggles an *as sent* band under F1 (`ComposeOverlay.Preview`, run-wide, shared with the native editor via diff --git a/src/SharpMUTerm.Avalonia/ComposerView.cs b/src/SharpMUTerm.Avalonia/ComposerView.cs index 72b94fd5..cc816991 100644 --- a/src/SharpMUTerm.Avalonia/ComposerView.cs +++ b/src/SharpMUTerm.Avalonia/ComposerView.cs @@ -58,6 +58,13 @@ internal sealed class ComposerView : Border private readonly WrapPanel _keys; private readonly Border _rule; + // The command field above the text (ComposerModel.Verb): a one-line box, its label, and the text's label. + private readonly TextBox _command; + private readonly Border _commandWell; + private readonly TextBlock _commandLabel; + private readonly TextBlock _textLabel; + private readonly Control _commandRow; + // The docked panel's own parts: the editor's framed well, and the footer's summary, Preview and Send. private readonly Border? _well; private readonly TextBlock _summary = new() { VerticalAlignment = VerticalAlignment.Center, TextTrimming = TextTrimming.CharacterEllipsis }; @@ -92,6 +99,52 @@ public ComposerView(TerminalView view, bool fullScreen) _editor.AddHandler(PointerPressedEvent, (_, _) => AskToArm(), RoutingStrategies.Tunnel, handledEventsToo: true); _editor.GotFocus += (_, _) => AskToArm(); _editor.ContextRequested += OnContextRequested; + _command = new TextBox + { + AcceptsReturn = false, + AcceptsTab = false, + Background = Brushes.Transparent, + BorderThickness = default, + Padding = new Thickness(NativeTokens.Space10, NativeTokens.Space6), + MinHeight = 0, + VerticalContentAlignment = VerticalAlignment.Center, + PlaceholderText = ComposerModel.CommandPlaceholder, + MaxLength = 200, + }; + AutomationProperties.SetName(_command, "Command"); + ToolTip.SetTip(_command, "The command the text is sent with: +pose, say, +bbpost 3= (Tab moves to the text)"); + _command.TextChanged += (_, _) => OnCommandChanged(); + _command.AddHandler(KeyDownEvent, OnCommandKeyDown, RoutingStrategies.Tunnel); + _command.AddHandler(PointerPressedEvent, (_, _) => AskToArm(), RoutingStrategies.Tunnel, handledEventsToo: true); + _command.GotFocus += (_, _) => AskToArm(); + _commandWell = new Border + { + Child = _command, + CornerRadius = new CornerRadius(NativeTokens.RadiusControl), + BorderThickness = new Thickness(NativeTokens.Hairline), + ClipToBounds = true, + }; + _commandLabel = new TextBlock { Text = ComposerModel.CommandLabel, VerticalAlignment = VerticalAlignment.Center }; + _textLabel = new TextBlock { Text = ComposerModel.TextLabel }; + if (fullScreen) + { + // F1: one row under the header, the label beside the box. + var row = new DockPanel { LastChildFill = true }; + _commandLabel.Margin = new Thickness(0, 0, NativeTokens.Space10, 0); + DockPanel.SetDock(_commandLabel, Dock.Left); + row.Children.Add(_commandLabel); + row.Children.Add(_commandWell); + _commandRow = new Border { Child = row, Padding = new Thickness(NativeTokens.Space24, NativeTokens.Space8) }; + } + else + { + // Docked, as the mockup's panel: Command over its box, then Text over the editor's well. + _commandLabel.Margin = new Thickness(PanelText.Pad, NativeTokens.Space12, PanelText.Pad, 0); + _commandWell.Margin = new Thickness(PanelText.Pad, NativeTokens.Space6, PanelText.Pad, 0); + _commandRow = new StackPanel { Children = { _commandLabel, _commandWell } }; + _textLabel.Margin = new Thickness(PanelText.Pad, NativeTokens.Space12, PanelText.Pad, 0); + } + _marks = new MarkLayer(_editor); _gutter = new LineGutter(_editor) { IsVisible = false }; @@ -175,7 +228,7 @@ public ComposerView(TerminalView view, bool fullScreen) _well = new Border { Child = text, - Margin = new Thickness(PanelText.Pad, NativeTokens.Space12, PanelText.Pad, 0), + Margin = new Thickness(PanelText.Pad, NativeTokens.Space6, PanelText.Pad, 0), CornerRadius = new CornerRadius(NativeTokens.RadiusControl), BorderThickness = new Thickness(NativeTokens.Hairline), ClipToBounds = true, @@ -188,12 +241,17 @@ public ComposerView(TerminalView view, bool fullScreen) body.Children.Add(_gutter); body.Children.Add(page); - var grid = new Grid { RowDefinitions = new RowDefinitions("Auto,*,Auto,Auto") }; + var grid = new Grid { RowDefinitions = new RowDefinitions("Auto,Auto,Auto,*,Auto,Auto") }; Grid.SetRow(_header, 0); - Grid.SetRow(body, 1); - Grid.SetRow(_preview, 2); - Grid.SetRow(_footer, 3); + Grid.SetRow(_commandRow, 1); + Grid.SetRow(_textLabel, 2); + Grid.SetRow(body, 3); + Grid.SetRow(_preview, 4); + Grid.SetRow(_footer, 5); + _textLabel.IsVisible = !fullScreen; grid.Children.Add(_header); + grid.Children.Add(_commandRow); + grid.Children.Add(_textLabel); grid.Children.Add(body); grid.Children.Add(_preview); grid.Children.Add(_footer); @@ -287,6 +345,20 @@ public void Show(ComposerModel model, ComposerSession session, PanelInk ink, Col if (model.Revision != _applied) { _applied = model.Revision; + if (!string.Equals(ComposeMessage.CleanCommand(_command.Text), model.Verb, StringComparison.Ordinal)) + { + _applying = true; + try + { + _command.Text = model.Verb; + _command.CaretIndex = model.Verb.Length; + } + finally + { + _applying = false; + } + } + if (!string.Equals(_editor.Text ?? string.Empty, model.Body, StringComparison.Ordinal)) { _applying = true; @@ -327,6 +399,7 @@ public void Show(ComposerModel model, ComposerSession session, PanelInk ink, Col } _rule.IsVisible = !_fullScreen && model.Armed; + if (_armed != model.Armed) { var was = _armed; @@ -338,7 +411,7 @@ public void Show(ComposerModel model, ComposerSession session, PanelInk ink, Col Dispatcher.UIThread.Post(() => _editor.Focus(), DispatcherPriority.Input); } } - else if (was == true && _editor.IsKeyboardFocusWithin) + else if (was == true && (_editor.IsKeyboardFocusWithin || _command.IsKeyboardFocusWithin)) { _view.Focus(); } @@ -348,6 +421,12 @@ public void Show(ComposerModel model, ComposerSession session, PanelInk ink, Col /// The gutter of line numbers, shown for a script. Internal for tests. internal LineGutter Gutter => _gutter; + /// The command field. Internal for tests. + internal TextBox CommandBox => _command; + + /// Whether the command field is shown (a post) and what it holds, for a test. + internal string? CommandText => _commandRow.IsVisible ? _command.Text ?? string.Empty : null; + /// The header's length cell as drawn. Internal for tests. internal string CountText => _count.Text ?? string.Empty; @@ -383,12 +462,24 @@ private void Paint() _header.BorderThickness = new Thickness(0, 0, 0, NativeTokens.Hairline); _footer.BorderBrush = _header.BorderBrush; _footer.BorderThickness = _fullScreen ? new Thickness(0, NativeTokens.Hairline, 0, 0) : default; + var tokens = NativeTokens.For(null, Luma(_plane) < 0.5); if (_well is not null) { + // The mockup's Text field: the well's ground, ringed in the focus edge, as the field the post is written in. _well.Background = new SolidColorBrush(Well); - _well.BorderBrush = new SolidColorBrush(Mix(_plane, _text, 0.2)); + _well.BorderBrush = new SolidColorBrush(tokens.Focus); } + // The Command field: the same ground, ringed in the quieter edge. + _commandWell.Background = new SolidColorBrush(_fullScreen ? Mix(_plane, _text, 0.05) : Well); + _commandWell.BorderBrush = new SolidColorBrush(tokens.Edge); + _command.Foreground = new SolidColorBrush(_text); + _command.CaretBrush = new SolidColorBrush(Accent); + _command.SelectionBrush = new SolidColorBrush(Color.FromArgb(0x70, Accent.R, Accent.G, Accent.B)); + _command.SelectionForegroundBrush = new SolidColorBrush(_text); + _commandLabel.Foreground = new SolidColorBrush(Dim); + _textLabel.Foreground = new SolidColorBrush(Dim); + _summary.Foreground = new SolidColorBrush(Dim); PaintButton(_previewButton, accent: false); PaintButton(_sendButton, accent: true); @@ -422,6 +513,10 @@ private void ApplyFont() _target.FontSize = _fullScreen ? ui : PanelText.Size; _count.FontSize = ui - 1; _summary.FontSize = PanelText.Size - 1; + _commandLabel.FontSize = _fullScreen ? ui - 1 : PanelText.Size - 1; + _textLabel.FontSize = PanelText.Size - 1; + _command.FontSize = Math.Clamp(cell * 0.8, 11, 18); + _command.FontFamily = NativeTokens.CellFace(_view.Renderer.Fonts.FamilyName); foreach (var button in new[] { _previewButton, _sendButton }) { if (button.Child is TextBlock words) @@ -532,6 +627,12 @@ private void Label(ComposerModel model) } _preview.IsVisible = _fullScreen && model.Preview && model.Edit is null; + + // The command field and the Text label: a post's, and in a docked pane only while there is room for them over an + // editor worth writing in — the heading, both labels, the field, two lines of text and the footer are about 232 px. + var roomForCommand = _fullScreen || Bounds.Height is 0 or >= 232; + _commandRow.IsVisible = model.HasCommandField && roomForCommand; + _textLabel.IsVisible = !_fullScreen && model.HasCommandField && roomForCommand; SyncLength(); _keys.Children.Clear(); @@ -655,18 +756,21 @@ private void SyncLength() } var text = _editor.Text ?? string.Empty; - _count.Text = ComposerModel.CharactersLabel(ComposerModel.SentLength(text, model.Escaping, model.Edit is not null)); + var verb = model.HasCommandField ? _command.Text : null; + _count.Text = ComposerModel.CharactersLabel(ComposerModel.SentLength(verb, text, model.Escaping, model.Edit is not null)); if (!_fullScreen) { - // 2 paragraphs · 31 words · 240 chars; before anything is written, the keys that move in and out of it. + // 2 paragraphs · 31 words, the mockup's footer, with the length as sent in its tooltip (the chars count would + // elide the words in a 380 px column); before anything is written, the keys that move in and out of it. var summary = ComposerModel.Summary(text); _summary.Text = summary.Length > 0 - ? $"{summary} · {_count.Text}" + ? summary : NativeKeys.Words(model.Armed ? "Esc command line · F1 full screen" : "F1 full screen"); + ToolTip.SetTip(_summary, summary.Length > 0 ? $"{_count.Text} as sent" : null); } if (_preview.IsVisible) { - var command = ComposeMessage.Build(text.Replace("\r\n", "\n", StringComparison.Ordinal), model.Escaping); + var command = ComposeMessage.Build(verb, text.Replace("\r\n", "\n", StringComparison.Ordinal), model.Escaping); _previewText.Text = command ?? "nothing yet"; } } @@ -686,6 +790,40 @@ private void OnTextChanged() } } + /// The command field changed: the length cell follows, and the client is told unless it wrote it. + private void OnCommandChanged() + { + SyncLength(); + if (_session is { } session && !_applying) + { + session.EditedCommand(_command.Text ?? string.Empty); + } + } + + /// + /// A key in the command field: ⏎ and ⇥ move on to the text (a command is one line), and every composer chord — ⌃S, + /// ⌥L, ⌥P, Esc, the keys a docked editor hands the client — means what it means in the text. + /// + private void OnCommandKeyDown(object? sender, KeyEventArgs e) + { + var mods = e.KeyModifiers & (KeyModifiers.Control | KeyModifiers.Alt | KeyModifiers.Shift); + if ((e.Key == Key.Enter && mods == KeyModifiers.None) || (e.Key == Key.Tab && mods == KeyModifiers.None)) + { + e.Handled = true; + _editor.Focus(); + return; + } + + if (e.Key == Key.W && mods == KeyModifiers.Alt) + { + // ⌥W is a word of the text; in the command field it does nothing. + e.Handled = true; + return; + } + + OnEditorKeyDown(sender, e); + } + private void AskToArm() { if (!_fullScreen && _model is { Armed: false } && _session is { } session) @@ -722,6 +860,18 @@ private void OnEditorKeyDown(object? sender, KeyEventArgs e) session.Send(text); return; + case (Key.Tab, KeyModifiers.Shift) when model.HasCommandField && ReferenceEquals(sender, _editor): + // ⇧⇥ from the text back to the command field; ⇥ from the command field is its own handler's. + e.Handled = true; + _command.Focus(); + return; + + case (Key.Tab, KeyModifiers.None) when model.HasCommandField && ReferenceEquals(sender, _editor): + e.Handled = true; + _command.Focus(); + _command.SelectAll(); + return; + case (Key.L, KeyModifiers.Alt): e.Handled = true; session.ToggleEscaping(); diff --git a/src/SharpMUTerm.Client/Composer/ComposerModel.cs b/src/SharpMUTerm.Client/Composer/ComposerModel.cs index 2424c668..a93d6c6f 100644 --- a/src/SharpMUTerm.Client/Composer/ComposerModel.cs +++ b/src/SharpMUTerm.Client/Composer/ComposerModel.cs @@ -83,8 +83,21 @@ public sealed record ComposerModel( IReadOnlyList Marks, IReadOnlyList Keys) { - /// What ⌃S sends for this draft: , or null for nothing (or an edit). - public string? Command => Edit is null ? ComposeMessage.Build(Body, Escaping) : null; + /// + /// The command field: the verb the text is sent with (+pose, +bbpost 12=), drawn above the text in both + /// hosts. Empty for none — then the text is the whole command, verb and all, as the single buffer always was — and + /// always empty for an edit, which has no command field. + /// + public string Verb { get; init; } = string.Empty; + + /// Whether the composer draws a command field: a post does; a MOO or script edit is its lines alone. + public bool HasCommandField => Edit is null; + + /// + /// What ⌃S sends for this draft: of the command and + /// the text, or null for nothing (or an edit). + /// + public string? Command => Edit is null ? ComposeMessage.Build(Verb, Body, Escaping) : null; /// /// Whether F1 shows the post as it will be sent (⌥P) — the %r-joined, escaped command — under the editor. The @@ -93,7 +106,7 @@ public sealed record ComposerModel( public bool Preview { get; init; } /// The header's length cell for this draft: . - public int Characters => SentLength(Body, Escaping, Edit is not null); + public int Characters => SentLength(Verb, Body, Escaping, Edit is not null); /// /// How long a draft is as the game will get it: the length of 's command, with its @@ -107,6 +120,17 @@ public static int SentLength(string body, ComposeEscaping escaping, bool edit) return edit ? body.TrimEnd('\n').Length : ComposeMessage.Build(body, escaping)?.Length ?? 0; } + /// + /// of a post written as a command and its text: the length of + /// the one line the two fields make. + /// + public static int SentLength(string? verb, string body, ComposeEscaping escaping, bool edit) + { + ArgumentNullException.ThrowIfNull(body); + body = body.Replace("\r\n", "\n", StringComparison.Ordinal); + return edit ? body.TrimEnd('\n').Length : ComposeMessage.Build(verb, body, escaping)?.Length ?? 0; + } + /// The length cell's words: 1 char, 240 chars. public static string CharactersLabel(int count) => count == 1 ? "1 char" : $"{count:N0} chars"; @@ -143,10 +167,27 @@ public static string Summary(string body) } /// - /// The verb the post starts with — +pose, say — for the docked header, so a reader can see what the - /// buffer will be sent as without reading it. Empty for an empty buffer. + /// What the docked header names the post by — +pose, say — so a reader can see what it will be sent as + /// without reading it: the command field, elided to sixteen characters, or with none the text's first word. Empty for + /// an empty post. /// - public string Verb => VerbOf(Body); + public string HeadingVerb + { + get + { + var verb = ComposeMessage.CleanCommand(Verb); + return verb.Length == 0 ? VerbOf(Body) : verb.Length <= 16 ? verb : verb[..15] + "…"; + } + } + + /// The command field's label in both hosts. + public const string CommandLabel = "Command"; + + /// The text field's label in both hosts. + public const string TextLabel = "Text"; + + /// What an empty command field says: what goes there, and that it may be left empty. + public const string CommandPlaceholder = "+pose, say, +bbpost 3= … or none"; /// /// The model for a composer's state. The keys are worked out here, so the cells and the window offer the same row: @@ -164,7 +205,8 @@ public static ComposerModel Create( bool canSend, bool armed, long revision, - bool preview = false) + bool preview = false, + string verb = "") { ArgumentNullException.ThrowIfNull(target); ArgumentNullException.ThrowIfNull(body); @@ -184,6 +226,7 @@ public static ComposerModel Create( KeysFor(place, edit is not null, checker is not null, canSend, armed, preview, edit)) { Preview = preview && place == ComposerPlace.FullScreen && edit is null, + Verb = edit is null ? (verb ?? string.Empty).Replace("\r\n", " ", StringComparison.Ordinal).Replace('\n', ' ') : string.Empty, }; } @@ -223,6 +266,9 @@ public static IReadOnlyList KeysFor(ComposerPlace place, bool edit, docked.Add(new("F1", "full screen", "full")); docked.Add(new("Esc", "command line", "back")); + + // Last, so a narrow pane elides it before the way back. + docked.Add(new("⇥", "command ↔ text", "field")); return docked; } @@ -248,6 +294,7 @@ public static IReadOnlyList KeysFor(ComposerPlace place, bool edit, var keys = new List { new("⌃S", canSend ? "send" : "send (nothing connected)"), + new("⇥", "command ↔ text", "field"), new("⌥L", "escaping"), }; // With no dictionary, ⌥W is the way to one: the offer, never a download on its own. @@ -274,6 +321,7 @@ other is not null && Place == other.Place && Target == other.Target && Body == other.Body + && Verb == other.Verb && Escaping == other.Escaping && Equals(Edit, other.Edit) && Dictionary == other.Dictionary diff --git a/src/SharpMUTerm.Client/Composer/ComposerSession.cs b/src/SharpMUTerm.Client/Composer/ComposerSession.cs index 7667d212..b9f2e637 100644 --- a/src/SharpMUTerm.Client/Composer/ComposerSession.cs +++ b/src/SharpMUTerm.Client/Composer/ComposerSession.cs @@ -12,6 +12,12 @@ public sealed record ComposerCallbacks /// The writer changed the text: the whole buffer, lines broken by \n. public Action? Edited { get; init; } + /// + /// The writer changed the command field (): the whole field, one line. Null where the + /// composer has none to change. + /// + public Action? CommandEdited { get; init; } + /// ⌃S, with the buffer as it stands. public Action? Send { get; init; } @@ -120,6 +126,18 @@ public IReadOnlyList Suggestions(string word) => /// The host's: the writer changed the text. public void Edited(string body) => Pass(_callbacks.Edited, Normalise(body)); + /// + /// The host's: the writer changed the command field. Passed on one line (a pasted break is a space); nothing for an + /// edit, which has no command field. + /// + public void EditedCommand(string command) + { + if (Model.HasCommandField) + { + Pass(_callbacks.CommandEdited, Normalise(command).Replace('\n', ' ')); + } + } + /// The host's: ⌃S. public void Send(string body) => Pass(_callbacks.Send, Normalise(body)); diff --git a/src/SharpMUTerm.Core/Commands/ComposeMessage.cs b/src/SharpMUTerm.Core/Commands/ComposeMessage.cs index 6701adee..9fec8457 100644 --- a/src/SharpMUTerm.Core/Commands/ComposeMessage.cs +++ b/src/SharpMUTerm.Core/Commands/ComposeMessage.cs @@ -72,6 +72,54 @@ public static class ComposeMessage return sb.ToString(); } + /// + /// The one line to send for a post written as a (+pose, +bbpost 12=) and the + /// it carries — the composer's two fields — or null when there is nothing to send. + /// + /// The body is built exactly as builds a whole buffer (escaped first, + /// then joined with %r), and the command is put in front of it unescaped: it is the verb and its + /// switches, which the game must read. A blank command is the old single buffer, so a body that already starts with + /// its verb is sent as it always was. A body with nothing in it is nothing to send, whatever the command says. + /// + /// + /// One space joins them (), except after a command ending in = (+bbpost 12=Title, + /// page Bob=hi) or one that is a single punctuation character — MUSH's :, ; and " + /// shorthands are written against the text. + /// + /// + public static string? Build(string? command, string? body, ComposeEscaping escaping) + { + var text = Build(body, escaping); + return text is null ? null : Join(command, text); + } + + /// + /// (made one line and trimmed, ) in front of + /// , by 's rule; just + /// with no command. + /// + public static string Join(string? command, string text) + { + ArgumentNullException.ThrowIfNull(text); + var head = CleanCommand(command); + if (head.Length == 0) + { + return text; + } + + var tight = head[^1] == '=' || (head.Length == 1 && !char.IsLetterOrDigit(head[0])); + return tight ? head + text : head + " " + text; + } + + /// + /// The command field as it is sent: one line (a pasted break becomes a space) with no spaces at either end. Empty for + /// none. + /// + public static string CleanCommand(string? command) => + string.IsNullOrWhiteSpace(command) + ? string.Empty + : command.Replace("\r\n", " ", StringComparison.Ordinal).Replace('\n', ' ').Replace('\r', ' ').Trim(); + /// /// Splits a buffer into lines, treating CRLF, LF and a lone CR alike. The editor writes /// , a paste carries whatever the source had, and a body that diff --git a/src/SharpMUTerm.Tui/ComposeOverlay.cs b/src/SharpMUTerm.Tui/ComposeOverlay.cs index 36226d2c..e5350e55 100644 --- a/src/SharpMUTerm.Tui/ComposeOverlay.cs +++ b/src/SharpMUTerm.Tui/ComposeOverlay.cs @@ -15,7 +15,8 @@ namespace SharpMUTerm.Tui; /// The window's escaping mode when it happened. /// The MOO buffer this is an edit of, or null for a post. /// The script file this is an edit of, or null. -internal readonly record struct ComposeResult(string Body, ComposeEscaping Escaping, MooEdit? Edit = null, ScriptEdit? Script = null); +/// The command field (): empty for none, and for an edit. +internal readonly record struct ComposeResult(string Body, ComposeEscaping Escaping, MooEdit? Edit = null, ScriptEdit? Script = null, string Verb = ""); /// /// A script file open in the composer: its name under the scripts folder (or package:<id>/<file>), whose @@ -74,6 +75,10 @@ internal sealed class ComposeOverlay private Window? _window; private MultilineEditControl? _editor; + private Panels.ComposerCommandRow? _command; + + /// Whether the keyboard is in the command field (⇥ moves it); only while a post is open. + private bool _inCommand; private ComposeEscaping _escaping; private string _target = string.Empty; private bool _canSend; @@ -139,6 +144,12 @@ internal void ForgetSpelling() /// internal string Body => _editor?.GetContent().Replace("\r\n", "\n", StringComparison.Ordinal) ?? string.Empty; + /// The command field as it stands, one line; empty when shut, and for an edit, which has none. + internal string Verb => _command?.Text ?? string.Empty; + + /// Whether the keyboard is in the command field, for the tests. + internal bool InCommand => _command is not null && _inCommand; + /// The escaping mode as it stands — the window's own toggle, not a saved setting. internal ComposeEscaping Escaping => _escaping; @@ -171,7 +182,7 @@ internal void SetScriptStatus(string status) /// What the window draws, as the shared model a native composer draws: the target, the buffer as it stands, the /// mode, the edit, the dictionary and its marks, and the key row. /// - internal ComposerModel Model => ModelFor(_target, Body, _escaping, _edit, Spelling, _canSend, Preview, _script); + internal ComposerModel Model => ModelFor(_target, Body, _escaping, _edit, Spelling, _canSend, Preview, _script, Verb); /// /// Whether F1 shows the post as it will be sent (⌥P), under the editor. One fact for the run in both hosts — the @@ -187,7 +198,7 @@ internal void SetScriptStatus(string status) /// it, so the two say the same thing for the same draft. Revision 1: F1 opens on a draft and nothing replaces it /// while it is open. /// - internal static ComposerModel ModelFor(string target, string body, ComposeEscaping escaping, MooEdit? edit, SpellChecker? spelling, bool canSend, bool preview = false, ScriptEdit? script = null) => + internal static ComposerModel ModelFor(string target, string body, ComposeEscaping escaping, MooEdit? edit, SpellChecker? spelling, bool canSend, bool preview = false, ScriptEdit? script = null, string verb = "") => ComposerModel.Create( ComposerPlace.FullScreen, target, @@ -198,7 +209,8 @@ internal static ComposerModel ModelFor(string target, string body, ComposeEscapi canSend, armed: true, revision: 1, - preview: preview); + preview: preview, + verb: verb); /// /// Opens the composer on , or closes it when it is already open — the same @@ -214,7 +226,8 @@ internal static ComposerModel ModelFor(string target, string body, ComposeEscapi /// /// The MOO buffer this opens on, or null for a post. /// The script file this opens on, or null. - internal void Toggle(string target, string draft, ComposeEscaping escaping, bool canSend, MooEdit? edit = null, ScriptEdit? script = null) + /// The command field the draft was left with; a post only. + internal void Toggle(string target, string draft, ComposeEscaping escaping, bool canSend, MooEdit? edit = null, ScriptEdit? script = null, string verb = "") { if (_window is not null) { @@ -285,6 +298,15 @@ internal void Toggle(string target, string draft, ComposeEscaping escaping, bool } _editor.SetContent(draft); + _inCommand = false; + _command = null; + if (edit is null && script is null) + { + // A post has a command field above its text; an edit is its lines alone. + _command = new Panels.ComposerCommandRow(_scheme, ScreenPalette.FooterBg); + _command.Set(verb); + _command.Field.ContentChanged += (_, _) => RefreshBands(); + } if (script is { Line: > 0 } at) { _editor.GoToLine(at.Line); @@ -300,8 +322,13 @@ internal void Toggle(string target, string draft, ComposeEscaping escaping, bool .Maximized() .Frameless() .WithColors(_scheme.Colour(ScreenPalette.PanelFg), _scheme.Colour(ScreenPalette.PanelBg)) - .AddControl(HeaderBand()) - .AddControl(_editor); + .AddControl(HeaderBand()); + if (CommandControl() is { } row) + { + builder.AddControl(row); + } + + builder.AddControl(_editor); if (Model.Preview) { builder.AddControl(PreviewBand()); @@ -318,7 +345,36 @@ internal void Toggle(string target, string draft, ComposeEscaping escaping, bool // Nothing focuses a control for you in this framework, and an unfocused editor takes no // keystrokes at all — the window would open looking right and swallow everything typed into it. - _window.FocusManager.SetFocus(_editor, FocusReason.Programmatic); + _window.FocusManager.SetFocus(FocusedField, FocusReason.Programmatic); + } + + /// The field the keyboard is in: the command field after ⇥, else the text. + private MultilineEditControl FocusedField => _inCommand && _command is not null ? _command.Field : _editor!; + + /// The command row, sticky under the header, or null for an edit. + private IWindowControl? CommandControl() + { + if (_command is null) + { + return null; + } + + _command.Control.StickyPosition = StickyPosition.Top; + + return _command.Control; + } + + /// ⇥ / ⇧⇥ / ⏎ in the command field: the keyboard to the other field. + private void SwitchField(bool toCommand) + { + if (_window is null || _command is null) + { + return; + } + + _inCommand = toCommand; + _window.FocusManager.SetFocus(FocusedField, FocusReason.Programmatic); + _window.Invalidate(redrawAll: true); } /// @@ -361,7 +417,7 @@ internal bool SimulateKey(ConsoleKeyInfo key) return args.Handled; } - /// Types text into the editor, the way the framework's own key path would. + /// Types text into the field the keyboard is in, the way the framework's own key path would. internal void SimulateTyping(string text) { if (_editor is null) @@ -369,7 +425,8 @@ internal void SimulateTyping(string text) return; } - _editor.SetContent(_editor.GetContent() + text); + var field = FocusedField; + field.SetContent(field.GetContent() + text); RefreshBands(); } @@ -454,6 +511,16 @@ private void OnKey(object? sender, KeyPressedEventArgs e) return; } + // ⇥ and ⇧⇥ move between the command field and the text, and ⏎ in the command field moves on to the text: a + // command is one line, and a post's text has no use for a tab. An edit has one field and keeps its ⇥ (indent). + if (_command is not null && !ctrl && !alt + && (key.Key == ConsoleKey.Tab || (key.Key == ConsoleKey.Enter && _inCommand))) + { + e.Handled = true; + SwitchField(key.Key == ConsoleKey.Tab && !_inCommand && !key.Modifiers.HasFlag(ConsoleModifiers.Shift)); + return; + } + if (key.Key == ConsoleKey.Escape && !ctrl && !alt) { e.Handled = true; @@ -498,7 +565,7 @@ private void SendNow() // the close so the handler sees the buffer rather than an empty window — and Closed still // follows, so a send the host refuses (no connection) keeps the post rather than dropping it on // the floor. - Send?.Invoke(this, new ComposeResult(Body, _escaping, _edit, _script)); + Send?.Invoke(this, new ComposeResult(Body, _escaping, _edit, _script, Verb)); } /// Shuts the window, handing the buffer back for the host to keep. @@ -509,7 +576,7 @@ internal void Close() return; } - var result = new ComposeResult(Body, _escaping, _edit, _script); + var result = new ComposeResult(Body, _escaping, _edit, _script, Verb); _system.CloseModalWindow(window); Closed?.Invoke(this, result); } @@ -528,6 +595,11 @@ private void Redraw() window.ClearControls(); window.AddControl(HeaderBand()); + if (CommandControl() is { } row) + { + window.AddControl(row); + } + window.AddControl(_editor); if (Model.Preview) { @@ -541,7 +613,7 @@ private void Redraw() window.AddControl(FooterBand()); FitEditor(); window.Invalidate(redrawAll: true); - window.FocusManager.SetFocus(_editor, FocusReason.Programmatic); + window.FocusManager.SetFocus(FocusedField, FocusReason.Programmatic); } /// @@ -737,7 +809,7 @@ private void FitEditor() return; } - _editor.ViewportHeight = Math.Max(1, _system.ConsoleDriver.ScreenSize.Height - ChromeRows - (Model.Preview ? PreviewRows : 0)); + _editor.ViewportHeight = Math.Max(1, _system.ConsoleDriver.ScreenSize.Height - ChromeRows - (_command is null ? 0 : 1) - (Model.Preview ? PreviewRows : 0)); } /// The header and footer bands, which the editor's height is whatever is left over from. @@ -762,6 +834,8 @@ private void Reset() _system.ConsoleDriver.ScreenResized -= OnScreenResized; _window = null; _editor = null; + _command = null; + _inCommand = false; _edit = null; _script = null; _headerBand = null; diff --git a/src/SharpMUTerm.Tui/Panels/ComposerCommandRow.cs b/src/SharpMUTerm.Tui/Panels/ComposerCommandRow.cs new file mode 100644 index 00000000..91c79c58 --- /dev/null +++ b/src/SharpMUTerm.Tui/Panels/ComposerCommandRow.cs @@ -0,0 +1,96 @@ +using SharpConsoleUI; +using SharpConsoleUI.Builders; +using SharpConsoleUI.Controls; +using SharpConsoleUI.Layout; +using SharpMUTerm.Client.Composer; +using SharpMUTerm.Core.Commands; + +namespace SharpMUTerm.Tui.Panels; + +/// +/// The composer's command field in cells, one row above the text: command +pose. F1 and the docked panel both +/// draw it for a post (); a MOO or script edit has none. +/// +/// The field is a one-row editor, and its keys are the composer's to route. ⇥ and ⇧⇥ move between it and the +/// text, ⏎ in it moves to the text (a command is one line), and everything else is the editor's. Pasted line breaks +/// become spaces on the way out (), so whatever it holds is one line. +/// +/// +internal sealed class ComposerCommandRow +{ + /// The label column's width: command plus a cell. + internal const int LabelWidth = 10; + + private readonly MarkupControl _label; + + /// The settings screens' palette the composer is painted in. + /// + /// The row's plane under the label (a role), or null for the pane's own: the docked panel + /// sits on its pane's plane, as its header does. + /// + internal ComposerCommandRow(ScreenTheme scheme, string? plane) + { + Field = new MultilineEditControl + { + WrapMode = WrapMode.NoWrap, + ShowLineNumbers = false, + IsEditing = true, + ViewportHeight = 1, + MaxLength = 200, + HorizontalScrollbarVisibility = ScrollbarVisibility.Never, + VerticalScrollbarVisibility = ScrollbarVisibility.Never, + HorizontalAlignment = HorizontalAlignment.Stretch, + EscapeExitsEditMode = false, + PlaceholderText = ComposerModel.CommandPlaceholder, + }; + + _label = new MarkupControl(new List()) { HorizontalAlignment = HorizontalAlignment.Stretch }; + Paint(scheme, plane); + + var grid = Controls.Grid().WithAlignment(HorizontalAlignment.Stretch); + grid.Rows(GridLength.Cells(1)).Columns(GridLength.Cells(LabelWidth), GridLength.Star(1)); + grid.Place(_label, 0, 0, 1, 1); + grid.Place(Field, 0, 1, 1, 1); + Control = grid.Build(); + } + + /// The one-row editor holding the command. + internal MultilineEditControl Field { get; } + + /// What the composer lays out. + internal IWindowControl Control { get; } + + /// The command as it will be sent: one line, trimmed. + internal string Text => ComposeMessage.CleanCommand(Field.GetContent()); + + /// Re-colours the row: the label on , the field in the screens' field well. + internal void Paint(ScreenTheme scheme, string? plane) + { + if (plane is null) + { + _label.SetContent(new List { "[dim] command[/]" }); + } + else + { + _label.SetContent(new List { scheme.Paint($"[{ScreenPalette.Label}] command[/]", plane) }); + _label.BackgroundColor = scheme.Colour(plane); + } + + Field.BackgroundColor = scheme.Colour(ScreenPalette.FieldBg); + Field.FocusedBackgroundColor = scheme.Colour(ScreenPalette.CursorBg); + Field.ForegroundColor = scheme.Colour(ScreenPalette.Value); + Field.FocusedForegroundColor = scheme.Colour(ScreenPalette.Value); + Field.SelectionBackgroundColor = scheme.Colour(ScreenPalette.MenuSelectedBg); + Field.SelectionForegroundColor = scheme.Colour(ScreenPalette.Value); + } + + /// Replaces what the field holds, as one line. + internal void Set(string? command) + { + var text = ComposeMessage.CleanCommand(command); + if (!string.Equals(Field.GetContent(), text, StringComparison.Ordinal)) + { + Field.SetContent(text); + } + } +} diff --git a/src/SharpMUTerm.Tui/Panels/DockedComposer.cs b/src/SharpMUTerm.Tui/Panels/DockedComposer.cs index abdc54ca..2f88386a 100644 --- a/src/SharpMUTerm.Tui/Panels/DockedComposer.cs +++ b/src/SharpMUTerm.Tui/Panels/DockedComposer.cs @@ -11,7 +11,8 @@ namespace SharpMUTerm.Tui.Panels; /// /// The composer as a pane: a header naming what is being written and how it will be escaped -/// (COMPOSE +pose literal), the F1 composer's editor, and a key row +/// (COMPOSE +pose literal), the command field (), the F1 composer's editor for +/// the text, and a key row /// (⌃S send · ⌥L literal · F1 full screen · Esc command line). /// /// The editor is the F1 composer's — a that inserts on ⏎, wraps words @@ -91,16 +92,32 @@ internal DockedComposer(string windowId, string sessionKey, ScreenTheme scheme, } }; + CommandRow = new ComposerCommandRow(scheme, plane: null); + CommandRow.Field.ContentChanged += (_, _) => + { + if (!_fromHost) + { + Revision++; + } + + if (!_quiet) + { + Redraw(); + Changed?.Invoke(this, EventArgs.Empty); + } + }; + _header = new MarkupControl(new List()) { HorizontalAlignment = HorizontalAlignment.Stretch }; _footer = new MarkupControl(new List()) { HorizontalAlignment = HorizontalAlignment.Stretch }; var grid = Controls.Grid() .WithAlignment(HorizontalAlignment.Stretch) .WithVerticalAlignment(VerticalAlignment.Fill); - grid.Rows(GridLength.Cells(1), GridLength.Star(1), GridLength.Cells(1)).Columns(GridLength.Star(1)); + grid.Rows(GridLength.Cells(1), GridLength.Cells(1), GridLength.Star(1), GridLength.Cells(1)).Columns(GridLength.Star(1)); grid.Place(_header, 0, 0, 1, 1); - grid.Place(Editor, 1, 0, 1, 1); - grid.Place(_footer, 2, 0, 1, 1); + grid.Place(CommandRow.Control, 1, 0, 1, 1); + grid.Place(Editor, 2, 0, 1, 1); + grid.Place(_footer, 3, 0, 1, 1); Control = grid.Build(); Redraw(); } @@ -117,6 +134,28 @@ internal DockedComposer(string windowId, string sessionKey, ScreenTheme scheme, /// The editor, which the host focuses and hands keys to while this is armed. internal MultilineEditControl Editor { get; } + /// The command field above the text. + internal ComposerCommandRow CommandRow { get; } + + /// The command field's text, one line (). + internal string Verb => CommandRow.Text; + + /// + /// Whether the keyboard is in the command field rather than the text: ⇥ moves it (), and a + /// click in either field puts it there. The composer's own state, never the model's: where a caret is is not a fact + /// the other host draws. + /// + internal bool InCommand { get; set; } + + /// The field the keyboard is in: the one the host focuses and hands keys to while this is armed. + internal MultilineEditControl Focused => InCommand ? CommandRow.Field : Editor; + + /// Whether is one of this composer's two fields. + internal bool Owns(object? control) => ReferenceEquals(control, Editor) || ReferenceEquals(control, CommandRow.Field); + + /// ⇥: the keyboard to the other field. + internal void ToggleField() => InCommand = !InCommand; + /// The escaping mode, toggled by ⌥L, as F1's is. internal ComposeEscaping Escaping { get; private set; } = ComposeEscaping.AsTyped; @@ -181,6 +220,25 @@ internal void SetFromHost(string body) } } + /// The command a native editor's command field now holds, written in as writes the text. + internal void SetCommandFromHost(string command) + { + if (string.Equals(Verb, ComposeMessage.CleanCommand(command), StringComparison.Ordinal)) + { + return; + } + + _fromHost = true; + try + { + CommandRow.Set(command); + } + finally + { + _fromHost = false; + } + } + /// Raised after the buffer or the mode changed by the writer's hand (never by ). internal event EventHandler? Changed; @@ -191,22 +249,27 @@ internal void SetFromHost(string body) internal string FooterMarkup => _footer.Text; /// Replaces the buffer and mode with a draft kept elsewhere (F1 closing), raising nothing. - internal void Load(string body, ComposeEscaping escaping) + internal void Load(string body, ComposeEscaping escaping, string? verb = null) { Escaping = escaping; Revision++; - if (!string.Equals(Body, body, StringComparison.Ordinal)) + _quiet = true; + try { - _quiet = true; - try + if (!string.Equals(Body, body, StringComparison.Ordinal)) { Editor.SetContent(body); } - finally + + if (verb is not null) { - _quiet = false; + CommandRow.Set(verb); } } + finally + { + _quiet = false; + } Redraw(); } @@ -222,7 +285,7 @@ internal void ToggleEscaping() /// Sizes the editor to the pane's box, less the header and key rows. internal void Fit(int width, int height) { - var rows = Math.Max(1, height - 2); + var rows = Math.Max(1, height - 3); if (Editor.ViewportHeight != rows) { Editor.ViewportHeight = rows; @@ -238,12 +301,6 @@ internal void Fit(int width, int height) /// The pane's width, which picks the key row's long or short form. private int _width; - /// - /// The verb the post starts with — +pose, say — for the header, so a reader can see what the - /// buffer will be sent as without reading it. Empty for an empty buffer. - /// - internal static string Verb(string body) => ComposerModel.VerbOf(body); - /// Re-describes the composer and draws the model. internal void Redraw() { @@ -259,7 +316,7 @@ internal void Redraw() /// internal void Render(ComposerModel model) { - var verb = model.Verb; + var verb = model.HeadingVerb; var mode = model.Escaping == ComposeEscaping.Literal ? $"[{_accent}]literal[/]" : "[dim]as typed[/]"; var marker = model.Armed ? $"[{_accent}]▌[/]" : " "; var title = $"{marker}[bold {_accent}]COMPOSE[/]" + (verb.Length > 0 ? $" {Escape(verb)}" : string.Empty) + $" {mode}"; diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.NativeComposer.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.NativeComposer.cs index 1c8e1cba..fc0b9f5e 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.NativeComposer.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.NativeComposer.cs @@ -96,7 +96,7 @@ private IEnumerable SpellingNames() /// Opens F1 on a draft: in the host's editor when it has one, else the cell window. Both are given the same draft /// and say the same thing about it (). /// - private void OpenComposer(string target, string draft, ComposeEscaping escaping, bool canSend, MooEdit? edit = null, ScriptEdit? script = null) + private void OpenComposer(string target, string draft, ComposeEscaping escaping, bool canSend, MooEdit? edit = null, ScriptEdit? script = null, string verb = "") { // The names a game reports change between openings; the dictionary learns them each time F1 opens. if (_composerSpellingOpened) @@ -106,7 +106,7 @@ private void OpenComposer(string target, string draft, ComposeEscaping escaping, if (NativeComposerHost is not { } native) { - _composer.Toggle(target, draft, escaping, canSend, edit, script); + _composer.Toggle(target, draft, escaping, canSend, edit, script, verb); return; } @@ -115,6 +115,7 @@ private void OpenComposer(string target, string draft, ComposeEscaping escaping, Body = draft.Replace("\r\n", "\n", StringComparison.Ordinal), Escaping = escaping, Script = script, + Verb = edit is null && script is null ? ComposeMessage.CleanCommand(verb) : string.Empty, }; open.Session = new ComposerSession( NativeComposeModel(open), @@ -130,12 +131,20 @@ private void OpenComposer(string target, string draft, ComposeEscaping escaping, open.Session.Publish(NativeComposeModel(open)); } }), + CommandEdited = command => OnUiThread(() => + { + if (ReferenceEquals(_nativeCompose, open) && open.Edit is null && open.Script is null) + { + open.Verb = ComposeMessage.CleanCommand(command); + open.Session.Publish(NativeComposeModel(open)); + } + }), Send = body => OnUiThread(() => { if (ReferenceEquals(_nativeCompose, open)) { open.Body = body; - SendComposed(new ComposeResult(body, open.Escaping, open.Edit, open.Script)); + SendComposed(new ComposeResult(body, open.Escaping, open.Edit, open.Script, open.Verb)); } }), ToggleEscaping = () => OnUiThread(() => @@ -208,7 +217,7 @@ private Action ChooseComposerFace(string? sessionKey) => proportional => O /// The native F1's model for what it holds now; the cell window's for the same draft. private ComposerModel NativeComposeModel(NativeCompose open) => - ComposeOverlay.ModelFor(open.Target, open.Body, open.Escaping, open.Edit, open.Edit is null && open.Script is null ? ComposerSpelling() : null, open.CanSend, _composer.Preview, open.Script); + ComposeOverlay.ModelFor(open.Target, open.Body, open.Escaping, open.Edit, open.Edit is null && open.Script is null ? ComposerSpelling() : null, open.CanSend, _composer.Preview, open.Script, open.Verb); /// /// Closes F1, in whichever host it is open, keeping its buffer as the character's draft (or MOO edit) exactly as the @@ -225,7 +234,7 @@ private void CloseComposer() _nativeCompose = null; open.Session.End(); Host.NativeComposer?.Close(); - KeepComposeDraft(new ComposeResult(open.Body, open.Escaping, open.Edit, open.Script)); + KeepComposeDraft(new ComposeResult(open.Body, open.Escaping, open.Edit, open.Script, open.Verb)); PublishPanels(); PublishHostChrome(); } @@ -274,7 +283,8 @@ private ComposerModel DescribeDocked(DockedComposer composer) composer.Spelling, canSend: ComposerCanSend(session, composer.SessionKey), composer.Armed, - composer.Revision); + composer.Revision, + verb: composer.Verb); Drawing(PanelIds.Composer, composer.WindowId, model); if (_dockedSessions.TryGetValue(composer.WindowId, out var native)) { @@ -302,6 +312,7 @@ private ComposerSession DockedSessionFor(DockedComposer composer) new ComposerCallbacks { Edited = body => OnUiThread(() => composer.SetFromHost(body)), + CommandEdited = command => OnUiThread(() => composer.SetCommandFromHost(command)), Send = body => OnUiThread(() => { composer.SetFromHost(body); @@ -406,6 +417,9 @@ private sealed class NativeCompose(string target, bool canSend, MooEdit? edit) internal string Body { get; set; } = string.Empty; + /// The command field, one line; empty for an edit. + internal string Verb { get; set; } = string.Empty; + internal ComposeEscaping Escaping { get; set; } /// The script file this is an edit of, or null; its status moves with each save. diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs index f5e6a5b3..a98d6f97 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs @@ -307,7 +307,7 @@ private IWindowControl NewDockedComposer(TerminalPanelContext context) var composer = new DockedComposer(context.WindowId, context.SessionKey, _screens, _ink.Accent, DescribeDocked); if (_composeDrafts.TryGetValue(context.SessionKey, out var draft)) { - composer.Load(draft.Body, draft.Escaping); + composer.Load(draft.Body, draft.Escaping, draft.Verb); } composer.Changed += (_, _) => KeepDockedDraft(composer); @@ -323,13 +323,13 @@ private IWindowControl NewDockedComposer(TerminalPanelContext context) /// private void KeepDockedDraft(DockedComposer composer) { - if (composer.Body.Trim().Length == 0) + if (composer.Body.Trim().Length == 0 && composer.Verb.Length == 0) { _composeDrafts.Remove(composer.SessionKey); return; } - _composeDrafts[composer.SessionKey] = new ComposeResult(composer.Body, composer.Escaping); + _composeDrafts[composer.SessionKey] = new ComposeResult(composer.Body, composer.Escaping, Verb: composer.Verb); } /// Puts a character's kept draft back into its docked composers, after F1 changed it. @@ -340,7 +340,7 @@ private void SyncDockedComposers(string? sessionKey) if (sessionKey is null || string.Equals(composer.SessionKey, sessionKey, StringComparison.Ordinal)) { var draft = _composeDrafts.GetValueOrDefault(composer.SessionKey); - composer.Load(draft.Body ?? string.Empty, draft.Body is null ? composer.Escaping : draft.Escaping); + composer.Load(draft.Body ?? string.Empty, draft.Body is null ? composer.Escaping : draft.Escaping, draft.Verb ?? string.Empty); } } } @@ -373,7 +373,7 @@ private void SyncDockedComposers(string? sessionKey) /// Whether the framework's focus is on a docked composer's editor. internal bool ComposerHasFocus => - _window.FocusManager.FocusedControl is { } focused && _dockedComposers.Values.Any(c => ReferenceEquals(c.Editor, focused)); + _window.FocusManager.FocusedControl is { } focused && _dockedComposers.Values.Any(c => c.Owns(focused)); /// /// Paints who holds the keyboard: the armed composer's header marker, and both command lines idle while a @@ -426,8 +426,14 @@ private void ReleaseComposer() private void ArmClickedComposer() { if (_pinningFocus || !_window.GetIsActive() || _window.FocusManager.FocusedControl is not { } focused - || _dockedComposers.Values.FirstOrDefault(c => ReferenceEquals(c.Editor, focused)) is not { } clicked - || ReferenceEquals(clicked, ArmedComposer())) + || _dockedComposers.Values.FirstOrDefault(c => c.Owns(focused)) is not { } clicked) + { + return; + } + + // A click in either field puts the keyboard in that field, armed or not. + clicked.InCommand = ReferenceEquals(focused, clicked.CommandRow.Field); + if (ReferenceEquals(clicked, ArmedComposer())) { return; } @@ -477,14 +483,15 @@ private void ArmClickedComposer() // Never the editor's own: its ⌃C/⌃X write to the system clipboard through a helper nothing can // substitute. Through the app's clipboard, as the command line's are. e.Handled = true; - if (!composer.Editor.HasSelection) + var field = composer.Focused; + if (!field.HasSelection) { CopySelection(); } - else if (ToClipboard(composer.Editor.GetSelectedText(), key.Key == ConsoleKey.X ? "cut" : "copied") + else if (ToClipboard(field.GetSelectedText(), key.Key == ConsoleKey.X ? "cut" : "copied") && key.Key == ConsoleKey.X) { - composer.Editor.ProcessKey(new ConsoleKeyInfo('\b', ConsoleKey.Backspace, false, false, false)); + field.ProcessKey(new ConsoleKeyInfo('\b', ConsoleKey.Backspace, false, false, false)); } return null; @@ -524,13 +531,26 @@ private void ArmClickedComposer() return null; } + // ⇥ / ⇧⇥ move between the command field and the text; ⏎ in the command field moves on to the text, a command + // being one line. F1's keys, handed here as every composer key is. + if ((key.Key == ConsoleKey.Tab && (key.Modifiers & ~ConsoleModifiers.Shift) == 0) + || (key.Key == ConsoleKey.Enter && key.Modifiers == 0 && composer.InCommand)) + { + e.Handled = true; + composer.InCommand = key.Key == ConsoleKey.Tab && !composer.InCommand && key.Modifiers == 0; + _window.FocusControl(composer.Focused); + composer.Redraw(); + return null; + } + e.Handled = true; - if (!composer.Editor.HasFocus) + var target = composer.Focused; + if (!target.HasFocus) { - _window.FocusControl(composer.Editor); + _window.FocusControl(target); } - composer.Editor.ProcessKey(key.Key == ConsoleKey.Enter ? new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false) : key); + target.ProcessKey(key.Key == ConsoleKey.Enter ? new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false) : key); return null; } @@ -569,14 +589,16 @@ private void SendDocked(DockedComposer composer) return; } - if (ComposeMessage.Build(composer.Body, composer.Escaping) is not { } line) + if (ComposeMessage.Build(composer.Verb, composer.Body, composer.Escaping) is not { } line) { RefuseCommand("nothing to send — the composer is empty"); return; } - composer.Load(string.Empty, composer.Escaping); - _composeDrafts.Remove(composer.SessionKey); + // The text goes; the command stays, for the next pose. + var verb = composer.Verb; + composer.Load(string.Empty, composer.Escaping, verb); + ForgetComposeText(composer.SessionKey, composer.Escaping, verb); HistoryFor(composer.SessionKey, BarKind(_input)).Add(line); _ = session.SendUserInputAsync(line); } @@ -588,6 +610,8 @@ internal void SimulateComposerTyping(string text) { SimulateKey(c == '\n' ? new ConsoleKeyInfo('\r', ConsoleKey.Enter, false, false, false) + : c == '\t' + ? new ConsoleKeyInfo('\t', ConsoleKey.Tab, false, false, false) : new ConsoleKeyInfo(c, char.IsAsciiLetter(c) ? (ConsoleKey)char.ToUpperInvariant(c) : ConsoleKey.NoName, char.IsUpper(c), false, false)); } } @@ -788,7 +812,7 @@ private void LoadDemoPanels(string view) RebuildPaneArea(); Activate(MainWindowId); Activate(composer); - SimulateComposerTyping("+pose Corvid sets the lantern down by the fountain\nand waits, 100% certain [someone] saw."); + SimulateComposerTyping("\t+pose\tCorvid sets the lantern down by the fountain\nand waits, 100% certain [someone] saw."); } break; diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 0c0d38a3..4d55da29 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -1286,13 +1286,14 @@ public string RenderSnapshot(string? view = null) _composer.Preview = string.Equals(view, "compose-preview", StringComparison.OrdinalIgnoreCase); OpenComposer( DemoScene.MainCharacterName, - "+bbpost 12=The Long Winter\n\nThe caravan reached the pass at dusk, 100% frozen and\n" + "The Long Winter\n\nThe caravan reached the pass at dusk, 100% frozen and\n" + "short two horses. [Nobody] said what everyone was thinking.\n\n" + " -- Corvid, scribe", !string.Equals(view, "compose", StringComparison.OrdinalIgnoreCase) ? ComposeEscaping.Literal : ComposeEscaping.AsTyped, - canSend: true); + canSend: true, + verb: "+bbpost 12="); } // The composer holding a MOO verb to edit: the header names it and its type, and the footer offers a @@ -5541,7 +5542,24 @@ private void ToggleComposer() draft.Body, draft.Escaping, canSend: ComposerCanSend(session, key), - draft.Edit); + draft.Edit, + verb: draft.Verb ?? string.Empty); + } + + /// + /// A post was sent: its text is forgotten and its command kept (with its escaping), so the next post from that + /// character starts on the same verb. A post with no command leaves no draft at all. + /// + private void ForgetComposeText(string key, ComposeEscaping escaping, string verb) + { + if (verb.Length == 0) + { + _composeDrafts.Remove(key); + } + else + { + _composeDrafts[key] = new ComposeResult(string.Empty, escaping, Verb: verb); + } } /// @@ -5606,7 +5624,7 @@ private void SendComposed(ComposeResult result) return; } - if (ComposeMessage.Build(result.Body, result.Escaping) is not { } line) + if (ComposeMessage.Build(result.Verb, result.Body, result.Escaping) is not { } line) { // An empty buffer is not a blank command to send: a MUSH answers a blank line, and some log // it. Said out loud rather than closing quietly, so ⌃S on an empty window is not mistaken @@ -5619,7 +5637,7 @@ private void SendComposed(ComposeResult result) // before it is undone by the very act of shutting the window — the post came back next time it // was opened, already sent. CloseComposer(); - _composeDrafts.Remove(session.SessionKey); + ForgetComposeText(session.SessionKey, result.Escaping, result.Verb ?? string.Empty); SyncDockedComposers(session.SessionKey); HistoryFor(BarKind(ActiveBar())).Add(line); _ = session.SendUserInputAsync(line); @@ -5650,7 +5668,7 @@ private void KeepComposeDraft(ComposeResult result) return; } - if (result.Body.Trim().Length == 0) + if (result.Body.Trim().Length == 0 && string.IsNullOrEmpty(result.Verb)) { _composeDrafts.Remove(key); } @@ -6084,7 +6102,7 @@ private void PinFocusToArmedBar() } // The armed composer, when one holds the keyboard, is what typing, paste and the caret follow instead. - IInteractiveControl bar = ArmedComposer()?.Editor ?? (IInteractiveControl)ActiveBar(); + IInteractiveControl bar = ArmedComposer()?.Focused ?? (IInteractiveControl)ActiveBar(); if (ReferenceEquals(_window.FocusManager.FocusedControl, bar)) { return; @@ -7614,7 +7632,8 @@ private QuitModel QuitFactsNow() // and F1 that post is in both places at once: the dictionary kept it on the way out and the // window is holding it again. Counting both said "2 unsent drafts" for one post. var openKey = ComposerOpen ? ComposeDraftKey(activeId) : null; - var posts = _composeDrafts.Count(d => d.Key != openKey) + // A command kept with no text (the verb a sent post leaves behind) is no unsent post. + var posts = _composeDrafts.Count(d => d.Key != openKey && d.Value.Body.Trim().Length > 0) + (ComposerOpen && ComposerBody.Trim().Length > 0 ? 1 : 0); var drafts = holding.Count(w => w.Id != activeId) + bars + posts; diff --git a/tests/SharpMUTerm.Avalonia.Tests/NativeComposerTests.cs b/tests/SharpMUTerm.Avalonia.Tests/NativeComposerTests.cs index 69e688a0..656b1abe 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/NativeComposerTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/NativeComposerTests.cs @@ -393,6 +393,55 @@ public async Task TypingInTheDockedEditorIsTheDraftAndCtrlSSendsIt() await Assert.That(after).IsEqualTo(string.Empty).Because("the client cleared the draft, and the editor takes the client's text"); } + /// + /// The docked command box (the mockup's Command field): what is typed there is the cell composer's command field, ⏎ in + /// it moves to the text, and ⌃S sends the command in front of the text as one line — and the command stays. + /// + [Test] + public async Task TheDockedCommandBoxIsTheCommandFieldAndCtrlSSendsItInFrontOfTheText() + { + var (verb, textFocused, sent, kept, boxAfter) = await Run(rig => + { + var composer = Dock(rig); + var windowId = rig.Layer.Composers.Keys.Single(); + composer.CommandBox.Focus(); + composer.CommandBox.RaiseEvent(new TextInputEventArgs { RoutedEvent = InputElement.TextInputEvent, Text = "+pose", Source = composer.CommandBox }); + Drain(); + composer.CommandBox.RaiseEvent(new KeyEventArgs { RoutedEvent = InputElement.KeyDownEvent, Key = Key.Enter, Source = composer.CommandBox }); + Drain(); + var verb = rig.App.DockedComposerIn(windowId)!.Verb; + var textFocused = composer.Editor.IsFocused; + Type(composer.Editor, "waves [twice]"); + Press(composer.Editor, Key.S, KeyModifiers.Control); + rig.App.RenderNextFrame(); + Drain(); + return (verb, textFocused, rig.Telnet.Lines.ToList(), rig.App.DockedComposerIn(windowId)!.Verb, rig.Layer.Composers.Values.Single().CommandText); + }); + + await Assert.That(verb).IsEqualTo("+pose"); + await Assert.That(textFocused).IsTrue().Because("⏎ in the command field moves on to the text"); + await Assert.That(sent).IsEquivalentTo(new[] { "+pose waves [twice]" }); + await Assert.That(kept).IsEqualTo("+pose").Because("the command stays for the next post"); + await Assert.That(boxAfter).IsEqualTo("+pose"); + } + + [Test] + public async Task F1HasACommandRowAndAMooEditHasNone() + { + var (post, edit) = await Run(rig => + { + var overlay = OpenF1(rig); + var post = overlay.Composer.CommandText; + Press(overlay.Composer.Editor, Key.Escape); + rig.Telnet.ReceiveMooEdit(Look); + Drain(); + return (post, rig.Driver.Composer.Overlay!.Composer.CommandText); + }); + + await Assert.That(post).IsEqualTo(string.Empty).Because("a post shows its command row, empty here"); + await Assert.That(edit).IsNull().Because("a MOO edit has no command field"); + } + [Test] public async Task EscReleasesToTheCellsAndAClickArmsAgain() { diff --git a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs index ade00e3d..60e84a37 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs @@ -692,6 +692,30 @@ await Same("status: notice action", "layout-combat", await Assert.That(native.Outcome).IsEqualTo(cells.Outcome); } + // The command field: written in the window's command box and in the cells' (⇥ there and back), the same one + // line goes out — the command unescaped in front of the escaped text — and a close keeps it with the draft. + foreach (var (verb, draft, literal) in new[] + { + ("+pose", "waves [twice]\nand sits", true), + ("+bbpost 3=", "Title\n\n50% done", false), + (":", "grins.", false), + }) + { + var native = await ComposeOnTheWire(native: true, draft, literal, send: true, verb); + var cells = await ComposeOnTheWire(native: false, draft, literal, send: true, verb); + await Assert.That(native.Sent).IsEquivalentTo(new[] { ComposeMessage.Build(verb, draft, literal ? ComposeEscaping.Literal : ComposeEscaping.AsTyped)! }); + await Assert.That(native.Sent).IsEquivalentTo(cells.Sent).Because($"compose: send '{verb}' + '{draft}'"); + await Assert.That(native.Outcome).IsEqualTo(cells.Outcome).Because("compose: the command is kept after a send"); + await Assert.That(native.Outcome).Contains($"verb={verb}"); + } + + { + var native = await ComposeOnTheWire(native: false, "half a post", literal: false, send: false, "say"); + var cells = await ComposeOnTheWire(native: true, "half a post", literal: false, send: false, "say"); + await Assert.That(native.Outcome).IsEqualTo(cells.Outcome).Because("compose: close keeps the command with the draft"); + await Assert.That(native.Outcome).Contains("draft=half a post as typed verb=say"); + } + { var native = await ComposeOnTheWire(native: true, "half a post", literal: true, send: false); var cells = await ComposeOnTheWire(native: false, "half a post", literal: true, send: false); @@ -710,6 +734,14 @@ await Same("status: notice action", "layout-combat", await Assert.That(native.Sent).IsEquivalentTo(new[] { "+pose waves%rand sits" }); await Assert.That(native.Sent).IsEquivalentTo(cells.Sent).Because("composer: send"); await Assert.That(native.Outcome).IsEqualTo(cells.Outcome).Because("composer: release"); + + // The same post written in the two fields goes out as the same one line, and the command stays for the next. + var nativeSplit = await DockedOnTheWire(native: true, split: true); + var cellsSplit = await DockedOnTheWire(native: false, split: true); + await Assert.That(nativeSplit.Sent).IsEquivalentTo(new[] { "+pose waves%rand sits" }); + await Assert.That(nativeSplit.Sent).IsEquivalentTo(cellsSplit.Sent).Because("composer: send from the two fields"); + await Assert.That(nativeSplit.Outcome).IsEqualTo(cellsSplit.Outcome).Because("composer: the command is kept"); + await Assert.That(nativeSplit.Outcome).Contains("verb=+pose"); probed.Add(PanelIds.Composer); } @@ -1088,7 +1120,7 @@ await Same("scroll-band: jump to latest", "scrollback-split", /// A connected client writes in F1 — the window's editor through its session, or the cell /// window through its keys — and sends it with ⌃S or closes it with Esc. What reached the wire, and the state left. /// - private static async Task<(IReadOnlyList Sent, string Outcome)> ComposeOnTheWire(bool native, string draft, bool literal, bool send) + private static async Task<(IReadOnlyList Sent, string Outcome)> ComposeOnTheWire(bool native, string draft, bool literal, bool send, string verb = "") { using var driver = new AvaloniaConsoleDriver(140, 36); var composer = native ? new FakeComposer() : null; @@ -1098,6 +1130,11 @@ await Same("scroll-band: jump to latest", "scrollback-split", if (composer is not null) { var session = composer.Session!; + if (verb.Length > 0) + { + session.EditedCommand(verb); + } + session.Edited(draft); if (literal) { @@ -1115,6 +1152,14 @@ await Same("scroll-band: jump to latest", "scrollback-split", } else { + if (verb.Length > 0) + { + // ⇥ to the command field, the command, ⇥ back to the text. + app.Composer.SimulateKey(new ConsoleKeyInfo('\t', ConsoleKey.Tab, false, false, false)); + app.Composer.SimulateTyping(verb); + app.Composer.SimulateKey(new ConsoleKeyInfo('\t', ConsoleKey.Tab, false, false, false)); + } + app.Composer.SimulateTyping(draft); if (literal) { @@ -1129,8 +1174,8 @@ await Same("scroll-band: jump to latest", "scrollback-split", // Where the draft went: reopened, F1 says what it holds and in which mode. app.SimulateKey(new ConsoleKeyInfo('\0', ConsoleKey.F1, false, false, false)); var held = composer is not null - ? $"{composer.Session!.Model.Body} {(composer.Session.Model.Escaping == ComposeEscaping.Literal ? "literal" : "as typed")}" - : $"{app.Composer.Body} {(app.Composer.HeaderMarkup.Contains("literal", StringComparison.Ordinal) ? "literal" : "as typed")}"; + ? $"{composer.Session!.Model.Body} {(composer.Session.Model.Escaping == ComposeEscaping.Literal ? "literal" : "as typed")} verb={composer.Session.Model.Verb}" + : $"{app.Composer.Body} {(app.Composer.HeaderMarkup.Contains("literal", StringComparison.Ordinal) ? "literal" : "as typed")} verb={app.Composer.Verb}"; return (telnet.Lines.ToList(), Outcome(app) + " | draft=" + held); } @@ -1138,7 +1183,7 @@ await Same("scroll-band: jump to latest", "scrollback-split", /// A connected client docks its composer, types into it — the window's editor through its session, or the cells /// through the composer's keys — sends with ⌃S, types again and releases with Esc. /// - private static async Task<(IReadOnlyList Sent, string Outcome)> DockedOnTheWire(bool native) + private static async Task<(IReadOnlyList Sent, string Outcome)> DockedOnTheWire(bool native, bool split = false) { using var driver = new AvaloniaConsoleDriver(140, 36); var (app, telnet) = await Connected(driver, native ? new FakeComposer() : null); @@ -1147,7 +1192,15 @@ await Same("scroll-band: jump to latest", "scrollback-split", app.RenderNextFrame(); var windowId = TerminalPanels.WindowId(PanelIds.Composer, "Quiet.Ann"); var session = native ? driver.Pointer.Panels.Single(p => p.PanelId == PanelIds.Composer).ComposerSession! : null; - if (session is not null) + if (session is not null && split) + { + session.EditedCommand("+pose"); + session.Edited("waves\nand sits"); + session.Send("waves\nand sits"); + session.Edited("next"); + session.Release(); + } + else if (session is not null) { session.Edited("+pose waves\nand sits"); session.Send("+pose waves\nand sits"); @@ -1156,13 +1209,14 @@ await Same("scroll-band: jump to latest", "scrollback-split", } else { - app.SimulateComposerTyping("+pose waves\nand sits"); + app.SimulateComposerTyping(split ? "\t+pose\twaves\nand sits" : "+pose waves\nand sits"); app.SimulateKey(new ConsoleKeyInfo('\x13', ConsoleKey.S, false, false, true)); app.SimulateComposerTyping("next"); app.SimulateKey(new ConsoleKeyInfo('\x1b', ConsoleKey.Escape, false, false, false)); } - return (telnet.Lines.ToList(), $"{Outcome(app)} | armed={app.ComposerArmed} | docked={app.DockedComposerIn(windowId)!.Body}"); + var docked = app.DockedComposerIn(windowId)!; + return (telnet.Lines.ToList(), $"{Outcome(app)} | armed={app.ComposerArmed} | docked={docked.Body} verb={docked.Verb}"); } /// A connected client docks its composer, types a draft and asks for the preview; the F1 it opens, read back. diff --git a/tests/SharpMUTerm.Client.Tests/ComposerModelTests.cs b/tests/SharpMUTerm.Client.Tests/ComposerModelTests.cs index b5ef0d60..58708cc4 100644 --- a/tests/SharpMUTerm.Client.Tests/ComposerModelTests.cs +++ b/tests/SharpMUTerm.Client.Tests/ComposerModelTests.cs @@ -84,7 +84,7 @@ public async Task TheDockedKeyRowSaysWhatTheCellsSay() await Assert.That(ComposerModel.KeysFor(ComposerPlace.Docked, false, false, true, armed: false).Select(k => k.Label)) .IsEquivalentTo(new[] { "click here to write", "full screen" }); await Assert.That(ComposerModel.KeysFor(ComposerPlace.Docked, false, true, true, armed: true).Select(k => k.Key)) - .IsEquivalentTo(new[] { "⌃S", "⌥L", "⌥W", "F1", "Esc" }); + .IsEquivalentTo(new[] { "⌃S", "⌥L", "⌥W", "F1", "Esc", "⇥" }); } [Test] @@ -135,4 +135,49 @@ public async Task ASessionMarksWithTheClientsDictionaryOnlyOnceTheModelSaysOne() await Assert.That(some.CanAddWords).IsTrue(); await Assert.That(none.CanAddWords).IsFalse(); } + + /// + /// The command field: what ⌃S sends is the command in front of the built text, the length cell counts that line, the + /// docked header names the post by the command, and two models differing only in it are different models. + /// + [Test] + public async Task TheCommandFieldGoesInFrontOfTheTextAndIsPartOfTheModel() + { + var model = ComposerModel.Create(ComposerPlace.Docked, "Ann", "tips his hat [x]\n\nwaits", ComposeEscaping.Literal, null, null, + canSend: true, armed: true, revision: 1, verb: "+pose"); + + await Assert.That(model.Command).IsEqualTo(ComposeMessage.Build("+pose", "tips his hat [x]\n\nwaits", ComposeEscaping.Literal)); + await Assert.That(model.Command).StartsWith("+pose tips"); + await Assert.That(model.Characters).IsEqualTo(model.Command!.Length); + await Assert.That(model.HeadingVerb).IsEqualTo("+pose"); + await Assert.That(model.HasCommandField).IsTrue(); + await Assert.That(model.Equals(model with { Verb = "say" })).IsFalse(); + await Assert.That(Post("say hello").HeadingVerb).IsEqualTo("say").Because("with no command the text's first word names it"); + } + + [Test] + public async Task AnEditHasNoCommandField() + { + var model = ComposerModel.Create(ComposerPlace.FullScreen, "Ann", "return 1;", ComposeEscaping.AsTyped, + new ComposerEdit("Test:look", "moo-code"), null, canSend: true, armed: true, revision: 1, verb: "+pose"); + + await Assert.That(model.HasCommandField).IsFalse(); + await Assert.That(model.Verb).IsEmpty(); + } + + [Test] + public async Task ASessionPassesTheCommandFieldOnOneLineAndNotForAnEdit() + { + var commands = new List(); + var post = new ComposerSession(Post(string.Empty), null, new ComposerCallbacks { CommandEdited = commands.Add }); + post.EditedCommand("+bbpost\r\n3="); + + var edit = new ComposerSession( + ComposerModel.Create(ComposerPlace.FullScreen, "Ann", "x", ComposeEscaping.AsTyped, new ComposerEdit("a", "moo-code"), null, true, true, 1), + null, + new ComposerCallbacks { CommandEdited = commands.Add }); + edit.EditedCommand("say"); + + await Assert.That(commands).IsEquivalentTo(new[] { "+bbpost 3=" }); + } } diff --git a/tests/SharpMUTerm.Core.Tests/Commands/ComposeMessageTests.cs b/tests/SharpMUTerm.Core.Tests/Commands/ComposeMessageTests.cs index 150edfd0..4e3b2b97 100644 --- a/tests/SharpMUTerm.Core.Tests/Commands/ComposeMessageTests.cs +++ b/tests/SharpMUTerm.Core.Tests/Commands/ComposeMessageTests.cs @@ -93,4 +93,38 @@ public async Task LiteralLeavesOrdinaryProseAlone() await Assert.That(ComposeMessage.Build(body, ComposeEscaping.Literal)).IsEqualTo(body); } + + /// + /// The composer's two fields: the command goes in front of the built text, never escaped, and the text is built as a + /// whole buffer is — escaped per line, then joined with %r. + /// + [Test] + public async Task TheCommandGoesInFrontOfTheBuiltTextUnescaped() + { + var line = ComposeMessage.Build("+pose [x]", "tips his hat; [nods]\n\nwaits", ComposeEscaping.Literal); + + await Assert.That(line).IsEqualTo("+pose [x] tips his hat\\; \\[nods\\]%r%rwaits"); + } + + [Test] + [Arguments("+bbpost 12=", "Title", "+bbpost 12=Title")] + [Arguments("page Bob=", "hi", "page Bob=hi")] + [Arguments(":", "waves.", ":waves.")] + [Arguments(" say ", "hello", "say hello")] + [Arguments("say\nloudly", "hello", "say loudly hello")] + public async Task OneSpaceJoinsThemExceptAfterAnEqualsOrAPunctuationShorthand(string command, string body, string expected) => + await Assert.That(ComposeMessage.Build(command, body, ComposeEscaping.AsTyped)).IsEqualTo(expected); + + /// A blank command is the single buffer it always was: the body is the whole command. + [Test] + [Arguments(null)] + [Arguments("")] + [Arguments(" ")] + public async Task ABlankCommandSendsTheBodyAsTheWholeCommand(string? command) => + await Assert.That(ComposeMessage.Build(command, "+bbpost 1=a\nb", ComposeEscaping.Literal)) + .IsEqualTo(ComposeMessage.Build("+bbpost 1=a\nb", ComposeEscaping.Literal)); + + [Test] + public async Task ACommandWithNoTextIsNothingToSend() => + await Assert.That(ComposeMessage.Build("+pose", " \n ", ComposeEscaping.AsTyped)).IsNull(); } diff --git a/tests/SharpMUTerm.Tui.Tests/NativeComposerRoutingTests.cs b/tests/SharpMUTerm.Tui.Tests/NativeComposerRoutingTests.cs index 685ae6b4..85f15c9b 100644 --- a/tests/SharpMUTerm.Tui.Tests/NativeComposerRoutingTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/NativeComposerRoutingTests.cs @@ -167,7 +167,7 @@ public async Task F1OpensTheHostsEditorAndNotTheCellModal() await Assert.That(model.Place).IsEqualTo(ComposerPlace.FullScreen); await Assert.That(model.Target).IsEqualTo("Ann"); await Assert.That(model.CanSend).IsTrue(); - await Assert.That(model.Keys.Select(k => k.Key)).IsEquivalentTo(new[] { "⌃S", "⌥L", "⌥W", "⌥P", "Esc" }); + await Assert.That(model.Keys.Select(k => k.Key)).IsEquivalentTo(new[] { "⌃S", "⇥", "⌥L", "⌥W", "⌥P", "Esc" }); } [Test] From 8ab365bf749c312a1e674acdc7ab5ff5f999024a Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 20:22:08 +0000 Subject: [PATCH 080/113] Wave 22 A: Combat's quick bar as a strip and the collapsed chat as a bar In the window (HostChrome.Strips): the quick bar takes three rows and draws 34 px buttons with a key cap; F4 gains a style field (danger), drawn in the warning red in both hosts; a collapsed layout panel gets a pane of its own drawn as a one-row bar at the foot of its column (surface collapsed-panel), expanded by a click or by activating a window in it. Vitals card spacing to the mockup. Terminal frames unchanged. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 4 + CLAUDE.md | 9 + src/SharpMUTerm.Avalonia/CollapsedBarView.cs | 132 ++++++++++ src/SharpMUTerm.Avalonia/DesktopLayer.cs | 27 +- src/SharpMUTerm.Avalonia/PanelText.cs | 12 +- src/SharpMUTerm.Avalonia/QuickBarButtons.cs | 46 ++-- src/SharpMUTerm.Avalonia/VitalsGauges.cs | 2 +- .../Panels/CollapsedPanelModel.cs | 24 ++ .../Panels/QuickBarModel.cs | 6 +- .../Settings/BuiltInLists.cs | 20 +- .../Surfaces/SurfaceCatalog.cs | 16 ++ src/SharpMUTerm.Core/Automation/Macro.cs | 6 + .../Layouts/LayoutRealiser.cs | 66 ++++- src/SharpMUTerm.Core/Layouts/PanelSizing.cs | 18 +- src/SharpMUTerm.Tui/Hosting/ClientHost.cs | 11 +- src/SharpMUTerm.Tui/KeypadScreenRenderer.cs | 24 +- .../Panels/CollapsedBarRenderer.cs | 26 ++ .../Panels/QuickBarRenderer.cs | 16 +- src/SharpMUTerm.Tui/Pointer/PointerTarget.cs | 4 +- .../Pointer/SharpMUTermApp.Desktop.cs | 8 +- .../SharpMUTermApp.CollapsedBars.cs | 233 ++++++++++++++++++ src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs | 8 +- src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs | 9 +- src/SharpMUTerm.Tui/SharpMUTermApp.cs | 16 +- .../SurfaceParityTests.cs | 17 ++ .../SurfaceCatalogTests.cs | 3 +- .../SharpMUTerm.Tui.Tests/CombatStripTests.cs | 101 ++++++++ .../MacroKeyCaptureTests.cs | 4 +- 28 files changed, 816 insertions(+), 52 deletions(-) create mode 100644 src/SharpMUTerm.Avalonia/CollapsedBarView.cs create mode 100644 src/SharpMUTerm.Client/Panels/CollapsedPanelModel.cs create mode 100644 src/SharpMUTerm.Tui/Panels/CollapsedBarRenderer.cs create mode 100644 src/SharpMUTerm.Tui/SharpMUTermApp.CollapsedBars.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/CombatStripTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 74e2d7bc..bb4c5fc6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,10 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] - In the desktop window, the header shows only the search box and your character, and the status bar reads "Corvid connected · UTF-8 · Log off" with a short hint on the right such as "2 new in Chat" (or the keys of the mode you are in). Notices still take the whole bar while they show. +- In the desktop window, Combat's quick bar is a proper strip of buttons, each key a key cap beside its name, and a + binding marked *danger* on F4 (new `style` field) is drawn in red there and in the terminal's quick bar. +- In the desktop window, a panel a layout collapses (Combat's chat) is a one-row bar at the foot of its column saying + how many new lines it holds; click it to open it as a pane. The terminal keeps it as a background tab. - The composer has a Command field above the text, in F1 and the docked panel, in the terminal and the desktop window: put the verb there (`+pose`, `say`, `+bbpost 3=`) and write the post below it. ⇥ moves between the two (⏎ in the command moves on to the text); the command is sent in front of the text unescaped, joined by a space (none after diff --git a/CLAUDE.md b/CLAUDE.md index 416d0ca8..f41fb5a5 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -1568,6 +1568,15 @@ fallbacks) for inline images/maps. In the window a pop-out button shows only while the pointer is over its panel (`DesktopLayer.SyncPopOutHover`), and a one-row strip gives the button its right end (`ReservesPopOut`: the native control is narrowed, the corner painted the pane's plane), so the button never sits on a strip's text. +- **Wave 22 combat strips (`HostChrome.Strips`, the window's `Desktop`; terminal frames unchanged).** The quick bar is + `PanelSizing.QuickBarStripRows` (3) rows there (`ApplyAll(…, quickBarRows)`), drawn as 34 px buttons (`QuickBarButtons.ButtonHeight`, + key cap in `KeyFace`, a rule on top). `Macro.Danger` (F4 `style`: normal/danger, presentation only; the engine never reads it) is + `QuickBarItem.Danger`, drawn in `ScreenPalette.Warn` held legible (`DangerInk`) in both hosts. A collapsed panel gets a pane of + its own (`LayoutRealiser.Realise(collapsedAsBars:)`, `collapsed:`, below its region's first pane) drawn as a bar + (`SharpMUTermApp.CollapsedBars.cs`, `CollapsedPanelModel`, `CollapsedBarRenderer`, `CollapsedBarView`; surface `collapsed-panel`): + `CollapsedBarRows` (1 under `Input`, else 2), no tab strip, its windows marked scrolled back so the unread reads `N new`. A click, + or `Activate` of a window in it, is `ExpandCollapsedBar` (for the run; an explicit apply clears it). `DesktopLayer.BelowGrid` + stretches a native view at the foot of a column over the field reserve where the band does not reach. - **Wave 19 panels and welcome (window only; the cells are unchanged).** Each docked native panel draws a heading from its model (`PanelHeading.For`, Client; `PanelText.Heading`); `VitalsModel.Source` names where the meters came from (`SourceOf`, set in `ReadVitals`), a mixture names nothing. The docked composer's footer (summary, Preview, Send) ends diff --git a/src/SharpMUTerm.Avalonia/CollapsedBarView.cs b/src/SharpMUTerm.Avalonia/CollapsedBarView.cs new file mode 100644 index 00000000..d9c0f9ea --- /dev/null +++ b/src/SharpMUTerm.Avalonia/CollapsedBarView.cs @@ -0,0 +1,132 @@ +using Avalonia; +using Avalonia.Controls; +using Avalonia.Input; +using Avalonia.Media; +using SharpMUTerm.Client.Panels; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Avalonia; + +/// +/// A collapsed panel's bar, over the pane whose cells draw the same : a rule along its +/// top, the panel's name, its unread count in the accent, and the note at the right — the mockups' Chat 2 new ····· +/// collapsed in combat footer of a side column. A left click anywhere on it is , the +/// method the cell row's link ends in; the window builds no command. A right click is the client's, on the cell under it. +/// It never takes the keyboard. +/// +internal sealed class CollapsedBarView : Control +{ + private readonly TerminalView _view; + private CollapsedPanelModel _model = new(string.Empty, 0, string.Empty); + private Color _plane = Colors.Black; + private Color _text = Colors.White; + private Color _accent = Colors.Teal; + private Action? _expand; + private bool _hot; + + public CollapsedBarView(TerminalView view) + { + _view = view; + ClipToBounds = true; + Focusable = false; + Cursor = new Cursor(StandardCursorType.Hand); + ToolTip.SetTip(this, CollapsedPanelModel.ExpandHint); + } + + /// What it is showing. Internal for tests. + internal CollapsedPanelModel Model => _model; + + public void Show(CollapsedPanelModel model, PanelInk ink, Color plane, Color text, Action? expand) + { + _expand = expand; + var accent = PanelText.Parse(ink.Bar); + if (model == _model && plane == _plane && text == _text && accent == _accent) + { + return; + } + + _model = model; + _plane = plane; + _text = text; + _accent = accent; + InvalidateVisual(); + } + + /// Clicks the bar as a left press and release would. Internal for tests. + internal void PerformClick() => _expand?.Invoke(); + + protected override void OnPointerEntered(PointerEventArgs e) + { + base.OnPointerEntered(e); + _hot = true; + InvalidateVisual(); + } + + protected override void OnPointerExited(PointerEventArgs e) + { + base.OnPointerExited(e); + _hot = false; + InvalidateVisual(); + } + + protected override void OnPointerMoved(PointerEventArgs e) + { + base.OnPointerMoved(e); + e.Handled = true; + } + + protected override void OnPointerPressed(PointerPressedEventArgs e) + { + base.OnPointerPressed(e); + e.Handled = true; + if (e.GetCurrentPoint(this).Properties.IsRightButtonPressed) + { + _view.ForwardRightClick(e.GetPosition(_view), e.KeyModifiers); + } + } + + protected override void OnPointerReleased(PointerReleasedEventArgs e) + { + base.OnPointerReleased(e); + e.Handled = true; + if (e.InitialPressMouseButton == MouseButton.Left && new Rect(Bounds.Size).Contains(e.GetPosition(this))) + { + _expand?.Invoke(); + } + } + + protected override void OnPointerWheelChanged(PointerWheelEventArgs e) + { + base.OnPointerWheelChanged(e); + e.Handled = true; + } + + public override void Render(DrawingContext context) + { + var bounds = new Rect(Bounds.Size); + var plane = _hot ? PanelText.Mix(_plane, _text, 0.05) : _plane; + context.FillRectangle(new SolidColorBrush(plane), bounds); + context.FillRectangle( + new SolidColorBrush(PanelText.Rule(_text, _plane)), + NativeTokens.HorizontalRule(this, 0, 0, bounds.Width)); + if (bounds.Width < 8) + { + return; + } + + var middle = bounds.Height / 2; + var size = PanelText.Size; + var x = PanelText.Pad; + var note = PanelText.Measure(_model.Note, NativeTokens.Small + 1, false); + var right = bounds.Width - PanelText.Pad; + var room = Math.Max(1, right - x - note - NativeTokens.Space16); + x += PanelText.Draw(context, _model.Title, x, middle, size, _text, true, room); + if (_model.UnreadText.Length > 0) + { + x += NativeTokens.Space8; + PanelText.Draw(context, _model.UnreadText, x, middle, size, _accent, true, Math.Max(1, right - x - note - NativeTokens.Space8)); + } + + PanelText.Draw(context, _model.Note, right, middle, NativeTokens.Small + 1, PanelText.Dim(_text, _plane), false, note + 1, alignRight: true); + } +} diff --git a/src/SharpMUTerm.Avalonia/DesktopLayer.cs b/src/SharpMUTerm.Avalonia/DesktopLayer.cs index 51d83de0..44d097c0 100644 --- a/src/SharpMUTerm.Avalonia/DesktopLayer.cs +++ b/src/SharpMUTerm.Avalonia/DesktopLayer.cs @@ -48,6 +48,7 @@ internal sealed class DesktopLayer : Canvas private readonly NativeFooter _footer; private readonly Dictionary _whoHere = new(StringComparer.Ordinal); private readonly Dictionary _quickBars = new(StringComparer.Ordinal); + private readonly Dictionary _collapsedBars = new(StringComparer.Ordinal); private readonly Dictionary _composers = new(StringComparer.Ordinal); private readonly NoticeToasts _toasts; private readonly Dictionary _strips = new(StringComparer.Ordinal); @@ -151,6 +152,9 @@ protected override void OnSizeChanged(SizeChangedEventArgs e) /// The native quick bars by window id. Internal for tests. internal IReadOnlyDictionary QuickBars => _quickBars; + /// The collapsed panels' bars, by window id. Internal for tests. + internal IReadOnlyDictionary CollapsedBars => _collapsedBars; + /// The native docked composers by window id. Internal for tests. internal IReadOnlyDictionary Composers => _composers; @@ -458,6 +462,15 @@ private void SyncPanels(ScreenFrame frame, Size cell) cell, (bar, panel, plane) => bar.Show(panel.QuickBar!, panel.Ink, plane, text, cell.Height, panel.Pick, panel.Dispatch)); + // A collapsed panel's bar, at the foot of its column (HostChrome.Strips). + Place( + _collapsedBars, + _pointer.Panels.Where(p => p.Collapsed is not null), + () => new CollapsedBarView(_view), + frame, + cell, + (bar, panel, plane) => bar.Show(panel.Collapsed!, panel.Ink, plane, text, panel.Expand)); + // The docked composer: a native editor over its pane, the cell editor still drawn (and still the draft) under it. Place( _composers, @@ -627,7 +640,7 @@ private void Place( // A one-row strip that can pop out leaves its right end to the button (ReservesPopOut), so the button never // lies over its text (`88 / 100`, `F4 edits keys`); the button paints the pane's plane over the cells there. control.Width = Math.Max(0, (rect.Width * cell.Width) - (ReservesPopOut(panel) ? PopOutReserve(cell) : 0)); - control.Height = rect.Height * cell.Height; + control.Height = (rect.Height * cell.Height) + BelowGrid(frame, rect); // The pane's own plane, read off the frame, so the native view sits on whatever the pane wears — its // character's tint, the focus lift — without the client having to say it twice. @@ -637,6 +650,18 @@ private void Place( } } + /// + /// The pixels under the grid a panel also covers: where the window draws the command line's field in the output's + /// column, the grid is shorter than the view and the columns beside the field + /// are filled with their last row's plane down to the footer. A panel whose pane ends on the grid's last row in such a + /// column (a collapsed panel's bar, the map) runs down over that filler, so it meets the footer as the mockups draw it. + /// + private double BelowGrid(ScreenFrame frame, SharpMUTerm.Core.Workspaces.PaneRect rect) => + _chrome.Input && frame.Band is { } band && rect.Y + rect.Height >= frame.Height && rect.Width > 0 + && !band.Spans(rect.X, frame.Width) && !band.Spans(rect.X + rect.Width - 1, frame.Width) + ? NativeLayout.FieldReserve + : 0; + /// The client builds the menu on its thread; it is opened here, under the button. private void OpenMenu(HeaderAction action, HeaderButton button) => action.Menu(model => Dispatcher.UIThread.Post(() => diff --git a/src/SharpMUTerm.Avalonia/PanelText.cs b/src/SharpMUTerm.Avalonia/PanelText.cs index f2cddc94..64a19cee 100644 --- a/src/SharpMUTerm.Avalonia/PanelText.cs +++ b/src/SharpMUTerm.Avalonia/PanelText.cs @@ -12,13 +12,13 @@ namespace SharpMUTerm.Avalonia; internal static class PanelText { /// One line of text, trimmed to with an ellipsis. - public static FormattedText Format(string text, double size, Color colour, bool bold, double maxWidth = double.PositiveInfinity) + public static FormattedText Format(string text, double size, Color colour, bool bold, double maxWidth = double.PositiveInfinity, FontFamily? face = null) { var formatted = new FormattedText( text, CultureInfo.InvariantCulture, FlowDirection.LeftToRight, - new Typeface(NativeTokens.UiFont, FontStyle.Normal, bold ? FontWeight.SemiBold : FontWeight.Normal), + new Typeface(face ?? NativeTokens.UiFont, FontStyle.Normal, bold ? FontWeight.SemiBold : FontWeight.Normal), size, new SolidColorBrush(colour)) { @@ -34,20 +34,22 @@ public static FormattedText Format(string text, double size, Color colour, bool } /// How wide a line is drawn, untrimmed. - public static double Measure(string text, double size, bool bold) => Format(text, size, Colors.White, bold).Width; + public static double Measure(string text, double size, bool bold, FontFamily? face = null) => Format(text, size, Colors.White, bold, face: face).Width; /// /// Draws a line with its left edge at (its right edge there when ), /// centred on , and returns the width it took. /// - public static double Draw(DrawingContext context, string text, double x, double middle, double size, Color colour, bool bold, double maxWidth, bool alignRight = false) + public static double Draw( + DrawingContext context, string text, double x, double middle, double size, Color colour, bool bold, double maxWidth, bool alignRight = false, + FontFamily? face = null) { if (maxWidth < 2 || text.Length == 0) { return 0; } - var formatted = Format(text, size, colour, bold, maxWidth); + var formatted = Format(text, size, colour, bold, maxWidth, face); var width = Math.Min(formatted.Width, maxWidth); context.DrawText(formatted, new Point(alignRight ? x - width : x, middle - (formatted.Height / 2))); return width; diff --git a/src/SharpMUTerm.Avalonia/QuickBarButtons.cs b/src/SharpMUTerm.Avalonia/QuickBarButtons.cs index ff9ced8d..1caa8892 100644 --- a/src/SharpMUTerm.Avalonia/QuickBarButtons.cs +++ b/src/SharpMUTerm.Avalonia/QuickBarButtons.cs @@ -10,10 +10,11 @@ namespace SharpMUTerm.Avalonia; /// -/// The quick bar as native buttons, over the pane whose cells draw the same : one button -/// per binding (its key in the accent, then its name), a +N button holding the bindings that do not fit, and -/// F4 edits keys as a link at the right. Every button is drawn alike — the model marks no binding as special, -/// so neither does the window — except that a key this host cannot deliver is drawn dim, as the cells draw it. +/// The quick bar as native buttons, over the pane whose cells draw the same : the mockups' +/// strip (a rule along its top, -pixel buttons, the key as a monospace cap then the name), a +/// +N button holding the bindings that do not fit, and the dashed + Bind a key at the right. A binding F4 +/// flags dangerous () is drawn in the warning colour — a plate and edge leaned toward +/// it and its words in it — as the cells draw it; a key this host cannot deliver is drawn dim. /// /// It takes the pointer, as the map does, and never the keyboard. A click on a binding is /// with its index: the client runs that binding on the panel's own character through @@ -43,7 +44,10 @@ internal enum SlotKind /// The widest a binding's name is drawn before it is trimmed. internal const double MaxTitleWidth = 150; - private const double Gap = NativeTokens.Space8, PadX = NativeTokens.Space12; + private const double Gap = NativeTokens.Space8, PadX = NativeTokens.Space14; + + /// A button's height where the strip has the room (PanelSizing.QuickBarStripRows): the mockups' 34 px. + internal const double ButtonHeight = NativeTokens.ControlHeight + NativeTokens.Space2; /// The first button's left edge: the chrome's one text inset, as every panel's heading and the output are. private const double Lead = NativeTokens.PanelInset; @@ -128,13 +132,16 @@ public void Show(QuickBarModel model, PanelInk ink, Color plane, Color text, dou /// The key chip's size: a step under the label, as a caption. private double KeySize => Math.Max(8, FontSize - 2); + /// The key cap's face: the cells' mono, as every key chip in the window. + private static FontFamily KeyFace => NativeTokens.KeyFace; + private static string Trim(QuickBarItem item) => item.Title; private double ItemWidth(QuickBarItem item) { var size = FontSize; var title = Math.Min(MaxTitleWidth, PanelText.Measure(Trim(item), size, false)); - return PadX + PanelText.Measure(NativeKeys.Words(item.Key), KeySize, false) + 7 + title + PadX; + return PadX + PanelText.Measure(NativeKeys.Words(item.Key), KeySize, false, KeyFace) + NativeTokens.Space8 + title + PadX; } private double MoreWidth(int hidden) => PadX + PanelText.Measure($"+{hidden.ToString(CultureInfo.InvariantCulture)}", FontSize, true) + PadX; @@ -160,8 +167,8 @@ private void Layout(Size size) return; } - var height = Math.Max(4, size.Height - 4); - var top = (size.Height - height) / 2; + var height = Math.Max(4, Math.Min(ButtonHeight, size.Height - 4)); + var top = Math.Round((size.Height - height) / 2); var items = _model.Items; var widths = items.Select(ItemWidth).ToList(); foreach (var withEdit in new[] { true, false }) @@ -334,6 +341,12 @@ public override void Render(DrawingContext context) { var bounds = new Rect(Bounds.Size); context.FillRectangle(new SolidColorBrush(_plane), bounds); + if (bounds.Height > ButtonHeight) + { + // A strip tall enough for the buttons is a strip: a rule along its top, as the mockups draw it over the field. + context.FillRectangle(new SolidColorBrush(PanelText.Rule(_text, _plane)), NativeTokens.HorizontalRule(this, 0, 0, bounds.Width)); + } + Layout(bounds.Size); var size = FontSize; var accent = PanelText.Parse(_ink.Bar); @@ -357,11 +370,12 @@ public override void Render(DrawingContext context) { // The key as a caption, then the binding's name: a button per binding, as the mockups draw the bar. var item = _model.Items[slot.Index]; - Plate(context, rect, hot, down, dashed: false); - var keyInk = item.Fires ? dim : PanelText.Mix(dim, _plane, 0.35); - var titleInk = item.Fires ? _text : dim; + var danger = item.Danger ? PanelText.Parse(_ink.Low) : (Color?)null; + Plate(context, rect, hot, down, dashed: false, danger); + var keyInk = item.Fires ? danger is { } d ? PanelText.Mix(d, _text, 0.3) : dim : PanelText.Mix(dim, _plane, 0.35); + var titleInk = item.Fires ? danger is { } t ? PanelText.Mix(t, _text, 0.55) : _text : dim; var x = rect.Left + PadX; - x += PanelText.Draw(context, NativeKeys.Words(item.Key), x, middle, KeySize, keyInk, false, rect.Width) + 7; + x += PanelText.Draw(context, NativeKeys.Words(item.Key), x, middle, KeySize, keyInk, false, rect.Width, face: KeyFace) + NativeTokens.Space8; PanelText.Draw(context, Trim(item), x, middle, size, titleInk, false, rect.Right - PadX - x + 0.5); break; } @@ -384,11 +398,13 @@ public override void Render(DrawingContext context) /// A button's plate: a step off the plane with a rule-coloured edge, stronger under the pointer and while pressed; the /// bind button's edge is dashed and its plate empty until the pointer is on it. /// - private void Plate(DrawingContext context, Rect rect, bool hot, bool down, bool dashed) + private void Plate(DrawingContext context, Rect rect, bool hot, bool down, bool dashed, Color? danger = null) { - var fill = dashed && !hot && !down ? _plane : PanelText.Mix(_plane, _text, down ? 0.2 : hot ? 0.13 : 0.07); + var fill = dashed && !hot && !down ? _plane + : danger is { } warn ? PanelText.Mix(_plane, warn, down ? 0.3 : hot ? 0.24 : 0.17) + : PanelText.Mix(_plane, _text, down ? 0.2 : hot ? 0.13 : 0.07); var edge = new Pen( - new SolidColorBrush(PanelText.Mix(_plane, _text, dashed ? 0.3 : 0.18)), + new SolidColorBrush(danger is { } rim ? PanelText.Mix(_plane, rim, 0.42) : PanelText.Mix(_plane, _text, dashed ? 0.3 : 0.18)), NativeTokens.DevicePixel(this), dashed ? new DashStyle([4, 3], 0) : null); var radius = Math.Min(NativeTokens.RadiusM, rect.Height / 2); diff --git a/src/SharpMUTerm.Avalonia/VitalsGauges.cs b/src/SharpMUTerm.Avalonia/VitalsGauges.cs index 16dbff45..75ffb391 100644 --- a/src/SharpMUTerm.Avalonia/VitalsGauges.cs +++ b/src/SharpMUTerm.Avalonia/VitalsGauges.cs @@ -66,7 +66,7 @@ public void Show(VitalsModel model, PanelInk ink, Color plane, Color text, doubl private static double BarHeight(double cellHeight) => cellHeight >= 15 ? 10 : 8; /// Height one stacked block takes: a line of text, the bar under it, and the gap to the next. - private static double BlockHeight(double cellHeight) => LabelHeight(cellHeight) + 4 + BarHeight(cellHeight) + 10; + private static double BlockHeight(double cellHeight) => LabelHeight(cellHeight) + NativeTokens.Space4 + BarHeight(cellHeight) + NativeTokens.Space12; /// The height every stacked block takes, the target's rule included. private double BlocksHeight(VitalsModel model) => diff --git a/src/SharpMUTerm.Client/Panels/CollapsedPanelModel.cs b/src/SharpMUTerm.Client/Panels/CollapsedPanelModel.cs new file mode 100644 index 00000000..eedf1e9f --- /dev/null +++ b/src/SharpMUTerm.Client/Panels/CollapsedPanelModel.cs @@ -0,0 +1,24 @@ +namespace SharpMUTerm.Client.Panels; + +/// +/// A panel the layout collapsed, as the one-line bar at the foot of its column: what it is (Chat), how many lines +/// have arrived in it unseen, and why it is folded away (collapsed in combat). The cells draw it as a row +/// (CollapsedBarRenderer) and the window as a native bar over that row; a click on either expands the panel into a +/// pane that shares its column. Only a host that draws strips (HostChrome.Strips) gives a collapsed panel a bar; +/// elsewhere it is a background tab, as it always was. +/// +/// The panel's name: its first window's title. +/// Lines that arrived in its windows while folded away. +/// Why it is folded: collapsed in combat, after the layout. +public sealed record CollapsedPanelModel(string Title, int Unread, string Note) +{ + /// The unread count in words, or empty when there is none: 2 new. + public string UnreadText => Unread > 0 ? $"{(Unread > 99 ? "99+" : Unread.ToString(System.Globalization.CultureInfo.InvariantCulture))} new" : string.Empty; + + /// The note for a panel collapsed by . + public static string NoteFor(string? layoutName) => + string.IsNullOrWhiteSpace(layoutName) ? "collapsed" : $"collapsed in {layoutName.Trim().ToLowerInvariant()}"; + + /// What a click on the bar does, for a tooltip and a screen reader. + public const string ExpandHint = "Click to show it in the column"; +} diff --git a/src/SharpMUTerm.Client/Panels/QuickBarModel.cs b/src/SharpMUTerm.Client/Panels/QuickBarModel.cs index 4dab8746..e0546f1c 100644 --- a/src/SharpMUTerm.Client/Panels/QuickBarModel.cs +++ b/src/SharpMUTerm.Client/Panels/QuickBarModel.cs @@ -8,13 +8,15 @@ namespace SharpMUTerm.Client.Panels; /// The binding's name, on one line. /// Whether pressing the key reaches the binding on this host; one that does not is still /// clickable and drawn dim. -public sealed record QuickBarItem(string Key, string Descriptor, string Title, bool Fires); +/// Whether the binding is flagged dangerous on F4 (Macro.Danger): every view draws it in the +/// warning colour. +public sealed record QuickBarItem(string Key, string Descriptor, string Title, bool Fires, bool Danger = false); /// /// The quick bar's content for one character: its function-key bindings in the order every view lists them, plain /// keys before modified ones and then by number. The terminal draws them as a row of cells (QuickBarRenderer); /// the window draws native buttons over that row from the same instance, so an item index names the same binding -/// in both. Nothing here marks a binding as dangerous: the configuration says no such thing, so no view may. +/// in both. A binding is dangerous only where F4 says so (); no view guesses it from a name. /// public sealed record QuickBarModel(IReadOnlyList Items) { diff --git a/src/SharpMUTerm.Client/Settings/BuiltInLists.cs b/src/SharpMUTerm.Client/Settings/BuiltInLists.cs index d3e31228..71bdfa3c 100644 --- a/src/SharpMUTerm.Client/Settings/BuiltInLists.cs +++ b/src/SharpMUTerm.Client/Settings/BuiltInLists.cs @@ -277,6 +277,15 @@ public static partial class BuiltInSettings }, }; + /// A binding's ordinary look, on F4's style. + public const string NormalStyle = "normal"; + + /// A binding drawn in the warning colour (). + public const string DangerStyle = "danger"; + + /// F4's style choices. + public static IReadOnlyList MacroStyles { get; } = [NormalStyle, DangerStyle]; + /// F4: the key bindings of every set. public static SettingsSectionContribution Keypad { get; } = new() { @@ -296,7 +305,7 @@ public static partial class BuiltInSettings is { } key ? new Macro { Name = NewBindingName, Key = key, Command = NewBindingCommand } : null, - Copy = m => new Macro { Name = m.Name, Key = m.Key, Enabled = m.Enabled, Command = m.Command, ScriptCallback = m.ScriptCallback }, + Copy = m => new Macro { Name = m.Name, Key = m.Key, Enabled = m.Enabled, Command = m.Command, Danger = m.Danger, ScriptCallback = m.ScriptCallback }, Name = m => m.Name, Rename = (m, v) => m.Name = v, Title = m => m.Key, @@ -316,6 +325,15 @@ public static partial class BuiltInSettings Binding = SettingBinding.ForItem((_, m) => m.Key, (_, m, v) => m.Key = v, NewMacro), }, OwnerField(s => s.Macros, NewMacro, () => Keypad!), + new ChoiceField("style", "style", MacroStyles, "how the quick bar draws it: danger is the warning colour") + { + Group = BehaviourGroup, + Keywords = "danger warning red colour quick bar", + Binding = SettingBinding.ForItem( + (_, m) => m.Danger ? DangerStyle : NormalStyle, + (_, m, v) => m.Danger = string.Equals(v, DangerStyle, StringComparison.Ordinal), + NewMacro), + }, ], }, }; diff --git a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs index e463761f..9ae42337 100644 --- a/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs +++ b/src/SharpMUTerm.Client/Surfaces/SurfaceCatalog.cs @@ -234,6 +234,12 @@ public static class SurfaceCatalog /// public const string FloatingPanel = "floating-panel"; + /// + /// A panel the layout collapsed, as a one-line bar at the foot of its column where the host draws strips + /// (HostChrome.Strips): a row of cells, and in the window a native bar over it. A click expands it. + /// + public const string CollapsedPanel = "collapsed-panel"; + /// /// Pop the panel out into a window of its own: the window's alone, offered by a button on the panel's native view, /// the pane's right-click menu and ⌃P (panel:popout:<window>), all ending in one client method. @@ -639,6 +645,16 @@ [.. PanelViews("MapCanvas"), "SharpMUTerm.Avalonia.MapInspector"]), NativeChrome, "SharpMUTerm.Tui.TabTitles.Strip", ["SharpMUTerm.Avalonia.NativeTabStrip"]), + new( + CollapsedPanel, + typeof(CollapsedPanelModel), + [ + // Expand: the cell row is one link to the same method, so the cells need no other door. + new(SurfaceActionKind.Target, "expand", "ExpandCollapsedBar"), + ], + CellsUnderNative, + "SharpMUTerm.Tui.Panels.CollapsedBarRenderer.Render", + ["SharpMUTerm.Avalonia.CollapsedBarView"]), new( ScrollBand, typeof(ScrollBandModel), diff --git a/src/SharpMUTerm.Core/Automation/Macro.cs b/src/SharpMUTerm.Core/Automation/Macro.cs index 6c2e5272..9f3e4d1b 100644 --- a/src/SharpMUTerm.Core/Automation/Macro.cs +++ b/src/SharpMUTerm.Core/Automation/Macro.cs @@ -38,6 +38,12 @@ public sealed class Macro /// public string Command { get; set; } = string.Empty; + /// + /// Whether the binding is drawn as a dangerous one (flee, quit): the quick bar gives it the warning + /// colour in both hosts. Presentation only; the engine never reads it. + /// + public bool Danger { get; set; } + /// Optional named script callback (resolved by the scripting layer). public string? ScriptCallback { get; init; } } diff --git a/src/SharpMUTerm.Core/Layouts/LayoutRealiser.cs b/src/SharpMUTerm.Core/Layouts/LayoutRealiser.cs index 19f92236..ad31f146 100644 --- a/src/SharpMUTerm.Core/Layouts/LayoutRealiser.cs +++ b/src/SharpMUTerm.Core/Layouts/LayoutRealiser.cs @@ -30,24 +30,41 @@ public sealed record RealisedLayout( /// and its split collapsed. /// A collapsed panel's windows are background tabs of the first pane in its region that is not a strip, else of the output pane: /// a title the player can open, which is what collapsed means in a pane tree. +/// Where the host draws collapsed panels as bars (collapsedAsBars), a collapsed panel's windows are a pane of +/// their own instead, under that pane in its column, with the id and the panel id: the +/// host draws it as a one-line bar that a click expands. /// Every window in keep that no panel placed survives — in the pane it asks for when that pane still /// exists, else in the output pane. Applying a layout never closes a window. /// /// public static class LayoutRealiser { + /// The id prefix of a collapsed panel's own pane (collapsedAsBars), followed by the panel id. + public const string CollapsedPanePrefix = "collapsed:"; + + /// The share a collapsed panel's pane is given beside the pane above it, for when it is expanded. + public const double CollapsedPaneShare = 0.5; + + /// The panel a collapsed panel's pane stands for, or null when is no such pane. + public static string? CollapsedPanelOf(string? paneId) => + paneId is not null && paneId.StartsWith(CollapsedPanePrefix, StringComparison.Ordinal) && paneId.Length > CollapsedPanePrefix.Length + ? paneId[CollapsedPanePrefix.Length..] + : null; + /// Realises , or returns null when it draws nothing. /// The layout folded, for the regions of collapsed panels. /// The fold. /// The windows that draw a panel, in tab order; empty when nothing does yet. /// The session's own window: focused, and where strays go. /// Windows to keep, each with the pane id it would like to stay in (or null). + /// Whether a collapsed panel gets a pane of its own under its region's pane (see above). public static RealisedLayout? Realise( LayoutDefinition layout, LayoutFoldResult fold, Func> windowsOf, string outputWindowId, - IEnumerable<(string WindowId, string? PaneId)>? keep = null) + IEnumerable<(string WindowId, string? PaneId)>? keep = null, + bool collapsedAsBars = false) { ArgumentNullException.ThrowIfNull(layout); ArgumentNullException.ThrowIfNull(fold); @@ -125,6 +142,14 @@ public static class LayoutRealiser && PanelSizing.FixedRows(first) is null && layout.PlacementOf(first)?.Region == collapsed.Region) ?? output; + if (collapsedAsBars) + { + var bar = new PaneNode(CollapsedPanePrefix + collapsed.PanelId, windows); + root = Below(root, target, bar); + panelPanes[collapsed.PanelId] = bar.Id; + continue; + } + target.Tabs.AddRange(windows); panelPanes[collapsed.PanelId] = target.Id; } @@ -145,6 +170,45 @@ public static class LayoutRealiser return new RealisedLayout(root, output.Id, panelPanes, FoldShape(fold)); } + /// + /// with under : beside it in its column when its + /// parent is one, else in a new column the two share (). + /// + private static LayoutNode Below(LayoutNode root, PaneNode target, PaneNode bar) + { + if (ReferenceEquals(root, target)) + { + return new SplitNode(SplitDirection.Column, [target, bar], [1, CollapsedPaneShare]); + } + + if (root is not SplitNode split) + { + return root; + } + + var children = new List(); + var sizes = new List(); + for (var i = 0; i < split.Children.Count; i++) + { + var child = split.Children[i]; + if (ReferenceEquals(child, target) && split.Direction == SplitDirection.Column) + { + children.Add(child); + sizes.Add(split.Sizes[i]); + children.Add(bar); + sizes.Add(split.Sizes[i] * CollapsedPaneShare); + continue; + } + + children.Add(ReferenceEquals(child, target) + ? new SplitNode(SplitDirection.Column, [target, bar], [1, CollapsedPaneShare]) + : Below(child, target, bar)); + sizes.Add(split.Sizes[i]); + } + + return new SplitNode(split.Direction, children, sizes); + } + /// /// What a fold draws and where, as a string: the tree of panes with their panel ids, then the collapsed panels. /// No sizes and no window ids, so it changes only when a panel appears, goes, or moves. diff --git a/src/SharpMUTerm.Core/Layouts/PanelSizing.cs b/src/SharpMUTerm.Core/Layouts/PanelSizing.cs index df95cc5e..4279905b 100644 --- a/src/SharpMUTerm.Core/Layouts/PanelSizing.cs +++ b/src/SharpMUTerm.Core/Layouts/PanelSizing.cs @@ -29,6 +29,12 @@ public static class PanelSizing /// public static int VitalsCardRows(int meters) => (2 * Math.Max(0, meters)) + 6; + /// + /// The rows a quick bar takes where the host draws it as a strip of buttons (HostChrome.Strips, the window): + /// three twenty-pixel rows hold the mockups' 34-pixel buttons with their padding. Everywhere else it is one row. + /// + public const int QuickBarStripRows = 3; + /// The rows of content a docked composer is never squeezed below: its header, four rows of post and its key hints. public const int ComposerMinRows = 6; @@ -77,13 +83,16 @@ public static bool IsStrip(IReadOnlyList panels) => /// Non-null when a vitals tab here is drawn as a card of that many rows ( decides); null for /// the one-row strip. /// - public static void Apply(PaneNode pane, Func panelOf, int tabStripRows, int? vitalsCardRows = null) + /// The rows a quick bar takes: 1, or where the host draws buttons. + public static void Apply(PaneNode pane, Func panelOf, int tabStripRows, int? vitalsCardRows = null, int quickBarRows = 1) { ArgumentNullException.ThrowIfNull(pane); ArgumentNullException.ThrowIfNull(panelOf); var panels = pane.Tabs.Select(panelOf).ToList(); int? Rows(string? panel) => - vitalsCardRows is { } card && string.Equals(panel, PanelIds.Vitals, StringComparison.Ordinal) ? card : FixedRows(panel); + vitalsCardRows is { } card && string.Equals(panel, PanelIds.Vitals, StringComparison.Ordinal) ? card + : string.Equals(panel, PanelIds.QuickBar, StringComparison.Ordinal) ? Math.Max(1, quickBarRows) + : FixedRows(panel); var strip = panels.Count > 0 && panels.All(p => Rows(p) is not null); var chrome = ShowsTabStrip(panels) ? Math.Max(0, tabStripRows) : 0; @@ -106,7 +115,8 @@ public static void Apply(PaneNode pane, Func panelOf, int tabSt /// share of the window's width (). is how many /// meters the character behind a vitals window has, by window id. /// - public static void ApplyAll(LayoutNode root, Func panelOf, int tabStripRows, Func vitalsMetersOf) + /// The rows a quick bar takes (see ). + public static void ApplyAll(LayoutNode root, Func panelOf, int tabStripRows, Func vitalsMetersOf, int quickBarRows = 1) { ArgumentNullException.ThrowIfNull(root); ArgumentNullException.ThrowIfNull(vitalsMetersOf); @@ -119,7 +129,7 @@ public static void ApplyAll(LayoutNode root, Func panelOf, int card = VitalsCardRows(vitalsMetersOf(vitals)); } - Apply(pane, panelOf, tabStripRows, card); + Apply(pane, panelOf, tabStripRows, card, quickBarRows); } } diff --git a/src/SharpMUTerm.Tui/Hosting/ClientHost.cs b/src/SharpMUTerm.Tui/Hosting/ClientHost.cs index 1144503c..8b20e383 100644 --- a/src/SharpMUTerm.Tui/Hosting/ClientHost.cs +++ b/src/SharpMUTerm.Tui/Hosting/ClientHost.cs @@ -336,8 +336,15 @@ internal static ClientHost HarnessTerminal( /// as wide as the column the output is in (), with the panes beside /// it running down to the status row. Only cells move; the pane rectangles, and so NAWS, are what is arranged. /// +/// +/// The host draws the strip panels as desktop strips: the quick bar gets PanelSizing.QuickBarStripRows rows for +/// its buttons, and a panel a layout collapses gets a pane of its own at the foot of its column, drawn as a one-line bar +/// (CollapsedPanelModel) a click expands, rather than a background tab of the pane above it. Rows only; the pane +/// rectangles, and so NAWS, are what is arranged. +/// internal sealed record HostChrome( - bool Header, bool Rail, bool Status = false, bool Input = false, bool Tabs = false, bool PaneGutter = false, bool InputInColumn = false) + bool Header, bool Rail, bool Status = false, bool Input = false, bool Tabs = false, bool PaneGutter = false, bool InputInColumn = false, + bool Strips = false) { /// The client draws all of its chrome in cells: the terminal, the snapshot, the tests. public static HostChrome None { get; } = new(false, false); @@ -349,7 +356,7 @@ internal sealed record HostChrome( /// The host draws the header, the rail, the status footer, the command line's field and every pane's tab strip, and /// the client pads every pane with a gutter and puts the command line in the output's column: the desktop window. /// - public static HostChrome Desktop { get; } = new(true, true, true, true, true, true, true); + public static HostChrome Desktop { get; } = new(true, true, true, true, true, true, true, true); /// The same arrangement as ; the name the tab strip's tests use. public static HostChrome Native => Desktop; diff --git a/src/SharpMUTerm.Tui/KeypadScreenRenderer.cs b/src/SharpMUTerm.Tui/KeypadScreenRenderer.cs index 9e4ac9ef..5092f726 100644 --- a/src/SharpMUTerm.Tui/KeypadScreenRenderer.cs +++ b/src/SharpMUTerm.Tui/KeypadScreenRenderer.cs @@ -94,6 +94,13 @@ internal static class KeypadScreenRenderer /// internal const int SetField = 3; + /// + /// The binding's style (: normal or danger), appended after the set for the + /// same reason, and like it present only when the screen knows the sets. It is drawn after the command only while + /// it says danger or is being edited, so an ordinary row is drawn as it always was. + /// + internal const int StyleField = 4; + /// The label the binding list's add button carries; it names the key it will claim. internal const string AddBindingLabel = "+ binding"; @@ -227,7 +234,7 @@ internal static string HeaderLine(int width, ScreenModel? model = null, ScreenFo internal static SettingsCollection Declared => BuiltInSettings.Keypad.Collection!; /// The binding row's fields by declared id, in ⇥ order; set only when the screen knows the sets. - internal static IReadOnlyList RowFieldOrder { get; } = ["name", "command", "key", "set"]; + internal static IReadOnlyList RowFieldOrder { get; } = ["name", "command", "key", "set", "style"]; internal static ScreenModel Model( HostKeys keys, @@ -249,7 +256,7 @@ private static ScreenRow BindingRow( { var target = new SettingTarget(DeclaredFields.Over(sets ?? Array.Empty()), Item: macro); var fields = RowFieldOrder - .Where(id => sets is not null || id != "set") + .Where(id => sets is not null || (id != "set" && id != "style")) .Select(id => DeclaredFields.Item( Declared.Field(id), target, @@ -486,7 +493,8 @@ internal static List HotkeysColumn( cursor.EditOn(0, i, NameField), cursor.EditOn(0, i, CommandField), cursor.EditOn(0, i, KeyField), - cursor.EditOn(0, i, SetField)), + cursor.EditOn(0, i, SetField), + cursor.EditOn(0, i, StyleField)), cursor.IsOn(0, i), width)); } @@ -560,7 +568,8 @@ private static string Hotkey( ScreenFieldEdit? name, ScreenFieldEdit? command, ScreenFieldEdit? key, - ScreenFieldEdit? set) + ScreenFieldEdit? set, + ScreenFieldEdit? style = null) { var verdict = MacroKeys.Verdict(keys, macro.Key); var clash = KeyClashes.For(keys, macro, macros); @@ -592,7 +601,12 @@ private static string Hotkey( : ScreenChrome.Field( PadVisible($"[{Value}]{Escape(Truncate(setName, SetColumnWidth))}[/]", SetColumnWidth), set) + " "; - return $"{tick} {bound} {named} {owner}→ {ScreenChrome.Field(Escape(macro.Command), command)}"; + // The style is said only when it is not the ordinary one, or while it is being changed: a danger binding reads + // "· danger" in the caution ink after its command, and every other row is the row it always was. + var styled = style is not null + ? " " + ScreenChrome.Field(macro.Danger ? BuiltInSettings.DangerStyle : BuiltInSettings.NormalStyle, style) + : macro.Danger ? $" [{Caution}]· {BuiltInSettings.DangerStyle}[/]" : string.Empty; + return $"{tick} {bound} {named} {owner}→ {ScreenChrome.Field(Escape(macro.Command), command)}{styled}"; } /// diff --git a/src/SharpMUTerm.Tui/Panels/CollapsedBarRenderer.cs b/src/SharpMUTerm.Tui/Panels/CollapsedBarRenderer.cs new file mode 100644 index 00000000..4d262cde --- /dev/null +++ b/src/SharpMUTerm.Tui/Panels/CollapsedBarRenderer.cs @@ -0,0 +1,26 @@ +using SharpMUTerm.Client.Panels; +using static SharpMUTerm.Tui.MarkupText; + +namespace SharpMUTerm.Tui.Panels; + +/// +/// A collapsed panel's bar as a row of cells: ▸ Chat 2 new ······ collapsed in combat, the whole row one link +/// () the bar's own control answers by expanding the panel. Drawn from a +/// , the one the window's native bar is drawn from. Elided to the width, never wrapped. +/// +internal static class CollapsedBarRenderer +{ + /// The link the row carries; only the bar's own control answers it. + internal const string ExpandLink = "mux:collapsed:expand"; + + /// The row for cells. + internal static string Render(CollapsedPanelModel model, int width, string accent) + { + ArgumentNullException.ThrowIfNull(model); + width = Math.Max(1, width); + var left = $"▸ [bold]{Escape(model.Title)}[/]" + (model.Unread > 0 ? $" [bold {accent}]{Escape(model.UnreadText)}[/]" : string.Empty); + var right = $"[dim]{Escape(model.Note)}[/]"; + var row = VisibleLength(left) + VisibleLength(right) + 2 <= width ? SpreadLR(left, right, width) : ElideVisible(left, width); + return $"[link={ExpandLink}]{row}[/]"; + } +} diff --git a/src/SharpMUTerm.Tui/Panels/QuickBarRenderer.cs b/src/SharpMUTerm.Tui/Panels/QuickBarRenderer.cs index d6291aad..b1e48acc 100644 --- a/src/SharpMUTerm.Tui/Panels/QuickBarRenderer.cs +++ b/src/SharpMUTerm.Tui/Panels/QuickBarRenderer.cs @@ -59,14 +59,18 @@ internal static QuickBarModel Entries(HostKeys keys, IEnumerable macros, var key = (parts.Ctrl ? "⌃" : string.Empty) + (parts.Alt ? "⌥" : string.Empty) + (parts.Shift ? "⇧" : string.Empty) + parts.Key; var modifiers = (parts.Ctrl ? 1 : 0) + (parts.Alt ? 2 : 0) + (parts.Shift ? 4 : 0); - entries.Add((new QuickBarItem(key, descriptor, Single(name), MacroKeys.Verdict(keys, descriptor).Fires), modifiers, number)); + entries.Add((new QuickBarItem(key, descriptor, Single(name), MacroKeys.Verdict(keys, descriptor).Fires, macro.Danger), modifiers, number)); } return new QuickBarModel(entries.OrderBy(e => e.Modifiers).ThenBy(e => e.Number).Select(e => e.Entry).ToList()); } /// The row for cells. Entries that do not fit are counted, never wrapped. - internal static string Render(QuickBarModel model, int width, string accent) + /// What to draw. + /// The row's width in cells. + /// The key's ink. + /// The ink a dangerous binding's key and name take; the accent when null. + internal static string Render(QuickBarModel model, int width, string accent, string? danger = null) { var entries = model.Items; width = Math.Max(1, width); @@ -76,7 +80,7 @@ internal static string Render(QuickBarModel model, int width, string accent) return ElideVisible($"[dim]{QuickBarModel.EmptyText} · [/]{hint}", width); } - var cells = entries.Select((e, i) => Cell(e, i, accent)).ToList(); + var cells = entries.Select((e, i) => Cell(e, i, accent, danger ?? accent)).ToList(); var hintWidth = VisibleLength(hint); foreach (var withHint in new[] { true, false }) { @@ -118,11 +122,13 @@ internal static string Render(QuickBarModel model, int width, string accent) return null; } - private static string Cell(QuickBarItem entry, int index, string accent) + private static string Cell(QuickBarItem entry, int index, string accent, string danger) { var name = entry.Title.Length <= MaxNameWidth ? entry.Title : entry.Title[..(MaxNameWidth - 1)] + "…"; var link = $"[link={LinkPrefix}{index.ToString(CultureInfo.InvariantCulture)}]"; - return entry.Fires + return entry.Fires && entry.Danger + ? $"{link}[bold {danger}]{Escape(entry.Key)}[/] [{danger}]{Escape(name)}[/][/]" + : entry.Fires ? $"{link}[bold {accent}]{Escape(entry.Key)}[/] {Escape(name)}[/]" : $"{link}[dim]{Escape(entry.Key)} {Escape(name)}[/][/]"; } diff --git a/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs b/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs index 6a9c1b9b..267ba647 100644 --- a/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs +++ b/src/SharpMUTerm.Tui/Pointer/PointerTarget.cs @@ -292,7 +292,9 @@ internal sealed record PanelOverlay( Action? PopOut = null, Action? SelectRoom = null, Action? EditMap = null, - Action? LookMap = null); + Action? LookMap = null, + SharpMUTerm.Client.Panels.CollapsedPanelModel? Collapsed = null, + Action? Expand = null); /// A panel's colours as #rrggbb: a bar or fill, the warning, and the empty part of a bar. internal sealed record PanelInk(string Bar, string Low, string Track); diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Desktop.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Desktop.cs index 0bb1fa64..2c42b431 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Desktop.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Desktop.cs @@ -211,7 +211,11 @@ private void PublishPanels() var over = Host.Chrome.PaneGutter ? new Core.Workspaces.PaneRect(rect.X - PaneGutterColumns, rect.Y, rect.Width + (2 * PaneGutterColumns), rect.Height) : rect; - if (_workspace.Layout.FindPane(paneId) is { ActiveTab: { } windowId } && OverlayFor(windowId, over, docked: true) is { } overlay) + if (CollapsedBarOverlay(paneId, over) is { } bar) + { + overlays.Add(bar); + } + else if (_workspace.Layout.FindPane(paneId) is { ActiveTab: { } windowId } && OverlayFor(windowId, over, docked: true) is { } overlay) { overlays.Add(overlay); } @@ -272,7 +276,7 @@ private void PublishPanels() if (panelId == PanelIds.QuickBar) { return new PanelOverlay( - panelId, windowId, rect, PanelListInk(), null, QuickBar: QuickBarEntries(key), Pick: PickerFor(windowId, key), + panelId, windowId, rect, PanelListInk() with { Low = DangerInk() }, null, QuickBar: QuickBarEntries(key), Pick: PickerFor(windowId, key), Dispatch: _panelDispatch ??= id => OnUiThread(() => DispatchCommand(id)), PopOut: popOut); } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.CollapsedBars.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.CollapsedBars.cs new file mode 100644 index 00000000..f3b7c8e9 --- /dev/null +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.CollapsedBars.cs @@ -0,0 +1,233 @@ +using SharpConsoleUI; +using SharpConsoleUI.Builders; +using SharpConsoleUI.Controls; +using SharpConsoleUI.Layout; +using SharpMUTerm.Client.Panels; +using SharpMUTerm.Client.Surfaces; +using SharpMUTerm.Core.Layouts; +using SharpMUTerm.Core.Workspaces; +using SharpMUTerm.Tui.Panels; + +namespace SharpMUTerm.Tui; + +/// +/// A collapsed panel drawn as a bar at the foot of its column (, the window): the layout's +/// realiser gives such a panel a pane of its own (), and while it is not +/// expanded that pane is rows of one , drawn by +/// in cells and by the window's native bar over them. A click on either is +/// : the pane shares its column like any other from then on, for the run, until a layout is +/// applied again. Activating a window the bar holds expands it too, so ⌥N never lands in a bar. A window in a bar is +/// marked scrolled back, so its lines are counted as unread, which is what the bar's 2 new reads. +/// +internal sealed partial class SharpMUTermApp +{ + /// + /// The rows a collapsed panel's bar takes: two, the mockups' ~40 px footer — or one where the host draws the command + /// line's field (), whose grid is shorter than its view by the field's padding and whose + /// bar at the foot of a column runs down over that too. + /// + internal int CollapsedBarRows => Host.Chrome.Input ? 1 : 2; + + /// Collapsed panes the player has expanded this run, by pane id. + private readonly HashSet _expandedBars = new(StringComparer.Ordinal); + + /// Each collapsed bar's control, by pane id, with what it last drew. + private readonly Dictionary _collapsedBarViews = + new(StringComparer.Ordinal); + + /// The expand callback per pane, one instance each so a published overlay compares equal frame to frame. + private readonly Dictionary _barExpanders = new(StringComparer.Ordinal); + + /// Whether is drawn as a collapsed panel's bar now. + private bool IsCollapsedBar(PaneNode? pane) => + pane is not null + && Host.Chrome.Strips + && LayoutRealiser.CollapsedPanelOf(pane.Id) is not null + && !_expandedBars.Contains(pane.Id) + && pane.Tabs.Count > 0 + && _workspace.Layout.ZoomedPaneId is null; + + /// The panes as the tree holds them. Internal for tests. + internal IReadOnlyList PaneNodes => _workspace.Layout.Root.Panes().ToList(); + + /// Whether a pane id is a collapsed bar now. Internal for tests. + internal bool IsCollapsedBarPane(string paneId) => IsCollapsedBar(_workspace.Layout.FindPane(paneId)); + + /// The model the bar in last drew, for the tests and the parity harness. + internal CollapsedPanelModel? CollapsedBarModel(string paneId) => DrawnModel(SurfaceCatalog.CollapsedPanel, paneId) as CollapsedPanelModel; + + /// A click on a link in the bar's cells, as the framework raises it. The test seam. + internal void SimulateCollapsedBarClick(string paneId, string url) + { + if (_collapsedBarViews.TryGetValue(paneId, out var view) && url == CollapsedBarRenderer.ExpandLink) + { + ExpandCollapsedBar(paneId); + } + } + + /// + /// After : every collapsed bar is rows with no tab + /// strip, and the windows in it count their lines as unread. + /// + private void ApplyCollapsedBars() + { + foreach (var pane in _workspace.Layout.Root.Panes()) + { + if (!IsCollapsedBar(pane)) + { + continue; + } + + pane.FixedRows = CollapsedBarRows; + pane.MinRows = null; + pane.DrawsHeader = false; + foreach (var windowId in pane.Tabs) + { + _workspace.SetScrolledBack(windowId, true); + } + } + } + + /// What the bar in says: its first window's title, the unread across its windows, why. + private CollapsedPanelModel CollapsedModelFor(PaneNode pane) + { + var windows = pane.Tabs.Select(_workspace.FindWindow).OfType().ToList(); + var title = windows.FirstOrDefault()?.Title ?? LayoutRealiser.CollapsedPanelOf(pane.Id) ?? string.Empty; + var layout = _liveLayout is { } live ? Layouts.Find(live.LayoutId)?.Name : null; + return new CollapsedPanelModel(Snippet(title), windows.Sum(w => w.Unread), CollapsedPanelModel.NoteFor(layout)); + } + + /// + /// The bar's cells: a tab control holding one tab (so the pane rectangle, the rail and every pane walk see a pane like + /// any other), its header hidden, its page the bar's row. The windows the pane holds keep their tabs in the model and + /// are drawn when it is expanded. + /// + private IWindowControl BuildCollapsedBar(PaneNode pane) + { + var paneId = pane.Id; + if (!_collapsedBarViews.TryGetValue(paneId, out var view)) + { + var control = new MarkupControl(new List()) + { + HorizontalAlignment = HorizontalAlignment.Stretch, + VerticalAlignment = VerticalAlignment.Fill, + }; + control.LinkClicked += (_, e) => + { + if (e.Url == CollapsedBarRenderer.ExpandLink) + { + ExpandCollapsedBar(paneId); + } + }; + view = (control, null, -1); + } + + _collapsedBarViews[paneId] = view with { Model = null, Width = -1 }; + var tabs = Controls.TabControl().AddTab(string.Empty, view.Control).Fill().WithAlignment(HorizontalAlignment.Stretch).Build(); + if (Host.Chrome.PaneGutter) + { + tabs.Margin = new Margin(PaneGutterColumns, 0, PaneGutterColumns, 0); + } + + tabs.TabPages[0].Tag = pane.ActiveTab; + tabs.TabPages[0].IsClosable = false; + tabs.ShowTabHeader = false; + lock (_paneTabsLock) + { + _paneTabs[paneId] = tabs; + } + + RefreshCollapsedBar(paneId); + return tabs; + } + + /// Redraws one bar when what it says or its width moved. + private void RefreshCollapsedBar(string paneId) + { + if (!_collapsedBarViews.TryGetValue(paneId, out var view) || _workspace.Layout.FindPane(paneId) is not { } pane || !IsCollapsedBar(pane)) + { + return; + } + + var width = PaneOutputRects().TryGetValue(paneId, out var rect) && rect.Width > 0 ? rect.Width : 40; + var model = Drawing(SurfaceCatalog.CollapsedPanel, paneId, CollapsedModelFor(pane)); + if (model == view.Model && width == view.Width) + { + return; + } + + view.Control.SetContent([CollapsedBarRenderer.Render(model, width, _ink.Accent)]); + _collapsedBarViews[paneId] = (view.Control, model, width); + } + + /// Every bar on screen, redrawn as its unread or width moves. Rides PostBufferPaint. + private void SyncCollapsedBars() + { + foreach (var paneId in _collapsedBarViews.Keys.ToList()) + { + if (_workspace.Layout.FindPane(paneId) is null) + { + _collapsedBarViews.Remove(paneId); + continue; + } + + RefreshCollapsedBar(paneId); + } + } + + /// What the host is told about the bar in , or null when it is no bar. + private PanelOverlay? CollapsedBarOverlay(string paneId, PaneRect rect) + { + if (_workspace.Layout.FindPane(paneId) is not { } pane || !IsCollapsedBar(pane) || pane.ActiveTab is not { } windowId) + { + return null; + } + + var expand = _barExpanders.TryGetValue(paneId, out var known) + ? known + : _barExpanders[paneId] = () => OnUiThread(() => ExpandCollapsedBar(paneId)); + var model = DrawnModel(SurfaceCatalog.CollapsedPanel, paneId) as CollapsedPanelModel ?? CollapsedModelFor(pane); + return new PanelOverlay( + LayoutRealiser.CollapsedPanelOf(paneId)!, windowId, rect, PanelListInk(), null, Collapsed: model, Expand: expand); + } + + /// + /// Expands the collapsed panel in : the pane shares its column from now on and its window comes + /// forward. What the cell row's link and the native bar's click both end in. + /// + internal void ExpandCollapsedBar(string paneId) + { + if (_workspace.Layout.FindPane(paneId) is not { } pane || !IsCollapsedBar(pane)) + { + return; + } + + _expandedBars.Add(paneId); + _collapsedBarViews.Remove(paneId); + RebuildPaneArea(); + if (pane.ActiveTab is { } windowId) + { + Activate(windowId); + _workspace.SetScrolledBack(windowId, false); + RefreshTabTitles(); + } + } + + /// Expands the bar holding , if one does: a window brought forward is never left in a bar. + private void ExpandBarHolding(string windowId) + { + if (!Host.Chrome.Strips || _workspace.Layout.FindWindow(windowId) is not { } pane || !IsCollapsedBar(pane)) + { + return; + } + + _expandedBars.Add(pane.Id); + _collapsedBarViews.Remove(pane.Id); + foreach (var id in pane.Tabs) + { + _workspace.SetScrolledBack(id, false); + } + + RebuildPaneArea(); + } +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs index 9fc048e9..8c39acfd 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Layouts.cs @@ -281,11 +281,17 @@ internal bool ApplyLayout(string key, LayoutDefinition layout, string? focusWind .SelectMany(p => p.Tabs.Select(t => (t, (string?)p.Id))) .Where(k => !FloatsHere(k.t)) .ToList(); - if (LayoutRealiser.Realise(layout, fold, panel => DockedWindows(key, panel), output, keep) is not { } realised) + if (LayoutRealiser.Realise(layout, fold, panel => DockedWindows(key, panel), output, keep, collapsedAsBars: Host.Chrome.Strips) + is not { } realised) { return false; } + if (adoptFloating) + { + _expandedBars.Clear(); // an explicit apply folds the collapsed panels away again + } + _workspace.Layout.ReplaceTree(realised.Root, realised.FocusedPaneId); _liveLayout = new LiveLayout( key, layout.Id, realised.Shape, LayoutRealiser.TreeShape(_workspace.Layout.Root), realised.PanelPanes); diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs index a98d6f97..e4cd53dd 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs @@ -235,6 +235,12 @@ private VitalsStripRenderer.Ink VitalsInk() => /// The low cue's ink on (), as markup. private string LowInk(Rgb plane) => WorkspacePalette.Low(_theme, ParseHex(_ink.Notice), plane).ToHex(); + /// + /// The ink a dangerous binding () is drawn in: the settings screens' warning red, held to the + /// floor on the panes' reading plane. + /// + private string DangerInk() => Contrast.Legible(ParseHex(ScreenPalette.Warn), _ink.Plane).ToHex(); + // --- Quick bar -------------------------------------------------------------------------------------------- private IWindowControl NewQuickBarPanel(TerminalPanelContext context) @@ -244,7 +250,7 @@ private IWindowControl NewQuickBarPanel(TerminalPanelContext context) { var model = Drawing(PanelIds.QuickBar, context.WindowId, QuickBarEntries(context.SessionKey)); drawn = model.Items; - return [QuickBarRenderer.Render(model, width, _ink.Accent)]; + return [QuickBarRenderer.Render(model, width, _ink.Accent, DangerInk())]; }); view.Click = url => { @@ -765,6 +771,7 @@ private void LoadDemoBindings() new Macro { Name = "bash", Key = "F12", Command = "bash" }, new Macro { Name = "cure light", Key = "Ctrl+F3", Command = "cast 'cure light'" }, new Macro { Name = "quaff mana", Key = "Ctrl+F4", Command = "quaff mana" }, + new Macro { Name = "flee", Key = "Ctrl+F12", Command = "flee", Danger = true }, }, }); FindCharacter(DemoScene.ActiveSessionKey)?.Character.TriggerSets.Add("Quick"); diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 4d55da29..b9ac9c57 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -1061,6 +1061,7 @@ public SharpMUTermApp( PublishStatus(); SyncMapSizes(); SyncPanelSizes(); + SyncCollapsedBars(); SyncScrollSplitBars(); SyncChromeBarWidths(); SyncStatusMode(); @@ -10973,7 +10974,10 @@ private IWindowControl BuildWorkspaceRow() // floor. Derived here on every rebuild rather than stored, so a pane handed an ordinary window stops being a // strip at once. // A vitals pane in a side column is a card, its height from the character's meters. - Core.Layouts.PanelSizing.ApplyAll(_workspace.Layout.Root, PanelIdOfWindow, TabStripRows, VitalsMetersOfWindow); + Core.Layouts.PanelSizing.ApplyAll( + _workspace.Layout.Root, PanelIdOfWindow, TabStripRows, VitalsMetersOfWindow, + Host.Chrome.Strips ? Core.Layouts.PanelSizing.QuickBarStripRows : 1); + ApplyCollapsedBars(); // When a pane is zoomed, render just that pane full-area; otherwise render the whole tree. var zoomed = _workspace.Layout.ZoomedPaneId is { } zid ? _workspace.Layout.FindPane(zid) : null; @@ -11750,6 +11754,11 @@ private void PaintTabChips(TabControl tabs, Rgb surface) /// Builds a leaf pane's tab strip from its window ids, tracking it under its pane id. private IWindowControl BuildPaneTabs(PaneNode pane) { + if (IsCollapsedBar(pane)) + { + return BuildCollapsedBar(pane); + } + var builder = Controls.TabControl(); var ids = new List(); @@ -13338,7 +13347,8 @@ internal IReadOnlyDictionary PaneOutputRects() foreach (var (paneId, tabs, rect) in RealisedPanes()) { var margin = tabs.Margin; - var top = margin.Top + tabs.TabHeaderHeight + PaneGutterRowsFor(_workspace.Layout.FindPane(paneId)?.ActiveTab); + var pane = _workspace.Layout.FindPane(paneId); + var top = margin.Top + tabs.TabHeaderHeight + (IsCollapsedBar(pane) ? 0 : PaneGutterRowsFor(pane?.ActiveTab)); rects[paneId] = new PaneRect( rect.X + margin.Left, rect.Y + top, @@ -13630,6 +13640,8 @@ private bool Activate(string id) return false; } + ExpandBarHolding(id); // a window brought forward is never left in a collapsed panel's bar + // Selecting the tab below raises the framework's own TabChanged, which lands back in // OnTabChanged and so back here. The model call above is idempotent, so re-entering is harmless // — but doing the rest twice would recall the drafts twice and say anything it has to say twice. diff --git a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs index 60e84a37..a9fad513 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/SurfaceParityTests.cs @@ -339,6 +339,17 @@ await Assert.That(Rows(palette.Session!.View(query))).IsEquivalentTo(Rows(drawn! covered.Add(SurfaceCatalog.FloatingPanel); } + // A collapsed panel's bar: the native bar is handed the model the cell bar drew in the same frame. + { + using var driver = new AvaloniaConsoleDriver(140, 36); + await using var app = App(driver, DemoScene.Build()); + app.RenderSnapshot("layout-combat"); + var bar = driver.Pointer.Panels.Single(p => p.Collapsed is not null); + var barPane = app.PaneNodes.Single(p => LayoutRealiser.CollapsedPanelOf(p.Id) == bar.PanelId).Id; + await Assert.That(app.DrawnModel(SurfaceCatalog.CollapsedPanel, barPane)).IsEqualTo((object)bar.Collapsed!).Because("collapsed-panel"); + covered.Add(SurfaceCatalog.CollapsedPanel); + } + // The tab overflow chip: the menu the window opens is the list the cells recorded for that strip in the same frame. { using var driver = new AvaloniaConsoleDriver(56, 20); @@ -592,6 +603,12 @@ await Same("quick-bar: edit", "layout-combat", (app, d) => app.SimulatePanelClick(Panel(d, PanelIds.QuickBar).WindowId, QuickBarRenderer.EditLink)); probed.Add(PanelIds.QuickBar); + // A collapsed panel's bar: the native bar's click, and the cell bar's link. + await Same("collapsed-panel: expand", "layout-combat", + (app, d) => d.Pointer.Panels.Single(p => p.Collapsed is not null).Expand!(), + (app, d) => app.SimulateCollapsedBarClick(app.PaneNodes.Single(p => LayoutRealiser.CollapsedPanelOf(p.Id) is not null).Id, CollapsedBarRenderer.ExpandLink)); + probed.Add(SurfaceCatalog.CollapsedPanel); + // Layouts: choosing Roleplay in the menu, and running the ⌥M list's command for it. await Same("layouts-menu: apply", "layout-combat", (app, d) => diff --git a/tests/SharpMUTerm.Client.Tests/SurfaceCatalogTests.cs b/tests/SharpMUTerm.Client.Tests/SurfaceCatalogTests.cs index 2194f26c..48497127 100644 --- a/tests/SharpMUTerm.Client.Tests/SurfaceCatalogTests.cs +++ b/tests/SharpMUTerm.Client.Tests/SurfaceCatalogTests.cs @@ -73,7 +73,8 @@ public async Task PanelSurfacesAreKnownPanels() var panels = SurfaceCatalog.All.Where(s => s.Id is not (SurfaceCatalog.Header or SurfaceCatalog.Sidebar or SurfaceCatalog.Settings or SurfaceCatalog.LayoutsMenu or SurfaceCatalog.Palette or SurfaceCatalog.Prefix or SurfaceCatalog.RailStrip or SurfaceCatalog.Notice or SurfaceCatalog.Compose - or SurfaceCatalog.FloatingPanel or SurfaceCatalog.TabOverflow or SurfaceCatalog.Status or SurfaceCatalog.TabStrip or SurfaceCatalog.ScrollBand) + or SurfaceCatalog.FloatingPanel or SurfaceCatalog.TabOverflow or SurfaceCatalog.Status or SurfaceCatalog.TabStrip or SurfaceCatalog.ScrollBand + or SurfaceCatalog.CollapsedPanel) && !SurfaceCatalog.Modals.Contains(s.Id)); foreach (var surface in panels) { diff --git a/tests/SharpMUTerm.Tui.Tests/CombatStripTests.cs b/tests/SharpMUTerm.Tui.Tests/CombatStripTests.cs new file mode 100644 index 00000000..d28e2eeb --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/CombatStripTests.cs @@ -0,0 +1,101 @@ +using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Panels; +using SharpMUTerm.Core.Layouts; +using SharpMUTerm.Core.Workspaces; +using SharpMUTerm.Graphics; +using SharpMUTerm.Tui.Panels; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// A host that draws strips (, the window) gives the Combat layout's quick bar the rows its +/// buttons need and draws a collapsed panel as a bar of its own at the foot of its column, which a click expands. The +/// terminal keeps the one-row bar and the background tab. Rows only: the pane rectangles are what is arranged. +/// +/// Serialised: rendering a frame redirects the process-global Console.Out. +[NotInParallel] +public class CombatStripTests +{ + private static readonly TerminalCapabilities Caps = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private static SharpMUTermApp App(HostChrome chrome, out string frame) + { + Console.SetIn(TextReader.Null); + var host = ClientHost.Headless(new HeadlessConsoleDriver(140, 40), Caps) with { Chrome = chrome }; + var app = new SharpMUTermApp(DemoScene.Build(), host); + frame = app.RenderSnapshot("layout-combat"); + app.RenderNextFrame(); + return app; + } + + private static string? PaneHolding(SharpMUTermApp app, string panelId) => + app.PaneNodes.FirstOrDefault(p => p.Tabs.Any(t => t.StartsWith("panel:" + panelId + ":", StringComparison.Ordinal)))?.Id; + + [Test] + public async Task TheWindowsQuickBarIsAStripTallEnoughForButtonsAndTheTerminalsIsOneRow() + { + await using var window = App(HostChrome.Desktop, out _); + await using var terminal = App(HostChrome.None, out _); + var windowBar = PaneHolding(window, PanelIds.QuickBar)!; + var terminalBar = PaneHolding(terminal, PanelIds.QuickBar)!; + + await Assert.That(window.PaneOutputRects()[windowBar].Height).IsEqualTo(PanelSizing.QuickBarStripRows); + await Assert.That(terminal.PaneOutputRects()[terminalBar].Height).IsEqualTo(1); + } + + [Test] + public async Task ACollapsedPanelIsABarAtTheFootOfItsColumnInTheWindowAndATabInTheTerminal() + { + await using var window = App(HostChrome.Desktop, out _); + await using var terminal = App(HostChrome.None, out _); + + var bar = window.PaneNodes.Single(p => LayoutRealiser.CollapsedPanelOf(p.Id) == PanelIds.Chat); + await Assert.That(window.IsCollapsedBarPane(bar.Id)).IsTrue(); + await Assert.That(window.PaneOutputRects()[bar.Id].Height).IsEqualTo(window.CollapsedBarRows); + + // Its column runs down to the status row: nothing under the bar. + var map = window.PaneNodes.Single(p => p.Tabs.Any(t => t.StartsWith("map:", StringComparison.Ordinal))); + var rects = window.PaneOutputRects(); + await Assert.That(rects[bar.Id].Y).IsGreaterThan(rects[map.Id].Y); + await Assert.That(rects[bar.Id].X).IsEqualTo(rects[map.Id].X); + var bottom = 40; + await Assert.That(rects[bar.Id].Y + rects[bar.Id].Height).IsEqualTo(bottom).Because(string.Join("; ", rects.Select(r => $"{r.Key}={r.Value}"))); + + var model = window.CollapsedBarModel(bar.Id); + await Assert.That(model).IsNotNull(); + await Assert.That(model!.Title).IsEqualTo("Chat"); + await Assert.That(model.Note).IsEqualTo("collapsed in combat"); + + // The terminal: no such pane, the chat window a background tab of the map's pane as before. + await Assert.That(terminal.PaneNodes.Any(p => LayoutRealiser.CollapsedPanelOf(p.Id) is not null)).IsFalse(); + } + + [Test] + public async Task TheBarsLinkExpandsItIntoAPaneThatSharesItsColumn() + { + await using var window = App(HostChrome.Desktop, out _); + var bar = window.PaneNodes.Single(p => LayoutRealiser.CollapsedPanelOf(p.Id) is not null); + var markup = window.CollapsedBarModel(bar.Id)!; + await Assert.That(CollapsedBarRenderer.Render(markup, 40, "#00f5b7")).Contains(CollapsedBarRenderer.ExpandLink); + + window.ExpandCollapsedBar(bar.Id); + window.RenderNextFrame(); + + await Assert.That(window.IsCollapsedBarPane(bar.Id)).IsFalse(); + await Assert.That(window.PaneOutputRects()[bar.Id].Height).IsGreaterThan(window.CollapsedBarRows); + await Assert.That(window.FocusedPaneId).IsEqualTo(bar.Id); + } + + [Test] + public async Task ADangerBindingIsDrawnInTheWarningInkAndOthersInTheAccent() + { + var model = new QuickBarModel([ + new QuickBarItem("F1", "F1", "kick", true), + new QuickBarItem("⌃F12", "Ctrl+F12", "flee", true, Danger: true), + ]); + var row = QuickBarRenderer.Render(model, 80, "#00f5b7", "#ff6b6b"); + await Assert.That(row).Contains("[bold #00f5b7]F1[/] kick"); + await Assert.That(row).Contains("[bold #ff6b6b]⌃F12[/] [#ff6b6b]flee[/]"); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/MacroKeyCaptureTests.cs b/tests/SharpMUTerm.Tui.Tests/MacroKeyCaptureTests.cs index 6f0ed8c7..d092011c 100644 --- a/tests/SharpMUTerm.Tui.Tests/MacroKeyCaptureTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/MacroKeyCaptureTests.cs @@ -202,7 +202,7 @@ public async Task TheNumpadGridSaysThatNothingReachesIt() /// The key is the row's third field, appended after the name and the command so the two ordinals /// that were already addressed by the renderer, the tests and the snapshot scripts still mean what /// they meant. Opening it arms a capture rather than a buffer. The owning set was appended after it - /// on the same rule, so the key is still the third and the row is now four. + /// on the same rule, so the key is still the third; the quick bar's style came last, and the row is now five. /// [Test] public async Task TheBindingRowCarriesItsKeyAsACaptureField() @@ -211,7 +211,7 @@ public async Task TheBindingRowCarriesItsKeyAsACaptureField() var model = KeypadScreenRenderer.Model(HostKeys.Terminal, sets.SelectMany(s => s.Macros).ToList(), sets, 0); var row = model.RowAt(0, 0); - await Assert.That(row.FieldCount).IsEqualTo(4); + await Assert.That(row.FieldCount).IsEqualTo(5); await Assert.That(row.FieldAt(KeypadScreenRenderer.SetField)!.Value.Get()).IsEqualTo(sets[0].Name); await Assert.That(row.FieldAt(KeypadScreenRenderer.NameField)!.Value.Get()).IsEqualTo("Look"); await Assert.That(row.FieldAt(KeypadScreenRenderer.CommandField)!.Value.Get()).IsEqualTo("look"); From 281b82a5ea46c63930f06f8fb4a7478c8eff51a0 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 20:51:02 +0000 Subject: [PATCH 081/113] Wave 23 A: the window's map column uses its space The native map draws rooms at the mockup's 32 px wherever the step leaves a line between them (fit up to a 90 px step), and lays out room names: whole, wider than the room, at the first place covering no room and no other name (under, over or beside with exits clear, else across a line, else pulled aside), elided only where nothing fits. Where the host draws tab strips, a pane holding only the map window draws none (its heading names it); where it draws strips, the vitals card is as tall as its gauges (2 a meter + 4, +2 while a target is named) and re-lays when that changes. The terminal keeps its rules; NAWS follows the real rectangles. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 4 + CLAUDE.md | 16 +- src/SharpMUTerm.Avalonia/MapCanvas.cs | 224 +++++++++++++++++- src/SharpMUTerm.Core/Layouts/PanelSizing.cs | 18 +- .../SharpMUTermApp.MapColumn.cs | 84 +++++++ src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs | 12 +- src/SharpMUTerm.Tui/SharpMUTermApp.cs | 4 +- .../MapNamesTests.cs | 90 +++++++ .../Workspace/PaneExtentTests.cs | 12 + tests/SharpMUTerm.Tui.Tests/MapColumnTests.cs | 80 +++++++ 10 files changed, 526 insertions(+), 18 deletions(-) create mode 100644 src/SharpMUTerm.Tui/SharpMUTermApp.MapColumn.cs create mode 100644 tests/SharpMUTerm.Avalonia.Tests/MapNamesTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/MapColumnTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index bb4c5fc6..10efde1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- In the desktop window, Combat's map uses its pane: rooms are drawn at full size, every room's name is written out in + full where it fits without covering another room or name (shortened only where it truly cannot fit), the map pane no + longer repeats a lone "Map" tab above its own heading, and the vitals card is only as tall as its gauges, so the map + gets the rows that used to stay empty under Movement. - In the desktop window, the map is drawn the way the mockups draw it: dark rooms outlined in a rule, exits as thin lines, your room ringed in the accent with an `@`, Up/Down/Areas as proper buttons, and the legend in a strip at the foot with "Click a room to walk there" under it, so it never covers a room. diff --git a/CLAUDE.md b/CLAUDE.md index f41fb5a5..56310b48 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -165,10 +165,14 @@ fallbacks) for inline images/maps. carries `Up`/`Down` (an up/down exit or stub, or an exit to a room on another level) and `Elsewhere` (the other area an exit leads to). The cells draw a one-line legend on the last row from 6 rows up — words go first, then names shorten, then areas are counted (`+2`); it never wraps. The window opens fitted (`MapCanvas.Fit`: the - rooms within 6 steps of the character's, up to zoom 2.4) and refits on a new model until the player zooms or pans - (`Fitted`; a double-click or another level or area fits again); it names rooms whenever a step is 40 px or more + rooms within 6 steps of the character's, up to a 90 px step, the mockup's) and refits on a new model until the player zooms or pans + (`Fitted`; a double-click or another level or area fits again); rooms are the mockup's 32 px (`RoomTarget`) wherever the + step leaves a line between boxes (`RoomSize`: at most 0.56 of a step). It names rooms whenever a step is 40 px or more (`NamesFromStep`), the current room always, plus the hovered name on a plate, stairs triangles, a halo on the - current room and a legend plate. + current room and a legend plate. **Names are laid out, not centred blindly** (`Labels`/`LayOutNames`, cached per view): + the character's room first, then nearest first, each whole (up to `NameMaxWidth`) at the first place covering no room, + no placed name and staying between the look buttons and the legend — under, over or beside with every exit clear, else + straight under/over across a line, else pulled aside — and elided only where none fits (under `NameMinWidth`: hover only). - **A speedwalk sends one step and waits for the map to say it arrived** (`Speedwalk`); it goes through `SendCommandAsync`, so the recorder sees the step. It stops off the path, on the world's `WalkFailurePattern`, after `StepTimeout` with no room, and on disconnect. @@ -1456,6 +1460,12 @@ fallbacks) for inline images/maps. (no tab strip, above), the cells draw name and numbers over a full-width bar (`VitalsStripRenderer.RenderCard`, chosen by box height ≥ 3), and at 20 px rows the window's gauges stack in it, headed. Decided from the tree on every rebuild, so a player's own layout gets it too; the terminal mockup's top strip is the narrow arrangement, not the wide one. + **Where the host draws strips (`HostChrome.Strips`, the window) the card is as tall as its gauges** + (`VitalsGaugeCardRows` = 2 a meter + 4, + 2 only while a target is named; `SharpMUTermApp.MapColumn.cs`), so the map + gets the rows; a target arriving or a meter appearing re-lays the pane area (`ResizeVitalsCard`, on the panel's game + data change, only when the rows differ). The column is beside the output, so no NAWS moves. The terminal keeps the + reserved card. **There too a pane holding the map window alone draws no tab strip** (`ApplyLoneMapPanes`, under + `HostChrome.Tabs`): the native map's heading names it. The terminal keeps its strip (the cell map's drag handle and ×). - **The status row leaves its meters out while the vitals strip shows them** (`VitalsStripShowing`: the status row's character's vitals window is the front tab of a drawn pane, zoom included). `SyncStatusMeters` repaints the row only when that flips (on a rebuild or an activation), so a notice is not displaced for nothing. The diff --git a/src/SharpMUTerm.Avalonia/MapCanvas.cs b/src/SharpMUTerm.Avalonia/MapCanvas.cs index 8cdc1167..840190a0 100644 --- a/src/SharpMUTerm.Avalonia/MapCanvas.cs +++ b/src/SharpMUTerm.Avalonia/MapCanvas.cs @@ -42,7 +42,7 @@ internal sealed class MapCanvas : Control private const double MinZoom = 0.35, MaxZoom = 3, DragThreshold = 4; /// The most the fit zooms in: past it a small area's rooms are boxes the size of buttons. - internal const double FitMaxZoom = 2.4; + internal const double FitMaxZoom = 90 / Spacing; /// How many grid steps from the character's room the fit takes in; a larger area is fitted around them. internal const int FitRadius = 6; @@ -183,11 +183,22 @@ private Point Middle } } + /// The side the mockup draws a room at (32 px, its rooms 90 px apart). + internal const double RoomTarget = 32; + /// - /// A room's side: about half the step between rooms (the mockup draws 32 px rooms 90 px apart; names under them need the room), so the exits read - /// as lines between boxes rather than boxes touching. + /// A room's side: the mockup's wherever the step leaves an exit between boxes (a little over half the + /// step at most), growing past it only once the player zooms in far, so the exits read as lines between boxes rather than + /// boxes touching. Internal for tests. /// - private double RoomSize => Math.Max(5, Spacing * Zoom * 0.48); + internal double RoomSize + { + get + { + var step = Spacing * Zoom; + return Math.Max(5, Math.Min(step * 0.56, Math.Max(step * 0.35, RoomTarget))); + } + } /// /// Fits the area to the canvas: the rooms within steps of the character's, centred in the open @@ -227,11 +238,13 @@ private void Fit() // them (the legend and the hint), so neither ever covers a room of the fitted view. var top = TopReserve(); var bottom = BottomReserve(Bounds.Size); - var across = Math.Max(1, open - 24) / ((maxX - minX + 1.6) * Spacing); - var down = Math.Max(1, Bounds.Height - top - bottom) / ((maxY - minY + 1.6) * Spacing); + // Down, the span of rows plus a room (up to 0.56 of a step) and a name under the lowest; across, the span plus a + // room and room for the outer names (labels.Fit keeps any name that would leave the canvas inside it). + var across = Math.Max(1, open - 24) / ((maxX - minX + 1.3) * Spacing); + var down = Math.Max(1, Bounds.Height - top - bottom - NameRow) / ((maxY - minY + 0.6) * Spacing); _zoom = Math.Clamp(Math.Min(across, down), MinZoom, FitMaxZoom); var step = Spacing * _zoom; - _fit = new Vector(-(minX + maxX) / 2.0 * step, ((top - bottom) / 2) - ((minY + maxY) / 2.0 * step)); + _fit = new Vector(-(minX + maxX) / 2.0 * step, ((top - bottom - NameRow) / 2) - ((minY + maxY) / 2.0 * step)); } /// The player took the view: the fit stops following, and stays where it was. @@ -726,7 +739,6 @@ public override void Render(DrawingContext context) var accent = Parse(_ink.Bar); var path = Parse(_ink.Low); var radius = size * 0.19; - var names = NamesShown; var edge = new Pen(new SolidColorBrush(rule), Math.Clamp(size / 22, 1, 1.5)); foreach (var room in _model.Rooms) { @@ -789,9 +801,15 @@ public override void Render(DrawingContext context) context.DrawRectangle(null, ring, rect.Inflate(size * 0.3), radius * 2, radius * 2); } - if ((names || room.Current) && room.Id != _hovered) + } + + // Names after every room, where the layout found them a place that covers no room and no other name. + foreach (var label in Labels(bounds)) + { + if (label.Room != _hovered) { - DrawName(context, room.Name, c, size, plate: false); + context.DrawRectangle(new SolidColorBrush(_plane), null, label.Rect.Inflate(new Thickness(NativeTokens.Space2, 0)), 2, 2); + context.DrawText(label.Text, label.Rect.TopLeft); } } @@ -893,6 +911,192 @@ private static StreamGeometry Triangle(Point a, Point b, Point c) return geometry; } + // ── Names: wider than the room, placed so that no two collide ────────────────────────────────── + + /// A room's name where the layout put it: the room, the box it takes, the words as drawn (elided only when cut). + internal sealed record PlacedName(long Room, Rect Rect, FormattedText Text, bool Elided); + + /// The height a name row takes under a room, its gap included: what the fit leaves under the lowest row. + private const double NameRow = NativeTokens.Space4 + 15; + + /// The widest a name is drawn before it is elided even with the room for it. + internal const double NameMaxWidth = 168; + + /// The narrowest an elided name is drawn: below it the name is left to the hover. + private const double NameMinWidth = 34; + + private (MapViewModel Model, double Zoom, Vector Offset, Size Size, Color Plane, Color Text)? _labelsFor; + private List _labels = []; + + /// + /// Where each room's name is drawn at the view shown. The character's room is placed first, then the others nearest it + /// first. A name goes where it covers no room and no name already placed, on the canvas: under its room, over it or + /// beside it with every exit line clear; else straight under or over it across a line; else pulled to one side, clear + /// of lines if it can be, else crossing fewest. Only a name that fits nowhere is elided, to the room + /// under or over its room; one that has not even then is left to the hover's plate. Below + /// only the character's room is named. Internal for tests. + /// + internal IReadOnlyList Labels(Rect bounds) + { + Fit(); + var key = (_model, _zoom, _fit + _pan, bounds.Size, _plane, _text); + if (_labelsFor is { } was && ReferenceEquals(was.Model, key._model) && was.Zoom == key._zoom && was.Offset == key.Item3 + && was.Size == key.Size && was.Plane == key._plane && was.Text == key._text) + { + return _labels; + } + + _labelsFor = (key._model, key._zoom, key.Item3, key.Size, key._plane, key._text); + _labels = LayOutNames(bounds); + return _labels; + } + + private List LayOutNames(Rect bounds) + { + var placed = new List(); + if (_model.Rooms.Count == 0) + { + return placed; + } + + var size = RoomSize; + // Between what is drawn above the rooms (the heading and the look buttons) and below them (the legend and the hint). + var top = TopReserve() - NativeTokens.Space4; + var bottom = bounds.Height - BottomReserve(bounds.Size) + NativeTokens.Space8; + var area = new Rect(bounds.X + 2, bounds.Y + top, Math.Max(0, bounds.Width - 4), Math.Max(0, bottom - top)); + var visible = _model.Rooms + .Select(r => (Room: r, Centre: CentreOf(r))) + .Where(r => bounds.Inflate(size).Contains(r.Centre)) + .ToList(); + var boxes = visible.Select(r => new Rect(r.Centre.X - (size / 2) - 2, r.Centre.Y - (size / 2) - 2, size + 4, size + 4)).ToList(); + var byId = visible.ToDictionary(r => r.Room.Id, r => r.Centre); + var lines = _model.Exits + .Where(e => byId.ContainsKey(e.From) && byId.ContainsKey(e.To)) + .Select(e => (byId[e.From], byId[e.To])) + .ToList(); + + var anchor = _model.Current ?? _model.Rooms[0]; + var order = visible + .Where(r => NamesShown || r.Room.Current) + .OrderBy(r => r.Room.Current ? 0 : 1) + .ThenBy(r => Math.Abs(r.Room.X - anchor.X) + Math.Abs(r.Room.Y - anchor.Y)) + .ThenBy(r => r.Room.Y) + .ThenBy(r => r.Room.X); + foreach (var (room, c) in order) + { + var full = PanelText.Format(room.Name, NativeTokens.Small, DimInk, bold: false, NameMaxWidth); + var w = full.Width; + var h = full.Height; + bool Free(Rect r, bool exits) => + area.Contains(r) + && !boxes.Any(b => b.Intersects(r)) + && !placed.Any(p => p.Rect.Inflate(new Thickness(NativeTokens.Space4, NativeTokens.Space2)).Intersects(r)) + && (!exits || !lines.Any(l => Crosses(l.Item1, l.Item2, r))); + + var below = c.Y + (size / 2) + NativeTokens.Space4; + var above = c.Y - (size / 2) - NativeTokens.Space4 - h; + var middle = c.Y - (h / 2); + Rect[] Places(double width) => + [ + new(c.X - (width / 2), below, width, h), + new(c.X - (width / 2), above, width, h), + new(c.X + (size / 2) + 6, middle, width, h), + new(c.X - (size / 2) - 6 - width, middle, width, h), + new(c.X - (size / 2), below, width, h), + new(c.X + (size / 2) - width, below, width, h), + new(c.X - (size / 2), above, width, h), + new(c.X + (size / 2) - width, above, width, h), + + // Clear of a line straight down or up out of the room: just to one side of its middle. + new(c.X + NativeTokens.Space4, below, width, h), + new(c.X - NativeTokens.Space4 - width, below, width, h), + new(c.X + NativeTokens.Space4, above, width, h), + new(c.X - NativeTokens.Space4 - width, above, width, h), + ]; + + var places = Places(w).Select(r => Inside(r, area)).ToArray(); + // Under, over or beside the room with every line clear; else straight under or over it across a line (its plate + // breaks the line, and the name still reads as the room's); only then pulled to one side. + var spot = places.Take(4).Cast().FirstOrDefault(r => Free(r!.Value, exits: true)) + ?? places.Take(2).Cast().FirstOrDefault(r => Free(r!.Value, exits: false)) + ?? places.Skip(4).Cast().FirstOrDefault(r => Free(r!.Value, exits: true)) + ?? places.Where(r => Free(r, exits: false)) + .Select(r => (Rect?)r) + .OrderBy(r => lines.Count(l => Crosses(l.Item1, l.Item2, r!.Value))) + .FirstOrDefault(); + if (spot is { } found) + { + placed.Add(new PlacedName(room.Id, Snap(found), full, Elided: false)); + continue; + } + + // Nowhere whole: the widest elision that fits under or over the room, centred on it. + for (var width = Math.Floor(w) - 6; width >= NameMinWidth; width -= 6) + { + var cut = PanelText.Format(room.Name, NativeTokens.Small, DimInk, bold: false, width); + var fits = new[] { new Rect(c.X - (cut.Width / 2), below, cut.Width, h), new Rect(c.X - (cut.Width / 2), above, cut.Width, h) } + .Select(r => Inside(r, area)) + .Cast() + .FirstOrDefault(r => Free(r!.Value, exits: false)); + if (fits is { } at) + { + placed.Add(new PlacedName(room.Id, Snap(at), cut, Elided: true)); + break; + } + } + } + + return placed; + } + + /// moved the least distance that puts it inside across (rows stay). + private static Rect Inside(Rect r, Rect area) + { + var x = Math.Min(Math.Max(r.X, area.X), Math.Max(area.X, area.Right - r.Width)); + return new Rect(x, r.Y, r.Width, r.Height); + } + + private static Rect Snap(Rect r) => new(Math.Round(r.X), Math.Round(r.Y), r.Width, r.Height); + + /// Whether the segment from to passes through (Liang–Barsky). + internal static bool Crosses(Point a, Point b, Rect r) + { + double t0 = 0, t1 = 1; + var dx = b.X - a.X; + var dy = b.Y - a.Y; + bool Clip(double p, double q) + { + if (Math.Abs(p) < 1e-9) + { + return q >= 0; + } + + var t = q / p; + if (p < 0) + { + if (t > t1) + { + return false; + } + + t0 = Math.Max(t0, t); + } + else + { + if (t < t0) + { + return false; + } + + t1 = Math.Min(t1, t); + } + + return true; + } + + return Clip(-dx, a.X - r.Left) && Clip(dx, r.Right - a.X) && Clip(-dy, a.Y - r.Top) && Clip(dy, r.Bottom - a.Y) && t0 <= t1; + } + /// A room's name centred under it; on a plate of the pane's own colour when . private void DrawName(DrawingContext context, string name, Point centre, double size, bool plate) { diff --git a/src/SharpMUTerm.Core/Layouts/PanelSizing.cs b/src/SharpMUTerm.Core/Layouts/PanelSizing.cs index 4279905b..c9155d6d 100644 --- a/src/SharpMUTerm.Core/Layouts/PanelSizing.cs +++ b/src/SharpMUTerm.Core/Layouts/PanelSizing.cs @@ -29,6 +29,14 @@ public static class PanelSizing /// public static int VitalsCardRows(int meters) => (2 * Math.Max(0, meters)) + 6; + /// + /// The rows a vitals card takes where the host draws it as stacked gauges (HostChrome.Strips, the window): the + /// heading, two twenty-pixel rows a meter, and the target's two only while the game names one, so the card is as tall + /// as what it shows and the map under it has the rest. A target arriving re-lays the side column there, which costs + /// no output cell (the column is beside the output) and so no NAWS. + /// + public static int VitalsGaugeCardRows(int meters, bool target) => (2 * Math.Max(0, meters)) + (target ? 6 : 4); + /// /// The rows a quick bar takes where the host draws it as a strip of buttons (HostChrome.Strips, the window): /// three twenty-pixel rows hold the mockups' 34-pixel buttons with their padding. Everywhere else it is one row. @@ -116,7 +124,13 @@ public static void Apply(PaneNode pane, Func panelOf, int tabSt /// meters the character behind a vitals window has, by window id. /// /// The rows a quick bar takes (see ). - public static void ApplyAll(LayoutNode root, Func panelOf, int tabStripRows, Func vitalsMetersOf, int quickBarRows = 1) + /// + /// The rows a vitals card takes, by window id, where the host says (); null for + /// of . + /// + public static void ApplyAll( + LayoutNode root, Func panelOf, int tabStripRows, Func vitalsMetersOf, int quickBarRows = 1, + Func? cardRowsOf = null) { ArgumentNullException.ThrowIfNull(root); ArgumentNullException.ThrowIfNull(vitalsMetersOf); @@ -126,7 +140,7 @@ public static void ApplyAll(LayoutNode root, Func panelOf, int if (share < CardBelowWidthShare && pane.Tabs.FirstOrDefault(t => string.Equals(panelOf(t), PanelIds.Vitals, StringComparison.Ordinal)) is { } vitals) { - card = VitalsCardRows(vitalsMetersOf(vitals)); + card = cardRowsOf is not null ? cardRowsOf(vitals) : VitalsCardRows(vitalsMetersOf(vitals)); } Apply(pane, panelOf, tabStripRows, card, quickBarRows); diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.MapColumn.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.MapColumn.cs new file mode 100644 index 00000000..7ffa644e --- /dev/null +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.MapColumn.cs @@ -0,0 +1,84 @@ +using SharpMUTerm.Core.Layouts; +using SharpMUTerm.Core.Workspaces; + +namespace SharpMUTerm.Tui; + +/// +/// The side column a desktop host draws natively (, ): a vitals +/// card as tall as its gauges, and a map pane with no tab strip, so the map has the rows the window would otherwise leave +/// blank. Rows only; the pane rectangles, and so NAWS, are what is arranged. The terminal keeps the cell rules. +/// +internal sealed partial class SharpMUTermApp +{ + /// The card rows each vitals window was last laid out with, where the host draws gauges; see . + private readonly Dictionary _vitalsCardRows = new(StringComparer.Ordinal); + + /// The rows a pane claims (), as the last rebuild derived them. Internal for tests. + internal int? PaneFixedRows(string paneId) => _workspace.Layout.FindPane(paneId)?.FixedRows; + + /// The card rows a vitals window takes where the host draws gauges: its meters, and the target only while there is one. + private int VitalsGaugeRowsOfWindow(string windowId) + { + var vitals = TerminalPanels.TryParseWindowId(windowId, out _, out var sessionKey) ? ReadVitals(sessionKey) : null; + var meters = vitals is { } shown ? shown.Meters.Count : VitalsMetersOfWindow(windowId); + var rows = PanelSizing.VitalsGaugeCardRows(meters, vitals?.Target is not null); + _vitalsCardRows[windowId] = rows; + return rows; + } + + /// + /// 's card rule for this host: the gauges' height where the host draws strips, else + /// null for the cell card (whose target rows are held whether or not there is one). + /// + private Func? VitalsCardRowsRule() + { + if (!Host.Chrome.Strips) + { + return null; + } + + _vitalsCardRows.Clear(); + return VitalsGaugeRowsOfWindow; + } + + /// + /// Re-lays the pane area when a vitals card's gauges came to need other rows (a meter or the target arriving or going). + /// Only where the host draws gauges, and only for a card sized. + /// + private void ResizeVitalsCard(string windowId) + { + if (!Host.Chrome.Strips || !_vitalsCardRows.TryGetValue(windowId, out var applied)) + { + return; + } + + var vitals = TerminalPanels.TryParseWindowId(windowId, out _, out var sessionKey) ? ReadVitals(sessionKey) : null; + var meters = vitals is { } shown ? shown.Meters.Count : VitalsMetersOfWindow(windowId); + if (PanelSizing.VitalsGaugeCardRows(meters, vitals?.Target is not null) != applied) + { + RebuildPaneArea(); + } + } + + /// + /// After : where the host draws the tab strips, a pane holding the map window and + /// nothing else draws none, as a lone panel does — the map's own heading names it (Map, the area and the level), and the + /// two rows go to the rooms. The terminal keeps its strip: there it is the cell map's drag handle and its ×. + /// + private void ApplyLoneMapPanes() + { + if (!Host.Chrome.Tabs) + { + return; + } + + foreach (var pane in _workspace.Layout.Root.Panes()) + { + if (pane.Tabs.Count == 1 && IsMapWindow(pane.Tabs[0]) && pane.FixedRows is null) + { + pane.DrawsHeader = false; + pane.MinRows = null; + } + } + } +} diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs index e4cd53dd..1e4e3253 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs @@ -192,8 +192,16 @@ private IWindowControl NewVitalsPanel(TerminalPanelContext context) if (context.Session is { } session) { - session.GameData.Changed += (_, _) => OnUiThread(view.Refresh); - session.MxpMetersChanged += (_, _) => OnUiThread(view.Refresh); + session.GameData.Changed += (_, _) => OnUiThread(() => + { + view.Refresh(); + ResizeVitalsCard(context.WindowId); + }); + session.MxpMetersChanged += (_, _) => OnUiThread(() => + { + view.Refresh(); + ResizeVitalsCard(context.WindowId); + }); } return view.Control; diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index b9ac9c57..fbc4c600 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -10976,8 +10976,10 @@ private IWindowControl BuildWorkspaceRow() // A vitals pane in a side column is a card, its height from the character's meters. Core.Layouts.PanelSizing.ApplyAll( _workspace.Layout.Root, PanelIdOfWindow, TabStripRows, VitalsMetersOfWindow, - Host.Chrome.Strips ? Core.Layouts.PanelSizing.QuickBarStripRows : 1); + Host.Chrome.Strips ? Core.Layouts.PanelSizing.QuickBarStripRows : 1, + VitalsCardRowsRule()); ApplyCollapsedBars(); + ApplyLoneMapPanes(); // When a pane is zoomed, render just that pane full-area; otherwise render the whole tree. var zoomed = _workspace.Layout.ZoomedPaneId is { } zid ? _workspace.Layout.FindPane(zid) : null; diff --git a/tests/SharpMUTerm.Avalonia.Tests/MapNamesTests.cs b/tests/SharpMUTerm.Avalonia.Tests/MapNamesTests.cs new file mode 100644 index 00000000..093a83f7 --- /dev/null +++ b/tests/SharpMUTerm.Avalonia.Tests/MapNamesTests.cs @@ -0,0 +1,90 @@ +using Avalonia; +using SharpMUTerm.Client.Panels; +using SharpMUTerm.Core.Layouts; +using SharpMUTerm.Core.Workspaces; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Avalonia.Tests; + +/// +/// The native map uses its pane: rooms toward the mockup's 32 px, names wider than their rooms placed where they cover no +/// room and no other name, and elided only where they would. +/// +public class MapNamesTests +{ + private static MapViewModel Plaza() => new( + "Town", + 0, + [ + new MapViewRoom(1, "The Grand Plaza", 0, 0, Current: true, Ahead: false, Locked: false), + new MapViewRoom(2, "Temple of the Tide", 0, -1, Current: false, Ahead: false, Locked: false), + new MapViewRoom(3, "Market Row", 1, 0, Current: false, Ahead: false, Locked: false), + new MapViewRoom(4, "Guildhall", -1, 0, Current: false, Ahead: false, Locked: false), + new MapViewRoom(5, "Lantern Street", 0, 1, Current: false, Ahead: false, Locked: false), + new MapViewRoom(6, "Spice Stall", 2, 0, Current: false, Ahead: false, Locked: false), + ], + [new MapViewExit(1, 2), new MapViewExit(1, 3), new MapViewExit(1, 4), new MapViewExit(1, 5), new MapViewExit(3, 6)], + null) + { + AnchorId = 1, + }; + + private static Task<(double Room, IReadOnlyList Names, List Rooms)> Fit(MapViewModel model, int columns, int rows) => + DesktopLayerTests.Run((window, view, layer, driver) => + { + ((IPointerPresenter)driver.Pointer).Panels( + [new PanelOverlay(PanelIds.Map, "map:demo", new PaneRect(0, 0, columns, rows), new PanelInk("#33ccff", "#ffaa33", "#555555"), null, model, _ => { })]); + DesktopLayerTests.Drain(); + window.UpdateLayout(); + var canvas = layer.Maps.Values.Single(); + var size = canvas.RoomSize; + var rooms = canvas.Model.Rooms.Select(r => canvas.CentreOf(r)).Select(c => new Rect(c.X - (size / 2), c.Y - (size / 2), size, size)).ToList(); + return (size, canvas.Labels(new Rect(canvas.Bounds.Size)), rooms); + }, columns: columns, rows: rows); + + [Test] + public async Task APaneWithRoomDrawsTheMockupsRoomsAndEveryNameWholeWithNoTwoTouching() + { + var (room, names, rooms) = await Fit(Plaza(), 60, 30); + + await Assert.That(room).IsEqualTo(MapCanvas.RoomTarget).Because("a pane this size fits the rooms at the mockup's size"); + await Assert.That(names.Count).IsEqualTo(6); + await Assert.That(names.Any(n => n.Elided)).IsFalse(); + await Assert.That(names.Any(n => n.Rect.Width > room)).IsTrue().Because("a name is drawn wider than its room"); + for (var i = 0; i < names.Count; i++) + { + await Assert.That(rooms.Any(r => r.Intersects(names[i].Rect))).IsFalse(); + for (var j = i + 1; j < names.Count; j++) + { + await Assert.That(names[i].Rect.Intersects(names[j].Rect)).IsFalse(); + } + } + } + + [Test] + public async Task ACrampedPaneStillLetsNoNameCoverAnother() + { + var (_, names, rooms) = await Fit(Plaza(), 26, 14); + + for (var i = 0; i < names.Count; i++) + { + await Assert.That(rooms.Any(r => r.Intersects(names[i].Rect))).IsFalse(); + for (var j = i + 1; j < names.Count; j++) + { + await Assert.That(names[i].Rect.Intersects(names[j].Rect)).IsFalse(); + } + } + + await Assert.That(names.Any(n => n.Room == 1)).IsTrue().Because("the character's room is named first"); + } + + [Test] + public async Task ASegmentCrossesOnlyTheRectanglesItPassesThrough() + { + var box = new Rect(10, 10, 10, 10); + await Assert.That(MapCanvas.Crosses(new Point(0, 15), new Point(30, 15), box)).IsTrue(); + await Assert.That(MapCanvas.Crosses(new Point(0, 0), new Point(30, 0), box)).IsFalse(); + await Assert.That(MapCanvas.Crosses(new Point(0, 0), new Point(30, 30), box)).IsTrue(); + await Assert.That(MapCanvas.Crosses(new Point(0, 30), new Point(5, 25), box)).IsFalse(); + } +} diff --git a/tests/SharpMUTerm.Core.Tests/Workspace/PaneExtentTests.cs b/tests/SharpMUTerm.Core.Tests/Workspace/PaneExtentTests.cs index f7590ec9..39032f4f 100644 --- a/tests/SharpMUTerm.Core.Tests/Workspace/PaneExtentTests.cs +++ b/tests/SharpMUTerm.Core.Tests/Workspace/PaneExtentTests.cs @@ -290,6 +290,18 @@ public async Task AVitalsCardHoldsTwoRowsAMeterAndTheTargetsRowsWhetherOrNotTher await Assert.That(PanelSizing.VitalsCardRows(0)).IsEqualTo(6); } + [Test] + public async Task AGaugeCardHoldsTheTargetsRowsOnlyWhileThereIsOneAndTheHostsRuleSizesTheCard() + { + await Assert.That(PanelSizing.VitalsGaugeCardRows(3, target: false)).IsEqualTo(10); + await Assert.That(PanelSizing.VitalsGaugeCardRows(3, target: true)).IsEqualTo(12); + + var side = new PaneNode("side", ["panel:vitals:W.C"]); + var root = new SplitNode(SplitDirection.Row, [new PaneNode("output", ["main"]), side], [0.7, 0.3]); + PanelSizing.ApplyAll(root, PanelOf, tabStripRows: 1, _ => 3, cardRowsOf: _ => 9); + await Assert.That(side.FixedRows).IsEqualTo(9); + } + [Test] public async Task AStripHandedAnOrdinaryWindowStopsBeingAStrip() { diff --git a/tests/SharpMUTerm.Tui.Tests/MapColumnTests.cs b/tests/SharpMUTerm.Tui.Tests/MapColumnTests.cs new file mode 100644 index 00000000..20e35903 --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/MapColumnTests.cs @@ -0,0 +1,80 @@ +using SharpConsoleUI.Drivers; +using SharpMUTerm.Core.Layouts; +using SharpMUTerm.Graphics; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// Combat's side column where the host draws it natively (): the vitals card is as tall as +/// its gauges and grows only when a target arrives, and the map's pane draws no tab strip. The terminal keeps its rules. +/// +/// Serialised: rendering redirects the process-global Console.Out. +[NotInParallel] +public class MapColumnTests +{ + private static readonly TerminalCapabilities Caps = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private static SharpMUTermApp Demo(HostChrome chrome) + { + Console.SetIn(TextReader.Null); + var config = DemoScene.Build(); + config.ScrollbackSpill.Enabled = false; + return new SharpMUTermApp(config, ClientHost.Headless(new HeadlessConsoleDriver(120, 36), Caps) with { Chrome = chrome }); + } + + [Test] + public async Task TheWindowsMapPaneDrawsNoTabStripAndItsVitalsCardIsAsTallAsItsGauges() + { + await using var app = Demo(HostChrome.Desktop); + app.RenderSnapshot("layout-combat"); + + var whole = app.PaneSnapshot().Rects; + var output = app.PaneOutputRects(); + await Assert.That(output["panel:map"].Height).IsEqualTo(whole["panel:map"].Height).Because("no tab strip over the map: its heading names it"); + await Assert.That(whole["panel:vitals"].Height).IsEqualTo(PanelSizing.VitalsGaugeCardRows(3, target: false)); + await Assert.That(whole["panel:map"].Y).IsEqualTo(whole["panel:vitals"].Y + whole["panel:vitals"].Height); + } + + [Test] + public async Task TheTerminalKeepsTheMapsTabStripAndTheReservedCard() + { + await using var app = Demo(HostChrome.None); + app.RenderSnapshot("layout-combat"); + + var whole = app.PaneSnapshot().Rects; + var output = app.PaneOutputRects(); + await Assert.That(output["panel:map"].Height).IsLessThan(whole["panel:map"].Height); + await Assert.That(whole["panel:vitals"].Height).IsEqualTo(PanelSizing.VitalsCardRows(3)); + } + + [Test] + public async Task ATargetArrivingGrowsTheWindowsCardByItsRows() + { + Console.SetIn(TextReader.Null); + var config = DemoScene.Build(); + config.ScrollbackSpill.Enabled = false; + config.LastSession = null; + config.Worlds[0].Layout = BuiltInLayouts.CombatId; + var time = new ManualTimeProvider(); + await using var app = new SharpMUTermApp( + config, ClientHost.Headless(new HeadlessConsoleDriver(120, 36), Caps) with { Chrome = HostChrome.Desktop }, time, autoLayout: true); + var session = app.BindWorldWithoutConnecting(config.Worlds[0]); + session.GameData.SetGmcp("Char.Vitals", """{"hp":"412","maxhp":"500","mp":"23","maxmp":"120"}"""); + time.Advance(SharpMUTermApp.LayoutRefoldDelay); + app.RenderNextFrame(); + + var meters = app.ReadVitals(session.SessionKey)!.Meters.Count; + int? Card() => app.PaneFixedRows("panel:vitals"); + await Assert.That(Card()).IsEqualTo(PanelSizing.VitalsGaugeCardRows(meters, target: false)); + + session.GameData.SetGmcp("Char.Status", """{"enemy":"a rotting ghoul","enemypct":"40"}"""); + app.RenderNextFrame(); + await Assert.That(Card()).IsEqualTo(PanelSizing.VitalsGaugeCardRows(meters, target: true)); + + var rebuilds = app.PaneAreaRebuilds; + session.GameData.SetGmcp("Char.Status", """{"enemy":"a rotting ghoul","enemypct":"30"}"""); + await Assert.That(app.PaneAreaRebuilds).IsEqualTo(rebuilds).Because("the same rows: no reflow"); + } +} From 2f4b6781aedbacc004936b29c040b89632a9fb3f Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 20:51:26 +0000 Subject: [PATCH 082/113] Wave 23 C: the terminal's cells toward the terminal mockups Docked panel headings (HERE, COMPOSE, VITALS) are a filled band (HeadingBand, WorkspacePalette.HeadingBand/HeadingInk, held to 4.5:1); the scrolled-back divider is filled with the same band; modal frames are grey on Dark; the header's character sits on the band in the world's colour with no chip; the vitals card draws its rule only above a target; the welcome's /connect example is in the accent. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 5 ++ CLAUDE.md | 11 ++++- src/SharpMUTerm.Tui/Panels/DockedComposer.cs | 22 ++++++++- src/SharpMUTerm.Tui/Panels/HeadingBand.cs | 48 +++++++++++++++++++ .../Panels/VitalsStripRenderer.cs | 13 +++-- src/SharpMUTerm.Tui/Panels/WhoHereRenderer.cs | 11 +++-- src/SharpMUTerm.Tui/ScreenTheme.cs | 9 +++- src/SharpMUTerm.Tui/ScrollSplitBarRenderer.cs | 15 ++++-- src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs | 6 +-- .../SharpMUTermApp.ScrollSplit.cs | 2 +- src/SharpMUTerm.Tui/SharpMUTermApp.cs | 27 +++++------ src/SharpMUTerm.Tui/WelcomeSurface.cs | 2 +- src/SharpMUTerm.Tui/WorkspacePalette.cs | 33 ++++++------- 13 files changed, 152 insertions(+), 52 deletions(-) create mode 100644 src/SharpMUTerm.Tui/Panels/HeadingBand.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index bb4c5fc6..36738bce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,11 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- In the terminal, the who-is-here, composer and vitals panels head themselves with a filled band, the scrolled-back + divider is a filled band too, modal pop-ups have a quiet grey frame instead of a cyan one, the header shows your + character in the world's colour without a grey chip, the vitals card no longer draws a stray rule when nothing is + targeted, and the welcome's `/connect` example is highlighted — closer to the terminal mockups. + - In the desktop window, the map is drawn the way the mockups draw it: dark rooms outlined in a rule, exits as thin lines, your room ringed in the accent with an `@`, Up/Down/Areas as proper buttons, and the legend in a strip at the foot with "Click a room to walk there" under it, so it never covers a room. diff --git a/CLAUDE.md b/CLAUDE.md index f41fb5a5..5d10b140 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -1101,7 +1101,8 @@ fallbacks) for inline images/maps. that happens to be `#00f5b7`); a foreground that is no role (a world's accent) is held to the floor on the plane it lands on, except on Dark, which stays as it was. - A bordered modal's title, border and unstyled text are the framework's cyan and `#eeeeee`, 1.4:1 on a - light backdrop; `ScreenTheme.Frame` recolours them off Dark. **The workspace popups follow it too** (⌃P, quit, ⌃B panel, + light backdrop; `ScreenTheme.Frame` recolours them off Dark, and on Dark gives the border and title the label/value + inks (the terminal mockups' grey frame, wave 23) while the text stays the framework's. **The workspace popups follow it too** (⌃P, quit, ⌃B panel, search, game data, message log, history): each has a `Scheme` the app sets in `SchemePopups()` (on `ApplyTheme`), paints its plane with `Scheme.Colour(MenuBg)`, its lines with `Scheme.Lines` and its frame with `Scheme.Frame`; ⌃P's prompt well takes `EditBg` off Dark. Dark is byte for byte unchanged. @@ -1577,6 +1578,14 @@ fallbacks) for inline images/maps. `CollapsedBarRows` (1 under `Input`, else 2), no tab strip, its windows marked scrolled back so the unread reads `N new`. A click, or `Activate` of a window in it, is `ExpandCollapsedBar` (for the run; an explicit apply clears it). `DesktopLayer.BelowGrid` stretches a native view at the foot of a column over the field reserve where the band does not reach. +- **Wave 23 terminal (cells only; the window's native views are unchanged).** A docked panel's heading is a band + across the panel (`HeadingBand.Row`, Tui `Panels/`; `WorkspacePalette.HeadingBand` = the rule leaned 0.2 toward + `Theme.Prompt`, `HeadingInk` and the accent held to 4.5:1 on it): `HERE`, `COMPOSE` (the armed `▌` in the band's first + cell) and the vitals card's `VITALS`. The renderers take the band as an optional `Ink` member, so a renderer test with + none still gets the bare accent label. The scrolled-back band is filled with the same band (`ScrollSplitBarRenderer.Bar(…, + fill)`): it divides two viewports rather than sitting in a buffer, unlike the freeze/away/NEW bars, which stay rules. + The header's character is ` ● Corvid` in the world's colour on the band, no chip (`HeaderChip` is gone). The vitals + card draws its rule only above a target. The welcome's `/connect` example is in the accent. - **Wave 19 panels and welcome (window only; the cells are unchanged).** Each docked native panel draws a heading from its model (`PanelHeading.For`, Client; `PanelText.Heading`); `VitalsModel.Source` names where the meters came from (`SourceOf`, set in `ReadVitals`), a mixture names nothing. The docked composer's footer (summary, Preview, Send) ends diff --git a/src/SharpMUTerm.Tui/Panels/DockedComposer.cs b/src/SharpMUTerm.Tui/Panels/DockedComposer.cs index 2f88386a..c56f65d6 100644 --- a/src/SharpMUTerm.Tui/Panels/DockedComposer.cs +++ b/src/SharpMUTerm.Tui/Panels/DockedComposer.cs @@ -42,6 +42,7 @@ internal sealed class DockedComposer private readonly MarkupControl _header; private readonly MarkupControl _footer; private readonly string _accent; + private readonly HeadingBand.Ink? _heading; private readonly Func _describe; private bool _armed; private bool _quiet; @@ -50,11 +51,13 @@ internal sealed class DockedComposer /// /// The model for this composer's state, which the host also records as drawn and hands a native editor. /// - internal DockedComposer(string windowId, string sessionKey, ScreenTheme scheme, string accent, Func describe) + /// The heading's band (); null draws the bare accent label. + internal DockedComposer(string windowId, string sessionKey, ScreenTheme scheme, string accent, Func describe, HeadingBand.Ink? heading = null) { WindowId = windowId; SessionKey = sessionKey; _accent = accent; + _heading = heading; _describe = describe; Editor = new MultilineEditControl { @@ -317,6 +320,17 @@ internal void Redraw() internal void Render(ComposerModel model) { var verb = model.HeadingVerb; + if (_heading is { } band) + { + var bandMode = model.Escaping == ComposeEscaping.Literal ? $"[{band.Accent}]literal[/]" : "as typed"; + var rest = (verb.Length > 0 ? $" {Escape(verb)}" : string.Empty) + $" {bandMode}"; + var lead = model.Armed ? $"[{band.Accent}]▌[/]" : null; + var chars = ComposerModel.CharactersLabel(model.Characters); + _header.SetContent(new List { HeadingBand.Row("COMPOSE", rest, chars, _width > 0 ? _width : VisibleLength(rest) + 9, band, lead) }); + RenderFooter(model); + return; + } + var mode = model.Escaping == ComposeEscaping.Literal ? $"[{_accent}]literal[/]" : "[dim]as typed[/]"; var marker = model.Armed ? $"[{_accent}]▌[/]" : " "; var title = $"{marker}[bold {_accent}]COMPOSE[/]" + (verb.Length > 0 ? $" {Escape(verb)}" : string.Empty) + $" {mode}"; @@ -331,6 +345,12 @@ internal void Render(ComposerModel model) : ElideVisible(title, _width), }); + RenderFooter(model); + } + + /// The key row under the editor, in the long form or the short one when the pane is too narrow for it. + private void RenderFooter(ComposerModel model) + { var footer = KeyRow(model.Keys, shortForm: false); if (_width > 0 && VisibleLength(footer) > _width) { diff --git a/src/SharpMUTerm.Tui/Panels/HeadingBand.cs b/src/SharpMUTerm.Tui/Panels/HeadingBand.cs new file mode 100644 index 00000000..95c02d7a --- /dev/null +++ b/src/SharpMUTerm.Tui/Panels/HeadingBand.cs @@ -0,0 +1,48 @@ +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Text; +using SharpMUTerm.Core.Theming; +using static SharpMUTerm.Tui.MarkupText; + +namespace SharpMUTerm.Tui.Panels; + +/// +/// A docked panel's heading as the terminal mockups draw it: one row on a band the panel's whole width — +/// HERE The Grand Plaza · 4 — the label bold, everything in the band's own ink, a cell of margin at each end. +/// The band costs no row: it is the row the heading always took. Text on it is the band's ink or its accent, both held +/// to on it, because a heading's muted words would be a third ink measured +/// against nothing. +/// +internal static class HeadingBand +{ + /// The band and its two inks, as markup colours. + internal readonly record struct Ink(string Band, string Text, string Accent); + + /// The band and inks for , the accent held to the heading floor on the band. + internal static Ink For(Theme theme, string accent) + { + var band = WorkspacePalette.HeadingBand(theme); + return new Ink( + band.ToHex(), + WorkspacePalette.HeadingInk(theme).ToHex(), + Contrast.Legible(RgbJsonConverter.Parse(accent), band, WorkspacePalette.HeadingFloor).ToHex()); + } + + /// + /// The heading row for a panel cells wide: bold, then + /// (markup in the band's inks), and at the far end when both fit; + /// the right part goes first, then the rest is elided. Never wider than . The first cell is + /// the band's margin, or (one cell of markup: the docked composer's armed ▌) in it. + /// + internal static string Row(string label, string rest, string right, int width, Ink ink, string? lead = null) + { + width = Math.Max(1, width); + var left = $"[bold]{label}[/]{rest}"; + var inner = Math.Max(1, width - 2); + var body = right.Length > 0 && VisibleLength(left) + VisibleLength(right) + 2 <= inner + ? SpreadLR(left, right, inner) + : PadVisible(ElideVisible(left, inner), inner); + return width < 3 + ? $"[{ink.Text} on {ink.Band}]{ElideVisible(left, width)}[/]" + : $"[{ink.Text} on {ink.Band}]{lead ?? " "}{body} [/]"; + } +} diff --git a/src/SharpMUTerm.Tui/Panels/VitalsStripRenderer.cs b/src/SharpMUTerm.Tui/Panels/VitalsStripRenderer.cs index 36625711..feffb890 100644 --- a/src/SharpMUTerm.Tui/Panels/VitalsStripRenderer.cs +++ b/src/SharpMUTerm.Tui/Panels/VitalsStripRenderer.cs @@ -23,8 +23,8 @@ internal static class VitalsStripRenderer /// The meter's mark when it is below . internal const string LowMark = "low"; - /// The panel's colours: the bars, the warning, and the empty part of a bar. - internal readonly record struct Ink(string Bar, string Low, string Empty); + /// The panel's colours: the bars, the warning, the empty part of a bar, and the card heading's band. + internal readonly record struct Ink(string Bar, string Low, string Empty, HeadingBand.Ink? Heading = null); /// The one-cell low mark the tighter levels use in place of . internal const string ShortLowMark = "!"; @@ -100,8 +100,10 @@ internal static IReadOnlyList RenderCard(VitalsModel vitals, int width, // window's heading says it — when there is a row for it beside the blocks. if (height >= (2 * blocks) + 5) { - var source = vitals.Source is { } from ? " [dim]" + Escape(Fit(from, Math.Max(1, width - 8))) + "[/]" : string.Empty; - lines.Add($"[bold {ink.Bar}]VITALS[/]{source}"); + var from = vitals.Source is { } named ? Escape(Fit(named, Math.Max(1, width - 8))) : null; + lines.Add(ink.Heading is { } band + ? HeadingBand.Row("VITALS", from is null ? string.Empty : " " + from, string.Empty, width, band) + : $"[bold {ink.Bar}]VITALS[/]" + (from is null ? string.Empty : $" [dim]{from}[/]")); lines.Add(string.Empty); } @@ -115,9 +117,10 @@ internal static IReadOnlyList RenderCard(VitalsModel vitals, int width, lines.Add(Bar(meter.HasMax ? meter.Share ?? 0 : 1, width, colour, ink)); } - lines.Add($"[{ink.Empty}]{new string('─', width)}[/]"); + // The rule parts the meters from the target; with no target there is nothing to part them from. if (vitals.Target is { } target) { + lines.Add($"[{ink.Empty}]{new string('─', width)}[/]"); var percent = target.Share is { } share ? StatusMeterRenderer.Percent(share) : string.Empty; var name = Escape(Fit(target.Name, Math.Max(1, width - 8 - percent.Length))); lines.Add(Spread("[dim]Target[/] " + (target.Low ? $"[{ink.Low}]{name}[/]" : name), percent, width)); diff --git a/src/SharpMUTerm.Tui/Panels/WhoHereRenderer.cs b/src/SharpMUTerm.Tui/Panels/WhoHereRenderer.cs index 35cff02e..bab0ee07 100644 --- a/src/SharpMUTerm.Tui/Panels/WhoHereRenderer.cs +++ b/src/SharpMUTerm.Tui/Panels/WhoHereRenderer.cs @@ -28,8 +28,11 @@ internal static class WhoHereRenderer /// What the panel says in an empty room. internal const string EmptyText = WhoHereModel.EmptyText; - /// The panel's colours: the dot of an active player, and the plane they are measured on. - internal readonly record struct Ink(string Accent); + /// + /// The panel's colours: the dot of an active player, and the heading's band (); with no + /// band the heading is the bare accent label it was before the band. + /// + internal readonly record struct Ink(string Accent, HeadingBand.Ink? Heading = null); /// /// The panel's rows for a box by cells. Never wider than the @@ -54,7 +57,9 @@ internal static List Render(WhoHereModel model, int width, int height, I var count = $" · {rowsIn.Count.ToString(CultureInfo.InvariantCulture)}"; var title = model.Room is { } room ? " " + Escape(room) : string.Empty; - lines.Add(ElideVisible($"[bold {ink.Accent}]HERE[/]{title}[dim]{count}[/]", width)); + lines.Add(ink.Heading is { } band + ? HeadingBand.Row("HERE", title + count, string.Empty, width, band) + : ElideVisible($"[bold {ink.Accent}]HERE[/]{title}[dim]{count}[/]", width)); if (height == 1) { return lines; diff --git a/src/SharpMUTerm.Tui/ScreenTheme.cs b/src/SharpMUTerm.Tui/ScreenTheme.cs index c8c215ac..a45c9b04 100644 --- a/src/SharpMUTerm.Tui/ScreenTheme.cs +++ b/src/SharpMUTerm.Tui/ScreenTheme.cs @@ -164,14 +164,19 @@ internal static ScreenTheme For(Theme theme) /// /// Colours a bordered modal's frame, title and unstyled text. The framework's defaults (a cyan title /// and border, #eeeeee text) were chosen for a dark backdrop and fall to 1.4:1 on a light one, - /// so a theme that is not the constants' own draws them in its label and value inks; the Dark theme - /// keeps the framework's, unchanged. + /// so a theme that is not the constants' own draws them in its label and value inks. The Dark theme keeps the + /// framework's text but takes the same quiet border and title (the terminal mockups' grey frame): a cyan box around + /// every modal was the loudest thing on the screen and said nothing the modal's own heading does not. /// internal void Frame(Window window) { ArgumentNullException.ThrowIfNull(window); if (IsIdentity) { + window.ActiveTitleForegroundColor = Colour(ScreenPalette.Value); + window.InactiveTitleForegroundColor = Colour(ScreenPalette.Label); + window.ActiveBorderForegroundColor = Colour(ScreenPalette.Label); + window.InactiveBorderForegroundColor = Colour(ScreenPalette.Label); return; } diff --git a/src/SharpMUTerm.Tui/ScrollSplitBarRenderer.cs b/src/SharpMUTerm.Tui/ScrollSplitBarRenderer.cs index f76a0912..6d7189cd 100644 --- a/src/SharpMUTerm.Tui/ScrollSplitBarRenderer.cs +++ b/src/SharpMUTerm.Tui/ScrollSplitBarRenderer.cs @@ -13,17 +13,22 @@ internal static class ScrollSplitBarRenderer /// (), so the label does not move as output arrives; the hints are dropped, last /// first, when the pane is too narrow for them, and the rule takes whatever is left. /// - public static string Bar(SharpMUTerm.Client.Chrome.ScrollBandModel band, int width, string accentHex) + /// + /// The band it is drawn on ('s inks: the label in the fill's accent, the rest in its + /// text). It is a divider between two viewports rather than a row of either, so the terminal mockup fills it; null + /// draws the bare rule the other boundary bars draw. + /// + public static string Bar(SharpMUTerm.Client.Chrome.ScrollBandModel band, int width, string accentHex, Panels.HeadingBand.Ink? fill = null) { ArgumentNullException.ThrowIfNull(band); - return Bar(band.RowsBack, width, accentHex); + return Bar(band.RowsBack, width, accentHex, fill); } /// The count a band shows for : capped, as the status row caps it. public static string Count(int rowsBack) => UnreadBadge.Format(Math.Max(1, rowsBack)); /// The bar for a count, as draws it. - public static string Bar(int rowsBack, int width, string accentHex) + public static string Bar(int rowsBack, int width, string accentHex, Panels.HeadingBand.Ink? fill = null) { ArgumentException.ThrowIfNullOrEmpty(accentHex); @@ -39,7 +44,9 @@ public static string Bar(int rowsBack, int width, string accentHex) if (used + 2 <= width || keep == 0) { var rule = new string('─', Math.Max(0, width - used)); - return $"[dim]{lead}[/][{accentHex}]{MarkupText.Escape(label)}[/][dim]{MarkupText.Escape(hint)} {rule}[/]"; + return fill is { } band + ? $"[{band.Text} on {band.Band}]{lead}[{band.Accent}]{MarkupText.Escape(label)}[/]{MarkupText.Escape(hint)} {rule}[/]" + : $"[dim]{lead}[/][{accentHex}]{MarkupText.Escape(label)}[/][dim]{MarkupText.Escape(hint)} {rule}[/]"; } } diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs index e4cd53dd..e8132223 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs @@ -99,7 +99,7 @@ private IWindowControl NewWhoHerePanel(TerminalPanelContext context) { var model = Drawing(PanelIds.WhoHere, context.WindowId, ReadWhoHere(context.SessionKey)); drawn = model.Rows; - return WhoHereRenderer.Render(model, width, height, new WhoHereRenderer.Ink(_ink.Accent)); + return WhoHereRenderer.Render(model, width, height, new WhoHereRenderer.Ink(_ink.Accent, HeadingBand.For(_theme, _ink.Accent))); }); view.Click = url => { @@ -230,7 +230,7 @@ private IWindowControl NewVitalsPanel(TerminalPanelContext context) /// meaning, so they are lifted like text; the empty part of a bar is a grey that still reads as a track. /// private VitalsStripRenderer.Ink VitalsInk() => - new(_ink.Accent, LowInk(_ink.Plane), _ink.Lift(new Rgb(0x6a, 0x6a, 0x72))); + new(_ink.Accent, LowInk(_ink.Plane), _ink.Lift(new Rgb(0x6a, 0x6a, 0x72)), HeadingBand.For(_theme, _ink.Accent)); /// The low cue's ink on (), as markup. private string LowInk(Rgb plane) => WorkspacePalette.Low(_theme, ParseHex(_ink.Notice), plane).ToHex(); @@ -310,7 +310,7 @@ private void RunQuickMacro(string sessionKey, string descriptor) private IWindowControl NewDockedComposer(TerminalPanelContext context) { - var composer = new DockedComposer(context.WindowId, context.SessionKey, _screens, _ink.Accent, DescribeDocked); + var composer = new DockedComposer(context.WindowId, context.SessionKey, _screens, _ink.Accent, DescribeDocked, HeadingBand.For(_theme, _ink.Accent)); if (_composeDrafts.TryGetValue(context.SessionKey, out var draft)) { composer.Load(draft.Body, draft.Escaping, draft.Verb); diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.ScrollSplit.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.ScrollSplit.cs index 9d6432f1..fbb54fbb 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.ScrollSplit.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.ScrollSplit.cs @@ -220,7 +220,7 @@ private bool RefreshScrollSplitBar(string windowId) var width = panel.ViewportWidth > 0 ? panel.ViewportWidth : 80; var below = panel.TotalContentHeight - panel.ViewportHeight - panel.VerticalScrollOffset; var band = Drawing(SurfaceCatalog.ScrollBand, windowId, new ScrollBandModel(windowId, below)); - var markup = ScrollSplitBarRenderer.Bar(band, width, _ink.Notice); + var markup = ScrollSplitBarRenderer.Bar(band, width, _ink.Notice, SharpMUTerm.Tui.Panels.HeadingBand.For(_theme, _ink.Notice)); if (!string.Equals(_scrollSplitBarText.GetValueOrDefault(windowId), markup, StringComparison.Ordinal)) { _scrollSplitBarText[windowId] = markup; diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index b9ac9c57..c0b0affc 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -14502,12 +14502,6 @@ private string HeaderMarkup(HeaderModel model) // identity cluster is a powerline ribbon — menu ▸ world ▸ character — flowing accent colours. var caret = model.MenuOpen ? "▾" : Glyphs.Menu; var headerBg = Hex(_theme.StatusBackground); - // The dim chrome the character segment sits on. Derived rather than the literal #3f4859 it was: - // the header is painted on the theme's own chrome band, and a fixed dark chip under a *light* - // theme is a plane nothing else on the row is measured against — which is how the world accent - // came to be drawn on it at 1.53:1. - var chipRgb = WorkspacePalette.HeaderChip(_theme); - var chip = chipRgb.ToHex(); // Build the ribbon by hand so only the brand "button" is a link (wrapping the whole bar makes // the driver's link highlight repaint every segment and flatten the flowing colours). @@ -14518,7 +14512,7 @@ private string HeaderMarkup(HeaderModel model) var sb = new System.Text.StringBuilder(); sb.Append($"[link={HeaderModel.PaletteTarget}][bold {SegmentInk(brandBg)} on {brandBg}] {caret} {BrandWord} [/][/]"); - var tail = brandBg; + string? tail = brandBg; if (model.World is { } active) { var worldAccent = FillHex(active.Accent); @@ -14527,17 +14521,20 @@ private string HeaderMarkup(HeaderModel model) tail = worldAccent; if (model.Character?.Name is { } name) { - sb.Append($"[{tail} on {chip}]{Glyphs.PowerRight}[/]"); - - // The ● wears the world's colour and is *text* here rather than a fill, so it is the one - // place on this row the accent has to clear the floor — against the chip, which is the - // plane it actually lands on. - sb.Append($"[{Contrast.Legible(ParseHex(worldAccent), chipRgb, WorkspacePalette.HeaderTextFloor).ToHex()} on {chip}] ● {Escape(name)} [/]"); - tail = chip; + // The character is the ribbon's last word and sits on the band itself, as the terminal mockups draw + // it (` ● Corvid ` in the world's colour, no chip): the ribbon ends at the world, and the ● and name + // wear the world's colour as *text*, so they are the one place on this row the accent has to clear + // the floor — against the band, which is the plane they actually land on. + sb.Append($"[{tail} on {headerBg}]{Glyphs.PowerRight}[/]"); + sb.Append($"[bold {Contrast.Legible(ParseHex(worldAccent), ParseHex(headerBg), WorkspacePalette.HeaderTextFloor).ToHex()} on {headerBg}] ● {Escape(name)} [/]"); + tail = null; } } - sb.Append($"[{tail} on {headerBg}]{Glyphs.PowerRight}[/]"); + if (tail is not null) + { + sb.Append($"[{tail} on {headerBg}]{Glyphs.PowerRight}[/]"); + } var leftBar = sb.ToString(); var right = HeaderRight(model); diff --git a/src/SharpMUTerm.Tui/WelcomeSurface.cs b/src/SharpMUTerm.Tui/WelcomeSurface.cs index 63ca0faf..c9714c58 100644 --- a/src/SharpMUTerm.Tui/WelcomeSurface.cs +++ b/src/SharpMUTerm.Tui/WelcomeSurface.cs @@ -395,7 +395,7 @@ private static List RenderMenu(WelcomeModel model, int width) lines.Add(model.Problem is null ? string.Empty : $" [{ScreenPalette.Caution}]{Escape(model.Problem)}[/]"); lines.Add(Label(WelcomeModel.ExampleLead)); - lines.Add(" " + Value(ExampleCommand)); + lines.Add($" [{ScreenPalette.Accent}]{Escape(ExampleCommand)}[/]"); lines.Add(string.Empty); lines.Add(Label(model.LayoutHeading)); var chips = string.Join(" ", Enum.GetValues().Select(layout => diff --git a/src/SharpMUTerm.Tui/WorkspacePalette.cs b/src/SharpMUTerm.Tui/WorkspacePalette.cs index 62a3405b..b0890482 100644 --- a/src/SharpMUTerm.Tui/WorkspacePalette.cs +++ b/src/SharpMUTerm.Tui/WorkspacePalette.cs @@ -318,20 +318,27 @@ internal static Rgb Recessed(Rgb plane) => internal static Rgb Rule(Theme theme) => Mix(Surface(theme), theme.Border, RuleLift); /// - /// A divider under the pointer, or being dragged: the hairline leaned toward the prompt colour, the anchor - /// the armed command line leans to. Enough to say "this moves" without reading as a second focus cue. + /// The band a docked panel's heading is drawn on (HERE, COMPOSE, VITALS), the terminal mockups' + /// heading bar, and the scrolled-back band between a split pane's two viewports: the rule leaned toward + /// , so it is past every pane plane, the focused one included (a step above on a dark theme, + /// below on a light one), and a hue apart from the divider rule it may sit beside. /// - internal static Rgb RuleHover(Theme theme) => Mix(Rule(theme), theme.Prompt, RuleHoverLean); + internal static Rgb HeadingBand(Theme theme) => Mix(Rule(theme), theme.Prompt, HeadingLean); + + /// How far leans from the rule toward the prompt colour. + private const double HeadingLean = 0.2; + + /// A heading's words: the theme's text, held to body-text contrast (4.5:1) on . + internal static Rgb HeadingInk(Theme theme) => Contrast.Legible(theme.Foreground, HeadingBand(theme), HeadingFloor); + + /// The floor a heading's words and accent are held to: small text, the status row's 4.5:1. + internal const double HeadingFloor = 4.5; /// - /// The chrome the header ribbon's character segment sits on — the chrome band lifted toward its own - /// foreground, so the segment reads as a chip against the band it ends on. + /// A divider under the pointer, or being dragged: the hairline leaned toward the prompt colour, the anchor + /// the armed command line leans to. Enough to say "this moves" without reading as a second focus cue. /// - internal static Rgb HeaderChip(Theme theme) - { - ArgumentNullException.ThrowIfNull(theme); - return Mix(theme.StatusBackground, theme.Foreground, ChipLift); - } + internal static Rgb RuleHover(Theme theme) => Mix(Rule(theme), theme.Prompt, RuleHoverLean); /// /// The floor the header's text is held to — WCAG AA for body text. The header is the one row every frame carries, @@ -403,12 +410,6 @@ internal static Rgb Low(Theme theme, Rgb notice, Rgb plane) /// How far the header's quiet text leans from its band toward its ink before the floor is applied. private const double MutedLean = 0.55; - /// - /// How far the header chip is lifted toward the theme's ink: enough that the wedge between the two - /// reads as a shape, no further, since this is a background for a name and not a highlight. - /// - private const double ChipLift = 0.22; - /// /// Every plane a pane's output can be painted on — the untinted surface and all ten tints, each /// focused and not. They form a band: every one is a theme background put through a darkening and a From 71804076d7dbbe8915484ca43f06bc969456b2e7 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 20:59:05 +0000 Subject: [PATCH 083/113] Packages test waits for the review mode, not the window IsOpen is true before Mode is set (the window is added first), so the fetch-then-review test could read the mode in between on a slow runner. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- tests/SharpMUTerm.Tui.Tests/PackagesAppTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/SharpMUTerm.Tui.Tests/PackagesAppTests.cs b/tests/SharpMUTerm.Tui.Tests/PackagesAppTests.cs index b93dc74d..d898cda4 100644 --- a/tests/SharpMUTerm.Tui.Tests/PackagesAppTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/PackagesAppTests.cs @@ -134,7 +134,7 @@ public async Task ALinkIsFetchedThenReviewed() rig.App.PackageFetch = (uri, _) => { asked = uri; return Task.FromResult(Archive()); }; Type(rig.App, "/package install https://packages.example/basics.zip"); - for (var i = 0; i < 1000 && !rig.App.PackageView.IsOpen; i++) + for (var i = 0; i < 1000 && rig.App.PackageView.Mode != "review"; i++) { await Task.Delay(10); } From 72aa798a3895e18c30498680aa7e2c0e81bdf4b3 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 21:02:27 +0000 Subject: [PATCH 084/113] Wave 23 B: the window's Light theme and the settings window toward the mockups - Native header on a light theme shares the backdrop with the rail and footer (no lavender third grey); quiet ink held on it. - Light native edge/rule mirror the dark set's step, so fields on light panels have an edge. - Welcome's search and form fields are sunk into their cards (magnifier in the search). - Settings: no greyed 0 counts while searching; 12 pt mono paths and live values; received paths scroll in their panel; list-editor combos stretch to line up; disabled buttons keep the button plane. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 7 +++++ CLAUDE.md | 8 ++++++ src/SharpMUTerm.Avalonia/ListEditorView.cs | 6 +++-- src/SharpMUTerm.Avalonia/NativeTokens.Page.cs | 10 ++++++- src/SharpMUTerm.Avalonia/NativeTokens.cs | 10 ++++--- src/SharpMUTerm.Avalonia/SettingsWindow.cs | 27 ++++++++++++------- src/SharpMUTerm.Avalonia/WelcomeView.cs | 8 ++++++ .../Pointer/SharpMUTermApp.Chrome.cs | 5 ++-- src/SharpMUTerm.Tui/WorkspacePalette.cs | 20 ++++++++++++-- .../SettingsWindowTests.cs | 2 +- 10 files changed, 83 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cce24ff4..40dcbb90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,13 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] divider is a filled band too, modal pop-ups have a quiet grey frame instead of a cyan one, the header shows your character in the world's colour without a grey chip, the vitals card no longer draws a stray rule when nothing is targeted, and the welcome's `/connect` example is highlighted — closer to the terminal mockups. +- In the desktop window's Light theme, the header sits on the same plane as the sidebar and status row instead of a + separate lavender grey, text fields in the composer, the welcome and the pop-ups have a visible edge, and the + welcome's fields are sunk into their cards (with a magnifier in the search box) in every theme. +- The settings window is closer to its mockup: while searching, a section with no match no longer shows a greyed `0`, + the meter table's paths and live values are in the 12-point monospace face, the list of received paths scrolls inside + its panel instead of pushing the page down, the list editors' drop-downs line up with the text boxes beside them, + and a disabled button no longer looks heavier than an enabled one. - In the desktop window, the map is drawn the way the mockups draw it: dark rooms outlined in a rule, exits as thin lines, your room ringed in the accent with an `@`, Up/Down/Areas as proper buttons, and the legend in a strip at the foot with diff --git a/CLAUDE.md b/CLAUDE.md index 419e3ba8..36169289 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -2481,6 +2481,14 @@ markup (`[bold #rrggbb on #rrggbb]…[/]`, `[[`/`]]` escaping, `[link=url]…[/] `TheSpacingScaleAndTheChromeSizesAreWholeDevicePixels…` pins the multiples of 4. Not done: the quick bar is still one cell row (the mockup's is a 56 px strip of 34 px buttons), and panel internals' font sizes are not on the scale. +- **Wave 23 B (Light window, settings window).** The native header's plane is `WorkspacePalette.NativeHeaderPlane`: the + status band on a dark theme, the backdrop on a light one (Light's status band is a lavender that sat beside the neutral + rail and footer as a third grey); `HeaderMuted(theme, plane)` holds the quiet ink on it. Native only — the cell header + keeps its band. `LightCanon`'s `Edge`/`Rule` are `#c4c8d2`/`#dcdfe6`, the dark set's ~1.4:1 step mirrored, so a field on + Light's side column has an edge. The welcome's search and form fields are `ModalParts.Sunk` (Fluent's default text + background is `Raised`, the cards' own plane). Settings: a section with no match shows no count (not a greyed `0`); + page monospace is `NativeTokens.Code` (12); the received-paths panel scrolls past `MeterPathsMaxHeight`; list-editor + combos stretch like the text boxes; a disabled button keeps the button plane with a `Rule` edge. - **Every native surface spells a key in words** (`NativeKeys.Words`, Avalonia: `KeyGlyphs.Words` plus the named keys `⏎` Enter, `⇥`/`↹` Tab, `⇤` Shift+Tab, `⌫` Backspace, `⌦` Delete, `⎋` Esc, `⇞`/`⇟` PgUp/PgDn; arrows stay arrows): `Ctrl+P`, `Alt+M`, `Ctrl+B b`, never `⌃P`/`⌥M`/`⏎`. The client writes keys in glyphs because the cells draw them diff --git a/src/SharpMUTerm.Avalonia/ListEditorView.cs b/src/SharpMUTerm.Avalonia/ListEditorView.cs index a4a2e70f..f9a9f7a6 100644 --- a/src/SharpMUTerm.Avalonia/ListEditorView.cs +++ b/src/SharpMUTerm.Avalonia/ListEditorView.cs @@ -618,7 +618,9 @@ private Control ControlFor(SettingsField field) case ChoiceField choice when field.Binding is SettingBinding named: { - var combo = new ComboBox { ItemsSource = _form.Choices(choice), SelectedItem = _form.Get(named), MaxWidth = 280 }; + // Stretched as the text boxes are, so every control in the column shares both edges: a combo capped at 280 px was + // centred in a wider cell, 25 px in from the Name box above it. + var combo = new ComboBox { ItemsSource = _form.Choices(choice), SelectedItem = _form.Get(named), HorizontalAlignment = HorizontalAlignment.Stretch }; combo.SelectionChanged += (_, _) => { if (!_syncing && combo.SelectedItem is string value && value != _form.Get(named)) @@ -678,7 +680,7 @@ private Control ControlFor(SettingsField field) { ItemsSource = names, ItemTemplate = new FuncDataTemplate((name, _) => Swatch(name)), - MaxWidth = 280, + HorizontalAlignment = HorizontalAlignment.Stretch, }; void Pick() => combo.SelectedItem = names.FirstOrDefault(n => string.Equals(n, HighlightColours.Format(_form.Get(colour)), StringComparison.OrdinalIgnoreCase)); diff --git a/src/SharpMUTerm.Avalonia/NativeTokens.Page.cs b/src/SharpMUTerm.Avalonia/NativeTokens.Page.cs index 6cfedc24..a63c7584 100644 --- a/src/SharpMUTerm.Avalonia/NativeTokens.Page.cs +++ b/src/SharpMUTerm.Avalonia/NativeTokens.Page.cs @@ -23,6 +23,9 @@ internal sealed partial record NativeTokens /// A field's label on a page. public const double Label = 13; + /// Monospace text on a page: a path, a live value (the mockup's 12 px JetBrains Mono). + public const double Code = 12; + /// Corner radius of an input, a button or a navigation row on a page. public const double RadiusControl = 6; @@ -156,7 +159,12 @@ void Set(Color colour, params string[] keys) Set(FocusEdge, "TextControlBorderBrushFocused", "ComboBoxBorderBrushPointerOver", "ButtonBorderBrushPointerOver", "TextControlBorderBrushPointerOver", "ComboBoxDropDownBorderBrush"); - Set(Button, "ButtonBackground", "RepeatButtonBackground", "ToggleSwitchFillOff", "ToggleSwitchFillOffPointerOver"); + Set(Button, "ButtonBackground", "RepeatButtonBackground", "ToggleSwitchFillOff", "ToggleSwitchFillOffPointerOver", + "ButtonBackgroundDisabled", "RepeatButtonBackgroundDisabled"); + + // A disabled button is the enabled one with its edge and ink quieter, never a darker fill: Fluent's own grey made + // the one button that does nothing (the list's ↑ at the top) the heaviest thing in its row on a light page. + Set(Rule, "ButtonBorderBrushDisabled", "RepeatButtonBorderBrushDisabled"); Set(PopupSelected, "ButtonBackgroundPointerOver", "ButtonBackgroundPressed", "RepeatButtonBackgroundPointerOver", "ComboBoxItemBackgroundPointerOver", "ComboBoxItemBackgroundSelected", "ComboBoxItemBackgroundSelectedPointerOver", diff --git a/src/SharpMUTerm.Avalonia/NativeTokens.cs b/src/SharpMUTerm.Avalonia/NativeTokens.cs index 91967511..6775bb2f 100644 --- a/src/SharpMUTerm.Avalonia/NativeTokens.cs +++ b/src/SharpMUTerm.Avalonia/NativeTokens.cs @@ -322,12 +322,16 @@ private sealed record Canon( new Rgb(0x10, 0x13, 0x1a), new Rgb(0x3a, 0x4f, 0x73)); - /// The palette's light card. + /// + /// The palette's light card: the dark set mirrored. Its edge and rule hold the dark set's step against the plane they + /// sit on (the mockup's #2c3447 on #141822 is about 1.4:1), so a field on a light panel keeps an edge + /// rather than the near-white hairline (1.1:1 on Light's #f2f2f5 side column) it had. + /// private static readonly Canon LightCanon = new( Color.FromArgb(0x4d, 0, 0, 0), new Rgb(0xff, 0xff, 0xff), - new Rgb(0xd4, 0xd4, 0xdd), - new Rgb(0xe6, 0xe6, 0xec), + new Rgb(0xc4, 0xc8, 0xd2), + new Rgb(0xdc, 0xdf, 0xe6), new Rgb(0x1d, 0x1d, 0x24), new Rgb(0x62, 0x62, 0x70), new Rgb(0x6a, 0x6a, 0x78), diff --git a/src/SharpMUTerm.Avalonia/SettingsWindow.cs b/src/SharpMUTerm.Avalonia/SettingsWindow.cs index d71e2f3d..6934080b 100644 --- a/src/SharpMUTerm.Avalonia/SettingsWindow.cs +++ b/src/SharpMUTerm.Avalonia/SettingsWindow.cs @@ -34,6 +34,9 @@ internal sealed class SettingsWindow : Window /// How far the meter table's received-paths box sits in: under the path columns, past the label column. private const double MeterPathsIndent = 128; + /// The received-paths panel's height before it scrolls: its heading and about six paths. + private const double MeterPathsMaxHeight = 200; + private readonly TextBox _search; private readonly ListBox _sections; private readonly StackPanel _page; @@ -426,13 +429,11 @@ private void UpdateBadges() foreach (var section in _form.Sections) { var count = counts.GetValueOrDefault(section.Id); + // While searching a section with matches says how many and one without says nothing (the mockup's rows): + // a column of greyed zeros read as a column of disabled sections. _badges[section.Id].Text = searching - ? count.ToString(CultureInfo.InvariantCulture) + ? count > 0 ? count.ToString(CultureInfo.InvariantCulture) : string.Empty : SettingsForm.IsDeclared(section) ? string.Empty : "↗"; - if (Items.FirstOrDefault(i => Equals(i.Tag, section.Id)) is { } item) - { - item.Opacity = searching && count == 0 ? 0.45 : 1; - } } StyleNavigation(); @@ -1167,7 +1168,7 @@ private StackPanel MeterTable(ListField field) value.GotFocus += (_, _) => lastPath = value; max.GotFocus += (_, _) => lastPath = max; - var now = new TextBlock { VerticalAlignment = VerticalAlignment.Center, FontFamily = Mono, FontSize = NativeTokens.Body }; + var now = new TextBlock { VerticalAlignment = VerticalAlignment.Center, FontFamily = Mono, FontSize = NativeTokens.Code }; _meterNow.Add((meter, now)); var remove = new Button @@ -1210,7 +1211,7 @@ private StackPanel MeterTable(ListField field) foreach (var item in received.Take(40)) { - var line = new TextBlock { FontFamily = Mono, FontSize = NativeTokens.Body, TextTrimming = TextTrimming.CharacterEllipsis }; + var line = new TextBlock { FontFamily = Mono, FontSize = NativeTokens.Code, TextTrimming = TextTrimming.CharacterEllipsis }; line.Inlines!.Add(new Run(item.Path) { Foreground = page.Brush(page.Text) }); line.Inlines.Add(new Run($" = {item.Value}") { Foreground = DimInk }); var pick = new Button @@ -1235,9 +1236,17 @@ private StackPanel MeterTable(ListField field) box.Children.Add(pick); } + // The mockup's drop-down shows a handful of rows; a connection that has sent sixty paths scrolls inside the panel + // rather than pushing "+ Add a meter" and the next card a screen down. + var list = new ScrollViewer + { + Content = box, + MaxHeight = MeterPathsMaxHeight, + HorizontalScrollBarVisibility = global::Avalonia.Controls.Primitives.ScrollBarVisibility.Disabled, + }; outer.Children.Add(new Border { - Child = box, + Child = list, Background = page.Brush(page.Popup), BorderThickness = new Thickness(NativeTokens.Hairline), BorderBrush = page.Brush(page.FocusEdge), @@ -1271,7 +1280,7 @@ private static AutoCompleteBox PathBox(string? text, IReadOnlyList paths Text = text ?? string.Empty, ItemsSource = paths, FontFamily = Mono, - FontSize = NativeTokens.Body, + FontSize = NativeTokens.Code, FilterMode = AutoCompleteFilterMode.ContainsOrdinal, MinimumPrefixLength = 0, HorizontalAlignment = HorizontalAlignment.Stretch, diff --git a/src/SharpMUTerm.Avalonia/WelcomeView.cs b/src/SharpMUTerm.Avalonia/WelcomeView.cs index af5ac914..7fe1a8d5 100644 --- a/src/SharpMUTerm.Avalonia/WelcomeView.cs +++ b/src/SharpMUTerm.Avalonia/WelcomeView.cs @@ -90,6 +90,9 @@ public WelcomeView(WelcomeSession session, NativeTokens colours, Action done) MaxLength = WorldDirectory.MaxQuery, }; global::Avalonia.Automation.AutomationProperties.SetName(_search, WelcomeModel.FindHeading); + // Sunk into the ground with the mockup's magnifier, as every search box is: on the raised card a field on Fluent's + // default (the raised plane itself) had no plane of its own and on Light read as no field at all. + ModalParts.Sunk(_search, colours); _search.TextChanged += (_, _) => DrawRows(); _findNote = new TextBlock { FontSize = NativeTokens.Body, Foreground = colours.Brush(colours.Dim), TextWrapping = TextWrapping.Wrap }; var find = new StackPanel { Spacing = NativeTokens.Space12 }; @@ -104,6 +107,11 @@ public WelcomeView(WelcomeSession session, NativeTokens colours, Action done) _port = Field(WelcomeModel.FieldLabel(WelcomeField.Port), "4000", 5); _port.FontFamily = Mono; _character = Field(WelcomeModel.FieldLabel(WelcomeField.Character), "Name", WelcomeModel.MaxCharacter); + foreach (var box in new[] { _host, _port, _character }) + { + ModalParts.Sunk(box, colours, magnifier: false); + } + _tls = new CheckBox { Content = "Encrypt the connection (TLS)", FontSize = NativeTokens.Title }; _passwordLater = new CheckBox { Content = NativeKeys.Words("Password: " + char.ToLowerInvariant(WelcomeModel.PasswordOn[0]) + WelcomeModel.PasswordOn[1..]), FontSize = NativeTokens.Body }; _command = new TextBlock { FontSize = NativeTokens.Body, Foreground = colours.Brush(colours.Dim), TextWrapping = TextWrapping.Wrap }; diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Chrome.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Chrome.cs index 1b6b908f..7d965e07 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Chrome.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Chrome.cs @@ -73,6 +73,7 @@ internal ChromeOverlay BuildChromeOverlay() _sidebarMenuRun ??= id => OnUiThread(() => RunSidebarMenuEntry(id)); var header = BuildHeaderModel(); var brand = FillHex(AccentPalette[2]); + var headerPlane = WorkspacePalette.NativeHeaderPlane(_theme); var palette = new ChromePalette( brand, header.World is { } world ? FillHex(world.Accent) : null, @@ -80,12 +81,12 @@ internal ChromeOverlay BuildChromeOverlay() _ink.Draft, UnreadBadge.TintFor(_ink), _ink.Notice, - Hex(_theme.StatusBackground), + Hex(headerPlane), Hex(WorkspacePalette.Backdrop(_theme)), Hex(_theme.Resolve(Core.Text.TerminalColor.Default, isBackground: false))) { BrandInk = WorkspacePalette.HeaderInk(_theme, ParseHex(brand)).ToHex(), - HeaderMuted = WorkspacePalette.HeaderMuted(_theme).ToHex(), + HeaderMuted = WorkspacePalette.HeaderMuted(_theme, headerPlane).ToHex(), }; return new ChromeOverlay( diff --git a/src/SharpMUTerm.Tui/WorkspacePalette.cs b/src/SharpMUTerm.Tui/WorkspacePalette.cs index b0890482..91df4faf 100644 --- a/src/SharpMUTerm.Tui/WorkspacePalette.cs +++ b/src/SharpMUTerm.Tui/WorkspacePalette.cs @@ -383,10 +383,26 @@ internal static Rgb NoticeMuted(Theme theme, Rgb plane) } /// The header's quiet text (the counts, the log state), held to on its band. - internal static Rgb HeaderMuted(Theme theme) + internal static Rgb HeaderMuted(Theme theme) => HeaderMuted(theme, theme?.StatusBackground ?? throw new ArgumentNullException(nameof(theme))); + + /// The header's quiet text held to on . + internal static Rgb HeaderMuted(Theme theme, Rgb plane) + { + ArgumentNullException.ThrowIfNull(theme); + return Contrast.Legible(Mix(plane, theme.StatusForeground, MutedLean), plane, HeaderTextFloor); + } + + /// + /// The plane a host draws its native header on. A dark theme keeps the status band (a step above the backdrop, the + /// mockup's header over its navigation). A light theme's status band is a tinted grey (Light's lavender + /// #dcdce6) that sat beside the neutral rail and footer as a third, unrelated grey; there the header shares the + /// backdrop with the rail and the footer, and the rule under it is the boundary. Native only: the cell header keeps + /// its band. + /// + internal static Rgb NativeHeaderPlane(Theme theme) { ArgumentNullException.ThrowIfNull(theme); - return Contrast.Legible(Mix(theme.StatusBackground, theme.StatusForeground, MutedLean), theme.StatusBackground, HeaderTextFloor); + return Contrast.RelativeLuminance(theme.Background) < LightPlaneLuminance ? theme.StatusBackground : Backdrop(theme); } /// diff --git a/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowTests.cs b/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowTests.cs index d69cb5c6..5ecd76a4 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowTests.cs @@ -128,7 +128,7 @@ public async Task TheSearchNarrowsThePageAndCountsEachSection() await Assert.That(section).IsEqualTo("text").Because("the section on show had nothing matching, so the first that has is shown"); await Assert.That(fields).IsEquivalentTo(expected.Where(m => m.Section.Id == "text").Select(m => m.Field!.Id).ToArray()); await Assert.That(badges["text"]).IsEqualTo(expected.Count(m => m.Section.Id == "text").ToString(System.Globalization.CultureInfo.InvariantCulture)); - await Assert.That(badges["input"]).IsEqualTo("0"); + await Assert.That(badges["input"]).IsEqualTo(string.Empty).Because("a section with no match says nothing, as the mockup's rows do"); } [Test] From 76df2de3aebf490314b8c2fb68f72a5a7394ff16 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 21:29:43 +0000 Subject: [PATCH 085/113] Wave 24 A: a panel's heading band is the stacked boundary; the rail's spacer column goes to the panes In the cells, a lone composer or who-here pane stands its heading band in for the divider row above it (PaneNode.DrawsHeading, counted by PaneExtent.HeaderPanes); the band's empty run, read off the paint, is the divider's hover/drag/double-click handle. The window keeps its divider row, since its native panels lie over that row. Who-here draws its band before the roster arrives. The rail-coloured spacer column after the rail's rule is given back to the panes (NAWS +1 column); the rule stays because an unfocused pane is only ~2.9 L* above the backdrop (RailEdgeTests). Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 3 + CLAUDE.md | 15 +- src/SharpMUTerm.Core/Layouts/PanelSizing.cs | 9 ++ src/SharpMUTerm.Core/Workspace/LayoutNode.cs | 7 + src/SharpMUTerm.Core/Workspace/PaneExtent.cs | 10 +- src/SharpMUTerm.Tui/Panels/WhoHereRenderer.cs | 6 +- .../Pointer/SharpMUTermApp.HeadingDividers.cs | 111 ++++++++++++++ .../Pointer/SharpMUTermApp.Pointer.cs | 6 + .../SharpMUTermApp.CollapsedBars.cs | 1 + src/SharpMUTerm.Tui/SharpMUTermApp.cs | 16 +- .../Workspace/PaneExtentTests.cs | 24 +++ .../HeadingDividerTests.cs | 141 ++++++++++++++++++ tests/SharpMUTerm.Tui.Tests/RailEdgeTests.cs | 44 ++++++ .../RailWindowRowTests.cs | 12 +- 14 files changed, 385 insertions(+), 20 deletions(-) create mode 100644 src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.HeadingDividers.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/HeadingDividerTests.cs create mode 100644 tests/SharpMUTerm.Tui.Tests/RailEdgeTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 40dcbb90..f5acc6e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,9 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] ### Added +- In the terminal, a docked panel's heading band is the boundary between stacked panes: Roleplay's composer and the + who-is-here list no longer have a grey row between them (drag the HERE band's empty part to resize), and the panes + are one column wider, because the spare column between the sidebar's rule and the output is gone. - In the desktop window, Combat's map uses its pane: rooms are drawn at full size, every room's name is written out in full where it fits without covering another room or name (shortened only where it truly cannot fit), the map pane no longer repeats a lone "Map" tab above its own heading, and the vitals card is only as tall as its gauges, so the map diff --git a/CLAUDE.md b/CLAUDE.md index 36169289..ba2147c7 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -675,7 +675,7 @@ fallbacks) for inline images/maps. **The window's native sidebar folds by the same rule** (verified under Xvfb at `--size 60x24` and on a live resize): at `--size 80x24` the window is ~102 columns wide with its sidebar, so it stays open and the pane is the 80 columns the rule protects. Decisions not to relitigate: - - **100 because of the server's wrap width**: the open rail, divider and spacer cost ~20 columns, so 100 still + - **100 because of the server's wrap width**: the open rail and its divider cost ~20 columns, so 100 still leaves the pane 80; below it a world's 80-column text orphans a word on every other row. 30 rows because above it the output keeps 24 rows with a three-row bar. Height never folds the rail. - **The automatic fold acts only on a crossing** (`_narrowSeen`) and once at start, never on a resize that stays on @@ -1235,6 +1235,17 @@ fallbacks) for inline images/maps. the deep grey a dark theme's step gives. Side by side, nothing changed. The freed row went to the panes, which is the point and a NAWS change; `StackedDividerTests` and the `split-stacked` view are the pins. + - **A panel's heading band is a boundary too, in the cells** (`PaneNode.DrawsHeading`, set by `ApplyHeadingPanes` + after `ApplyAll` for a lone composer or who-here pane, `PanelSizing.DrawsHeadingBand`; `HeaderPanes` counts it). + Roleplay's composer over who-here has no divider row; the HERE band's empty run is the handle (`HeadingFill`), + **read off the paint** (`MeasureHeadingRuns`, before `PaintHeaderDividers`: the longest blank run on the band's or + the lit rule's plane), because three renderers lay their headings out three ways. Who-here draws its band before + the roster arrives, so the boundary never comes and goes. **Not in the window** (`HostChrome.Strips`): its native + panels lie over that row and take its presses, so it keeps the divider row. `HeadingDividerTests`. + - **The rail is `rail │ panes`: the spacer column after the rule went to the panes in wave 24** (NAWS +1 column). + Measured, not preferred (`RailEdgeTests`): the mockup lets the planes carry the rail's edge (~6 L*), but here an + unfocused pane is 2.9 L* above the backdrop on Dark (a tinted one less) and the rule 15.9, so the rule stays and + the rail-coloured spacer beside it separated nothing. Pane text meets the rule as at any pane divider. - **The menu is the ⌃P catalog's own entries** (`AddCommands`), so it cannot offer an action the keyboard lacks, and each says its key (`ShortHint`). A right-click on a link or output focuses that pane first, and on a tab activates it, so the entries act on what was clicked. @@ -1326,7 +1337,7 @@ fallbacks) for inline images/maps. `NativeLayout`), and the client is only told the part is not its to draw. With `Header` the header control is `Visible = false` — a hidden sticky band takes no row — and `ChromeRows()` counts no header row, so the input-height veto (`SyncInputHeights`) and the layout agree. With `Rail` `BuildWorkspaceRow` builds the pane area - alone (no rail column, divider or spacer; `_railColumn` is null, so `ApplyRailWidth` does nothing). Everything + alone (no rail column or divider; `_railColumn` is null, so `ApplyRailWidth` does nothing). Everything else follows from arranged bounds: `PaneOutputRects` and so per-pane NAWS are the panes the cells really hold. `HostChromeLayoutTests` pins rows, rectangles, NAWS and the veto at 80×6. - **The window moves the cells out of the way; nothing native sits over a cell.** `DesktopLayer` spans the window diff --git a/src/SharpMUTerm.Core/Layouts/PanelSizing.cs b/src/SharpMUTerm.Core/Layouts/PanelSizing.cs index c9155d6d..8f49e736 100644 --- a/src/SharpMUTerm.Core/Layouts/PanelSizing.cs +++ b/src/SharpMUTerm.Core/Layouts/PanelSizing.cs @@ -77,6 +77,15 @@ public static bool IsStrip(IReadOnlyList panels) => /// public static bool ShowsTabStrip(IReadOnlyList panels) => !(panels.Count == 1 && panels[0] is not null); + /// + /// Whether draws a filled heading band on its first row in the cells (COMPOSE, HERE), which a + /// host may take as the boundary above its pane (). The vitals card has one too, but + /// it is a fixed strip, which never has a divider row beside it. + /// + public static bool DrawsHeadingBand(string? panel) => + string.Equals(panel, PanelIds.Composer, StringComparison.Ordinal) + || string.Equals(panel, PanelIds.WhoHere, StringComparison.Ordinal); + /// /// Sets 's and from what it /// holds. names the panel each tab draws (null for an ordinary window), and diff --git a/src/SharpMUTerm.Core/Workspace/LayoutNode.cs b/src/SharpMUTerm.Core/Workspace/LayoutNode.cs index 4c360e57..82fcc6a8 100644 --- a/src/SharpMUTerm.Core/Workspace/LayoutNode.cs +++ b/src/SharpMUTerm.Core/Workspace/LayoutNode.cs @@ -118,6 +118,13 @@ public PaneNode( /// public bool DrawsHeader { get; set; } + /// + /// Whether the one panel this pane holds draws a filled heading band along its top row (the terminal's COMPOSE and + /// HERE). Like , that band is the boundary in a stacked split: no divider row is drawn above + /// the pane, and the host makes the band's empty run the divider's handle. Derived by the host and not persisted. + /// + public bool DrawsHeading { get; set; } + public override IEnumerable Panes() { yield return this; diff --git a/src/SharpMUTerm.Core/Workspace/PaneExtent.cs b/src/SharpMUTerm.Core/Workspace/PaneExtent.cs index 248d395e..16e8e306 100644 --- a/src/SharpMUTerm.Core/Workspace/PaneExtent.cs +++ b/src/SharpMUTerm.Core/Workspace/PaneExtent.cs @@ -63,8 +63,8 @@ public static int MinRows(LayoutNode node) /// /// none beside a fixed-height strip, which sits flush and is told apart by its own plane — it cannot be /// resized, so a row there would be a rule with nothing to drag; - /// none above a child whose top row is all tab strip (): that strip is the - /// boundary, and the host makes its empty run the divider's handle. + /// none above a child whose top row is all tab strip or panel heading band (): that + /// row is the boundary, and the host makes its empty run the divider's handle. /// /// public static int DividerRows(SplitNode split, int index) @@ -104,8 +104,8 @@ public static int Dividers(SplitNode split) } /// - /// The panes whose tab strips run along 's whole top edge, or an empty list when any part - /// of that edge is not a tab strip. A pane is its own answer; a stack is its first child's; a side-by-side row is + /// The panes whose tab strips or panel heading bands () run along + /// 's whole top edge, or an empty list when any part of that edge is neither. A pane is its own answer; a stack is its first child's; a side-by-side row is /// every child's, and only when each of them has one. /// public static IReadOnlyList HeaderPanes(LayoutNode node) @@ -113,7 +113,7 @@ public static IReadOnlyList HeaderPanes(LayoutNode node) ArgumentNullException.ThrowIfNull(node); if (node is PaneNode pane) { - return pane.DrawsHeader ? [pane] : []; + return pane.DrawsHeader || pane.DrawsHeading ? [pane] : []; } var split = (SplitNode)node; diff --git a/src/SharpMUTerm.Tui/Panels/WhoHereRenderer.cs b/src/SharpMUTerm.Tui/Panels/WhoHereRenderer.cs index bab0ee07..2091aaf0 100644 --- a/src/SharpMUTerm.Tui/Panels/WhoHereRenderer.cs +++ b/src/SharpMUTerm.Tui/Panels/WhoHereRenderer.cs @@ -47,7 +47,11 @@ internal static List Render(WhoHereModel model, int width, int height, I { if (!model.Known) { - return [$"[dim]{UnknownText}[/]"]; + // The band is drawn whatever the game has said: in a stack it is the boundary above this pane (no divider + // row is drawn there), so it must not come and go with the roster. + return ink.Heading is { } unknownBand && height > 1 + ? [HeadingBand.Row("HERE", string.Empty, string.Empty, Math.Max(8, width), unknownBand), $"[dim]{UnknownText}[/]"] + : [$"[dim]{UnknownText}[/]"]; } width = Math.Max(8, width); diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.HeadingDividers.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.HeadingDividers.cs new file mode 100644 index 00000000..077bc926 --- /dev/null +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.HeadingDividers.cs @@ -0,0 +1,111 @@ +using SharpConsoleUI.Controls; +using SharpConsoleUI.Layout; +using SharpMUTerm.Core.Layouts; +using SharpMUTerm.Core.Workspaces; + +namespace SharpMUTerm.Tui; + +/// +/// A docked panel's heading band as the boundary above its pane (): in a stack, the +/// composer's COMPOSE band and who-here's HERE band already mark where one pane ends and the next begins, so no divider +/// row is drawn over them and the band's empty run is the divider's handle — hover, drag, double-click, as a tab strip's +/// run is. Cells only: where the host draws the panels natively (, the window) a native +/// view lies over that row and takes its presses, so the window keeps its divider row. +/// +internal sealed partial class SharpMUTermApp +{ + /// Each heading pane's empty band run, as the last paint left it, in desktop cells; swapped whole, read off-thread. + private Dictionary _headingRuns = new(StringComparer.Ordinal); + + /// + /// After : a pane holding one panel that draws a heading band, and no tab strip, + /// stands its band in for the divider above it — in the cells only. + /// + private void ApplyHeadingPanes() + { + foreach (var pane in _workspace.Layout.Root.Panes()) + { + pane.DrawsHeading = !Host.Chrome.Strips + && !pane.DrawsHeader + && pane.FixedRows is null + && pane.Tabs.Count == 1 + && PanelSizing.DrawsHeadingBand(PanelIdOfWindow(pane.Tabs[0])); + } + } + + /// + /// The empty run of 's heading band, or null when the pane draws none or nothing has painted + /// it yet. + /// + private PaneRect? HeadingFill(string paneId) => + Volatile.Read(ref _headingRuns).TryGetValue(paneId, out var run) ? run : null; + + /// + /// Reads each heading pane's band off the frame just painted: the longest run of blank cells on the band's plane (or + /// the lit rule's, which leaves there) along the pane's top row. Read off the paint + /// because three renderers lay their headings out three ways (the composer's length sits at the far end), and a second + /// arithmetic for where their text ends would drift from what is drawn. + /// + private void MeasureHeadingRuns(CharacterBuffer buffer) + { + var runs = new Dictionary(StringComparer.Ordinal); + if (_window is not null) + { + var band = WorkspacePalette.HeadingBand(_theme); + var hover = WorkspacePalette.RuleHover(_theme); + var top = _window.Top + _system.DesktopUpperLeft.Y; + foreach (var slot in _dividers) + { + if (slot.HeaderPaneId is not { } paneId || _workspace.Layout.FindPane(paneId) is not { DrawsHeading: true }) + { + continue; + } + + TabControl? tabs; + lock (_paneTabsLock) + { + tabs = _paneTabs.GetValueOrDefault(paneId); + } + + if (tabs is null || BoundsOf(tabs) is not { Width: > 0, Height: > 0 } rect) + { + continue; + } + + var by = rect.Y - top; + int bestFrom = 0, bestLength = 0, from = -1; + for (var x = rect.X; x <= rect.X + rect.Width; x++) + { + var bx = x - _window.Left; + var blank = x < rect.X + rect.Width && by >= 0 && by < buffer.Height && bx >= 0 && bx < buffer.Width + && buffer.GetCell(bx, by) is var cell + && cell.Character.Value == ' ' + && (Same(cell.Background, band) || Same(cell.Background, hover)); + if (blank && from < 0) + { + from = x; + } + else if (!blank && from >= 0) + { + if (x - from > bestLength) + { + (bestFrom, bestLength) = (from, x - from); + } + + from = -1; + } + } + + if (bestLength > 0) + { + runs[paneId] = new PaneRect(bestFrom, rect.Y, bestLength, 1); + } + } + } + + Volatile.Write(ref _headingRuns, runs); + + static bool Same(SharpConsoleUI.Color colour, SharpMUTerm.Core.Text.Rgb rgb) => + colour.R == rgb.R && colour.G == rgb.G && colour.B == rgb.B; + } +} diff --git a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs index 0fe54d42..09b52759 100644 --- a/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs +++ b/src/SharpMUTerm.Tui/Pointer/SharpMUTermApp.Pointer.cs @@ -107,6 +107,12 @@ private void RegisterHeaderDivider(SplitNode split, int index) /// private PaneRect? HeaderFill(string paneId) { + // A panel's heading band standing in for the divider (HeadingDividers): its run as the last paint left it. + if (HeadingFill(paneId) is { } heading) + { + return heading; + } + TabControl? tabs; lock (_paneTabsLock) { diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.CollapsedBars.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.CollapsedBars.cs index f3b7c8e9..32901d8f 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.CollapsedBars.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.CollapsedBars.cs @@ -81,6 +81,7 @@ private void ApplyCollapsedBars() pane.FixedRows = CollapsedBarRows; pane.MinRows = null; pane.DrawsHeader = false; + pane.DrawsHeading = false; foreach (var windowId in pane.Tabs) { _workspace.SetScrolledBack(windowId, true); diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index f371e059..375c3d31 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -195,7 +195,6 @@ private sealed class SizeReport /// private readonly MarkupControl _promptRow; private readonly MarkupControl _rail; - private readonly MarkupControl _railSpacer = new(new List()); private readonly Dictionary _paneTabs = new(StringComparer.Ordinal); /// @@ -1048,6 +1047,7 @@ public SharpMUTermApp( ReportPaneSizes(); SyncTabStripWidths(); SyncTransparentColours(); + MeasureHeadingRuns(buffer); PaintHeaderDividers(buffer); PaintTabOverflow(buffer); BlankNativeTabStrips(buffer); @@ -10980,6 +10980,7 @@ private IWindowControl BuildWorkspaceRow() VitalsCardRowsRule()); ApplyCollapsedBars(); ApplyLoneMapPanes(); + ApplyHeadingPanes(); // When a pane is zoomed, render just that pane full-area; otherwise render the whole tree. var zoomed = _workspace.Layout.ZoomedPaneId is { } zid ? _workspace.Layout.FindPane(zid) : null; @@ -10998,8 +10999,12 @@ private IWindowControl BuildWorkspaceRow() var railWidth = RailWidth(railLines); _railWidth = railWidth; - // rail │ thin divider │ 1-col spacer (breathing room) │ output — a solid 1-col bar in the - // border colour instead of the framework's double-line splitter, for a calmer single-line look. + // rail │ thin divider │ output — a solid 1-col bar in the border colour instead of the framework's double-line + // splitter, for a calmer single-line look. There used to be a rail-coloured spacer column after the bar; it was + // given back to the panes (wave 24). The bar stays: the rail is the backdrop, and an unfocused pane is only + // ~2.8 L* above it on Dark (a tinted one less still), so the plane step alone would not carry the edge + // (RailEdgeTests). The rail's own margin cell is the breathing room on its side; the pane's text meets the + // rule as it meets every divider between two panes. // Stretch (control default is Left) so the window arranges the whole row at the full console // width; without it the row floats at content width and the Flex pane column can't claim the // space to the right edge. (SharpConsoleUI docs/patterns.md — sidebar+content layouts.) @@ -11020,7 +11025,6 @@ private IWindowControl BuildWorkspaceRow() .WithVerticalAlignment(VerticalAlignment.Fill) .Column(c => c.Width(railWidth).Add(_rail)) .Column(c => c.Width(1).Add(Divider())) - .Column(c => c.Width(1).Add(_railSpacer)) .Column(c => c.Flex(1).Add(paneArea)) .Build(); @@ -11477,8 +11481,8 @@ private void ToggleRail() /// /// Breathing room between the widest row and the divider beside it. One cell, not two: the divider - /// column and the _railSpacer beside it (see ) already separate - /// the rail from the panes, so a second margin cell is a column taken off every pane to no effect. + /// column (see ) already separates the rail from the panes, so a second + /// margin cell is a column taken off every pane to no effect. /// private const int RailMargin = 1; diff --git a/tests/SharpMUTerm.Core.Tests/Workspace/PaneExtentTests.cs b/tests/SharpMUTerm.Core.Tests/Workspace/PaneExtentTests.cs index 39032f4f..8cb0498e 100644 --- a/tests/SharpMUTerm.Core.Tests/Workspace/PaneExtentTests.cs +++ b/tests/SharpMUTerm.Core.Tests/Workspace/PaneExtentTests.cs @@ -70,6 +70,30 @@ public async Task NoDividerRowIsDrawnAboveAPaneThatDrawsItsOwnTabStrip() await Assert.That(rects["below"]).IsEqualTo(new PaneRect(0, 15, 100, 15)); } + [Test] + public async Task NoDividerRowIsDrawnAboveAPaneWhosePanelDrawsAHeadingBand() + { + var below = Pane("below"); + below.DrawsHeading = true; + var root = new SplitNode(SplitDirection.Column, [Pane("top"), below]); + + var rects = LayoutSolver.Solve(root, Screen); + + await Assert.That(PaneExtent.DividerRows(root, 0)).IsEqualTo(0); + await Assert.That(PaneExtent.HeaderPanes(below).Select(p => p.Id)).IsEquivalentTo(["below"]); + await Assert.That(rects["below"].Y).IsEqualTo(rects["top"].Height); + } + + [Test] + public async Task OnlyTheComposerAndWhoHereDrawAHeadingBandAPaneCanStandOn() + { + await Assert.That(PanelSizing.DrawsHeadingBand(PanelIds.Composer)).IsTrue(); + await Assert.That(PanelSizing.DrawsHeadingBand(PanelIds.WhoHere)).IsTrue(); + await Assert.That(PanelSizing.DrawsHeadingBand(PanelIds.Vitals)).IsFalse(); + await Assert.That(PanelSizing.DrawsHeadingBand(PanelIds.Map)).IsFalse(); + await Assert.That(PanelSizing.DrawsHeadingBand(null)).IsFalse(); + } + [Test] public async Task APaneWithNoTabStripStillGetsItsDividerRow() { diff --git a/tests/SharpMUTerm.Tui.Tests/HeadingDividerTests.cs b/tests/SharpMUTerm.Tui.Tests/HeadingDividerTests.cs new file mode 100644 index 00000000..438763d7 --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/HeadingDividerTests.cs @@ -0,0 +1,141 @@ +using System.Drawing; +using SharpConsoleUI.Drivers; +using SharpMUTerm.Client.Panels; +using SharpMUTerm.Core.Theming; +using SharpMUTerm.Core.Workspaces; +using SharpMUTerm.Graphics; +using SharpMUTerm.Tui; +using SharpMUTerm.Tui.Panels; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// A docked panel's heading band is the boundary above its pane, as a tab strip is: Roleplay's composer stacked over +/// who-here has no divider row between them, the HERE band's empty run is the divider (hover, drag, double-click), and +/// the band's text is not. The window, whose native panels lie over that row, keeps its divider row. +/// +/// Serialised: rendering a frame redirects the process-global Console.Out. +[NotInParallel] +public class HeadingDividerTests +{ + private const int Width = 120; + private const int Height = 34; + + private static readonly TerminalCapabilities Headless = + new(GraphicsProtocol.None, supportsTrueColor: true, supportsKittyGraphics: false, supportsSixel: false); + + private static SharpMUTermApp App(HostChrome? chrome = null, string theme = "Dark") + { + Console.SetIn(TextReader.Null); + var config = DemoScene.Build(); + config.ThemeName = theme; + config.Theme = ThemeLibrary.Get(theme); + var host = ClientHost.Headless(new HeadlessConsoleDriver(Width, Height), Headless) with { Chrome = chrome ?? HostChrome.None }; + var app = new SharpMUTermApp(config, host); + app.RenderSnapshot("layout-roleplay"); + app.RenderNextFrame(); + return app; + } + + /// The side column's two panes, composer over who-here, by their whole rectangles. + private static (PaneRect Composer, PaneRect Here) Column(SharpMUTermApp app) + { + var rects = app.PaneSnapshot().Rects.Values.Where(r => r.X > Width / 2).OrderBy(r => r.Y).ToArray(); + return (rects[0], rects[1]); + } + + /// What the pointer finds along the top row of (not the divider column beside it). + private static IEnumerable<(Point Cell, PointerTarget Target)> Row(SharpMUTermApp app, PaneRect pane) => + Enumerable.Range(pane.X, pane.Width).Select(x => (new Point(x, pane.Y), app.TargetAt(new Point(x, pane.Y)))); + + [Test] + public async Task NoDividerRowIsDrawnAboveAPanelsHeadingBand() + { + var app = App(); + var (composer, here) = Column(app); + + await Assert.That(here.Y).IsEqualTo(composer.Y + composer.Height).Because("the HERE band is the boundary"); + var text = FrameGrid.Decode(app.RenderWholeFrame(), Width, Height); + await Assert.That(text[here.Y].Substring(here.X, here.Width)).Contains("HERE"); + } + + [Test] + public async Task TheBandsEmptyRunIsTheDividerAndItsWordsAreNot() + { + var app = App(); + var (_, here) = Column(app); + var text = FrameGrid.Decode(app.RenderWholeFrame(), Width, Height)[here.Y]; + + var divider = Row(app, here).Where(hit => hit.Target.Kind == PointerKind.Divider).ToArray(); + await Assert.That(divider).IsNotEmpty(); + await Assert.That(divider.All(hit => hit.Target.Shape == PointerShape.ResizeRows)).IsTrue(); + await Assert.That(divider[0].Target.Tooltip).Contains("above and below"); + await Assert.That(divider.All(hit => text[hit.Cell.X] == ' ')).IsTrue().Because("only blank band cells are the handle"); + await Assert.That(divider.Min(hit => hit.Cell.X)).IsGreaterThan(text.IndexOf("HERE", StringComparison.Ordinal)) + .Because("the run past the heading's words"); + await Assert.That(divider.Max(hit => hit.Cell.X)).IsEqualTo(here.X + here.Width - 1); + } + + [Test] + public async Task HoveringTheBandLightsOnlyItsEmptyRunAndMovesNoPane() + { + var app = App(); + var before = app.PaneOutputRects(); + var (_, here) = Column(app); + var cell = Row(app, here).First(hit => hit.Target.Kind == PointerKind.Divider).Cell; + var resting = FrameGrid.Backgrounds(app.RenderWholeFrame()); + + app.SimulatePointer(cell, MouseFlags.ReportMousePosition); + var lit = FrameGrid.Backgrounds(app.RenderWholeFrame()); + + await Assert.That(app.DividerLit).IsTrue(); + var changed = lit.Keys.Where(k => lit[k] != resting.GetValueOrDefault(k)).ToArray(); + await Assert.That(changed).IsNotEmpty(); + await Assert.That(changed.All(k => k.Row == here.Y && k.Column >= app.TargetAt(cell).Area.X)).IsTrue(); + await Assert.That(app.PaneOutputRects()).IsEquivalentTo(before); + + // Lit, the run is still found (it is read off the paint, where it now wears the hover colour). + await Assert.That(app.TargetAt(cell).Kind).IsEqualTo(PointerKind.Divider); + } + + [Test] + public async Task DraggingTheBandResizesTheStack() + { + var app = App(); + var (composer, here) = Column(app); + var cell = Row(app, here).First(hit => hit.Target.Kind == PointerKind.Divider).Cell; + + app.SimulatePointer(cell, MouseFlags.Button1Pressed); + app.SimulatePointer(cell with { Y = cell.Y + 3 }, MouseFlags.Button1Pressed, MouseFlags.Button1Dragged, MouseFlags.ReportMousePosition); + app.SimulatePointer(cell with { Y = cell.Y + 3 }, MouseFlags.Button1Released); + app.RenderNextFrame(); + + var (composerAfter, hereAfter) = Column(app); + await Assert.That(composerAfter.Height).IsEqualTo(composer.Height + 3); + await Assert.That(hereAfter.Y).IsEqualTo(here.Y + 3).Because("the band follows the pointer"); + } + + /// + /// The window draws who-here and the composer natively over their whole panes, heading row included, and those views + /// take the pointer, so the band's run could not be pressed there: the window keeps its divider row. + /// + [Test] + public async Task TheWindowKeepsItsDividerRowUnderTheNativePanels() + { + var app = App(HostChrome.Desktop); + var (composer, here) = Column(app); + + await Assert.That(here.Y).IsEqualTo(composer.Y + composer.Height + 1); + } + + /// The band does not wait for the roster: in a stack it is the boundary, and must not come and go. + [Test] + public async Task WhoHereDrawsItsBandBeforeTheGameHasSaidWhoIsThere() + { + var ink = new WhoHereRenderer.Ink("#00f5b7", HeadingBand.For(ThemeLibrary.Get("Dark"), "#00f5b7")); + var lines = WhoHereRenderer.Render(WhoHereModel.Unknown, 30, 6, ink); + + await Assert.That(FrameGrid.Visible(lines[0])).Contains("HERE"); + await Assert.That(FrameGrid.Visible(lines[1])).IsEqualTo(WhoHereRenderer.UnknownText); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/RailEdgeTests.cs b/tests/SharpMUTerm.Tui.Tests/RailEdgeTests.cs new file mode 100644 index 00000000..fdc5d4f8 --- /dev/null +++ b/tests/SharpMUTerm.Tui.Tests/RailEdgeTests.cs @@ -0,0 +1,44 @@ +using SharpMUTerm.Core.Configuration; +using SharpMUTerm.Core.Theming; +using SharpMUTerm.Tui; + +namespace SharpMUTerm.Tui.Tests; + +/// +/// Why the cell layout keeps a rule between the rail and the panes but no spacer beside it (wave 24). The Terminal-Main +/// mockup draws the rail straight against the output, the edge carried by the planes alone (#121216 against #1e1e24, +/// about 6 L*). Here the rail is the backdrop, and the planes beside it are not that far apart: an unfocused pane sits +/// one backdrop step above it and a tinted one sits lower still (TintDepth), so on every theme some pane meets +/// the rail at a step the eye cannot find on its own. The rule is what carries the edge there, and it is well clear of +/// the backdrop. The rail-coloured spacer that used to follow the rule separated nothing the rule had not, so that +/// column went to the panes (RailWindowRowTests.TheRailSpendsAtMostOneBlankColumnPastItsWidestRow). +/// +public class RailEdgeTests +{ + /// A step the eye finds on a terminal's worth of flat colour (WorkspacePaletteTests.Visible's figure, in L*). + private const double Visible = 8; + + private static double Lightness(SharpMUTerm.Core.Text.Rgb rgb) + { + var y = SharpMUTerm.Core.Text.Contrast.RelativeLuminance(rgb); + return y > 0.008856 ? (116 * Math.Cbrt(y)) - 16 : 903.3 * y; + } + + [Test] + [Arguments("Dark")] + [Arguments("Light")] + [Arguments("Solarized Dark")] + public async Task SomePaneMeetsTheRailAtAStepOnlyTheRuleCarries(string themeName) + { + var theme = ThemeLibrary.Get(themeName); + var rail = Lightness(WorkspacePalette.Backdrop(theme)); + var planes = Enum.GetValues() + .Select(tint => tint == PaneTint.None ? WorkspacePalette.Surface(theme) : WorkspacePalette.Tint(theme, tint)) + .ToList(); + var nearest = planes.Min(plane => Math.Abs(Lightness(plane) - rail)); + var rule = Math.Abs(Lightness(WorkspacePalette.Rule(theme)) - rail); + + await Assert.That(nearest).IsLessThan(Visible).Because("the planes alone would not show where the rail ends"); + await Assert.That(rule).IsGreaterThan(nearest).Because("the rule carries the edge the planes do not"); + } +} diff --git a/tests/SharpMUTerm.Tui.Tests/RailWindowRowTests.cs b/tests/SharpMUTerm.Tui.Tests/RailWindowRowTests.cs index 5e2331f6..684f68b6 100644 --- a/tests/SharpMUTerm.Tui.Tests/RailWindowRowTests.cs +++ b/tests/SharpMUTerm.Tui.Tests/RailWindowRowTests.cs @@ -244,9 +244,8 @@ public async Task ALabelLongerThanTheRailIsElidedRatherThanWrapped() /// /// The sidebar spends at most one blank column past its widest row. The other half of the width /// invariant: the rail must be wide enough for its rows (above) and no wider, because everything it - /// keeps is taken off the panes. One column and not two — a divider and a one-cell spacer already stand - /// between the rail's last cell and the first pane, so a second margin cell separates nothing from - /// nothing. Asserted on the demo, whose widest row is comfortably past RailMinWidth, so what is + /// keeps is taken off the panes. One column and not two — a divider already stands between the rail's + /// last cell and the first pane, so a second margin cell separates nothing from nothing. Asserted on the demo, whose widest row is comfortably past RailMinWidth, so what is /// being read is the margin rather than the floor. /// [Test] @@ -261,10 +260,11 @@ public async Task TheRailSpendsAtMostOneBlankColumnPastItsWidestRow() // And the layout spent exactly that. The line above is arithmetic over the rows and would still // pass if nothing applied the answer, so the claim is closed against the arranged pane rectangle: - // a pane starts past the rail, its divider and the one-cell spacer beside it - // (SharpMUTermApp.BuildWorkspaceRow), which is also the geometry per-pane NAWS is derived from. + // a pane starts just past the rail and its divider (SharpMUTermApp.BuildWorkspaceRow), which is also the + // geometry per-pane NAWS is derived from. It was + 2 until wave 24 gave the rail-coloured spacer column + // beside the divider back to the panes (RailEdgeTests says why the divider stayed and the spacer went). var rect = app.PaneOutputRects()[app.FocusedPaneId]; - await Assert.That(rect.X).IsEqualTo(app.RailColumnWidth + 2); + await Assert.That(rect.X).IsEqualTo(app.RailColumnWidth + 1); } /// From ac5d0c3948f16f3980c427d16ad6539f68686550 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 4 Nov 2026 21:32:44 +0000 Subject: [PATCH 086/113] Wave 24 C: meters have colours, and a low one is the warning red Each meter carries an optional colour (StatusMeter.Colour; absent means its label's default: health green, mana blue, movement gold). Client MeterColours maps palette names to the mockups' meter shades; VitalsMeter/VitalsTarget carry it, and the status row's labels, the cell vitals strip and card and the window's native gauges draw it held to their planes' floors. Low is ScreenPalette.Warn held to 4.5:1 in every host and theme. F7's meter table gains a colour column in both hosts. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Rqqt7SPYixp6Cg4JDKRTwx --- CHANGELOG.md | 3 + CLAUDE.md | 8 ++ src/SharpMUTerm.Avalonia/SettingsWindow.cs | 63 ++++++++++- src/SharpMUTerm.Avalonia/VitalsGauges.cs | 33 +++++- src/SharpMUTerm.Client/Panels/MeterColours.cs | 103 ++++++++++++++++++ src/SharpMUTerm.Client/Panels/VitalsModel.cs | 9 +- .../Settings/BuiltInSettings.cs | 5 +- .../Settings/SettingsForm.cs | 4 +- .../Configuration/StatusMeter.cs | 43 +++++++- src/SharpMUTerm.Tui/OptionsScreenRenderer.cs | 42 ++++++- .../Panels/VitalsStripRenderer.cs | 38 ++++--- src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs | 17 ++- src/SharpMUTerm.Tui/SharpMUTermApp.cs | 2 +- src/SharpMUTerm.Tui/StatusMeterRenderer.cs | 19 +++- src/SharpMUTerm.Tui/WorkspacePalette.cs | 18 ++- .../DesktopLayerTests.cs | 19 ++++ .../SettingsWindowTests.cs | 22 +++- .../MeterColourTests.cs | 89 +++++++++++++++ tests/SharpMUTerm.Tui.Tests/GameDataTests.cs | 13 ++- .../TerminalPanelTests.cs | 57 ++++++++++ 20 files changed, 554 insertions(+), 53 deletions(-) create mode 100644 src/SharpMUTerm.Client/Panels/MeterColours.cs create mode 100644 tests/SharpMUTerm.Client.Tests/MeterColourTests.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index f5acc6e1..e5945bec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,9 @@ and a release's notes are its section. The procedure is in [`docs/RELEASING.md`] - In the terminal, a docked panel's heading band is the boundary between stacked panes: Roleplay's composer and the who-is-here list no longer have a grey row between them (drag the HERE band's empty part to resize), and the panes are one column wider, because the spare column between the sidebar's rule and the output is gone. +- Vitals have colours: health is green, mana blue and movement gold on the status row, the terminal's vitals strip and card, + and the desktop window's gauges, and the target's bar is orange. A low vital turns red everywhere. Pick any meter's + colour in F7's meter table (a new colour column; `auto` keeps the default for its name). - In the desktop window, Combat's map uses its pane: rooms are drawn at full size, every room's name is written out in full where it fits without covering another room or name (shortened only where it truly cannot fit), the map pane no longer repeats a lone "Map" tab above its own heading, and the vitals card is only as tall as its gauges, so the map diff --git a/CLAUDE.md b/CLAUDE.md index ba2147c7..fee220a3 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -133,6 +133,14 @@ fallbacks) for inline images/maps. - **A meter is drawn only once its value has arrived, and from then its fields are reserved** (value and max five cells each, `StatusMeter.Fit` scales past that). A world with no game data costs the row nothing; one with it never reflows the row as numbers change. + - **Each meter has a colour** (`StatusMeter.Colour`, null = `DefaultColour(label)`: hp green, mp blue, mv gold, else the + accent; no schema bump, absent means default; the one-line form writes ` @name`). Client `MeterColours` turns a palette + name into a *meter shade* (the mockups' `#4cc38a`/`#5aa9e6`, not web green/blue), `VitalsMeter.Colour` and + `VitalsTarget.Colour` (`#ff8a65`) carry it, and each host holds it on its own plane: the cell strip and card + (`VitalsStripRenderer.Ink.For`/`Hold`) and the native gauges (`VitalsGauges.FillFor`) to 3:1 on the pane, the status row's + label (`StatusMeterInk`) to 4.5:1 on the row. **Low is the warning red in all three** (`WorkspacePalette.Low` = + `ScreenPalette.Warn` held to 4.5:1, every theme): it was the notice amber, which said nothing beside a gold movement bar. + F7's meter table has a colour column (`auto` + the highlight palette, typed `#rrggbb` too) in both hosts. - **Maps** (`Core/Mapping`: `WorldMap`, `MapRoom`, `PathFinder`, `MapStore`). Mudlet's room model (id, area, x/y/z, exits by direction and by command, room and exit weights, locks). `MapStore` keeps one file per **endpoint** under `maps/` (`MsspCache`'s reasoning), memory-only with no directory, never overwrites a diff --git a/src/SharpMUTerm.Avalonia/SettingsWindow.cs b/src/SharpMUTerm.Avalonia/SettingsWindow.cs index 6934080b..fbf17890 100644 --- a/src/SharpMUTerm.Avalonia/SettingsWindow.cs +++ b/src/SharpMUTerm.Avalonia/SettingsWindow.cs @@ -12,6 +12,7 @@ using Avalonia.Themes.Fluent; using Avalonia.Threading; using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Client.Panels; using SharpMUTerm.Client.Settings; using SharpMUTerm.Core.Configuration; @@ -1131,10 +1132,10 @@ private StackPanel MeterTable(ListField field) var meters = _form.Meters(field); _meterRows = meters.Count; - var grid = new Grid { ColumnDefinitions = new ColumnDefinitions("120,*,*,120,32"), ColumnSpacing = 8, RowSpacing = 8 }; + var grid = new Grid { ColumnDefinitions = new ColumnDefinitions("120,*,*,130,120,32"), ColumnSpacing = 8, RowSpacing = 8 }; MeterGrid = grid; _controls[field.Id] = grid; - string[] headings = ["Label", "Value path", "Maximum path", "Live value"]; + string[] headings = ["Label", "Value path", "Maximum path", "Colour", "Live value"]; grid.RowDefinitions.Add(new RowDefinition(GridLength.Auto)); for (var c = 0; c < headings.Length; c++) { @@ -1189,7 +1190,8 @@ private StackPanel MeterTable(ListField field) Commit(); }; - Control[] cells = [label, value, max, now, remove]; + var colour = MeterColourBox(meter, row, Commit); + Control[] cells = [label, value, max, colour, now, remove]; for (var c = 0; c < cells.Length; c++) { Grid.SetRow(cells[c], row); @@ -1270,6 +1272,61 @@ private StackPanel MeterTable(ListField field) return outer; } + /// + /// A meter's colour: auto (its label's default) or a highlight palette name, each item a swatch of the colour the + /// meter is drawn in and its name. A colour typed in the cells that no name covers (#rrggbb) is listed too, so + /// opening the page shows it. A choice is stored through , the funnel. + /// + private ComboBox MeterColourBox(StatusMeter meter, int row, Action commit) + { + var current = MeterColours.Label(meter); + var names = MeterColours.Choices.Contains(current, StringComparer.OrdinalIgnoreCase) + ? MeterColours.Choices.ToList() + : [.. MeterColours.Choices, current]; + var box = new ComboBox + { + ItemsSource = names.Select(n => MeterColourItem(n, meter)).ToList(), + SelectedIndex = Math.Max(0, names.FindIndex(n => string.Equals(n, current, StringComparison.OrdinalIgnoreCase))), + HorizontalAlignment = HorizontalAlignment.Stretch, + FontSize = NativeTokens.Label, + }; + AutomationProperties.SetName(box, $"meter {row} colour"); + box.SelectionChanged += (_, _) => + { + if (box.SelectedIndex < 0 || box.SelectedIndex >= names.Count) + { + return; + } + + var picked = names[box.SelectedIndex]; + if (!string.Equals(picked, current, StringComparison.OrdinalIgnoreCase)) + { + meter.Colour = MeterColours.TryNormalise(picked, out var stored) ? stored : null; + commit(); + } + }; + return box; + } + + /// One colour in the meter colour box: a swatch (auto's is the label's default) and the name. + private StackPanel MeterColourItem(string name, StatusMeter meter) + { + var hex = name == MeterColours.Auto ? MeterColours.Hex(StatusMeter.DefaultColour(meter.Label)) : MeterColours.Hex(name); + var panel = new StackPanel { Orientation = Orientation.Horizontal, Spacing = NativeTokens.Space8 }; + panel.Children.Add(new Border + { + Width = 12, + Height = 12, + CornerRadius = new CornerRadius(NativeTokens.RadiusS), + Background = hex is not null && Color.TryParse(hex, out var colour) ? new SolidColorBrush(colour) : Brushes.Transparent, + BorderThickness = hex is null ? new Thickness(NativeTokens.Hairline) : default, + BorderBrush = DimInk, + VerticalAlignment = VerticalAlignment.Center, + }); + panel.Children.Add(new TextBlock { Text = name, VerticalAlignment = VerticalAlignment.Center, Foreground = _tokens.Page.Brush(_tokens.Page.Text) }); + return panel; + } + /// The page's monospace face, for paths and values (the mockup's game-text face). private static FontFamily Mono => NativeTokens.MonoFont; diff --git a/src/SharpMUTerm.Avalonia/VitalsGauges.cs b/src/SharpMUTerm.Avalonia/VitalsGauges.cs index 75ffb391..e6c6c40a 100644 --- a/src/SharpMUTerm.Avalonia/VitalsGauges.cs +++ b/src/SharpMUTerm.Avalonia/VitalsGauges.cs @@ -39,6 +39,27 @@ public VitalsGauges() /// Whether the meters are stacked (true) or side by side. Internal for tests. internal bool Stacked => StackedFor(Bounds.Height > 0 ? Bounds.Height : Height, _model); + /// + /// What a bar is filled with: the warning when low, else the meter's own colour () held + /// to the floor on the pane's plane — the cells' rule — else the panel's bar ink. Internal for tests. + /// + internal Color FillFor(string? colour, bool low) + { + if (low) + { + return Parse(_ink.Low); + } + + if (colour is null || !Color.TryParse(colour, out var own)) + { + return Parse(_ink.Bar); + } + + var held = SharpMUTerm.Core.Text.Contrast.Legible( + new SharpMUTerm.Core.Text.Rgb(own.R, own.G, own.B), new SharpMUTerm.Core.Text.Rgb(_plane.R, _plane.G, _plane.B)); + return Color.FromRgb(held.R, held.G, held.B); + } + /// The bars drawn on the last render, in order: each bar's track and filled part. Internal for tests. internal IReadOnlyList<(Rect Track, Rect Fill, bool Low)> DrawnBars => _drawn; @@ -132,7 +153,7 @@ private void RenderStacked(DrawingContext context, Rect bounds) var title = low ? $"{meter.Title} · low" : meter.Title; PanelText.Draw(context, title, inner.Left, middle, size, low ? warn : _text, low, inner.Width * 0.6); PanelText.Draw(context, Numbers(meter), inner.Right, middle, size, low ? warn : _text, false, inner.Width * 0.4, alignRight: true); - DrawBar(context, new Rect(inner.Left, y + label + 4, inner.Width, barHeight), meter.HasMax ? meter.Share ?? 0 : 1, low); + DrawBar(context, new Rect(inner.Left, y + label + 4, inner.Width, barHeight), meter.HasMax ? meter.Share ?? 0 : 1, low, meter.Colour); y += block; } @@ -146,7 +167,7 @@ private void RenderStacked(DrawingContext context, Rect bounds) if (target.Share is { } share) { PanelText.Draw(context, Percent(share), inner.Right, middle, size, _text, false, inner.Width * 0.25, alignRight: true); - DrawBar(context, new Rect(inner.Left, y + label + 4, inner.Width, Math.Max(4, barHeight - 4)), share, target.Low); + DrawBar(context, new Rect(inner.Left, y + label + 4, inner.Width, Math.Max(4, barHeight - 4)), share, target.Low, target.Colour); } } } @@ -195,7 +216,7 @@ private void RenderRow(DrawingContext context, Rect bounds) var barRight = x + unit - numbersWidth - 8; if (barRight - barLeft >= 8) { - DrawBar(context, new Rect(barLeft, middle - (barHeight / 2), barRight - barLeft, barHeight), meter.HasMax ? meter.Share ?? 0 : 1, low); + DrawBar(context, new Rect(barLeft, middle - (barHeight / 2), barRight - barLeft, barHeight), meter.HasMax ? meter.Share ?? 0 : 1, low, meter.Colour); } x += unit + gap; @@ -215,7 +236,7 @@ private void RenderRow(DrawingContext context, Rect bounds) var barRight = inner.Right - pctWidth - 8; if (barRight - barLeft >= 8) { - DrawBar(context, new Rect(barLeft, middle - (barHeight / 2), barRight - barLeft, barHeight), target.Share!.Value, target.Low); + DrawBar(context, new Rect(barLeft, middle - (barHeight / 2), barRight - barLeft, barHeight), target.Share!.Value, target.Low, target.Colour); } } } @@ -244,7 +265,7 @@ private static FormattedText Format(string text, double size, Color colour, bool return formatted; } - private void DrawBar(DrawingContext context, Rect track, double share, bool low) + private void DrawBar(DrawingContext context, Rect track, double share, bool low, string? colour) { // Flat fills on a track one step off the plane, rounded to the bar's height: the mockups' gauge. var radius = track.Height / 2; @@ -252,7 +273,7 @@ private void DrawBar(DrawingContext context, Rect track, double share, bool low) var fill = new Rect(track.X, track.Y, track.Width * Math.Clamp(share, 0, 1), track.Height); if (fill.Width > 0.5) { - context.DrawRectangle(new SolidColorBrush(Parse(low ? _ink.Low : _ink.Bar)), null, fill, radius, radius); + context.DrawRectangle(new SolidColorBrush(FillFor(colour, low)), null, fill, radius, radius); } _drawn.Add((track, fill, low)); diff --git a/src/SharpMUTerm.Client/Panels/MeterColours.cs b/src/SharpMUTerm.Client/Panels/MeterColours.cs new file mode 100644 index 00000000..a8d09983 --- /dev/null +++ b/src/SharpMUTerm.Client/Panels/MeterColours.cs @@ -0,0 +1,103 @@ +using SharpMUTerm.Client.Settings; +using SharpMUTerm.Core.Configuration; + +namespace SharpMUTerm.Client.Panels; + +/// +/// What colour a meter is drawn in, as #rrggbb before any host holds it to its plane's floor. A meter's colour is +/// written as F2's highlight colours are (: a palette name, #rrggbb, idx:N); +/// a palette name is drawn in a meter shade of that name rather than its web colour, because web green is +/// #008000 and web blue #0000ff, a mud and a hole on a dark pane. The shades are the mockups' gauges +/// (health #4cc38a, movement #5aa9e6, target #ff8a65) and their neighbours at the same weight. +/// +public static class MeterColours +{ + /// What a meter with no colour of its own reads as in a picker: its label's default (). + public const string Auto = "auto"; + + /// The names a meter's colour is picked from: , then the highlight palette's names. + public static IReadOnlyList Choices { get; } = [Auto, .. HighlightColours.NameColours]; + + /// What the target's bar is drawn in (the mockups' #ff8a65); a low target is the warning colour. + public const string Target = "#ff8a65"; + + private static readonly IReadOnlyDictionary Shades = new Dictionary(StringComparer.OrdinalIgnoreCase) + { + ["red"] = "#ff6b6b", + ["orange"] = "#ff8a65", + ["gold"] = "#e8b84a", + ["yellow"] = "#f5e663", + ["lime"] = "#9be15d", + ["green"] = "#4cc38a", + ["cyan"] = "#4fd6e8", + ["teal"] = "#2ec4b6", + ["blue"] = "#5aa9e6", + ["magenta"] = "#e06bd8", + ["purple"] = "#a98bf0", + ["pink"] = "#f08ab8", + ["white"] = "#e8ecf4", + ["silver"] = "#b8c0cc", + ["grey"] = "#8a93a3", + ["black"] = "#3a4257", + }; + + /// The meter's colour (its own, else its label's default) as #rrggbb, or null for the client's accent. + public static string? For(StatusMeter meter) + { + ArgumentNullException.ThrowIfNull(meter); + return Hex(meter.EffectiveColour); + } + + /// A meter colour as written (green, #4cc38a, idx:2) as #rrggbb; null for none, auto or nonsense. + public static string? Hex(string? colour) + { + if (string.IsNullOrWhiteSpace(colour) || colour.Trim().Equals(Auto, StringComparison.OrdinalIgnoreCase)) + { + return null; + } + + var text = colour.Trim(); + if (Shades.TryGetValue(text, out var shade)) + { + return shade; + } + + return HighlightColours.TryParse(text, out var parsed) ? HighlightColours.Hex(parsed) : null; + } + + /// What a colour column shows for a meter: its own colour as written, else . + public static string Label(StatusMeter meter) + { + ArgumentNullException.ThrowIfNull(meter); + return string.IsNullOrWhiteSpace(meter.Colour) ? Auto : meter.Colour.Trim(); + } + + /// + /// A typed or picked colour as it is stored: null for or blank, a palette name lower-cased, anything + /// else reads kept as written. False (and nothing stored) for text that names no colour. + /// + public static bool TryNormalise(string? text, out string? stored) + { + stored = null; + if (string.IsNullOrWhiteSpace(text) || text.Trim().Equals(Auto, StringComparison.OrdinalIgnoreCase) + || text.Trim().Equals(HighlightColours.None, StringComparison.OrdinalIgnoreCase)) + { + return true; + } + + var trimmed = text.Trim(); + if (Shades.ContainsKey(trimmed)) + { + stored = trimmed.ToLowerInvariant(); + return true; + } + + if (HighlightColours.TryParse(trimmed, out var parsed) && parsed is not null) + { + stored = trimmed; + return true; + } + + return false; + } +} diff --git a/src/SharpMUTerm.Client/Panels/VitalsModel.cs b/src/SharpMUTerm.Client/Panels/VitalsModel.cs index 2500565d..3deae498 100644 --- a/src/SharpMUTerm.Client/Panels/VitalsModel.cs +++ b/src/SharpMUTerm.Client/Panels/VitalsModel.cs @@ -12,7 +12,11 @@ namespace SharpMUTerm.Client.Panels; /// Whether the meter is configured with a maximum at all, sent yet or not. /// Value over maximum, when both are numbers and the maximum is positive. /// Whether is under . -public sealed record VitalsMeter(string Label, string Value, string? Max, bool HasMax, double? Share, bool Low) +/// +/// The meter's colour as #rrggbb (), before any host holds it to its plane; null for +/// the client's accent. A low meter is drawn in the warning colour instead, in every view. +/// +public sealed record VitalsMeter(string Label, string Value, string? Max, bool HasMax, double? Share, bool Low, string? Colour = null) { /// /// The label spelt out where a view has the room: hp reads as Health, mp as Mana. @@ -24,7 +28,8 @@ public sealed record VitalsMeter(string Label, string Value, string? Max, bool H /// What the character is fighting, when the game says. /// The target's name, bounded by . /// Its health as a share of its maximum, when the game sends one. -public sealed record VitalsTarget(string Name, double? Share) +/// Its bar's colour as #rrggbb before the floor (); low is the warning colour. +public sealed record VitalsTarget(string Name, double? Share, string? Colour = MeterColours.Target) { /// Whether the target is below . public bool Low => Share < VitalsModel.LowShare; diff --git a/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs b/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs index 4bcf44c8..53e76058 100644 --- a/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs +++ b/src/SharpMUTerm.Client/Settings/BuiltInSettings.cs @@ -107,11 +107,12 @@ public static partial class BuiltInSettings new TextField("label", "label", StatusMeter.MaxLabelLength), new TextField("value", "value path"), new TextField("max", "maximum path"), + new TextField("colour", "colour"), ], - "game data the status row shows, such as hp 412/500") + "game data the status row shows, such as hp 412/500, each in its own colour") { Group = MetersGroup, - Keywords = "gauge gmcp msdp vitals hp mana status", + Keywords = "gauge gmcp msdp vitals hp mana status colour color", Binding = new SettingBinding>( c => c.Text.StatusMeters, (c, v) => c.Text.StatusMeters = v, diff --git a/src/SharpMUTerm.Client/Settings/SettingsForm.cs b/src/SharpMUTerm.Client/Settings/SettingsForm.cs index eb22ddb9..02004d40 100644 --- a/src/SharpMUTerm.Client/Settings/SettingsForm.cs +++ b/src/SharpMUTerm.Client/Settings/SettingsForm.cs @@ -1,4 +1,5 @@ using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Client.Panels; using SharpMUTerm.Core.Automation; using SharpMUTerm.Core.Configuration; @@ -599,6 +600,7 @@ public void SetMeters(ListField field, IEnumerable meters) Label = StatusMeter.Clip(m.Label.Trim()), Value = m.Value.Trim(), Max = string.IsNullOrWhiteSpace(m.Max) ? null : m.Max.Trim(), + Colour = MeterColours.TryNormalise(m.Colour, out var colour) ? colour : null, }).ToList(); Set(binding, list); } @@ -626,5 +628,5 @@ public void OpenScreen(string sectionId) /// Raises ; the client calls it once a committed change has landed. public void NotifyChanged() => Changed?.Invoke(); - private static StatusMeter Copy(StatusMeter m) => new() { Label = m.Label, Value = m.Value, Max = m.Max }; + private static StatusMeter Copy(StatusMeter m) => new() { Label = m.Label, Value = m.Value, Max = m.Max, Colour = m.Colour }; } diff --git a/src/SharpMUTerm.Core/Configuration/StatusMeter.cs b/src/SharpMUTerm.Core/Configuration/StatusMeter.cs index a102bd2f..573f0f22 100644 --- a/src/SharpMUTerm.Core/Configuration/StatusMeter.cs +++ b/src/SharpMUTerm.Core/Configuration/StatusMeter.cs @@ -20,6 +20,32 @@ public sealed class StatusMeter /// The maximum's path, or null for a meter with none (gold). public string? Max { get; set; } + /// + /// The colour the meter's bar and label are drawn in: a palette name (green) or #rrggbb, as F2's highlight + /// colours are written. Null (absent from a saved file) means the default for the label (), + /// so a configuration from before the field needs no migration. Every host holds it to the legibility floor on the + /// plane it lands on, and a low meter is drawn in the warning colour whatever this says. + /// + public string? Colour { get; set; } + + /// + /// The colour a meter with none of its own is drawn in, by the label every MUD shares: health green, mana blue, + /// movement gold; null (the client's accent) for anything else. + /// + public static string? DefaultColour(string? label) => (label ?? string.Empty).Trim().ToLowerInvariant() switch + { + "hp" or "health" => "green", + "mp" or "sp" or "mana" => "blue", + "mv" or "moves" or "move" or "movement" => "gold", + "ep" or "en" or "endurance" => "teal", + "wp" or "willpower" => "purple", + "st" or "sta" or "stamina" => "orange", + _ => null, + }; + + /// The colour this meter is drawn in: its own, else for its label. + public string? EffectiveColour => string.IsNullOrWhiteSpace(Colour) ? DefaultColour(Label) : Colour.Trim(); + /// The longest label the row draws. public const int MaxLabelLength = 8; @@ -81,7 +107,8 @@ public static IReadOnlyList MsdpVariables(IEnumerable meter .ToArray(); /// - /// Writes meters as the one-line form F7 edits: hp=Char.Vitals.hp/Char.Vitals.maxhp; gold=Char.Status.gold. + /// Writes meters as the one-line form F7 edits: hp=Char.Vitals.hp/Char.Vitals.maxhp; gold=Char.Status.gold, + /// a meter's own colour after an @ (hp=Char.Vitals.hp @lime). /// public static string Format(IEnumerable meters) { @@ -98,6 +125,11 @@ public static string Format(IEnumerable meters) { sb.Append('/').Append(meter.Max); } + + if (!string.IsNullOrWhiteSpace(meter.Colour)) + { + sb.Append(" @").Append(meter.Colour.Trim()); + } } return sb.ToString(); @@ -120,6 +152,14 @@ public static List Parse(string? text) var label = part[..eq].Trim(); var paths = part[(eq + 1)..]; + string? colour = null; + var at = paths.LastIndexOf(" @", StringComparison.Ordinal); + if (at >= 0) + { + colour = paths[(at + 2)..].Trim(); + paths = paths[..at]; + } + var slash = paths.IndexOf('/', StringComparison.Ordinal); var value = (slash < 0 ? paths : paths[..slash]).Trim(); var max = slash < 0 ? null : paths[(slash + 1)..].Trim(); @@ -133,6 +173,7 @@ public static List Parse(string? text) Label = label.Length > MaxLabelLength ? label[..MaxLabelLength] : label, Value = value, Max = string.IsNullOrEmpty(max) ? null : max, + Colour = string.IsNullOrEmpty(colour) ? null : colour, }); } diff --git a/src/SharpMUTerm.Tui/OptionsScreenRenderer.cs b/src/SharpMUTerm.Tui/OptionsScreenRenderer.cs index 8558a02b..ae5f5f47 100644 --- a/src/SharpMUTerm.Tui/OptionsScreenRenderer.cs +++ b/src/SharpMUTerm.Tui/OptionsScreenRenderer.cs @@ -1,9 +1,11 @@ using System.Globalization; using SharpMUTerm.Client.Contributions; +using SharpMUTerm.Client.Panels; using SharpMUTerm.Client.Settings; using SharpMUTerm.Core.Configuration; using SharpMUTerm.Core.Input; using SharpMUTerm.Core.Protocols; +using SharpMUTerm.Core.Text; using static SharpMUTerm.Tui.MarkupText; using static SharpMUTerm.Tui.ScreenPalette; @@ -691,6 +693,9 @@ private static OptionRow Row(SettingsField field, AppConfiguration config) /// The cells the meter table's label column takes (a label is at most eight). private const int MeterLabelWidth = StatusMeter.MaxLabelLength + 1; + /// The cells its colour column takes: magenta and a cell. + private const int MeterColourWidth = 8; + /// The cells its now column takes: 1000/1000 and a cell. private const int MeterNowWidth = 11; @@ -737,6 +742,7 @@ private static OptionRow Row(SettingsField field, AppConfiguration config) ScreenField.Text("label", () => meter.Label, v => meter.Label = StatusMeter.Clip(v)), PathField("value path", () => meter.Value, v => meter.Value = v ?? string.Empty, received, required: true), PathField("maximum path", () => meter.Max, v => meter.Max = v, received, required: false), + ColourField(() => MeterColours.Label(meter), v => meter.Colour = v), }; rows.Add(new OptionRow( meter.Label, null, null, @@ -802,10 +808,22 @@ private static ScreenField PathField( ChoiceCaption: ReceivedCaption); } + /// + /// A meter's colour: (its label's default) or a highlight palette name, stepped with + /// ↑↓ or typed — #rrggbb too, as F2's highlight takes it. Stored through . + /// + private static ScreenField ColourField(Func get, Action set) => + new( + "colour", + get, + value => MeterColours.TryNormalise(value, out _) ? null : $"{value.Trim()} is not a colour", + value => set(MeterColours.TryNormalise(value, out var stored) ? stored : null), + MeterColours.Choices); + /// How wide the table's two path columns are at . private static (int Value, int Max) PathWidths(int width) { - var room = (width > 0 ? width : 100) - AffordanceWidth - MeterLabelWidth - MeterNowWidth - (3 * MeterGap); + var room = (width > 0 ? width : 100) - AffordanceWidth - MeterLabelWidth - MeterColourWidth - MeterNowWidth - (4 * MeterGap); room = Math.Max(16, room); return (room / 2, room - (room / 2)); } @@ -818,6 +836,7 @@ private static string MeterHeading(int width, bool changed) + "label".PadRight(MeterLabelWidth) + gap + "value path".PadRight(value) + gap + "maximum path".PadRight(max) + gap + + "colour".PadRight(MeterColourWidth) + gap + "now"; return $"[dim]{line}[/]" + (changed ? Changed() : string.Empty); } @@ -831,7 +850,11 @@ private static string MeterRow(StatusMeter meter, GameDataStore? data, ScreenFie var (valueWidth, maxWidth) = PathWidths(width); var gap = new string(' ', MeterGap); var line = new System.Text.StringBuilder(new string(' ', AffordanceWidth)); - var cells = new[] { (meter.Label, MeterLabelWidth), (meter.Value, valueWidth), (meter.Max ?? string.Empty, maxWidth) }; + var cells = new[] + { + (meter.Label, MeterLabelWidth), (meter.Value, valueWidth), (meter.Max ?? string.Empty, maxWidth), + (MeterColours.Label(meter), MeterColourWidth), + }; for (var i = 0; i < cells.Length; i++) { var (text, cell) = cells[i]; @@ -844,13 +867,26 @@ private static string MeterRow(StatusMeter meter, GameDataStore? data, ScreenFie var shown = string.IsNullOrEmpty(text) ? "—" : text; var display = Escape(ElidePlain(shown, cell - 1).PadRight(cell - 1)); - line.Append(PadVisible(ScreenChrome.Field($"[{ScreenPalette.Value}]{display}[/]", null), cell)).Append(gap); + var ink = i == 3 ? MeterColourInk(meter) : ScreenPalette.Value; + line.Append(PadVisible(ScreenChrome.Field($"[{ink}]{display}[/]", null), cell)).Append(gap); } line.Append(Now(meter, data)); return line.ToString(); } + /// + /// The colour column's ink: the colour the meter is drawn in (its own, or auto's default), held to the floor on + /// the field's well, so the name is its own sample; the value ink for a meter that takes the accent. + /// + private static string MeterColourInk(StatusMeter meter) => + MeterColours.For(meter) is { } hex + ? Contrast.Legible(ToRgb(hex), ToRgb(ScreenPalette.FieldBg)).ToHex() + : ScreenPalette.Value; + + private static Core.Text.Rgb ToRgb(string hex) => new( + Convert.ToByte(hex.Substring(1, 2), 16), Convert.ToByte(hex.Substring(3, 2), 16), Convert.ToByte(hex.Substring(5, 2), 16)); + /// The now column: 412/500, 412 with no maximum, or . internal static string Now(StatusMeter meter, GameDataStore? data) => NowText(meter, data) is { } text diff --git a/src/SharpMUTerm.Tui/Panels/VitalsStripRenderer.cs b/src/SharpMUTerm.Tui/Panels/VitalsStripRenderer.cs index feffb890..688350d5 100644 --- a/src/SharpMUTerm.Tui/Panels/VitalsStripRenderer.cs +++ b/src/SharpMUTerm.Tui/Panels/VitalsStripRenderer.cs @@ -23,8 +23,16 @@ internal static class VitalsStripRenderer /// The meter's mark when it is below . internal const string LowMark = "low"; - /// The panel's colours: the bars, the warning, the empty part of a bar, and the card heading's band. - internal readonly record struct Ink(string Bar, string Low, string Empty, HeadingBand.Ink? Heading = null); + /// + /// The panel's colours: the bars (a meter with no colour of its own), the warning, the empty part of a bar, the card + /// heading's band, and how a meter's own colour is held to the pane's floor (none: every bar is ). + /// + internal readonly record struct Ink(string Bar, string Low, string Empty, HeadingBand.Ink? Heading = null, Func? Hold = null) + { + /// What a bar is drawn in: the warning when low, else its own colour held to the floor, else . + public string For(string? colour, bool low) => + low ? Low : colour is not null && Hold is { } hold ? hold(colour) : Bar; + } /// The one-cell low mark the tighter levels use in place of . internal const string ShortLowMark = "!"; @@ -50,7 +58,8 @@ internal static class VitalsStripRenderer /// The strip for a box cells wide, or empty when no meter has a value and the game /// names no target. /// - internal static string Render(IReadOnlyList meters, CombatTarget? target, int width, Ink ink) + internal static string Render( + IReadOnlyList meters, CombatTarget? target, int width, Ink ink, string? targetColour = null) { if (meters.Count == 0 && target is null) { @@ -61,7 +70,7 @@ internal static string Render(IReadOnlyList me string? last = null; foreach (var level in Levels) { - last = Compose(meters, target, level, width, ink); + last = Compose(meters, target, level, width, ink, targetColour); if (VisibleLength(last) <= width) { return last; @@ -74,10 +83,11 @@ internal static string Render(IReadOnlyList me /// The strip for a : the same model the window's native gauges are drawn from. internal static string Render(VitalsModel vitals, int width, Ink ink) => Render( - [.. vitals.Meters.Select(m => new StatusMeterRenderer.MeterReading(m.Label, m.Value, m.Max, m.HasMax, m.Share, m.Low))], + [.. vitals.Meters.Select(m => new StatusMeterRenderer.MeterReading(m.Label, m.Value, m.Max, m.HasMax, m.Share, m.Low, m.Colour))], vitals.Target is { } target ? new CombatTarget(target.Name, target.Share) : null, width, - ink); + ink, + vitals.Target?.Colour); /// /// The card a tall vitals pane draws (): a heading, then per meter its title @@ -111,7 +121,7 @@ internal static IReadOnlyList RenderCard(VitalsModel vitals, int width, { foreach (var meter in vitals.Meters) { - var colour = meter.Low ? ink.Low : ink.Bar; + var colour = ink.For(meter.Colour, meter.Low); var title = Escape(Fit(meter.Low ? $"{meter.Title} · {LowMark}" : meter.Title, width - 1)); lines.Add(Spread(meter.Low ? $"[bold {colour}]{title}[/]" : $"[bold]{title}[/]", Numbers(meter), width)); lines.Add(Bar(meter.HasMax ? meter.Share ?? 0 : 1, width, colour, ink)); @@ -124,7 +134,7 @@ internal static IReadOnlyList RenderCard(VitalsModel vitals, int width, var percent = target.Share is { } share ? StatusMeterRenderer.Percent(share) : string.Empty; var name = Escape(Fit(target.Name, Math.Max(1, width - 8 - percent.Length))); lines.Add(Spread("[dim]Target[/] " + (target.Low ? $"[{ink.Low}]{name}[/]" : name), percent, width)); - lines.Add(target.Share is { } s ? Bar(s, width, target.Low ? ink.Low : ink.Bar, ink) : string.Empty); + lines.Add(target.Share is { } s ? Bar(s, width, ink.For(target.Colour, target.Low), ink) : string.Empty); } return lines; @@ -133,7 +143,7 @@ internal static IReadOnlyList RenderCard(VitalsModel vitals, int width, // One row a meter: the label, a bar in what is left, the value. foreach (var meter in vitals.Meters.Take(Math.Max(1, height - (vitals.Target is null ? 0 : 1)))) { - var colour = meter.Low ? ink.Low : ink.Bar; + var colour = ink.For(meter.Colour, meter.Low); var value = Escape(StatusMeter.Fit(meter.Value, StatusMeterRenderer.ValueWidth)); var label = Fit(meter.Label, 4).PadRight(4); var bar = Math.Max(0, width - label.Length - VisibleLength(value) - 2); @@ -170,7 +180,7 @@ private static string Fit(string text, int width) => width <= 0 ? string.Empty : text.Length <= width ? text : text[..Math.Max(0, width - 1)] + "…"; private static string Compose( - IReadOnlyList meters, CombatTarget? target, Level level, int width, Ink ink) + IReadOnlyList meters, CombatTarget? target, Level level, int width, Ink ink, string? targetColour) { var left = string.Join(new string(' ', level.Gap), meters.Select(m => Meter(m, level, ink))); if (target is null) @@ -178,7 +188,7 @@ private static string Compose( return left; } - var right = Target(target, level, ink); + var right = Target(target, level, ink, targetColour); var gap = width - VisibleLength(left) - VisibleLength(right); return left.Length == 0 ? new string(' ', Math.Max(0, gap)) + right @@ -189,7 +199,7 @@ private static string Meter(StatusMeterRenderer.MeterReading meter, Level level, { var sb = new StringBuilder(); sb.Append($"[dim]{Escape(meter.Label)}[/]"); - var colour = meter.Low ? ink.Low : ink.Bar; + var colour = ink.For(meter.Colour, meter.Low); if (!level.Values) { var text = meter.Share is { } share @@ -220,7 +230,7 @@ private static string Meter(StatusMeterRenderer.MeterReading meter, Level level, return sb.ToString(); } - private static string Target(CombatTarget target, Level level, Ink ink) + private static string Target(CombatTarget target, Level level, Ink ink, string? colour) { var name = target.Name.Length <= level.TargetName ? target.Name.PadRight(level.TargetName) @@ -231,7 +241,7 @@ private static string Target(CombatTarget target, Level level, Ink ink) var low = share < StatusMeterRenderer.LowShare; if (level.TargetBar > 0) { - sb.Append(' ').Append(Bar(share, level.TargetBar, low ? ink.Low : ink.Bar, ink)); + sb.Append(' ').Append(Bar(share, level.TargetBar, ink.For(colour, low), ink)); } sb.Append($" [bold]{StatusMeterRenderer.Percent(share).PadLeft(StatusMeterRenderer.ShareWidth)}[/]"); diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs index e2c1fcad..0d5080a3 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.Panels.cs @@ -220,7 +220,7 @@ private IWindowControl NewVitalsPanel(TerminalPanelContext context) var configured = PanelMeters(sessionKey); var meters = StatusMeterRenderer.Read(configured, data) - .Select(m => new VitalsMeter(m.Label, m.Value, m.Max, m.HasMax, m.Share, m.Low)) + .Select(m => new VitalsMeter(m.Label, m.Value, m.Max, m.HasMax, m.Share, m.Low, m.Colour)) .ToList(); // Where each value was found: the first of a meter's alternatives the game has sent, as the reading took it. @@ -238,10 +238,21 @@ private IWindowControl NewVitalsPanel(TerminalPanelContext context) /// meaning, so they are lifted like text; the empty part of a bar is a grey that still reads as a track. /// private VitalsStripRenderer.Ink VitalsInk() => - new(_ink.Accent, LowInk(_ink.Plane), _ink.Lift(new Rgb(0x6a, 0x6a, 0x72)), HeadingBand.For(_theme, _ink.Accent)); + new(_ink.Accent, LowInk(_ink.Plane), _ink.Lift(new Rgb(0x6a, 0x6a, 0x72)), HeadingBand.For(_theme, _ink.Accent), + colour => MeterInk(colour, _ink.Plane)); /// The low cue's ink on (), as markup. - private string LowInk(Rgb plane) => WorkspacePalette.Low(_theme, ParseHex(_ink.Notice), plane).ToHex(); + private string LowInk(Rgb plane) => WorkspacePalette.Low(_theme, plane).ToHex(); + + /// The plane the panels' inks are held against (the panes' reading plane). Internal for tests. + internal Rgb PanelPlane => _ink.Plane; + + /// A meter's colour () held to the floor on , as markup. + private static string MeterInk(string colour, Rgb plane) => Contrast.Legible(ParseHex(colour), plane).ToHex(); + + /// A meter's label on the status row: its colour held to the row's small-text floor on the row's plane. + private string StatusMeterInk(string colour) => + Contrast.Legible(ParseHex(colour), _theme.StatusBackground, WorkspacePalette.HeaderTextFloor).ToHex(); /// /// The ink a dangerous binding () is drawn in: the settings screens' warning red, held to the diff --git a/src/SharpMUTerm.Tui/SharpMUTermApp.cs b/src/SharpMUTerm.Tui/SharpMUTermApp.cs index 375c3d31..864da2b2 100644 --- a/src/SharpMUTerm.Tui/SharpMUTermApp.cs +++ b/src/SharpMUTerm.Tui/SharpMUTermApp.cs @@ -14820,7 +14820,7 @@ private StatusModel StatusBarRow(string character, string state) // is not on screen. Nothing else on the row moves with it: every other cell is reserved or dropped by width. _statusMetersHidden = VitalsStripShowing(); StatusSegment? MeterSegment(bool compact) => - StatusMeterRenderer.Runs(StatusMeters(), StatusData(), LowInk(_theme.StatusBackground), StatusDim, compact) is { Count: > 0 } runs + StatusMeterRenderer.Runs(StatusMeters(), StatusData(), LowInk(_theme.StatusBackground), StatusDim, compact, StatusMeterInk) is { Count: > 0 } runs ? new StatusSegment(StatusRole.Meters, runs) : null; var meters = _statusMetersHidden ? null : MeterSegment(compact: false); diff --git a/src/SharpMUTerm.Tui/StatusMeterRenderer.cs b/src/SharpMUTerm.Tui/StatusMeterRenderer.cs index 3d078e9f..46fb6342 100644 --- a/src/SharpMUTerm.Tui/StatusMeterRenderer.cs +++ b/src/SharpMUTerm.Tui/StatusMeterRenderer.cs @@ -48,9 +48,13 @@ internal static string Render(IReadOnlyList meters, GameDataStore d /// The meters that have a value, as status-row runs, or none when none does: each label in /// , the value bold (in when low), the maximum in /// , two cells between meters. is the same runs as markup. + /// With , a meter's label is drawn in its colour () as + /// holds it to the row's plane, and a low meter's label in with its + /// value: the colour costs no cell. /// internal static List Runs( - IReadOnlyList meters, GameDataStore data, string lowInk, string dimInk, bool compact = false) + IReadOnlyList meters, GameDataStore data, string lowInk, string dimInk, bool compact = false, + Func? hold = null) { var runs = new List(); foreach (var reading in Read(meters, data)) @@ -63,7 +67,11 @@ internal static string Render(IReadOnlyList meters, GameDataStore d var value = compact && reading.Share is { } share ? Percent(share).PadLeft(ShareWidth) : StatusMeter.Fit(reading.Value, ValueWidth).PadLeft(ValueWidth); - runs.Add(new(reading.Label, dimInk, false)); + var labelInk = hold is null ? dimInk + : reading.Low ? lowInk + : reading.Colour is { } colour ? hold(colour) + : dimInk; + runs.Add(new(reading.Label, labelInk, false)); runs.Add(new(" ", null, false)); runs.Add(new(value, reading.Low ? lowInk : null, true)); if (!(compact && reading.Share is not null) && reading.HasMax) @@ -85,7 +93,9 @@ internal static string Render(IReadOnlyList meters, GameDataStore d /// Whether the meter is configured with a maximum at all, sent yet or not. /// Value over maximum, when both are numbers and the maximum is positive. /// Whether is under . - internal readonly record struct MeterReading(string Label, string Value, string? Max, bool HasMax, double? Share, bool Low); + /// The meter's colour as #rrggbb before the floor (MeterColours.For), or null for the accent. + internal readonly record struct MeterReading( + string Label, string Value, string? Max, bool HasMax, double? Share, bool Low, string? Colour = null); /// The meters that have a value, in their configured order. A meter with nothing to read is left out. internal static IReadOnlyList Read(IReadOnlyList meters, GameDataStore data) @@ -100,7 +110,8 @@ internal static IReadOnlyList Read(IReadOnlyList mete var hasMax = !string.IsNullOrWhiteSpace(meter.Max); var max = hasMax ? StatusMeter.Read(data, meter.Max) : null; - readings.Add(new MeterReading(meter.Label, value, max, hasMax, Share(value, max), IsLow(value, max))); + readings.Add(new MeterReading( + meter.Label, value, max, hasMax, Share(value, max), IsLow(value, max), SharpMUTerm.Client.Panels.MeterColours.For(meter))); } return readings; diff --git a/src/SharpMUTerm.Tui/WorkspacePalette.cs b/src/SharpMUTerm.Tui/WorkspacePalette.cs index 91df4faf..a4e39ad2 100644 --- a/src/SharpMUTerm.Tui/WorkspacePalette.cs +++ b/src/SharpMUTerm.Tui/WorkspacePalette.cs @@ -407,21 +407,19 @@ internal static Rgb NativeHeaderPlane(Theme theme) /// /// The low cue on a meter (a vital below StatusMeterRenderer.LowShare): its bar, its value and its low - /// mark, in both hosts. A dark theme keeps the client's notice amber (), which reads as a - /// warning on a dark plane. A light theme gets a deep orange held to on - /// : the amber pushed down to a light plane's floor turns olive, and the cue then read as a - /// grey word over an olive bar — no warning at all (UX audit #29). + /// mark, in both hosts — the settings screens' warning red (, the mockups' low mana) + /// held to on . It was the notice amber on a dark theme until + /// meters had colours of their own: movement is gold, and an amber low cue said nothing beside it. A red pushed down + /// to a light plane's floor stays red, where the amber turned olive (UX audit #29). /// - internal static Rgb Low(Theme theme, Rgb notice, Rgb plane) + internal static Rgb Low(Theme theme, Rgb plane) { ArgumentNullException.ThrowIfNull(theme); - return Contrast.RelativeLuminance(theme.Background) < LightPlaneLuminance - ? notice - : Contrast.Legible(LowBase, plane, HeaderTextFloor); + return Contrast.Legible(LowBase, plane, HeaderTextFloor); } - /// The light themes' low cue before the plane has said how deep it must be: a warm, saturated orange. - private static readonly Rgb LowBase = new(0xe8, 0x59, 0x0c); + /// The low cue before the plane has said how deep it must be. + private static readonly Rgb LowBase = new(0xff, 0x6b, 0x6b); /// How far the header's quiet text leans from its band toward its ink before the floor is applied. private const double MutedLean = 0.55; diff --git a/tests/SharpMUTerm.Avalonia.Tests/DesktopLayerTests.cs b/tests/SharpMUTerm.Avalonia.Tests/DesktopLayerTests.cs index f3e192d5..1fefbb86 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/DesktopLayerTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/DesktopLayerTests.cs @@ -164,6 +164,25 @@ public async Task TheButtonCoversOnlyBlankHeaderCellsAndStandsDownOverText() await Assert.That(overText).IsFalse(); } + [Test] + public async Task AGaugeIsFilledWithItsMetersColourHeldToThePlaneAndALowOneWithTheWarning() + { + var (own, low, none) = await Run((window, view, layer, driver) => + { + var gauges = new VitalsGauges(); + gauges.Show( + Vitals, new PanelInk("#00f5b7", "#c62828", "#3a3a40"), + global::Avalonia.Media.Color.FromRgb(0xf4, 0xf4, 0xf6), global::Avalonia.Media.Colors.Black, 16); + return (gauges.FillFor("#4cc38a", low: false), gauges.FillFor("#4cc38a", low: true), gauges.FillFor(null, low: false)); + }); + + var held = SharpMUTerm.Core.Text.Contrast.Legible(new(0x4c, 0xc3, 0x8a), new(0xf4, 0xf4, 0xf6)); + await Assert.That(own).IsEqualTo(global::Avalonia.Media.Color.FromRgb(held.R, held.G, held.B)) + .Because("health's green, darkened to the floor on a light pane, as the cells hold it"); + await Assert.That(low).IsEqualTo(global::Avalonia.Media.Color.FromRgb(0xc6, 0x28, 0x28)); + await Assert.That(none).IsEqualTo(global::Avalonia.Media.Color.FromRgb(0x00, 0xf5, 0xb7)).Because("no colour of its own: the panel's bar ink"); + } + [Test] public async Task VitalsGaugesAreDrawnOverTheirPaneAndThePointerStillReachesTheCells() { diff --git a/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowTests.cs b/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowTests.cs index 5ecd76a4..38b77e87 100644 --- a/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowTests.cs +++ b/tests/SharpMUTerm.Avalonia.Tests/SettingsWindowTests.cs @@ -140,7 +140,7 @@ public async Task TheMeterTableHasARowPerMeterAndReadsNow() { var grid = window.MeterGrid!; var rows = grid.RowDefinitions.Count; - var now = grid.Children.OfType().Where(t => Grid.GetRow(t) == 1 && Grid.GetColumn(t) == 3).Select(t => t.Text).Single(); + var now = grid.Children.OfType().Where(t => Grid.GetRow(t) == 1 && Grid.GetColumn(t) == 4).Select(t => t.Text).Single(); var add = window.GetVisualDescendantsOf