X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FBox.java.pp;h=09035f9c5dd758a35999c35e6ec0448480e67dcf;hb=5e8485ac88b45693b5cdb8e70f346b92732eb91f;hp=73524f70ae4a5e1e1c11ba6ad06d762b51b88a1a;hpb=2f02c1815b096a837b7ee70eb6d775ee959525c8;p=org.ibex.core.git

diff --git a/src/org/xwt/Box.java.pp b/src/org/xwt/Box.java.pp
index 73524f7..09035f9 100644
--- a/src/org/xwt/Box.java.pp
+++ b/src/org/xwt/Box.java.pp
@@ -86,7 +86,7 @@ public final class Box extends JS.Scope {
     short flags = 0;
     static int MOUSEINSIDE_FLAG  = 0x00000001;
     static int INVISIBLE_FLAG    = 0x00000002;
-    static int ABSOLUTE_FLAG     = 0x00000004;
+    static int NOTPACKED_FLAG    = 0x00000004;
     static int HSHRINK_FLAG      = 0x00000008;
     static int VSHRINK_FLAG      = 0x00000010;
     static int TILE_FLAG         = 0x00000020;
@@ -130,12 +130,18 @@ public final class Box extends JS.Scope {
     private int col = 0;  // FEATURE use a short
     private LENGTH contentwidth = 0;             // == max(minwidth, textwidth+pad, sum(child.contentwidth) + pad)
     private LENGTH contentheight = 0;
+    private LENGTH offset_x = 0;
+    private LENGTH offset_y = 0;
 
 
     // Rendering Properties ///////////////////////////////////////////////////////////
 
     private VectorGraphics.VectorPath path = null;
     private VectorGraphics.Affine transform = null;
+
+    private VectorGraphics.RasterPath rpath = null;
+    private VectorGraphics.Affine rtransform = null;
+
     //private VectorGraphics.Paint fill = null;
     //private VectorGraphics.Paint stroke = null;
     int strokewidth = 1;
@@ -143,6 +149,7 @@ public final class Box extends JS.Scope {
     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
 
@@ -214,15 +221,7 @@ public final class Box extends JS.Scope {
     /** 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);
-            if (path != null) {
-                contentwidth = max(contentwidth, path.boundingBoxWidth());
-                contentheight = max(contentheight, path.boundingBoxHeight());
-            }
-	    return;
-	}
+        contentwidth = contentheight = 0;
 
         // --- Phase 0 ----------------------------------------------------------------------
         // recurse
@@ -240,10 +239,10 @@ public final class Box extends JS.Scope {
         // 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) {
+        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
@@ -258,7 +257,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());
                 }
             }
         }
@@ -266,26 +265,44 @@ 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)
+        if (numChildren() != 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 hpad/vpad
+            contentwidth = 2 * hpad;
+            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);
-        contentwidth = bound(minwidth, contentwidth, maxwidth);
-        if (path != null) {
-            contentwidth = max(contentwidth, path.boundingBoxWidth());
-            contentheight = max(contentheight, path.boundingBoxHeight());
+                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 + 2 * hpad, 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
+        }
+    }
+    
 
     private void resize(LENGTH x, LENGTH y, LENGTH width, LENGTH height) {
         
@@ -331,7 +348,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++)
@@ -376,7 +393,7 @@ 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);
@@ -386,7 +403,8 @@ public final class Box extends JS.Scope {
                 //#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
                 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) child_x = max(hpad, 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
@@ -415,8 +433,10 @@ public final class Box extends JS.Scope {
         }
         if (clipw <= 0 || cliph <= 0) return;
 
-        if ((fillcolor & 0xFF000000) != 0x00000000)
-            buf.fillTrapezoid(clipx, clipx + clipw, clipy, clipx, clipx + clipw, clipy + cliph, fillcolor);
+        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);
@@ -426,9 +446,18 @@ public final class Box extends JS.Scope {
             renderText(globalx, globaly, clipx, clipy, clipw, cliph, buf);
 
         if (path != null) {
-            VectorGraphics.RasterPath rp = path.realize(a);
-            if ((strokecolor & 0xff000000) != 0) rp.stroke(buf, 1, strokecolor);
-            if ((fillcolor & 0xff000000) != 0) rp.fill(buf, new VectorGraphics.SingleColorPaint(fillcolor));
+            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));
         }
 
         // now subtract the pad region from the clip region before proceeding
@@ -440,9 +469,11 @@ public final class Box extends JS.Scope {
         }
 
         for(Box b = getChild(0); b != null; b = b.nextSibling()) {
-            a.translate(b.x, b.y);
-            b.render(globalx, globaly, clipx, clipy, clipw, cliph, buf, a);
-            a.translate(-1 * b.x, -1 * b.y);
+            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);
         }
     }
 
@@ -485,7 +516,7 @@ public final class Box extends JS.Scope {
                                      y + vpad + g.max_ascent - g.baseline + g.p.getHeight(),
                                      0, 0,
                                      g.p.getWidth(), g.p.getHeight(),
-                                     strokecolor);
+                                     textcolor);
             x += g.advance;
         }
     }
@@ -810,8 +841,10 @@ public final class Box extends JS.Scope {
     // Trivial Helper Methods (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; }
@@ -875,49 +908,17 @@ public final class Box extends JS.Scope {
         void put(String name, Box b, Object value) { put(b, value); }
 
         static {
-            //#repeat fill/stroke fillcolor/strokecolor
-            specialBoxProperties.put("fill", new SpecialBoxProperty() {
-                    public Object get(Box b) {
-                        if ((b.fillcolor & 0xFF000000) == 0) return null;
-                        String red = Integer.toHexString((b.fillcolor & 0x00FF0000) >> 16);
-                        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 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("fill"); }
-                    public void put(Box b, Object value) { b.put("fill", 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("stroke"); }
-                    public void put(Box b, Object value) { b.put("stroke", 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() {
@@ -1017,6 +1018,7 @@ public final class Box extends JS.Scope {
                             }
                             t = t.substring(t.indexOf(')') + 1).trim();
                         }
+                        MARK_FOR_REFLOW_b;
                         b.dirty();
                     }
                     public Object get(Box b) { return b.transform.toString(); }
@@ -1109,7 +1111,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)) return;
                         int x = stoi(value);
                         if (x == b.x) return;
                         b.dirty();
@@ -1177,15 +1179,15 @@ public final class Box extends JS.Scope {
                         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 {
@@ -1195,12 +1197,12 @@ 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;
                     } });
         
@@ -1441,6 +1443,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 */