fix paste performance issue on windows and linux

.gitignore

@@ -767,3 +767,4 @@ fabric.properties
 *.sln.iml
 
 /src/Tools/Consolonia.PreviewHost/Properties/launchSettings.json
+src/.vscode/launch.json

src/Consolonia.Core/Consolonia.Core.csproj

@@ -6,7 +6,7 @@
         <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
         <PackageReference Include="Avalonia.Controls.DataGrid" Version="$(AvaloniaVersion)" />
         <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
-        <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.8" />
+        <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="3.116.1" />
         <PackageReference Include="Unicode.net" Version="2.0.0" />
         <PackageReference Include="Wcwidth" Version="2.0.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />

src/Consolonia.Core/Helpers/Extensions.cs → src/Consolonia.Core/Helpers/UtilityExtensions.cs

@@ -13,7 +13,7 @@
 
 namespace Consolonia.Core.Helpers
 {
-    public static class Extensions
+    public static class UtilityExtensions
     {
         public static IDisposable SubscribeAction<TValue>(
             this IObservable<AvaloniaPropertyChangedEventArgs<TValue>> observable,

src/Consolonia.Core/Infrastructure/ConsoleBase.cs

@@ -6,6 +6,7 @@
 using Avalonia.Media;
 using Consolonia.Core.Drawing;
 using Consolonia.Core.Drawing.PixelBufferImplementation;
+using Consolonia.Core.Text;
 
 namespace Consolonia.Core.Infrastructure
 {
@@ -68,6 +69,7 @@ protected void StartSizeCheckTimerAsync(uint slowInterval = 1500)
         public event Action<Key, char, RawInputModifiers, bool, ulong> KeyEvent;
         public event Action<RawPointerEventType, Point, Vector?, RawInputModifiers> MouseEvent;
         public event Action<bool> FocusEvent;
+        public event Action<string, ulong> TextInputEvent;
 
         protected void RaiseMouseEvent(RawPointerEventType eventType, Point point, Vector? wheelDelta,
             RawInputModifiers modifiers)
@@ -80,6 +82,11 @@ protected void RaiseKeyPress(Key key, char character, RawInputModifiers modifier
             KeyEvent?.Invoke(key, character, modifiers, down, timeStamp);
         }
 
+        protected void RaiseTextInput(string text, ulong timestamp)
+        {
+            TextInputEvent?.Invoke(text, timestamp);
+        }
+
         protected void RaiseFocusEvent(bool focused)
         {
             FocusEvent?.Invoke(focused);
@@ -123,6 +130,7 @@ public virtual void HideCaret()
 
         public virtual void PrepareConsole()
         {
+            WriteText(Esc.EnableBracketedPasteMode);
             _consoleOutput.PrepareConsole();
         }
 
@@ -135,6 +143,7 @@ public virtual void Print(PixelBufferCoordinate bufferPoint, Color background, C
         public virtual void RestoreConsole()
         {
             _consoleOutput.RestoreConsole();
+            WriteText(Esc.DisableBracketedPasteMode);
         }
 
         public virtual void SetCaretPosition(PixelBufferCoordinate bufferPoint)

src/Consolonia.Core/Infrastructure/ConsoleWindow.cs

@@ -38,6 +38,7 @@ public ConsoleWindow()
             Console = AvaloniaLocator.Current.GetService<IConsole>() ?? throw new NotImplementedException();
             Console.Resized += OnConsoleOnResized;
             Console.KeyEvent += ConsoleOnKeyEvent;
+            Console.TextInputEvent += ConsoleOnTextInputEvent;
             Console.MouseEvent += ConsoleOnMouseEvent;
             Console.FocusEvent += ConsoleOnFocusEvent;
             Handle = null!;
@@ -394,6 +395,18 @@ private void OnConsoleOnResized()
             });
         }
 
+        private void ConsoleOnTextInputEvent(string text, ulong timeStamp)
+        {
+            Dispatcher.UIThread.Post(() =>
+            {
+#pragma warning disable CS0618 // Type or member is obsolete // todo: change to correct constructor, CFA20A9A-3A24-4187-9CA3-9DF0081124EE 
+                var rawInputEventArgs = new RawTextInputEventArgs(_myKeyboardDevice, timeStamp, _inputRoot, text);
+#pragma warning restore CS0618 // Type or member is obsolete
+                Input!(rawInputEventArgs);
+            }, DispatcherPriority.Input);
+        }
+
+
         private async void ConsoleOnKeyEvent(Key key, char keyChar, RawInputModifiers rawInputModifiers, bool down,
             ulong timeStamp)
         {

src/Consolonia.Core/Infrastructure/ConsoloniaPlatform.cs

@@ -59,34 +59,13 @@ public void Initialize()
                 .Bind<IPlatformIconLoader>().ToConstant(new DummyIconLoader())
                 .Bind<IPlatformSettings>().ToSingleton<ConsoloniaPlatformSettings>()
                 .Bind<IStorageProvider>().ToSingleton<ConsoloniaStorageProvider>()
+                //.Bind<IClipboard>().ToConstant(null)
                 /*.Bind<IKeyboardNavigationHandler>().ToTransient<ArrowsAndKeyboardNavigationHandler>() todo: implement this navigation*/
                 //.Bind<IClipboard>().ToConstant(new X11Clipboard(this))
                 //.Bind<IPlatformSettings>().ToConstant(new PlatformSettingsStub())
                 //.Bind<ISystemDialogImpl>().ToConstant(new GtkSystemDialog())
                 /*.Bind<IMountedVolumeInfoProvider>().ToConstant(new LinuxMountedVolumeInfoProvider())*/;
 
-            if (OperatingSystem.IsWindows())
-            {
-                AvaloniaLocator.CurrentMutable.Bind<IClipboard>()
-                    .ToFunc(() =>
-                    {
-                        Assembly assembly = Assembly.Load("Avalonia.Win32");
-                        ArgumentNullException.ThrowIfNull(assembly, "Avalonia.Win32");
-                        Type type = assembly.GetType(assembly.GetName().Name + ".ClipboardImpl");
-                        ArgumentNullException.ThrowIfNull(type, "ClipboardImpl");
-                        var clipboard = Activator.CreateInstance(type) as IClipboard;
-                        ArgumentNullException.ThrowIfNull(clipboard, nameof(clipboard));
-                        return clipboard;
-                    });
-            }
-            else if (OperatingSystem.IsMacOS())
-            {
-                // TODO: Implement or reuse MacOS clipboard
-            }
-            else if (OperatingSystem.IsLinux())
-            {
-                // TODO: Implement or reuse X11 Clipboard
-            }
         }
 
         [DebuggerStepThrough]

src/Consolonia.Core/Infrastructure/IConsole.cs

@@ -32,6 +32,7 @@ public interface IConsole : IConsoleOutput
         public event Action Resized;
 
         event Action<Key, char, RawInputModifiers, bool, ulong> KeyEvent;
+        event Action<string, ulong> TextInputEvent;
         event Action<RawPointerEventType, Point, Vector?, RawInputModifiers> MouseEvent;
 
         event Action<bool> FocusEvent;

src/Consolonia.Core/Infrastructure/NaiveClipboard.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Threading.Tasks;
+using Avalonia.Input;
+using Avalonia.Input.Platform;
+
+namespace Consolonia.Core.Infrastructure
+{
+    /// <summary>
+    /// This clipboard only stores memory in the same process, so it is not useful for sharing data between processes.
+    /// </summary>
+    public class NaiveClipboard : IClipboard
+    {
+        private string _text = String.Empty;
+
+#pragma warning disable CA1822 // Mark members as static
+        public async Task ClearAsync()
+        {
+            await Task.CompletedTask;
+            _text = String.Empty;
+        }
+
+        public Task<object> GetDataAsync(string format)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<string[]> GetFormatsAsync()
+        {
+            throw new NotImplementedException();
+        }
+
+        public async Task<string> GetTextAsync()
+        {
+            await Task.CompletedTask;
+            return _text;
+        }
+
+        public Task SetDataObjectAsync(IDataObject data)
+        {
+            throw new NotImplementedException();
+        }
+
+        public async Task SetTextAsync(string text)
+        {
+            await Task.CompletedTask;
+            _text = text;
+        }
+    }
+}

src/Consolonia.Core/Text/Esc.cs

@@ -42,7 +42,7 @@ internal static class Esc
 
         // bracketed 
         public const string EnableBracketedPasteMode = "\u001b[?2004h";
-        public const string DisableBracktedPasteMode = "\u001b[?2004l";
+        public const string DisableBracketedPasteMode = "\u001b[?2004l";
 
         // mouse tracking
         public const string EnableMouseTracking = "\u001b[?1000h";

src/Consolonia.Gallery/Gallery/GalleryViews/GalleryTextBox.axaml

@@ -7,16 +7,17 @@
              x:Class="Consolonia.Gallery.Gallery.GalleryViews.GalleryTextBox">
     <!--Copied from https://github.com/AvaloniaUI/Avalonia/blob/master/src/Avalonia.Themes.Default/TextBox.xaml-->
     <StackPanel Orientation="Vertical"
+                HorizontalAlignment="Stretch"
                 Spacing="1"
                 Margin="1,0">
-        <StackPanel.Styles>
+        <!--<StackPanel.Styles>
             <Style Selector="TextBox">
                 <Setter Property="HorizontalAlignment"
                         Value="Left" />
                 <Setter Property="Width"
                         Value="35" />
             </Style>
-        </StackPanel.Styles>
+        </StackPanel.Styles>-->
         <TextBox Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit.">
             <TextBox.ContextFlyout>
                 <Flyout>
@@ -64,10 +65,10 @@
 
         <TextBox AcceptsReturn="True"
                  TextWrapping="Wrap"
-                 Height="4"
+                 Height="10"
                  Text="Multiline TextBox with TextWrapping.&#xD;&#xD;Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus magna. Cras in mi at felis aliquet congue. Ut a est eget ligula molestie gravida. Curabitur massa. Donec eleifend, libero at sagittis mollis, tellus est malesuada tellus, at luctus turpis elit sit amet quam. Vivamus pretium ornare est." />
         <TextBox AcceptsReturn="True"
-                 Height="5"
+                 Height="10"
                  Text="Multiline TextBox with no TextWrapping.&#xD;&#xD;Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus magna. Cras in mi at felis aliquet congue. Ut a est eget ligula molestie gravida. Curabitur massa. Donec eleifend, libero at sagittis mollis, tellus est malesuada tellus, at luctus turpis elit sit amet quam. Vivamus pretium ornare est." />
 
     </StackPanel>

src/Consolonia.Gallery/View/ControlsListView.axaml

@@ -42,10 +42,11 @@
 
         </Grid>
         <Grid RowDefinitions="* Auto">
-            <Border
-                Child="{Binding ElementName=GalleryGrid,Path=SelectedItem, Converter={StaticResource GalleryItemConverter}}"
-                BorderThickness="1"
-                BorderBrush="{DynamicResource ThemeBorderBrush}" />
+            <Border BorderThickness="1"
+                    BorderBrush="{DynamicResource ThemeBorderBrush}">
+                <ScrollViewer
+                    Content="{Binding ElementName=GalleryGrid,Path=SelectedItem, Converter={StaticResource GalleryItemConverter}}" />
+            </Border>
             <StackPanel Orientation="Horizontal"
                         HorizontalAlignment="Right"
                         Grid.Row="1">

src/Consolonia.GuiCS/WindowsDriver.cs

@@ -42,18 +42,21 @@ public CONSOLE_INPUT_MODE ConsoleMode
             }
         }
 
+        const int bufferSize = 0xffff;
+        private static INPUT_RECORD[] s_inputBuffer = new INPUT_RECORD[bufferSize];
+
         public INPUT_RECORD[] ReadConsoleInput()
         {
-            const int bufferSize = 1;
-            var records = new INPUT_RECORD[bufferSize];
-
-            if (!Kernel32.ReadConsoleInput(InputHandle, records, bufferSize,
-                out var numberEventsRead))
-                throw GetLastError().GetException();
+            lock (s_inputBuffer)
+            {
 
-            return numberEventsRead == 0
-                ? Array.Empty<INPUT_RECORD>()
-                : records;
+                if (!Kernel32.ReadConsoleInput(InputHandle, s_inputBuffer, bufferSize,
+                    out var numberEventsRead))
+                    throw GetLastError().GetException();
+                INPUT_RECORD[] recordsToReturn = new INPUT_RECORD[numberEventsRead];
+                Array.Copy(s_inputBuffer, recordsToReturn, numberEventsRead);
+                return recordsToReturn;
+            }
         }
     }
 }

