Pause io

src/.editorconfig

@@ -39,7 +39,7 @@ csharp_space_between_method_declaration_name_and_open_parenthesis = false
 csharp_space_between_method_declaration_parameter_list_parentheses = false
 csharp_space_between_parentheses = false
 csharp_space_between_square_brackets = false
-csharp_style_namespace_declarations = file_scoped:suggestion
+csharp_style_namespace_declarations = block_scoped:suggestion
 csharp_style_var_for_built_in_types = false:suggestion
 csharp_using_directive_placement = outside_namespace:silent
 dotnet_diagnostic.bc40000.severity = warning

src/Consolonia.Core/ApplicationStartup.cs

@@ -68,7 +68,7 @@ public static ClassicDesktopStyleApplicationLifetime BuildLifetime<TApp>(IConsol
         private static ClassicDesktopStyleApplicationLifetime CreateLifetime<T>(T builder, string[] args)
             where T : AppBuilderBase<T>, new()
         {
-            var lifetime = new ClassicDesktopStyleApplicationLifetime
+            var lifetime = new ConsoloniaLifetime
             {
                 Args = args,
                 ShutdownMode = ShutdownMode.OnMainWindowClose

src/Consolonia.Core/Infrastructure/ConsoleWindow.cs

@@ -15,30 +15,30 @@ namespace Consolonia.Core.Infrastructure
 {
     internal class ConsoleWindow : IWindowImpl
     {
-        [NotNull] private readonly IConsole _console;
         private readonly IKeyboardDevice _myKeyboardDevice;
+        [NotNull] internal readonly IConsole Console;
         internal readonly List<Rect> InvalidatedRects = new(50);
         private IInputRoot _inputRoot;
 
         public ConsoleWindow()
         {
             _myKeyboardDevice = AvaloniaLocator.Current.GetService<IKeyboardDevice>();
             MouseDevice = AvaloniaLocator.Current.GetService<IMouseDevice>();
-            _console = AvaloniaLocator.Current.GetService<IConsole>() ?? throw new NotImplementedException();
-            _console.Resized += OnConsoleOnResized;
-            _console.KeyEvent += ConsoleOnKeyEvent;
-            _console.MouseEvent += ConsoleOnMouseEvent;
-            _console.FocusEvent += ConsoleOnFocusEvent;
+            Console = AvaloniaLocator.Current.GetService<IConsole>() ?? throw new NotImplementedException();
+            Console.Resized += OnConsoleOnResized;
+            Console.KeyEvent += ConsoleOnKeyEvent;
+            Console.MouseEvent += ConsoleOnMouseEvent;
+            Console.FocusEvent += ConsoleOnFocusEvent;
         }
 
         public void Dispose()
         {
             Closed?.Invoke();
-            _console.Resized -= OnConsoleOnResized;
-            _console.KeyEvent -= ConsoleOnKeyEvent;
-            _console.MouseEvent -= ConsoleOnMouseEvent;
-            _console.FocusEvent -= ConsoleOnFocusEvent;
-            _console.Dispose();
+            Console.Resized -= OnConsoleOnResized;
+            Console.KeyEvent -= ConsoleOnKeyEvent;
+            Console.MouseEvent -= ConsoleOnMouseEvent;
+            Console.FocusEvent -= ConsoleOnFocusEvent;
+            Console.Dispose();
         }
 
         public IRenderer CreateRenderer(IRenderRoot root)
@@ -114,7 +114,7 @@ public Size ClientSize
         {
             get
             {
-                PixelBufferSize pixelBufferSize = _console.Size;
+                PixelBufferSize pixelBufferSize = Console.Size;
                 return new Size(pixelBufferSize.Width, pixelBufferSize.Height);
             }
         }
@@ -181,7 +181,7 @@ public void SetTopmost(bool value)
 
         public void SetTitle(string title)
         {
-            _console.SetTitle(title);
+            Console.SetTitle(title);
         }
 
         public void SetParent(IWindowImpl parent)
@@ -316,7 +316,7 @@ private void OnConsoleOnResized()
         {
             Dispatcher.UIThread.Post(() =>
             {
-                PixelBufferSize pixelBufferSize = _console.Size;
+                PixelBufferSize pixelBufferSize = Console.Size;
                 var size = new Size(pixelBufferSize.Width, pixelBufferSize.Height);
                 Resized(size, PlatformResizeReason.Unspecified);
                 //todo; Invalidate(new Rect(size));

src/Consolonia.Core/Infrastructure/ConsoloniaLifetime.cs

@@ -0,0 +1,35 @@
+using System.Threading;
+using System.Threading.Tasks;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Threading;
+
+namespace Consolonia.Core.Infrastructure
+{
+    public class ConsoloniaLifetime : ClassicDesktopStyleApplicationLifetime
+    {
+        /// <summary>
+        ///     returned task indicates that console is successfully paused
+        /// </summary>
+        public Task DisconnectFromConsoleAsync(CancellationToken cancellationToken)
+        {
+            var taskToWaitFor = new TaskCompletionSource();
+            cancellationToken.Register(() => taskToWaitFor.SetResult());
+
+            var mainWindowPlatformImpl = (ConsoleWindow)MainWindow.PlatformImpl;
+            IConsole console = mainWindowPlatformImpl.Console;
+
+            Task pauseTask = taskToWaitFor.Task;
+
+            console.PauseIO(pauseTask);
+
+            pauseTask.ContinueWith(_ =>
+            {
+                mainWindowPlatformImpl.Console.ClearOutput();
+
+                Dispatcher.UIThread.Post(() => { MainWindow.InvalidateVisual(); });
+            }, CancellationToken.None, TaskContinuationOptions.None, TaskScheduler.Default);
+
+            return Dispatcher.UIThread.InvokeAsync(() => { });
+        }
+    }
+}

src/Consolonia.Core/Infrastructure/DefaultNetConsole.cs

@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
 using System.Threading;
+using System.Threading.Tasks;
 using Avalonia.Input;
 using Consolonia.Core.InternalHelpers;
 
@@ -49,13 +51,32 @@ protected override void Dispose(bool disposing)
             RaiseFocusEvent(false);
         }
 
+        public override void PauseIO(Task task)
+        {
+            base.PauseIO(task);
+
+            TextReader defaultIn = Console.In;
+            Console.SetIn(new StringReader(string.Empty));
+            Console.SetIn(defaultIn);
+        }
+
         private void StartInputReading()
         {
             ThreadPool.QueueUserWorkItem(_ =>
             {
                 while (!Disposed)
                 {
-                    ConsoleKeyInfo consoleKeyInfo = Console.ReadKey(true);
+                    PauseTask?.Wait();
+
+                    ConsoleKeyInfo consoleKeyInfo;
+                    try
+                    {
+                        consoleKeyInfo = Console.ReadKey(true);
+                    }
+                    catch (InvalidOperationException)
+                    {
+                        continue;
+                    }
 
                     Key key = ConvertToKey(consoleKeyInfo.Key);
 

src/Consolonia.Core/Infrastructure/IConsole.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
@@ -27,5 +28,7 @@ void Print(PixelBufferCoordinate bufferPoint, ConsoleColor backgroundColor, Cons
         event Action<RawPointerEventType, Point, Vector?, RawInputModifiers> MouseEvent;
 
         event Action<bool> FocusEvent;
+        void PauseIO(Task task);
+        void ClearOutput();
     }
 }

src/Consolonia.Core/Infrastructure/InputLessDefaultNetConsole.cs

@@ -20,11 +20,13 @@ public class InputLessDefaultNetConsole : IConsole
         protected InputLessDefaultNetConsole()
         {
             Console.CursorVisible = false;
-            ActualizeTheSize();
+            ActualizeSize();
         }
 
         protected bool Disposed { get; private set; }
 
+        protected Task PauseTask { get; private set; }
+
         public bool CaretVisible
         {
             get => _caretVisible;
@@ -67,6 +69,7 @@ public PixelBufferCoordinate GetCaretPosition()
         public void Print(PixelBufferCoordinate bufferPoint, ConsoleColor backgroundColor, ConsoleColor foregroundColor,
             string str)
         {
+            PauseTask?.Wait();
             SetCaretPosition(bufferPoint);
 
             if (_headBackground != backgroundColor)
@@ -103,23 +106,35 @@ public void Print(PixelBufferCoordinate bufferPoint, ConsoleColor backgroundColo
         public event Action<RawPointerEventType, Point, Vector?, RawInputModifiers> MouseEvent;
         public event Action<bool> FocusEvent;
 
+        public virtual void PauseIO(Task task)
+        {
+            task.ContinueWith(_ => { PauseTask = null; }, TaskScheduler.Default);
+            PauseTask = task;
+        }
+
         public void Dispose()
         {
             Dispose(true);
             GC.SuppressFinalize(this);
         }
 
+        public void ClearOutput()
+        {
+            // this is hack, but somehow it does not work when just calling ActualizeSize with same size
+            Size = new PixelBufferSize(1, 1);
+            Resized?.Invoke();
+        }
+
         // ReSharper disable once MemberCanBePrivate.Global
         protected bool CheckActualizeTheSize()
         {
             if (Size.Width == Console.WindowWidth && Size.Height == Console.WindowHeight) return false;
-            ActualizeTheSize();
+            ActualizeSize();
             return true;
         }
 
-        protected void ActualizeTheSize()
+        protected void ActualizeSize()
         {
-            Console.Clear();
             Size = new PixelBufferSize((ushort)Console.WindowWidth, (ushort)Console.WindowHeight);
             Resized?.Invoke();
         }
@@ -151,6 +166,10 @@ protected void StartSizeCheckTimerAsync(uint slowInterval = 1500)
             {
                 while (!Disposed)
                 {
+                    Task pauseTask = PauseTask;
+                    if (pauseTask != null)
+                        await pauseTask.ConfigureAwait(false);
+
                     int timeout = (int)(CheckActualizeTheSize() ? 1 : slowInterval);
                     await Task.Delay(timeout).ConfigureAwait(false);
                 }