Various backports from VSMac

.github/workflows/build-and-test.yml

@@ -0,0 +1,39 @@
+name: CI
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: macos-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+    - uses: actions/checkout@v2
+
+    # Build helper
+    - name: Build ptylib
+      run: |
+        cd helper
+        cc -shared pty.c -shared -o libpty.dylib
+
+    # Restore packages
+    - name: Restore
+      run: msbuild /t:restore
+
+    # Build
+    - name: Build
+      run: msbuild /t:build
+
+    # Test
+    - name: Test
+      run: dotnet test Tests/Tests.csproj

GuiCsHost/GuiCsHost.csproj

@@ -31,17 +31,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="NStack">
-      <HintPath>..\packages\NStack.Core.0.12.0\lib\netstandard1.5\NStack.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ValueTuple">
-      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
-    </Reference>
-    <Reference Include="mscorlib" />
-    <Reference Include="Terminal.Gui">
-      <HintPath>..\packages\Terminal.Gui.0.19.0\lib\net461\Terminal.Gui.dll</HintPath>
-    </Reference>
     <Reference Include="Mono.Posix" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+    <PackageReference Include="NStack.Core" Version="0.12.0" />
+    <PackageReference Include="Terminal.Gui" Version="0.19.0" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />

GuiCsHost/TerminalView.cs

