Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2026-01-01 16:59:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #666. Refactor ConsoleDrivers to simplify and remove duplicated code (#2612)

Browse Source 
* Added ClipRegion; cleaned up driver code

* clip region unit tests

* api docs

* Moved color stuff from ConsoleDriver to Color.cs

* Removes unused ConsoleDriver APIs

* Code cleanup and Removes unused ConsoleDriver APIs

* Code cleanup and Removes unused ConsoleDriver APIs

* Work around https://github.com/gui-cs/Terminal.Gui/issues/2610

* adjusted unit tests

* initial commit

* Made Rows, Cols, Top, Left virtual

* Made Clipboard non-virtual

* Made EnableConsoleScrolling  non-virtual

* Made Contents non-virtual

* Pulled Row/Col up

* Made MoveTo virtual; fixed stupid FakeDriver cursor issue

* Made CurrentAttribute non-virtual

* Made SetAttribute  non-virtual

* Moved clipboard code out

* Code cleanup

* Removes dependecy on NStack from ConsoleDrivers - WIP

* Fixed unit tests

* Fixed unit tests

* Added list of unit tests needed

* Did some perf testing; tweaked code and charmap to address

* Brough in code from PR #2264 (but commented)

* Tons of code cleanup

* Fighting with ScrollView

* Fixing bugs

* Fixed TabView tests

* Fixed View.Visible test that was not really working

* Fixed unit tests

* Cleaned up clipboard APIs in attempt to track down unit test failure

* Add Cut_Preserves_Selection test

* Removed invalid code

* Removed invalid test code; unit tests now pass

* EscSeq* - Adjusted naming, added more sequences, made code more consistent, simplified, etc...

* Added CSI_SetGraphicsRendition

* NetDriver code cleanup

* code cleanup

* Cleaned up color handling in NetDriver

* refixed tabview unit test

* WindowsDriver color code cleanup

* WindowsDriver color code cleanup

* CursesDriver color code cleanup

* CursesDriver - Adding _BOLD has no effect. Further up the stack we cast the return of ColorToCursesColor from int to short and the _BOLD values don't fit in a short.

* CursesDriver color code - make code more accurate

* CursesDriver color code - make code more accurate

* Simplified ConsoleDriver.GetColors API

* Simplified ConsoleDriver.GetColors API further

* Improved encapslation of Attribute; prep for TrueColor & other attributes like blink

* Fixes #2249. CharacterMap isn't refreshing well non-BMP code points on scroll.

* Use GetRange to take some of the runes before convert to string.

* Attempting to fix unit tests not being cleaned up

* Fixes #2658 - ConsoleDriver.IsRuneSupported

* Fixes #2658 - ConsoleDriver.IsRuneSupported (for WindowsDriver)

* Check all the range values and not only the max value.

* Reducing code.

* Fixes #2674 - Unit test process doesn't exit

* Changed Cell to support IsDirty and list of Runes

* add support for rendering TrueColor output on Windows merging veeman & tznind code

* add colorconverter changes

* fixed merged v2_develop

* Fixing merge bugs

* Fixed merge bugs

* Fixed merge bugs - all unit tests pass

* Debugging netdriver

* More netdriver diag

* API docs for escutils

* Update unicode scenario to stress more stuff

* Contents: Now a 2D array of Cells; WIP

* AddRune and ClearContents no longer virtual/abstract

* WindowsDriver renders correctly again

* Progress on Curses

* Progress on Curses

* broke windowsdriver

* Cleaned up FakeMainLoop

* Cleaned up some build warnings

* Removed _init from AutoInitShutdown as it's not needed anymore

* Removed unused var

* Removed unused var

* Fixed nullabiltiy warning in LineCanvas

* Fixed charmap crash

* Fixes #2758 in v2

* Port testonfail fix to v2

* Remove EnableConsoleScrolling

* Backport #2764 from develop (clear last line)

* Remove uneeded usings

* Progress on unicode

* Merged in changes from PR #2786, Fixes #2784

* revamp charmap rendering

* Charmap option to show glyph widths

* Fixed issue with wide glpyhs being overwritten

* Fixed charmap startcodepoint change issue

* Added abiltiy to see ncurses verison/lib

* Fought with CursesDriver; giving up for now. See notes.

* Leverage Wcwidth nuget library instaed of our own tables

* enhanced charmap Details dialog

* Final attempt at fixing curses

---------

