tk/spectre.console
1
0
Fork 0
mirror of https://github.com/nsnail/spectre.console.git synced 2025-04-17 17:32:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix console detection for Cygwin/WSL-Shell on Windows

Browse Source
This commit is contained in:
Matt Constable 2021-01-04 17:24:56 +00:00 committed by GitHub
parent 1f211d3e1f
commit 9ad5f2daeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Spectre.Console/Internal/Ansi/AnsiDetector.cs
View File

@ -54,6 +54,11 @@ namespace Spectre.Console.Internal
return (supportsAnsi, legacyConsole); return (supportsAnsi, legacyConsole);
} }
return DetectFromTerm();
}
private static (bool SupportsAnsi, bool LegacyConsole) DetectFromTerm()
{
// Check if the terminal is of type ANSI/VT100/xterm compatible. // Check if the terminal is of type ANSI/VT100/xterm compatible.
var term = Environment.GetEnvironmentVariable("TERM"); var term = Environment.GetEnvironmentVariable("TERM");
if (!string.IsNullOrWhiteSpace(term)) if (!string.IsNullOrWhiteSpace(term))
@ -101,8 +106,11 @@ namespace Spectre.Console.Internal
var @out = GetStdHandle(STD_OUTPUT_HANDLE); var @out = GetStdHandle(STD_OUTPUT_HANDLE);
if (!GetConsoleMode(@out, out var mode)) if (!GetConsoleMode(@out, out var mode))
{ {
// Could not get console mode. // Could not get console mode, try TERM (set in cygwin, WSL-Shell).
return false; var (ansiFromTerm, legacyFromTerm) = DetectFromTerm();
isLegacy = ansiFromTerm ? legacyFromTerm : isLegacy;
return ansiFromTerm;
} }
if ((mode & ENABLE_VIRTUAL_TERMINAL_PROCESSING) == 0) if ((mode & ENABLE_VIRTUAL_TERMINAL_PROCESSING) == 0)