Merge commit 'e6bb1700749980e69b5e913acbfd276f129c24dc'

[nikiroo-utils.git] / src / jexer / tterminal / DisplayLine.java

diff --git a/src/jexer/tterminal/DisplayLine.java b/src/jexer/tterminal/DisplayLine.java
index 74e63a85960e840e911c5999b44e21d1ede2799b..87e6952fb515447b43500395d40cb8e80d0c919b 100644 (file)
--- a/src/jexer/tterminal/DisplayLine.java
+++ b/src/jexer/tterminal/DisplayLine.java
@@ -103,8 +103,7 @@ public class DisplayLine {
     public DisplayLine(final CellAttributes attr) {
         chars = new Cell[MAX_LINE_LENGTH];
         for (int i = 0; i < chars.length; i++) {
-            chars[i] = new Cell();
-            chars[i].setTo(attr);
+            chars[i] = new Cell(attr);
         }
     }
 
@@ -193,8 +192,7 @@ public class DisplayLine {
      */
     public void insert(final int idx, final Cell newCell) {
         System.arraycopy(chars, idx, chars, idx + 1, chars.length - idx - 1);
-        chars[idx] = new Cell();
-        chars[idx].setTo(newCell);
+        chars[idx] = new Cell(newCell);
     }
 
     /**
@@ -223,7 +221,7 @@ public class DisplayLine {
      * @param idx the character index
      * @param ch the new char
      */
-    public void setChar(final int idx, final char ch) {
+    public void setChar(final int idx, final int ch) {
         chars[idx].setChar(ch);
     }
 
@@ -247,8 +245,32 @@ public class DisplayLine {
      */
     public void delete(final int idx, final Cell newCell) {
         System.arraycopy(chars, idx + 1, chars, idx, chars.length - idx - 1);
-        chars[chars.length - 1] = new Cell();
-        chars[chars.length - 1].setTo(newCell);
+        chars[chars.length - 1] = new Cell(newCell);
+    }
+
+    /**
+     * Determine if line contains image data.
+     *
+     * @return true if the line has image data
+     */
+    public boolean isImage() {
+        for (int i = 0; i < chars.length; i++) {
+            if (chars[i].isImage()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Clear image data from line.
+     */
+    public void clearImages() {
+        for (int i = 0; i < chars.length; i++) {
+            if (chars[i].isImage()) {
+                chars[i].reset();
+            }
+        }
     }
 
 }