git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
#35 CJK WIP
[fanfix.git]
/
src
/
jexer
/
backend
/
ECMA48Terminal.java
diff --git
a/src/jexer/backend/ECMA48Terminal.java
b/src/jexer/backend/ECMA48Terminal.java
index d10437c1f49dd377bce18ac786b9ecfae3555357..e22e4fe91e277e1afd5abbeb0d6e83b917d4743f 100644
(file)
--- a/
src/jexer/backend/ECMA48Terminal.java
+++ b/
src/jexer/backend/ECMA48Terminal.java
@@
-44,7
+44,6
@@
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
-import java.util.LinkedList;
import jexer.TImage;
import jexer.bits.Cell;
import jexer.TImage;
import jexer.bits.Cell;
@@
-1109,7
+1108,7
@@
public class ECMA48Terminal extends LogicalScreen
reloadOptions();
// Spin up the input reader
reloadOptions();
// Spin up the input reader
- eventQueue = new
Linked
List<TInputEvent>();
+ eventQueue = new
Array
List<TInputEvent>();
readerThread = new Thread(this);
readerThread.start();
readerThread = new Thread(this);
readerThread.start();
@@
-1195,7
+1194,7
@@
public class ECMA48Terminal extends LogicalScreen
reloadOptions();
// Spin up the input reader
reloadOptions();
// Spin up the input reader
- eventQueue = new
Linked
List<TInputEvent>();
+ eventQueue = new
Array
List<TInputEvent>();
readerThread = new Thread(this);
readerThread.start();
readerThread = new Thread(this);
readerThread.start();
@@
-1392,7
+1391,7
@@
public class ECMA48Terminal extends LogicalScreen
// available() will often return > 1, so we need to read in chunks to
// stay caught up.
char [] readBuffer = new char[128];
// available() will often return > 1, so we need to read in chunks to
// stay caught up.
char [] readBuffer = new char[128];
- List<TInputEvent> events = new
Linked
List<TInputEvent>();
+ List<TInputEvent> events = new
Array
List<TInputEvent>();
while (!done && !stopReaderThread) {
try {
while (!done && !stopReaderThread) {
try {
@@
-2852,7
+2851,9
@@
public class ECMA48Terminal extends LogicalScreen
int [] rgbArray;
for (int i = 0; i < cells.size() - 1; i++) {
int [] rgbArray;
for (int i = 0; i < cells.size() - 1; i++) {
- if (cells.get(i).isInvertedImage()) {
+ if (false && cells.get(i).isInvertedImage()) {
+ // I used to put an all-white cell over the cursor, don't do
+ // that anymore.
rgbArray = new int[imageWidth * imageHeight];
for (int j = 0; j < rgbArray.length; j++) {
rgbArray[j] = 0xFFFFFF;
rgbArray = new int[imageWidth * imageHeight];
for (int j = 0; j < rgbArray.length; j++) {
rgbArray[j] = 0xFFFFFF;
@@
-2884,7
+2885,9
@@
public class ECMA48Terminal extends LogicalScreen
}
}
totalWidth -= ((cells.size() - 1) * imageWidth);
}
}
totalWidth -= ((cells.size() - 1) * imageWidth);
- if (cells.get(cells.size() - 1).isInvertedImage()) {
+ if (false && cells.get(cells.size() - 1).isInvertedImage()) {
+ // I used to put an all-white cell over the cursor, don't do that
+ // anymore.
rgbArray = new int[totalWidth * imageHeight];
for (int j = 0; j < rgbArray.length; j++) {
rgbArray[j] = 0xFFFFFF;
rgbArray = new int[totalWidth * imageHeight];
for (int j = 0; j < rgbArray.length; j++) {
rgbArray[j] = 0xFFFFFF;
@@
-2959,6
+2962,8
@@
public class ECMA48Terminal extends LogicalScreen
// colored pixels, and select the color.
sb.append(String.format("$#%d", i));
// colored pixels, and select the color.
sb.append(String.format("$#%d", i));
+ int oldData = -1;
+ int oldDataCount = 0;
for (int imageX = 0; imageX < image.getWidth(); imageX++) {
// Add up all the pixels that match this color.
for (int imageX = 0; imageX < image.getWidth(); imageX++) {
// Add up all the pixels that match this color.
@@
-2991,10
+2996,32
@@
public class ECMA48Terminal extends LogicalScreen
}
}
assert (data >= 0);
}
}
assert (data >= 0);
- assert (data <
127
);
+ assert (data <
64
);
data += 63;
data += 63;
- sb.append((char) data);
+
+ if (data == oldData) {
+ oldDataCount++;
+ } else {
+ if (oldDataCount == 1) {
+ sb.append((char) oldData);
+ } else if (oldDataCount > 1) {
+ sb.append(String.format("!%d", oldDataCount));
+ sb.append((char) oldData);
+ }
+ oldDataCount = 1;
+ oldData = data;
+ }
+
} // for (int imageX = 0; imageX < image.getWidth(); imageX++)
} // for (int imageX = 0; imageX < image.getWidth(); imageX++)
+
+ // Emit the last sequence.
+ if (oldDataCount == 1) {
+ sb.append((char) oldData);
+ } else if (oldDataCount > 1) {
+ sb.append(String.format("!%d", oldDataCount));
+ sb.append((char) oldData);
+ }
+
} // for (int i = 0; i < MAX_COLOR_REGISTERS; i++)
// Advance to the next scan line.
} // for (int i = 0; i < MAX_COLOR_REGISTERS; i++)
// Advance to the next scan line.
@@
-3013,6
+3040,15
@@
public class ECMA48Terminal extends LogicalScreen
return (startSixel(x, y) + sb.toString() + endSixel());
}
return (startSixel(x, y) + sb.toString() + endSixel());
}
+ /**
+ * Get the sixel support flag.
+ *
+ * @return true if this terminal is emitting sixel
+ */
+ public boolean hasSixel() {
+ return sixel;
+ }
+
// ------------------------------------------------------------------------
// End sixel output support -----------------------------------------------
// ------------------------------------------------------------------------
// ------------------------------------------------------------------------
// End sixel output support -----------------------------------------------
// ------------------------------------------------------------------------