Added RestartTerm method to the control

Author: mitchcapper

EasyWindowsTerminalControl.WinUI/EasyWindowsTerminalControl.WinUI.csproj

@@ -6,7 +6,7 @@
     <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
     <UseWinUI>true</UseWinUI>
     <Platforms>AnyCPU;x64</Platforms>
-    <Version>1.0.15-beta.1</Version>
+    <Version>1.0.16-beta.1</Version>
     <Description>High performance WinUI3 native terminal/shell control.  For WPF version see EasyWindowsTerminalControl alt package.   It features full 24-bit color support with ANSI/VT escape sequences (and colors), hardware / GPU accelerated rendering, mouse support, and true console interaction.  Support for command shells and key sequences, user interaction and programatic control.  See GH for more details.</Description>
 	<PackageReadmeFile>README.md</PackageReadmeFile>
     <Authors>MitchCapper</Authors>
@@ -39,9 +39,11 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="CI.Microsoft.Windows.Console.ConPTY" Version="1.22.250314001" />
-		<PackageReference Include="CI.Microsoft.Terminal.WinUI3.Unofficial" Version="1.0.15-beta.1" />
+		<PackageReference Include="CI.Microsoft.Terminal.WinUI3.Unofficial" Version="1.0.16-beta.1" />
 		<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106">
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
 	</ItemGroup>
 </Project>
+
+

EasyWindowsTerminalControl/EasyTerminalControl.cs

@@ -188,6 +188,24 @@ private void Term_TermReady(object sender, EventArgs e) {
 				ConPTYTerm.Resize(Terminal.Columns, Terminal.Rows);//fix the size being partially off on first load
 			});
 		}
+		/// <summary>
+		/// Restarts the command we are running in a brand new term and disposes of the old one
+		/// </summary>
+		/// <param name="useTerm">Optional term to use, note if useTerm.TermProcIsStarted this function will not do verry much</param>
+		/// <param name="disposeOld">True if the old term should be killed off</param>
+		public async Task RestartTerm(TermPTY useTerm = null, bool disposeOld=true){
+			var oldTerm = ConPTYTerm;
+			ConPTYTerm = useTerm ?? new TermPTY();
+			if (disposeOld){
+				try{
+				oldTerm?.CloseStdinToApp();
+				}catch{ }
+				try{
+				oldTerm?.StopExternalTermOnly();
+				}catch{ }
+			}
+			await TermInit();
+		}
 		private void StartTerm(int column_width, int row_height) {
 			if (ConPTYTerm == null)
 				return;
@@ -206,11 +224,16 @@ private void StartTerm(int column_width, int row_height) {
 			});
 		}
 		private async void Terminal_Loaded(object sender, RoutedEventArgs e) {
+			await TermInit();
+			//Terminal.Focus();
+		}
+
+		private async Task TermInit() {
 			StartTerm(Terminal.Columns, Terminal.Rows);
 			SetTheme(Theme);
 			SetCursor(IsCursorVisible);
 			SetReadOnly(IsReadOnly);
-			//Terminal.Focus();
+
 			await Task.Delay(1000);
 			SetCursor(IsCursorVisible);
 		}

EasyWindowsTerminalControl/EasyWindowsTerminalControl.csproj

@@ -5,7 +5,7 @@
 		<PlatformTarget>x64</PlatformTarget>
 		<Platforms>x64</Platforms>
 		<UseWpf>true</UseWpf>
-		<Version>1.0.33</Version>
+		<Version>1.0.34</Version>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
 		<PackageOutputPath>../Publish</PackageOutputPath>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -32,3 +32,4 @@
 
 
 </Project>
+

Microsoft.Terminal.WinUI3/Microsoft.Terminal.WinUI3.csproj

@@ -10,7 +10,7 @@
 		<BeforePack>CollectNativePackContents</BeforePack>
 		<Authors>MitchCapper</Authors>
 		<PackageProjectUrl>https://github.com/MitchCapper/EasyWindowsTerminalControl</PackageProjectUrl>
