checkstyle sweep

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

diff --git a/src/jexer/io/SwingScreen.java b/src/jexer/io/SwingScreen.java
index 8677fdff122d1746d5368b27812bab17cde8cb6b..cdca714bb1cff6765144cc381c5bfef20ae6c16c 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
@@ -168,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.
          */
@@ -329,7 +339,7 @@ public final class SwingScreen extends Screen {
             getFontDimensions();
 
             // Setup double-buffering
-            if (screen.doubleBuffer) {
+            if (SwingScreen.doubleBuffer) {
                 setIgnoreRepaint(true);
                 createBufferStrategy(2);
                 bufferStrategy = getBufferStrategy();
@@ -350,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;
+            }
         }
 
         /**
@@ -452,24 +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) {
 
-                            /*
-                             * TODO:
-                             *   reverse
-                             *   blink
-                             *   underline
-                             */
+                            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);
@@ -488,6 +519,8 @@ public final class SwingScreen extends Screen {
                     Cell lCell = screen.logical[cursorX][cursorY];
                     gr.setColor(attrToForegroundColor(lCell));
                     switch (cursorStyle) {
+                    default:
+                        // Fall through...
                     case UNDERLINE:
                         gr.fillRect(xPixel, yPixel + textHeight - 2,
                             textWidth, 2);
@@ -540,7 +573,7 @@ public final class SwingScreen extends Screen {
                     SwingScreen.this.frame.resizeToScreen();
                     SwingScreen.this.frame.setVisible(true);
                 }
-            } );
+            });
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -568,7 +601,7 @@ public final class SwingScreen extends Screen {
 
         if (reallyCleared) {
             // Really refreshed, do it all
-            if (doubleBuffer) {
+            if (SwingScreen.doubleBuffer) {
                 Graphics gr = frame.bufferStrategy.getDrawGraphics();
                 frame.paint(gr);
                 gr.dispose();
@@ -607,6 +640,7 @@ public final class SwingScreen extends Screen {
                         || ((x == cursorX)
                             && (y == cursorY)
                             && cursorVisible)
+                        || lCell.isBlink()
                     ) {
                         if (xPixel < xMin) {
                             xMin = xPixel;
@@ -634,7 +668,7 @@ public final class SwingScreen extends Screen {
         // Repaint the desired area
         // System.err.printf("REPAINT X %d %d Y %d %d\n", xMin, xMax,
         //     yMin, yMax);
-        if (doubleBuffer) {
+        if (SwingScreen.doubleBuffer) {
             Graphics gr = frame.bufferStrategy.getDrawGraphics();
             Rectangle bounds = new Rectangle(xMin, yMin, xMax - xMin,
                 yMax - yMin);