OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GdkGraphics.java (drawString): Pass font name, not XLFD, to native drawString. 

2003-08-22  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* gnu/java/awt/peer/gtk/GdkGraphics.java (drawString): Pass font
	name, not XLFD, to native drawString.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c (drawString):
	Replace XLFD-based implementation with Pango-based
	implementation.

From-SVN: r70698
This commit is contained in:
Thomas Fitzsimmons 2003-08-22 20:33:50 +00:00 committed by Thomas Fitzsimmons
parent 376de22592
commit 50fe737a03
4 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libjava/ChangeLog
View File

@ -1,3 +1,11 @@
2003-08-22 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics.java (drawString): Pass font
name, not XLFD, to native drawString.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c (drawString):
Replace XLFD-based implementation with Pango-based
implementation.
2003-08-22 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GtkWindowPeer.java: Remove

3
libjava/gnu/java/awt/peer/gtk/GdkGraphics.java
View File

@ -215,8 +215,7 @@ public class GdkGraphics extends Graphics
native void drawString (String str, int x, int y, String fname, int size);
public void drawString (String str, int x, int y)
{
drawString (str, x, y,
((GtkFontPeer)font.getPeer ()).getXLFD (), font.getSize ());
drawString (str, x, y, font.getName(), font.getSize());
}
public void drawString (AttributedCharacterIterator ci, int x, int y)

33
libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c
View File

@ -191,27 +191,40 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawString
jstring fname, jint size)
{
struct graphics *g;
const char *cfname, *cstr;
gchar *xlfd;
const char *cstr;
const char *font_name;
PangoFontDescription *font_desc;
PangoContext *context;
PangoLayout *layout;
g = (struct graphics *) NSA_GET_PTR (env, obj);
cfname = (*env)->GetStringUTFChars (env, fname, NULL);
xlfd = g_strdup_printf (cfname, (size * 10));
(*env)->ReleaseStringUTFChars (env, fname, cfname);
cstr = (*env)->GetStringUTFChars (env, str, NULL);
font_name = (*env)->GetStringUTFChars (env, fname, NULL);
gdk_threads_enter ();
gdk_draw_string (g->drawable, gdk_font_load (xlfd), g->gc,
x + g->x_offset, y + g->y_offset, cstr);
font_desc = pango_font_description_from_string (font_name);
pango_font_description_set_size (font_desc, size * PANGO_SCALE);
context = gdk_pango_context_get();
pango_context_set_font_description (context, font_desc);
layout = pango_layout_new (context);
pango_layout_set_text (layout, cstr, -1);
gdk_draw_layout (g->drawable, g->gc,
x + g->x_offset, y + g->y_offset, layout);
pango_font_description_free (font_desc);
gdk_threads_leave ();
(*env)->ReleaseStringUTFChars (env, fname, font_name);
(*env)->ReleaseStringUTFChars (env, str, cstr);
g_free (xlfd);
}
JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawLine
(JNIEnv *env, jobject obj, jint x, jint y, jint x2, jint y2)
{

2
libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c
View File

@ -43,7 +43,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCanvasPeer_create
(JNIEnv *env, jobject obj)
{
gpointer widget;
gdk_threads_enter ();
widget = gtk_type_new (gtk_drawing_area_get_type ());
gdk_threads_leave ();