Fix AWT printing issues w/ overlapping and/or non-opaque contents ; Change AWTPrintLifecycle's lifecycle

- AWTPrintLifecycle:
  - Should decorate:
       PrinterJob.print(..),
    instead of within Printable.print(..) { .. container.printAll(..); .. }

    This is due to AWT print implementation, i.e.
    AWT will issue Printable.print(..) multiple times for 'overlapping'
    or non-opaque elements!

  - Move from javax.media.opengl.awt -> com.jogamp.nativewindow.awt
  - Make _interface_ AWT agnostic, i.e. remove Graphics2D from 'setup(..)'
  - Add 'int numSamples' to 'setup(..)' to determine the number of samples

- AWTTilePrinter:
  - Use double precision when scaling image-size and clip-rect,
    then round them to integer values.
    Otherwise AWT will use the bounding box for the clipping-rectangular.

  - Clip negative portion of clip-rect,
    this removes redundant overpaints, as well as increasing the tile count
    due to the increased clipping-size.

  - Clip the image-size in the tile-renderer according to the clip-rect.

  - DEBUG_TILES: Dump tiles to file

  - Use sub-image of final BuffereImage instead
    of adding another clipping region. This might increase performance
    if no clip-rect has been set.

TODO:
  TestTiledPrintingGearsSwingAWT overlapping tests exposes
  a 'off by one' bug of the first layer's background!
  Note: The GL content seems to be correct though - maybe it's simply an AWT rounding error ..

4 files changed, 169 insertions, 262 deletions

