added ability to pick the cursor style when using cursor brush.

jinek · Dec 17, 2024 · 4b97ba4 · 4b97ba4
1 parent aaf951a
commit 4b97ba4
Show file tree

Hide file tree

Showing 7 changed files with 219 additions and 177 deletions.
diff --git a/src/Consolonia.Core/Drawing/CursorStyle.cs b/src/Consolonia.Core/Drawing/CursorStyle.cs
@@ -0,0 +1,12 @@
+namespace Consolonia.Core.Drawing
+{
+    public enum CursorStyle
+    {
+        BlinkingBar,
+        SteadyBar,
+        BlinkingBlock,
+        SteadyBlock,
+        BlinkingUnderline,
+        SteadyUnderline,
+    }
+}
diff --git a/src/Consolonia.Core/Drawing/DrawingContextImpl.cs b/src/Consolonia.Core/Drawing/DrawingContextImpl.cs
diff --git a/src/Consolonia.Core/Drawing/MoveConsoleCaretToPositionBrush.cs b/src/Consolonia.Core/Drawing/MoveConsoleCaretToPositionBrush.cs
@@ -9,5 +9,10 @@ public class MoveConsoleCaretToPositionBrush : IImmutableBrush
         public double Opacity => 1;
         public ITransform Transform => null;
         public RelativePoint TransformOrigin => RelativePoint.TopLeft;
+
+        /// <summary>
+        /// style of curosr
+        /// </summary>
+        public CursorStyle Style { get; set; } = CursorStyle.BlinkingBar;
     }
 }
diff --git a/src/Consolonia.Core/Drawing/PixelBufferImplementation/PixelBuffer.cs b/src/Consolonia.Core/Drawing/PixelBufferImplementation/PixelBuffer.cs
@@ -32,6 +32,8 @@ public PixelBuffer(ushort width, ushort height)
         public ushort Width { get; }
         public ushort Height { get; }
 
+        public CursorStyle CursorStyle { get; set; } = CursorStyle.BlinkingBar;
+
         // ReSharper disable once UnusedMember.Global
         [JsonIgnore]
         public Pixel this[int i]

diff --git a/src/Consolonia.Core/Drawing/RenderTarget.cs b/src/Consolonia.Core/Drawing/RenderTarget.cs
@@ -10,6 +10,8 @@
 using Avalonia.Platform;
 using Consolonia.Core.Drawing.PixelBufferImplementation;
 using Consolonia.Core.Infrastructure;
+using Consolonia.Core.Text;
+using Newtonsoft.Json.Linq;
 
 namespace Consolonia.Core.Drawing
 {
@@ -141,11 +143,23 @@ private void RenderToDevice()
             if (caretPosition != null)
             {
                 _console.SetCaretPosition((PixelBufferCoordinate)caretPosition);
+                _console.WriteText(pixelBuffer.CursorStyle switch
+                {
+                    CursorStyle.BlinkingBar => Esc.BlinkingBarCursor,
+                    CursorStyle.SteadyBar => Esc.SteadyBarCursor,
+                    CursorStyle.BlinkingBlock => Esc.BlinkingBlockCursor,
+                    CursorStyle.SteadyBlock => Esc.SteadyBlockCursor,
+                    CursorStyle.BlinkingUnderline => Esc.BlinkingUnderlineCursor,
+                    CursorStyle.SteadyUnderline => Esc.SteadyUnderlineCursor,
+                    _ => throw new ArgumentOutOfRangeException()
+                });
+                _console.WriteText(Esc.ShowCursor);
                 _console.CaretVisible = true;
             }
             else
             {
                 _console.CaretVisible = false;
+                _console.WriteText(Esc.HideCursor);
             }
         }
 

diff --git a/src/Consolonia.Core/Infrastructure/InputLessDefaultNetConsole.cs b/src/Consolonia.Core/Infrastructure/InputLessDefaultNetConsole.cs
@@ -39,7 +39,6 @@ public bool CaretVisible
             set
             {
                 if (_caretVisible == value) return;
-                WriteText(value ? Esc.ShowCursor : Esc.HideCursor);
                 _caretVisible = value;
             }
 #pragma warning restore CA1303 // Do not pass literals as localized parameters

diff --git a/src/Consolonia.Core/Text/Esc.cs b/src/Consolonia.Core/Text/Esc.cs
@@ -31,6 +31,14 @@ internal static class Esc
         public const string HideCursor = "\u001b[?25l";
         public const string ShowCursor = "\u001b[?25h";
 
+        // cursor shape
+        public const string BlinkingBlockCursor = "\u001b[1 q";
+        public const string SteadyBlockCursor = "\u001b[2 q";
+        public const string BlinkingUnderlineCursor = "\u001b[3 q";
+        public const string SteadyUnderlineCursor = "\u001b[4 q";
+        public const string BlinkingBarCursor = "\u001b[5 q";
+        public const string SteadyBarCursor = "\u001b[6 q";
+
         // move cursor
         public static string MoveCursorUp(int n)
         {