Fix status line for non-tiple-buffered case

[fanfix.git] / src / jexer / backend / SwingTerminal.java

diff --git a/src/jexer/backend/SwingTerminal.java b/src/jexer/backend/SwingTerminal.java
index bd1ba87ce2d3c442ce5254f358254586cae0227e..ce26efee97ada8436701c5c373b650a5d9dd3909 100644 (file)
--- a/src/jexer/backend/SwingTerminal.java
+++ b/src/jexer/backend/SwingTerminal.java
@@ -182,12 +182,12 @@ public class SwingTerminal extends LogicalScreen
     /**
      * Width of a character cell in pixels.
      */
-    private int textWidth = 1;
+    private int textWidth = 16;
 
     /**
      * Height of a character cell in pixels.
      */
-    private int textHeight = 1;
+    private int textHeight = 20;
 
     /**
      * Width of a character cell in pixels, as reported by font.
@@ -403,7 +403,7 @@ public class SwingTerminal extends LogicalScreen
                     SwingTerminal.this.setDimensions(sessionInfo.
                         getWindowWidth(), sessionInfo.getWindowHeight());
 
-                    SwingTerminal.this.resizeToScreen();
+                    SwingTerminal.this.resizeToScreen(true);
                     SwingTerminal.this.swing.setVisible(true);
                 }
             });
@@ -573,6 +573,7 @@ public class SwingTerminal extends LogicalScreen
         ) {
             do {
                 do {
+                    clearPhysical();
                     drawToSwing();
                 } while (swing.getBufferStrategy().contentsRestored());
 
@@ -760,7 +761,7 @@ public class SwingTerminal extends LogicalScreen
             swing.setFont(font);
             glyphCacheBlink = new HashMap<Cell, BufferedImage>();
             glyphCache = new HashMap<Cell, BufferedImage>();
-            resizeToScreen();
+            resizeToScreen(true);
         }
     }
 
@@ -1109,13 +1110,24 @@ public class SwingTerminal extends LogicalScreen
         gotFontDimensions = true;
     }
 
+    /**
+     * Resize the physical screen to match the logical screen dimensions.
+     *
+     * @param resizeComponent if true, resize the Swing component
+     */
+    private void resizeToScreen(final boolean resizeComponent) {
+        if (resizeComponent) {
+            swing.setDimensions(textWidth * width, textHeight * height);
+        }
+        clearPhysical();
+    }
+
     /**
      * Resize the physical screen to match the logical screen dimensions.
      */
     @Override
     public void resizeToScreen() {
-        swing.setDimensions(textWidth * width, textHeight * height);
-        clearPhysical();
+        resizeToScreen(false);
     }
 
     /**
@@ -1168,7 +1180,7 @@ public class SwingTerminal extends LogicalScreen
         /*
         System.err.println("drawGlyph(): " + xPixel + " " + yPixel +
             " " + cell);
-        */
+         */
 
         BufferedImage image = null;
         if (cell.isBlink() && !cursorBlinkVisible) {
@@ -1217,9 +1229,8 @@ public class SwingTerminal extends LogicalScreen
             || (cell.isBlink() && cursorBlinkVisible)
         ) {
             gr2.setColor(attrToForegroundColor(cellColor));
-            char [] chars = new char[1];
-            chars[0] = cell.getChar();
-            gr2.drawChars(chars, 0, 1, gr2x + textAdjustX,
+            char [] chars = Character.toChars(cell.getChar());
+            gr2.drawChars(chars, 0, chars.length, gr2x + textAdjustX,
                 gr2y + textHeight - maxDescent + textAdjustY);
 
             if (cell.isUnderline()) {
@@ -1337,7 +1348,7 @@ public class SwingTerminal extends LogicalScreen
         if (bounds != null) {
             // Only update what is in the bounds
             xCellMin = textColumn(bounds.x);
-            xCellMax = textColumn(bounds.x + bounds.width);
+            xCellMax = textColumn(bounds.x + bounds.width) + 1;
             if (xCellMax > width) {
                 xCellMax = width;
             }
@@ -1348,7 +1359,7 @@ public class SwingTerminal extends LogicalScreen
                 xCellMin = 0;
             }
             yCellMin = textRow(bounds.y);
-            yCellMax = textRow(bounds.y + bounds.height);
+            yCellMax = textRow(bounds.y + bounds.height) + 1;
             if (yCellMax > height) {
                 yCellMax = height;
             }
@@ -1370,7 +1381,7 @@ public class SwingTerminal extends LogicalScreen
             /*
             System.err.printf("bounds %s X %d %d Y %d %d\n",
                  bounds, xCellMin, xCellMax, yCellMin, yCellMax);
-            */
+             */
 
             for (int y = yCellMin; y < yCellMax; y++) {
                 for (int x = xCellMin; x < xCellMax; x++) {
@@ -1817,6 +1828,7 @@ public class SwingTerminal extends LogicalScreen
                 break;
             default:
                 if (!alt && ctrl && !shift) {
+                    // Control character, replace ch with 'A', 'B', etc.
                     ch = KeyEvent.getKeyText(key.getKeyCode()).charAt(0);
                 }
                 // Not a special key, put it together