X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fcore%2FBox.java;h=dffc33c0cb011af9a06545a352ec565b6f8b890b;hp=0e95a7e2f1db531ddf117f5c2b88c0d458f9a438;hb=HEAD;hpb=5f0b1c28e1c93b3fc14236fa9eb9742aa3304377

diff --git a/src/org/ibex/core/Box.java b/src/org/ibex/core/Box.java
index 0e95a7e..dffc33c 100644
--- a/src/org/ibex/core/Box.java
+++ b/src/org/ibex/core/Box.java
@@ -1,22 +1,28 @@
-// FIXME
-// Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
+// Copyright 2000-2005 the Contributors, as shown in the revision logs.
+// Licensed under the GNU General Public License version 2 ("the License").
+// You may not use this file except in compliance with the License.
+
 package org.ibex.core;
 
 // FIXME: are traps on x/y meaningful?
-// FIXME: if we trap on cols, then set rows to 0 (forcing cols to 1), does the cols trap get triggered?
-// FIXME: if we change min{width/height}, thereby forcing a change to max{min/height}, does a trap on those get triggered?
-// FIXME: trap on numchildren?  replaces ChildChanged?
 // FIXME: trap on visible, trigger when parent visibility changes
-
-// FIXME: ax/ay nonsense
 // FIXME: mouse move/release still needs to propagate to boxen in which the mouse was pressed and is still held down
-
-// FEATURE: mark to reflow starting with a certain child
 // FEATURE: reintroduce surface.abort
 
+// Broken:
+// - textures
+// - align/origin
+// - clipping (all forms)
+// - mouse events
+// - fonts/text
+// - vertical layout
+
+// - stroke clipping
+
 import java.util.*;
 import org.ibex.js.*;
 import org.ibex.util.*;
+import org.ibex.plat.*;
 import org.ibex.graphics.*;
 
 /**
@@ -38,132 +44,91 @@ import org.ibex.graphics.*;
  *  trigger a Surface.abort; if rendering were done in the same pass,
  *  rendering work done prior to the Surface.abort would be wasted.
  */
