
2006-06-13 Thomas Fitzsimmons <fitzsim@redhat.com> * configure: Regenerate. * Makefile.in: Regenerate. * configure.ac (--enable-plugin): New option. (ac_configure_args): Add --enable-tool-wrappers. (ac_configure_args): Add --disable-plugin unless --enable-plugin was specified. * gcj/Makefile.in: Regenerate. * sources.am (gnu_java_net_source_files): Add classpath/gnu/java/net/IndexListParser.java. (property_files): Remove classpath/resource/gnu/classpath/tools/jarsigner/MessageBundle.properties, classpath/resource/gnu/classpath/tools/keytool/MessageBundle.properties. Add classpath/resource/gnu/classpath/tools/appletviewer/MessagesBundle.properties, classpath/resource/gnu/classpath/tools/appletviewer/MessagesBundle_de.properties, classpath/resource/gnu/classpath/tools/getopt/Messages.properties, classpath/resource/gnu/classpath/tools/jar/messages.properties, classpath/resource/gnu/classpath/tools/jarsigner/messages.properties, classpath/resource/gnu/classpath/tools/keytool/messages.properties, classpath/resource/gnu/classpath/tools/native2ascii/messages.properties, classpath/resource/gnu/classpath/tools/serialver/messages.properties. * classpath/Makefile.in: Regenerate. * classpath/native/jni/gtk-peer/cairographics2d.h, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c: Merge from GNU Classpath. * classpath/native/Makefile.in: Regenerate. * classpath/native/jawt/Makefile.in: Regenerate. * classpath/native/jawt/Makefile.am: Install libjawt.so in GCJ's versioned library directory. * classpath/native/Makefile.am: Add plugin directory if --enable-plugin was specified. * classpath/native/plugin/Makefile.in: Regenerate. * classpath/native/plugin/Makefile.am: Install libgcjwebplugin.so in GCJ's versioned library directory. * classpath/resource/gnu/classpath/tools/native2ascii/messages.properties: New file. * classpath/resource/gnu/classpath/tools/getopt/Messages.properties: Likewise. * classpath/resource/gnu/classpath/tools/jarsigner/messages.properties: Likewise. * classpath/resource/gnu/classpath/tools/jarsigner/MessageBundle.properties: Remove file. * classpath/resource/gnu/classpath/tools/keytool/messages.properties: New file. * classpath/resource/gnu/classpath/tools/keytool/MessageBundle.properties: Remove file. * classpath/resource/gnu/classpath/tools/appletviewer/MessagesBundle_de.properties: New file. * classpath/resource/gnu/classpath/tools/appletviewer/MessagesBundle.properties: Likewise. * classpath/resource/gnu/classpath/tools/jar/messages.properties: Likewise. * classpath/resource/gnu/classpath/tools/serialver/messages.properties: Likewise. * classpath/gnu/java/net/IndexListParser.java: Likewise. * classpath/gnu/java/awt/peer/gtk/VolatileImageGraphics.java, classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java, classpath/gnu/java/awt/peer/gtk/CairoSurface.java, classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java, classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java, classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java, classpath/gnu/java/awt/peer/gtk/GdkTextLayout.java, classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java, classpath/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java, classpath/gnu/java/awt/peer/gtk/GtkVolatileImage.java, classpath/gnu/java/awt/font/opentype/truetype/VirtualMachine.java, classpath/gnu/java/awt/java2d/PolyEdge.java, classpath/gnu/java/awt/java2d/AbstractGraphics2D.java: Merge from GNU Classpath. * classpath/tools/toolwrapper.c: Replace tools.zip reference with libgcj-tools-4.2.0.jar. * classpath/tools/Makefile.in: Regenerate. * classpath/tools/Makefile.am: Rename tools.zip to libgcj-tools-4.2.0.jar. Install libgcj-tools-4.2.0.jar in $(datadir)/java. * classpath/javax/swing/JTabbedPane.java, classpath/javax/swing/text/DefaultStyledDocument.java, classpath/javax/swing/text/html/HTMLDocument.java, classpath/javax/swing/text/GapContent.java, classpath/javax/swing/JComponent.java, classpath/javax/swing/RepaintManager.java, classpath/javax/swing/plaf/basic/BasicComboBoxRenderer.java, classpath/javax/swing/plaf/basic/BasicScrollBarUI.java, classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java, classpath/javax/swing/plaf/basic/BasicScrollPaneUI.java, classpath/javax/swing/plaf/basic/BasicLookAndFeel.java, classpath/javax/swing/plaf/metal/MetalButtonUI.java, classpath/java/text/Bidi.java, classpath/java/awt/image/BufferedImage.java, classpath/java/awt/datatransfer/DataFlavor.java, classpath/java/awt/geom/AffineTransform.java, classpath/java/awt/dnd/DropTargetDropEvent.java, classpath/java/awt/dnd/DropTargetContext.java, classpath/java/awt/font/TextLayout.java, classpath/include/gnu_java_awt_peer_gtk_ComponentGraphics.h, classpath/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h, classpath/include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h, classpath/include/gnu_java_awt_peer_gtk_GdkTextLayout.h, classpath/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h, classpath/include/gnu_java_awt_peer_gtk_CairoSurface.h: Merge from GNU Classpath. * classpath/include/gnu_java_awt_peer_gtk_GdkGraphics.h, classpath/include/gnu_java_awt_peer_gtk_GdkGraphics2D.h, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c, classpath/native/jni/gtk-peer/gtkcairopeer.h, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c: Remove files. * classpath/Makefile.am (SUBDIRS, DIST_SUBDIRS): Include tools directory. * include/Makefile.in: Regenerate. * testsuite/Makefile.in: Regenerate. From-SVN: r114633
403 lines
11 KiB
Java
403 lines
11 KiB
Java
/* GdkFontPeer.java -- Implements FontPeer with GTK+
|
|
Copyright (C) 1999, 2004, 2005, 2006 Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Classpath.
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU Classpath 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 for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Classpath; see the file COPYING. If not, write to the
|
|
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
02110-1301 USA.
|
|
|
|
Linking this library statically or dynamically with other modules is
|
|
making a combined work based on this library. Thus, the terms and
|
|
conditions of the GNU General Public License cover the whole
|
|
combination.
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
permission to link this library with independent modules to produce an
|
|
executable, regardless of the license terms of these independent
|
|
modules, and to copy and distribute the resulting executable under
|
|
terms of your choice, provided that you also meet, for each linked
|
|
independent module, the terms and conditions of the license of that
|
|
module. An independent module is a module which is not derived from
|
|
or based on this library. If you modify this library, you may extend
|
|
this exception to your version of the library, but you are not
|
|
obligated to do so. If you do not wish to do so, delete this
|
|
exception statement from your version. */
|
|
|
|
|
|
package gnu.java.awt.peer.gtk;
|
|
|
|
import gnu.classpath.Configuration;
|
|
import gnu.java.awt.peer.ClasspathFontPeer;
|
|
import gnu.java.awt.font.opentype.NameDecoder;
|
|
|
|
import java.awt.Font;
|
|
import java.awt.FontMetrics;
|
|
import java.awt.Toolkit;
|
|
import java.awt.font.FontRenderContext;
|
|
import java.awt.font.GlyphVector;
|
|
import java.awt.font.GlyphMetrics;
|
|
import java.awt.font.LineMetrics;
|
|
import java.awt.geom.Rectangle2D;
|
|
import java.awt.geom.Point2D;
|
|
import java.text.CharacterIterator;
|
|
import java.text.StringCharacterIterator;
|
|
import java.util.Locale;
|
|
import java.util.Map;
|
|
import java.util.ResourceBundle;
|
|
import java.nio.ByteBuffer;
|
|
import java.util.HashMap;
|
|
|
|
public class GdkFontPeer extends ClasspathFontPeer
|
|
{
|
|
static native void initStaticState();
|
|
private final int native_state = GtkGenericPeer.getUniqueInteger ();
|
|
private static ResourceBundle bundle;
|
|
|
|
/**
|
|
* Cache GlyphMetrics objects.
|
|
*/
|
|
private HashMap metricsCache;
|
|
|
|
static
|
|
{
|
|
System.loadLibrary("gtkpeer");
|
|
|
|
initStaticState ();
|
|
|
|
try
|
|
{
|
|
bundle = ResourceBundle.getBundle ("gnu.java.awt.peer.gtk.font");
|
|
}
|
|
catch (Throwable ignored)
|
|
{
|
|
bundle = null;
|
|
}
|
|
}
|
|
|
|
private ByteBuffer nameTable = null;
|
|
|
|
private native void initState ();
|
|
private native void dispose ();
|
|
private native void setFont (String family, int style, int size);
|
|
|
|
native void getFontMetrics(double [] metrics);
|
|
native void getTextMetrics(String str, double [] metrics);
|
|
|
|
native void releasePeerGraphicsResource();
|
|
|
|
|
|
protected void finalize ()
|
|
{
|
|
releasePeerGraphicsResource();
|
|
dispose ();
|
|
}
|
|
|
|
/*
|
|
* Helpers for the 3-way overloading that this class seems to suffer
|
|
* from. Remove them if you feel like they're a performance bottleneck,
|
|
* for the time being I prefer my code not be written and debugged in
|
|
* triplicate.
|
|
*/
|
|
|
|
private String buildString(CharacterIterator iter)
|
|
{
|
|
StringBuffer sb = new StringBuffer();
|
|
for(char c = iter.first(); c != CharacterIterator.DONE; c = iter.next())
|
|
sb.append(c);
|
|
return sb.toString();
|
|
}
|
|
|
|
private String buildString(CharacterIterator iter, int begin, int limit)
|
|
{
|
|
StringBuffer sb = new StringBuffer();
|
|
int i = 0;
|
|
for(char c = iter.first(); c != CharacterIterator.DONE; c = iter.next(), i++)
|
|
{
|
|
if (begin <= i)
|
|
sb.append(c);
|
|
if (limit <= i)
|
|
break;
|
|
}
|
|
return sb.toString();
|
|
}
|
|
|
|
private String buildString(char[] chars, int begin, int limit)
|
|
{
|
|
return new String(chars, begin, limit - begin);
|
|
}
|
|
|
|
/* Public API */
|
|
|
|
public GdkFontPeer (String name, int style)
|
|
{
|
|
// All fonts get a default size of 12 if size is not specified.
|
|
this(name, style, 12);
|
|
}
|
|
|
|
public GdkFontPeer (String name, int style, int size)
|
|
{
|
|
super(name, style, size);
|
|
initState ();
|
|
setFont (this.familyName, this.style, (int)this.size);
|
|
metricsCache = new HashMap();
|
|
}
|
|
|
|
public GdkFontPeer (String name, Map attributes)
|
|
{
|
|
super(name, attributes);
|
|
initState ();
|
|
setFont (this.familyName, this.style, (int)this.size);
|
|
metricsCache = new HashMap();
|
|
}
|
|
|
|
/**
|
|
* Unneeded, but implemented anyway.
|
|
*/
|
|
public String getSubFamilyName(Font font, Locale locale)
|
|
{
|
|
String name;
|
|
|
|
if (locale == null)
|
|
locale = Locale.getDefault();
|
|
|
|
name = getName(NameDecoder.NAME_SUBFAMILY, locale);
|
|
if (name == null)
|
|
{
|
|
name = getName(NameDecoder.NAME_SUBFAMILY, Locale.ENGLISH);
|
|
if ("Regular".equals(name))
|
|
name = null;
|
|
}
|
|
|
|
return name;
|
|
}
|
|
|
|
/**
|
|
* Returns the bytes belonging to a TrueType/OpenType table,
|
|
* Parameters n,a,m,e identify the 4-byte ASCII tag of the table.
|
|
*
|
|
* Returns null if the font is not TT, the table is nonexistant,
|
|
* or if some other unexpected error occured.
|
|
*
|
|
*/
|
|
private native byte[] getTrueTypeTable(byte n, byte a, byte m, byte e);
|
|
|
|
/**
|
|
* Returns the PostScript name of the font, defaults to the familyName if
|
|
* a PS name could not be retrieved.
|
|
*/
|
|
public String getPostScriptName(Font font)
|
|
{
|
|
String name = getName(NameDecoder.NAME_POSTSCRIPT,
|
|
/* any language */ null);
|
|
if( name == null )
|
|
return this.familyName;
|
|
|
|
return name;
|
|
}
|
|
|
|
/**
|
|
* Extracts a String from the font’s name table.
|
|
*
|
|
* @param name the numeric TrueType or OpenType name ID.
|
|
*
|
|
* @param locale the locale for which names shall be localized, or
|
|
* <code>null</code> if the locale does mot matter because the name
|
|
* is known to be language-independent (for example, because it is
|
|
* the PostScript name).
|
|
*/
|
|
private String getName(int name, Locale locale)
|
|
{
|
|
if (nameTable == null)
|
|
{
|
|
byte[] data = getTrueTypeTable((byte)'n', (byte) 'a',
|
|
(byte) 'm', (byte) 'e');
|
|
if( data == null )
|
|
return null;
|
|
|
|
nameTable = ByteBuffer.wrap( data );
|
|
}
|
|
|
|
return NameDecoder.getName(nameTable, name, locale);
|
|
}
|
|
|
|
public boolean canDisplay (Font font, char c)
|
|
{
|
|
// FIXME: inquire with pango
|
|
return true;
|
|
}
|
|
|
|
public int canDisplayUpTo (Font font, CharacterIterator i, int start, int limit)
|
|
{
|
|
// FIXME: inquire with pango
|
|
return -1;
|
|
}
|
|
|
|
public GlyphVector createGlyphVector (Font font,
|
|
FontRenderContext ctx,
|
|
CharacterIterator i)
|
|
{
|
|
return new FreetypeGlyphVector(font, buildString (i), ctx);
|
|
}
|
|
|
|
public GlyphVector createGlyphVector (Font font,
|
|
FontRenderContext ctx,
|
|
int[] glyphCodes)
|
|
{
|
|
return new FreetypeGlyphVector(font, glyphCodes, ctx);
|
|
}
|
|
|
|
public byte getBaselineFor (Font font, char c)
|
|
{
|
|
// FIXME: Actually check.
|
|
return Font.ROMAN_BASELINE;
|
|
}
|
|
|
|
private static class GdkFontLineMetrics extends LineMetrics
|
|
{
|
|
private FontMetrics fm;
|
|
private int nchars;
|
|
private float strikethroughOffset, strikethroughThickness,
|
|
underlineOffset, underlineThickness;
|
|
|
|
public GdkFontLineMetrics (GdkFontPeer fp, FontMetrics m, int n)
|
|
{
|
|
fm = m;
|
|
nchars = n;
|
|
strikethroughOffset = 0f;
|
|
underlineOffset = 0f;
|
|
strikethroughThickness = ((float)fp.getSize(null)) / 12f;
|
|
underlineThickness = strikethroughThickness;
|
|
}
|
|
|
|
public float getAscent()
|
|
{
|
|
return (float) fm.getAscent ();
|
|
}
|
|
|
|
public int getBaselineIndex()
|
|
{
|
|
// FIXME
|
|
return Font.ROMAN_BASELINE;
|
|
}
|
|
|
|
public float[] getBaselineOffsets()
|
|
{
|
|
return new float[3];
|
|
}
|
|
|
|
public float getDescent()
|
|
{
|
|
return (float) fm.getDescent ();
|
|
}
|
|
|
|
public float getHeight()
|
|
{
|
|
return (float) fm.getHeight ();
|
|
}
|
|
|
|
public float getLeading() { return 0.f; }
|
|
public int getNumChars() { return nchars; }
|
|
public float getStrikethroughOffset() { return 0.f; }
|
|
public float getStrikethroughThickness() { return 0.f; }
|
|
public float getUnderlineOffset() { return 0.f; }
|
|
public float getUnderlineThickness() { return 0.f; }
|
|
|
|
}
|
|
|
|
public LineMetrics getLineMetrics (Font font, CharacterIterator ci,
|
|
int begin, int limit, FontRenderContext rc)
|
|
{
|
|
return new GdkFontLineMetrics (this, getFontMetrics (font), limit - begin);
|
|
}
|
|
|
|
public Rectangle2D getMaxCharBounds (Font font, FontRenderContext rc)
|
|
{
|
|
throw new UnsupportedOperationException ();
|
|
}
|
|
|
|
public int getMissingGlyphCode (Font font)
|
|
{
|
|
throw new UnsupportedOperationException ();
|
|
}
|
|
|
|
public String getGlyphName (Font font, int glyphIndex)
|
|
{
|
|
throw new UnsupportedOperationException ();
|
|
}
|
|
|
|
public int getNumGlyphs (Font font)
|
|
{
|
|
byte[] data = getTrueTypeTable((byte)'m', (byte) 'a',
|
|
(byte)'x', (byte) 'p');
|
|
if( data == null )
|
|
return -1;
|
|
|
|
ByteBuffer buf = ByteBuffer.wrap( data );
|
|
return buf.getShort(4);
|
|
}
|
|
|
|
public Rectangle2D getStringBounds (Font font, CharacterIterator ci,
|
|
int begin, int limit, FontRenderContext frc)
|
|
{
|
|
GlyphVector gv = new FreetypeGlyphVector( font,
|
|
buildString(ci, begin, limit),
|
|
frc);
|
|
return gv.getVisualBounds();
|
|
}
|
|
|
|
public boolean hasUniformLineMetrics (Font font)
|
|
{
|
|
return true;
|
|
}
|
|
|
|
public GlyphVector layoutGlyphVector (Font font, FontRenderContext frc,
|
|
char[] chars, int start, int limit,
|
|
int flags)
|
|
{
|
|
return new FreetypeGlyphVector( font, new String( chars, start,
|
|
limit - start),
|
|
frc, flags);
|
|
}
|
|
|
|
public LineMetrics getLineMetrics (Font font, String str,
|
|
FontRenderContext frc)
|
|
{
|
|
return new GdkFontLineMetrics (this, getFontMetrics (font), str.length ());
|
|
}
|
|
|
|
public FontMetrics getFontMetrics (Font font)
|
|
{
|
|
// Get the font metrics through GtkToolkit to take advantage of
|
|
// the metrics cache.
|
|
return Toolkit.getDefaultToolkit().getFontMetrics (font);
|
|
}
|
|
|
|
/**
|
|
* Returns a cached GlyphMetrics object for a given glyphcode,
|
|
* or null if it doesn't exist in the cache.
|
|
*/
|
|
GlyphMetrics getGlyphMetrics( int glyphCode )
|
|
{
|
|
return (GlyphMetrics)metricsCache.get( new Integer( glyphCode ) );
|
|
}
|
|
|
|
/**
|
|
* Put a GlyphMetrics object in the cache.
|
|
*/
|
|
void putGlyphMetrics( int glyphCode, Object metrics )
|
|
{
|
|
metricsCache.put( new Integer( glyphCode ), metrics );
|
|
}
|
|
}
|