Fix ConEmu support for 256 colors, fixes #294

jline · Jul 17, 2018 · 62d6088 · 62d6088
1 parent bc8fd90
commit 62d6088
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/win/JansiWinSysTerminal.java b/terminal-jansi/src/main/java/org/jline/terminal/impl/jansi/win/JansiWinSysTerminal.java
@@ -36,6 +36,9 @@ public class JansiWinSysTerminal extends AbstractWindowsTerminal {
     public static JansiWinSysTerminal createTerminal(String name, String type, boolean ansiPassThrough, Charset encoding, int codepage, boolean nativeSignals, SignalHandler signalHandler, boolean paused) throws IOException {
         Writer writer;
         if (ansiPassThrough) {
+            if (type == null) {
+                type = OSUtils.IS_CONEMU ? TYPE_WINDOWS_256_COLOR : TYPE_WINDOWS;
+            }
             writer = new JansiWinConsoleWriter();
         } else {
             long console = GetStdHandle(STD_OUTPUT_HANDLE);

diff --git a/terminal-jna/src/main/java/org/jline/terminal/impl/jna/win/JnaWinSysTerminal.java b/terminal-jna/src/main/java/org/jline/terminal/impl/jna/win/JnaWinSysTerminal.java
@@ -32,6 +32,9 @@ public class JnaWinSysTerminal extends AbstractWindowsTerminal {
     public static JnaWinSysTerminal createTerminal(String name, String type, boolean ansiPassThrough, Charset encoding, int codepage, boolean nativeSignals, SignalHandler signalHandler, boolean paused) throws IOException {
         Writer writer;
         if (ansiPassThrough) {
+            if (type == null) {
+                type = OSUtils.IS_CONEMU ? TYPE_WINDOWS_256_COLOR : TYPE_WINDOWS;
+            }
             writer = new JnaWinConsoleWriter(consoleOut);
         } else {
             IntByReference mode = new IntByReference();