8351878: RichTextArea: copy/paste issues

Reviewed-by: lkostyra, zelmidaoui

Author: Andy Goryachev

modules/jfx.incubator.richtext/src/main/java/com/sun/jfx/incubator/scene/control/richtext/HtmlStyledOutput.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 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
@@ -73,16 +73,21 @@ public void consume(StyledSegment seg) throws IOException {
             break;
         case TEXT:
             StyleAttributeMap a = seg.getStyleAttributeMap(resolver);
-            boolean div = ((a != null) && (!a.isEmpty()));
-            if (div) {
+            String styles;
+            if ((a != null) && (!a.isEmpty())) {
+                styles = extractStyles(a);
+            } else {
+                styles = null;
+            }
+            if (styles != null) {
                 wr.write("<span style='");
-                writeAttributes(a);
+                wr.write(styles);
                 wr.write("'>");
             }
             String text = seg.getText();
             String encoded = encode(text);
             wr.write(encoded);
-            if (div) {
+            if (styles != null) {
                 wr.write("</span>");
             }
             break;
@@ -93,28 +98,35 @@ public void consume(StyledSegment seg) throws IOException {
         }
     }
 
-    private void writeAttributes(StyleAttributeMap attrs) throws IOException {
+    private String extractStyles(StyleAttributeMap attrs) {
+        StringBuilder sb = new StringBuilder();
         boolean sp = false;
         for (StyleAttribute a : attrs.getAttributes()) {
             Object v = attrs.get(a);
             if (v != null) {
                 Key k = createKey(attrs, a, v);
                 if (k != null) {
                     if (sp) {
-                        wr.write(' ');
+                        sb.append(' ');
                     } else {
                         sp = true;
                     }
 
                     Val val = styles.get(k);
-                    if (inlineStyles) {
-                        wr.write(val.css);
-                    } else {
-                        wr.write(val.name);
+                    if (val != null) {
+                        if (inlineStyles) {
+                            sb.append(val.css);
+                        } else {
+                            sb.append(val.name);
+                        }
                     }
                 }
             }
         }
+        if (sb.length() == 0) {
+            return null;
+        }
+        return sb.toString();
     }
 
     /**
@@ -310,21 +322,21 @@ public void close() throws IOException {
 
     private static String createCss(StyleAttribute a, Object v) {
         if (a == StyleAttributeMap.BOLD) {
-            return "font-weight: bold;";
+            return Boolean.TRUE.equals(v) ? "font-weight: bold;" : null;
         } else if (a == StyleAttributeMap.FONT_FAMILY) {
             return "font-family: \"" + encodeFontFamily(v.toString()) + "\";";
         } else if (a == StyleAttributeMap.FONT_SIZE) {
-            return "font-size: " + v + "pt;";
+            return "font-size: " + v + "px;";
         } else if (a == StyleAttributeMap.ITALIC) {
-            return "font-style: italic;";
-        } else if (a == StyleAttributeMap.STRIKE_THROUGH) {
+            return Boolean.TRUE.equals(v) ? "font-style: italic;" : null;
+        } else if (a == StyleAttributeMap.STRIKE_THROUGH && Boolean.TRUE.equals(v)) {
             return "text-decoration: line-through;";
         } else if (a == StyleAttributeMap.TEXT_COLOR) {
             return "color: " + RichUtils.toWebColor((Color)v) + ";";
         } else if (a == StyleAttributeMap.UNDERLINE) {
-            return "text-decoration: underline;";
+            return Boolean.TRUE.equals(v) ? "text-decoration: underline;" : null;
         } else if (a == SS_AND_UNDERLINE) {
-            return "text-decoration: line-through underline;";
+            return Boolean.TRUE.equals(v) ? "text-decoration: line-through underline;" : null;
         } else {
             return null;
         }

modules/jfx.incubator.richtext/src/main/java/com/sun/jfx/incubator/scene/control/richtext/RichTextAreaBehavior.java

@@ -1230,6 +1230,7 @@ protected void copyWithCut(boolean cut) {
                         }
                     }
                 } catch(Exception | OutOfMemoryError e) {
+                    e.printStackTrace();
                     control.errorFeedback();
                 }
             }

modules/jfx.incubator.richtext/src/main/java/com/sun/jfx/incubator/scene/control/richtext/rtf/AttrSet.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 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
@@ -41,6 +41,7 @@ public class AttrSet {
     private AttrSet parent;
 
     public AttrSet(AttrSet a) {
+        addAttributes(a);
     }
 
     public AttrSet() {
@@ -84,13 +85,19 @@ public void setResolveParent(AttrSet parent) {
     }
 
     public StyleAttributeMap getStyleAttributeMap() {
-        return StyleAttributeMap.builder().
+        StyleAttributeMap.Builder b = StyleAttributeMap.builder();
+        b.
             setBold(getBoolean(StyleAttributeMap.BOLD)).
             setFontFamily(getString(StyleAttributeMap.FONT_FAMILY)).
             setItalic(getBoolean(StyleAttributeMap.ITALIC)).
+            setStrikeThrough(getBoolean(StyleAttributeMap.STRIKE_THROUGH)).
             setTextColor(getColor(StyleAttributeMap.TEXT_COLOR)).
-            setUnderline(getBoolean(StyleAttributeMap.UNDERLINE)).
-            build();
+            setUnderline(getBoolean(StyleAttributeMap.UNDERLINE));
+        Double d = getDouble(StyleAttributeMap.FONT_SIZE);
+        if (d != null) {
+            b.setFontSize(d);
+        }
+        return b.build();
     }
 
     private boolean getBoolean(Object attr) {
@@ -113,6 +120,14 @@ private Color getColor(Object attr) {
         return null;
     }
 
+    private Double getDouble(Object attr) {
+        Object v = attrs.get(attr);
+        if (v instanceof Number n) {
+            return n.doubleValue();
+        }
+        return null;
+    }
+
     public void setItalic(boolean on) {
         attrs.put(StyleAttributeMap.ITALIC, on);
     }

modules/jfx.incubator.richtext/src/main/java/com/sun/jfx/incubator/scene/control/richtext/rtf/RTFParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -27,6 +27,10 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CoderResult;
 
 /**
  * <b>RTFParser</b> is a subclass of <b>AbstractFilter</b> which understands basic RTF syntax
@@ -60,6 +64,12 @@ abstract class RTFParser extends AbstractFilter {
     private final int S_aftertickc = 5; // after reading \'x
     private final int S_inblob = 6; // in a \bin blob
 
+    // For fcharset control word
+    protected CharsetDecoder decoder;
+    protected final ByteBuffer decoderBB = ByteBuffer.wrap(new byte[2]);
+    private final char[] decoderCA = new char[1];
+    private final CharBuffer decoderCB = CharBuffer.wrap(decoderCA);
+
     /** Implemented by subclasses to interpret a parameter-less RTF keyword.
      *  The keyword is passed without the leading '/' or any delimiting
      *  whitespace. */
@@ -98,13 +108,19 @@ public void handleText(char ch) {
         rtfSpecialsTable['\\'] = true;
     }
 
+    // Defined for replacement character
+    private static final char REPLACEMENT_CHAR = '\uFFFD';
+
     public RTFParser() {
         currentCharacters = new StringBuffer();
         state = S_text;
         pendingKeyword = null;
         level = 0;
 
         specialsTable = rtfSpecialsTable;
+        // Initialize byte buffer for CharsetDecoder
+        decoderBB.clear();
+        decoderBB.limit(1);
     }
 
     @Override
@@ -169,6 +185,9 @@ public void write(char ch) throws IOException {
                 }
                 state = S_backslashed;
             } else {
+                // SBCS: ASCII character
+                // DBCS: Non lead byte
+                ch = decode(ch);
                 currentCharacters.append(ch);
             }
             break;
@@ -286,7 +305,8 @@ public void write(char ch) throws IOException {
             state = S_text;
             if (Character.digit(ch, 16) != -1) {
                 pendingCharacter = pendingCharacter * 16 + Character.digit(ch, 16);
-                ch = translationTable[pendingCharacter];
+                // Use translationTable if decoder is not defined
+                ch = decoder == null ? translationTable[pendingCharacter] : decode((char)pendingCharacter);
                 if (ch != 0) {
                     handleText(ch);
                 }
@@ -343,4 +363,33 @@ public void close() throws IOException {
 
         super.close();
     }
+
+    private char decode(char ch) {
+        if (decoder == null) return ch;
+        decoderBB.put((byte) ch);
+        decoderBB.rewind();
+        decoderCB.clear();
+        CoderResult cr = decoder.decode(decoderBB, decoderCB, false);
+        if (cr.isUnderflow()) {
+            if (decoderCB.position() == 1) {
+                // Converted to Unicode (including replacement character)
+                decoder.reset();
+                decoderBB.clear();
+                decoderBB.limit(1);
+                return decoderCA[0];
+            } else {
+                // Detected lead byte
+                decoder.reset();
+                decoderBB.limit(2);
+                decoderBB.position(1);
+                return 0; // Skip write operation if return value is 0
+            }
+        } else {
+            // Fallback, should not be called
+            decoder.reset();
+            decoderBB.clear();
+            decoderBB.limit(1);
+            return REPLACEMENT_CHAR;
+        }
+    }
 }