X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FBox.java.pp;h=c566a017e142fc0139e8ee55cff33fb6599bfdd8;hb=3c68ab103101636952799709c5a5b635d3cc214b;hp=245a2c159e4a04e0640d9e8cc807528335c7be91;hpb=55c3195af733f3de6b7894f4c4a96f7b50f58c11;p=org.ibex.core.git
diff --git a/src/org/xwt/Box.java.pp b/src/org/xwt/Box.java.pp
index 245a2c1..c566a01 100644
--- a/src/org/xwt/Box.java.pp
+++ b/src/org/xwt/Box.java.pp
@@ -6,9 +6,6 @@ package org.xwt;
// RULE: coordinates on non-static methods are ALWAYS relative to the
// upper-left hand corner of this
-// FIXME: font color, italicization, bolding, and underlining
-// FIXME: align
-// FIXME: fixed aspect
// FEATURE: reflow before allowing js to read from width/height
// FEATURE: fastpath for rows=1/cols=1
// FEATURE: reflow starting with a certain child
@@ -72,7 +69,7 @@ public final class Box extends JS.Scope {
// Misc instance data ////////////////////////////////////////////////////////////////
- private static int sizePosChangesSinceLastRender = 0;
+ static int sizePosChangesSinceLastRender = 0;
// Misc instance data ////////////////////////////////////////////////////////////////
@@ -85,30 +82,17 @@ public final class Box extends JS.Scope {
Box redirect = this;
Surface surface = null; // null on all non-root boxen
- // FEATURE: combine this with the JSObject Hash
- Hash traps = null;
-
-
// Flags ///////////////////////////////////////////////////////////////////////////////
+ short flags = 0;
static int MOUSEINSIDE_FLAG = 0x00000001;
static int INVISIBLE_FLAG = 0x00000002;
static int ABSOLUTE_FLAG = 0x00000004;
- static int HSHRINK_FLAG = 0x00000010;
- static int VSHRINK_FLAG = 0x00000020;
- static int TILE_FLAG = 0x00000040;
-
- /**
- * Set when the font changes, cleared during repack. If set
- * during repack, all font==null children are marked for reflow
- * and given the font_changed_flag. We use this flag to avoid
- * having to iterate over all descendents of a box when its font
- * changes.
- */
- static int FONT_CHANGED_FLAG = 0x00000100;
-
- static int ALIGN_FLAG = 0x00000000;
- static int FIXEDASPECT_FLAG = 0x00000000;
- int flags = 0;
+ static int HSHRINK_FLAG = 0x00000008;
+ static int VSHRINK_FLAG = 0x00000010;
+ 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 ////////////////////////////////////////////////////////////////////////////
@@ -119,10 +103,10 @@ public final class Box extends JS.Scope {
//#define MIN_LENGTH Integer.MIN_VALUE
// always correct (set directly by user)
- LENGTH minwidth = 0;
- LENGTH minheight = 0;
- LENGTH maxwidth = MAX_LENGTH;
- LENGTH maxheight = MAX_LENGTH;
+ public LENGTH minwidth = 0;
+ public LENGTH minheight = 0;
+ public LENGTH maxwidth = MAX_LENGTH;
+ public LENGTH maxheight = MAX_LENGTH;
private LENGTH hpad = 0;
private LENGTH vpad = 0;
private String text = null;
@@ -138,8 +122,8 @@ public final class Box extends JS.Scope {
private int colspan = 1;
// computed during reflow
- LENGTH x = 0;
- LENGTH y = 0;
+ public LENGTH x = 0;
+ public LENGTH y = 0;
public LENGTH width = 0;
public LENGTH height = 0;
private int row = 0; // FEATURE use a short
@@ -150,13 +134,15 @@ 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;
- private Picture image; // will disappear
- private int fillcolor = 0x00000000; // will become SVG.Paint
- private int strokecolor = 0xFF000000; // will become SVG.Paint
+ public Picture image; // will disappear
+ 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
@@ -164,23 +150,23 @@ 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;
y += cur.y;
}
- */
- Box cur;
- for(cur = this; cur.parent != null; cur = cur.parent);
- if (cur.surface != null) cur.surface.dirty(0, 0, cur.width, cur.height);
}
/**
@@ -199,10 +185,10 @@ public final class Box extends JS.Scope {
if (!wasinside && !isinside) return;
- if (traps == null) { }
- else if (!wasinside && isinside && traps.get("Enter") != null) put("Enter", Boolean.TRUE);
- else if (wasinside && !isinside && traps.get("Leave") != null) put("Leave", Boolean.TRUE);
- else if (wasinside && isinside && (mousex != oldmousex || mousey != oldmousey) && traps.get("Move") != null) put("Move", Boolean.TRUE);
+ if (!wasinside && isinside && get("Enter", Trap.class) != null) put("Enter", Boolean.TRUE);
+ else if (wasinside && !isinside && get("Leave", Trap.class) != null) put("Leave", Boolean.TRUE);
+ else if (wasinside && isinside && (mousex != oldmousex || mousey != oldmousey) && get("Move", Trap.class) != null)
+ put("Move", Boolean.TRUE);
if (isinside && cursor != null) getRoot().cursor = cursor;
@@ -218,10 +204,11 @@ public final class Box extends JS.Scope {
// Reflow ////////////////////////////////////////////////////////////////////////////////////////
- void reflow() {
+ void reflow() { reflow(width, height); }
+ void reflow(int new_width, int new_height) {
repack();
if (Surface.abort) return;
- resize(x, y, width, height);
+ resize(x, y, new_width, new_height);
}
/** Checks if the Box's size has changed, dirties it if necessary, and makes sure childrens' sizes are up to date */
@@ -230,6 +217,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;
}
@@ -288,19 +279,23 @@ public final class Box extends JS.Scope {
for(int col=0; col> 16);
@@ -991,13 +911,13 @@ public final class Box extends JS.Scope {
//#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() {
@@ -1025,6 +945,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) {
@@ -1045,6 +1042,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) {
@@ -1079,17 +1084,8 @@ public final class Box extends JS.Scope {
MARK_FOR_REFLOW_b;
} });
+ //FIXME
specialBoxProperties.put("static", new SpecialBoxProperty() {
- public Object get(Box b) {
- String cfsn =
- JS.Thread.fromJavaThread(java.lang.Thread.currentThread()).getCurrentCompiledFunction().getSourceName();
- for(int i=0; i