From: david Date: Fri, 30 Jan 2004 07:42:37 +0000 (+0000) Subject: 2003/12/07 08:45:03 X-Git-Tag: RC3~282 X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=commitdiff_plain;h=d4d39728dfff9918ac8ab5e054524585cac77ac0 2003/12/07 08:45:03 darcs-hash:20040130074237-0c9ea-774bb712496b0490e29b4988085d17ec18d0da9f.gz --- diff --git a/src/org/xwt/Box.java b/src/org/xwt/Box.java index 366b04b..06a5e91 100644 --- a/src/org/xwt/Box.java +++ b/src/org/xwt/Box.java @@ -63,6 +63,31 @@ public final class Box extends JSScope { public static final int MAX_LENGTH = Integer.MAX_VALUE; static final Font DEFAULT_FONT = Font.getFont((Res)Main.builtin.get("fonts/vera/Vera.ttf"), 10); + // 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", + "minwidth", "maxwidth", "minheight", "maxheight", + "numchildren", "redirect", "cursor", "mousex", "mousey", "xwt", "static", + "mouseinside", "root", "thisbox", "indexof" + }; + + // 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 ////////////////////////////////////////////////////////////////////// static final int MOUSEINSIDE = 0x00000001; @@ -238,10 +263,10 @@ public final class Box extends JSScope { boolean poschange = (this.x != x || this.y != y) && getTrap("PosChange") != null; 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) 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); } } } @@ -335,7 +360,7 @@ public final class Box extends JSScope { for(int y = globaly; y < cy2; y += texture.picture.getHeight()) buf.drawPicture(texture.picture, 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(); }}); @@ -364,7 +389,18 @@ public final class Box extends JSScope { public Enumeration keys() { throw new Error("you cannot apply for..in to a " + this.getClass().getName()); } - protected boolean isTrappable() { return true; } + 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); diff --git a/src/org/xwt/js/Interpreter.java b/src/org/xwt/js/Interpreter.java index df802e2..101b0af 100644 --- a/src/org/xwt/js/Interpreter.java +++ b/src/org/xwt/js/Interpreter.java @@ -160,7 +160,7 @@ class Interpreter implements ByteCodes, Tokens { pc = ((TryMarker)o).finallyLoc - 1; continue OUTER; } else if (o instanceof CallMarker) { - if (scope instanceof Trap.TrapScope) { + if (scope instanceof Trap.TrapScope) { // handles return component of a read trap Trap.TrapScope ts = (Trap.TrapScope)scope; if (!ts.cascadeHappened) { ts.cascadeHappened = true; @@ -177,7 +177,7 @@ class Interpreter implements ByteCodes, Tokens { f = t.f; scope = new Trap.TrapScope(f.parentScope, t, ts.val); pc = -1; - break; + continue OUTER; } } } @@ -201,22 +201,36 @@ class Interpreter implements ByteCodes, Tokens { throw je("tried to put a value to the " + key + " property on a " + target.getClass().getName()); if (key == null) throw je("tried to assign \"" + (val==null?"(null)":val.toString()) + "\" to the null key"); + Trap t = null; - if (target instanceof JS) { - t = ((JS)target).getTrap(key); - while (t != null && t.f.numFormalArgs == 0) t = t.next; - } else if (target instanceof Trap.TrapScope && key.equals("cascade")) { + if (target instanceof Trap.TrapScope && key.equals("cascade")) { Trap.TrapScope ts = (Trap.TrapScope)target; t = ts.t.next; ts.cascadeHappened = true; while (t != null && t.f.numFormalArgs == 0) t = t.next; - if (t == null) target = ts.t.trapee; + if (t == null) { target = ts.t.trapee; key = ts.t.name; } + + } else if (target instanceof Trap.TrapScope && key.equals(((Trap.TrapScope)target).t.name)) { + throw je("tried to put to " + key + " inside a trap it owns; use cascade instead"); + + } else if (target instanceof JS) { + if (target instanceof JSScope) { + JSScope p = (JSScope)target; // search the scope-path for the trap + t = p.getTrap(key); + while (t == null && p.getParentScope() != null) { p = p.getParentScope(); t = p.getTrap(key); } + } else { + t = ((JS)target).getTrap(key); + } + + while (t != null && t.f.numFormalArgs == 0) t = t.next; // find the first write trap + if (t != null) { + stack.push(new CallMarker(this)); + JSArray args = new JSArray(); + args.addElement(val); + stack.push(args); + } } if (t != null) { - stack.push(new CallMarker(this)); - JSArray args = new JSArray(); - args.addElement(val); - stack.push(args); f = t.f; scope = new Trap.TrapScope(f.parentScope, t, val); pc = -1; @@ -248,18 +262,28 @@ class Interpreter implements ByteCodes, Tokens { break; } else if (o instanceof JS) { Trap t = null; - if (o instanceof JS) { - t = ((JS)o).getTrap(v); - while (t != null && t.f.numFormalArgs != 0) t = t.next; - } else if (o instanceof Trap.TrapScope && v.equals("cascade")) { + if (o instanceof Trap.TrapScope && v.equals("cascade")) { t = ((Trap.TrapScope)o).t.next; while (t != null && t.f.numFormalArgs != 0) t = t.next; - if (t == null) o = ((Trap.TrapScope)o).t.trapee; + if (t == null) { v = ((Trap.TrapScope)o).t.name; o = ((Trap.TrapScope)o).t.trapee; } + + } else if (o instanceof JS) { + if (o instanceof JSScope) { + JSScope p = (JSScope)o; // search the scope-path for the trap + t = p.getTrap(v); + while (t == null && p.getParentScope() != null) { p = p.getParentScope(); t = p.getTrap(v); } + } else { + t = ((JS)o).getTrap(v); + } + + while (t != null && t.f.numFormalArgs != 0) t = t.next; // get first read trap + if (t != null) { + stack.push(new CallMarker(this)); + JSArray args = new JSArray(); + stack.push(args); + } } if (t != null) { - stack.push(new CallMarker(this)); - JSArray args = new JSArray(); - stack.push(args); f = t.f; scope = new Trap.TrapScope(f.parentScope, t, null); ((Trap.TrapScope)scope).cascadeHappened = true;