import java.io.*;
import java.net.*;
import java.util.*;
+import org.xwt.js.*;
import org.xwt.util.*;
-import org.mozilla.javascript.*;
/**
* <p>
* uses x1,y1,x2,y2 tuples.
* </p>
*/
-public final class Box extends JSObject {
+public final class Box extends JS.Scope {
// Static Data //////////////////////////////////////////////////////////////
static Hash imageToNameMap = new Hash();
/** the empty object, used for get-traps */
- private static Object[] emptyobj = new Object[] { };
+ private static JS.Array emptyobj = new JS.Array();
// Instance Data: Templates ////////////////////////////////////////////////////////
/** The maximum <i>defined</i> width and height of this box */
public static final int dmax = 0;
- private short _dmax_0 = 0;
- private short _dmax_1 = 0;
- public final short dmax(int axis) { return axis == 0 ? _dmax_0 : _dmax_1; }
+ private int _dmax_0 = 0;
+ private int _dmax_1 = 0;
+ public final int dmax(int axis) { return axis == 0 ? _dmax_0 : _dmax_1; }
/** The minimum <i>defined</i> width and height of this box */
public static final int dmin = 1;
- private short _dmin_0 = 0;
- private short _dmin_1 = 0;
- public final short dmin(int axis) { return axis == 0 ? _dmin_0 : _dmin_1; }
+ private int _dmin_0 = 0;
+ private int _dmin_1 = 0;
+ public final int dmin(int axis) { return axis == 0 ? _dmin_0 : _dmin_1; }
/** The minimum <i>calculated</i> width and height of this box -- unlike dmin, this takes childrens' sizes into account */
public static final int cmin = 2;
- private short _cmin_0 = 0;
- private short _cmin_1 = 0;
- public final short cmin(int axis) { return axis == 0 ? _cmin_0 : _cmin_1; }
+ private int _cmin_0 = 0;
+ private int _cmin_1 = 0;
+ public final int cmin(int axis) { return axis == 0 ? _cmin_0 : _cmin_1; }
/** The position of this box, relitave to the parent */
public static final int abs = 3;
- private short _abs_0 = 0;
- private short _abs_1 = 0;
- public final short abs(int axis) { return axis == 0 ? _abs_0 : _abs_1; }
+ private int _abs_0 = 0;
+ private int _abs_1 = 0;
+ public final int abs(int axis) { return axis == 0 ? _abs_0 : _abs_1; }
/** The absolute position of this box (ie relitave to the root); set by the parent */
public static final int pos = 4;
- private short _pos_0 = 0;
- private short _pos_1 = 0;
- public final short pos(int axis) { return axis == 0 ? _pos_0 : _pos_1; }
+ private int _pos_0 = 0;
+ private int _pos_1 = 0;
+ public final int pos(int axis) { return axis == 0 ? _pos_0 : _pos_1; }
/** The actual size of this box; set by the parent. */
public static final int size = 5;
- short _size_0 = 0;
- short _size_1 = 0;
- public final short size(int axis) { return axis == 0 ? _size_0 : _size_1; }
+ int _size_0 = 0;
+ int _size_1 = 0;
+ public final int size(int axis) { return axis == 0 ? _size_0 : _size_1; }
/** The old actual absolute position of this box (ie relitave to the root) */
public static final int oldpos = 6;
- private short _oldpos_0 = 0;
- private short _oldpos_1 = 0;
- public final short oldpos(int axis) { return axis == 0 ? _oldpos_0 : _oldpos_1; }
+ private int _oldpos_0 = 0;
+ private int _oldpos_1 = 0;
+ public final int oldpos(int axis) { return axis == 0 ? _oldpos_0 : _oldpos_1; }
/** The old actual size of this box */
public static final int oldsize = 7;
- private short _oldsize_0 = 0;
- private short _oldsize_1 = 0;
- public final short oldsize(int axis) { return axis == 0 ? _oldsize_0 : _oldsize_1; }
+ private int _oldsize_0 = 0;
+ private int _oldsize_1 = 0;
+ public final int oldsize(int axis) { return axis == 0 ? _oldsize_0 : _oldsize_1; }
/** The padding along each edge for this box */
public static final int pad = 8;
- private short _pad_0 = 0;
- private short _pad_1 = 0;
- public final short pad(int axis) { return axis == 0 ? _pad_0 : _pad_1; }
+ private int _pad_0 = 0;
+ private int _pad_1 = 0;
+ public final int pad(int axis) { return axis == 0 ? _pad_0 : _pad_1; }
/** The dimensions of the text in this box */
public static final int textdim = 9;
- private short _textdim_0 = 0;
- private short _textdim_1 = 0;
- public final short textdim(int axis) { return axis == 0 ? _textdim_0 : _textdim_1; }
+ private int _textdim_0 = 0;
+ private int _textdim_1 = 0;
+ public final int textdim(int axis) { return axis == 0 ? _textdim_0 : _textdim_1; }
// Instance Data /////////////////////////////////////////////////////////////////
/** If redirect is enabled, this holds the Box redirected to */
Box redirect = this;
- /** the Box's font -- you must call textupdate() after changing this */
- String font = Platform.getDefaultFont();
+ /** the Box's font, null inherits from parent -- you must call textupdate() after changing this */
+ String font = null;
+
+ /** if font == null, this might be a cached copy of the inherited ancestor font */
+ String cachedFont = null;
/** The surface for us to render on; null if none; INVARIANT: surface == getParent().surface */
Surface surface = null;
// Instance Data: IndexOf ////////////////////////////////////////////////////////////
/** The indexof() Function; created lazily */
- public Function indexof = null;
- public Function indexof() {
- if (indexof == null) indexof = new IndexOf();
- return indexof;
- }
+ public JS.Callable indexof = null;
+ public JS.Callable indexof() { if (indexof == null) indexof = new IndexOf(); return indexof; }
/** a trivial private class to serve as the box.indexof function object */
- private class IndexOf extends JSObject implements Function {
+ private class IndexOf extends JS.Callable {
public IndexOf() { this.setSeal(true); }
- public Scriptable construct(Context cx, Scriptable scope, java.lang.Object[] args) { return null; }
- public Object call(Context cx, Scriptable scope, Scriptable thisObj, java.lang.Object[] args) throws JavaScriptException {
- if (args == null || args.length != 1 || args[0] == null || !(args[0] instanceof Box)) return new Integer(-1);
- Box b = (Box)args[0];
+ public Object call(JS.Array args) throws JS.Exn {
+ if (args.length() != 1 || args.elementAt(0) == null || !(args.elementAt(0) instanceof Box)) return new Integer(-1);
+ Box b = (Box)args.elementAt(0);
if (b.getParent() != Box.this) {
if (redirect == null || redirect == Box.this) return new Integer(-1);
- return Box.this.redirect.indexof().call(cx, scope, thisObj, args);
+ return Box.this.redirect.indexof().call(args);
}
return new Integer(b.getIndexInParent());
}
// Methods which enforce/preserve invariants ////////////////////////////////////////////
/** This method MUST be used to change geometry values -- it ensures that certain invariants are preserved. */
- public final void set(int which, int axis, int newvalue) { set(which, axis, (short)newvalue); }
- public final void set(int which, int axis, short newvalue) {
+ public final void set(int which, int axis, int newvalue) {
// if this Box is the root of the Surface, notify the Surface of size changes
if (getParent() == null && surface != null && which == size)
if (which == dmin) set(size, axis, max(size(axis), newvalue));
if (which == dmax) set(size, axis, min(size(axis), newvalue));
- // keep obedience to shrink directives
- if (which == cmin || which == textdim || which == pad || which == dmin)
- if ((hshrink && axis == 0) || (vshrink && axis == 1))
- set(dmax, axis, max(cmin(axis), (textdim(axis) + 2 * pad(axis)), dmin(axis)));
-
// keep cmin in line with dmin/dmax/textdim
if (which == dmax || which == dmin || which == textdim || which == pad || which == cmin)
set(cmin, axis,
max(
- min(cmin(axis), dmax(axis)),
+ min(dmax(axis), cmin(axis)),
dmin(axis),
min(dmax(axis), textdim(axis) + 2 * pad(axis))
)
/** Ensures that cmin is in sync with the cmin's of our children. This should be called whenever a child is added or
* removed, as well as when our pad is changed. */
final void sync_cmin_to_children() {
- short co = (short)(2 * pad(o));
- short cxo = (short)(2 * pad(xo));
+ int co = (int)(2 * pad(o));
+ int cxo = (int)(2 * pad(xo));
for(Box bt = getChild(0); bt != null; bt = bt.nextSibling()) {
if (bt.invisible || bt.absolute) continue;
co += bt.cmin(o);
- cxo = (short)max(bt.cmin(xo) + 2 * pad(xo), cxo);
+ cxo = (int)max(bt.cmin(xo) + 2 * pad(xo), cxo);
}
set(cmin, o, co);
set(dmin, 1, (image == null ? 0 : image.getHeight()) + (border == null ? 0 : border[0].getHeight()) * 2);
}
+ /** returns the actual font that should be used to render this box */
+ private String font() {
+ if (font != null) return font;
+ if (font == null && cachedFont != null) return cachedFont;
+ if (getParent() != null) return cachedFont = getParent().font();
+ return cachedFont = Platform.getDefaultFont();
+ }
+
+ /** this must be called when a box's font changes */
+ void fontChanged() {
+ textupdate();
+ for(Box b = getChild(0); b != null; b = b.nextSibling())
+ if (b.font == null) {
+ b.cachedFont = font();
+ b.fontChanged();
+ }
+ }
+
/** This must be called when font or text is changed */
void textupdate() {
if (text.equals("")) {
set(textdim, 0, 0);
set(textdim, 1, 0);
} else {
- XWF xwf = XWF.getXWF(font);
+ XWF xwf = XWF.getXWF(font());
if (xwf == null) {
- set(textdim, 0, Platform.stringWidth(font, text));
- set(textdim, 1, (Platform.getMaxAscent(font) + Platform.getMaxDescent(font)));
+ set(textdim, 0, Platform.stringWidth(font(), text));
+ set(textdim, 1, (Platform.getMaxAscent(font()) + Platform.getMaxDescent(font())));
} else {
set(textdim, 0, xwf.stringWidth(text));
set(textdim, 1, (xwf.getMaxAscent() + xwf.getMaxDescent()));
}
/** loads the image described by string str, possibly blocking for a network load */
- static ImageDecoder getImage(String str, final Function callback) {
- boolean ispng = false;
+ static ImageDecoder getImage(String str, final JS.Callable callback) {
if (str.indexOf(':') == -1) {
String s = str;
byte[] b = Resources.getResource(Resources.resolve(s + ".png", null));
- if (b == null) return null;
- return PNG.decode(new ByteArrayInputStream(b), str);
+ if (b != null) return PNG.decode(new ByteArrayInputStream(b), str);
+ b = Resources.getResource(Resources.resolve(s + ".jpeg", null));
+ if (b != null) return Platform.decodeJPEG(new ByteArrayInputStream(b), str);
+ return null;
} else {
- Thread thread = Thread.currentThread();
+ java.lang.Thread thread = java.lang.Thread.currentThread();
if (!(thread instanceof ThreadMessage)) {
if (Log.on) Log.log(Box.class, "HTTP images can not be loaded from the foreground thread");
return null;
}
// FIXME: use primitives here
ThreadMessage mythread = (ThreadMessage)thread;
- mythread.setPriority(Thread.MIN_PRIORITY);
+ mythread.setPriority(java.lang.Thread.MIN_PRIORITY);
mythread.done.release();
try {
- // FIXME use mime types here, not extensions
- if (str.endsWith(".jpeg") || str.endsWith(".jpg"))
- str = "http://xmlrpc.xwt.org/jpeg2png/" + str.substring(str.indexOf("//") + 2);
-
HTTP http = new HTTP(str);
final HTTP.HTTPInputStream in = http.GET();
final int contentLength = in.getContentLength();
if (ret != -1) bytesDownloaded += ret;
if (clear && callback != null) {
clear = false;
- ThreadMessage.newthread(new JSObject.JSFunction() {
- public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] args) throws JavaScriptException {
+ ThreadMessage.newthread(new JS.Callable() {
+ public Object call(JS.Array args_) throws JS.Exn {
try {
- callback.call(cx, null, null, new Object[] {
- new Double(bytesDownloaded), new Double(contentLength) });
+ JS.Array args = new JS.Array();
+ args.addElement(new Double(bytesDownloaded));
+ args.addElement(new Double(contentLength));
+ callback.call(args);
} finally {
clear = true;
}
return ret;
}
};
-
+
if (str.endsWith(".gif")) return GIF.decode(is, str);
+ else if (str.endsWith(".jpeg") || str.endsWith(".jpg")) return Platform.decodeJPEG(is, str);
else return PNG.decode(is, str);
} catch (IOException e) {
} finally {
MessageQueue.add(mythread);
- mythread.setPriority(Thread.NORM_PRIORITY);
+ mythread.setPriority(java.lang.Thread.NORM_PRIORITY);
mythread.go.block();
}
}
} else {
image = getPicture(s);
if (image == null) {
- if (Log.on) Log.log(Box.class, "unable to load image " + s + " at " +
- Context.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine);
+ if (Log.on) Log.logJS(Box.class, "unable to load image " + s);
return;
}
if (sizetoimage) syncSizeToImage();
if (border == null) {
ImageDecoder id = getImage(s, null);
if (id == null) {
- if (Log.on) Log.log(this, "unable to load border image " + s + " at " +
- Context.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine);
+ if (Log.on) Log.logJS(this, "unable to load border image " + s);
return;
}
int[] data = id.getData();
}
/** returns true if the property has a trap on it */
- boolean is_trapped(String property) {
- if (traps == null) {
- return false;
- } else {
- Object gc = traps.get(property);
- return (gc != null &&
- !(gc instanceof org.mozilla.javascript.Undefined) &&
- gc != org.mozilla.javascript.Scriptable.NOT_FOUND);
- }
- }
+ boolean is_trapped(String property) { return traps != null && traps.get(property) != null; }
/** Adds the node's current actual geometry to the Surface's dirty list */
- void dirty() {
- dirty(pos(0), pos(1), size(0), size(1));
- }
+ void dirty() { dirty(pos(0), pos(1), size(0), size(1)); }
/** Adds the intersection of (x,y,w,h) and the node's current actual geometry to the Surface's dirty list */
public final void dirty(int x, int y, int w, int h) {
if (!wasinside && !isinside) return;
- if (!wasinside && isinside && is_trapped("Enter")) put("Enter", null, this);
- else if (wasinside && !isinside && is_trapped("Leave")) put("Leave", null, this);
- else if (wasinside && isinside && (mousex != oldmousex || mousey != oldmousey) && is_trapped("Move")) put("Move", null, this);
+ if (!wasinside && isinside && is_trapped("Enter")) put("Enter", this);
+ else if (wasinside && !isinside && is_trapped("Leave")) put("Leave", this);
+ else if (wasinside && isinside && (mousex != oldmousex || mousey != oldmousey) && is_trapped("Move")) put("Move", this);
if (isinside && cursor != null && surface != null) surface.cursor = cursor;
}
/** creates a new box from an anonymous template; <tt>ids</tt> is passed through to Template.apply() */
- Box(Template anonymous, Vec pboxes, Vec ptemplates, Function callback, int numerator, int denominator) {
- super(true);
- set(dmax, 0, Short.MAX_VALUE);
- set(dmax, 1, Short.MAX_VALUE);
+ Box(Template anonymous, Vec pboxes, Vec ptemplates, JS.Callable callback, int numerator, int denominator) {
+ super(null);
+ set(dmax, 0, Integer.MAX_VALUE);
+ set(dmax, 1, Integer.MAX_VALUE);
template = anonymous;
template.apply(this, pboxes, ptemplates, callback, numerator, denominator);
templatename = null;
/** creates a new box from an unresolved templatename and an importlist; use "box" for an untemplatized box */
public Box(String templatename, String[] importlist) { this(templatename, importlist, null); }
- public Box(String templatename, String[] importlist, Function callback) {
- super(true);
- set(dmax, 0, Short.MAX_VALUE);
- set(dmax, 1, Short.MAX_VALUE);
+ public Box(String templatename, String[] importlist, JS.Callable callback) {
+ super(null);
+ set(dmax, 0, Integer.MAX_VALUE);
+ set(dmax, 1, Integer.MAX_VALUE);
this.importlist = importlist;
if (!"box".equals(templatename)) {
template = Template.getTemplate(templatename, importlist);
for(Box cur = this; cur != null && (cur == this || cur == this.getParent()); cur = cur.getParent()) {
cur.dirty(pos(0) + min(oldsize(0) - bw, size(0) - bw),
pos(1),
- Math.abs(oldsize(0) - size(0)) + bw,
+ java.lang.Math.abs(oldsize(0) - size(0)) + bw,
max(oldsize(1), size(1)));
cur.dirty(pos(0),
pos(1) + min(oldsize(1) - bh, size(1) - bh),
max(oldsize(0), size(0)),
- Math.abs(oldsize(1) - size(1)) + bh);
+ java.lang.Math.abs(oldsize(1) - size(1)) + bh);
}
// SLOWPATH: dirty ourselves, as well as our former position on our parent
if (++surface.sizePosChangesSinceLastRender >= 500) {
if (surface.sizePosChangesSinceLastRender == 500) {
- if (Log.on) Log.log(this, "Warning, more than 500 SizeChange/PosChange traps triggered since last complete render");
- if (Log.on) Log.log(this, " interpreter is at " + Context.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine);
+ if (Log.on) Log.logJS(this, "Warning, more than 500 SizeChange/PosChange traps triggered since last complete render");
+ /*
try {
Trap t = sizechange ? Trap.getTrap(this, "SizeChange") : Trap.getTrap(this, "PosChange");
- InterpretedFunction f = (InterpretedFunction)t.f;
+ InterpretedJS.Callable f = (InterpretedJS.Callable)t.f;
if (Log.on) Log.log(this, "Current trap is at " + f.getSourceName() + ":" + f.getLineNumbers()[0]);
} catch (Throwable t) { }
+ */
}
} else {
- if (sizechange) put("SizeChange", null, Boolean.TRUE);
- if (poschange) put("PosChange", null, Boolean.TRUE);
+ if (sizechange) put("SizeChange", Boolean.TRUE);
+ if (poschange) put("PosChange", Boolean.TRUE);
if (sizechange || poschange) {
surface.abort = true;
return;
for(Box bt = getChild(0); bt != null; bt = bt.nextSibling()) {
if (bt.invisible) continue;
if (bt.absolute) {
- bt.set(size, o, max(bt.cmin(o), min(size(o) - bt.abs(o) - pad(o), bt.dmax(o))));
- bt.set(size, xo, max(bt.cmin(xo), min(size(xo) - bt.abs(xo) - pad(xo), bt.dmax(xo))));
+ bt.set(size, 0, bt.hshrink ? bt.cmin(0) : max(bt.cmin(0), min(size(0) - bt.abs(0) - pad(0), bt.dmax(0))));
+ bt.set(size, 1, bt.vshrink ? bt.cmin(1) : max(bt.cmin(1), min(size(1) - bt.abs(1) - pad(1), bt.dmax(1))));
} else if (xo == 0 && bt.hshrink || xo == 1 && bt.vshrink) {
bt.set(size, xo, bt.cmin(xo));
} else {
for(Box bt = getChild(0); bt != null; bt = bt.nextSibling()) {
if (bt.absolute || bt.invisible) continue;
- bt.set(size, o, bound(bt.cmin(o), factor * bt.flex, bt.dmax(o)));
+ int btmax = (o == 0 && bt.hshrink) || (o == 1 && bt.vshrink) ? bt.cmin(o) : bt.dmax(o);
+ bt.set(size, o, bound(bt.cmin(o), factor * bt.flex, btmax));
total += bt.size(o);
if (factor * bt.flex < bt.cmin(o) && bt.size(o) == bt.cmin(o)) {
nextjoint = min(nextjoint, divide_round_up(bt.cmin(o), bt.flex));
- } else if (bt.size(o) < bt.dmax(o)) {
+ } else if (bt.size(o) < btmax) {
remaining_flex += bt.flex;
- nextjoint = min(nextjoint, divide_round_up(bt.dmax(o), bt.flex));
+ nextjoint = min(nextjoint, divide_round_up(btmax, bt.flex));
}
}
while(goal != total && total != last) {
last = total;
for(Box bt = getChild(0); bt != null; bt = bt.nextSibling()) {
- int newsize = bound(bt.cmin(o), bt.size(o) + (goal > total ? 1 : -1), bt.dmax(o));
+ int btmax = (o == 0 && bt.hshrink) || (o == 1 && bt.vshrink) ? bt.cmin(o) : bt.dmax(o);
+ int newsize = bound(bt.cmin(o), bt.size(o) + (goal > total ? 1 : -1), btmax);
total += newsize - bt.size(o);
bt.set(size, o, newsize);
}
if ((textcolor & 0xFF000000) == 0x00000000) return;
buf.setClip(x, y, w + x, h + y);
- XWF xwf = XWF.getXWF(font);
+ XWF xwf = XWF.getXWF(font());
if (xwf != null) {
xwf.drawString(buf, text,
pos(0) + pad(0),
pos(1) + pad(1) + xwf.getMaxAscent() - 1,
textcolor);
} else {
- buf.drawString(font, text,
+ buf.drawString(font(), text,
pos(0) + pad(0),
- pos(1) + pad(1) + Platform.getMaxAscent(font) - 1,
+ pos(1) + pad(1) + Platform.getMaxAscent(font()) - 1,
textcolor);
}
buf.setClip(0, 0, buf.getWidth(), buf.getHeight());
- int i=0; while(i<font.length() && !Character.isDigit(font.charAt(i))) i++;
+ int i=0; while(i<font().length() && !Character.isDigit(font().charAt(i))) i++;
- if (font.lastIndexOf('d') > i) {
+ if (font().lastIndexOf('d') > i) {
for(int j = pos(0) + pad(0); j < pos(0) + pad(0) + textdim(0); j += 2)
- buf.fillRect(j, pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font) : xwf.getMaxAscent()) + 2,
- j + 1, pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font) : xwf.getMaxAscent()) + 2 + 1,
+ buf.fillRect(j, pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font()) : xwf.getMaxAscent()) + 2,
+ j + 1, pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font()) : xwf.getMaxAscent()) + 2 + 1,
textcolor);
- } else if (font.lastIndexOf('u') > i) {
+ } else if (font().lastIndexOf('u') > i) {
buf.fillRect(pos(0) + pad(0),
- pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font) : xwf.getMaxAscent()) + 2,
+ pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font()) : xwf.getMaxAscent()) + 2,
pos(0) + pad(0) + textdim(0),
- pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font) : xwf.getMaxAscent()) + 2 + 1,
+ pos(1) + pad(1) + (xwf == null ? Platform.getMaxAscent(font()) : xwf.getMaxAscent()) + 2 + 1,
textcolor);
}
// Methods to implement org.mozilla.javascript.Scriptable //////////////////////////////////////
/** Returns the i_th child */
- public Object get(int i, Scriptable start) {
+ public Object get(int i) {
if (redirect == null) return null;
- if (redirect != this) return redirect.get(i, start);
- return i >= numChildren() ? null : getChild(i);
+ if (redirect != this) return redirect.get(i);
+ return i >= numChildren() || i < 0 ? null : getChild(i);
}
/**
* INVARIANT: after completion, getChild(min(i, numChildren())) == newnode
* WARNING: O(n) runtime, unless i == numChildren()
*/
- public void put(int i, Scriptable start, Object value) {
+ public void put(int i, Object value) {
+ if (i < 0) return;
if (value != null && !(value instanceof Box)) {
- if (Log.on) Log.log(this, "attempt to set a numerical property on a box to anything other than a box at " +
- Context.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine);
-
+ if (Log.on) Log.logJS(this, "attempt to set a numerical property on a box to anything other than a box");
} else if (redirect == null) {
- if (Log.on) Log.log(this, "attempt to add/remove children to/from a node with a null redirect at " +
- Context.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine);
-
+ if (Log.on) Log.logJS(this, "attempt to add/remove children to/from a node with a null redirect");
} else if (redirect != this) {
- Box b = value == null ? (Box)redirect.get(i, null) : (Box)value;
- redirect.put(i, null, value);
- put("0", null, b);
+ Box b = value == null ? (Box)redirect.get(i) : (Box)value;
+ redirect.put(i, value);
+ put("0", b);
} else if (value == null) {
if (i >= 0 && i < numChildren()) {
Box b = getChild(i);
b.remove();
- put("0", null, b);
+ put("0", b);
}
} else if (value instanceof RootProxy) {
- if (Log.on) Log.log(this, "attempt to reparent a box via its proxy object at " +
- Context.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine);
+ if (Log.on) Log.logJS(this, "attempt to reparent a box via its proxy object");
} else {
Box newnode = (Box)value;
+
+ // check if box being moved is currently target of a redirect
+ for(Box cur = newnode.getParent(); cur != null; cur = cur.getParent())
+ if (cur.redirect == newnode) {
+ if (Log.on) Log.logJS(this, "attempt to move a box that is the target of a redirect");
+ return;
+ }
+
+ // check for recursive ancestor violation
for(Box cur = this; cur != null; cur = cur.getParent())
if (cur == newnode) {
- if (Log.on) Log.log(this, "attempt to make a node a parent of its own ancestor at " +
- Context.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine);
+ if (Log.on) Log.logJS(this, "attempt to make a node a parent of its own ancestor");
+ if (Log.on) Log.log(this, "box == " + this + " ancestor == " + newnode);
return;
}
sync_cmin_to_children();
// note that JavaScript box[0] will invoke put(int i), not put(String s)
- put("0", null, newnode);
+ put("0", newnode);
}
}
- public Object get(String name, Scriptable start) { return get(name, start, false); }
- public Object get(String name, Scriptable start, boolean ignoretraps) {
-
- if (name == null || name.equals("")) return null;
+ public Object get(Object name) { return get(name, false); }
+ public Object get(Object name_, boolean ignoretraps) {
+ if (name_ instanceof Number) return get(((Number)name_).intValue());
- // hack since Rhino needs to be able to grab these functions to create new objects
- if (name.equals("Object")) return JSObject.defaultObjects.get("Object", null);
- if (name.equals("Array")) return JSObject.defaultObjects.get("Array", null);
- if (name.equals("Function")) return JSObject.defaultObjects.get("Function", null);
- if (name.equals("TypeError")) return JSObject.defaultObjects.get("TypeError", null);
- if (name.equals("ConversionError")) return JSObject.defaultObjects.get("ConversionError", null);
+ String name = (String)name_;
+ if (name.equals("")) return null;
// See if we're reading back the function value of a trap
if (name.charAt(0) == '_') {
SpecialBoxProperty gph = (SpecialBoxProperty)SpecialBoxProperty.specialBoxProperties.get(name);
if (gph != null) return gph.get(this);
- Object ret = super.get(name, start);
+ Object ret = super.get(name);
if (name.startsWith("$") && ret == null)
- if (Log.on) Log.log(this, "WARNING: attempt to access " + name + ", but no child with id=\"" + name.substring(1) + "\" found; " +
- Context.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine);
+ if (Log.on) Log.logJS(this, "WARNING: attempt to access " + name + ", but no child with id=\"" + name.substring(1) + "\" found");
return ret;
}
- /** indicate that we don't want JSObject trying to handle these */
- public boolean has(String name, Scriptable start) {
- if (name.equals("")) return false;
- if (traps != null && traps.get(name) != null) return true;
- if (name.charAt(0) == '_') return true;
- if (SpecialBoxProperty.specialBoxProperties.get(name) != null) return true;
- if (name.equals("Function") || name.equals("Array") || name.equals("Object") ||
- name.equals("TypeError") || name.equals("ConversionError")) return true;
- return super.has(name, start);
- }
-
- public Object[] getIds() {
+ public Object[] keys() {
Object[] ret = new Object[numChildren()];
- for(int i=0; i<ret.length; i++) ret[i] = get(i, null);
+ for(int i=0; i<ret.length; i++) ret[i] = new Integer(i);
return ret;
}
- public void put(String name, Scriptable start, Object value) { put(name, start, value, false, null); }
- public void put(String name, Scriptable start, Object value, boolean ignoretraps) { put(name, start, value, ignoretraps, null); }
-
/**
* Scriptable.put()
* @param ignoretraps if set, no traps will be triggered (set when 'cascade' reaches the bottom of the trap stack)
* @param rp if this put is being performed via a root proxy, rp is the root proxy.
*/
- public void put(String name, Scriptable start, Object value, boolean ignoretraps, RootProxy rp) {
- if (name == null) return;
+ public void put(Object name, Object value) { put(name, value, false, null); }
+ public void put(Object name, Object value, boolean ignoretraps) { put(name, value, ignoretraps, null); }
+ public void put(Object name_, Object value, boolean ignoretraps, RootProxy rp) {
+ if (name_ instanceof Number) { put(((Number)name_).intValue(), value); return; }
+ String name = (String)name_;
+ if (name == null) return; // FIXME, shouldn't be necessary
if (name.startsWith("xwt_")) {
- if (Log.on) Log.log(this, "attempt to set reserved property " + name + " at " +
- Context.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine);
+ if (Log.on) Log.logJS(this, "attempt to set reserved property " + name);
return;
}
if (!ignoretraps && traps != null) {
Trap t = (Trap)traps.get(name);
if (t != null) {
- Object[] arg = (Object[])singleObjects.remove(false);
- if (arg == null) arg = new Object[] { value };
- else arg[0] = value;
+ JS.Array arg = new JS.Array();
+ arg.addElement(value);
t.perform(arg);
- arg[0] = null;
- singleObjects.append(arg);
+ arg.setElementAt(null, 0);
return;
}
}
}
if (name.charAt(0) == '_') {
- if (value != null && !(value instanceof Function)) {
- if (Log.on) Log.log(this, "attempt to put a non-function value to " + name + " at " +
- Context.enter().interpreterSourceFile + ":" + Context.enter().interpreterLine);
+ if (value != null && !(value instanceof JS.Callable)) {
+ if (Log.on) Log.logJS(this, "attempt to put a non function value (" + value + ") to " + name);
+ } else if (value != null && !(value instanceof JS.CompiledFunction)) {
+ if (Log.on) Log.logJS(this, "attempt to put a non-compiled function value (" + value + ") to " + name);
} else if (name.charAt(1) == '_') {
name = name.substring(2).intern();
Trap t = Trap.getTrap(this, name);
if (t != null) t.delete();
- if (value != null) Trap.addTrap(this, name, ((Function)value), true, rp);
+ if (value != null) Trap.addTrap(this, name, ((JS.CompiledFunction)value), true, rp);
} else {
name = name.substring(1).intern();
Trap t = Trap.getTrap(this, name);
if (t != null) t.delete();
- if (value != null) Trap.addTrap(this, name, ((Function)value), false, rp);
+ if (value != null) Trap.addTrap(this, name, ((JS.CompiledFunction)value), false, rp);
}
return;
}
- if (ignoretraps) {
- // traps always cascade to the global property, not the local one
- putGlobally(name, start, value);
- } else {
- super.put(name, start, value);
- }
+ super.put(name, value);
// a bit of a hack, since titlebar is the only 'special' property stored in JSObject
if (getParent() == null && surface != null) {
}
}
- /** the <tt>delete</tt> keyword is not valid in XWT scripts */
- public void delete(int i) { }
-
// Tree Manipulation /////////////////////////////////////////////////////////////////////
/** remove this node from its parent; INVARIANT: whenever the parent of a node is changed, remove() gets called. */
public void remove() {
+ cachedFont = null;
if (parent == null) {
if (surface != null) surface.dispose(true);
return;
setSurface(null);
// note that JavaScript box[0] will invoke put(int i), not put(String s)
- if (oldparent != null) oldparent.put("0", null, this);
+ if (oldparent != null) oldparent.put("0", this);
}
/** returns our next sibling (parent[ourindex + 1]) */
// Root Proxy ///////////////////////////////////////////////////////////////////////////////
RootProxy myproxy = null;
- public Scriptable getRootProxy() {
+ public JS getRootProxy() {
if (myproxy == null) myproxy = new RootProxy(this);
return myproxy;
}
- private static class RootProxy implements Scriptable {
-
+ private static class RootProxy extends JS {
Box box;
RootProxy(Box b) { this.box = b; }
-
- public void delete(String name) { box.delete(name); }
- public Scriptable getParentScope() { return box.getParentScope(); }
- public void setParentScope(Scriptable p) { box.setParentScope(p); }
- public boolean hasInstance(Scriptable value) { return box.hasInstance(value); }
- public Scriptable getPrototype() { return box.getPrototype(); }
- public void setPrototype(Scriptable p) { box.setPrototype(p); }
- public void delete(int i) { box.delete(i); }
- public String getClassName() { return box.getClassName(); }
- public Object getDefaultValue(Class hint) { return box.getDefaultValue(hint); }
-
- public void put(int i, Scriptable start, Object value) { if (value != null) box.put(i, start, value); }
- public Object get(String name, Scriptable start) { return box.get(name, start); }
- public Object get(int i, Scriptable start) { return null; }
-
- public void put(String name, Scriptable start, Object value) { box.put(name, start, value, false, this); }
- public boolean has(String name, Scriptable start) { return box.has(name, start); }
- public boolean has(int i, Scriptable start) { return box.has(i, start); }
- public Object[] getIds() { return box.getIds(); }
-
+ public Object get(Object name) { return box.get(name); }
+ public void put(Object name, Object value) { box.put(name, value, false, this); }
+ public Object[] keys() { return box.keys(); }
}
}
-
projects / org.ibex.core.git / blobdiff