Remove ConsoleDriver.SupportsSixel

gui-cs · Oct 10, 2024 · 64d286c · 64d286c
1 parent 9990a55
commit 64d286c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 27 deletions.
diff --git a/Terminal.Gui/ConsoleDrivers/ConsoleDriver.cs b/Terminal.Gui/ConsoleDrivers/ConsoleDriver.cs
@@ -484,9 +484,6 @@ public virtual void Move (int col, int row)
     /// <summary>Gets whether the <see cref="ConsoleDriver"/> supports TrueColor output.</summary>
     public virtual bool SupportsTrueColor => true;
 
-    // TODO: make not static TODO: gets set in mouse logic in net driver :/
-    public static bool SupportsSixel { get; set; }
-
     // TODO: This makes ConsoleDriver dependent on Application, which is not ideal. This should be moved to Application.
     // BUGBUG: Application.Force16Colors should be bool? so if SupportsTrueColor and Application.Force16Colors == false, this doesn't override
     /// <summary>

diff --git a/Terminal.Gui/ConsoleDrivers/NetDriver.cs b/Terminal.Gui/ConsoleDrivers/NetDriver.cs
@@ -632,9 +632,6 @@ private void HandleRequestResponseEvent (string c1Control, string code, string [
                         break;
                 }
 
-                break;
-            case EscSeqUtils.CSI_ReportDeviceAttributes_Terminator:
-                ConsoleDriver.SupportsSixel = values.Any (v => v == "4");
                 break;
             default:
                 EnqueueRequestResponseEvent (c1Control, code, values, terminating);
@@ -1024,15 +1021,12 @@ public override void UpdateScreen ()
                 Console.Write (output);
             }
 
-            if (ConsoleDriver.SupportsSixel)
+            foreach (var s in Application.Sixel)
             {
-                foreach (var s in Application.Sixel)
+                if (!string.IsNullOrWhiteSpace (s.SixelData))
                 {
-                    if (!string.IsNullOrWhiteSpace (s.SixelData))
-                    {
-                        SetCursorPosition (s.ScreenPosition.X, s.ScreenPosition.Y);
-                        Console.Write (s.SixelData);
-                    }
+                    SetCursorPosition (s.ScreenPosition.X, s.ScreenPosition.Y);
+                    Console.Write (s.SixelData);
                 }
             }
         }
@@ -1141,9 +1135,6 @@ internal override MainLoop Init ()
         _mainLoopDriver = new NetMainLoop (this);
         _mainLoopDriver.ProcessInput = ProcessInput;
 
-        _mainLoopDriver._netEvents.EscSeqRequests.Add ("c");
-        // Determine if sixel is supported
-        Console.Out.Write (EscSeqUtils.CSI_SendDeviceAttributes);
 
         return new MainLoop (_mainLoopDriver);
     }

diff --git a/Terminal.Gui/ConsoleDrivers/WindowsDriver.cs b/Terminal.Gui/ConsoleDrivers/WindowsDriver.cs
@@ -129,14 +129,10 @@ public bool WriteToConsole (Size size, ExtendedCharInfo [] charInfoBuffer, Coord
 
             _lastWrite = s;
 
-            if (ConsoleDriver.SupportsSixel)
+            foreach (var sixel in Application.Sixel)
             {
-                foreach (var sixel in Application.Sixel)
-                {
-                    SetCursorPosition (new Coord ((short)sixel.ScreenPosition.X, (short)sixel.ScreenPosition.Y));
-                    WriteConsole (_screenBuffer, sixel.SixelData, (uint)sixel.SixelData.Length, out uint _, nint.Zero);
-
-                }
+                SetCursorPosition (new Coord ((short)sixel.ScreenPosition.X, (short)sixel.ScreenPosition.Y));
+                WriteConsole (_screenBuffer, sixel.SixelData, (uint)sixel.SixelData.Length, out uint _, nint.Zero);
             }
         }
 

diff --git a/UICatalog/Scenarios/Images.cs b/UICatalog/Scenarios/Images.cs
@@ -69,8 +69,6 @@ public override void Main ()
         var sixelSupportDetector = new AssumeSupportDetector ();
         _sixelSupportResult = sixelSupportDetector.Detect ();
 
-        ConsoleDriver.SupportsSixel = _sixelSupportResult.IsSupported;
-
         Application.Init ();
         _win = new() { Title = $"{Application.QuitKey} to Quit - Scenario: {GetName ()}" };
 
@@ -103,15 +101,15 @@ public override void Main ()
         {
             X = Pos.Right (lblDriverName) + 2,
             Y = 1,
-            CheckedState = ConsoleDriver.SupportsSixel
+            CheckedState = _sixelSupportResult.IsSupported
                                ? CheckState.Checked
                                : CheckState.UnChecked,
             Text = "Supports Sixel"
         };
 
         cbSupportsSixel.CheckedStateChanging += (s, e) =>
                                                 {
-                                                    ConsoleDriver.SupportsSixel = e.NewValue == CheckState.Checked;
+                                                    _sixelSupportResult.IsSupported = e.NewValue == CheckState.Checked;
                                                     SetupSixelSupported (e.NewValue == CheckState.Checked);
                                                 };