Fix clear screen on ConEmu, fixes #301

jline · Sep 3, 2018 · 141442c · 141442c
1 parent bb51b5c
commit 141442c
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 2 deletions.
diff --git a/terminal/src/main/java/org/jline/terminal/impl/AbstractWindowsTerminal.java b/terminal/src/main/java/org/jline/terminal/impl/AbstractWindowsTerminal.java
@@ -111,6 +111,7 @@ public AbstractWindowsTerminal(Writer writer, String name, String type, Charset
         // ConEMU extended fonts support
         if (TYPE_WINDOWS_256_COLOR.equals(getType())
                 && !Boolean.getBoolean("org.jline.terminal.conemu.disable-activate")) {
+            strings.replace(InfoCmp.Capability.clear_screen, "\\E[H\\E[J", "\\E[H\\E[J\\E[9999E");
             writer.write("\u001b[9999E");
             writer.flush();
         }

diff --git a/terminal/src/test/java/org/jline/terminal/impl/AbstractWindowsTerminalTest.java b/terminal/src/test/java/org/jline/terminal/impl/AbstractWindowsTerminalTest.java
@@ -10,12 +10,12 @@
 
 import org.jline.terminal.Size;
 import org.jline.terminal.Terminal;
+import static org.jline.terminal.impl.AbstractWindowsTerminal.TYPE_WINDOWS_256_COLOR;
 import org.jline.utils.AnsiWriter;
+import org.jline.utils.InfoCmp;
 import org.junit.Test;
 
-import java.io.BufferedOutputStream;
 import java.io.BufferedWriter;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.nio.charset.Charset;
@@ -59,4 +59,33 @@ public Size getSize() {
         assertEquals("This is a char.\nThis is a string.\n", sw.toString());
     }
 
+    @Test
+    public void testConEmuClearScreen() throws IOException {
+        System.setProperty("org.jline.terminal.conemu.disable-activate", "false");
+        StringWriter sw = new StringWriter();
+        Terminal terminal = new AbstractWindowsTerminal(new AnsiWriter(new BufferedWriter(sw)), "name", TYPE_WINDOWS_256_COLOR, Charset.defaultCharset(),0,
+                false, Terminal.SignalHandler.SIG_DFL) {
+            @Override
+            protected int getConsoleOutputCP() {
+                return 0;
+            }
+            @Override
+            protected int getConsoleMode() {
+                return 0;
+            }
+            @Override
+            protected void setConsoleMode(int mode) {
+            }
+            @Override
+            protected boolean processConsoleInput() throws IOException {
+                return false;
+            }
+            @Override
+            public Size getSize() {
+                return new Size(80, 25);
+            }
+        };
+        assertEquals("\\E[H\\E[J\\E[9999E", terminal.getStringCapability(InfoCmp.Capability.clear_screen));
+    }
+
 }