stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8208595: [parfait] Better X11 font support

Browse Source 
Reviewed-by: serb, psadhukhan
This commit is contained in:
Phil Race 2018-10-04 11:07:30 -07:00
parent 9b0d241a16
commit c33f1a61de
1 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/java.desktop/unix/native/libfontmanager/X11FontScaler.c
View File

@ -66,6 +66,9 @@ Java_sun_font_NativeStrike_createNullScalerContext
NativeScalerContext *context = NativeScalerContext *context =
(NativeScalerContext*)malloc(sizeof(NativeScalerContext)); (NativeScalerContext*)malloc(sizeof(NativeScalerContext));
if (context == NULL) {
return (jlong)(uintptr_t)0L;
}
context->xFont = NULL; context->xFont = NULL;
context->minGlyph = 0; context->minGlyph = 0;
context->maxGlyph = 0; context->maxGlyph = 0;
@ -92,6 +95,10 @@ Java_sun_font_NativeStrike_createScalerContext
(*env)->GetByteArrayRegion(env, xlfdBytes, 0, len, (jbyte*)xlfd); (*env)->GetByteArrayRegion(env, xlfdBytes, 0, len, (jbyte*)xlfd);
xlfd[len] = '\0'; xlfd[len] = '\0';
context = (NativeScalerContext*)malloc(sizeof(NativeScalerContext)); context = (NativeScalerContext*)malloc(sizeof(NativeScalerContext));
if (context == NULL) {
free(xlfd);
return (jlong)(uintptr_t)0L;
}
AWTLoadFont (xlfd, &(context->xFont)); AWTLoadFont (xlfd, &(context->xFont));
free(xlfd); free(xlfd);
@ -232,10 +239,15 @@ JNIEXPORT jfloat JNICALL
Java_sun_font_NativeFont_getGlyphAdvance Java_sun_font_NativeFont_getGlyphAdvance
(JNIEnv *env, jobject font2D, jlong pScalerContext, jint glyphCode) { (JNIEnv *env, jobject font2D, jlong pScalerContext, jint glyphCode) {
NativeScalerContext *context = (NativeScalerContext*)pScalerContext;
AWTFont xFont = (AWTFont)context->xFont;
AWTChar xcs = NULL; AWTChar xcs = NULL;
jfloat advance = 0.0f; jfloat advance = 0.0f;
AWTFont xFont;
NativeScalerContext *context = (NativeScalerContext*)pScalerContext;
if (context == NULL) {
return advance;
} else {
xFont = (AWTFont)context->xFont;
}
if (xFont == NULL || context->ptSize == NO_POINTSIZE) { if (xFont == NULL || context->ptSize == NO_POINTSIZE) {
return advance; return advance;
@ -271,9 +283,14 @@ JNIEXPORT jlong JNICALL
Java_sun_font_NativeFont_getGlyphImageNoDefault Java_sun_font_NativeFont_getGlyphImageNoDefault
(JNIEnv *env, jobject font2D, jlong pScalerContext, jint glyphCode) { (JNIEnv *env, jobject font2D, jlong pScalerContext, jint glyphCode) {
NativeScalerContext *context = (NativeScalerContext*)pScalerContext;
AWTFont xFont = context->xFont;
AWTChar2b xChar; AWTChar2b xChar;
AWTFont xFont;
NativeScalerContext *context = (NativeScalerContext*)pScalerContext;
if (context == NULL) {
return (jlong)0;
} else {
xFont = (AWTFont)context->xFont;
}
if (xFont == NULL || context->ptSize == NO_POINTSIZE) { if (xFont == NULL || context->ptSize == NO_POINTSIZE) {
return (jlong)0; return (jlong)0;
@ -292,9 +309,14 @@ JNIEXPORT jlong JNICALL
Java_sun_font_NativeFont_getGlyphImage Java_sun_font_NativeFont_getGlyphImage
(JNIEnv *env, jobject font2D, jlong pScalerContext, jint glyphCode) { (JNIEnv *env, jobject font2D, jlong pScalerContext, jint glyphCode) {
NativeScalerContext *context = (NativeScalerContext*)pScalerContext;
AWTFont xFont = context->xFont;
AWTChar2b xChar; AWTChar2b xChar;
AWTFont xFont;
NativeScalerContext *context = (NativeScalerContext*)pScalerContext;
if (context == NULL) {
return (jlong)0;
} else {
xFont = (AWTFont)context->xFont;
}
if (xFont == NULL || context->ptSize == NO_POINTSIZE) { if (xFont == NULL || context->ptSize == NO_POINTSIZE) {
return (jlong)0; return (jlong)0;
@ -313,10 +335,15 @@ JNIEXPORT jobject JNICALL
Java_sun_font_NativeFont_getFontMetrics Java_sun_font_NativeFont_getFontMetrics
(JNIEnv *env, jobject font2D, jlong pScalerContext) { (JNIEnv *env, jobject font2D, jlong pScalerContext) {
NativeScalerContext *context = (NativeScalerContext*)pScalerContext;
AWTFont xFont = (AWTFont)context->xFont;
jfloat j0=0, j1=1, ay=j0, dy=j0, mx=j0; jfloat j0=0, j1=1, ay=j0, dy=j0, mx=j0;
jobject metrics; jobject metrics;
AWTFont xFont;
NativeScalerContext *context = (NativeScalerContext*)pScalerContext;
if (context == NULL) {
return NULL;
} else {
xFont = (AWTFont)context->xFont;
}
if (xFont == NULL) { if (xFont == NULL) {
return NULL; return NULL;