From 1f209098ddad5d06e46f732d9330aa1e652cbb5f Mon Sep 17 00:00:00 2001 From: Tigger Kindel Date: Sat, 12 Aug 2023 06:52:49 -0600 Subject: [PATCH] diagnosing netdriver wsl --- Terminal.Gui/ConsoleDrivers/CursesDriver/CursesDriver.cs | 7 +++---- Terminal.Gui/ConsoleDrivers/NetDriver.cs | 4 +++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Terminal.Gui/ConsoleDrivers/CursesDriver/CursesDriver.cs b/Terminal.Gui/ConsoleDrivers/CursesDriver/CursesDriver.cs index b0feeece0..c294f0a11 100644 --- a/Terminal.Gui/ConsoleDrivers/CursesDriver/CursesDriver.cs +++ b/Terminal.Gui/ConsoleDrivers/CursesDriver/CursesDriver.cs @@ -657,16 +657,12 @@ internal class CursesDriver : ConsoleDriver { Curses.StartColor (); Curses.UseDefaultColors (); - Curses.CheckWinChange (); } CurrentAttribute = MakeColor (Color.White, Color.Black); InitializeColorSchemes (); - ClearContents (); - TerminalResized = terminalResized; - StartReportingMouseMoves (); if (RuntimeInformation.IsOSPlatform (OSPlatform.OSX)) { Clipboard = new MacOSXClipboard (); @@ -679,7 +675,10 @@ internal class CursesDriver : ConsoleDriver { } if (_window != null) { + Curses.CheckWinChange (); + ClearContents (); Curses.refresh (); + StartReportingMouseMoves (); } } diff --git a/Terminal.Gui/ConsoleDrivers/NetDriver.cs b/Terminal.Gui/ConsoleDrivers/NetDriver.cs index aafcfbcea..7ec794cd1 100644 --- a/Terminal.Gui/ConsoleDrivers/NetDriver.cs +++ b/Terminal.Gui/ConsoleDrivers/NetDriver.cs @@ -3,6 +3,7 @@ // using System; using System.Collections.Generic; +using System.Diagnostics; using System.Linq; using System.Runtime.InteropServices; using System.Threading; @@ -554,7 +555,7 @@ internal class NetDriver : ConsoleDriver { const int COLOR_BRIGHT_CYAN = 96; const int COLOR_BRIGHT_WHITE = 97; - public override bool SupportsTrueColor => true;// Environment.OSVersion.Version.Build >= 14931; + public override bool SupportsTrueColor => Environment.OSVersion.Platform == PlatformID.Unix || (IsWinPlatform && Environment.OSVersion.Version.Build >= 14931); public NetWinVTConsole NetWinConsole { get; private set; } public bool IsWinPlatform { get; private set; } @@ -617,6 +618,7 @@ internal class NetDriver : ConsoleDriver { Rows = Console.WindowHeight; } else { // Simluate + throw new InvalidOperationException ("blah"); Cols = 80; Rows = 25; }