summaryrefslogtreecommitdiffstats
path: root/libjava/gnu/java/awt
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/gnu/java/awt')
-rw-r--r--libjava/gnu/java/awt/font/GNUGlyphVector.h1
-rw-r--r--libjava/gnu/java/awt/font/OpenTypeFontPeer$XFontMetrics.h61
-rw-r--r--libjava/gnu/java/awt/font/OpenTypeFontPeer$XLineMetrics.h73
-rw-r--r--libjava/gnu/java/awt/font/OpenTypeFontPeer.h96
-rw-r--r--libjava/gnu/java/awt/image/AsyncImage$AsyncImageSource.h61
-rw-r--r--libjava/gnu/java/awt/image/AsyncImage.h72
-rw-r--r--libjava/gnu/java/awt/image/ImageConverter.h82
-rw-r--r--libjava/gnu/java/awt/java2d/AbstractGraphics2D.h12
-rw-r--r--libjava/gnu/java/awt/java2d/PixelCoverage$Bucket.h42
-rw-r--r--libjava/gnu/java/awt/java2d/PixelCoverage.h45
-rw-r--r--libjava/gnu/java/awt/java2d/ScanlineConverter.h6
-rw-r--r--libjava/gnu/java/awt/java2d/ShapeWrapper.h63
-rw-r--r--libjava/gnu/java/awt/java2d/TextCacheKey.h57
-rw-r--r--libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h2
-rw-r--r--libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.h2
15 files changed, 667 insertions, 8 deletions
diff --git a/libjava/gnu/java/awt/font/GNUGlyphVector.h b/libjava/gnu/java/awt/font/GNUGlyphVector.h
index 99086f13f2a..a3f54bf8edd 100644
--- a/libjava/gnu/java/awt/font/GNUGlyphVector.h
+++ b/libjava/gnu/java/awt/font/GNUGlyphVector.h
@@ -93,6 +93,7 @@ private:
JArray< jfloat > * pos;
JArray< ::java::awt::geom::AffineTransform * > * transforms;
jint layoutFlags;
+ ::java::awt::Shape * cleanOutline;
public:
static ::java::lang::Class class$;
};
diff --git a/libjava/gnu/java/awt/font/OpenTypeFontPeer$XFontMetrics.h b/libjava/gnu/java/awt/font/OpenTypeFontPeer$XFontMetrics.h
new file mode 100644
index 00000000000..3f0b4d28c14
--- /dev/null
+++ b/libjava/gnu/java/awt/font/OpenTypeFontPeer$XFontMetrics.h
@@ -0,0 +1,61 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_awt_font_OpenTypeFontPeer$XFontMetrics__
+#define __gnu_java_awt_font_OpenTypeFontPeer$XFontMetrics__
+
+#pragma interface
+
+#include <java/awt/FontMetrics.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+ namespace gnu
+ {
+ namespace java
+ {
+ namespace awt
+ {
+ namespace font
+ {
+ class OpenTypeFontPeer;
+ class OpenTypeFontPeer$XFontMetrics;
+ }
+ }
+ }
+ }
+ namespace java
+ {
+ namespace awt
+ {
+ class Font;
+ namespace geom
+ {
+ class Point2D;
+ }
+ }
+ }
+}
+
+class gnu::java::awt::font::OpenTypeFontPeer$XFontMetrics : public ::java::awt::FontMetrics
+{
+
+public: // actually package-private
+ OpenTypeFontPeer$XFontMetrics(::gnu::java::awt::font::OpenTypeFontPeer *, ::java::awt::Font *);
+public:
+ virtual jint getAscent();
+ virtual jint getDescent();
+ virtual jint getHeight();
+ virtual jint charWidth(jchar);
+ virtual jint charsWidth(JArray< jchar > *, jint, jint);
+ virtual jint stringWidth(::java::lang::String *);
+private:
+ ::java::awt::geom::Point2D * __attribute__((aligned(__alignof__( ::java::awt::FontMetrics)))) cachedPoint;
+public: // actually package-private
+ ::gnu::java::awt::font::OpenTypeFontPeer * this$0;
+public:
+ static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_awt_font_OpenTypeFontPeer$XFontMetrics__
diff --git a/libjava/gnu/java/awt/font/OpenTypeFontPeer$XLineMetrics.h b/libjava/gnu/java/awt/font/OpenTypeFontPeer$XLineMetrics.h
new file mode 100644
index 00000000000..1fec3c237e2
--- /dev/null
+++ b/libjava/gnu/java/awt/font/OpenTypeFontPeer$XLineMetrics.h
@@ -0,0 +1,73 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_awt_font_OpenTypeFontPeer$XLineMetrics__
+#define __gnu_java_awt_font_OpenTypeFontPeer$XLineMetrics__
+
+#pragma interface
+
+#include <java/awt/font/LineMetrics.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+ namespace gnu
+ {
+ namespace java
+ {
+ namespace awt
+ {
+ namespace font
+ {
+ class OpenTypeFontPeer;
+ class OpenTypeFontPeer$XLineMetrics;
+ }
+ }
+ }
+ }
+ namespace java
+ {
+ namespace awt
+ {
+ class Font;
+ namespace font
+ {
+ class FontRenderContext;
+ class GlyphVector;
+ }
+ }
+ namespace text
+ {
+ class CharacterIterator;
+ }
+ }
+}
+
+class gnu::java::awt::font::OpenTypeFontPeer$XLineMetrics : public ::java::awt::font::LineMetrics
+{
+
+public: // actually package-private
+ OpenTypeFontPeer$XLineMetrics(::gnu::java::awt::font::OpenTypeFontPeer *, ::java::awt::Font *, ::java::text::CharacterIterator *, jint, jint, ::java::awt::font::FontRenderContext *);
+public:
+ virtual jfloat getAscent();
+ virtual jint getBaselineIndex();
+ virtual JArray< jfloat > * getBaselineOffsets();
+ virtual jfloat getDescent();
+ virtual jfloat getHeight();
+ virtual jfloat getLeading();
+ virtual jint getNumChars();
+ virtual jfloat getStrikethroughOffset();
+ virtual jfloat getStrikethroughThickness();
+ virtual jfloat getUnderlineOffset();
+ virtual jfloat getUnderlineThickness();
+private:
+ ::java::awt::Font * __attribute__((aligned(__alignof__( ::java::awt::font::LineMetrics)))) font;
+ ::java::awt::font::GlyphVector * glyphVector;
+ ::java::awt::font::FontRenderContext * fontRenderContext;
+public: // actually package-private
+ ::gnu::java::awt::font::OpenTypeFontPeer * this$0;
+public:
+ static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_awt_font_OpenTypeFontPeer$XLineMetrics__
diff --git a/libjava/gnu/java/awt/font/OpenTypeFontPeer.h b/libjava/gnu/java/awt/font/OpenTypeFontPeer.h
new file mode 100644
index 00000000000..6129982b4c4
--- /dev/null
+++ b/libjava/gnu/java/awt/font/OpenTypeFontPeer.h
@@ -0,0 +1,96 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_awt_font_OpenTypeFontPeer__
+#define __gnu_java_awt_font_OpenTypeFontPeer__
+
+#pragma interface
+
+#include <gnu/java/awt/peer/ClasspathFontPeer.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+ namespace gnu
+ {
+ namespace java
+ {
+ namespace awt
+ {
+ namespace font
+ {
+ class FontDelegate;
+ class OpenTypeFontPeer;
+ }
+ }
+ }
+ }
+ namespace java
+ {
+ namespace awt
+ {
+ class Font;
+ class FontMetrics;
+ namespace font
+ {
+ class FontRenderContext;
+ class GlyphVector;
+ class LineMetrics;
+ }
+ namespace geom
+ {
+ class AffineTransform;
+ class Rectangle2D;
+ }
+ }
+ namespace text
+ {
+ class CharacterIterator;
+ }
+ }
+}
+
+class gnu::java::awt::font::OpenTypeFontPeer : public ::gnu::java::awt::peer::ClasspathFontPeer
+{
+
+public:
+ OpenTypeFontPeer(::java::lang::String *, jint, jint);
+ OpenTypeFontPeer(::java::lang::String *, ::java::util::Map *);
+ virtual jboolean canDisplay(::java::awt::Font *, jint);
+ virtual jint canDisplayUpTo(::java::awt::Font *, ::java::text::CharacterIterator *, jint, jint);
+ virtual ::java::lang::String * getSubFamilyName(::java::awt::Font *, ::java::util::Locale *);
+ virtual ::java::lang::String * getPostScriptName(::java::awt::Font *);
+ virtual jint getNumGlyphs(::java::awt::Font *);
+ virtual jint getMissingGlyphCode(::java::awt::Font *);
+ virtual jbyte getBaselineFor(::java::awt::Font *, jchar);
+ virtual ::java::lang::String * getGlyphName(::java::awt::Font *, jint);
+ virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, ::java::text::CharacterIterator *);
+ virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, JArray< jint > *);
+ virtual ::java::awt::font::GlyphVector * layoutGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, JArray< jchar > *, jint, jint, jint);
+ virtual ::java::awt::FontMetrics * getFontMetrics(::java::awt::Font *);
+ virtual jboolean hasUniformLineMetrics(::java::awt::Font *);
+ virtual ::java::awt::font::LineMetrics * getLineMetrics(::java::awt::Font *, ::java::text::CharacterIterator *, jint, jint, ::java::awt::font::FontRenderContext *);
+ virtual ::java::awt::geom::Rectangle2D * getMaxCharBounds(::java::awt::Font *, ::java::awt::font::FontRenderContext *);
+ static ::java::lang::String * encodeFont(::java::lang::String *, ::java::util::Map *);
+public: // actually package-private
+ static ::java::lang::String * encodeFont(::java::lang::String *, jint);
+ static ::java::lang::String * validName(::java::lang::String *);
+public:
+ static JArray< ::java::lang::String * > * getAvailableFontFamilyNames(::java::util::Locale *);
+private:
+ static ::java::util::Set * getFontNames();
+ ::java::lang::String * mapFontToFilename(::java::lang::String *);
+public: // actually package-private
+ static ::gnu::java::awt::font::FontDelegate * access$0(::gnu::java::awt::font::OpenTypeFontPeer *);
+ static ::java::awt::geom::AffineTransform * access$1();
+private:
+ static ::java::util::Properties * fontProperties;
+ static ::java::util::Set * availableFontNames;
+ static ::java::util::Map * fontToFileMap;
+ static ::java::awt::geom::AffineTransform * IDENDITY;
+ ::gnu::java::awt::font::FontDelegate * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::ClasspathFontPeer)))) fontDelegate;
+public:
+ static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_awt_font_OpenTypeFontPeer__
diff --git a/libjava/gnu/java/awt/image/AsyncImage$AsyncImageSource.h b/libjava/gnu/java/awt/image/AsyncImage$AsyncImageSource.h
new file mode 100644
index 00000000000..ecd73a56be5
--- /dev/null
+++ b/libjava/gnu/java/awt/image/AsyncImage$AsyncImageSource.h
@@ -0,0 +1,61 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_awt_image_AsyncImage$AsyncImageSource__
+#define __gnu_java_awt_image_AsyncImage$AsyncImageSource__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+ namespace gnu
+ {
+ namespace java
+ {
+ namespace awt
+ {
+ namespace image
+ {
+ class AsyncImage;
+ class AsyncImage$AsyncImageSource;
+ }
+ }
+ }
+ }
+ namespace java
+ {
+ namespace awt
+ {
+ namespace image
+ {
+ class ImageConsumer;
+ class ImageProducer;
+ }
+ }
+ }
+}
+
+class gnu::java::awt::image::AsyncImage$AsyncImageSource : public ::java::lang::Object
+{
+
+ AsyncImage$AsyncImageSource(::gnu::java::awt::image::AsyncImage *);
+public:
+ virtual void addConsumer(::java::awt::image::ImageConsumer *);
+ virtual jboolean isConsumer(::java::awt::image::ImageConsumer *);
+ virtual void removeConsumer(::java::awt::image::ImageConsumer *);
+ virtual void requestTopDownLeftRightResend(::java::awt::image::ImageConsumer *);
+ virtual void startProduction(::java::awt::image::ImageConsumer *);
+private:
+ ::java::awt::image::ImageProducer * getRealSource();
+public: // actually package-private
+ AsyncImage$AsyncImageSource(::gnu::java::awt::image::AsyncImage *, ::gnu::java::awt::image::AsyncImage$AsyncImageSource *);
+private:
+ ::java::awt::image::ImageProducer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) realSource;
+public: // actually package-private
+ ::gnu::java::awt::image::AsyncImage * this$0;
+public:
+ static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_awt_image_AsyncImage$AsyncImageSource__
diff --git a/libjava/gnu/java/awt/image/AsyncImage.h b/libjava/gnu/java/awt/image/AsyncImage.h
new file mode 100644
index 00000000000..7c1a731799e
--- /dev/null
+++ b/libjava/gnu/java/awt/image/AsyncImage.h
@@ -0,0 +1,72 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_awt_image_AsyncImage__
+#define __gnu_java_awt_image_AsyncImage__
+
+#pragma interface
+
+#include <java/awt/Image.h>
+extern "Java"
+{
+ namespace gnu
+ {
+ namespace java
+ {
+ namespace awt
+ {
+ namespace image
+ {
+ class AsyncImage;
+ }
+ }
+ }
+ }
+ namespace java
+ {
+ namespace awt
+ {
+ class Graphics;
+ class Image;
+ namespace image
+ {
+ class ImageObserver;
+ class ImageProducer;
+ }
+ }
+ }
+}
+
+class gnu::java::awt::image::AsyncImage : public ::java::awt::Image
+{
+
+public: // actually package-private
+ AsyncImage();
+public:
+ virtual void flush();
+ virtual ::java::awt::Graphics * getGraphics();
+ virtual jboolean isComplete();
+ virtual jint getHeight(::java::awt::image::ImageObserver *);
+ virtual ::java::lang::Object * getProperty(::java::lang::String *, ::java::awt::image::ImageObserver *);
+ virtual ::java::awt::image::ImageProducer * getSource();
+ virtual jint getWidth(::java::awt::image::ImageObserver *);
+ virtual void addObserver(::java::awt::image::ImageObserver *);
+ virtual jboolean prepareImage(jint, jint, ::java::awt::image::ImageObserver *);
+ virtual jint checkImage(jint, jint, ::java::awt::image::ImageObserver *);
+ virtual ::java::awt::Image * getRealImage();
+ virtual void setRealImage(::java::awt::Image *);
+ virtual void notifyObservers(jint, jint, jint, jint, jint);
+ virtual void waitForImage(::java::awt::image::ImageObserver *);
+public: // actually package-private
+ static ::java::awt::Image * access$0(::gnu::java::awt::image::AsyncImage *);
+private:
+ ::java::awt::Image * volatile __attribute__((aligned(__alignof__( ::java::awt::Image)))) realImage;
+public: // actually package-private
+ ::java::util::HashSet * observers;
+private:
+ jboolean volatile complete;
+public:
+ static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_awt_image_AsyncImage__
diff --git a/libjava/gnu/java/awt/image/ImageConverter.h b/libjava/gnu/java/awt/image/ImageConverter.h
new file mode 100644
index 00000000000..8df255f6910
--- /dev/null
+++ b/libjava/gnu/java/awt/image/ImageConverter.h
@@ -0,0 +1,82 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_awt_image_ImageConverter__
+#define __gnu_java_awt_image_ImageConverter__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+ namespace gnu
+ {
+ namespace java
+ {
+ namespace awt
+ {
+ namespace image
+ {
+ class AsyncImage;
+ class ImageConverter;
+ }
+ }
+ }
+ }
+ namespace java
+ {
+ namespace awt
+ {
+ class Image;
+ namespace image
+ {
+ class BufferedImage;
+ class ColorModel;
+ class IndexColorModel;
+ }
+ }
+ }
+}
+
+class gnu::java::awt::image::ImageConverter : public ::java::lang::Object
+{
+
+public:
+ ImageConverter();
+ virtual void setDimensions(jint, jint);
+ virtual void setProperties(::java::util::Hashtable *);
+ virtual void setColorModel(::java::awt::image::ColorModel *);
+ virtual void setHints(jint);
+ virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint);
+ virtual void setPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint);
+private:
+ ::java::awt::image::ColorModel * setupColorModel(::java::awt::image::ColorModel *);
+ void createImage();
+ jint transferPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint, jint);
+ jint transferPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint, jint);
+ jint convertPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jbyte > *, jint, jint, jint);
+ jint convertPixels(jint, jint, jint, jint, ::java::awt::image::ColorModel *, JArray< jint > *, jint, jint, jint);
+ jint convertIndexColorModelToSRGB(jint, jint, jint, jint, ::java::awt::image::IndexColorModel *, JArray< jbyte > *, jint, jint, jint);
+ jint convertIndexColorModelToSRGB(jint, jint, jint, jint, ::java::awt::image::IndexColorModel *, JArray< jint > *, jint, jint, jint);
+ jint updateTransparency(jint, jint);
+public:
+ virtual void imageComplete(jint);
+ virtual void setTargetColorModel(::java::awt::image::ColorModel *);
+ virtual ::java::awt::Image * getImage();
+ static ::java::lang::String * IMAGE_TRANSPARENCY_PROPERTY;
+ static ::java::lang::String * IMAGE_PROPERTIES_PROPERTY;
+private:
+ ::gnu::java::awt::image::AsyncImage * __attribute__((aligned(__alignof__( ::java::lang::Object)))) image;
+ ::java::awt::image::BufferedImage * bImage;
+ ::java::util::Hashtable * imageProperties;
+ jint width;
+ jint height;
+ ::java::awt::image::ColorModel * colorModel;
+ ::java::awt::image::ColorModel * targetColorModel;
+public:
+ static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_awt_image_ImageConverter__
diff --git a/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h b/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h
index 03567167734..92f78733b29 100644
--- a/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h
+++ b/libjava/gnu/java/awt/java2d/AbstractGraphics2D.h
@@ -23,6 +23,7 @@ extern "Java"
class ScanlineConverter;
class ScanlineCoverage;
class ShapeCache;
+ class TextCacheKey;
}
}
}
@@ -170,7 +171,6 @@ public: // actually protected
virtual ::java::awt::Rectangle * getDeviceBounds();
virtual void rawDrawLine(jint, jint, jint, jint);
virtual void rawDrawRect(jint, jint, jint, jint);
- virtual void rawDrawString(::java::lang::String *, jint, jint);
virtual void rawClearRect(jint, jint, jint, jint);
virtual void rawFillRect(jint, jint, jint, jint);
virtual jboolean rawDrawImage(::java::awt::Image *, jint, jint, ::java::awt::image::ImageObserver *);
@@ -187,11 +187,15 @@ private:
void updateOptimization();
static ::java::awt::Rectangle * computeIntersection(jint, jint, jint, jint, ::java::awt::Rectangle *);
void updateClip(::java::awt::geom::AffineTransform *);
- ::gnu::java::awt::java2d::ShapeCache * getShapeCache();
::gnu::java::awt::java2d::ScanlineConverter * getScanlineConverter();
+ void freeScanlineConverter(::gnu::java::awt::java2d::ScanlineConverter *);
+ static jboolean DEFAULT_TEXT_AA;
static ::java::awt::Font * FONT;
- static ::java::lang::ThreadLocal * shapeCache;
- static ::java::lang::ThreadLocal * scanlineConverters;
+ static const jint GV_CACHE_SIZE = 50;
+ static ::gnu::java::awt::java2d::ShapeCache * shapeCache;
+ static ::java::util::LinkedList * scanlineConverters;
+ static ::java::util::Map * gvCache;
+ static ::gnu::java::awt::java2d::TextCacheKey * searchTextKey;
public: // actually protected
::java::awt::geom::AffineTransform * __attribute__((aligned(__alignof__( ::java::awt::Graphics2D)))) transform__;
private:
diff --git a/libjava/gnu/java/awt/java2d/PixelCoverage$Bucket.h b/libjava/gnu/java/awt/java2d/PixelCoverage$Bucket.h
new file mode 100644
index 00000000000..07b6ac072c1
--- /dev/null
+++ b/libjava/gnu/java/awt/java2d/PixelCoverage$Bucket.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_awt_java2d_PixelCoverage$Bucket__
+#define __gnu_java_awt_java2d_PixelCoverage$Bucket__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+ namespace gnu
+ {
+ namespace java
+ {
+ namespace awt
+ {
+ namespace java2d
+ {
+ class PixelCoverage$Bucket;
+ }
+ }
+ }
+ }
+}
+
+class gnu::java::awt::java2d::PixelCoverage$Bucket : public ::java::lang::Object
+{
+
+ PixelCoverage$Bucket();
+public: // actually package-private
+ PixelCoverage$Bucket(::gnu::java::awt::java2d::PixelCoverage$Bucket *);
+ jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) xPos;
+ jint xCov;
+ jint yCov;
+ ::gnu::java::awt::java2d::PixelCoverage$Bucket * next;
+ ::gnu::java::awt::java2d::PixelCoverage$Bucket * prev;
+public:
+ static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_awt_java2d_PixelCoverage$Bucket__
diff --git a/libjava/gnu/java/awt/java2d/PixelCoverage.h b/libjava/gnu/java/awt/java2d/PixelCoverage.h
new file mode 100644
index 00000000000..75a505760e0
--- /dev/null
+++ b/libjava/gnu/java/awt/java2d/PixelCoverage.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_awt_java2d_PixelCoverage__
+#define __gnu_java_awt_java2d_PixelCoverage__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+ namespace gnu
+ {
+ namespace java
+ {
+ namespace awt
+ {
+ namespace java2d
+ {
+ class PixelCoverage;
+ class PixelCoverage$Bucket;
+ }
+ }
+ }
+ }
+}
+
+class gnu::java::awt::java2d::PixelCoverage : public ::java::lang::Object
+{
+
+public: // actually package-private
+ PixelCoverage();
+ void rewind();
+ void clear();
+ void add(jint, jint, jint);
+private:
+ ::gnu::java::awt::java2d::PixelCoverage$Bucket * findOrInsert(jint);
+ ::gnu::java::awt::java2d::PixelCoverage$Bucket * __attribute__((aligned(__alignof__( ::java::lang::Object)))) head;
+ ::gnu::java::awt::java2d::PixelCoverage$Bucket * current;
+ ::gnu::java::awt::java2d::PixelCoverage$Bucket * last;
+public:
+ static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_awt_java2d_PixelCoverage__
diff --git a/libjava/gnu/java/awt/java2d/ScanlineConverter.h b/libjava/gnu/java/awt/java2d/ScanlineConverter.h
index 8ef5369096d..b2da8ffdcd8 100644
--- a/libjava/gnu/java/awt/java2d/ScanlineConverter.h
+++ b/libjava/gnu/java/awt/java2d/ScanlineConverter.h
@@ -50,11 +50,11 @@ class gnu::java::awt::java2d::ScanlineConverter : public ::java::lang::Object
public: // actually package-private
ScanlineConverter();
public:
- void renderShape(::gnu::java::awt::java2d::Pixelizer *, ::java::awt::Shape *, ::java::awt::Shape *, ::java::awt::geom::AffineTransform *, jint, ::java::awt::RenderingHints *);
+ void renderShape(::gnu::java::awt::java2d::Pixelizer *, ::java::awt::Shape *, ::java::awt::Shape *, ::java::awt::geom::AffineTransform *, jint, jint, ::java::awt::RenderingHints *);
private:
void clear();
void doScanline(::gnu::java::awt::java2d::Pixelizer *, jint, jboolean, jboolean);
- void setResolution(jint);
+ void setResolution(jint, jint);
void setUpperBounds(jint);
void addShape(::java::awt::geom::PathIterator *, jboolean);
void addEdge(::gnu::java::awt::java2d::PolyEdge *);
@@ -63,11 +63,11 @@ private:
void edgePoolAdd(jint, jint, jint, jint, jboolean);
static jint FIXED_DIGITS;
static jint ONE;
- static jint Y_RESOLUTION;
jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) numScanlines;
JArray< ::gnu::java::awt::java2d::Scanline * > * scanlines;
jint upperBounds;
jint resolution;
+ jint yResolution;
jint halfStep;
JArray< jfloat > * coords;
::gnu::java::awt::java2d::ActiveEdges * activeEdges;
diff --git a/libjava/gnu/java/awt/java2d/ShapeWrapper.h b/libjava/gnu/java/awt/java2d/ShapeWrapper.h
new file mode 100644
index 00000000000..62c9b357e40
--- /dev/null
+++ b/libjava/gnu/java/awt/java2d/ShapeWrapper.h
@@ -0,0 +1,63 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_awt_java2d_ShapeWrapper__
+#define __gnu_java_awt_java2d_ShapeWrapper__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+ namespace gnu
+ {
+ namespace java
+ {
+ namespace awt
+ {
+ namespace java2d
+ {
+ class ShapeWrapper;
+ }
+ }
+ }
+ }
+ namespace java
+ {
+ namespace awt
+ {
+ class Rectangle;
+ class Shape;
+ namespace geom
+ {
+ class AffineTransform;
+ class PathIterator;
+ class Point2D;
+ class Rectangle2D;
+ }
+ }
+ }
+}
+
+class gnu::java::awt::java2d::ShapeWrapper : public ::java::lang::Object
+{
+
+public:
+ ShapeWrapper(::java::awt::Shape *);
+ virtual jboolean contains(jdouble, jdouble);
+ virtual jboolean contains(::java::awt::geom::Point2D *);
+ virtual jboolean contains(jdouble, jdouble, jdouble, jdouble);
+ virtual jboolean contains(::java::awt::geom::Rectangle2D *);
+ virtual ::java::awt::Rectangle * getBounds();
+ virtual ::java::awt::geom::Rectangle2D * getBounds2D();
+ virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *);
+ virtual ::java::awt::geom::PathIterator * getPathIterator(::java::awt::geom::AffineTransform *, jdouble);
+ virtual jboolean intersects(jdouble, jdouble, jdouble, jdouble);
+ virtual jboolean intersects(::java::awt::geom::Rectangle2D *);
+private:
+ ::java::awt::Shape * __attribute__((aligned(__alignof__( ::java::lang::Object)))) shape;
+public:
+ static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_awt_java2d_ShapeWrapper__
diff --git a/libjava/gnu/java/awt/java2d/TextCacheKey.h b/libjava/gnu/java/awt/java2d/TextCacheKey.h
new file mode 100644
index 00000000000..9904a6a3ee2
--- /dev/null
+++ b/libjava/gnu/java/awt/java2d/TextCacheKey.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_java_awt_java2d_TextCacheKey__
+#define __gnu_java_awt_java2d_TextCacheKey__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+ namespace gnu
+ {
+ namespace java
+ {
+ namespace awt
+ {
+ namespace java2d
+ {
+ class TextCacheKey;
+ }
+ }
+ }
+ }
+ namespace java
+ {
+ namespace awt
+ {
+ class Font;
+ namespace font
+ {
+ class FontRenderContext;
+ }
+ }
+ }
+}
+
+class gnu::java::awt::java2d::TextCacheKey : public ::java::lang::Object
+{
+
+public:
+ TextCacheKey();
+ TextCacheKey(::java::lang::String *, ::java::awt::Font *, ::java::awt::font::FontRenderContext *);
+ virtual void setString(::java::lang::String *);
+ virtual void setFontRenderContext(::java::awt::font::FontRenderContext *);
+ virtual void setFont(::java::awt::Font *);
+ virtual jboolean equals(::java::lang::Object *);
+ virtual jint hashCode();
+private:
+ ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) string;
+ ::java::awt::font::FontRenderContext * fontRenderContext;
+ ::java::awt::Font * font;
+public:
+ static ::java::lang::Class class$;
+};
+
+#endif // __gnu_java_awt_java2d_TextCacheKey__
diff --git a/libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h b/libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h
index 9379c5ea611..a9b70e73bcb 100644
--- a/libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h
+++ b/libjava/gnu/java/awt/peer/gtk/ComponentGraphics.h
@@ -76,7 +76,7 @@ private:
void lock();
void unlock();
public: // actually protected
- virtual jlong initFromVolatile(jlong, jint, jint);
+ virtual jlong initFromVolatile(jlong);
private:
void start_gdk_drawing();
void end_gdk_drawing();
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.h
index fa35e2ad70b..78c7127c85d 100644
--- a/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.h
+++ b/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.h
@@ -87,7 +87,9 @@ public: // actually package-private
virtual void gtkWidgetGetDimensions(JArray< jint > *);
virtual void gtkWidgetGetPreferredDimensions(JArray< jint > *);
virtual void gtkWindowGetLocationOnScreen(JArray< jint > *);
+ virtual void gtkWindowGetLocationOnScreenUnlocked(JArray< jint > *);
virtual void gtkWidgetGetLocationOnScreen(JArray< jint > *);
+ virtual void gtkWidgetGetLocationOnScreenUnlocked(JArray< jint > *);
virtual void gtkWidgetSetCursor(jint, ::gnu::java::awt::peer::gtk::GtkImage *, jint, jint);
virtual void gtkWidgetSetCursorUnlocked(jint, ::gnu::java::awt::peer::gtk::GtkImage *, jint, jint);
virtual void gtkWidgetSetBackground(jint, jint, jint);
OpenPOWER on IntegriCloud