imp - Clear whole buffer for Windows conhost

--- For the console host, we need to clear the entire buffer. --- Type: imp Breaking: False Doc Required: False Part: 1/1
Aptivi · Feb 26, 2024 · 667036d · 667036d
1 parent 86e0956
commit 667036d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 24 deletions.
diff --git a/public/Nitrocid.Addons/Nitrocid.Extras.Docking/Dock/Docks/DigitalClock.cs b/public/Nitrocid.Addons/Nitrocid.Extras.Docking/Dock/Docks/DigitalClock.cs
@@ -107,10 +107,7 @@ static string UpdateHeadline()
                         var display = new StringBuilder();
 
                         // Clear the console and write the time using figlet
-                        display.Append(
-                            CsiSequences.GenerateCsiCursorPosition(1, 1) +
-                            CsiSequences.GenerateCsiEraseInDisplay(0)
-                        );
+                        ConsoleWrapper.ClearLoadBack();
                         cachedTimeStr = TimeDateRenderers.RenderTime(FormatType.Short);
                         var figFont = FigletTools.GetFigletFont(Config.MainConfig.DefaultFigletFontName);
                         int figHeight = FigletTools.GetFigletHeight(timeStr, figFont) / 2;

diff --git a/public/Nitrocid/Drivers/Console/BaseConsoleDriver.cs b/public/Nitrocid/Drivers/Console/BaseConsoleDriver.cs
@@ -30,6 +30,7 @@
 using Terminaux.Colors;
 using System.Runtime.Serialization;
 using Terminaux.Writer.DynamicWriters;
+using SpecProbe.Platform;
 
 namespace Nitrocid.Drivers.Console
 {
@@ -262,8 +263,13 @@ public virtual void Clear(bool loadBack = false)
             {
                 if (loadBack)
                     SystemConsole.Write(ColorTools.CurrentBackgroundColor.VTSequenceBackground);
-                SetCursorPosition(0, 0);
-                SystemConsole.Write(CsiSequences.GenerateCsiEraseInDisplay(0));
+                if (PlatformHelper.IsOnWindowsOrWsl())
+                    SystemConsole.Clear();
+                else
+                {
+                    SetCursorPosition(0, 0);
+                    SystemConsole.Write(CsiSequences.GenerateCsiEraseInDisplay(0));
+                }
             }
         }
 

diff --git a/public/Nitrocid/Misc/Splash/BaseSplash.cs b/public/Nitrocid/Misc/Splash/BaseSplash.cs
@@ -22,6 +22,7 @@
 using System.Threading;
 using Nitrocid.ConsoleBase.Colors;
 using Nitrocid.Kernel.Debugging;
+using Terminaux.Base;
 using Terminaux.Colors;
 using Terminaux.Sequences.Builder.Types;
 
@@ -50,14 +51,9 @@ public class BaseSplash : ISplash
         /// <inheritdoc/>
         public virtual string Opening(SplashContext context)
         {
-            var builder = new StringBuilder();
             DebugWriter.WriteDebug(DebugLevel.I, "Splash opening. Clearing console...");
-            ColorTools.SetConsoleColor(KernelColorTools.GetColor(KernelColorType.Background), true);
-            builder.Append(
-                CsiSequences.GenerateCsiCursorPosition(1, 1) +
-                CsiSequences.GenerateCsiEraseInDisplay(0)
-            );
-            return builder.ToString();
+            ConsoleWrapper.ClearLoadBack();
+            return "";
         }
 
         /// <inheritdoc/>
@@ -77,15 +73,10 @@ public virtual string Display(SplashContext context)
         /// <inheritdoc/>
         public virtual string Closing(SplashContext context, out bool delayRequired)
         {
-            var builder = new StringBuilder();
             DebugWriter.WriteDebug(DebugLevel.I, "Splash closing. Clearing console...");
-            ColorTools.SetConsoleColor(KernelColorTools.GetColor(KernelColorType.Background), true);
-            builder.Append(
-                CsiSequences.GenerateCsiCursorPosition(1, 1) +
-                CsiSequences.GenerateCsiEraseInDisplay(0)
-            );
+            ConsoleWrapper.ClearLoadBack();
             delayRequired = false;
-            return builder.ToString();
+            return "";
         }
 
         /// <inheritdoc/>

diff --git a/public/Nitrocid/Users/Login/ModernLogonScreen.cs b/public/Nitrocid/Users/Login/ModernLogonScreen.cs
@@ -102,10 +102,7 @@ static string UpdateHeadline()
                             var display = new StringBuilder();
 
                             // Clear the console and write the time using figlet
-                            display.Append(
-                                CsiSequences.GenerateCsiCursorPosition(1, 1) +
-                                CsiSequences.GenerateCsiEraseInDisplay(0)
-                            );
+                            ConsoleWrapper.ClearLoadBack();
                             cachedTimeStr = TimeDateRenderers.RenderTime(FormatType.Short);
                             var figFont = FigletTools.GetFigletFont(Config.MainConfig.DefaultFigletFontName);
                             int figHeight = FigletTools.GetFigletHeight(timeStr, figFont) / 2;