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.

1 files changed, 153 insertions, 0 deletions

diff --git a/gnu/java/awt/java2d/TextCacheKey.java b/gnu/java/awt/java2d/TextCacheKey.java
new file mode 100644
index 000000000..0a60c6226
--- /dev/null
+++ b/gnu/java/awt/java2d/TextCacheKey.java
@@ -0,0 +1,153 @@
+/* TextCacheKey.java -- Key to use for caching texts with their rendered layout
+   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. */
+
+package gnu.java.awt.java2d;
+
+import java.awt.Font;
+import java.awt.font.FontRenderContext;
+
+/**
+ * A key object to be used when caching pre-rendered text.
+ */
+public class TextCacheKey
+{
+
+  /**
+   * The actual string.
+   */
+  private String string;
+
+  /**
+   * The font render context.
+   */
+  private FontRenderContext fontRenderContext;
+
+  /**
+   * The font.
+   */
+  private Font font;
+
+  /**
+   * Creates a new TextCacheKey.
+   *
+   * This is intended to be used as search key. It is important to initialize
+   * the values using the setter methods before using this key, otherwise
+   * it will throw NPEs.
+   */
+  public TextCacheKey()
+  {
+    // No-arg constructor.
+  }
+
+  /**
+   * Creates a new TextCacheKey with initial values.
+   *
+   * @param s the string
+   * @param f the font
+   * @param frc the font render context
+   */
+  public TextCacheKey(String s, Font f, FontRenderContext frc)
+  {
+    string = s;
+    font = f;
+    fontRenderContext = frc;
+  }
+
+  /**
+   * Re-sets the string. This is intented to be used in search keys only.
+   *
+   * @param s the string to set
+   */
+  public void setString(String s)
+  {
+    string = s;
+  }
+
+  /**
+   * Sets the font render context.
+   * This is intented to be used in search keys only.
+   *
+   * @param frc the new font render context
+   */
+  public void setFontRenderContext(FontRenderContext frc)
+  {
+    fontRenderContext = frc;
+  }
+
+  /**
+   * Sets the font.
+   * This is intented to be used in search keys only.
+   *
+   * @param f the font to set
+   */
+  public void setFont(Font f)
+  {
+    font = f;
+  }
+
+  /**
+   * Determines if two objects are equal.
+   *
+   * @see Object#equals(Object)
+   */
+  public boolean equals(Object o)
+  {
+    boolean eq;
+    if (o instanceof TextCacheKey)
+      {
+        TextCacheKey other = (TextCacheKey) o;
+        eq = other.string.equals(string)
+             && other.font.equals(font)
+             && other.fontRenderContext.equals(fontRenderContext);
+      }
+    else
+      {
+        eq = false;
+      }
+    return eq;
+  }
+
+  /**
+   * Computes a hashcode for this key.
+   *
+   * @see Object#hashCode()
+   */
+  public int hashCode()
+  {
+    return string.hashCode() ^ font.hashCode() ^ fontRenderContext.hashCode();
+  }
+}