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 ////////////////////////////////////////////////////////////////////////////
// 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 String cursor = null; // the cursor for this box
// 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;
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;
}
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());
+ }
//#end
}
// Rendering Pipeline /////////////////////////////////////////////////////////////////////
/** Renders self and children within the specified region. All rendering operations are clipped to xIn,yIn,wIn,hIn */
- void render(int parentx, int parenty, int clipx, int clipy, int clipw, int cliph, PixelBuffer buf) {
+ void render(int parentx, int parenty, int clipx, int clipy, int clipw, int cliph, PixelBuffer buf, VectorGraphics.Affine a) {
if (Surface.abort || (flags & INVISIBLE_FLAG) != 0) return;
int globalx = parentx + (parent == null ? 0 : x);
int globaly = parenty + (parent == null ? 0 : y);
// intersect the x,y,w,h rendering window with ourselves; quit if it's empty
- clipw = min(max(clipx, parent == null ? 0 : globalx) + clipw, (parent == null ? 0 : globalx) + width) - globalx;
- cliph = min(max(clipy, parent == null ? 0 : globaly) + cliph, (parent == null ? 0 : globaly) + height) - globaly;
- clipx = max(clipx, parent == null ? 0 : globalx);
- clipy = max(clipy, parent == null ? 0 : globaly);
+ if ((flags & NOCLIP_FLAG) == 0) {
+ clipw = min(max(clipx, parent == null ? 0 : globalx) + clipw, (parent == null ? 0 : globalx) + width) - globalx;
+ cliph = min(max(clipy, parent == null ? 0 : globaly) + cliph, (parent == null ? 0 : globaly) + height) - globaly;
+ clipx = max(clipx, parent == null ? 0 : globalx);
+ clipy = max(clipy, parent == null ? 0 : globaly);
+ }
if (clipw <= 0 || cliph <= 0) return;
if ((fillcolor & 0xFF000000) != 0x00000000)
- buf.fillRect(clipx, clipy, clipx + clipw, clipy + cliph, fillcolor);
+ buf.fillTrapezoid(clipx, clipx + clipw, clipy, clipx, clipx + clipw, clipy + cliph, fillcolor);
if (image != null)
if ((flags & TILE_FLAG) != 0) renderTiledImage(globalx, globaly, clipx, clipy, clipw, cliph, buf);
if (text != null && !text.equals(""))
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));
+ }
+
// now subtract the pad region from the clip region before proceeding
- clipw = min(max(clipx, globalx + hpad) + clipw, globalx + width - hpad) - clipx;
- cliph = min(max(clipy, globaly + vpad) + cliph, globaly + height - vpad) - clipy;
- clipx = max(clipx, globalx + hpad);
- clipy = max(clipy, globaly + vpad);
+ if ((flags & NOCLIP_FLAG) == 0) {
+ clipw = min(max(clipx, globalx + hpad) + clipw, globalx + width - hpad) - clipx;
+ cliph = min(max(clipy, globaly + vpad) + cliph, globaly + height - vpad) - clipy;
+ clipx = max(clipx, globalx + hpad);
+ clipy = max(clipy, globaly + vpad);
+ }
- for(Box b = getChild(0); b != null; b = b.nextSibling())
- b.render(globalx, globaly, clipx, clipy, clipw, cliph, buf);
+ 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);
+ }
}
void renderStretchedImage(int globalx, int globaly, int clipx, int clipy, int clipw, int cliph, PixelBuffer buf) {
// 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(),
+ strokecolor);
x += g.advance;
}
}
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);
void put(String name, Box b, Object value) { put(b, value); }
static {
- //#repeat fillcolor/strokecolor
- specialBoxProperties.put("fillcolor", new SpecialBoxProperty() {
+ //#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);
//#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); }
+ public Object get(Box b) { return b.get("fill"); }
+ public void put(Box b, Object value) { b.put("fill", value); }
});
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); }
+ public Object get(Box b) { return b.get("stroke"); }
+ public void put(Box b, Object value) { b.put("stroke", value); }
});
specialBoxProperties.put("text", new SpecialBoxProperty() {
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) {
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) {
b.dirty();
} });
+ 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("invisible", new SpecialBoxProperty() {
public Object get(Box b) {
for (Box cur = b; cur != null; cur = cur.parent) {
} else {
// FIXME
}
- b.minwidth = Math.min(b.maxwidth, Math.max(b.minwidth, b.image == null ? 0 : b.image.getWidth()));
- b.minheight = Math.min(b.maxheight, Math.max(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();
}
});
//#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; }
projects / org.ibex.core.git / blobdiff