-public final class Box extends JSScope implements Task {
+public final class Box extends JS.Obj implements Callable, Mesh.Chain {
+
+    public Mesh.Chain getMeshChainParent() { return parent; }
+    public Mesh       getMesh()            { return mesh; }
+    public Affine     getAffine()          { return transform; }
 
     // Macros //////////////////////////////////////////////////////////////////////
 
-    final void REPLACE() { for(Box b2 = this; b2 != null && !b2.test(REPLACE); b2 = b2.parent) b2.set(REPLACE); }
+    final void REPLACE()     { for(Box b2 = this; b2 != null && !b2.test(REPLACE); b2 = b2.parent) b2.set(REPLACE); }
     final void RECONSTRAIN() { for(Box b2 = this; b2 != null && !b2.test(RECONSTRAIN); b2 = b2.parent) b2.set(RECONSTRAIN); }
-    final void REPACK() { for(Box b2 = this; b2 != null && !b2.test(REPACK); b2 = b2.parent) b2.set(REPACK); }
-
-    //#define CHECKSET_SHORT(prop) short nu = (short)toInt(value); if (nu == prop) break; prop = nu;
-    //#define CHECKSET_INT(prop) int nu = toInt(value); if (nu == prop) break; prop = nu;
-    //#define CHECKSET_FLAG(flag) boolean nu = toBoolean(value); if (nu == test(flag)) break; if (nu) set(flag); else clear(flag);
-    //#define CHECKSET_BOOLEAN(prop) boolean nu = toBoolean(value); if (nu == prop) break; prop = nu;
-    //#define CHECKSET_STRING(prop) if ((value==null&&prop==null)||(value!=null&&JS.toString(value).equals(prop))) break; prop=JS.toString(value);
-
-    public Box() { super(null); }
-
-    // FIXME memory leak
-    static Hash boxToCursor = new Hash(500, 3);
-
-    static final Font DEFAULT_FONT = Font.getFont((Stream)Main.builtin.get("fonts/vera/Vera.ttf"), 10);
-
-
-    // Flags //////////////////////////////////////////////////////////////////////
-
-    static final int MOUSEINSIDE  = 0x00000001;
-    static final int VISIBLE      = 0x00000002;
-    static final int PACKED       = 0x00000004;
-    public static final int HSHRINK      = 0x00000008;
-    public static final int VSHRINK      = 0x00000010;
-    static final int BLACK        = 0x00000020;  // for red-black code
-
-    static final int FIXED        = 0x00000040;
-    static final boolean ROWS     = true;
-    static final boolean COLS     = false;
-
-    static final int ISROOT       = 0x00000080;
-    static final int REPACK       = 0x00000100;
-    static final int RECONSTRAIN  = 0x00000200;
-    static final int REPLACE      = 0x00000400;
-
-    static final int ALIGN_TOP    = 0x00001000;
-    static final int ALIGN_BOTTOM = 0x00002000;
-    static final int ALIGN_LEFT   = 0x00004000;
-    static final int ALIGN_RIGHT  = 0x00008000;
-    static final int ALIGNS       = 0x0000f000;
-    static final int CURSOR       = 0x00010000;  // if true, this box has a cursor in the cursor hash; FEATURE: GC issues?
-    static final int CLIP         = 0x00020000;
-    static final int STOP_UPWARD_PROPAGATION    = 0x00040000;
-    static final int MOVED         = 0x00080000;
 
+    //#define CHECKSET_SHORT(prop) short nu = (short)JSU.toInt(value); if (nu == prop) break; prop = nu;
+    //#define CHECKSET_INT(prop) int nu = JSU.toInt(value); if (nu == prop) break; prop = nu;
+    //#define CHECKSET_FLAG(flag) boolean nu=JSU.toBoolean(value);if(nu == test(flag)) break; if (nu) set(flag); else clear(flag);
+    //#define CHECKSET_BOOLEAN.N(prop) boolean nu = JSU.toBoolean(value); if (nu == prop) break; prop = nu;
+    //#define CHECKSET_STRING(prop) if((value==null&&prop==null)||(value!=null&&JSU.toString(value).equals(prop)))break;prop=JSU.toString(value);
 
     // Instance Data //////////////////////////////////////////////////////////////////////
 
-    Box parent = null;
-    Box redirect = this;
-    int flags = VISIBLE | PACKED | REPACK | RECONSTRAIN | REPLACE | FIXED | STOP_UPWARD_PROPAGATION | CLIP | MOVED;
-
-    private String text = null;
-    private Font font = DEFAULT_FONT; 
-    private Picture texture = null;
-    private short strokewidth = 1;
-    public int fillcolor = 0x00000000;
-    private int strokecolor = 0xFF000000;
-
-    private int aspect = 0;
+    private Box          parent       = null;
+    private Box          redirect     = this;
+    private int          flags        = VISIBLE | RECONSTRAIN | REPLACE | STOP_UPWARD_PROPAGATION | CLIP | MOVED;
+    private BalancedTree bt           = null;
+    private String       text         = null;
+    private Font         font         = DEFAULT_FONT; 
+    private Picture      texture      = null;
+    public  int          fillcolor    = 0x00000000;
+    private int          strokecolor  = 0xFF000000;
+    public  float        flex         = 1;
+    private Path         path         = null;
+    private Path         clippath     = null;
+    private Affine       transform    = Affine.identity();
+
+    // FEATURE: polygon caching
+    private Mesh      polygon      = null;
+    private Mesh         mesh         = null;
 
     // specified directly by user
     public int minwidth = 0;
     public int maxwidth = Integer.MAX_VALUE;
     public int minheight = 0;
     public int maxheight = Integer.MAX_VALUE;
-    private short rows = 1;
-    private short cols = 0;
-    private short rowspan = 1;
-    private short colspan = 1;
 
     // computed during reflow
-    private short row = 0;
-    private short col = 0;
-    public int x = 0;
-    public int y = 0;
-    public int ax = 0;   // FEATURE: roll these into x/y; requires lots of changes
-    public int ay = 0;   // FEATURE: roll these into x/y; requires lots of changes; perhaps y()?
-    public int width = 0;
-    public int height = 0;
+    //public int width = 0;   // AS MEASURED IN PARENT SPACE!
+    //public int height = 0;  // AS MEASURED IN PARENT SPACE!
+    float _width;
+    float _height;
+    private int width;
+    private int height;
+    private int rootwidth;
+    private int rootheight;
+    public int getRootWidth() { return rootwidth; }
+    public int getRootHeight() { return rootheight; }
+
     public int contentwidth = 0;      // == max(minwidth, textwidth, sum(child.contentwidth))
     public int contentheight = 0;
 
-    private Path path = null;
-    /*
-    private Affine transform = null;
-    private VectorGraphics.RasterPath rpath = null;
-    private Affine rtransform = null;
-    */
 
     // Instance Methods /////////////////////////////////////////////////////////////////////
 
-    public final int fontSize() { return font == null ? DEFAULT_FONT.pointsize : font.pointsize; }
-
     /** invoked when a resource needed to render ourselves finishes loading */
-    public void perform() throws JSExn {
-        if (texture == null) { Log.warn(Box.class, "perform() called with null texture"); return; }
+    public Object run(Object o) throws JSExn {
+        if (texture == null) { Log.warn(Box.class, "perform() called with null texture"); return null; }
         if (texture.isLoaded) {
             setWidth(max(texture.width, minwidth), maxwidth); 
             setHeight(max(texture.height, minheight), maxheight); 
             dirty(); }
         else { JS res = texture.stream; texture = null; throw new JSExn("image not found: "+res.unclone()); }
+        return null;
     }
 
-    // FEATURE: use cx2/cy2 format
     /** Adds the intersection of (x,y,w,h) and the node's current actual geometry to the Surface's dirty list */
-    public void dirty() { dirty(0, 0, width, height); }
-    public void dirty(int x, int y, int w, int h) {
-        for(Box cur = this; cur != null; cur = cur.parent) {
-            // x and y have a different meaning on the root box
-            if (cur.parent != null && cur.test(CLIP)) {
-                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.getSurface() != null) cur.getSurface().dirty(x, y, w, h);
-            x += cur.x;
-            y += cur.y;
-        }
+    public void dirty() { if (path==null) dirty(0, 0, contentwidth, contentheight); else dirty(path); }
+    public void dirty(int x, int y, int w, int h) { }
+    public void dirty(Path p) {
+        Affine a = transform.copy();
+        for(Box cur = this; cur != null; cur = cur.parent) a.premultiply(cur.transform);
+        long hbounds = p.horizontalBounds(a);
+        long vbounds = p.verticalBounds(a);
+        int x1 = (int)Encode.longToFloat2(hbounds);
+        int x2 = (int)Encode.longToFloat1(hbounds);
+        int y1 = (int)Encode.longToFloat2(vbounds);
+        int y2 = (int)Encode.longToFloat1(vbounds);
+        if (getSurface() != null) getSurface().dirty(x1, y1, x2-x1, y2-y1);
     }
 
 
@@ -171,363 +136,299 @@ public final class Box extends JSScope implements Task {
 
     /** should only be invoked on the root box */
     public void reflow() {
-        pack();
-        resize(x, y,
-               test(HSHRINK) ? contentwidth : maxwidth,
-               test(VSHRINK) ? contentheight : maxheight);
-        place();
+        constrain(this, Affine.identity(), new BoundingBox());
+        width  = rootwidth  = maxwidth;
+        height = rootheight = maxheight;
+        transform.e = 0;
+        transform.f = 0;
+        place(0, 0, width, height, false);
     }
-    
-    private static Box[] frontier = new Box[65535];
-    /** pack the boxes into rows and columns, compute contentwidth */
-    public void pack() {
-        if (!test(REPACK)) { constrain(); return; }
-        boolean haskid = false;
-        for(Box child = getChild(0); child != null; child = child.nextSibling()) { haskid = true; child.pack(); }
-        if (!haskid) { clear(REPACK); constrain(); return; }
-        int frontier_size = 0;
-        //#repeat COLS/ROWS rows/cols cols/rows col/row row/col colspan/rowspan rowspan/colspan \
-        //        contentheight/contentwidth contentwidth/contentheight
-        if (test(FIXED) == COLS) {
-            rows = 0;
-            for(Box child = getChild(0); child != null; child = child.nextSibling()) {
-                if (!child.test(PACKED) || !child.test(VISIBLE)) continue;
-                if (cols == 1) { child.row = rows; rows += child.rowspan; child.col = 0; continue; }
-                child.col = (short)(frontier_size <= 0 ? 0 : (frontier[frontier_size-1].col + frontier[frontier_size-1].colspan));
-                child.row = (short)(frontier_size <= 0 ? 0 : frontier[frontier_size-1].row);
-                if (child.col + min(cols,child.colspan) > cols) { child.col = 0; child.row++; }
-                for(int i=0; i<frontier_size; i++)
-                    if (frontier[i].row + frontier[i].rowspan <= child.row) {
-                        frontier[i--] = frontier[--frontier_size]; frontier[frontier_size] = null;
-                    } else if (frontier[i].col<child.col+min(cols,child.colspan)&&frontier[i].col+frontier[i].colspan>child.col) {
-                        child.col = (short)(frontier[i].col + frontier[i].colspan);
-                        if (child.col + min(cols,child.colspan) > cols) {
-                            child.row = (short)(frontier[i].row + frontier[i].rowspan);
-                            for(i--; i>0; i--) child.row = (short)min(row, frontier[i].row + frontier[i].rowspan);
-                            child.col = (short)0;
-                        }
-                        i = -1;
-                    } else break;
-                frontier[frontier_size++] = child;
-            }
-            for(int i=0; i<frontier_size; i++){ rows=(short)max(rows, frontier[i].row + frontier[i].rowspan); frontier[i] = null; }
+
+    public float minWidth()      { return Encode.longToFloat1(transform.rotateBox(minwidth, minheight)); }
+    public float minHeight()     { return Encode.longToFloat2(transform.rotateBox(minwidth, minheight)); }
+    public float maxWidth()      { return Encode.longToFloat1(transform.rotateBox(maxwidth, maxheight)); }
+    public float maxHeight()     { return Encode.longToFloat2(transform.rotateBox(maxwidth, maxheight)); }
+    public float contentWidth()  { return Encode.longToFloat1(transform.rotateBox(contentwidth, contentheight)); }
+    public float contentHeight() { return Encode.longToFloat2(transform.rotateBox(contentwidth, contentheight)); }
+
+    /** used (single-threadedly) in constrain() */
+    private static int xmin = 0, ymin = 0, xmax = 0, ymax = 0;
+
+    private static class BoundingBox {
+        public int xmin, ymin, xmax, ymax;
+        public boolean unbounded() {
+            return xmin==Integer.MAX_VALUE||xmax==Integer.MIN_VALUE||ymin==Integer.MAX_VALUE||ymax==Integer.MIN_VALUE; }
+        public void reset() {
+            xmin = Integer.MAX_VALUE; ymin = Integer.MAX_VALUE;
+            xmax = Integer.MIN_VALUE; ymax = Integer.MIN_VALUE;
+        }
+        public void include(Affine a, float cw, float ch) {
+            //#repeat contentwidth/contentheight contentheight/contentwidth minwidth/minheight row/col col/row \
+            //        textwidth/textheight maxwidth/maxheight bounds/boundsy x1/y1 x2/y2 z1/q1 z2/q2 z3/q3 z4/q4 \
+            //        horizontalBounds/verticalBounds e/f multiply_px/multiply_py xmin/ymin xmax/ymax
+            float z1    = a.multiply_px(0, 0);
+            float z2    = a.multiply_px(cw, ch);
+            float z3    = a.multiply_px(cw, 0);
+            float z4    = a.multiply_px(0, ch);
+            xmin = min(xmin, (int)min(min(z1, z2), min(z3, z4)));
+            xmax = max(xmax, (int)max(max(z1, z2), max(z3, z4)));
+            //#end
+        }
+        public void include(Affine a, Path path) {
+            //#repeat contentwidth/contentheight contentheight/contentwidth minwidth/minheight row/col col/row \
+            //        textwidth/textheight maxwidth/maxheight bounds/boundsy x1/y1 x2/y2 z1/q1 z2/q2 z3/q3 z4/q4 \
+            //        horizontalBounds/verticalBounds e/f multiply_px/multiply_py xmin/ymin xmax/ymax
+            long bounds = path.horizontalBounds(a);
+            float z1    = Encode.longToFloat2(bounds);
+            float z2    = Encode.longToFloat1(bounds);
+            float z3    = Encode.longToFloat2(bounds);
+            float z4    = Encode.longToFloat1(bounds);
+            xmin = min(xmin, (int)min(min(z1, z2), min(z3, z4)));
+            xmax = max(xmax, (int)max(max(z1, z2), max(z3, z4)));
+            //#end
         }
-        //#end
-        clear(REPACK);
-        set(RECONSTRAIN);   // FIXME: be smarter / more incremental
-        constrain();
     }
 
-    public void constrain() {
-        if (!test(RECONSTRAIN)) return;
-        solve(true);
-        //#repeat contentwidth/contentheight contentheight/contentwidth minwidth/minheight row/col col/row \
-        //        textwidth/textheight maxwidth/maxheight cols/rows rows/cols colspan/rowspan rowspan/colspan
-        contentwidth = bound(minwidth,
-                             max(contentwidth, font == null || text == null ? 0 : font.textwidth(text)),
-                             maxwidth);
-        //#end
-        set(REPLACE); // FIXME: be smarter / more incremental
-    }
-    
-    void resize(int x, int y, int width, int height) {
-        if (x == this.x && y == this.y && width == this.width && height == this.height) return;
-        boolean sizechange = (this.width != width || this.height != height) && getTrap("SizeChange") != null;
-        int thisx = parent == null ? 0 : this.x;
-        int thisy = parent == null ? 0 : this.y;
-        Box who = (parent == null ? this : parent);
-        if (this.x != x || this.y != y) set(MOVED);
-        if (texture == null && (text == null || text.equals("")) && !test(MOVED)) {
-            if ((fillcolor & 0xff000000) != 0 || parent == null) {
-                who.dirty(thisx+min(this.width,width), thisy, Math.abs(width-this.width), max(this.height, height));
-                who.dirty(thisx, thisy+min(this.height,height), max(this.width, width), Math.abs(height-this.height));
+    /** expand the {x,y}{min,max} boundingbox in space <tt>a</tt> to include this box */
+    public void constrain(Box b, Affine a, BoundingBox bbox) {
+        contentwidth = 0;
+        contentheight = 0;
+        a = a.copy().premultiply(transform);
+
+        BoundingBox bbox2 = new BoundingBox();
+        for(Box child = getChild(0); child != null; child = child.nextSibling()) {
+            child.constrain(this, Affine.identity(), bbox2);
+            if (bbox2.unbounded()) { /* FIXME: why? */ bbox2.reset(); continue; }
+            if (packed()) {
+                // packed boxes mush together their childrens' bounding boxes
+                if (test(XAXIS)) {
+                    contentwidth  = contentwidth + (bbox2.xmax-bbox2.xmin);
+                    contentheight = max(bbox2.ymax-bbox2.ymin, contentheight);
+                } else {
+                    contentwidth  = max(bbox2.xmax-bbox2.xmin, contentwidth);
+                    contentheight = contentheight + (bbox2.ymax-bbox2.ymin);
+                }
+                bbox2.reset();
             }
-            this.width = width; this.height = height; this.x = x; this.y = y;
-        } else {
-            who.dirty(thisx, thisy, this.width, this.height);
-            this.width = width; this.height = height; this.x = x; this.y = y;
-            dirty();
         }
-        if (sizechange) putAndTriggerTrapsAndCatchExceptions("SizeChange", T);
+        if (!packed()) {
+            // unpacked boxes simply use the "cumulative" bounding box
+            contentwidth  = bbox2.xmax-bbox2.xmin;
+            contentheight = bbox2.ymax-bbox2.ymin;
+        }
+
+        contentwidth = bound(minwidth, contentwidth, maxwidth);
+        contentheight = bound(minheight, contentheight, maxheight);
+        bbox.include(a, contentwidth, contentheight);
+        if (path!=null) bbox.include(a, path);
     }
 
-    private float targetColumnSize = (float)0.0;
-    private float targetRowSize = (float)0.0;
-    private static float[] sizes = new float[65535];
-    private static float[] sizes_v = new float[65535];
-    private static int[] regions = new int[65535];
-    private static int[] regions_v = new int[65535];
-    private static int numregions = 0;
-    private static int numregions_v = 0;
-
-    void solve(boolean findMinimum) {
-        int numkids = 0; for(Box c = firstPackedChild(); c != null; c = c.nextPackedSibling()) numkids++;
-        //#repeat col/row colspan/rowspan contentwidth/contentheight width/height HSHRINK/VSHRINK numregions/numregions_v \
-        //        maxwidth/maxheight cols/rows minwidth/minheight regions/regions_v targetColumnSize/targetRowSize sizes/sizes_v \
-        //        HSHRINK/VSHRINK
-        if (numkids == 0) {
-            if (findMinimum) contentwidth = 0;
-            else targetColumnSize = 0;
-        } else if (cols == 1) {
-            if (findMinimum) {
-                contentwidth = 0;
-                for(Box c = firstPackedChild(); c != null; c = c.nextPackedSibling())
-                    contentwidth = max(contentwidth, c.contentwidth);
+    void place(float x, float y, float w, float h, boolean keep) {
+        int oldw = width;
+        int oldh = height;
+        width  = bound(contentwidth,  (int)Encode.longToFloat1(transform.inverse().rotateBox(w, h)), test(HSHRINK)?contentwidth:maxwidth);
+        height = bound(contentheight, (int)Encode.longToFloat2(transform.inverse().rotateBox(w, h)), test(VSHRINK)?contentheight:maxheight);
+        if (oldw!=width || oldh!=height) mesh = null;
+        if (!keep) {
+            Affine a = transform;
+            transform.e = 0;
+            transform.f = 0;
+            float e;
+            float f;
+            //#repeat e/f x/y multiply_px/multiply_py horizontalBounds/verticalBounds bounds/boundsy z1/z1y z2/z2y z3/z3y z4/z4y
+            long bounds = path==null ? 0                            : path.horizontalBounds(transform);
+            float z1    = path==null ? a.multiply_px(0, 0)          : Encode.longToFloat2(bounds);
+            float z2    = path==null ? a.multiply_px(width, height) : Encode.longToFloat1(bounds);
+            float z3    = path==null ? a.multiply_px(width, 0)      : Encode.longToFloat2(bounds);
+            float z4    = path==null ? a.multiply_px(0,     height) : Encode.longToFloat1(bounds);
+            e = (-1 * min(min(z1, z2), min(z3, z4))) + x;
+            //#end
+            transform.e = e;
+            transform.f = f;
+        }
+        
+        if (!packed()) {
+            for(Box child = getChild(0); child != null; child = child.nextSibling())
+                child.place(0, 0, width, height, true);
+            return;
+        }
+        float slack = test(XAXIS)?width:height, oldslack = 0, flex = 0, newflex = 0;
+        for(Box child = getChild(0); child != null; child = child.nextSibling()) {
+            if (!child.test(VISIBLE)) continue;
+            if (test(XAXIS)) {
+                child._width  = child.contentWidth();
+                child._height = height;
+                slack -= child._width;
             } else {
-                targetColumnSize = width;
-            }
-        } else if (cols > 1) do {
-
-            // FIXME: cache these?
-            // compute regions
-            numregions = 0;
-            for(Box c = firstPackedChild(); c != null; c = c.nextPackedSibling()) {
-                regions[numregions++] = c.col;
-                regions[numregions++] = min(cols, c.col+c.colspan);
+                child._height  = child.contentHeight();
+                child._width = width;
+                slack -= child._height;
             }
-            Vec.sortInts(regions, 0, numregions);
-            int j = 0;
-            int newnumregions = numregions;
-            for(int i=1; i<numregions; i++) {
-                if (regions[j] != regions[i]) j++;
-                else newnumregions--;
-                regions[j] = regions[i];
-            }
-            numregions = newnumregions;
-            if (regions[numregions-1] == cols) numregions--;
-            else regions[numregions] = cols;
-
-            int target = findMinimum ? 0 : Math.max(width, contentwidth);
-            // priority 0: (inviolable) honor minwidths
-            // priority 1: sum of columns no greater than parent
-            // priority 2: honor maxwidths
-            // priority 3: equalize columns
-            float targetColumnSize = target == 0 ? 0 : this.targetColumnSize;
-            float last_columnsize = 0;
-            float last_total = 0;
-            float total;
-            boolean first = true;
-            while(true) {
-                total = (float)0.0;
-                for(int r=0; r<numregions; r++) total += (sizes[r] = (float)(targetColumnSize * (regions[r+1]-regions[r])));
-                int minregion = 0;
-                for(Box child = firstPackedChild(); child != null; child = child.nextPackedSibling())
-                    for(int r=(child.col==0?0:minregion); r<numregions; r++) {
-                        if (regions[r+1] < child.col) continue;
-                        if (regions[r] >= min(child.col+child.colspan,cols)) { minregion = r; break; }
-                        total -= sizes[r];
-                        int child_maxwidth = child.test(HSHRINK)?child.contentwidth:child.maxwidth;
-                        if (sizes[r] <= (float)(targetColumnSize*(regions[r+1]-regions[r])))
-                            if ((child.colspan * targetColumnSize) > (child_maxwidth + (float)0.5))
-                                sizes[r] = (float)Math.min(sizes[r], (regions[r+1]-regions[r])*(child_maxwidth/child.colspan));
-                        if ((child.colspan * targetColumnSize) < (child.contentwidth - (float)0.5))
-                            sizes[r] = (float)Math.max(sizes[r], (regions[r+1]-regions[r])*(child.contentwidth/child.colspan));
-                        total += sizes[r];
-                    }
-                float save = targetColumnSize;
-                if (Math.abs(total - target) <= (float)1.0) break;
-                if (!first) {
-                    if (Math.abs(total - last_total) <= (float)1.0) break;
+            flex += child.flex;
+        }
+        while(slack > 0 && flex > 0 && oldslack!=slack) {
+            oldslack = slack;
+            slack = test(XAXIS) ? width : height;
+            newflex = 0;
+            for(Box child = getChild(0); child != null; child = child.nextSibling()) {
+                if (!child.test(VISIBLE)) continue;
+                if (test(XAXIS)) {
+                    float oldwidth = child._width;
+                    if (child.test(HSHRINK)) child._width = min(child.maxWidth(), child._width+(oldslack*child.flex)/flex);
+                    slack -= child._width;
+                    if (child._width > oldwidth) newflex += child.flex;
                 } else {
-                    last_columnsize = ((total - target) / (float)cols) + targetColumnSize;
+                    float oldheight = child._height;
+                    if (child.test(VSHRINK)) child._height = min(child.maxHeight(), child._height+(oldslack*child.flex)/flex);
+                    slack -= child._height;
+                    if (child._height > oldheight) newflex += child.flex;
                 }
-                if (total < target)      targetColumnSize += Math.abs((last_columnsize - targetColumnSize) / (float)1.1);
-                else if (total > target) targetColumnSize -= Math.abs((last_columnsize - targetColumnSize) / (float)1.1);
-                last_columnsize = save;
-                last_total = total;
-                first = false;
             }
-            if (findMinimum) contentwidth = Math.round(total);
-            else this.targetColumnSize = targetColumnSize;
-        } while(false);
-        //#end
-    }
-
-    void place() {
-        solve(false);
+            flex = newflex;
+        }
+        float pos = slack / 2;
         for(Box child = getChild(0); child != null; child = child.nextSibling()) {
             if (!child.test(VISIBLE)) continue;
-            if (!child.test(REPLACE)) continue;
-            int child_width, child_height, child_x, child_y;
-            if (!child.test(PACKED)) {
-                child_width = child.test(HSHRINK) ? child.contentwidth : min(child.maxwidth, width - Math.abs(child.ax));
-                child_height = child.test(VSHRINK) ? child.contentheight : min(child.maxheight, height - Math.abs(child.ay));
-                child_width = max(child.minwidth, child_width);
-                child_height = max(child.minheight, child_height);
-                int gap_x = width - child_width;
-                int gap_y = height - child_height;
-                child_x = child.ax + (child.test(ALIGN_RIGHT) ? gap_x : !child.test(ALIGN_LEFT) ? gap_x / 2 : 0);
-                child_y = child.ay + (child.test(ALIGN_BOTTOM) ? gap_y : !child.test(ALIGN_TOP) ? gap_y / 2 : 0);
+            if (test(XAXIS)) {
+                child.place(pos, 0, child._width, child._height, false);
+                pos += child._width;
             } else {
-                int diff;
-                //#repeat col/row colspan/rowspan contentwidth/contentheight width/height colMaxWidth/rowMaxHeight \
-                //        child_x/child_y x/y HSHRINK/VSHRINK maxwidth/maxheight cols/rows minwidth/minheight x_slack/y_slack \
-                //        child_width/child_height ALIGN_RIGHT/ALIGN_BOTTOM ALIGN_LEFT/ALIGN_TOP lp_h/lp \
-                //        numregions/numregions_v regions/regions_v targetColumnSize/targetRowSize sizes/sizes_v
-                child_x = 0;
-                if (cols == 1) {
-                    child_width = width;
-                } else {
-                    child_width = 0;
-                    for(int r=0; r<numregions; r++) {
-                        if (regions[r] < child.col) child_x += Math.round(sizes[r]);
-                        else if (regions[r] < child.col+child.colspan) child_width += Math.round(sizes[r]);
-                    }
-                }
-                diff = (child_width - (child.test(HSHRINK) ? child.contentwidth : min(child_width, child.maxwidth)));
-                child_x += (child.test(ALIGN_RIGHT) ? diff : child.test(ALIGN_LEFT) ? 0 : diff / 2);
-                child_width -= diff;
-                //#end
+                child.place(0, pos, child._width, child._height, false);
+                pos += child._height;
             }
-            if (test(MOVED)) child.set(MOVED);
-            child.resize(child_x, child_y, child_width, child_height);
         }
-        clear(MOVED);
-
-        for(Box child = getChild(0); child != null; child = child.nextSibling())
-            if (child.test(VISIBLE) && child.treeSize() > 0)
-                child.place();
     }
 
-
+           
+   
+   
 
     // Rendering Pipeline /////////////////////////////////////////////////////////////////////
 
+    private static final boolean OPTIMIZE = false;
+
     /** Renders self and children within the specified region. All rendering operations are clipped to xIn,yIn,wIn,hIn */
-    public void render(int parentx, int parenty, int cx1, int cy1, int cx2, int cy2, PixelBuffer buf, Affine a) {
+    public void render(PixelBuffer buf, Affine a, Mesh clipFrom) { render(buf, a, clipFrom, Affine.identity(), 0); }
+    public void render(PixelBuffer buf, Affine a, Mesh clipFrom, Affine clipa, int bg) {
         if (!test(VISIBLE)) 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
-        if (test(CLIP)) {
-            cx1 = max(cx1, globalx);
-            cy1 = max(cy1, globaly);
-            cx2 = min(cx2, globalx + width);
-            cy2 = min(cy2, globaly + height);
-            if (cx2 <= cx1 || cy2 <= cy1) return;
+        a = a.copy().multiply(transform);
+        clipa = clipa.copy().multiply(transform);
+
+        if (mesh == null)
+            if (path != null) mesh = new Mesh(path, true);
+            else {
+                if (((fillcolor & 0xFF000000) != 0x00000000 || parent == null) && (text==null||"".equals(text))) {
+                    mesh = new Mesh().addRect(0, 0, width, height);
+                }
+                // if (ret == 0) Platform.Scheduler.add(this);
+                // FIXME: texture
+            }
+        if (mesh==null) {
+            for(Box b = getChild(0); b != null; b = b.nextSibling()) b.render(buf, a, clipFrom, clipa, bg);
+            if (!(text==null||text.equals("")))
+                font.rasterizeGlyphs(text, buf, a.copy(), clipFrom, clipa.copy(), strokecolor, 0);
+            return;
         }
 
-        if ((fillcolor & 0xFF000000) != 0x00000000 || parent == null)
-            buf.fillTrapezoid(cx1, cx2, cy1, cx1, cx2, cy2, (fillcolor & 0xFF000000) == 0 ? 0xffffffff : fillcolor);
-
-        if (texture != null && texture.isLoaded)
-            for(int x = globalx; x < cx2; x += texture.width)
-                for(int y = globaly; y < cy2; y += texture.height)
-                    buf.drawPicture(texture, x, y, cx1, cy1, cx2, cy2);
- 
-        if (text != null && !text.equals("") && font != null) {
-            int gap_x = width - font.textwidth(text);
-            int gap_y = height - font.textheight(text);
-            int text_x = globalx + (test(ALIGN_RIGHT) ? gap_x : !test(ALIGN_LEFT) ? gap_x/2 : 0);
-            int text_y = globaly + (test(ALIGN_BOTTOM) ? gap_y : !test(ALIGN_TOP) ? gap_y/2 : 0);
-            font.rasterizeGlyphs(text, buf, strokecolor, text_x, text_y, cx1, cy1, cx2, cy2);
-        }
+        if (clipFrom != null) clipFrom.subtract(mesh, clipa);
+        Mesh mesh = treeSize() > 0 ? this.mesh.copy() : this.mesh;
 
-        if (path != null) path.realize(Affine.translate(globalx, globaly)).stroke(buf, 1, strokecolor);
+        if ((fillcolor & 0xff000000)!=0) bg = fillcolor;
+        for(Box b = getChild(0); b != null; b = b.nextSibling()) b.render(buf, a, mesh, Affine.identity(), bg);
 
-        for(Box b = getChild(0); b != null; b = b.nextSibling())
-            b.render(globalx, globaly, cx1, cy1, cx2, cy2, buf, null);
+        mesh.fill(buf, a, null, fillcolor, true);
+        if ((strokecolor & 0xff000000) != 0) mesh.stroke(buf, a, strokecolor);
+        if (!(text==null||text.equals("")))
+            font.rasterizeGlyphs(text, buf, a.copy(), clipFrom, clipa.copy(), strokecolor, bg);
     }
     
-    
     // Methods to implement org.ibex.js.JS //////////////////////////////////////
-
   
-    public Object callMethod(Object method, Object a0, Object a1, Object a2, Object[] rest, int nargs) throws JSExn {
-        switch (nargs) {
+    public JS call(JS method, JS[] args) throws JSExn {
+        switch (args.length) {
             case 1: {
-                //#switch(method)
+                //#switch(JSU.toString(method))
                 case "indexof":
-                    Box b = (Box)a0;
+                    Box b = (Box)args[0];
                     if (b.parent != this)
-                        return (redirect == null || redirect == this) ?
-                            N(-1) :
-                            redirect.callMethod(method, a0, a1, a2, rest, nargs);
-                    return N(b.getIndexInParent());
+                        return (redirect == null || redirect == this) ? JSU.N(-1) : redirect.call(method, args);
+                    return JSU.N(b.getIndexInParent());
 
                 case "distanceto":
-                    Box b = (Box)a0;
-                    JS ret = new JS();
-                    ret.put("x", N(b.localToGlobalX(0) - localToGlobalX(0)));
-                    ret.put("y", N(b.localToGlobalY(0) - localToGlobalY(0)));
+                    Box b = (Box)args[0];
+                    JS ret = new JS.Obj();
+                    ret.put(JSU.S("x"), JSU.N(b.localToGlobalX(0) - localToGlobalX(0)));
+                    ret.put(JSU.S("y"), JSU.N(b.localToGlobalY(0) - localToGlobalY(0)));
                     return ret;
 
                 //#end
             }
         }
-        return super.callMethod(method, a0, a1, a2, rest, nargs);
+        return super.call(method, args);
     }
 
-    public Object get(Object name) throws JSExn {
-        if (name instanceof Number)
-            return redirect == null ? null : redirect == this ? getChild(toInt(name)) : redirect.get(name);
+    public JS get(JS name) throws JSExn {
+        if (JSU.isInt(name))
+            return redirect == null ? null : redirect == this ? getChild(JSU.toInt(name)) : redirect.get(name);
 
-        //#switch(name)
-        case "surface": return parent == null ? null : parent.getAndTriggerTraps("surface");
+        //#switch(JSU.toString(name))
+        case "surface": return parent == null ? null : parent.getAndTriggerTraps(name);
         case "indexof": return METHOD;
         case "distanceto": return METHOD;
-        case "text": return text;
-        case "path": 
-            if (path != null) return path.toString();
+        case "text": return JSU.S(text);
+        case "path": {
+            if (path != null) return JSU.S(path.toString());
             if (text == null) return null;
             if (font == null) return null;
             String ret = "";
             for(int i=0; i<text.length(); i++) ret += font.glyphs[text.charAt(i)].path;
-            return ret;
-        case "fill": return Color.colorToString(fillcolor);
-        case "strokecolor": return Color.colorToString(strokecolor);
-        case "textcolor": return Color.colorToString(strokecolor);
+            return JSU.S(ret);
+        }
+        case "fill": return JSU.S(Color.colorToString(fillcolor));
+        case "strokecolor": return JSU.S(Color.colorToString(strokecolor));
+        case "textcolor": return JSU.S(Color.colorToString(strokecolor));
         case "font": return font == null ? null : font.stream;
-        case "fontsize": return font == null ? N(10) : N(font.pointsize);
-        case "strokewidth": return N(strokewidth);
-        case "align": return alignToString();
+        case "fontsize": return font == null ? JSU.N(10) : JSU.N(font.pointsize);
         case "thisbox": return this;
-        case "shrink": return B(test(HSHRINK) || test(VSHRINK));
-        case "hshrink": return B(test(HSHRINK));
-        case "vshrink": return B(test(VSHRINK));
-        case "aspect": return N(aspect);
-        case "x": return (parent == null || !test(VISIBLE)) ? N(0) : test(PACKED) ? N(x) : N(ax);
-        case "y": return (parent == null || !test(VISIBLE)) ? N(0) : test(PACKED) ? N(y) : N(ay);
-        case "cols": return test(FIXED) == COLS ? N(cols) : N(0);
-        case "rows": return test(FIXED) == ROWS ? N(rows) : N(0);
-        case "colspan": return N(colspan);
-        case "rowspan": return N(rowspan);
-        case "width": getRoot().reflow(); return N(width);
-        case "height": getRoot().reflow(); return N(height);
-        case "minwidth": return N(minwidth);
-        case "maxwidth": return N(maxwidth);
-        case "minheight": return N(minheight);
-        case "maxheight": return N(maxheight);
-        case "clip": return B(test(CLIP));
-        case "visible": return B(test(VISIBLE) && (parent == null || (parent.get("visible") == T)));
-        case "packed": return B(test(PACKED));
-        case "globalx": return N(localToGlobalX(0));
-        case "globaly": return N(localToGlobalY(0));
-        case "cursor": return test(CURSOR) ? boxToCursor.get(this) : null;
+        case "shrink": return JSU.B(test(HSHRINK) || test(VSHRINK));
+        case "hshrink": return JSU.B(test(HSHRINK));
+        case "vshrink": return JSU.B(test(VSHRINK));
+        case "flex": return JSU.N(flex);
+        case "width": getRoot().reflow(); return JSU.N(width);
+        case "height": getRoot().reflow(); return JSU.N(height);
+        case "minwidth": return JSU.N(minwidth);
+        case "maxwidth": return JSU.N(maxwidth);
+        case "minheight": return JSU.N(minheight);
+        case "maxheight": return JSU.N(maxheight);
+        case "clip": return JSU.B(test(CLIP));
+        case "visible": return JSU.B(test(VISIBLE) && (parent == null || (parent.get(JSU.S("visible")) == JSU.T)));
+        case "axis": return test(XAXIS) ? JSU.S("x") : test(YAXIS) ? JSU.S("y") : JSU.S("z");
+        case "globalx": return JSU.N(localToGlobalX(0));
+        case "globaly": return JSU.N(localToGlobalY(0));
+        case "cursor": return test(CURSOR) ? JSU.S((String)boxToCursor.get(this)) : null;
         case "mouse":
             if (getSurface() == null) return null;
             if (getSurface()._mousex == Integer.MAX_VALUE)
                 throw new JSExn("you cannot read from the box.mouse property in background thread context");
             return new Mouse();
-        case "numchildren": return redirect == null ? N(0) : redirect == this ? N(treeSize()) : redirect.get("numchildren");
-        case "redirect": return redirect == null ? null : redirect == this ? T : redirect.get("redirect");
-        case "Minimized": if (parent == null && getSurface() != null) return B(getSurface().minimized);
+        case "numchildren": return redirect == null ? JSU.N(0) : redirect == this ? JSU.N(treeSize()) : redirect.get(JSU.S("numchildren"));
+        case "redirect": return redirect == null ? null : redirect == this ? JSU.T : redirect.get(JSU.S("redirect"));
+        case "Minimized": if (parent == null && getSurface() != null) return JSU.B(getSurface().minimized);
         default: return super.get(name);
         //#end
         throw new Error("unreachable"); // unreachable
     }
 
-    private class Mouse extends JS.Cloneable {
-        public Object get(Object key) {
-            //#switch(key)
-            case "x": return N(globalToLocalX(getSurface()._mousex));
-            case "y": return N(globalToLocalY(getSurface()._mousey));
+    private class Mouse extends JS.Immutable implements JS.Cloneable {
+        public JS get(JS key) throws JSExn {
+            //#switch(JSU.toString(key))
+            case "x": return JSU.N(globalToLocalX(getSurface()._mousex));
+            case "y": return JSU.N(globalToLocalY(getSurface()._mousey));
 
             // this might not get recomputed if we change mousex/mousey...
-            case "inside": return B(test(MOUSEINSIDE));
+            case "inside": return JSU.B(test(MOUSEINSIDE));
             //#end
-            return null;
+            return super.get(key);
         }
     }
 
@@ -546,71 +447,93 @@ public final class Box extends JSScope implements Task {
     }
     //#end
 
-    public void put(Object name, Object value) throws JSExn {
-        if (name instanceof Number) { put(toInt(name), value); return; }
-        //#switch(name)
+    public void put(JS name, JS value) throws JSExn {
+        if (JSU.isInt(name)) { put(JSU.toInt(name), value); return; }
+        //#switch(JSU.toString(name))
         case "thisbox":     if (value == null) removeSelf();
-        case "text":        if (value == null) value = ""; CHECKSET_STRING(text); RECONSTRAIN(); dirty();
-        case "strokecolor": value = N(Color.stringToColor((String)value)); CHECKSET_INT(strokecolor); dirty();
-        case "textcolor":   value = N(Color.stringToColor((String)value)); CHECKSET_INT(strokecolor); dirty();
-        case "strokewidth": CHECKSET_SHORT(strokewidth); dirty();
+        case "text":        {
+            String s = value==null ?  "" : JSU.toString(value);
+            text = s;
+            minwidth = maxwidth = font.textwidth(text);
+            minheight = maxheight = font.textheight(text);
+            RECONSTRAIN();
+            dirty();
+        }
+        case "strokecolor": value = JSU.N(Color.stringToColor(JSU.toString(value))); CHECKSET_INT(strokecolor); dirty();
+        case "textcolor":   value = JSU.N(Color.stringToColor(JSU.toString(value))); CHECKSET_INT(strokecolor); dirty();
         case "shrink":      CHECKSET_FLAG(HSHRINK | VSHRINK); RECONSTRAIN();
         case "hshrink":     CHECKSET_FLAG(HSHRINK); RECONSTRAIN();
         case "vshrink":     CHECKSET_FLAG(VSHRINK); RECONSTRAIN();
-        case "path":        path = Path.parse(toString(value)); RECONSTRAIN(); dirty();
-        case "width":       setWidth(toInt(value), toInt(value));
-        case "height":      setHeight(toInt(value), toInt(value));
-        case "maxwidth":    setWidth(minwidth, toInt(value));
-        case "minwidth":    setWidth(toInt(value), maxwidth);
-        case "maxheight":   setHeight(minheight, toInt(value));
-        case "minheight":   setHeight(toInt(value), maxheight);
-        case "colspan":     if (toInt(value) > 0) { CHECKSET_SHORT(colspan); if (parent != null) parent.REPACK(); }
-        case "rowspan":     if (toInt(value) > 0) { CHECKSET_SHORT(rowspan); if (parent != null) parent.REPACK(); }
+        case "path":        {
+            mesh = null;
+            path = new Path(JSU.toString(value));
+            float tx = -1 * Encode.longToFloat2(path.horizontalBounds(Affine.identity()));
+            float ty = -1 * Encode.longToFloat2(path.verticalBounds(Affine.identity()));
+            path.transform(Affine.translate(tx, ty), true);
+            REPLACE();
+            RECONSTRAIN();
+            dirty();
+            polygon = null;
+        }
+        case "clippath":        {
+            clippath = new Path(JSU.toString(value));
+            //float tx = -1 * Encode.longToFloat2(clippath.horizontalBounds(Affine.identity()));
+            //float ty = -1 * Encode.longToFloat2(clippath.verticalBounds(Affine.identity()));
+            //clippath.transform(Affine.translate(tx, ty), true);
+            REPLACE();
+            RECONSTRAIN();
+            dirty();
+            polygon = null;
+        }
+        case "x":           transform.e = JSU.toInt(value);
+        case "y":           transform.f = JSU.toInt(value);
+        case "transform":   {
+            transform = Affine.parse(JSU.toString(value));
+            if (getSurface() != null)  // FIXME
+                getSurface().dirty(0, 0, getSurface().root.contentwidth, getSurface().root.contentheight);
+            REPLACE();
+            RECONSTRAIN();
+            dirty();
+            polygon = null;
+        }
+        case "width":       setWidth(JSU.toInt(value), JSU.toInt(value));
+        case "height":      setHeight(JSU.toInt(value), JSU.toInt(value));
+        case "flex":        flex = JSU.toFloat(value);
+        case "maxwidth":    setWidth(minwidth, JSU.toInt(value));
+        case "minwidth":    setWidth(JSU.toInt(value), maxwidth);
+        case "maxheight":   setHeight(minheight, JSU.toInt(value));
+        case "minheight":   setHeight(JSU.toInt(value), maxheight);
         case "visible":     CHECKSET_FLAG(VISIBLE); RECONSTRAIN(); dirty();
-        case "packed":      CHECKSET_FLAG(PACKED); if (parent != null) { parent.REPACK(); } else { REPACK(); }
-        case "align":       clear(ALIGNS); setAlign(value == null ? "center" : value); REPLACE();
-        case "cursor":      setCursor(value);
+        case "cursor":      setCursor(JSU.toString(value));
         case "fill":        setFill(value);
         case "clip":        CHECKSET_FLAG(CLIP); if (parent == null) dirty(); else parent.dirty();
-        case "rows": CHECKSET_SHORT(rows); if (rows==0){set(FIXED, COLS);if(cols==0)cols=1;} else set(FIXED, ROWS); REPACK();
-        case "cols": CHECKSET_SHORT(cols); if (cols==0){set(FIXED, ROWS);if(rows==0)rows=1;} else set(FIXED, COLS); REPACK();
-
-        // FIXME: remove
         case "mouse":
-            int mousex = toInt(((JS)value).get("x"));
-            int mousey = toInt(((JS)value).get("y"));
-            getSurface()._mousex = localToGlobalX(mousex);
-            getSurface()._mousey = localToGlobalY(mousey);
-
-        case "Minimized": if (parent == null && getSurface() != null) getSurface().minimized = toBoolean(value);  // FEATURE
-        case "Maximized": if (parent == null && getSurface() != null) getSurface().maximized = toBoolean(value);  // FEATURE
+            int mousex = JSU.toInt(((JS)value).get(JSU.S("x")));
+            int mousey = JSU.toInt(((JS)value).get(JSU.S("y")));
+            getSurface()._mousex = (int)localToGlobalX(mousex);
+            getSurface()._mousey = (int)localToGlobalY(mousey);
+        case "axis":        {
+            String s = JSU.toString(value); 
+            if (s.equals("x")) { clear(YAXIS); set(XAXIS); }
+            else if (s.equals("y")) { clear(XAXIS); set(YAXIS); }
+            else if (s.equals("z")) { clear(XAXIS); clear(YAXIS); }
+            else JSU.warn("attempted to set axis property to invalid value: " + s);
+        }
+        case "Minimized": if (parent == null && getSurface() != null) getSurface().minimized = JSU.toBoolean(value);  // FEATURE
+        case "Maximized": if (parent == null && getSurface() != null) getSurface().maximized = JSU.toBoolean(value);  // FEATURE
         case "Close":     if (parent == null && getSurface() != null) getSurface().dispose(true);
         case "redirect":
             for(Box cur = (Box)value; cur != null || cur == redirect; cur = cur.parent)
                 if (cur == redirect) { redirect = (Box)value; return; }
-            JS.error("redirect can only be set to a descendant of its current value");
-        case "fontsize": font = Font.getFont(font == null ? null : font.stream, toInt(value)); RECONSTRAIN(); dirty();
+            JSU.error("redirect can only be set to a descendant of its current value");
+        case "fontsize": font = Font.getFont(font == null ? null : font.stream, JSU.toInt(value)); RECONSTRAIN(); dirty();
         case "font":
-            if(!(value instanceof Stream)) throw new JSExn("You can only put streams to the font property");
-            if (font == value) return;  // FIXME: unclone()
-            font = value == null ? null : Font.getFont((Stream)value, font == null ? 10 : font.pointsize);
+            if(!(value instanceof Fountain)) throw new JSExn("You can only put streams to the font property");
+            //FIXME: if (font == value) return;  // FIXME: unclone()
+            font = value == null ? null : Font.getFont((Fountain)value, font == null ? 10 : font.pointsize);
             RECONSTRAIN();
             dirty();
-        case "x": if (parent==null && Surface.fromBox(this)!=null) {
-            CHECKSET_INT(x);
-        } else {
-            if (test(PACKED) && parent != null) return;
-            CHECKSET_INT(ax);
-            REPLACE();
-        }
-        case "y": if (parent==null && Surface.fromBox(this)!=null) {
-            CHECKSET_INT(y);
-        } else {
-            if (test(PACKED) && parent != null) return;
-            CHECKSET_INT(ay);
-            REPLACE();
-        }
-        case "titlebar": if (getSurface()!=null) getSurface().setTitleBarText(toString(value)); super.put(name,value);
+        case "titlebar": if (getSurface()!=null) getSurface().setTitleBarText(JSU.toString(value)); super.put(name,value);
         // FIXME: icon
 
         case "Press1":        if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value);
@@ -629,9 +552,9 @@ public final class Box extends JSScope implements Task {
         case "KeyReleased":   if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value);
         case "Move":          if (!test(STOP_UPWARD_PROPAGATION) && parent != null) parent.putAndTriggerTraps(name, value);
         case "HScroll":       if (!test(STOP_UPWARD_PROPAGATION) && parent != null)
-            parent.putAndTriggerTraps(name, N(((Number)value).floatValue() * ((float)parent.fontSize()) / ((float)fontSize())));
+            parent.putAndTriggerTraps(name, JSU.N(JSU.toFloat(value) * ((float)parent.fontSize()) / ((float)fontSize())));
         case "VScroll":       if (!test(STOP_UPWARD_PROPAGATION) && parent != null)
-            parent.putAndTriggerTraps(name, N(((Number)value).floatValue() * ((float)parent.fontSize()) / ((float)fontSize())));
+            parent.putAndTriggerTraps(name, JSU.N(JSU.toFloat(value) * ((float)parent.fontSize()) / ((float)fontSize())));
 
         case "_Move":         propagateDownward(name, value, false);
         case "_Press1":       propagateDownward(name, value, false);
@@ -660,37 +583,7 @@ public final class Box extends JSScope implements Task {
         //#end
     }
 
-    private String alignToString() {
-        switch(flags & ALIGNS) {
-            case (ALIGN_TOP | ALIGN_LEFT): return "topleft";
-            case (ALIGN_BOTTOM | ALIGN_LEFT): return "bottomleft";
-            case (ALIGN_TOP | ALIGN_RIGHT): return "topright";
-            case (ALIGN_BOTTOM | ALIGN_RIGHT): return "bottomright";
-            case ALIGN_TOP: return "top";
-            case ALIGN_BOTTOM: return "bottom";
-            case ALIGN_LEFT: return "left";
-            case ALIGN_RIGHT: return "right";
-            case 0: return "center";
-            default: throw new Error("invalid alignment flags: " + (flags & ALIGNS));
-        }
-    }
-
-    private void setAlign(Object value) {
-        clear(ALIGNS);
-        //#switch(value)
-        case "topleft": set(ALIGN_TOP | ALIGN_LEFT);
-        case "bottomleft": set(ALIGN_BOTTOM | ALIGN_LEFT);
-        case "topright": set(ALIGN_TOP | ALIGN_RIGHT);
-        case "bottomright": set(ALIGN_BOTTOM | ALIGN_RIGHT);
-        case "top": set(ALIGN_TOP);
-        case "bottom": set(ALIGN_BOTTOM);
-        case "left": set(ALIGN_LEFT);
-        case "right": set(ALIGN_RIGHT);
-        default: JS.log("invalid alignment \"" + value + "\"");
-        //#end
-    }
-    
-    private void setCursor(Object value) {
+    private void setCursor(String value) throws JSExn {
         if (value == null) { clear(CURSOR); boxToCursor.remove(this); return; }
         if (value.equals(boxToCursor.get(this))) return;
         set(CURSOR);
@@ -702,24 +595,22 @@ public final class Box extends JSScope implements Task {
         if (surface.cursor != tempcursor) surface.syncCursor();
     }
 
-    private void setFill(Object value) throws JSExn {
+    private void setFill(JS value) throws JSExn {
         if (value == null) {
             if (texture == null && fillcolor == 0) return;
             texture = null;
             fillcolor = 0;
-        } else if (value instanceof String) {
-            int newfillcolor = Color.stringToColor((String)value);
+        } else if (JSU.isString(value)) {
+            int newfillcolor = Color.stringToColor(JSU.toString(value));
             if (newfillcolor == fillcolor) return;
             fillcolor = newfillcolor;
             texture = null;
-        } else if (value instanceof JS) {
+        } else {
             Picture newtex = Picture.load((JS)value, this);
             if (texture == newtex) return;
             texture = newtex;
             fillcolor = 0;
-            if (texture != null && texture.isLoaded) perform();
-        } else {
-            throw new JSExn("fill must be null, a String, or a stream, not a " + value.getClass());
+            if (texture != null && texture.isLoaded) run(null);
         }
         dirty();
     }
@@ -728,50 +619,52 @@ public final class Box extends JSScope implements Task {
      *  Handles events which propagate down the box tree.  If obscured
      *  is set, then we merely check for Enter/Leave.
      */
-    private void propagateDownward(Object name_, Object value, boolean obscured) {
+    private void propagateDownward(JS name_, JS value, boolean obscured) throws JSExn {
 
-        String name = (String)name_;
+        String name = JSU.toString(name_);
         if (getSurface() == null) return;
-        int x = globalToLocalX(getSurface()._mousex);
-        int y = globalToLocalY(getSurface()._mousey);
+        int x = (int)globalToLocalX(getSurface()._mousex);
+        int y = (int)globalToLocalY(getSurface()._mousey);
         boolean wasinside = test(MOUSEINSIDE);
         boolean isinside = test(VISIBLE) && inside(x, y) && !obscured;
         if (!wasinside && isinside) {
             set(MOUSEINSIDE);
-            putAndTriggerTrapsAndCatchExceptions("Enter", T);
+            putAndTriggerTrapsAndCatchExceptions(JSU.S("Enter"), JSU.T);
         }
         if (isinside && test(CURSOR)) getSurface().cursor = (String)boxToCursor.get(this);
         if (wasinside && !isinside) {
             clear(MOUSEINSIDE);
-            putAndTriggerTrapsAndCatchExceptions("Leave", T);
+            putAndTriggerTrapsAndCatchExceptions(JSU.S("Leave"), JSU.T);
         }
 
         boolean found = false;
         if (wasinside || isinside)
             for(Box child = getChild(treeSize() - 1); child != null; child = child.prevSibling()) {
                 boolean save_stop = child.test(STOP_UPWARD_PROPAGATION);
-                Object value2 = value;
+                JS value2 = value;
                 if (name.equals("_HScroll") || name.equals("_VScroll"))
-                    value2 = N(((Number)value).floatValue() * ((float)child.fontSize()) / (float)fontSize());
-                if (obscured || !child.inside(x - child.x, y - child.y)) {
-                    child.propagateDownward(name, value2, true);
+                    value2 = JSU.N(JSU.toFloat(value) * ((float)child.fontSize()) / (float)fontSize());
+                if (obscured /*|| !child.inside(x - child.x, y - child.y) FIXME FIXME */) {
+                    child.propagateDownward(name_, value2, true);
                 } else try {
                     found = true;
                     child.clear(STOP_UPWARD_PROPAGATION);
-                    if (name != null) child.putAndTriggerTrapsAndCatchExceptions(name, value2);
-                    else child.propagateDownward(name, value2, obscured);
+                    if (name != null) child.putAndTriggerTrapsAndCatchExceptions(name_, value2);
+                    else child.propagateDownward(name_, value2, obscured);
                 } finally {
                     if (save_stop) child.set(STOP_UPWARD_PROPAGATION); else child.clear(STOP_UPWARD_PROPAGATION);
                 }
+                /* FIXME FIXME
                 if (child.inside(x - child.x, y - child.y))
                     if (name != null && name.equals("_Move")) obscured = true;
                     else break;
+ */
             }
 
         if (!obscured && !found)
             if ("_Move".equals(name) || name.startsWith("_Release") || wasinside)
                 if (name != null)
-                    putAndTriggerTrapsAndCatchExceptions(name.substring(1), value);
+                    putAndTriggerTrapsAndCatchExceptions(JSU.S(name.substring(1)), value);
     }
 
     /** figures out what box in this subtree of the Box owns the pixel at x,y relitave to the Surface */
@@ -790,11 +683,11 @@ public final class Box extends JSScope implements Task {
             for(int i=cur.treeSize() - 1; i>=0; i--) {
                 Box child = cur.getChild(i);
                 if (child == null) continue;        // since this method is unsynchronized, we have to double-check
-                globalx += child.x;
-                globaly += child.y;
+                globalx += child.transform.e;
+                globaly += child.transform.f;
                 if (child.test(VISIBLE) && child.inside(x - globalx, y - globaly)) { cur = child; continue OUTER; }
-                globalx -= child.x;
-                globaly -= child.y;
+                globalx -= child.transform.e;
+                globaly -= child.transform.f;
             }
             break;
         }
@@ -804,16 +697,17 @@ public final class Box extends JSScope implements Task {
 
     // Trivial Helper Methods (should be inlined) /////////////////////////////////////////
 
-    void mark_for_repack() { REPACK(); }
-    public Enumeration keys() { throw new Error("you cannot apply for..in to a " + this.getClass().getName()); }
+    public final int fontSize() { return font == null ? DEFAULT_FONT.pointsize : font.pointsize; }
+    public Enumeration jskeys() { throw new Error("you cannot apply for..in to a " + this.getClass().getName()); }
     public Box getRoot() { return parent == null ? this : parent.getRoot(); }
     public Surface getSurface() { return Surface.fromBox(getRoot()); }
-    Box nextPackedSibling() { Box b = nextSibling(); return b == null || (b.test(PACKED | VISIBLE)) ? b : b.nextPackedSibling(); }
-    Box firstPackedChild() { Box b = getChild(0); return b == null || (b.test(PACKED | VISIBLE)) ? b : b.nextPackedSibling(); }
-    public int globalToLocalX(int x) { return parent == null ? x : parent.globalToLocalX(x - this.x); }
-    public int globalToLocalY(int y) { return parent == null ? y : parent.globalToLocalY(y - this.y); }
-    public int localToGlobalX(int x) { return parent == null ? x : parent.globalToLocalX(x + this.x); }
-    public int localToGlobalY(int y) { return parent == null ? y : parent.globalToLocalY(y + this.y); }
+    private final boolean packed() { return test(YAXIS) || test(XAXIS); }
+    Box nextPackedSibling() { Box b = nextSibling(); return b == null || (b.packed() && b.test(VISIBLE))?b:b.nextPackedSibling(); }
+    Box firstPackedChild() { Box b = getChild(0); return b == null || (b.packed() && b.test(VISIBLE))?b:b.nextPackedSibling(); }
+    public float globalToLocalX(float x) { return parent == null ? x : parent.globalToLocalX(x - transform.e); }
+    public float globalToLocalY(float y) { return parent == null ? y : parent.globalToLocalY(y - transform.f); }
+    public float localToGlobalX(float x) { return parent == null ? x : parent.globalToLocalX(x + transform.e); }
+    public float localToGlobalY(float y) { return parent == null ? y : parent.globalToLocalY(y + transform.f); }
 
     static short min(short a, short b) { if (a<b) return a; else return b; }
     static int min(int a, int b) { if (a<b) return a; else return b; }
@@ -861,35 +755,35 @@ public final class Box extends JSScope implements Task {
         b.clear(MOUSEINSIDE);
         deleteNode(i);
         b.parent = null;
-        REPACK();
-        putAndTriggerTrapsAndCatchExceptions("ChildChange", b);
+        RECONSTRAIN();
+        putAndTriggerTrapsAndCatchExceptions(JSU.S("ChildChange"), b);
     }
     
-    public void put(int i, Object value) throws JSExn {
+    public void put(int i, JS value) throws JSExn {
         if (i < 0) return;
             
         if (value != null && !(value instanceof Box)) {
-            if (Log.on) JS.warn("attempt to set a numerical property on a box to a non-box");
+            if (Log.on) JSU.warn("attempt to set a numerical property on a box to a non-box");
             return;
         }
 
         if (redirect == null) {
-            if (value == null) putAndTriggerTrapsAndCatchExceptions("ChildChange", getChild(i));
-            else JS.warn("attempt to add/remove children to/from a node with a null redirect");
+            if (value == null) putAndTriggerTrapsAndCatchExceptions(JSU.S("ChildChange"), getChild(i));
+            else JSU.warn("attempt to add/remove children to/from a node with a null redirect");
 
         } else if (redirect != this) {
-            if (value != null) putAndTriggerTrapsAndCatchExceptions("ChildChange", value);
+            if (value != null) putAndTriggerTrapsAndCatchExceptions(JSU.S("ChildChange"), value);
             redirect.put(i, value);
             if (value == null) {
-                Box b = (Box)redirect.get(new Integer(i));
-                if (b != null) putAndTriggerTrapsAndCatchExceptions("ChildChange", b);
+                Box b = (Box)redirect.get(JSU.N(i));
+                if (b != null) putAndTriggerTrapsAndCatchExceptions(JSU.S("ChildChange"), b);
             }
 
         } else if (value == null) {
             if (i < 0 || i > treeSize()) return;
             Box b = getChild(i);
             removeChild(i);
-            putAndTriggerTrapsAndCatchExceptions("ChildChange", b);
+            putAndTriggerTrapsAndCatchExceptions(JSU.S("ChildChange"), b);
 
         } else {
             Box b = (Box)value;
@@ -897,14 +791,14 @@ public final class Box extends JSScope implements Task {
             // check if box being moved is currently target of a redirect
             for(Box cur = b.parent; cur != null; cur = cur.parent)
                 if (cur.redirect == b) {
-                    if (Log.on) JS.warn("attempt to move a box that is the target of a redirect");
+                    if (Log.on) JSU.warn("attempt to move a box that is the target of a redirect");
                     return;
                 }
 
             // check for recursive ancestor violation
             for(Box cur = this; cur != null; cur = cur.parent)
                 if (cur == b) {
-                    if (Log.on) JS.warn("attempt to make a node a parent of its own ancestor");
+                    if (Log.on) JSU.warn("attempt to make a node a parent of its own ancestor");
                     if (Log.on) Log.info(this, "box == " + this + "  ancestor == " + b);
                     return;
                 }
@@ -914,30 +808,56 @@ public final class Box extends JSScope implements Task {
             b.parent = this;
             
             // need both of these in case child was already uncalc'ed
-            b.REPACK();
-            REPACK();
+            b.RECONSTRAIN();
+            RECONSTRAIN();
             
             b.dirty(); 
-            putAndTriggerTrapsAndCatchExceptions("ChildChange", b);
+            putAndTriggerTrapsAndCatchExceptions(JSU.S("ChildChange"), b);
         }
     }
     
-    public void putAndTriggerTrapsAndCatchExceptions(Object name, Object val) {
+    public void putAndTriggerTrapsAndCatchExceptions(JS name, JS val) {
         try {
             putAndTriggerTraps(name, val);
         } catch (JSExn e) {
-            JS.log("caught js exception while putting to trap \""+name+"\"");
-            JS.log(e);
+            JSU.log("caught js exception while putting to trap \""+ JSU.str(name)+"\"");
+            JSU.log(e);
         } catch (Exception e) {
-            JS.log("caught exception while putting to trap \""+name+"\"");
-            JS.log(e);
+            JSU.log("caught exception while putting to trap \""+ JSU.str(name)+"\"");
+            JSU.log(e);
         }
     }
+    
+    // BalancedTree functions
+    private void insertNode(int p, Box b) { if(bt == null) bt = new BalancedTree(); bt.insertNode(p,b); }
+    private int treeSize() { return bt == null ? 0 : bt.treeSize(); }
+    private int indexNode(Box b) { return bt == null ? -1 : bt.indexNode(b); }
+    private void deleteNode(int p) { bt.deleteNode(p); }
+    private Box getNode(int p) { return (Box)bt.getNode(p); }
 
-}
+    // FIXME memory leak
+    final static JS.Method METHOD = new JS.Method();
+    final static Basket.Map boxToCursor = new Basket.Hash(500, 3);
+    final static JS SIZECHANGE = JSU.S("SizeChange");
+    final static Font DEFAULT_FONT = Font.getFont(Main.vera, 10);
 
 
+    // Flags //////////////////////////////////////////////////////////////////////
 
+    public static final int MOUSEINSIDE             = 0x00000001;
+    public static final int XAXIS                   = 0x00000002;
+    public static final int YAXIS                   = 0x00000004;
+    public static final int VISIBLE                 = 0x00000008;
+    public static final int VSHRINK                 = 0x00000010;
+    public static final int HSHRINK                 = 0x00000020;
+    public static final int RECONSTRAIN             = 0x00000040;
+    public static final int REPLACE                 = 0x00000080;
 
+    // if true, this box has cursor in the cursor hash; FEATURE: GC issues?
+    public static final int CURSOR                  = 0x00010000;
+    public static final int CLIP                    = 0x00020000;
+    public static final int STOP_UPWARD_PROPAGATION = 0x00040000;
+    public static final int MOVED                   = 0x00080000;
 
 
+}