Adds "Clip Region" clipping to ConsoleDriver

Terminal.Gui/Application.cs

@@ -6,7 +6,6 @@
 using System.Reflection;
 using System.IO;
 using System.Text.Json.Serialization;
-using static Terminal.Gui.ConfigurationManager;
 
 namespace Terminal.Gui {
 	/// <summary>
@@ -1087,7 +1086,7 @@ static void OnTerminalResized ()
 		{
 			var full = new Rect (0, 0, Driver.Cols, Driver.Rows);
 			TerminalResized?.Invoke (new ResizedEventArgs () { Cols = full.Width, Rows = full.Height });
-			Driver.Clip = full;
+			Driver.Clip = new Rect (0, 0, Driver.Cols, Driver.Rows);
 			foreach (var t in _toplevels) {
 				t.SetRelativeLayout (full);
 				t.LayoutSubviews ();
@@ -1149,7 +1148,7 @@ public static void GrabMouse (View view)
 			if (!OnGrabbingMouse (view)) {
 				OnGrabbedMouse (view);
 				_mouseGrabView = view;
-				Driver.UncookMouse ();
+				//Driver.UncookMouse ();
 			}
 		}
 
@@ -1163,7 +1162,7 @@ public static void UngrabMouse ()
 			if (!OnUnGrabbingMouse (_mouseGrabView)) {
 				OnUnGrabbedMouse (_mouseGrabView);
 				_mouseGrabView = null;
-				Driver.CookMouse ();
+				//Driver.CookMouse ();
 			}
 		}
 

Terminal.Gui/Clipboard/Clipboard.cs

@@ -1,100 +1,172 @@
 using NStack;
 using System;
+using System.Diagnostics;
+using System.Threading.Tasks;
+
+namespace Terminal.Gui;
+
+/// <summary>
+/// Provides cut, copy, and paste support for the OS clipboard.
+/// </summary>
+/// <remarks>
+/// <para>
+/// On Windows, the <see cref="Clipboard"/> class uses the Windows Clipboard APIs via P/Invoke.
+/// </para>
+/// <para>
+/// On Linux, when not running under Windows Subsystem for Linux (WSL),
+/// the <see cref="Clipboard"/> class uses the xclip command line tool. If xclip is not installed,
+/// the clipboard will not work.
+/// </para>
+/// <para>
+/// On Linux, when running under Windows Subsystem for Linux (WSL),
+/// the <see cref="Clipboard"/> class launches Windows' powershell.exe via WSL interop and uses the
+/// "Set-Clipboard" and "Get-Clipboard" Powershell CmdLets. 
+/// </para>
+/// <para>
+/// On the Mac, the <see cref="Clipboard"/> class uses the MacO OS X pbcopy and pbpaste command line tools
+/// and the Mac clipboard APIs vai P/Invoke.
+/// </para>
+/// </remarks>
+public static class Clipboard {
+	static ustring contents;
 
-namespace Terminal.Gui {
 	/// <summary>
-	/// Provides cut, copy, and paste support for the OS clipboard.
+	/// Gets (copies from) or sets (pastes to) the contents of the OS clipboard.
 	/// </summary>
-	/// <remarks>
-	/// <para>
-	/// On Windows, the <see cref="Clipboard"/> class uses the Windows Clipboard APIs via P/Invoke.
-	/// </para>
-	/// <para>
-	/// On Linux, when not running under Windows Subsystem for Linux (WSL),
-	/// the <see cref="Clipboard"/> class uses the xclip command line tool. If xclip is not installed,
-	/// the clipboard will not work.
-	/// </para>
-	/// <para>
-	/// On Linux, when running under Windows Subsystem for Linux (WSL),
-	/// the <see cref="Clipboard"/> class launches Windows' powershell.exe via WSL interop and uses the
-	/// "Set-Clipboard" and "Get-Clipboard" Powershell CmdLets. 
-	/// </para>
-	/// <para>
-	/// On the Mac, the <see cref="Clipboard"/> class uses the MacO OS X pbcopy and pbpaste command line tools
-	/// and the Mac clipboard APIs vai P/Invoke.
-	/// </para>
-	/// </remarks>
-	public static class Clipboard {
-		static ustring contents;
-
-		/// <summary>
-		/// Gets (copies from) or sets (pastes to) the contents of the OS clipboard.
-		/// </summary>
-		public static ustring Contents {
-			get {
-				try {
-					if (IsSupported) {
-						return contents = ustring.Make (Application.Driver.Clipboard.GetClipboardData ());
-					} else {
-						return contents;
-					}
-				} catch (Exception) {
+	public static ustring Contents {
+		get {
+			try {
+				if (IsSupported) {
+					return contents = ustring.Make (Application.Driver.Clipboard.GetClipboardData ());
+				} else {
 					return contents;
 				}
+			} catch (Exception) {
+				return contents;
 			}
-			set {
-				try {
-					if (IsSupported) {
-						if (value == null) {
-							value = string.Empty;
-						}
-						Application.Driver.Clipboard.SetClipboardData (value.ToString ());
+		}
+		set {
+			try {
+				if (IsSupported) {
+					if (value == null) {
+						value = string.Empty;
 					}
-					contents = value;
-				} catch (NotSupportedException e) {
-					throw e;
-				} catch (Exception) {
-					contents = value;
+					Application.Driver.Clipboard.SetClipboardData (value.ToString ());
 				}
+				contents = value;
+			} catch (NotSupportedException e) {
+				throw e;
+			} catch (Exception) {
+				contents = value;
 			}
 		}
+	}
 
-		/// <summary>
-		/// Returns true if the environmental dependencies are in place to interact with the OS clipboard.
-		/// </summary>
-		/// <remarks>
-		/// </remarks>
-		public static bool IsSupported { get => Application.Driver.Clipboard.IsSupported; }
-
-		/// <summary>
-		/// Copies the contents of the OS clipboard to <paramref name="result"/> if possible.
-		/// </summary>
-		/// <param name="result">The contents of the OS clipboard if successful, <see cref="string.Empty"/> if not.</param>
-		/// <returns><see langword="true"/> the OS clipboard was retrieved, <see langword="false"/> otherwise.</returns>
-		public static bool TryGetClipboardData (out string result)
-		{
-			if (IsSupported && Application.Driver.Clipboard.TryGetClipboardData (out result)) {
-				if (contents != result) {
-					contents = result;
-				}
-				return true;
+	/// <summary>
+	/// Returns true if the environmental dependencies are in place to interact with the OS clipboard.
+	/// </summary>
+	/// <remarks>
+	/// </remarks>
+	public static bool IsSupported { get => Application.Driver.Clipboard.IsSupported; }
+
+	/// <summary>
+	/// Copies the contents of the OS clipboard to <paramref name="result"/> if possible.
+	/// </summary>
+	/// <param name="result">The contents of the OS clipboard if successful, <see cref="string.Empty"/> if not.</param>
+	/// <returns><see langword="true"/> the OS clipboard was retrieved, <see langword="false"/> otherwise.</returns>
+	public static bool TryGetClipboardData (out string result)
+	{
+		if (IsSupported && Application.Driver.Clipboard.TryGetClipboardData (out result)) {
+			if (contents != result) {
+				contents = result;
 			}
-			result = string.Empty;
-			return false;
+			return true;
 		}
+		result = string.Empty;
+		return false;
+	}
 
-		/// <summary>
-		/// Pastes the <paramref name="text"/> to the OS clipboard if possible.
-		/// </summary>
-		/// <param name="text">The text to paste to the OS clipboard.</param>
-		/// <returns><see langword="true"/> the OS clipboard was set, <see langword="false"/> otherwise.</returns>
-		public static bool TrySetClipboardData (string text)
-		{
-			if (IsSupported && Application.Driver.Clipboard.TrySetClipboardData (text)) {
-				contents = text;
-				return true;
-			}
-			return false;
+	/// <summary>
+	/// Pastes the <paramref name="text"/> to the OS clipboard if possible.
+	/// </summary>
+	/// <param name="text">The text to paste to the OS clipboard.</param>
+	/// <returns><see langword="true"/> the OS clipboard was set, <see langword="false"/> otherwise.</returns>
+	public static bool TrySetClipboardData (string text)
+	{
+		if (IsSupported && Application.Driver.Clipboard.TrySetClipboardData (text)) {
+			contents = text;
+			return true;
 		}
+		return false;
 	}
 }
+
+/// <summary>
+/// Helper class for console drivers to invoke shell commands to interact with the clipboard.
+/// Used primarily by CursesDriver, but also used in Unit tests which is why it is in
+/// ConsoleDriver.cs.
+/// </summary>
+internal static class ClipboardProcessRunner {
+	public static (int exitCode, string result) Bash (string commandLine, string inputText = "", bool waitForOutput = false)
+	{
+		var arguments = $"-c \"{commandLine}\"";
+		var (exitCode, result) = Process ("bash", arguments, inputText, waitForOutput);
+
+		return (exitCode, result.TrimEnd ());
+	}
+
+	public static (int exitCode, string result) Process (string cmd, string arguments, string input = null, bool waitForOutput = true)
+	{
+		var output = string.Empty;
+
+		using (Process process = new Process {
+			StartInfo = new ProcessStartInfo {
+				FileName = cmd,
+				Arguments = arguments,
+				RedirectStandardOutput = true,
+				RedirectStandardError = true,
+				RedirectStandardInput = true,
+				UseShellExecute = false,
+				CreateNoWindow = true,
+			}
+		}) {
+			var eventHandled = new TaskCompletionSource<bool> ();
+			process.Start ();
+			if (!string.IsNullOrEmpty (input)) {
+				process.StandardInput.Write (input);
+				process.StandardInput.Close ();
+			}
+
+			if (!process.WaitForExit (5000)) {
+				var timeoutError = $@"Process timed out. Command line: {process.StartInfo.FileName} {process.StartInfo.Arguments}.";
+				throw new TimeoutException (timeoutError);
+			}
+
+			if (waitForOutput && process.StandardOutput.Peek () != -1) {
+				output = process.StandardOutput.ReadToEnd ();
+			}
+
+			if (process.ExitCode > 0) {
+				output = $@"Process failed to run. Command line: {cmd} {arguments}.
+										Output: {output}
+										Error: {process.StandardError.ReadToEnd ()}";
+			}
+
+			return (process.ExitCode, output);
+		}
+	}
+
+	public static bool DoubleWaitForExit (this System.Diagnostics.Process process)
+	{
+		var result = process.WaitForExit (500);
+		if (result) {
+			process.WaitForExit ();
+		}
+		return result;
+	}
+
+	public static bool FileExists (this string value)
+	{
+		return !string.IsNullOrEmpty (value) && !value.Contains ("not found");
+	}
+}

Terminal.Gui/Clipboard/IClipboard.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Terminal.Gui {
 	/// <summary>

Terminal.Gui/Configuration/ConfigurationManager.cs

@@ -1,4 +1,5 @@
-global using CM = Terminal.Gui.ConfigurationManager;
+global using static Terminal.Gui.ConfigurationManager;
+global using CM = Terminal.Gui.ConfigurationManager;
 
 using System;
 using System.Collections;

Terminal.Gui/Configuration/ThemeScope.cs

@@ -57,7 +57,7 @@ public class ThemeScope : Scope<ThemeScope> {
 			internal override bool Apply ()
 			{
 				var ret = base.Apply ();
-				Application.Driver?.InitalizeColorSchemes ();
+				Application.Driver?.InitializeColorSchemes ();
 				return ret;
 			}
 		}