8251928: [macos] the printer DPI always be 72, cause some content lost when print out

Reviewed-by: psadhukhan, prr

Author: GennadiyKrivoshein

src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterGraphicsConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@
 import java.awt.Rectangle;
 import java.awt.Transparency;
 import java.awt.geom.AffineTransform;
+import java.awt.geom.Point2D;
 import java.awt.image.BufferedImage;
 import java.awt.image.ColorModel;
 import java.awt.image.VolatileImage;
@@ -45,10 +46,16 @@ public static CPrinterGraphicsConfig getConfig(PageFormat pf) {
 
     private final GraphicsDevice device;
     private final PageFormat pf;
+    private final AffineTransform deviceTransform;
 
     public CPrinterGraphicsConfig(PageFormat pf) {
+        this(pf, null);
+    }
+
+    CPrinterGraphicsConfig(PageFormat pf, AffineTransform deviceTransform) {
         this.device = new CPrinterDevice(this);
         this.pf = pf;
+        this.deviceTransform = deviceTransform;
     }
 
     public PageFormat getPageFormat() {
@@ -178,7 +185,8 @@ public ColorModel getColorModel(int transparency) {
      */
     @Override
     public AffineTransform getDefaultTransform() {
-        return new AffineTransform();
+        return deviceTransform == null ?
+                new AffineTransform() : new AffineTransform(deviceTransform);
     }
 
     /**
@@ -224,6 +232,10 @@ public AffineTransform getNormalizingTransform() {
      */
     @Override
     public Rectangle getBounds() {
-        return new Rectangle(0, 0, (int)pf.getWidth(), (int)pf.getHeight());
+        Point2D.Double pt = new Point2D.Double(pf.getWidth(), pf.getHeight());
+        Point2D.Double transformedPt = new Point2D.Double();
+        getDefaultTransform().transform(pt, transformedPt);
+        return new Rectangle(0, 0,
+                (int)transformedPt.getX(), (int)transformedPt.getY());
     }
 }

src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJob.java

@@ -35,6 +35,7 @@
 import java.awt.GraphicsEnvironment;
 import java.awt.SecondaryLoop;
 import java.awt.Toolkit;
+import java.awt.geom.AffineTransform;
 import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 import java.awt.print.Pageable;
@@ -85,6 +86,9 @@ public final class CPrinterJob extends RasterPrinterJob {
     // future compatibility and the state keeping that it handles.
 
     private static String sShouldNotReachHere = "Should not reach here.";
+    private static final double USER_SPACE_DPI = 72.0;
+    private static final int DEFAULT_DOC_DPI_X = 300;
+    private static final int DEFAULT_DOC_DPI_Y = 300;
 
     private volatile SecondaryLoop printingLoop;
     private AtomicReference<Throwable> printErrorRef = new AtomicReference<>();
@@ -110,6 +114,9 @@ public final class CPrinterJob extends RasterPrinterJob {
     private final Object fNSPrintInfoLock = new Object();
     private final Object disposerReferent = new Object();
 
+    private double hRes = DEFAULT_DOC_DPI_X;
+    private double vRes = DEFAULT_DOC_DPI_Y;
+
     static {
         // AWT has to be initialized for the native code to function correctly.
         Toolkit.getDefaultToolkit();
@@ -461,8 +468,7 @@ public void print(PrintRequestAttributeSet attributes) throws PrinterException {
      */
     @Override
     protected double getXRes() {
-        // NOTE: This is not used in the CPrinterJob code path.
-        return 0;
+        return hRes;
     }
 
     /**
@@ -471,8 +477,31 @@ protected double getXRes() {
      */
     @Override
     protected double getYRes() {
-        // NOTE: This is not used in the CPrinterJob code path.
-        return 0;
+        return vRes;
+    }
+
+    @Override
+    protected void setXYRes(double x, double y) {
+        hRes = x;
+        vRes = y;
+    }
+
+    /**
+     * Returns the resolution in dots per inch across the width
+     * of the page. This method take into account the page orientation.
+     */
+    private double getXRes(PageFormat pageFormat) {
+        return pageFormat.getOrientation() == PageFormat.PORTRAIT ?
+                getXRes() : getYRes();
+    }
+
+    /**
+     * Returns the resolution in dots per inch across the height
+     * of the page. This method take into account the page orientation.
+     */
+    private double getYRes(PageFormat pageFormat) {
+        return pageFormat.getOrientation() == PageFormat.PORTRAIT ?
+                getYRes() : getXRes();
     }
 
     /**
@@ -817,7 +846,11 @@ private void printToPathGraphics(    final PeekGraphics graphics, // Always an a
         // This is called from the native side.
         Runnable r = new Runnable() { public void run() {
             try {
-                SurfaceData sd = CPrinterSurfaceData.createData(page, context); // Just stores page into an ivar
+                AffineTransform deviceTransform = new AffineTransform(
+                        getXRes(page) / USER_SPACE_DPI, 0, 0,
+                        getYRes(page) / USER_SPACE_DPI, 0, 0);
+                SurfaceData sd = CPrinterSurfaceData
+                        .createData(page, deviceTransform, context); // Just stores page into an ivar
                 if (defaultFont == null) {
                     defaultFont = new Font("Dialog", Font.PLAIN, 12);
                 }
@@ -873,6 +906,9 @@ private Object[] getPageformatPrintablePeekgraphics(final int pageIndex) {
                         Rectangle2D pageFormatArea =
                              getPageFormatArea(pageFormat);
                         initPrinterGraphics(peekGraphics, pageFormatArea);
+                        double scaleX = getXRes(pageFormat) / USER_SPACE_DPI;
+                        double scaleY = getYRes(pageFormat) / USER_SPACE_DPI;
+                        peekGraphics.scale(scaleX, scaleY);
 
                         // Do the assignment here!
                         ret[0] = pageFormat;

src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterSurfaceData.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
 package sun.lwawt.macosx;
 
 import java.awt.*;
+import java.awt.geom.AffineTransform;
 import java.awt.image.*;
 import java.awt.print.PageFormat;
 import java.nio.ByteBuffer;
@@ -40,8 +41,8 @@ public final class CPrinterSurfaceData extends OSXSurfaceData{
 //    public static final SurfaceType IntArgbPQ = SurfaceType.IntArgb.deriveSubType(DESC_INT_ARGB_PQ);
     public static final SurfaceType IntRgbPQ = SurfaceType.IntRgb.deriveSubType(DESC_INT_RGB_PQ);
 
-    static SurfaceData createData(PageFormat pf, long context) {
-        return new CPrinterSurfaceData(CPrinterGraphicsConfig.getConfig(pf), context);
+    static SurfaceData createData(PageFormat pf, AffineTransform deviceTransform, long context) {
+        return new CPrinterSurfaceData(new CPrinterGraphicsConfig(pf, deviceTransform), context);
     }
 
     private CPrinterSurfaceData(GraphicsConfiguration gc, long context) {

src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterView.m

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -86,6 +86,8 @@ - (void)drawRect:(NSRect)aRect
     GET_CPRINTERJOB_CLASS();
     DECLARE_METHOD(jm_printToPathGraphics, sjc_CPrinterJob, "printToPathGraphics",
                    "(Lsun/print/PeekGraphics;Ljava/awt/print/PrinterJob;Ljava/awt/print/Printable;Ljava/awt/print/PageFormat;IJ)V");
+    DECLARE_METHOD(jm_getXRes, sjc_CPrinterJob, "getXRes", "(Ljava/awt/print/PageFormat;)D");
+    DECLARE_METHOD(jm_getYRes, sjc_CPrinterJob, "getYRes", "(Ljava/awt/print/PageFormat;)D");
 
     // Create and draw into a new CPrinterGraphics with the current Context.
     assert(fCurPageFormat != NULL);
@@ -103,6 +105,21 @@ - (void)drawRect:(NSRect)aRect
 
     jlong context = ptr_to_jlong([printLoop context]);
     CGContextRef cgRef = (CGContextRef)[[printLoop context] graphicsPort];
+
+    // Scale from the java document DPI to the user space DPI
+    jdouble hRes = (*env)->CallDoubleMethod(env, fPrinterJob, jm_getXRes, fCurPageFormat);
+    CHECK_EXCEPTION();
+    jdouble vRes = (*env)->CallDoubleMethod(env, fPrinterJob, jm_getYRes, fCurPageFormat);
+    CHECK_EXCEPTION();
+    if (hRes > 0 && vRes > 0) {
+        double defaultDeviceDPI = 72;
+        double scaleX = defaultDeviceDPI / hRes;
+        double scaleY = defaultDeviceDPI / vRes;
+        if (scaleX != 1 || scaleY != 1) {
+            CGContextScaleCTM(cgRef, scaleX, scaleY);
+        }
+    }
+
     CGContextSaveGState(cgRef); //04/28/2004: state needs to be saved here due to addition of lazy state management
 
     (*env)->CallVoidMethod(env, fPrinterJob, jm_printToPathGraphics, fCurPeekGraphics, fPrinterJob,