fix javadoc header

[fanfix.git] / src / jexer / io / SwingScreen.java

diff --git a/src/jexer/io/SwingScreen.java b/src/jexer/io/SwingScreen.java
index 2a96122b00bfd6035d2652fbd367931bfc2554be..3c949c1b8016866d4e36641d1afe1c0e1837a2c6 100644 (file)
--- a/src/jexer/io/SwingScreen.java
+++ b/src/jexer/io/SwingScreen.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Jexer - Java Text User Interface
  *
  * License: LGPLv3 or later
@@ -41,6 +41,7 @@ import java.awt.Rectangle;
 import java.awt.Toolkit;
 import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
+import java.awt.image.BufferStrategy;
 import java.io.InputStream;
 import java.util.Date;
 import javax.swing.JFrame;
@@ -55,6 +56,11 @@ import jexer.session.SwingSessionInfo;
  */
 public final class SwingScreen extends Screen {
 
+    /**
+     * If true, use double buffering thread.
+     */
+    private static final boolean doubleBuffer = true;
+
     /**
      * Cursor style to draw.
      */
@@ -137,6 +143,11 @@ public final class SwingScreen extends Screen {
          */
         private static final String FONTFILE = "terminus-ttf-4.39/TerminusTTF-Bold-4.39.ttf";
 
+        /**
+         * The BufferStrategy object needed for double-buffering.
+         */
+        private BufferStrategy bufferStrategy;
+
         /**
          * The TUI Screen data.
          */
@@ -157,6 +168,16 @@ public final class SwingScreen extends Screen {
          */
         private int maxDescent = 0;
 
+        /**
+         * System-dependent Y adjustment for text in the  character cell.
+         */
+        private int textAdjustY = 0;
+
+        /**
+         * System-dependent X adjustment for text in the  character cell.
+         */
+        private int textAdjustX = 0;
+
         /**
          * Top pixel absolute location.
          */
@@ -197,12 +218,6 @@ public final class SwingScreen extends Screen {
          * @return the Swing Color
          */
         private Color attrToForegroundColor(final CellAttributes attr) {
-            /*
-             * TODO:
-             *   reverse
-             *   blink
-             *   underline
-             */
             if (attr.isBold()) {
                 if (attr.getForeColor().equals(jexer.bits.Color.BLACK)) {
                     return MYBOLD_BLACK;
@@ -250,12 +265,6 @@ public final class SwingScreen extends Screen {
          * @return the Swing Color
          */
         private Color attrToBackgroundColor(final CellAttributes attr) {
-            /*
-             * TODO:
-             *   reverse
-             *   blink
-             *   underline
-             */
             if (attr.getBackColor().equals(jexer.bits.Color.BLACK)) {
                 return MYBLACK;
             } else if (attr.getBackColor().equals(jexer.bits.Color.RED)) {
@@ -328,6 +337,13 @@ public final class SwingScreen extends Screen {
 
             // Save the text cell width/height
             getFontDimensions();
+
+            // Setup double-buffering
+            if (SwingScreen.doubleBuffer) {
+                setIgnoreRepaint(true);
+                createBufferStrategy(2);
+                bufferStrategy = getBufferStrategy();
+            }
         }
 
         /**
@@ -344,6 +360,11 @@ public final class SwingScreen extends Screen {
             // This also produces the same number, but works better for ugly
             // monospace.
             textHeight = fm.getMaxAscent() + maxDescent - leading;
+
+            if (System.getProperty("os.name").startsWith("Windows")) {
+                textAdjustY = -1;
+                textAdjustX = 0;
+            }
         }
 
         /**
@@ -446,16 +467,40 @@ public final class SwingScreen extends Screen {
                         Cell lCell = screen.logical[x][y];
                         Cell pCell = screen.physical[x][y];
 
-                        if (!lCell.equals(pCell) || reallyCleared) {
+                        if (!lCell.equals(pCell)
+                            || lCell.isBlink()
+                            || reallyCleared) {
+
+                            Cell lCellColor = new Cell();
+                            lCellColor.setTo(lCell);
+
+                            // Check for reverse
+                            if (lCell.isReverse()) {
+                                lCellColor.setForeColor(lCell.getBackColor());
+                                lCellColor.setBackColor(lCell.getForeColor());
+                            }
+
                             // Draw the background rectangle, then the
                             // foreground character.
-                            gr.setColor(attrToBackgroundColor(lCell));
+                            gr.setColor(attrToBackgroundColor(lCellColor));
                             gr.fillRect(xPixel, yPixel, textWidth, textHeight);
-                            gr.setColor(attrToForegroundColor(lCell));
-                            char [] chars = new char[1];
-                            chars[0] = lCell.getChar();
-                            gr.drawChars(chars, 0, 1, xPixel,
-                                yPixel + textHeight - maxDescent);
+
+                            // Handle blink and underline
+                            if (!lCell.isBlink()
+                                || (lCell.isBlink() && cursorBlinkVisible)
+                            ) {
+                                gr.setColor(attrToForegroundColor(lCellColor));
+                                char [] chars = new char[1];
+                                chars[0] = lCell.getChar();
+                                gr.drawChars(chars, 0, 1, xPixel + textAdjustX,
+                                    yPixel + textHeight - maxDescent
+                                    + textAdjustY);
+
+                                if (lCell.isUnderline()) {
+                                    gr.fillRect(xPixel, yPixel + textHeight - 2,
+                                        textWidth, 2);
+                                }
+                            }
 
                             // Physical is always updated
                             physical[x][y].setTo(lCell);
@@ -500,6 +545,13 @@ public final class SwingScreen extends Screen {
      */
     SwingFrame frame;
 
+    /**
+     * Restore terminal to normal state.
+     */
+    public void shutdown() {
+        frame.dispose();
+    }
+
     /**
      * Public constructor.
      */
@@ -547,7 +599,15 @@ public final class SwingScreen extends Screen {
 
         if (reallyCleared) {
             // Really refreshed, do it all
-            frame.repaint();
+            if (SwingScreen.doubleBuffer) {
+                Graphics gr = frame.bufferStrategy.getDrawGraphics();
+                frame.paint(gr);
+                gr.dispose();
+                frame.bufferStrategy.show();
+                Toolkit.getDefaultToolkit().sync();
+            } else {
+                frame.repaint();
+            }
             return;
         }
 
@@ -578,6 +638,7 @@ public final class SwingScreen extends Screen {
                         || ((x == cursorX)
                             && (y == cursorY)
                             && cursorVisible)
+                        || lCell.isBlink()
                     ) {
                         if (xPixel < xMin) {
                             xMin = xPixel;
@@ -603,8 +664,20 @@ public final class SwingScreen extends Screen {
         }
 
         // Repaint the desired area
-        frame.repaint(xMin, yMin, xMax - xMin, yMax - yMin);
-        // System.err.printf("REPAINT X %d %d Y %d %d\n", xMin, xMax, yMin, yMax);
+        // System.err.printf("REPAINT X %d %d Y %d %d\n", xMin, xMax,
+        //     yMin, yMax);
+        if (SwingScreen.doubleBuffer) {
+            Graphics gr = frame.bufferStrategy.getDrawGraphics();
+            Rectangle bounds = new Rectangle(xMin, yMin, xMax - xMin,
+                yMax - yMin);
+            gr.setClip(bounds);
+            frame.paint(gr);
+            gr.dispose();
+            frame.bufferStrategy.show();
+            Toolkit.getDefaultToolkit().sync();
+        } else {
+            frame.repaint(xMin, yMin, xMax - xMin, yMax - yMin);
+        }
     }
 
     /**