Status: added indication of truncated status lines and status border

jline · Oct 11, 2019 · 2c58163 · 2c58163
1 parent 5c464bc
commit 2c58163
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 16 deletions.
diff --git a/builtins/src/main/java/org/jline/builtins/Widgets.java b/builtins/src/main/java/org/jline/builtins/Widgets.java
@@ -116,17 +116,19 @@ public void clearDescription() {
     }
 
     public void initDescription(int size) {
+        Status status = Status.getStatus(reader.getTerminal(), false);
         if (size > 0) {
+            if (status == null) {
+                status = Status.getStatus(reader.getTerminal());
+            }
+            status.setBorder(true);
             List<AttributedString> as = new ArrayList<>();
             for (int i = 0; i < size; i++) {
                 as.add(new AttributedString(""));
             }
             addDescription(as);
-        } else {
-            Status status = Status.getStatus(reader.getTerminal(), false);
-            if (status != null) {
-                status.clear();
-            }
+        } else if (status != null) {
+            status.clear();
         }
     }
 

diff --git a/terminal/src/main/java/org/jline/utils/Status.java b/terminal/src/main/java/org/jline/utils/Status.java
@@ -27,6 +27,8 @@ public class Status {
     protected int columns;
     protected boolean force;
     protected boolean suspended = false;
+    protected AttributedString borderString;
+    protected int border = 0;
 
     public static Status getStatus(Terminal terminal) {
         return getStatus(terminal, true);
@@ -46,10 +48,21 @@ public Status(AbstractTerminal terminal) {
             && terminal.getStringCapability(Capability.restore_cursor) != null
             && terminal.getStringCapability(Capability.cursor_address) != null;
         if (supported) {
+            char borderChar = '─';
+            AttributedStringBuilder bb = new AttributedStringBuilder();
+            for (int i = 0; i < 200; i++) {
+                bb.append(borderChar);
+            }
+            borderString = bb.toAttributedString();
             resize();
         }
     }
 
+    public void setBorder(boolean border) {
+        clear();
+        this.border = border ? 1 : 0;
+    }
+
     public void resize() {
         Size size = terminal.getSize();
         this.rows = size.getRows();
@@ -78,11 +91,21 @@ public void redraw() {
     }
 
     public void clear() {
-        if (!oldLines.isEmpty()) {
-            List<AttributedString> as = new ArrayList<>();
-            for (int i = 0; i < oldLines.size(); i++) {
-                as.add(new AttributedString(""));
-            }
+        privateClear(oldLines.size());
+    }
+
+    private void clearAll() {
+        int b = border;
+        border = 0;
+        privateClear(oldLines.size() + b);
+    }
+
+    private void privateClear(int statusSize) {
+        List<AttributedString> as = new ArrayList<>();
+        for (int i = 0; i < statusSize; i++) {
+            as.add(new AttributedString(""));
+        }
+        if (!as.isEmpty()) {
             update(as);
         }
     }
@@ -98,10 +121,14 @@ public void update(List<AttributedString> lines) {
             linesToRestore = new ArrayList<>(lines);
             return;
         }
+        if (lines.isEmpty()) {
+            clearAll();
+        }
         if (oldLines.equals(lines) && !force) {
             return;
         }
-        int nb = lines.size() - oldLines.size();
+        int statusSize = lines.size() + (lines.size() == 0 ? 0 : border);
+        int nb = statusSize - oldLines.size() - (oldLines.size() == 0 ? 0 : border);
         if (nb > 0) {
             for (int i = 0; i < nb; i++) {
                 terminal.puts(Capability.cursor_down);
@@ -111,13 +138,23 @@ public void update(List<AttributedString> lines) {
             }
         }
         terminal.puts(Capability.save_cursor);
-        terminal.puts(Capability.cursor_address, rows - lines.size(), 0);
+        terminal.puts(Capability.cursor_address, rows - statusSize, 0);
         terminal.puts(Capability.clr_eos);
+        if (border == 1 && lines.size() > 0) {
+            terminal.puts(Capability.cursor_address, rows - statusSize, 0);
+            borderString.columnSubSequence(0, columns).print(terminal);
+        }
         for (int i = 0; i < lines.size(); i++) {
             terminal.puts(Capability.cursor_address, rows - lines.size() + i, 0);
-            lines.get(i).columnSubSequence(0, columns).print(terminal);
+            if (lines.get(i).length() > columns) {
+                AttributedStringBuilder asb = new AttributedStringBuilder();
+                asb.append(lines.get(i).substring(0, columns - 3)).append("...", new AttributedStyle(AttributedStyle.INVERSE));
+                asb.toAttributedString().columnSubSequence(0, columns).print(terminal);
+            } else {
+                lines.get(i).columnSubSequence(0, columns).print(terminal);
+            }
         }
-        terminal.puts(Capability.change_scroll_region, 0, rows - 1 - lines.size());
+        terminal.puts(Capability.change_scroll_region, 0, rows - 1 - statusSize);
         terminal.puts(Capability.restore_cursor);
         terminal.flush();
         oldLines = new ArrayList<>(lines);
@@ -136,14 +173,14 @@ public void suspend() {
     public void restore() {
         if (!suspended) {
             return;
-        }        
+        }
         suspended = false;
         update(linesToRestore);
         linesToRestore = Collections.emptyList();
     }
 
     public int size() {
-        return oldLines.size();
+        return oldLines.size() + border;
     }
 
 }