X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FBox.java.pp;h=931171cedd6d186477d5dd1f15d593d6aaa75790;hb=fed560ec17c824f4332919829f11899e48b52f4b;hp=f18182cfc216d27cf6e1caa8e301d8b1b1ce3fc8;hpb=8235361e8601ae7b36ab707058de3b52225d15a2;p=org.ibex.core.git diff --git a/src/org/xwt/Box.java.pp b/src/org/xwt/Box.java.pp index f18182c..931171c 100644 --- a/src/org/xwt/Box.java.pp +++ b/src/org/xwt/Box.java.pp @@ -92,6 +92,7 @@ public final class Box extends JS.Scope { static int TILE_FLAG = 0x00000020; static int FONT_CHANGED_FLAG = 0x00000040; // set when font changes, cleared during repack static int ISROOT_FLAG = 0x00000080; + static int NOCLIP_FLAG = 0x00000100; // Geometry //////////////////////////////////////////////////////////////////////////// @@ -133,13 +134,16 @@ public final class Box extends JS.Scope { // Rendering Properties /////////////////////////////////////////////////////////// - //private SVG.VP path = null; - //private SVG.Paint fill = null; - //private SVG.Paint stroke = null; + private VectorGraphics.VectorPath path = null; + private VectorGraphics.Affine transform = null; + //private VectorGraphics.Paint fill = null; + //private VectorGraphics.Paint stroke = null; + int strokewidth = 1; 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 @@ -147,13 +151,18 @@ public final class Box extends JS.Scope { // Instance Methods ///////////////////////////////////////////////////////////////////// /** Adds the intersection of (x,y,w,h) and the node's current actual geometry to the Surface's dirty list */ - public final void dirty() { dirty(0, 0, width, height); } + public final void dirty() { + if ((flags & NOCLIP_FLAG) != 0 && parent != null) parent.dirty(); + else dirty(0, 0, width, height); + } public final void dirty(int x, int y, int w, int h) { for(Box cur = this; cur != null; cur = cur.parent) { - w = min(x + w, cur.width) - max(x, 0); - h = min(y + h, cur.height) - max(y, 0); - x = max(x, 0); - y = max(y, 0); + if ((flags & NOCLIP_FLAG) == 0) { + w = min(x + w, cur.width) - max(x, 0); + h = min(y + h, cur.height) - max(y, 0); + x = max(x, 0); + y = max(y, 0); + } if (w <= 0 || h <= 0) return; if (cur.parent == null && cur.surface != null) cur.surface.dirty(x, y, w, h); x += cur.x; @@ -209,6 +218,10 @@ public final class Box extends JS.Scope { if (numChildren() == 0) { contentwidth = max(textwidth + 2 * hpad, minwidth); contentheight = max(textheight + 2 * vpad, minheight); + if (path != null) { + contentwidth = max(contentwidth, path.boundingBoxWidth()); + contentheight = max(contentheight, path.boundingBoxHeight()); + } return; } @@ -267,6 +280,10 @@ public final class Box extends JS.Scope { for(int col=0; col> 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 +914,83 @@ public final class Box extends JS.Scope { b.dirty(); } }); + specialBoxProperties.put("path", new SpecialBoxProperty() { + public Object get(Box b) { throw new JS.Exn("cannot read from the path property"); } + public void put(Box b, Object value) { + String t = value == null ? "null" : value.toString(); + b.path = value == null ? null : VectorGraphics.parseVectorPath(value.toString()); + MARK_FOR_REFLOW_b; + b.dirty(); + } }); + + specialBoxProperties.put("transform", new SpecialBoxProperty() { + public void put(Box b, Object value) { + String t = value.toString().trim(); + b.transform = VectorGraphics.Affine.identity(); + while (t.length() > 0) { + if (t.startsWith("skewX(")) { + // FIXME + + } else if (t.startsWith("shear(")) { + // FIXME: nonstandard; remove this + b.transform.multiply(VectorGraphics.Affine.shear(Float.parseFloat(t.substring(t.indexOf('(') + 1, t.indexOf(')'))))); + + } else if (t.startsWith("skewY(")) { + // FIXME + + } else if (t.startsWith("rotate(")) { + String sub = t.substring(t.indexOf('(') + 1, t.indexOf(')')); + if (sub.indexOf(',') != -1) { + float angle = Float.parseFloat(sub.substring(0, sub.indexOf(','))); + sub = sub.substring(sub.indexOf(',') + 1); + float cx = Float.parseFloat(sub.substring(0, sub.indexOf(','))); + sub = sub.substring(sub.indexOf(',') + 1); + float cy = Float.parseFloat(sub); + b.transform.multiply(VectorGraphics.Affine.translate(cx, cy)); + b.transform.multiply(VectorGraphics.Affine.rotate(angle)); + b.transform.multiply(VectorGraphics.Affine.translate(-1 * cx, -1 * cy)); + } else { + b.transform.multiply(VectorGraphics.Affine.rotate(Float.parseFloat(t.substring(t.indexOf('(') + 1, t.indexOf(')'))))); + } + + } else if (t.startsWith("translate(")) { + String sub = t.substring(t.indexOf('(') + 1, t.indexOf(')')); + if (sub.indexOf(',') > -1) { + b.transform.multiply(VectorGraphics.Affine.translate(Float.parseFloat(t.substring(t.indexOf('(') + 1, t.indexOf(','))), + Float.parseFloat(t.substring(t.indexOf(',') + 1, t.indexOf(')'))))); + } else { + b.transform.multiply(VectorGraphics.Affine.translate(Float.parseFloat(t.substring(t.indexOf('(') + 1, t.indexOf(','))), 0)); + } + + } else if (t.startsWith("flip(")) { + String which = t.substring(t.indexOf('(') + 1, t.indexOf(')')); + b.transform.multiply(VectorGraphics.Affine.flip(which.equals("horizontal"), which.equals("vertical"))); + + } else if (t.startsWith("scale(")) { + String sub = t.substring(t.indexOf('(') + 1, t.indexOf(')')); + if (sub.indexOf(',') > -1) { + b.transform.multiply(VectorGraphics.Affine.scale(Float.parseFloat(t.substring(t.indexOf('(') + 1, t.indexOf(','))), + Float.parseFloat(t.substring(t.indexOf(',') + 1, t.indexOf(')'))))); + } else { + b.transform.multiply(VectorGraphics.Affine.scale(Float.parseFloat(t.substring(t.indexOf('(') + 1, t.indexOf(','))), + Float.parseFloat(t.substring(t.indexOf('(') + 1, t.indexOf(','))))); + } + + } else if (t.startsWith("matrix(")) { + // FIXME: is this mapped right? + float d[] = new float[6]; + StringTokenizer st = new StringTokenizer(t, ",", false); + for(int i=0; i<6; i++) + d[i] = Float.parseFloat(st.nextToken()); + b.transform.multiply(new VectorGraphics.Affine(d[0], d[1], d[2], d[3], d[4], d[5])); + } + t = t.substring(t.indexOf(')') + 1).trim(); + } + b.dirty(); + } + public Object get(Box b) { return b.transform.toString(); } + }); + specialBoxProperties.put("font", new SpecialBoxProperty() { public Object get(Box b) { return b.font; } public void put(Box b, Object value) { @@ -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); } @@ -1092,15 +1137,24 @@ public final class Box extends JS.Scope { b.dirty(); } }); - specialBoxProperties.put("invisible", new SpecialBoxProperty() { + specialBoxProperties.put("noclip", new SpecialBoxProperty() { + public Object get(Box b) { return ((b.flags & NOCLIP_FLAG) != 0) ? Boolean.TRUE : Boolean.FALSE; } + public void put(Box b, Object value) { + if (((b.flags & NOCLIP_FLAG) != 0) == stob(value)) return; + if (stob(value)) b.flags |= NOCLIP_FLAG; else b.flags &= ~NOCLIP_FLAG; + MARK_FOR_REFLOW_b; + b.dirty(); + } }); + + specialBoxProperties.put("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 { @@ -1132,8 +1186,8 @@ public final class Box extends JS.Scope { } else { // FIXME } - b.minwidth = b.image == null ? 0 : b.image.getWidth(); - b.minheight = b.image == null ? 0 : b.image.getHeight(); + b.minwidth = min(b.maxwidth, max(b.minwidth, b.image == null ? 0 : b.image.getWidth())); + b.minheight = min(b.maxheight, max(b.minheight, b.image == null ? 0 : b.image.getHeight())); MARK_FOR_REFLOW_b; b.dirty(); } @@ -1176,10 +1230,6 @@ public final class Box extends JS.Scope { }); //#end - specialBoxProperties.put("xwt", new SpecialBoxProperty() { - public Object get(Box b) { return XWT.singleton; } - }); - specialBoxProperties.put("mouseinside", new SpecialBoxProperty() { public Object get(Box b) { return ((b.flags & MOUSEINSIDE_FLAG) != 0) ? Boolean.TRUE : Boolean.FALSE; } @@ -1320,7 +1370,16 @@ public final class Box extends JS.Scope { //#end specialBoxProperties.put("redirect", new SpecialBoxProperty() { - public void put(Box b, Object value) { } + public void put(Box b, Object value) { + if (b.redirect != b) Log.log(this, "cannot change the redirect of a box once it is set"); + else if (value == null) b.redirect = null; + else { + Box b2 = (Box)value; + while(b2 != b && b2 != null) b2 = b2.parent; + if (b2 == null) Log.log(this, "a box's redirect must be one of its descendants"); + b.redirect = (Box)value; + } + } public Object get(Box b) { if (b.redirect == null) return null; if (b.redirect == b) return Boolean.TRUE; @@ -1351,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 */