X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2FBox.java;h=bbfad254b465d6e0bb7e1e4f0f879291e2e97ba8;hp=9d7ed497118e1d4fa1ced72240a7dc166994e378;hb=c9c75398e998bd9d1dce22509c2b3dea9de63ec4;hpb=db4ab6de30e095d6448fb826c2e6f0d4ac53cc7b diff --git a/src/org/ibex/Box.java b/src/org/ibex/Box.java index 9d7ed49..bbfad25 100644 --- a/src/org/ibex/Box.java +++ b/src/org/ibex/Box.java @@ -1,5 +1,5 @@ // FIXME -// Copyright 2002 Adam Megacz, see the COPYING file for licensing [GPL] +// Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL] package org.ibex; // FEATURE: reflow before allowing js to read from width/height @@ -54,13 +54,11 @@ public final class Box extends JSScope implements Scheduler.Task { //#define CHECKSET_INT(prop) int nu = toInt(value); if (nu == prop) break; prop = nu; //#define CHECKSET_FLAG(flag) boolean nu = toBoolean(value); if (nu == test(flag)) break; if (nu) set(flag); else clear(flag); //#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; } + //#define CHECKSET_STRING(prop) if ((value==null&&prop==null)||(value!=null&&JS.toString(value).equals(prop))) break; prop=JS.toString(value); protected Box() { super(null); } - static Hash boxToCursor = new Hash(500, 3); + static Hash boxToCursor = new Hash(500, 3); // FIXME memory leak public static final int MAX_LENGTH = Integer.MAX_VALUE; static final Font DEFAULT_FONT; @@ -87,11 +85,9 @@ public final class Box extends JSScope implements Scheduler.Task { "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" + "Enter", "Leave", "Move", "ChildChange", + "KeyPressed", "KeyReleased", "SizeChange", + "Focused", "Maximized", "Minimized", "Close" }; // Flags ////////////////////////////////////////////////////////////////////// @@ -152,6 +148,8 @@ public final class Box extends JSScope implements Scheduler.Task { private short col = 0; public LENGTH x = 0; public LENGTH y = 0; + public LENGTH ax = 0; // FEATURE: roll these into x/y; requires lots of changes + public LENGTH ay = 0; // FEATURE: roll these into x/y; requires lots of changes; perhaps y()? public LENGTH width = 0; public LENGTH height = 0; private LENGTH contentwidth = 0; // == max(minwidth, textwidth, sum(child.contentwidth)) @@ -166,6 +164,7 @@ public final class Box extends JSScope implements Scheduler.Task { // Instance Methods ///////////////////////////////////////////////////////////////////// + public final int fontSize() { return font == null ? DEFAULT_FONT.pointsize : font.pointsize; } /** invoked when a resource needed to render ourselves finishes loading */ public void perform() throws JSExn { @@ -174,18 +173,16 @@ public final class Box extends JSScope implements Scheduler.Task { // 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 { JS res = texture.stream; texture = null; throw new JSExn("image not found: "+res); } + else { JS res = texture.stream; texture = null; throw new JSExn("image not found: "+res.unclone()); } + } else { + Log.warn(Box.class, "perform() called with null texture"); } - 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 void dirty() { dirty(0, 0, width, height); } @@ -208,66 +205,59 @@ public final class Box extends JSScope implements Scheduler.Task { // Reflow //////////////////////////////////////////////////////////////////////////////////////// - // static stuff so we don't have to keep reallocating - private static int[] numRowsInCol = new int[65535]; - private static LENGTH[] colWidth = new LENGTH[65535]; - private static LENGTH[] colMaxWidth = new LENGTH[65535]; - private static LENGTH[] rowHeight = new LENGTH[65535]; - private static LENGTH[] rowMaxHeight = new LENGTH[65535]; - static { for(int i=0; i 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; - child.col = (short)(c - numclear + 1); child.row = r; - rows = (short)max(rows, child.row + child.rowspan); - child = child.nextPackedSibling(); - numclear = 0; - } + void pack() { + for(Box child = getChild(0); child != null; child = child.nextSibling()) child.pack(); + int frontier_size = 0; contentwidth = 0; contentheight = 0; + //#repeat COLS/ROWS rows/cols cols/rows col/row row/col colspan/rowspan rowspan/colspan \ + // contentheight/contentwidth contentwidth/contentheight + if (treeSize() > 0 && test(FIXED) == COLS) { + rows = 0; + for(Box child = getChild(0); child != null; child = child.nextSibling()) { + if (!child.test(PACKED) || !child.test(VISIBLE)) continue; + child.col = (short)(frontier_size <= 0 ? 0 : (frontier[frontier_size-1].col + frontier[frontier_size-1].colspan)); + child.row = (short)(frontier_size <= 0 ? 0 : frontier[frontier_size-1].row); + if (child.col + min(cols,child.colspan) > cols) { child.col = 0; child.row++; } + for(int i=0; ichild.col) { + child.col = (short)(frontier[i].col + frontier[i].colspan); + if (child.col + min(cols,child.colspan) > cols) { + child.row = (short)(frontier[i].row + frontier[i].rowspan); + for(i--; i>0; i--) child.row = (short)min(row, frontier[i].row + frontier[i].rowspan); + child.col = (short)0; + } + i = -1; + } else break; + frontier[frontier_size++] = child; } - for(int i=0; i 0) do { + computeRegions(); + int nc = numregions * 3 + numkids * 2 + 3; + if (coeff == null || nc+1>coeff.length) coeff = new float[nc+1]; + lp_h.init(nc); + + for(int i=0; i= child.col && regions[r+1] <= min(child.col+child.colspan,cols)) + coeff[r] = (float)(regions[r+1] - regions[r]); + lp_h.add_constraint(coeff, Simplex.GE, (float)child.contentwidth); + if (!findMinimum) { + // priority 2: honor maxwidths + int child_maxwidth = child.test(HSHRINK) ? min(child.maxwidth, child.contentwidth) : child.maxwidth; + if (child_maxwidth < Integer.MAX_VALUE) { + for(int i=0; i= child.col && regions[r+1] <= min(child.col+child.colspan,cols)) + coeff[r] = (float)(regions[r+1] - regions[r]); + coeff[numregions*2+childnum] = (float)-1.0; + lp_h.add_constraint(coeff, Simplex.LE, (float)child_maxwidth); + } + } + childnum++; + } + + if (!findMinimum) { + // priority 3: equalize columns + float avg = ((float)width)/((float)numregions); + for(int r=0; r 0 && cols > 0 && startslack != x_slack;) { - int increment = max(1, x_slack / cols); - startslack = x_slack; - for(short col=0; col < cols; col++) { - // FIXME: double check this - int diff = min(min(colMaxWidth[col], colWidth[col] + increment) - colWidth[col], x_slack); - x_slack -= diff; - colWidth[col] += diff; + + try { switch(lp_h.solve()) { + case Simplex.UNBOUNDED: Log.warn(this, "simplex claims unboundedness; this should never happen"); break; + case Simplex.INFEASIBLE: Log.debug(this, "simplex claims infeasibility; this should never happen"); break; + case Simplex.MILP_FAIL: Log.warn(this, "simplex claims MILP_FAIL; this should never happen"); break; + case Simplex.RUNNING: Log.warn(this, "simplex still RUNNING; this should never happen"); break; + case Simplex.FAILURE: Log.warn(this, "simplex claims FAILURE; this should never happen"); break; + } } catch (Error e) { + Log.warn(this, "got an Error in simplex solver; not sure why this happens"); + return; } - } + + if (findMinimum) contentwidth = Math.round(lp_h.solution[lp_h.rows + (2*numregions + numkids + 1)]); + } while(false); //#end + } - // Phase 3: assign childrens' actual sizes + void place() { + solve(false); for(Box child = getChild(0); child != null; child = child.nextSibling()) { if (!child.test(VISIBLE)) continue; int child_width, child_height, child_x, child_y; if (!child.test(PACKED)) { - child_x = child.x; - child_y = child.y; - child_width = child.test(HSHRINK) ? child.contentwidth : min(child.maxwidth, width - child_x); - child_height = child.test(VSHRINK) ? child.contentheight : min(child.maxheight, height - child_y); + child_width = child.test(HSHRINK) ? child.contentwidth : min(child.maxwidth, width - Math.abs(child.ax)); + child_height = child.test(VSHRINK) ? child.contentheight : min(child.maxheight, height - Math.abs(child.ay)); child_width = max(child.minwidth, child_width); child_height = max(child.minheight, child_height); + int gap_x = width - child_width; + int gap_y = height - child_height; + child_x = child.ax + (child.test(ALIGN_RIGHT) ? gap_x : !child.test(ALIGN_LEFT) ? gap_x / 2 : 0); + child_y = child.ay + (child.test(ALIGN_BOTTOM) ? gap_y : !child.test(ALIGN_TOP) ? gap_y / 2 : 0); } else { - int unbounded; + int diff; //#repeat col/row colspan/rowspan contentwidth/contentheight width/height colMaxWidth/rowMaxHeight \ // child_x/child_y x/y HSHRINK/VSHRINK maxwidth/maxheight cols/rows minwidth/minheight x_slack/y_slack \ - // colWidth/rowHeight child_width/child_height ALIGN_RIGHT/ALIGN_BOTTOM ALIGN_LEFT/ALIGN_TOP - unbounded = 0; - for(int i = child.col; i < child.col + child.colspan; i++) unbounded += colWidth[i]; - child_width = min(unbounded, child.test(HSHRINK) ? child.contentwidth : child.maxwidth); - child_x = test(ALIGN_RIGHT) ? x_slack : test(ALIGN_LEFT) ? 0 : x_slack / 2; - for(int i=0; i < child.col; i++) child_x += colWidth[i]; - if (child_width > unbounded) child_x -= (child_width - unbounded) / 2; + // child_width/child_height ALIGN_RIGHT/ALIGN_BOTTOM ALIGN_LEFT/ALIGN_TOP lp_h/lp \ + // numregions/numregions_v regions/regions_v + child_width = 0; + child_x = 0; + if (cols == 1) { + child_x = 0; + child_width = width; + } else { + for(int r=0; r= child.col && regions[r+1] <= min(child.col+child.colspan,cols)) + child_width += Math.round(lp_h.solution[lp_h.rows+r+1] * (regions[r+1] - regions[r])); + else if (regions[r+1] <= child.col) + child_x += Math.round(lp_h.solution[lp_h.rows+r+1] * (regions[r+1] - regions[r])); + } + diff = (child_width - (child.test(HSHRINK) ? child.contentwidth : min(child_width, child.maxwidth))); + child_x += (child.test(ALIGN_RIGHT) ? diff : child.test(ALIGN_LEFT) ? 0 : diff / 2); + child_width -= diff; //#end } child.resize(child_x, child_y, child_width, child_height); } - // cleanup - for(int i=0; i 0) + child.place(); } @@ -361,10 +440,9 @@ public final class Box extends JSScope implements Scheduler.Task { int globaly = parenty + (parent == null ? 0 : y); // intersect the x,y,w,h rendering window with ourselves; quit if it's empty - if (test(CLIP)) { - cx1 = max(cx1, parent == null ? 0 : globalx); - cy1 = max(cy1, parent == null ? 0 : globaly); + cx1 = max(cx1, globalx); + cy1 = max(cy1, globaly); cx2 = min(cx2, globalx + width); cy2 = min(cy2, globaly + height); if (cx2 <= cx1 || cy2 <= cy1) return; @@ -378,10 +456,14 @@ public final class Box extends JSScope implements Scheduler.Task { 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 (font.rasterizeGlyphs(text, buf, strokecolor, globalx, globaly, cx1, cy1, cx2, cy2, null) == -1) - font.rasterizeGlyphs(text, buf, strokecolor, globalx, globaly, cx1, cy1, cx2, cy2, this); + + if (text != null && !text.equals("") && font != null) { + int gap_x = width - font.textwidth(text); + int gap_y = height - font.textheight(text); + int text_x = globalx + (test(ALIGN_RIGHT) ? gap_x : !test(ALIGN_LEFT) ? gap_x/2 : 0); + int text_y = globaly + (test(ALIGN_BOTTOM) ? gap_y : !test(ALIGN_TOP) ? gap_y/2 : 0); + font.rasterizeGlyphs(text, buf, strokecolor, text_x, text_y, cx1, cy1, cx2, cy2); + } for(Box b = getChild(0); b != null; b = b.nextSibling()) b.render(globalx, globaly, cx1, cy1, cx2, cy2, buf, null); @@ -390,22 +472,31 @@ public final class Box extends JSScope implements Scheduler.Task { // Methods to implement org.ibex.js.JS ////////////////////////////////////// - public int globalToLocalX(int x) { return parent == null ? x : parent.globalToLocalX(x - this.x); } - public int globalToLocalY(int y) { return parent == null ? y : parent.globalToLocalY(y - this.y); } - 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 JSExn { - if (nargs != 1 || !"indexof".equals(method)) return super.callMethod(method, a0, a1, a2, rest, nargs); - Box b = (Box)a0; - if (b.parent != this) - return (redirect == null || redirect == this) ? - N(-1) : - redirect.callMethod(method, a0, a1, a2, rest, nargs); - return N(b.getIndexInParent()); - } + switch (nargs) { + case 1: { + //#switch(method) + case "indexof": + Box b = (Box)a0; + if (b.parent != this) + return (redirect == null || redirect == this) ? + N(-1) : + redirect.callMethod(method, a0, a1, a2, rest, nargs); + return N(b.getIndexInParent()); + + case "distanceto": + Box b = (Box)a0; + JS ret = new JS(); + ret.put("x", N(b.localToGlobalX(0) - localToGlobalX(0))); + ret.put("y", N(b.localToGlobalY(0) - localToGlobalY(0))); + return ret; - public Enumeration keys() { throw new Error("you cannot apply for..in to a " + this.getClass().getName()); } + //#end + } + } + return super.callMethod(method, a0, a1, a2, rest, nargs); + } protected boolean isTrappable(Object key, boolean isRead) { if (key == null) return false; @@ -426,6 +517,7 @@ public final class Box extends JSScope implements Scheduler.Task { //#switch(name) case "surface": return parent == null ? null : parent.getAndTriggerTraps("surface"); case "indexof": return METHOD; + case "distanceto": return METHOD; case "text": return text; case "path": throw new JSExn("cannot read from the path property"); case "fill": return colorToString(fillcolor); @@ -440,8 +532,8 @@ public final class Box extends JSScope implements Scheduler.Task { 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 "x": return (parent == null || !test(VISIBLE)) ? N(0) : test(PACKED) ? N(x) : N(ax); + case "y": return (parent == null || !test(VISIBLE)) ? N(0) : test(PACKED) ? N(y) : N(ay); 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); @@ -484,11 +576,11 @@ public final class Box extends JSScope implements Scheduler.Task { } } - void setMaxWidth(Object value) { + public void setMaxWidth(Object value) { do { CHECKSET_INT(maxwidth); MARK_RESIZE; } while(false); - if (parent == null && getSurface() != null) getSurface().pendingWidth = maxwidth; + if (parent == null && getSurface() != null) getSurface().pendingWidth = maxwidth; } - void setMaxHeight(Object value) { + public void setMaxHeight(Object value) { do { CHECKSET_INT(maxheight); MARK_RESIZE; } while(false); if (parent == null && getSurface() != null) getSurface().pendingHeight = maxheight; } @@ -514,8 +606,8 @@ public final class Box extends JSScope implements Scheduler.Task { case "minheight": CHECKSET_INT(minheight); MARK_RESIZE; if (parent == null && getSurface() != null) getSurface().setMinimumSize(minwidth, minheight, minwidth != maxwidth || minheight != maxheight); - case "colspan": CHECKSET_SHORT(colspan); MARK_REPACK_parent; - case "rowspan": CHECKSET_SHORT(rowspan); MARK_REPACK_parent; + case "colspan": if (toInt(value) <= 0) return; CHECKSET_SHORT(colspan); MARK_REPACK_parent; + case "rowspan": if (toInt(value) <= 0) return; 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 "clip": CHECKSET_FLAG(CLIP); if (parent == null) dirty(); else parent.dirty(); @@ -535,15 +627,36 @@ public final class Box extends JSScope implements Scheduler.Task { 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 "redirect": if (redirect == this) redirect = (Box)value; else Log.info(this, "redirect can only be set once"); + case "redirect": + if (value == null) { redirect = null; return; } + for(Box cur = (Box)value; cur != null; cur = cur.parent) + if (cur == redirect) { + redirect = (Box)value; + return; + } + JS.error("redirect can only be set to a descendant of its current value"); 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.stream, toInt(value)); MARK_RESIZE; dirty(); - case "x": if (parent==null && Surface.fromBox(this)!=null) { CHECKSET_INT(x); } else { if (test(PACKED) && parent != null) return; dirty(); 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; dirty(); CHECKSET_INT(y); dirty(); MARK_RESIZE; dirty(); } + case "x": if (parent==null && Surface.fromBox(this)!=null) { + CHECKSET_INT(x); + } else { + if (test(PACKED) && parent != null) return; + dirty(); CHECKSET_INT(ax); + dirty(); MARK_RESIZE; + dirty(); + } + case "y": if (parent==null && Surface.fromBox(this)!=null) { + CHECKSET_INT(y); + } else { + if (test(PACKED) && parent != null) return; + dirty(); CHECKSET_INT(ay); + dirty(); MARK_RESIZE; + dirty(); + } case "titlebar": if (getSurface() != null && value != null) getSurface().setTitleBarText(JS.toString(value)); super.put(name,value); @@ -563,8 +676,11 @@ public final class Box extends JSScope implements Scheduler.Task { 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 "HScroll": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) + parent.putAndTriggerTraps(name, N(((Number)value).floatValue() * ((float)parent.fontSize()) / ((float)fontSize()))); + case "VScroll": if (!test(STOP_UPWARD_PROPAGATION) && parent != null) + parent.putAndTriggerTraps(name, N(((Number)value).floatValue() * ((float)parent.fontSize()) / ((float)fontSize()))); case "_Move": propagateDownward(name, value, false); case "_Press1": propagateDownward(name, value, false); @@ -581,11 +697,13 @@ public final class Box extends JSScope implements Scheduler.Task { case "_DoubleClick3": propagateDownward(name, value, false); case "_KeyPressed": propagateDownward(name, value, false); case "_KeyReleased": propagateDownward(name, value, false); + case "_HScroll": propagateDownward(name, value, false); + case "_VScroll": propagateDownward(name, value, false); - case "PosChange": return; case "SizeChange": return; - case "childadded": return; - case "childremoved": return; + case "ChildChange": return; + case "Enter": return; + case "Leave": return; case "thisbox": if (value == null) removeSelf(); @@ -629,10 +747,11 @@ public final class Box extends JSScope implements Scheduler.Task { set(CURSOR); boxToCursor.put(this, value); Surface surface = getSurface(); - String tempcursor = surface.cursor; - // FIXME - //Move(surface.mousex, surface.mousey, surface.mousex, surface.mousey); - if (surface.cursor != tempcursor) surface.syncCursor(); + if (surface != null) { + String tempcursor = surface.cursor; + propagateDownward(null, null, false); + if (surface.cursor != tempcursor) surface.syncCursor(); + } } private void setFill(Object value) throws JSExn { @@ -647,6 +766,7 @@ public final class Box extends JSScope implements Scheduler.Task { fillcolor = newfillcolor; } else if(value instanceof JS) { texture = Picture.load((JS)value, this); + if (texture != null && texture.isLoaded) perform(); } else { throw new JSExn("fill must be null, a String, or a stream, not a " + value.getClass()); } @@ -666,29 +786,42 @@ public final class Box extends JSScope implements Scheduler.Task { 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); } + if (!wasinside && isinside) { + set(MOUSEINSIDE); + putAndTriggerTrapsAndCatchExceptions("Enter", T); + } + if (isinside && test(CURSOR)) getSurface().cursor = (String)boxToCursor.get(this); + 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); + Object value2 = value; + if (name.equals("_HScroll") || name.equals("_VScroll")) + value2 = N(((Number)value).floatValue() * ((float)child.fontSize()) / (float)fontSize()); if (obscured || !child.inside(x - child.x, y - child.y)) { - child.propagateDownward(name, value, true); + child.propagateDownward(name, value2, true); } else try { found = true; child.clear(STOP_UPWARD_PROPAGATION); - child.putAndTriggerTrapsAndCatchExceptions(name, value); + if (name != null) child.putAndTriggerTrapsAndCatchExceptions(name, value2); + else child.propagateDownward(name, value2, obscured); } 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; + if (name != null && name.equals("_Move")) obscured = true; else break; } if (!obscured && !found) - if (!name.equals("_Move") || wasinside) putAndTriggerTrapsAndCatchExceptions(name.substring(1), value); + if ("_Move".equals(name) || name.startsWith("_Release") || wasinside) + if (name != null) + putAndTriggerTrapsAndCatchExceptions(name.substring(1), value); } private static int stringToColor(String s) { @@ -749,6 +882,17 @@ public final class Box extends JSScope implements Scheduler.Task { // Trivial Helper Methods (should be inlined) ///////////////////////////////////////// + void mark_for_repack() { MARK_REPACK; } + public Enumeration keys() { throw new Error("you cannot apply for..in to a " + this.getClass().getName()); } + public Box getRoot() { return parent == null ? this : parent.getRoot(); } + public Surface getSurface() { return Surface.fromBox(getRoot()); } + 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(); } + public int globalToLocalX(int x) { return parent == null ? x : parent.globalToLocalX(x - this.x); } + public int globalToLocalY(int y) { return parent == null ? y : parent.globalToLocalY(y - this.y); } + 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); } + static short min(short a, short b) { if (a treeSize()) return; Box b = getChild(i); removeChild(i); - putAndTriggerTrapsAndCatchExceptions("childremoved", b); + putAndTriggerTrapsAndCatchExceptions("ChildChange", b); } else { Box b = (Box)value; @@ -852,7 +996,7 @@ public final class Box extends JSScope implements Scheduler.Task { MARK_REFLOW; b.dirty(); - putAndTriggerTrapsAndCatchExceptions("childadded", b); + putAndTriggerTrapsAndCatchExceptions("ChildChange", b); } }