X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FBox.java;h=6b90368308c0c51e204721e32817d4cc6bbe2b45;hb=56d726332d730217bf79b87237b75660108556b9;hp=a98e052bd6bcda43c56dbdf8561bb601d174e6d3;hpb=2c0ae10e1f1d99d1661b798e479d2d4e68f523d2;p=org.ibex.core.git diff --git a/src/org/xwt/Box.java b/src/org/xwt/Box.java index a98e052..6b90368 100644 --- a/src/org/xwt/Box.java +++ b/src/org/xwt/Box.java @@ -57,6 +57,8 @@ public final class Box extends JSScope implements Scheduler.Task { //#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); @@ -70,16 +72,18 @@ public final class Box extends JSScope implements Scheduler.Task { 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", "invisible", "absolute", "globalx", "globaly", + "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", @@ -88,9 +92,7 @@ public final class Box extends JSScope implements Scheduler.Task { "DoubleClick1", "DoubleClick2", "DoubleClick3", "Enter", "Leave", "Move", "KeyPressed", "KeyReleased", "PosChange", "SizeChange", - "childadded", "childremoved", - "Focused", "Maximized", "Minimized", "Close", "icon", "titlebar", "toback", "tofront" }; @@ -120,21 +122,24 @@ public final class Box extends JSScope implements Scheduler.Task { 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 = DEFAULT_FONT; - private Picture texture; + 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; @@ -166,7 +171,13 @@ public final class Box extends JSScope implements Scheduler.Task { /** invoked when a resource needed to render ourselves finishes loading */ - public void perform() { + 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; @@ -194,25 +205,6 @@ public final class Box extends JSScope implements Scheduler.Task { } } - /** 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(treeSize() - 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 //////////////////////////////////////////////////////////////////////////////////////// @@ -227,17 +219,6 @@ public final class Box extends JSScope implements Scheduler.Task { 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(); @@ -271,7 +252,7 @@ public final class Box extends JSScope implements Scheduler.Task { //#end } - private void resize(LENGTH x, LENGTH y, LENGTH width, LENGTH height) { + void resize(LENGTH x, LENGTH y, LENGTH width, LENGTH height) { // FEATURE reimplement, but we're destroying this // FIXME: uncommenting this breaks; see http://bugs.xwt.org/show_bug.cgi?id=345 //if (x != this.x || y != this.y || width != this.width || height != this.height) { @@ -280,14 +261,12 @@ public final class Box extends JSScope implements Scheduler.Task { boolean poschange = (this.x != x || this.y != y) && getTrap("PosChange") != null; this.width = width; this.height = height; this.x = x; this.y = y; dirty(); - if (sizechange) try { putAndTriggerTraps("SizeChange", T); /*Surface.abort = true;*/ } - catch (Exception e) { Log.log(this, e); } - if (poschange) try { 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 @@ -372,6 +351,7 @@ public final class Box extends JSScope implements Scheduler.Task { if ((fillcolor & 0xFF000000) != 0x00000000) buf.fillTrapezoid(globalx, globalx + width, globaly, globalx, globalx + width, globaly + height, fillcolor); + // 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) @@ -436,6 +416,7 @@ public final class Box extends JSScope implements Scheduler.Task { 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); @@ -465,6 +446,9 @@ public final class Box extends JSScope implements Scheduler.Task { throw new Error("unreachable"); // unreachable } + 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) @@ -476,11 +460,11 @@ public final class Box extends JSScope implements Scheduler.Task { 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) { Surface.fromBox(this).setWidth(toInt(value)); } else { put("maxwidth", value); put("minwidth", value); MARK_RESIZE; } - case "height": if (parent == null&&Surface.fromBox(this)!=null) { Surface.fromBox(this).setHeight(toInt(value)); } 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; @@ -489,23 +473,12 @@ public final class Box extends JSScope implements Scheduler.Task { 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); @@ -516,14 +489,49 @@ public final class Box extends JSScope implements Scheduler.Task { case "fontsize": font = Font.getFont(font == null ? null : font.res, toInt(value)); MARK_RESIZE; dirty(); 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 "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 - case "thisbox": if (value == null) removeSelf(); - default: super.put(name, value); + + 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 } @@ -564,7 +572,8 @@ public final class Box extends JSScope implements Scheduler.Task { 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(); } @@ -580,36 +589,48 @@ public final class Box extends JSScope implements Scheduler.Task { } if (!(value instanceof Res)) return; - - // FIXME texture = Picture.load((Res)value, this); - if (texture.isLoaded) { - minwidth = texture.width; - minheight = texture.height; - MARK_REFLOW; - dirty(); - return; - } - texture = Picture.load((Res)value, new Scheduler.Task() { public void perform() { - // FIXME pass this instead of a new Task? - minwidth = texture.width; - minheight = texture.height; - Box b = Box.this; MARK_REFLOW_b; - 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); + + /** + * 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 { @@ -713,7 +734,7 @@ public final class Box extends JSScope implements Scheduler.Task { deleteNode(i); b.parent = null; MARK_REFLOW; - putAndTriggerTraps("childremoved", b); + putAndTriggerTrapsAndCatchExceptions("childremoved", b); } public void put(int i, Object value) throws JSExn { @@ -725,22 +746,22 @@ public final class Box extends JSScope implements Scheduler.Task { } if (redirect == null) { - if (value == null) putAndTriggerTraps("childremoved", getChild(i)); + 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) 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 > treeSize()) return; Box b = getChild(i); removeChild(i); - putAndTriggerTraps("childremoved", b); + putAndTriggerTrapsAndCatchExceptions("childremoved", b); } else { Box b = (Box)value; @@ -769,29 +790,19 @@ public final class Box extends JSScope implements Scheduler.Task { MARK_REFLOW; b.dirty(); - putAndTriggerTraps("childadded", b); + putAndTriggerTrapsAndCatchExceptions("childadded", b); } } - - public final void putAndTriggerTraps(Object key, Object value) { + void putAndTriggerTrapsAndCatchExceptions(Object name, Object val) { try { - super.putAndTriggerTraps(key, value); - } catch (JSExn jse) { - Log.logJS("attempt to put value " + value + " to key " + key + " on a box triggered a trap which threw:"); - Log.logJS(jse); + putAndTriggerTraps(name, val); + } catch (Exception e) { + Log.logJS("caught exception while putting to trap \""+name+"\""); + Log.logJS(e); } } - public final Object getAndTriggerTraps(Object key) { - try { - return super.getAndTriggerTraps(key); - } catch (JSExn jse) { - Log.logJS("attempt to get key " + key + " on a box triggered a trap which threw:"); - Log.logJS(jse); - return null; - } - } }