mirror of
https://github.com/gui-cs/Terminal.Gui.git
synced 2025-12-26 15:57:56 +01:00
* Fixes #4004. Driver "windows" broken in conhost and cmd
* Fix unit tests
* Remove IsVirtualTerminal from IApplication. Add IDriverInternal and IOutputInternal interfaces
* Fix result.IsSupported
* Remove internal interfaces and add them in the implementations classes
* Move Sixel from IApplication to IDriver interface it's a characteristic of the driver
* Only if IOutput is OutputBase then set the internal properties
* Prevents driver windows error on Unix system
* Fix scenario sixel error
* Comment some tests because is keyboard layout dependent and shifted key is needed to produce them (Pt)
* Add 🇵🇹 regional indicators test proving they ca be joined as only one grapheme
* SetConsoleActiveScreenBuffer is already called by the constructor and is only needed once
* Finally fixed non virtual terminal in windows driver
* Add more Sixel unit tests
* Add unit tests for OutputBase class
* Avoid emit escape sequence
* Fix assertion failure in UICatalog
* Let each driver to deal with the Sixel write
* When Shutdown is called by the static Application then the ApplicationImpl.ResetStateStatic should be also called
* Add more OutputBase with Sixel unit tests
* Fix some issues with IsVirtualTerminal and Force16Colors with unit tests improvement
* Add Sixel Detect method unit test
* Make Sixel IsSupported and SupportsTransparency consistent with more unit tests
* Fix namespaces and unit test
* Covering more ApplicationImpl Sixel unit test
* Remove DriverImplProxy because sometimes fails in parallel unit tests
* Fix Init_KeyBindings_Are_Not_Reset unit test failing
* Revert "Fix Init_KeyBindings_Are_Not_Reset unit test failing"
This reverts commit 0ab298bc56.
* Fix Force16Colors but still use Application.Force16Colors because of CM
* Enforce conditional
* Revert change
* Moving to a new file
* Add the same workaround as the All_Scenarios_Benchmark unit test
* Fixes #4440. TextView with ReadOnly as true, MoveRight doesn't select text up to the end of the line
* Fixes #4442. TextField PositionCursor doesn't treat zero width as one column
* Each character must return at least one column, with the exception of Tab.
* Add unit test for the ScrollOffset
* Each character must return at least one column, with the exception of Tab.
* Add unit test for the LeftColumn
* WIP
* Refactor DriverImpl and OutputBase for maintainability
Refactored `DriverImpl` to remove `IDisposable` and streamline event
handling, including replacing `OnSizeMonitorOnSizeChanged` with an
inline lambda. Reintroduced `SizeChanged` and updated `SetScreenSize`
to invoke it. Moved `SupportsTrueColor` from `OutputBase` to
`DriverImpl` and reintroduced `Force16Colors` with updated logic.
Reintroduced and updated several `OutputBuffer`-related properties
and methods in `DriverImpl`, including `Screen`, `Clip`, `Cols`, and
`Contents`. Moved `Clipboard` from `OutputBase` to `DriverImpl` and
initialized it with `FakeClipboard`. Simplified `Refresh` and `ToAnsi`
methods in `DriverImpl`.
Removed `Force16Colors` from `OutputBase` and simplified method
signatures, including `ToAnsi` and `BuildAnsiForRegion`. Fixed a
parameter name typo in `AppendOrWriteAttribute`. Made minor code
formatting adjustments.
These changes improve code maintainability, reduce redundancy, and
align the implementation with updated design requirements.
* Refactor Force16Colors handling and improve UICatalog
Refactored the `Force16Colors` property:
- Moved it from `DriverImpl` to `IOutput` and `OutputBase`.
- Simplified its management by removing redundant logic.
- Added `OnDriverOnForce16ColorsChanged` to handle updates.
Updated `UICatalogRunnable`:
- Replaced `Driver.Force16Colors` with `Application.Driver.Force16Colors`.
- Added an `F7` shortcut to toggle `Force16Colors`.
- Removed redundant event handlers and improved formatting.
Updated `config.json`:
- Replaced `Application.Force16Colors` with `Driver.Force16Colors`.
- Improved theme configuration formatting for readability.
Other changes:
- Removed the `force16Colors` parameter from `IOutput.ToAnsi`.
- Improved diagnostics handling in `UICatalogRunnable`.
- General code cleanup for readability and maintainability.
* Refactor `Force16Colors` access and improve null safety
Refactored `Force16Colors` property access to use `Application.Driver!`
for null safety and consistency. Updated event handlers to align with
this pattern. Replaced nullable `DrawContext?` parameters with
non-nullable `DrawContext` in `OnDrawingContent` overrides across
multiple classes to enforce stricter nullability checks.
Removed unused `_cachedCursorVisibility` field in `OutputBase.cs` and
cleaned up commented-out legacy code in `UICatalogRunnable.cs`. Updated
XML documentation to reflect method signature changes and property
references. Refactored `Shortcut` example in documentation for
consistency.
Replaced `Application.LayoutAndDraw` with `SetNeedsDraw` for marking
views as needing redraw. Performed general code cleanup to remove
redundant code and improve consistency.
* Refactor ForceDriver and Force16Colors properties
Removed `[Obsolete]` from `Application.ForceDriver`, making it a stable API. Added comments to clarify its role as a configuration property and its synchronization with `IApplication.ForceDriver`. Introduced `_forceDriver` as a private backing field.
Removed `Force16Colors` from `ApplicationImpl` and eliminated reset logic for `ForceDriver` and `Force16Colors` during shutdown, shifting state management responsibility to the library user.
Updated comments in `Driver.cs` to document `Force16Colors` as a configuration property and its synchronization with `IDriver.Force16Colors`. Retained `_force16Colors` as a private backing field for configuration overrides.
* Updated docs
* There is no way to detect Sixel transparency and so relying in VTS or Xterm with transparency
* Fix detect Sixel unit tests with the adjusting code
* Refactored Output.
* MErging
* - Added `OnDriverOnForce16ColorsChanged` method to handle `Driver.Force16ColorsChanged` events and update the `Force16Colors` property.
- Implemented `IDisposable` to ensure proper cleanup of resources, including unsubscribing from `SizeMonitor.SizeChanged` and `Driver.Force16ColorsChanged` events, and disposing of `_output`.
- Replaced inline `SizeMonitor.SizeChanged` event handler with a dedicated method, `OnSizeMonitorOnSizeChanged`, for better readability and maintainability.
- Simplified the `Screen` property by removing commented-out code and directly returning a `Rectangle` based on `OutputBuffer` dimensions.
- Updated the `Force16Colors` property to use `_output` for both getting and setting its value.
- Performed general cleanup, including removing unused code and improving code structure.
* merged
* Refactor Sixel handling with ConcurrentQueue
Replaced `List<SixelToRender>` with `ConcurrentQueue<SixelToRender>`
to improve thread safety and performance in sixel management.
Updated the `Images` class to avoid unnecessary removal and
re-creation of sixel objects by updating existing ones in place.
Refactored `Application.Sixel` to return a `ConcurrentQueue` and
introduced `GetSixels` in `IDriver` and `IOutput` for consistent
access. Updated `OutputBase` to use a private `ConcurrentQueue`
and adjusted rendering logic accordingly.
Removed legacy and redundant code, including `Application.Driver?.Sixel.Clear()`
and unused properties in `DriverImpl` and `ApplicationImpl`. Updated
tests in `OutputBaseTests` to align with the new implementation.
Added `using System.Collections.Concurrent` where necessary and
improved documentation to reflect the changes. These updates
enhance thread safety, simplify the codebase, and align with
modern concurrent programming practices.
* Tweak
* Refactor DriverImpl to use Dispose and improve modularity
Replaced `Driver.End()` with `Driver.Dispose()` across the codebase, aligning with the `IDisposable` pattern for proper resource cleanup. Updated `DriverImpl` to implement `Dispose`, ensuring event unsubscriptions and resource disposal.
Enhanced `DriverImpl` structure by organizing code into logical regions, improving modularity and readability. Refactored and reintroduced methods and properties like `Clipboard`, `Screen`, `SetScreenSize`, `Cols`, `Rows`, and others for better encapsulation.
Updated the `IDriver` interface to include `IDisposable` and reorganized it into regions. Added new methods and properties such as `Init`, `Refresh`, `Suspend`, `QueueAnsiRequest`, and `ToAnsi`.
Refactored unit tests to replace `driver.End()` with `driver.Dispose()` and ensured proper resource cleanup. Improved code comments and documentation for better clarity.
Aligned with modern C# practices, adopting features like null-coalescing operators and pattern matching. Removed redundant code, addressed some TODOs, and modularized the codebase for maintainability and extensibility.
* Refactor driver docs and update View.Driver usage
Updated `application.md` to clarify the purpose of the `View.Driver` property, replacing the obsolete `Application.Driver`. Added a reference to the "Drivers Deep Dive" documentation for further details.
Refactored the `OnDrawContent` method to use the `Driver` property, ensuring compatibility with the new driver architecture.
Added a new section, "Testing with the New Architecture," to `application.md`, highlighting the improved testability of the instance-based architecture.
Expanded and reorganized `drivers.md` to provide a detailed breakdown of the `IDriver` interface, including lifecycle, components, screen and display, color support, content buffer, drawing, cursor, input events, and ANSI escape sequences. Introduced new subsections for clarity and emphasized the modular design for maintainability.
Added a note in `drivers.md` discouraging direct access to the `Driver` and recommending higher-level abstractions like `Terminal.Gui.App.Application.Screen` and `Terminal.Gui.ViewBase.View` methods for positioning and drawing.
* Refactor IsVirtualTerminal to IsLegacyConsole
Replaced the `IsVirtualTerminal` property with `IsLegacyConsole` across the codebase to better represent legacy versus modern terminal environments. Updated logic in `SixelSupportDetector`, `DriverImpl`, and `OutputBase` to use the new property.
Refactored tests to align with the updated property, including renaming test methods, adjusting mock setups, and replacing `VirtualTerminalTests` with `LegacyConsoleTests`.
Simplified `WindowsOutput` implementation to handle console modes and sixel rendering based on `IsLegacyConsole`. Removed redundant code related to `IsVirtualTerminal`.
Improved code readability and maintainability by using more descriptive property names and ensuring consistency across the codebase. Updated `.DotSettings` with new entries.
* Update Examples/UICatalog/Scenarios/LineDrawing.cs
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update Examples/UICatalog/Scenarios/Images.cs
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update Examples/UICatalog/Scenarios/Images.cs
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update Terminal.Gui/App/IApplication.cs
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update Terminal.Gui/App/ApplicationImpl.Lifecycle.cs
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update Examples/UICatalog/Scenarios/ColorPicker.cs
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update Examples/UICatalog/Scenarios/ColorPicker.cs
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Fix formatting and typo in code and documentation
Improved code readability in `LineDrawing.cs` by fixing spacing
around the ternary operator in `Width` and `Y` property assignments.
Corrected a typo in `drivers.md` by changing "Configuraiton Manager"
to "Configuration Manager" for accurate documentation.
* Test failure casued by assert left in by accident.
* Added a workaround in `OutputBase.cs` to address dirty cell handling in legacy console mode by marking all buffer cells as dirty.
Refactored `_disableMouseCb` event handling in `UICatalogRunnable.cs` to use the `Selecting` event for toggling `Application.IsMouseDisabled`. Simplified `MouseImpl.cs` by converting `App` to an auto-implemented property and removing redundant namespace usage.
Streamlined logging in `WindowsOutput.cs` by replacing verbose `Logging.Logger` calls with shorter alternatives (`Logging.Information`, `Logging.Error`, etc.).
* Update theme and remove unused ListView component
The application's default theme configuration was updated from "Light" to "Amber Phosphor" by modifying the `ConfigurationManager.RuntimeConfig` value.
Additionally, the `ListView` component in the `ExampleWindow` class was removed. This included its initialization, layout properties (`Y`, `Height`, `Width`), and its data source (["One", "Two", "Three", "Four"]).
* Increase safety timeout in NestedRunTimeoutTests to 10s
The timeout duration for the safety mechanism in the
`NestedRunTimeoutTests` class was increased from 5000ms (5s)
to 10000ms (10s). This change allows the app more time to
complete before triggering the safety timeout, reducing the
likelihood of premature termination during long-running tests.
Refactor and enhance test coverage
Refactored `Load_WithInvalidJson_AddsJsonError` test in `SourcesManagerTests.cs` to improve organization and added a note about its impact on parallel execution. Increased the safety timeout in `NestedRunTimeoutTests.cs` from 5 seconds to 10 seconds to address potential premature test timeouts.
* Handle null Driver gracefully in event subscription
Replaced `ArgumentNullException.ThrowIfNull(Driver)` with a null-check conditional in `SubscribeDriverEvents` and `UnsubscribeDriverEvents`. If `Driver` is `null`, the methods now log an error using `Logging.Error` and return early. This prevents potential exceptions and improves error handling.
---------
Co-authored-by: BDisp <bd.bdisp@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
676 lines
26 KiB
C#
676 lines
26 KiB
C#
global using Attribute = Terminal.Gui.Drawing.Attribute;
|
|
global using Color = Terminal.Gui.Drawing.Color;
|
|
global using CM = Terminal.Gui.Configuration.ConfigurationManager;
|
|
global using Terminal.Gui.App;
|
|
global using Terminal.Gui.ViewBase;
|
|
global using Terminal.Gui.Drivers;
|
|
global using Terminal.Gui.Input;
|
|
global using Terminal.Gui.Configuration;
|
|
global using Terminal.Gui.Views;
|
|
global using Terminal.Gui.Drawing;
|
|
global using Terminal.Gui.Text;
|
|
global using Terminal.Gui.FileServices;
|
|
using System.CommandLine;
|
|
using System.CommandLine.Builder;
|
|
using System.CommandLine.Parsing;
|
|
using System.Data;
|
|
using System.Diagnostics;
|
|
using System.Diagnostics.CodeAnalysis;
|
|
using System.Globalization;
|
|
using System.Reflection;
|
|
using System.Reflection.Metadata;
|
|
using System.Text;
|
|
using System.Text.Json;
|
|
using Microsoft.Extensions.Logging;
|
|
using Serilog;
|
|
using Serilog.Core;
|
|
using Serilog.Events;
|
|
using Command = Terminal.Gui.Input.Command;
|
|
using ILogger = Microsoft.Extensions.Logging.ILogger;
|
|
|
|
#nullable enable
|
|
|
|
namespace UICatalog;
|
|
|
|
/// <summary>
|
|
/// UI Catalog is a comprehensive sample library and test app for Terminal.Gui. It provides a simple UI for adding to
|
|
/// the
|
|
/// catalog of scenarios.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// <para>UI Catalog attempts to satisfy the following goals:</para>
|
|
/// <para>
|
|
/// <list type="number">
|
|
/// <item>
|
|
/// <description>Be an easy-to-use showcase for Terminal.Gui concepts and features.</description>
|
|
/// </item>
|
|
/// <item>
|
|
/// <description>Provide sample code that illustrates how to properly implement said concepts & features.</description>
|
|
/// </item>
|
|
/// <item>
|
|
/// <description>Make it easy for contributors to add additional samples in a structured way.</description>
|
|
/// </item>
|
|
/// </list>
|
|
/// </para>
|
|
/// </remarks>
|
|
public class UICatalog
|
|
{
|
|
private static string? _forceDriver;
|
|
private static string? _uiCatalogDriver;
|
|
private static string? _scenarioDriver;
|
|
|
|
public static string LogFilePath { get; set; } = string.Empty;
|
|
public static LoggingLevelSwitch LogLevelSwitch { get; } = new ();
|
|
public const string LOGFILE_LOCATION = "logs";
|
|
public static UICatalogCommandLineOptions Options { get; set; }
|
|
|
|
private static int Main (string [] args)
|
|
{
|
|
Console.OutputEncoding = Encoding.Default;
|
|
|
|
if (Debugger.IsAttached)
|
|
{
|
|
CultureInfo.DefaultThreadCurrentUICulture = CultureInfo.GetCultureInfo ("en-US");
|
|
}
|
|
|
|
UICatalogRunnable.CachedScenarios = Scenario.GetScenarios ();
|
|
UICatalogRunnable.CachedCategories = Scenario.GetAllCategories ();
|
|
|
|
// Process command line args
|
|
|
|
// If no driver is provided, the default driver is used.
|
|
// Get allowed driver names
|
|
string? [] allowedDrivers = Application.GetDriverTypes ().Item2.ToArray ();
|
|
|
|
Option<string> driverOption = new Option<string> ("--driver", "The IDriver to use.")
|
|
.FromAmong (allowedDrivers!);
|
|
driverOption.SetDefaultValue (string.Empty);
|
|
driverOption.AddAlias ("-d");
|
|
driverOption.AddAlias ("--d");
|
|
|
|
// Add validator separately (not chained)
|
|
driverOption.AddValidator (result =>
|
|
{
|
|
var value = result.GetValueOrDefault<string> ();
|
|
if (result.Tokens.Count > 0 && !allowedDrivers.Contains (value))
|
|
{
|
|
result.ErrorMessage = $"Invalid driver name '{value}'. Allowed values: {string.Join (", ", allowedDrivers)}";
|
|
}
|
|
});
|
|
|
|
// Configuration Management
|
|
Option<bool> disableConfigManagement = new (
|
|
"--disable-cm",
|
|
"Indicates Configuration Management should not be enabled. Only `ConfigLocations.HardCoded` settings will be loaded.");
|
|
disableConfigManagement.AddAlias ("-dcm");
|
|
disableConfigManagement.AddAlias ("--dcm");
|
|
|
|
Option<bool> benchmarkFlag = new ("--benchmark", "Enables benchmarking. If a Scenario is specified, just that Scenario will be benchmarked.");
|
|
benchmarkFlag.AddAlias ("-b");
|
|
benchmarkFlag.AddAlias ("--b");
|
|
|
|
Option<uint> benchmarkTimeout = new (
|
|
"--timeout",
|
|
() => Scenario.BenchmarkTimeout,
|
|
$"The maximum time in milliseconds to run a benchmark for. Default is {Scenario.BenchmarkTimeout}ms.");
|
|
benchmarkTimeout.AddAlias ("-t");
|
|
benchmarkTimeout.AddAlias ("--t");
|
|
|
|
Option<string> resultsFile = new ("--file", "The file to save benchmark results to. If not specified, the results will be displayed in a TableView.");
|
|
resultsFile.AddAlias ("-f");
|
|
resultsFile.AddAlias ("--f");
|
|
|
|
// what's the app name?
|
|
LogFilePath = $"{LOGFILE_LOCATION}/{Assembly.GetExecutingAssembly ().GetName ().Name}";
|
|
|
|
Option<string> debugLogLevel = new Option<string> ("--debug-log-level", $"The level to use for logging (debug console and {LogFilePath})").FromAmong (
|
|
Enum.GetNames<LogLevel> ()
|
|
);
|
|
debugLogLevel.SetDefaultValue ("Warning");
|
|
debugLogLevel.AddAlias ("-dl");
|
|
debugLogLevel.AddAlias ("--dl");
|
|
|
|
Argument<string> scenarioArgument = new Argument<string> (
|
|
"scenario",
|
|
description:
|
|
"The name of the Scenario to run. If not provided, the UI Catalog UI will be shown.",
|
|
getDefaultValue: () => "none"
|
|
).FromAmong (
|
|
UICatalogRunnable.CachedScenarios.Select (s => s.GetName ())
|
|
.Append ("none")
|
|
.ToArray ()
|
|
);
|
|
|
|
var rootCommand = new RootCommand ("A comprehensive sample library and test app for Terminal.Gui")
|
|
{
|
|
scenarioArgument, debugLogLevel, benchmarkFlag, benchmarkTimeout, resultsFile, driverOption, disableConfigManagement
|
|
};
|
|
|
|
rootCommand.SetHandler (
|
|
context =>
|
|
{
|
|
var options = new UICatalogCommandLineOptions
|
|
{
|
|
Scenario = context.ParseResult.GetValueForArgument (scenarioArgument),
|
|
Driver = context.ParseResult.GetValueForOption (driverOption) ?? string.Empty,
|
|
DontEnableConfigurationManagement = context.ParseResult.GetValueForOption (disableConfigManagement),
|
|
Benchmark = context.ParseResult.GetValueForOption (benchmarkFlag),
|
|
BenchmarkTimeout = context.ParseResult.GetValueForOption (benchmarkTimeout),
|
|
ResultsFile = context.ParseResult.GetValueForOption (resultsFile) ?? string.Empty,
|
|
DebugLogLevel = context.ParseResult.GetValueForOption (debugLogLevel) ?? "Warning"
|
|
/* etc. */
|
|
};
|
|
|
|
// See https://github.com/dotnet/command-line-api/issues/796 for the rationale behind this hackery
|
|
Options = options;
|
|
}
|
|
);
|
|
|
|
var helpShown = false;
|
|
|
|
Parser parser = new CommandLineBuilder (rootCommand)
|
|
.UseHelp (ctx => helpShown = true)
|
|
.Build ();
|
|
|
|
parser.Invoke (args);
|
|
|
|
if (helpShown)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
var parseResult = parser.Parse (args);
|
|
|
|
if (parseResult.Errors.Count > 0)
|
|
{
|
|
foreach (var error in parseResult.Errors)
|
|
{
|
|
Console.Error.WriteLine (error.Message);
|
|
}
|
|
return 1; // Non-zero exit code for error
|
|
}
|
|
|
|
Scenario.BenchmarkTimeout = Options.BenchmarkTimeout;
|
|
|
|
Logging.Logger = CreateLogger ();
|
|
|
|
UICatalogMain (Options);
|
|
|
|
Application.ForceDriver = string.Empty;
|
|
|
|
return 0;
|
|
}
|
|
|
|
public static LogEventLevel LogLevelToLogEventLevel (LogLevel logLevel)
|
|
{
|
|
return logLevel switch
|
|
{
|
|
LogLevel.Trace => LogEventLevel.Verbose,
|
|
LogLevel.Debug => LogEventLevel.Debug,
|
|
LogLevel.Information => LogEventLevel.Information,
|
|
LogLevel.Warning => LogEventLevel.Warning,
|
|
LogLevel.Error => LogEventLevel.Error,
|
|
LogLevel.Critical => LogEventLevel.Fatal,
|
|
LogLevel.None => LogEventLevel.Fatal, // Default to Fatal if None is specified
|
|
_ => LogEventLevel.Fatal // Default to Information for any unspecified LogLevel
|
|
};
|
|
}
|
|
|
|
private static ILogger CreateLogger ()
|
|
{
|
|
// Configure Serilog to write logs to a file
|
|
LogLevelSwitch.MinimumLevel = LogLevelToLogEventLevel (Enum.Parse<LogLevel> (Options.DebugLogLevel));
|
|
|
|
Log.Logger = new LoggerConfiguration ()
|
|
.MinimumLevel.ControlledBy (LogLevelSwitch)
|
|
.Enrich.FromLogContext () // Enables dynamic enrichment
|
|
.WriteTo.Debug ()
|
|
.WriteTo.File (
|
|
LogFilePath,
|
|
rollingInterval: RollingInterval.Day,
|
|
outputTemplate: "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level:u3}] {Message:lj}{NewLine}{Exception}")
|
|
.CreateLogger ();
|
|
|
|
// Create a logger factory compatible with Microsoft.Extensions.Logging
|
|
using ILoggerFactory loggerFactory = LoggerFactory.Create (
|
|
builder =>
|
|
{
|
|
builder
|
|
.AddSerilog (dispose: true) // Integrate Serilog with ILogger
|
|
.SetMinimumLevel (LogLevel.Trace); // Set minimum log level
|
|
});
|
|
|
|
// Get an ILogger instance
|
|
return loggerFactory.CreateLogger ("Global Logger");
|
|
}
|
|
|
|
/// <summary>
|
|
/// Shows the UI Catalog selection UI. When the user selects a Scenario to run, the UI Catalog main app UI is
|
|
/// killed and the Scenario is run as though it were Application.TopRunnable. When the Scenario exits, this function exits.
|
|
/// </summary>
|
|
/// <returns></returns>
|
|
private static Scenario RunUICatalogRunnable ()
|
|
{
|
|
// Run UI Catalog UI. When it exits, if _selectedScenario is != null then
|
|
// a Scenario was selected. Otherwise, the user wants to quit UI Catalog.
|
|
|
|
// If the user specified a driver on the command line then use it,
|
|
// ignoring Config files.
|
|
|
|
Application.Init (driverName: _forceDriver);
|
|
|
|
_uiCatalogDriver = Application.Driver!.GetName ();
|
|
|
|
Application.Run<UICatalogRunnable> ();
|
|
Application.Shutdown ();
|
|
VerifyObjectsWereDisposed ();
|
|
|
|
return UICatalogRunnable.CachedSelectedScenario!;
|
|
}
|
|
|
|
[SuppressMessage ("Style", "IDE1006:Naming Styles", Justification = "<Pending>")]
|
|
private static readonly FileSystemWatcher _currentDirWatcher = new ();
|
|
|
|
[SuppressMessage ("Style", "IDE1006:Naming Styles", Justification = "<Pending>")]
|
|
private static readonly FileSystemWatcher _homeDirWatcher = new ();
|
|
|
|
private static void StartConfigWatcher ()
|
|
{
|
|
// Set up a file system watcher for `./.tui/`
|
|
_currentDirWatcher.NotifyFilter = NotifyFilters.LastWrite;
|
|
|
|
string assemblyLocation = Assembly.GetExecutingAssembly ().Location;
|
|
string tuiDir;
|
|
|
|
if (!string.IsNullOrEmpty (assemblyLocation))
|
|
{
|
|
var assemblyFile = new FileInfo (assemblyLocation);
|
|
tuiDir = Path.Combine (assemblyFile.Directory!.FullName, ".tui");
|
|
}
|
|
else
|
|
{
|
|
tuiDir = Path.Combine (AppContext.BaseDirectory, ".tui");
|
|
}
|
|
|
|
if (!Directory.Exists (tuiDir))
|
|
{
|
|
Directory.CreateDirectory (tuiDir);
|
|
}
|
|
|
|
_currentDirWatcher.Path = tuiDir;
|
|
_currentDirWatcher.Filter = "*config.json";
|
|
|
|
// Set up a file system watcher for `~/.tui/`
|
|
_homeDirWatcher.NotifyFilter = NotifyFilters.LastWrite;
|
|
var f = new FileInfo (Environment.GetFolderPath (Environment.SpecialFolder.UserProfile));
|
|
tuiDir = Path.Combine (f.FullName, ".tui");
|
|
|
|
if (!Directory.Exists (tuiDir))
|
|
{
|
|
Directory.CreateDirectory (tuiDir);
|
|
}
|
|
|
|
_homeDirWatcher.Path = tuiDir;
|
|
_homeDirWatcher.Filter = "*config.json";
|
|
|
|
_currentDirWatcher.Changed += ConfigFileChanged;
|
|
|
|
//_currentDirWatcher.Created += ConfigFileChanged;
|
|
_currentDirWatcher.EnableRaisingEvents = true;
|
|
|
|
_homeDirWatcher.Changed += ConfigFileChanged;
|
|
|
|
//_homeDirWatcher.Created += ConfigFileChanged;
|
|
_homeDirWatcher.EnableRaisingEvents = true;
|
|
|
|
ThemeManager.ThemeChanged += ThemeManagerOnThemeChanged;
|
|
}
|
|
|
|
private static void ThemeManagerOnThemeChanged (object? sender, EventArgs<string> e)
|
|
{
|
|
CM.Apply ();
|
|
}
|
|
|
|
private static void StopConfigWatcher ()
|
|
{
|
|
ThemeManager.ThemeChanged += ThemeManagerOnThemeChanged;
|
|
|
|
_currentDirWatcher.EnableRaisingEvents = false;
|
|
_currentDirWatcher.Changed -= ConfigFileChanged;
|
|
_currentDirWatcher.Created -= ConfigFileChanged;
|
|
|
|
_homeDirWatcher.EnableRaisingEvents = false;
|
|
_homeDirWatcher.Changed -= ConfigFileChanged;
|
|
_homeDirWatcher.Created -= ConfigFileChanged;
|
|
}
|
|
|
|
private static void ConfigFileChanged (object sender, FileSystemEventArgs e)
|
|
{
|
|
if (Application.TopRunnableView == null)
|
|
{
|
|
return;
|
|
}
|
|
|
|
Logging.Debug ($"{e.FullPath} {e.ChangeType} - Loading and Applying");
|
|
ConfigurationManager.Load (ConfigLocations.All);
|
|
ConfigurationManager.Apply ();
|
|
}
|
|
|
|
private static void UICatalogMain (UICatalogCommandLineOptions options)
|
|
{
|
|
// By setting _forceDriver we ensure that if the user has specified a driver on the command line, it will be used
|
|
// regardless of what's in a config file.
|
|
Application.ForceDriver = _forceDriver = options.Driver;
|
|
|
|
// If a Scenario name has been provided on the commandline
|
|
// run it and exit when done.
|
|
if (options.Scenario != "none")
|
|
{
|
|
if (!Options.DontEnableConfigurationManagement)
|
|
{
|
|
ConfigurationManager.Enable (ConfigLocations.All);
|
|
}
|
|
|
|
int item = UICatalogRunnable.CachedScenarios!.IndexOf (
|
|
UICatalogRunnable.CachedScenarios!.FirstOrDefault (
|
|
s =>
|
|
s.GetName ()
|
|
.Equals (options.Scenario, StringComparison.OrdinalIgnoreCase)
|
|
)!);
|
|
UICatalogRunnable.CachedSelectedScenario = (Scenario)Activator.CreateInstance (UICatalogRunnable.CachedScenarios [item].GetType ())!;
|
|
|
|
BenchmarkResults? results = RunScenario (UICatalogRunnable.CachedSelectedScenario, options.Benchmark);
|
|
|
|
if (results is { })
|
|
{
|
|
Console.WriteLine (
|
|
JsonSerializer.Serialize (
|
|
results,
|
|
new JsonSerializerOptions
|
|
{
|
|
WriteIndented = true
|
|
}));
|
|
}
|
|
|
|
VerifyObjectsWereDisposed ();
|
|
|
|
return;
|
|
}
|
|
|
|
// Benchmark all Scenarios
|
|
if (options.Benchmark)
|
|
{
|
|
BenchmarkAllScenarios ();
|
|
|
|
return;
|
|
}
|
|
|
|
#if DEBUG_IDISPOSABLE
|
|
View.EnableDebugIDisposableAsserts = true;
|
|
#endif
|
|
|
|
if (!Options.DontEnableConfigurationManagement)
|
|
{
|
|
ConfigurationManager.Enable (ConfigLocations.All);
|
|
StartConfigWatcher ();
|
|
}
|
|
|
|
while (RunUICatalogRunnable () is { } scenario)
|
|
{
|
|
#if DEBUG_IDISPOSABLE
|
|
VerifyObjectsWereDisposed ();
|
|
|
|
// Measure how long it takes for the app to shut down
|
|
var sw = new Stopwatch ();
|
|
string scenarioName = scenario.GetName ();
|
|
Application.InitializedChanged += ApplicationOnInitializedChanged;
|
|
#endif
|
|
|
|
Application.ForceDriver = _forceDriver;
|
|
|
|
scenario.Main ();
|
|
scenario.Dispose ();
|
|
|
|
// This call to Application.Shutdown brackets the Application.Init call
|
|
// made by Scenario.Init() above
|
|
if (Application.Driver is { })
|
|
{
|
|
Application.Shutdown ();
|
|
}
|
|
|
|
VerifyObjectsWereDisposed ();
|
|
|
|
#if DEBUG_IDISPOSABLE
|
|
Application.InitializedChanged -= ApplicationOnInitializedChanged;
|
|
|
|
void ApplicationOnInitializedChanged (object? sender, EventArgs<bool> e)
|
|
{
|
|
if (e.Value)
|
|
{
|
|
sw.Start ();
|
|
_scenarioDriver = Application.Driver!.GetName ();
|
|
Debug.Assert (_scenarioDriver == _uiCatalogDriver);
|
|
}
|
|
else
|
|
{
|
|
sw.Stop ();
|
|
Logging.Trace ($"Shutdown of {scenarioName} Scenario took {sw.ElapsedMilliseconds}ms");
|
|
}
|
|
}
|
|
#endif
|
|
}
|
|
|
|
StopConfigWatcher ();
|
|
VerifyObjectsWereDisposed ();
|
|
}
|
|
|
|
private static BenchmarkResults? RunScenario (Scenario scenario, bool benchmark)
|
|
{
|
|
if (benchmark)
|
|
{
|
|
scenario.StartBenchmark ();
|
|
}
|
|
|
|
Application.ForceDriver = _forceDriver!;
|
|
|
|
scenario.Main ();
|
|
|
|
BenchmarkResults? results = null;
|
|
|
|
if (benchmark)
|
|
{
|
|
results = scenario.EndBenchmark ();
|
|
}
|
|
|
|
scenario.Dispose ();
|
|
|
|
if (Application.Driver is { })
|
|
{
|
|
Application.Shutdown ();
|
|
}
|
|
|
|
return results;
|
|
}
|
|
|
|
private static void BenchmarkAllScenarios ()
|
|
{
|
|
List<BenchmarkResults> resultsList = [];
|
|
|
|
var maxScenarios = 5;
|
|
|
|
foreach (Scenario s in UICatalogRunnable.CachedScenarios!)
|
|
{
|
|
resultsList.Add (RunScenario (s, true)!);
|
|
maxScenarios--;
|
|
|
|
if (maxScenarios == 0)
|
|
{
|
|
// break;
|
|
}
|
|
}
|
|
|
|
if (resultsList.Count <= 0)
|
|
{
|
|
return;
|
|
}
|
|
|
|
if (!string.IsNullOrEmpty (Options.ResultsFile))
|
|
{
|
|
string output = JsonSerializer.Serialize (
|
|
resultsList,
|
|
new JsonSerializerOptions
|
|
{
|
|
WriteIndented = true
|
|
});
|
|
|
|
using StreamWriter file = File.CreateText (Options.ResultsFile);
|
|
file.Write (output);
|
|
file.Close ();
|
|
|
|
return;
|
|
}
|
|
|
|
Application.Init ();
|
|
|
|
var benchmarkWindow = new Window
|
|
{
|
|
Title = "Benchmark Results"
|
|
};
|
|
|
|
if (benchmarkWindow.Border is { })
|
|
{
|
|
benchmarkWindow.Border!.Thickness = new (0, 0, 0, 0);
|
|
}
|
|
|
|
TableView resultsTableView = new ()
|
|
{
|
|
Width = Dim.Fill (),
|
|
Height = Dim.Fill ()
|
|
};
|
|
|
|
// TableView provides many options for table headers. For simplicity we turn all
|
|
// of these off. By enabling FullRowSelect and turning off headers, TableView looks just
|
|
// like a ListView
|
|
resultsTableView.FullRowSelect = true;
|
|
resultsTableView.Style.ShowHeaders = true;
|
|
resultsTableView.Style.ShowHorizontalHeaderOverline = false;
|
|
resultsTableView.Style.ShowHorizontalHeaderUnderline = true;
|
|
resultsTableView.Style.ShowHorizontalBottomline = false;
|
|
resultsTableView.Style.ShowVerticalCellLines = true;
|
|
resultsTableView.Style.ShowVerticalHeaderLines = true;
|
|
|
|
/* By default, TableView lays out columns at render time and only
|
|
* measures y rows of data at a time. Where y is the height of the
|
|
* console. This is for the following reasons:
|
|
*
|
|
* - Performance, when tables have a large amount of data
|
|
* - Defensive, prevents a single wide cell value pushing other
|
|
* columns off-screen (requiring horizontal scrolling
|
|
*
|
|
* In the case of UICatalog here, such an approach is overkill so
|
|
* we just measure all the data ourselves and set the appropriate
|
|
* max widths as ColumnStyles
|
|
*/
|
|
//int longestName = _scenarios!.Max (s => s.GetName ().Length);
|
|
|
|
//resultsTableView.Style.ColumnStyles.Add (
|
|
// 0,
|
|
// new () { MaxWidth = longestName, MinWidth = longestName, MinAcceptableWidth = longestName }
|
|
// );
|
|
//resultsTableView.Style.ColumnStyles.Add (1, new () { MaxWidth = 1 });
|
|
//resultsTableView.CellActivated += ScenarioView_OpenSelectedItem;
|
|
|
|
// TableView typically is a grid where nav keys are biased for moving left/right.
|
|
resultsTableView.KeyBindings.Remove (Key.Home);
|
|
resultsTableView.KeyBindings.Add (Key.Home, Command.Start);
|
|
resultsTableView.KeyBindings.Remove (Key.End);
|
|
resultsTableView.KeyBindings.Add (Key.End, Command.End);
|
|
|
|
// Ideally, TableView.MultiSelect = false would turn off any keybindings for
|
|
// multi-select options. But it currently does not. UI Catalog uses Ctrl-A for
|
|
// a shortcut to About.
|
|
resultsTableView.MultiSelect = false;
|
|
|
|
var dt = new DataTable ();
|
|
|
|
dt.Columns.Add (new DataColumn ("Scenario", typeof (string)));
|
|
dt.Columns.Add (new DataColumn ("Duration", typeof (TimeSpan)));
|
|
dt.Columns.Add (new DataColumn ("Refreshed", typeof (int)));
|
|
dt.Columns.Add (new DataColumn ("LaidOut", typeof (int)));
|
|
dt.Columns.Add (new DataColumn ("ClearedContent", typeof (int)));
|
|
dt.Columns.Add (new DataColumn ("DrawComplete", typeof (int)));
|
|
dt.Columns.Add (new DataColumn ("Updated", typeof (int)));
|
|
dt.Columns.Add (new DataColumn ("Iterations", typeof (int)));
|
|
|
|
foreach (BenchmarkResults r in resultsList)
|
|
{
|
|
dt.Rows.Add (
|
|
r.Scenario,
|
|
r.Duration,
|
|
r.RefreshedCount,
|
|
r.LaidOutCount,
|
|
r.ClearedContentCount,
|
|
r.DrawCompleteCount,
|
|
r.UpdatedCount,
|
|
r.IterationCount
|
|
);
|
|
}
|
|
|
|
BenchmarkResults totalRow = new ()
|
|
{
|
|
Scenario = "TOTAL",
|
|
Duration = new (resultsList.Sum (r => r.Duration.Ticks)),
|
|
RefreshedCount = resultsList.Sum (r => r.RefreshedCount),
|
|
LaidOutCount = resultsList.Sum (r => r.LaidOutCount),
|
|
ClearedContentCount = resultsList.Sum (r => r.ClearedContentCount),
|
|
DrawCompleteCount = resultsList.Sum (r => r.DrawCompleteCount),
|
|
UpdatedCount = resultsList.Sum (r => r.UpdatedCount),
|
|
IterationCount = resultsList.Sum (r => r.IterationCount)
|
|
};
|
|
|
|
dt.Rows.Add (
|
|
totalRow.Scenario,
|
|
totalRow.Duration,
|
|
totalRow.RefreshedCount,
|
|
totalRow.LaidOutCount,
|
|
totalRow.ClearedContentCount,
|
|
totalRow.DrawCompleteCount,
|
|
totalRow.UpdatedCount,
|
|
totalRow.IterationCount
|
|
);
|
|
|
|
dt.DefaultView.Sort = "Duration";
|
|
DataTable sortedCopy = dt.DefaultView.ToTable ();
|
|
|
|
resultsTableView.Table = new DataTableSource (sortedCopy);
|
|
|
|
benchmarkWindow.Add (resultsTableView);
|
|
|
|
Application.Run (benchmarkWindow);
|
|
benchmarkWindow.Dispose ();
|
|
Application.Shutdown ();
|
|
}
|
|
|
|
private static void VerifyObjectsWereDisposed ()
|
|
{
|
|
#if DEBUG_IDISPOSABLE
|
|
if (!View.EnableDebugIDisposableAsserts)
|
|
{
|
|
View.Instances.Clear ();
|
|
|
|
return;
|
|
}
|
|
|
|
// Validate there are no outstanding View instances
|
|
// after a scenario was selected to run. This proves the main UI Catalog
|
|
// 'app' closed cleanly.
|
|
foreach (View? inst in View.Instances)
|
|
{
|
|
Debug.Assert (inst.WasDisposed);
|
|
}
|
|
|
|
View.Instances.Clear ();
|
|
#endif
|
|
}
|
|
}
|