src/Consolonia.NUnit/UnitTestConsole.cs

@@ -204,6 +204,7 @@ public void SetupLifetime(ClassicDesktopStyleApplicationLifetime lifetime)
         public event Action<Key, char, RawInputModifiers, bool, ulong> KeyEvent;
         public event Action<RawPointerEventType, Point, Vector?, RawInputModifiers> MouseEvent;
         public event Action<bool> FocusEvent;
+        public event Action<string, ulong> TextInputEvent;
 #pragma warning restore CS0067
     }
 }

src/Consolonia.PlatformSupport/Clipboard/ClipboardProcessRunner.cs

@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Consolonia.PlatformSupport.Clipboard
+{
+    /// <summary>
+    ///     Helper class for console drivers to invoke shell commands to interact with the clipboard. 
+    /// </summary>
+    internal static class ClipboardProcessRunner
+    {
+        public static (int exitCode, string result) Bash(
+            string commandLine,
+            string inputText = "",
+            bool waitForOutput = false
+        )
+        {
+            var arguments = $"-c \"{commandLine}\"";
+            (int exitCode, string result) = Process("bash", arguments, inputText, waitForOutput);
+
+            return (exitCode, result.TrimEnd());
+        }
+
+        public static bool DoubleWaitForExit(this Process process)
+        {
+            bool 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", StringComparison.Ordinal); }
+
+        public static (int exitCode, string result) Process(
+            string cmd,
+            string arguments,
+            string input = null,
+            bool waitForOutput = true
+        )
+        {
+            var output = string.Empty;
+
+            using (var process = new Process
+            {
+                StartInfo = new()
+                {
+                    FileName = cmd,
+                    Arguments = arguments,
+                    RedirectStandardOutput = true,
+                    RedirectStandardError = true,
+                    RedirectStandardInput = true,
+                    UseShellExecute = false,
+                    CreateNoWindow = true
+                }
+            })
+            {
+                TaskCompletionSource<bool> eventHandled = new();
+                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);
+            }
+        }
+    }
+}