X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FBox.java;h=c4f34e599ae38e2032334d9cf47884ac1bb29159;hb=9c2602143956cd39ecf5ef4c9eb31f5f56b5bd66;hp=c195b484a4530c1a99313a68b6f57132e65ac7cd;hpb=3d545db9c5a99535462adc62cbf9fc88d3dd619b;p=org.ibex.core.git diff --git a/src/org/xwt/Box.java b/src/org/xwt/Box.java index c195b48..c4f34e5 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 final class Box extends JSScope { +public final class Box extends JSScope implements Scheduler.Task { // Macros ////////////////////////////////////////////////////////////////////// @@ -57,10 +57,43 @@ public final class Box extends JSScope { //#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((Stream)Main.builtin.get("fonts/vera/Vera.ttf"), 10); } + catch(JSExn e) { Log.info(Box.class, "should never happen: "+e); } + DEFAULT_FONT = f; + } + + // FIXME update these + // box properties can not be trapped + static final String[] props = new String[] { + "shrink", "hshrink", "vshrink", "x", "y", "width", "height", "cols", "rows", + "colspan", "rowspan", "align", "visible", "packed", "globalx", "globaly", + "minwidth", "maxwidth", "minheight", "maxheight", "indexof", "thisbox", "clip", + "numchildren", "redirect", "cursor", "mouse" + }; + + // 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 ////////////////////////////////////////////////////////////////////// @@ -86,22 +119,25 @@ public final class Box extends JSScope { static final int ALIGN_RIGHT = 0x00008000; 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 CLIP = 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 | CLIP; 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; + public 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,6 +167,23 @@ public final class Box extends JSScope { // Instance Methods ///////////////////////////////////////////////////////////////////// + + /** invoked when a resource needed to render ourselves finishes loading */ + public void perform() throws JSExn { + + // FIXME; we can't assume that just because we were performed the image is loaded. + // as external events have occured, check the state of box + if (texture != null) { + if (texture.isLoaded) { minwidth = min(texture.width, maxwidth); minheight = min(texture.height, maxheight); } + else { Stream 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()); } @@ -139,7 +192,8 @@ public final class Box extends JSScope { 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)) { + // x and y have a different meaning on the root box + if (cur.parent != null && cur.test(CLIP)) { w = min(x + w, cur.width) - max(x, 0); h = min(y + h, cur.height) - max(y, 0); x = max(x, 0); @@ -152,25 +206,6 @@ public final class Box extends JSScope { } } - /** 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) putAndTriggerTraps("Enter", T); - else if (wasinside && !isinside && getTrap("Leave") != null) putAndTriggerTraps("Leave", T); - else if (wasinside && isinside && (mousex != oldmousex || mousey != oldmousey) && getTrap("Move")!= null) - putAndTriggerTraps("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 //////////////////////////////////////////////////////////////////////////////////////// @@ -185,17 +220,6 @@ public final class Box extends JSScope { Box nextPackedSibling() { Box b = nextSibling(); return b == null || (b.test(PACKED | VISIBLE)) ? b : b.nextPackedSibling(); } Box firstPackedChild() { Box b = getChild(0); return b == null || (b.test(PACKED | VISIBLE)) ? b : b.nextPackedSibling(); } - /** only for use on the root box */ - void reflow(int new_width, int new_height) { - repack(); - /* - new_width = bound(max(contentwidth, minwidth), new_width, test(HSHRINK) ? max(contentwidth, minwidth) : maxwidth); - new_height = bound(max(contentheight, minheight), new_height, test(VSHRINK) ? max(contentheight, minheight) : maxheight); - */ - resize(x, y, new_width, new_height); - resize_children(); - } - /** pack the boxes into rows and columns; also computes contentwidth */ void repack() { for(Box child = getChild(0); child != null; child = child.nextSibling()) child.repack(); @@ -205,7 +229,7 @@ public final class Box extends JSScope { short r = 0; for(Box child = firstPackedChild(); child != null; r++) { for(short c=0, numclear=0; child != null && c < cols; c++) { - if (numRowsInCol[c] > r) continue; + 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=c - numclear + 1; i <= c; i++) numRowsInCol[i] += child.rowspan; @@ -229,22 +253,41 @@ public final class Box extends JSScope { //#end } - private void resize(LENGTH x, LENGTH y, LENGTH width, LENGTH height) { - // FEATURE reimplement, but we're destroying this + void resize(LENGTH x, LENGTH y, LENGTH width, LENGTH height) { if (x != this.x || y != this.y || width != this.width || height != this.height) { - (parent == null ? this : parent).dirty(this.x, this.y, this.width, this.height); boolean sizechange = (this.width != width || this.height != height) && getTrap("SizeChange") != null; boolean poschange = (this.x != x || this.y != y) && getTrap("PosChange") != null; + do { + int thisx = parent == null ? 0 : this.x; + int thisy = parent == null ? 0 : this.y; + + // we can't reenable this until we track + // surface-relative sizes; imagine the case of a clear + // surface with nonclear children + + /* + if (texture == null && (text == null || text.equals(""))) { + if ((fillcolor & 0xff000000) == 0) break; + // FEATURE: more optimizations here + if (this.x == x && this.y == y) { + Box who = (parent == null ? this : parent); + who.dirty(thisx+min(this.width,width), thisy, Math.abs(width-this.width), max(this.height, height)); + who.dirty(thisx, thisy+min(this.height,height), min(this.width, width), Math.abs(height-this.height)); + break; + } + } + */ + (parent == null ? this : parent).dirty(thisx, thisy, this.width, this.height); + this.width = width; this.height = height; this.x = x; this.y = y; + dirty(); + } while (false); this.width = width; this.height = height; this.x = x; this.y = y; - dirty(); - try { if (sizechange) putAndTriggerTraps("SizeChange", T); /*Surface.abort = true;*/ } - catch (Exception e) { Log.log(this, e); } - try { if (poschange) putAndTriggerTraps("PosChange", T); /*Surface.abort = true;*/ } - catch (Exception e) { Log.log(this, e); } + if (sizechange) putAndTriggerTrapsAndCatchExceptions("SizeChange", T); + if (poschange) putAndTriggerTrapsAndCatchExceptions("PosChange", T); } } - private void resize_children() { + void resize_children() { //#repeat col/row colspan/rowspan contentwidth/contentheight x/y width/height colMaxWidth/rowMaxHeight colWidth/rowHeight \ // HSHRINK/VSHRINK maxwidth/maxheight cols/rows minwidth/minheight colWidth/rowHeight x_slack/y_slack @@ -264,7 +307,8 @@ public final class Box extends JSScope { int increment = max(1, x_slack / cols); startslack = x_slack; for(short col=0; col < cols; col++) { - int diff = min(colMaxWidth[col], colWidth[col] + increment) - colWidth[col]; + // FIXME: double check this + int diff = min(min(colMaxWidth[col], colWidth[col] + increment) - colWidth[col], x_slack); x_slack -= diff; colWidth[col] += diff; } @@ -318,7 +362,8 @@ public final class Box extends JSScope { int globaly = parenty + (parent == null ? 0 : y); // intersect the x,y,w,h rendering window with ourselves; quit if it's empty - if (!test(NOCLIP)) { + + if (test(CLIP)) { cx1 = max(cx1, parent == null ? 0 : globalx); cy1 = max(cy1, parent == null ? 0 : globaly); cx2 = min(cx2, globalx + width); @@ -326,18 +371,18 @@ public final class Box extends JSScope { if (cx2 <= cx1 || cy2 <= cy1) return; } - if ((fillcolor & 0xFF000000) != 0x00000000) - buf.fillTrapezoid(globalx, globalx + width, globaly, globalx, globalx + width, globaly + height, fillcolor); + if ((fillcolor & 0xFF000000) != 0x00000000 || parent == null) + buf.fillTrapezoid(cx1, cx2, cy1, cx1, cx2, cy2, (fillcolor & 0xFF000000) == 0 ? 0xffffffff : 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); @@ -363,15 +408,24 @@ public final class Box extends JSScope { public Enumeration keys() { throw new Error("you cannot apply for..in to a " + this.getClass().getName()); } - /** to be filled in by the Tree implementation */ - public int numchildren = 0; + 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; + } - protected boolean isTrappable() { return true; } - public Object get(Object name) { + 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 "surface": return parent == null ? null : parent.getAndTriggerTraps("surface"); case "indexof": return METHOD; case "text": return text; case "path": throw new JSExn("cannot read from the path property"); @@ -386,28 +440,31 @@ public final class Box extends JSScope { 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); - case "height": return N(height); case "cols": return test(FIXED) == COLS ? N(cols) : N(0); case "rows": return test(FIXED) == ROWS ? N(rows) : N(0); case "colspan": return N(colspan); case "rowspan": return N(rowspan); - case "noclip": return B(test(NOCLIP)); + case "width": return N(width); + case "height": return N(height); + case "minwidth": return N(minwidth); + case "maxwidth": return N(maxwidth); + case "minheight": return N(minheight); + case "maxheight": return N(maxheight); + case "clip": return B(test(CLIP)); case "visible": return B(test(VISIBLE) && (parent == null || (parent.get("visible") == T))); case "packed": return B(test(PACKED)); case "globalx": return N(localToGlobalX(0)); case "globaly": return N(localToGlobalY(0)); case "cursor": return test(CURSOR) ? boxToCursor.get(this) : null; - 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 "minwidth": return N(minwidth); - case "maxwidth": return N(maxwidth); - case "minheight": return N(minheight); - case "maxheight": return N(maxheight); + case "mouse": + if (getSurface() == null) return null; + if (getSurface()._mousex == Integer.MAX_VALUE) + throw new JSExn("you cannot read from the box.mouse property in background thread context"); + return new Mouse(); + case "numchildren": return redirect == null ? N(0) : redirect == this ? N(treeSize()) : redirect.get("numchildren"); case "redirect": return redirect == null ? null : redirect == this ? T : redirect.get("redirect"); case "Minimized": if (parent == null && getSurface() != null) return B(getSurface().minimized); default: return super.get(name); @@ -415,7 +472,29 @@ public final class Box extends JSScope { throw new Error("unreachable"); // unreachable } - public void put(Object name, Object value) { + private class Mouse extends JS { + public Object get(Object key) { + //#switch(key) + case "x": return N(globalToLocalX(getSurface()._mousex)); + case "y": return N(globalToLocalY(getSurface()._mousey)); + + // this might not get recomputed if we change mousex/mousey... + case "inside": return B(test(MOUSEINSIDE)); + //#end + return null; + } + } + + void setMaxWidth(Object value) { + do { CHECKSET_INT(maxwidth); MARK_RESIZE; } while(false); + if (parent == null && getSurface() != null) getSurface().pendingWidth = maxwidth; + } + void setMaxHeight(Object value) { + do { CHECKSET_INT(maxheight); MARK_RESIZE; } while(false); + if (parent == null && getSurface() != null) getSurface().pendingHeight = maxheight; + } + + 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(); @@ -423,57 +502,91 @@ public final class Box extends JSScope { 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(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 "clip": CHECKSET_FLAG(CLIP); 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 "mouse": + int mousex = toInt(((JS)value).get("x")); + int mousey = toInt(((JS)value).get("y")); + getSurface()._mousex = localToGlobalX(mousex); + getSurface()._mousey = localToGlobalY(mousey); 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); - case "toback": if (parent == null && getSurface() != null && toBoolean(value)) { getSurface().toBack(); } - case "tofront": if (parent == null && getSurface() != null && toBoolean(value)) { getSurface().toFront(); } - 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 "redirect": if (redirect == this) redirect = (Box)value; else Log.info(this, "redirect can only be set once"); + case "font": + if(!(value instanceof Stream)) throw new JSExn("You can only put streams to the font property"); + font = value == null ? null : Font.getFont((Stream)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": return; // prevent stuff from hitting the Hash - case "KeyReleased": return; // prevent stuff from hitting the Hash - case "PosChange": return; // prevent stuff from hitting the Hash - case "SizeChange": return; // prevent stuff from hitting the Hash - case "childadded": return; // prevent stuff from hitting the Hash - case "childremoved": return; // prevent stuff from hitting the Hash - default: super.put(name, value); + 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 "titlebar": + if (getSurface() != null && value != null) getSurface().setTitleBarText(JS.toString(value)); + super.put(name,value); + + case "Press1": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); + case "Press2": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); + case "Press3": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); + case "Release1": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); + case "Release2": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); + case "Release3": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); + case "Click1": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); + case "Click2": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); + case "Click3": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); + case "DoubleClick1": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); + case "DoubleClick2": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); + case "DoubleClick3": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); + case "KeyPressed": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); + case "KeyReleased": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); + case "Move": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); + case "Enter": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value); + case "Leave": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(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 } @@ -503,7 +616,7 @@ public final class Box extends JSScope { case "bottom": set(ALIGN_BOTTOM); case "left": set(ALIGN_LEFT); case "right": set(ALIGN_RIGHT); - default: Log.logJS("invalid alignment \"" + value + "\""); + default: JS.log("invalid alignment \"" + value + "\""); //#end } @@ -514,58 +627,79 @@ public final class Box extends JSScope { 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(); } - private void setFill(Object value) { - if (value == null) return; - if (value instanceof String) { + private void setFill(Object value) throws JSExn { + if (value == null) { + // FIXME: Check this... does this make it transparent? + texture = null; + fillcolor = 0; + } else if (value instanceof String) { // FIXME check double set int newfillcolor = stringToColor((String)value); if (newfillcolor == fillcolor) return; fillcolor = newfillcolor; - dirty(); - 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; + } else if(value instanceof Stream) { + texture = Picture.load((Stream)value, this); + } else { + throw new JSExn("fill must be null, a String, or a stream"); } - 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(); - } }); + dirty(); } - - 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.putAndTriggerTraps(name, value); return; } - if (parent != null) parent.putAndTriggerTraps(name, value); + + // FIXME: mouse move/release still needs to propagate to boxen in which the mouse was pressed and is still held down + /** + * 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) { + // FIXME support three-char strings by doubling digits if (s == null) return 0x00000000; else if (SVG.colors.get(s) != null) return 0xFF000000 | toInt(SVG.colors.get(s)); - else if (s.length() > 0 && s.charAt(0) == '#') try { + else if (s.length() == 7 && s.charAt(0) == '#') try { // FEATURE alpha return 0xFF000000 | (Integer.parseInt(s.substring(1, 3), 16) << 16) | (Integer.parseInt(s.substring(3, 5), 16) << 8) | Integer.parseInt(s.substring(5, 7), 16); } catch (NumberFormatException e) { - Log.log(Box.class, "invalid color " + s); + Log.info(Box.class, "invalid color " + s); return 0; } else return 0; // FEATURE: error? @@ -595,7 +729,7 @@ public final class Box extends JSScope { 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; @@ -630,372 +764,63 @@ public final class Box extends JSScope { void clear(int mask) { flags &= ~mask; } boolean test(int mask) { return ((flags & mask) == mask); } - protected Box left = null; - protected Box right = null; - protected Box rootChild = null; - protected Box peerTree_parent = null; - // Tree Handling ////////////////////////////////////////////////////////////////////// - - private static boolean REDbool = false; - private static boolean BLACKbool = true; - - public final Box peerTree_leftmost() { for (Box p = this; ; p = p.left) if (p.left == null) return p; } - public final Box peerTree_rightmost() { for (Box p = this; ; p = p.right) if (p.right == null) return p; } - static Box peerTree_parent(Box p) { return (p == null)? null: p.peerTree_parent; } - - public void insertBeforeMe(Box cell) { left = cell; cell.peerTree_parent = this; cell.fixAfterInsertion(); } - public void insertAfterMe(Box cell) { right = cell; cell.peerTree_parent = this; cell.fixAfterInsertion(); } - - static boolean colorOf(Box p) { return (p == null) ? BLACKbool : p.test(BLACK); } - static void setColor(Box p, boolean c) { if (p != null) { if (c) p.set(BLACK); else p.clear(BLACK); } } - static Box leftOf(Box p) { return (p == null)? null: p.left; } - static Box rightOf(Box p) { return (p == null)? null: p.right; } - - public final Box nextSibling() { - if (right != null) - return right.peerTree_leftmost(); - else { - Box p = peerTree_parent; - Box ch = this; - while (p != null && ch == p.right) { ch = p; p = p.peerTree_parent; } - return p; - } - } - - public final Box prevSibling() { - if (left != null) - return left.peerTree_rightmost(); - else { - Box p = peerTree_parent; - Box ch = this; - while (p != null && ch == p.left) { ch = p; p = p.peerTree_parent; } - return p; - } - } - - public void removeNode() { - - // handle case where we are only node - if (left == null && right == null && peerTree_parent == null) return; - - // if strictly internal, swap places with a successor - if (left != null && right != null) { - Box s = nextSibling(); - // To work nicely with arbitrary subclasses of Box, we don't want to - // just copy successor's fields. since we don't know what - // they are. Instead we swap positions in the tree. - swapPosition(this, s); - } - - // Start fixup at replacement node (normally a child). - // But if no children, fake it by using self - - if (left == null && right == null) { - - if (test(BLACK)) fixAfterDeletion(); - - // Unlink (Couldn't before since fixAfterDeletion needs peerTree_parent ptr) - - if (peerTree_parent != null) { - if (this == peerTree_parent.left) - peerTree_parent.left = null; - else if (this == peerTree_parent.right) - peerTree_parent.right = null; - peerTree_parent = null; - } - - } - else { - Box replacement = left; - if (replacement == null) replacement = right; - - // link replacement to peerTree_parent - replacement.peerTree_parent = peerTree_parent; - - if (peerTree_parent == null) parent.rootChild = replacement; - else if (this == peerTree_parent.left) peerTree_parent.left = replacement; - else peerTree_parent.right = replacement; - - left = null; - right = null; - peerTree_parent = null; - - // fix replacement - if (test(BLACK)) replacement.fixAfterDeletion(); - - } - } - - /** - * Swap the linkages of two nodes in a tree. - * Return new root, in case it changed. - **/ - void swapPosition(Box x, Box y) { - - /* Too messy. TODO: find sequence of assigments that are always OK */ - - Box px = x.peerTree_parent; - boolean xpl = px != null && x == px.left; - Box lx = x.left; - Box rx = x.right; - - Box py = y.peerTree_parent; - boolean ypl = py != null && y == py.left; - Box ly = y.left; - Box ry = y.right; - - if (x == py) { - y.peerTree_parent = px; - if (px != null) if (xpl) px.left = y; else px.right = y; - x.peerTree_parent = y; - if (ypl) { - y.left = x; - y.right = rx; if (rx != null) rx.peerTree_parent = y; - } - else { - y.right = x; - y.left = lx; if (lx != null) lx.peerTree_parent = y; - } - x.left = ly; if (ly != null) ly.peerTree_parent = x; - x.right = ry; if (ry != null) ry.peerTree_parent = x; - } - else if (y == px) { - x.peerTree_parent = py; - if (py != null) if (ypl) py.left = x; else py.right = x; - y.peerTree_parent = x; - if (xpl) { - x.left = y; - x.right = ry; if (ry != null) ry.peerTree_parent = x; - } - else { - x.right = y; - x.left = ly; if (ly != null) ly.peerTree_parent = x; - } - y.left = lx; if (lx != null) lx.peerTree_parent = y; - y.right = rx; if (rx != null) rx.peerTree_parent = y; - } - else { - x.peerTree_parent = py; if (py != null) if (ypl) py.left = x; else py.right = x; - x.left = ly; if (ly != null) ly.peerTree_parent = x; - x.right = ry; if (ry != null) ry.peerTree_parent = x; - - y.peerTree_parent = px; if (px != null) if (xpl) px.left = y; else px.right = y; - y.left = lx; if (lx != null) lx.peerTree_parent = y; - y.right = rx; if (rx != null) rx.peerTree_parent = y; - } - - boolean c = x.test(BLACK); - if (y.test(BLACK)) x.set(BLACK); else x.clear(BLACK); - if (c) y.set(BLACK); else y.clear(BLACK); - - if (parent.rootChild == x) parent.rootChild = y; - else if (parent.rootChild == y) parent.rootChild = x; - } - - void rotateLeft() { - Box r = right; - right = r.left; - if (r.left != null) r.left.peerTree_parent = this; - r.peerTree_parent = peerTree_parent; - if (peerTree_parent == null) parent.rootChild = r; - else if (peerTree_parent.left == this) peerTree_parent.left = r; - else peerTree_parent.right = r; - r.left = this; - peerTree_parent = r; - } - - void rotateRight() { - Box l = left; - left = l.right; - if (l.right != null) l.right.peerTree_parent = this; - l.peerTree_parent = peerTree_parent; - if (peerTree_parent == null) parent.rootChild = l; - else if (peerTree_parent.right == this) peerTree_parent.right = l; - else peerTree_parent.left = l; - l.right = this; - peerTree_parent = l; - } - - void fixAfterInsertion() { - clear(BLACK); - Box x = this; - - while (x != null && x != parent.rootChild && !x.peerTree_parent.test(BLACK)) { - if (peerTree_parent(x) == leftOf(peerTree_parent(peerTree_parent(x)))) { - Box y = rightOf(peerTree_parent(peerTree_parent(x))); - if (colorOf(y) == REDbool) { - setColor(peerTree_parent(x), BLACKbool); - setColor(y, BLACKbool); - setColor(peerTree_parent(peerTree_parent(x)), REDbool); - x = peerTree_parent(peerTree_parent(x)); - } - else { - if (x == rightOf(peerTree_parent(x))) { - x = peerTree_parent(x); - x.rotateLeft(); - } - setColor(peerTree_parent(x), BLACKbool); - setColor(peerTree_parent(peerTree_parent(x)), REDbool); - if (peerTree_parent(peerTree_parent(x)) != null) - peerTree_parent(peerTree_parent(x)).rotateRight(); - } - } - else { - Box y = leftOf(peerTree_parent(peerTree_parent(x))); - if (colorOf(y) == REDbool) { - setColor(peerTree_parent(x), BLACKbool); - setColor(y, BLACKbool); - setColor(peerTree_parent(peerTree_parent(x)), REDbool); - x = peerTree_parent(peerTree_parent(x)); - } - else { - if (x == leftOf(peerTree_parent(x))) { - x = peerTree_parent(x); - x.rotateRight(); - } - setColor(peerTree_parent(x), BLACKbool); - setColor(peerTree_parent(peerTree_parent(x)), REDbool); - if (peerTree_parent(peerTree_parent(x)) != null) - peerTree_parent(peerTree_parent(x)).rotateLeft(); - } - } - } - parent.rootChild.set(BLACK); - } - - /** From CLR **/ - void fixAfterDeletion() { - Box x = this; - while (x != parent.rootChild && colorOf(x) == BLACKbool) { - if (x == leftOf(peerTree_parent(x))) { - Box sib = rightOf(peerTree_parent(x)); - if (colorOf(sib) == REDbool) { - setColor(sib, BLACKbool); - setColor(peerTree_parent(x), REDbool); - peerTree_parent(x).rotateLeft(); - sib = rightOf(peerTree_parent(x)); - } - if (colorOf(leftOf(sib)) == BLACKbool && colorOf(rightOf(sib)) == BLACKbool) { - setColor(sib, REDbool); - x = peerTree_parent(x); - } - else { - if (colorOf(rightOf(sib)) == BLACKbool) { - setColor(leftOf(sib), BLACKbool); - setColor(sib, REDbool); - sib.rotateRight(); - sib = rightOf(peerTree_parent(x)); - } - setColor(sib, colorOf(peerTree_parent(x))); - setColor(peerTree_parent(x), BLACKbool); - setColor(rightOf(sib), BLACKbool); - peerTree_parent(x).rotateLeft(); - x = parent.rootChild; - } - } - else { - Box sib = leftOf(peerTree_parent(x)); - if (colorOf(sib) == REDbool) { - setColor(sib, BLACKbool); - setColor(peerTree_parent(x), REDbool); - peerTree_parent(x).rotateRight(); - sib = leftOf(peerTree_parent(x)); - } - if (colorOf(rightOf(sib)) == BLACKbool && colorOf(leftOf(sib)) == BLACKbool) { - setColor(sib, REDbool); - x = peerTree_parent(x); - } - else { - if (colorOf(leftOf(sib)) == BLACKbool) { - setColor(rightOf(sib), BLACKbool); - setColor(sib, REDbool); - sib.rotateLeft(); - sib = leftOf(peerTree_parent(x)); - } - setColor(sib, colorOf(peerTree_parent(x))); - setColor(peerTree_parent(x), BLACKbool); - setColor(leftOf(sib), BLACKbool); - peerTree_parent(x).rotateRight(); - x = parent.rootChild; - } - } - } - setColor(x, BLACKbool); + 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 ///////////////////////////////////////////////////////////////////// - /** remove this node from its parent; INVARIANT: whenever the parent of a node is changed, remove() gets called. */ - public void remove() { - if (parent == null) { - Surface surface = Surface.fromBox(this); - if (surface != null) surface.dispose(true); - return; - } else { - parent.numchildren--; - } - Box oldparent = parent; - if (oldparent == null) return; - MARK_REFLOW; - dirty(); - clear(MOUSEINSIDE); - removeNode(); - parent = null; - if (oldparent != null) { Box b = oldparent; MARK_REFLOW_b; } - if (oldparent != null) oldparent.putAndTriggerTraps("childremoved", this); + void removeSelf() { + if (parent != null) { parent.removeChild(parent.indexNode(this)); return; } + Surface surface = Surface.fromBox(this); + if (surface != null) surface.dispose(true); } - /** Returns ith child */ - public Box getChild(int i) { - // FIXME: store numleft and numright in the tree - Box left = rootChild; - if (left == null) return null; - while (left.left != null) left = left.left; - for(; i > 0; i--) left = left.nextSibling(); - return left; + /** 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); } - /** Returns our index in our parent */ - public int getIndexInParent() { - // FIXME: store numleft and numright in the tree - if (peerTree_parent == null) return left == null ? 0 : left.numPeerChildren() + 1; - else if (peerTree_parent.left == this) return peerTree_parent.getIndexInParent() - 1; - else if (peerTree_parent.right == this) return peerTree_parent.getIndexInParent() + 1; - else throw new Error("we're not a child of our parent!"); - } - - public int numPeerChildren() { - return (left == null ? 0 : left.numPeerChildren() + 1) + (right == null ? 0 : right.numPeerChildren() + 1); - } - - public void put(int i, Object value) { + 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"); + if (Log.on) JS.log(this, "attempt to set a numerical property on a box to a non-box"); return; } if (redirect == null) { - if (value == null) putAndTriggerTraps("childremoved", getChild(i)); - else Log.logJS(this, "attempt to add/remove children to/from a node with a null redirect"); + if (value == null) putAndTriggerTrapsAndCatchExceptions("childremoved", getChild(i)); + else JS.log(this, "attempt to add/remove children to/from a node with a null redirect"); } else if (redirect != this) { - if (value != null) putAndTriggerTraps("childadded", value); + if (value != null) putAndTriggerTrapsAndCatchExceptions("childadded", value); redirect.put(i, value); if (value == null) { Box b = (Box)redirect.get(new Integer(i)); - if (b != null) putAndTriggerTraps("childremoved", b); + if (b != null) putAndTriggerTrapsAndCatchExceptions("childremoved", b); } } else if (value == null) { - if (i < 0 || i > numchildren) return; + if (i < 0 || i > treeSize()) return; Box b = getChild(i); - b.remove(); - putAndTriggerTraps("childremoved", b); + removeChild(i); + putAndTriggerTrapsAndCatchExceptions("childremoved", b); } else { Box b = (Box)value; @@ -1003,35 +828,40 @@ public final class Box extends JSScope { // 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"); + if (Log.on) JS.log(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); + if (Log.on) JS.log(this, "attempt to make a node a parent of its own ancestor"); + if (Log.on) Log.info(this, "box == " + this + " ancestor == " + b); return; } - b.remove(); + if (b.parent != null) b.parent.removeChild(b.parent.indexNode(b)); + insertNode(i, b); b.parent = this; - numchildren++; - - Box before = getChild(i); - if (before == null) { - if (rootChild == null) rootChild = b; - else rootChild.peerTree_rightmost().insertAfterMe(b); - } - else before.insertBeforeMe(b); // need both of these in case child was already uncalc'ed MARK_REFLOW_b; MARK_REFLOW; b.dirty(); - putAndTriggerTraps("childadded", b); + putAndTriggerTrapsAndCatchExceptions("childadded", b); + } + } + + void putAndTriggerTrapsAndCatchExceptions(Object name, Object val) { + try { + putAndTriggerTraps(name, val); + } catch (JSExn e) { + JS.log("caught js exception while putting to trap \""+name+"\""); + JS.log(e); + } catch (Exception e) { + JS.log("caught exception while putting to trap \""+name+"\""); + JS.log(e); } }