Fixed ansi clr_eos sequences on windows, #481

jline · Dec 9, 2019 · 238f020 · 238f020
1 parent d0f52f0
commit 238f020
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 16 deletions.
diff --git a/terminal/src/main/java/org/jline/utils/InfoCmp.java b/terminal/src/main/java/org/jline/utils/InfoCmp.java
@@ -624,12 +624,4 @@ static String loadDefaultInfoCmp(String name) {
         }
     }
 
-    static boolean support(String terminal, Capability capability) {
-        if ((terminal.equals("windows") || terminal.equals("windows-256color"))
-                && (capability == Capability.clr_eos)) {
-            return false;
-        }
-        return true;
-    }
-
 }
diff --git a/terminal/src/main/java/org/jline/utils/Status.java b/terminal/src/main/java/org/jline/utils/Status.java
@@ -139,10 +139,8 @@ public void update(List<AttributedString> lines) {
             }
         }
         terminal.puts(Capability.save_cursor);
-        if (InfoCmp.support(terminal.getType(), Capability.clr_eos)) {
-            terminal.puts(Capability.cursor_address, rows - statusSize, 0);
-            terminal.puts(Capability.clr_eos);
-        } else {
+        terminal.puts(Capability.cursor_address, rows - statusSize, 0);
+        if (!terminal.puts(Capability.clr_eos)) {
             for (int i = rows - statusSize; i < rows; i++) {
                 terminal.puts(Capability.cursor_address, i, 0);
                 terminal.puts(Capability.clr_eol);

diff --git a/terminal/src/main/resources/org/jline/utils/windows-256color.caps b/terminal/src/main/resources/org/jline/utils/windows-256color.caps
@@ -8,7 +8,7 @@ windows-256color|windows with 256 colors terminal compatibility,
 	il=\E[%p1%dL, il1=\E[L,
 	dl=\E[%p1%dM, dl1=\E[M,
 	ech=\E[%p1%dX,
-	el=\E[K, ed=\E[2K,
+	el=\E[K, ed=\E[J,
 	el1=\E[1K, home=\E[H, hpa=\E[%i%p1%dG,
 	ind=^J,
 	invis=\E[8m, kbs=^H, kcbt=\E[Z,

diff --git a/terminal/src/main/resources/org/jline/utils/windows-conemu.caps b/terminal/src/main/resources/org/jline/utils/windows-conemu.caps
@@ -8,7 +8,7 @@ windows-conemu|conemu windows terminal,
 	il=\E[%p1%dL, il1=\E[L,
 	dl=\E[%p1%dM, dl1=\E[M,
 	ech=\E[%p1%dX,
-	el=\E[K, ed=\E[2K,
+	el=\E[K, ed=\E[J,
 	el1=\E[1K, home=\E[H, hpa=\E[%i%p1%dG,
 	ind=^J,
 	invis=\E[8m, kbs=^H, kcbt=\E[Z,

diff --git a/terminal/src/main/resources/org/jline/utils/windows-vtp.caps b/terminal/src/main/resources/org/jline/utils/windows-vtp.caps
@@ -8,7 +8,7 @@ windows-vtp|windows with virtual terminal processing,
 	il=\E[%p1%dL, il1=\E[L,
 	dl=\E[%p1%dM, dl1=\E[M,
 	ech=\E[%p1%dX,
-	el=\E[K, ed=\E[2K,
+	el=\E[K, ed=\E[J,
 	el1=\E[1K, home=\E[H, hpa=\E[%i%p1%dG,
 	ind=^J,
 	invis=\E[8m, kbs=^H, kcbt=\E[Z,

diff --git a/terminal/src/main/resources/org/jline/utils/windows.caps b/terminal/src/main/resources/org/jline/utils/windows.caps
@@ -8,7 +8,7 @@ windows|windows terminal compatibility,
 	il=\E[%p1%dL, il1=\E[L,
 	dl=\E[%p1%dM, dl1=\E[M,
 	ech=\E[%p1%dX,
-	el=\E[K, ed=\E[2K,
+	el=\E[K, ed=\E[J,
 	el1=\E[1K, home=\E[H, hpa=\E[%i%p1%dG,
 	ind=^J,
 	invis=\E[8m, kbs=^H, kcbt=\E[Z,