Merge branch 'v2_develop' of tig:gui-cs/Terminal.Gui into v2_develop

tznind · Oct 17, 2023 · 56a31f1 · 56a31f1
2 parents b0dc1e6 + 15d0c04
commit 56a31f1
Show file tree

Hide file tree

Showing 12 changed files with 2,489 additions and 16 deletions.
diff --git a/Terminal.Gui/ConsoleDrivers/CursesDriver/CursesDriver.cs b/Terminal.Gui/ConsoleDrivers/CursesDriver/CursesDriver.cs
@@ -627,7 +627,7 @@ public override void PrepareToRun (MainLoop mainLoop, Action<KeyEvent> keyHandle
 			return true;
 		});
 
-		_mainLoop.WinChanged += ProcessInput;
+		_mainLoop.WinChanged = ProcessInput;
 	}
 
 	public override void Init (Action terminalResized)

diff --git a/Terminal.Gui/ConsoleDrivers/FakeDriver/FakeDriver.cs b/Terminal.Gui/ConsoleDrivers/FakeDriver/FakeDriver.cs
@@ -353,7 +353,7 @@ public override void PrepareToRun (MainLoop mainLoop, Action<KeyEvent> keyHandle
 		_keyUpHandler = keyUpHandler;
 
 		// Note: Net doesn't support keydown/up events and thus any passed keyDown/UpHandlers will never be called
-		(mainLoop.MainLoopDriver as FakeMainLoop).KeyPressed += (consoleKey) => ProcessInput (consoleKey);
+		(mainLoop.MainLoopDriver as FakeMainLoop).KeyPressed = (consoleKey) => ProcessInput (consoleKey);
 	}
 
 	void ProcessInput (ConsoleKeyInfo consoleKey)

diff --git a/Terminal.Gui/ConsoleDrivers/NetDriver.cs b/Terminal.Gui/ConsoleDrivers/NetDriver.cs
@@ -136,7 +136,7 @@ public NetEvents (ConsoleDriver consoleDriver)
 
 	public InputResult? DequeueInput ()
 	{
-		while (!_inputReadyCancellationTokenSource.Token.IsCancellationRequested) {
+		while (_inputReadyCancellationTokenSource != null && !_inputReadyCancellationTokenSource.Token.IsCancellationRequested) {
 			_waitForStart.Set ();
 			_winChange.Set ();
 
@@ -185,7 +185,12 @@ void ProcessInputQueue ()
 	{
 		while (!_inputReadyCancellationTokenSource.Token.IsCancellationRequested) {
 
-			_waitForStart.Wait (_inputReadyCancellationTokenSource.Token);
+			try {
+				_waitForStart.Wait (_inputReadyCancellationTokenSource.Token);
+			} catch (OperationCanceledException) {
+
+				return;
+			}
 			_waitForStart.Reset ();
 
 			if (_inputQueue.Count == 0) {
@@ -1339,9 +1344,14 @@ void NetInputHandler ()
 			} catch (OperationCanceledException) {
 				return;
 			} finally {
-				_waitForProbe.Reset ();
+				if (_waitForProbe.IsSet) {
+					_waitForProbe.Reset ();
+				}
 			}
 
+			if (_inputHandlerTokenSource.IsCancellationRequested) {
+				return;
+			}
 			if (_resultQueue.Count == 0) {
 				_resultQueue.Enqueue (_netEvents.DequeueInput ());
 			}

diff --git a/Terminal.Gui/ConsoleDrivers/WindowsDriver.cs b/Terminal.Gui/ConsoleDrivers/WindowsDriver.cs
@@ -861,9 +861,9 @@ public override void PrepareToRun (MainLoop mainLoop, Action<KeyEvent> keyHandle
 		_mouseHandler = mouseHandler;
 
 		_mainLoop = mainLoop.MainLoopDriver as WindowsMainLoop;
-		_mainLoop.ProcessInput += ProcessInput;
+		_mainLoop.ProcessInput = ProcessInput;
 #if HACK_CHECK_WINCHANGED
-		_mainLoop.WinChanged += ChangeWin;
+		_mainLoop.WinChanged = ChangeWin;
 #endif
 	}
 

diff --git a/Terminal.Gui/Drawing/Glyphs.cs b/Terminal.Gui/Drawing/Glyphs.cs
@@ -129,6 +129,11 @@ public class GlyphDefinitions {
 		/// </summary>
 		public Rune Dot { get; set; } = (Rune)'∙';
 
+		/// <summary>
+		/// Black Circle . Default is (U+025cf) - ●.
+		/// </summary>
+		public Rune BlackCircle { get; set; } = (Rune)'●'; // Black Circle - ● U+025cf
+
 		/// <summary>
 		/// Expand (e.g. for <see cref="TreeView"/>.
 		/// </summary>

diff --git a/Terminal.Gui/Types/Point.cs b/Terminal.Gui/Types/Point.cs
@@ -41,7 +41,7 @@ public struct Point
 		/// <remarks>
 		///	An uninitialized Point Structure.
 		/// </remarks>
-		
+
 		public static readonly Point Empty;
 
 		/// <summary>