diff --git a/src/jogl/classes/javax/media/opengl/awt/AWTPrintLifecycle.java b/src/jogl/classes/javax/media/opengl/awt/AWTPrintLifecycle.java
deleted file mode 100644
index 1a4c5bac0..000000000
--- a/src/jogl/classes/javax/media/opengl/awt/AWTPrintLifecycle.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/**
- * Copyright 2013 JogAmp Community. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- * 
- *    1. Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- * 
- *    2. Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * The views and conclusions contained in the software and documentation are those of the
- * authors and should not be interpreted as representing official policies, either expressed
- * or implied, of JogAmp Community.
- */
-package javax.media.opengl.awt;
-
-import javax.media.opengl.GLAutoDrawable;
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-
-import jogamp.nativewindow.awt.AWTMisc;
-
-/**
- * Interface describing print lifecycle to support AWT printing
- * on AWT {@link GLAutoDrawable}s.
- * <a name="impl"><h5>Implementations</h5></a>
- * <p>
- * Implementing {@link GLAutoDrawable} classes based on AWT
- * supporting {@link Component#print(Graphics)} shall implement this interface.
- * </p>
- * <a name="usage"><h5>Usage</h5></a>
- * <p>
- * Users attempting to print an AWT {@link Container} containing {@link AWTPrintLifecycle} elements
- * shall consider decorating the {@link Container#printAll(Graphics)} call with<br>
- * {@link #setupPrint(Graphics2D, double, double) setupPrint(..)} and {@link #releasePrint()}
- * on all {@link AWTPrintLifecycle} elements in the {@link Container}.<br>
- * To minimize this burden, a user can use {@link Context#setupPrint(Container, Graphics2D, double, double) Context.setupPrint(..)}:
- * <pre>
- *  Graphics2D g2d;
- *  Frame frame;
- *  double scaleGLMatXY = 72.0/glDPI;
- *  ...
-    final AWTPrintLifecycle.Context ctx = AWTPrintLifecycle.Context.setupPrint(frame, g2d, scaleGLMatXY, scaleGLMatXY);
-    try {
-       AWTEDTExecutor.singleton.invoke(true, new Runnable() {
-            public void run() {
-                frame.printAll(g2d);
-           } });
-    } finally {
-       ctx.releasePrint();
-    }
- * 
- * </pre>
- * </p>
- */
-public interface AWTPrintLifecycle {
-
-    public static final int DEFAULT_PRINT_TILE_SIZE = 512;
-    
-    
-    /**
-     * Shall be called before {@link Component#print(Graphics)}.
-     * <p>
-     * See <a href="#usage">Usage</a>.
-     * </p>
-     * @param g2d the {@link Graphics2D} instance, which will be used for printing.
-     * @param scaleMatX {@link Graphics2D} {@link Graphics2D#scale(double, double) scaling factor}, i.e. rendering 1/scaleMatX * width pixels
-     * @param scaleMatY {@link Graphics2D} {@link Graphics2D#scale(double, double) scaling factor}, i.e. rendering 1/scaleMatY * height pixels
-     */
-    void setupPrint(Graphics2D g2d, double scaleMatX, double scaleMatY);
-    
-    /**
-     * Shall be called after very last {@link Component#print(Graphics)}.
-     * <p>
-     * See <a href="#usage">Usage</a>.
-     * </p>
-     */
-    void releasePrint();
-
-    /**
-     * Convenient {@link AWTPrintLifecycle} context simplifying calling {@link AWTPrintLifecycle#setupPrint(Graphics2D, double, double) setupPrint(..)}
-     * and {@link AWTPrintLifecycle#releasePrint()} on all {@link AWTPrintLifecycle} elements of a {@link Container}.
-     * <p>
-     * See <a href="#usage">Usage</a>.
-     * </p>
-     */
-    public static class Context {
-        /**
-         * <p>
-         * See <a href="#usage">Usage</a>.
-         * </p>
-         * 
-         * @param c container to be traversed through to perform {@link AWTPrintLifecycle#setupPrint(Graphics2D, double, double) setupPrint(..)} on all {@link AWTPrintLifecycle} elements.
-         * @param g2d the {@link Graphics2D} instance, which will be used for printing.
-         * @param scaleMatX {@link Graphics2D} {@link Graphics2D#scale(double, double) scaling factor}, i.e. rendering 1/scaleMatX * width pixels
-         * @param scaleMatY {@link Graphics2D} {@link Graphics2D#scale(double, double) scaling factor}, i.e. rendering 1/scaleMatY * height pixels
-         * @return the context
-         */
-        public static Context setupPrint(Container c, Graphics2D g2d, double scaleMatX, double scaleMatY) {
-            final Context t = new Context(c, g2d, scaleMatX, scaleMatY);
-            t.setupPrint(c);
-            return t;
-        }
-
-        /**
-         * <p>
-         * See <a href="#usage">Usage</a>.
-         * </p>
-         */
-        public void releasePrint() {
-            count = AWTMisc.performAction(cont, AWTPrintLifecycle.class, releaseAction);
-        }
-
-        /**
-         * @return count of performed actions of last {@link #setupPrint(Container, Graphics2D, double, double) setupPrint(..)} or {@link #releasePrint()}.
-         */
-        public int getCount() { return count; }
-        
-        private final Container cont;
-        private final Graphics2D g2d;
-        private final double scaleMatX;
-        private final double scaleMatY;
-        private int count;
-        
-        private final AWTMisc.ComponentAction setupAction = new AWTMisc.ComponentAction() {
-            @Override
-            public void run(Component c) {
-                ((AWTPrintLifecycle)c).setupPrint(g2d, scaleMatX, scaleMatY);
-            } };
-        private final AWTMisc.ComponentAction releaseAction = new AWTMisc.ComponentAction() {
-            @Override
-            public void run(Component c) {
-                ((AWTPrintLifecycle)c).releasePrint();
-            } };
-
-        private Context(Container c, Graphics2D g2d, double scaleMatX, double scaleMatY) {
-            this.cont = c;
-            this.g2d = g2d;
-            this.scaleMatX = scaleMatX;
-            this.scaleMatY = scaleMatY;
-            this.count = 0;
-        }
-        private void setupPrint(Container c) {
-            count = AWTMisc.performAction(c, AWTPrintLifecycle.class, setupAction);
-        }
-    }
-}
diff --git a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
index 4e0fdba5d..a519e33bb 100644
--- a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
+++ b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java
@@ -53,7 +53,6 @@ import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsDevice;
-import java.awt.RenderingHints;
 import java.awt.geom.Rectangle2D;
 
 import java.awt.EventQueue;
@@ -94,6 +93,7 @@ import com.jogamp.common.util.locks.RecursiveLock;
 import com.jogamp.nativewindow.awt.AWTGraphicsConfiguration;
 import com.jogamp.nativewindow.awt.AWTGraphicsDevice;
 import com.jogamp.nativewindow.awt.AWTGraphicsScreen;
+import com.jogamp.nativewindow.awt.AWTPrintLifecycle;
 import com.jogamp.nativewindow.awt.AWTWindowClosingProtocol;
 import com.jogamp.nativewindow.awt.JAWTWindow;
 import com.jogamp.opengl.JoglVersion;
