X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FBox.java.pp;h=e6c7201b5d4a3305aeed9e2746f217c697842894;hb=e3ab0c9f1105faf5d28002caf095937a2850a60a;hp=2c6016165340437319ca95962b49c03da97041b8;hpb=7431226f404a5517a4b68548284872336b0e5249;p=org.ibex.core.git
diff --git a/src/org/xwt/Box.java.pp b/src/org/xwt/Box.java.pp
index 2c60161..e6c7201 100644
--- a/src/org/xwt/Box.java.pp
+++ b/src/org/xwt/Box.java.pp
@@ -6,11 +6,7 @@ package org.xwt;
// RULE: coordinates on non-static methods are ALWAYS relative to the
// upper-left hand corner of this
-// FIXME: align
-// FIXME: use bitfields
-// FIXME: fixedaspect
-// FIXME: reflow before allowing js to read from width/height
-// FIXME: due to font inheritance, we must dirty and mark all null-font descendents of a node if its font changes
+// FEATURE: reflow before allowing js to read from width/height
// FEATURE: fastpath for rows=1/cols=1
// FEATURE: reflow starting with a certain child
// FEATURE: separate mark_for_reflow and mark_for_resize
@@ -20,7 +16,7 @@ import java.net.*;
import java.util.*;
import org.xwt.js.*;
import org.xwt.util.*;
-import org.xwt.imp.*;
+import org.xwt.translators.*;
/**
*
@@ -56,13 +52,14 @@ import org.xwt.imp.*;
* SizeChanges trigger an Surface.abort; if rendering were done in the same
* pass, rendering work done prior to the Surface.abort would be wasted.
*
- * Repacking is seperate from resizing since a box's size depends on
- * both the box's parent's size (so the traversal must be preorder)
- * contentwidths of siblings both before and after the box, which in
- * turn depend on all descendents of the siblings. FIXME
+ * The two passes are repack and resize. Together they are known as
+ * reflow. Repacking assigns boxes to the appropriate grid
+ * coordinates within the parents and computes
+ * contentwidth/contentheight. Resize computes actual size and
+ * position.
*
* A note on coordinates: the Box class represents regions
- * internally as x,y,w,h tuples, even though the DoubleBuffer class
+ * internally as x,y,w,h tuples, even though the PixelBuffer class
* uses x1,y1,x2,y2 tuples.
*/
public final class Box extends JS.Scope {
@@ -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 ////////////////////////////////////////////////////////////////
@@ -82,10 +79,20 @@ public final class Box extends JS.Scope {
//#define MARK_FOR_REFLOW_b for(Box b2 = b; b2 != null && !b2.needs_reflow; b2 = b2.parent) b2.needs_reflow = true;
//#define MARK_FOR_REFLOW_b_parent for(Box b2 = b.parent; b2 != null && !b2.needs_reflow; b2 = b2.parent) b2.needs_reflow = true;
- private boolean mouseinside = false;
Box redirect = this;
Surface surface = null; // null on all non-root boxen
- Hash traps = null;
+
+ // Flags ///////////////////////////////////////////////////////////////////////////////
+ short flags = 0;
+ static int MOUSEINSIDE_FLAG = 0x00000001;
+ static int INVISIBLE_FLAG = 0x00000002;
+ static int NOTPACKED_FLAG = 0x00000004;
+ 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 ////////////////////////////////////////////////////////////////////////////
@@ -96,65 +103,70 @@ 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;
- private LENGTH hpad = 0;
- private LENGTH vpad = 0;
+ public LENGTH minwidth = 0;
+ public LENGTH minheight = 0;
+ public LENGTH maxwidth = MAX_LENGTH;
+ public LENGTH maxheight = MAX_LENGTH;
private String text = null;
- private String font = null;
+ private Res font = null;
+ private int fontsize = 10;
private LENGTH textwidth = 0;
private LENGTH textheight = 0;
- // FIXME: use shorts
+ // FEATURE: use shorts
private int rows = 1;
private int cols = 0;
private int rowspan = 1;
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; // FIXME use a short
- private int col = 0; // FIXME use a short
- private LENGTH contentwidth = 0; // == max(minwidth, textwidth+pad, sum(child.contentwidth) + pad)
+ private int row = 0; // FEATURE use a short
+ private int col = 0; // FEATURE use a short
+ private LENGTH contentwidth = 0; // == max(minwidth, textwidth, sum(child.contentwidth))
private LENGTH contentheight = 0;
+ private LENGTH offset_x = 0;
+ private LENGTH offset_y = 0;
// 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 Picture image; // will disappear
- private int fillcolor = 0x00000000; // will become SVG.Paint
- private int strokecolor = 0xFF000000; // will become SVG.Paint
+ private VectorGraphics.RasterPath rpath = null;
+ private VectorGraphics.Affine rtransform = null;
- private String cursor = null; // the cursor for this box
+ //private VectorGraphics.Paint fill = null;
+ //private VectorGraphics.Paint stroke = null;
+ int strokewidth = 1;
- //FIXME make private
- public boolean invisible = false; // true iff the Box is invisible
- private boolean absolute = false; // If true, the box will be positioned absolutely
- private boolean vshrink = false; // If true, the box will shrink to the smallest vertical size possible
- private boolean hshrink = false; // If true, the box will shrink to the smallest horizontal size possible
- private boolean tile = false; // FIXME: drop this?
+ 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
// Instance Methods /////////////////////////////////////////////////////////////////////
- // FIXME: rethink
/** 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;
@@ -172,21 +184,21 @@ public final class Box extends JS.Scope {
void Move(int oldmousex, int oldmousey, int mousex, int mousey) { Move(oldmousex, oldmousey, mousex, mousey, false); }
void Move(int oldmousex, int oldmousey, int mousex, int mousey, boolean forceleave) {
- boolean wasinside = mouseinside;
- boolean isinside = !invisible && inside(mousex, mousey) && !forceleave;
- mouseinside = isinside;
+ boolean wasinside = (flags & MOUSEINSIDE_FLAG) != 0;
+ boolean isinside = !((flags & INVISIBLE_FLAG) != 0) && inside(mousex, mousey) && !forceleave;
+ if (isinside) flags |= MOUSEINSIDE_FLAG; else flags &= ~MOUSEINSIDE_FLAG;
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;
// if the mouse has moved into our padding region, it is considered 'outside' all our children
- if (!(mousex >= hpad && mousey >= vpad && mousex < width - hpad && mousey < height + vpad)) forceleave = true;
+ if (!(mousex >= 0 && mousey >= 0 && mousex < width && mousey < height)) forceleave = true;
for(Box b = getChild(numChildren() - 1); b != null; b = b.prevSibling()) {
b.Move(oldmousex - b.x, oldmousey - b.y, mousex - b.x, mousey - b.y, forceleave);
@@ -197,36 +209,44 @@ public final class Box extends JS.Scope {
// Reflow ////////////////////////////////////////////////////////////////////////////////////////
- void reflow() {
+ /** only for use on the root box */
+ void reflow() { reflow(width, height); }
+ void reflow(int new_width, int new_height) {
repack();
if (Surface.abort) return;
- resize(x, y, width, height);
+ //#repeat width/height new_width/new_height HSHRINK_FLAG/VSHRINK_FLAG contentwidth/contentheight minwidth/minheight maxwidth/maxheight
+ new_width = bound(max(contentwidth, minwidth),
+ new_width,
+ ((flags & HSHRINK_FLAG) != 0) ? max(contentwidth, minwidth) : maxwidth);
+ //#end
+ 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 */
void repack() {
if (!needs_reflow) return;
- if (numChildren() == 0) {
- contentwidth = max(textwidth + 2 * hpad, minwidth);
- contentheight = max(textheight + 2 * vpad, minheight);
- return;
- }
+ contentwidth = contentheight = 0;
// --- Phase 0 ----------------------------------------------------------------------
// recurse
for(Box child = getChild(0); child != null; child = child.nextSibling()) {
+ if (((flags & FONT_CHANGED_FLAG) != 0) && child.font == null) {
+ child.flags |= FONT_CHANGED_FLAG;
+ child.needs_reflow = true;
+ }
child.repack();
if (Surface.abort) { MARK_FOR_REFLOW_this; return; }
}
+ flags &= ~FONT_CHANGED_FLAG;
// --- Phase 1 ----------------------------------------------------------------------
// 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.absolute || child.invisible); 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
@@ -241,7 +261,7 @@ public final class Box extends JS.Scope {
child.row = row;
col += min(cols, child.colspan);
child = child.nextSibling();
- for(; child != null && (child.absolute || child.invisible); child = child.nextSibling());
+ for(; child != null && (((child.flags & NOTPACKED_FLAG) != 0) || ((child.flags & INVISIBLE_FLAG) != 0)); child = child.nextSibling());
}
}
}
@@ -249,32 +269,53 @@ 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)
+ //#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
+ if (numChildren() != 0) {
+ 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.absolute || child.invisible))
- colWidth[child.col] = max(colWidth[child.col], child.contentwidth / child.colspan);
- for(int col=0; col= 0 && i < numChildren()) {
Box b = getChild(i);
b.remove();
- put("0", b);
+ if (t != null) t.perform(b);
}
- } else if (value instanceof RootProxy) {
- if (Log.on) Log.logJS(this, "attempt to reparent a box via its proxy object");
} else {
Box newnode = (Box)value;
@@ -600,12 +628,14 @@ public final class Box extends JS.Scope {
MARK_FOR_REFLOW_this;
newnode.dirty();
-
- // note that JavaScript box[0] will invoke put(int i), not put(String s)
- put("0", newnode);
+ if (t != null) t.perform(b);
}
}
+ public Object get(Object key, Object key2) { return super.get(key, key2); }
+ public void put(Object key, Object key2, Object val) { super.put(key, key2, val); }
+
+ public Object get_(Object name) { return super.get(name); }
public Object get(Object name) { return get(name, false); }
public Object get(Object name_, boolean ignoretraps) {
if (name_ instanceof Number) return get(((Number)name_).intValue());
@@ -614,17 +644,9 @@ public final class Box extends JS.Scope {
String name = (String)name_;
if (name.equals("")) return null;
- // See if we're reading back the function value of a trap
- if (name.charAt(0) == '_') {
- if (name.charAt(1) == '_') name = name.substring(2);
- else name = name.substring(1);
- Trap t = Trap.getTrap(this, name);
- return t == null ? null : t.f;
- }
-
// See if we're triggering a trap
- Trap t = traps == null || ignoretraps ? null : (Trap)traps.get(name);
- if (t != null && t.isreadtrap) return t.perform(Trap.emptyargs);
+ Trap t = ignoretraps ? (Trap)null : (Trap)get(name, Trap.class);
+ if (t != null) return t.perform();
// Check for a special handler
SpecialBoxProperty gph = (SpecialBoxProperty)SpecialBoxProperty.specialBoxProperties.get(name);
@@ -632,7 +654,8 @@ public final class Box extends JS.Scope {
Object ret = super.get(name);
if (name.startsWith("$") && ret == null)
- if (Log.on) Log.logJS(this, "WARNING: attempt to access " + name + ", but no child with id=\"" + name.substring(1) + "\" found");
+ if (Log.on) Log.logJS(this, "WARNING: attempt to access " + name + ", but no child with id=\"" +
+ name.substring(1) + "\" found");
return ret;
}
@@ -642,53 +665,32 @@ public final class Box extends JS.Scope {
return ret;
}
+ public void addTrap(Object name, Object value) { Trap.addTrap(this, name, ((JS.CompiledFunction)value)); }
+ public void delTrap(Object name, Object value) { Trap.delTrap(this, name, ((JS.CompiledFunction)value)); }
+
+
/**
* Scriptable.put()
* @param ignoretraps if set, no traps will be triggered (set when 'cascade' reaches the bottom of the trap stack)
* @param rp if this put is being performed via a root proxy, rp is the root proxy.
*/
- public void put(Object name, Object value) { put(name, value, false, null); }
- public void put(Object name, Object value, boolean ignoretraps) { put(name, value, ignoretraps, null); }
- public void put(Object name_, Object value, boolean ignoretraps, RootProxy rp) {
+ public void put_(Object name, Object value) { super.put(name, value); }
+ public void put(Object name, Object value) { put(name, value, false); }
+ public void put(Object name_, Object value, boolean ignoretraps) {
if (name_ instanceof Number) { put(((Number)name_).intValue(), value); return; }
if (!(name_ instanceof String)) { super.put(name_,value); return; }
String name = name_.toString();
- if (!ignoretraps && traps != null) {
- Trap t = (Trap)traps.get(name);
+ if (!ignoretraps) {
+ Trap t = (Trap)get(name, Trap.class);
if (t != null) {
- JS.Array arg = new JS.Array();
- arg.addElement(value);
- t.perform(arg);
- arg.setElementAt(null, 0);
+ t.perform(value);
return;
}
}
- // don't want to really cascade down to the box on this one
- if (name.equals("0")) return;
-
SpecialBoxProperty gph = (SpecialBoxProperty)SpecialBoxProperty.specialBoxProperties.get(name);
if (gph != null) { gph.put(name, this, value); return; }
- if (name.charAt(0) == '_') {
- if (value != null && !(value instanceof JS.Callable)) {
- if (Log.on) Log.logJS(this, "attempt to put a non function value (" + value + ") to " + name);
- } else if (value != null && !(value instanceof JS.CompiledFunction)) {
- if (Log.on) Log.logJS(this, "attempt to put a non-compiled function value (" + value + ") to " + name);
- } else if (name.charAt(1) == '_') {
- name = name.substring(2).intern();
- Trap t = Trap.getTrap(this, name);
- if (t != null) t.delete();
- if (value != null) Trap.addTrap(this, name, ((JS.CompiledFunction)value), true, rp);
- } else {
- name = name.substring(1).intern();
- Trap t = Trap.getTrap(this, name);
- if (t != null) t.delete();
- if (value != null) Trap.addTrap(this, name, ((JS.CompiledFunction)value), false, rp);
- }
- return;
- }
-
super.put(name, value);
}
@@ -730,7 +732,7 @@ public final class Box extends JS.Scope {
if (oldparent == null) return;
MARK_FOR_REFLOW_this;
dirty();
- mouseinside = false;
+ flags &= ~MOUSEINSIDE_FLAG;
if (parent.children != null) {
parent.children.removeElementAt(indexInParent);
@@ -753,7 +755,10 @@ public final class Box extends JS.Scope {
if (oldparent != null) { Box b = oldparent; MARK_FOR_REFLOW_b; }
// note that JavaScript box[0] will invoke put(int i), not put(String s)
- if (oldparent != null) oldparent.put("0", this);
+ if (oldparent != null) {
+ Trap t = (Trap)oldparent.get("childremoved", Trap.class);
+ if (t != null) t.perform(this);
+ }
}
/** returns our next sibling (parent[ourindex + 1]) */
@@ -830,36 +835,17 @@ public final class Box extends JS.Scope {
}
- // Root Proxy ///////////////////////////////////////////////////////////////////////////////
-
- // FEATURE: use xwt.graft() here
- RootProxy myproxy = null;
- public JS getRootProxy() {
- if (myproxy == null) myproxy = new RootProxy(this);
- return myproxy;
- }
-
- private static class RootProxy extends JS {
- Box box;
- RootProxy(Box b) { this.box = b; }
- public Object get(Object name) { return box.get(name); }
- public void put(Object name, Object value) { box.put(name, value, false, this); }
- public Object[] keys() { return box.keys(); }
- public Object callMethod(Object method, JS.Array args, boolean justChecking) {
- return ((Box)box).callMethod(method,args,justChecking);
- }
- }
-
-
// Trivial Helper Methods (should be inlined) /////////////////////////////////////////
static final int min(int a, int b) { if (ab) 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; }
- final boolean inside(int x, int y) { return (!invisible && x >= 0 && y >= 0 && x < width && y < height); }
+ final boolean inside(int x, int y) { return (!((flags & INVISIBLE_FLAG) != 0) && x >= 0 && y >= 0 && x < width && y < height); }
/** figures out what box in this subtree of the Box owns the pixel at x,y relitave to the Surface */
public static Box whoIs(Box cur, int x, int y) {
@@ -873,7 +859,7 @@ public final class Box extends JS.Scope {
// is UNSYNCHRONIZED for performance reasons. BE CAREFUL
// HERE.
- if (cur.invisible) return null;
+ if ((cur.flags & INVISIBLE_FLAG) != 0) return null;
if (!cur.inside(x - globalx, y - globaly)) return cur.parent == null ? cur : null;
OUTER: while(true) {
for(int i=cur.numChildren() - 1; i>=0; i--) {
@@ -881,7 +867,7 @@ public final class Box extends JS.Scope {
if (child == null) continue; // since this method is unsynchronized, we have to double-check
globalx += child.x;
globaly += child.y;
- if (!child.invisible && child.inside(x - globalx, y - globaly)) { cur = child; continue OUTER; }
+ if (!((child.flags & INVISIBLE_FLAG) != 0) && child.inside(x - globalx, y - globaly)) { cur = child; continue OUTER; }
globalx -= child.x;
globaly -= child.y;
}
@@ -919,49 +905,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 (SVG.colors.get(s) != null)
- newcolor = 0xFF000000 | ((Integer)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() {
@@ -975,10 +929,13 @@ public final class Box extends JS.Scope {
b.textwidth = b.textheight = 0;
} else {
try {
- ImageDecoder id = org.xwt.imp.Font.render(new FileInputStream("COMIC.TTF"), 24, b.text, true);
- if (id.getWidth() != b.textwidth || id.getHeight() != b.textheight) MARK_FOR_REFLOW_b;
- b.textwidth = id.getWidth();
- b.textheight = id.getHeight();
+ MARK_FOR_REFLOW_b;
+ b.textwidth = 0;
+ for(int i=0; i 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();
+ }
+ MARK_FOR_REFLOW_b;
+ 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.font = value == null ? null : value.toString();
- // FIXME: need a resource stream to hand off to MIPS
- // FIXME: MARK_FOR_REFLOW here
+ // FIXME: translate value into a resource if it is a string
+ b.font = value == null ? null : (Res)value;
+ MARK_FOR_REFLOW_b;
+ b.flags |= FONT_CHANGED_FLAG;
+ b.dirty();
+ } });
+
+ specialBoxProperties.put("fontsize", new SpecialBoxProperty() {
+ public Object get(Box b) { return b.font; }
+ public void put(Box b, Object value) {
+ if (b.fontsize == stoi(value)) return;
+ b.fontsize = stoi(value);
+ MARK_FOR_REFLOW_b;
+ b.flags |= FONT_CHANGED_FLAG;
+ 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();
} });
@@ -1029,31 +1083,18 @@ public final class Box extends JS.Scope {
MARK_FOR_REFLOW_b;
} });
- 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> 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();
+ }
}
}