
2006-06-13 Thomas Fitzsimmons <fitzsim@redhat.com> * configure: Regenerate. * Makefile.in: Regenerate. * configure.ac (--enable-plugin): New option. (ac_configure_args): Add --enable-tool-wrappers. (ac_configure_args): Add --disable-plugin unless --enable-plugin was specified. * gcj/Makefile.in: Regenerate. * sources.am (gnu_java_net_source_files): Add classpath/gnu/java/net/IndexListParser.java. (property_files): Remove classpath/resource/gnu/classpath/tools/jarsigner/MessageBundle.properties, classpath/resource/gnu/classpath/tools/keytool/MessageBundle.properties. Add classpath/resource/gnu/classpath/tools/appletviewer/MessagesBundle.properties, classpath/resource/gnu/classpath/tools/appletviewer/MessagesBundle_de.properties, classpath/resource/gnu/classpath/tools/getopt/Messages.properties, classpath/resource/gnu/classpath/tools/jar/messages.properties, classpath/resource/gnu/classpath/tools/jarsigner/messages.properties, classpath/resource/gnu/classpath/tools/keytool/messages.properties, classpath/resource/gnu/classpath/tools/native2ascii/messages.properties, classpath/resource/gnu/classpath/tools/serialver/messages.properties. * classpath/Makefile.in: Regenerate. * classpath/native/jni/gtk-peer/cairographics2d.h, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c: Merge from GNU Classpath. * classpath/native/Makefile.in: Regenerate. * classpath/native/jawt/Makefile.in: Regenerate. * classpath/native/jawt/Makefile.am: Install libjawt.so in GCJ's versioned library directory. * classpath/native/Makefile.am: Add plugin directory if --enable-plugin was specified. * classpath/native/plugin/Makefile.in: Regenerate. * classpath/native/plugin/Makefile.am: Install libgcjwebplugin.so in GCJ's versioned library directory. * classpath/resource/gnu/classpath/tools/native2ascii/messages.properties: New file. * classpath/resource/gnu/classpath/tools/getopt/Messages.properties: Likewise. * classpath/resource/gnu/classpath/tools/jarsigner/messages.properties: Likewise. * classpath/resource/gnu/classpath/tools/jarsigner/MessageBundle.properties: Remove file. * classpath/resource/gnu/classpath/tools/keytool/messages.properties: New file. * classpath/resource/gnu/classpath/tools/keytool/MessageBundle.properties: Remove file. * classpath/resource/gnu/classpath/tools/appletviewer/MessagesBundle_de.properties: New file. * classpath/resource/gnu/classpath/tools/appletviewer/MessagesBundle.properties: Likewise. * classpath/resource/gnu/classpath/tools/jar/messages.properties: Likewise. * classpath/resource/gnu/classpath/tools/serialver/messages.properties: Likewise. * classpath/gnu/java/net/IndexListParser.java: Likewise. * classpath/gnu/java/awt/peer/gtk/VolatileImageGraphics.java, classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java, classpath/gnu/java/awt/peer/gtk/CairoSurface.java, classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java, classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java, classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java, classpath/gnu/java/awt/peer/gtk/GdkTextLayout.java, classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java, classpath/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java, classpath/gnu/java/awt/peer/gtk/GtkVolatileImage.java, classpath/gnu/java/awt/font/opentype/truetype/VirtualMachine.java, classpath/gnu/java/awt/java2d/PolyEdge.java, classpath/gnu/java/awt/java2d/AbstractGraphics2D.java: Merge from GNU Classpath. * classpath/tools/toolwrapper.c: Replace tools.zip reference with libgcj-tools-4.2.0.jar. * classpath/tools/Makefile.in: Regenerate. * classpath/tools/Makefile.am: Rename tools.zip to libgcj-tools-4.2.0.jar. Install libgcj-tools-4.2.0.jar in $(datadir)/java. * classpath/javax/swing/JTabbedPane.java, classpath/javax/swing/text/DefaultStyledDocument.java, classpath/javax/swing/text/html/HTMLDocument.java, classpath/javax/swing/text/GapContent.java, classpath/javax/swing/JComponent.java, classpath/javax/swing/RepaintManager.java, classpath/javax/swing/plaf/basic/BasicComboBoxRenderer.java, classpath/javax/swing/plaf/basic/BasicScrollBarUI.java, classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java, classpath/javax/swing/plaf/basic/BasicScrollPaneUI.java, classpath/javax/swing/plaf/basic/BasicLookAndFeel.java, classpath/javax/swing/plaf/metal/MetalButtonUI.java, classpath/java/text/Bidi.java, classpath/java/awt/image/BufferedImage.java, classpath/java/awt/datatransfer/DataFlavor.java, classpath/java/awt/geom/AffineTransform.java, classpath/java/awt/dnd/DropTargetDropEvent.java, classpath/java/awt/dnd/DropTargetContext.java, classpath/java/awt/font/TextLayout.java, classpath/include/gnu_java_awt_peer_gtk_ComponentGraphics.h, classpath/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h, classpath/include/gnu_java_awt_peer_gtk_FreetypeGlyphVector.h, classpath/include/gnu_java_awt_peer_gtk_GdkTextLayout.h, classpath/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h, classpath/include/gnu_java_awt_peer_gtk_CairoSurface.h: Merge from GNU Classpath. * classpath/include/gnu_java_awt_peer_gtk_GdkGraphics.h, classpath/include/gnu_java_awt_peer_gtk_GdkGraphics2D.h, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c, classpath/native/jni/gtk-peer/gtkcairopeer.h, classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c: Remove files. * classpath/Makefile.am (SUBDIRS, DIST_SUBDIRS): Include tools directory. * include/Makefile.in: Regenerate. * testsuite/Makefile.in: Regenerate. From-SVN: r114633
315 lines
8.8 KiB
Java
315 lines
8.8 KiB
Java
/* CairoSurface.java
|
|
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.peer.gtk;
|
|
|
|
import java.awt.Graphics;
|
|
import java.awt.Color;
|
|
import java.awt.Image;
|
|
import java.awt.Point;
|
|
import java.awt.Graphics2D;
|
|
import java.awt.GraphicsConfiguration;
|
|
import java.awt.image.DataBuffer;
|
|
import java.awt.image.Raster;
|
|
import java.awt.image.WritableRaster;
|
|
import java.awt.image.BufferedImage;
|
|
import java.awt.image.ColorModel;
|
|
import java.awt.image.DirectColorModel;
|
|
import java.io.File;
|
|
import java.io.IOException;
|
|
import java.util.Hashtable;
|
|
import java.util.Vector;
|
|
import java.io.ByteArrayOutputStream;
|
|
import java.io.BufferedInputStream;
|
|
import java.net.URL;
|
|
import gnu.classpath.Pointer;
|
|
|
|
/**
|
|
* CairoSurface - wraps a Cairo surface.
|
|
*
|
|
* @author Sven de Marothy
|
|
*/
|
|
public class CairoSurface extends DataBuffer
|
|
{
|
|
int width = -1, height = -1;
|
|
|
|
/**
|
|
* The native pointer to the Cairo surface.
|
|
*/
|
|
long surfacePointer;
|
|
|
|
/**
|
|
* The native pointer to the image's data buffer
|
|
*/
|
|
long bufferPointer;
|
|
|
|
|
|
static ColorModel nativeModel = new DirectColorModel(32,
|
|
0x000000FF,
|
|
0x0000FF00,
|
|
0x00FF0000,
|
|
0xFF000000);
|
|
|
|
/**
|
|
* Allocates and clears the buffer and creates the cairo surface.
|
|
* @param width, height - the image size
|
|
* @param stride - the buffer row stride. (in ints)
|
|
*/
|
|
private native void create(int width, int height, int stride);
|
|
|
|
/**
|
|
* Destroys the cairo surface and frees the buffer.
|
|
*/
|
|
private native void destroy(long surfacePointer, long bufferPointer);
|
|
|
|
/**
|
|
* Gets buffer elements
|
|
*/
|
|
private native int nativeGetElem(long bufferPointer, int i);
|
|
|
|
/**
|
|
* Sets buffer elements.
|
|
*/
|
|
private native void nativeSetElem(long bufferPointer, int i, int val);
|
|
|
|
/**
|
|
* Draws this image to a given CairoGraphics context,
|
|
* with an affine transform given by i2u.
|
|
*/
|
|
public native void nativeDrawSurface(long surfacePointer, long contextPointer,
|
|
double[] i2u, double alpha);
|
|
|
|
public void drawSurface(long contextPointer, double[] i2u, double alpha)
|
|
{
|
|
nativeDrawSurface(surfacePointer, contextPointer, i2u, alpha);
|
|
}
|
|
|
|
/**
|
|
* getPixels -return the pixels as a java array.
|
|
*/
|
|
native int[] nativeGetPixels(long bufferPointer, int size);
|
|
|
|
public int[] getPixels(int size)
|
|
{
|
|
return nativeGetPixels(bufferPointer, size);
|
|
}
|
|
|
|
/**
|
|
* getPixels -return the pixels as a java array.
|
|
*/
|
|
native void nativeSetPixels(long bufferPointer, int[] pixels);
|
|
|
|
public void setPixels(int[] pixels)
|
|
{
|
|
nativeSetPixels(bufferPointer, pixels);
|
|
}
|
|
|
|
native long getFlippedBuffer(long bufferPointer, int size);
|
|
|
|
/**
|
|
* Create a cairo_surface_t with specified width and height.
|
|
* The format will be ARGB32 with premultiplied alpha and native bit
|
|
* and word ordering.
|
|
*/
|
|
public CairoSurface(int width, int height)
|
|
{
|
|
super(DataBuffer.TYPE_INT, width * height);
|
|
|
|
if(width <= 0 || height <= 0)
|
|
throw new IllegalArgumentException("Image must be at least 1x1 pixels.");
|
|
|
|
this.width = width;
|
|
this.height = height;
|
|
|
|
create(width, height, width);
|
|
|
|
if(surfacePointer == 0 || bufferPointer == 0)
|
|
throw new Error("Could not allocate bitmap.");
|
|
}
|
|
|
|
/**
|
|
* Create a cairo_surface_t from a GtkImage instance.
|
|
* (data is copied, not shared)
|
|
*/
|
|
CairoSurface(GtkImage image)
|
|
{
|
|
super(DataBuffer.TYPE_INT, image.width * image.height);
|
|
|
|
if(image.width <= 0 || image.height <= 0)
|
|
throw new IllegalArgumentException("Image must be at least 1x1 pixels.");
|
|
|
|
width = image.width;
|
|
height = image.height;
|
|
|
|
create(width, height, width);
|
|
|
|
if(surfacePointer == 0 || bufferPointer == 0)
|
|
throw new Error("Could not allocate bitmap.");
|
|
|
|
// Copy the pixel data from the GtkImage.
|
|
int[] data = image.getPixels();
|
|
|
|
// Swap ordering from GdkPixbuf to Cairo
|
|
for(int i = 0; i < data.length; i++ )
|
|
{
|
|
int alpha = (data[i] & 0xFF000000) >> 24;
|
|
if( alpha == 0 ) // I do not know why we need this, but it works.
|
|
data[i] = 0;
|
|
else
|
|
{
|
|
int r = (((data[i] & 0x00FF0000) >> 16) );
|
|
int g = (((data[i] & 0x0000FF00) >> 8) );
|
|
int b = ((data[i] & 0x000000FF) );
|
|
data[i] = (( alpha << 24 ) & 0xFF000000)
|
|
| (( b << 16 ) & 0x00FF0000)
|
|
| (( g << 8 ) & 0x0000FF00)
|
|
| ( r & 0x000000FF);
|
|
}
|
|
}
|
|
|
|
setPixels( data );
|
|
}
|
|
|
|
/**
|
|
* Dispose of the native data.
|
|
*/
|
|
public void dispose()
|
|
{
|
|
if(surfacePointer != 0)
|
|
destroy(surfacePointer, bufferPointer);
|
|
}
|
|
|
|
/**
|
|
* Call dispose() to clean up any native resources allocated.
|
|
*/
|
|
protected void finalize()
|
|
{
|
|
dispose();
|
|
}
|
|
|
|
/**
|
|
* Return a GtkImage from this Cairo surface.
|
|
*/
|
|
public GtkImage getGtkImage()
|
|
{
|
|
return new GtkImage( width, height,
|
|
getFlippedBuffer(bufferPointer, width * height ));
|
|
}
|
|
|
|
/**
|
|
* Returns a BufferedImage backed by a Cairo surface.
|
|
*/
|
|
public static BufferedImage getBufferedImage(int width, int height)
|
|
{
|
|
return getBufferedImage(new CairoSurface(width, height));
|
|
}
|
|
|
|
/**
|
|
* Returns a BufferedImage backed by a Cairo surface,
|
|
* created from a GtkImage.
|
|
*/
|
|
public static BufferedImage getBufferedImage(GtkImage image)
|
|
{
|
|
return getBufferedImage(new CairoSurface(image));
|
|
}
|
|
|
|
/**
|
|
* Returns a BufferedImage backed by a Cairo surface.
|
|
*/
|
|
public static BufferedImage getBufferedImage(CairoSurface surface)
|
|
{
|
|
WritableRaster raster = Raster.createPackedRaster
|
|
(surface, surface.width, surface.height, surface.width,
|
|
new int[]{ 0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000 },
|
|
new Point(0,0));
|
|
|
|
return new BufferedImage(nativeModel, raster, true, new Hashtable());
|
|
}
|
|
|
|
/**
|
|
* DataBank.getElem implementation
|
|
*/
|
|
public int getElem(int bank, int i)
|
|
{
|
|
if(bank != 0 || i < 0 || i >= width*height)
|
|
throw new IndexOutOfBoundsException(i+" size: "+width*height);
|
|
return nativeGetElem(bufferPointer, i);
|
|
}
|
|
|
|
/**
|
|
* DataBank.setElem implementation
|
|
*/
|
|
public void setElem(int bank, int i, int val)
|
|
{
|
|
if(bank != 0 || i < 0 || i >= width*height)
|
|
throw new IndexOutOfBoundsException(i+" size: "+width*height);
|
|
nativeSetElem(bufferPointer, i, val);
|
|
}
|
|
|
|
/**
|
|
* Return a Graphics2D drawing to the CairoSurface.
|
|
*/
|
|
public Graphics2D getGraphics()
|
|
{
|
|
return new CairoSurfaceGraphics(this);
|
|
}
|
|
|
|
///// Methods used by CairoSurfaceGraphics /////
|
|
/**
|
|
* Creates a cairo_t drawing context, returns the pointer as a long.
|
|
* Used by CairoSurfaceGraphics.
|
|
*/
|
|
native long nativeNewCairoContext(long surfacePointer);
|
|
|
|
public long newCairoContext()
|
|
{
|
|
return nativeNewCairoContext(surfacePointer);
|
|
}
|
|
|
|
/**
|
|
* Copy an area of the surface. Expects parameters must be within bounds.
|
|
* Count on a segfault otherwise.
|
|
*/
|
|
native void copyAreaNative2(long bufferPointer, int x, int y, int width,
|
|
int height, int dx, int dy, int stride);
|
|
public void copyAreaNative(int x, int y, int width,
|
|
int height, int dx, int dy, int stride)
|
|
{
|
|
copyAreaNative2(bufferPointer, x, y, width, height, dx, dy, stride);
|
|
}
|
|
}
|