Fix Swing triple-buffering

diff --git a/README.md b/README.md
index a947012e434fc381de1c7e94e174c2c5ccc2b1d4..4e71a9c60490da52f21588553934f9d7d2b1340f 100644 (file)
--- a/README.md
+++ b/README.md
@@ -225,7 +225,7 @@ Many tasks remain before calling this version 1.0:
 
 0.0.5: BUG HUNT
 
-- Swing performance.  Even with double buffering it isn't great.
+- Swing performance is better, triple-buffering appears to have helped.
 
 0.1.0: BETA RELEASE
 

diff --git a/src/jexer/TApplication.java b/src/jexer/TApplication.java
index c43f436f6af3fb672c534e2950b54052ceef5fd1..e9a7a44c62ddb4c9cd53b17a3ca7eee35e8985b8 100644 (file)
--- a/src/jexer/TApplication.java
+++ b/src/jexer/TApplication.java
@@ -618,12 +618,13 @@ public class TApplication implements Runnable {
      * @param y row position
      */
     private void invertCell(final int x, final int y) {
-        synchronized (getScreen()) {
-            CellAttributes attr = getScreen().getAttrXY(x, y);
-            attr.setForeColor(attr.getForeColor().invert());
-            attr.setBackColor(attr.getBackColor().invert());
-            getScreen().putAttrXY(x, y, attr, false);
+        if (debugThreads) {
+            System.err.printf("invertCell() %d %d\n", x, y);
         }
+        CellAttributes attr = getScreen().getAttrXY(x, y);
+        attr.setForeColor(attr.getForeColor().invert());
+        attr.setBackColor(attr.getBackColor().invert());
+        getScreen().putAttrXY(x, y, attr, false);
     }
 
     /**
@@ -635,18 +636,23 @@ public class TApplication implements Runnable {
         }
 
         if (!repaint) {
-            if ((oldMouseX != mouseX) || (oldMouseY != mouseY)) {
-                // The only thing that has happened is the mouse moved.
-                // Clear the old position and draw the new position.
-                invertCell(oldMouseX, oldMouseY);
-                invertCell(mouseX, mouseY);
-                oldMouseX = mouseX;
-                oldMouseY = mouseY;
+            if (debugThreads) {
+                System.err.printf("drawAll() !repaint\n");
             }
-            if (getScreen().isDirty()) {
-                backend.flushScreen();
+            synchronized (getScreen()) {
+                if ((oldMouseX != mouseX) || (oldMouseY != mouseY)) {
+                    // The only thing that has happened is the mouse moved.
+                    // Clear the old position and draw the new position.
+                    invertCell(oldMouseX, oldMouseY);
+                    invertCell(mouseX, mouseY);
+                    oldMouseX = mouseX;
+                    oldMouseY = mouseY;
+                }
+                if (getScreen().isDirty()) {
+                    backend.flushScreen();
+                }
+                return;
             }
-            return;
         }
 
         if (debugThreads) {
@@ -712,6 +718,8 @@ public class TApplication implements Runnable {
 
         // Draw the mouse pointer
         invertCell(mouseX, mouseY);
+        oldMouseX = mouseX;
+        oldMouseY = mouseY;
 
         // Place the cursor if it is visible
         TWidget activeWidget = null;
@@ -730,7 +738,9 @@ public class TApplication implements Runnable {
         }
 
         // Flush the screen contents
-        backend.flushScreen();
+        if (getScreen().isDirty()) {
+            backend.flushScreen();
+        }
 
         repaint = false;
     }

diff --git a/src/jexer/io/SwingScreen.java b/src/jexer/io/SwingScreen.java
index 1519079d50b68e6578a0d7cf060763ba1bbaa5b9..24710101ee5b1fb44ebe25ee126390e523ccb244 100644 (file)
--- a/src/jexer/io/SwingScreen.java
+++ b/src/jexer/io/SwingScreen.java
@@ -55,9 +55,9 @@ import jexer.session.SwingSessionInfo;
 public final class SwingScreen extends Screen {
 
     /**
-     * If true, use double buffering thread.
+     * If true, use triple buffering thread.
      */
-    private static final boolean doubleBuffer = true;
+    private static final boolean tripleBuffer = true;
 
     /**
      * Cursor style to draw.
@@ -142,7 +142,7 @@ 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.
+         * The BufferStrategy object needed for triple-buffering.
          */
         private BufferStrategy bufferStrategy;
 
@@ -336,10 +336,10 @@ public final class SwingScreen extends Screen {
             // Save the text cell width/height
             getFontDimensions();
 
-            // Setup double-buffering
-            if (SwingScreen.doubleBuffer) {
+            // Setup triple-buffering
+            if (SwingScreen.tripleBuffer) {
                 setIgnoreRepaint(true);
-                createBufferStrategy(2);
+                createBufferStrategy(3);
                 bufferStrategy = getBufferStrategy();
             }
         }
@@ -597,17 +597,24 @@ public final class SwingScreen extends Screen {
     @Override
     public void flushPhysical() {
 
-        if (reallyCleared) {
-            // Really refreshed, do it all
-            if (SwingScreen.doubleBuffer) {
-                Graphics gr = frame.bufferStrategy.getDrawGraphics();
-                frame.paint(gr);
-                gr.dispose();
-                frame.bufferStrategy.show();
-                Toolkit.getDefaultToolkit().sync();
-            } else {
-                frame.repaint();
-            }
+        /*
+        System.err.printf("flushPhysical(): reallyCleared %s dirty %s\n",
+            reallyCleared, dirty);
+         */
+
+        // If reallyCleared is set, we have to draw everything.
+        if ((frame.bufferStrategy != null) && (reallyCleared == true)) {
+            // Triple-buffering: we have to redraw everything on this thread.
+            Graphics gr = frame.bufferStrategy.getDrawGraphics();
+            frame.paint(gr);
+            gr.dispose();
+            frame.bufferStrategy.show();
+            // sync() doesn't seem to help the tearing for me.
+            // Toolkit.getDefaultToolkit().sync();
+            return;
+        } else if ((frame.bufferStrategy == null) && (reallyCleared == true)) {
+            // Repaint everything on the Swing thread.
+            frame.repaint();
             return;
         }
 
@@ -664,9 +671,11 @@ 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 (SwingScreen.doubleBuffer) {
+        /*
+        System.err.printf("REPAINT X %d %d Y %d %d\n", xMin, xMax,
+            yMin, yMax);
+         */
+        if (frame.bufferStrategy != null) {
             Graphics gr = frame.bufferStrategy.getDrawGraphics();
             Rectangle bounds = new Rectangle(xMin, yMin, xMax - xMin,
                 yMax - yMin);
@@ -674,7 +683,8 @@ public final class SwingScreen extends Screen {
             frame.paint(gr);
             gr.dispose();
             frame.bufferStrategy.show();
-            Toolkit.getDefaultToolkit().sync();
+            // sync() doesn't seem to help the tearing for me.
+            // Toolkit.getDefaultToolkit().sync();
         } else {
             frame.repaint(xMin, yMin, xMax - xMin, yMax - yMin);
         }