#35 CJK font wip

[fanfix.git] / src / jexer / TTerminalWindow.java

diff --git a/src/jexer/TTerminalWindow.java b/src/jexer/TTerminalWindow.java
index c7456358df7193db8d8be27481ecac6133e863a5..6d06fc88530f4d698c99d6dc8c5244949e0df1cc 100644 (file)
--- a/src/jexer/TTerminalWindow.java
+++ b/src/jexer/TTerminalWindow.java
@@ -359,6 +359,12 @@ public class TTerminalWindow extends TScrollableWindow
                 }
                 for (int i = 0; i < widthMax; i++) {
                     Cell ch = line.charAt(i);
+
+                    if (ch.isImage()) {
+                        putCharXY(i + 1, row, ch);
+                        continue;
+                    }
+
                     Cell newCell = new Cell();
                     newCell.setTo(ch);
                     boolean reverse = line.isReverseColor() ^ ch.isReverse();
@@ -1032,7 +1038,7 @@ public class TTerminalWindow extends TScrollableWindow
      * The double-width font will be 2x this value.
      */
     private void setupFont(final int fontSize) {
-        doubleFont = GlyphMaker.getDefault().size(fontSize * 2);
+        doubleFont = GlyphMaker.getInstance(fontSize * 2);
 
         // Special case: the ECMA48 backend needs to have a timer to drive
         // its blink state.