X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FBox.java;h=a96383e087b5a08491d9b66dc90770cb3b175e15;hb=80b5d720b22ac8cea4dd316f12f7775b09253714;hp=8e515429ed516918b5626d014118dc06fab76865;hpb=2b1b2ef9bb8b8a34efb6329c552eea4f773d9466;p=org.ibex.core.git diff --git a/src/org/xwt/Box.java b/src/org/xwt/Box.java index 8e51542..a96383e 100644 --- a/src/org/xwt/Box.java +++ b/src/org/xwt/Box.java @@ -39,7 +39,7 @@ import org.xwt.translators.*; * SizeChanges trigger an Surface.abort; if rendering were done in the same * pass, rendering work done prior to the Surface.abort would be wasted. */ -public abstract class Box extends JSScope implements JSTrap.JSTrappable { +public final class Box extends JSScope implements Scheduler.Task { // Macros ////////////////////////////////////////////////////////////////////// @@ -57,10 +57,45 @@ public abstract class Box extends JSScope implements JSTrap.JSTrappable { //#define CHECKSET_BOOLEAN(prop) boolean nu = toBoolean(value); if (nu == prop) break; prop = nu; //#define CHECKSET_STRING(prop) if ((value==null&&prop==null)||(value!=null&&value.equals(prop))) break; prop=(String)value; + void mark_for_repack() { MARK_REPACK; } + protected Box() { super(null); } static Hash boxToCursor = new Hash(500, 3); public static final int MAX_LENGTH = Integer.MAX_VALUE; + static final Font DEFAULT_FONT; + + static { + Font f = null; + try { f = Font.getFont((Res)Main.builtin.get("fonts/vera/Vera.ttf"), 10); } + catch(JSExn e) { Log.log(Box.class, "should never happen: "+e); } + DEFAULT_FONT = f; + } + + // FIXME update these + // box properties can not be trapped + static final String[] props = new String[] { + "fill", "stroke", "image", "tile", "fixedaspect", "text", "path", "font", + "shrink", "hshrink", "vshrink", "x", "y", "width", "height", "cols", "rows", + "colspan", "rowspan", "align", "visible", "absolute", "globalx", "globaly", + "minwidth", "maxwidth", "minheight", "maxheight", + "numchildren", "redirect", "cursor", "mousex", "mousey", "xwt", "static", + "mouseinside", "root", "thisbox", "indexof" + }; + + // FIXME update these + // events can have write traps, but not read traps + static final String[] events = new String[] { + "Press1", "Press2", "Press3", + "Release1", "Release2", "Release3", + "Click1", "Click2", "Click3", + "DoubleClick1", "DoubleClick2", "DoubleClick3", + "Enter", "Leave", "Move", + "KeyPressed", "KeyReleased", "PosChange", "SizeChange", + "childadded", "childremoved", + "Focused", "Maximized", "Minimized", "Close", + "icon", "titlebar", "toback", "tofront" + }; // Flags ////////////////////////////////////////////////////////////////////// @@ -87,21 +122,24 @@ public abstract class Box extends JSScope implements JSTrap.JSTrappable { static final int ALIGNS = 0x0000f000; static final int CURSOR = 0x00010000; // if true, this box has a cursor in the cursor hash; FEATURE: GC issues? static final int NOCLIP = 0x00020000; + static final int STOP_UPWARD_PROPAGATION = 0x00040000; // Instance Data ////////////////////////////////////////////////////////////////////// Box parent = null; Box redirect = this; - int flags = VISIBLE | PACKED | REPACK | REFLOW | RESIZE | FIXED /* ROWS */; + int flags = VISIBLE | PACKED | REPACK | REFLOW | RESIZE | FIXED /* ROWS */ | STOP_UPWARD_PROPAGATION; private String text = null; - private Font font = null; - private Picture.Holder texture; + private Font font = DEFAULT_FONT; + private Picture texture = null; private short strokewidth = 1; private int fillcolor = 0x00000000; private int strokecolor = 0xFF000000; + private int aspect = 0; + // specified directly by user public LENGTH minwidth = 0; public LENGTH maxwidth = MAX_LENGTH; @@ -131,13 +169,28 @@ public abstract class Box extends JSScope implements JSTrap.JSTrappable { // Instance Methods ///////////////////////////////////////////////////////////////////// + + /** invoked when a resource needed to render ourselves finishes loading */ + public void perform() throws JSExn { + // as external events have occured, check the state of box + if (texture != null) { + if (texture.isLoaded) { minwidth = texture.width; minheight = texture.height; } + else { Res res = texture.res; texture = null; throw new JSExn("image not found: "+res); } + } + + MARK_REPACK; + MARK_REFLOW; + MARK_RESIZE; + dirty(); + } + public Box getRoot() { return parent == null ? this : parent.getRoot(); } public Surface getSurface() { return Surface.fromBox(getRoot()); } // FEATURE: use cx2/cy2 format /** 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() { dirty(0, 0, width, height); } - public final void dirty(int x, int y, int w, int h) { + public void dirty() { dirty(0, 0, width, height); } + public void dirty(int x, int y, int w, int h) { for(Box cur = this; cur != null; cur = cur.parent) { if (!cur.test(NOCLIP)) { w = min(x + w, cur.width) - max(x, 0); @@ -152,29 +205,6 @@ public abstract class Box extends JSScope implements JSTrap.JSTrappable { } } - public void putAndTriggerJSTraps(Object key, Object value) { - JSContext.invokeTrap(this, key, value); - } - - /** update MOUSEINSIDE, check for Enter/Leave/Move */ - void Move(int oldmousex, int oldmousey, int mousex, int mousey) { Move(oldmousex, oldmousey, mousex, mousey, false); } - void Move(int oldmousex, int oldmousey, int mousex, int mousey, boolean forceleave) { - boolean wasinside = test(MOUSEINSIDE); - boolean isinside = test(VISIBLE) && inside(mousex, mousey) && !forceleave; - if (isinside) set(MOUSEINSIDE); else clear(MOUSEINSIDE); - if (!wasinside && !isinside) return; - - if (isinside && test(CURSOR)) Surface.fromBox(getRoot()).cursor = (String)boxToCursor.get(this); - if (!wasinside && isinside && getTrap("Enter") != null) putAndTriggerJSTraps("Enter", T); - else if (wasinside && !isinside && getTrap("Leave") != null) putAndTriggerJSTraps("Leave", T); - else if (wasinside && isinside && (mousex != oldmousex || mousey != oldmousey) && getTrap("Move")!= null) - putAndTriggerJSTraps("Move", T); - for(Box b = getChild(numchildren - 1); b != null; b = b.prevSibling()) { - b.Move(oldmousex - b.x, oldmousey - b.y, mousex - b.x, mousey - b.y, forceleave); - if (b.inside(mousex - b.x, mousey - b.y)) forceleave = true; - } - } - // Reflow //////////////////////////////////////////////////////////////////////////////////////// @@ -186,19 +216,8 @@ public abstract class Box extends JSScope implements JSTrap.JSTrappable { private static LENGTH[] rowMaxHeight = new LENGTH[65535]; static { for(int i=0; i r) continue; - if (col != 0 && col + min(cols, child.colspan) > cols) break; + for(short c=0, numclear=0; child != null && c < cols; c++) { + if (numRowsInCol[c] > r) { numclear = 0; continue; } + if (c != 0 && c + min(cols, child.colspan) - numclear > cols) break; if (++numclear < min(cols, child.colspan)) continue; - for(int i=col - numclear + 1; i <= col; i++) numRowsInCol[i] += child.rowspan; - child.col = col; child.row = r; + for(int i=c - numclear + 1; i <= c; i++) numRowsInCol[i] += child.rowspan; + child.col = (short)(c - numclear + 1); child.row = r; rows = (short)max(rows, child.row + child.rowspan); child = child.nextPackedSibling(); + numclear = 0; } } for(int i=0; i unbounded) child_x -= (child_width - unbounded) / 2; @@ -333,15 +351,15 @@ public abstract class Box extends JSScope implements JSTrap.JSTrappable { if ((fillcolor & 0xFF000000) != 0x00000000) buf.fillTrapezoid(globalx, globalx + width, globaly, globalx, globalx + width, globaly + height, fillcolor); - if (texture != null && texture.picture != null) - for(int x = globalx; x < cx2; x += texture.picture.getWidth()) - for(int y = globaly; y < cy2; y += texture.picture.getHeight()) - buf.drawPicture(texture.picture, x, y, cx1, cy1, cx2, cy2); + // FIXME: do aspect in here + if (texture != null && texture.isLoaded) + for(int x = globalx; x < cx2; x += texture.width) + for(int y = globaly; y < cy2; y += texture.height) + buf.drawPicture(texture, x, y, cx1, cy1, cx2, cy2); - if (text != null && !text.equals("") && font != null) + if (text != null && !text.equals("") && font != null) if (font.rasterizeGlyphs(text, buf, strokecolor, globalx, globaly, cx1, cy1, cx2, cy2, null) == -1) - font.rasterizeGlyphs(text, buf, strokecolor, globalx, globaly, cx1, cy1, cx2, cy2, - new Scheduler.Task() { public void perform() { Box b = Box.this; MARK_REFLOW_b; dirty(); }}); + font.rasterizeGlyphs(text, buf, strokecolor, globalx, globaly, cx1, cy1, cx2, cy2, this); for(Box b = getChild(0); b != null; b = b.nextSibling()) b.render(globalx, globaly, cx1, cy1, cx2, cy2, buf, null); @@ -355,7 +373,7 @@ public abstract class Box extends JSScope implements JSTrap.JSTrappable { public int localToGlobalX(int x) { return parent == null ? x : parent.globalToLocalX(x + this.x); } public int localToGlobalY(int y) { return parent == null ? y : parent.globalToLocalY(y + this.y); } - public Object callMethod(Object method, Object a0, Object a1, Object a2, Object[] rest, int nargs) throws JS.Exn { + public Object callMethod(Object method, Object a0, Object a1, Object a2, Object[] rest, int nargs) throws JSExn { if (nargs != 1 || !"indexof".equals(method)) return super.callMethod(method, a0, a1, a2, rest, nargs); Box b = (Box)a0; if (b.parent != this) @@ -367,25 +385,26 @@ public abstract class Box extends JSScope implements JSTrap.JSTrappable { public Enumeration keys() { throw new Error("you cannot apply for..in to a " + this.getClass().getName()); } - /** to be filled in by the Tree implementation */ - abstract void put(int i, Object value); - public int numchildren = 0; - abstract public int getIndexInParent(); - abstract public Box getChild(int i); - abstract public Box nextSibling(); - abstract public Box prevSibling(); - abstract public void remove(); - abstract Box swapPosition(Box x, Box y); - - public Object get(Object name) { return get(name, false); } - public Object get(Object name, boolean ignoretraps) { + protected boolean isTrappable(Object key, boolean isRead) { + if (key == null) return false; + else if (key instanceof String) { + // not allowed to trap box properties, and no read traps on events + String name = (String)key; + for (int i=0; i < props.length; i++) if (name.equals(props[i])) return false; + if (isRead) for (int i=0; i < events.length; i++) if (name.equals(events[i])) return false; + } + + return true; + } + + public Object get(Object name) throws JSExn { if (name instanceof Number) return redirect == null ? null : redirect == this ? getChild(toInt(name)) : redirect.get(name); //#switch(name) case "indexof": return METHOD; case "text": return text; - case "path": throw new JS.Exn("cannot read from the path property"); + case "path": throw new JSExn("cannot read from the path property"); case "fill": return colorToString(fillcolor); case "strokecolor": return colorToString(strokecolor); case "textcolor": return colorToString(strokecolor); @@ -397,6 +416,7 @@ public abstract class Box extends JSScope implements JSTrap.JSTrappable { case "shrink": return B(test(HSHRINK) || test(VSHRINK)); case "hshrink": return B(test(HSHRINK)); case "vshrink": return B(test(VSHRINK)); + case "aspect": return N(aspect); case "x": return (parent == null || !test(VISIBLE)) ? N(0) : N(x); case "y": return (parent == null || !test(VISIBLE)) ? N(0) : N(y); case "width": return N(width); @@ -414,7 +434,7 @@ public abstract class Box extends JSScope implements JSTrap.JSTrappable { case "mousex": { Surface s = getSurface(); return N(s == null ? 0 : globalToLocalX(s.mousex)); } case "mousey": { Surface s = getSurface(); return N(s == null ? 0 : globalToLocalY(s.mousey)); } case "mouseinside": return B(test(MOUSEINSIDE)); - case "numchildren": return redirect == null ? N(0) : redirect == this ? N(numchildren) : redirect.get("numchildren"); + case "numchildren": return redirect == null ? N(0) : redirect == this ? N(treeSize()) : redirect.get("numchildren"); case "minwidth": return N(minwidth); case "maxwidth": return N(maxwidth); case "minheight": return N(minheight); @@ -423,53 +443,42 @@ public abstract class Box extends JSScope implements JSTrap.JSTrappable { case "Minimized": if (parent == null && getSurface() != null) return B(getSurface().minimized); default: return super.get(name); //#end - return null; + throw new Error("unreachable"); // unreachable } - public void put(Object name, Object value) { put(name, value, false); } - public void put(Object name, Object value, boolean ignoretraps) { - if (name instanceof Number) { put(toInt(name), value); return; } + void setMaxWidth(Object value) { do { CHECKSET_INT(maxwidth); MARK_RESIZE; } while(false); } + void setMaxHeight(Object value) { do { CHECKSET_INT(maxheight); MARK_RESIZE; } while(false); } + public void put(Object name, Object value) throws JSExn { + if (name instanceof Number) { put(toInt(name), value); return; } //#switch(name) case "text": CHECKSET_STRING(text); MARK_RESIZE; dirty(); case "strokecolor": value = N(stringToColor((String)value)); CHECKSET_INT(strokecolor); MARK_RESIZE; dirty(); case "textcolor": value = N(stringToColor((String)value)); CHECKSET_INT(strokecolor); MARK_RESIZE; dirty(); case "text": CHECKSET_STRING(text); MARK_RESIZE; dirty(); case "strokewidth": CHECKSET_SHORT(strokewidth); dirty(); - case "thisbox": if (value == null) remove(); case "shrink": put("hshrink", value); put("vshrink", value); case "hshrink": CHECKSET_FLAG(HSHRINK); MARK_RESIZE; case "vshrink": CHECKSET_FLAG(VSHRINK); MARK_RESIZE; - case "width": if (parent==null&&Surface.fromBox(this)!=null) { CHECKSET_INT(width); } else { put("maxwidth", value); put("minwidth", value); MARK_RESIZE; } - case "height": if (parent == null&&Surface.fromBox(this)!=null) { CHECKSET_INT(height); } else { put("maxheight", value); put("minheight", value); MARK_RESIZE; } - case "maxwidth": CHECKSET_INT(maxwidth); MARK_RESIZE; + case "width": put("maxwidth", value); put("minwidth", value); MARK_RESIZE; + case "height": put("maxheight", value); put("minheight", value); MARK_RESIZE; + case "maxwidth": setMaxWidth(value); case "minwidth": CHECKSET_INT(minwidth); MARK_RESIZE; - case "maxheight": CHECKSET_INT(maxheight); MARK_RESIZE; + case "maxheight": setMaxHeight(value); case "minheight": CHECKSET_INT(minheight); MARK_RESIZE; case "colspan": CHECKSET_SHORT(colspan); MARK_REPACK_parent; - case "rowspan": CHECKSET_SHORT(colspan); MARK_REPACK_parent; + case "rowspan": CHECKSET_SHORT(rowspan); MARK_REPACK_parent; case "rows": CHECKSET_SHORT(rows); if (rows==0){set(FIXED, COLS);if(cols==0)cols=1;} else set(FIXED, ROWS); MARK_REPACK; case "cols": CHECKSET_SHORT(cols); if (cols==0){set(FIXED, ROWS);if(rows==0)rows=1;} else set(FIXED, COLS); MARK_REPACK; case "noclip": CHECKSET_FLAG(NOCLIP); if (parent == null) dirty(); else parent.dirty(); case "visible": CHECKSET_FLAG(VISIBLE); dirty(); MARK_RESIZE; dirty(); case "packed": CHECKSET_FLAG(PACKED); MARK_REPACK_parent; + case "aspect": CHECKSET_INT(aspect); DIRTY; case "globalx": put("x", N(globalToLocalX(toInt(value)))); case "globaly": put("y", N(globalToLocalY(toInt(value)))); case "align": clear(ALIGNS); setAlign(value == null ? "center" : value); MARK_RESIZE; case "cursor": setCursor(value); case "fill": setFill(value); - case "Press1": mouseEvent("Press1", value); - case "Press2": mouseEvent("Press2", value); - case "Press3": mouseEvent("Press3", value); - case "Release1": mouseEvent("Release1", value); - case "Release2": mouseEvent("Release2", value); - case "Release3": mouseEvent("Release3", value); - case "Click1": mouseEvent("Click1", value); - case "Click2": mouseEvent("Click2", value); - case "Click3": mouseEvent("Click3", value); - case "DoubleClick1": mouseEvent("DoubleClick1", value); - case "DoubleClick2": mouseEvent("DoubleClick2", value); - case "DoubleClick3": mouseEvent("DoubleClick3", value); case "Minimized": if (parent == null && getSurface() != null) getSurface().minimized = toBoolean(value); // FEATURE case "Maximized": if (parent == null && getSurface() != null) getSurface().maximized = toBoolean(value); // FEATURE case "Close": if (parent == null && getSurface() != null) getSurface().dispose(true); @@ -478,14 +487,51 @@ public abstract class Box extends JSScope implements JSTrap.JSTrappable { case "redirect": if (redirect == this) redirect = (Box)value; else Log.log(this, "redirect can only be set once"); case "font": font = value == null ? null : Font.getFont((Res)value, font == null ? 10 : font.pointsize); MARK_RESIZE; dirty(); case "fontsize": font = Font.getFont(font == null ? null : font.res, toInt(value)); MARK_RESIZE; dirty(); - case "x": if (test(PACKED) && parent != null) return; CHECKSET_INT(x); dirty(); MARK_RESIZE; dirty(); - case "y": if (test(PACKED) && parent != null) return; CHECKSET_INT(y); dirty(); MARK_RESIZE; dirty(); - case "KeyPressed": // prevent stuff from hitting the Hash - case "KeyReleased": // prevent stuff from hitting the Hash - case "PosChange": // prevent stuff from hitting the Hash - case "SizeChange": // prevent stuff from hitting the Hash - case "childadded": // prevent stuff from hitting the Hash - case "childremoved": // prevent stuff from hitting the Hash + case "x": if (parent==null && Surface.fromBox(this)!=null) { CHECKSET_INT(x); } else { if (test(PACKED) && parent != null) return; CHECKSET_INT(x); dirty(); MARK_RESIZE; dirty(); } + case "y": if (parent==null && Surface.fromBox(this)!=null) { CHECKSET_INT(y); } else { if (test(PACKED) && parent != null) return; CHECKSET_INT(y); dirty(); MARK_RESIZE; dirty(); } + + case "Press1": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.put(name, value); + case "Press2": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.put(name, value); + case "Press3": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.put(name, value); + case "Release1": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.put(name, value); + case "Release2": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.put(name, value); + case "Release3": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.put(name, value); + case "Click1": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.put(name, value); + case "Click2": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.put(name, value); + case "Click3": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.put(name, value); + case "DoubleClick1": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.put(name, value); + case "DoubleClick2": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.put(name, value); + case "DoubleClick3": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.put(name, value); + case "KeyPressed": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.put(name, value); + case "KeyReleased": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.put(name, value); + case "Move": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.put(name, value); + case "Enter": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.put(name, value); + case "Leave": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.put(name, value); + + case "_Move": propagateDownward(name, value, false); + case "_Press1": propagateDownward(name, value, false); + case "_Press2": propagateDownward(name, value, false); + case "_Press3": propagateDownward(name, value, false); + case "_Release1": propagateDownward(name, value, false); + case "_Release2": propagateDownward(name, value, false); + case "_Release3": propagateDownward(name, value, false); + case "_Click1": propagateDownward(name, value, false); + case "_Click2": propagateDownward(name, value, false); + case "_Click3": propagateDownward(name, value, false); + case "_DoubleClick1": propagateDownward(name, value, false); + case "_DoubleClick2": propagateDownward(name, value, false); + case "_DoubleClick3": propagateDownward(name, value, false); + case "_KeyPressed": propagateDownward(name, value, false); + case "_KeyReleased": propagateDownward(name, value, false); + + case "PosChange": return; + case "SizeChange": return; + case "childadded": return; + case "childremoved": return; + + case "thisbox": if (value == null) removeSelf(); + + default: super.put(name, value); //#end } @@ -526,7 +572,8 @@ public abstract class Box extends JSScope implements JSTrap.JSTrappable { boxToCursor.put(this, value); Surface surface = getSurface(); String tempcursor = surface.cursor; - Move(surface.mousex, surface.mousey, surface.mousex, surface.mousey); + // FIXME + //Move(surface.mousex, surface.mousey, surface.mousex, surface.mousey); if (surface.cursor != tempcursor) surface.syncCursor(); } @@ -541,30 +588,45 @@ public abstract class Box extends JSScope implements JSTrap.JSTrappable { return; } if (!(value instanceof Res)) return; - texture = Picture.fromRes((Res)value, null); - if (texture != null) { - minwidth = texture.picture.getWidth(); - minheight = texture.picture.getHeight(); - MARK_REFLOW; - dirty(); - return; - } - texture = Picture.fromRes((Res)value, new Scheduler.Task() { public void perform() { - minwidth = texture.picture.getWidth(); - minheight = texture.picture.getHeight(); - Box b = Box.this; MARK_REFLOW_b; - dirty(); - } }); + + texture = Picture.load((Res)value, this); } - - private void mouseEvent(String name, Object value) { - Surface surface = getSurface(); - if (surface == null) return; - int mousex = globalToLocalX(surface.mousex); - int mousey = globalToLocalY(surface.mousey); - for(Box c = prevSibling(); c != null; c = c.prevSibling()) - if (c.inside(mousex - c.x, mousey - c.y)) { c.putAndTriggerJSTraps(name, value); return; } - if (parent != null) parent.putAndTriggerJSTraps(name, value); + + /** + * Handles events which propagate down the box tree. If obscured + * is set, then we merely check for Enter/Leave. + */ + private void propagateDownward(Object name_, Object value, boolean obscured) { + + String name = (String)name_; + if (getSurface() == null) return; + int x = globalToLocalX(getSurface().mousex); + int y = globalToLocalY(getSurface().mousey); + boolean wasinside = test(MOUSEINSIDE); + boolean isinside = test(VISIBLE) && inside(x, y) && !obscured; + if (!wasinside && isinside) { set(MOUSEINSIDE); putAndTriggerTrapsAndCatchExceptions("Enter", T); } + if (wasinside && !isinside) { clear(MOUSEINSIDE); putAndTriggerTrapsAndCatchExceptions("Leave", T); } + + boolean found = false; + if (wasinside || isinside) + for(Box child = getChild(treeSize() - 1); child != null; child = child.prevSibling()) { + boolean save_stop = child.test(STOP_UPWARD_PROPAGATION); + if (obscured || !child.inside(x - child.x, y - child.y)) { + child.propagateDownward(name, value, true); + } else try { + found = true; + child.clear(STOP_UPWARD_PROPAGATION); + child.putAndTriggerTrapsAndCatchExceptions(name, value); + } finally { + if (save_stop) child.set(STOP_UPWARD_PROPAGATION); else child.clear(STOP_UPWARD_PROPAGATION); + } + if (child.inside(x - child.x, y - child.y)) + if (name.equals("_Move")) obscured = true; + else break; + } + + if (!obscured && !found) + if (!name.equals("_Move") || wasinside) putAndTriggerTrapsAndCatchExceptions(name.substring(1), value); } private static int stringToColor(String s) { @@ -607,7 +669,7 @@ public abstract class Box extends JSScope implements JSTrap.JSTrappable { if (!cur.test(VISIBLE)) return null; if (!cur.inside(x - globalx, y - globaly)) return cur.parent == null ? cur : null; OUTER: while(true) { - for(int i=cur.numchildren - 1; i>=0; i--) { + for(int i=cur.treeSize() - 1; i>=0; i--) { Box child = cur.getChild(i); if (child == null) continue; // since this method is unsynchronized, we have to double-check globalx += child.x; @@ -624,37 +686,122 @@ public abstract class Box extends JSScope implements JSTrap.JSTrappable { // Trivial Helper Methods (should be inlined) ///////////////////////////////////////// - static final short min(short a, short b) { if (ab) return a; else return b; } - static final int max(int a, int b) { if (a>b) return a; else return b; } - static final float max(float a, float b) { if (a>b) return a; else return b; } + static short max(short a, short b) { if (a>b) return a; else return b; } + static int max(int a, int b) { if (a>b) return a; else return b; } + static float max(float a, float b) { if (a>b) return a; else return b; } - static final int min(int a, int b, int c) { if (a<=b && a<=c) return a; else if (b<=c && b<=a) return b; else return c; } - static final int max(int a, int b, int c) { if (a>=b && a>=c) return a; else if (b>=c && b>=a) return b; else return c; } - static final int bound(int a, int b, int c) { if (c < b) return c; if (a > b) return a; return b; } + static int min(int a, int b, int c) { if (a<=b && a<=c) return a; else if (b<=c && b<=a) return b; else return c; } + static int max(int a, int b, int c) { if (a>=b && a>=c) return a; else if (b>=c && b>=a) return b; else return c; } + static int bound(int a, int b, int c) { if (c < b) return c; if (a > b) return a; return b; } final boolean inside(int x, int y) { return test(VISIBLE) && x >= 0 && y >= 0 && x < width && y < height; } - protected final void set(int mask) { flags |= mask; } - protected final void set(int mask, boolean setclear) { if (setclear) set(mask); else clear(mask); } - protected final void clear(int mask) { flags &= ~mask; } - protected final boolean test(int mask) { return ((flags & mask) == mask); } + void set(int mask) { flags |= mask; } + void set(int mask, boolean setclear) { if (setclear) set(mask); else clear(mask); } + void clear(int mask) { flags &= ~mask; } + boolean test(int mask) { return ((flags & mask) == mask); } + + + // Tree Handling ////////////////////////////////////////////////////////////////////// + + public final int getIndexInParent() { return parent == null ? 0 : parent.indexNode(this); } + public final Box nextSibling() { return parent == null ? null : parent.getChild(parent.indexNode(this) + 1); } + public final Box prevSibling() { return parent == null ? null : parent.getChild(parent.indexNode(this) - 1); } + public final Box getChild(int i) { + if (i < 0) return null; + if (i >= treeSize()) return null; + return (Box)getNode(i); + } + + // Tree Manipulation ///////////////////////////////////////////////////////////////////// + + void removeSelf() { + if (parent != null) { parent.removeChild(parent.indexNode(this)); return; } + Surface surface = Surface.fromBox(this); + if (surface != null) surface.dispose(true); + } + + /** remove the i^th child */ + public void removeChild(int i) { + Box b = getChild(i); + MARK_REFLOW_b; + b.dirty(); + b.clear(MOUSEINSIDE); + deleteNode(i); + b.parent = null; + MARK_REFLOW; + putAndTriggerTrapsAndCatchExceptions("childremoved", b); + } - protected Box left = null; - protected Box right = null; - protected Box rootChild = null; - protected Box peerTree_parent = null; - public abstract Box peerTree_leftmost(); - public abstract Box peerTree_rightmost(); - public abstract Box insertBeforeMe(Box cell); - public abstract Box insertAfterMe(Box cell); - protected abstract Box fixAfterInsertion(); - protected abstract Box fixAfterDeletion(); - protected abstract Box rotateLeft(); - protected abstract Box rotateRight(); - protected abstract int numPeerChildren(); + public void put(int i, Object value) throws JSExn { + if (i < 0) return; + + if (value != null && !(value instanceof Box)) { + if (Log.on) Log.logJS(this, "attempt to set a numerical property on a box to a non-box"); + return; + } + + if (redirect == null) { + if (value == null) putAndTriggerTrapsAndCatchExceptions("childremoved", getChild(i)); + else Log.logJS(this, "attempt to add/remove children to/from a node with a null redirect"); + + } else if (redirect != this) { + if (value != null) putAndTriggerTrapsAndCatchExceptions("childadded", value); + redirect.put(i, value); + if (value == null) { + Box b = (Box)redirect.get(new Integer(i)); + if (b != null) putAndTriggerTrapsAndCatchExceptions("childremoved", b); + } + + } else if (value == null) { + if (i < 0 || i > treeSize()) return; + Box b = getChild(i); + removeChild(i); + putAndTriggerTrapsAndCatchExceptions("childremoved", b); + + } else { + Box b = (Box)value; + + // check if box being moved is currently target of a redirect + for(Box cur = b.parent; cur != null; cur = cur.parent) + if (cur.redirect == b) { + 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.parent) + if (cur == b) { + 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 == " + b); + return; + } + + if (b.parent != null) b.parent.removeChild(b.parent.indexNode(b)); + insertNode(i, b); + b.parent = this; + + // need both of these in case child was already uncalc'ed + MARK_REFLOW_b; + MARK_REFLOW; + + b.dirty(); + putAndTriggerTrapsAndCatchExceptions("childadded", b); + } + } + + void putAndTriggerTrapsAndCatchExceptions(Object name, Object val) { + try { + putAndTriggerTraps(name, val); + } catch (Exception e) { + Log.logJS("caught exception while putting to trap \""+name+"\""); + Log.logJS(e); + } + } + }