9e9e204234
2003-04-19 Scott Gilbertson <scottg@mantatest.com> * gnu/awt/xlib/XGraphics.java (XGraphics): Use new GC.create. (dispose): Null metrics. * gnu/awt/xlib/XToolkit.java (sync): Implement. * gnu/gcj/xlib/Clip.java (dispose): Change name of native from finalize. (finalize): Call dispose. * gnu/gcj/xlib/Drawable.java (gcCache): New field. (gcCachedCount): New field. (finalize): New method. (putGCInCache): New method. (getGCFromCache): New method. * gnu/gcj/xlib/GC.java (GC): Make protected. (clone): Get new GC from cache if possible. (create): New static method. (dispose): Save old GC in cache. * gnu/gcj/xlib/natClip.cc (dispose): Check for null before deleting. * gnu/gcj/xlib/natGC.cc (initStructure): Call XCreateGC only if gc is null. * gnu/gcj/xlib/Pixmap.java (Pixmap): Use new GC.create. * java/awt/Container.java (visitChild): Dispose gfx2 when finished. From-SVN: r65827
57 lines
1.3 KiB
C++
57 lines
1.3 KiB
C++
/* Copyright (C) 2000 Free Software Foundation
|
|
|
|
This file is part of libgcj.
|
|
|
|
This software is copyrighted work licensed under the terms of the
|
|
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
|
|
details. */
|
|
|
|
// Needed to avoid linking in libstdc++
|
|
#ifndef __STL_USE_EXCEPTIONS
|
|
# include <java/lang/OutOfMemoryError.h>
|
|
# define __THROW_BAD_ALLOC throw new java::lang::OutOfMemoryError()
|
|
#endif
|
|
|
|
#include <vector>
|
|
|
|
#include <X11/Xlib.h>
|
|
#include <gcj/cni.h>
|
|
#include <gnu/gcj/RawData.h>
|
|
#include <java/awt/Rectangle.h>
|
|
|
|
#include "gnu/gcj/xlib/Clip.h"
|
|
|
|
typedef java::awt::Rectangle AWTRect;
|
|
typedef JArray<AWTRect*> AWTRectArray;
|
|
typedef std::vector<XRectangle> XRectVector;
|
|
|
|
void gnu::gcj::xlib::Clip::init(AWTRectArray* rectangles)
|
|
{
|
|
// Prepare rectangles:
|
|
|
|
int numRect = JvGetArrayLength(rectangles);
|
|
XRectVector* xrectvector = new XRectVector(numRect);
|
|
|
|
for (int i=0; i<numRect; i++)
|
|
{
|
|
AWTRect* awtrect = elements(rectangles)[i];
|
|
XRectangle& xrect = (*xrectvector)[i];
|
|
|
|
xrect.x = awtrect->x;
|
|
xrect.y = awtrect->y;
|
|
xrect.width = awtrect->width;
|
|
xrect.height = awtrect->height;
|
|
}
|
|
|
|
xrects = reinterpret_cast<gnu::gcj::RawData*>(xrectvector);
|
|
}
|
|
|
|
void gnu::gcj::xlib::Clip::dispose()
|
|
{
|
|
if (xrects)
|
|
{
|
|
delete xrects;
|
|
xrects = 0;
|
|
}
|
|
}
|