Co-authored-by: BDisp <bd.bdisp@gmail.com>
Co-authored-by: adstep <stephensonadamj@gmail.com>
This commit is contained in:
Tig
2023-08-09 14:28:36 -06:00
committed by GitHub
parent f3979b23ff
commit 0df485a890
101 changed files with 13094 additions and 12359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
UnitTests/Configuration/ConfigurationMangerTests.cs
View File

@@ -13,7 +13,7 @@ using Attribute = Terminal.Gui.Attribute;
namespace Terminal.Gui.ConfigurationTests {
public class ConfigurationManagerTests {
public static readonly JsonSerializerOptions _jsonOptions = new() {
public static readonly JsonSerializerOptions _jsonOptions = new () {
Converters = {
new AttributeJsonConverter (),
new ColorJsonConverter (),
@@ -65,44 +65,43 @@ namespace Terminal.Gui.ConfigurationTests {
Assert.Equal (boolSrc, boolCopy);
// Structs
var attrDest = new Attribute (1);
var attrSrc = new Attribute (2);
var attrDest = new Attribute (Color.Black);
var attrSrc = new Attribute (Color.White);
var attrCopy = DeepMemberwiseCopy (attrSrc, attrDest);
Assert.Equal (attrSrc, attrCopy);
// Classes
var colorschemeDest = new ColorScheme () { Disabled = new Attribute (1) };
var colorschemeSrc = new ColorScheme () { Disabled = new Attribute (2) };
var colorschemeDest = new ColorScheme () { Disabled = new Attribute (Color.Black) };
var colorschemeSrc = new ColorScheme () { Disabled = new Attribute (Color.White) };
var colorschemeCopy = DeepMemberwiseCopy (colorschemeSrc, colorschemeDest);
Assert.Equal (colorschemeSrc, colorschemeCopy);
// Dictionaries
var dictDest = new Dictionary<string, Attribute> () { { "Disabled", new Attribute (1) } };
var dictSrc = new Dictionary<string, Attribute> () { { "Disabled", new Attribute (2) } };
var dictDest = new Dictionary<string, Attribute> () { { "Disabled", new Attribute (Color.Black) } };
var dictSrc = new Dictionary<string, Attribute> () { { "Disabled", new Attribute (Color.White) } };
var dictCopy = (Dictionary<string, Attribute>)DeepMemberwiseCopy (dictSrc, dictDest);
Assert.Equal (dictSrc, dictCopy);
dictDest = new Dictionary<string, Attribute> () { { "Disabled", new Attribute (1) } };
dictSrc = new Dictionary<string, Attribute> () { { "Disabled", new Attribute (2) }, { "Normal", new Attribute (3) } };
dictDest = new Dictionary<string, Attribute> () { { "Disabled", new Attribute (Color.Black) } };
dictSrc = new Dictionary<string, Attribute> () { { "Disabled", new Attribute (Color.White) }, { "Normal", new Attribute (Color.Blue) } };
dictCopy = (Dictionary<string, Attribute>)DeepMemberwiseCopy (dictSrc, dictDest);
Assert.Equal (dictSrc, dictCopy);
// src adds an item
dictDest = new Dictionary<string, Attribute> () { { "Disabled", new Attribute (1) } };
dictSrc = new Dictionary<string, Attribute> () { { "Disabled", new Attribute (2) }, { "Normal", new Attribute (3) } };
dictDest = new Dictionary<string, Attribute> () { { "Disabled", new Attribute (Color.Black) } };
dictSrc = new Dictionary<string, Attribute> () { { "Disabled", new Attribute (Color.White) }, { "Normal", new Attribute (Color.Blue) } };
dictCopy = (Dictionary<string, Attribute>)DeepMemberwiseCopy (dictSrc, dictDest);
Assert.Equal (2, dictCopy.Count);
Assert.Equal (dictSrc ["Disabled"], dictCopy ["Disabled"]);
Assert.Equal (dictSrc ["Normal"], dictCopy ["Normal"]);
// src updates only one item
dictDest = new Dictionary<string, Attribute> () { { "Disabled", new Attribute (1) }, { "Normal", new Attribute (2) } };
dictSrc = new Dictionary<string, Attribute> () { { "Disabled", new Attribute (3) } };
dictDest = new Dictionary<string, Attribute> () { { "Disabled", new Attribute (Color.Black) }, { "Normal", new Attribute (Color.White) } };
dictSrc = new Dictionary<string, Attribute> () { { "Disabled", new Attribute (Color.White) } };
dictCopy = (Dictionary<string, Attribute>)DeepMemberwiseCopy (dictSrc, dictDest);
Assert.Equal (2, dictCopy.Count);
Assert.Equal (dictSrc ["Disabled"], dictCopy ["Disabled"]);
Assert.Equal (dictDest ["Normal"], dictCopy ["Normal"]);
}
//[Fact ()]
@@ -207,7 +206,7 @@ namespace Terminal.Gui.ConfigurationTests {
}
[Fact]
public void Reset_Resets()
public void Reset_Resets ()
{
ConfigurationManager.Locations = ConfigLocations.DefaultOnly;
ConfigurationManager.Reset ();
@@ -225,7 +224,6 @@ namespace Terminal.Gui.ConfigurationTests {
ConfigurationManager.Settings ["Application.AlternateForwardKey"].PropertyValue = Key.F;
ConfigurationManager.Settings ["Application.AlternateBackwardKey"].PropertyValue = Key.B;
ConfigurationManager.Settings ["Application.IsMouseDisabled"].PropertyValue = true;
ConfigurationManager.Settings ["Application.EnableConsoleScrolling"].PropertyValue = true;
ConfigurationManager.Settings.Apply ();
// assert apply worked
@@ -233,7 +231,6 @@ namespace Terminal.Gui.ConfigurationTests {
Assert.Equal (Key.F, Application.AlternateForwardKey);
Assert.Equal (Key.B, Application.AlternateBackwardKey);
Assert.True (Application.IsMouseDisabled);
Assert.True (Application.EnableConsoleScrolling);
//act
ConfigurationManager.Reset ();
@@ -245,14 +242,12 @@ namespace Terminal.Gui.ConfigurationTests {
Assert.Equal (Key.PageDown | Key.CtrlMask, Application.AlternateForwardKey);
Assert.Equal (Key.PageUp | Key.CtrlMask, Application.AlternateBackwardKey);
Assert.False (Application.IsMouseDisabled);
Assert.False (Application.EnableConsoleScrolling);
// arrange
ConfigurationManager.Settings ["Application.QuitKey"].PropertyValue = Key.Q;
ConfigurationManager.Settings ["Application.AlternateForwardKey"].PropertyValue = Key.F;
ConfigurationManager.Settings ["Application.AlternateBackwardKey"].PropertyValue = Key.B;
ConfigurationManager.Settings ["Application.IsMouseDisabled"].PropertyValue = true;
ConfigurationManager.Settings ["Application.EnableConsoleScrolling"].PropertyValue = true;
ConfigurationManager.Settings.Apply ();
ConfigurationManager.Locations = ConfigLocations.DefaultOnly;
@@ -268,7 +263,6 @@ namespace Terminal.Gui.ConfigurationTests {
Assert.Equal (Key.PageDown | Key.CtrlMask, Application.AlternateForwardKey);
Assert.Equal (Key.PageUp | Key.CtrlMask, Application.AlternateBackwardKey);
Assert.False (Application.IsMouseDisabled);
Assert.False (Application.EnableConsoleScrolling);
}
@@ -312,7 +306,7 @@ namespace Terminal.Gui.ConfigurationTests {
ConfigurationManager.Reset ();
ConfigurationManager.GetHardCodedDefaults ();
var stream = ConfigurationManager.ToStream ();
ConfigurationManager.Settings.Update (stream, "TestConfigurationManagerToJson");
}
@@ -320,7 +314,7 @@ namespace Terminal.Gui.ConfigurationTests {
public void TestConfigurationManagerInitDriver_NoLocations ()
{
}
[Fact, AutoInitShutdown (configLocation: ConfigLocations.DefaultOnly)]
@@ -336,7 +330,7 @@ namespace Terminal.Gui.ConfigurationTests {
// Change Base
var json = ConfigurationManager.ToStream ();
ConfigurationManager.Settings.Update (json, "TestConfigurationManagerInitDriver");
var colorSchemes = ((Dictionary<string, ColorScheme>)ConfigurationManager.Themes [ConfigurationManager.Themes.Theme] ["ColorSchemes"].PropertyValue);
@@ -507,7 +501,7 @@ namespace Terminal.Gui.ConfigurationTests {
ConfigurationManager.Reset ();
ConfigurationManager.ThrowOnJsonErrors = true;
ConfigurationManager.Settings.Update (json, "TestConfigurationManagerUpdateFromJson");
Assert.Equal (Key.Q | Key.CtrlMask, Application.QuitKey);
@@ -518,7 +512,7 @@ namespace Terminal.Gui.ConfigurationTests {
Assert.Equal (Color.White, Colors.ColorSchemes ["Base"].Normal.Foreground);
Assert.Equal (Color.Blue, Colors.ColorSchemes ["Base"].Normal.Background);
var colorSchemes = (Dictionary<string, ColorScheme>)Themes.First().Value ["ColorSchemes"].PropertyValue;
var colorSchemes = (Dictionary<string, ColorScheme>)Themes.First ().Value ["ColorSchemes"].PropertyValue;
Assert.Equal (Color.White, colorSchemes ["Base"].Normal.Foreground);
Assert.Equal (Color.Blue, colorSchemes ["Base"].Normal.Background);
@@ -571,7 +565,7 @@ namespace Terminal.Gui.ConfigurationTests {
""UserDefined"": {
""AbNormal"": {
""foreground"": ""green"",
""background"": ""1234""
""background"": ""black""
}
}
}
@@ -615,7 +609,7 @@ namespace Terminal.Gui.ConfigurationTests {
jsonException = Assert.Throws<JsonException> (() => ConfigurationManager.Settings.Update (json, "test"));
Assert.StartsWith ("Unknown property", jsonException.Message);
Assert.Equal (0, ConfigurationManager.jsonErrors.Length);
ConfigurationManager.ThrowOnJsonErrors = false;
@@ -661,7 +655,7 @@ namespace Terminal.Gui.ConfigurationTests {
""UserDefined"": {
""AbNormal"": {
""foreground"": ""green"",
""background"": ""1234""
""background"": ""black""
}
}
}
@@ -696,7 +690,7 @@ namespace Terminal.Gui.ConfigurationTests {
ConfigurationManager.Settings.Update (json, "test");
ConfigurationManager.Settings.Update ("{}}", "test");
Assert.NotEqual (0, ConfigurationManager.jsonErrors.Length);
Application.Shutdown ();
@@ -743,12 +737,11 @@ namespace Terminal.Gui.ConfigurationTests {
public void Load_FiresUpdated ()
{
ConfigurationManager.Reset ();
ConfigurationManager.Settings ["Application.QuitKey"].PropertyValue = Key.Q;
ConfigurationManager.Settings ["Application.AlternateForwardKey"].PropertyValue = Key.F;
ConfigurationManager.Settings ["Application.AlternateBackwardKey"].PropertyValue = Key.B;
ConfigurationManager.Settings ["Application.IsMouseDisabled"].PropertyValue = true;
ConfigurationManager.Settings ["Application.EnableConsoleScrolling"].PropertyValue = true;
ConfigurationManager.Updated += ConfigurationManager_Updated;
bool fired = false;
@@ -760,7 +753,6 @@ namespace Terminal.Gui.ConfigurationTests {
Assert.Equal (Key.PageDown | Key.CtrlMask, ConfigurationManager.Settings ["Application.AlternateForwardKey"].PropertyValue);
Assert.Equal (Key.PageUp | Key.CtrlMask, ConfigurationManager.Settings ["Application.AlternateBackwardKey"].PropertyValue);
Assert.False ((bool)ConfigurationManager.Settings ["Application.IsMouseDisabled"].PropertyValue);
Assert.False ((bool)ConfigurationManager.Settings ["Application.EnableConsoleScrolling"].PropertyValue);
}
ConfigurationManager.Load (true);
@@ -785,7 +777,6 @@ namespace Terminal.Gui.ConfigurationTests {
Assert.Equal (Key.F, Application.AlternateForwardKey);
Assert.Equal (Key.B, Application.AlternateBackwardKey);
Assert.True (Application.IsMouseDisabled);
Assert.True (Application.EnableConsoleScrolling);
}
// act
@@ -793,7 +784,6 @@ namespace Terminal.Gui.ConfigurationTests {
ConfigurationManager.Settings ["Application.AlternateForwardKey"].PropertyValue = Key.F;
ConfigurationManager.Settings ["Application.AlternateBackwardKey"].PropertyValue = Key.B;
ConfigurationManager.Settings ["Application.IsMouseDisabled"].PropertyValue = true;
ConfigurationManager.Settings ["Application.EnableConsoleScrolling"].PropertyValue = true;
ConfigurationManager.Apply ();