8341438: TextFlow: incorrect caretShape(), hitTest(), rangeShape() with non-empty padding/border

modules/javafx.graphics/src/main/java/com/sun/javafx/scene/text/TextLayout.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -25,12 +25,10 @@
 
 package com.sun.javafx.scene.text;
 
-import javafx.scene.shape.PathElement;
+import java.util.Objects;
 import com.sun.javafx.geom.BaseBounds;
 import com.sun.javafx.geom.Shape;
 
-import java.util.Objects;
-
 public interface TextLayout {
 
     /* Internal flags Flags */
@@ -79,6 +77,12 @@ public interface TextLayout {
 
     public static final int DEFAULT_TAB_SIZE = 8;
 
+    /** Callback to be called for each rectangular shape */
+    @FunctionalInterface
+    public static interface GeometryCallback {
+        public void addRectangle(float left, float top, float right, float bottom);
+    }
+
     public static class Hit {
         int charIndex;
         int insertionIndex;
@@ -233,8 +237,46 @@ public String toString() {
      */
     public Hit getHitInfo(float x, float y);
 
-    public PathElement[] getCaretShape(int offset, boolean isLeading,
-                                       float x, float y);
-    public PathElement[] getRange(int start, int end, int type,
-                                  float x, float y);
+    /**
+     * Queries the caret geometry and associated information at the specified text position.
+     *
+     * @param offset the character offset
+     * @param leading whether the caret is biased on the leading edge of the character
+     * @return the caret geometry
+     */
+    public CaretGeometry getCaretGeometry(int offset, boolean leading);
+
+    /**
+     * Queries the range geometry of the range of text within the text layout for one of the three possible types:
+     * <ul>
+     * <li>{@link #TYPE_STRIKETHROUGH} - strike-through shape
+     * <li>{@link #TYPE_TEXT} - text selection shape
+     * <li>{@link #TYPE_UNDERLINE} - underline shape
+     * </ul>
+     *
+     * @param start the start offset
+     * @param end the end offset
+     * @param type the type of the geometry
+     * @param client the callback to invoke for each rectangular shape
+     */
+    public void getRange(int start, int end, int type, GeometryCallback client);
+
+    /**
+     * Encodes the caret geometry, which can be either a single vertical line,
+     * or two vertical lines (a "split" caret), represented by {@code Single}
+     * and {@code Split} classes respectively.
+     */
+    public sealed interface CaretGeometry {
+        /**
+         * Represents a single line from (x, y) to (x, y + height)
+         */
+        public record Single(float x, float y, float height) implements CaretGeometry {}
+
+        /**
+         * Represents a split caret drawn as two lines, the first line
+         * from (x1, y) to (x1, y + height/2),
+         * the second line from (x2, y + height/2) to (x2, y + height).
+         */
+        public record Split(float x1, float x2, float y, float height) implements CaretGeometry {}
+    }
 }

modules/javafx.graphics/src/main/java/com/sun/javafx/scene/text/TextLine.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -37,11 +37,11 @@ public interface TextLine {
     public GlyphList[] getRuns();
 
     /**
-     * Returns metrics information about the line as follow:
+     * Returns metrics information about the line as follows:
      *
      * bounds().getWidth() - the width of the line.
      * The width for the line is sum of all run's width in the line, it is not
-     * affect by any wrapping width but it will include any changes caused by
+     * affected by any wrapping width but it will include any changes caused by
      * justification.
      *
      * bounds().getHeight() - the height of the line.
@@ -73,7 +73,7 @@ public interface TextLine {
     public int getStart();
 
     /**
-     * Returns the line length in character.
+     * Returns the line length in characters.
      */
     public int getLength();
 }

modules/javafx.graphics/src/main/java/com/sun/javafx/text/PrismCaretInfo.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2024, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.sun.javafx.text;
+
+import java.util.Objects;
+import javafx.geometry.Rectangle2D;
+import javafx.scene.text.CaretInfo;
+
+/**
+ * CaretInfo as reported by the PrismTextLayout.
+ */
+public final class PrismCaretInfo extends CaretInfo {
+
+    private final Rectangle2D[] parts;
+
+    public PrismCaretInfo(Rectangle2D[] parts) {
+        this.parts = parts;
+    }
+
+    @Override
+    public int getSegmentCount() {
+        return parts.length;
+    }
+
+    @Override
+    public Rectangle2D getSegmentAt(int index) {
+        Objects.checkIndex(index, parts.length);
+        return parts[index];
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("[");
+        for (int i = 0; i < getSegmentCount(); i++) {
+            if (i > 0) {
+                sb.append(",");
+            }
+            sb.append(getSegmentAt(i));
+        }
+        sb.append("]");
+        return sb.toString();
+    }
+}

modules/javafx.graphics/src/main/java/com/sun/javafx/text/PrismLayoutInfo.java

@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.sun.javafx.text;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import javafx.geometry.Rectangle2D;
+import javafx.scene.text.CaretInfo;
+import javafx.scene.text.LayoutInfo;
+import javafx.scene.text.TextLineInfo;
+import com.sun.javafx.geom.BaseBounds;
+import com.sun.javafx.scene.text.TextLayout;
+import com.sun.javafx.scene.text.TextLine;
+
+/**
+ * Layout information as reported by PrismLayout.
+ */
+public abstract non-sealed class PrismLayoutInfo extends LayoutInfo {
+
+    protected abstract double lineSpacing();
+
+    protected abstract double dx();
+
+    protected abstract double dy();
+
+    private final TextLayout layout;
+
+    public PrismLayoutInfo(TextLayout layout) {
+        this.layout = layout;
+    }
+
+    @Override
+    public Rectangle2D getLogicalBounds(boolean includeLineSpacing) {
+        BaseBounds b = layout.getBounds();
+        double dx = dx();
+        double dy = dy();
+        double sp = includeLineSpacing ? lineSpacing() : 0.0;
+        return TextUtils.toRectangle2D(b, dx, dy, sp);
+    }
+
+    @Override
+    public int getTextLineCount() {
+        return layout.getLines().length;
+    }
+
+    @Override
+    public List<TextLineInfo> getTextLines(boolean includeLineSpacing) {
+        TextLine[] lines = layout.getLines();
+        double dx = dx();
+        double dy = dy();
+        double sp = includeLineSpacing ? lineSpacing() : 0.0;
+        int sz = lines.length;
+
+        ArrayList<TextLineInfo> rv = new ArrayList<>(sz);
+        for (int i = 0; i < sz; i++) {
+            rv.add(TextUtils.toLineInfo(lines[i], dx, dy, sp));
+        }
+        return Collections.unmodifiableList(rv);
+    }
+
+    @Override
+    public TextLineInfo getTextLine(int index, boolean includeLineSpacing) {
+        TextLine[] lines = layout.getLines();
+        Objects.checkIndex(index, lines.length);
+        double dx = dx();
+        double dy = dy();
+        double sp = includeLineSpacing ? lineSpacing() : 0.0;
+        return TextUtils.toLineInfo(lines[index], dx, dy, sp);
+    }
+
+    @Override
+    public List<Rectangle2D> getSelectionGeometry(int start, int end, boolean includeLineSpacing) {
+        double sp = includeLineSpacing ? lineSpacing() : 0.0;
+        return getGeometry(start, end, TextLayout.TYPE_TEXT, sp);
+    }
+
+    @Override
+    public List<Rectangle2D> getStrikeThroughGeometry(int start, int end) {
+        return getGeometry(start, end, TextLayout.TYPE_STRIKETHROUGH, 0.0);
+    }
+
+    @Override
+    public List<Rectangle2D> getUnderlineGeometry(int start, int end) {
+        return getGeometry(start, end, TextLayout.TYPE_UNDERLINE, 0.0);
+    }
+
+    private List<Rectangle2D> getGeometry(int start, int end, int type, double lineSpacing) {
+        double dx = dx();
+        double dy = dy();
+
+        ArrayList<Rectangle2D> rv = new ArrayList<>();
+        layout.getRange(start, end, type, (left, top, right, bottom) -> {
+            if (left < right) {
+                rv.add(new Rectangle2D(left + dx, top + dy, right - left, bottom - top + lineSpacing));
+            } else {
+                rv.add(new Rectangle2D(right + dx, top + dy, left - right, bottom - top + lineSpacing));
+            }
+        });
+        return Collections.unmodifiableList(rv);
+    }
+
+    @Override
+    public CaretInfo caretInfoAt(int charIndex, boolean leading) {
+        TextLayout.CaretGeometry g = layout.getCaretGeometry(charIndex, leading);
+        double dx = dx();
+        double dy = dy();
+        Rectangle2D[] parts = TextUtils.getCaretRectangles(g, dx, dy);
+        return new PrismCaretInfo(parts);
+    }
+}