Simplify term start to avoid multiple ready events

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.17-beta.1</Version>
+    <Version>1.0.18-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,7 +39,7 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="CI.Microsoft.Windows.Console.ConPTY" Version="1.22.250314001" />
-		<PackageReference Include="CI.Microsoft.Terminal.WinUI3.Unofficial" Version="1.0.17-beta.1" />
+		<PackageReference Include="CI.Microsoft.Terminal.WinUI3.Unofficial" Version="1.0.18-beta.1" />
 		<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106">
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
@@ -49,3 +49,5 @@
 
 
 
+
+

EasyWindowsTerminalControl/EasyTerminalControl.cs

@@ -193,30 +193,24 @@ private void Term_TermReady(object sender, EventArgs e) {
 		/// </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){
+		public async Task RestartTerm(TermPTY useTerm = null, bool disposeOld = true) {
 			var oldTerm = ConPTYTerm;
 			DisconnectConPTYTerm();
-			ConPTYTerm = useTerm ?? new TermPTY();
-			if (disposeOld){
-				try{
-				oldTerm?.CloseStdinToApp();
-				}catch{ }
-				try{
-				oldTerm?.StopExternalTermOnly();
-				}catch{ }
+			if (disposeOld) {
+				try {
+					oldTerm?.CloseStdinToApp();
+				} catch { }
+				try {
+					oldTerm?.StopExternalTermOnly();
+				} catch { }
 			}
-			await TermInit();
+
+			ConPTYTerm = useTerm ?? new TermPTY(); //setting the term to a new value will automatically initalize everyhting
 		}
 		private void StartTerm(int column_width, int row_height) {
-			if (ConPTYTerm == null)
+			if (ConPTYTerm?.TermProcIsStarted != false)
 				return;
 
-			if (ConPTYTerm.TermProcIsStarted) {
-				ConPTYTerm.Resize(column_width, row_height);
-				Term_TermReady(ConPTYTerm, null);
-				return;
-			}
-			ConPTYTerm.TermReady += Term_TermReady;
 			MainThreadRun(() => {
 				var cmd = StartupCommandLine;//thread safety for dp
 				var term = ConPTYTerm;

EasyWindowsTerminalControl/EasyWindowsTerminalControl.csproj

@@ -5,7 +5,7 @@
 		<PlatformTarget>x64</PlatformTarget>
 		<Platforms>x64</Platforms>
 		<UseWpf>true</UseWpf>
-		<Version>1.0.35</Version>
+		<Version>1.0.36</Version>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
 		<PackageOutputPath>../Publish</PackageOutputPath>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -34,3 +34,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.17-beta.1</Version>
+		<Version>1.0.18-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>
@@ -98,3 +98,4 @@
 </Project>
 
 
+

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.17-beta.1" />
+	  <PackageReference Include="EasyWindowsTerminalControl.WinUI" Version="1.0.18-beta.1" />
 
   </ItemGroup>
   <ItemGroup>
@@ -74,3 +74,4 @@
 </Project>
 
 
+