X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FBox.java.pp;h=473d049d3999c4cc836f181c3e974b105603b069;hb=b205a30ca1e66d49676d807969dd73da999c26f0;hp=2c25b443ab68d9fee78ca540daa8183da32bd7d7;hpb=a81a151e639664cb340cf3726f9e8b9c77d125fb;p=org.ibex.core.git

diff --git a/src/org/xwt/Box.java.pp b/src/org/xwt/Box.java.pp
index 2c25b44..473d049 100644
--- a/src/org/xwt/Box.java.pp
+++ b/src/org/xwt/Box.java.pp
@@ -84,14 +84,19 @@ public final class Box extends JS.Scope {
 
     // Flags ///////////////////////////////////////////////////////////////////////////////
     short flags = 0;
-    static int MOUSEINSIDE_FLAG  = 0x00000001;
-    static int INVISIBLE_FLAG    = 0x00000002;
-    static int ABSOLUTE_FLAG     = 0x00000004;
-    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 final int MOUSEINSIDE_FLAG  = 0x00000001;
+    static final int INVISIBLE_FLAG    = 0x00000002;
+    static final int NOTPACKED_FLAG    = 0x00000004;
+    static final int HSHRINK_FLAG      = 0x00000008;
+    static final int VSHRINK_FLAG      = 0x00000010;
+    static final int FONT_CHANGED_FLAG = 0x00000040;  // set when font changes, cleared during repack
+    static final int ISROOT_FLAG       = 0x00000080;
+    static final int NOCLIP_FLAG       = 0x00000100;
+    static final int ALIGN_TOP_FLAG    = 0x00001000;
+    static final int ALIGN_BOTTOM_FLAG = 0x00002000;
+    static final int ALIGN_LEFT_FLAG   = 0x00004000;
+    static final int ALIGN_RIGHT_FLAG  = 0x00008000;
+    static final int ALIGN_FLAGS       = 0x0000f000;
 
 
     // Geometry ////////////////////////////////////////////////////////////////////////////
@@ -102,15 +107,12 @@ 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;
-    private LENGTH hpad = 0;
-    private LENGTH vpad = 0;
+    public LENGTH minwidth = 0;        
+    public LENGTH minheight = 0;        
+    public LENGTH maxwidth = MAX_LENGTH;
+    public LENGTH maxheight = MAX_LENGTH;
     private String text = null;
-    private Res font = null;
-    private int fontsize = 10;
+    private Font font = null;
     private LENGTH textwidth = 0;
     private LENGTH textheight = 0;
 
@@ -127,19 +129,28 @@ public final class Box extends JS.Scope {
     public LENGTH height = 0;
     private int row = 0;  // FEATURE use a short
     private int col = 0;  // FEATURE use a short
-    private LENGTH contentwidth = 0;             // == max(minwidth, textwidth+pad, sum(child.contentwidth) + pad)
+    private LENGTH contentwidth = 0;             // == max(minwidth, textwidth, sum(child.contentwidth))
     private LENGTH contentheight = 0;
+    private LENGTH offset_x = 0;
+    private LENGTH offset_y = 0;
 
 
     // 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 Picture image;                       // will disappear
-    private int fillcolor = 0x00000000;          // will become SVG.Paint
-    private int strokecolor = 0xFF000000;        // will become SVG.Paint
+    private VectorGraphics.RasterPath rpath = null;
+    private VectorGraphics.Affine rtransform = null;
+
+    //private VectorGraphics.Paint fill = null;
+    //private VectorGraphics.Paint stroke = null;
+    int strokewidth = 1;
+
+    public Picture image;                        // will disappear
+    private int fillcolor = 0x00000000;          // will become VectorGraphics.Paint
+    private int strokecolor = 0xFF000000;        // will become VectorGraphics.Paint
+    private int textcolor = 0xFF000000;          // will become VectorGraphics.Paint
 
     private String cursor = null;                // the cursor for this box
 
@@ -147,13 +158,18 @@ 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;
@@ -185,7 +201,7 @@ public final class Box extends JS.Scope {
         if (isinside && cursor != null) getRoot().cursor = cursor;
 
         // if the mouse has moved into our padding region, it is considered 'outside' all our children
-        if (!(mousex >= hpad && mousey >= vpad && mousex < width - hpad && mousey < height + vpad)) forceleave = true;
+        if (!(mousex >= 0 && mousey >= 0 && mousex < width && mousey < height)) forceleave = true;
 
         for(Box b = getChild(numChildren() - 1); b != null; b = b.prevSibling()) {
             b.Move(oldmousex - b.x, oldmousey - b.y, mousex - b.x, mousey - b.y, forceleave);
@@ -196,20 +212,23 @@ public final class Box extends JS.Scope {
 
     // Reflow ////////////////////////////////////////////////////////////////////////////////////////
 
-    void reflow() {
+    /** only for use on the root box */
+    void reflow() { reflow(width, height); }
+    void reflow(int new_width, int new_height) {
         repack();
         if (Surface.abort) return;
-        resize(x, y, width, height);
+        //#repeat width/height new_width/new_height HSHRINK_FLAG/VSHRINK_FLAG contentwidth/contentheight minwidth/minheight maxwidth/maxheight
+        new_width = bound(max(contentwidth, minwidth),
+                          new_width,
+                          ((flags & HSHRINK_FLAG) != 0) ? max(contentwidth, minwidth) : maxwidth);
+        //#end
+        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 */
     void repack() {
         if (!needs_reflow) return;
-        if (numChildren() == 0) {
-	    contentwidth = max(textwidth + 2 * hpad, minwidth);
-	    contentheight = max(textheight + 2 * vpad, minheight);
-	    return;
-	}
+        contentwidth = contentheight = 0;
 
         // --- Phase 0 ----------------------------------------------------------------------
         // recurse
@@ -226,11 +245,11 @@ public final class Box extends JS.Scope {
         // --- Phase 1 ----------------------------------------------------------------------
         // assign children to their row/column positions (assuming constrained columns)
         if ((rows == 0 && cols == 0) || (rows != 0 && cols != 0)) throw new Error("rows == " + rows + "   cols == " + cols);
-        //#repeat x/y y/x width/height col/row row/col cols/rows rows/cols colspan/rowspan rowspan/colspan colWidth/rowHeight numRowsInCol/numColsInRow INNER/INNER2 maxwidth/maxheight minwidth/minheight contentwidth/contentheight colMaxWidth/rowMaxHeight OUTER/OUTER2 INNER/INNER2
-        if (rows == 0) {
+        //#repeat x/y y/x width/height col/row row/col cols/rows rows/cols colspan/rowspan rowspan/colspan colWidth/rowHeight numRowsInCol/numColsInRow INNER/INNER2 maxwidth/maxheight minwidth/minheight colMaxWidth/rowMaxHeight OUTER/OUTER2 INNER/INNER2
+        if (rows == 0 && numChildren() != 0) {
             int[] numRowsInCol = new int[cols];           // the number of cells occupied in each column
             Box child = getChild(0);
-            for(; child != null && (((child.flags & ABSOLUTE_FLAG) != 0) || ((child.flags & INVISIBLE_FLAG) != 0)); child = child.nextSibling());
+            for(; child != null && (((child.flags & NOTPACKED_FLAG) != 0) || ((child.flags & INVISIBLE_FLAG) != 0)); child = child.nextSibling());
             OUTER: for(int row=0; child != null; row++) {
                 for(int col=0; child != null && col < cols;) {
                     INNER: while(true) {  // scan across the row, looking for an unoccupied gap at least as wide as the child
@@ -245,7 +264,7 @@ public final class Box extends JS.Scope {
                     child.row = row;
                     col += min(cols, child.colspan);
                     child = child.nextSibling();
-                    for(; child != null && (((child.flags & ABSOLUTE_FLAG) != 0) || ((child.flags & INVISIBLE_FLAG) != 0)); child = child.nextSibling());
+                    for(; child != null && (((child.flags & NOTPACKED_FLAG) != 0) || ((child.flags & INVISIBLE_FLAG) != 0)); child = child.nextSibling());
                 }
             }
         }
@@ -253,25 +272,46 @@ public final class Box extends JS.Scope {
 
         // --- Phase 2 ----------------------------------------------------------------------
         // compute the min/max sizes of the columns and rows and set our contentwidth
-        //#repeat x/y y/x width/height col/row cols/rows colspan/rowspan colWidth/rowHeight maxwidth/maxheight minwidth/minheight contentwidth/contentheight colMaxWidth/rowMaxHeight numCols/numRows hpad/vpad
-        contentwidth = 2 * hpad;
-        int numCols = cols;
-        if (numCols == 0)
+        //#repeat x/y y/x width/height col/row cols/rows colspan/rowspan colWidth/rowHeight maxwidth/maxheight minwidth/minheight contentwidth/contentheight colMaxWidth/rowMaxHeight numCols/numRows textwidth/textheight
+        if (numChildren() != 0) {
+            int numCols = cols;
+            if (numCols == 0)
+                for(Box child = getChild(0); child != null; child = child.nextSibling())
+                    numCols = max(numCols, child.col + child.colspan);
+            LENGTH[] colWidth = new LENGTH[numCols];
             for(Box child = getChild(0); child != null; child = child.nextSibling())
-                numCols = max(numCols, child.col + child.colspan);
-        LENGTH[] colWidth = new LENGTH[numCols];
-        for(Box child = getChild(0); child != null; child = child.nextSibling())
-            if (!(((child.flags & ABSOLUTE_FLAG) != 0) || ((child.flags & INVISIBLE_FLAG) != 0)))
-                colWidth[child.col] = max(colWidth[child.col], child.contentwidth / child.colspan);
-        for(int col=0; col<numCols; col++) contentwidth += colWidth[col];
-        contentwidth = max(textwidth + 2 * hpad, contentwidth);
+                if (!(((child.flags & NOTPACKED_FLAG) != 0) || ((child.flags & INVISIBLE_FLAG) != 0)))
+                    colWidth[child.col] = max(colWidth[child.col], child.contentwidth / child.colspan);
+            for(int col=0; col<numCols; col++) contentwidth += colWidth[col];
+        }
+        contentwidth = max(textwidth, contentwidth);
         contentwidth = bound(minwidth, contentwidth, maxwidth);
-        //#end
+        //#end               
+
+        offset_x = 0;
+        if ((flags & NOTPACKED_FLAG) == 0) {
+            if (path != null) {
+                if (rpath == null) rpath = path.realize(transform == null ? VectorGraphics.Affine.identity() : transform);
+                if ((flags & HSHRINK_FLAG) != 0) contentwidth = max(contentwidth, rpath.boundingBoxWidth());
+                if ((flags & VSHRINK_FLAG) != 0) contentheight = max(contentheight, rpath.boundingBoxHeight());
+                // FIXME: separate offset_x needed for the path
+            }
+            //#repeat x1/y1 x2/y2 x3/y3 x4/y4 contentwidth/contentheight left/top right/bottom
+            int x1 = transform == null ? 0 : (int)transform.multiply_px(0, 0);
+            int x2 = transform == null ? 0 : (int)transform.multiply_px(contentwidth, 0);
+            int x3 = transform == null ? contentwidth : (int)transform.multiply_px(contentwidth, contentheight);
+            int x4 = transform == null ? contentwidth : (int)transform.multiply_px(0, contentheight);
+            int left = min(min(x1, x2), min(x3, x4));
+            int right = max(max(x1, x2), max(x3, x4));
+            contentwidth = max(contentwidth, right - left);
+            offset_x = -1 * left;
+            //#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) {
@@ -286,8 +326,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;
                 }
@@ -314,7 +354,7 @@ public final class Box extends JS.Scope {
         //#end
 
         for(Box child = getChild(0); child != null; child = child.nextSibling()) {
-            if (((child.flags & ABSOLUTE_FLAG) != 0) || ((child.flags & INVISIBLE_FLAG) != 0)) continue;
+            if (((child.flags & NOTPACKED_FLAG) != 0) || ((child.flags & INVISIBLE_FLAG) != 0)) continue;
             //#repeat x/y y/x width/height col/row cols/rows colspan/rowspan colWidth/rowHeight maxwidth/maxheight minwidth/minheight contentwidth/contentheight colMaxWidth/rowMaxHeight HSHRINK_FLAG/VSHRINK_FLAG numCols/numRows
             colWidth[child.col] = max(colWidth[child.col], child.contentwidth / child.colspan);
             for(int i=child.col; i<child.col+child.colspan && i<numCols; i++)
@@ -336,8 +376,8 @@ public final class Box extends JS.Scope {
         // --- Phase 3 ----------------------------------------------------------------------
         // hand out the slack
         int slack;
-        //#repeat x/y y/x width/height col/row cols/rows colspan/rowspan colWidth/rowHeight maxwidth/maxheight minwidth/minheight contentwidth/contentheight colMaxWidth/rowMaxHeight numCols/numRows hpad/vpad
-        slack = width - 2 * hpad;
+        //#repeat x/y y/x width/height col/row cols/rows colspan/rowspan colWidth/rowHeight maxwidth/maxheight minwidth/minheight contentwidth/contentheight colMaxWidth/rowMaxHeight numCols/numRows
+        slack = width;
         for(int i=0; i<numCols; i++) slack -= colWidth[i];
         if (numChildren() > 0)
             while(slack > 0) {  
@@ -359,17 +399,21 @@ public final class Box extends JS.Scope {
         for(Box child = getChild(0); child != null; child = child.nextSibling()) {
             if ((child.flags & INVISIBLE_FLAG) != 0) continue;
             int child_x = 0, child_y = 0, child_width = 0, child_height = 0;
-            if ((child.flags & ABSOLUTE_FLAG) != 0) {
+            if ((child.flags & NOTPACKED_FLAG) != 0) {
                 child_x = child.x;
                 child_y = child.y;
-                child_width = ((child.flags & HSHRINK_FLAG) != 0) ? child.contentwidth : min(child.maxwidth, width - child.x - hpad);
-                child_height = ((child.flags & VSHRINK_FLAG) != 0) ? child.contentheight : min(child.maxheight, height - child.y - vpad);
+                child_width = ((child.flags & HSHRINK_FLAG) != 0) ? child.contentwidth : min(child.maxwidth, width - child.x);
+                child_height = ((child.flags & VSHRINK_FLAG) != 0) ? child.contentheight : min(child.maxheight, height - child.y);
             } else {
                 int diff;
-                //#repeat x/y y/x width/height col/row cols/rows colspan/rowspan colWidth/rowHeight maxwidth/maxheight minwidth/minheight contentwidth/contentheight colMaxWidth/rowMaxHeight HSHRINK_FLAG/VSHRINK_FLAG marginWidth/marginHeight hpad/vpad child_x/child_y child_width/child_height
+                //#repeat x/y y/x width/height col/row cols/rows colspan/rowspan colWidth/rowHeight maxwidth/maxheight minwidth/minheight contentwidth/contentheight colMaxWidth/rowMaxHeight HSHRINK_FLAG/VSHRINK_FLAG marginWidth/marginHeight child_x/child_y child_width/child_height ALIGN_LEFT_FLAG/ALIGN_TOP_FLAG ALIGN_RIGHT_FLAG/ALIGN_BOTTOM_FLAG
                 child_width = 0; for(int i=child.col; i<child.col+child.colspan && i<colWidth.length; i++) child_width += colWidth[i];
                 diff = bound(child.contentwidth, child_width, ((child.flags & HSHRINK_FLAG) != 0) ? child.contentwidth : child.maxwidth) - child_width;
-                child_x = max(hpad, marginWidth / 2); for(int i=0; i<child.col; i++) child_x += colWidth[i];
+                if (transform == null) {
+                    if ((flags & ALIGN_RIGHT_FLAG) != 0) child_x = marginWidth;
+                    else if ((flags & ALIGN_LEFT_FLAG) == 0) child_x = marginWidth / 2;
+                }
+                for(int i=0; i<child.col; i++) child_x += colWidth[i];
                 if (diff < 0) child_x += -1 * (diff / 2);
                 child_width += diff;
                 //#end
@@ -384,81 +428,62 @@ 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, PixelBuffer 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 (path == null && (fillcolor & 0xFF000000) != 0x00000000) {
+            VectorGraphics.VectorPath path2 = VectorGraphics.parseVectorPath("M0,0H" + width + "V" + height + "H0V0z");
+            path2.realize(a).fill(buf, new VectorGraphics.SingleColorPaint(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(globalx, globaly, clipx, clipy, clipw, cliph, buf);
-
-        // 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);
-
-        for(Box b = getChild(0); b != null; b = b.nextSibling())
-            b.render(globalx, globaly, clipx, clipy, clipw, cliph, buf);   
-    }
-
-    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, PixelBuffer buf) {
-        int iw = image.getWidth();
-        int ih = image.getHeight();
-        for(int i=(x - x)/iw; i <= (x + w - x)/iw; i++) {
-            for(int j=(y - y)/ih; j<= (y + h - y)/ih; j++) {
-                
-                int dx1 = max(i * iw + x, x);
-                int dy1 = max(j * ih + y, y);
-                int dx2 = min((i+1) * iw + x, x + w);
-                int dy2 = min((j+1) * ih + y, y + h);
-                
-                int sx1 = dx1 - (i*iw) - x;
-                int sy1 = dy1 - (j*ih) - y;
-                int sx2 = dx2 - (i*iw) - x;
-                int sy2 = dy2 - (j*ih) - y;
-
-                if (dx2 - dx1 > 0 && dy2 - dy1 > 0 && sx2 - sx1 > 0 && sy2 - sy1 > 0)
-                    buf.drawPicture(image, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2);
+            for(int x = globalx; x < clipx + clipw; x += image.getWidth())
+                for(int y = globaly; y < clipy + cliph; y += image.getHeight())
+                    buf.drawPicture(image, x, y, clipx, clipy, clipx + clipw, clipy + cliph);
+
+	if (text != null && !text.equals("") && font != null) // FIXME
+            font.rasterizeGlyphs(text, buf, textcolor,
+                                 globalx, globaly, clipx, clipy, clipw + clipx, clipy + cliph,
+                                 new Scheduler.Task() { public void perform() {
+                                     Box.this.dirty();
+                                     Box b = Box.this;
+                                     MARK_FOR_REFLOW_b;
+                                     b.dirty();
+                                 }});
+
+        if (path != null) {
+            if (rtransform == null) rpath = null;
+            else if (!rtransform.equalsIgnoringTranslation(a)) rpath = null;
+            else {
+                rpath.translate((int)(a.e - rtransform.e), (int)(a.f - rtransform.f));
+                rtransform = a.copy();
             }
+            if (rpath == null) {
+                rtransform = a;
+                rpath = path.realize(a == null ? VectorGraphics.Affine.identity() : a);
+            }
+            if ((strokecolor & 0xff000000) != 0) rpath.stroke(buf, 1, strokecolor);
+            if ((fillcolor & 0xff000000) != 0) rpath.fill(buf, new VectorGraphics.SingleColorPaint(fillcolor));
         }
-    }
 
-    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.drawPicture(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());
-            x += g.advance;
+        for(Box b = getChild(0); b != null; b = b.nextSibling()) {
+            VectorGraphics.Affine a2 = VectorGraphics.Affine.translate(b.x, b.y);
+            if (transform != null) a2.multiply(transform);
+            a2.multiply(VectorGraphics.Affine.translate(offset_x, offset_y));
+            a2.multiply(a);
+            b.render(globalx, globaly, clipx, clipy, clipw, cliph, buf, a2);
         }
     }
 
@@ -475,42 +500,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 Res) {
-                Res res = (Res)args.elementAt(0);
-                //                res = res.addExtension(".xwt");
-                Template t = Template.getTemplate(res);
-                if (ThreadMessage.suspendThread()) try {
-                    JS.Callable callback = args.length() < 2 ? null : (Callable)args.elementAt(1);
-                    
-                    // FIXME!!! needs to be xwt.apply(template, box)
-                    t.apply(this, callback, 0, t.numUnits(), null);
-                } finally {
-                    ThreadMessage.resumeThread();
-                }
-            } else if (args.elementAt(0) instanceof String) {
-                String templatename = (String)args.elementAt(0);
-                // FIXME
-                Template t = Template.getTemplate(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);
-                        // FIXME!!! needs to be xwt.apply(template, box)
-                        t.apply(this, callback, 0, t.numUnits(), null);
-                    } 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;
     }
@@ -528,22 +517,28 @@ public final class Box extends JS.Scope {
      *  INVARIANT: after completion, getChild(min(i, numChildren())) == newnode
      *  WARNING: O(n) runtime, unless i == numChildren()
      */
-    public void put(int i, Object value) {
-        if (i < 0) return;
-
+    public Object put(int i, Object value) {
+        if (i < 0) return null;
+        Trap t = value == null ? (Trap)get("childremoved", Trap.class) : (Trap)get("childadded", Trap.class);
+            
         if (value != null && !(value instanceof Box)) {
-            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");
+            if (Log.on) Log.logJS(this, "attempt to set a numerical property on a box to a non-box");
+            return null;
+        }
+
+        if (redirect == null) {
+            if (t != null) return t.perform(value);
+            else if (Log.on) Log.logJS(this, "attempt to add/remove children to/from a node with a null redirect");
         } else if (redirect != this) {
             Box b = value == null ? (Box)redirect.get(i) : (Box)value;
+            // FIXME: what if both of them want a tailcall?
             redirect.put(i, value);
-            put("0", b);
+            if (t != null) return t.perform(value);
         } else if (value == null) {
             if (i >= 0 && i < numChildren()) {
                 Box b = getChild(i);
                 b.remove();
-                put("0", b);
+                if (t != null) return t.perform(b);
             }
         } else {
             Box newnode = (Box)value;
@@ -552,7 +547,7 @@ public final class Box extends JS.Scope {
             for(Box cur = newnode.parent; cur != null; cur = cur.parent)
                 if (cur.redirect == newnode) {
                     if (Log.on) Log.logJS(this, "attempt to move a box that is the target of a redirect");
-                    return;
+                    return null;
                 }
 
             // check for recursive ancestor violation
@@ -560,7 +555,7 @@ public final class Box extends JS.Scope {
                 if (cur == newnode) {
                     if (Log.on) Log.logJS(this, "attempt to make a node a parent of its own ancestor");
                     if (Log.on) Log.log(this, "box == " + this + "  ancestor == " + newnode);
-                    return;
+                    return null;
                 }
 
             if (numKids > 15 && children == null) convert_to_array();
@@ -605,14 +600,13 @@ public final class Box extends JS.Scope {
             MARK_FOR_REFLOW_this;
             
             newnode.dirty();
-
-            // note that JavaScript box[0] will invoke put(int i), not put(String s)
-            put("0", newnode);
+            if (t != null) return t.perform(b);
         }
+        return null;
     }
     
     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 void put2(Object key, Object key2, Object val) { super.put2(key, key2, val); }
 
     public Object get_(Object name) { return super.get(name); }
     public Object get(Object name) { return get(name, false); }
@@ -625,7 +619,7 @@ public final class Box extends JS.Scope {
 
         // See if we're triggering a trap
         Trap t = ignoretraps ? (Trap)null : (Trap)get(name, Trap.class);
-        if (t != null) return t.perform();
+        if (t != null) { t.perform(); return null; }
 
         // Check for a special handler
         SpecialBoxProperty gph = (SpecialBoxProperty)SpecialBoxProperty.specialBoxProperties.get(name);
@@ -654,26 +648,20 @@ public final class Box extends JS.Scope {
      *  @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); }
-    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; }
+    public Object put(Object name, Object value) { return put(name, value, false); }
+    public Object put(Object name_, Object value,  boolean ignoretraps) {
+        if (name_ instanceof Number) { return put(((Number)name_).intValue(), value); }
+        if (!(name_ instanceof String)) { return super.put(name_,value); }
         String name = name_.toString();
         if (!ignoretraps) {
             Trap t = (Trap)get(name, Trap.class);
-            if (t != null) {
-                t.perform(value);
-                return;
-            }
+            if (t != null) return t.perform(value);
         }
 
-        // don't want to really cascade down to the box on this one
-        if (name.equals("0")) return;
-
         SpecialBoxProperty gph = (SpecialBoxProperty)SpecialBoxProperty.specialBoxProperties.get(name);
-        if (gph != null) { gph.put(name, this, value); return; }
+        if (gph != null) { gph.put(name, this, value); return null; }
 
-        super.put(name, value);
+        return super.put(name, value);
     }
 
 
@@ -737,7 +725,12 @@ public final class Box extends JS.Scope {
         if (oldparent != null) { Box b = oldparent; MARK_FOR_REFLOW_b; }
 
         // note that JavaScript box[0] will invoke put(int i), not put(String s)
-        if (oldparent != null) oldparent.put("0", this);
+        if (oldparent != null) {
+            Trap t = (Trap)oldparent.get("childremoved", Trap.class);
+
+            // FIXME!!
+            //if (t != null) t.perform(this, tail);
+        }
     }
 
     /** returns our next sibling (parent[ourindex + 1]) */
@@ -813,12 +806,29 @@ public final class Box extends JS.Scope {
         return parent.getRoot();
     }
 
+    public void recompute_font() {
+        if (text == null) { textwidth = textheight = 0; return; }
+        if (font == null) { /* FIXME */ return; }
+        long widthheight = font.rasterizeGlyphs(text, null, textcolor, 0, 0, 0, 0, 0, 0,
+                                                new Scheduler.Task() { public void perform() {
+                                                    Box b = Box.this;
+                                                    recompute_font();
+                                                    MARK_FOR_REFLOW_b;
+                                                    b.dirty();
+                                                } });
+        textwidth = (int)((widthheight & 0xffff0000) >> 16);
+        textheight = (int)(widthheight & 0x0000ffff);
+        MARK_FOR_REFLOW_this;
+    }
+
 
-    // Trivial Helper Methods (should be inlined) /////////////////////////////////////////
+    // Trivial Helper Method s(should be inlined) /////////////////////////////////////////
 
     static final int min(int a, int b) { if (a<b) return a; else return b; }
+    static final float min(float a, float b) { if (a<b) return a; else return b; }
     static final double min(double a, double b) { if (a<b) return a; else return b; }
     static final int max(int a, int b) { if (a>b) return a; else return b; }
+    static final float max(float a, float b) { if (a>b) return a; else return b; }
     static final int min(int a, int b, int c) { if (a<=b && a<=c) return a; else if (b<=c && b<=a) return b; else return c; }
     static final int max(int a, int b, int c) { if (a>=b && a>=c) return a; else if (b>=c && b>=a) return b; else return c; }
     static final int bound(int a, int b, int c) { if (c < b) return c; if (a > b) return a; return b; }
@@ -882,49 +892,32 @@ 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() {
-                    public Object get(Box b) {
-                        if ((b.fillcolor & 0xFF000000) == 0) return null;
-                        String red = Integer.toHexString((b.fillcolor & 0x00FF0000) >> 16);
-                        String green = Integer.toHexString((b.fillcolor & 0x0000FF00) >> 8);
-                        String blue = Integer.toHexString(b.fillcolor & 0x000000FF);
-                        if (red.length() < 2) red = "0" + red;
-                        if (blue.length() < 2) blue = "0" + blue;
-                        if (green.length() < 2) green = "0" + green;
-                        return "#" + red + green + blue;
-                    }
-                    public void put(Box b, Object value) {
-                        int newcolor = b.fillcolor;
-                        String s = value == null ? null : value.toString();
-                        if (value == null) newcolor = 0x00000000;
-                        else if (s.length() > 0 && s.charAt(0) == '#')
-                            try {
-                                newcolor = 0xFF000000 |
-                                    (Integer.parseInt(s.substring(1, 3), 16) << 16) |
-                                    (Integer.parseInt(s.substring(3, 5), 16) << 8) |
-                                    Integer.parseInt(s.substring(5, 7), 16);
-                            } catch (NumberFormatException e) {
-                                Log.log(this, "invalid color " + s);
-                                return;
-                            }
-                        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();
+            specialBoxProperties.put("fill", new ColorBoxProperty() {
+                    public void put(final Box b, final Object value) {
+                        if (value == null || !(value instanceof Res)) super.put(b, value);
+                        else {
+                            Callback callback = new Callback() { public Object call(Object pic) {
+                                b.image = (Picture)pic;
+                                b.minwidth = b.image.getWidth();
+                                b.minheight = b.image.getHeight();
+                                MARK_FOR_REFLOW_b;
+                                b.dirty();
+                                return null;
+                            } };
+                            Picture pic = Picture.fromRes((Res)value, callback);
+                            if (pic != null) callback.call(pic);
+                        }
                     }
+                    public int getColor(Box b) { return b.fillcolor; }
+                    public void putColor(Box b, int argb) { b.fillcolor = argb; }
                 });
-            //#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); }
+            specialBoxProperties.put("textcolor", new ColorBoxProperty() {
+                    public int getColor(Box b) { return b.textcolor; }
+                    public void putColor(Box b, int argb) { b.textcolor = argb; }
                 });
-
-            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); }
+            specialBoxProperties.put("strokecolor", new ColorBoxProperty() {
+                    public int getColor(Box b) { return b.strokecolor; }
+                    public void putColor(Box b, int argb) { b.strokecolor = argb; }
                 });
 
             specialBoxProperties.put("text", new SpecialBoxProperty() {
@@ -933,50 +926,155 @@ public final class Box extends JS.Scope {
                         String t = value == null ? "null" : value.toString();
                         if (t.equals(b.text)) return;
 			b.text = t;
-			if (t == null) {
-                            if (b.textwidth != 0 || b.textheight != 0) MARK_FOR_REFLOW_b;
-			    b.textwidth = b.textheight = 0;
-			} else {
-			    try {
-                                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);
-			    }
-			}
 			b.dirty();
+                        b.recompute_font();
                     } });
 
+            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();
+                        }
+                        MARK_FOR_REFLOW_b;
+                        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) {
                         // FIXME: translate value into a resource if it is a string
-                        b.font = value == null ? null : (Res)value;
+                        b.font = value == null ? null :
+                            Font.getFont((Res)value, b.font == null ? 10 : b.font.pointsize); // FIXME
                         MARK_FOR_REFLOW_b;
                         b.flags |= FONT_CHANGED_FLAG;
                         b.dirty();
+                        b.recompute_font();
                     } });
         
             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);
+                        if (b.font != null && b.font.pointsize == stoi(value)) return;
+                        b.font = value == null ? null :
+                            Font.getFont(b.font == null ? null : b.font.res, stoi(value)); // FIXME
                         MARK_FOR_REFLOW_b;
                         b.flags |= FONT_CHANGED_FLAG;
                         b.dirty();
+                        b.recompute_font();
+                    } });
+        
+            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("align", new SpecialBoxProperty() {
+                    public Object get(Box b) {
+                        switch(b.flags & ALIGN_FLAGS) {
+                        case (ALIGN_TOP_FLAG | ALIGN_LEFT_FLAG): return "topleft";
+                        case (ALIGN_BOTTOM_FLAG | ALIGN_LEFT_FLAG): return "bottomleft";
+                        case (ALIGN_TOP_FLAG | ALIGN_RIGHT_FLAG): return "topright";
+                        case (ALIGN_BOTTOM_FLAG | ALIGN_RIGHT_FLAG): return "bottomright";
+                        case ALIGN_TOP_FLAG: return "top";
+                        case ALIGN_BOTTOM_FLAG: return "bottom";
+                        case ALIGN_LEFT_FLAG: return "left";
+                        case ALIGN_RIGHT_FLAG: return "right";
+                        case 0: return "center";
+                        default: throw new Error("invalid alignment flags: " + (b.flags & ALIGN_FLAGS));
+                        }
+                    }
+                    public void put(Box b, Object value) {
+                        b.flags &= ~ALIGN_FLAGS;
+                        if (value == null || value.equals("center")) { b.flags &= ALIGN_FLAGS; }
+                        else if (value.equals("topleft")) { b.flags |= ALIGN_TOP_FLAG | ALIGN_LEFT_FLAG; }
+                        else if (value.equals("bottomleft")) { b.flags |= ALIGN_BOTTOM_FLAG | ALIGN_LEFT_FLAG; }
+                        else if (value.equals("topright")) { b.flags |= ALIGN_TOP_FLAG | ALIGN_RIGHT_FLAG; }
+                        else if (value.equals("bottomright")) { b.flags |= ALIGN_BOTTOM_FLAG | ALIGN_RIGHT_FLAG; }
+                        else if (value.equals("top")) { b.flags |= ALIGN_TOP_FLAG; }
+                        else if (value.equals("bottom")) { b.flags |= ALIGN_BOTTOM_FLAG; }
+                        else if (value.equals("left")) { b.flags |= ALIGN_LEFT_FLAG; }
+                        else if (value.equals("right")) { b.flags |= ALIGN_RIGHT_FLAG; }
+                        else Log.logJS("invalid alignment specifier \"" + value + "\"");
+                        MARK_FOR_REFLOW_b;
+                        b.dirty();
                     } });
         
             specialBoxProperties.put("thisbox", new SpecialBoxProperty() {
                     public Object get(Box b) { return b; }
                     public void put(Box b, Object value) {
                         if (value == null) b.remove();
-                        else if (value.equals("window") || value.equals("frame")) Platform.createSurface(b, value.equals("frame"), true);
                         else if (Log.on) Log.log(this, "put invalid value to 'thisbox' property: " + value);
                     }
                 });
@@ -1006,10 +1104,6 @@ public final class Box extends JS.Scope {
                         MARK_FOR_REFLOW_b;
                     } });
 
-            //FIXME
-            specialBoxProperties.put("static", new SpecialBoxProperty() {
-                });
-
             specialBoxProperties.put("shrink", new SpecialBoxProperty() {
                     public Object get(Box b) { return (((b.flags & HSHRINK_FLAG) != 0) || ((b.flags & VSHRINK_FLAG) != 0)) ? Boolean.TRUE : Boolean.FALSE; }
                     public void put(Box b, Object value) { b.put("hshrink", value); b.put("vshrink", value); }
@@ -1035,7 +1129,7 @@ public final class Box extends JS.Scope {
                         return new Integer(b.x);
                     }
                     public void put(Box b, Object value) {
-                        if (!((b.flags & ABSOLUTE_FLAG) != 0)) return;
+                        if (!((b.flags & NOTPACKED_FLAG) != 0) && (b.parent != null || b.surface == null)) return;
                         int x = stoi(value);
                         if (x == b.x) return;
                         b.dirty();
@@ -1047,17 +1141,20 @@ public final class Box extends JS.Scope {
                 });
             //#end
         
-            //#repeat width/height minwidth/minheight maxwidth/maxheight
+            //#repeat width/height height/width minwidth/minheight maxwidth/maxheight true/false
             specialBoxProperties.put("width", new SpecialBoxProperty() {
                     public Object get(Box b) { return new Integer(b.width); }
                     public void put(Box b, Object value) {
-                        b.width = stoi(value);
+                        int newval = stoi(value);
                         if (b.parent == null && b.surface != null) {
-                            b.surface.setSize();
+                            // hack to circumvent #repeat
+                            int other = b.height;
+                            if (true) b.surface.setSize(newval, other);
+                            else b.surface.setSize(other, newval);
                             MARK_FOR_REFLOW_b;
                         } else {
-                            if (b.minwidth == b.width && b.maxwidth == b.width) return;
-                            b.minwidth = b.maxwidth = b.width;
+                            if (b.minwidth == newval && b.maxwidth == newval) return;
+                            b.minwidth = b.maxwidth = newval;
                             MARK_FOR_REFLOW_b;
                         }
                     } });
@@ -1086,23 +1183,24 @@ public final class Box extends JS.Scope {
                 });
             //#end
         
-            specialBoxProperties.put("tile", new SpecialBoxProperty() {
-                    public Object get(Box b) { return ((b.flags & TILE_FLAG) != 0) ? Boolean.TRUE : Boolean.FALSE; }
+            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 & TILE_FLAG) != 0) == stob(value)) return;
-                        if (stob(value)) b.flags |= TILE_FLAG; else b.flags &= ~TILE_FLAG;
+                        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() {
+            specialBoxProperties.put("visible", new SpecialBoxProperty() {
                     public Object get(Box b) {
                         for (Box cur = b; cur != null; cur = cur.parent) {
-                            if ((cur.flags & INVISIBLE_FLAG) != 0) return Boolean.TRUE; }
-                        return Boolean.FALSE;
+                            if ((cur.flags & INVISIBLE_FLAG) != 0) return Boolean.FALSE; }
+                        return Boolean.TRUE;
                     }
                     public void put(Box b, Object value) {
-                        if (stob(value) == ((b.flags & INVISIBLE_FLAG) != 0)) return;
-                        if (stob(value)) b.flags |= INVISIBLE_FLAG; else b.flags &= ~INVISIBLE_FLAG;
+                        if (!stob(value) == ((b.flags & INVISIBLE_FLAG) != 0)) return;
+                        if (!stob(value)) b.flags |= INVISIBLE_FLAG; else b.flags &= ~INVISIBLE_FLAG;
                         if (b.parent == null) {
                             if (b.surface != null) b.surface.setInvisible((b.flags & INVISIBLE_FLAG) != 0);
                         } else {
@@ -1112,38 +1210,15 @@ public final class Box extends JS.Scope {
                         }
                     }});
         
-            specialBoxProperties.put("absolute", new SpecialBoxProperty() {
-                    public Object get(Box b) { return ((b.flags & ABSOLUTE_FLAG) != 0) ? Boolean.TRUE : Boolean.FALSE; }
+            specialBoxProperties.put("packed", new SpecialBoxProperty() {
+                    public Object get(Box b) { return ((b.flags & NOTPACKED_FLAG) != 0) ? Boolean.TRUE : Boolean.FALSE; }
                     public void put(Box b, Object value) {
-                        if (stob(value) == ((b.flags & ABSOLUTE_FLAG) != 0)) return;
-                        if (stob(value)) b.flags |= ABSOLUTE_FLAG; else b.flags &= ~ABSOLUTE_FLAG;
-                        if ((b.flags & ABSOLUTE_FLAG) != 0) { b.x = 0; b.y = 0; }
+                        if (stob(value) == ((b.flags & NOTPACKED_FLAG) == 0)) return;
+                        if (!stob(value)) b.flags |= NOTPACKED_FLAG; else b.flags &= ~NOTPACKED_FLAG;
+                        if ((b.flags & NOTPACKED_FLAG) != 0) { b.x = 0; b.y = 0; }
                         if (b.parent != null) MARK_FOR_REFLOW_b_parent;
                     } });
         
-            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;
-                            }
-                        }
-                        b.dirty();
-                    }
-                    */
-                });
-
             //#repeat globalx/globaly x/y
             specialBoxProperties.put("globalx", new SpecialBoxProperty() {
                     public Object get(Box b) { return new Integer(b.parent == null || b.surface == null ? 0 : b.x); }
@@ -1181,10 +1256,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; }
@@ -1287,24 +1358,6 @@ public final class Box extends JS.Scope {
             specialBoxProperties.put("PosChange", new SpecialBoxProperty());
             specialBoxProperties.put("SizeChange", new SpecialBoxProperty());
 
-            //#repeat hpad/vpad 
-            specialBoxProperties.put("hpad", new SpecialBoxProperty() {
-                    public Object get(Box b) {
-                        if (b.redirect == null) return new Integer(0);
-                        if (b.redirect != b) return get(b.redirect);
-                        return new Integer(b.hpad);
-                    }
-                    public void put(Box b, Object value) {
-                        if (b.redirect == null) return;
-                        if (b.redirect != b) { put(b.redirect, value); return; }
-                        int newval = stoi(value);
-                        if (newval == b.hpad) return;
-                        b.hpad = newval;
-                        MARK_FOR_REFLOW_b;
-                    }
-                });
-            //#end
-
             //#repeat minwidth/minheight maxwidth/maxheight
             specialBoxProperties.put("minwidth", new SpecialBoxProperty() {
                     public Object get(Box b) { return new Integer(b.minwidth); }
@@ -1325,7 +1378,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;
@@ -1356,6 +1418,41 @@ public final class Box extends JS.Scope {
                     */
                 });
         }
+
+        private static abstract class ColorBoxProperty extends SpecialBoxProperty {
+            public abstract int getColor(Box b);
+            public abstract void putColor(Box b, int argb);
+            public Object get(Box b) {
+                if ((getColor(b) & 0xFF000000) == 0) return null;
+                String red = Integer.toHexString((getColor(b) & 0x00FF0000) >> 16);
+                String green = Integer.toHexString((getColor(b) & 0x0000FF00) >> 8);
+                String blue = Integer.toHexString(getColor(b) & 0x000000FF);
+                if (red.length() < 2) red = "0" + red;
+                if (blue.length() < 2) blue = "0" + blue;
+                if (green.length() < 2) green = "0" + green;
+                return "#" + red + green + blue;
+            }
+            public void put(Box b, Object value) {
+                int newcolor = getColor(b);
+                String s = value == null ? null : value.toString();
+                if (value == null) newcolor = 0x00000000;
+                else if (s.length() > 0 && s.charAt(0) == '#')
+                    try {
+                        newcolor = 0xFF000000 |
+                            (Integer.parseInt(s.substring(1, 3), 16) << 16) |
+                            (Integer.parseInt(s.substring(3, 5), 16) << 8) |
+                            Integer.parseInt(s.substring(5, 7), 16);
+                    } catch (NumberFormatException e) {
+                        Log.log(this, "invalid color " + s);
+                        return;
+                    }
+                else if (org.xwt.translators.SVG.colors.get(s) != null)
+                    newcolor = 0xFF000000 | ((Integer)org.xwt.translators.SVG.colors.get(s)).intValue();
+                if (newcolor == getColor(b)) return;
+                putColor(b, newcolor);
+                b.dirty();
+            }
+        }
     }
 
     /** helper that converts a String to a boolean according to JavaScript coercion rules */