@@ -263,7 +263,7 @@ public override void Redraw (Rect region)
 
 		public override bool MouseEvent (MouseEvent mouseEvent)
 		{
-			if (terminal.MouseEvents) {
+			if (terminal.MouseMode.SendMotionEvent()) {
 				var f = mouseEvent.Flags;
 				int button = -1;
 				if (f.HasFlag (MouseFlags.Button1Clicked))
@@ -274,10 +274,10 @@ public override bool MouseEvent (MouseEvent mouseEvent)
 					button = 2;
 
 				if  (button != -1){
-					var e = terminal.EncodeButton (button, release: false, shift: false, meta: false, control: false);
+					var e = terminal.EncodeMouseButton (button, release: false, shift: false, meta: false, control: false);
 					terminal.SendEvent (e, mouseEvent.X, mouseEvent.Y);
-					if (terminal.MouseSendsRelease) {
-						e = terminal.EncodeButton (button, release: true, shift: false, meta: false, control: false);
+					if (terminal.MouseMode.SendButtonRelease()) {
+						e = terminal.EncodeMouseButton (button, release: true, shift: false, meta: false, control: false);
 						terminal.SendEvent (e, mouseEvent.X, mouseEvent.Y);
 					}
 					return true;
@@ -325,6 +325,11 @@ public string WindowCommand (XtermSharp.Terminal source, WindowManipulationComma
 			return null;
 		}
 
+		bool ITerminalDelegate.IsProcessTrusted ()
+		{
+			return true;
+		}
+
 		public override void PositionCursor ()
 		{
 			Move (terminal.Buffer.X, terminal.Buffer.Y);

MacTerminal/Info.plist

@@ -11,7 +11,7 @@
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSMinimumSystemVersion</key>
-	<string>10.12</string>
+	<string>10.14</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleInfoDictionaryVersion</key>

MacTerminal/MacTerminal.csproj

@@ -1,91 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{1F7FAA67-E10C-4C71-8DA9-91A2A08E5F46}</ProjectGuid>
-    <ProjectTypeGuids>{A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <TargetFramework>net6.0-macos</TargetFramework>
     <OutputType>Exe</OutputType>
-    <RootNamespace>MacTerminal</RootNamespace>
-    <AssemblyName>MacTerminal</AssemblyName>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <TargetFrameworkIdentifier>Xamarin.Mac</TargetFrameworkIdentifier>
-    <MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <EnableCodeSigning>false</EnableCodeSigning>
-    <CodeSigningKey>Mac Developer</CodeSigningKey>
-    <CreatePackage>false</CreatePackage>
-    <EnablePackageSigning>false</EnablePackageSigning>
-    <IncludeMonoRuntime>false</IncludeMonoRuntime>
-    <UseSGen>true</UseSGen>
-    <UseRefCounting>true</UseRefCounting>
-    <Profiling>true</Profiling>
-    <HttpClientHandler></HttpClientHandler>
-    <LinkMode></LinkMode>
-    <XamMacArch></XamMacArch>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <DefineConstants></DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <EnableCodeSigning>false</EnableCodeSigning>
-    <CreatePackage>true</CreatePackage>
-    <EnablePackageSigning>false</EnablePackageSigning>
-    <IncludeMonoRuntime>true</IncludeMonoRuntime>
-    <UseSGen>true</UseSGen>
-    <UseRefCounting>true</UseRefCounting>
+    <RuntimeIdentifier>osx-arm64</RuntimeIdentifier>
+    <UseMonoRuntime>false</UseMonoRuntime>
     <LinkMode>SdkOnly</LinkMode>
-    <HttpClientHandler></HttpClientHandler>
-    <XamMacArch></XamMacArch>
+
+    <SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion>
+    <MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <RootNamespace>MacTerminal</RootNamespace>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="Xamarin.Mac" />
     <PackageReference Include="NStack.Core" Version="0.12.0" />
   </ItemGroup>
-  <ItemGroup>
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-128.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-128%402x.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-16.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-16%402x.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-256.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-256%402x.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-32.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-32%402x.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-512.png" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\AppIcon-512%402x.png" />
-    <ImageAsset Include="Assets.xcassets\Contents.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Resources\" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Info.plist" />
-    <None Include="Entitlements.plist" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AppDelegate.cs" />
-    <Compile Include="ViewController.cs" />
-    <Compile Include="ViewController.designer.cs">
-      <DependentUpon>ViewController.cs</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <InterfaceDefinition Include="Main.storyboard" />
-  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\XtermSharp\XtermSharp.csproj">
       <Project>{218EB800-B5D6-46C3-8113-8DB312AE0C64}</Project>
@@ -96,8 +26,8 @@
       <Name>XtermSharp.Mac</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
-  <Target Name="AfterBuild">
-    <Copy SourceFiles="..\helper\libpty.dylib" DestinationFolder="$(OutputPath)\MacTerminal.app\Contents\MonoBundle" />
+
+  <Target Name="AfterBuild" AfterTargets="_CopyResolvedFilesToPublishAlways">
+    <Copy SourceFiles="..\helper\libpty.dylib" DestinationFolder="$(OutputPath)MacTerminal.app\Contents\MonoBundle" />
   </Target>
-</Project>
+</Project>

MacTerminal/ViewController.cs

@@ -5,14 +5,15 @@
 using System;
 using AppKit;
 using Foundation;
+using ObjCRuntime;
 using XtermSharp.Mac;
 
 namespace MacTerminal {
 	public partial class ViewController : NSViewController {
 		ProcessTerminalView terminalControl;
 		LocalProcess process;
 
-		public ViewController (IntPtr handle) : base (handle)
+		public ViewController (NativeHandle handle) : base (handle)
 		{
 		}
 

README.md

@@ -2,6 +2,7 @@
 XtermSharp
 ----------
 
+![Build Status](https://github.com/migueldeicaza/XtermSharp/workflows/CI/badge.svg)
 [![Build Status](https://migueldeicaza.visualstudio.com/XtermSharp/_apis/build/status/XtermSharp-Mac-CI?branchName=master)](https://migueldeicaza.visualstudio.com/XtermSharp/_build/latest?definitionId=9&branchName=master)
 
 <img width="45%" alt="XtermSharpGui" src="https://user-images.githubusercontent.com/36863/54497310-80eda980-48cf-11e9-84c2-14ddc054a4b6.png"><img width="45%" alt="XtermSharpMac" src="https://user-images.githubusercontent.com/36863/54497311-80eda980-48cf-11e9-9695-d7425e43262d.png">

SimpleTester/SimpleTester.csproj

@@ -28,9 +28,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="NStack">
-      <HintPath>..\packages\NStack.Core.0.11.0\lib\netstandard1.5\NStack.dll</HintPath>
-    </Reference>
+    <PackageReference Include="NStack.Core" Version="0.12.0" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />

Tests/BufferTests/ReflowNarrowerTest.cs

@@ -0,0 +1,25 @@
+using System;
+using XtermSharp;
+using Xunit;
+
+namespace XtermSharp.Tests.BufferTests {
+
+	public class ReflowNarrowerTests {
+		[Fact]
+		public void DoesNotCrashWhenReflowingToTinyWidth ()
+		{
+			var options = new TerminalOptions () { Cols = 10, Rows = 10 };
+			options.Scrollback = 1;
+			var terminal = new Terminal (null, options);
+
+			terminal.Feed ("1234567890\r\n");
+			terminal.Feed ("ABCDEFGH\r\n");
+			terminal.Feed ("abcdefghijklmnopqrstxxx\r\n");
+			terminal.Feed ("\r\n");
+
+			// if we resize to a small column width, content is pushed back up and out the top
+			// of the buffer. Ensure that this does not crash
+			terminal.Resize (3, 10);
+		}
+	}
+}

Tests/BufferTests/SelectionTests.cs

@@ -0,0 +1,32 @@
+using Xunit;
+
+namespace XtermSharp.Tests.BufferTests {
+	public class SelectionTests {
+		[Fact]
+		public void DoesNotCrashWhenSelectingWordOrExpressionOutsideColumnRange ()
+		{
+			var terminal = new Terminal (null, new TerminalOptions { Rows = 10, Cols = 10 });
+			var selection = new SelectionService (terminal);
+
+			terminal.Feed ("1234567890");
+
+			// depending on the size of terminal view, there might be a space near the margin where the user
+			// clicks which might result in a col or row outside the bounds of terminal,
+			selection.SelectWordOrExpression (-1, 0);
+			selection.SelectWordOrExpression (11, 0);
+		}
+
+		[Fact]
+		public void DoesNotCrashWhenSelectingWordOrExpressionOutsideRowRange ()
+		{
+			var terminal = new Terminal (null, new TerminalOptions { Rows = 10, Cols = 10, Scrollback = 0 });
+			var selection = new SelectionService (terminal);
+
+			terminal.Feed ("1234567890");
+
+			// depending on the size of terminal view, there might be a space near the margin where the user
+			// clicks which might result in a col or row outside the bounds of terminal,
+			selection.SelectWordOrExpression (0, -1);
+		}
+	}
+}