2003/10/01 21:43:41
[org.ibex.core.git] / src / org / xwt / Box.java.pp
index aac3bd1..931171c 100644 (file)
@@ -135,12 +135,15 @@ public final class Box extends JS.Scope {
     // Rendering Properties ///////////////////////////////////////////////////////////
 
     private VectorGraphics.VectorPath path = null;
-    //private SVG.Paint fill = null;
-    //private SVG.Paint stroke = null;
+    private VectorGraphics.Affine transform = 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 SVG.Paint
-    private int strokecolor = 0xFF000000;        // will become SVG.Paint
+    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
 
@@ -476,13 +479,14 @@ public final class Box extends JS.Scope {
             // 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());
+           buf.drawPictureAlphaOnly(g.p,
+                                     x + hpad,
+                                     y + vpad + g.max_ascent - g.baseline,
+                                     x + hpad + g.p.getWidth(),
+                                     y + vpad + g.max_ascent - g.baseline + g.p.getHeight(),
+                                     0, 0,
+                                     g.p.getWidth(), g.p.getHeight(),
+                                     textcolor);
             x += g.advance;
         }
     }
@@ -524,6 +528,7 @@ public final class Box extends JS.Scope {
             if (Log.on) Log.logJS(this, "attempt to set a numerical property on a box to anything other than a box");
         } else if (redirect == null) {
             if (Log.on) Log.logJS(this, "attempt to add/remove children to/from a node with a null redirect");
+            put("0", (Box)value);
         } else if (redirect != this) {
             Box b = value == null ? (Box)redirect.get(i) : (Box)value;
             redirect.put(i, value);
@@ -871,49 +876,17 @@ 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 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() {
@@ -950,6 +923,74 @@ public final class Box extends JS.Scope {
                        b.dirty();
                     } });
 
+            specialBoxProperties.put("transform", new SpecialBoxProperty() {
+                    public void put(Box b, Object value) {
+                        String t = value.toString().trim();
+                        b.transform = VectorGraphics.Affine.identity();
+                        while (t.length() > 0) {
+                            if (t.startsWith("skewX(")) {
+                                // FIXME
+                                
+                            } else if (t.startsWith("shear(")) {
+                                // FIXME: nonstandard; remove this
+                                b.transform.multiply(VectorGraphics.Affine.shear(Float.parseFloat(t.substring(t.indexOf('(') + 1, t.indexOf(')')))));
+                                
+                            } else if (t.startsWith("skewY(")) {
+                                // FIXME
+                                
+                            } else if (t.startsWith("rotate(")) {
+                                String sub = t.substring(t.indexOf('(') + 1, t.indexOf(')'));
+                                if (sub.indexOf(',') != -1) {
+                                    float angle = Float.parseFloat(sub.substring(0, sub.indexOf(',')));
+                                    sub = sub.substring(sub.indexOf(',') + 1);
+                                    float cx = Float.parseFloat(sub.substring(0, sub.indexOf(',')));
+                                    sub = sub.substring(sub.indexOf(',') + 1);
+                                    float cy = Float.parseFloat(sub);
+                                    b.transform.multiply(VectorGraphics.Affine.translate(cx, cy));
+                                    b.transform.multiply(VectorGraphics.Affine.rotate(angle));
+                                    b.transform.multiply(VectorGraphics.Affine.translate(-1 * cx, -1 * cy));
+                                } else {
+                                    b.transform.multiply(VectorGraphics.Affine.rotate(Float.parseFloat(t.substring(t.indexOf('(') + 1, t.indexOf(')')))));
+                                }
+                                
+                            } else if (t.startsWith("translate(")) {
+                                String sub = t.substring(t.indexOf('(') + 1, t.indexOf(')'));
+                                if (sub.indexOf(',') > -1) {
+                                    b.transform.multiply(VectorGraphics.Affine.translate(Float.parseFloat(t.substring(t.indexOf('(') + 1, t.indexOf(','))),
+                                                                                         Float.parseFloat(t.substring(t.indexOf(',') + 1, t.indexOf(')')))));
+                                } else {
+                                    b.transform.multiply(VectorGraphics.Affine.translate(Float.parseFloat(t.substring(t.indexOf('(') + 1, t.indexOf(','))), 0));
+                                }
+                                
+                            } else if (t.startsWith("flip(")) {
+                                String which = t.substring(t.indexOf('(') + 1, t.indexOf(')'));
+                                b.transform.multiply(VectorGraphics.Affine.flip(which.equals("horizontal"), which.equals("vertical")));
+                                
+                            } else if (t.startsWith("scale(")) {
+                                String sub = t.substring(t.indexOf('(') + 1, t.indexOf(')'));
+                                if (sub.indexOf(',') > -1) {
+                                    b.transform.multiply(VectorGraphics.Affine.scale(Float.parseFloat(t.substring(t.indexOf('(') + 1, t.indexOf(','))),
+                                                                                     Float.parseFloat(t.substring(t.indexOf(',') + 1, t.indexOf(')')))));
+                                } else {
+                                    b.transform.multiply(VectorGraphics.Affine.scale(Float.parseFloat(t.substring(t.indexOf('(') + 1, t.indexOf(','))),
+                                                                                     Float.parseFloat(t.substring(t.indexOf('(') + 1, t.indexOf(',')))));
+                                }
+                                
+                            } else if (t.startsWith("matrix(")) {
+                                // FIXME: is this mapped right?
+                                float d[] = new float[6];
+                                StringTokenizer st = new StringTokenizer(t, ",", false);
+                                for(int i=0; i<6; i++)
+                                    d[i] = Float.parseFloat(st.nextToken());
+                                b.transform.multiply(new VectorGraphics.Affine(d[0], d[1], d[2], d[3], d[4], d[5]));
+                            }
+                            t = t.substring(t.indexOf(')') + 1).trim();
+                        }
+                        b.dirty();
+                    }
+                    public Object get(Box b) { return b.transform.toString(); }
+                });
+            
             specialBoxProperties.put("font", new SpecialBoxProperty() {
                     public Object get(Box b) { return b.font; }
                     public void put(Box b, Object value) {
@@ -970,6 +1011,14 @@ public final class Box extends JS.Scope {
                         b.dirty();
                     } });
         
+            specialBoxProperties.put("strokewidth", new SpecialBoxProperty() {
+                    public Object get(Box b) { return new Integer(b.strokewidth); }
+                    public void put(Box b, Object value) {
+                        if (b.strokewidth == stoi(value)) return;
+                        b.strokewidth = stoi(value);
+                        b.dirty();
+                    } });
+        
             specialBoxProperties.put("thisbox", new SpecialBoxProperty() {
                     public Object get(Box b) { return b; }
                     public void put(Box b, Object value) {
@@ -1004,10 +1053,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); }
@@ -1101,15 +1146,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 {
@@ -1365,6 +1410,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 */