infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-16 05:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

8015556: [macosx] surrogate pairs do not render properly

Browse Source 
Reviewed-by: bae, jchen
This commit is contained in:
Phil Race 2013-05-31 09:25:37 -07:00
parent 3c4b82e2bb
commit 2cbcc2b315
2 changed files with 208 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

148
jdk/src/macosx/classes/sun/font/CCharToGlyphMapper.java
View File

@ -130,7 +130,17 @@ public class CCharToGlyphMapper extends CharToGlyphMapper {
}
public synchronized int charToGlyph(int unicode) {
return charToGlyph((char)unicode);
if (unicode >= 0x10000) {
int[] glyphs = new int[2];
char[] surrogates = new char[2];
int base = unicode - 0x10000;
surrogates[0] = (char)((base >>> 10) + HI_SURROGATE_START);
surrogates[1] = (char)((base % 0x400) + LO_SURROGATE_START);
charsToGlyphs(2, surrogates, glyphs);
return glyphs[0];
} else {
return charToGlyph((char)unicode);
}
}
public synchronized void charsToGlyphs(int count, char[] unicodes, int[] glyphs) {
@ -138,9 +148,9 @@ public class CCharToGlyphMapper extends CharToGlyphMapper {
}
public synchronized void charsToGlyphs(int count, int[] unicodes, int[] glyphs) {
final char[] unicodeChars = new char[count];
for (int i = 0; i < count; i++) unicodeChars[i] = (char)unicodes[i];
cache.get(count, unicodeChars, glyphs);
for (int i = 0; i < count; i++) {
glyphs[i] = charToGlyph(unicodes[i]);
};
}
// This mapper returns either the glyph code, or if the character can be
@ -166,7 +176,7 @@ public class CCharToGlyphMapper extends CharToGlyphMapper {
firstLayerCache[1] = 1;
}
public int get(final char index) {
public synchronized int get(final int index) {
if (index < FIRST_LAYER_SIZE) {
// catch common glyphcodes
return firstLayerCache[index];
@ -179,12 +189,12 @@ public class CCharToGlyphMapper extends CharToGlyphMapper {
}
if (generalCache == null) return 0;
final Integer value = generalCache.get(new Integer(index));
final Integer value = generalCache.get(index);
if (value == null) return 0;
return value.intValue();
}
public void put(final char index, final int value) {
public synchronized void put(final int index, final int value) {
if (index < FIRST_LAYER_SIZE) {
// catch common glyphcodes
firstLayerCache[index] = value;
@ -204,7 +214,7 @@ public class CCharToGlyphMapper extends CharToGlyphMapper {
generalCache = new HashMap<Integer, Integer>();
}
generalCache.put(new Integer(index), new Integer(value));
generalCache.put(index, value);
}
private class SparseBitShiftingTwoLayerArray {
@ -220,14 +230,14 @@ public class CCharToGlyphMapper extends CharToGlyphMapper {
this.secondLayerLength = size >> shift;
}
public int get(final char index) {
public int get(final int index) {
final int firstIndex = index >> shift;
final int[] firstLayerRow = cache[firstIndex];
if (firstLayerRow == null) return 0;
return firstLayerRow[index - (firstIndex * (1 << shift))];
}
public void put(final char index, final int value) {
public void put(final int index, final int value) {
final int firstIndex = index >> shift;
int[] firstLayerRow = cache[firstIndex];
if (firstLayerRow == null) {
@ -237,77 +247,81 @@ public class CCharToGlyphMapper extends CharToGlyphMapper {
}
}
public void get(int count, char[] indicies, int[] values){
public synchronized void get(int count, char[] indicies, int[] values)
{
// "missed" is the count of 'char' that are not mapped.
// Surrogates count for 2.
// unmappedChars is the unique list of these chars.
// unmappedCharIndices is the location in the original array
int missed = 0;
for(int i = 0; i < count; i++){
char code = indicies[i];
char[] unmappedChars = null;
int [] unmappedCharIndices = null;
for (int i = 0; i < count; i++){
int code = indicies[i];
if (code >= HI_SURROGATE_START &&
code <= HI_SURROGATE_END && i < count - 1)
{
char low = indicies[i + 1];
if (low >= LO_SURROGATE_START && low <= LO_SURROGATE_END) {
code = (code - HI_SURROGATE_START) * 0x400 +
low - LO_SURROGATE_START + 0x10000;
}
}
final int value = get(code);
if(value != 0){
if (value != 0 && value != -1) {
values[i] = value;
}else{
// zero this element out, because the caller does not
// promise to keep it clean
if (code >= 0x10000) {
values[i+1] = INVISIBLE_GLYPH_ID;
i++;
}
} else {
values[i] = 0;
put(code, -1);
if (unmappedChars == null) {
// This is likely to be longer than we need,
// but is the simplest and cheapest option.
unmappedChars = new char[indicies.length];
unmappedCharIndices = new int[indicies.length];
}
unmappedChars[missed] = indicies[i];
unmappedCharIndices[missed] = i;
if (code >= 0x10000) { // was a surrogate pair
unmappedChars[++missed] = indicies[++i];
}
missed++;
}
}
if (missed == 0) return; // horray! everything is already cached!
final char[] filteredCodes = new char[missed]; // all index codes requested (partially filled)
final int[] filteredIndicies = new int[missed]; // local indicies into filteredCodes array (totally filled)
// scan, mark, and store the index codes again to send into native
int j = 0;
int dupes = 0;
for (int i = 0; i < count; i++){
if (values[i] != 0L) continue; // already filled
final char code = indicies[i];
// we have already promised to fill this code - this is a dupe
if (get(code) == -1){
filteredIndicies[j] = -1;
dupes++;
j++;
continue;
}
// this is a code we have not obtained before
// mark this one as "promise to get" in the global cache with a -1
final int k = j - dupes;
filteredCodes[k] = code;
put(code, -1);
filteredIndicies[j] = k;
j++;
if (missed == 0) {
return;
}
final int filteredRunLen = j - dupes;
final int[] filteredValues = new int[filteredRunLen];
final int[] glyphCodes = new int[missed];
// bulk call to fill in the distinct values
nativeCharsToGlyphs(fFont.getNativeFontPtr(), filteredRunLen, filteredCodes, filteredValues);
// bulk call to fill in the unmapped code points.
nativeCharsToGlyphs(fFont.getNativeFontPtr(),
missed, unmappedChars, glyphCodes);
// scan the requested list, and fill in values from our
// distinct code list which has been filled from "getDistinct"
j = 0;
for (int i = 0; i < count; i++){
if (values[i] != 0L && values[i] != -1L) continue; // already placed
final int k = filteredIndicies[j]; // index into filteredImages array
final char code = indicies[i];
if(k == -1L){
// we should have already filled the cache with this value
values[i] = get(code);
}else{
// fill the particular code request, and store in the cache
final int ptr = filteredValues[k];
values[i] = ptr;
put(code, ptr);
for (int m = 0; m < missed; m++){
int i = unmappedCharIndices[m];
int code = unmappedChars[m];
if (code >= HI_SURROGATE_START &&
code <= HI_SURROGATE_END && m < missed - 1)
{
char low = indicies[m + 1];
if (low >= LO_SURROGATE_START && low <= LO_SURROGATE_END) {
code = (code - HI_SURROGATE_START) * 0x400 +
low - LO_SURROGATE_START + 0x10000;
}
}
values[i] = glyphCodes[m];
put(code, values[i]);
if (code >= 0x10000) {
m++;
values[i + 1] = INVISIBLE_GLYPH_ID;
}
j++;
}
}
}

127
jdk/test/java/awt/FontClass/SurrogateTest/SuppCharTest.java Normal file
View File

@ -0,0 +1,127 @@
/*
* Copyright (c) 2013, 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.
*
* 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.
*/
/*
* @test
* @bug 8015556
* @summary Surrogate pairs do not render properly on MacOS X.
*/
import java.util.Locale;
import java.awt.*;
import java.awt.font.*;
import javax.swing.*;
public class SuppCharTest {
static String str = "ABC\uD840\uDC01\uD840\uDC00AB";
static String EXTB_FONT = "MingLiU-ExtB";
public static void main(String args[]) throws Exception {
final Font font = new Font(EXTB_FONT, Font.PLAIN, 36);
if (!EXTB_FONT.equalsIgnoreCase(font.getFamily(Locale.ENGLISH))) {
return;
}
SwingUtilities.invokeLater(new Runnable(){
@Override
public void run(){
JFrame f = new JFrame("Test Supplementary Char Support");
Component c = new SuppCharComp(font, str);
f.add("Center", c);
JButton b = new JButton(str);
b.setFont(font);
f.add("South", b);
f.pack();
f.setVisible(true);
}
});
/* If a supplementary character was found, 'invisible glyphs'
* with value 65535 will be inserted in the place of the 2nd (low)
* char index. So we are looking here to make sure such substitutions
* took place.
*/
FontRenderContext frc = new FontRenderContext(null, false, false);
GlyphVector gv = font.createGlyphVector(frc, str);
int numGlyphs = gv.getNumGlyphs();
int[] codes = gv.getGlyphCodes(0, numGlyphs, null);
boolean foundInvisibleGlyph = false;
for (int i=0; i<numGlyphs;i++) {
if (codes[i] == 65535) {
foundInvisibleGlyph = true;
break;
}
}
if (!foundInvisibleGlyph) {
throw new RuntimeException("No invisible glyphs");
}
if (font.canDisplayUpTo(str) != -1) {
throw new RuntimeException("Font can't display all chars");
}
}
}
class SuppCharComp extends Component {
static final int w=400, h=250;
public Dimension preferredSize() {
return new Dimension(w,h);
}
String str = null;
Font font = null;
public SuppCharComp(Font font, String str) {
this.font = font;
this.str = str;
}
public void paint(Graphics g) {
Graphics2D g2d = (Graphics2D)g.create();
g2d.setColor(Color.white);
g2d.fillRect(0,0,w,h);
g2d.setColor(Color.black);
int y = 0;
g2d.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS,
RenderingHints.VALUE_FRACTIONALMETRICS_ON);
g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,
RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
g2d.setFont(font);
g2d.drawString(str, 10, 50);
FontRenderContext frc = g2d.getFontRenderContext();
GlyphVector gv = font.createGlyphVector(frc, str);
g2d.drawGlyphVector(gv, 10, 100);
TextLayout tl = new TextLayout(str, font, frc);
tl.draw(g2d, 10, 150);
char[] ca = str.toCharArray();
g2d.drawChars(ca, 0, ca.length, 10, 200);
}
}