X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FBox.java.pp;h=c566a017e142fc0139e8ee55cff33fb6599bfdd8;hb=3c68ab103101636952799709c5a5b635d3cc214b;hp=2b3a305e018dccb0a70bfc69c26ad6f2fa7651a5;hpb=14c79b82aa525bab500334fac875b4d2b2685926;p=org.ibex.core.git

diff --git a/src/org/xwt/Box.java.pp b/src/org/xwt/Box.java.pp
index 2b3a305..c566a01 100644
--- a/src/org/xwt/Box.java.pp
+++ b/src/org/xwt/Box.java.pp
@@ -6,9 +6,6 @@ package org.xwt;
 // RULE: coordinates on non-static methods are ALWAYS relative to the
 // upper-left hand corner of <tt>this</tt>
 
-// FIXME: font color, italicization, bolding, and underlining
-// FIXME: align
-// FIXME: fixed aspect
 // FEATURE: reflow before allowing js to read from width/height 
 // FEATURE: fastpath for rows=1/cols=1
 // FEATURE: reflow starting with a certain child
@@ -62,7 +59,7 @@ import org.xwt.translators.*;
  *  position.
  *
  *  A note on coordinates: the Box class represents regions
- *  internally as x,y,w,h tuples, even though the DoubleBuffer class
+ *  internally as x,y,w,h tuples, even though the PixelBuffer class
  *  uses x1,y1,x2,y2 tuples.
  */
 public final class Box extends JS.Scope {
@@ -72,7 +69,7 @@ public final class Box extends JS.Scope {
 
     // Misc instance data ////////////////////////////////////////////////////////////////
 
-    private static int sizePosChangesSinceLastRender = 0;
+    static int sizePosChangesSinceLastRender = 0;
 
 
     // Misc instance data ////////////////////////////////////////////////////////////////
@@ -85,30 +82,17 @@ public final class Box extends JS.Scope {
     Box redirect = this;
     Surface surface = null;               // null on all non-root boxen
 
-    // FEATURE: combine this with the JSObject Hash
-    Hash traps = null;
-
-
     // Flags ///////////////////////////////////////////////////////////////////////////////
+    short flags = 0;
     static int MOUSEINSIDE_FLAG  = 0x00000001;
     static int INVISIBLE_FLAG    = 0x00000002;
     static int ABSOLUTE_FLAG     = 0x00000004;
-    static int HSHRINK_FLAG      = 0x00000010;
-    static int VSHRINK_FLAG      = 0x00000020;
-    static int TILE_FLAG         = 0x00000040;
-
-    /**
-     *  Set when the font changes, cleared during repack.  If set
-     *  during repack, all font==null children are marked for reflow
-     *  and given the font_changed_flag.  We use this flag to avoid
-     *  having to iterate over all descendents of a box when its font
-     *  changes.
-     */
-    static int FONT_CHANGED_FLAG = 0x00000100;
-
-    static int ALIGN_FLAG        = 0x00000000;
-    static int FIXEDASPECT_FLAG  = 0x00000000;
-    int flags = 0;
+    static int HSHRINK_FLAG      = 0x00000008;
+    static int VSHRINK_FLAG      = 0x00000010;
+    static int TILE_FLAG         = 0x00000020;
+    static int FONT_CHANGED_FLAG = 0x00000040;  // set when font changes, cleared during repack
+    static int ISROOT_FLAG       = 0x00000080;
+    static int NOCLIP_FLAG       = 0x00000100;
 
 
     // Geometry ////////////////////////////////////////////////////////////////////////////
@@ -119,14 +103,15 @@ public final class Box extends JS.Scope {
     //#define MIN_LENGTH Integer.MIN_VALUE
 
     // always correct (set directly by user)
-    LENGTH minwidth = 0;        
-    LENGTH minheight = 0;        
-    LENGTH maxwidth = MAX_LENGTH;
-    LENGTH maxheight = MAX_LENGTH;
+    public LENGTH minwidth = 0;        
+    public LENGTH minheight = 0;        
+    public LENGTH maxwidth = MAX_LENGTH;
+    public LENGTH maxheight = MAX_LENGTH;
     private LENGTH hpad = 0;
     private LENGTH vpad = 0;
     private String text = null;
-    private String font = null;
+    private Res font = null;
+    private int fontsize = 10;
     private LENGTH textwidth = 0;
     private LENGTH textheight = 0;
 
@@ -137,8 +122,8 @@ public final class Box extends JS.Scope {
     private int colspan = 1;
 
     // computed during reflow
-    LENGTH x = 0;
-    LENGTH y = 0;
+    public LENGTH x = 0;
+    public LENGTH y = 0;
     public LENGTH width = 0;
     public LENGTH height = 0;
     private int row = 0;  // FEATURE use a short
@@ -149,13 +134,15 @@ public final class Box extends JS.Scope {
 
     // Rendering Properties ///////////////////////////////////////////////////////////
 
-    //private SVG.VP path = null;
-    //private SVG.Paint fill = null;
-    //private SVG.Paint stroke = null;
+    private VectorGraphics.VectorPath path = null;
+    private VectorGraphics.Affine transform = null;
+    //private VectorGraphics.Paint fill = null;
+    //private VectorGraphics.Paint stroke = null;
+    int strokewidth = 1;
 
-    private Picture image;                       // will disappear
-    private int fillcolor = 0x00000000;          // will become SVG.Paint
-    private int strokecolor = 0xFF000000;        // will become SVG.Paint
+    public Picture image;                        // will disappear
+    private int fillcolor = 0x00000000;          // will become VectorGraphics.Paint
+    private int strokecolor = 0xFF000000;        // will become VectorGraphics.Paint
 
     private String cursor = null;                // the cursor for this box
 
@@ -163,23 +150,23 @@ public final class Box extends JS.Scope {
     // Instance Methods /////////////////////////////////////////////////////////////////////
 
     /** Adds the intersection of (x,y,w,h) and the node's current actual geometry to the Surface's dirty list */
-    public final void dirty() { dirty(0, 0, width, height); }
+    public final void dirty() {
+        if ((flags & NOCLIP_FLAG) != 0 && parent != null) parent.dirty();
+        else dirty(0, 0, width, height);
+    }
     public final void dirty(int x, int y, int w, int h) {
-        /*
         for(Box cur = this; cur != null; cur = cur.parent) {
-            w = min(x + w, cur.width) - max(x, 0);
-            h = min(y + h, cur.height) - max(y, 0);
-            x = max(x, 0);
-            y = max(y, 0);
+            if ((flags & NOCLIP_FLAG) == 0) {
+                w = min(x + w, cur.width) - max(x, 0);
+                h = min(y + h, cur.height) - max(y, 0);
+                x = max(x, 0);
+                y = max(y, 0);
+            }
             if (w <= 0 || h <= 0) return;
             if (cur.parent == null && cur.surface != null) cur.surface.dirty(x, y, w, h);
             x += cur.x;
             y += cur.y;
         }
-        */
-        Box cur;
-        for(cur = this; cur.parent != null; cur = cur.parent);
-        if (cur.surface != null) cur.surface.dirty(0, 0, cur.width, cur.height);
     }
 
     /**
@@ -198,10 +185,10 @@ public final class Box extends JS.Scope {
 
         if (!wasinside && !isinside) return;
 
-        if (traps == null) { }
-        else if (!wasinside && isinside && traps.get("Enter") != null) put("Enter", Boolean.TRUE);
-        else if (wasinside && !isinside && traps.get("Leave") != null) put("Leave", Boolean.TRUE);
-        else if (wasinside && isinside && (mousex != oldmousex || mousey != oldmousey) && traps.get("Move") != null) put("Move", Boolean.TRUE);
+        if (!wasinside && isinside && get("Enter", Trap.class) != null) put("Enter", Boolean.TRUE);
+        else if (wasinside && !isinside && get("Leave", Trap.class) != null) put("Leave", Boolean.TRUE);
+        else if (wasinside && isinside && (mousex != oldmousex || mousey != oldmousey) && get("Move", Trap.class) != null)
+            put("Move", Boolean.TRUE);
 
         if (isinside && cursor != null) getRoot().cursor = cursor;
 
@@ -217,10 +204,11 @@ public final class Box extends JS.Scope {
 
     // Reflow ////////////////////////////////////////////////////////////////////////////////////////
 
-    void reflow() {
+    void reflow() { reflow(width, height); }
+    void reflow(int new_width, int new_height) {
         repack();
         if (Surface.abort) return;
-        resize(x, y, width, height);
+        resize(x, y, new_width, new_height);
     }
 
     /** Checks if the Box's size has changed, dirties it if necessary, and makes sure childrens' sizes are up to date */
@@ -229,6 +217,10 @@ public final class Box extends JS.Scope {
         if (numChildren() == 0) {
 	    contentwidth = max(textwidth + 2 * hpad, minwidth);
 	    contentheight = max(textheight + 2 * vpad, minheight);
+            if (path != null) {
+                contentwidth = max(contentwidth, path.boundingBoxWidth());
+                contentheight = max(contentheight, path.boundingBoxHeight());
+            }
 	    return;
 	}
 
@@ -287,19 +279,23 @@ public final class Box extends JS.Scope {
         for(int col=0; col<numCols; col++) contentwidth += colWidth[col];
         contentwidth = max(textwidth + 2 * hpad, contentwidth);
         contentwidth = bound(minwidth, contentwidth, maxwidth);
+        if (path != null) {
+            contentwidth = max(contentwidth, path.boundingBoxWidth());
+            contentheight = max(contentheight, path.boundingBoxHeight());
+        }
         //#end
     }
 
 
-    void resize(LENGTH x, LENGTH y, LENGTH width, LENGTH height) {
-
+    private void resize(LENGTH x, LENGTH y, LENGTH width, LENGTH height) {
+        
         // --- Phase 1 ----------------------------------------------------------------------
         // run PosChange/SizeChange, dirty as needed
         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 = false, poschange = false;
-            if (traps != null && (this.width != width || this.height != height) && traps.get("SizeChange") != null) sizechange = true;
-            if (traps != null && (this.x != x || this.y != y) && traps.get("PosChange") != null) poschange = true;
+            if ((this.width != width || this.height != height) && get("SizeChange", Trap.class) != null) sizechange = true;
+            if ((this.x != x || this.y != y) && get("PosChange", Trap.class) != null) poschange = true;
             this.width = width; this.height = height; this.x = x; this.y = y;
             dirty();
             if (sizechange || poschange)
@@ -307,8 +303,8 @@ public final class Box extends JS.Scope {
                     if (Log.on) Log.logJS(this, "Warning, more than 500 SizeChange/PosChange traps triggered since last complete render");
                 } else {
                     sizePosChangesSinceLastRender++;
-                    if (sizechange) put("SizeChange", Boolean.TRUE);
-                    if (poschange) put("PosChange", Boolean.TRUE);
+                    try { if (sizechange) put("SizeChange", Boolean.TRUE); } catch (Exception e) { Log.log(this, e); }
+                    try { if (poschange) put("PosChange", Boolean.TRUE); } catch (Exception e) { Log.log(this, e); }
                     Surface.abort = true;
                     return;
                 }
@@ -405,51 +401,57 @@ public final class Box extends JS.Scope {
     // Rendering Pipeline /////////////////////////////////////////////////////////////////////
 
     /** Renders self and children within the specified region. All rendering operations are clipped to xIn,yIn,wIn,hIn */
-    void render(int parentx, int parenty, int clipx, int clipy, int clipw, int cliph, DoubleBuffer buf) {
+    void render(int parentx, int parenty, int clipx, int clipy, int clipw, int cliph, PixelBuffer buf, VectorGraphics.Affine a) {
         if (Surface.abort || (flags & INVISIBLE_FLAG) != 0) return;
         int globalx = parentx + (parent == null ? 0 : x);
         int globaly = parenty + (parent == null ? 0 : y);
 
         // intersect the x,y,w,h rendering window with ourselves; quit if it's empty
-        clipw = min(max(clipx, parent == null ? 0 : globalx) + clipw,
-                    (parent == null ? 0 : globalx) + width) - globalx;
-        cliph = min(max(clipy, parent == null ? 0 : globaly) + cliph,
-                    (parent == null ? 0 : globaly) + height) - globaly;
-        clipx = max(clipx, parent == null ? 0 : globalx);
-        clipy = max(clipy, parent == null ? 0 : globaly);
+        if ((flags & NOCLIP_FLAG) == 0) {
+            clipw = min(max(clipx, parent == null ? 0 : globalx) + clipw, (parent == null ? 0 : globalx) + width) - globalx;
+            cliph = min(max(clipy, parent == null ? 0 : globaly) + cliph, (parent == null ? 0 : globaly) + height) - globaly;
+            clipx = max(clipx, parent == null ? 0 : globalx);
+            clipy = max(clipy, parent == null ? 0 : globaly);
+        }
         if (clipw <= 0 || cliph <= 0) return;
 
-        if ((fillcolor & 0xFF000000) != 0x00000000 || parent == null)
-            buf.fillRect(clipx, clipy, clipx + clipw, clipy + cliph,
-                         (fillcolor & 0xFF000000) != 0 ? fillcolor : 0xFF777777);
+        if ((fillcolor & 0xFF000000) != 0x00000000)
+            buf.fillTrapezoid(clipx, clipx + clipw, clipy, clipx, clipx + clipw, clipy + cliph, fillcolor);
 
         if (image != null)
             if ((flags & TILE_FLAG) != 0) renderTiledImage(globalx, globaly, clipx, clipy, clipw, cliph, buf);
             else renderStretchedImage(globalx, globaly, clipx, clipy, clipw, cliph, buf);
 
 	if (text != null && !text.equals(""))
-            renderText(x, y, clipx, clipy, clipw, cliph, buf);
+            renderText(globalx, globaly, clipx, clipy, clipw, cliph, buf);
+
+        if (path != null) {
+            VectorGraphics.RasterPath rp = path.realize(a);
+            if ((strokecolor & 0xff000000) != 0) rp.stroke(buf, 1, strokecolor);
+            if ((fillcolor & 0xff000000) != 0) rp.fill(buf, new VectorGraphics.SingleColorPaint(fillcolor));
+        }
 
         // now subtract the pad region from the clip region before proceeding
-        clipw = min(max(clipx, globalx + hpad) + clipw, globalx + width - hpad) - clipx;
-        cliph = min(max(clipy, globaly + vpad) + cliph, globaly + height - vpad) - clipy;
-        clipx = max(clipx, globalx + hpad);
-        clipy = max(clipy, globaly + vpad);
+        if ((flags & NOCLIP_FLAG) == 0) {
+            clipw = min(max(clipx, globalx + hpad) + clipw, globalx + width - hpad) - clipx;
+            cliph = min(max(clipy, globaly + vpad) + cliph, globaly + height - vpad) - clipy;
+            clipx = max(clipx, globalx + hpad);
+            clipy = max(clipy, globaly + vpad);
+        }
 
-        for(Box b = getChild(0); b != null; b = b.nextSibling())
-            b.render(globalx, globaly, clipx, clipy, clipw, cliph, buf);   
+        for(Box b = getChild(0); b != null; b = b.nextSibling()) {
+            a.translate(b.x, b.y);
+            b.render(globalx, globaly, clipx, clipy, clipw, cliph, buf, a);
+            a.translate(-1 * b.x, -1 * b.y);
+        }
     }
 
-    void renderStretchedImage(int globalx, int globaly, int clipx, int clipy, int clipw, int cliph, DoubleBuffer buf) {
-        //buf.setClip(x, y, w + x, h + y);
-        System.out.println("draw " + clipx + " " + clipy + " " + (clipx + clipw) + " " + (clipy + cliph));
-        buf.drawPicture(image,
-                        clipx, clipy, clipx + clipw, clipy + cliph,
-                        0, 0, image.getWidth(), image.getHeight());
-        //buf.setClip(0, 0, buf.getWidth(), buf.getHeight());
+    void renderStretchedImage(int globalx, int globaly, int clipx, int clipy, int clipw, int cliph, PixelBuffer buf) {
+        // FIXME: wrong
+        buf.drawPicture(image, clipx, clipy, clipx + clipw, clipy + cliph, 0, 0, image.getWidth(), image.getHeight());
     }
 
-    void renderTiledImage(int globalx, int globaly, int x, int y, int w, int h, DoubleBuffer buf) {
+    void renderTiledImage(int globalx, int globaly, int x, int y, int w, int h, PixelBuffer buf) {
         int iw = image.getWidth();
         int ih = image.getHeight();
         for(int i=(x - x)/iw; i <= (x + w - x)/iw; i++) {
@@ -471,31 +473,21 @@ public final class Box extends JS.Scope {
         }
     }
 
-    void renderText(int x, int y, int clipx, int clipy, int clipw, int cliph, DoubleBuffer buf) {
-         /*
-	// hack because (believe it or not) libgcj doesn't support UTF16.
-	byte[] b = new byte[text.length() * 2 + 2];
-	for(int i=0; i<text.length(); i++) {
-	    b[i * 2] = (byte)((((short)text.charAt(i)) & 0xff00) >> 8);
-	    b[i * 2 + 1] = (byte)(((short)text.charAt(i)) & 0xff);
-	}
-	b[text.length()] = 0;
-	b[text.length() + 1] = 0;
-         */
-            /*
-	try {
-	    ImageDecoder id = org.xwt.translators.Font.render(new FileInputStream("COMIC.TTF"), 24, text, false);
-	    Picture p = Platform.createPicture(id);
-            // FIXME: clipping (don't use setClip)
-	    buf.drawPicture(p,
-                            x + hpad, y + vpad,
-                            x + hpad + p.getWidth(), y + vpad + p.getHeight(),
-                            0, 0,
-                            p.getWidth(), p.getHeight());
-	} catch (Exception e) {
-	    Log.log(this, e);
-	}
-            */
+    void renderText(int x, int y, int clipx, int clipy, int clipw, int cliph, PixelBuffer buf) {
+        for(int i=0; i<text.length(); i++) {
+            // FIXME: clipping
+            char c = text.charAt(i);
+            Glyph g = Glyph.getGlyph(font, fontsize, c);
+	    buf.drawPictureAlphaOnly(g.p,
+                                     x + hpad,
+                                     y + vpad + g.max_ascent - g.baseline,
+                                     x + hpad + g.p.getWidth(),
+                                     y + vpad + g.max_ascent - g.baseline + g.p.getHeight(),
+                                     0, 0,
+                                     g.p.getWidth(), g.p.getHeight(),
+                                     strokecolor);
+            x += g.advance;
+        }
     }
 
 
@@ -511,28 +503,6 @@ public final class Box extends JS.Scope {
                 return redirect.callMethod(method, args, checkOnly);
             }
             return new Integer(b.getIndexInParent());
-
-        } else if ("apply".equals(method)) {
-            if (checkOnly) return Boolean.TRUE;
-            if (args.elementAt(0) instanceof String) {
-                String templatename = (String)args.elementAt(0);
-                Template t = Template.getTemplate(templatename, null);
-                if (t == null) {
-                    if (Log.on) Log.logJS(this, "template " + templatename + " not found");
-                } else {
-                    if (ThreadMessage.suspendThread()) try {
-                        JS.Callable callback = args.length() < 2 ? null : (Callable)args.elementAt(1);
-                        t.apply(this, null, null, callback, 0, t.numUnits());
-                    } finally {
-                        ThreadMessage.resumeThread();
-                    }
-                }
-            } else if (args.elementAt(0) instanceof JS && !(args.elementAt(0) instanceof Box)) {
-                JS s = (JS)args.elementAt(0);
-                Object[] keys = s.keys();
-                for(int j=0; j<keys.length; j++) put(keys[j].toString(), s.get(keys[j]));
-            }
-            return this;
         }
         return null;
     }
@@ -557,6 +527,7 @@ public final class Box extends JS.Scope {
             if (Log.on) Log.logJS(this, "attempt to set a numerical property on a box to anything other than a box");
         } else if (redirect == null) {
             if (Log.on) Log.logJS(this, "attempt to add/remove children to/from a node with a null redirect");
+            put("0", (Box)value);
         } else if (redirect != this) {
             Box b = value == null ? (Box)redirect.get(i) : (Box)value;
             redirect.put(i, value);
@@ -567,8 +538,6 @@ public final class Box extends JS.Scope {
                 b.remove();
                 put("0", b);
             }
-        } else if (value instanceof RootProxy) {
-            if (Log.on) Log.logJS(this, "attempt to reparent a box via its proxy object");
         } else {
             Box newnode = (Box)value;
 
@@ -635,6 +604,9 @@ public final class Box extends JS.Scope {
         }
     }
     
+    public Object get(Object key, Object key2) { return super.get(key, key2); }
+    public void put(Object key, Object key2, Object val) { super.put(key, key2, val); }
+
     public Object get_(Object name) { return super.get(name); }
     public Object get(Object name) { return get(name, false); }
     public Object get(Object name_, boolean ignoretraps) {
@@ -644,17 +616,9 @@ public final class Box extends JS.Scope {
         String name = (String)name_;
         if (name.equals("")) return null;
 
-        // See if we're reading back the function value of a trap
-        if (name.charAt(0) == '_') {
-            if (name.charAt(1) == '_') name = name.substring(2);
-            else name = name.substring(1);
-            Trap t = Trap.getTrap(this, name);
-            return t == null ? null : t.f;
-        }
-        
         // See if we're triggering a trap
-        Trap t = traps == null || ignoretraps ? null : (Trap)traps.get(name);
-        if (t != null && t.isreadtrap) return t.perform(Trap.emptyargs);
+        Trap t = ignoretraps ? (Trap)null : (Trap)get(name, Trap.class);
+        if (t != null) return t.perform();
 
         // Check for a special handler
         SpecialBoxProperty gph = (SpecialBoxProperty)SpecialBoxProperty.specialBoxProperties.get(name);
@@ -662,7 +626,8 @@ public final class Box extends JS.Scope {
 
         Object ret = super.get(name);
         if (name.startsWith("$") && ret == null)
-            if (Log.on) Log.logJS(this, "WARNING: attempt to access " + name + ", but no child with id=\"" + name.substring(1) + "\" found");
+            if (Log.on) Log.logJS(this, "WARNING: attempt to access " + name + ", but no child with id=\"" +
+                                  name.substring(1) + "\" found");
         return ret;
     }
 
@@ -672,25 +637,25 @@ public final class Box extends JS.Scope {
         return ret;
     }
 
+    public void addTrap(Object name, Object value) { Trap.addTrap(this, name, ((JS.CompiledFunction)value)); }
+    public void delTrap(Object name, Object value) { Trap.delTrap(this, name, ((JS.CompiledFunction)value)); }
+
+
     /**
      *  Scriptable.put()
      *  @param ignoretraps if set, no traps will be triggered (set when 'cascade' reaches the bottom of the trap stack)
      *  @param rp if this put is being performed via a root proxy, rp is the root proxy.
      */
     public void put_(Object name, Object value) { super.put(name, value); }
-    public void put(Object name, Object value) { put(name, value, false, null); }
-    public void put(Object name, Object value, boolean ignoretraps) { put(name, value, ignoretraps, null); }
-    public void put(Object name_, Object value, boolean ignoretraps, RootProxy rp) {
+    public void put(Object name, Object value) { put(name, value, false); }
+    public void put(Object name_, Object value, boolean ignoretraps) {
         if (name_ instanceof Number) { put(((Number)name_).intValue(), value); return; }
         if (!(name_ instanceof String)) { super.put(name_,value); return; }
         String name = name_.toString();
-        if (!ignoretraps && traps != null) {
-            Trap t = (Trap)traps.get(name);
+        if (!ignoretraps) {
+            Trap t = (Trap)get(name, Trap.class);
             if (t != null) {
-                JS.Array arg = new JS.Array();
-                arg.addElement(value);
-                t.perform(arg);
-                arg.setElementAt(null, 0);
+                t.perform(value);
                 return;
             }
         }
@@ -701,25 +666,6 @@ public final class Box extends JS.Scope {
         SpecialBoxProperty gph = (SpecialBoxProperty)SpecialBoxProperty.specialBoxProperties.get(name);
         if (gph != null) { gph.put(name, this, value); return; }
 
-        if (name.charAt(0) == '_') {
-            if (value != null && !(value instanceof JS.Callable)) {
-                if (Log.on) Log.logJS(this, "attempt to put a non function value (" + value + ") to " + name);
-            } else if (value != null && !(value instanceof JS.CompiledFunction)) {
-                if (Log.on) Log.logJS(this, "attempt to put a non-compiled function value (" + value + ") to " + name);
-            } else if (name.charAt(1) == '_') {
-                name = name.substring(2).intern();
-                Trap t = Trap.getTrap(this, name);
-                if (t != null) t.delete();
-                if (value != null) Trap.addTrap(this, name, ((JS.CompiledFunction)value), true, rp);
-            } else {
-                name = name.substring(1).intern();
-                Trap t = Trap.getTrap(this, name);
-                if (t != null) t.delete();
-                if (value != null) Trap.addTrap(this, name, ((JS.CompiledFunction)value), false, rp);
-            }
-            return;
-        }
-
         super.put(name, value);
     }
 
@@ -861,27 +807,6 @@ public final class Box extends JS.Scope {
     }
 
 
-    // Root Proxy ///////////////////////////////////////////////////////////////////////////////
-
-    // FEATURE: use xwt.graft() here
-    RootProxy myproxy = null;
-    public JS getRootProxy() {
-        if (myproxy == null) myproxy = new RootProxy(this);
-        return myproxy;
-    }
-
-    private static class RootProxy extends JS {
-        Box box;
-        RootProxy(Box b) { this.box = b; }
-        public Object get(Object name) { return box.get(name); }
-        public void put(Object name, Object value) { box.put(name, value, false, this); }
-        public Object[] keys() { return box.keys(); }
-        public Object callMethod(Object method, JS.Array args, boolean justChecking) {
-	    return ((Box)box).callMethod(method,args,justChecking);
-	}
-    }
-
-
     // Trivial Helper Methods (should be inlined) /////////////////////////////////////////
 
     static final int min(int a, int b) { if (a<b) return a; else return b; }
@@ -950,8 +875,8 @@ public final class Box extends JS.Scope {
         void put(String name, Box b, Object value) { put(b, value); }
 
         static {
-            //#repeat fillcolor/strokecolor
-            specialBoxProperties.put("fillcolor", new SpecialBoxProperty() {
+            //#repeat fill/stroke fillcolor/strokecolor
+            specialBoxProperties.put("fill", new SpecialBoxProperty() {
                     public Object get(Box b) {
                         if ((b.fillcolor & 0xFF000000) == 0) return null;
                         String red = Integer.toHexString((b.fillcolor & 0x00FF0000) >> 16);
@@ -976,8 +901,8 @@ public final class Box extends JS.Scope {
                                 Log.log(this, "invalid color " + s);
                                 return;
                             }
-                        else if (SVG.colors.get(s) != null)
-                            newcolor = 0xFF000000 | ((Integer)SVG.colors.get(s)).intValue();
+                        else if (org.xwt.translators.SVG.colors.get(s) != null)
+                            newcolor = 0xFF000000 | ((Integer)org.xwt.translators.SVG.colors.get(s)).intValue();
                         if (newcolor == b.fillcolor) return;
                         b.fillcolor = newcolor;
                         b.dirty();
@@ -986,13 +911,13 @@ public final class Box extends JS.Scope {
             //#end
         
             specialBoxProperties.put("color", new SpecialBoxProperty() {
-                    public Object get(Box b) { return b.get("fillcolor"); }
-                    public void put(Box b, Object value) { b.put("fillcolor", value); }
+                    public Object get(Box b) { return b.get("fill"); }
+                    public void put(Box b, Object value) { b.put("fill", value); }
                 });
 
             specialBoxProperties.put("textcolor", new SpecialBoxProperty() {
-                    public Object get(Box b) { return b.get("strokecolor"); }
-                    public void put(Box b, Object value) { b.put("strokecolor", value); }
+                    public Object get(Box b) { return b.get("stroke"); }
+                    public void put(Box b, Object value) { b.put("stroke", value); }
                 });
 
             specialBoxProperties.put("text", new SpecialBoxProperty() {
@@ -1006,10 +931,13 @@ public final class Box extends JS.Scope {
 			    b.textwidth = b.textheight = 0;
 			} else {
 			    try {
-				ImageDecoder id = org.xwt.translators.Font.render(new FileInputStream("COMIC.TTF"), 24, b.text, true);
-                                if (id.getWidth() != b.textwidth || id.getHeight() != b.textheight) MARK_FOR_REFLOW_b;
-				b.textwidth = id.getWidth();
-				b.textheight = id.getHeight();
+                                MARK_FOR_REFLOW_b;
+                                b.textwidth = 0;
+                                for(int i=0; i<b.text.length(); i++) {
+                                    Glyph g = Glyph.getGlyph(b.font, b.fontsize, b.text.charAt(i));
+                                    b.textwidth += g.advance;
+                                    b.textheight = g.max_ascent + g.max_descent;
+                                }
 			    } catch (Exception e) {
 				Log.log(this, e);
 			    }
@@ -1017,16 +945,111 @@ public final class Box extends JS.Scope {
 			b.dirty();
                     } });
 
+            specialBoxProperties.put("path", new SpecialBoxProperty() {
+                    public Object get(Box b) { throw new JS.Exn("cannot read from the path property"); }
+                    public void put(Box b, Object value) {
+                        String t = value == null ? "null" : value.toString();
+                        b.path = value == null ? null : VectorGraphics.parseVectorPath(value.toString());
+                        MARK_FOR_REFLOW_b;
+			b.dirty();
+                    } });
+
+            specialBoxProperties.put("transform", new SpecialBoxProperty() {
+                    public void put(Box b, Object value) {
+                        String t = value.toString().trim();
+                        b.transform = VectorGraphics.Affine.identity();
+                        while (t.length() > 0) {
+                            if (t.startsWith("skewX(")) {
+                                // FIXME
+                                
+                            } else if (t.startsWith("shear(")) {
+                                // FIXME: nonstandard; remove this
+                                b.transform.multiply(VectorGraphics.Affine.shear(Float.parseFloat(t.substring(t.indexOf('(') + 1, t.indexOf(')')))));
+                                
+                            } else if (t.startsWith("skewY(")) {
+                                // FIXME
+                                
+                            } else if (t.startsWith("rotate(")) {
+                                String sub = t.substring(t.indexOf('(') + 1, t.indexOf(')'));
+                                if (sub.indexOf(',') != -1) {
+                                    float angle = Float.parseFloat(sub.substring(0, sub.indexOf(',')));
+                                    sub = sub.substring(sub.indexOf(',') + 1);
+                                    float cx = Float.parseFloat(sub.substring(0, sub.indexOf(',')));
+                                    sub = sub.substring(sub.indexOf(',') + 1);
+                                    float cy = Float.parseFloat(sub);
+                                    b.transform.multiply(VectorGraphics.Affine.translate(cx, cy));
+                                    b.transform.multiply(VectorGraphics.Affine.rotate(angle));
+                                    b.transform.multiply(VectorGraphics.Affine.translate(-1 * cx, -1 * cy));
+                                } else {
+                                    b.transform.multiply(VectorGraphics.Affine.rotate(Float.parseFloat(t.substring(t.indexOf('(') + 1, t.indexOf(')')))));
+                                }
+                                
+                            } else if (t.startsWith("translate(")) {
+                                String sub = t.substring(t.indexOf('(') + 1, t.indexOf(')'));
+                                if (sub.indexOf(',') > -1) {
+                                    b.transform.multiply(VectorGraphics.Affine.translate(Float.parseFloat(t.substring(t.indexOf('(') + 1, t.indexOf(','))),
+                                                                                         Float.parseFloat(t.substring(t.indexOf(',') + 1, t.indexOf(')')))));
+                                } else {
+                                    b.transform.multiply(VectorGraphics.Affine.translate(Float.parseFloat(t.substring(t.indexOf('(') + 1, t.indexOf(','))), 0));
+                                }
+                                
+                            } else if (t.startsWith("flip(")) {
+                                String which = t.substring(t.indexOf('(') + 1, t.indexOf(')'));
+                                b.transform.multiply(VectorGraphics.Affine.flip(which.equals("horizontal"), which.equals("vertical")));
+                                
+                            } else if (t.startsWith("scale(")) {
+                                String sub = t.substring(t.indexOf('(') + 1, t.indexOf(')'));
+                                if (sub.indexOf(',') > -1) {
+                                    b.transform.multiply(VectorGraphics.Affine.scale(Float.parseFloat(t.substring(t.indexOf('(') + 1, t.indexOf(','))),
+                                                                                     Float.parseFloat(t.substring(t.indexOf(',') + 1, t.indexOf(')')))));
+                                } else {
+                                    b.transform.multiply(VectorGraphics.Affine.scale(Float.parseFloat(t.substring(t.indexOf('(') + 1, t.indexOf(','))),
+                                                                                     Float.parseFloat(t.substring(t.indexOf('(') + 1, t.indexOf(',')))));
+                                }
+                                
+                            } else if (t.startsWith("matrix(")) {
+                                // FIXME: is this mapped right?
+                                float d[] = new float[6];
+                                StringTokenizer st = new StringTokenizer(t, ",", false);
+                                for(int i=0; i<6; i++)
+                                    d[i] = Float.parseFloat(st.nextToken());
+                                b.transform.multiply(new VectorGraphics.Affine(d[0], d[1], d[2], d[3], d[4], d[5]));
+                            }
+                            t = t.substring(t.indexOf(')') + 1).trim();
+                        }
+                        b.dirty();
+                    }
+                    public Object get(Box b) { return b.transform.toString(); }
+                });
+            
             specialBoxProperties.put("font", new SpecialBoxProperty() {
                     public Object get(Box b) { return b.font; }
                     public void put(Box b, Object value) {
-                        b.font = value == null ? null : value.toString();
-                        // FIXME: translate value into a resource
+                        // FIXME: translate value into a resource if it is a string
+                        b.font = value == null ? null : (Res)value;
                         MARK_FOR_REFLOW_b;
                         b.flags |= FONT_CHANGED_FLAG;
                         b.dirty();
                     } });
         
+            specialBoxProperties.put("fontsize", new SpecialBoxProperty() {
+                    public Object get(Box b) { return b.font; }
+                    public void put(Box b, Object value) {
+                        if (b.fontsize == stoi(value)) return;
+                        b.fontsize = stoi(value);
+                        MARK_FOR_REFLOW_b;
+                        b.flags |= FONT_CHANGED_FLAG;
+                        b.dirty();
+                    } });
+        
+            specialBoxProperties.put("strokewidth", new SpecialBoxProperty() {
+                    public Object get(Box b) { return new Integer(b.strokewidth); }
+                    public void put(Box b, Object value) {
+                        if (b.strokewidth == stoi(value)) return;
+                        b.strokewidth = stoi(value);
+                        b.dirty();
+                    } });
+        
             specialBoxProperties.put("thisbox", new SpecialBoxProperty() {
                     public Object get(Box b) { return b; }
                     public void put(Box b, Object value) {
@@ -1061,17 +1084,8 @@ public final class Box extends JS.Scope {
                         MARK_FOR_REFLOW_b;
                     } });
 
+            //FIXME
             specialBoxProperties.put("static", new SpecialBoxProperty() {
-                    public Object get(Box b) {
-                        String cfsn =
-                            JS.Thread.fromJavaThread(java.lang.Thread.currentThread()).getCurrentCompiledFunction().getSourceName();
-                        for(int i=0; i<cfsn.length() - 1; i++)
-                            if (cfsn.charAt(i) == '.' && (cfsn.charAt(i+1) == '_' || Character.isDigit(cfsn.charAt(i+1)))) {
-                                cfsn = cfsn.substring(0, i);
-                                break;
-                            }
-                        return Static.getStatic(cfsn);
-                    }
                 });
 
             specialBoxProperties.put("shrink", new SpecialBoxProperty() {
@@ -1104,10 +1118,7 @@ public final class Box extends JS.Scope {
                         if (x == b.x) return;
                         b.dirty();
                         b.x = x;
-                        if (b.parent == null && b.surface != null) {
-                            b.surface.setLocation();
-                            b.surface.centerSurfaceOnRender = false;
-                        }
+                        if (b.parent == null && b.surface != null) b.surface.setLocation();
                         MARK_FOR_REFLOW_b;
                         b.dirty();
                     }
@@ -1161,6 +1172,15 @@ public final class Box extends JS.Scope {
                         b.dirty();
                     } });
         
+            specialBoxProperties.put("noclip", new SpecialBoxProperty() {
+                    public Object get(Box b) { return ((b.flags & NOCLIP_FLAG) != 0) ? Boolean.TRUE : Boolean.FALSE; }
+                    public void put(Box b, Object value) {
+                        if (((b.flags & NOCLIP_FLAG) != 0) == stob(value)) return;
+                        if (stob(value)) b.flags |= NOCLIP_FLAG; else b.flags &= ~NOCLIP_FLAG;
+                        MARK_FOR_REFLOW_b;
+                        b.dirty();
+                    } });
+        
             specialBoxProperties.put("invisible", new SpecialBoxProperty() {
                     public Object get(Box b) {
                         for (Box cur = b; cur != null; cur = cur.parent) {
@@ -1189,21 +1209,21 @@ public final class Box extends JS.Scope {
                     } });
         
             specialBoxProperties.put("image", new SpecialBoxProperty() {
+                    /* FIXME
                     public Object get(Box b) { return b.image == null ? null : ImageDecoder.imageToNameMap.get(b.image); }
+                    */
                     public void put(Box b, Object value) {
-                        if ((value == null && b.image == null) ||
-                            (value != null && b.image != null && value.equals(ImageDecoder.imageToNameMap.get(b.image)))) return;
-                        String s = value == null ? null : value.toString();
-                        if (s == null || s.equals("")) b.image = null;
-                        else {
-                            if ((b.image = ImageDecoder.getPicture(s)) == null) {
-                                if (Log.on) Log.logJS(Box.class, "unable to load image " + s);
-                            } else {
-                                b.minwidth = b.image.getWidth();
-                                b.minheight = b.image.getHeight();
-                                MARK_FOR_REFLOW_b;
-                            }
+                        //if (image != null) System.out.println("hit");
+                        if (value == null) {
+                            b.image = null;
+                        } else if (value instanceof Res) {
+                            b.image = Picture.fromRes((Res)value);
+                        } else {
+                            // FIXME
                         }
+                        b.minwidth = min(b.maxwidth, max(b.minwidth, b.image == null ? 0 : b.image.getWidth()));
+                        b.minheight = min(b.maxheight, max(b.minheight, b.image == null ? 0 : b.image.getHeight()));
+                        MARK_FOR_REFLOW_b;
                         b.dirty();
                     }
                 });
@@ -1245,10 +1265,6 @@ public final class Box extends JS.Scope {
                 });
             //#end
         
-            specialBoxProperties.put("xwt", new SpecialBoxProperty() {
-                    public Object get(Box b) { return XWT.singleton; }
-                });
-        
             specialBoxProperties.put("mouseinside", new SpecialBoxProperty() {
                     public Object get(Box b) {
                         return ((b.flags & MOUSEINSIDE_FLAG) != 0) ? Boolean.TRUE : Boolean.FALSE; }
@@ -1294,10 +1310,13 @@ public final class Box extends JS.Scope {
             specialBoxProperties.put("DoubleClick3", mouseEventHandler);
 
             specialBoxProperties.put("root", new SpecialBoxProperty() {
+                    public void put(Box b, Object value) {
+                        if (stob(value)) b.flags |= ISROOT_FLAG;
+                        else b.flags &= ~ISROOT_FLAG;
+                    }
                     public Object get(Box b) {
-                        if (b.getRoot() == null) return null;
-                        else if (b.parent == null) return b;
-                        else return b.getRoot().getRootProxy();
+                        if (b.parent == null || ((b.flags & ISROOT_FLAG) != 0)) return b;
+                        else return get(b.parent);
                     } });
 
             specialBoxProperties.put("Minimized", new SpecialBoxProperty() {
@@ -1336,18 +1355,6 @@ public final class Box extends JS.Scope {
                     }
                 });
 
-            //#repeat hscar/vscar
-            specialBoxProperties.put("hscar", new SpecialBoxProperty() {
-                    public void put(Box b, Object value) {
-                        if (b.parent == null && b.surface != null) {
-                            b.surface.hscar = stoi(value);
-                            b.surface.dirty(0, 0, b.width, b.height);
-                            b.surface.Refresh();
-                        }
-                    }
-                });
-            //#end
-
             specialBoxProperties.put("Close", new SpecialBoxProperty() {
                     public void put(Box b, Object value) {
                         if (b.parent == null && b.surface != null) b.surface.dispose(true);
@@ -1398,7 +1405,16 @@ public final class Box extends JS.Scope {
             //#end
 
             specialBoxProperties.put("redirect", new SpecialBoxProperty() {
-                    public void put(Box b, Object value) { }
+                    public void put(Box b, Object value) {
+                        if (b.redirect != b) Log.log(this, "cannot change the redirect of a box once it is set");
+                        else if (value == null) b.redirect = null;
+                        else {
+                            Box b2 = (Box)value;
+                            while(b2 != b && b2 != null) b2 = b2.parent;
+                            if (b2 == null) Log.log(this, "a box's redirect must be one of its descendants");
+                            b.redirect = (Box)value;
+                        }
+                    }
                     public Object get(Box b) {
                         if (b.redirect == null) return null;
                         if (b.redirect == b) return Boolean.TRUE;
@@ -1416,6 +1432,8 @@ public final class Box extends JS.Scope {
                 });
 
             specialBoxProperties.put("icon", new SpecialBoxProperty() {
+                    // FIXME
+                    /*
                     public void put(Box b, Object value) {
                         b.put_("icon", value);
                         if (b.surface == null) return;
@@ -1424,6 +1442,7 @@ public final class Box extends JS.Scope {
                         else if (Log.on) Log.log(this, "unable to load icon " + value);
                     }
                     public Object get(Box b) { return b.get_("icon"); }
+                    */
                 });
         }
     }