-		<Version>1.0.15-beta.1</Version>
+		<Version>1.0.16-beta.1</Version>
 		<Description>This is an unofficial WinUI3 recreation of the official Microsoft.Terminal.WPF package.  Highly recommend using this with the "EasyWindowsTerminalControl.WinUI".</Description>
 		<PackageOutputPath>../Publish</PackageOutputPath>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -96,3 +96,4 @@
 		</ItemGroup>
 	</Target>
 </Project>
+

README.md

@@ -59,6 +59,7 @@ The control has all the standard UserControl properties but it has the following
 ### Methods
 #### EasyTerminalControl
 - `DisconnectConPTYTerm()` - Mostly useful if you plan to connect another ConPTYTerm to the frontend
+- `RestartTerm(TermPTY useTerm = null, bool disposeOld=true)` - Restarts the process in a clean term with a new TermPTY instance. Can set `useTerm` to use your own TermPTY instance rather than ours. Any properties (ie StartupCommandLine) that have been changed the new version is used.
 
 #### TermPTY
 - `TermPTY(int READ_BUFFER_SIZE = 1024 * 16, bool USE_BINARY_WRITER = false, IProcessFactory ProcessFactory=null)` - The read buffer is the maximum that can be read at once, rarely would it need to be changed.  By default data is transmitted as UTF8 text however conpty does support binary reading and writing.  No matter what mode you use, you can use the `WriteToTerm` or `WriteToTermBinary` functions and it will automatically transform them to bytes/text automatically.  Of course if you are working with binary data but don't have binary writing on you will run into problems when it attempts to call Encoding.UTF8.GetString on those bytes.  IProcessFactory interface is responsible for creating the actual process.  If you need more control you can implement this but please review the default implementation first.  There are some [specific things](https://docs.microsoft.com/en-us/windows/console/creating-a-pseudoconsole-session#preparing-for-creation-of-the-child-process) that must be set or else the console interaction may not work properly.

TermExample.WinUI/MainWindow.xaml

@@ -22,6 +22,7 @@
 
 			<Button Content="Duplicate New" Click="DuplicateClicked" Margin="5" />
 			<Button Content="Clear Term" Click="ClearTermClicked" Margin="5" />
+			<Button Content="Restart Term" Click="RestartTermClicked" Margin="5" />
 			<Button Content="Show Buffer" Click="ShowBufferClicked" Margin="5" />
 		</StackPanel>
 	</Grid>

TermExample.WinUI/TermExample.WinUI.csproj

@@ -37,7 +37,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250310001" />
-	  <PackageReference Include="EasyWindowsTerminalControl.WinUI" Version="1.0.15-beta.1" />
+	  <PackageReference Include="EasyWindowsTerminalControl.WinUI" Version="1.0.16-beta.1" />
 
   </ItemGroup>
   <ItemGroup>
@@ -72,3 +72,4 @@
 		<None Remove="Package.appxmanifest" />
 	</ItemGroup>
 </Project>
+

TermExample/MainWindow.xaml

@@ -23,6 +23,7 @@
 		<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Row="1"  >
 			<Button Content="Duplicate New" Click="DuplicateClicked" Margin="5" />
 			<Button Content="Clear Term" Click="ClearTermClicked" Margin="5" />
+			<Button Content="Restart Term" Click="RestartTermClicked" Margin="5" />
 			<Button Content="Show Buffer" Click="ShowBufferClicked" Margin="5" />
 			<Button Content="Process Output Sample" Click="ShowProcessOutputClicked" Margin="5" />
 		</StackPanel>

TermExample/MainWindow.xaml.cs

@@ -107,6 +107,11 @@ private void ClearTermClicked(object sender, RoutedEventArgs e) {
 			RefocusKB();
 
 		}
+		private void RestartTermClicked(object sender, RoutedEventArgs e) {
+			basicTermControl.RestartTerm();
+			RefocusKB();
+
+		}
 
 
 		private void DuplicateClicked(object sender, RoutedEventArgs e) {