2006-05-18 17:29:21 +00:00
|
|
|
/* GNUGlyphVector.java -- The GNU implementation of GlyphVector.
|
|
|
|
Copyright (C) 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.font;
|
|
|
|
|
2008-06-28 13:29:13 +00:00
|
|
|
import gnu.java.awt.java2d.ShapeWrapper;
|
|
|
|
|
2006-05-18 17:29:21 +00:00
|
|
|
import java.awt.Font;
|
|
|
|
import java.awt.font.FontRenderContext;
|
|
|
|
import java.awt.font.GlyphMetrics;
|
|
|
|
import java.awt.font.GlyphJustificationInfo;
|
|
|
|
import java.awt.font.GlyphVector;
|
|
|
|
|
|
|
|
import java.awt.Shape;
|
|
|
|
import java.awt.geom.AffineTransform;
|
|
|
|
import java.awt.geom.GeneralPath;
|
|
|
|
import java.awt.geom.Point2D;
|
|
|
|
import java.awt.geom.Rectangle2D;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* The GNU implementation of the abstract GlyphVector class, which
|
|
|
|
* uses the services provided by a FontDelegate for its functionality.
|
|
|
|
*
|
|
|
|
* @author Sascha Brawer (brawer@dandelis.ch)
|
|
|
|
*/
|
|
|
|
public class GNUGlyphVector
|
|
|
|
extends GlyphVector
|
|
|
|
{
|
|
|
|
private FontDelegate fontDelegate;
|
|
|
|
private Font font;
|
|
|
|
private FontRenderContext renderContext;
|
|
|
|
private int[] glyphs;
|
|
|
|
private float fontSize;
|
|
|
|
private AffineTransform transform;
|
|
|
|
private boolean valid;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* The position of each glyph. The horizontal position of the
|
|
|
|
* <code>i</code>-th glyph is at <code>pos[i * 2]</code>, its
|
|
|
|
* vertical position at <code>pos[i * 2 + 1]</code>. The total
|
|
|
|
* advance width of the entire vector is stored at
|
|
|
|
* <code>pos[numGlyphs]</code>, the total advance height at
|
|
|
|
* <code>pos[numGlyphs + 1]</code>.
|
|
|
|
*/
|
|
|
|
private float[] pos;
|
|
|
|
|
|
|
|
|
|
|
|
private AffineTransform[] transforms;
|
|
|
|
private int layoutFlags;
|
|
|
|
|
2008-06-28 13:29:13 +00:00
|
|
|
/**
|
|
|
|
* The cached non-transformed outline of this glyph vector.
|
|
|
|
*/
|
|
|
|
private Shape cleanOutline;
|
2006-05-18 17:29:21 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Constructs a new GNUGlyphVector.
|
|
|
|
*
|
|
|
|
* @param fontDelegate the FontDelegate that creates this vector.
|
|
|
|
*
|
|
|
|
* @param font the Font that this GlyphVector will return for {@link
|
|
|
|
* #getFont()}. That object is also used to determine the point
|
|
|
|
* size, which affects the affine transformation used by the font
|
|
|
|
* scaler.
|
|
|
|
*
|
|
|
|
* @param renderContext an object with parameters for font
|
|
|
|
* rendering, such as whether anti-aliasing is enabled.
|
|
|
|
*
|
|
|
|
* @param glyphs the glyphs in this vector.
|
|
|
|
*/
|
|
|
|
public GNUGlyphVector(FontDelegate fontDelegate,
|
|
|
|
Font font,
|
|
|
|
FontRenderContext renderContext,
|
|
|
|
int[] glyphs)
|
|
|
|
{
|
|
|
|
this.fontDelegate = fontDelegate;
|
|
|
|
this.font = font;
|
|
|
|
this.renderContext = renderContext;
|
|
|
|
this.glyphs = glyphs;
|
|
|
|
|
|
|
|
fontSize = font.getSize2D();
|
|
|
|
transform = font.getTransform(); // returns a modifiable copy
|
String.java, [...]: Merge from GNU Classpath HEAD.
2006-06-09 Thomas Fitzsimmons <fitzsim@redhat.com>
* java/lang/String.java, classpath/native/jni/classpath/jcl.h,
classpath/native/jni/qt-peer/eventmethods.h,
classpath/native/jni/qt-peer/qtmenupeer.cpp,
classpath/native/jni/qt-peer/.cvsignore,
classpath/native/jni/gtk-peer/gdkdisplay.h,
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_GdkFontPeer.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c,
classpath/native/jni/gtk-peer/.cvsignore,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c,
classpath/native/jni/gtk-peer/gtkpeer.h,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c,
classpath/native/jni/gtk-peer/Makefile.am,
classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c,
classpath/native/jawt/Makefile.am,
classpath/native/jawt/.cvsignore,
classpath/native/target/Linux/Makefile.in,
classpath/native/plugin/gcjwebplugin.cc,
classpath/native/plugin/Makefile.am,
classpath/native/plugin/.cvsignore,
classpath/resource/Makefile.in,
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/GdkGraphicsEnvironment.java,
classpath/gnu/java/awt/peer/gtk/GdkGraphics2D.java,
classpath/gnu/java/awt/peer/gtk/ComponentGraphicsCopy.java,
classpath/gnu/java/awt/peer/gtk/GtkComponentPeer.java,
classpath/gnu/java/awt/peer/gtk/GdkGraphics.java,
classpath/gnu/java/awt/peer/gtk/GtkToolkit.java,
classpath/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java,
classpath/gnu/java/awt/peer/gtk/BufferedImageGraphics.java,
classpath/gnu/java/awt/peer/gtk/GdkTextLayout.java,
classpath/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java,
classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java,
classpath/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java,
classpath/gnu/java/awt/peer/gtk/GtkImage.java,
classpath/gnu/java/awt/peer/gtk/GtkVolatileImage.java,
classpath/gnu/java/awt/peer/gtk/GdkGlyphVector.java,
classpath/gnu/java/awt/peer/gtk/GtkCanvasPeer.java,
classpath/gnu/java/awt/peer/swing/SwingContainerPeer.java,
classpath/gnu/java/awt/peer/swing/SwingComponent.java,
classpath/gnu/java/awt/peer/swing/SwingTextFieldPeer.java,
classpath/gnu/java/awt/peer/swing/SwingMenuBarPeer.java,
classpath/gnu/java/awt/peer/swing/SwingFramePeer.java,
classpath/gnu/java/awt/peer/swing/SwingComponentPeer.java,
classpath/gnu/java/awt/peer/swing/SwingWindowPeer.java,
classpath/gnu/java/awt/print/JavaPrinterJob.java,
classpath/gnu/java/awt/print/PostScriptGraphics2D.java,
classpath/gnu/java/awt/print/SpooledDocument.java,
classpath/gnu/java/awt/print/JavaPrinterGraphics.java,
classpath/gnu/java/awt/BitwiseXORComposite.java,
classpath/gnu/java/awt/font/GNUGlyphVector.java,
classpath/gnu/java/awt/font/opentype/NameDecoder.java,
classpath/gnu/java/awt/java2d/RasterGraphics.java,
classpath/gnu/java/awt/java2d/TexturePaintContext.java,
classpath/gnu/java/awt/java2d/PolyEdge.java,
classpath/gnu/java/awt/java2d/AbstractGraphics2D.java,
classpath/gnu/java/awt/java2d/AlphaCompositeContext.java,
classpath/gnu/java/awt/java2d/ImagePaint.java,
classpath/gnu/java/awt/Buffers.java,
classpath/gnu/classpath/Configuration.java.in,
classpath/gnu/javax/swing/text/html/CombinedAttributes.java,
classpath/gnu/javax/swing/text/html/CharacterAttributeTranslator.java,
classpath/gnu/javax/swing/text/html/parser/htmlAttributeSet.java,
classpath/gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet.java,
classpath/gnu/javax/swing/text/html/ImageViewIconFactory.java,
classpath/tools/toolwrapper.c,
classpath/tools/gnu/classpath/tools/native2ascii/Native2ASCII.java,
classpath/tools/gnu/classpath/tools/native2ascii/Messages.java,
classpath/tools/gnu/classpath/tools/getopt/FileArgumentCallback.java,
classpath/tools/gnu/classpath/tools/getopt/OptionGroup.java,
classpath/tools/gnu/classpath/tools/getopt/OptionException.java,
classpath/tools/gnu/classpath/tools/getopt/Messages.java,
classpath/tools/gnu/classpath/tools/getopt/Option.java,
classpath/tools/gnu/classpath/tools/getopt/Parser.java,
classpath/tools/gnu/classpath/tools/getopt/ClasspathToolParser.java,
classpath/tools/gnu/classpath/tools/jarsigner/JarSigner.java,
classpath/tools/gnu/classpath/tools/jarsigner/Main.java,
classpath/tools/gnu/classpath/tools/jarsigner/Messages.java,
classpath/tools/gnu/classpath/tools/jarsigner/package.html,
classpath/tools/gnu/classpath/tools/keytool/ListCmd.java,
classpath/tools/gnu/classpath/tools/keytool/StorePasswdCmd.java,
classpath/tools/gnu/classpath/tools/keytool/ExportCmd.java,
classpath/tools/gnu/classpath/tools/keytool/GenKeyCmd.java,
classpath/tools/gnu/classpath/tools/keytool/Messages.java,
classpath/tools/gnu/classpath/tools/keytool/package.html,
classpath/tools/gnu/classpath/tools/keytool/Command.java,
classpath/tools/gnu/classpath/tools/keytool/IdentityDBCmd.java,
classpath/tools/gnu/classpath/tools/keytool/Main.java,
classpath/tools/gnu/classpath/tools/keytool/DeleteCmd.java,
classpath/tools/gnu/classpath/tools/keytool/CertReqCmd.java,
classpath/tools/gnu/classpath/tools/keytool/SelfCertCmd.java,
classpath/tools/gnu/classpath/tools/keytool/KeyCloneCmd.java,
classpath/tools/gnu/classpath/tools/keytool/KeyPasswdCmd.java,
classpath/tools/gnu/classpath/tools/keytool/ImportCmd.java,
classpath/tools/gnu/classpath/tools/keytool/PrintCertCmd.java,
classpath/tools/gnu/classpath/tools/rmi/registry/package.html,
classpath/tools/gnu/classpath/tools/rmi/RMIC.txt,
classpath/tools/gnu/classpath/tools/rmi/RMIC.java,
classpath/tools/gnu/classpath/tools/appletviewer/ErrorApplet.java,
classpath/tools/gnu/classpath/tools/appletviewer/AppletClassLoader.java,
classpath/tools/gnu/classpath/tools/appletviewer/CommonAppletContext.java,
classpath/tools/gnu/classpath/tools/appletviewer/StandaloneAppletContext.java,
classpath/tools/gnu/classpath/tools/appletviewer/AppletSecurityManager.java,
classpath/tools/gnu/classpath/tools/appletviewer/PluginAppletContext.java,
classpath/tools/gnu/classpath/tools/appletviewer/AppletWarning.java,
classpath/tools/gnu/classpath/tools/appletviewer/StandaloneAppletViewer.java,
classpath/tools/gnu/classpath/tools/appletviewer/AppletTag.java,
classpath/tools/gnu/classpath/tools/appletviewer/ConsoleDialog.java,
classpath/tools/gnu/classpath/tools/appletviewer/Main.java,
classpath/tools/gnu/classpath/tools/appletviewer/StandaloneAppletWindow.java,
classpath/tools/gnu/classpath/tools/appletviewer/PluginAppletViewer.java,
classpath/tools/gnu/classpath/tools/appletviewer/TagParser.java,
classpath/tools/gnu/classpath/tools/appletviewer/PluginAppletWindow.java,
classpath/tools/gnu/classpath/tools/appletviewer/CommonAppletStub.java,
classpath/tools/gnu/classpath/tools/serialver/Messages.java,
classpath/tools/gnu/classpath/tools/serialver/SerialVer.java,
classpath/tools/gnu/classpath/tools/jar/Creator.java,
classpath/tools/gnu/classpath/tools/jar/Entry.java,
classpath/tools/gnu/classpath/tools/jar/Lister.java,
classpath/tools/gnu/classpath/tools/jar/Main.java,
classpath/tools/gnu/classpath/tools/jar/Updater.java,
classpath/tools/gnu/classpath/tools/jar/Messages.java,
classpath/tools/gnu/classpath/tools/jar/Extractor.java,
classpath/tools/gnu/classpath/tools/jar/Action.java,
classpath/tools/gnu/classpath/tools/jar/Indexer.java,
classpath/tools/gnu/classpath/tools/jar/WorkSet.java,
classpath/tools/gnu/classpath/tools/giop/GRMIC.txt,
classpath/tools/gnu/classpath/tools/giop/grmic/GiopRmicCompiler.java,
classpath/tools/gnu/classpath/tools/giop/GRMIC.java,
classpath/tools/Makefile.am, classpath/tools/jarsigner.in,
classpath/tools/keytool.in, classpath/tools/appletviewer.in,
classpath/tools/.cvsignore, classpath/configure.ac,
classpath/javax/swing/JTabbedPane.java,
classpath/javax/swing/AbstractButton.java,
classpath/javax/swing/JViewport.java,
classpath/javax/swing/KeyboardManager.java,
classpath/javax/swing/JMenuItem.java,
classpath/javax/swing/JMenuBar.java,
classpath/javax/swing/MenuSelectionManager.java,
classpath/javax/swing/JOptionPane.java,
classpath/javax/swing/JSpinner.java,
classpath/javax/swing/JCheckBoxMenuItem.java,
classpath/javax/swing/JEditorPane.java,
classpath/javax/swing/JFormattedTextField.java,
classpath/javax/swing/JTree.java,
classpath/javax/swing/CellRendererPane.java,
classpath/javax/swing/JScrollPane.java,
classpath/javax/swing/tree/VariableHeightLayoutCache.java,
classpath/javax/swing/tree/TreeNode.java,
classpath/javax/swing/tree/FixedHeightLayoutCache.java,
classpath/javax/swing/tree/DefaultTreeCellEditor.java,
classpath/javax/swing/tree/TreePath.java,
classpath/javax/swing/tree/RowMapper.java,
classpath/javax/swing/tree/DefaultMutableTreeNode.java,
classpath/javax/swing/tree/DefaultTreeModel.java,
classpath/javax/swing/tree/AbstractLayoutCache.java,
classpath/javax/swing/tree/TreeSelectionModel.java,
classpath/javax/swing/tree/DefaultTreeSelectionModel.java,
classpath/javax/swing/tree/DefaultTreeCellRenderer.java,
classpath/javax/swing/tree/ExpandVetoException.java,
classpath/javax/swing/JList.java,
classpath/javax/swing/table/JTableHeader.java,
classpath/javax/swing/table/AbstractTableModel.java,
classpath/javax/swing/table/DefaultTableModel.java,
classpath/javax/swing/table/TableCellEditor.java,
classpath/javax/swing/table/TableCellRenderer.java,
classpath/javax/swing/ProgressMonitor.java,
classpath/javax/swing/JToolBar.java,
classpath/javax/swing/TransferHandler.java,
classpath/javax/swing/DefaultCellEditor.java,
classpath/javax/swing/DefaultButtonModel.java,
classpath/javax/swing/JLayeredPane.java,
classpath/javax/swing/text/DefaultEditorKit.java,
classpath/javax/swing/text/DefaultCaret.java,
classpath/javax/swing/text/FieldView.java,
classpath/javax/swing/text/JTextComponent.java,
classpath/javax/swing/text/TextAction.java,
classpath/javax/swing/text/StyleContext.java,
classpath/javax/swing/text/html/HTMLDocument.java,
classpath/javax/swing/text/html/MinimalHTMLWriter.java,
classpath/javax/swing/text/html/ImageView.java,
classpath/javax/swing/text/html/HTMLEditorKit.java,
classpath/javax/swing/text/AbstractWriter.java,
classpath/javax/swing/text/GapContent.java,
classpath/javax/swing/text/Utilities.java,
classpath/javax/swing/text/PlainView.java,
classpath/javax/swing/UIManager.java,
classpath/javax/swing/JSplitPane.java,
classpath/javax/swing/JComponent.java,
classpath/javax/swing/SwingUtilities.java,
classpath/javax/swing/border/AbstractBorder.java,
classpath/javax/swing/border/CompoundBorder.java,
classpath/javax/swing/border/TitledBorder.java,
classpath/javax/swing/border/MatteBorder.java,
classpath/javax/swing/border/BevelBorder.java,
classpath/javax/swing/RepaintManager.java,
classpath/javax/swing/JTable.java,
classpath/javax/swing/UIDefaults.java,
classpath/javax/swing/DefaultDesktopManager.java,
classpath/javax/swing/JMenu.java,
classpath/javax/swing/JLabel.java,
classpath/javax/swing/JSlider.java,
classpath/javax/swing/plaf/basic/BasicToolBarUI.java,
classpath/javax/swing/plaf/basic/BasicButtonUI.java,
classpath/javax/swing/plaf/basic/BasicOptionPaneUI.java,
classpath/javax/swing/plaf/basic/BasicTextAreaUI.java,
classpath/javax/swing/plaf/basic/BasicToggleButtonUI.java,
classpath/javax/swing/plaf/basic/BasicSpinnerUI.java,
classpath/javax/swing/plaf/basic/BasicSliderUI.java,
classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java,
classpath/javax/swing/plaf/basic/BasicComboPopup.java,
classpath/javax/swing/plaf/basic/BasicCheckBoxUI.java,
classpath/javax/swing/plaf/basic/BasicInternalFrameUI.java,
classpath/javax/swing/plaf/basic/BasicProgressBarUI.java,
classpath/javax/swing/plaf/basic/BasicRadioButtonUI.java,
classpath/javax/swing/plaf/basic/BasicPanelUI.java,
classpath/javax/swing/plaf/basic/BasicSplitPaneUI.java,
classpath/javax/swing/plaf/basic/BasicTreeUI.java,
classpath/javax/swing/plaf/basic/BasicTableHeaderUI.java,
classpath/javax/swing/plaf/basic/BasicFileChooserUI.java,
classpath/javax/swing/plaf/basic/BasicScrollPaneUI.java,
classpath/javax/swing/plaf/basic/BasicComboBoxUI.java,
classpath/javax/swing/plaf/basic/BasicListUI.java,
classpath/javax/swing/plaf/basic/BasicIconFactory.java,
classpath/javax/swing/plaf/basic/BasicTextUI.java,
classpath/javax/swing/plaf/basic/BasicLookAndFeel.java,
classpath/javax/swing/plaf/basic/BasicDirectoryModel.java,
classpath/javax/swing/plaf/basic/BasicRootPaneUI.java,
classpath/javax/swing/plaf/basic/BasicTableUI.java,
classpath/javax/swing/plaf/basic/SharedUIDefaults.java,
classpath/javax/swing/plaf/multi/MultiComboBoxUI.java,
classpath/javax/swing/plaf/multi/MultiListUI.java,
classpath/javax/swing/plaf/multi/MultiSplitPaneUI.java,
classpath/javax/swing/plaf/multi/MultiFileChooserUI.java,
classpath/javax/swing/plaf/multi/MultiOptionPaneUI.java,
classpath/javax/swing/plaf/multi/MultiTabbedPaneUI.java,
classpath/javax/swing/plaf/multi/MultiLookAndFeel.java,
classpath/javax/swing/plaf/metal/MetalSliderUI.java,
classpath/javax/swing/plaf/metal/MetalIconFactory.java,
classpath/javax/swing/plaf/metal/MetalComboBoxIcon.java,
classpath/javax/swing/plaf/metal/MetalTabbedPaneUI.java,
classpath/javax/swing/plaf/metal/MetalLookAndFeel.java,
classpath/javax/swing/plaf/metal/MetalCheckBoxUI.java,
classpath/javax/swing/plaf/metal/MetalSeparatorUI.java,
classpath/javax/swing/plaf/metal/MetalBorders.java,
classpath/javax/swing/plaf/metal/MetalSplitPaneDivider.java,
classpath/javax/swing/plaf/metal/MetalScrollBarUI.java,
classpath/javax/swing/plaf/metal/MetalRootPaneUI.java,
classpath/javax/swing/plaf/metal/MetalInternalFrameUI.java,
classpath/javax/swing/plaf/metal/MetalRadioButtonUI.java,
classpath/javax/swing/plaf/metal/MetalToolTipUI.java,
classpath/javax/swing/plaf/metal/MetalInternalFrameTitlePane.java,
classpath/javax/swing/plaf/metal/MetalFileChooserUI.java,
classpath/javax/swing/plaf/metal/MetalUtils.java,
classpath/javax/swing/plaf/metal/MetalComboBoxButton.java,
classpath/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.java,
classpath/javax/swing/plaf/metal/MetalButtonUI.java,
classpath/javax/swing/JPopupMenu.java,
classpath/javax/swing/JProgressBar.java,
classpath/javax/swing/WindowConstants.java,
classpath/javax/swing/JFrame.java,
classpath/javax/swing/JFileChooser.java,
classpath/javax/swing/JComboBox.java,
classpath/javax/swing/event/EventListenerList.java,
classpath/javax/swing/ListSelectionModel.java,
classpath/javax/swing/JScrollBar.java,
classpath/java/text/SimpleDateFormat.java,
classpath/java/text/NumberFormat.java,
classpath/java/text/class-dependencies.conf,
classpath/java/awt/image/ColorModel.java,
classpath/java/awt/image/BufferedImage.java,
classpath/java/awt/Window.java,
classpath/java/awt/ContainerOrderFocusTraversalPolicy.java,
classpath/java/awt/LightweightDispatcher.java,
classpath/java/awt/EventDispatchThread.java,
classpath/java/awt/BasicStroke.java,
classpath/java/awt/ColorPaintContext.java,
classpath/java/awt/Container.java,
classpath/java/awt/TexturePaint.java,
classpath/java/awt/Component.java, classpath/java/awt/Font.java,
classpath/java/awt/GraphicsConfiguration.java,
classpath/java/awt/DefaultKeyboardFocusManager.java,
classpath/java/awt/print/PrinterJob.java,
classpath/java/awt/im/InputContext.java,
classpath/java/awt/dnd/DragGestureRecognizer.java,
classpath/java/awt/Toolkit.java,
classpath/java/awt/font/GraphicAttribute.java,
classpath/java/awt/font/ImageGraphicAttribute.java,
classpath/java/awt/font/GlyphVector.java,
classpath/java/awt/font/GlyphMetrics.java,
classpath/java/awt/font/ShapeGraphicAttribute.java,
classpath/java/awt/Graphics2D.java,
classpath/include/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h,
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_GtkCanvasPeer.h,
classpath/include/config.h.in,
classpath/include/gnu_java_awt_peer_gtk_GdkTextLayout.h,
classpath/include/gnu_java_awt_peer_gtk_GtkComponentPeer.h,
classpath/include/gnu_java_awt_peer_gtk_GdkFontPeer.h,
classpath/include/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.h,
classpath/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h,
classpath/include/gnu_java_awt_peer_gtk_GtkImage.h,
classpath/include/gnu_java_awt_peer_gtk_CairoSurface.h,
classpath/include/gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.h:
Merge from GNU Classpath HEAD.
From-SVN: r114510
2006-06-09 16:07:07 +00:00
|
|
|
//transform.concatenate(renderContext.getTransform());
|
2006-05-18 17:29:21 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the font of the glyphs in this GlyphVector.
|
|
|
|
*/
|
|
|
|
public Font getFont()
|
|
|
|
{
|
|
|
|
return font;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the FontRenderContext that is used to calculate the
|
|
|
|
* extent and position of the glyphs.
|
|
|
|
*/
|
|
|
|
public FontRenderContext getFontRenderContext()
|
|
|
|
{
|
|
|
|
return renderContext;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Moves each glyph in the vector to its default position.
|
|
|
|
*/
|
|
|
|
public void performDefaultLayout()
|
|
|
|
{
|
|
|
|
float x, y, advanceWidth, advanceHeight;
|
|
|
|
int i, p;
|
|
|
|
AffineTransform tx;
|
|
|
|
Point2D.Float advance = new Point2D.Float();
|
|
|
|
|
|
|
|
pos = new float[(glyphs.length + 1) * 2];
|
|
|
|
x = y = 0.0f;
|
|
|
|
p = 0;
|
|
|
|
for (i = p = 0; i < glyphs.length; i++)
|
|
|
|
{
|
|
|
|
p += 2;
|
|
|
|
|
|
|
|
if ((transforms == null) || (tx = transforms[i]) == null)
|
|
|
|
tx = this.transform;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
tx = new AffineTransform(tx);
|
|
|
|
tx.concatenate(this.transform);
|
|
|
|
}
|
|
|
|
|
|
|
|
fontDelegate.getAdvance(glyphs[i], fontSize, tx,
|
|
|
|
renderContext.isAntiAliased(),
|
|
|
|
renderContext.usesFractionalMetrics(),
|
|
|
|
/* horizontal */ true,
|
|
|
|
advance);
|
libjava/classpath/ChangeLog.gcj:
2007-05-31 Matthias Klose <doko@ubuntu.com>
* javax/management/NotificationBroadcasterSupport.java
(getNotificationInfo): Add cast.
* native/jni/qt-peer/Makefile.am (AM_CXXFLAGS): Add libstdc++ include
directories.
* native/jni/qt-peer/Makefile.in: Regenerate.
libjava/ChangeLog:
2007-06-03 Matthias Klose <doko@ubuntu.com>
* java/io/natFileWin32.cc (setFilePermissions): New (stub only).
_access: Handle EXEC query, stub only.
2007-06-03 Matthias Klose <doko@ubuntu.com>
Merged from classpath:
* gnu/java/nio/SelectorProviderImpl.java: Whitespace merge.
* java/lang/System.java(inheritedChannel): New.
* java/lang/Character.java: Remove stray`;'.
* java/net/MulticastSocket.java: Merged.
* java/text/DateFormatSymbols.java(getInstance): New, comment updates.
* java/text/Collator.java(getInstance): Merged.
* java/util/Calendar.java: New attributes ALL_STYLES, SHORT, LONG.
getDisplayName, getDisplayNames: New.
* java/util/logging/Logger.java: Merged.
* Regenerate .class and .h files.
2007-06-03 Matthias Klose <doko@ubuntu.com>
* java/io/File.java: Merge with classpath-0.95, new method
setFilePermissions, new attribute EXEC.
* java/io/natFilePosix.cc (setFilePermissions): New.
_access: Handle EXEC query.
* classpath/lib/java/io/File.class, java/io/File.h: Regenerate.
2007-06-03 Matthias Klose <doko@ubuntu.com>
Imported GNU Classpath 0.95.
* classpath/Makefile.in,
classpath/native/jni/midi-dssi/Makefile.in,
classpath/native/jni/classpath/Makefile.in,
classpath/native/jni/Makefile.in,
classpath/native/jni/gconf-peer/Makefile.in,
classpath/native/jni/java-io/Makefile.in,
classpath/native/jni/native-lib/Makefile.in,
classpath/native/jni/java-util/Makefile.in,
classpath/native/jni/midi-alsa/Makefile.in,
classpath/native/jni/java-lang/Makefile.in,
classpath/native/jni/java-nio/Makefile.in,
classpath/native/jni/java-net/Makefile.in,
classpath/native/jni/xmlj/Makefile.in,
classpath/native/jni/qt-peer/Makefile.in,
classpath/native/jni/gtk-peer/Makefile.in,
classpath/native/Makefile.in, classpath/native/jawt/Makefile.in,
classpath/native/fdlibm/Makefile.in,
classpath/native/plugin/Makefile.in,
classpath/resource/Makefile.in, classpath/scripts/Makefile.in,
classpath/tools/Makefile.in, classpath/doc/Makefile.in,
classpath/doc/api/Makefile.in, classpath/lib/Makefile.in,
classpath/external/Makefile.in, classpath/external/jsr166/Makefile.in,
classpath/external/sax/Makefile.in,
classpath/external/w3c_dom/Makefile.in,
classpath/external/relaxngDatatype/Makefile.in,
classpath/include/Makefile.in,
classpath/examples/Makefile.in: Regenerate.
* classpath/config.guess, classpath/config.sub,
classpath/ltmain.sh : Update.
* classpath/configure, classpath/depcomp, classpath/missing,
classpath/aclocal.m4, classpath/install-sh: Regenerate.
* gnu/classpath/Configuration.java (CLASSPATH_VERSION): Now 0.95.
* sources.am: Regenerate.
* Makefile.in: Regenerate.
* Update the .class files and generated CNI header files, add new
.class and generated CNI header files.
* Remove generated files for removed java source files:
classpath/gnu/java/net/BASE64.java,
classpath/gnu/java/security/util/Base64.java,
classpath/gnu/java/awt/peer/gtk/GThreadMutex.java,
classpath/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java,
classpath/gnu/java/awt/font/autofit/Scaler.java,
classpath/gnu/classpath/jdwp/util/Value.java,
classpath/gnu/javax/net/ssl/Base64.java.
* Remove empty directories.
* Makefile.am(nat_source_files): Add natVMOperatingSystemMXBeanImpl.cc.
* java/lang/Class.java(setAccessible): Merge from classpath.
* java/util/Locale.java: Remove.
* gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java,
gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc: New.
* gcj/javaprims.h: Update class declarations.
* scripts/classes.pl: Update usage.
* HACKING: Mention to build all peers.
From-SVN: r125302
2007-06-03 23:18:43 +00:00
|
|
|
// FIXME: We shouldn't round here, but instead hint the metrics
|
|
|
|
// correctly.
|
|
|
|
pos[p] = x += Math.round(advance.x);
|
2006-05-18 17:29:21 +00:00
|
|
|
pos[p + 1] = y += advance.y;
|
|
|
|
}
|
|
|
|
valid = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Determines the number of glyphs in this GlyphVector.
|
|
|
|
*/
|
|
|
|
public int getNumGlyphs()
|
|
|
|
{
|
|
|
|
return glyphs.length;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Determines the glyph number by index in this vector.
|
|
|
|
* Glyph numbers are specific to each font, so two fonts
|
|
|
|
* will likely assign different numbers to the same glyph.
|
|
|
|
*
|
|
|
|
* @param glyphIndex the index of the glyph whose glyph number is to
|
|
|
|
* be retrieved.
|
|
|
|
*
|
|
|
|
* @throws IndexOutOfBoundsException if <code>glyphIndex</code>
|
|
|
|
* is not in the range <code[0 .. getNumGlyphs() - 1]</code>.
|
|
|
|
*/
|
|
|
|
public int getGlyphCode(int glyphIndex)
|
|
|
|
{
|
|
|
|
/* The exception is thrown automatically if the index is out
|
|
|
|
* of the valid bounds.
|
|
|
|
*/
|
|
|
|
return glyphs[glyphIndex];
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a slice of this GlyphVector.
|
|
|
|
*
|
|
|
|
* @param firstGlyphIndex the index of the first glyph in the
|
|
|
|
* returned slice.
|
|
|
|
*
|
|
|
|
* @param numEntries the size of the returned slice.
|
|
|
|
*
|
|
|
|
* @param outCodes a pre-allocated array for storing the slice,
|
|
|
|
* or <code>null</code> to cause allocation of a new array.
|
|
|
|
*
|
|
|
|
* @return a slice of this GlyphVector. If <code>outCodes</code>
|
|
|
|
* is <code>null</code>, the slice will be stored into a freshly
|
|
|
|
* allocated array; otherwise, the result will be stored into
|
|
|
|
* <code>outCodes</code>.
|
|
|
|
*/
|
|
|
|
public int[] getGlyphCodes(int firstGlyphIndex,
|
|
|
|
int numEntries,
|
|
|
|
int[] outCodes)
|
|
|
|
{
|
|
|
|
if (numEntries < 0)
|
|
|
|
throw new IllegalArgumentException();
|
|
|
|
if (outCodes == null)
|
|
|
|
outCodes = new int[numEntries];
|
|
|
|
System.arraycopy(glyphs, firstGlyphIndex, outCodes, 0, numEntries);
|
|
|
|
return outCodes;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public Rectangle2D getLogicalBounds()
|
|
|
|
{
|
|
|
|
float ascent, descent;
|
|
|
|
|
|
|
|
validate();
|
|
|
|
|
|
|
|
return new Rectangle2D.Float(0, 0,
|
|
|
|
pos[pos.length - 2],
|
|
|
|
getAscent() - getDescent());
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public Rectangle2D getVisualBounds()
|
|
|
|
{
|
|
|
|
validate();
|
|
|
|
|
|
|
|
// FIXME: Not yet implemented.
|
|
|
|
return getLogicalBounds();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the shape of this GlyphVector.
|
|
|
|
*/
|
|
|
|
public Shape getOutline()
|
|
|
|
{
|
|
|
|
return getOutline(0.0f, 0.0f);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the shape of this GlyphVector, translated to the
|
|
|
|
* specified position.
|
|
|
|
*
|
|
|
|
* @param x the horizontal position for rendering this vector.
|
|
|
|
* @param y the vertical position for rendering this vector.
|
|
|
|
*/
|
|
|
|
public Shape getOutline(float x, float y)
|
|
|
|
{
|
|
|
|
validate();
|
|
|
|
|
2008-06-28 13:29:13 +00:00
|
|
|
Shape outline;
|
|
|
|
if (cleanOutline == null)
|
2006-05-18 17:29:21 +00:00
|
|
|
{
|
2008-06-28 13:29:13 +00:00
|
|
|
GeneralPath path = new GeneralPath();
|
|
|
|
int len = glyphs.length;
|
|
|
|
for (int i = 0; i < len; i++)
|
|
|
|
{
|
|
|
|
GeneralPath p = new GeneralPath(getGlyphOutline(i));
|
|
|
|
path.append(p, false);
|
|
|
|
}
|
|
|
|
// Protect the cached instance from beeing modified by application
|
|
|
|
// code.
|
|
|
|
cleanOutline = new ShapeWrapper(path);
|
|
|
|
outline = cleanOutline;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
outline = cleanOutline;
|
|
|
|
}
|
|
|
|
if (x != 0 || y != 0)
|
|
|
|
{
|
|
|
|
GeneralPath path = new GeneralPath(outline);
|
|
|
|
AffineTransform t = new AffineTransform();
|
|
|
|
t.translate(x, y);
|
|
|
|
path.transform(t);
|
|
|
|
outline = path;
|
2006-05-18 17:29:21 +00:00
|
|
|
}
|
|
|
|
return outline;
|
|
|
|
}
|
|
|
|
|
libjava/classpath/ChangeLog.gcj:
2007-05-31 Matthias Klose <doko@ubuntu.com>
* javax/management/NotificationBroadcasterSupport.java
(getNotificationInfo): Add cast.
* native/jni/qt-peer/Makefile.am (AM_CXXFLAGS): Add libstdc++ include
directories.
* native/jni/qt-peer/Makefile.in: Regenerate.
libjava/ChangeLog:
2007-06-03 Matthias Klose <doko@ubuntu.com>
* java/io/natFileWin32.cc (setFilePermissions): New (stub only).
_access: Handle EXEC query, stub only.
2007-06-03 Matthias Klose <doko@ubuntu.com>
Merged from classpath:
* gnu/java/nio/SelectorProviderImpl.java: Whitespace merge.
* java/lang/System.java(inheritedChannel): New.
* java/lang/Character.java: Remove stray`;'.
* java/net/MulticastSocket.java: Merged.
* java/text/DateFormatSymbols.java(getInstance): New, comment updates.
* java/text/Collator.java(getInstance): Merged.
* java/util/Calendar.java: New attributes ALL_STYLES, SHORT, LONG.
getDisplayName, getDisplayNames: New.
* java/util/logging/Logger.java: Merged.
* Regenerate .class and .h files.
2007-06-03 Matthias Klose <doko@ubuntu.com>
* java/io/File.java: Merge with classpath-0.95, new method
setFilePermissions, new attribute EXEC.
* java/io/natFilePosix.cc (setFilePermissions): New.
_access: Handle EXEC query.
* classpath/lib/java/io/File.class, java/io/File.h: Regenerate.
2007-06-03 Matthias Klose <doko@ubuntu.com>
Imported GNU Classpath 0.95.
* classpath/Makefile.in,
classpath/native/jni/midi-dssi/Makefile.in,
classpath/native/jni/classpath/Makefile.in,
classpath/native/jni/Makefile.in,
classpath/native/jni/gconf-peer/Makefile.in,
classpath/native/jni/java-io/Makefile.in,
classpath/native/jni/native-lib/Makefile.in,
classpath/native/jni/java-util/Makefile.in,
classpath/native/jni/midi-alsa/Makefile.in,
classpath/native/jni/java-lang/Makefile.in,
classpath/native/jni/java-nio/Makefile.in,
classpath/native/jni/java-net/Makefile.in,
classpath/native/jni/xmlj/Makefile.in,
classpath/native/jni/qt-peer/Makefile.in,
classpath/native/jni/gtk-peer/Makefile.in,
classpath/native/Makefile.in, classpath/native/jawt/Makefile.in,
classpath/native/fdlibm/Makefile.in,
classpath/native/plugin/Makefile.in,
classpath/resource/Makefile.in, classpath/scripts/Makefile.in,
classpath/tools/Makefile.in, classpath/doc/Makefile.in,
classpath/doc/api/Makefile.in, classpath/lib/Makefile.in,
classpath/external/Makefile.in, classpath/external/jsr166/Makefile.in,
classpath/external/sax/Makefile.in,
classpath/external/w3c_dom/Makefile.in,
classpath/external/relaxngDatatype/Makefile.in,
classpath/include/Makefile.in,
classpath/examples/Makefile.in: Regenerate.
* classpath/config.guess, classpath/config.sub,
classpath/ltmain.sh : Update.
* classpath/configure, classpath/depcomp, classpath/missing,
classpath/aclocal.m4, classpath/install-sh: Regenerate.
* gnu/classpath/Configuration.java (CLASSPATH_VERSION): Now 0.95.
* sources.am: Regenerate.
* Makefile.in: Regenerate.
* Update the .class files and generated CNI header files, add new
.class and generated CNI header files.
* Remove generated files for removed java source files:
classpath/gnu/java/net/BASE64.java,
classpath/gnu/java/security/util/Base64.java,
classpath/gnu/java/awt/peer/gtk/GThreadMutex.java,
classpath/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java,
classpath/gnu/java/awt/font/autofit/Scaler.java,
classpath/gnu/classpath/jdwp/util/Value.java,
classpath/gnu/javax/net/ssl/Base64.java.
* Remove empty directories.
* Makefile.am(nat_source_files): Add natVMOperatingSystemMXBeanImpl.cc.
* java/lang/Class.java(setAccessible): Merge from classpath.
* java/util/Locale.java: Remove.
* gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java,
gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc: New.
* gcj/javaprims.h: Update class declarations.
* scripts/classes.pl: Update usage.
* HACKING: Mention to build all peers.
From-SVN: r125302
2007-06-03 23:18:43 +00:00
|
|
|
public Shape getOutline(float x, float y, int type)
|
|
|
|
{
|
|
|
|
validate();
|
|
|
|
|
|
|
|
GeneralPath outline = new GeneralPath();
|
|
|
|
int len = glyphs.length;
|
|
|
|
for (int i = 0; i < len; i++)
|
|
|
|
{
|
|
|
|
GeneralPath p = new GeneralPath(getGlyphOutline(i, type));
|
|
|
|
outline.append(p, false);
|
|
|
|
}
|
|
|
|
AffineTransform t = new AffineTransform();
|
|
|
|
t.translate(x, y);
|
|
|
|
outline.transform(t);
|
|
|
|
return outline;
|
|
|
|
}
|
2006-05-18 17:29:21 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Determines the shape of the specified glyph.
|
|
|
|
*
|
|
|
|
* @throws IndexOutOfBoundsException if <code>glyphIndex</code> is
|
|
|
|
* not in the range <code[0 .. getNumGlyphs()]</code>.
|
|
|
|
*/
|
|
|
|
public Shape getGlyphOutline(int glyphIndex)
|
|
|
|
{
|
|
|
|
AffineTransform tx, glyphTx;
|
|
|
|
GeneralPath path;
|
|
|
|
|
|
|
|
validate();
|
|
|
|
|
|
|
|
if ((transforms != null)
|
|
|
|
&& ((glyphTx = transforms[glyphIndex]) != null))
|
|
|
|
{
|
|
|
|
tx = new AffineTransform(transform);
|
|
|
|
tx.concatenate(glyphTx);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
tx = transform;
|
|
|
|
|
|
|
|
path = fontDelegate.getGlyphOutline(glyphs[glyphIndex], fontSize, tx,
|
|
|
|
renderContext.isAntiAliased(),
|
libjava/classpath/ChangeLog.gcj:
2007-05-31 Matthias Klose <doko@ubuntu.com>
* javax/management/NotificationBroadcasterSupport.java
(getNotificationInfo): Add cast.
* native/jni/qt-peer/Makefile.am (AM_CXXFLAGS): Add libstdc++ include
directories.
* native/jni/qt-peer/Makefile.in: Regenerate.
libjava/ChangeLog:
2007-06-03 Matthias Klose <doko@ubuntu.com>
* java/io/natFileWin32.cc (setFilePermissions): New (stub only).
_access: Handle EXEC query, stub only.
2007-06-03 Matthias Klose <doko@ubuntu.com>
Merged from classpath:
* gnu/java/nio/SelectorProviderImpl.java: Whitespace merge.
* java/lang/System.java(inheritedChannel): New.
* java/lang/Character.java: Remove stray`;'.
* java/net/MulticastSocket.java: Merged.
* java/text/DateFormatSymbols.java(getInstance): New, comment updates.
* java/text/Collator.java(getInstance): Merged.
* java/util/Calendar.java: New attributes ALL_STYLES, SHORT, LONG.
getDisplayName, getDisplayNames: New.
* java/util/logging/Logger.java: Merged.
* Regenerate .class and .h files.
2007-06-03 Matthias Klose <doko@ubuntu.com>
* java/io/File.java: Merge with classpath-0.95, new method
setFilePermissions, new attribute EXEC.
* java/io/natFilePosix.cc (setFilePermissions): New.
_access: Handle EXEC query.
* classpath/lib/java/io/File.class, java/io/File.h: Regenerate.
2007-06-03 Matthias Klose <doko@ubuntu.com>
Imported GNU Classpath 0.95.
* classpath/Makefile.in,
classpath/native/jni/midi-dssi/Makefile.in,
classpath/native/jni/classpath/Makefile.in,
classpath/native/jni/Makefile.in,
classpath/native/jni/gconf-peer/Makefile.in,
classpath/native/jni/java-io/Makefile.in,
classpath/native/jni/native-lib/Makefile.in,
classpath/native/jni/java-util/Makefile.in,
classpath/native/jni/midi-alsa/Makefile.in,
classpath/native/jni/java-lang/Makefile.in,
classpath/native/jni/java-nio/Makefile.in,
classpath/native/jni/java-net/Makefile.in,
classpath/native/jni/xmlj/Makefile.in,
classpath/native/jni/qt-peer/Makefile.in,
classpath/native/jni/gtk-peer/Makefile.in,
classpath/native/Makefile.in, classpath/native/jawt/Makefile.in,
classpath/native/fdlibm/Makefile.in,
classpath/native/plugin/Makefile.in,
classpath/resource/Makefile.in, classpath/scripts/Makefile.in,
classpath/tools/Makefile.in, classpath/doc/Makefile.in,
classpath/doc/api/Makefile.in, classpath/lib/Makefile.in,
classpath/external/Makefile.in, classpath/external/jsr166/Makefile.in,
classpath/external/sax/Makefile.in,
classpath/external/w3c_dom/Makefile.in,
classpath/external/relaxngDatatype/Makefile.in,
classpath/include/Makefile.in,
classpath/examples/Makefile.in: Regenerate.
* classpath/config.guess, classpath/config.sub,
classpath/ltmain.sh : Update.
* classpath/configure, classpath/depcomp, classpath/missing,
classpath/aclocal.m4, classpath/install-sh: Regenerate.
* gnu/classpath/Configuration.java (CLASSPATH_VERSION): Now 0.95.
* sources.am: Regenerate.
* Makefile.in: Regenerate.
* Update the .class files and generated CNI header files, add new
.class and generated CNI header files.
* Remove generated files for removed java source files:
classpath/gnu/java/net/BASE64.java,
classpath/gnu/java/security/util/Base64.java,
classpath/gnu/java/awt/peer/gtk/GThreadMutex.java,
classpath/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java,
classpath/gnu/java/awt/font/autofit/Scaler.java,
classpath/gnu/classpath/jdwp/util/Value.java,
classpath/gnu/javax/net/ssl/Base64.java.
* Remove empty directories.
* Makefile.am(nat_source_files): Add natVMOperatingSystemMXBeanImpl.cc.
* java/lang/Class.java(setAccessible): Merge from classpath.
* java/util/Locale.java: Remove.
* gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java,
gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc: New.
* gcj/javaprims.h: Update class declarations.
* scripts/classes.pl: Update usage.
* HACKING: Mention to build all peers.
From-SVN: r125302
2007-06-03 23:18:43 +00:00
|
|
|
renderContext.usesFractionalMetrics(),
|
|
|
|
FontDelegate.FLAG_FITTED);
|
2006-05-18 17:29:21 +00:00
|
|
|
|
|
|
|
tx = new AffineTransform();
|
|
|
|
tx.translate(pos[glyphIndex * 2], pos[glyphIndex * 2 + 1]);
|
|
|
|
path.transform(tx);
|
|
|
|
return path;
|
|
|
|
}
|
|
|
|
|
libjava/classpath/ChangeLog.gcj:
2007-05-31 Matthias Klose <doko@ubuntu.com>
* javax/management/NotificationBroadcasterSupport.java
(getNotificationInfo): Add cast.
* native/jni/qt-peer/Makefile.am (AM_CXXFLAGS): Add libstdc++ include
directories.
* native/jni/qt-peer/Makefile.in: Regenerate.
libjava/ChangeLog:
2007-06-03 Matthias Klose <doko@ubuntu.com>
* java/io/natFileWin32.cc (setFilePermissions): New (stub only).
_access: Handle EXEC query, stub only.
2007-06-03 Matthias Klose <doko@ubuntu.com>
Merged from classpath:
* gnu/java/nio/SelectorProviderImpl.java: Whitespace merge.
* java/lang/System.java(inheritedChannel): New.
* java/lang/Character.java: Remove stray`;'.
* java/net/MulticastSocket.java: Merged.
* java/text/DateFormatSymbols.java(getInstance): New, comment updates.
* java/text/Collator.java(getInstance): Merged.
* java/util/Calendar.java: New attributes ALL_STYLES, SHORT, LONG.
getDisplayName, getDisplayNames: New.
* java/util/logging/Logger.java: Merged.
* Regenerate .class and .h files.
2007-06-03 Matthias Klose <doko@ubuntu.com>
* java/io/File.java: Merge with classpath-0.95, new method
setFilePermissions, new attribute EXEC.
* java/io/natFilePosix.cc (setFilePermissions): New.
_access: Handle EXEC query.
* classpath/lib/java/io/File.class, java/io/File.h: Regenerate.
2007-06-03 Matthias Klose <doko@ubuntu.com>
Imported GNU Classpath 0.95.
* classpath/Makefile.in,
classpath/native/jni/midi-dssi/Makefile.in,
classpath/native/jni/classpath/Makefile.in,
classpath/native/jni/Makefile.in,
classpath/native/jni/gconf-peer/Makefile.in,
classpath/native/jni/java-io/Makefile.in,
classpath/native/jni/native-lib/Makefile.in,
classpath/native/jni/java-util/Makefile.in,
classpath/native/jni/midi-alsa/Makefile.in,
classpath/native/jni/java-lang/Makefile.in,
classpath/native/jni/java-nio/Makefile.in,
classpath/native/jni/java-net/Makefile.in,
classpath/native/jni/xmlj/Makefile.in,
classpath/native/jni/qt-peer/Makefile.in,
classpath/native/jni/gtk-peer/Makefile.in,
classpath/native/Makefile.in, classpath/native/jawt/Makefile.in,
classpath/native/fdlibm/Makefile.in,
classpath/native/plugin/Makefile.in,
classpath/resource/Makefile.in, classpath/scripts/Makefile.in,
classpath/tools/Makefile.in, classpath/doc/Makefile.in,
classpath/doc/api/Makefile.in, classpath/lib/Makefile.in,
classpath/external/Makefile.in, classpath/external/jsr166/Makefile.in,
classpath/external/sax/Makefile.in,
classpath/external/w3c_dom/Makefile.in,
classpath/external/relaxngDatatype/Makefile.in,
classpath/include/Makefile.in,
classpath/examples/Makefile.in: Regenerate.
* classpath/config.guess, classpath/config.sub,
classpath/ltmain.sh : Update.
* classpath/configure, classpath/depcomp, classpath/missing,
classpath/aclocal.m4, classpath/install-sh: Regenerate.
* gnu/classpath/Configuration.java (CLASSPATH_VERSION): Now 0.95.
* sources.am: Regenerate.
* Makefile.in: Regenerate.
* Update the .class files and generated CNI header files, add new
.class and generated CNI header files.
* Remove generated files for removed java source files:
classpath/gnu/java/net/BASE64.java,
classpath/gnu/java/security/util/Base64.java,
classpath/gnu/java/awt/peer/gtk/GThreadMutex.java,
classpath/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java,
classpath/gnu/java/awt/font/autofit/Scaler.java,
classpath/gnu/classpath/jdwp/util/Value.java,
classpath/gnu/javax/net/ssl/Base64.java.
* Remove empty directories.
* Makefile.am(nat_source_files): Add natVMOperatingSystemMXBeanImpl.cc.
* java/lang/Class.java(setAccessible): Merge from classpath.
* java/util/Locale.java: Remove.
* gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java,
gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc: New.
* gcj/javaprims.h: Update class declarations.
* scripts/classes.pl: Update usage.
* HACKING: Mention to build all peers.
From-SVN: r125302
2007-06-03 23:18:43 +00:00
|
|
|
public Shape getGlyphOutline(int glyphIndex, int type)
|
|
|
|
{
|
|
|
|
AffineTransform tx, glyphTx;
|
|
|
|
GeneralPath path;
|
|
|
|
|
|
|
|
validate();
|
|
|
|
|
|
|
|
if ((transforms != null)
|
|
|
|
&& ((glyphTx = transforms[glyphIndex]) != null))
|
|
|
|
{
|
|
|
|
tx = new AffineTransform(transform);
|
|
|
|
tx.concatenate(glyphTx);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
tx = transform;
|
|
|
|
|
|
|
|
path = fontDelegate.getGlyphOutline(glyphs[glyphIndex], fontSize, tx,
|
|
|
|
renderContext.isAntiAliased(),
|
|
|
|
renderContext.usesFractionalMetrics(),
|
|
|
|
type);
|
|
|
|
|
|
|
|
tx = new AffineTransform();
|
|
|
|
tx.translate(pos[glyphIndex * 2], pos[glyphIndex * 2 + 1]);
|
|
|
|
path.transform(tx);
|
|
|
|
return path;
|
|
|
|
}
|
2006-05-18 17:29:21 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Determines the position of the specified glyph, or the
|
|
|
|
* total advance width and height of the vector.
|
|
|
|
*
|
|
|
|
* @param glyphIndex the index of the glyph in question.
|
|
|
|
* If this value equals <code>getNumGlyphs()</code>, the
|
|
|
|
* position <i>after</i> the last glyph will be returned,
|
|
|
|
* which is the total advance width and height of the vector.
|
|
|
|
*
|
|
|
|
* @throws IndexOutOfBoundsException if <code>glyphIndex</code> is
|
|
|
|
* not in the range <code[0 .. getNumGlyphs()]</code>.
|
|
|
|
*/
|
|
|
|
public Point2D getGlyphPosition(int glyphIndex)
|
|
|
|
{
|
|
|
|
validate();
|
|
|
|
return new Point2D.Float(pos[glyphIndex * 2],
|
|
|
|
pos[glyphIndex * 2 + 1]);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Moves the specified glyph to a new position, or changes the
|
|
|
|
* advance width and height of the entire glyph vector.
|
|
|
|
*
|
|
|
|
* <p>Note that the position of an individual glyph may also
|
|
|
|
* affected by its affine transformation.
|
|
|
|
*
|
|
|
|
* @param glyphIndex the index of the moved glyph. If
|
|
|
|
* <code>glyphIndex</code> equals the total number of glyphs in this
|
|
|
|
* vector, the advance width and height of the vector is changed.
|
|
|
|
*
|
|
|
|
* @param position the new position of the glyph.
|
|
|
|
*
|
|
|
|
* @throws IndexOutOfBoundsException if <code>glyphIndex</code> is
|
|
|
|
* not in the range <code[0 .. getNumGlyphs()]</code>.
|
|
|
|
*/
|
|
|
|
public void setGlyphPosition(int glyphIndex, Point2D position)
|
|
|
|
{
|
|
|
|
validate();
|
|
|
|
pos[glyphIndex * 2] = (float) position.getX();
|
|
|
|
pos[glyphIndex * 2 + 1] = (float) position.getY();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the affine transformation that is applied to the
|
|
|
|
* glyph at the specified index.
|
|
|
|
*
|
|
|
|
* @param glyphIndex the index of the glyph whose transformation
|
|
|
|
* is to be retrieved.
|
|
|
|
*
|
|
|
|
* @return an affine transformation, or <code>null</code>
|
|
|
|
* for the identity transformation.
|
|
|
|
*
|
|
|
|
* @throws IndexOutOfBoundsException if <code>glyphIndex</code> is
|
|
|
|
* not in the range <code[0 .. getNumGlyphs() - 1]</code>.
|
|
|
|
*/
|
|
|
|
public AffineTransform getGlyphTransform(int glyphIndex)
|
|
|
|
{
|
|
|
|
if (transforms == null)
|
|
|
|
return null;
|
|
|
|
else
|
|
|
|
return transforms[glyphIndex];
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Applies an affine transformation to the glyph at the specified
|
|
|
|
* index.
|
|
|
|
*
|
|
|
|
* @param glyphIndex the index of the glyph to which the
|
|
|
|
* transformation is applied.
|
|
|
|
*
|
|
|
|
* @param transform the affine transformation for the glyph, or
|
|
|
|
* <code>null</code> for an identity transformation.
|
|
|
|
*/
|
|
|
|
public void setGlyphTransform(int glyphIndex,
|
|
|
|
AffineTransform transform)
|
|
|
|
{
|
|
|
|
if (transforms == null)
|
|
|
|
transforms = new AffineTransform[glyphs.length];
|
|
|
|
transforms[glyphIndex] = transform;
|
|
|
|
|
|
|
|
/* If the GlyphVector has only a transform for a single glyph, and
|
|
|
|
* the caller clears its transform, the FLAG_HAS_TRANSFORMS bit
|
|
|
|
* should be cleared in layoutFlags. However, this would require
|
|
|
|
* that we keep track of the number of transformed glyphs, or that
|
|
|
|
* we count them when a transform is cleared. This would
|
|
|
|
* complicate the code quite a bit. Note that the only drawback of
|
|
|
|
* wrongly setting FLAG_HAS_TRANSFORMS is that a slower code path
|
|
|
|
* might be taken for rendering the vector. Right now, we never
|
|
|
|
* really look at the flag, so it does not make any difference.
|
|
|
|
*/
|
|
|
|
if (transform != null)
|
|
|
|
layoutFlags |= FLAG_HAS_TRANSFORMS;
|
|
|
|
valid = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns flags that can be used for optimizing the rendering
|
|
|
|
* of this GlyphVector.
|
|
|
|
*
|
|
|
|
* @return a bit mask with the applicable flags set.
|
|
|
|
*
|
|
|
|
* @since 1.4
|
|
|
|
*
|
|
|
|
* @see GlyphVector#FLAG_HAS_POSITION_ADJUSTMENTS
|
|
|
|
* @see GlyphVector#FLAG_HAS_TRANSFORMS
|
|
|
|
* @see GlyphVector#FLAG_RUN_RTL
|
|
|
|
* @see GlyphVector#FLAG_COMPLEX_GLYPHS
|
|
|
|
* @see GlyphVector#FLAG_MASK
|
|
|
|
*/
|
|
|
|
public int getLayoutFlags()
|
|
|
|
{
|
|
|
|
return layoutFlags;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the positions of a range of glyphs in this vector.
|
|
|
|
*
|
|
|
|
* @param firstGlyphIndex the index of the first glyph whose
|
|
|
|
* position is retrieved.
|
|
|
|
*
|
|
|
|
* @param numGlyphs the number of glyphs whose positions
|
|
|
|
* are retrieved.
|
|
|
|
*
|
|
|
|
* @param outPositions an array for storing the results
|
|
|
|
* (the length must be at least twice <code>numGlyphs</code>),
|
|
|
|
* or <code>null</code> for freshly allocating an array.
|
|
|
|
*
|
|
|
|
* @return an array with the glyph positions. The horizontal
|
|
|
|
* position of the <code>i</code>-th glyph is at index <code>2 *
|
|
|
|
* i</code>, the vertical position at index <code>2 * i + 1</code>.
|
|
|
|
*
|
|
|
|
* @throws IllegalArgumentException if <code>numGlyphs</code>
|
|
|
|
* is less than zero.
|
|
|
|
*
|
|
|
|
* @throws IndexOutOfBoundsException if either
|
|
|
|
* <code>firstGlyphIndex</code> or <code>(firstGlyphIndex +
|
|
|
|
* numGlyphs)</code> is not in the range <code>[0 .. getNumGlyphs() -
|
|
|
|
* 1]</code>.
|
|
|
|
*/
|
|
|
|
public float[] getGlyphPositions(int firstGlyphIndex,
|
|
|
|
int numGlyphs,
|
|
|
|
float[] outPositions)
|
|
|
|
{
|
|
|
|
if (numGlyphs < 0)
|
|
|
|
throw new IllegalArgumentException();
|
|
|
|
|
|
|
|
validate();
|
|
|
|
if (outPositions == null)
|
|
|
|
outPositions = new float[numGlyphs * 2];
|
|
|
|
|
|
|
|
System.arraycopy(/*src */ pos, /* srcStart */ firstGlyphIndex * 2,
|
|
|
|
/* dest */ outPositions, /* destStart */ 0,
|
|
|
|
/* length */ numGlyphs * 2);
|
|
|
|
return outPositions;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private float getAscent()
|
|
|
|
{
|
|
|
|
return fontDelegate.getAscent(fontSize, transform,
|
|
|
|
renderContext.isAntiAliased(),
|
|
|
|
renderContext.usesFractionalMetrics(),
|
|
|
|
/* horizontal */ true);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private float getDescent()
|
|
|
|
{
|
|
|
|
return fontDelegate.getDescent(fontSize, transform,
|
|
|
|
renderContext.isAntiAliased(),
|
|
|
|
renderContext.usesFractionalMetrics(),
|
|
|
|
/* horizontal */ true);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public Shape getGlyphLogicalBounds(int glyphIndex)
|
|
|
|
{
|
|
|
|
float x, y, ascent;
|
|
|
|
|
|
|
|
validate();
|
|
|
|
ascent = getAscent();
|
|
|
|
x = pos[glyphIndex * 2];
|
|
|
|
y = pos[glyphIndex * 2 + 1];
|
|
|
|
|
|
|
|
return new Rectangle2D.Float(x, y - ascent,
|
|
|
|
pos[(glyphIndex + 1) * 2] - x,
|
|
|
|
ascent - getDescent());
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public Shape getGlyphVisualBounds(int glyphIndex)
|
|
|
|
{
|
|
|
|
return getGlyphOutline(glyphIndex).getBounds2D();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Determines the metrics of the glyph at the specified index.
|
|
|
|
*
|
|
|
|
* @param glyphIndex the index of the glyph whose metrics is to be
|
|
|
|
* retrieved.
|
|
|
|
*
|
|
|
|
* @throws IndexOutOfBoundsException if <code>glyphIndex</code> is
|
|
|
|
* not in the range <code[0 .. getNumGlyphs() - 1]</code>.
|
|
|
|
*/
|
|
|
|
public GlyphMetrics getGlyphMetrics(int glyphIndex)
|
|
|
|
{
|
|
|
|
// FIXME: Not yet implemented.
|
|
|
|
throw new UnsupportedOperationException();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Determines the justification information for the glyph at the
|
|
|
|
* specified index.
|
|
|
|
*
|
|
|
|
* @param glyphIndex the index of the glyph whose justification
|
|
|
|
* information is to be retrieved.
|
|
|
|
*
|
|
|
|
* @throws IndexOutOfBoundsException if <code>glyphIndex</code> is
|
|
|
|
* not in the range <code[0 .. getNumGlyphs() - 1]</code>.
|
|
|
|
*/
|
|
|
|
public GlyphJustificationInfo getGlyphJustificationInfo(int glyphIndex)
|
|
|
|
{
|
|
|
|
// FIXME: Not yet implemented.
|
|
|
|
throw new UnsupportedOperationException();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Determines whether another GlyphVector is for the same font and
|
|
|
|
* rendering context, uses the same glyphs and positions them to the
|
|
|
|
* same location.
|
|
|
|
*
|
|
|
|
* @param other the GlyphVector to compare with.
|
|
|
|
*
|
|
|
|
* @return <code>true</code> if the two vectors are equal,
|
|
|
|
* <code>false</code> otherwise.
|
|
|
|
*/
|
|
|
|
public boolean equals(GlyphVector other)
|
|
|
|
{
|
|
|
|
GNUGlyphVector o;
|
|
|
|
if (!(other instanceof GNUGlyphVector))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
o = (GNUGlyphVector) other;
|
|
|
|
if ((this.font != o.font)
|
|
|
|
|| (this.fontDelegate != o.fontDelegate)
|
|
|
|
|| (this.renderContext != o.renderContext)
|
|
|
|
|| (this.glyphs.length != o.glyphs.length))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
for (int i = 0; i < glyphs.length; i++)
|
|
|
|
if (this.glyphs[i] != o.glyphs[i])
|
|
|
|
return false;
|
|
|
|
|
|
|
|
validate();
|
|
|
|
o.validate();
|
|
|
|
for (int i = 0; i < pos.length; i++)
|
|
|
|
if (this.pos[i] != o.pos[i])
|
|
|
|
return false;
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
private void validate()
|
|
|
|
{
|
|
|
|
if (!valid)
|
|
|
|
performDefaultLayout();
|
|
|
|
}
|
|
|
|
}
|