diff -r -up gcc.patched/libjava/gnu/awt/xlib/XGraphics.java gcc/libjava/gnu/awt/xlib/XGraphics.java --- gcc.patched/libjava/gnu/awt/xlib/XGraphics.java 2003-02-03 12:56:08.000000000 -0500 +++ gcc/libjava/gnu/awt/xlib/XGraphics.java 2003-03-19 17:10:14.000000000 -0500 @@ -58,16 +58,17 @@ public class XGraphics implements Clonea context = null; config = null; clipBounds = null; + metrics = null; if (lContext != null) - { - lContext.dispose(); - } + { + lContext.dispose(); + } } public XGraphics(Drawable drawable, XGraphicsConfiguration config) { - context = new GC(drawable); + context = GC.create(drawable); this.config = config; } diff -r -up gcc.patched/libjava/gnu/awt/xlib/XToolkit.java gcc/libjava/gnu/awt/xlib/XToolkit.java --- gcc.patched/libjava/gnu/awt/xlib/XToolkit.java 2003-02-03 12:56:08.000000000 -0500 +++ gcc/libjava/gnu/awt/xlib/XToolkit.java 2003-03-13 15:26:05.000000000 -0500 @@ -188,7 +188,10 @@ public class XToolkit extends Toolkit public void sync() { - throw new UnsupportedOperationException("not implemented yet"); + flushIfIdle (); + // FIXME: should instead wait for eventLoop to go idle + // (perhaps send a dummy event there and block till it makes + // it through the queue) } public Image getImage(String filename) diff -r -up gcc.patched/libjava/gnu/gcj/xlib/Clip.java gcc/libjava/gnu/gcj/xlib/Clip.java --- gcc.patched/libjava/gnu/gcj/xlib/Clip.java 2003-02-03 12:56:08.000000000 -0500 +++ gcc/libjava/gnu/gcj/xlib/Clip.java 2003-03-10 16:06:34.000000000 -0500 @@ -29,7 +29,12 @@ final class Clip private native void init(Rectangle[] rects); - public native void finalize(); + public void finalize() + { + dispose (); + } + + public native void dispose(); RawData xrects; } diff -r -up gcc.patched/libjava/gnu/gcj/xlib/Drawable.java gcc/libjava/gnu/gcj/xlib/Drawable.java --- gcc.patched/libjava/gnu/gcj/xlib/Drawable.java 2003-02-03 12:56:08.000000000 -0500 +++ gcc/libjava/gnu/gcj/xlib/Drawable.java 2003-03-19 17:39:38.000000000 -0500 @@ -16,6 +16,9 @@ import java.awt.Rectangle; */ public class Drawable extends XID { + private GC[] gcCache = new GC[10]; + private int gcCachedCount = 0; + public Drawable(Display display, int xid) { super(display, xid); @@ -78,5 +81,36 @@ public class Drawable extends XID private static final String MSG_XGETSUBIMAGE_FAILED = "XGetSubImage() failed."; - + + protected void finalize() throws Throwable + { + // Dispose all the cached GCs, to reduce X server resource usage + for (int i=0; i= gcCache.length) + { + // List full - extend it to double its present size + GC[] oldList = gcCache; + gcCache = new GC[oldList.length*2]; + System.arraycopy (oldList,0,gcCache,0,oldList.length); + } + gcCache[gcCachedCount++] = gc; + } + + /** Get a GC from the cache, if available + * @return A GC from the cache, or null if the cache is empty + */ + GC getGCFromCache () + { + return (gcCachedCount>0) ? gcCache[--gcCachedCount] : null; + } } diff -r -up gcc.patched/libjava/gnu/gcj/xlib/GC.java gcc/libjava/gnu/gcj/xlib/GC.java --- gcc.patched/libjava/gnu/gcj/xlib/GC.java 2003-02-03 12:56:08.000000000 -0500 +++ gcc/libjava/gnu/gcj/xlib/GC.java 2003-03-19 17:39:15.000000000 -0500 @@ -23,17 +23,25 @@ import java.awt.Rectangle; */ public class GC implements Cloneable { - - public GC(Drawable target) + /** Protected constructor, because GC.create(target) should be used instead. + */ + protected GC(Drawable target) { this.target = target; initStructure(null); } + /** Try to get a suitable GC from the drawable's cache. + * If there isn't one, create one. + */ public Object clone() { - GC gcClone = (GC) super.clone(); - gcClone.structure = null; + GC gcClone = target.getGCFromCache (); + if (gcClone==null) + { + gcClone = (GC) super.clone(); + gcClone.structure = null; + } gcClone.initStructure(this); gcClone.updateClip(); return gcClone; @@ -45,15 +53,31 @@ public class GC implements Cloneable { return (GC) clone(); } + + /** Create a GC, or if one is already cached for target, return that. + * @param target The Drawable for which a GC is needed + * @return The new or retrieved GC + */ + static public GC create (Drawable target) + { + GC returnValue = target.getGCFromCache (); + if (returnValue == null) + returnValue = new GC (target); + return returnValue; + } public void finalize() { disposeImpl(); } + /** Save this GC in the drawable's cache. + * The "real" dispose (disposeImpl) is called when the + * drawable is finialized, to free X server resources. + */ public void dispose() { - disposeImpl(); + target.putGCInCache (this); } public synchronized native void disposeImpl(); diff -r -up gcc.patched/libjava/gnu/gcj/xlib/natClip.cc gcc/libjava/gnu/gcj/xlib/natClip.cc --- gcc.patched/libjava/gnu/gcj/xlib/natClip.cc 2003-02-03 12:56:08.000000000 -0500 +++ gcc/libjava/gnu/gcj/xlib/natClip.cc 2003-03-10 16:06:58.000000000 -0500 @@ -46,7 +46,11 @@ void gnu::gcj::xlib::Clip::init(AWTRectA xrects = reinterpret_cast(xrectvector); } -void gnu::gcj::xlib::Clip::finalize() +void gnu::gcj::xlib::Clip::dispose() { - delete xrects; xrects = 0; + if (xrects) + { + delete xrects; + xrects = 0; + } } diff -r -up gcc.patched/libjava/gnu/gcj/xlib/natGC.cc gcc/libjava/gnu/gcj/xlib/natGC.cc --- gcc.patched/libjava/gnu/gcj/xlib/natGC.cc 2003-02-18 15:29:13.000000000 -0500 +++ gcc/libjava/gnu/gcj/xlib/natGC.cc 2003-03-19 16:08:52.000000000 -0500 @@ -34,12 +34,16 @@ void gnu::gcj::xlib::GC::initStructure(G { Display* display = target->getDisplay(); ::Display* dpy = (::Display*) (display->display); - ::Drawable drawableXID = target->getXID(); - - ::GC gc = XCreateGC(dpy, drawableXID, 0, 0); - - if (gc == 0) - throw new XException(JvNewStringLatin1("GC creation failed")); + ::GC gc = (::GC) structure; + if (gc == 0) + { + // If we haven't already created a GC, create one now + ::Drawable drawableXID = target->getXID(); + gc = XCreateGC(dpy, drawableXID, 0, 0); + structure = reinterpret_cast(gc); + if (gc == 0) + throw new XException(JvNewStringLatin1("GC creation failed")); + } if (copyFrom != 0) { @@ -47,8 +51,6 @@ void gnu::gcj::xlib::GC::initStructure(G XCopyGC(dpy, fromGC, ~0, gc); // no fast fail } - - structure = reinterpret_cast(gc); } void gnu::gcj::xlib::GC::disposeImpl() diff -r -up gcc.patched/libjava/gnu/gcj/xlib/Pixmap.java gcc/libjava/gnu/gcj/xlib/Pixmap.java --- gcc.patched/libjava/gnu/gcj/xlib/Pixmap.java 2003-02-03 12:56:08.000000000 -0500 +++ gcc/libjava/gnu/gcj/xlib/Pixmap.java 2003-03-19 17:14:39.000000000 -0500 @@ -25,7 +25,7 @@ public class Pixmap extends Drawable /* FIXME: don't create a new GC all the time. This might actually not be as bad as initially believed. The GC cache of Xlib makes this operation less costly. */ - GC gc = new GC(this); + GC gc = GC.create (this); gc.putImage(image, 0, 0, 0, 0, image.getWidth(), image.getHeight()); } diff -r -up gcc.patched/libjava/java/awt/Container.java gcc/libjava/java/awt/Container.java --- gcc.patched/libjava/java/awt/Container.java 2003-02-17 15:13:38.000000000 -0500 +++ gcc/libjava/java/awt/Container.java 2003-03-06 11:51:43.000000000 -0500 @@ -1134,10 +1134,17 @@ public class Container extends Component if (clip.isEmpty()) return; Graphics gfx2 = gfx.create(); - gfx2.setClip(clip.x, clip.y, clip.width, clip.height); - gfx2.translate(bounds.x, bounds.y); + try + { + gfx2.setClip(clip.x, clip.y, clip.width, clip.height); + gfx2.translate(bounds.x, bounds.y); - visitor.visit(comp, gfx2); + visitor.visit(comp, gfx2); + } + finally + { + gfx2.dispose (); + } } void dispatchEventImpl(AWTEvent e)