diff options
Diffstat (limited to 'gnu/java/awt/peer/gtk')
| -rw-r--r-- | gnu/java/awt/peer/gtk/CairoSurface.java | 8 | ||||
| -rw-r--r-- | gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java | 33 | ||||
| -rw-r--r-- | gnu/java/awt/peer/gtk/ComponentGraphics.java | 5 | ||||
| -rw-r--r-- | gnu/java/awt/peer/gtk/ComponentGraphicsCopy.java | 129 | ||||
| -rw-r--r-- | gnu/java/awt/peer/gtk/GtkImage.java | 24 |
5 files changed, 189 insertions, 10 deletions
diff --git a/gnu/java/awt/peer/gtk/CairoSurface.java b/gnu/java/awt/peer/gtk/CairoSurface.java index 86809f971..a5645a002 100644 --- a/gnu/java/awt/peer/gtk/CairoSurface.java +++ b/gnu/java/awt/peer/gtk/CairoSurface.java @@ -154,6 +154,14 @@ public class CairoSurface extends DataBuffer } /** + * Return a GtkImage which shares its data with this Cairo surface. + */ + public GtkImage getSharedGtkImage() + { + return new GtkImage( width, height, bufferPointer ); + } + + /** * Returns a BufferedImage backed by a Cairo surface. */ public static BufferedImage getBufferedImage(int width, int height) diff --git a/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java b/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java index 7150adf60..615012725 100644 --- a/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java +++ b/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java @@ -51,7 +51,7 @@ import java.awt.image.*; */ public class CairoSurfaceGraphics extends CairoGraphics2D { - private CairoSurface surface; + protected CairoSurface surface; private long cairo_t; /** @@ -89,13 +89,32 @@ public class CairoSurfaceGraphics extends CairoGraphics2D public void copyArea(int x, int y, int width, int height, int dx, int dy) { - // FIXME: Adjust parameters so that clipping on the edges occurs. - - if( x + dx + width >= surface.width || y + dy + height >= surface.height) + // Return if outside the surface + if( x + dx > surface.width || y + dy > surface.height ) return; - if( x + dx <= 0 || y + dy <= 0) + + if( x + dx + width < 0 || y + dy + height < 0 ) return; - - surface.copyAreaNative(x, y, width, height, dx, dy, surface.width*4); + + // Clip edges if necessary + if( x + dx < 0 ) // left + { + width = x + dx + width; + x = -dx; + } + + if( y + dy < 0 ) // top + { + height = y + dy + height; + y = -dy; + } + + if( x + dx + width >= surface.width ) // right + width = surface.width - dx - x; + + if( y + dy + height >= surface.height ) // bottom + height = surface.height - dy - y; + + surface.copyAreaNative(x, y, width, height, dx, dy, surface.width * 4); } } diff --git a/gnu/java/awt/peer/gtk/ComponentGraphics.java b/gnu/java/awt/peer/gtk/ComponentGraphics.java index e650bc7ac..3ac28ee4a 100644 --- a/gnu/java/awt/peer/gtk/ComponentGraphics.java +++ b/gnu/java/awt/peer/gtk/ComponentGraphics.java @@ -44,6 +44,7 @@ import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.GraphicsConfiguration; import java.awt.Image; +import java.awt.Rectangle; import java.awt.Shape; import java.awt.font.FontRenderContext; import java.awt.font.GlyphVector; @@ -109,7 +110,9 @@ public class ComponentGraphics extends CairoGraphics2D { if( hasXRender() ) return new ComponentGraphics(component); - throw new UnsupportedOperationException("No non-xrender yet."); + + Rectangle r = component.awtComponent.getBounds(); + return new ComponentGraphicsCopy(r.width, r.height, component); } public GraphicsConfiguration getDeviceConfiguration() diff --git a/gnu/java/awt/peer/gtk/ComponentGraphicsCopy.java b/gnu/java/awt/peer/gtk/ComponentGraphicsCopy.java new file mode 100644 index 000000000..a5d54ad20 --- /dev/null +++ b/gnu/java/awt/peer/gtk/ComponentGraphicsCopy.java @@ -0,0 +1,129 @@ +/* ComponentGraphicsCopy.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.Color; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.GraphicsConfiguration; +import java.awt.Image; +import java.awt.Point; +import java.awt.Rectangle; +import java.awt.Shape; +import java.awt.font.GlyphVector; +import java.awt.geom.AffineTransform; +import java.awt.image.BufferedImage; +import java.awt.image.DataBuffer; +import java.awt.image.RenderedImage; +import java.awt.image.ImageObserver; + +/** + * Implementation of Graphics2D for Components for servers which + * do not have xrender. + * + * A mirrored GtkImage of the component is stored in memory + * and copied back. Yay. + */ +public class ComponentGraphicsCopy extends CairoSurfaceGraphics +{ + private GtkComponentPeer component; + + /** + * GtkImage sharing its data buffer with this Cairo surface. + */ + private GtkImage gtkimage; + + private int width, height; + + native void getPixbuf( GtkComponentPeer component, GtkImage image ); + + native void copyPixbuf( GtkComponentPeer component, GtkImage image, + int x, int y, int w, int h ); + + public ComponentGraphicsCopy(int width, int height, + GtkComponentPeer component) + { + super( new CairoSurface( width, height ) ); + this.component = component; + this.width = width; + this.height = height; + gtkimage = surface.getSharedGtkImage(); + getPixbuf( component, gtkimage ); + } + + /** + * Overloaded methods that do actual drawing need to enter the gdk threads + * and also do certain things before and after. + */ + public void draw(Shape s) + { + super.draw(s); + Rectangle r = s.getBounds(); + copyPixbuf(component, gtkimage, r.x, r.y, r.width, r.height); + } + + public void fill(Shape s) + { + super.fill(s); + Rectangle r = s.getBounds(); + copyPixbuf(component, gtkimage, r.x, r.y, r.width, r.height); + } + + public void drawRenderedImage(RenderedImage image, AffineTransform xform) + { + super.drawRenderedImage(image, xform); + copyPixbuf(component, gtkimage, 0, 0, width, height); + } + + protected boolean drawImage(Image img, AffineTransform xform, + Color bgcolor, ImageObserver obs) + { + boolean rv = super.drawImage(img, xform, bgcolor, obs); + copyPixbuf(component, gtkimage, 0, 0, width, height); + return rv; + } + + public void drawGlyphVector(GlyphVector gv, float x, float y) + { + super.drawGlyphVector(gv, x, y); + Rectangle r = gv.getPixelBounds(getFontRenderContext(), x , y); + copyPixbuf(component, gtkimage, r.x, r.y, r.width, r.height); + } +} + diff --git a/gnu/java/awt/peer/gtk/GtkImage.java b/gnu/java/awt/peer/gtk/GtkImage.java index 61cce154b..d4db2bfc2 100644 --- a/gnu/java/awt/peer/gtk/GtkImage.java +++ b/gnu/java/awt/peer/gtk/GtkImage.java @@ -111,6 +111,16 @@ public class GtkImage extends Image 0xFF000000); /** + * The singleton GtkImage that is returned on errors by GtkToolkit. + */ + private static GtkImage errorImage; + + /** + * Allocate a PixBuf from a given ARGB32 buffer pointer + */ + private native void initFromBuffer( long bufferPointer ); + + /** * Returns a copy of the pixel data as a java array. * Should be called with the GdkPixbufDecoder.pixbufLock held. */ @@ -306,8 +316,18 @@ public class GtkImage extends Image props = new Hashtable(); } - // The singleton GtkImage that is returned on errors by GtkToolkit. - private static GtkImage errorImage; + /** + * Wraps a buffer with a GtkImage. Buffer must be + */ + GtkImage(int width, int height, long bufferPointer) + { + this.width = width; + this.height = height; + props = new Hashtable(); + isLoaded = true; + observers = null; + initFromBuffer( bufferPointer ); + } /** * Returns an empty GtkImage with the errorLoading flag set. |