CVSROOT: /cvsroot/classpath Module name: classpath Changes by: Francis Kung <fkung> 07/04/02 19:39:27
Modified files: native/jni/gtk-peer: gnu_java_awt_peer_gtk_GdkFontPeer.c gdkfont.h gnu_java_awt_peer_gtk_FreetypeGlyphVector.c gnu_java_awt_peer_gtk_CairoGraphics2D.c include : gnu_java_awt_peer_gtk_CairoGraphics2D.h gnu_java_awt_peer_gtk_FreetypeGlyphVector.h gnu/java/awt/peer/gtk: FreetypeGlyphVector.java ComponentGraphics.java CairoGraphics2D.java . : ChangeLog Log message: 2007-04-02 Francis Kung <[EMAIL PROTECTED]> * gnu/java/awt/peer/gtk/CairoGraphics2D.java (cairoDrawGlyphVector): Added parameter. (drawGlyphVector): Retrieve and pass fontset parameter. * gnu/java/awt/peer/gtk/ComponentGraphics.java (cairoDrawGlyphVector): Added parameter. (lock): Removed unnecessary cast. (unlock): Removed unnecessary cast and explicitly set to ONE variable. * gnu/java/awt/peer/gtk/FreetypeGlyphVector.java (fontSet): New field. (dispose): New native method. (finalize): New method. (getGlyphFonts): New method. (getGlyphOutline): Pass fontSet parameter to native method. (getGlyphOutlineNative): Added parameter. (getGlyphs): Pass extra parameters to native method. (getGlyphsNative): Added parameters. (getKerning): Added fontSet parameter. (getMetricsNative): Added fontSet parameter. (performDefaultLayout): Only check kerning if glyphs use the same font. (setupGlyphMetrics): Pass extra parameters to native methods. * include/gnu_java_awt_peer_gtk_CairoGraphics2D.h, * include/gnu_java_awt_peer_gtk_FreetypGlyphVector.h: Regenerated. * native/jni/gtk-peer/gdkfont.h: Enable pango engine. (peerfont): Add variable for fontset. * native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c (Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoDrawGlyphVector): Accept array of font pointers to use when drawing glyphs. * native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c (getFontSet): New function. (Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_dispose): New function. (Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getGlyphOutlineNative): Added and use new fontSet parameter. (Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getGlyphs): Use pango to retrieve glyphs and estimate font, if the current font does not contain a requested glyph. (Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getKerning): Added and use new fontSet parameter. (Java_gnu_java_awt_peer_gtk_FreetypeGlyphVector_getMetricsNative): Added and use new fontSet parameter. * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c (Java_gnu_java_awt_peer_gtk_GdkFontPeer_dispose): Free fontset. (Java_gnu_java_awt_peer_gtk_GdkFontPeer_setFont): Load fontset. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c?cvsroot=classpath&r1=1.22&r2=1.23 http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gdkfont.h?cvsroot=classpath&r1=1.10&r2=1.11 http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c?cvsroot=classpath&r1=1.4&r2=1.5 http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c?cvsroot=classpath&r1=1.21&r2=1.22 http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h?cvsroot=classpath&r1=1.17&r2=1.18 http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h?cvsroot=classpath&r1=1.2&r2=1.3 http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java?cvsroot=classpath&r1=1.16&r2=1.17 http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java?cvsroot=classpath&r1=1.25&r2=1.26 http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java?cvsroot=classpath&r1=1.67&r2=1.68 http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.9192&r2=1.9193