@@ -725,13 +725,13 @@ public class GLCanvas extends Canvas implements AWTGLAutoDrawable, WindowClosing
   }
 
   private volatile boolean printActive = false;
-  private boolean printUseAA = false;
+  private int printNumSamples = 0;
   private GLAnimatorControl printAnimator = null; 
   private GLAutoDrawable printGLAD = null;
   private AWTTilePainter printAWTTiles = null;
   
   @Override
-  public void setupPrint(Graphics2D g2d, double scaleMatX, double scaleMatY) {
+  public void setupPrint(double scaleMatX, double scaleMatY, int numSamples) {
       if( !validateGLDrawable() ) {
           if(DEBUG) {
               System.err.println(getThreadName()+": Info: GLCanvas setupPrint - skipped GL render, drawable not valid yet");
@@ -746,14 +746,9 @@ public class GLCanvas extends Canvas implements AWTGLAutoDrawable, WindowClosing
       }
       printActive = true; 
       sendReshape = false; // clear reshape flag
-      final RenderingHints rHints = g2d.getRenderingHints();
-      {
-          final Object _useAA = rHints.get(RenderingHints.KEY_ANTIALIASING);
-          printUseAA = null != _useAA && ( _useAA == RenderingHints.VALUE_ANTIALIAS_DEFAULT || _useAA == RenderingHints.VALUE_ANTIALIAS_ON );
-      }
+      printNumSamples = AWTTilePainter.getNumSamples(numSamples, getChosenGLCapabilities());
       if( DEBUG ) {
-          System.err.println("AWT print.setup: canvasSize "+getWidth()+"x"+getWidth()+", scaleMat "+scaleMatX+" x "+scaleMatY+", useAA "+printUseAA+", printAnimator "+printAnimator);
-          AWTTilePainter.dumpHintsAndScale(g2d);
+          System.err.println("AWT print.setup: canvasSize "+getWidth()+"x"+getWidth()+", scaleMat "+scaleMatX+" x "+scaleMatY+", numSamples "+numSamples+" -> "+printNumSamples+", printAnimator "+printAnimator);
       }
       final int componentCount = isOpaque() ? 3 : 4;
       final TileRenderer printRenderer = new TileRenderer();
@@ -769,23 +764,15 @@ public class GLCanvas extends Canvas implements AWTGLAutoDrawable, WindowClosing
               printAnimator.remove(GLCanvas.this);
           }
           final GLCapabilities caps = (GLCapabilities)getChosenGLCapabilities().cloneMutable();
-          final GLProfile glp = caps.getGLProfile();
           if( caps.getSampleBuffers() ) {
-              // bug / issue w/ swapGLContextAndAllGLEventListener and onscreen MSAA w/ NV/GLX
+              // Bug 830: swapGLContextAndAllGLEventListener and onscreen MSAA w/ NV/GLX
               printGLAD = GLCanvas.this;
           } else {
               caps.setDoubleBuffered(false);
               caps.setOnscreen(false);
-              if( printUseAA && !caps.getSampleBuffers() ) {
-                  if ( !glp.isGL2ES3() ) {
-                      if( DEBUG ) {
-                          System.err.println("Ignore MSAA due to gl-profile < GL2ES3");
-                      }
-                      printUseAA = false;
-                  } else {
-                      caps.setSampleBuffers(true);
-                      caps.setNumSamples(8);
-                  }
+              if( printNumSamples != caps.getNumSamples() ) {
+                  caps.setSampleBuffers(0 < printNumSamples);
+                  caps.setNumSamples(printNumSamples);
               }
               final GLDrawableFactory factory = GLDrawableFactory.getFactory(caps.getGLProfile());
               printGLAD = factory.createOffscreenAutoDrawable(null, caps, null, DEFAULT_PRINT_TILE_SIZE, DEFAULT_PRINT_TILE_SIZE, null);
@@ -796,7 +783,7 @@ public class GLCanvas extends Canvas implements AWTGLAutoDrawable, WindowClosing
           printAWTTiles.renderer.attachToAutoDrawable(printGLAD);
           if( DEBUG ) {
               System.err.println("AWT print.setup "+printAWTTiles);
-              System.err.println("AWT print.setup AA "+printUseAA+", "+caps);
+              System.err.println("AWT print.setup AA "+printNumSamples+", "+caps);
               System.err.println("AWT print.setup "+printGLAD);
           }
       }
diff --git a/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java b/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java
index 02f4e54a7..f0c6b7beb 100644
--- a/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java
+++ b/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java
@@ -48,7 +48,6 @@ import java.awt.Graphics2D;
 import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsEnvironment;
 import java.awt.Rectangle;
-import java.awt.RenderingHints;
 import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 import java.awt.image.DataBufferInt;
@@ -90,6 +89,7 @@ import jogamp.opengl.awt.Java2D;
 import jogamp.opengl.util.glsl.GLSLTextureRaster;
 
 import com.jogamp.common.util.awt.AWTEDTExecutor;
+import com.jogamp.nativewindow.awt.AWTPrintLifecycle;
 import com.jogamp.nativewindow.awt.AWTWindowClosingProtocol;
 import com.jogamp.opengl.FBObject;
 import com.jogamp.opengl.util.GLPixelBuffer.GLPixelAttributes;
@@ -424,7 +424,7 @@ public class GLJPanel extends JPanel implements AWTGLAutoDrawable, WindowClosing
       createAndInitializeBackend();
     }
 
-    if (!isInitialized) {
+    if (!isInitialized || printActive) {
       return;
     }
 
@@ -498,13 +498,13 @@ public class GLJPanel extends JPanel implements AWTGLAutoDrawable, WindowClosing
   }
 
   private volatile boolean printActive = false;
-  private boolean printUseAA = false;
+  private int printNumSamples = 0;
   private GLAnimatorControl printAnimator = null; 
   private GLAutoDrawable printGLAD = null;
   private AWTTilePainter printAWTTiles = null;
   
   @Override
-  public void setupPrint(Graphics2D g2d, double scaleMatX, double scaleMatY) {
+  public void setupPrint(double scaleMatX, double scaleMatY, int numSamples) {
       if (!isInitialized) {
           if(DEBUG) {
               System.err.println(getThreadName()+": Info: GLJPanel setupPrint - skipped GL render, drawable not valid yet");
@@ -520,14 +520,9 @@ public class GLJPanel extends JPanel implements AWTGLAutoDrawable, WindowClosing
       printActive = true; 
       sendReshape = false; // clear reshape flag
       handleReshape = false; // ditto
-      final RenderingHints rHints = g2d.getRenderingHints();
-      {
-          final Object _useAA = rHints.get(RenderingHints.KEY_ANTIALIASING);
-          printUseAA = null != _useAA && ( _useAA == RenderingHints.VALUE_ANTIALIAS_DEFAULT || _useAA == RenderingHints.VALUE_ANTIALIAS_ON );
-      }
+      printNumSamples = AWTTilePainter.getNumSamples(numSamples, getChosenGLCapabilities());
       if( DEBUG ) {
-          System.err.println("AWT print.setup: canvasSize "+getWidth()+"x"+getWidth()+", scaleMat "+scaleMatX+" x "+scaleMatY+", useAA "+printUseAA+", printAnimator "+printAnimator);
-          AWTTilePainter.dumpHintsAndScale(g2d);
+          System.err.println("AWT print.setup: canvasSize "+getWidth()+"x"+getWidth()+", scaleMat "+scaleMatX+" x "+scaleMatY+", numSamples "+numSamples+" -> "+printNumSamples+", printAnimator "+printAnimator);
       }
       final int componentCount = isOpaque() ? 3 : 4;
       final TileRenderer printRenderer = new TileRenderer();
@@ -546,30 +541,21 @@ public class GLJPanel extends JPanel implements AWTGLAutoDrawable, WindowClosing
           
           printGLAD = GLJPanel.this; // default: re-use 
           final GLCapabilities caps = (GLCapabilities)getChosenGLCapabilities().cloneMutable();
-          final GLProfile glp = caps.getGLProfile();
-          if( printUseAA && !caps.getSampleBuffers() ) {
-              if ( !glp.isGL2ES3() ) {
-                  if( DEBUG ) {
-                      System.err.println("Ignore MSAA due to gl-profile < GL2ES3");
-                  }
-                  printUseAA = false;
-              } else {
-                  // MSAA FBO ..
-                  caps.setDoubleBuffered(false);
-                  caps.setOnscreen(false);
-                  caps.setSampleBuffers(true);
-                  caps.setNumSamples(8);
-                  final GLDrawableFactory factory = GLDrawableFactory.getFactory(caps.getGLProfile());
-                  printGLAD = factory.createOffscreenAutoDrawable(null, caps, null, DEFAULT_PRINT_TILE_SIZE, DEFAULT_PRINT_TILE_SIZE, null);
-                  GLDrawableUtil.swapGLContextAndAllGLEventListener(GLJPanel.this, printGLAD);
-              }
+          if( printNumSamples != caps.getNumSamples() ) {
+              caps.setDoubleBuffered(false);
+              caps.setOnscreen(false);
+              caps.setSampleBuffers(0 < printNumSamples);
+              caps.setNumSamples(printNumSamples);
+              final GLDrawableFactory factory = GLDrawableFactory.getFactory(caps.getGLProfile());
+              printGLAD = factory.createOffscreenAutoDrawable(null, caps, null, DEFAULT_PRINT_TILE_SIZE, DEFAULT_PRINT_TILE_SIZE, null);
+              GLDrawableUtil.swapGLContextAndAllGLEventListener(GLJPanel.this, printGLAD);
           }
           printAWTTiles.setIsGLOriented(printGLAD.isGLOriented());
           printAWTTiles.renderer.setTileSize(printGLAD.getWidth(), printGLAD.getHeight(), 0);
           printAWTTiles.renderer.attachToAutoDrawable(printGLAD);
           if( DEBUG ) {
               System.err.println("AWT print.setup "+printAWTTiles);
-              System.err.println("AWT print.setup AA "+printUseAA+", "+caps);
+              System.err.println("AWT print.setup AA "+printNumSamples+", "+caps);
               System.err.println("AWT print.setup "+printGLAD);
           }
       }
@@ -624,9 +610,6 @@ public class GLJPanel extends JPanel implements AWTGLAutoDrawable, WindowClosing
       printAWTTiles.setupGraphics2DAndClipBounds(g2d, getWidth(), getHeight());
       try {
           final TileRenderer tileRenderer = printAWTTiles.renderer; 
-          if( DEBUG ) {
-              System.err.println("AWT print.0: "+tileRenderer);
-          }
           do {
               if( printGLAD != GLJPanel.this ) {
                   tileRenderer.display();
diff --git a/src/jogl/classes/jogamp/opengl/awt/AWTTilePainter.java b/src/jogl/classes/jogamp/opengl/awt/AWTTilePainter.java
index 0ff733457..b16273b35 100644
--- a/src/jogl/classes/jogamp/opengl/awt/AWTTilePainter.java
+++ b/src/jogl/classes/jogamp/opengl/awt/AWTTilePainter.java
@@ -33,16 +33,25 @@ import java.awt.Rectangle;
 import java.awt.RenderingHints;
 import java.awt.Shape;
 import java.awt.geom.AffineTransform;
+import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 import java.awt.image.DataBufferInt;
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.Map.Entry;
 
+import javax.imageio.ImageIO;
+import javax.media.nativewindow.util.DimensionImmutable;
 import javax.media.opengl.GL;
 import javax.media.opengl.GLAutoDrawable;
+import javax.media.opengl.GLCapabilitiesImmutable;
 import javax.media.opengl.GLEventListener;
 
+import jogamp.opengl.Debug;
+
 import com.jogamp.opengl.util.TileRenderer;
 import com.jogamp.opengl.util.TileRendererBase;
 import com.jogamp.opengl.util.GLPixelBuffer.GLPixelAttributes;
@@ -56,6 +65,8 @@ import com.jogamp.opengl.util.awt.AWTGLPixelBuffer.AWTGLPixelBufferProvider;
  * </p>
  */
 public class AWTTilePainter {
+    private static final boolean DEBUG_TILES = Debug.debug("TileRenderer");
+    
     public final TileRenderer renderer;
     public final int componentCount;
     public final double scaleMatX, scaleMatY;
@@ -76,8 +87,28 @@ public class AWTTilePainter {
               System.err.println("Hint["+count+"]: "+rEntry.getKey()+" -> "+rEntry.getValue());
           }
           final AffineTransform aTrans = g2d.getTransform();
+          System.err.println(" type "+aTrans.getType());
           System.err.println(" scale "+aTrans.getScaleX()+" x "+aTrans.getScaleY());
           System.err.println(" move "+aTrans.getTranslateX()+" x "+aTrans.getTranslateY());        
+          System.err.println(" mat  "+aTrans);
+    }
+    
+    /**
+     * @param numSamples multisampling value: < 0 turns off, == 0 leaves as-is, > 0 enables using given num samples 
+     * @param caps used capabilties
+     * @return resulting number of samples, 0 if disabled
+     */
+    public static int getNumSamples(int numSamples, GLCapabilitiesImmutable caps) {
+          if( 0 > numSamples ) {
+              return 0;
+          } else if( 0 < numSamples ) {
+              if ( !caps.getGLProfile().isGL2ES3() ) {
+                  return 0;
+              }
+              return Math.max(caps.getNumSamples(), numSamples);
+          } else {
+              return caps.getNumSamples();
+          }
     }
     
     /** 
@@ -104,7 +135,6 @@ public class AWTTilePainter {
         this.scaleMatY = scaleMatY;
         this.verbose = verbose;
         this.flipVertical = true;
-        this.renderer.setRowOrder(TileRenderer.TR_TOP_TO_BOTTOM);
     }
     
     public String toString() { return renderer.toString(); }
@@ -113,6 +143,25 @@ public class AWTTilePainter {
         flipVertical = v;
     }
     
+    private static Rectangle getRoundedRect(Rectangle2D r) {
+        if( null == r ) { return null; }
+        return new Rectangle((int)Math.round(r.getX()), (int)Math.round(r.getY()), 
+                             (int)Math.round(r.getWidth()), (int)Math.round(r.getHeight()));
+    }
+    private static Rectangle clipNegative(Rectangle in) {
+        if( null == in ) { return null; }
+        final Rectangle out = new Rectangle(in);
+        if( 0 > out.x ) {
+            out.width += out.x;
+            out.x = 0;
+        }
+        if( 0 > out.y ) {
+            out.height += out.y;
+            out.y = 0;
+        }
+        return out;
+    }
+    
     /**
      * Caches the {@link Graphics2D} instance for rendering.
      * <p>
@@ -132,31 +181,49 @@ public class AWTTilePainter {
     public void setupGraphics2DAndClipBounds(Graphics2D g2d, int width, int height) {
         this.g2d = g2d;
         saveAT = g2d.getTransform();
-        final Rectangle gClipOrig = g2d.getClipBounds();
-        if( null == gClipOrig ) {
-            g2d.setClip(0, 0, width, height);
+        final Rectangle gClipOrigR;
+        final Rectangle2D dClipOrig, dImageSizeOrig; // double precision for scaling
+        // setup original rectangles
+        {
+            gClipOrigR = g2d.getClipBounds();
+            final Rectangle gClipOrig = clipNegative(gClipOrigR);
+            dClipOrig = null != gClipOrig ? new Rectangle2D.Double(gClipOrig.getX(), gClipOrig.getY(), gClipOrig.getWidth(), gClipOrig.getHeight()) : null;
+            dImageSizeOrig = new Rectangle2D.Double(0, 0, width, height);
         }
-        g2d.scale(scaleMatX, scaleMatY);
-        
-        final Rectangle gClipScaled = g2d.getClipBounds();
-        if( 0 > gClipScaled.x ) {
-            gClipScaled.width += gClipScaled.x;
-            gClipScaled.x = 0;
+        final Rectangle2D dClipScaled, dImageSizeScaled; // double precision for scaling
+        // retrieve scaled image-size and clip-bounds
+        {
+            g2d.setClip(dImageSizeOrig);
+            g2d.scale(scaleMatX, scaleMatY);
+            dImageSizeScaled = (Rectangle2D) g2d.getClip();
+            if( null == dClipOrig ) {
+                g2d.setClip(null);
+                dClipScaled = (Rectangle2D) dImageSizeScaled.clone();
+            } else {
+                g2d.setTransform(saveAT); // reset
+                g2d.setClip(dClipOrig);
+                g2d.scale(scaleMatX, scaleMatY);
+                dClipScaled = (Rectangle2D) g2d.getClip();
+            }
         }
-        if( 0 > gClipScaled.y ) {
-            gClipScaled.height += gClipScaled.y;
-            gClipScaled.y = 0;
+        final Rectangle iClipScaled = getRoundedRect(dClipScaled);
+        final Rectangle iImageSizeScaled = getRoundedRect(dImageSizeScaled);
+        scaledYOffset = iClipScaled.y;
+        renderer.setImageSize(iImageSizeScaled.width, iImageSizeScaled.height);
+        renderer.clipImageSize(iClipScaled.width, iClipScaled.height);
+        final int clipH = Math.min(iImageSizeScaled.height, iClipScaled.height);
+        if( flipVertical ) {
+            renderer.setTileOffset(iClipScaled.x, iImageSizeScaled.height - ( iClipScaled.y + clipH ));
+        } else {
+            renderer.setTileOffset(iClipScaled.x, iClipScaled.y);
         }
         if( verbose ) {
-            System.err.println("AWT print.0: "+gClipOrig+" -> "+gClipScaled);
-        }
-        renderer.setImageSize(gClipScaled.width, gClipScaled.height);
-        renderer.setTileOffset(gClipScaled.x, gClipScaled.y);
-        if( null == gClipOrig ) {
-            // reset
-            g2d.setClip(null);
+            System.err.println("AWT print.0: image "+dImageSizeOrig + " -> " + dImageSizeScaled + " -> " + iImageSizeScaled);
+            System.err.println("AWT print.0: clip  "+gClipOrigR + " -> " + dClipOrig + " -> " + dClipScaled + " -> " + iClipScaled);
+            System.err.println("AWT print.0: "+renderer);
         }
     }
+    private int scaledYOffset;
     
     /** See {@ #setupGraphics2DAndClipBounds(Graphics2D)}. */
     public void resetGraphics2D() {        
@@ -208,28 +275,55 @@ public class AWTTilePainter {
         @Override
         public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) {}
     };
+    static int _counter = 0;
     final GLEventListener postTileGLEL = new GLEventListener() {
-        int tTopRowHeight = 0;
         @Override
         public void init(GLAutoDrawable drawable) {
-            tTopRowHeight = 0;
         }
         @Override
         public void dispose(GLAutoDrawable drawable) {}
         @Override
         public void display(GLAutoDrawable drawable) {              
+            final DimensionImmutable cis = renderer.getClippedImageSize();
+            final int tWidth = renderer.getParam(TileRendererBase.TR_CURRENT_TILE_WIDTH);
+            final int tHeight = renderer.getParam(TileRendererBase.TR_CURRENT_TILE_HEIGHT);
+            final int pX = renderer.getParam(TileRendererBase.TR_CURRENT_TILE_X_POS);
+            final int pY = renderer.getParam(TileRendererBase.TR_CURRENT_TILE_Y_POS);
+            final int pYOff = renderer.getParam(TileRenderer.TR_TILE_Y_OFFSET);
+            final int pYf;
+            if( flipVertical ) {
+                pYf = cis.getHeight() - ( pY - pYOff + tHeight ) + scaledYOffset;
+            } else {
+                pYf = pY;
+            }
+            
             // Copy temporary data into raster of BufferedImage for faster
             // blitting Note that we could avoid this copy in the cases
             // where !offscreenDrawable.isGLOriented(),
             // but that's the software rendering path which is very slow anyway.
-            final int tWidth = renderer.getParam(TileRendererBase.TR_CURRENT_TILE_WIDTH);
-            final int tHeight = renderer.getParam(TileRendererBase.TR_CURRENT_TILE_HEIGHT);
             final BufferedImage dstImage;
+            if( DEBUG_TILES ) {
+                final String fname = String.format("file_%03d_0_tile_[%02d][%02d]_sz_%03dx%03d_pos0_%03d_%03d_yOff_%03d_pos1_%03d_%03d.png", 
+                        _counter, 
+                        renderer.getParam(TileRenderer.TR_CURRENT_COLUMN), renderer.getParam(TileRenderer.TR_CURRENT_ROW),
+                        tWidth, tHeight,
+                        pX, pY, pYOff, pX, pYf).replace(' ', '_');
+                System.err.println("XXX file "+fname);
+                final File fout = new File(fname); 
+                try {
+                    ImageIO.write(tBuffer.image, "png", fout);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }            
             if( flipVertical ) {
                 final BufferedImage srcImage = tBuffer.image;
                 dstImage = vFlipImage;
                 final int[] src = ((DataBufferInt) srcImage.getRaster().getDataBuffer()).getData();
                 final int[] dst = ((DataBufferInt) dstImage.getRaster().getDataBuffer()).getData();
+                if( DEBUG_TILES ) {
+                    Arrays.fill(dst, 0x55);
+                }
                 final int incr = tBuffer.width;
                 int srcPos = 0;
                 int destPos = (tHeight - 1) * tBuffer.width;
@@ -239,28 +333,31 @@ public class AWTTilePainter {
             } else {
                 dstImage = tBuffer.image;
             }
-            // Draw resulting image in one shot
-            final int tRows = renderer.getParam(TileRenderer.TR_ROWS);
-            final int tRow = renderer.getParam(TileRenderer.TR_CURRENT_ROW);
-            final int pX = renderer.getParam(TileRendererBase.TR_CURRENT_TILE_X_POS); 
-            final int pYf;
-            if( flipVertical ) {
-                if( tRow == tRows - 1 ) {
-                    tTopRowHeight = tHeight;
-                    pYf = 0;
-                } else if( tRow == tRows - 2 ){
-                    pYf = tTopRowHeight;
-                } else {
-                    pYf = ( tRows - 2 - tRow ) * tHeight + tTopRowHeight;
+            if( DEBUG_TILES ) {
+                final String fname = String.format("file_%03d_1_tile_[%02d][%02d]_sz_%03dx%03d_pos0_%03d_%03d_yOff_%03d_pos1_%03d_%03d.png", 
+                        _counter, 
+                        renderer.getParam(TileRenderer.TR_CURRENT_COLUMN), renderer.getParam(TileRenderer.TR_CURRENT_ROW),
+                        tWidth, tHeight,
+                        pX, pY, pYOff, pX, pYf).replace(' ', '_');
+                System.err.println("XXX file "+fname);
+                final File fout = new File(fname); 
+                try {
+                    ImageIO.write(dstImage, "png", fout);
+                } catch (IOException e) {
+                    e.printStackTrace();
                 }
-            } else {
-                pYf = renderer.getParam(TileRendererBase.TR_CURRENT_TILE_Y_POS);
-            }
+                _counter++;
+            }            
+            // Draw resulting image in one shot
             final Shape oClip = g2d.getClip();
-            g2d.clipRect(pX, pYf, tWidth, tHeight);
-            g2d.drawImage(dstImage, pX, pYf, dstImage.getWidth(), dstImage.getHeight(), null); // Null ImageObserver since image data is ready.
+            // g2d.clipRect(pX, pYf, tWidth, tHeight);
+            final BufferedImage outImage = dstImage.getSubimage(0, 0, tWidth, tHeight); // instead of clipping
+            final boolean drawDone = g2d.drawImage(outImage, pX, pYf, null); // Null ImageObserver since image data is ready.
+            // final boolean drawDone = g2d.drawImage(dstImage, pX, pYf, dstImage.getWidth(), dstImage.getHeight(), null); // Null ImageObserver since image data is ready.
             if( verbose ) {
-                System.err.println("XXX tile-post.X clip "+oClip+" -> "+g2d.getClip());
+                System.err.println("XXX tile-post.X clippedImageSize "+cis);
+                System.err.println("XXX tile-post.X pYf "+cis.getHeight()+" - ( "+pY+" - "+pYOff+" + "+tHeight+" ) "+scaledYOffset+" = "+ pYf);
+                System.err.println("XXX tile-post.X clip "+oClip+" + "+pX+" / [pY "+pY+", pYOff "+pYOff+", pYf "+pYf+"] "+tWidth+"x"+tHeight+" -> "+g2d.getClip());
                 g2d.setColor(Color.BLACK);
                 g2d.drawRect(pX, pYf, tWidth, tHeight);
                 if( null != oClip ) {
@@ -269,9 +366,11 @@ public class AWTTilePainter {
                     g2d.drawRect(r.x, r.y, r.width, r.height);
                 }
                 System.err.println("XXX tile-post.X "+renderer);
-                System.err.println("XXX tile-post.X dst-img "+dstImage.getWidth()+"x"+dstImage.getHeight()+", y-flip "+flipVertical+" -> "+pX+"/"+pYf);
+                System.err.println("XXX tile-post.X dst-img "+dstImage.getWidth()+"x"+dstImage.getHeight());
+                System.err.println("XXX tile-post.X out-img "+outImage.getWidth()+"x"+dstImage.getHeight());
+                System.err.println("XXX tile-post.X y-flip "+flipVertical+" -> "+pX+"/"+pYf+", drawDone "+drawDone);
             }
-            g2d.setClip(oClip);
+            // g2d.setClip(oClip);
         }
         @Override
         public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) {}