diff options
author | Roman Kennke <roman@kennke.org> | 2007-09-20 14:01:05 +0000 |
---|---|---|
committer | Roman Kennke <roman@kennke.org> | 2007-09-20 14:01:05 +0000 |
commit | 3eaf3f44a0e41fea77a3e39535b17d455d056a49 (patch) | |
tree | 479662ece4a19a7488466852d0f9876beec69306 /resource | |
parent | df7bb76cd9404208c6a9acc97bc96380a7a210ba (diff) | |
download | classpath-3eaf3f44a0e41fea77a3e39535b17d455d056a49.tar.gz |
2007-09-20 Roman Kennke <roman.kennke@aicas.com>
* gnu/java/awt/font/GNUGlyphVector.java
(cleanOutline): New field, caches the untransformed outline.
(getOutline()): No need to validate here. Already done in
getOutline(float,float).
(getOutline(float,float)): Cache untransformed outlines. Protect
returned shape from modification by wrapping in ShapeWrapper
object.
* gnu/java/awt/font/OpenTypeFontPeer.java: New class. Implements
ClasspathFontPeer for OpenType fonts.
* gnu/java/awt/java2d/AbstractGraphics2D.java
(DEFAULT_TEXT_AA): New constant/property for controlling
default anti-aliasing for text.
(GC_CACHE_SIZE): New constant for the size of the glyph vector
cache.
(shapeCache): Don't make shapeCache thread local. This wouldn't
gain much, because the event dispatch thread is restarted quite
often.
(scanlineConverters): Don't make scanlineConverters thread local,
but instead pool them into a list.
(gvCache): New cache for glyph vectors.
(searchTextKey): New static field, a shared key used for GV caching.
(drawString): Cache glyph vectors.
(getFontRenderContext): Protect the current transform from beeing
changed.
(clone): Check clip for null when cloning.
(drawLine): Use shared shape cache. No need for calling a method here.
(drawRect): Likewise. Add translation to rectangle coordinates.
(fillRect): Use shared shape cache. No need for calling a method here.
(drawRoundRect): Likewise.
(fillRoundRect): Likewise.
(drawOval): Likewise.
(fillOval): Likewise.
(drawArc): Likewise.
(fillArc): Likewise.
(drawPolyline): Likewise.
(drawPolygon): Likewise.
(fillPolygon): Likewise.
(fillShape): Check property for default text AA. Set Y resolution.
(rawDrawLine): Use shared shape cache. No need for calling a method
here.
(rawDrawRect): Likewise.
(rawFillRect): Likewise.
(rawDrawString): Removed. Subclasses override drawString() instead.
(getShapeCache): Removed. No longer needed.
(getScanlineConverter): New helper method for pooling
scanline converters.
(freeScanlineConverter): New helper method for pooling
scanline converters.
* gnu/java/awt/java2d/PixelCoverage.java: New class. Used by the
reworked scanline converter.
* gnu/java/awt/java2d/ScanlineConverter.java
(Y_RESOLUTION): Removed. The Y resolution is now specified
by the caller.
(yResolution): New field. Stores the Y resolution.
(renderShape): Take y resolution as argument.
(setResolution): Take y resolution as argument.
* gnu/java/awt/java2d/ShapeWrapper.java: New class. Protects
shape objects from modification by application code.
* gnu/java/awt/java2d/TextCacheKey.java: New class. Used for
caching GlyphVectors.
* gnu/java/awt/peer/x/XFontPeer2.java: Removed. This is now
implemented in OpenTypeFontPeer now.
* gnu/java/awt/peer/x/XEventPump.java
(handleEvent): Check insets.
* gnu/java/awt/peer/x/XFontPeer.java
Changed class and method names for changed Escher API.
(clinit): Use font properties from xfonts.properties.
(canDisplay): Changed to take int argument.
* gnu/java/awt/peer/x/XFramePeer.java
(XFramePeer): Set the title of the frame on creation time.
(setTitle): Implemented.
* gnu/java/awt/peer/x/XGraphics2D.java
(imageCache): New field. Caches native representations for
images.
(drawString): New method. Optimized version for X fonts.
(fillScanline): Removed.
(fillScanlineAA): Removed.
(rawDrawImage): Optimized drawing for ZPixmap-backed images.
(rawDrawRect): Optimized rectangle drawing.
(renderScanline): Added compositing code.
(setFont): Overridden for X font support.
(setPaint): Added TODO.
* gnu/java/awt/peer/x/XGraphicsConfiguration.java
(getSize): New helper method for XToolkit.
(getResolution): New helper method for XToolkit.
* gnu/java/awt/peer/x/XGraphicsEnvironment.java
(getAvailableFontFamilyNames): Implemented.
* gnu/java/awt/peer/x/XToolkit.java
(fontCache): New field for caching fonts.
(getClasspathFontPeer): Cache fonts.
(getScreenSize): Implemented.
(getScreenResolution): Implemented.
(getFontList): Implemented.
(isModalExclusionTypeSupported): New method.
(isModalityTypeSupported): New method.
* gnu/java/awt/peer/x/XWindowPeer.java
(insets): New field for storing the insets of the frame.
(XWindowPeer): Set correct decoration.
(getGraphics): Set foreground, background and font.
(show): Determine the correct frame extents.
(reshape): Only resize when not inside callback.
(insets): Implemented correctly.
(getFontMetrics): Use OpenTypeFontPeer.
* gnu/java/awt/peer/x/ZPixmapDataBuffer.java
(getZPixmap): New method. This is used in XGraphics2D for drawing
the buffer.
* gnu/java/util/LRUCache.java: New class. Implements an LRU cache.
Diffstat (limited to 'resource')
-rw-r--r-- | resource/gnu/java/awt/font/fonts.properties | 59 | ||||
-rw-r--r-- | resource/gnu/java/awt/peer/x/xfonts.properties | 25 |
2 files changed, 84 insertions, 0 deletions
diff --git a/resource/gnu/java/awt/font/fonts.properties b/resource/gnu/java/awt/font/fonts.properties new file mode 100644 index 000000000..4fc0b10b8 --- /dev/null +++ b/resource/gnu/java/awt/font/fonts.properties @@ -0,0 +1,59 @@ +# fonts.properties +# Copyright (C) 2007 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. + +# List of available fonts. +FreeMono/p=/usr/share/fonts/truetype/freefont/FreeMono.ttf +FreeMono/b=/usr/share/fonts/truetype/freefont/FreeMonoBold.ttf +FreeMono/bi=/usr/share/fonts/truetype/freefont/FreeMonoBoldOblique.ttf +FreeMono/i=/usr/share/fonts/truetype/freefont/FreeMonoOblique.ttf + +FreeSans/p=/usr/share/fonts/truetype/freefont/FreeSans.ttf +FreeSans/b=/usr/share/fonts/truetype/freefont/FreeSansBold.ttf +FreeSans/bi=/usr/share/fonts/truetype/freefont/FreeSansBoldOblique.ttf +FreeSans/i=/usr/share/fonts/truetype/freefont/FreeSansOblique.ttf + +FreeSerif/p=/usr/share/fonts/truetype/freefont/FreeSerif.ttf +FreeSerif/b=/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf +FreeSerif/bi=/usr/share/fonts/truetype/freefont/FreeSerifBoldOblique.ttf +FreeSerif/i=/usr/share/fonts/truetype/freefont/FreeSerifOblique.ttf + +# List of aliases. +Dialog/a=FreeSans +DialogInput/a=FreeSans +Serif/a=FreeSerif +SansSerif/a=FreeSans +Monospaced/a=FreeMono diff --git a/resource/gnu/java/awt/peer/x/xfonts.properties b/resource/gnu/java/awt/peer/x/xfonts.properties new file mode 100644 index 000000000..2c8755ceb --- /dev/null +++ b/resource/gnu/java/awt/peer/x/xfonts.properties @@ -0,0 +1,25 @@ + +serif.plain=-adobe-times-medium-r-normal--%d-*-*-*-p-*-iso8859-1 +serif.bold=-adobe-times-bold-r-normal--%d-*-*-*-p-*-iso8859-1 +serif.italic=-adobe-times-medium-o-normal--%d-*-*-*-p-*-iso8859-1 +serif.bolditalic=-adobe-times-bold-o-normal--%d-*-*-*-p-*-iso8859-1 + +sansserif.plain=-adobe-helvetica-medium-r-normal--%d-*-*-*-p-*-iso8859-1 +sansserif.bold=-adobe-helvetica-bold-r-normal--%d-*-*-*-p-*-iso8859-1 +sansserif.italic=-adobe-helvetica-medium-o-normal--%d-*-*-*-p-*-iso8859-1 +sansserif.bolditalic=-adobe-helvetica-bold-o-normal--%d-*-*-*-p-*-iso8859-1 + +monospaced.plain=-adobe-courier-medium-r-normal--%d-*-*-*-p-*-iso8859-1 +monospaced.bold=-adobe-courier-bold-r-normal--%d-*-*-*-p-*-iso8859-1 +monospaced.italic=-adobe-courier-medium-o-normal--%d-*-*-*-p-*-iso8859-1 +monospaced.bolditalic=-adobe-courier-bold-o-normal--%d-*-*-*-p-*-iso8859-1 + +dialog.plain=-adobe-helvetica-medium-r-normal--%d-*-*-*-p-*-iso8859-1 +dialog.bold=-adobe-helvetica-bold-r-normal--%d-*-*-*-p-*-iso8859-1 +dialog.italic=-adobe-helvetica-medium-o-normal--%d-*-*-*-p-*-iso8859-1 +dialog.bolditalic=-adobe-helvetica-bold-o-normal--%d-*-*-*-p-*-iso8859-1 + +dialoginput.plain=-adobe-helvetica-medium-r-normal--%d-*-*-*-p-*-iso8859-1 +dialoginput.bold=-adobe-helvetica-bold-r-normal--%d-*-*-*-p-*-iso8859-1 +dialoginput.italic=-adobe-helvetica-medium-o-normal--%d-*-*-*-p-*-iso8859-1 +dialoginput.bolditalic=-adobe-helvetica-bold-o-normal--%d-*-*-*-p-*-iso8859-1 |